add missing return statements for many of the get functions

Author: sreeder

odm2api/ODM2/models.py

@@ -1800,7 +1800,6 @@ def _getSchema(engine):
 
 
 def setSchema(engine):
-
     s = _getSchema(engine)
     _changeSchema(s)
 

odm2api/ODM2/services/readService.py

@@ -747,32 +747,32 @@ def getSpecimenBatchPositions(self):
 
     # TODO functions for Provenance
     def getAuthorLists(self):
-        self._session.query(AuthorLists).all()
+        return self._session.query(AuthorLists).all()
 
     def getDatasetCitations(self):
-        self._session.query(DataSetCitations).all()
+        return self._session.query(DataSetCitations).all()
 
     def getDerivationEquations(self):
-        self._session.query(DerivationEquations).all()
+        return self._session.query(DerivationEquations).all()
 
     def getMethodCitations(self):
-        self._session.query(MethodCitations).all()
+        return self._session.query(MethodCitations).all()
 
     def getRelatedAnnotations(self):
         # q= read._session.query(Actions).select_from(RelatedActions).join(RelatedActions.RelatedActionObj)
-        self._session.query(RelatedAnnotations).all()
+        return self._session.query(RelatedAnnotations).all()
 
     def getRelatedCitations(self):
-        self._session.query(RelatedCitations).all()
+        return self._session.query(RelatedCitations).all()
 
     def getRelatedDatasets(self):
-        self._session.query(RelatedDataSets).all()
+        return self._session.query(RelatedDataSets).all()
 
     def getRelatedResults(self):
-        self._session.query(RelatedResults).all()
+        return self._session.query(RelatedResults).all()
 
     def getResultDerivationEquations(self):
-        self._session.query(ResultDerivationEquations).all()
+        return self._session.query(ResultDerivationEquations).all()
 
     # ################################################################################
     # Results

odm2api/base.py

@@ -24,10 +24,9 @@ def __init__(self,  session_factory, debug=False):
         self._version = session_factory.version
         self._debug = debug
 
-        #self._sessiona
 
-    #self._session_factory=""
-   # def getSessionFactory( session = None):
+
+
     def getSession(self):
         if self._session is None:
             self._session = self._session_factory.getSession()
@@ -39,9 +38,11 @@ def reset_session(self):
 
 
 
-from sqlalchemy.ext.declarative import declared_attr
+
 
 class Base(object):
+    from sqlalchemy.ext.declarative import declared_attr
+
     @declared_attr
     def __tablename__(cls):
         return cls.__name__.lower()
@@ -63,8 +64,8 @@ def __repr__(self):
         return "<%s(%s)>" % (self.__class__.__name__, str(valuedict))
 
 
-from sqlalchemy.ext.declarative import declarative_base
 class modelBase():
+    from sqlalchemy.ext.declarative import declarative_base
     Base = declarative_base(cls=Base)