This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See http://git.nuiton.org/topia.git commit f0d6d37c66e0521d2b2879c603bfa3a0a67bd67a Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Mar 22 15:40:24 2015 +0100 fixes #3662: Do not execute sql comments while migration --- .../topia/migration/AbstractTopiaMigrationCallback.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java b/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java index a96c12a..6b14d7f 100644 --- a/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java +++ b/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java @@ -35,7 +35,9 @@ import org.nuiton.util.version.Version; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import static org.nuiton.i18n.I18n.t; @@ -170,13 +172,19 @@ public abstract class AbstractTopiaMigrationCallback { final boolean showProgression, final String... sqls) throws TopiaException { - if (log.isInfoEnabled()) { - log.info(t("topia.migration.start.sqls", sqls.length)); + final Set<String> sqlsWithoutComments = new LinkedHashSet<String>(); + for (String sql : sqls) { + if (!sql.trim().startsWith("--")) { + sqlsWithoutComments.add(sql); + } + } + if (log.isInfoEnabled()) { + log.info(t("topia.migration.start.sqls", sqlsWithoutComments.size())); } if (showSql) { StringBuilder buffer = new StringBuilder(); - for (String s : sqls) { + for (String s : sqlsWithoutComments) { buffer.append(s).append("\n"); } log.info("SQL TO EXECUTE :\n" + -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.