pass datasource to bsh script

JumpMind · Nov 21, 2011 · 72985b4 · 72985b4
1 parent 9dda090
commit 72985b4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractDbDialect.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractDbDialect.java
@@ -557,7 +557,7 @@ public String getCreateSymmetricDDL() {
         Database database = readSymmetricSchemaFromXml();
         prefixConfigDatabase(database);
         StringWriter writer = new StringWriter();
-        SqlBuilder builder = platform.createSqlBuilder(writer);
+        SqlBuilder builder = platform.getDdlBuilder();
         builder.createTables(database, true);
         return writer.getBuffer().toString();
     }
@@ -567,7 +567,7 @@ public String getCreateTableSQL(TriggerRouter triggerRouter) {
                 triggerRouter.getTrigger().getSourceTableName(), true);
         String sql = null;
         StringWriter writer = new StringWriter();
-        SqlBuilder builder = platform.createSqlBuilder(writer);
+        SqlBuilder builder = platform.getDdlBuilder();
         builder.createTable(cachedModel, table);
         sql = writer.toString();
         return sql;
@@ -666,7 +666,7 @@ protected boolean createTablesIfNecessary() {
             }
 
             StringWriter writer = new StringWriter();
-            SqlBuilder builder = platform.createSqlBuilder(writer);
+            SqlBuilder builder = platform.getDdlBuilder();
 
             if (builder.isAlterDatabase(modelFromDatabase, modelFromXml)) {
                 log.info("TablesAutoUpdatingFoundTablesToAlter");
@@ -1375,4 +1375,8 @@ protected SQLException findSQLException(Throwable ex) {
         }
         return null;
     }
+
+    public JdbcTemplate getJdbcTemplate() {
+		return jdbcTemplate;
+	}
 }
diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/IDbDialect.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/IDbDialect.java
@@ -332,4 +332,6 @@ public DmlStatement createStatementBuilder(DmlType type, String catalogName, Str
      */
     public boolean isPrimaryKeyViolation(Exception ex);
 
+    public JdbcTemplate getJdbcTemplate();
+
 }

diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/load/csv/CsvLoader.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/load/csv/CsvLoader.java
@@ -223,7 +223,7 @@ public void load() throws IOException {
                             Map<String, Object> variables = new HashMap<String, Object>();
                             Node identity = nodeService.findIdentity();
                             variables.put("SOURCE_NODE_ID", context.getNodeId());
-                            variables.put("DATASOURCE", context.getJdbcTemplate().getDataSource());
+                            variables.put("DATASOURCE", dbDialect.getJdbcTemplate().getDataSource());
                             if (identity != null) {
                                 variables.put("TARGET_NODE_ID", identity.getNodeId());
                                 variables.put("TARGET_EXTERNAL_ID", identity.getExternalId());