outputencoding for sql, patch by Miroslav Zaťko. PR 39541

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1555947 13f79535-47bb-0310-9956-ffa450edef68

CONTRIBUTORS

@@ -254,6 +254,7 @@ Michael Saunders
 Miha
 Mike Davis
 Mike Roberts
+Miroslav Zaťko
 mnowostawski
 Mounir El Hajj
 Nathan Beyer

WHATSNEW

@@ -88,6 +88,9 @@ Other changes:
  * <javadoc> now has an option to fail if javadoc issues warnings.
    Bugzilla Report 55015
 
+ * <sql> has a new outputencoding attribute.
+   Bugzilla Report 39541
+
 Changes from Ant 1.9.2 TO Ant 1.9.3
 ===================================
 

contributors.xml

@@ -1037,6 +1037,10 @@
     <first>Mike</first>
     <last>Roberts</last>
   </name>
+  <name>
+    <first>Miroslav</first>
+    <last>Zaťko</last>
+  </name>
   <name>
     <last>mnowostawski</last>
   </name>

manual/Tasks/sql.html

@@ -90,6 +90,12 @@ and <b>abort</b> execution and transaction and fail task.</p>
   <td valign="top">The encoding of the files containing SQL statements</td>
   <td align="center">No - defaults to default JVM encoding</td>
 </tr>
+<tr>
+  <td valign="top">outputencoding</td>
+  <td valign="top">The encoding of the files holding
+    results.  <em>since 1.9.4</em</td>
+  <td align="center">No - defaults to default JVM encoding</td>
+</tr>
 <tr>
   <td width="12%" valign="top">delimiter</td>
   <td width="78%" valign="top">String that separates SQL statements</td>

src/main/org/apache/tools/ant/taskdefs/SQLExec.java

@@ -162,6 +162,11 @@ public class SQLExec extends JDBCTask {
      */
     private Resource output = null;
 
+    /**
+     * Output encoding.
+     */
+    private String outputEncoding = null;
+
     /**
      * Action to perform if an error is found
      */
@@ -428,6 +433,17 @@ public class SQLExec extends JDBCTask {
         this.output = output;
     }
 
+    /**
+     * The encoding to use when writing the result to a resource.
+     * <p>Default's to the platform's default encoding</p>
+     * @param outputEncoding the name of the encoding or null for the
+     * platform's default encoding
+     * @since Ant 1.9.4
+     */
+    public void setOutputEncoding(String outputEncoding) {
+        this.outputEncoding = outputEncoding;
+    }
+
     /**
      * whether output should be appended to or overwrite
      * an existing file.  Defaults to false.
@@ -641,7 +657,12 @@ public class SQLExec extends JDBCTask {
                                 }
                             }
                         }
+                        if (outputEncoding != null) {
+                            out = new PrintStream(new BufferedOutputStream(os),
+                                                  false, outputEncoding);
+                        } else {
                         out = new PrintStream(new BufferedOutputStream(os));
+                        }
                     }
 
                     // Process all transactions