Merge pull request #90 from alercebroker/refactor/minimalistic-lib

refactor: deleted query wrapper

db_plugins/__init__.py

@@ -1 +1 @@
-__version__ = "4.2.7"
+__version__ = "5.0.0"

db_plugins/db/sql/connection.py

@@ -1,7 +1,6 @@
 from sqlalchemy import create_engine
-from sqlalchemy.orm import sessionmaker, scoped_session
+from sqlalchemy.orm import sessionmaker, scoped_session, Query
 
-from .query import SQLQuery
 from ..generic import DatabaseConnection, DatabaseCreator
 from .models import Base
 
@@ -85,7 +84,7 @@ def connect(
         )
         self.Base = base or Base
         session_options = session_options or {}
-        session_options["query_cls"] = SQLQuery
+        session_options["query_cls"] = Query
         if self.Session is None:
             self.Session = sessionmaker(bind=self.engine, **session_options)
         if create_session:
@@ -110,7 +109,7 @@ def create_session(self, use_scoped, scope_func=None):
 
     def _create_scoped_session(self, scope_func):
         self.session = scoped_session(self.Session, scopefunc=scope_func)
-        self.Base.query = self.session.query_property(query_cls=SQLQuery)
+        self.Base.query = self.session.query_property(query_cls=Query)
         self.use_scoped = True
 
     def _create_unscoped_session(self):

db_plugins/db/sql/models.py

@@ -11,10 +11,10 @@
     DateTime,
     ForeignKeyConstraint,
 )
-from sqlalchemy.orm import relationship
+from sqlalchemy.orm import declarative_base, relationship
 from .. import generic
 
-from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import declarative_base
 
 Base = declarative_base()
 

pyproject.toml

@@ -16,7 +16,7 @@ dependencies = [
     "alembic==1.8.1",
     "click==8.1.3",
     "marshmallow_sqlalchemy==0.28.1",
-    "SQLAlchemy==1.3.24",
+    "SQLAlchemy==2.0.19",
     "pymongo==4.3.3"
 ]