sqlalchemy-query-helpers 1.0.101__py3-none-any.whl → 1.0.103__py3-none-any.whl

sqlalchemy_query_helpers/main.py

@@ -16,9 +16,15 @@ class DB:
     Session: sessionmaker = None
     session: Session = None
 
-    def __init__(self, db_name, base: DeclarativeMeta, use_os_env=True, echo=False):
+    def __init__(self, db_name, base: DeclarativeMeta, db_url: str | None = None, echo=False):
+        """
+        :param db_url: URL as "{user}:{password}@{host}" without [schema + netloc], 
+            that will use as f'mysql+pymysql://{db_url}'. 
+            It's convenient to store this string as an OS environment variable.
+            None - Use OS environment variables: 'DB_USER', 'DB_PASSWORD', 'DB_HOST'.
+        """
         self.base = base
-        engine_str = self.make_engine_str(use_os_env)
+        engine_str = self.make_engine_str(db_url)
         self.engine = create_engine(f'{engine_str}/{db_name}', echo=echo)
         self.Session = sessionmaker(bind=self.engine)
         # self.session = self.Session()
@@ -31,12 +37,14 @@ class DB:
             self.session.close()
 
     @staticmethod
-    def make_engine_str(use_os_env) -> str:
+    def make_engine_str(db_url: str | None) -> str:
         """
         Create an engine string (schema + netloc), like "mysql+pymysql://USER:PASSWORD@HOST"
-        :param use_os_env: Use OS envs 'DB_USER', 'DB_PASSWORD', 'DB_HOST', instead the `cfg.py` file
+        :param db_url: URL as "{user}:{password}@{host}" that will use as f'mysql+pymysql://{db_url}'. 
+            It's convenient to store this string as an OS environment variable.
+            None - Use OS environment variables: 'DB_USER', 'DB_PASSWORD', 'DB_HOST'.
         """
-        if use_os_env:
+        if not db_url:
             import os
             try:
                 user = os.environ['DB_USER']
@@ -44,9 +52,9 @@ class DB:
                 host = os.environ['DB_HOST']
             except KeyError:
                 raise RuntimeError("Set the 'DB_USER', 'DB_PASSWORD', 'DB_HOST' OS env variables")
+            engine_str = f'mysql+pymysql://{user}:{password}@{host}'
         else:
-            from cfg import user, password, host
-        engine_str = f'mysql+pymysql://{user}:{password}@{host}'
+            engine_str = f'mysql+pymysql://{db_url}'
         return engine_str
 
     def get_predefined_table(self, table_name: str, base_metadata=None):
@@ -230,7 +238,8 @@ class DB:
         stmt = insert(t).values(rows_to_insert)
         # 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
+            table_columns = t.columns._all_columns if isinstance(t, Table) else t._sa_class_manager.mapper.columns._all_columns
+            update_dict = {x.name: x for x in stmt.inserted for c in table_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}

{sqlalchemy_query_helpers-1.0.101.dist-info → sqlalchemy_query_helpers-1.0.103.dist-info}/METADATA

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

@@ -0,0 +1,7 @@
+sqlalchemy_query_helpers/__init__.py,sha256=xxmsXX2HKm1K8Ay9sy_tXGkPDWz3NXJI0s4xiwPckr0,39
+sqlalchemy_query_helpers/main.py,sha256=AkpIVLgyg74Ch22avp-RkRVhzrJnOI3rzDfkl03skNg,13806
+sqlalchemy_query_helpers-1.0.103.dist-info/LICENSE,sha256=XUL1pa84eZAnKR9S2WnYrv2M523Oysejy3KPlVSyCks,1069
+sqlalchemy_query_helpers-1.0.103.dist-info/METADATA,sha256=D-41uVz5Eta_wxbHlKD5KOYMH8KXXb2jS9qCD499OaY,2599
+sqlalchemy_query_helpers-1.0.103.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+sqlalchemy_query_helpers-1.0.103.dist-info/top_level.txt,sha256=3CUM4jiTua2frHF1satgUAYlW0QfDsvdkxO_6Fj_0zY,25
+sqlalchemy_query_helpers-1.0.103.dist-info/RECORD,,

sqlalchemy_query_helpers-1.0.101.dist-info/RECORD

@@ -1,7 +0,0 @@
-sqlalchemy_query_helpers/__init__.py,sha256=xxmsXX2HKm1K8Ay9sy_tXGkPDWz3NXJI0s4xiwPckr0,39
-sqlalchemy_query_helpers/main.py,sha256=Ls89jPpiJC12LvQqw-huNZVwZY9oVQJVqmt6i5HxKpM,13188
-sqlalchemy_query_helpers-1.0.101.dist-info/LICENSE,sha256=XUL1pa84eZAnKR9S2WnYrv2M523Oysejy3KPlVSyCks,1069
-sqlalchemy_query_helpers-1.0.101.dist-info/METADATA,sha256=jUe0cZDU-4jtGjPPMKzu11_QZBj8H-VGDFJ820sfWgM,2599
-sqlalchemy_query_helpers-1.0.101.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-sqlalchemy_query_helpers-1.0.101.dist-info/top_level.txt,sha256=3CUM4jiTua2frHF1satgUAYlW0QfDsvdkxO_6Fj_0zY,25
-sqlalchemy_query_helpers-1.0.101.dist-info/RECORD,,