sqlalchemy-query-helpers 1.0.103__tar.gz → 1.0.104__tar.gz

{sqlalchemy_query_helpers-1.0.103/src/sqlalchemy_query_helpers.egg-info → sqlalchemy_query_helpers-1.0.104}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: sqlalchemy-query-helpers
-Version: 1.0.103
+Version: 1.0.104
 Summary: Some helpers for SQLAlchemy
 Author-email: vladiscripts <blagopoluchie12@gmail.com>
 Project-URL: Homepage, https://github.com/vladiscripts/sqlalchemy-query-helpers
@@ -12,6 +12,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: sqlalchemy
+Dynamic: license-file
 
 Пакет содержит хелперы для пакета SQLAlchmy - методов `insert`, `upsert`, `update` и другое.
 

{sqlalchemy_query_helpers-1.0.103 → sqlalchemy_query_helpers-1.0.104}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sqlalchemy-query-helpers"
-version = "1.0.103"
+version = "1.0.104"
 authors = [
     { name = "vladiscripts", email = "blagopoluchie12@gmail.com" },
 ]

{sqlalchemy_query_helpers-1.0.103 → sqlalchemy_query_helpers-1.0.104}/src/sqlalchemy_query_helpers/main.py

@@ -1,5 +1,6 @@
 from sqlalchemy import create_engine, MetaData, Table, select
 from sqlalchemy.orm import sessionmaker, Query, DeclarativeMeta, session
+from sqlalchemy.orm import declarative_base
 from sqlalchemy.orm.session import Session
 from sqlalchemy.orm.attributes import InstrumentedAttribute
 from sqlalchemy.dialects.mysql import insert
@@ -114,19 +115,21 @@ class DB:
         return new_rowid
 
     def insert_many(self, t, rows: Union[list, tuple], mfields: Union[list, tuple] = None, do_commit=True):
-        for row in rows:
-            row = self.__to_dict(row, mfields, use_orm_keys=True)
-            m = t(**row)
-            self.session.add(m)
-        if do_commit:
-            self.session.commit()
+        with self.Session() as s:
+            for row in rows:
+                row = self.__to_dict(row, mfields, use_orm_keys=True)
+                m = t(**row)
+                s.add(m)
+            if do_commit:
+                s.commit()
 
-    def insert_one(self, t, row: Union[list, tuple], mfields: Union[list, tuple] = None, ignore=False):
+    def insert_one(self, t, row: Union[dict, list, tuple], mfields: Union[list, tuple] = None, ignore=False):
         q = insert(t).values(self.__to_dict(row, mfields))
         if ignore:
             q = q.prefix_with('IGNORE', dialect='mysql')
-        r = self.session.execute(q)
-        self.session.commit()
+        with self.Session() as s:
+            r = s.execute(q)
+            s.commit()
         return r.lastrowid
 
     def insert_ignore(self, t, row: Union[dict, list, tuple], mfields: Iterable[InstrumentedAttribute] = None) -> bool:
@@ -134,18 +137,19 @@ class DB:
         return is_inserted
 
     def insert_ignore_many(self, t, rows: List[dict], mfields: Iterable[InstrumentedAttribute] = None) -> bool:
-        is_inserted = False
-        for row in rows:
-            row = self.__to_dict(row, mfields, use_orm_keys=True)
-            try:
-                with self.session.begin_nested():
-                    m = t(**row)
-                    self.session.add(m)
-                is_inserted = True
-            except IntegrityError:
-                # print(f'already in DB: {row}')
-                pass
-        self.session.commit()
+        with self.Session() as s:
+            is_inserted = False
+            for row in rows:
+                row = self.__to_dict(row, mfields, use_orm_keys=True)
+                try:
+                    with s.begin_nested():
+                        m = t(**row)
+                        s.add(m)
+                    is_inserted = True
+                except IntegrityError:
+                    # print(f'already in DB: {row}')
+                    pass
+            s.commit()
         return is_inserted
 
     def insert_ignore_core(self, t, row: Union[dict, list, tuple], mfields: Union[list, tuple] = None) -> None:
@@ -178,7 +182,8 @@ class DB:
     def update(self, t, row: Union[dict, list, tuple], cause_keys: Union[list, tuple], mfields: Union[list, tuple] = None) -> (bool, bool):
         row = self.__to_dict(row, mfields)
         in_keys, not_in_keys = self.__check_modelkeys(row, cause_keys)  # get_check_args(row, keys)
-        rows_updates = Query(t, session=self.session).filter_by(**in_keys).update(not_in_keys)
+        with self.Session() as s:
+            rows_updates = s.query(t).filter_by(**in_keys).update(not_in_keys)
         # q = update(t).values(**not_in_keys).where(**in_keys)
         # rows_updates = self.db.session.execute(q)
         # self.db.session.commit()
@@ -192,7 +197,8 @@ class DB:
         cause_dict, to_insert_dict = self.__check_modelkeys(row, cause_dict)
         # r = Query(t, session=self.session).filter_by(**cause_dict).first()
         q = select(t).where(**cause_dict).limit(1)
-        r = self.session.execute(q).first()
+        with self.Session() as s:
+            r = s.execute(q).first()
         if r:
             for k, v in to_insert_dict.items():
                 if vars(r)[k] != v:

{sqlalchemy_query_helpers-1.0.103 → sqlalchemy_query_helpers-1.0.104/src/sqlalchemy_query_helpers.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: sqlalchemy-query-helpers
-Version: 1.0.103
+Version: 1.0.104
 Summary: Some helpers for SQLAlchemy
 Author-email: vladiscripts <blagopoluchie12@gmail.com>
 Project-URL: Homepage, https://github.com/vladiscripts/sqlalchemy-query-helpers
@@ -12,6 +12,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: sqlalchemy
+Dynamic: license-file
 
 Пакет содержит хелперы для пакета SQLAlchmy - методов `insert`, `upsert`, `update` и другое.