Merge pull request #3621 from FOCONIS/new-db-versions

New db versions + testcontainers 7.8

Author: rbygrave

.github/workflows/mariadb.yml

@@ -34,5 +34,5 @@ jobs:
         path:
           ~/.m2
         key: build-${{ env.cache-name }}
-    - name: mariadb 10.6
+    - name: mariadb 10.11
       run: mvn -T 8 clean test -Dprops.file=testconfig/ebean-mariadb.properties

.github/workflows/sqlserver.yml

@@ -34,5 +34,5 @@ jobs:
         path:
           ~/.m2
         key: build-${{ env.cache-name }}
-    - name: sqlserver 2017
-      run: mvn -T 8 clean test -Dprops.file=testconfig/ebean-sqlserver17.properties
+    - name: sqlserver 2022
+      run: mvn -T 8 clean test -Dprops.file=testconfig/ebean-sqlserver.properties

ebean-test/pom.xml

@@ -264,7 +264,7 @@
     <dependency>
       <groupId>com.ibm.db2</groupId>
       <artifactId>jcc</artifactId>
-      <version>11.5.6.0</version>
+      <version>12.1.0.0</version>
       <scope>test</scope>
     </dependency>
 

ebean-test/src/main/java/io/ebean/test/config/platform/Db2Setup.java

@@ -24,7 +24,7 @@ private Properties dockerProperties(Config dbConfig) {
       return new Properties();
     }
 
-    dbConfig.setDockerVersion("11.5.6.0a");
+    dbConfig.setDockerVersion("11.5.9.0");
     return dbConfig.getDockerProperties();
   }
 

ebean-test/src/test/java/main/StartDb2.java

@@ -5,12 +5,12 @@
 public class StartDb2 {
 
   public static void main(String[] args) {
-    Db2Container.builder("11.5.6.0a")
+    Db2Container.builder("11.5.9.0")
       .dbName("unit")
       .user("unit")
       .password("unit")
       // to change collation, charset and other parameters like pagesize:
-      .configOptions("USING CODESET UTF-8 TERRITORY DE COLLATE USING IDENTITY PAGESIZE 32768")
+      .createOptions("USING CODESET UTF-8 TERRITORY DE COLLATE USING IDENTITY PAGESIZE 32768")
       .configOptions("USING STRING_UNITS CODEUNITS32")
       .build()
       .startWithDropCreate();

ebean-test/src/test/resources/ebean.properties

@@ -141,7 +141,7 @@ datasource.mysql.url=jdbc:mysql://127.0.0.1:4306/test_ebean
 
 datasource.mariadb.username=unit
 datasource.mariadb.password=test
-datasource.mariadb.url=jdbc:mariadb://localhost:14307/unit?useLegacyDatetimeCode=false
+datasource.mariadb.url=jdbc:mariadb://localhost:14309/unit?useLegacyDatetimeCode=false
 
 datasource.cockroach.username=root
 datasource.cockroach.password=

ebean-test/testconfig/ebean-db2-11.5.properties

@@ -0,0 +1,14 @@
+ebean.test.platform=db2
+ebean.test.dbName=unit
+# we need admin user to call the procedure SYSPROC.ADMIN_MOVE_TABLE
+ebean.test.username=admin
+ebean.test.password=admin
+datasource.default=db2
+ebean.db2.databasePlatformName=db2luw
+ebean.lengthCheck=utf8
+
+ebean.test.db2.version=11.5.9.0
+ebean.test.db2.containerName=ut_db2-11-5-9
+ebean.test.db2.port=50055
+
+datasource.db2.url=jdbc:db2://localhost:50055/unit

ebean-test/testconfig/ebean-db2.properties

@@ -6,3 +6,6 @@ ebean.test.password=admin
 datasource.default=db2
 ebean.db2.databasePlatformName=db2luw
 ebean.lengthCheck=utf8
+
+ebean.test.db2.version=12.1.1.0
+ebean.test.db2.containerName=ut_db2-12-1-1

ebean-test/testconfig/ebean-mariadb-10.6.properties

@@ -0,0 +1,7 @@
+ebean.test.platform=mariadb
+ebean.test.dbName=unit
+ebean.test.mariadb.version=10.6
+ebean.test.mariadb.containerName=ut_mariadb-10-6
+ebean.test.mariadb.port=14307
+datasource.default=mariadb-106
+ebean.lengthCheck=on

ebean-test/testconfig/ebean-mariadb.properties

@@ -1,7 +1,8 @@
 ebean.test.platform=mariadb
 ebean.test.dbName=unit
-ebean.test.mariadb.version=10.6
-ebean.test.mariadb.containerName=ut_mariadb-10-6
-ebean.test.mariadb.port=14307
+ebean.test.mariadb.version=10.11
+ebean.test.mariadb.containerName=ut_mariadb-10-11
+ebean.test.mariadb.port=14309
 datasource.default=mariadb
 ebean.lengthCheck=on
+