Fixed issue with new freetds connection string

Author: jmeline

odmtools/odmdata/__init__.py

@@ -63,4 +63,12 @@
     'MemoryDatabase',
     'copy_series',
     'copy_data_value'
-]
+]
+
+# pyinstaller needs pymysql, psycopg2, and pyodbc (If on windows)
+import sys
+if sys.platform is not 'darwin':
+    import pymysql
+    import psycopg2
+    import pyodbc
+    

odmtools/odmservices/service_manager.py

@@ -61,6 +61,7 @@ def get_all_conn_dicts(self):
     def is_valid_connection(self):
         if self._current_conn_dict:
             conn_string = self._build_connection_string(self._current_conn_dict)
+            logger.debug("Conn_string: %s" % conn_string)
             try:
                 if self.testEngine(conn_string):
                     return self.get_current_conn_dict()
@@ -187,7 +188,7 @@ def _get_file(self, mode):
 
     def _build_connection_string(self, conn_dict):
         driver = ""
-        if conn_dict['engine'] == 'mssql' and sys.platform is not 'win32':
+        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']))
             conn_string = 'mssql+pyodbc:///?odbc_connect={}'.format(quoted)

setup/make.py

@@ -104,6 +104,10 @@ def mac_pyinstaller():
 def run_inno():
     os.system(INNO_EXECUTABLE + " " + INNO_SCRIPT)
 
+def run_no_installer():
+    pass
+    # zf = zipfile.ZipFile('')
+
 def run_iceberg():
     os.system(ICE_EXECUTABLE + " "+ ICE_SCRIPT)
 
@@ -113,8 +117,7 @@ def main():
     check_if_dirs_exist()
 
     if sys.platform == 'win32':
-
-
+        print "Creating Windows Executable..."
         if (run_pyinstaller()):
             run_inno()