fix connection

Author: stephanie

odmtools/odmdata/memory_database.py

@@ -90,6 +90,11 @@ def rollback(self):
         # self.mem_service._session_factory.engine.connect().connection.rollback()
         #self.updateDF()
 
+    #TODO is there a way to do a single rollback
+    def rollbacksingle(self):
+        pass
+
+
     def update(self, updates):
         '''
         updates : list of dictionary that contains 2 items, id and value

odmtools/odmservices/service_manager.py

@@ -189,27 +189,52 @@ def _get_file(self, mode):
         return config_file
 
     def _build_connection_string(self, conn_dict):
-        driver = ""
-        connformat= self._connection_format
+
+        self._connection_format = "%s+%s://%s:%s@%s/%s"
+
         if conn_dict['engine'] == 'mssql' and sys.platform != 'win32':
             driver = "pyodbc"
-            quoted = urllib.quote_plus('DRIVER={FreeTDS};DSN=%s;UID=%s;PWD=%s;' % (conn_dict['address'], conn_dict['user'], conn_dict['password']))
+            quoted = urllib.quote_plus('DRIVER={FreeTDS};DSN=%s;UID=%s;PWD=%s;' % (conn_dict['address'], conn_dict['user'],
+                                                                                  conn_dict['password']))
+            # quoted = urllib.quote_plus('DRIVER={FreeTDS};DSN=%s;UID=%s;PWD=%s;DATABASE=%s' %
+            #                            (conn_dict['address'], conn_dict['user'], conn_dict['password'],conn_dict['db'],
+            #                             ))
             conn_string = 'mssql+pyodbc:///?odbc_connect={}'.format(quoted)
+
         elif conn_dict['engine']=='sqlite':
             connformat = "%s:///%s"
             conn_string = connformat%(conn_dict['engine'], conn_dict['address'])
         else:
             if conn_dict['engine'] == 'mssql':
                 driver = "pyodbc"
-                connformat=self._connection_format = "%s+%s://%s:%s@%s/%s?driver=SQL+Server+Native+Client+10.0"
+                conn = "%s+%s://%s:%s@%s/%s?driver=SQL+Server"
+                if "sqlncli11.dll" in os.listdir("C:\\Windows\\System32"):
+                    conn = "%s+%s://%s:%s@%s/%s?driver=SQL+Server+Native+Client+11.0"
+                self._connection_format = conn
+                conn_string = self._connection_format % (
+                    conn_dict['engine'], driver, conn_dict['user'], conn_dict['password'], conn_dict['address'],
+                    conn_dict['db'])
             elif conn_dict['engine'] == 'mysql':
                 driver = "pymysql"
+                conn_string = self.constringBuilder(conn_dict, driver)
             elif conn_dict['engine'] == 'postgresql':
                 driver = "psycopg2"
+                conn_string = self.constringBuilder(conn_dict, driver)
             else:
                 driver = "None"
+                conn_string = self.constringBuilder(conn_dict, driver)
 
-            conn_string = connformat % (
+        # print "******", conn_string
+        return conn_string
+
+
+    def constringBuilder(self, conn_dict, driver):
+        if conn_dict['password'] is None or not conn_dict['password']:
+            conn_string = self._connection_format_nopassword % (
+                conn_dict['engine'], driver, conn_dict['user'], conn_dict['address'],
+                conn_dict['db'])
+        else:
+            conn_string = self._connection_format % (
                 conn_dict['engine'], driver, conn_dict['user'], conn_dict['password'], conn_dict['address'],
                 conn_dict['db'])
         return conn_string