IGNITE-11463: Fixed backward compatibility of ODBC

gridgain · Mar 1, 2019 · 86da884 · 86da884
1 parent 96f71a4
commit 86da884
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.../src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java b/.../src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java
@@ -145,7 +145,9 @@ public OdbcConnectionContext(GridKernalContext ctx, GridNioSession ses, GridSpin
         if (ver.compareTo(VER_2_5_0) >= 0) {
             user = reader.readString();
             passwd = reader.readString();
+        }
 
+        if (ver.compareTo(VER_2_7_0) >= 0) {
             byte nestedTxModeVal = reader.readByte();
 
             nestedTxMode = NestedTxMode.fromByte(nestedTxModeVal);

diff --git a/modules/platforms/cpp/odbc/src/message.cpp b/modules/platforms/cpp/odbc/src/message.cpp
@@ -84,9 +84,10 @@ namespace ignite
             {
                 utility::WriteString(writer, config.GetUser());
                 utility::WriteString(writer, config.GetPassword());
+            }
 
+            if (version >= ProtocolVersion::VERSION_2_7_0)
                 writer.WriteInt8(config.GetNestedTxMode());
-            }
         }
 
         QueryExecuteRequest::QueryExecuteRequest(const std::string& schema, const std::string& sql,