diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/ase/AseSymmetricDialect.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/ase/AseSymmetricDialect.java index c476265866..09f6264190 100644 --- a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/ase/AseSymmetricDialect.java +++ b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/ase/AseSymmetricDialect.java @@ -132,7 +132,7 @@ protected boolean doesTriggerExistOnPlatform(final String catalogName, String sc public Boolean execute(Connection con) throws SQLException { String previousCatalog = con.getCatalog(); PreparedStatement stmt = con - .prepareStatement("select count(*) from sysobjects where type = 'TR' AND name = ?"); + .prepareStatement("select count(*) from dbo.sysobjects where type = 'TR' AND name = ?"); try { if (catalogName != null) { con.setCatalog(catalogName); diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/sqlanywhere/SqlAnywhereSymmetricDialect.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/sqlanywhere/SqlAnywhereSymmetricDialect.java index 1e527551ca..61142da177 100644 --- a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/sqlanywhere/SqlAnywhereSymmetricDialect.java +++ b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/sqlanywhere/SqlAnywhereSymmetricDialect.java @@ -193,7 +193,7 @@ protected boolean doesTriggerExistOnPlatform(final String catalogName, String sc public Boolean execute(Connection con) throws SQLException { String previousCatalog = con.getCatalog(); PreparedStatement stmt = con - .prepareStatement("select count(*) from sysobjects where type = 'TR' AND name = ?"); + .prepareStatement("select count(*) from dbo.sysobjects where type = 'TR' AND name = ?"); try { if (catalogName != null) { con.setCatalog(catalogName); 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 a22400d329..66e63f6829 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 @@ -151,7 +151,7 @@ protected String getNativeDefaultValue(Column column) { @Override protected void dropTable(Table table, StringBuilder ddl, boolean temporary, boolean recreate) { writeQuotationOnStatement(ddl); - ddl.append("IF EXISTS (SELECT 1 FROM sysobjects WHERE type = 'U' AND name = "); + ddl.append("IF EXISTS (SELECT 1 FROM dbo.sysobjects WHERE type = 'U' AND name = "); printAlwaysSingleQuotedIdentifier(getTableName(table.getName()), ddl); println(")", ddl); println("BEGIN", ddl); @@ -167,7 +167,7 @@ protected void writeExternalForeignKeyDropStmt(Table table, ForeignKey foreignKe StringBuilder ddl) { String constraintName = getForeignKeyName(table, foreignKey); - ddl.append("IF EXISTS (SELECT 1 FROM sysobjects WHERE type = 'RI' AND name = "); + ddl.append("IF EXISTS (SELECT 1 FROM dbo.sysobjects WHERE type = 'RI' AND name = "); printAlwaysSingleQuotedIdentifier(constraintName, ddl); println(")", ddl); printIndent(ddl); @@ -468,18 +468,18 @@ protected void processChange(Database currentModel, Database desiredModel, println("BEGIN", ddl); println(" DECLARE @" + tableNameVar + " nvarchar(60), @" + constraintNameVar + " nvarchar(60)", ddl); - println(" WHILE EXISTS(SELECT sysindexes.name", ddl); - println(" FROM sysindexes, sysobjects", ddl); - ddl.append(" WHERE sysobjects.name = "); + println(" WHILE EXISTS(SELECT si.name", ddl); + println(" FROM dbo.sysindexes si, dbo.sysobjects so", ddl); + ddl.append(" WHERE so.name = "); printAlwaysSingleQuotedIdentifier(tableName, ddl); - println(" AND sysobjects.id = sysindexes.id AND (sysindexes.status & 2048) > 0)", ddl); + println(" AND so.id = si.id AND (si.status & 2048) > 0)", ddl); println(" BEGIN", ddl); - println(" SELECT @" + tableNameVar + " = sysobjects.name, @" + constraintNameVar - + " = sysindexes.name", ddl); - println(" FROM sysindexes, sysobjects", ddl); - ddl.append(" WHERE sysobjects.name = "); + println(" SELECT @" + tableNameVar + " = so.name, @" + constraintNameVar + + " = si.name", ddl); + println(" FROM dbo.sysindexes si, dbo.sysobjects so", ddl); + ddl.append(" WHERE so.name = "); printAlwaysSingleQuotedIdentifier(tableName, ddl); - ddl.append(" AND sysobjects.id = sysindexes.id AND (sysindexes.status & 2048) > 0"); + ddl.append(" AND so.id = si.id AND (si.status & 2048) > 0"); println(" EXEC ('ALTER TABLE '+@" + tableNameVar + "+' DROP CONSTRAINT '+@" + constraintNameVar + ")", ddl); println(" END", 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 dbc7d411b6..210e7f3f79 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 @@ -143,7 +143,7 @@ protected String getNativeDefaultValue(Column column) { @Override protected void dropTable(Table table, StringBuilder ddl, boolean temporary, boolean recreate) { writeQuotationOnStatement(ddl); - ddl.append("IF EXISTS (SELECT 1 FROM sysobjects WHERE type = 'U' AND name = "); + ddl.append("IF EXISTS (SELECT 1 FROM dbo.sysobjects WHERE type = 'U' AND name = "); printAlwaysSingleQuotedIdentifier(getTableName(table.getName()), ddl); println(")", ddl); println("BEGIN", ddl); @@ -159,7 +159,7 @@ protected void writeExternalForeignKeyDropStmt(Table table, ForeignKey foreignKe StringBuilder ddl) { String constraintName = getForeignKeyName(table, foreignKey); - ddl.append("IF EXISTS (SELECT 1 FROM sysobjects WHERE type = 'RI' AND name = "); + ddl.append("IF EXISTS (SELECT 1 FROM dbo.sysobjects WHERE type = 'RI' AND name = "); printAlwaysSingleQuotedIdentifier(constraintName, ddl); println(")", ddl); printIndent(ddl); @@ -407,18 +407,18 @@ protected void processChange(Database currentModel, Database desiredModel, println("BEGIN", ddl); println(" DECLARE @" + tableNameVar + " nvarchar(60), @" + constraintNameVar + " nvarchar(60)", ddl); - println(" WHILE EXISTS(SELECT sysindexes.name", ddl); - println(" FROM sysindexes, sysobjects", ddl); - ddl.append(" WHERE sysobjects.name = "); + println(" WHILE EXISTS(SELECT si.name", ddl); + println(" FROM dbo.sysindexes si, dbo.sysobjects so", ddl); + ddl.append(" WHERE so.name = "); printAlwaysSingleQuotedIdentifier(tableName, ddl); - println(" AND sysobjects.id = sysindexes.id AND (sysindexes.status & 2048) > 0)", ddl); + println(" AND so.id = si.id AND (si.status & 2048) > 0)", ddl); println(" BEGIN", ddl); - println(" SELECT @" + tableNameVar + " = sysobjects.name, @" + constraintNameVar - + " = sysindexes.name", ddl); - println(" FROM sysindexes, sysobjects", ddl); - ddl.append(" WHERE sysobjects.name = "); + println(" SELECT @" + tableNameVar + " = so.name, @" + constraintNameVar + + " = si.name", ddl); + println(" FROM dbo.sysindexes si, dbo.sysobjects so", ddl); + ddl.append(" WHERE so.name = "); printAlwaysSingleQuotedIdentifier(tableName, ddl); - ddl.append(" AND sysobjects.id = sysindexes.id AND (sysindexes.status & 2048) > 0"); + ddl.append(" AND so.id = si.id AND (si.status & 2048) > 0"); println(" EXEC ('ALTER TABLE '+@" + tableNameVar + "+' DROP CONSTRAINT '+@" + constraintNameVar + ")", ddl); println(" END", ddl); diff --git a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/ase/AseDdlReader.java b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/ase/AseDdlReader.java index 860de776c6..1a8ea7e313 100644 --- a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/ase/AseDdlReader.java +++ b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/ase/AseDdlReader.java @@ -161,7 +161,7 @@ protected Collection readForeignKeys(Connection connection, Database query.append(", refs.refkey"); query.append(idx); } - query.append(" FROM sysreferences refs, sysobjects refobjs, sysobjects localtables, sysobjects remotetables"); + query.append(" FROM dbo.sysreferences refs, dbo.sysobjects refobjs, dbo.sysobjects localtables, dbo.sysobjects remotetables"); query.append(" WHERE refobjs.type = 'RI' AND refs.constrid = refobjs.id AND"); query.append(" localtables.type = 'U' AND refs.tableid = localtables.id AND localtables.name = '"); query.append(tableName); @@ -169,7 +169,7 @@ protected Collection readForeignKeys(Connection connection, Database Statement stmt = connection.createStatement(); PreparedStatement prepStmt = connection - .prepareStatement("SELECT name FROM syscolumns WHERE id = ? AND colid = ?"); + .prepareStatement("SELECT name FROM dbo.syscolumns WHERE id = ? AND colid = ?"); ArrayList result = new ArrayList(); try { @@ -231,11 +231,11 @@ protected boolean isInternalPrimaryKeyIndex(Connection connection, // for pk indexes StringBuffer query = new StringBuffer(); - query.append("SELECT name = sysindexes.name FROM sysindexes, sysobjects WHERE sysobjects.name = '"); + query.append("SELECT name = si.name FROM dbo.sysindexes si, dbo.sysobjects so WHERE so.name = '"); query.append(table.getName()); - query.append("' AND sysindexes.name = '"); + query.append("' AND si.name = '"); query.append(index.getName()); - query.append("' AND sysobjects.id = sysindexes.id AND (sysindexes.status & 2048) > 0"); + query.append("' AND so.id = si.id AND (si.status & 2048) > 0"); Statement stmt = connection.createStatement(); diff --git a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/sqlanywhere/SqlAnywhereDdlReader.java b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/sqlanywhere/SqlAnywhereDdlReader.java index 29cdaa9204..bdc5c99fb8 100644 --- a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/sqlanywhere/SqlAnywhereDdlReader.java +++ b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/sqlanywhere/SqlAnywhereDdlReader.java @@ -145,11 +145,11 @@ protected boolean isInternalPrimaryKeyIndex(Connection connection, // for pk indexes StringBuffer query = new StringBuffer(); - query.append("SELECT name = sysindexes.name FROM sysindexes, sysobjects WHERE sysobjects.name = '"); + query.append("SELECT name = si.name FROM dbo.sysindexes si, dbo.sysobjects so WHERE so.name = '"); query.append(table.getName()); - query.append("' AND sysindexes.name = '"); + query.append("' AND si.name = '"); query.append(index.getName()); - query.append("' AND sysobjects.id = sysindexes.id AND (sysindexes.status & 2048) > 0"); + query.append("' AND so.id = si.id AND (si.status & 2048) > 0"); Statement stmt = connection.createStatement();