Skip to content

Commit

Permalink
Use more parameter markers for DB2z catalogue queries (#4387)
Browse files Browse the repository at this point in the history 
* more PreparedStatements for DB2z

* paramater counting for PreparedStatement.setXYZ(...) starts with 1

* SQL syntax corrected

* removed duplicate section for DB2z

* Use the correct parameter

* Fix tests.

---------

Co-authored-by: michaelmatthiaskern <michael.kern@mail.de>
Co-authored-by: filipe <flautert@liquibase.org>
  • Loading branch information
@MichaelKern-IVV @michaelmatthiaskern @filipelautert
3 people committed Aug 23, 2023
1 parent c2e78de commit 9cc6c8e
Show file tree
Hide file tree
Showing 5 changed files with 96 additions and 70 deletions.
10 changes: 6 additions & 4 deletions ...se-snowflake/src/main/java/liquibase/snapshot/jvm/SequenceSnapshotGeneratorSnowflake.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import liquibase.database.Database;
import liquibase.database.core.SnowflakeDatabase;
import liquibase.snapshot.SnapshotGenerator;
import liquibase.statement.SqlStatement;
import liquibase.statement.core.RawSqlStatement;
import liquibase.structure.DatabaseObject;
import liquibase.structure.core.Column;
import liquibase.structure.core.Schema;
Expand All @@ -24,14 +26,14 @@ public Class<? extends SnapshotGenerator>[] replaces() {
}

@Override
protected String getSelectSequenceSql(Schema schema, Database database) {
protected SqlStatement getSelectSequenceStatement(Schema schema, Database database) {
if (database instanceof SnowflakeDatabase) {
return "SELECT SEQUENCE_NAME, START_VALUE, MINIMUM_VALUE AS MIN_VALUE, MAXIMUM_VALUE AS MAX_VALUE, " +
return new RawSqlStatement("SELECT SEQUENCE_NAME, START_VALUE, MINIMUM_VALUE AS MIN_VALUE, MAXIMUM_VALUE AS MAX_VALUE, " +
database.escapeObjectName("INCREMENT", Column.class) + " AS INCREMENT_BY, " +
"CYCLE_OPTION AS WILL_CYCLE FROM information_schema.sequences " +
"WHERE SEQUENCE_CATALOG='" + database.getDefaultCatalogName() + "' AND " +
"SEQUENCE_SCHEMA='" + database.getDefaultSchemaName() + "'";
"SEQUENCE_SCHEMA='" + database.getDefaultSchemaName() + "'");
}
return super.getSelectSequenceSql(schema, database);
return super.getSelectSequenceStatement(schema, database);
}
}
4 changes: 2 additions & 2 deletions liquibase-standard/src/main/java/liquibase/executor/jvm/JdbcExecutor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,9 @@ public Object query(final SqlStatement sql, final ResultSetExtractor rse, final
String finalSql = applyVisitors((RawParameterizedSqlStatement) sql, sqlVisitors);

try (PreparedStatement pstmt = factory.create(finalSql)) {
final List<?> parameters = ((RawParameterizedSqlStatement) sql).getParameters();
final List<Object> parameters = ((RawParameterizedSqlStatement) sql).getParameters();
for (int i = 0; i < parameters.size(); i++) {
pstmt.setObject(i, parameters.get(0));
pstmt.setObject(i+1, parameters.get(i));
}
return rse.extractData(pstmt.executeQuery());
} catch (SQLException e) {
Expand Down
62 changes: 32 additions & 30 deletions liquibase-standard/src/main/java/liquibase/snapshot/jvm/SequenceSnapshotGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import liquibase.snapshot.DatabaseSnapshot;
import liquibase.snapshot.InvalidExampleException;
import liquibase.snapshot.SnapshotIdService;
import liquibase.statement.SqlStatement;
import liquibase.statement.core.RawParameterizedSqlStatement;
import liquibase.statement.core.RawSqlStatement;
import liquibase.structure.DatabaseObject;
import liquibase.structure.core.Schema;
Expand Down Expand Up @@ -52,7 +54,7 @@ protected void addTo(DatabaseObject foundObject, DatabaseSnapshot snapshot) thro
Database database = snapshot.getDatabase();

//noinspection unchecked
List<Map<String, ?>> sequences = Scope.getCurrentScope().getSingleton(ExecutorService.class).getExecutor("jdbc", database).queryForList(new RawSqlStatement(getSelectSequenceSql(schema, database)));
List<Map<String, ?>> sequences = Scope.getCurrentScope().getSingleton(ExecutorService.class).getExecutor("jdbc", database).queryForList(getSelectSequenceStatement(schema, database));

if (sequences != null) {
for (Map<String, ?> sequence : sequences) {
Expand All @@ -71,7 +73,7 @@ protected DatabaseObject snapshotObject(DatabaseObject example, DatabaseSnapshot
if (database instanceof Db2zDatabase) {
sequences = Scope.getCurrentScope().getSingleton(ExecutorService.class)
.getExecutor("jdbc", database)
.queryForList(new RawSqlStatement(getSelectSequenceSql(example.getSchema(), database)));
.queryForList(getSelectSequenceStatement(example.getSchema(), database));
return getSequences(example, database, sequences);
} else {
if (example.getAttribute("liquibase-complete", false)) { //need to go through "snapshotting" the object even if it was previously populated in addTo. Use the "liquibase-complete" attribute to track that it doesn't need to be fully snapshotted
Expand All @@ -86,7 +88,7 @@ protected DatabaseObject snapshotObject(DatabaseObject example, DatabaseSnapshot

sequences = Scope.getCurrentScope().getSingleton(ExecutorService.class)
.getExecutor("jdbc", database)
.queryForList(new RawSqlStatement(getSelectSequenceSql(example.getSchema(), database)));
.queryForList(getSelectSequenceStatement(example.getSchema(), database));
return getSequences(example, database, sequences);
}
}
Expand Down Expand Up @@ -156,46 +158,46 @@ protected BigInteger toBigInteger(Object value, Database database) {
return new BigInteger(value.toString());
}

protected String getSelectSequenceSql(Schema schema, Database database) {
protected SqlStatement getSelectSequenceStatement (Schema schema, Database database) {
if (database instanceof DB2Database) {
if (database.getDatabaseProductName().startsWith("DB2 UDB for AS/400")) {
return "SELECT SEQNAME AS SEQUENCE_NAME FROM QSYS2.SYSSEQUENCES WHERE SEQSCHEMA = '" + schema.getCatalogName() + "'";
return new RawSqlStatement("SELECT SEQNAME AS SEQUENCE_NAME FROM QSYS2.SYSSEQUENCES WHERE SEQSCHEMA = '" + schema.getCatalogName() + "'");
}
return "SELECT SEQNAME AS SEQUENCE_NAME FROM SYSCAT.SEQUENCES WHERE SEQTYPE='S' AND SEQSCHEMA = '" + schema.getCatalogName() + "'";
return new RawSqlStatement("SELECT SEQNAME AS SEQUENCE_NAME FROM SYSCAT.SEQUENCES WHERE SEQTYPE='S' AND SEQSCHEMA = '" + schema.getCatalogName() + "'");
} else if (database instanceof Db2zDatabase) {
return "SELECT NAME AS SEQUENCE_NAME, " +
return new RawParameterizedSqlStatement ("SELECT NAME AS SEQUENCE_NAME, " +
"START AS START_VALUE, " +
"MINVALUE AS MIN_VALUE, " +
"MAXVALUE AS MAX_VALUE, " +
"CACHE AS CACHE_SIZE, " +
"INCREMENT AS INCREMENT_BY, " +
"CYCLE AS WILL_CYCLE, " +
"ORDER AS IS_ORDERED " +
"FROM SYSIBM.SYSSEQUENCES WHERE SEQTYPE = 'S' AND SCHEMA = '" + schema.getCatalogName() + "'";
"FROM SYSIBM.SYSSEQUENCES WHERE SEQTYPE = 'S' AND SCHEMA = ?", schema.getCatalogName());
} else if (database instanceof DerbyDatabase) {
return "SELECT " +
return new RawSqlStatement("SELECT " +
" seq.SEQUENCENAME AS SEQUENCE_NAME " +
"FROM " +
" SYS.SYSSEQUENCES seq, " +
" SYS.SYSSCHEMAS sch " +
"WHERE " +
" sch.SCHEMANAME = '" + new CatalogAndSchema(null, schema.getName()).customize(database).getSchemaName() + "' AND " +
" sch.SCHEMAID = seq.SCHEMAID";
" sch.SCHEMAID = seq.SCHEMAID");
} else if (database instanceof FirebirdDatabase) {
return "SELECT TRIM(RDB$GENERATOR_NAME) AS SEQUENCE_NAME FROM RDB$GENERATORS WHERE RDB$SYSTEM_FLAG IS NULL OR RDB$SYSTEM_FLAG = 0";
return new RawSqlStatement("SELECT TRIM(RDB$GENERATOR_NAME) AS SEQUENCE_NAME FROM RDB$GENERATORS WHERE RDB$SYSTEM_FLAG IS NULL OR RDB$SYSTEM_FLAG = 0");
} else if (database instanceof H2Database) {
try {
if (database.getDatabaseMajorVersion() <= 1) {
return "SELECT SEQUENCE_NAME FROM INFORMATION_SCHEMA.SEQUENCES WHERE SEQUENCE_SCHEMA = '" + schema.getName() + "' AND IS_GENERATED=FALSE";
return new RawSqlStatement("SELECT SEQUENCE_NAME FROM INFORMATION_SCHEMA.SEQUENCES WHERE SEQUENCE_SCHEMA = '" + schema.getName() + "' AND IS_GENERATED=FALSE");
}
} catch (DatabaseException e) {
Scope.getCurrentScope().getLog(getClass()).fine("Cannot determine h2 version in order to generate sequence snapshot query");
}
return "SELECT SEQUENCE_NAME FROM INFORMATION_SCHEMA.SEQUENCES WHERE SEQUENCE_SCHEMA = '" + schema.getName() + "'";
return new RawSqlStatement("SELECT SEQUENCE_NAME FROM INFORMATION_SCHEMA.SEQUENCES WHERE SEQUENCE_SCHEMA = '" + schema.getName() + "'");
} else if (database instanceof HsqlDatabase) {
return "SELECT SEQUENCE_NAME FROM INFORMATION_SCHEMA.SYSTEM_SEQUENCES WHERE SEQUENCE_SCHEMA = '" + schema.getName() + "'";
return new RawSqlStatement("SELECT SEQUENCE_NAME FROM INFORMATION_SCHEMA.SYSTEM_SEQUENCES WHERE SEQUENCE_SCHEMA = '" + schema.getName() + "'");
} else if (database instanceof InformixDatabase) {
return "SELECT tabname AS SEQUENCE_NAME FROM systables t, syssequences s WHERE s.tabid = t.tabid AND t.owner = '" + schema.getName() + "'";
return new RawSqlStatement("SELECT tabname AS SEQUENCE_NAME FROM systables t, syssequences s WHERE s.tabid = t.tabid AND t.owner = '" + schema.getName() + "'");
} else if (database instanceof OracleDatabase) {
/*
* Return an SQL statement that only returns the non-default values so the output changeLog is cleaner
Expand All @@ -209,7 +211,7 @@ protected String getSelectSequenceSql(Schema schema, Database database) {
if (catalogName == null || catalogName.isEmpty()) {
catalogName = database.getDefaultCatalogName();
}
return "SELECT sequence_name, \n" +
return new RawSqlStatement("SELECT sequence_name, \n" +
"CASE WHEN increment_by > 0 \n" +
" THEN CASE WHEN min_value=1 THEN NULL ELSE min_value END\n" +
" ELSE CASE WHEN min_value=(-999999999999999999999999999) THEN NULL else min_value END\n" +
Expand All @@ -223,7 +225,7 @@ protected String getSelectSequenceSql(Schema schema, Database database) {
"CASE WHEN order_flag = 'N' THEN NULL ELSE order_flag END AS is_ordered, \n" +
"LAST_NUMBER as START_VALUE, \n" +
"CASE WHEN cache_size = 20 THEN NULL ELSE cache_size END AS cache_size \n" +
"FROM ALL_SEQUENCES WHERE SEQUENCE_OWNER = '" + catalogName + "'";
"FROM ALL_SEQUENCES WHERE SEQUENCE_OWNER = '" + catalogName + "'");
} else if (database instanceof PostgresDatabase) {
int version = 9;
try {
Expand All @@ -237,24 +239,24 @@ protected String getSelectSequenceSql(Schema schema, Database database) {
}
String pgSequenceQuery = COMMON_PG_SEQUENCE_QUERY.replace("SCHEMA_NAME", schemaName);
if (version < 10) { // 'pg_sequence' view does not exists yet
return "SELECT c.relname AS \"SEQUENCE_NAME\" FROM pg_class c " + pgSequenceQuery;
return new RawSqlStatement("SELECT c.relname AS \"SEQUENCE_NAME\" FROM pg_class c " + pgSequenceQuery);
} else {
return "SELECT c.relname AS \"SEQUENCE_NAME\", " +
return new RawSqlStatement("SELECT c.relname AS \"SEQUENCE_NAME\", " +
" s.seqmin AS \"MIN_VALUE\", s.seqmax AS \"MAX_VALUE\", s.seqincrement AS \"INCREMENT_BY\", " +
" s.seqcycle AS \"WILL_CYCLE\", s.seqstart AS \"START_VALUE\", s.seqcache AS \"CACHE_SIZE\", " +
" pg_catalog.format_type(s.seqtypid, NULL) AS \"SEQ_TYPE\" " +
"FROM pg_class c " +
"JOIN pg_sequence s on c.oid = s.seqrelid " +
pgSequenceQuery;
pgSequenceQuery);
}
} else if (database instanceof MSSQLDatabase) {
return "SELECT SEQUENCE_NAME, " +
return new RawSqlStatement("SELECT SEQUENCE_NAME, " +
"cast(START_VALUE AS BIGINT) AS START_VALUE, " +
"cast(MINIMUM_VALUE AS BIGINT) AS MIN_VALUE, " +
"cast(MAXIMUM_VALUE AS BIGINT) AS MAX_VALUE, " +
"CAST(INCREMENT AS BIGINT) AS INCREMENT_BY, " +
"CYCLE_OPTION AS WILL_CYCLE " +
"FROM INFORMATION_SCHEMA.SEQUENCES WHERE SEQUENCE_SCHEMA = '" + schema.getName() + "'";
"FROM INFORMATION_SCHEMA.SEQUENCES WHERE SEQUENCE_SCHEMA = '" + schema.getName() + "'");
} else if (database instanceof MariaDBDatabase) {
StringJoiner j = new StringJoiner(" \n UNION\n");
try {
Expand All @@ -265,7 +267,7 @@ protected String getSelectSequenceSql(Schema schema, Database database) {
"where TABLE_SCHEMA = '" + schema.getName() +"' " +
"and TABLE_TYPE = 'SEQUENCE' order by table_name;"));
if (res.size() == 0) {
return "SELECT 'name' AS SEQUENCE_NAME from dual WHERE 1=0";
return new RawSqlStatement("SELECT 'name' AS SEQUENCE_NAME from dual WHERE 1=0");
}
for (Map<String, ?> e : res) {
String seqName = (String) e.get("SEQUENCE_NAME");
Expand All @@ -280,22 +282,22 @@ protected String getSelectSequenceSql(Schema schema, Database database) {
} catch (DatabaseException e) {
throw new UnexpectedLiquibaseException("Could not get list of schemas ", e);
}
return j.toString();
return new RawSqlStatement(j.toString());
} else if (database instanceof SybaseASADatabase) {
return "SELECT SEQUENCE_NAME, " +
return new RawSqlStatement("SELECT SEQUENCE_NAME, " +
"START_WITH AS START_VALUE, " +
"MIN_VALUE, " +
"MAX_VALUE, " +
"INCREMENT_BY, " +
"CYCLE AS WILL_CYCLE " +
"FROM SYS.SYSSEQUENCE s " +
"JOIN SYS.SYSUSER u ON s.OWNER = u.USER_ID "+
"WHERE u.USER_NAME = '" + schema.getName() + "'";
"WHERE u.USER_NAME = '" + schema.getName() + "'");
} else if (database.getClass().getName().contains("MaxDB")) { //have to check classname as this is currently an extension
return "SELECT SEQUENCE_NAME, MIN_VALUE, MAX_VALUE, INCREMENT_BY, CYCLE_FLAG AS WILL_CYCLE " +
"FROM sequences WHERE SCHEMANAME = '" + schema.getName() + "'";
} else {
return new RawSqlStatement("SELECT SEQUENCE_NAME, MIN_VALUE, MAX_VALUE, INCREMENT_BY, CYCLE_FLAG AS WILL_CYCLE " +
"FROM sequences WHERE SCHEMANAME = '" + schema.getName() + "'");
} else {
throw new UnexpectedLiquibaseException("Don't know how to query for sequences on " + database);
}
}
}
}

0 comments on commit 9cc6c8e

Please sign in to comment.