ODMTools can now connect to mssql from *unix platform, fixed an issue where refactoring pnlDataTable didn't include an important function

Author: denvaar

odmtools/controller/frmDataTable.py

@@ -49,9 +49,15 @@ def onChangeSelection(self,  datetime_list=None):
             except:
                 pass
 
+    def clear(self):
+        self.memDB = None
+        self.olvDataTable.DeleteAllItems()
+        self.olvDataTable.dataframe = None
+        self.dataObjects = None
+
 if __name__ == "__main__":
     app = wx.App()
     frame = wx.Frame(None)
     panel = FrmDataTable(frame)
     frame.Show()
-    app.MainLoop()
+    app.MainLoop()

odmtools/odmdata/series.py

@@ -94,7 +94,8 @@ class Series(Base):
 
     # TODO add all to repr
     def __repr__(self):
-        return "<Series('%s')>" % (self.id)
+        return "<Series('%s', '%s', '%s', '%s')>" % (self.id, self.site_name, self.variable_code, self.variable_name)
+
 
     def get_table_columns(self):
         return self.__table__.columns.keys()

odmtools/odmservices/service_manager.py

@@ -1,5 +1,8 @@
 import logging
 import os
+import sys
+
+import urllib
 
 from sqlalchemy.exc import SQLAlchemyError#OperationalError, DBAPIError
 
@@ -184,18 +187,24 @@ def _get_file(self, mode):
 
     def _build_connection_string(self, conn_dict):
         driver = ""
-        if conn_dict['engine'] == 'mssql':
+        if conn_dict['engine'] == 'mssql' and sys.platform is not 'win32':
             driver = "pyodbc"
-        elif conn_dict['engine'] == 'mysql':
-            driver = "pymysql"
-        elif conn_dict['engine'] == 'postgresql':
-            driver = "psycopg2"
+            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)
+        
         else:
-            driver = "None"
+            if conn_dict['engine'] == 'mssql':
+                driver = "pyodbc"
+            elif conn_dict['engine'] == 'mysql':
+                driver = "pymysql"
+            elif conn_dict['engine'] == 'postgresql':
+                driver = "psycopg2"
+            else:
+                driver = "None"
 
-        conn_string = self._connection_format % (
-            conn_dict['engine'], driver, conn_dict['user'], conn_dict['password'], conn_dict['address'],
-            conn_dict['db'])
+            conn_string = self._connection_format % (
+                conn_dict['engine'], driver, conn_dict['user'], conn_dict['password'], conn_dict['address'],
+                conn_dict['db'])
         return conn_string
 
     def _save_connections(self):

tests/test_odmdata/test_FreeTDS.py

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+from odmtools.odmdata import SessionFactory, variable, series
+from odmtools.odmservices import SeriesService
+from tests import test_util
+import wx
+from tests.test_util import build_db
+import urllib
+import sqlalchemy
+from sqlalchemy.orm import sessionmaker
+
+class TestFreeTDS:
+    def setup(self):
+        # connection string
+        
+        # create engine
+        #quoted = urllib.quote_plus('DRIVER={FreeTDS};Server=iutahqc.uwrl.usu.edu;Database=iUTAH_Logan_OD;UID=qc;PWD=iUTAH123!!;TDS_Version=8.0;Port=1433;')
+        quoted = urllib.quote_plus('DRIVER={FreeTDS};DSN=iutahqc;UID=qc;PWD=iUTAH123!!;')
+        engine = sqlalchemy.create_engine('mssql+pyodbc:///?odbc_connect={}'.format(quoted))
+        # conn = engine.connect()
+        # q = conn.execute("select * from variables")
+        print "engine:", engine
+        assert engine 
+        Session = sessionmaker(bind=engine)
+        assert Session
+        session = Session()
+        assert session
+        q= session.query(variable.Variable).all()
+        print "q:", type(q), dir(q)
+        for i in q:
+            print i
+        #conn.close()
+        q= session.query(series.Series).all()
+        for i in q[:10]:
+            print i
+        assert q
+        print engine
+
+    def test_connection(self):
+        pass