Skip to content

Commit 8da84f0

Browse files
author
dlopez
committed
Minor bugs and sample config file
1 parent fc332e3 commit 8da84f0

3 files changed

Lines changed: 19 additions & 7 deletions

File tree

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,20 @@ private static void writeResultSet(ResultSet resultSet, PrintWriter out, RunnerC
6262
if (conf.getPrintHeader()) {
6363
for (int i = 1; i <= colCount; i++) {
6464
out.print(rsmd.getColumnName(i));
65-
if (i <= colCount)
65+
if (i < colCount)
6666
out.print(conf.getPrintFieldSeparator());
6767
}
6868
out.println();
6969
} // header
7070
while (resultSet.next()) {
7171
for (int i = 1; i <= colCount; i++) {
7272
out.print(resultSet.getString(i));
73-
if (i <= colCount)
73+
if (i < colCount)
7474
out.print(conf.getPrintFieldSeparator());
7575
} // for col
7676
out.println();
7777
} // while row
78+
out.flush();
7879
}
7980

8081
private static String readAll(InputStream in) throws IOException {
@@ -103,6 +104,11 @@ private static RunnerConfig readArgs(String[] args) throws ConfigException {
103104
}
104105
else
105106
throw new ConfigException(null, "No arguments");
107+
// default values (cant use constructor, explicit or implicit)
108+
if (conf.getPrintFieldSeparator() == null)
109+
conf.setPrintFieldSeparator("\t");
110+
if (conf.getPrintHeader() == null)
111+
conf.setPrintHeader(true);
106112
return conf;
107113
}
108114
}

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

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

33
public class RunnerConfig {
4-
private String inputSQL;
54
private String jdbcDriverPath;
65
private String jdbcDriverClass;
76
private String jdbcUrl;
87
private String jdbcUser;
98
private String jdbcPass;
9+
private String inputSQL;
1010
private String outputResult;
11-
private boolean printHeader;
12-
private String printFieldSeparator;
11+
private Boolean printHeader = true;
12+
private String printFieldSeparator = "\t";
1313

1414
public String getInputSQL() {
1515
return inputSQL;
@@ -67,11 +67,11 @@ public void setOutputResult(String outputResult) {
6767
this.outputResult = outputResult;
6868
}
6969

70-
public boolean getPrintHeader() {
70+
public Boolean getPrintHeader() {
7171
return printHeader;
7272
}
7373

74-
public void setPrintHeader(boolean printHeader) {
74+
public void setPrintHeader(Boolean printHeader) {
7575
this.printHeader = printHeader;
7676
}
7777

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# database connection properties
2+
jdbcDriverPath=
3+
jdbcDriverClass=
4+
jdbcUrl=
5+
jdbcUser=
6+
jdbcPass=

0 commit comments

Comments
 (0)