You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by is...@apache.org on 2019/03/01 18:04:43 UTC

[ignite] branch master updated: IGNITE-11463: Fixed backward compatibility of ODBC

This is an automated email from the ASF dual-hosted git repository.

isapego pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 6517ff2  IGNITE-11463: Fixed backward compatibility of ODBC
6517ff2 is described below

commit 6517ff2af5972af4c6e7c6ed25f1b56317763d0d
Author: Igor Sapego <ig...@gmail.com>
AuthorDate: Fri Mar 1 21:02:41 2019 +0300

    IGNITE-11463: Fixed backward compatibility of ODBC
    
    This closes #6213
---
 .../ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java    | 2 ++
 modules/platforms/cpp/odbc/src/message.cpp                             | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java
index 5c63a4a..fa8468c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java
@@ -145,7 +145,9 @@ public class OdbcConnectionContext extends ClientListenerAbstractConnectionConte
         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
index 587d253..6398964 100644
--- 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,