diff --git a/pom.xml b/pom.xml index c60096e..ada449d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.liquibase.ext liquibase-netezza - 4.2.1-SNAPSHOT + 4.32.0 Liquibase Netezza Database Integration Liquibase extension for Netezza database http://www.liquibase.org @@ -22,7 +22,7 @@ org.liquibase liquibase-core - 4.2.2 + 4.32.0 diff --git a/src/main/java/liquibase/ext/netezza/snapshot/NetezzaResultSetConstraintsExtractor.java b/src/main/java/liquibase/ext/netezza/snapshot/NetezzaResultSetConstraintsExtractor.java index 81aa87c..ecbd1e7 100644 --- a/src/main/java/liquibase/ext/netezza/snapshot/NetezzaResultSetConstraintsExtractor.java +++ b/src/main/java/liquibase/ext/netezza/snapshot/NetezzaResultSetConstraintsExtractor.java @@ -16,9 +16,6 @@ */ package liquibase.ext.netezza.snapshot; -import java.sql.SQLException; -import java.util.List; - import liquibase.CatalogAndSchema; import liquibase.database.AbstractJdbcDatabase; import liquibase.database.Database; @@ -29,6 +26,9 @@ import liquibase.snapshot.NetezzaResultSetCache.SingleResultSetExtractor; import liquibase.structure.core.Schema; +import java.sql.SQLException; +import java.util.List; + public class NetezzaResultSetConstraintsExtractor extends SingleResultSetExtractor { private DatabaseSnapshot databaseSnapshot; @@ -71,7 +71,7 @@ public List fastFetchQuery() throws SQLException, DatabaseException { return executeAndExtract( createSql(((AbstractJdbcDatabase) this.database).getJdbcCatalogName(catalogAndSchema), ((AbstractJdbcDatabase) this.database).getJdbcSchemaName(catalogAndSchema), this.tableName), - this.database, false); + this.database); } @Override diff --git a/src/main/java/liquibase/ext/netezza/snapshot/NetezzaSequenceSnapshotGenerator.java b/src/main/java/liquibase/ext/netezza/snapshot/NetezzaSequenceSnapshotGenerator.java index e402d4a..42debfc 100644 --- a/src/main/java/liquibase/ext/netezza/snapshot/NetezzaSequenceSnapshotGenerator.java +++ b/src/main/java/liquibase/ext/netezza/snapshot/NetezzaSequenceSnapshotGenerator.java @@ -16,15 +16,17 @@ */ package liquibase.ext.netezza.snapshot; -import java.util.Locale; - import liquibase.database.Database; import liquibase.ext.netezza.database.NetezzaDatabase; import liquibase.snapshot.SnapshotGenerator; import liquibase.snapshot.jvm.SequenceSnapshotGenerator; +import liquibase.statement.SqlStatement; +import liquibase.statement.core.RawParameterizedSqlStatement; import liquibase.structure.DatabaseObject; import liquibase.structure.core.Schema; +import java.util.Locale; + public class NetezzaSequenceSnapshotGenerator extends SequenceSnapshotGenerator { @Override @@ -42,18 +44,19 @@ public Class[] replaces() { } @Override - protected String getSelectSequenceSql(Schema schema, Database database) { - if (database instanceof NetezzaDatabase) { - String catalogName = schema.getCatalogName().toUpperCase(Locale.ENGLISH); - return "SELECT\n" + - "S.SEQNAME AS SEQUENCE_NAME, " + - " VT.CYCLE AS WILL_CYCLE, VT.INCREMENT AS INCREMENT_BY, VT.* FROM " + catalogName + ".DEFINITION_SCHEMA._V_SEQUENCE S" + - "\nLEFT JOIN " + catalogName + ".DEFINITION_SCHEMA._VT_SEQUENCE VT " + - "ON S.OBJID = VT.SEQ_ID" + - "\nWHERE s.SCHEMA ='" + schema.getName() + "'"; + protected SqlStatement getSelectSequenceStatement(Schema schema, Database database) { + if (database instanceof NetezzaDatabase) { + String catalogName = schema.getCatalogName().toUpperCase(Locale.ENGLISH); + String sql = "SELECT\n" + + "S.SEQNAME AS SEQUENCE_NAME, " + + " VT.CYCLE AS WILL_CYCLE, VT.INCREMENT AS INCREMENT_BY, VT.* FROM " + catalogName + ".DEFINITION_SCHEMA._V_SEQUENCE S" + + "\nLEFT JOIN " + catalogName + ".DEFINITION_SCHEMA._VT_SEQUENCE VT " + + "ON S.OBJID = VT.SEQ_ID" + + "\nWHERE s.SCHEMA ='" + schema.getName() + "'"; + return new RawParameterizedSqlStatement(sql); + } else { + return super.getSelectSequenceStatement(schema, database); } - - return super.getSelectSequenceSql(schema, database); - } + } } \ No newline at end of file diff --git a/src/main/java/liquibase/snapshot/NetezzaResultSetCache.java b/src/main/java/liquibase/snapshot/NetezzaResultSetCache.java index 00db564..ea4cc2e 100644 --- a/src/main/java/liquibase/snapshot/NetezzaResultSetCache.java +++ b/src/main/java/liquibase/snapshot/NetezzaResultSetCache.java @@ -16,12 +16,12 @@ */ package liquibase.snapshot; -import java.sql.SQLException; -import java.util.List; - import liquibase.database.Database; import liquibase.exception.DatabaseException; +import java.sql.SQLException; +import java.util.List; + public class NetezzaResultSetCache extends ResultSetCache { public static class RowData extends ResultSetCache.RowData { public RowData(String catalog, String schema, Database database, String... parameters) { @@ -42,12 +42,5 @@ protected boolean shouldBulkSelect(String schemaKey, NetezzaResultSetCache resul public List executeAndExtract(String sql, Database database) throws DatabaseException, SQLException { return super.executeAndExtract(sql, database); } - - @Override - public List executeAndExtract(String sql, Database database, boolean informixTrimHint) - throws DatabaseException, SQLException { - return super.executeAndExtract(sql, database, informixTrimHint); - } - } }