dbhydra 2.2.13__tar.gz → 2.2.16__tar.gz

{dbhydra-2.2.13 → dbhydra-2.2.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbhydra
-Version: 2.2.13
+Version: 2.2.16
 Summary: Data science friendly ORM combining Python
 Home-page: https://github.com/DovaX/dbhydra
 Author: DovaX

{dbhydra-2.2.13 → dbhydra-2.2.16}/dbhydra/src/abstract_db.py

@@ -73,7 +73,7 @@ class AbstractDb(abc.ABC):
         # 'AbstractSet': set,
     }
     python_database_type_mapping = {}
-    def __init__(self, config_file="config.ini", db_details=None, debug_mode=False):
+    def __init__(self, config_file="config.ini", db_details=None, debug_mode=False, debug_message=""):
         if db_details is None:
             db_details = read_connection_details(config_file)
 
@@ -88,6 +88,7 @@ class AbstractDb(abc.ABC):
         
         self.is_autocommiting=True
         self.debug_mode = debug_mode
+        self.debug_message = debug_message
 
         if "DB_PORT" in db_details.keys():
             self.DB_PORT = int(db_details["DB_PORT"])
@@ -156,13 +157,13 @@ class AbstractDb(abc.ABC):
         try:
             if self.debug_mode:
                 with open("dbhydra_logs.txt","a+") as file:
-                    file.write(str(datetime.datetime.now())+": DB "+str(self)+": _connect() called\n")
+                    file.write(str(datetime.datetime.now())+": DB "+str(self)+": _connect() called, debug msg:"+str(self.debug_message)+"\n")
             self._connect()
             yield None
         finally:
             if self.debug_mode:
                 with open("dbhydra_logs.txt","a+") as file:
-                    file.write(str(datetime.datetime.now())+": DB "+str(self)+": close_connection() called\n")
+                    file.write(str(datetime.datetime.now())+": DB "+str(self)+": close_connection() called, debug msg:"+str(self.debug_message)+"\n")
             self.close_connection()
 
     @contextmanager
@@ -197,7 +198,7 @@ class AbstractDb(abc.ABC):
             self.cursor.commit()
             if self.debug_mode:
                 with open("dbhydra_logs.txt","a+") as file:
-                    file.write(str(datetime.datetime.now())+": DB "+str(self)+": execute() called\n")
+                    file.write(str(datetime.datetime.now())+": DB "+str(self)+": execute() called, debug msg:"+str(self.debug_message)+"\n")
                 with open("dbhydra_queries_logs.txt","a+") as file:
                     file.write(str(datetime.datetime.now())+": "+str(query)+"\n")
         return(result)

{dbhydra-2.2.13 → dbhydra-2.2.16}/dbhydra/src/abstract_table.py

@@ -424,14 +424,26 @@ class AbstractTable(AbstractJoinable, abc.ABC):
 
     #TODO: need to solve inserting in different column_order
     #check df column names, permute if needed
-    def insert_from_column_value_dict(self, dict, insert_id=False):
-        df = pd.DataFrame(dict, index=[0])
+    def insert_from_column_value_dict(self, inserted_dict, insert_id=False):
+        print("DbHydra deprecation warning! insert_from_column_value_dict method was renamed to insert_from_dict and will be deprecated.")
+        self.insert_from_dict(inserted_dict, insert_id)
+        
+    def insert_from_column_value_dict_list(self, inserted_list, insert_id=False):
+        print("DbHydra deprecation warning! insert_from_column_value_dict_list method was renamed to insert_from_dict_list and will be deprecated.")
+        self.insert_from_dict(inserted_list, insert_id)
+        
+    def insert_from_dict(self, column_value_dict, insert_id = False):
+        df = pd.DataFrame(column_value_dict, index=[0])
         return self.insert_from_df(df, insert_id=insert_id)
 
-    def insert_from_column_value_dict_list(self, list, insert_id=False):
-        df = pd.DataFrame(list)
-        self.insert_from_df(df, insert_id=insert_id)
-
+    def insert_from_dict_list(self, column_value_dict_list, insert_id = False):
+        df = pd.DataFrame(column_value_dict_list)
+        return self.insert_from_df(df, insert_id=insert_id)
+        
+    def update_from_dict(self, column_value_dict, where_column: Optional[str] = None, where_value: Any = None):
+        update_df = pd.DataFrame(column_value_dict, index=[0])
+        self.update_from_df(update_df, where_column, where_value)
+            
 
     def delete(self, where=None):
         quote = self.db1.identifier_quote

{dbhydra-2.2.13 → dbhydra-2.2.16}/dbhydra/src/mysql_db.py

@@ -57,7 +57,7 @@ class MysqlDb(AbstractDb):
             self.connection.commit()
             if self.debug_mode:
                 with open("dbhydra_logs.txt","a+") as file:
-                    file.write(str(datetime.datetime.now())+": DB "+str(self)+": execute() called\n")
+                    file.write(str(datetime.datetime.now())+": DB "+str(self)+": execute() called, debug msg:"+str(self.debug_message)+"\n")
                 with open("dbhydra_queries_logs.txt","a+") as file:
                     file.write(str(datetime.datetime.now())+": "+str(query)+"\n")
         return result

{dbhydra-2.2.13 → dbhydra-2.2.16}/dbhydra/src/tables.py

@@ -809,7 +809,7 @@ class MysqlTable(AbstractTable):
                 elif 'blob' in self.types[j + start_index]:
                     # Convert to hex to allow insertion into SQL query
                     hex_data = binascii.hexlify(rows[k][j]).decode('ascii')
-                    query += f"UNHEX('{hex_data}'), "
+                    query += f"UNHEX('{hex_data}'),"
 
                 else:
                     query += str(rows[k][j]) + ","

{dbhydra-2.2.13 → dbhydra-2.2.16}/dbhydra.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbhydra
-Version: 2.2.13
+Version: 2.2.16
 Summary: Data science friendly ORM combining Python
 Home-page: https://github.com/DovaX/dbhydra
 Author: DovaX

{dbhydra-2.2.13 → dbhydra-2.2.16}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
     
 setuptools.setup(
     name='dbhydra',
-    version='2.2.13',
+    version='2.2.16',
     author='DovaX',
     author_email='dovax.ai@gmail.com',
     description='Data science friendly ORM combining Python',