Merge pull request #2188 from coylecullen/issue-2152-npe

Include columnDataType in generated setColumnRemarks changesets
liquibase · Jan 12, 2022 · 5f14dcb · 5f14dcb
2 parents f5a9b16 + 6d3df91
commit 5f14dcb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/...core/src/main/java/liquibase/diff/output/changelog/core/ChangedColumnChangeGenerator.java b/...core/src/main/java/liquibase/diff/output/changelog/core/ChangedColumnChangeGenerator.java
@@ -81,6 +81,11 @@ public Change[] fixChanged(DatabaseObject changedObject, ObjectDifferences diffe
             change.setColumnName(column.getName());
             change.setRemarks(column.getRemarks());
 
+            LiquibaseDataType columnDataType = DataTypeFactory.getInstance().from(column.getType(), comparisonDatabase);
+            if (columnDataType != null) {
+            change.setColumnDataType(columnDataType.toString());
+            }
+
             changes.add(change);
         }
 

diff --git a/liquibase-core/src/main/java/liquibase/parser/core/xml/XMLChangeLogSAXParser.java b/liquibase-core/src/main/java/liquibase/parser/core/xml/XMLChangeLogSAXParser.java
@@ -16,7 +16,7 @@
 
 public class XMLChangeLogSAXParser extends AbstractChangeLogParser {
 
-    public static final String LIQUIBASE_SCHEMA_VERSION = "4.1";
+    public static final String LIQUIBASE_SCHEMA_VERSION = "4.6";
     private SAXParserFactory saxParserFactory;
 
     private final LiquibaseEntityResolver resolver = new LiquibaseEntityResolver();