You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2010/02/21 16:19:02 UTC
svn commit: r912359 -
/roller/trunk/roller-core/src/main/java/org/apache/roller/util/SQLScriptRunner.java
Author: snoopdave
Date: Sun Feb 21 15:19:00 2010
New Revision: 912359
URL: http://svn.apache.org/viewvc?rev=912359&view=rev
Log:
Cleaned up the SQL output commands so that they look nice when displayed in the Web UI at install/table create time
Modified:
roller/trunk/roller-core/src/main/java/org/apache/roller/util/SQLScriptRunner.java
Modified: roller/trunk/roller-core/src/main/java/org/apache/roller/util/SQLScriptRunner.java
URL: http://svn.apache.org/viewvc/roller/trunk/roller-core/src/main/java/org/apache/roller/util/SQLScriptRunner.java?rev=912359&r1=912358&r2=912359&view=diff
==============================================================================
--- roller/trunk/roller-core/src/main/java/org/apache/roller/util/SQLScriptRunner.java (original)
+++ roller/trunk/roller-core/src/main/java/org/apache/roller/util/SQLScriptRunner.java Sun Feb 21 15:19:00 2010
@@ -30,6 +30,7 @@
import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.lang.StringUtils;
/**
@@ -65,9 +66,12 @@
command += line.trim();
if (command.endsWith(";")) {
// ";" is end of command, so add completed command to list
- commands.add(command.substring(0, command.length() - 1));
+ String cmd = command.substring(0, command.length() - 1);
+ String[] cmdArray = StringUtils.split(cmd);
+ cmd = StringUtils.join(cmdArray, " ");
+ commands.add(cmd);
command = "";
- } else {
+ } else if (StringUtils.isNotEmpty(command)) {
command += " "; // still more command coming so add space
}
}