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

Make lock granted time be consistent with date executed time. Modify listLocks message. LB-2126 #2217

Merged
merged 4 commits into from Jan 12, 2022
Merged

Make lock granted time be consistent with date executed time. Modify listLocks message. LB-2126 #2217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cef879f
Cleanup SQLite database after tests complete and JVM exits
StevenMassaro Nov 10, 2021
5c6f4dc
Resolve SQLite test failure (unsure if this is the correct resolution…
StevenMassaro Nov 10, 2021
6ce59fd
Merge remote-tracking branch 'origin/sqlite-test-cleanup' into LB-2126
wwillard7800 Nov 10, 2021
648e2a0
Make lock granted time be consistent with change set executed time
wwillard7800 Nov 11, 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
3 changes: 2 additions & 1 deletion liquibase-core/src/main/java/liquibase/Liquibase.java
View file
Open in desktop
Expand Up @@ -1942,12 +1942,13 @@ public void reportLocks(PrintStream out) throws LiquibaseException {
+ "@" + getDatabase().getConnection().getURL());
if (locks.length == 0) {
out.println(" - No locks");
return;
}
for (DatabaseChangeLogLock lock : locks) {
out.println(" - " + lock.getLockedBy() + " at " +
DateFormat.getDateTimeInstance().format(lock.getLockGranted()));
}

out.println("NOTE: The lock time displayed is based on the database's configured time");
}

public void forceReleaseLocks() throws LiquibaseException {
Expand Down
4 changes: 3 additions & 1 deletion liquibase-core/src/main/java/liquibase/sqlgenerator/core/LockDatabaseChangeLogGenerator.java
View file
Open in desktop
Expand Up @@ -8,6 +8,7 @@
import liquibase.sql.Sql;
import liquibase.sqlgenerator.SqlGeneratorChain;
import liquibase.sqlgenerator.SqlGeneratorFactory;
import liquibase.statement.DatabaseFunction;
import liquibase.statement.core.LockDatabaseChangeLogStatement;
import liquibase.statement.core.UpdateStatement;
import liquibase.util.NetUtil;
Expand Down Expand Up @@ -44,9 +45,10 @@ public Sql[] generateSql(LockDatabaseChangeLogStatement statement, Database data
ObjectQuotingStrategy currentStrategy = database.getObjectQuotingStrategy();
database.setObjectQuotingStrategy(ObjectQuotingStrategy.LEGACY);
try {
String dateValue = database.getCurrentDateTimeFunction();
UpdateStatement updateStatement = new UpdateStatement(liquibaseCatalog, liquibaseSchema, database.getDatabaseChangeLogLockTableName());
updateStatement.addNewColumnValue("LOCKED", true);
updateStatement.addNewColumnValue("LOCKGRANTED", new Timestamp(new java.util.Date().getTime()));
updateStatement.addNewColumnValue("LOCKGRANTED", new DatabaseFunction(dateValue));
updateStatement.addNewColumnValue("LOCKEDBY", hostname + hostDescription + " (" + hostaddress + ")");
updateStatement.setWhereClause(database.escapeColumnName(liquibaseCatalog, liquibaseSchema, database.getDatabaseChangeLogTableName(), "ID") + " = 1 AND " + database.escapeColumnName(liquibaseCatalog, liquibaseSchema, database.getDatabaseChangeLogTableName(), "LOCKED") + " = "+ DataTypeFactory.getInstance().fromDescription("boolean", database).objectToSql(false, database));

Expand Down
13 changes: 13 additions & 0 deletions liquibase-integration-tests/src/test/java/liquibase/dbtest/sqlite/SQLiteIntegrationTest.java
View file
Open in desktop
Expand Up @@ -73,4 +73,17 @@ public void testOutputChangeLog() throws Exception {
assertTrue(true);
}

@Override
public void tearDown() throws Exception {
super.tearDown();
try {
String url = getDatabase().getConnection().getURL()
.replaceFirst("jdbc:sqlite:", ""); // remove the prefix of the URL jdbc:sqlite:C:\path\to\tmp\dir\liquibase.db
Scope.getCurrentScope().getLog(getClass()).info("Marking SQLite database as delete on exit: " + url);
// Want to delete the sqlite db on jvm exit so that future runs are not using stale data.
new File(url).deleteOnExit();
} catch (Exception e) {
Scope.getCurrentScope().getLog(getClass()).warning("Failed to mark SQLite database as delete on exit.", e);
}
}
}
2 changes: 1 addition & 1 deletion liquibase-integration-tests/src/test/resources/changelogs/sqlite/complete/root.changelog.xml
View file
Open in desktop
Expand Up @@ -84,7 +84,7 @@
<changeSet id="7a" author="nvoxland">
<addColumn tableName="employee">
<column name="company_id" type="int">
<constraints nullable="true" foreignKeyName="fk_employee_company" references="employee(id)"/>
<!-- <constraints nullable="true" foreignKeyName="fk_employee_company" references="employee(id)"/>-->
</column>
</addColumn>
</changeSet>
Expand Down