sqlalchemy-query-helpers 1.0.9__py3-none-any.whl → 1.0.10__py3-none-any.whl

sqlalchemy_query_helpers/main.py

@@ -224,15 +224,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.dist-info → sqlalchemy_query_helpers-1.0.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlalchemy-query-helpers
-Version: 1.0.9
+Version: 1.0.10
 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.10.dist-info/RECORD

@@ -0,0 +1,7 @@
+sqlalchemy_query_helpers/__init__.py,sha256=xxmsXX2HKm1K8Ay9sy_tXGkPDWz3NXJI0s4xiwPckr0,39
+sqlalchemy_query_helpers/main.py,sha256=bbKi3JQ6P6c0VuPF_3v1a2IKZZC2y6Z1BxhWUsHXqII,13159
+sqlalchemy_query_helpers-1.0.10.dist-info/LICENSE,sha256=XUL1pa84eZAnKR9S2WnYrv2M523Oysejy3KPlVSyCks,1069
+sqlalchemy_query_helpers-1.0.10.dist-info/METADATA,sha256=vHzOYUc9XB3JpY4waa3A-PYVznNv_ks5Ti5FvW3co00,2598
+sqlalchemy_query_helpers-1.0.10.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+sqlalchemy_query_helpers-1.0.10.dist-info/top_level.txt,sha256=3CUM4jiTua2frHF1satgUAYlW0QfDsvdkxO_6Fj_0zY,25
+sqlalchemy_query_helpers-1.0.10.dist-info/RECORD,,

sqlalchemy_query_helpers-1.0.9.dist-info/RECORD

@@ -1,7 +0,0 @@
-sqlalchemy_query_helpers/__init__.py,sha256=xxmsXX2HKm1K8Ay9sy_tXGkPDWz3NXJI0s4xiwPckr0,39
-sqlalchemy_query_helpers/main.py,sha256=WQkS85VCqwWPu26vPU2dflGG0fRsLXDKxzjCPni3rfo,12628
-sqlalchemy_query_helpers-1.0.9.dist-info/LICENSE,sha256=XUL1pa84eZAnKR9S2WnYrv2M523Oysejy3KPlVSyCks,1069
-sqlalchemy_query_helpers-1.0.9.dist-info/METADATA,sha256=dRlNyqKDhebsLorOUurPt811bLyJcd6YZbqR_rkloaU,2597
-sqlalchemy_query_helpers-1.0.9.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-sqlalchemy_query_helpers-1.0.9.dist-info/top_level.txt,sha256=3CUM4jiTua2frHF1satgUAYlW0QfDsvdkxO_6Fj_0zY,25
-sqlalchemy_query_helpers-1.0.9.dist-info/RECORD,,