Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.liquibase.ext</groupId>
<artifactId>liquibase-netezza</artifactId>
<version>4.2.1-SNAPSHOT</version>
<version>4.32.0</version>
<name>Liquibase Netezza Database Integration</name>
<description>Liquibase extension for Netezza database</description>
<url>http://www.liquibase.org</url>
Expand All @@ -22,7 +22,7 @@
<dependency>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId>
<version>4.2.2</version>
<version>4.32.0</version>
</dependency>
</dependencies>
<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -71,7 +71,7 @@ public List<CachedRow> 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -42,18 +44,19 @@ public Class<? extends SnapshotGenerator>[] 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);
}

}
}
13 changes: 3 additions & 10 deletions src/main/java/liquibase/snapshot/NetezzaResultSetCache.java
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -42,12 +42,5 @@ protected boolean shouldBulkSelect(String schemaKey, NetezzaResultSetCache resul
public List<CachedRow> executeAndExtract(String sql, Database database) throws DatabaseException, SQLException {
return super.executeAndExtract(sql, database);
}

@Override
public List<CachedRow> executeAndExtract(String sql, Database database, boolean informixTrimHint)
throws DatabaseException, SQLException {
return super.executeAndExtract(sql, database, informixTrimHint);
}

}
}