From 1bdfd8de337d1e48ede5b5b0632b0fc0b0dbea12 Mon Sep 17 00:00:00 2001 From: chenson42 Date: Sun, 4 Nov 2012 21:20:25 +0000 Subject: [PATCH] 0000872: Add an uninstall feature to SymmetricDS. Add option to the command line. --- .../db/hsqldb2/HsqlDb2SymmetricDialect.java | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/hsqldb2/HsqlDb2SymmetricDialect.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/hsqldb2/HsqlDb2SymmetricDialect.java index 18a1d89d3b..63d9b3c812 100644 --- a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/hsqldb2/HsqlDb2SymmetricDialect.java +++ b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/hsqldb2/HsqlDb2SymmetricDialect.java @@ -71,7 +71,7 @@ public void removeTrigger(StringBuilder sqlBuffer, String catalogName, String sc @Override protected void createRequiredFunctions() { - String encode = this.parameterService.getTablePrefix() + "_" + "BASE_64_ENCODE"; + String encode = this.parameterService.getTablePrefix() + "_base_64_encode"; if (!installed(SQL_FUNCTION_INSTALLED, encode)) { String sql = "CREATE FUNCTION $(functionName)(binaryData BINARY) " + " RETURNS VARCHAR(1000000) " + @@ -82,25 +82,24 @@ protected void createRequiredFunctions() { install(sql, encode); } - String setSession = this.parameterService.getTablePrefix() + "_" + "BASE_64_ENCODE"; + String setSession = this.parameterService.getTablePrefix() + "_set_session"; if (!installed(SQL_FUNCTION_INSTALLED, setSession)) { - String sql = "CREATE FUNCTION $(functionName)(binaryData BINARY) " + - " RETURNS VARCHAR(1000000) " + - " NO SQL " + - " LANGUAGE JAVA PARAMETER STYLE JAVA " + - " EXTERNAL NAME " + - " 'CLASSPATH:org.jumpmind.symmetric.db.hsqldb.HsqlDbFunctions.encodeBase64' "; + String sql = "CREATE PROCEDURE $(functionName)(key VARCHAR(50), data VARCHAR(50)) " + + " NO SQL " + + " LANGUAGE JAVA PARAMETER STYLE JAVA " + + " EXTERNAL NAME " + + " 'CLASSPATH:org.jumpmind.symmetric.db.hsqldb.HsqlDbFunctions.setSession' "; install(sql, setSession); } - String getSession = this.parameterService.getTablePrefix() + "_" + "BASE_64_ENCODE"; + String getSession = this.parameterService.getTablePrefix() + "_get_session"; if (!installed(SQL_FUNCTION_INSTALLED, getSession)) { String sql = "CREATE FUNCTION $(functionName)(key VARCHAR(50)) " + - " RETURNS VARCHAR(50) " + - " NO SQL " + - " LANGUAGE JAVA PARAMETER STYLE JAVA " + - " EXTERNAL NAME " + - " 'CLASSPATH:org.jumpmind.symmetric.db.hsqldb.HsqlDbFunctions.getSession' "; + " RETURNS VARCHAR(50) " + + " NO SQL " + + " LANGUAGE JAVA PARAMETER STYLE JAVA " + + " EXTERNAL NAME " + + " 'CLASSPATH:org.jumpmind.symmetric.db.hsqldb.HsqlDbFunctions.getSession' "; install(sql, getSession); } @@ -108,17 +107,17 @@ protected void createRequiredFunctions() { @Override protected void dropRequiredFunctions() { - String encode = this.parameterService.getTablePrefix() + "_" + "base_64_encode"; + String encode = this.parameterService.getTablePrefix() + "_base_64_encode"; if (installed(SQL_FUNCTION_INSTALLED, encode)) { uninstall(SQL_DROP_FUNCTION, encode); } - String setSession = this.parameterService.getTablePrefix() + "_" + "set_session"; + String setSession = this.parameterService.getTablePrefix() + "_set_session"; if (installed(SQL_FUNCTION_INSTALLED, setSession)) { uninstall(SQL_DROP_FUNCTION, setSession); } - String getSession = this.parameterService.getTablePrefix() + "_" + "get_session"; + String getSession = this.parameterService.getTablePrefix() + "_get_session"; if (installed(SQL_FUNCTION_INSTALLED, getSession)) { uninstall(SQL_DROP_FUNCTION, getSession); }