merged 4.0beta into main

liquibase · Jul 16, 2020 · 2713143 · 2713143
2 parents e107a40 + 48e6ec8
commit 2713143
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>org.liquibase.ext</groupId>
 	<artifactId>liquibase-db2i</artifactId>
-	<version>3.10.1-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 
 	<name>Liquibase Extension: IBM DB2 for iSeries Support</name>
 	<description>Adds support for IBM DB2 for iSeries</description>
@@ -51,7 +51,7 @@
 		<dependency>
 			<groupId>org.liquibase</groupId>
 			<artifactId>liquibase-core</artifactId>
-			<version>3.10.1</version>
+			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
@@ -73,8 +73,8 @@
 				<plugin>
 					<artifactId>maven-compiler-plugin</artifactId>
 					<configuration>
-						<source>1.6</source>
-						<target>1.6</target>
+						<source>1.8</source>
+						<target>1.8</target>
 						<optimize>true</optimize>
 						<debug>true</debug>
 						<encoding>${project.build.sourceEncoding}</encoding>

diff --git a/src/main/java/liquibase/ext/db2i/sqlgenerator/InsertSetGeneratorDB2i.java b/src/main/java/liquibase/ext/db2i/sqlgenerator/InsertSetGeneratorDB2i.java
@@ -41,7 +41,7 @@ public Sql[] generateSql(InsertSetStatement statement, Database database, SqlGen
         if (statement.peek() == null) {
             return new UnparsedSql[0];
         }
-        StringBuffer sql = new StringBuffer();
+        StringBuilder sql = new StringBuilder();
         generateHeader(sql, statement, database);
 
         ArrayList<Sql> result = new ArrayList<Sql>();
@@ -54,7 +54,7 @@ public Sql[] generateSql(InsertSetStatement statement, Database database, SqlGen
                 result.add(completeStatement(statement, sql));
 
                 index = 0;
-                sql = new StringBuffer();
+                sql = new StringBuilder();
                 generateHeader(sql, statement, database);
             }
         }
@@ -65,7 +65,7 @@ public Sql[] generateSql(InsertSetStatement statement, Database database, SqlGen
         return result.toArray(new UnparsedSql[result.size()]);
     }
 
-    private Sql completeStatement(InsertSetStatement statement, StringBuffer sql) {
+    private Sql completeStatement(InsertSetStatement statement, StringBuilder sql) {
         sql.deleteCharAt(sql.lastIndexOf(","));
         return new UnparsedSql(sql.toString(), getAffectedTable(statement));
     }

diff --git a/src/main/resources/META-INF/services/liquibase.database.Database b/src/main/resources/META-INF/services/liquibase.database.Database
@@ -0,0 +1 @@
+liquibase.ext.db2i.database.DB2iDatabase
diff --git a/src/main/resources/META-INF/services/liquibase.sqlgenerator.SqlGenerator b/src/main/resources/META-INF/services/liquibase.sqlgenerator.SqlGenerator
@@ -0,0 +1,5 @@
+liquibase.ext.db2i.sqlgenerator.InsertOrUpdateGeneratorDB2i
+liquibase.ext.db2i.sqlgenerator.InsertSetGeneratorDB2i
+liquibase.ext.db2i.sqlgenerator.SetColumnRemarksGeneratorDB2i
+liquibase.ext.db2i.sqlgenerator.SetNullableGeneratorDB2i
+liquibase.ext.db2i.sqlgenerator.SetTableRemarksGeneratorDB2i