Changeset: cf4722f136ed for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cf4722f136ed Modified Files: sql/backends/monet5/datacell/Makefile.ag sql/backends/monet5/datacell/actuator.mx sql/backends/monet5/datacell/sensor.mx Branch: default Log Message:
Merge results diffs (148 lines): diff --git a/java/ChangeLog.Apr2011 b/java/ChangeLog.Apr2011 --- a/java/ChangeLog.Apr2011 +++ b/java/ChangeLog.Apr2011 @@ -1,3 +1,9 @@ # ChangeLog file for java # This file is updated with Maddlog +* Mon Jun 6 2011 Fabian Groffen <[email protected]> +- Fixed read-only interpretation. Connection.isReadOnly now always + returns false, setReadOnly now generates a warning when called with + true. Partly from bug #2818 +- Allow readonly to be set when autocommit is disabled as well. Bug #2818 + 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.21-jdbc.jar jdbcclient.jar + FILES = monetdb-1.6-mcl.jar monetdb-1.22-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=21 +JDBC_MINOR=22 # 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.21 (Magnistipula/MCL-1.6) +MonetDB JDBC driver version 1.22 (Magnistipula/MCL-1.6) Fabian Groffen <[email protected]> -Release date: 2011-05-25 +Release date: 2011-06-06 This JDBC driver is designed for use with MonetDB, a main-memory diff --git a/java/src/nl/cwi/monetdb/jdbc/MonetConnection.java b/java/src/nl/cwi/monetdb/jdbc/MonetConnection.java --- a/java/src/nl/cwi/monetdb/jdbc/MonetConnection.java +++ b/java/src/nl/cwi/monetdb/jdbc/MonetConnection.java @@ -559,12 +559,14 @@ /** * Retrieves whether this Connection object is in read-only mode. - * MonetDB currently doesn't support updateable result sets. + * MonetDB currently doesn't support updateable result sets, but + * updates are possible. Hence the Connection object is never in + * read-only mode. * * @return true if this Connection object is read-only; false otherwise */ public boolean isReadOnly() { - return(true); + return(false); } public String nativeSQL(String sql) {return(sql);} @@ -905,10 +907,8 @@ * method is called during a transaction. */ public void setReadOnly(boolean readOnly) throws SQLException { - if (autoCommit == false) throw - new SQLException("changing read-only setting not allowed during transactions"); - if (readOnly == false) - addWarning("cannot setReadOnly(false): writable mode not supported"); + if (readOnly == true) + addWarning("cannot setReadOnly(true): read-only Connection mode not supported"); } /** diff --git a/sql/backends/monet5/datacell/Makefile.ag b/sql/backends/monet5/datacell/Makefile.ag --- a/sql/backends/monet5/datacell/Makefile.ag +++ b/sql/backends/monet5/datacell/Makefile.ag @@ -47,17 +47,15 @@ } bin_actuator = { - # FIXME: usec comes from basket.mx, use GDKusec instead? - # socket_* comes from dcsocket.mx SOURCES = actuator.mx dcsocket.mx LIBS = ../../../../common/stream/libstream \ ../../../../common/options/libmoptions \ - ../../../../gdk/libbat + ../../../../gdk/libbat \ + ../../../../monetdb5/tools/libmonetdb5 } bin_sensor = { - # FIXME: usec comes from basket.mx, use GDKusec instead? SOURCES = sensor.mx dcsocket.mx LIBS = ../../../../common/stream/libstream \ ../../../../common/options/libmoptions \ diff --git a/sql/backends/monet5/datacell/actuator.mx b/sql/backends/monet5/datacell/actuator.mx --- a/sql/backends/monet5/datacell/actuator.mx +++ b/sql/backends/monet5/datacell/actuator.mx @@ -54,13 +54,6 @@ #include "dcsocket.h" -#define MYBUFSIZ 64*1024 -#ifndef SHUT_RD -#define SHUT_RD 0 -#define SHUT_WR 1 -#define SHUT_RDWR 2 -#endif - /*#define _DEBUG_ACTUATOR_ */ #define ACout GDKout diff --git a/sql/backends/monet5/datacell/sensor.mx b/sql/backends/monet5/datacell/sensor.mx --- a/sql/backends/monet5/datacell/sensor.mx +++ b/sql/backends/monet5/datacell/sensor.mx @@ -59,6 +59,7 @@ #endif +#include "dcsocket.h" /*#define DEBUG*/ #define SEout GDKout diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c --- a/sql/server/rel_dump.c +++ b/sql/server/rel_dump.c @@ -912,7 +912,8 @@ { sql_rel *rel = NULL, *nrel, *lrel, *rrel; list *exps, *gexps; - int distinct = 0, j=0; + int distinct = 0; + operator_type j = 0; skipWS(r,pos); if (r[*pos] == 'd') { _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
