Fixed backwards versioning

Author: tvincentNuoDB

pynuodb/encodedsession.py

@@ -90,7 +90,9 @@ def __init__(self, host, port, service='SQL2'):
         self.__encryption = True
         """ @type : boolean """
         self.__connectedNodeID = 0
-        """ @type : int """        
+        """ @type : int """ 
+        self.__serverVersion = 0
+        """ @type : int """       
 
     # Mostly for connections
     def open_database(self, db_name, parameters, cp):
@@ -121,6 +123,8 @@ def open_database(self, db_name, parameters, cp):
             self.__connectedNodeID = self.getInt()
             maxNodes = self.getInt()
 
+        self.__serverVersion = protocolVersion
+
         return protocolVersion, serverKey, salt
 
     def check_auth(self):
@@ -195,7 +199,10 @@ def execute_statement(self, statement, query):
         @type query str
         @rtype: ExecutionResult
         """
-        self._putMessageId(protocol.EXECUTE).putInt(self.getCommitInfo(self.__connectedNodeID)).putInt(statement.handle).putString(query)
+        self._putMessageId(protocol.EXECUTE)
+        if(self.__serverVersion >= protocol.PROTOCOL_VERSION17):
+            self.putInt(self.getCommitInfo(self.__connectedNodeID))
+        self.putInt(statement.handle).putString(query)
         self._exchangeMessages()
 
         result = self.getInt()
@@ -229,7 +236,9 @@ def execute_prepared_statement(self, prepared_statement, parameters):
         @type parameters list
         @rtype: ExecutionResult
         """
-        self._putMessageId(protocol.EXECUTEPREPAREDSTATEMENT).putInt(self.getCommitInfo(self.__connectedNodeID))
+        self._putMessageId(protocol.EXECUTEPREPAREDSTATEMENT)
+        if(self.__serverVersion >= protocol.PROTOCOL_VERSION17):
+            self.putInt(self.getCommitInfo(self.__connectedNodeID))
         self.putInt(prepared_statement.handle).putInt(len(parameters))
 
         for param in parameters:
@@ -248,7 +257,9 @@ def execute_batch_prepared_statement(self, prepared_statement, param_lists):
         @type param_lists list[list]
 
         """
-        self._putMessageId(protocol.EXECUTEBATCHPREPAREDSTATEMENT).putInt(self.getCommitInfo(self.__connectedNodeID))
+        self._putMessageId(protocol.EXECUTEBATCHPREPAREDSTATEMENT)
+        if(self.__serverVersion >= protocol.PROTOCOL_VERSION17):
+            self.putInt(self.getCommitInfo(self.__connectedNodeID))
         self.putInt(prepared_statement.handle)
         for parameters in param_lists:
             if prepared_statement.parameter_count != len(parameters):
@@ -916,6 +927,7 @@ def isASCII(self, data):
 
     def getCommitInfo(self, nodeID):
         """ Currently does not support last commit """
+
         return 0