From dac039a25fb4c0336412e10872f7c9762f391be2 Mon Sep 17 00:00:00 2001 From: dgutierr Date: Tue, 29 Sep 2015 17:00:49 +0200 Subject: [PATCH] BZ-1049238: Optimize DDL scripts for production use --- .../dashboard/database/DatabaseAutoSynchronizer.java | 9 +++++---- .../src/main/webapp/WEB-INF/etc/sql/1-create-mysql.sql | 5 ++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/modules/dashboard-commons/src/main/java/org/jboss/dashboard/database/DatabaseAutoSynchronizer.java b/modules/dashboard-commons/src/main/java/org/jboss/dashboard/database/DatabaseAutoSynchronizer.java index 9b6fb4ff..4e723d1c 100755 --- a/modules/dashboard-commons/src/main/java/org/jboss/dashboard/database/DatabaseAutoSynchronizer.java +++ b/modules/dashboard-commons/src/main/java/org/jboss/dashboard/database/DatabaseAutoSynchronizer.java @@ -47,7 +47,7 @@ public class DatabaseAutoSynchronizer { @Inject @Config("dashb_installed_module") protected String installedModulesTable; - @Inject @Config("DELIMITER //,//,// DELIMITER ;,GO") + @Inject @Config("DELIMITER //,//,DELIMITER ;,GO") protected String[] excludedScriptStatements; @Inject @Config("-- CUSTOM_DELIMITER") @@ -105,8 +105,7 @@ protected void runSQLFile(File f) throws Exception { } protected void runDDL(final String ddl) throws Exception { - String separator = ";"; - if (ddl.startsWith(customDelimiterEnabler)) separator = customDelimiter; + String separator = ddl.startsWith(customDelimiterEnabler) ? customDelimiter : ";"; String[] statements = splitString(ddl, separator); for (int i = 0; i < statements.length; i++) { final String ddlStatement = removeComments(statements[i]).trim(); @@ -114,7 +113,9 @@ protected void runDDL(final String ddl) throws Exception { continue; } - if (log.isDebugEnabled()) log.debug("Running statement: " + ddlStatement); + if (log.isDebugEnabled()) { + log.debug("Running statement: " + ddlStatement); + } new HibernateTxFragment() { protected void txFragment(Session session) throws Exception { Work w = new Work() { diff --git a/modules/dashboard-webapp/src/main/webapp/WEB-INF/etc/sql/1-create-mysql.sql b/modules/dashboard-webapp/src/main/webapp/WEB-INF/etc/sql/1-create-mysql.sql index 8773a809..854b3937 100644 --- a/modules/dashboard-webapp/src/main/webapp/WEB-INF/etc/sql/1-create-mysql.sql +++ b/modules/dashboard-webapp/src/main/webapp/WEB-INF/etc/sql/1-create-mysql.sql @@ -47,7 +47,10 @@ BEGIN END -- CUSTOM_DELIMITER -// DELIMITER ; +// +-- CUSTOM_DELIMITER + +DELIMITER ; -- CUSTOM_DELIMITER CREATE TABLE dashb_data_source (