Merge branch 'DBTOOLS-1792_fix_docker_test_ms_table_type' into 'master'

DBTOOLS-1792 fixed docker test ms_table_type

See merge request codekeeper/pgcodekeeper-core!103

Author: AxelCat

src/test/java/org/pgcodekeeper/core/it/jdbc/base/JdbcLoaderTest.java

@@ -39,9 +39,15 @@ public abstract class JdbcLoaderTest {
 
     protected void jdbcLoaderTest(String dumpFileName, String ignoreListName, String url, AbstractJdbcConnector connector,
                                   CoreSettings settings, SupportedPgVersion version, Class<?> clazz)
+            throws PgCodekeeperException, SQLException, IOException, URISyntaxException, InterruptedException{
+        settings.setAddTransaction(true);
+        jdbcLoaderTest(dumpFileName, ignoreListName, url, connector, settings, version, clazz, false);
+    }
+
+    protected void jdbcLoaderTest(String dumpFileName, String ignoreListName, String url, AbstractJdbcConnector connector,
+                                  CoreSettings settings, SupportedPgVersion version, Class<?> clazz, boolean isMemoryOptimized)
             throws PgCodekeeperException, SQLException, IOException, URISyntaxException, InterruptedException {
         settings.setEnableFunctionBodiesDependencies(true);
-        settings.setAddTransaction(true);
         var df = new DatabaseFactory(settings);
         List<String> ignoreLists = new ArrayList<>() ;
         ignoreLists.add(TestUtils.getFilePath(ignoreListName, clazz));
@@ -50,13 +56,19 @@ protected void jdbcLoaderTest(String dumpFileName, String ignoreListName, String
         if (null != version) {
             dumpDb.setVersion(version);
         }
+        var script = Files.readString(TestUtils.getPathToResource(dumpFileName, clazz));
 
         ScriptParser parser = new ScriptParser(dumpFileName,
                 Files.readString(TestUtils.getPathToResource(dumpFileName, clazz)), settings);
 
         var startConfDb = df.loadFromJdbc(url);
         try {
-            new JdbcRunner(new NullMonitor()).runBatches(connector, parser.batch(), null);
+            var runner = new JdbcRunner(new NullMonitor());
+            if (isMemoryOptimized) {
+                runner.run(connector, script);
+            } else {
+                runner.runBatches(connector, parser.batch(), null);
+            }
             var remoteDb = df.loadFromJdbc(url);
             var actual = PgCodeKeeperApi.diff(settings, dumpDb, remoteDb, ignoreLists);
             Assertions.assertEquals("", actual, "Incorrect run dump %s on Database".formatted(dumpFileName));

src/test/java/org/pgcodekeeper/core/it/jdbc/ms/MsJdbcLoaderTest.java

@@ -50,4 +50,15 @@ void msJdbcLoaderTest(String fileName) throws PgCodekeeperException, IOException
         jdbcLoaderTest(fileName + FILES_POSTFIX.SQL, "ms.pgcodekeeperignore",
                 TestContainer.MS_URL, new MsJdbcConnector(TestContainer.MS_URL), settings, null, getClass());
     }
+
+    @ParameterizedTest
+    @CsvSource({
+            "ms_table_type",
+    })
+    void msJdbcLoaderWithMemomyOptimizedTest(String fileName) throws PgCodekeeperException, IOException, InterruptedException, SQLException, URISyntaxException {
+        var settings = new CoreSettings();
+        settings.setDbType(DatabaseType.MS);
+        jdbcLoaderTest(fileName + "_memory_optimized" + FILES_POSTFIX.SQL, "ms.pgcodekeeperignore",
+                TestContainer.MS_URL_MEMORY_OPTIMIZED, new MsJdbcConnector(TestContainer.MS_URL_MEMORY_OPTIMIZED), settings, null, getClass(), true);
+    }
 }

src/test/java/org/pgcodekeeper/core/loader/TestContainer.java

@@ -31,6 +31,7 @@ public final class TestContainer {
 
     public static final String PG_URL;
     public static final String MS_URL;
+    public static final String MS_URL_MEMORY_OPTIMIZED;
     public static final String CH_URL;
 
     public static final Integer PG_PORT;
@@ -55,7 +56,8 @@ public final class TestContainer {
         CH_PORT = CH_DB.getFirstMappedPort();
 
         PG_URL = "jdbc:postgresql://localhost:" + PG_PORT + "/test" + PG_CH_URL_POSTFIX;
-        MS_URL = "jdbc:sqlserver://localhost:" + MS_PORT + ";databaseName=test_db;user=sa;password=A_Str0ng_Required_Password";
+        MS_URL = buildMsConnectionUrl("test_db");
+        MS_URL_MEMORY_OPTIMIZED = buildMsConnectionUrl("test_db_memory_optimized");
         CH_URL = "jdbc:clickhouse://localhost:" + CH_PORT + "/default" + PG_CH_URL_POSTFIX;
 
         Runtime.getRuntime().addShutdownHook(new Thread(() -> {
@@ -70,6 +72,12 @@ private static String getInitScriptPath(String fileName) {
         return TestContainer.class.getPackage().getName().replace('.', '/') + '/' + fileName;
     }
 
+    private static String buildMsConnectionUrl(String databaseName) {
+        return "jdbc:sqlserver://localhost:" + MS_PORT +
+                ";databaseName=" + databaseName +
+                ";user=sa;password=A_Str0ng_Required_Password";
+    }
+
     private TestContainer() {
     }
 }

src/test/resources/org/pgcodekeeper/core/it/jdbc/ms/ms_table_type.sql

@@ -1,17 +1,3 @@
---CREATE TYPE [dbo].[type1] AS TABLE(
---[c1] [int] NOT NULL,
---[c2] [int] NOT NULL,
---INDEX [q] NONCLUSTERED HASH (
---    [c1]
---) WITH ( BUCKET_COUNT = 2),
---PRIMARY KEY NONCLUSTERED HASH
---(
---    [c2]
---) WITH ( BUCKET_COUNT = 2),
---CHECK ((c1 > 0))
---) WITH (MEMORY_OPTIMIZED = ON)
---GO
-
 CREATE TYPE [dbo].[type2] AS TABLE (
 [col1] [int] NOT NULL,
 UNIQUE CLUSTERED ([col1] DESC))

src/test/resources/org/pgcodekeeper/core/it/jdbc/ms/ms_table_type_memory_optimized.sql

@@ -0,0 +1,11 @@
+CREATE TYPE [dbo].[type1] AS TABLE(
+	[c1] [int] NOT NULL,
+	[c2] [int] NOT NULL,
+	INDEX [q] NONCLUSTERED HASH
+(
+	[c1]
+) WITH ( BUCKET_COUNT = 2),
+	PRIMARY KEY NONCLUSTERED  HASH ([c2]) WITH (BUCKET_COUNT = 2),
+	CHECK  (([c1]>(0)))
+)
+WITH ( MEMORY_OPTIMIZED = ON )

src/test/resources/org/pgcodekeeper/core/loader/init_ms_db.sql

@@ -2,4 +2,17 @@ CREATE DATABASE test_db;
 
 ALTER DATABASE test_db
 SET CHANGE_TRACKING = ON
-(CHANGE_RETENTION = 2 DAYS, AUTO_CLEANUP = ON);
+(CHANGE_RETENTION = 2 DAYS, AUTO_CLEANUP = ON);
+
+CREATE DATABASE test_db_memory_optimized;
+
+ALTER DATABASE test_db_memory_optimized
+ADD FILEGROUP memory_optimized_fg
+CONTAINS MEMORY_OPTIMIZED_DATA;
+
+ALTER DATABASE test_db_memory_optimized
+ADD FILE (
+    NAME = memory_optimized_container,
+    FILENAME = '/var/opt/mssql/data/test_db_mopt'
+)
+TO FILEGROUP memory_optimized_fg;