From 3dbdd7e6135f6bef64b9df25a00cfcdcfef07fb3 Mon Sep 17 00:00:00 2001 From: chenson42 Date: Wed, 7 Dec 2011 19:18:45 +0000 Subject: [PATCH] make sure replacement tokens are used when parsing sql script --- .../src/main/java/org/jumpmind/db/sql/SqlScript.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/symmetric/symmetric-db/src/main/java/org/jumpmind/db/sql/SqlScript.java b/symmetric/symmetric-db/src/main/java/org/jumpmind/db/sql/SqlScript.java index e9a4f957b8..9c6f0d874e 100644 --- a/symmetric/symmetric-db/src/main/java/org/jumpmind/db/sql/SqlScript.java +++ b/symmetric/symmetric-db/src/main/java/org/jumpmind/db/sql/SqlScript.java @@ -53,8 +53,6 @@ public class SqlScript { private boolean failOnError = true; - private Map replacementTokens; - private String lineDeliminator; public SqlScript(URL url, ISqlTemplate sqlTemplate) { @@ -97,14 +95,13 @@ public SqlScript(String sqlScript, ISqlTemplate sqlTemplate, boolean failOnError private void init(List sqlScript, ISqlTemplate sqlTemplate, boolean failOnError, String delimiter, Map replacementTokens) { - this.statements = parseLines(sqlScript); + this.statements = parseLines(sqlScript, replacementTokens); this.sqlTemplate = sqlTemplate; this.failOnError = failOnError; this.delimiter = delimiter; - this.replacementTokens = replacementTokens; } - protected List parseLines(List script) { + protected List parseLines(List script, Map replacementTokens) { List statements = new ArrayList(); StringBuilder sql = new StringBuilder(); for (String line : script) {