comparison src/main/java/org/monetdb/jdbc/MonetConnection.java @ 666:2448ce017593

Fixes related to adding autocommit=true/false option to jdbc url See https://dev.monetdb.org/hg/monetdb-java/rev/108123ca6889 Stil todo: add entry in ChangeLog, add test to JDBC_API_Tester.java
author Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
date Thu, 20 Oct 2022 18:53:50 +0200 (2022-10-20)
parents 8f7d51c478df
children fade6c6960cc
comparison
equal deleted inserted replaced
665:8f7d51c478df 666:2448ce017593
212 212
213 String autocommit_prop = props.getProperty("autocommit"); 213 String autocommit_prop = props.getProperty("autocommit");
214 boolean initial_autocommit = true; 214 boolean initial_autocommit = true;
215 if (autocommit_prop != null) { 215 if (autocommit_prop != null) {
216 initial_autocommit = Boolean.parseBoolean(autocommit_prop); 216 initial_autocommit = Boolean.parseBoolean(autocommit_prop);
217 conn_props.setProperty("initial_autocommit", Boolean.toString(initial_autocommit)); 217 conn_props.setProperty("autocommit", Boolean.toString(initial_autocommit));
218 } 218 }
219 219
220 final String fetchsize_prop = props.getProperty("fetchsize"); 220 final String fetchsize_prop = props.getProperty("fetchsize");
221 if (fetchsize_prop != null) { 221 if (fetchsize_prop != null) {
222 try { 222 try {
298 handshakeOptions.set(Setting.AutoCommit, initial_autocommit ? 1 : 0); 298 handshakeOptions.set(Setting.AutoCommit, initial_autocommit ? 1 : 0);
299 handshakeOptions.set(Setting.TimeZone, offsetSeconds); 299 handshakeOptions.set(Setting.TimeZone, offsetSeconds);
300 handshakeOptions.set(Setting.ReplySize, defaultFetchSize); 300 handshakeOptions.set(Setting.ReplySize, defaultFetchSize);
301 // handshakeOptions.set(Setting.SizeHeader, 1); 301 // handshakeOptions.set(Setting.SizeHeader, 1);
302 server.setHandshakeOptions(handshakeOptions); 302 server.setHandshakeOptions(handshakeOptions);
303 autoCommit = initial_autocommit;
303 304
304 // we're debugging here... uhm, should be off in real life 305 // we're debugging here... uhm, should be off in real life
305 if (debug) { 306 if (debug) {
306 try { 307 try {
307 final String fname = props.getProperty("logfile", "monet_" + System.currentTimeMillis() + ".log"); 308 final String fname = props.getProperty("logfile", "monet_" + System.currentTimeMillis() + ".log");