Merge pull request #488 from ishimoto/utf8migration

add UTF-8 migration SQLStatements from Input Stream
wocommunity · Oct 1, 2013 · 6c85da9 · 6c85da9
2 parents b7453e1 + 0be1657
commit 6c85da9
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/jdbc/ERXSQLHelper.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/jdbc/ERXSQLHelper.java
@@ -1428,7 +1428,8 @@ else if (ch == '-' && prev == '-' && !inQuotes) {
 	 *             if there is a problem reading the stream
 	 */
 	public NSArray<String> splitSQLStatementsFromInputStream(InputStream is) throws IOException {
-		return splitSQLStatements(ERXStringUtilities.stringFromInputStream(is));
+		String encoding = System.getProperty("file.encoding");
+		return splitSQLStatements(ERXStringUtilities.stringIsNullOrEmpty(encoding) ? ERXStringUtilities.stringFromInputStream(is) : ERXStringUtilities.stringFromInputStream(is, encoding));
 	}
 
 	/**