Option to migrate SQL Server tables to PostgreSQL

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

@@ -801,7 +801,7 @@ public static void updateDescription(Container container, String description, Us
     {
         ColumnValidators.validate(CORE.getTableInfoContainers().getColumn("Title"), null, 1, description);
 
-        //For some reason there is no primary key defined on core.containers
+        //For some reason, there is no primary key defined on core.containers
         //so we can't use Table.update here
         SQLFragment sql = new SQLFragment("UPDATE ");
         sql.append(CORE.getTableInfoContainers());
@@ -817,7 +817,7 @@ public static void updateDescription(Container container, String description, Us
 
     public static void updateSearchable(Container container, boolean searchable, User user)
     {
-        //For some reason there is no primary key defined on core.containers
+        //For some reason, there is no primary key defined on core.containers
         //so we can't use Table.update here
         SQLFragment sql = new SQLFragment("UPDATE ");
         sql.append(CORE.getTableInfoContainers());
@@ -2715,7 +2715,7 @@ public static int updateContainer(TableInfo dataTable, String idField, Collectio
     }
 
     /**
-     * If a container at the given path does not exist create one and set permissions. If the container does exist,
+     * If a container at the given path does not exist, create one and set permissions. If the container does exist,
      * permissions are only set if there is no explicit ACL for the container. This prevents us from resetting
      * permissions if all users are dropped. Implicitly done as an admin-level service user.
      */

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

@@ -148,7 +148,7 @@ public static Pair<DbScope, String> getDbScopeAndSchemaName(String fullyQualifie
         }
     }
 
-    Module getModule()
+    public Module getModule()
     {
         return _module;
     }

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

@@ -94,7 +94,7 @@ default String getLookupSchemaName()
         return Objects.toString(getLookupSchemaKey(),null);
     }
 
-    /* Schema path relative to the DefaultSchema (e.g. container) */
+    /* Schema path relative to the DefaultSchema (e.g., container) */
     SchemaKey getLookupSchemaKey();
 
     /**

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

@@ -15,6 +15,8 @@
  */
 package org.labkey.api.data;
 
+import org.apache.commons.lang3.mutable.MutableBoolean;
+import org.apache.commons.lang3.mutable.MutableInt;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
@@ -31,6 +33,7 @@
 import java.util.Collections;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * Executes a single module upgrade SQL script, including finding calls into Java code that are embedded using
@@ -51,13 +54,14 @@ public class SqlScriptExecutor
     /**
      * Splits a SQL string into blocks and executes each block, one at a time. Blocks are determined in a dialect-specific
      * way, using splitPattern and procPattern.
-     * @param scriptName Name of the SQL script for logging purposes
-     * @param sql The SQL string to split and execute
-     * @param splitPattern Dialect-specific regex pattern for splitting normal SQL statements into blocks. Null means no need to split.
-     * @param procPattern Dialect-specific regex pattern for finding executeJavaCode procedure calls in the SQL. See SqlDialect.getSqlScriptProcPattern() for details.
-     * @param schema Current schema. Null is allowed for testing purposes.
+     *
+     * @param scriptName    Name of the SQL script for logging purposes
+     * @param sql           The SQL string to split and execute
+     * @param splitPattern  Dialect-specific regex pattern for splitting normal SQL statements into blocks. Null means no need to split.
+     * @param procPattern   Dialect-specific regex pattern for finding executeJavaCode procedure calls in the SQL. See SqlDialect.getSqlScriptProcPattern() for details.
+     * @param schema        Current schema. Null is allowed for testing purposes.
      * @param moduleContext Current ModuleContext
-     * @param conn Connection to use, if non-null
+     * @param conn          Connection to use, if non-null
      */
     public SqlScriptExecutor(String scriptName, String sql, @Nullable Pattern splitPattern, @NotNull Pattern procPattern, @Nullable DbSchema schema, ModuleContext moduleContext, @Nullable Connection conn)
     {
@@ -79,10 +83,51 @@ public void execute()
         }
     }
 
+    private static final String START_ANNOTATION = "@SkipOnEmptySchemasBegin";
+    private static final String END_ANNOTATION = "@SkipOnEmptySchemasEnd";
+
     private Collection<Block> getBlocks()
     {
+        String sql;
+
+        if (ModuleLoader.getInstance().shouldInsertData())
+        {
+            sql = _sql;
+        }
+        else
+        {
+            // Strip all statements (typically inserts) between the empty-schema START and END annotations, inclusive
+            MutableBoolean skipping = new MutableBoolean(false);
+            MutableInt lineCount = new MutableInt(0);
+            sql = _sql.lines()
+                .filter(line -> {
+                    lineCount.increment();
+                    if (line.contains(START_ANNOTATION))
+                    {
+                        if (skipping.booleanValue())
+                            throw new IllegalStateException("Unexpected " + START_ANNOTATION + " at line " + lineCount.intValue());
+
+                        skipping.setValue(true);
+                    }
+
+                    boolean ret = !skipping.booleanValue();
+
+                    if (line.contains(END_ANNOTATION))
+                    {
+                        if (!skipping.booleanValue())
+                            throw new IllegalStateException("Unexpected " + END_ANNOTATION + " at line " + lineCount.intValue());
+
+                        skipping.setValue(false);
+                    }
+
+                    return ret;
+                }
+            )
+            .collect(Collectors.joining("\n"));
+        }
+
         // Strip all comments from the script -- PostgreSQL JDBC driver goes berserk if it sees ; or ? inside a comment
-        StringBuilder stripped = new SqlScanner(_sql).stripComments();
+        StringBuilder stripped = new SqlScanner(sql).stripComments();
 
         Collection<String> sqlBlocks;
 

api/src/org/labkey/api/data/dialect/BasePostgreSqlDialect.java

@@ -931,13 +931,6 @@ public DatabaseIdentifier makeDatabaseIdentifier(String alias)
 
     private static final Pattern PROC_PATTERN = Pattern.compile("^\\s*SELECT\\s+core\\.(executeJava(?:Upgrade|Initialization)Code\\s*\\(\\s*'(.+)'\\s*\\))\\s*;\\s*$", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
 
-    @Override
-    // No need to split up PostgreSQL scripts; execute all statements in a single block (unless we have a special stored proc call).
-    protected Pattern getSQLScriptSplitPattern()
-    {
-        return null;
-    }
-
     @NotNull
     @Override
     protected Pattern getSQLScriptProcPattern()

api/src/org/labkey/api/exp/api/ProvisionedDbSchema.java

@@ -31,7 +31,6 @@
 /**
  * A schema in the underlying database that is populated by tables created (provisioned) dynamically
  * based on administrator or other input into what columns/fields should be tracked.
- * Created by klum on 2/23/14.
  */
 public class ProvisionedDbSchema extends DbSchema
 {

api/src/org/labkey/api/exp/api/StorageProvisioner.java

@@ -77,6 +77,12 @@ static TableInfo createTableInfo(@NotNull Domain domain)
      */
     String ensureStorageTable(Domain domain, DomainKind<?> kind, DbScope scope);
 
+    /**
+     * Used by DatabaseMigration only. Creates the storage table associated with this domain, using the storage table
+     * name provided by the domain.
+     */
+    void createStorageTable(Domain domain, DomainKind<?> kind, DbScope scope);
+
     void dropNotRequiredIndices(Domain domain);
     void addMissingRequiredIndices(Domain domain);
     void addTableIndices(Domain domain, Set<PropertyStorageSpec.Index> indices, TableChange.IndexSizeMode sizeMode);