Skip to content

Commit 69dfec3

Browse files
author
David Lopez
committed
Add charset parameter for output
1 parent 690d7f0 commit 69dfec3

File tree

3 files changed

+21
-1
lines changed

3 files changed

+21
-1
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>io.github.jdlopez</groupId>
88
<artifactId>sqlcmd</artifactId>
9-
<version>1.1.1</version>
9+
<version>1.1.2</version>
1010

1111
<dependencies>
1212
<dependency>

src/main/java/es/jdlopez/sqlcmd/MainRunner.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
package es.jdlopez.sqlcmd;
22

33
import java.io.BufferedReader;
4+
import java.io.BufferedWriter;
45
import java.io.File;
56
import java.io.FileInputStream;
7+
import java.io.FileOutputStream;
68
import java.io.FileReader;
79
import java.io.IOException;
810
import java.io.InputStream;
911
import java.io.InputStreamReader;
12+
import java.io.OutputStreamWriter;
1013
import java.io.PrintWriter;
1114
import java.io.StringWriter;
15+
import java.nio.charset.Charset;
1216
import java.sql.Connection;
1317
import java.sql.DriverManager;
1418
import java.sql.ResultSet;
@@ -39,9 +43,13 @@ public static void main (String[] args) throws Exception {
3943
}
4044
else if (config.getOutputResult() == null)
4145
out = new PrintWriter(System.out, true);
46+
else if (config.getCharset() != null)
47+
out = new PrintWriter(new FileOutputStream(config.getOutputResult()), true,
48+
Charset.forName(config.getCharset()));
4249
else
4350
out = new PrintWriter(config.getOutputResult());
4451

52+
4553
Connection conn = null;
4654
try {
4755
if (config.getJdbcDriverPath() == null) {

src/main/java/es/jdlopez/sqlcmd/RunnerConfig.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package es.jdlopez.sqlcmd;
22

3+
import java.nio.charset.Charset;
4+
35
public class RunnerConfig {
46
private String jdbcDriverPath;
57
private String jdbcDriverClass;
@@ -23,6 +25,8 @@ public class RunnerConfig {
2325
private String formatterName;
2426

2527
private ResultFormatter formatter = null;
28+
private String charset;
29+
2630
public ResultFormatter buildFormatter() {
2731
if (formatter == null) {
2832
if (ResultFormatter.HTML.equalsIgnoreCase(formatterName))
@@ -187,4 +191,12 @@ public String getFormatterName() {
187191
public void setFormatterName(String formatterName) {
188192
this.formatterName = formatterName;
189193
}
194+
195+
public String getCharset() {
196+
return charset;
197+
}
198+
199+
public void setCharset(String charset) {
200+
this.charset = charset;
201+
}
190202
}

0 commit comments

Comments
 (0)