--- 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
--- 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 &&
--- 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<Integer, ObjectParameter> parameters = new HashMap<>();
+ private final Map<Integer, ObjectParameter> parameters = new HashMap<>();
private List<Object[]> 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();
--- 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 @@
<userName>dbuser</userName>
<password>dbpass</password>
</database>
+
+ <database>
+ <name>loopback</name>
+ <url>jdbc:loopback://</url>
+ <userName></userName>
+ <password></password>
+ </database>
-->
<!-- Output formatters: -->