Changeset: e76cacc01537 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e76cacc01537 Modified Files: Branch: default Log Message:
merging java fixes diffs (88 lines): diff --git a/java/ChangeLog b/java/ChangeLog --- a/java/ChangeLog +++ b/java/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog file for java # This file is updated with Maddlog +* Wed May 25 2011 Fabian Groffen <[email protected]> +- Added a naive implementation for PreparedStatement.setCharacterStream + * Mon Apr 11 2011 Fabian Groffen <[email protected]> - The obsolete Java-based implementation for PreparedStatements (formerly activated using the java_prepared_statements property) has been dropped diff --git a/java/Makefile.ag b/java/Makefile.ag --- a/java/Makefile.ag +++ b/java/Makefile.ag @@ -27,7 +27,7 @@ ant_distjdbc = { COND = HAVE_JAVAJDBC DIR = datadir/monetdb/lib - FILES = monetdb-1.6-mcl.jar monetdb-1.20-jdbc.jar jdbcclient.jar + FILES = monetdb-1.6-mcl.jar monetdb-1.21-jdbc.jar jdbcclient.jar } ant_distmerocontrol = { diff --git a/java/build.properties b/java/build.properties --- a/java/build.properties +++ b/java/build.properties @@ -19,7 +19,7 @@ # major release number JDBC_MAJOR=1 # minor release number -JDBC_MINOR=20 +JDBC_MINOR=21 # an additional identifying string JDBC_VER_SUFFIX=Magnistipula # the default port to connect on, if no port given when using SQL diff --git a/java/release.txt b/java/release.txt --- a/java/release.txt +++ b/java/release.txt @@ -1,8 +1,8 @@ RELEASE NOTES -MonetDB JDBC driver version 1.20 (Magnistipula/MCL-1.6) +MonetDB JDBC driver version 1.21 (Magnistipula/MCL-1.6) Fabian Groffen <[email protected]> -Release date: 2011-05-11 +Release date: 2011-05-25 This JDBC driver is designed for use with MonetDB, a main-memory @@ -53,9 +53,8 @@ The next features are not implemented: - getMetaData - setArray - - setAsciiStream, setBinaryStream, setCharacterStream, setUnicodeStream + - setAsciiStream, setBinaryStream, setUnicodeStream - setBlob - - setBytes - setRef, setURI * java.sql.ResultSet interface The next features are not implemented: diff --git a/java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java b/java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java --- a/java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java +++ b/java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java @@ -23,6 +23,7 @@ import java.util.*; import java.net.URL; import java.io.*; +import java.nio.*; import java.math.*; // BigDecimal, etc. import java.text.SimpleDateFormat; @@ -628,7 +629,13 @@ int length) throws SQLException { - throw new SQLException("Operation setCharacterStream(int parameterIndex, Reader reader, int length) currently not supported!"); + CharBuffer tmp = CharBuffer.allocate(length); + try { + reader.read(tmp); + } catch (IOException e) { + throw new SQLException(e.getMessage()); + } + setString(parameterIndex, tmp.toString()); } /** _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
