Changeset: 6aa38e8c0f2d for monetdb-java URL: https://dev.monetdb.org/hg/monetdb-java/rev/6aa38e8c0f2d Modified Files: build.xml example/MJDBCTest.java example/OnClientExample.java example/PreparedExample.java example/SQLImport.java release.txt src/main/java/nl/cwi/monetdb/client/JdbcClient.java src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java src/main/java/nl/cwi/monetdb/jdbc/types/INET.java src/main/java/nl/cwi/monetdb/jdbc/types/URL.java src/main/java/nl/cwi/monetdb/mcl/net/MapiSocket.java src/main/java/org/monetdb/client/JMonetDB.java src/main/java/org/monetdb/client/JdbcClient.java src/main/java/org/monetdb/jdbc/MonetBlob.java src/main/java/org/monetdb/jdbc/MonetCallableStatement.java src/main/java/org/monetdb/jdbc/MonetClob.java src/main/java/org/monetdb/jdbc/MonetConnection.java src/main/java/org/monetdb/jdbc/MonetDataSource.java src/main/java/org/monetdb/jdbc/MonetDatabaseMetaData.java src/main/java/org/monetdb/jdbc/MonetDriver.java.in src/main/java/org/monetdb/jdbc/MonetPreparedStatement.java src/main/java/org/monetdb/jdbc/MonetResultSet.java src/main/java/org/monetdb/jdbc/MonetSavepoint.java src/main/java/org/monetdb/jdbc/MonetStatement.java src/main/java/org/monetdb/jdbc/MonetWrapper.java src/main/java/org/monetdb/jdbc/types/INET.java src/main/java/org/monetdb/jdbc/types/URL.java src/main/java/org/monetdb/mcl/MCLException.java src/main/java/org/monetdb/mcl/io/BufferedMCLReader.java src/main/java/org/monetdb/mcl/io/BufferedMCLWriter.java src/main/java/org/monetdb/mcl/io/LineType.java src/main/java/org/monetdb/mcl/net/HandshakeOptions.java src/main/java/org/monetdb/mcl/net/MapiSocket.java src/main/java/org/monetdb/mcl/parser/HeaderLineParser.java src/main/java/org/monetdb/mcl/parser/MCLParseException.java src/main/java/org/monetdb/mcl/parser/MCLParser.java src/main/java/org/monetdb/mcl/parser/StartOfHeaderParser.java src/main/java/org/monetdb/mcl/parser/TupleLineParser.java src/main/java/org/monetdb/merovingian/Control.java src/main/java/org/monetdb/merovingian/MerovingianException.java src/main/java/org/monetdb/merovingian/SabaothDB.java src/main/java/org/monetdb/util/CmdLineOpts.java src/main/java/org/monetdb/util/Exporter.java src/main/java/org/monetdb/util/Extract.java src/main/java/org/monetdb/util/FileTransferHandler.java src/main/java/org/monetdb/util/MDBvalidator.java src/main/java/org/monetdb/util/OptionsException.java src/main/java/org/monetdb/util/SQLExporter.java src/main/java/org/monetdb/util/SQLRestore.java src/main/java/org/monetdb/util/XMLExporter.java tests/JDBC_API_Tester.java tests/OnClientTester.java tests/SQLcopyinto.java tests/Test_Cforkbomb.java tests/Test_Csendthread.java tests/build.xml tests/drop.sql version.sh Branch: default Log Message:
Updated Copyright year. diffs (truncated from 752 to 300 lines): diff --git a/build.xml b/build.xml --- a/build.xml +++ b/build.xml @@ -5,7 +5,7 @@ This Source Code Form is subject to the License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. -Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. +Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. --> <!-- diff --git a/example/MJDBCTest.java b/example/MJDBCTest.java --- a/example/MJDBCTest.java +++ b/example/MJDBCTest.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ import java.sql.*; diff --git a/example/OnClientExample.java b/example/OnClientExample.java --- a/example/OnClientExample.java +++ b/example/OnClientExample.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ import org.monetdb.jdbc.MonetConnection; @@ -98,6 +98,7 @@ public class OnClientExample { while (rs.next()) { count++; } + rs.close(); System.out.printf(" OK, returned %d rows%n", count); } else { System.out.printf(" OK, updated %d rows%n", stmt.getUpdateCount()); @@ -108,7 +109,6 @@ public class OnClientExample { System.out.println(" => SQL ERROR " + e.getMessage()); status = 1; } - } return status; @@ -229,7 +229,6 @@ public class OnClientExample { handle.uploadFrom(stream); } - private void justCountLines(MonetConnection.Download handle) throws IOException { System.out.println(" HANDLER: not writing the download to file, just counting the lines"); InputStream stream = handle.getStream(); @@ -260,6 +259,5 @@ public class OnClientExample { bufwriter.close(); // do not forget this } } - } } diff --git a/example/PreparedExample.java b/example/PreparedExample.java --- a/example/PreparedExample.java +++ b/example/PreparedExample.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ import java.sql.*; @@ -37,6 +37,7 @@ public class PreparedExample { } System.out.println(""); } + rs.close(); con.close(); } diff --git a/example/SQLImport.java b/example/SQLImport.java --- a/example/SQLImport.java +++ b/example/SQLImport.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ import java.sql.*; @@ -74,6 +74,7 @@ public class SQLImport { stmt.close(); // close the connection with the database con.close(); + // close the file fr.close(); } } diff --git a/release.txt b/release.txt --- a/release.txt +++ b/release.txt @@ -1,6 +1,6 @@ RELEASE NOTES MonetDB JDBC driver version 3.2 (Liberica/MCL-1.21) -Release date: 2021-10-15 +Release date: 2022-01-19 The Java Database Connectivity (JDBC) API provides universal data access from the Java programming language. @@ -109,7 +109,8 @@ Currently implemented JDBC 4.2 interface * java.sql.Statement The next methods/options are NOT useable/supported: - cancel (query execution cannot be terminated, once started) - see also: https://www.monetdb.org/bugzilla/show_bug.cgi?id=6222 + see also: https://github.com/MonetDB/monetdb-java/issues/7 + or https://www.monetdb.org/bugzilla/show_bug.cgi?id=6222 - execute with column indices or names - executeUpdate with column indices or names - setMaxFieldSize diff --git a/src/main/java/nl/cwi/monetdb/client/JdbcClient.java b/src/main/java/nl/cwi/monetdb/client/JdbcClient.java --- a/src/main/java/nl/cwi/monetdb/client/JdbcClient.java +++ b/src/main/java/nl/cwi/monetdb/client/JdbcClient.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ package nl.cwi.monetdb.client; diff --git a/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java b/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java --- a/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java +++ b/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ package nl.cwi.monetdb.jdbc; diff --git a/src/main/java/nl/cwi/monetdb/jdbc/types/INET.java b/src/main/java/nl/cwi/monetdb/jdbc/types/INET.java --- a/src/main/java/nl/cwi/monetdb/jdbc/types/INET.java +++ b/src/main/java/nl/cwi/monetdb/jdbc/types/INET.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ package nl.cwi.monetdb.jdbc.types; diff --git a/src/main/java/nl/cwi/monetdb/jdbc/types/URL.java b/src/main/java/nl/cwi/monetdb/jdbc/types/URL.java --- a/src/main/java/nl/cwi/monetdb/jdbc/types/URL.java +++ b/src/main/java/nl/cwi/monetdb/jdbc/types/URL.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ package nl.cwi.monetdb.jdbc.types; diff --git a/src/main/java/nl/cwi/monetdb/mcl/net/MapiSocket.java b/src/main/java/nl/cwi/monetdb/mcl/net/MapiSocket.java --- a/src/main/java/nl/cwi/monetdb/mcl/net/MapiSocket.java +++ b/src/main/java/nl/cwi/monetdb/mcl/net/MapiSocket.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ package nl.cwi.monetdb.mcl.net; diff --git a/src/main/java/org/monetdb/client/JMonetDB.java b/src/main/java/org/monetdb/client/JMonetDB.java --- a/src/main/java/org/monetdb/client/JMonetDB.java +++ b/src/main/java/org/monetdb/client/JMonetDB.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ package org.monetdb.client; diff --git a/src/main/java/org/monetdb/client/JdbcClient.java b/src/main/java/org/monetdb/client/JdbcClient.java --- a/src/main/java/org/monetdb/client/JdbcClient.java +++ b/src/main/java/org/monetdb/client/JdbcClient.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ package org.monetdb.client; diff --git a/src/main/java/org/monetdb/jdbc/MonetBlob.java b/src/main/java/org/monetdb/jdbc/MonetBlob.java --- a/src/main/java/org/monetdb/jdbc/MonetBlob.java +++ b/src/main/java/org/monetdb/jdbc/MonetBlob.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ package org.monetdb.jdbc; diff --git a/src/main/java/org/monetdb/jdbc/MonetCallableStatement.java b/src/main/java/org/monetdb/jdbc/MonetCallableStatement.java --- a/src/main/java/org/monetdb/jdbc/MonetCallableStatement.java +++ b/src/main/java/org/monetdb/jdbc/MonetCallableStatement.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ package org.monetdb.jdbc; diff --git a/src/main/java/org/monetdb/jdbc/MonetClob.java b/src/main/java/org/monetdb/jdbc/MonetClob.java --- a/src/main/java/org/monetdb/jdbc/MonetClob.java +++ b/src/main/java/org/monetdb/jdbc/MonetClob.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ package org.monetdb.jdbc; 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 @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ package org.monetdb.jdbc; diff --git a/src/main/java/org/monetdb/jdbc/MonetDataSource.java b/src/main/java/org/monetdb/jdbc/MonetDataSource.java --- a/src/main/java/org/monetdb/jdbc/MonetDataSource.java +++ b/src/main/java/org/monetdb/jdbc/MonetDataSource.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ package org.monetdb.jdbc; 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 @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ package org.monetdb.jdbc; diff --git a/src/main/java/org/monetdb/jdbc/MonetDriver.java.in b/src/main/java/org/monetdb/jdbc/MonetDriver.java.in --- a/src/main/java/org/monetdb/jdbc/MonetDriver.java.in +++ b/src/main/java/org/monetdb/jdbc/MonetDriver.java.in @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. */ package org.monetdb.jdbc; diff --git a/src/main/java/org/monetdb/jdbc/MonetPreparedStatement.java b/src/main/java/org/monetdb/jdbc/MonetPreparedStatement.java --- a/src/main/java/org/monetdb/jdbc/MonetPreparedStatement.java +++ b/src/main/java/org/monetdb/jdbc/MonetPreparedStatement.java @@ -3,7 +3,7 @@ _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
