add delete values

Author: sreeder

odm2api/ODM2/models.py

@@ -2050,21 +2050,22 @@ def _changeSchema(schema):
 
         if isinstance(Tbl, api.DeclarativeMeta):
             Tbl.__table__.schema = schema
+            Tbl.__table_args__["schema"]=schema
 
 
 def _getSchema(engine):
     from sqlalchemy.engine import reflection
 
     insp = reflection.Inspector.from_engine(engine)
-
     for name in insp.get_schema_names():
         if 'odm2' == name.lower():
             return name
-    else:
-        return insp.default_schema_name
 
+    return insp.default_schema_name
 
 def setSchema(engine):
     s = _getSchema(engine)
+    if s is None:
+        s = ''
     _changeSchema(s)
 

odm2api/ODM2/services/deleteService.py

@@ -90,6 +90,14 @@ def test(self):
 
 
 # ################################################################################
-# ODM2
+# Result Values
 # ################################################################################
 
+    def deleteTSRValues(self, ids=None, dates=None):
+
+        q = self._session.query(TimeSeriesResultValues)
+        if ids:
+            q = q.filter(TimeSeriesResultValues.ResultID.in_(ids))
+        if dates:
+            q = q.filter(TimeSeriesResultValues.ValueDateTime.in_(dates))
+        return q.delete(False)

odm2api/ODMconnection.py

@@ -30,6 +30,7 @@ def __init__(self, connection_string, echo=True, version = 2.0):
         # Create session maker
         self.Session = sessionmaker(bind=self.engine)
         self.test_Session = sessionmaker(bind=self.test_engine)
+        setSchema(self.engine)
         self.version=version
 
     def getSession(self):
@@ -65,7 +66,6 @@ def createConnection(self, engine, address, db=None, user=None, password=None, d
     @classmethod
     def createConnectionFromString(self, conn_string, dbtype= 2.0, echo = False):
         s = SessionFactory(conn_string, echo=echo, version=dbtype)
-        setSchema(s.engine)
         return s
 
     @classmethod