diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/ase/AseDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/ase/AseDdlBuilder.java index 66e63f6829..e9060d31fb 100644 --- a/symmetric-db/src/main/java/org/jumpmind/db/platform/ase/AseDdlBuilder.java +++ b/symmetric-db/src/main/java/org/jumpmind/db/platform/ase/AseDdlBuilder.java @@ -157,7 +157,7 @@ protected void dropTable(Table table, StringBuilder ddl, boolean temporary, bool println("BEGIN", ddl); printIndent(ddl); ddl.append("DROP TABLE "); - printlnIdentifier(getTableName(table.getFullyQualifiedTableName()), ddl); + printlnIdentifier(getFullyQualifiedTableNameShorten(table), ddl); ddl.append("END"); printEndOfStatement(ddl); } @@ -171,8 +171,8 @@ protected void writeExternalForeignKeyDropStmt(Table table, ForeignKey foreignKe printAlwaysSingleQuotedIdentifier(constraintName, ddl); println(")", ddl); printIndent(ddl); - ddl.append("ALTER TABLE "); - printIdentifier(getTableName(table.getName()), ddl); + ddl.append("ALTER TABLE "); + ddl.append(getFullyQualifiedTableNameShorten(table)); ddl.append(" DROP CONSTRAINT "); printIdentifier(constraintName, ddl); printEndOfStatement(ddl); @@ -181,7 +181,7 @@ protected void writeExternalForeignKeyDropStmt(Table table, ForeignKey foreignKe @Override public void writeExternalIndexDropStmt(Table table, IIndex index, StringBuilder ddl) { ddl.append("DROP INDEX "); - printIdentifier(getTableName(table.getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(table)); ddl.append("."); printIdentifier(getIndexName(index), ddl); printEndOfStatement(ddl); @@ -207,11 +207,9 @@ public String getSelectLastIdentityValues(Table table) { */ protected String getEnableIdentityOverrideSql(Table table) { StringBuffer result = new StringBuffer(); - result.append("SET IDENTITY_INSERT "); - result.append(getDelimitedIdentifier(getTableName(table.getName()))); + result.append(getFullyQualifiedTableNameShorten(table)); result.append(" ON"); - return result.toString(); } @@ -224,11 +222,9 @@ protected String getEnableIdentityOverrideSql(Table table) { */ protected String getDisableIdentityOverrideSql(Table table) { StringBuffer result = new StringBuffer(); - result.append("SET IDENTITY_INSERT "); - result.append(getDelimitedIdentifier(getTableName(table.getName()))); + result.append(getFullyQualifiedTableNameShorten(table)); result.append(" OFF"); - return result.toString(); } @@ -273,14 +269,14 @@ public void writeCopyDataStatement(Table sourceTable, Table targetTable, StringB if (hasIdentity) { ddl.append("SET IDENTITY_INSERT "); - printIdentifier(getTableName(targetTable.getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(targetTable)); ddl.append(" ON"); printEndOfStatement(ddl); } super.writeCopyDataStatement(sourceTable, targetTable, ddl); if (hasIdentity) { ddl.append("SET IDENTITY_INSERT "); - printIdentifier(getTableName(targetTable.getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(targetTable)); ddl.append(" OFF"); printEndOfStatement(ddl); } @@ -426,7 +422,7 @@ protected void processTableStructureChanges(Database currentModel, Database desi protected void processChange(Database currentModel, Database desiredModel, AddColumnChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + printlnIdentifier(getFullyQualifiedTableNameShorten(change.getChangedTable()), ddl); printIndent(ddl); ddl.append("ADD "); writeColumn(change.getChangedTable(), change.getNewColumn(), ddl); @@ -440,7 +436,7 @@ protected void processChange(Database currentModel, Database desiredModel, protected void processChange(Database currentModel, Database desiredModel, RemoveColumnChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + printlnIdentifier(getFullyQualifiedTableNameShorten(change.getChangedTable()), ddl); printIndent(ddl); ddl.append("DROP "); printIdentifier(getColumnName(change.getColumn()), ddl); @@ -495,7 +491,7 @@ protected void processChange(Database currentModel, Database desiredModel, protected void processChange(Database currentModel, Database desiredModel, ColumnDefaultValueChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + printlnIdentifier(getFullyQualifiedTableNameShorten(change.getChangedTable()), ddl); printIndent(ddl); ddl.append("REPLACE "); printIdentifier(getColumnName(change.getChangedColumn()), ddl); @@ -537,7 +533,7 @@ protected void processColumnChange(Table sourceTable, Table targetTable, Column // the // datatype changes ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(sourceTable.getName()), ddl); + printlnIdentifier(getFullyQualifiedTableNameShorten(sourceTable), ddl); printIndent(ddl); ddl.append("REPLACE "); printIdentifier(getColumnName(sourceColumn), ddl); @@ -545,14 +541,14 @@ protected void processColumnChange(Table sourceTable, Table targetTable, Column printEndOfStatement(ddl); } ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(sourceTable.getName()), ddl); + printlnIdentifier(getFullyQualifiedTableNameShorten(sourceTable), ddl); printIndent(ddl); ddl.append("MODIFY "); writeColumn(sourceTable, targetColumn, ddl); printEndOfStatement(ddl); if (defaultChanges) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(sourceTable.getName()), ddl); + printlnIdentifier(getFullyQualifiedTableNameShorten(sourceTable), ddl); printIndent(ddl); ddl.append("REPLACE "); printIdentifier(getColumnName(sourceColumn), ddl); diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/db2/Db2DdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/db2/Db2DdlBuilder.java index 6519499e0d..f08b98ce43 100644 --- a/symmetric-db/src/main/java/org/jumpmind/db/platform/db2/Db2DdlBuilder.java +++ b/symmetric-db/src/main/java/org/jumpmind/db/platform/db2/Db2DdlBuilder.java @@ -231,7 +231,7 @@ protected boolean writeAlterColumnDataType(ColumnDataTypeChange change, StringBu protected void processChange(Database currentModel, Database desiredModel, AddColumnChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(change.getChangedTable())); printIndent(ddl); ddl.append("ADD COLUMN "); writeColumn(change.getChangedTable(), change.getNewColumn(), ddl); @@ -245,7 +245,7 @@ protected void processChange(Database currentModel, Database desiredModel, protected void processChange(Database currentModel, Database desiredModel, RemoveColumnChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(change.getChangedTable())); printIndent(ddl); ddl.append("DROP COLUMN "); printIdentifier(getColumnName(change.getColumn()), ddl); @@ -261,7 +261,7 @@ protected void processChange(Database currentModel, Database desiredModel, protected void processChange(Database currentModel, Database desiredModel, RemovePrimaryKeyChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(change.getChangedTable())); printIndent(ddl); ddl.append("DROP PRIMARY KEY"); printEndOfStatement(ddl); @@ -274,7 +274,7 @@ protected void processChange(Database currentModel, Database desiredModel, protected void processChange(Database currentModel, Database desiredModel, PrimaryKeyChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(change.getChangedTable())); printIndent(ddl); ddl.append("DROP PRIMARY KEY"); printEndOfStatement(ddl); @@ -293,7 +293,7 @@ protected void writeExternalPrimaryKeysCreateStmt(Table table, Column[] primaryK protected void writeReorgStmt(Table table, StringBuilder ddl) { ddl.append("CALL SYSPROC.ADMIN_CMD('REORG TABLE "); - printlnIdentifier(getTableName(table.getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(table)); ddl.append("')"); } } diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/derby/DerbyDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/derby/DerbyDdlBuilder.java index b2ded8bba3..68e6d6be04 100644 --- a/symmetric-db/src/main/java/org/jumpmind/db/platform/derby/DerbyDdlBuilder.java +++ b/symmetric-db/src/main/java/org/jumpmind/db/platform/derby/DerbyDdlBuilder.java @@ -158,7 +158,7 @@ protected void processTableStructureChanges(Database currentModel, Database desi protected void processChange(Database currentModel, Database desiredModel, AddColumnChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(change.getChangedTable())); printIndent(ddl); ddl.append("ADD COLUMN "); writeColumn(change.getChangedTable(), change.getNewColumn(), ddl); diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/firebird/FirebirdDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/firebird/FirebirdDdlBuilder.java index 0e3099407c..6937717579 100644 --- a/symmetric-db/src/main/java/org/jumpmind/db/platform/firebird/FirebirdDdlBuilder.java +++ b/symmetric-db/src/main/java/org/jumpmind/db/platform/firebird/FirebirdDdlBuilder.java @@ -130,7 +130,7 @@ private void writeAutoIncrementCreateStmts(Table table, Column column, StringBui ddl.append("CREATE TRIGGER "); printIdentifier(getTriggerName(table, column), ddl); ddl.append(" FOR "); - printlnIdentifier(getTableName(table.getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(table)); println("ACTIVE BEFORE INSERT POSITION 0 AS", ddl); ddl.append("BEGIN IF (NEW."); printIdentifier(getColumnName(column), ddl); @@ -341,7 +341,7 @@ protected boolean writeAlterColumnDataType(ColumnDataTypeChange change, StringBu protected void processChange(Database currentModel, Database desiredModel, AddColumnChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(change.getChangedTable())); printIndent(ddl); ddl.append("ADD "); writeColumn(change.getChangedTable(), change.getNewColumn(), ddl); @@ -361,7 +361,7 @@ protected void processChange(Database currentModel, Database desiredModel, // Even though Firebird can only add columns, we can move them later // on ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(change.getChangedTable())); printIndent(ddl); ddl.append("ALTER "); printIdentifier(getColumnName(change.getNewColumn()), ddl); @@ -386,7 +386,7 @@ protected void processChange(Database currentModel, Database desiredModel, writeAutoIncrementDropStmts(change.getChangedTable(), change.getColumn(), ddl); } ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(change.getChangedTable())); printIndent(ddl); ddl.append("DROP "); printIdentifier(getColumnName(change.getColumn()), ddl); diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/h2/H2DdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/h2/H2DdlBuilder.java index 9839b176dc..9150ea6cf3 100644 --- a/symmetric-db/src/main/java/org/jumpmind/db/platform/h2/H2DdlBuilder.java +++ b/symmetric-db/src/main/java/org/jumpmind/db/platform/h2/H2DdlBuilder.java @@ -134,7 +134,7 @@ protected void processTableStructureChanges(Database currentModel, Database desi protected void processChange(Database currentModel, Database desiredModel, AddColumnChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(change.getChangedTable())); printIndent(ddl); ddl.append("ADD COLUMN "); writeColumn(change.getChangedTable(), change.getNewColumn(), ddl); @@ -148,7 +148,7 @@ protected void processChange(Database currentModel, Database desiredModel, protected void processChange(Database currentModel, Database desiredModel, RemoveColumnChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(change.getChangedTable())); printIndent(ddl); ddl.append("DROP COLUMN "); printIdentifier(getColumnName(change.getColumn()), ddl); diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/hsqldb/HsqlDbDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/hsqldb/HsqlDbDdlBuilder.java index db4a3dc84e..7bbe73a0f3 100644 --- a/symmetric-db/src/main/java/org/jumpmind/db/platform/hsqldb/HsqlDbDdlBuilder.java +++ b/symmetric-db/src/main/java/org/jumpmind/db/platform/hsqldb/HsqlDbDdlBuilder.java @@ -80,7 +80,7 @@ public HsqlDbDdlBuilder() { @Override protected void dropTable(Table table, StringBuilder ddl, boolean temporary, boolean recreate) { ddl.append("DROP TABLE "); - printIdentifier(getTableName(table.getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(table)); ddl.append(" IF EXISTS"); printEndOfStatement(ddl); } @@ -149,7 +149,7 @@ protected void processTableStructureChanges(Database currentModel, Database desi protected void processChange(Database currentModel, Database desiredModel, AddColumnChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(change.getChangedTable())); printIndent(ddl); ddl.append("ADD COLUMN "); writeColumn(change.getChangedTable(), change.getNewColumn(), ddl); @@ -167,7 +167,7 @@ protected void processChange(Database currentModel, Database desiredModel, protected void processChange(Database currentModel, Database desiredModel, RemoveColumnChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(change.getChangedTable())); printIndent(ddl); ddl.append("DROP COLUMN "); printIdentifier(getColumnName(change.getColumn()), ddl); diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/hsqldb2/HsqlDb2DdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/hsqldb2/HsqlDb2DdlBuilder.java index 8f3b5e12d6..a47553379b 100644 --- a/symmetric-db/src/main/java/org/jumpmind/db/platform/hsqldb2/HsqlDb2DdlBuilder.java +++ b/symmetric-db/src/main/java/org/jumpmind/db/platform/hsqldb2/HsqlDb2DdlBuilder.java @@ -85,7 +85,7 @@ public HsqlDb2DdlBuilder() { @Override protected void dropTable(Table table, StringBuilder ddl, boolean temporary, boolean recreate) { ddl.append("DROP TABLE "); - printIdentifier(getTableName(table.getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(table)); ddl.append(" IF EXISTS"); printEndOfStatement(ddl); } @@ -190,7 +190,7 @@ protected void processTableStructureChanges(Database currentModel, Database desi protected void processChange(Database currentModel, Database desiredModel, AddColumnChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(change.getChangedTable())); printIndent(ddl); ddl.append("ADD COLUMN "); writeColumn(change.getChangedTable(), change.getNewColumn(), ddl); @@ -208,7 +208,7 @@ protected void processChange(Database currentModel, Database desiredModel, protected void processChange(Database currentModel, Database desiredModel, RemoveColumnChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(change.getChangedTable())); printIndent(ddl); ddl.append("DROP COLUMN "); printIdentifier(getColumnName(change.getColumn()), ddl); diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/informix/InformixDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/informix/InformixDdlBuilder.java index ef1e76e920..cf4fde1a1d 100644 --- a/symmetric-db/src/main/java/org/jumpmind/db/platform/informix/InformixDdlBuilder.java +++ b/symmetric-db/src/main/java/org/jumpmind/db/platform/informix/InformixDdlBuilder.java @@ -97,7 +97,7 @@ protected void writeExternalPrimaryKeysCreateStmt(Table table, Column primaryKey StringBuilder ddl) { if (primaryKeyColumns.length > 0 && shouldGeneratePrimaryKeys(primaryKeyColumns)) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(table.getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(table)); printIndent(ddl); ddl.append("ADD CONSTRAINT "); writePrimaryKeyStmt(table, primaryKeyColumns, ddl); @@ -116,7 +116,7 @@ protected void writeExternalForeignKeyCreateStmt(Database database, Table table, ddl.append("ADD CONSTRAINT FOREIGN KEY ("); writeLocalReferences(key, ddl); ddl.append(") REFERENCES "); - printIdentifier(getTableName(key.getForeignTableName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(key.getForeignTable())); ddl.append(" ("); writeForeignReferences(key, ddl); ddl.append(") CONSTRAINT "); @@ -128,7 +128,7 @@ protected void writeExternalForeignKeyCreateStmt(Database database, Table table, protected void processChange(Database currentModel, Database desiredModel, RemovePrimaryKeyChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(change.getChangedTable())); printIndent(ddl); ddl.append("DROP CONSTRAINT "); printIdentifier(getConstraintName(null, change.getChangedTable(), "PK", null), ddl); @@ -139,7 +139,7 @@ protected void processChange(Database currentModel, Database desiredModel, protected void processChange(Database currentModel, Database desiredModel, PrimaryKeyChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(change.getChangedTable())); printIndent(ddl); ddl.append("DROP CONSTRAINT "); printIdentifier(getConstraintName(null, change.getChangedTable(), "PK", null), ddl); diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/interbase/InterbaseDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/interbase/InterbaseDdlBuilder.java index baecec45ac..4e88624f1e 100644 --- a/symmetric-db/src/main/java/org/jumpmind/db/platform/interbase/InterbaseDdlBuilder.java +++ b/symmetric-db/src/main/java/org/jumpmind/db/platform/interbase/InterbaseDdlBuilder.java @@ -154,7 +154,7 @@ private void writeAutoIncrementCreateStmts(Table table, Column column, StringBui ddl.append("CREATE TRIGGER "); printIdentifier(getTriggerName(table, column), ddl); ddl.append(" FOR "); - printlnIdentifier(getTableName(table.getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(table)); println("ACTIVE BEFORE INSERT POSITION 0 AS", ddl); ddl.append("BEGIN IF (NEW."); printIdentifier(getColumnName(column), ddl); @@ -323,7 +323,7 @@ protected void processTableStructureChanges(Database currentModel, Database desi protected void processChange(Database currentModel, Database desiredModel, AddColumnChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(change.getChangedTable())); printIndent(ddl); ddl.append("ADD "); writeColumn(change.getChangedTable(), change.getNewColumn(), ddl); @@ -343,7 +343,7 @@ protected void processChange(Database currentModel, Database desiredModel, // Even though Interbase can only add columns, we can move them // later on ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(change.getChangedTable())); printIndent(ddl); ddl.append("ALTER "); printIdentifier(getColumnName(change.getNewColumn()), ddl); @@ -368,7 +368,7 @@ protected void processChange(Database currentModel, Database desiredModel, writeAutoIncrementDropStmts(change.getChangedTable(), change.getColumn(), ddl); } ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(change.getChangedTable())); printIndent(ddl); ddl.append("DROP "); printIdentifier(getColumnName(change.getColumn()), ddl); diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/mssql/MsSql2000DdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/mssql/MsSql2000DdlBuilder.java index 51684f7874..70b6791063 100644 --- a/symmetric-db/src/main/java/org/jumpmind/db/platform/mssql/MsSql2000DdlBuilder.java +++ b/symmetric-db/src/main/java/org/jumpmind/db/platform/mssql/MsSql2000DdlBuilder.java @@ -265,7 +265,7 @@ protected void writeColumnAutoIncrementStmt(Table table, Column column, StringBu @Override public void writeExternalIndexDropStmt(Table table, IIndex index, StringBuilder ddl) { ddl.append("DROP INDEX "); - printIdentifier(getTableName(table.getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(table)); ddl.append("."); printIdentifier(getIndexName(index), ddl); printEndOfStatement(ddl); @@ -281,7 +281,7 @@ protected void writeExternalForeignKeyDropStmt(Table table, ForeignKey foreignKe println(")", ddl); printIndent(ddl); ddl.append("ALTER TABLE "); - printIdentifier(getTableName(table.getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(table)); ddl.append(" DROP CONSTRAINT "); printIdentifier(constraintName, ddl); printEndOfStatement(ddl); @@ -352,7 +352,7 @@ public void writeCopyDataStatement(Table sourceTable, Table targetTable, StringB if (hasIdentityColumns) { ddl.append("SET IDENTITY_INSERT "); - printIdentifier(getTableName(targetTable.getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(targetTable)); ddl.append(" ON"); printEndOfStatement(ddl); } @@ -361,7 +361,7 @@ public void writeCopyDataStatement(Table sourceTable, Table targetTable, StringB // per session if (hasIdentityColumns) { ddl.append("SET IDENTITY_INSERT "); - printIdentifier(getTableName(targetTable.getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(targetTable)); ddl.append(" OFF"); printEndOfStatement(ddl); } @@ -542,7 +542,7 @@ protected void processTableStructureChanges(Database currentModel, Database desi protected void processChange(Database currentModel, Database desiredModel, AddColumnChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(change.getChangedTable())); printIndent(ddl); ddl.append("ADD "); writeColumn(change.getChangedTable(), change.getNewColumn(), ddl); @@ -561,7 +561,7 @@ protected void processChange(Database currentModel, Database desiredModel, } ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(change.getChangedTable())); printIndent(ddl); ddl.append("DROP COLUMN "); printIdentifier(getColumnName(change.getColumn()), ddl); @@ -683,7 +683,7 @@ protected void processColumnChange(Table sourceTable, Table targetTable, Column if ((targetColumn.getMappedType().equalsIgnoreCase(TypeMap.LONGNVARCHAR) && sourceColumn.getJdbcTypeName().equalsIgnoreCase("text")) || (targetColumn.getMappedType().equalsIgnoreCase(TypeMap.LONGVARCHAR) && sourceColumn.getJdbcTypeName().equalsIgnoreCase("ntext"))) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(sourceTable.getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(sourceTable)); printIndent(ddl); ddl.append("ALTER COLUMN "); printIdentifier(getColumnName(targetColumn), ddl); @@ -692,7 +692,7 @@ protected void processColumnChange(Table sourceTable, Table targetTable, Column } ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(sourceTable.getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(sourceTable)); printIndent(ddl); ddl.append("ALTER COLUMN "); writeColumnTypeDefaultRequired(sourceTable, targetColumn, ddl); @@ -706,7 +706,7 @@ protected void processColumnChange(Table sourceTable, Table targetTable, Column * constraint */ ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(sourceTable.getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(sourceTable)); printIndent(ddl); ddl.append("ADD CONSTRAINT "); printIdentifier(getConstraintName("DF", sourceTable, sourceColumn.getName(), null), ddl); diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/mysql/MySqlDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/mysql/MySqlDdlBuilder.java index 37c317f9fd..0768c04d4e 100644 --- a/symmetric-db/src/main/java/org/jumpmind/db/platform/mysql/MySqlDdlBuilder.java +++ b/symmetric-db/src/main/java/org/jumpmind/db/platform/mysql/MySqlDdlBuilder.java @@ -119,7 +119,7 @@ public MySqlDdlBuilder() { @Override protected void dropTable(Table table, StringBuilder ddl, boolean temporary, boolean recreate) { ddl.append("DROP TABLE IF EXISTS "); - printIdentifier(getTableName(table.getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(table)); printEndOfStatement(ddl); } @@ -245,7 +245,7 @@ protected void processTableStructureChanges(Database currentModel, Database desi protected void processChange(Database currentModel, Database desiredModel, AddColumnChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(change.getChangedTable())); printIndent(ddl); ddl.append("ADD COLUMN "); writeColumn(change.getChangedTable(), change.getNewColumn(), ddl); @@ -265,7 +265,7 @@ protected void processChange(Database currentModel, Database desiredModel, protected void processChange(Database currentModel, Database desiredModel, RemoveColumnChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(change.getChangedTable())); printIndent(ddl); ddl.append("DROP COLUMN "); printIdentifier(getColumnName(change.getColumn()), ddl); @@ -279,7 +279,7 @@ protected void processChange(Database currentModel, Database desiredModel, protected void processChange(Database currentModel, Database desiredModel, RemovePrimaryKeyChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(change.getChangedTable())); printIndent(ddl); ddl.append("DROP PRIMARY KEY"); printEndOfStatement(ddl); @@ -292,7 +292,7 @@ protected void processChange(Database currentModel, Database desiredModel, protected void processChange(Database currentModel, Database desiredModel, PrimaryKeyChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(change.getChangedTable())); printIndent(ddl); ddl.append("DROP PRIMARY KEY"); printEndOfStatement(ddl); @@ -307,7 +307,7 @@ protected void processChange(Database currentModel, Database desiredModel, protected void processColumnChange(Table sourceTable, Table targetTable, Column sourceColumn, Column targetColumn, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(sourceTable.getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(sourceTable)); printIndent(ddl); ddl.append("MODIFY COLUMN "); writeColumn(targetTable, targetColumn, ddl); diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/oracle/OracleDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/oracle/OracleDdlBuilder.java index 17e9fb3f88..2abc16e2f7 100644 --- a/symmetric-db/src/main/java/org/jumpmind/db/platform/oracle/OracleDdlBuilder.java +++ b/symmetric-db/src/main/java/org/jumpmind/db/platform/oracle/OracleDdlBuilder.java @@ -149,7 +149,7 @@ protected void dropTable(Table table, StringBuilder ddl, boolean temporary, bool } ddl.append("DROP TABLE "); - printIdentifier(getTableName(table.getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(table)); ddl.append(" CASCADE CONSTRAINTS PURGE"); printEndOfStatement(ddl); } @@ -177,7 +177,7 @@ protected void createAutoIncrementTrigger(Table table, Column column, StringBuil ddl.append("CREATE OR REPLACE TRIGGER "); printlnIdentifier(triggerName, ddl); ddl.append("BEFORE INSERT ON "); - printlnIdentifier(getTableName(table.getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(table)); ddl.append("FOR EACH ROW WHEN (new."); printIdentifier(columnName, ddl); println(" IS NULL)", ddl); @@ -201,7 +201,7 @@ protected void createAutoIncrementTrigger(Table table, Column column, StringBuil ddl.append("CREATE OR REPLACE TRIGGER "); printIdentifier(triggerName, ddl); ddl.append(" BEFORE INSERT ON "); - printIdentifier(getTableName(table.getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(table)); ddl.append(" FOR EACH ROW WHEN (new."); printIdentifier(columnName, ddl); println(" IS NULL)", ddl); @@ -487,7 +487,7 @@ protected boolean writeAlterColumnDataType(ColumnDataTypeChange change, StringBu protected void processChange(Database currentModel, Database desiredModel, AddColumnChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + printlnIdentifier(getFullyQualifiedTableNameShorten(change.getChangedTable()), ddl); printIndent(ddl); ddl.append("ADD "); writeColumn(change.getChangedTable(), change.getNewColumn(), ddl); @@ -509,7 +509,7 @@ protected void processChange(Database currentModel, Database desiredModel, dropAutoIncrementSequence(change.getChangedTable(), change.getColumn(), ddl); } ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(change.getChangedTable())); printIndent(ddl); ddl.append("DROP COLUMN "); printIdentifier(getColumnName(change.getColumn()), ddl); @@ -523,7 +523,7 @@ protected void processChange(Database currentModel, Database desiredModel, protected void processChange(Database currentModel, Database desiredModel, RemovePrimaryKeyChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(change.getChangedTable())); printIndent(ddl); ddl.append("DROP PRIMARY KEY"); printEndOfStatement(ddl); diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/sqlanywhere/SqlAnywhereDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/sqlanywhere/SqlAnywhereDdlBuilder.java index b946b1279d..663b0c713e 100644 --- a/symmetric-db/src/main/java/org/jumpmind/db/platform/sqlanywhere/SqlAnywhereDdlBuilder.java +++ b/symmetric-db/src/main/java/org/jumpmind/db/platform/sqlanywhere/SqlAnywhereDdlBuilder.java @@ -150,7 +150,7 @@ protected void dropTable(Table table, StringBuilder ddl, boolean temporary, bool println("BEGIN", ddl); printIndent(ddl); ddl.append("DROP TABLE "); - printlnIdentifier(getTableName(table.getName()), ddl); + printlnIdentifier(getFullyQualifiedTableNameShorten(table), ddl); ddl.append("END"); printEndOfStatement(ddl); } @@ -165,7 +165,7 @@ protected void writeExternalForeignKeyDropStmt(Table table, ForeignKey foreignKe println(")", ddl); printIndent(ddl); ddl.append("ALTER TABLE "); - printIdentifier(getTableName(table.getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(table)); ddl.append(" DROP CONSTRAINT "); printIdentifier(constraintName, ddl); printEndOfStatement(ddl); @@ -174,7 +174,7 @@ protected void writeExternalForeignKeyDropStmt(Table table, ForeignKey foreignKe @Override public void writeExternalIndexDropStmt(Table table, IIndex index, StringBuilder ddl) { ddl.append("DROP INDEX "); - printIdentifier(getTableName(table.getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(table)); ddl.append("."); printIdentifier(getIndexName(index), ddl); printEndOfStatement(ddl); @@ -366,7 +366,7 @@ protected void processTableStructureChanges(Database currentModel, Database desi protected void processChange(Database currentModel, Database desiredModel, AddColumnChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + printlnIdentifier(getFullyQualifiedTableNameShorten(change.getChangedTable()), ddl); printIndent(ddl); ddl.append("ADD "); writeColumn(change.getChangedTable(), change.getNewColumn(), ddl); @@ -380,7 +380,7 @@ protected void processChange(Database currentModel, Database desiredModel, protected void processChange(Database currentModel, Database desiredModel, RemoveColumnChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + printlnIdentifier(getFullyQualifiedTableNameShorten(change.getChangedTable()), ddl); printIndent(ddl); ddl.append("DROP "); printIdentifier(getColumnName(change.getColumn()), ddl); @@ -400,7 +400,7 @@ protected void processChange(Database currentModel, Database desiredModel, protected void processChange(Database currentModel, Database desiredModel, RemovePrimaryKeyChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + printlnIdentifier(getFullyQualifiedTableNameShorten(change.getChangedTable()), ddl); printIndent(ddl); ddl.append("DROP PRIMARY KEY"); printEndOfStatement(ddl); @@ -414,7 +414,7 @@ protected void processChange(Database currentModel, Database desiredModel, protected void processChange(Database currentModel, Database desiredModel, ColumnDefaultValueChange change, StringBuilder ddl) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(change.getChangedTable().getName()), ddl); + printlnIdentifier(getFullyQualifiedTableNameShorten(change.getChangedTable()), ddl); printIndent(ddl); ddl.append("REPLACE "); printIdentifier(getColumnName(change.getChangedColumn()), ddl); @@ -456,7 +456,7 @@ protected void processColumnChange(Table sourceTable, Table targetTable, Column // the // datatype changes ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(sourceTable.getName()), ddl); + printlnIdentifier(getFullyQualifiedTableNameShorten(sourceTable), ddl); printIndent(ddl); ddl.append("REPLACE "); printIdentifier(getColumnName(sourceColumn), ddl); @@ -464,14 +464,14 @@ protected void processColumnChange(Table sourceTable, Table targetTable, Column printEndOfStatement(ddl); } ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(sourceTable.getName()), ddl); + printlnIdentifier(getFullyQualifiedTableNameShorten(sourceTable), ddl); printIndent(ddl); ddl.append("MODIFY "); writeColumn(sourceTable, targetColumn, ddl); printEndOfStatement(ddl); if (defaultChanges) { ddl.append("ALTER TABLE "); - printlnIdentifier(getTableName(sourceTable.getName()), ddl); + printlnIdentifier(getFullyQualifiedTableNameShorten(sourceTable), ddl); printIndent(ddl); ddl.append("REPLACE "); printIdentifier(getColumnName(sourceColumn), ddl); diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/sqlite/SqliteDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/sqlite/SqliteDdlBuilder.java index c5ed55cd45..83f28deef3 100644 --- a/symmetric-db/src/main/java/org/jumpmind/db/platform/sqlite/SqliteDdlBuilder.java +++ b/symmetric-db/src/main/java/org/jumpmind/db/platform/sqlite/SqliteDdlBuilder.java @@ -118,7 +118,7 @@ protected void writeEmbeddedPrimaryKeysStmt(Table table, StringBuilder ddl) { @Override protected void dropTable(Table table, StringBuilder ddl, boolean temporary, boolean recreate) { ddl.append("DROP TABLE IF EXISTS "); - printIdentifier(getTableName(table.getName()), ddl); + ddl.append(getFullyQualifiedTableNameShorten(table)); printEndOfStatement(ddl); }