Merge branch '3.1.x'

Conflicts: liquibase-cdi/pom.xml liquibase-core/pom.xml liquibase-debian/pom.xml liquibase-integration-tests/pom.xml liquibase-maven-plugin/pom.xml liquibase-osgi/pom.xml pom.xml
jfhjfh · Jan 16, 2014 · a047a77 · a047a77
2 parents 39c3ff2 + 4b20c12
commit a047a77
Show file tree

Hide file tree

Showing 23 changed files with 103 additions and 22 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,6 +1,17 @@
 Liquibase Core Changelog
 ===========================================
 
+Changes in version 3.1.1 (2014.01.16)
+Bug Fix release. Most critical bug is CORE-1704
+
+- [CORE-1704] - Checksum errors for changeSets with createProcedure in 3.1.0 vs 3.0.x
+- [CORE-1707] - TableRowCountGenerator shouldn't pass tableName as catalogName
+- [CORE-1710] - Oracle: NUMBER data type size specification is deployed with a precision specifier even though precision isn't specified in the change log
+- [CORE-1711] - rowCount doesn't work if only the tableName is given
+- [CORE-1713] - liquibase.precondition.core.ForeignKeyExistsPrecondition exception
+- [CORE-1715] - Errors if there are single quotes in comments
+- [CORE-1709] - generateChangeLog returns tables created by Materialized Views as standard tables
+
 Changes in version 3.1.0 (2014.01.09)
 - Major Changes:
      Offline Datatabase Support

diff --git a/liquibase-core/src/main/java/liquibase/change/core/CreateProcedureChange.java b/liquibase-core/src/main/java/liquibase/change/core/CreateProcedureChange.java
@@ -88,6 +88,21 @@ public void setRelativeToChangelogFile(Boolean relativeToChangelogFile) {
             "    BEGIN\n" +
             "      DBMS_OUTPUT.PUT_LINE('Hello From The Database!');\n" +
             "    END;")
+    /**
+     * @deprecated Use getProcedureText() instead
+     */
+    public String getProcedureBody() {
+        return procedureText;
+    }
+
+    /**
+     * @deprecated Use setProcedureText() instead
+     */
+    public void setProcedureBody(String procedureText) {
+        this.procedureText = procedureText;
+    }
+
+    @DatabaseChangeProperty(isChangeProperty = false)
     public String getProcedureText() {
         return procedureText;
     }
@@ -96,7 +111,7 @@ public void setProcedureText(String procedureText) {
         this.procedureText = procedureText;
     }
 
-	@DatabaseChangeProperty(since = "3.1", exampleValue = "h2, oracle")
+    @DatabaseChangeProperty(since = "3.1", exampleValue = "h2, oracle")
 	public String getDbms() {
 		return dbms;
 	}
@@ -146,6 +161,10 @@ public InputStream openSqlStream() throws IOException {
      */
     @Override
     public CheckSum generateCheckSum() {
+        if (this.path == null) {
+            return super.generateCheckSum();
+        }
+
         InputStream stream = null;
         try {
             stream = openSqlStream();
@@ -183,7 +202,11 @@ public SqlStatement[] generateStatements(Database database) {
             procedureText = StringUtils.trimToNull(getProcedureText());
         } else {
             try {
-                procedureText = StreamUtil.getStreamContents(openSqlStream(), encoding);
+                InputStream stream = openSqlStream();
+                if (stream == null) {
+                    throw new IOException("File does not exist: "+path);
+                }
+                procedureText = StreamUtil.getStreamContents(stream, encoding);
             } catch (IOException e) {
                 throw new UnexpectedLiquibaseException(e);
             }

diff --git a/liquibase-core/src/main/java/liquibase/precondition/core/RowCountPrecondition.java b/liquibase-core/src/main/java/liquibase/precondition/core/RowCountPrecondition.java
@@ -71,7 +71,7 @@ public void check(Database database, DatabaseChangeLog changeLog, ChangeSet chan
             TableRowCountStatement statement = new TableRowCountStatement(catalogName, schemaName, tableName);
 
             int result = ExecutorService.getInstance().getExecutor(database).queryForInt(statement);
-            if (result == expectedRows) {
+            if (result != expectedRows) {
                 throw new PreconditionFailedException(getFailureMessage(result), changeLog, this);
             }
 

diff --git a/liquibase-core/src/main/java/liquibase/snapshot/JdbcDatabaseSnapshot.java b/liquibase-core/src/main/java/liquibase/snapshot/JdbcDatabaseSnapshot.java
@@ -6,6 +6,7 @@
 import liquibase.database.core.*;
 import liquibase.database.jvm.JdbcConnection;
 import liquibase.exception.DatabaseException;
+import liquibase.exception.UnexpectedLiquibaseException;
 import liquibase.logging.LogFactory;
 import liquibase.structure.DatabaseObject;
 import liquibase.structure.core.*;
@@ -273,21 +274,58 @@ public ResultSetCache.RowData wantedKeyParameters() {
 
 
                 @Override
-				public List<CachedRow> fastFetchQuery() throws SQLException {
+				public List<CachedRow> fastFetchQuery() throws SQLException, DatabaseException {
                     CatalogAndSchema catalogAndSchema = database.correctSchema(new CatalogAndSchema(catalogName, schemaName));
 
+                    if (database instanceof OracleDatabase) {
+                        return queryOracle(catalogAndSchema, null);
+                    }
+
                     String catalog = ((AbstractJdbcDatabase) database).getJdbcCatalogName(catalogAndSchema);
                     String schema = ((AbstractJdbcDatabase) database).getJdbcSchemaName(catalogAndSchema);
                     return extract(databaseMetaData.getTables(catalog, schema, database.correctObjectName(table, Table.class), types));
                 }
 
 
                 @Override
-				public List<CachedRow> bulkFetchQuery() throws SQLException {
+				public List<CachedRow> bulkFetchQuery() throws SQLException, DatabaseException {
                     CatalogAndSchema catalogAndSchema = database.correctSchema(new CatalogAndSchema(catalogName, schemaName));
 
+                    if (database instanceof OracleDatabase) {
+                        return queryOracle(catalogAndSchema, null);
+                    }
+
                     return extract(databaseMetaData.getTables(((AbstractJdbcDatabase) database).getJdbcCatalogName(catalogAndSchema), ((AbstractJdbcDatabase) database).getJdbcSchemaName(catalogAndSchema), null, types));
                 }
+
+                private List<CachedRow> queryOracle(CatalogAndSchema catalogAndSchema, String tableName) throws DatabaseException, SQLException {
+                    List<CachedRow> results = new ArrayList<CachedRow>();
+                    for (String type : types) {
+                        String allTable;
+                        String nameColumn;
+                        if (type.equalsIgnoreCase("table")) {
+                            allTable = "ALL_TABLES";
+                            nameColumn = "TABLE_NAME";
+                        } else if (type.equalsIgnoreCase("view")) {
+                            allTable = "ALL_VIEWS";
+                            nameColumn = "VIEW_NAME";
+                        } else {
+                            throw new UnexpectedLiquibaseException("Unknown table type: "+type);
+                        }
+
+                        String ownerName = database.correctObjectName(catalogAndSchema.getCatalogName(), Schema.class);
+                        String sql = "SELECT null as TABLE_CAT, a.OWNER as TABLE_SCHEM, a."+nameColumn+" as TABLE_NAME, 'TABLE' as TABLE_TYPE,  c.COMMENTS as REMARKS " +
+                            "from "+allTable+" a " +
+                            "join ALL_TAB_COMMENTS c on a."+nameColumn+"=c.table_name and a.owner=c.owner " +
+                            "WHERE a.OWNER='" + ownerName + "'";
+                        if (tableName != null) {
+                            sql += " AND "+nameColumn+"='" + database.correctObjectName(tableName, Table.class) + "'";
+                        }
+                        sql += " AND a."+nameColumn+" not in (select mv.name from all_registered_mviews mv where mv.owner='"+ownerName+"')";
+                        results.addAll(executeAndExtract(sql, database));
+                    }
+                    return results;
+                }
             });
         }
 

diff --git a/liquibase-core/src/main/java/liquibase/snapshot/jvm/ColumnSnapshotGenerator.java b/liquibase-core/src/main/java/liquibase/snapshot/jvm/ColumnSnapshotGenerator.java
@@ -191,6 +191,9 @@ protected DataType readDataType(CachedRow columnMetadataResultSet, Column column
                     type.setColumnSize(38);
                 }
                 type.setDecimalDigits(columnMetadataResultSet.getInt("DATA_SCALE"));
+                if (type.getDecimalDigits() == null) {
+                    type.setDecimalDigits(0);
+                }
 //            type.setRadix(10);
             } else {
                 type.setColumnSize(columnMetadataResultSet.getInt("DATA_LENGTH"));

diff --git a/liquibase-core/src/main/java/liquibase/sqlgenerator/core/MarkChangeSetRanGenerator.java b/liquibase-core/src/main/java/liquibase/sqlgenerator/core/MarkChangeSetRanGenerator.java
@@ -57,7 +57,7 @@ public Sql[] generateSql(MarkChangeSetRanStatement statement, Database database,
                         .addColumnValue("ORDEREXECUTED", ChangeLogHistoryServiceFactory.getInstance().getChangeLogService(database).getNextSequenceValue())
                         .addColumnValue("MD5SUM", changeSet.generateCheckSum().toString())
                         .addColumnValue("DESCRIPTION", limitSize(changeSet.getDescription()))
-                        .addColumnValue("COMMENTS", limitSize(StringUtils.trimToEmpty(changeSet.getComments())))
+                        .addColumnValue("COMMENTS", limitSize(database.escapeStringForDatabase(StringUtils.trimToEmpty(changeSet.getComments()))))
                         .addColumnValue("EXECTYPE", statement.getExecType().value)
                         .addColumnValue("LIQUIBASE", LiquibaseUtil.getBuildVersion().replaceAll("SNAPSHOT", "SNP"));
 

diff --git a/liquibase-core/src/main/java/liquibase/sqlgenerator/core/TableRowCountGenerator.java b/liquibase-core/src/main/java/liquibase/sqlgenerator/core/TableRowCountGenerator.java
@@ -27,7 +27,7 @@ public ValidationErrors validate(TableRowCountStatement dropColumnStatement, Dat
     }
 
     protected String generateCountSql(TableRowCountStatement statement, Database database) {
-        return "SELECT COUNT(*) FROM "+database.escapeTableName(statement.getTableName(), statement.getSchemaName(), statement.getTableName());
+        return "SELECT COUNT(*) FROM "+database.escapeTableName(statement.getCatalogName(), statement.getSchemaName(), statement.getTableName());
     }
 
     @Override

diff --git a/liquibase-core/src/main/java/liquibase/structure/core/Table.java b/liquibase-core/src/main/java/liquibase/structure/core/Table.java
@@ -1,5 +1,7 @@
 package liquibase.structure.core;
 
+import liquibase.util.StringUtils;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -47,7 +49,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return getName().toUpperCase().hashCode();
+        return StringUtils.trimToEmpty(getName()).toUpperCase().hashCode();
     }
 
     @Override

diff --git a/liquibase-core/src/main/java/liquibase/util/StreamUtil.java b/liquibase-core/src/main/java/liquibase/util/StreamUtil.java
@@ -43,6 +43,10 @@ public static String getStreamContents(InputStream ins, String charsetName)
 			throws IOException {
 		UtfBomAwareReader reader;
 
+        if (ins  == null) {
+            throw new IOException("No stream to open");
+        }
+
 		if (charsetName == null) {
 			reader = new UtfBomAwareReader(ins);
 		} else {

diff --git a/...est/java/liquibase/verify/saved_state/minimumRequiredIsValidSql/createProcedure/asany.sql b/...est/java/liquibase/verify/saved_state/minimumRequiredIsValidSql/createProcedure/asany.sql
@@ -1,5 +1,5 @@
 -- Database: asany
--- Change Parameter: procedureText=CREATE OR REPLACE PROCEDURE testHello
+-- Change Parameter: procedureBody=CREATE OR REPLACE PROCEDURE testHello
 --     IS
 --     BEGIN
 --       DBMS_OUTPUT.PUT_LINE('Hello From The Database!');

diff --git a/.../test/java/liquibase/verify/saved_state/minimumRequiredIsValidSql/createProcedure/db2.sql b/.../test/java/liquibase/verify/saved_state/minimumRequiredIsValidSql/createProcedure/db2.sql
@@ -1,5 +1,5 @@
 -- Database: db2
--- Change Parameter: procedureText=CREATE OR REPLACE PROCEDURE testHello
+-- Change Parameter: procedureBody=CREATE OR REPLACE PROCEDURE testHello
 --     IS
 --     BEGIN
 --       DBMS_OUTPUT.PUT_LINE('Hello From The Database!');

diff --git a/...est/java/liquibase/verify/saved_state/minimumRequiredIsValidSql/createProcedure/derby.sql b/...est/java/liquibase/verify/saved_state/minimumRequiredIsValidSql/createProcedure/derby.sql
@@ -1,5 +1,5 @@
 -- Database: derby
--- Change Parameter: procedureText=CREATE OR REPLACE PROCEDURE testHello
+-- Change Parameter: procedureBody=CREATE OR REPLACE PROCEDURE testHello
 --     IS
 --     BEGIN
 --       DBMS_OUTPUT.PUT_LINE('Hello From The Database!');

diff --git a/.../java/liquibase/verify/saved_state/minimumRequiredIsValidSql/createProcedure/firebird.sql b/.../java/liquibase/verify/saved_state/minimumRequiredIsValidSql/createProcedure/firebird.sql
@@ -1,5 +1,5 @@
 -- Database: firebird
--- Change Parameter: procedureText=CREATE OR REPLACE PROCEDURE testHello
+-- Change Parameter: procedureBody=CREATE OR REPLACE PROCEDURE testHello
 --     IS
 --     BEGIN
 --       DBMS_OUTPUT.PUT_LINE('Hello From The Database!');

diff --git a/...c/test/java/liquibase/verify/saved_state/minimumRequiredIsValidSql/createProcedure/h2.sql b/...c/test/java/liquibase/verify/saved_state/minimumRequiredIsValidSql/createProcedure/h2.sql
@@ -1,5 +1,5 @@
 -- Database: h2
--- Change Parameter: procedureText=CREATE OR REPLACE PROCEDURE testHello
+-- Change Parameter: procedureBody=CREATE OR REPLACE PROCEDURE testHello
 --     IS
 --     BEGIN
 --       DBMS_OUTPUT.PUT_LINE('Hello From The Database!');

diff --git a/...st/java/liquibase/verify/saved_state/minimumRequiredIsValidSql/createProcedure/hsqldb.sql b/...st/java/liquibase/verify/saved_state/minimumRequiredIsValidSql/createProcedure/hsqldb.sql
@@ -1,5 +1,5 @@
 -- Database: hsqldb
--- Change Parameter: procedureText=CREATE OR REPLACE PROCEDURE testHello
+-- Change Parameter: procedureBody=CREATE OR REPLACE PROCEDURE testHello
 --     IS
 --     BEGIN
 --       DBMS_OUTPUT.PUT_LINE('Hello From The Database!');

diff --git a/.../java/liquibase/verify/saved_state/minimumRequiredIsValidSql/createProcedure/informix.sql b/.../java/liquibase/verify/saved_state/minimumRequiredIsValidSql/createProcedure/informix.sql
@@ -1,5 +1,5 @@
 -- Database: informix
--- Change Parameter: procedureText=CREATE OR REPLACE PROCEDURE testHello
+-- Change Parameter: procedureBody=CREATE OR REPLACE PROCEDURE testHello
 --     IS
 --     BEGIN
 --       DBMS_OUTPUT.PUT_LINE('Hello From The Database!');

diff --git a/...est/java/liquibase/verify/saved_state/minimumRequiredIsValidSql/createProcedure/mssql.sql b/...est/java/liquibase/verify/saved_state/minimumRequiredIsValidSql/createProcedure/mssql.sql
@@ -1,5 +1,5 @@
 -- Database: mssql
--- Change Parameter: procedureText=CREATE OR REPLACE PROCEDURE testHello
+-- Change Parameter: procedureBody=CREATE OR REPLACE PROCEDURE testHello
 --     IS
 --     BEGIN
 --       DBMS_OUTPUT.PUT_LINE('Hello From The Database!');

diff --git a/...est/java/liquibase/verify/saved_state/minimumRequiredIsValidSql/createProcedure/mysql.sql b/...est/java/liquibase/verify/saved_state/minimumRequiredIsValidSql/createProcedure/mysql.sql
@@ -1,5 +1,5 @@
 -- Database: mysql
--- Change Parameter: procedureText=CREATE OR REPLACE PROCEDURE testHello
+-- Change Parameter: procedureBody=CREATE OR REPLACE PROCEDURE testHello
 --     IS
 --     BEGIN
 --       DBMS_OUTPUT.PUT_LINE('Hello From The Database!');

diff --git a/...st/java/liquibase/verify/saved_state/minimumRequiredIsValidSql/createProcedure/oracle.sql b/...st/java/liquibase/verify/saved_state/minimumRequiredIsValidSql/createProcedure/oracle.sql
@@ -1,5 +1,5 @@
 -- Database: oracle
--- Change Parameter: procedureText=CREATE OR REPLACE PROCEDURE testHello
+-- Change Parameter: procedureBody=CREATE OR REPLACE PROCEDURE testHello
 --     IS
 --     BEGIN
 --       DBMS_OUTPUT.PUT_LINE('Hello From The Database!');

diff --git a/...ava/liquibase/verify/saved_state/minimumRequiredIsValidSql/createProcedure/postgresql.sql b/...ava/liquibase/verify/saved_state/minimumRequiredIsValidSql/createProcedure/postgresql.sql
@@ -1,5 +1,5 @@
 -- Database: postgresql
--- Change Parameter: procedureText=CREATE OR REPLACE PROCEDURE testHello
+-- Change Parameter: procedureBody=CREATE OR REPLACE PROCEDURE testHello
 --     IS
 --     BEGIN
 --       DBMS_OUTPUT.PUT_LINE('Hello From The Database!');

diff --git a/...st/java/liquibase/verify/saved_state/minimumRequiredIsValidSql/createProcedure/sqlite.sql b/...st/java/liquibase/verify/saved_state/minimumRequiredIsValidSql/createProcedure/sqlite.sql
@@ -1,5 +1,5 @@
 -- Database: sqlite
--- Change Parameter: procedureText=CREATE OR REPLACE PROCEDURE testHello
+-- Change Parameter: procedureBody=CREATE OR REPLACE PROCEDURE testHello
 --     IS
 --     BEGIN
 --       DBMS_OUTPUT.PUT_LINE('Hello From The Database!');

diff --git a/...st/java/liquibase/verify/saved_state/minimumRequiredIsValidSql/createProcedure/sybase.sql b/...st/java/liquibase/verify/saved_state/minimumRequiredIsValidSql/createProcedure/sybase.sql
@@ -1,5 +1,5 @@
 -- Database: sybase
--- Change Parameter: procedureText=CREATE OR REPLACE PROCEDURE testHello
+-- Change Parameter: procedureBody=CREATE OR REPLACE PROCEDURE testHello
 --     IS
 --     BEGIN
 --       DBMS_OUTPUT.PUT_LINE('Hello From The Database!');

diff --git a/...va/liquibase/verify/saved_state/minimumRequiredIsValidSql/createProcedure/unsupported.sql b/...va/liquibase/verify/saved_state/minimumRequiredIsValidSql/createProcedure/unsupported.sql
@@ -1,5 +1,5 @@
 -- Database: unsupported
--- Change Parameter: procedureText=CREATE OR REPLACE PROCEDURE testHello
+-- Change Parameter: procedureBody=CREATE OR REPLACE PROCEDURE testHello
 --     IS
 --     BEGIN
 --       DBMS_OUTPUT.PUT_LINE('Hello From The Database!');