This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit fffcdeeb3d862f0bbeb33c5a5fdd128a10da6b90 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 27 19:48:17 2015 +0200 Ne pas ajouter aux requetes de migrations les commentaires --- .../AbstractObserveMigrationCallBack.java | 34 +++++++++++++--------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java index 9819d82..e3b7c7e 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java @@ -40,6 +40,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -65,21 +66,28 @@ public abstract class AbstractObserveMigrationCallBack extends TopiaMigrationCal String migrationScript = prefix + "-" + scriptSuffix + ".sql"; String scriptPath = "/db/" + version.getVersion() + "/" + migrationScript; + if (log.isInfoEnabled()) { - log.info("Will will load migration script: "+scriptPath); + log.info("Will will load migration script: " + scriptPath); } - InputStream stream = getClass().getResourceAsStream(scriptPath); - String content; - try { - content = IOUtils.toString(stream, Charsets.UTF_8); - stream.close(); + + try (InputStream stream = getClass().getResourceAsStream(scriptPath)) { + String content = IOUtils.toString(stream, Charsets.UTF_8); + Set<String> result = new LinkedHashSet<>(); + for (String statement : content.split("\n")) { + + if (statement.startsWith("--")) { + // commentaire + continue; + } + result.add(statement); + } + + return result.toArray(new String[result.size()]); } catch (IOException e) { throw new TopiaException("Could not load migration script: " + migrationScript, e); - } finally { - IOUtils.closeQuietly(stream); } - return content.split("\n"); } @@ -111,9 +119,9 @@ public abstract class AbstractObserveMigrationCallBack extends TopiaMigrationCal } protected void addScript(String prefix, List<String> queries) { - { - String[] migrationQueries = loadScript(prefix); - queries.addAll(Lists.newArrayList(migrationQueries)); - } + + String[] migrationQueries = loadScript(prefix); + queries.addAll(Lists.newArrayList(migrationQueries)); + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.