# HG changeset patch
# User Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
# Date 1666284830 -7200
# Node ID 2448ce0175937b1c23b7c2a5d6a247bbb80915aa
# Parent  8f7d51c478dfaa6527c2c2404487a51cf9a4499f
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

diff --git a/src/main/java/org/monetdb/jdbc/MonetConnection.java b/src/main/java/org/monetdb/jdbc/MonetConnection.java
--- a/src/main/java/org/monetdb/jdbc/MonetConnection.java
+++ b/src/main/java/org/monetdb/jdbc/MonetConnection.java
@@ -214,7 +214,7 @@ public class MonetConnection
 		boolean initial_autocommit = true;
 		if (autocommit_prop != null) {
 			initial_autocommit = Boolean.parseBoolean(autocommit_prop);
-			conn_props.setProperty("initial_autocommit", Boolean.toString(initial_autocommit));
+			conn_props.setProperty("autocommit", Boolean.toString(initial_autocommit));
 		}
 
 		final String fetchsize_prop = props.getProperty("fetchsize");
@@ -300,6 +300,7 @@ public class MonetConnection
 		handshakeOptions.set(Setting.ReplySize, defaultFetchSize);
 //		handshakeOptions.set(Setting.SizeHeader, 1);
 		server.setHandshakeOptions(handshakeOptions);
+		autoCommit = initial_autocommit;
 
 		// we're debugging here... uhm, should be off in real life
 		if (debug) {
diff --git a/src/main/java/org/monetdb/jdbc/MonetDatabaseMetaData.java b/src/main/java/org/monetdb/jdbc/MonetDatabaseMetaData.java
--- a/src/main/java/org/monetdb/jdbc/MonetDatabaseMetaData.java
+++ b/src/main/java/org/monetdb/jdbc/MonetDatabaseMetaData.java
@@ -3882,7 +3882,8 @@ public class MonetDatabaseMetaData
 			"('password', 128, '', 'password for user name to login to MonetDB server')," +
 			"('language', 16, 'sql', 'language (sql or mal) used to parse commands in MonetDB server')," +
 			"('database', 1024, 'demo', 'name of database. It matches the dbfarm subdirectory name')," +
-			"('debug', 5, 'false', 'boolean flag true or false')," +
+			"('autocommit', 5, 'true', 'boolean flag true or false to turn autocommit on or off')," +
+			"('debug', 5, 'false', 'boolean flag true or false to turn debug logging on or off')," +
 			"('logfile', 1024, 'monet_######.log', 'name of logfile used when debug is enabled')," +
 			"('hash', 128, '', 'hash methods list to use in server connection. Supported are SHA512, SHA384, SHA256 and SHA1')," +
 			"('treat_blob_as_binary', 5, 'true', 'should blob columns be mapped to Types.VARBINARY instead of Types.BLOB in ResultSets and PreparedStatements')," +