sqlalchemy-query-helpers 1.0.6__tar.gz → 1.0.8__tar.gz

{sqlalchemy_query_helpers-1.0.6/src/sqlalchemy_query_helpers.egg-info → sqlalchemy_query_helpers-1.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlalchemy-query-helpers
-Version: 1.0.6
+Version: 1.0.8
 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.6 → sqlalchemy_query_helpers-1.0.8}/pyproject.toml

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

{sqlalchemy_query_helpers-1.0.6 → sqlalchemy_query_helpers-1.0.8}/src/sqlalchemy_query_helpers/main.py

@@ -21,7 +21,7 @@ class DB:
         engine_str = self.make_engine_str(use_os_env)
         self.engine = create_engine(f'{engine_str}/{db_name}', echo=echo)
         self.Session = sessionmaker(bind=self.engine)
-        self.session = self.Session()
+        # self.session = self.Session()
 
         base.metadata.create_all(self.engine)  # create tables and index if not exists
         self.name = self.engine.url.database
@@ -48,8 +48,8 @@ class DB:
         engine_str = f'mysql+pymysql://{user}:{password}@{host}'
         return engine_str
 
-    def get_predifined_table(self, table_name: str, base_metadata):
-        table = Table(table_name, base_metadata, autoload_with=self.engine)
+    def get_predefined_table(self, table_name: str, base_metadata=None):
+        table = Table(table_name, base_metadata or declarative_base().metadata, autoload_with=self.engine)
         return table
 
     @staticmethod
@@ -144,16 +144,14 @@ class DB:
         self.insert_ignore_many_core(t, [row], mfields)
 
     def insert_ignore_many_core(self, t, rows: List[Union[dict, list, tuple]], mfields: Union[list, tuple] = None) -> None:
-        """Core instead ORM. IGNORE can ignore don't only doubles but other errors. Many warnings."""
-        # for row in rows:
-        #     row = self.to_dict(row, mfields)
-        #     # self.session.execute(insert(t, values=row, prefixes=['IGNORE']))
-        #     s = insert(t).values(row).prefix_with('IGNORE', dialect='mysql')
-        #     # self.session.execute(s)
+        """If can better use upsert, or insert after select with filtering exists rows. Problems of IGNORE: 
+        * This make very large skips of row ids in table.
+        * Can ignore don't only doubles but other errors. Many warnings."""
         rows_to_insert = [self.__to_dict(row, mfields) for row in rows]
         q = insert(t).values(rows_to_insert).prefix_with('IGNORE', dialect='mysql')
-        self.session.execute(q)
-        self.session.commit()
+        with self.Session() as session:
+            session.execute(q)
+            session.commit()
 
     def insert_ignore_instanses(self, instances):
         if not isinstance(instances, Iterable): instances = (instances,)
@@ -226,12 +224,15 @@ class DB:
         self.session.commit()
         return is_updated, is_inserted
 
-    def upsert(self, t, rows: Union[list[dict], tuple[dict]], mfields=None):
+    def upsert(self, t, rows: Union[list[dict], tuple[dict]], mfields=None, do_commit=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}
         upsert_query = stmt.on_duplicate_key_update(update_dict)
-        self.session.execute(upsert_query)
+        with self.Session() as session:
+            session.execute(upsert_query)
+            if do_commit:
+                 session.commit()
 
     # def upsert(self, t, row, mfields=None):
     #     row = self.to_dict(row, mfields)

{sqlalchemy_query_helpers-1.0.6 → sqlalchemy_query_helpers-1.0.8/src/sqlalchemy_query_helpers.egg-info}/PKG-INFO

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