Merge pull request #118 from tvincentNuoDB/master

Updated driver to set clientHost and clientProcessId

Author: mjmichaels

pynuodb/connection.py

@@ -13,7 +13,9 @@
 from .encodedsession import EncodedSession
 from .crypt import ClientPassword, RC4Cipher
 from .util import getCloudEntry
+from os import getpid
 
+import platform
 import time
 
 apilevel = "2.0"
@@ -96,6 +98,9 @@ def __init__(self, dbName, broker, username, password, options):
             if 'cipher' in options and options['cipher'] == 'None':
                 self.__session.set_encryption(False)
 
+        parameters['clientProcessId'] = str(getpid())
+        parameters['clientHost'] = platform.node()
+
         version, serverKey, salt = self.__session.open_database(dbName, parameters, cp)
 
         sessionKey = cp.computeSessionKey(username.upper(), password, salt, serverKey)

pynuodb/encodedsession.py

@@ -157,7 +157,6 @@ def open_database(self, db_name, parameters, cp):
         self._putMessageId(protocol.OPENDATABASE).putInt(protocol.CURRENT_PROTOCOL_VERSION).putString(db_name).putInt(len(parameters))
         for (k, v) in parameters.items():
             self.putString(k).putString(v)
-
         self.putNull().putString(cp.genClientKey())
 
         self._exchangeMessages()

tests/nuodb_basic_test.py

@@ -9,6 +9,7 @@
 
 import unittest
 import decimal
+import platform
 import time
 import os
 import sys
@@ -17,7 +18,7 @@
 from .nuodb_base import NuoBase
 from .mock_tzs import EscapingTimestamp
 from .mock_tzs import Local
-from pynuodb.exception import DataError
+from pynuodb.exception import DataError, ProgrammingError
 
 
 class NuoDBBasicTest(NuoBase):
@@ -457,6 +458,36 @@ def test_long_string_types(self):
             finally:
                 con.close()
 
+    def test_connection_properties(self):
+        #Get NuoDB release 
+        con = self._connect()
+        cursor = con.cursor()
+        try:
+            cursor.execute("select getReleaseversion() from dual")
+        except ProgrammingError as pe:
+            return #2.0 or earlier, skip test
+            
+        version = cursor.fetchone()[0]
+        majorVersion = version[0]
+        minorVersion = version[2]
+        if(majorVersion is '2'):
+            if(minorVersion is not '3'):
+                return
+
+        clientInfo = "NuoDB Python driver"
+        tmp_args = self.connect_kw_args.copy()
+        tmp_args['options'] = {'schema': 'test', 'clientInfo': clientInfo}
+        con = pynuodb.connect(**tmp_args)#self._connect({'clientInfo':'Hello World'})
+        cursor = con.cursor()
+        cursor.execute("select * from SYSTEM.CONNECTIONS")
+        result = cursor.fetchone()
+
+        #Make sure our clientHost, clientProcessId and clientInfo remain the same in the SYSTEM.CONNECTIONS table
+        self.assertEqual(platform.node(), result[17]) #ClientHost
+        self.assertEqual(str(os.getpid()), result[18]) #clientProcessId
+        self.assertEqual(clientInfo, result[19]) #clientInfo
+
+
     def test_utf8_string_types(self):
         con = self._connect()
         cursor = con.cursor()