lowka commented on code in PR #6806:
URL: https://github.com/apache/ignite-3/pull/6806#discussion_r2452229083
##########
modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcMultiStatementSelfTest.java:
##########
@@ -417,7 +430,7 @@ public void testAutoCommitFalse() throws Exception {
@Test
@SuppressWarnings("ThrowableNotThrown")
public void testAutoCommitFalseTxControlStatementsNotSupported() throws
Exception {
- String txErrMsg = "Transaction control statements are not supported
when autocommit mode is disabled";
+ String txErrMsg = "Transaction control statement cannot be executed
within an external transaction.";
Review Comment:
Thanks. Fixed.
##########
modules/jdbc/src/main/java/org/apache/ignite/internal/jdbc2/ResultSetWrapper.java:
##########
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.jdbc2;
+
+import java.sql.SQLException;
+
+final class ResultSetWrapper {
+
+ private JdbcResultSet resultSet;
+
+ ResultSetWrapper(JdbcResultSet first) {
+ resultSet = first;
+ }
+
+ void setCloseStatement(boolean b) {
+ resultSet.setCloseStatement(b);
+ }
+
+ JdbcResultSet current() {
+ return resultSet;
+ }
+
+ boolean isQuery() {
+ ClientSyncResultSet rs = resultSet.resultSet();
+
+ return rs.hasRowSet();
+ }
+
+ int updateCount() {
+ JdbcResultSet rs = resultSet;
+
+ ClientSyncResultSet clientResultSet = rs.resultSet();
+ if (clientResultSet.hasRowSet()) {
+ return -1;
+ } else if (clientResultSet.wasApplied() ||
!clientResultSet.wasApplied() && clientResultSet.affectedRows() == -1) {
+ // DDL or control statements
+ return 0;
+ } else if (clientResultSet.affectedRows() >= 0) {
+ return (int) clientResultSet.affectedRows();
+ } else {
+ return -1;
+ }
Review Comment:
Thanks. Fixed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
