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

Fixed Formatted SQL "property" parsing #3037

Merged
merged 2 commits into from Jul 12, 2022
Merged

Fixed Formatted SQL "property" parsing #3037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fa4c53
Formatted SQL parsing was trying to parse as "-- property" any commen…
nvoxland Jul 1, 2022
eea140d
Formatted SQL parsing was trying to parse as "-- property" any commen…
nvoxland Jul 5, 2022
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
2 changes: 1 addition & 1 deletion ...se-core/src/main/java/liquibase/parser/core/formattedsql/FormattedSqlChangeLogParser.java
View file
Open in desktop
Expand Up @@ -83,7 +83,7 @@ public DatabaseChangeLog parse(String physicalChangeLogLocation, ChangeLogParame
RawSQLChange change = null;
Pattern changeLogPattern = Pattern.compile("\\-\\-\\s*liquibase formatted.*", Pattern.CASE_INSENSITIVE);
Pattern propertyPattern = Pattern.compile("\\s*\\-\\-[\\s]*property\\s+(.*:.*)\\s+(.*:.*).*", Pattern.CASE_INSENSITIVE);
Pattern altPropertyOneDashPattern = Pattern.compile("\\s*?[-]+.*property\\s.*", Pattern.CASE_INSENSITIVE);
Pattern altPropertyOneDashPattern = Pattern.compile("\\s*?[-]+\\s*property\\s.*", Pattern.CASE_INSENSITIVE);
Pattern changeSetPattern = Pattern.compile("\\s*\\-\\-[\\s]*changeset\\s+(\"[^\"]+\"|[^:]+):\\s*(\"[^\"]+\"|\\S+).*", Pattern.CASE_INSENSITIVE);
Pattern altChangeSetOneDashPattern = Pattern.compile("\\-[\\s]*changeset\\s.*", Pattern.CASE_INSENSITIVE);
Pattern altChangeSetNoOtherInfoPattern = Pattern.compile("\\s*\\-\\-[\\s]*changeset[\\s]*.*$", Pattern.CASE_INSENSITIVE);
Expand Down
55 changes: 55 additions & 0 deletions ...src/test/groovy/liquibase/parser/core/formattedsql/FormattedSqlChangeLogParserTest.groovy
View file
Open in desktop
Expand Up @@ -513,6 +513,61 @@ CREATE TABLE ALL_CAPS_TABLE_2 (
assert e.getMessage().toLowerCase().contains("-property name")
}

def "parse strings that contain keywords not at the beginning"() throws Exception {
when:
def changeLog = new MockFormattedSqlChangeLogParser("""
--liquibase formatted sql

--changeset example:1
not a property here
- not a property here
-- not a property here
not a changeset here
- not a changeset here
-- not a changeset here
not a rollback here
- not a rollback here
-- not a rollback here
not a precondition here
- not a precondition here
-- not a precondition here
not a comment here
- not a comment here
-- not a comment here
not validCheckSum here
- not validCheckSum here
-- not validCheckSum here
not ignoreLines here
- not ignoreLines here
-- not ignoreLines here
""".trim()).parse("asdf.sql", new ChangeLogParameters(), new JUnitResourceAccessor())

then:
StringUtil.standardizeLineEndings(((RawSQLChange) changeLog.getChangeSets()[0].getChanges()[0]).getSql().trim()) == StringUtil.standardizeLineEndings("""
not a property here
- not a property here
-- not a property here
not a changeset here
- not a changeset here
-- not a changeset here
not a rollback here
- not a rollback here
-- not a rollback here
not a precondition here
- not a precondition here
-- not a precondition here
not a comment here
- not a comment here
-- not a comment here
not validCheckSum here
- not validCheckSum here
-- not validCheckSum here
not ignoreLines here
- not ignoreLines here
-- not ignoreLines here
""".trim())
}

def parse_withComment() throws Exception {
when:
String changeLogWithComment = "--liquibase formatted sql\n\n" +
Expand Down