SYMMETRICDS-105: allow functions to be placed in different schema. th…

…is affects just postgresql at this point.
JumpMind · Jun 4, 2009 · 69ca27d · 69ca27d
1 parent ece9b9d
commit 69ca27d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/db/AbstractDbDialect.java b/symmetric/src/main/java/org/jumpmind/symmetric/db/AbstractDbDialect.java
@@ -210,8 +210,8 @@ final public boolean doesTriggerExist(String catalogName, String schema, String
     protected void createRequiredFunctions() {
         String[] functions = sqlTemplate.getFunctionsToInstall();
         for (String funcName : functions) {
-            if (jdbcTemplate.queryForInt(sqlTemplate.getFunctionInstalledSql(funcName)) == 0) {
-                jdbcTemplate.update(sqlTemplate.getFunctionSql(funcName));
+            if (jdbcTemplate.queryForInt(sqlTemplate.getFunctionInstalledSql(funcName, defaultSchema)) == 0) {
+                jdbcTemplate.update(sqlTemplate.getFunctionSql(funcName, defaultSchema));
                 logger.info("Just installed " + funcName);
             }
         }

diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/db/SqlTemplate.java b/symmetric/src/main/java/org/jumpmind/symmetric/db/SqlTemplate.java
@@ -688,20 +688,24 @@ public void setNewColumnPrefix(String newColumnPrefix) {
         this.newColumnPrefix = newColumnPrefix;
     }
 
-    public String getFunctionSql(String functionName) {
+    public String getFunctionSql(String functionName, String defaultSchema) {
         if (this.functionTemplatesToInstall != null) {
             String ddl = replace("functionName", functionName, this.functionTemplatesToInstall.get(functionName));
             ddl = replace("version", Version.versionWithUnderscores(), ddl);
+            ddl = replace("defaultSchema",
+                    defaultSchema != null && defaultSchema.length() > 0 ? defaultSchema + "." : "", ddl);
             return ddl;
         } else {
             return null;
         }
     }
 
-    public String getFunctionInstalledSql(String functionName) {
+    public String getFunctionInstalledSql(String functionName, String defaultSchema) {
         if (functionInstalledSql != null) {
             String ddl = replace("functionName", functionName, functionInstalledSql);
             ddl = replace("version", Version.versionWithUnderscores(), ddl);
+            ddl = replace("defaultSchema",
+                    defaultSchema != null && defaultSchema.length() > 0 ? defaultSchema + "." : "", ddl);
             return ddl;
         } else {
             return null;

diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/db/mysql/MySqlDbDialect.java b/symmetric/src/main/java/org/jumpmind/symmetric/db/mysql/MySqlDbDialect.java
@@ -69,8 +69,8 @@ protected void createRequiredFunctions() {
         String[] functions = sqlTemplate.getFunctionsToInstall();
         for (String funcName : functions) {
             if (! funcName.equals("fn_transaction_id") || supportsTransactionId) {
-                if (jdbcTemplate.queryForInt(sqlTemplate.getFunctionInstalledSql(funcName)) == 0) {
-                    jdbcTemplate.update(sqlTemplate.getFunctionSql(funcName));
+                if (jdbcTemplate.queryForInt(sqlTemplate.getFunctionInstalledSql(funcName, defaultSchema)) == 0) {
+                    jdbcTemplate.update(sqlTemplate.getFunctionSql(funcName, defaultSchema));
                     logger.info("Just installed " + funcName);
                 }
             }

diff --git a/symmetric/src/main/resources/dialects/postgresql.xml b/symmetric/src/main/resources/dialects/postgresql.xml
@@ -17,15 +17,16 @@
                 <property name="triggerPrefix" value="$[sym.trigger.prefix]" />
                 <property name="functionInstalledSql">
                     <value>
-                        <![CDATA[select count(*) from information_schema.routines where routine_name = '$(functionName)']]>
+                        <![CDATA[select count(*) from information_schema.routines 
+                        where routine_name = '$(functionName)' and specific_schema = '$(defaultSchema)']]>
                     </value>
                 </property>               
                 <property name="functionTemplatesToInstall">
                     <map>
                         <entry key="fn_sym_triggers_disabled">
                             <value>
                                 <![CDATA[ 
-                                CREATE or REPLACE FUNCTION fn_sym_triggers_disabled() RETURNS INTEGER AS $$
+                                CREATE or REPLACE FUNCTION $(defaultSchema)fn_sym_triggers_disabled() RETURNS INTEGER AS $$
                                 DECLARE
                                   triggerDisabled INTEGER;
                                 BEGIN
@@ -41,7 +42,7 @@
                         <entry key="fn_sym_node_disabled">
                             <value>
                                 <![CDATA[ 
-                                CREATE or REPLACE FUNCTION fn_sym_node_disabled() RETURNS VARCHAR AS $$
+                                CREATE or REPLACE FUNCTION $(defaultSchema)fn_sym_node_disabled() RETURNS VARCHAR AS $$
                                 DECLARE
                                   nodeId VARCHAR(50);
                                 BEGIN