Changeset: 5cc071c5c170 for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java/rev/5cc071c5c170
Modified Files:
ChangeLog
src/main/java/org/monetdb/client/JdbcClient.java
src/main/java/org/monetdb/jdbc/MonetConnection.java
src/main/java/org/monetdb/jdbc/MonetPreparedStatement.java
src/main/java/org/monetdb/jdbc/MonetStatement.java
tests/JDBC_API_Tester.java
Branch: default
Log Message:
Corrected the returned integer values of Statement methods executeUpdate(...),
executeLargeUpdate(...), getUpdateCount() and getLargeUpdateCount() and
PreparedStatement methods executeUpdate() and executeLargeUpdate(). They
returned -2 for DDL statements, which was not in compliance with the JDBC API
documentation.
diffs (truncated from 338 to 300 lines):
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,17 @@
# ChangeLog file for monetdb-java
# This file is updated with Maddlog
+* Thu Feb 13 2025 Martin van Dinther <martin.van.dint...@monetdbsolutions.com>
+- Corrected the returned integer values of Statement methods
+ getUpdateCount() and getLargeUpdateCount(). They returned -2 for
+ DDL statements, which was not in compliance with the JDBC API
+ documentation. Now they no longer return numbers smaller than -1.
+- Corrected the returned integer values of Statement methods
+ executeUpdate(...) and executeLargeUpdate(...) and PreparedStatement
+ methods executeUpdate() and executeLargeUpdate(). They returned -2 for
+ DDL statements, which was not in compliance with the JDBC API
+ documentation. Now they no longer return negative numbers.
+
* Wed Feb 12 2025 Martin van Dinther <martin.van.dint...@monetdbsolutions.com>
- Fix a bug in DatabaseMetaData.getTables() where a provided string in the
array of table types argument would contain a single quote or back slash.
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
@@ -1087,10 +1087,10 @@ public final class JdbcClient {
long finishTime = 0;
// execute the query, let the driver decide what type it is
- int aff = -1;
+ long aff = -1;
boolean nextRslt = stmt.execute(query,
Statement.RETURN_GENERATED_KEYS);
if (!nextRslt)
- aff = stmt.getUpdateCount();
+ aff = stmt.getLargeUpdateCount();
do {
if (nextRslt) {
// we have a ResultSet, print it
@@ -1118,7 +1118,7 @@ public final class JdbcClient {
rs.clearWarnings();
}
rs.close();
- } else if (aff != -1) {
+ } else {
String timingoutput = "";
if (showTiming) {
finishTime = System.currentTimeMillis();
@@ -1126,13 +1126,13 @@ public final class JdbcClient {
startTime = finishTime;
}
- if (aff == Statement.SUCCESS_NO_INFO) {
+ if (aff == -1) {
out.println("Operation successful" +
timingoutput);
} else {
// we have an update count
// see if a key was generated
final ResultSet rs =
stmt.getGeneratedKeys();
- final boolean hasGeneratedKeyData =
rs.next();
+ final boolean hasGeneratedKeyData = (rs
!= null && rs.next());
out.println(aff + " affected row" +
(aff != 1 ? "s" : "") +
(hasGeneratedKeyData ? ", last
generated key: " + rs.getString(1) : "") +
timingoutput);
@@ -1142,7 +1142,7 @@ public final class JdbcClient {
out.flush();
} while ((nextRslt = stmt.getMoreResults()) ||
- (aff = stmt.getUpdateCount()) != -1);
+ (aff = stmt.getLargeUpdateCount()) != -1);
// if there were warnings for this statement show them!
warn = stmt.getWarnings();
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
@@ -2935,16 +2935,10 @@ public class MonetConnection
/**
* The SchemaResponse represents an schema modification response.
* It is issued on statements like CREATE, DROP or ALTER TABLE.
- * This response keeps a field that represents the success state, as
- * defined by JDBC, which is currently in MonetDB's case always
- * SUCCESS_NO_INFO. Note that this state is not sent by the
- * server.<br />
* <samp>&3</samp>
*/
// {{{ SchemaResponse class implementation
class SchemaResponse implements Response {
- public final int state = Statement.SUCCESS_NO_INFO;
-
@Override
public String addLine(final String line, final LineType
linetype) {
return "Header lines are not supported for a
SchemaResponse";
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
@@ -327,7 +327,7 @@ public class MonetPreparedStatement
if (execute() != false)
throw new SQLException("Query produced a result set",
"M1M17");
- return getUpdateCount();
+ return Math.max(getUpdateCount(), 0);
}
/** override the executeUpdate from the Statement to throw an
SQLException */
@@ -2263,7 +2263,7 @@ public class MonetPreparedStatement
if (execute() != false)
throw new SQLException("Query produced a result set",
"M1M17");
- return getLargeUpdateCount();
+ return Math.max(getLargeUpdateCount(), 0L);
}
//== end methods interface PreparedStatement
diff --git a/src/main/java/org/monetdb/jdbc/MonetStatement.java
b/src/main/java/org/monetdb/jdbc/MonetStatement.java
--- a/src/main/java/org/monetdb/jdbc/MonetStatement.java
+++ b/src/main/java/org/monetdb/jdbc/MonetStatement.java
@@ -502,7 +502,7 @@ public class MonetStatement
if (execute(sql) != false)
throw new SQLException("Statement produced a result
set", "M1M17");
- return getUpdateCount();
+ return Math.max(getUpdateCount(), 0);
}
/**
@@ -535,7 +535,7 @@ public class MonetStatement
if (execute(sql) != false)
throw new SQLException("Statement produced a result
set", "M1M17");
- return getUpdateCount();
+ return Math.max(getUpdateCount(), 0);
}
/**
@@ -1133,9 +1133,9 @@ public class MonetStatement
public long getLargeUpdateCount() throws SQLException {
if (header != null) {
if (header instanceof MonetConnection.UpdateResponse) {
- return
((MonetConnection.UpdateResponse)header).count;
- } else if (header instanceof
MonetConnection.SchemaResponse) {
- return
((MonetConnection.SchemaResponse)header).state;
+ final long updCnt =
((MonetConnection.UpdateResponse)header).count;
+ if (updCnt >= 0)
+ return updCnt;
}
}
return -1;
@@ -1319,8 +1319,8 @@ public class MonetStatement
new SQLException("Batch query
produced a ResultSet! " +
"Ignoring and setting
update count to value " + EXECUTE_FAILED, "M1M17"));
counts[offset] = EXECUTE_FAILED;
- } else if (count >= 0) {
- counts[offset] = count;
+ } else {
+ counts[offset] = (count >= 0) ? count :
SUCCESS_NO_INFO;
}
offset++;
} while ((hasResultSet = getMoreResults()) || (count =
getLargeUpdateCount()) != -1);
@@ -1358,7 +1358,7 @@ public class MonetStatement
if (execute(sql) != false)
throw new SQLException("Statement produced a result
set", "M1M17");
- return getLargeUpdateCount();
+ return Math.max(getLargeUpdateCount(), 0L);
}
/**
@@ -1400,7 +1400,7 @@ public class MonetStatement
if (execute(sql) != false)
throw new SQLException("Statement produced a result
set", "M1M17");
- return getLargeUpdateCount();
+ return Math.max(getLargeUpdateCount(), 0L);
}
/**
diff --git a/tests/JDBC_API_Tester.java b/tests/JDBC_API_Tester.java
--- a/tests/JDBC_API_Tester.java
+++ b/tests/JDBC_API_Tester.java
@@ -810,8 +810,8 @@ public final class JDBC_API_Tester {
private void handleExecuteDDL(Statement stmt, String action, String
objtype, String objname, String sql) {
try {
int response = stmt.executeUpdate(sql);
- if (response != Statement.SUCCESS_NO_INFO)
- sb.append(action).append("
").append(objtype).append(" ").append(objname).append(" failed to return -2!!
It returned: ").append(response).append("\n");
+ if (response != 0)
+ sb.append(action).append("
").append(objtype).append(" ").append(objname).append(" failed to return 0!! It
returned: ").append(response).append("\n");
} catch (SQLException e) {
sb.append("Failed to ").append(action).append("
").append(objtype).append(" ").append(objname).append(":
").append(e.getMessage()).append("\n");
}
@@ -2542,8 +2542,8 @@ public final class JDBC_API_Tester {
stmt = con.createStatement();
int updates = 0;
updates = stmt.executeUpdate("CREATE TABLE
table_Test_PSmetadata ( myint int, mydouble double, mybool boolean, myvarchar
varchar(15), myclob clob )");
- if (updates != Statement.SUCCESS_NO_INFO)
- sb.append("1. Expected -2 got
").append(updates).append(" instead\n");
+ if (updates != 0)
+ sb.append("1. Expected 0 got
").append(updates).append(" instead\n");
// all NULLs
updates = stmt.executeUpdate("INSERT INTO
table_Test_PSmetadata VALUES (NULL, NULL, NULL, NULL,
NULL)");
@@ -3024,8 +3024,8 @@ public final class JDBC_API_Tester {
stmt = con.createStatement();
int updates = stmt.executeUpdate("CREATE TABLE
table_Test_PSsqldata ( myinet inet, myurl url )");
- if (updates != Statement.SUCCESS_NO_INFO)
- sb.append("1. Expected -2 got
").append(updates).append(" instead\n");
+ if (updates != 0)
+ sb.append("1. Expected 0 got
").append(updates).append(" instead\n");
pstmt = con.prepareStatement("INSERT INTO
table_Test_PSsqldata VALUES (?, ?)");
ParameterMetaData pmd = pstmt.getParameterMetaData();
@@ -3131,8 +3131,8 @@ public final class JDBC_API_Tester {
stmt = con.createStatement();
int updates = stmt.executeUpdate("CREATE TABLE
Test_PStimedate (t time, ts timestamp, d date)");
- if (updates != Statement.SUCCESS_NO_INFO)
- sb.append("1. Expected -2 got
").append(updates).append(" instead\n");
+ if (updates != 0)
+ sb.append("1. Expected 0 got
").append(updates).append(" instead\n");
pstmt = con.prepareStatement("INSERT INTO
Test_PStimedate VALUES (?, ?, ?)");
sb.append("1. empty call...");
@@ -3228,8 +3228,8 @@ public final class JDBC_API_Tester {
stmt = con.createStatement();
int updates = stmt.executeUpdate("CREATE TABLE
Test_PStimezone (ts timestamp, tsz timestamp with time zone, t time, tz time
with time zone)");
- if (updates != Statement.SUCCESS_NO_INFO)
- sb.append("1. Expected -2 got
").append(updates).append(" instead\n");
+ if (updates != 0)
+ sb.append("1. Expected 0 got
").append(updates).append(" instead\n");
pstmt = con.prepareStatement("INSERT INTO
Test_PStimezone VALUES (?, ?, ?, ?)");
sb.append("1. empty call...");
@@ -3448,13 +3448,13 @@ public final class JDBC_API_Tester {
" comment varchar(100)," +
" CONSTRAINT htmtest_htmid_pkey PRIMARY
KEY (htmid)" +
")" );
- if (updates != Statement.SUCCESS_NO_INFO)
- sb.append("1. Expected -2 got
").append(updates).append(" instead\n");
+ if (updates != 0)
+ sb.append("1. Expected 0 got
").append(updates).append(" instead\n");
// index is not used, but the original bug had it too
updates = stmt.executeUpdate("CREATE INDEX htmid ON
htmtest (htmid)");
- if (updates != Statement.SUCCESS_NO_INFO)
- sb.append("1. Expected -2 got
").append(updates).append(" instead\n");
+ if (updates != 0)
+ sb.append("1. Expected 0 got
").append(updates).append(" instead\n");
stmt.close();
@@ -3694,8 +3694,8 @@ public final class JDBC_API_Tester {
" id int, tiny_int tinyint, small_int smallint,
medium_int mediumint, \"integer\" int, big_int bigint," +
" a_real real, a_float float, a_double double,
a_decimal decimal(8,2), a_numeric numeric(8)," +
" bool boolean, a_char char(4), b_char char(5),
a_varchar varchar(20), PRIMARY KEY (id) )");
- if (updates != Statement.SUCCESS_NO_INFO)
- sb.append("1a. Expected -2 got
").append(updates).append(" instead\n");
+ if (updates != 0)
+ sb.append("1a. Expected 0 got
").append(updates).append(" instead\n");
// all falses
updates = stmt.executeUpdate("INSERT INTO
Test_Rbooleans VALUES
(1,0,0,0,0,0,0.0,0.0,0.0,0.0,0,false,'fals','false','false')");
@@ -4709,7 +4709,7 @@ public final class JDBC_API_Tester {
stmt = con.createStatement();
sb.append("1. create...");
- if (stmt.executeUpdate("CREATE TABLE Test_Sbatching (
id int )") != Statement.SUCCESS_NO_INFO)
+ if (stmt.executeUpdate("CREATE TABLE Test_Sbatching (
id int )") != 0)
sb.append("Wrong return status\n");
else
sb.append("passed\n");
@@ -4780,7 +4780,7 @@ public final class JDBC_API_Tester {
sb.append(rs.getInt(1)).append(" passed\n");
sb.append("8. drop table...");
- if (stmt.executeUpdate("DROP TABLE Test_Sbatching") !=
Statement.SUCCESS_NO_INFO)
+ if (stmt.executeUpdate("DROP TABLE Test_Sbatching") !=
0)
sb.append("Wrong return status\n");
else
sb.append("passed\n");
@@ -5043,7 +5043,7 @@ public final class JDBC_API_Tester {
sb.append("1. create table...");
// create a simple table with an auto-generated key (id)
upd = stmt.executeUpdate("CREATE TABLE bogus_gen_keys
(\n \"id\" serial,\n \"x\" varchar(12)\n);");
- if (upd != Statement.SUCCESS_NO_INFO)
+ if (upd != 0)
sb.append("Wrong return status:
").append(upd).append("\n");
else
sb.append("passed\n");
@@ -5094,7 +5094,7 @@ public final class JDBC_API_Tester {
try {
sb.append("7. drop table...");
upd = stmt.executeUpdate("DROP TABLE bogus_gen_keys");
- if (upd != Statement.SUCCESS_NO_INFO)
+ if (upd != 0)
sb.append("Wrong return status:
").append(upd).append("\n");
else
sb.append("passed\n");
@@ -6093,7 +6093,7 @@ public final class JDBC_API_Tester {
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
