CORE-2657 Add new DATABASECHANGELOG.DEPLOYMENT_ID column to track cha…

…ngeSets deployed together New deployment_id column should be nullable and not default values
liquibase · Feb 2, 2016 · 9a41d91 · 9a41d91
1 parent a12b0d3
commit 9a41d91
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/liquibase-core/src/main/java/liquibase/changelog/StandardChangeLogHistoryService.java b/liquibase-core/src/main/java/liquibase/changelog/StandardChangeLogHistoryService.java
@@ -179,15 +179,11 @@ public void init() throws DatabaseException {
             }
 
             if (!hasDeploymentIdColumn) {
-                generateDeploymentId();
                 executor.comment("Adding missing databasechangelog.deployment_id column");
                 statementsToExecute.add(new AddColumnStatement(getLiquibaseCatalogName(), getLiquibaseSchemaName(), getDatabaseChangeLogTableName(), "DEPLOYMENT_ID", "VARCHAR(10)", null));
                 if (database instanceof DB2Database) {
                     statementsToExecute.add(new ReorganizeTableStatement(getLiquibaseCatalogName(), getLiquibaseSchemaName(), getDatabaseChangeLogTableName()));
                 }
-                statementsToExecute.add(new UpdateStatement(getLiquibaseCatalogName(), getLiquibaseSchemaName(), getDatabaseChangeLogTableName()).addNewColumnValue("DEPLOYMENT_ID", getDeploymentId()));
-                statementsToExecute.add(new SetNullableStatement(getLiquibaseCatalogName(), getLiquibaseSchemaName(), getDatabaseChangeLogTableName(), "DEPLOYMENT_ID", "VARCHAR(10)", false));
-                resetDeploymentId();
             }
 
             List<Map<String, ?>> md5sumRS = ExecutorService.getInstance().getExecutor(database).queryForList(new SelectFromDatabaseChangeLogStatement(new SelectFromDatabaseChangeLogStatement.ByNotNullCheckSum(), new ColumnConfig().setName("MD5SUM")).setLimit(1));

diff --git a/...core/src/main/java/liquibase/sqlgenerator/core/CreateDatabaseChangeLogTableGenerator.java b/...core/src/main/java/liquibase/sqlgenerator/core/CreateDatabaseChangeLogTableGenerator.java
@@ -43,7 +43,7 @@ public Sql[] generateSql(CreateDatabaseChangeLogTableStatement statement, Databa
                 .addColumn("LIQUIBASE", DataTypeFactory.getInstance().fromDescription("VARCHAR(20)", database))
                 .addColumn("CONTEXTS", DataTypeFactory.getInstance().fromDescription("VARCHAR("+getContextsSize()+")", database))
                 .addColumn("LABELS", DataTypeFactory.getInstance().fromDescription("VARCHAR("+getLabelsSize()+")", database))
-                .addColumn("DEPLOYMENT_ID", DataTypeFactory.getInstance().fromDescription("VARCHAR(10)", database), new NotNullConstraint());
+                .addColumn("DEPLOYMENT_ID", DataTypeFactory.getInstance().fromDescription("VARCHAR(10)", database));
 
         return SqlGeneratorFactory.getInstance().generateSql(createTableStatement, database);
     }