Author: cbegin
Date: Mon Mar 29 00:50:50 2010
New Revision: 928551
URL: http://svn.apache.org/viewvc?rev=928551&view=rev
Log:
maintain newlines in migration scripts.
Modified:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/executor/ErrorContext.java
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/migration/MigrationReader.java
Modified:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/executor/ErrorContext.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/executor/ErrorContext.java?rev=928551&r1=928550&r2=928551&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/executor/ErrorContext.java
(original)
+++
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/executor/ErrorContext.java
Mon Mar 29 00:50:50 2010
@@ -2,7 +2,7 @@ package org.apache.ibatis.executor;
public class ErrorContext {
- private static String NEWLINE; // Can't be final due to a weird Java
compiler issue.
+ private static final String LINE_SEPARATOR =
System.getProperty("line.separator","\n");
private static final ThreadLocal<ErrorContext> LOCAL = new
ThreadLocal<ErrorContext>();
private ErrorContext stored;
@@ -13,14 +13,6 @@ public class ErrorContext {
private String sql;
private Throwable cause;
- static {
- try {
- NEWLINE = System.getProperty("line.separator");
- } catch (Throwable t) {
- NEWLINE = "\n";
- }
- }
-
private ErrorContext() {
}
@@ -93,42 +85,42 @@ public class ErrorContext {
// message
if (this.message != null) {
- description.append(NEWLINE);
+ description.append(LINE_SEPARATOR);
description.append("### ");
description.append(this.message);
}
// resource
if (resource != null) {
- description.append(NEWLINE);
+ description.append(LINE_SEPARATOR);
description.append("### The error may exist in ");
description.append(resource);
}
// object
if (object != null) {
- description.append(NEWLINE);
+ description.append(LINE_SEPARATOR);
description.append("### The error may involve ");
description.append(object);
}
// activity
if (activity != null) {
- description.append(NEWLINE);
+ description.append(LINE_SEPARATOR);
description.append("### The error occurred while ");
description.append(activity);
}
// activity
if (sql != null) {
- description.append(NEWLINE);
+ description.append(LINE_SEPARATOR);
description.append("### SQL: ");
description.append(sql.replace('\n', ' ').replace('\r', '
').replace('\t', ' ').trim());
}
// cause
if (cause != null) {
- description.append(NEWLINE);
+ description.append(LINE_SEPARATOR);
description.append("### Cause: ");
description.append(cause.toString());
}
Modified:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java?rev=928551&r1=928550&r2=928551&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java
(original)
+++
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java
Mon Mar 29 00:50:50 2010
@@ -8,6 +8,8 @@ import java.sql.*;
public class ScriptRunner {
+ private static final String LINE_SEPARATOR =
System.getProperty("line.separator","\n");
+
private static final String DEFAULT_DELIMITER = ";";
private Connection connection;
@@ -75,16 +77,14 @@ public class ScriptRunner {
}
private void executeFullScript(Reader reader) {
- final String lineseparator = System.getProperty("line.separator");
StringBuffer script = new StringBuffer();
try {
BufferedReader lineReader = new BufferedReader(reader);
String line;
while ((line = lineReader.readLine()) != null) {
script.append(line);
- script.append(lineseparator);
+ script.append(LINE_SEPARATOR);
}
- System.out.println(script);
executeStatement(script.toString());
commitConnection();
} catch (Exception e) {
@@ -161,13 +161,13 @@ public class ScriptRunner {
println(trimmedLine);
} else if (commandReadyToExecute(trimmedLine)) {
command.append(line.substring(0, line.lastIndexOf(delimiter)));
- command.append(" ");
+ command.append(LINE_SEPARATOR);
println(command);
executeStatement(command.toString());
command.setLength(0);
} else if (trimmedLine.length() > 0) {
command.append(line);
- command.append(" ");
+ command.append(LINE_SEPARATOR);
}
return command;
}
Modified:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/migration/MigrationReader.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/migration/MigrationReader.java?rev=928551&r1=928550&r2=928551&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/migration/MigrationReader.java
(original)
+++
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/migration/MigrationReader.java
Mon Mar 29 00:50:50 2010
@@ -10,6 +10,8 @@ import java.util.Properties;
public class MigrationReader extends Reader {
+ private static final String LINE_SEPARATOR =
System.getProperty("line.separator","\n");
+
private Reader target;
public MigrationReader(Reader source, boolean undo, Properties variables)
throws IOException {
@@ -28,7 +30,7 @@ public class MigrationReader extends Rea
line = line.replace("--//", "-- ");
}
currentBuilder.append(line);
- currentBuilder.append("\n");
+ currentBuilder.append(LINE_SEPARATOR);
}
}
if (undo) {
