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

Handles snapshot of Oracle temporary tables + ignore queue tables #5087

Merged
merged 4 commits into from
Oct 31, 2023
Merged

Handles snapshot of Oracle temporary tables + ignore queue tables #5087

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
a87e270
Creates Oracle temporary global tables as expected
filipelautert Oct 19, 2023
cd071ac
Do not try to create queue tables as they are not normal Oracle tables.
filipelautert Oct 19, 2023
f08254a
Merge branch '1516-oracle-temporary-table' of github.com:liquibase/li…
filipelautert Oct 19, 2023
cb79aa3
Creates Oracle temporary global tables as expected
filipelautert Oct 20, 2023
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: 5 additions & 4 deletions ...ndard/src/main/java/liquibase/diff/output/changelog/core/MissingTableChangeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@
import liquibase.change.ConstraintsConfig;
import liquibase.change.core.CreateTableChange;
import liquibase.database.Database;
import liquibase.database.core.InformixDatabase;
import liquibase.database.core.MSSQLDatabase;
import liquibase.database.core.MySQLDatabase;
import liquibase.database.core.PostgresDatabase;
import liquibase.database.core.*;
import liquibase.datatype.DataTypeFactory;
import liquibase.datatype.DatabaseDataType;
import liquibase.datatype.LiquibaseDataType;
Expand Down Expand Up @@ -137,6 +134,10 @@ public Change[] fixMissing(DatabaseObject missingObject, DiffOutputControl contr
change.setTablespace(missingTable.getTablespace());
}

if (referenceDatabase instanceof OracleDatabase && missingTable.getAttribute("temporary", "no").equals("GLOBAL")) {
change.setTableType("TEMPORARY GLOBAL");
}

for (Column column : missingTable.getColumns()) {
ColumnConfig columnConfig = new ColumnConfig();
columnConfig.setName(column.getName());
Expand Down
3 changes: 2 additions & 1 deletion liquibase-standard/src/main/java/liquibase/snapshot/JdbcDatabaseSnapshot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1243,7 +1243,8 @@ private List<CachedRow> queryOracle(CatalogAndSchema catalogAndSchema, String ta
"c.COMMENTS as REMARKS, A.tablespace_name as tablespace_name, CASE WHEN A.tablespace_name = " +
"(SELECT DEFAULT_TABLESPACE FROM USER_USERS) THEN 'true' ELSE null END as default_tablespace " +
"from ALL_TABLES a " +
"join ALL_TAB_COMMENTS c on a.TABLE_NAME=c.table_name and a.owner=c.owner ";
"join ALL_TAB_COMMENTS c on a.TABLE_NAME=c.table_name and a.owner=c.owner " +
"left outer join ALL_QUEUE_TABLES q ON a.TABLE_NAME = q.QUEUE_TABLE and a.OWNER = q.OWNER ";
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't actually filter out the queue-tables here as far as I can see. You will need to also add a where clause:
where q.QUEUE_TABLE is null

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

whoops, that's why it was so easy :) Thanks for the review - I'll create another pr with the fix.

String allCatalogsString = getAllCatalogsStringScratchData();
if (tableName != null || allCatalogsString == null) {
sql += "WHERE a.OWNER='" + ownerName + "'";
Expand Down