utils-flask-sqlalchemy 0.4.2__tar.gz → 0.4.4__tar.gz

{utils_flask_sqlalchemy-0.4.2/src/utils_flask_sqlalchemy.egg-info → utils_flask_sqlalchemy-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: utils-flask-sqlalchemy
-Version: 0.4.2
+Version: 0.4.4
 Summary: Python lib of tools for Flask and SQLAlchemy
 Home-page: https://github.com/PnX-SI/Utils-Flask-SQLAlchemy
 Maintainer: Parcs nationaux des Écrins et des Cévennes

utils_flask_sqlalchemy-0.4.4/VERSION

@@ -0,0 +1 @@
+0.4.4

{utils_flask_sqlalchemy-0.4.2 → utils_flask_sqlalchemy-0.4.4}/setup.py

@@ -1,7 +1,6 @@
 import setuptools
 from pathlib import Path
 
-
 root_dir = Path(__file__).absolute().parent
 with (root_dir / "VERSION").open() as f:
     version = f.read()

{utils_flask_sqlalchemy-0.4.2 → utils_flask_sqlalchemy-0.4.4}/src/utils_flask_sqla/db.py

@@ -1,7 +1,6 @@
 from flask import request
 from werkzeug.exceptions import BadRequest
 
-
 __all__ = ["ordered"]
 
 

utils_flask_sqlalchemy-0.4.4/src/utils_flask_sqla/env.py

@@ -0,0 +1,9 @@
+from os import environ
+from importlib import import_module
+
+db_path = environ.get("FLASK_SQLALCHEMY_DB")
+if not db_path:
+    raise Exception("FLASK_SQLALCHEMY_DB env var is missing")
+db_module_name, db_object_name = db_path.rsplit(".", 1)
+db_module = import_module(db_module_name)
+db = getattr(db_module, db_object_name)

{utils_flask_sqlalchemy-0.4.2 → utils_flask_sqlalchemy-0.4.4}/src/utils_flask_sqla/generic.py

@@ -1,15 +1,17 @@
 from itertools import chain
 from warnings import warn
 
+import sqlalchemy as sa
 from dateutil import parser
 from flask_sqlalchemy import SQLAlchemy
-from sqlalchemy import MetaData
 from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.types import Boolean, Date, DateTime, Integer, Numeric
 from werkzeug.exceptions import BadRequest
 
 from .errors import UtilsSqlaError
 
+from utils_flask_sqla.env import db
+
 
 def testDataType(value, sqlType, paramName):
     """
@@ -102,11 +104,18 @@ class GenericTable:
             - engine : sqlalchemy instance engine
                 for exemple : DB.engine if DB = Sqlalchemy()
         """
-        meta = MetaData(schema=schemaName)
-        meta.reflect(views=True, bind=engine)
 
         try:
-            self.tableDef = meta.tables["{}.{}".format(schemaName, tableName)]
+
+            conn = db.engine.connect()
+
+            metadata = sa.MetaData(bind=conn)
+            self.tableDef = sa.Table(
+                tableName,
+                metadata,
+                schema=schemaName,
+                autoload_with=conn,
+            )
         except KeyError:
             raise KeyError("table {}.{} doesn't exists".format(schemaName, tableName))
 
@@ -272,7 +281,7 @@ class GenericQuery:
         nb_result_without_filter = q.count()
 
         q = self.raw_query(process_filter=True)
-        total_filtered = q.count() if self.filters else nb_result_without_filter
+        total_filtered = q.limit(None).count() if self.filters else nb_result_without_filter
 
         data = q.all()
 

{utils_flask_sqlalchemy-0.4.2 → utils_flask_sqlalchemy-0.4.4}/src/utils_flask_sqla/migrations/utils.py

@@ -9,7 +9,6 @@ import os, os.path
 
 from ..utils import remote_file
 
-
 logger = logging.getLogger("alembic.runtime.migration")
 
 """

{utils_flask_sqlalchemy-0.4.2 → utils_flask_sqlalchemy-0.4.4}/src/utils_flask_sqla/migrations/versions/3842a6d800a0_sql_utils.py

@@ -11,7 +11,6 @@ import importlib.resources
 from alembic import op
 import sqlalchemy as sa
 
-
 # revision identifiers, used by Alembic.
 revision = "3842a6d800a0"
 down_revision = None
@@ -20,8 +19,7 @@ depends_on = None
 
 
 def upgrade():
-    op.execute(
-        """
+    op.execute("""
 CREATE OR REPLACE FUNCTION public.fct_trg_meta_dates_change()
     RETURNS trigger AS
     $BODY$
@@ -39,13 +37,10 @@ CREATE OR REPLACE FUNCTION public.fct_trg_meta_dates_change()
     $BODY$
 LANGUAGE plpgsql VOLATILE
 COST 100;
-"""
-    )
+""")
 
 
 def downgrade():
-    op.execute(
-        """
+    op.execute("""
 DROP FUNCTION public.fct_trg_meta_dates_change();
-    """
-    )
+    """)

{utils_flask_sqlalchemy-0.4.2 → utils_flask_sqlalchemy-0.4.4}/src/utils_flask_sqla/migrations/versions/ba207b468e31_create_fr_numeric_collation.py

@@ -9,7 +9,6 @@ Create Date: 2022-05-02 14:00:09.987246
 from alembic import op
 import sqlalchemy as sa
 
-
 # revision identifiers, used by Alembic.
 revision = "ba207b468e31"
 down_revision = "3842a6d800a0"
@@ -18,16 +17,12 @@ depends_on = None
 
 
 def upgrade():
-    op.execute(
-        """
+    op.execute("""
         CREATE COLLATION fr_numeric (provider = icu, locale = 'fr_FR.UTF-8@colNumeric=yes')
-        """
-    )
+        """)
 
 
 def downgrade():
-    op.execute(
-        """
+    op.execute("""
         DROP COLLATION fr_numeric
-        """
-    )
+        """)

{utils_flask_sqlalchemy-0.4.2 → utils_flask_sqlalchemy-0.4.4}/src/utils_flask_sqla/tests/fixtures.py

@@ -1,7 +1,6 @@
 import pytest
 from sqlalchemy.event import listen, remove
 
-
 """
 We open a nested transaction at each scope, and this nested transaction is rollback at teardown,
 removing all db changes introduced by fixtures at this level.

{utils_flask_sqlalchemy-0.4.2 → utils_flask_sqlalchemy-0.4.4}/src/utils_flask_sqla/tests/test_ordered.py

@@ -24,7 +24,6 @@ from werkzeug.exceptions import BadRequest
 
 from utils_flask_sqla.db import ordered
 
-
 db = SQLAlchemy()
 
 

{utils_flask_sqlalchemy-0.4.2 → utils_flask_sqlalchemy-0.4.4}/src/utils_flask_sqla/tests/test_qfilter.py

@@ -6,7 +6,6 @@ from flask_sqlalchemy import SQLAlchemy
 
 from utils_flask_sqla.models import qfilter
 
-
 db = SQLAlchemy()
 
 

{utils_flask_sqlalchemy-0.4.2 → utils_flask_sqlalchemy-0.4.4}/src/utils_flask_sqla/tests/test_schema.py

@@ -10,7 +10,6 @@ from flask_sqlalchemy import SQLAlchemy
 
 from utils_flask_sqla.schema import SmartRelationshipsMixin
 
-
 db = SQLAlchemy()
 
 

{utils_flask_sqlalchemy-0.4.2 → utils_flask_sqlalchemy-0.4.4}/src/utils_flask_sqla/tests/test_serializers.py

@@ -14,7 +14,6 @@ from geoalchemy2 import Geometry
 
 from utils_flask_sqla.serializers import serializable
 
-
 db = SQLAlchemy()
 
 

{utils_flask_sqlalchemy-0.4.2 → utils_flask_sqlalchemy-0.4.4}/src/utils_flask_sqla/tests/test_temporary_transaction.py

@@ -4,7 +4,6 @@ import pytest
 from flask import Flask
 from flask_sqlalchemy import SQLAlchemy
 
-
 db = SQLAlchemy()
 
 

{utils_flask_sqlalchemy-0.4.2 → utils_flask_sqlalchemy-0.4.4/src/utils_flask_sqlalchemy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: utils-flask-sqlalchemy
-Version: 0.4.2
+Version: 0.4.4
 Summary: Python lib of tools for Flask and SQLAlchemy
 Home-page: https://github.com/PnX-SI/Utils-Flask-SQLAlchemy
 Maintainer: Parcs nationaux des Écrins et des Cévennes

{utils_flask_sqlalchemy-0.4.2 → utils_flask_sqlalchemy-0.4.4}/src/utils_flask_sqlalchemy.egg-info/SOURCES.txt

@@ -9,6 +9,7 @@ tox.ini
 src/utils_flask_sqla/__init__.py
 src/utils_flask_sqla/commands.py
 src/utils_flask_sqla/db.py
+src/utils_flask_sqla/env.py
 src/utils_flask_sqla/errors.py
 src/utils_flask_sqla/generic.py
 src/utils_flask_sqla/models.py

utils_flask_sqlalchemy-0.4.2/VERSION

@@ -1 +0,0 @@
-0.4.2