Improve SQL Server migration process

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

@@ -431,6 +431,7 @@ public void registerServlets(ServletContext servletCtx)
             SimpleFilter.BetweenClauseTestCase.class,
             SimpleFilter.FilterTestCase.class,
             SimpleFilter.InClauseTestCase.class,
+            SimpleFilter.SqlClauseTestCase.class,
             SqlScanner.TestCase.class,
             StringExpressionFactory.TestCase.class,
             StringUtilsLabKey.TestCase.class,

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

@@ -313,12 +313,15 @@ public String toString()
         return "SQLFragment@" + System.identityHashCode(this) + "\n" + JdbcUtil.format(this);
     }
 
-
     public String toDebugString()
     {
         return JdbcUtil.format(this);
     }
 
+    public String toDebugString(SqlDialect dialect)
+    {
+        return JdbcUtil.format(this, dialect);
+    }
 
     public List<Object> getParams()
     {
@@ -1322,6 +1325,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.

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

@@ -393,6 +393,20 @@ public String getLabKeySQLWhereClause(Map<FieldKey, ? extends ColumnInfo> column
         {
             throw new UnsupportedOperationException();
         }
+
+        @Override
+        public boolean equals(Object o)
+        {
+            if (o == null || getClass() != o.getClass()) return false;
+            SQLClause sqlClause = (SQLClause) o;
+            return Objects.equals(_fragment, sqlClause._fragment) && Objects.equals(_fieldKeys, sqlClause._fieldKeys);
+        }
+
+        @Override
+        public int hashCode()
+        {
+            return Objects.hash(_fragment, _fieldKeys);
+        }
     }
 
     public static class FalseClause extends SQLClause
@@ -1701,7 +1715,6 @@ protected void test(String expectedSQL, String description, FilterClause clause,
         {
             test(expectedSQL, description, clause, dialect, Collections.emptyMap());
         }
-
     }
 
     public static class InClauseTestCase extends ClauseTestCase
@@ -1953,4 +1966,22 @@ public void testBetweenQueryString()
                     new CompareType.BetweenClause(fieldKey, "a,b,c", "Z", false).toURLParam("query."));
         }
     }
+
+    public static class SqlClauseTestCase extends Assert
+    {
+        @Test
+        public void testEquals()
+        {
+            SQLClause clause1 = new SQLClause(new SQLFragment("This = That", 1, 2));
+            SQLClause clause2 = new SQLClause(new SQLFragment("This = That", 1, 2));
+            assertEquals(clause1, clause2);
+            assertEquals(clause1.hashCode(), clause2.hashCode());
+            SQLClause clause3 = new SQLClause(new SQLFragment("That = This", 1, 2));
+            assertNotEquals(clause1, clause3);
+            assertNotEquals(clause1.hashCode(), clause3.hashCode());
+            SQLClause clause4 = new SQLClause(new SQLFragment("This = That", 3, 4));
+            assertNotEquals(clause1, clause4);
+            assertNotEquals(clause1.hashCode(), clause4.hashCode());
+        }
+    }
 }