0002356: Triggers not created for tables with sql_variant column

JumpMind · Aug 3, 2015 · a6dde30 · a6dde30
1 parent 6feda86
commit a6dde30
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/symmetric-db/src/main/java/org/jumpmind/db/model/ColumnTypes.java b/symmetric-db/src/main/java/org/jumpmind/db/model/ColumnTypes.java
@@ -32,7 +32,9 @@ private ColumnTypes() {
     public static final int LONGNVARCHAR = -16;
 
     public static final int ORACLE_TIMESTAMPTZ = -101;    
-    public static final int ORACLE_TIMESTAMPLTZ = -102;    
+    public static final int ORACLE_TIMESTAMPLTZ = -102;   
+
+    public static final int MSSQL_SQL_VARIANT = -150;
 
     public static final int MAPPED_TIMESTAMPTZ = ORACLE_TIMESTAMPTZ;
 

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/model/TypeMap.java b/symmetric-db/src/main/java/org/jumpmind/db/model/TypeMap.java
@@ -21,6 +21,7 @@
 
 import static org.jumpmind.db.model.ColumnTypes.ORACLE_TIMESTAMPLTZ;
 import static org.jumpmind.db.model.ColumnTypes.ORACLE_TIMESTAMPTZ;
+import static org.jumpmind.db.model.ColumnTypes.MSSQL_SQL_VARIANT;
 
 import java.sql.Types;
 import java.util.HashMap;
@@ -158,6 +159,7 @@ public abstract class TypeMap
         registerJdbcType(Types.VARCHAR,       VARCHAR,       JdbcTypeCategoryEnum.TEXTUAL);
         registerJdbcType(ORACLE_TIMESTAMPTZ,  TIMESTAMPTZ,   JdbcTypeCategoryEnum.DATETIME);
         registerJdbcType(ORACLE_TIMESTAMPLTZ, TIMESTAMPLTZ,   JdbcTypeCategoryEnum.DATETIME);
+        registerJdbcType(MSSQL_SQL_VARIANT, BLOB,   JdbcTypeCategoryEnum.BINARY);
 
         // only available in JDK 1.4 and above:
         if (PlatformUtils.supportsJava14JdbcTypes())

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/mssql/MsSql2008DdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/mssql/MsSql2008DdlBuilder.java
@@ -22,6 +22,7 @@
 
 import java.sql.Types;
 
+import org.jumpmind.db.model.ColumnTypes;
 import org.jumpmind.db.platform.DatabaseNamesConstants;
 
 public class MsSql2008DdlBuilder extends MsSql2005DdlBuilder {
@@ -35,6 +36,7 @@ public MsSql2008DdlBuilder() {
 
         databaseInfo.addNativeTypeMapping(Types.DATE, "DATE", Types.DATE);
         databaseInfo.addNativeTypeMapping(Types.DATE, "TIME", Types.TIME);
+        databaseInfo.addNativeTypeMapping(ColumnTypes.MSSQL_SQL_VARIANT, "SQL_VARIANT", Types.BLOB);
         // TODO add MSSQL 2008 types for time, datetimeoffset, and datetime2
     }
 

diff --git a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSqlDdlReader.java b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSqlDdlReader.java
@@ -155,6 +155,8 @@ protected Integer mapUnknownJdbcTypeForColumn(Map<String, Object> values) {
             return Types.LONGVARCHAR;
         } else if (typeName != null && typeName.toUpperCase().contains("NVARCHAR") && size > 8000) {
             return Types.LONGNVARCHAR;
+        } else if (typeName != null && typeName.toUpperCase().equals("SQL_VARIANT")) {
+            return Types.BINARY;
         } else {
             return super.mapUnknownJdbcTypeForColumn(values);
         }