diff --git a/core/src/main/java/com/github/drinkjava2/jdialects/DialectTypeMappingTemplate.java b/core/src/main/java/com/github/drinkjava2/jdialects/DialectTypeMappingTemplate.java
index 8c3da587984de647cd55209177c353e4a62a2927..6daa15eddb92a8db2f003a3c2bbf17c4d2581d36 100644
--- a/core/src/main/java/com/github/drinkjava2/jdialects/DialectTypeMappingTemplate.java
+++ b/core/src/main/java/com/github/drinkjava2/jdialects/DialectTypeMappingTemplate.java
@@ -923,7 +923,8 @@ public class DialectTypeMappingTemplate {
         m = Dialect.MySQLDialect.typeMappings;
         m.put(Type.BINARY, "binary($l)");
         m.put(Type.BIT, "bit");
-        m.put(Type.BLOB, "longblob");
+        m.put(Type.LONGBLOB,"longblob");
+        m.put(Type.BLOB, "blob");
         m.put(Type.BOOLEAN, "bit");
         m.put(Type.CHAR, "char($l)");
         m.put(Type.CLOB, "longtext");
@@ -939,6 +940,7 @@ public class DialectTypeMappingTemplate {
         m.put(Type.DATETIME, "datetime");
         m.put(Type.VARBINARY, "tinyblob<255|blob<65535|mediumblob<16777215|longblob");
         
+        m.put(DECIMAL, "decimal($p,$s)");
         m.put(Type.SMALLINT, "smallint($l)");
         m.put(Type.MEDIUMINT, "MEDIUMINT($l)");
         m.put(Type.TINYINT, "tinyint($l)");
@@ -946,6 +948,14 @@ public class DialectTypeMappingTemplate {
         m.put(Type.YEAR, "year($l)");
         m.put(Type.VARCHAR, "varchar($l)<65535|longtext");
         m.put(Type.TIMESTAMP, "timestamp");
+        m.put(Type.INT, "INT($l)");
+        m.put(Type.TINYBLOB, "TINYBLOB");
+        m.put(Type.TINYTEXT, "TINYTEXT");
+        m.put(Type.TEXT, "TEXT($l)");
+        m.put(Type.MEDIUMBLOB, "MEDIUMBLOB");
+        m.put(Type.MEDIUMTEXT, "MEDIUMTEXT");
+        m.put(Type.LONGTEXT, "LONGTEXT");
+        m.put(Type.JSON, "JSON");
 
         m = Dialect.MySQL5Dialect.typeMappings;
         m.putAll(Dialect.MySQLDialect.typeMappings);//extends from MySQLDialect
@@ -986,21 +996,17 @@ public class DialectTypeMappingTemplate {
         //================OracleDialect family===============
         m = Dialect.OracleDialect.typeMappings;
         m.put(BIGINT, "number(19,0)");
-        m.put(BINARY, "N/A");
         m.put(BIT, "number(1,0)");
         m.put(BLOB, "blob");
-        m.put(BOOLEAN, "boolean");
         m.put(CHAR, "char($l)");
         m.put(CLOB, "clob");
         m.put(DATE, "date");
         m.put(DECIMAL, "number($p,$s)");
-        m.put(DOUBLE, "double precision");
+        m.put(DOUBLE, "double");
         m.put(FLOAT, "float");
-        m.put(INTEGER, "number(10,0)");
+        m.put(INTEGER, "number($l,0)");
         m.put(JAVA_OBJECT, "N/A");
-        m.put(LONGNVARCHAR, "nvarchar($l)");
-        m.put(LONGVARBINARY, "bit varying($l)");
-        m.put(LONGVARCHAR, "varchar($l)");
+        m.put(LONGNVARCHAR, "nvarchar2($l)");
         m.put(NCHAR, "nchar($l)");
         m.put(NCLOB, "nclob");
         m.put(NUMERIC, "number($p,$s)");
@@ -1008,10 +1014,9 @@ public class DialectTypeMappingTemplate {
         m.put(REAL, "real");
         m.put(SMALLINT, "number(5,0)");
         m.put(TIME, "date");
-        m.put(TIMESTAMP, "date");
+        m.put(TIMESTAMP, "timestamp");
         m.put(TINYINT, "number(3,0)");
         m.put(VARBINARY, "raw($l)<2000|long raw");
-        m.put(VARCHAR, "varchar2($l)<4000|long");
         //add new
         m.put(Type.BINARY_FLOAT, "BINARY_FLOAT");
         m.put(Type.BINARY_DOUBLE, "BINARY_DOUBLE");
@@ -1020,6 +1025,12 @@ public class DialectTypeMappingTemplate {
         m.put(Type.TIMESTAMP_WITH_LOCAL_TIME_ZONE, "TIMESTAMP WITH LOCAL TIME ZONE");
         m.put(Type.INTERVAL_YEAR_TO_MONTH, "INTERVAL YEAR($l) TO MONTH");
         m.put(Type.INTERVAL_DAY_TO_SECOND, "INTERVAL DAY($p) TO SECOND($s)");
+        m.put(Type.VARCHAR2, "varchar2($l)");
+        m.put(Type.BINARY, "raw($l)<2000|long raw");
+        m.put(Type.BOOLEAN, "number(1,0)");
+        m.put(Type.LONGVARBINARY, "long raw");
+        m.put(Type.LONGVARCHAR, "long");
+        m.put(Type.VARCHAR, "varchar($l char)<4000|long");
 
         m = Dialect.Oracle10gDialect.typeMappings;
         m.putAll(Dialect.OracleDialect.typeMappings);//extends from OracleDialect
@@ -1031,7 +1042,6 @@ public class DialectTypeMappingTemplate {
         m.put(LONGVARCHAR, "long");
         m.put(NVARCHAR, "nvarchar2($l)");
         m.put(TIMESTAMP, "timestamp");
-        m.put(VARCHAR, "varchar2($l char)<4000|long");
 
         m = Dialect.Oracle12cDialect.typeMappings;
         m.putAll(Dialect.OracleDialect.typeMappings);//extends from OracleDialect
@@ -1043,7 +1053,6 @@ public class DialectTypeMappingTemplate {
         m.put(LONGVARCHAR, "long");
         m.put(NVARCHAR, "nvarchar2($l)");
         m.put(TIMESTAMP, "timestamp");
-        m.put(VARCHAR, "varchar2($l char)<4000|long");
 
         m = Dialect.Oracle8iDialect.typeMappings;
         m.putAll(Dialect.OracleDialect.typeMappings);//extends from OracleDialect
@@ -1056,7 +1065,6 @@ public class DialectTypeMappingTemplate {
         m.putAll(Dialect.OracleDialect.typeMappings);//extends from OracleDialect
         m.put(CHAR, "char($l char)");
         m.put(TIMESTAMP, "timestamp");
-        m.put(VARCHAR, "varchar2($l char)<4000|long");
 
         m = Dialect.Oracle9iDialect.typeMappings;
         m.putAll(Dialect.OracleDialect.typeMappings);//extends from OracleDialect
@@ -1068,7 +1076,6 @@ public class DialectTypeMappingTemplate {
         m.put(LONGVARCHAR, "long");
         m.put(NVARCHAR, "nvarchar2($l)");
         m.put(TIMESTAMP, "timestamp");
-        m.put(VARCHAR, "varchar2($l char)<4000|long");
 
         //================PointbaseDialect family===============
         m = Dialect.PointbaseDialect.typeMappings;