# HG changeset patch # User František Kučera # Date 1396799581 -7200 # Node ID dec1ba8af6c505e3c51d47e308d4ec4d5d9654c2 # Parent 701ec4db43fbf6e523f8181597213a97901fa658 improved JDBC loopback driver diff -r 701ec4db43fb -r dec1ba8af6c5 .hgignore --- a/.hgignore Fri Apr 04 23:40:28 2014 +0200 +++ b/.hgignore Sun Apr 06 17:53:01 2014 +0200 @@ -2,10 +2,15 @@ *~ temp/* + java/sql-dk/dist/ java/sql-dk/build/ java/sql-dk/nbproject/private/ +java/jdbc-loopback-driver/dist/ +java/jdbc-loopback-driver/build/ +java/jdbc-loopback-driver/nbproject/private/ + java/sql-dk/data/info/globalcode/sql/dk/version.txt java/sql-dk/data/info/globalcode/sql/dk/help.txt diff -r 701ec4db43fb -r dec1ba8af6c5 distributions/debian/build.sh --- a/distributions/debian/build.sh Fri Apr 04 23:40:28 2014 +0200 +++ b/distributions/debian/build.sh Sun Apr 06 17:53:01 2014 +0200 @@ -25,11 +25,12 @@ pushd TMP && -cp ../../../scripts/sql-dk.sh sql-dk && -cp ../../../xml/config.xsd config.xsd && -cp ../../../xml/config.rnc config.rnc && -cp ../../../xml/config.xsl config.xsl && -cp ../../../java/sql-dk/dist/sql-dk.jar sql-dk.jar && +cp ../../../scripts/sql-dk.sh sql-dk && +cp ../../../xml/config.xsd config.xsd && +cp ../../../xml/config.rnc config.rnc && +cp ../../../xml/config.xsl config.xsl && +cp ../../../java/sql-dk/dist/sql-dk.jar sql-dk.jar && +cp ../../../java/jdbc-loopback-driver/dist/jdbc-loopback-driver.jar jdbc-loopback-driver.jar && cp ../../../java/sql-dk/dist/bash-completion.sh SQL-DK && # TODO: should be sql-dk – name conflict with sql-dk in /usr/bin/ (equivs bug) chmod 755 sql-dk && @@ -40,7 +41,7 @@ CONTROL_FILE="equivs-control" && COPYRIGHT_FILE="copyright" && URL="https://sql-dk.globalcode.info/" && -VERSION="0.8" && +VERSION="0.9" && echo "Section: database Priority: optional @@ -56,6 +57,7 @@ Extra-Files: config.xsd, config.rnc, config.xsl Files: sql-dk /usr/bin/ sql-dk.jar /usr/share/sql-dk/ + jdbc-loopback-driver.jar /usr/share/sql-dk/ SQL-DK /etc/bash_completion.d/ Description: SQL batch client SQL-DK is a command-line client for relational databases." > $CONTROL_FILE && diff -r 701ec4db43fb -r dec1ba8af6c5 java/jdbc-loopback-driver/src/info/globalcode/jdbc/loopback/PreparedStatement.java --- a/java/jdbc-loopback-driver/src/info/globalcode/jdbc/loopback/PreparedStatement.java Fri Apr 04 23:40:28 2014 +0200 +++ b/java/jdbc-loopback-driver/src/info/globalcode/jdbc/loopback/PreparedStatement.java Sun Apr 06 17:53:01 2014 +0200 @@ -31,9 +31,9 @@ */ public class PreparedStatement extends AbstractPreparedStatement { - private Map parameters = new HashMap<>(); + private final Map parameters = new HashMap<>(); private List table; - private ResultSetMetaData metadata = new ResultSetMetaData(); + private final ResultSetMetaData metadata = new ResultSetMetaData(); @Override public void setObject(int parameterIndex, Object data, int targetSqlType) throws SQLException { @@ -46,7 +46,7 @@ if (parameters.size() < 1) { throw new SQLException("Missing first parameter (column count)"); } else { - int columnCount = Integer.valueOf((String) parameters.get(1).getData()); + int columnCount = Integer.valueOf(String.valueOf(parameters.get(1).getData())); for (int i = 0; i < columnCount; i++) { String label = parameters.get(1 + i + 1).getData().toString(); diff -r 701ec4db43fb -r dec1ba8af6c5 xml/config.xml --- a/xml/config.xml Fri Apr 04 23:40:28 2014 +0200 +++ b/xml/config.xml Sun Apr 06 17:53:01 2014 +0200 @@ -17,6 +17,13 @@ dbuser dbpass + + + loopback + jdbc:loopback:// + + + -->