Merge remote-tracking branch 'origin/master'

liquibase · Jan 24, 2022 · c038b28 · c038b28
2 parents 1e53733 + b8b6047
commit c038b28
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/liquibase-core/src/main/java/liquibase/lockservice/StandardLockService.java b/liquibase-core/src/main/java/liquibase/lockservice/StandardLockService.java
@@ -17,6 +17,7 @@
 import liquibase.exception.UnexpectedLiquibaseException;
 import liquibase.executor.Executor;
 import liquibase.executor.ExecutorService;
+import liquibase.executor.LoggingExecutor;
 import liquibase.snapshot.InvalidExampleException;
 import liquibase.snapshot.SnapshotGeneratorFactory;
 import liquibase.sql.Sql;
@@ -99,6 +100,14 @@ public void init() throws DatabaseException {
         Executor executor = Scope.getCurrentScope().getSingleton(ExecutorService.class).getExecutor("jdbc",  database);
 
         int maxIterations = 10;
+        if (executor instanceof LoggingExecutor) {
+            //can't / don't have to re-check
+            if (hasDatabaseChangeLogLockTable()) {
+                maxIterations = 0;
+            } else {
+                maxIterations = 1;
+            }
+        }
         for (int i = 0; i < maxIterations; i++) {
             try {
                 if (!hasDatabaseChangeLogLockTable(true)) {

diff --git a/liquibase-core/src/main/java/liquibase/snapshot/jvm/UniqueConstraintSnapshotGenerator.java b/liquibase-core/src/main/java/liquibase/snapshot/jvm/UniqueConstraintSnapshotGenerator.java
@@ -229,7 +229,7 @@ protected List<CachedRow> listConstraints(Table table, DatabaseSnapshot snapshot
                             "[ic].[key_ordinal]";
 
             } else if (database instanceof OracleDatabase) {
-                sql = "select ucc.owner as constraint_container, ucc.constraint_name as constraint_name, ucc.column_name, f.validated as constraint_validate " +
+                sql = "select ucc.owner as constraint_container, ucc.constraint_name as constraint_name, ucc.column_name, f.validated as constraint_validate, ucc.table_name " +
                         "from all_cons_columns ucc " +
                         "INNER JOIN all_constraints f " +
                         "ON ucc.owner = f.owner " +

diff --git a/liquibase-core/src/main/java/liquibase/ui/ConsoleUIService.java b/liquibase-core/src/main/java/liquibase/ui/ConsoleUIService.java
@@ -64,7 +64,7 @@ public void setAllowPrompt(boolean allowPrompt) throws IllegalArgumentException
 
     @Override
     public boolean getAllowPrompt() {
-        return allowPrompt;
+        return getConsole().supportsInput() && allowPrompt;
     }
 
     @Override

diff --git a/liquibase-core/src/main/javacc/liquibase/util/grammar/SimpleSqlGrammar.jj b/liquibase-core/src/main/javacc/liquibase/util/grammar/SimpleSqlGrammar.jj
@@ -581,6 +581,7 @@ Built list from http://stackoverflow.com/a/37668315/45756 list of punctuation
     "\u208D",
     "\u208E",
     "\u20A0"-"\u20BF", //Currency symbols https://www.Sutf8-chartable.de/unicode-utf8-table.pl
+    "\u2116", //numero sign in Russian it's a regular symbol (https://en.wikipedia.org/wiki/Numero_sign)
     "\u2308"-"\u230B",
     "\u2329",
     "\u232A",