Change name regexp to be consistent with the rest

liquibase · Feb 7, 2023 · 94cdc01 · 94cdc01
1 parent a45f2dc
commit 94cdc01
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/liquibase-core/src/main/java/liquibase/database/AbstractJdbcDatabase.java b/liquibase-core/src/main/java/liquibase/database/AbstractJdbcDatabase.java
@@ -106,8 +106,8 @@ public abstract class AbstractJdbcDatabase implements Database {
     private static final String TIMESTAMP_REGEX = "^\\d{4}\\-\\d{2}\\-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+$";
     private static final Pattern TIMESTAMP_PATTERN = Pattern.compile(TIMESTAMP_REGEX);
 
-    private static final String TIMES_REGEX = "^\\d{2}:\\d{2}:\\d{2}$";
-    private static final Pattern TIME_PATTERN = Pattern.compile(TIMES_REGEX);
+    private static final String TIME_REGEX = "^\\d{2}:\\d{2}:\\d{2}$";
+    private static final Pattern TIME_PATTERN = Pattern.compile(TIME_REGEX);
 
     private static final String  NAME_WITH_DESC_REGEX = "(?i).*\\s+DESC";
     private static final Pattern NAME_WITH_DESC_PATTERN = Pattern.compile(NAME_WITH_DESC_REGEX);

diff --git a/...se-core/src/main/java/liquibase/parser/core/formattedsql/FormattedSqlChangeLogParser.java b/...se-core/src/main/java/liquibase/parser/core/formattedsql/FormattedSqlChangeLogParser.java
@@ -169,7 +169,7 @@ public class FormattedSqlChangeLogParser implements ChangeLogParser {
     private static final String SINGLE_QUOTE_RESULT_REGEX = "^(?:expectedResult:)?'([^']+)' (.*)";
     private static final String DOUBLE_QUOTE_RESULT_REGEX = "^(?:expectedResult:)?\"([^\"]+)\" (.*)";
 
-    private static final Pattern[] PATTERNS = new Pattern[]{
+    private static final Pattern[] WORD_AND_QUOTING_PATTERNS = new Pattern[]{
             Pattern.compile(WORD_RESULT_REGEX, Pattern.CASE_INSENSITIVE),
             Pattern.compile(SINGLE_QUOTE_RESULT_REGEX, Pattern.CASE_INSENSITIVE),
             Pattern.compile(DOUBLE_QUOTE_RESULT_REGEX, Pattern.CASE_INSENSITIVE)
@@ -711,7 +711,7 @@ protected boolean supportsExtension(String changelogFile){
     }
 
     private SqlPrecondition parseSqlCheckCondition(String body) throws ChangeLogParseException{
-        for (Pattern pattern : PATTERNS) {
+        for (Pattern pattern : WORD_AND_QUOTING_PATTERNS) {
             Matcher matcher = pattern.matcher(body);
             if (matcher.matches() && (matcher.groupCount() == 2)) {
                 SqlPrecondition p = new SqlPrecondition();