sqlalchemy-query-helpers 1.0.9__tar.gz → 1.0.101__tar.gz

{sqlalchemy_query_helpers-1.0.9/src/sqlalchemy_query_helpers.egg-info → sqlalchemy_query_helpers-1.0.101}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlalchemy-query-helpers
-Version: 1.0.9
+Version: 1.0.101
 Summary: Some helpers for SQLAlchemy
 Author-email: vladiscripts <blagopoluchie12@gmail.com>
 Project-URL: Homepage, https://github.com/vladiscripts/sqlalchemy-query-helpers

{sqlalchemy_query_helpers-1.0.9 → sqlalchemy_query_helpers-1.0.101}/pyproject.toml

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

{sqlalchemy_query_helpers-1.0.9 → sqlalchemy_query_helpers-1.0.101}/src/sqlalchemy_query_helpers/main.py

@@ -27,7 +27,8 @@ class DB:
         self.name = self.engine.url.database
 
     def __del__(self):
-        self.session.close()
+        if self.session:
+            self.session.close()
 
     @staticmethod
     def make_engine_str(use_os_env) -> str:
@@ -224,15 +225,25 @@ class DB:
         self.session.commit()
         return is_updated, is_inserted
 
-    def upsert(self, t, rows: Union[list[dict], tuple[dict]], mfields=None, do_commit=True):
+    def upsert(self, t, rows: Union[list[dict], tuple[dict]], mfields=None, do_commit=True, filter_unque_primary_keys=True):
         rows_to_insert = [self.__to_dict(row, mfields) for row in rows]
         stmt = insert(t).values(rows_to_insert)
-        update_dict = {x.name: x for x in stmt.inserted}
+        # need to remove primary or unique keys on using, else will error
+        if filter_unque_primary_keys:
+            update_dict = {x.name: x for x in stmt.inserted for c in t._sa_class_manager.mapper.columns._all_columns
+                           if x.name == c.name and c.unique is not True and c.primary_key is not True}
+        else:
+            update_dict = {x.name: x for x in stmt.inserted}
+        if not update_dict:
+            return
         upsert_query = stmt.on_duplicate_key_update(update_dict)
         with self.Session() as session:
             session.execute(upsert_query)
             if do_commit:
-                 session.commit()
+                try:
+                    session.commit()
+                except Exception as e:
+                    session.rollback()
 
     # def upsert(self, t, row, mfields=None):
     #     row = self.to_dict(row, mfields)

{sqlalchemy_query_helpers-1.0.9 → sqlalchemy_query_helpers-1.0.101/src/sqlalchemy_query_helpers.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlalchemy-query-helpers
-Version: 1.0.9
+Version: 1.0.101
 Summary: Some helpers for SQLAlchemy
 Author-email: vladiscripts <blagopoluchie12@gmail.com>
 Project-URL: Homepage, https://github.com/vladiscripts/sqlalchemy-query-helpers