Skip to content

Commit

Permalink
0000872: Run uninstall with unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@chenson42
chenson42 committed Nov 5, 2012
1 parent 1156c7f commit 515043b
Show file tree
Hide file tree
Showing 21 changed files with 80 additions and 97 deletions.
2 changes: 1 addition & 1 deletion ...tric-client/src/main/java/org/jumpmind/symmetric/db/AbstractEmbeddedSymmetricDialect.java
View file
Expand Up @@ -62,7 +62,7 @@ public String createCsvPrimaryKeySql(Trigger trigger, TriggerHistory triggerHist
}


public void purge() {
public void purgeRecycleBin() {
}

public String getDefaultCatalog() {
Expand Down
6 changes: 3 additions & 3 deletions symmetric-client/src/main/java/org/jumpmind/symmetric/db/db2/Db2SymmetricDialect.java
View file
Expand Up @@ -67,11 +67,11 @@ protected boolean doesTriggerExistOnPlatform(String catalog, String schema, Stri
}

@Override
protected void createRequiredFunctions() {
protected void createRequiredDatabaseObjects() {
}

@Override
protected void dropRequiredFunctions() {
protected void dropRequiredDatabaseObjects() {
}

@Override
Expand Down Expand Up @@ -110,7 +110,7 @@ public boolean supportsTransactionId() {
return false;
}

public void purge() {
public void purgeRecycleBin() {
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions symmetric-client/src/main/java/org/jumpmind/symmetric/db/db2/Db2v9SymmetricDialect.java
View file
Expand Up @@ -39,7 +39,7 @@ public Db2v9SymmetricDialect(IParameterService parameterService, IDatabasePlatfo
}

@Override
protected void createRequiredFunctions() {
protected void createRequiredDatabaseObjects() {
ISqlTransaction transaction = null;
try {
transaction = platform.getSqlTemplate().startSqlTransaction();
Expand All @@ -57,7 +57,7 @@ protected void createRequiredFunctions() {
close(transaction);
}

super.createRequiredFunctions();
super.createRequiredDatabaseObjects();
}

private URL getSqlScriptUrl() {
Expand Down
6 changes: 3 additions & 3 deletions symmetric-client/src/main/java/org/jumpmind/symmetric/db/derby/DerbySymmetricDialect.java
View file
Expand Up @@ -52,7 +52,7 @@ protected boolean doesTriggerExistOnPlatform(String catalog, String schema, Stri
}

@Override
protected void createRequiredFunctions() {
protected void createRequiredDatabaseObjects() {
String escape = this.parameterService.getTablePrefix() + "_" + "escape";
if (!installed(SQL_FUNCTION_INSTALLED, escape)) {
String sql = "CREATE FUNCTION $(functionName)(STR VARCHAR(10000)) RETURNS " +
Expand Down Expand Up @@ -124,7 +124,7 @@ protected void createRequiredFunctions() {
}

@Override
protected void dropRequiredFunctions() {
protected void dropRequiredDatabaseObjects() {
String escape = this.parameterService.getTablePrefix() + "_" + "escape";
if (installed(SQL_FUNCTION_INSTALLED, escape)) {
uninstall(SQL_DROP_FUNCTION, escape);
Expand Down Expand Up @@ -216,7 +216,7 @@ public String getTransactionTriggerExpression(String defaultCatalog, String defa
return String.format("%s_transaction_id()", parameterService.getTablePrefix());
}

public void purge() {
public void purgeRecycleBin() {
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions ...ric-client/src/main/java/org/jumpmind/symmetric/db/firebird/FirebirdSymmetricDialect.java
View file
Expand Up @@ -49,7 +49,7 @@ public FirebirdSymmetricDialect(IParameterService parameterService, IDatabasePla
}

@Override
protected void createRequiredFunctions() {
protected void createRequiredDatabaseObjects() {
String escape = this.parameterService.getTablePrefix() + "_" + "escape";
if (!installed(SQL_FUNCTION_INSTALLED, escape)) {
String sql = "declare external function $(functionName) cstring(32660) " +
Expand All @@ -75,7 +75,7 @@ protected void createRequiredFunctions() {
}

@Override
protected void dropRequiredFunctions() {
protected void dropRequiredDatabaseObjects() {
String escape = this.parameterService.getTablePrefix() + "_" + "escape";
if (installed(SQL_FUNCTION_INSTALLED, escape)) {
uninstall(SQL_DROP_FUNCTION, escape);
Expand Down Expand Up @@ -128,7 +128,7 @@ public BinaryEncoding getBinaryEncoding() {
return BinaryEncoding.HEX;
}

public void purge() {
public void purgeRecycleBin() {
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions symmetric-client/src/main/java/org/jumpmind/symmetric/db/h2/H2SymmetricDialect.java
View file
Expand Up @@ -86,7 +86,7 @@ public void removeTrigger(StringBuilder sqlBuffer, String catalogName, String sc
}

@Override
protected void createRequiredFunctions() {
protected void createRequiredDatabaseObjects() {
String encode = this.parameterService.getTablePrefix() + "_" + "BASE64_ENCODE";
if (!installed(SQL_FUNCTION_INSTALLED, encode)) {
String sql = "CREATE ALIAS IF NOT EXISTS $(functionName) for \"org.jumpmind.symmetric.db.EmbeddedDbFunctions.encodeBase64\"; ";
Expand All @@ -96,7 +96,7 @@ protected void createRequiredFunctions() {
}

@Override
protected void dropRequiredFunctions() {
protected void dropRequiredDatabaseObjects() {
String encode = this.parameterService.getTablePrefix() + "_" + "BASE64_ENCODE";
if (installed(SQL_FUNCTION_INSTALLED, encode)) {
uninstall(SQL_DROP_FUNCTION, encode);
Expand Down
4 changes: 2 additions & 2 deletions symmetric-client/src/main/java/org/jumpmind/symmetric/db/hsqldb/HsqlDbSymmetricDialect.java
View file
Expand Up @@ -68,7 +68,7 @@ protected boolean doesTriggerExistOnPlatform(String catalogName, String schemaNa
}

@Override
protected void createRequiredFunctions() {
protected void createRequiredDatabaseObjects() {
String encode = this.parameterService.getTablePrefix() + "_" + "base_64_encode";
if (!installed(SQL_FUNCTION_INSTALLED, encode)) {
String sql = "CREATE ALIAS $(functionName) for \"org.jumpmind.symmetric.db.hsqldb.HsqlDbFunctions.encodeBase64\"; ";
Expand All @@ -90,7 +90,7 @@ protected void createRequiredFunctions() {
}

@Override
protected void dropRequiredFunctions() {
protected void dropRequiredDatabaseObjects() {
String encode = this.parameterService.getTablePrefix() + "_" + "base_64_encode";
if (installed(SQL_FUNCTION_INSTALLED, encode)) {
uninstall(SQL_DROP_FUNCTION, encode);
Expand Down
6 changes: 3 additions & 3 deletions ...etric-client/src/main/java/org/jumpmind/symmetric/db/hsqldb2/HsqlDb2SymmetricDialect.java
View file
Expand Up @@ -70,7 +70,7 @@ public void removeTrigger(StringBuilder sqlBuffer, String catalogName, String sc
}

@Override
protected void createRequiredFunctions() {
protected void createRequiredDatabaseObjects() {
String encode = this.parameterService.getTablePrefix() + "_base_64_encode";
if (!installed(SQL_FUNCTION_INSTALLED, encode)) {
String sql = "CREATE FUNCTION $(functionName)(binaryData BINARY) " +
Expand Down Expand Up @@ -106,7 +106,7 @@ protected void createRequiredFunctions() {
}

@Override
protected void dropRequiredFunctions() {
protected void dropRequiredDatabaseObjects() {
String encode = this.parameterService.getTablePrefix() + "_base_64_encode";
if (installed(SQL_FUNCTION_INSTALLED, encode)) {
uninstall(SQL_DROP_FUNCTION, encode);
Expand Down Expand Up @@ -178,7 +178,7 @@ public void truncateTable(String tableName) {
platform.getSqlTemplate().update("delete from " + tableName);
}

public void purge() {
public void purgeRecycleBin() {
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions ...ric-client/src/main/java/org/jumpmind/symmetric/db/informix/InformixSymmetricDialect.java
View file
Expand Up @@ -62,7 +62,7 @@ public String getSyncTriggersExpression() {
}

@Override
protected void createRequiredFunctions() {
protected void createRequiredDatabaseObjects() {
String triggersDisabled = this.parameterService.getTablePrefix() + "_" + "triggers_disabled";
if (!installed(SQL_FUNCTION_INSTALLED, triggersDisabled)) {
String sql = "create function $(defaultSchema)$(functionName)() returning boolean; " +
Expand Down Expand Up @@ -104,7 +104,7 @@ protected void createRequiredFunctions() {
}

@Override
protected void dropRequiredFunctions() {
protected void dropRequiredDatabaseObjects() {
String triggersDisabled = this.parameterService.getTablePrefix() + "_" + "triggers_disabled";
if (installed(SQL_FUNCTION_INSTALLED, triggersDisabled)) {
uninstall(SQL_DROP_FUNCTION, triggersDisabled);
Expand Down Expand Up @@ -155,7 +155,7 @@ public boolean isClobSyncSupported() {
return false;
}

public void purge() {
public void purgeRecycleBin() {
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions ...c-client/src/main/java/org/jumpmind/symmetric/db/interbase/InterbaseSymmetricDialect.java
View file
Expand Up @@ -58,7 +58,7 @@ public InterbaseSymmetricDialect(IParameterService parameterService, IDatabasePl
}

@Override
protected void createRequiredFunctions() {
protected void createRequiredDatabaseObjects() {
String contextTableName = parameterService.getTablePrefix() + "_" + CONTEXT_TABLE_NAME;
try {
platform.getSqlTemplate().queryForInt("select count(*) from " + contextTableName);
Expand Down Expand Up @@ -103,7 +103,7 @@ protected void createRequiredFunctions() {
}

@Override
protected void dropRequiredFunctions() {
protected void dropRequiredDatabaseObjects() {
String escape = this.parameterService.getTablePrefix() + "_" + "escape";
if (installed(SQL_FUNCTION_INSTALLED, escape)) {
uninstall(SQL_DROP_FUNCTION, escape);
Expand Down Expand Up @@ -172,7 +172,7 @@ public BinaryEncoding getBinaryEncoding() {
return BinaryEncoding.HEX;
}

public void purge() {
public void purgeRecycleBin() {
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions symmetric-client/src/main/java/org/jumpmind/symmetric/db/mssql/MsSqlSymmetricDialect.java
View file
Expand Up @@ -61,7 +61,7 @@ public MsSqlSymmetricDialect(IParameterService parameterService, IDatabasePlatfo
}

@Override
protected void createRequiredFunctions() {
protected void createRequiredDatabaseObjects() {
String encode = this.parameterService.getTablePrefix() + "_" + "base64_encode";
if (!installed(SQL_FUNCTION_INSTALLED, encode)) {
String sql = "create function dbo.$(functionName)(@data varbinary(max)) returns varchar(max) " +
Expand Down Expand Up @@ -99,7 +99,7 @@ protected void createRequiredFunctions() {
}

@Override
protected void dropRequiredFunctions() {
protected void dropRequiredDatabaseObjects() {
String encode = this.parameterService.getTablePrefix() + "_" + "base64_encode";
if (installed(SQL_FUNCTION_INSTALLED, encode)) {
uninstall(SQL_DROP_FUNCTION, encode);
Expand Down Expand Up @@ -260,7 +260,7 @@ public boolean isTransactionIdOverrideSupported() {
/*
* Nothing to do for SQL Server
*/
public void purge() {
public void purgeRecycleBin() {
}

public boolean needsToSelectLobData() {
Expand Down
6 changes: 3 additions & 3 deletions symmetric-client/src/main/java/org/jumpmind/symmetric/db/mysql/MySqlSymmetricDialect.java
View file
Expand Up @@ -64,7 +64,7 @@ public boolean supportsTransactionId() {
}

@Override
protected void createRequiredFunctions() {
protected void createRequiredDatabaseObjects() {
int[] versions = Version.parseVersion(getProductVersion());
if (getMajorVersion() == 5
&& (getMinorVersion() == 0 || (getMinorVersion() == 1 && versions[2] < 23))) {
Expand Down Expand Up @@ -112,7 +112,7 @@ protected void createRequiredFunctions() {
}

@Override
protected void dropRequiredFunctions() {
protected void dropRequiredDatabaseObjects() {
String function = this.parameterService.getTablePrefix() + "_" + TRANSACTION_ID + this.functionTemplateKeySuffix;
if (installed(SQL_FUNCTION_INSTALLED, function)) {
uninstall(SQL_DROP_FUNCTION, function);
Expand Down Expand Up @@ -177,7 +177,7 @@ public String getTransactionTriggerExpression(String defaultCatalog, String defa
return getTransactionFunctionName() + "()";
}

public void purge() {
public void purgeRecycleBin() {
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions symmetric-client/src/main/java/org/jumpmind/symmetric/db/oracle/OracleSymmetricDialect.java
View file
Expand Up @@ -106,7 +106,7 @@ public void createTrigger(StringBuilder sqlBuffer, DataEventType dml, Trigger tr
}

@Override
protected void createRequiredFunctions() {
protected void createRequiredDatabaseObjects() {
String blobToClob = this.parameterService.getTablePrefix() + "_" + "blob2clob";
if (!installed(SQL_FUNCTION_INSTALLED, blobToClob)) {
String sql = "CREATE OR REPLACE FUNCTION $(functionName) (blob_in IN BLOB) "
Expand Down Expand Up @@ -200,7 +200,7 @@ protected void createRequiredFunctions() {
}

@Override
protected void dropRequiredFunctions() {
protected void dropRequiredDatabaseObjects() {
String blobToClob = this.parameterService.getTablePrefix() + "_" + "blob2clob";
if (installed(SQL_FUNCTION_INSTALLED, blobToClob)) {
uninstall(SQL_DROP_FUNCTION, blobToClob);
Expand Down Expand Up @@ -261,7 +261,7 @@ public String getSequenceName(SequenceIdentifier identifier) {
return null;
}

public void purge() {
public void purgeRecycleBin() {
platform.getSqlTemplate().update("purge recyclebin");
}

Expand Down
6 changes: 3 additions & 3 deletions ...client/src/main/java/org/jumpmind/symmetric/db/postgresql/PostgreSqlSymmetricDialect.java
View file
Expand Up @@ -58,7 +58,7 @@ public PostgreSqlSymmetricDialect(IParameterService parameterService, IDatabaseP
}

@Override
protected void createRequiredFunctions() {
protected void createRequiredDatabaseObjects() {

if (transactionIdSupported()) {
supportsTransactionId = true;
Expand Down Expand Up @@ -134,7 +134,7 @@ protected void createRequiredFunctions() {
}

@Override
protected void dropRequiredFunctions() {
protected void dropRequiredDatabaseObjects() {
String triggersDisabled = this.parameterService.getTablePrefix() + "_" + "triggers_disabled";
if (installed(SQL_FUNCTION_INSTALLED, triggersDisabled)) {
uninstall(SQL_DROP_FUNCTION, triggersDisabled);
Expand Down Expand Up @@ -232,7 +232,7 @@ public boolean supportsTransactionId() {
return supportsTransactionId;
}

public void purge() {
public void purgeRecycleBin() {
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions symmetric-client/src/main/java/org/jumpmind/symmetric/db/sybase/SybaseSymmetricDialect.java
View file
Expand Up @@ -60,7 +60,7 @@ public SybaseSymmetricDialect(IParameterService parameterService, IDatabasePlatf
}

@Override
protected void createRequiredFunctions() {
protected void createRequiredDatabaseObjects() {
String encode = this.parameterService.getTablePrefix() + "_" + "base64_encode";
if (!installed(SQL_FUNCTION_INSTALLED, encode)) {
String sql = "create function dbo.$(functionName)(@data varbinary(1000)) returns varchar(2000) as " +
Expand Down Expand Up @@ -111,7 +111,7 @@ protected void createRequiredFunctions() {
}

@Override
protected void dropRequiredFunctions() {
protected void dropRequiredDatabaseObjects() {
String encode = this.parameterService.getTablePrefix() + "_" + "base64_encode";
if (installed(SQL_FUNCTION_INSTALLED, encode)) {
uninstall(SQL_DROP_FUNCTION, encode);
Expand Down Expand Up @@ -251,7 +251,7 @@ public boolean isTransactionIdOverrideSupported() {
return true;
}

public void purge() {
public void purgeRecycleBin() {
}

public boolean needsToSelectLobData() {
Expand Down

0 comments on commit 515043b

Please sign in to comment.