Changeset: efffbc6a1653 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=efffbc6a1653
Modified Files:
java/Makefile.ag
java/build.properties
java/release.txt
java/src/nl/cwi/monetdb/jdbc/MonetConnection.java
Branch: default
Log Message:
Merged from Apr2011
diffs (84 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 <fab...@cwi.nl>
+- 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 <fabian.grof...@cwi.nl>
-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");
}
/**
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
