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

Remove duplicate databasechangeloglock SQL when running update-sql against a new database #2335

Merged
merged 1 commit into from Jan 24, 2022
Merged

Remove duplicate databasechangeloglock SQL when running update-sql against a new database #2335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions liquibase-core/src/main/java/liquibase/lockservice/StandardLockService.java
View file
Open in desktop
Expand Up @@ -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;
Expand Down Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion liquibase-core/src/main/java/liquibase/ui/ConsoleUIService.java
View file
Open in desktop
Expand Up @@ -64,7 +64,7 @@ public void setAllowPrompt(boolean allowPrompt) throws IllegalArgumentException

@Override
public boolean getAllowPrompt() {
return allowPrompt;
return getConsole().supportsInput() && allowPrompt;
}

@Override
Expand Down