Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Include columnDataType in generated setColumnRemarks changesets #2188

Merged
merged 3 commits into from Jan 12, 2022
Merged

Include columnDataType in generated setColumnRemarks changesets #2188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5d2ae4
Issue #2152: Fix for Null Pointer Exception During Diff Change Log Ge…
coylecullen Nov 5, 2021
6ba827e
Merge branch 'issue-2152-npe' of https://github.com/coylecullen/liqui…
nvoxland Dec 22, 2021
6d3df91
Update XSD to 4.6
nvoxland Dec 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...core/src/main/java/liquibase/diff/output/changelog/core/ChangedColumnChangeGenerator.java
View file
Open in desktop
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion liquibase-core/src/main/java/liquibase/parser/core/xml/XMLChangeLogSAXParser.java
View file
Open in desktop
Expand Up @@ -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();
Expand Down