Improve SQL Server migration process

announcements/src/org/labkey/announcements/AnnouncementModule.java

@@ -34,16 +34,20 @@
 import org.labkey.api.attachments.AttachmentParentType;
 import org.labkey.api.audit.AuditLogService;
 import org.labkey.api.audit.provider.MessageAuditProvider;
+import org.labkey.api.data.ColumnInfo;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.ContainerManager;
 import org.labkey.api.data.DbSchema;
+import org.labkey.api.data.SQLFragment;
 import org.labkey.api.data.SqlExecutor;
 import org.labkey.api.data.TableInfo;
+import org.labkey.api.data.WrappedColumn;
 import org.labkey.api.message.digest.DailyMessageDigest;
 import org.labkey.api.message.settings.MessageConfigService;
 import org.labkey.api.migration.DatabaseMigrationConfiguration;
 import org.labkey.api.migration.DatabaseMigrationService;
 import org.labkey.api.migration.DefaultMigrationSchemaHandler;
+import org.labkey.api.migration.MigrationTableHandler;
 import org.labkey.api.module.DefaultModule;
 import org.labkey.api.module.ModuleContext;
 import org.labkey.api.rss.RSSService;
@@ -52,6 +56,7 @@
 import org.labkey.api.security.roles.EditorRole;
 import org.labkey.api.security.roles.Role;
 import org.labkey.api.security.roles.RoleManager;
+import org.labkey.api.util.GUID;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.emailTemplate.EmailTemplateService;
 import org.labkey.api.view.AlwaysAvailableWebPartFactory;
@@ -208,6 +213,45 @@ public void afterSchema(DatabaseMigrationConfiguration configuration, DbSchema s
                 return ws != null ? List.of(AnnouncementType.get(), ws.getAttachmentType()) : List.of(AnnouncementType.get());
             }
         });
+
+        DatabaseMigrationService.get().registerTableHandler(new MigrationTableHandler()
+        {
+            @Override
+            public TableInfo getTableInfo()
+            {
+                return CommSchema.getInstance().getTableInfoAnnouncements();
+            }
+
+            @Override
+            public ColumnInfo handleColumn(ColumnInfo col)
+            {
+                return "DiscussionSrcIdentifier".equals(col.getName()) ? new GuidMapperColumn(col) : col;
+            }
+
+            // In this column, map any value that exactly matches a GUID to lowercase
+            private static final class GuidMapperColumn extends WrappedColumn
+            {
+                public GuidMapperColumn(ColumnInfo col)
+                {
+                    super(col, col.getName());
+                }
+
+                @Override
+                public SQLFragment getValueSql(String tableAlias)
+                {
+                    SQLFragment columnAlias = super.getValueSql(tableAlias);
+                    //noinspection StringConcatenationInsideStringBufferAppend - SQLFragment flips out about unmatched quotes, so we're forced to use string concatenation
+                    return new SQLFragment("CASE WHEN ")
+                        .append(columnAlias)
+                        .append(" LIKE '" + GUID.SQL_LIKE_GUID_PATTERN + "'")
+                        .append(" THEN LOWER(")
+                        .append(columnAlias)
+                        .append(") ELSE ")
+                        .append(columnAlias)
+                        .append(" END");
+                }
+            }
+        });
     }
 
 

api/src/org/labkey/api/ApiModule.java

@@ -366,6 +366,7 @@ public void registerServlets(ServletContext servletCtx)
             Aggregate.TestCase.class,
             ApiXmlWriter.TestCase.class,
             ArrayListMap.TestCase.class,
+            AssayResultsFileWriter.TestCase.class,
             BaseServerProperties.TestCase.class,
             BooleanFormat.TestCase.class,
             BuilderObjectFactory.TestCase.class,
@@ -399,12 +400,12 @@ public void registerServlets(ServletContext servletCtx)
             GenerateUniqueDataIterator.TestCase.class,
             HelpTopic.TestCase.class,
             InlineInClauseGenerator.TestCase.class,
-            JobRunner.TestCase.class,
             JSONDataLoader.HeaderMatchTest.class,
             JSONDataLoader.MetadataTest.class,
             JSONDataLoader.RowTest.class,
             JSoupUtil.TestCase.class,
             JavaVersion.TestCase.class,
+            JobRunner.TestCase.class,
             JsonTest.class,
             JsonUtil.TestCase.class,
             LimitedUser.TestCase.class,
@@ -429,8 +430,10 @@ public void registerServlets(ServletContext servletCtx)
             SchemaKey.TestCase.class,
             SessionHelper.TestCase.class,
             SimpleFilter.BetweenClauseTestCase.class,
+            SimpleFilter.ContainsOneOfTestCase.class,
             SimpleFilter.FilterTestCase.class,
             SimpleFilter.InClauseTestCase.class,
+            SimpleFilter.SqlClauseTestCase.class,
             SqlScanner.TestCase.class,
             StringExpressionFactory.TestCase.class,
             StringUtilsLabKey.TestCase.class,
@@ -440,9 +443,8 @@ public void registerServlets(ServletContext servletCtx)
             TSVWriter.TestCase.class,
             TabLoader.HeaderMatchTest.class,
             Table.IsSelectTestCase.class,
-            ValidEmail.TestCase.class,
             URIUtil.TestCase.class,
-            AssayResultsFileWriter.TestCase.class
+            ValidEmail.TestCase.class
         );
     }
 

api/src/org/labkey/api/data/CompareType.java

@@ -2108,7 +2108,7 @@ SQLFragment toWhereClause(SqlDialect dialect, DatabaseIdentifier alias)
         public String getLabKeySQLWhereClause(Map<FieldKey, ? extends ColumnInfo> columnMap)
         {
             String colName = getLabKeySQLColName(_fieldKey);
-            return "LOWER(" + colName + ") LIKE LOWER('%" + escapeLabKeySqlValue(getParamVals()[0], getColumnType(columnMap, JdbcType.VARCHAR), true) + "%') " + sqlEscape();
+            return "LOWER(" + colName + ") LIKE LOWER('%" + escapeLabKeySqlValue(getParamVals()[0], getColumnType(columnMap, JdbcType.VARCHAR), true) + "%')" + sqlEscape();
         }
 
         @Override

api/src/org/labkey/api/data/SQLFragment.java

@@ -310,15 +310,21 @@ static boolean debugCompareSQL(SQLFragment sql1, SQLFragment sql2)
     @NotNull
     public String toString()
     {
-        return "SQLFragment@" + System.identityHashCode(this) + "\n" + JdbcUtil.format(this);
+        return "SQLFragment@" + System.identityHashCode(this) + "\n" + toDebugString();
     }
 
-
+    // Not recommended -- this uses the LabKey scope to dictate parsing of identifiers and string literals... which
+    // might not be correct for the incoming SQL.
+    @Deprecated // Use the variant below that takes a SqlDialect
     public String toDebugString()
     {
-        return JdbcUtil.format(this);
+        return toDebugString(DbScope.getLabKeyScope().getSqlDialect());
     }
 
+    public String toDebugString(SqlDialect dialect)
+    {
+        return JdbcUtil.format(this, dialect);
+    }
 
     public List<Object> getParams()
     {
@@ -1322,6 +1328,12 @@ public boolean equals(Object obj)
         return getSQL().equals(other.getSQL()) && getParams().equals(other.getParams());
     }
 
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(getSQL(), getParams());
+    }
+
     /**
      * Joins the SQLFragments in the provided {@code Iterable} into a single SQLFragment. The SQL is joined by string
      * concatenation using the provided separator. The parameters are combined to form the new parameter list.