IGNITE-8838: Fixed ODBC issue with two inserts without closing cursor.

Author: isapego

modules/platforms/cpp/core-test/src/compute_test.cpp

@@ -513,7 +513,7 @@ BOOST_AUTO_TEST_CASE(IgniteBroadcastLocalSync)
 {
     Compute compute = node.GetCompute();
 
-    BOOST_CHECKPOINT("Broadcasting");;
+    BOOST_CHECKPOINT("Broadcasting");
     std::vector<std::string> res = compute.Broadcast<std::string>(Func2(8, 5));
 
     BOOST_CHECK_EQUAL(res.size(), 1);
@@ -524,7 +524,7 @@ BOOST_AUTO_TEST_CASE(IgniteBroadcastLocalAsync)
 {
     Compute compute = node.GetCompute();
 
-    BOOST_CHECKPOINT("Broadcasting");;
+    BOOST_CHECKPOINT("Broadcasting");
     Future< std::vector<std::string> > res = compute.BroadcastAsync<std::string>(Func2(312, 245));
 
     BOOST_CHECK(!res.IsReady());

modules/platforms/cpp/odbc-test/src/queries_test.cpp

@@ -2024,4 +2024,39 @@ BOOST_AUTO_TEST_CASE(TestQueryAndConnectionTimeoutBoth)
     InsertTestBatch(11, 20, 9);
 }
 
+BOOST_AUTO_TEST_CASE(TestSeveralInsertsWithoutClosing)
+{
+    Connect("DRIVER={Apache Ignite};ADDRESS=127.0.0.1:11110;SCHEMA=cache");
+    
+    SQLCHAR request[] = "INSERT INTO TestType(_key, i32Field) VALUES(?, ?)";
+
+    SQLRETURN ret = SQLPrepare(stmt, request, SQL_NTS);
+
+    if (!SQL_SUCCEEDED(ret))
+        BOOST_FAIL(GetOdbcErrorMessage(SQL_HANDLE_STMT, stmt));
+
+    int64_t key = 0;
+    ret = SQLBindParameter(stmt, 1, SQL_PARAM_INPUT, SQL_C_SBIGINT, SQL_BIGINT, 0, 0, &key, 0, 0);
+
+    if (!SQL_SUCCEEDED(ret))
+        BOOST_FAIL(GetOdbcErrorMessage(SQL_HANDLE_STMT, stmt));
+
+    int32_t data = 0;
+    ret = SQLBindParameter(stmt, 2, SQL_PARAM_INPUT, SQL_C_SLONG, SQL_INTEGER, 0, 0, &data, 0, 0);
+
+    if (!SQL_SUCCEEDED(ret))
+        BOOST_FAIL(GetOdbcErrorMessage(SQL_HANDLE_STMT, stmt));
+
+    for (int32_t i = 0; i < 10; ++i)
+    {
+        key = i;
+        data = i * 10;
+
+        ret = SQLExecute(stmt);
+
+        if (!SQL_SUCCEEDED(ret))
+            BOOST_FAIL(GetOdbcErrorMessage(SQL_HANDLE_STMT, stmt));
+    }
+}
+
 BOOST_AUTO_TEST_SUITE_END()

modules/platforms/cpp/odbc-test/src/sql_types_test.cpp

@@ -128,7 +128,7 @@ BOOST_AUTO_TEST_CASE(TestByteArrayParamInsert)
 
     const int8_t data[] = { 'A','B','C','D','E','F','G','H','I','J' };
     std::vector<int8_t> paramData(data, data + sizeof(data) / sizeof(data[0]));
-    SQLCHAR request[] = "INSERT INTO TestType(_key, i8ArrayField) VALUES(?, ?)";;
+    SQLCHAR request[] = "INSERT INTO TestType(_key, i8ArrayField) VALUES(?, ?)";
 
     ret = SQLPrepare(stmt, request, SQL_NTS);
 
@@ -161,7 +161,7 @@ BOOST_AUTO_TEST_CASE(TestByteParamInsert)
 {
     SQLRETURN ret;
 
-    SQLCHAR request[] = "INSERT INTO TestType(_key, i8Field) VALUES(?, ?)";;
+    SQLCHAR request[] = "INSERT INTO TestType(_key, i8Field) VALUES(?, ?)";
 
     ret = SQLPrepare(stmt, request, SQL_NTS);
 

modules/platforms/cpp/odbc-test/src/sql_value_expressions_test.cpp

@@ -51,7 +51,7 @@ BOOST_AUTO_TEST_CASE(TestCase)
                 "THEN (i32Field / 2) "
                 "ELSE (i32Field / 3) "
             "END "
-        "FROM TestType", in.i32Field / 3);;
+        "FROM TestType", in.i32Field / 3);
 }
 
 BOOST_AUTO_TEST_CASE(TestCast)

modules/platforms/cpp/odbc/src/message.cpp

@@ -274,7 +274,7 @@ namespace ignite
             if (status == ResponseStatus::SUCCESS)
                 ReadOnSuccess(reader, ver);
             else
-                utility::ReadString(reader, error);;
+                utility::ReadString(reader, error);
         }
 
         void Response::ReadOnSuccess(impl::binary::BinaryReaderImpl&, const ProtocolVersion&)

modules/platforms/cpp/odbc/src/query/batch_query.cpp

@@ -50,11 +50,7 @@ namespace ignite
             SqlResult::Type BatchQuery::Execute()
             {
                 if (executed)
-                {
-                    diag.AddStatusRecord(SqlState::SHY010_SEQUENCE_ERROR, "Query cursor is in open state already.");
-
-                    return SqlResult::AI_ERROR;
-                }
+                    Close();
 
                 int32_t maxPageSize = connection.GetConfiguration().GetPageSize();
                 int32_t rowNum = params.GetParamSetSize();

modules/platforms/cpp/odbc/src/query/data_query.cpp

@@ -52,11 +52,7 @@ namespace ignite
             SqlResult::Type DataQuery::Execute()
             {
                 if (cursor.get())
-                {
-                    diag.AddStatusRecord(SqlState::SHY010_SEQUENCE_ERROR, "Query cursor is in open state already.");
-
-                    return SqlResult::AI_ERROR;
-                }
+                    InternalClose();
 
                 return MakeRequestExecute();
             }

modules/platforms/cpp/odbc/src/query/type_info_query.cpp

@@ -394,7 +394,7 @@ namespace ignite
 
             bool TypeInfoQuery::DataAvailable() const
             {
-                return cursor != types.end();;
+                return cursor != types.end();
             }
 
             int64_t TypeInfoQuery::AffectedRows() const