dbhydra 2.2.5__py3-none-any.whl → 2.2.8__py3-none-any.whl

dbhydra/dbhydra_core.py

@@ -22,6 +22,9 @@ class Jsonable(str):
     """Is used as type in python_database_type_mapping"""    
     pass
 
+class BLOB(str):
+    """Store BLOBS up to 16MB."""    
+    pass
 
 
 # dataframe - dictionary auxiliary functions

dbhydra/src/abstract_table.py

@@ -259,16 +259,19 @@ class AbstractTable(AbstractJoinable, abc.ABC):
     
     
     def drop(self, debug_mode = False):
-        query = "DROP TABLE " + self.name
+        quote = self.db1.identifier_quote
+        query = f"DROP TABLE {quote}{self.name}{quote}"
         if debug_mode:
             print(query)
         self.execute(query)
 
     def update(self, variable_assign, where=None, debug_mode = False):
+        quote = self.db1.identifier_quote
         if where is None:
-            query = "UPDATE " + self.name + " SET " + variable_assign
+            query = f"UPDATE {quote}{self.name}{quote} SET {quote}{variable_assign}{quote}"
         else:
-            query = "UPDATE " + self.name + " SET " + variable_assign + " WHERE " + where
+            query = f"UPDATE {quote}{self.name}{quote} SET {quote}{variable_assign}{quote} WHERE {quote}{where}{quote}"
+
         if debug_mode:
             print(query)
         return self.execute(query)
@@ -303,25 +306,25 @@ class AbstractTable(AbstractJoinable, abc.ABC):
             for column_name, column_type in types_without_id_column
         ]
 
+        quote = self.db1.identifier_quote
         column_value_string = ""
         for column_name, cell_value, column_type in update_df_row_list:
             if cell_value is None:
-                column_value_string += f"{column_name} = NULL, "
+                column_value_string += f"{quote}{column_name}{quote} = NULL, "
             elif column_type in ["double", "int", "tinyint"]:
-                column_value_string += f"{column_name} = {cell_value}, "
+                column_value_string += f"{quote}{column_name}{quote} = {cell_value}, "
             elif "varchar" in column_type:
-                column_value_string += f"{column_name} = '{cell_value}', "
+                column_value_string += f"{quote}{column_name}{quote} = '{cell_value}', "
             elif column_type in ["json", "text", "mediumtext", "longtext", "datetime"]:
-                column_value_string += f"{column_name} = '{cell_value}', "
+                column_value_string += f"{quote}{column_name}{quote} = '{cell_value}', "
             else:
                 raise AttributeError(f"Unknown column type '{column_type}'")
 
         column_value_string = column_value_string.rstrip(", ")
-        quote = self.db1.identifier_quote
         sql_query = f"UPDATE {quote}{self.name}{quote} SET {column_value_string}"
 
         if where_column is not None and where_value is not None:
-            sql_query += f" WHERE {where_column} = {where_value};"
+            sql_query += f" WHERE {quote}{where_column}{quote} = {where_value};"
         else:
             sql_query += ";"
         if debug_mode:
@@ -382,7 +385,7 @@ class AbstractTable(AbstractJoinable, abc.ABC):
             inserted_columns=list(dict.fromkeys(self.columns)) #DEDUPLICATION preserving order -> better than inserted_columns = set(self.columns) 
             id_index=inserted_columns.index(self.id_column_name)
             inserted_columns.pop(id_index)
-            print(inserted_columns,df.columns)
+            # print(inserted_columns,df.columns)
             
             assert set(df.columns) == set(inserted_columns) #elements are matchin
             #df = df[inserted_columns]
@@ -400,7 +403,8 @@ class AbstractTable(AbstractJoinable, abc.ABC):
 
         # TODO: handling nan values -> change to NULL
         for column in list(df.columns):
-            df.loc[pd.isna(df[column]), column] = "NULL"
+            
+            df[column] = df[column].fillna("NULL") #New implementation, Old implementation was deprecated by pandas: #df.loc[pd.isna(df[column]), column] = "NULL"
 
         # rows = df.values.tolist()
         # for i, row in enumerate(rows):
@@ -428,12 +432,7 @@ class AbstractTable(AbstractJoinable, abc.ABC):
         quote = self.db1.identifier_quote
 
         if where is None:
-            query = "DELETE FROM {quote}{self.name}{quote}"
+            query = f"DELETE FROM {quote}{self.name}{quote}"
         else:
             query = f"DELETE FROM {quote}{self.name}{quote} WHERE {where}"
         return self.execute(query)
-
-
-
-
-    

dbhydra/src/mysql_db.py

@@ -19,7 +19,8 @@ class MysqlDb(AbstractDb):
     'dict': "nvarchar(2047)",
     'bool': "tinyint",
     'datetime': "datetime",
-    'Jsonable': "json"
+    'Jsonable': "json",
+    'BLOB': "mediumblob",
     }
 
     def __init__(self, *args, **kwargs):

dbhydra/src/tables.py

@@ -5,9 +5,9 @@ import abc
 import time
 #xlsx imports
 import pathlib
-
+import pymysql
 from dbhydra.src.abstract_table import AbstractTable, AbstractSelectable, AbstractJoinable
-
+import binascii
 
 MONGO_OPERATOR_DICT = {"=": "$eq", ">": "$gt", ">=": "$gte", " IN ": "$in", "<": "$lt", "<=": "$lte", "<>": "$ne"}
 
@@ -294,11 +294,12 @@ class BigQueryTable(AbstractSelectable):
         return column_names, column_types
 
 
-    def select(self, query):
+    def select(self, query, debug_mode = False):
 
         """given SELECT query returns Python list"""
         """Columns give the number of selected columns"""
-        print(query)
+        if debug_mode:
+            print(query)
         # rows =  self.db1.client.query(query).result()
         rows = self.db1.execute(query)
         return rows
@@ -806,7 +807,10 @@ class MysqlTable(AbstractTable):
                     query += "'" + str(rows[k][j]) + "',"
                 elif "json" in self.types[j + start_index]:
                     query += f"'{rows[k][j]}', "
-
+                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}'), "
 
                 else:
                     query += str(rows[k][j]) + ","

{dbhydra-2.2.5.dist-info → dbhydra-2.2.8.dist-info}/METADATA

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

{dbhydra-2.2.5.dist-info → dbhydra-2.2.8.dist-info}/RECORD

@@ -1,16 +1,16 @@
 dbhydra/__init__.py,sha256=DCocEeXf4QxdVlBRlNiFvuP5IZJ5aa77_DbUR-_4C14,65
-dbhydra/dbhydra_core.py,sha256=26xBOo3sl--xFa-IrnE3AmBjB3ut5CXUJ1add438ups,2470
+dbhydra/dbhydra_core.py,sha256=gMroDA_kVph7JFimbsNpGZ33f-qiGhw-su9EUkNN0bA,2537
 dbhydra/test_migrator.py,sha256=e3Nnb2mCd3CfjhjSexNg1tXVJMjkl5cCoYcuhbfZ4pM,803
 dbhydra/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbhydra/src/abstract_db.py,sha256=lEP24vWz0HdGjQgSoHnawNK_NvRlSLuvzVSiiawssuw,5901
-dbhydra/src/abstract_table.py,sha256=82ciruUJBoGNqTcPjezTaYZJ03TpmuI_clkK95QGXy0,17420
+dbhydra/src/abstract_table.py,sha256=4oZO5if4wMbyEWtr5JkR6LPxbxjUwMVf4xITbE-2RXE,17755
 dbhydra/src/bigquery_db.py,sha256=77XsgvYbANlvYaJnuVve-kz-PNBx_CHoYCL-eYnA8e4,1834
 dbhydra/src/migrator.py,sha256=QzaODEFfraD9_6HN_Osaidaj-nLYQryCYYWwJtUu3n8,18931
 dbhydra/src/mongo_db.py,sha256=mP48zRjI7mXKpm45R8prroZI-Eo7JKf0KJqGX-oTy3w,1922
-dbhydra/src/mysql_db.py,sha256=xFYy1Ty7iS3GXSncFoaKve4QN1SMJiuDjGyMbb-b1bw,3152
+dbhydra/src/mysql_db.py,sha256=b0OV1nrYJBbzgTgBDKdLeENXQxKuYs_KhbvGvyymRf4,3180
 dbhydra/src/postgres_db.py,sha256=L7MaBq_6ArwDSP_5LaEqK58oLxZ1X7FgIokcDOSB7wk,1805
 dbhydra/src/sqlserver_db.py,sha256=9Xi3NAliqM79MTV8fpNQb0nWMH8Bqjl1leJSEqgyT94,3611
-dbhydra/src/tables.py,sha256=O66fps9U_gxwugOM38HoejuMRLgbTn6s2Omk0-Tgadw,46844
+dbhydra/src/tables.py,sha256=F_WEookoyjv4r9HGfWdCquCc9MP5vH3vfonBPKNRQ3k,47184
 dbhydra/src/xlsx_db.py,sha256=z6d-IjMYMmXC591Mt5DcxIYWyluanjPRFd-sXtjjXww,3514
 dbhydra/src/errors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbhydra/src/errors/exceptions.py,sha256=LVpfbTd3NHfQIM-D5TFAU6hOZwGQ3b5DwFD4B6vtf2U,149
@@ -18,8 +18,8 @@ dbhydra/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbhydra/tests/test_cases.py,sha256=eAFGaHaIaab3md3HHm2_ryb_HHfObtcXDAEzLh4qWx8,508
 dbhydra/tests/test_mongo.py,sha256=M8TD72M0iQAk7ZcLTWwLmcmmF_zwALnYEGTWjhQlq0s,1979
 dbhydra/tests/test_sql.py,sha256=aPFXyA0jh8o9VG3B5f9fNz7qDbuVPZ9TcE2twn5dAeQ,3126
-dbhydra-2.2.5.dist-info/LICENSE,sha256=k49Yga8CP889JJaHlOpGFzr_be2nqMoep2chYeIDctk,1091
-dbhydra-2.2.5.dist-info/METADATA,sha256=vi9gDW4BS2V0rKyfFIF2yaf2osd9n75-E5LtxHd6A1E,2298
-dbhydra-2.2.5.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-dbhydra-2.2.5.dist-info/top_level.txt,sha256=oO4Gf1T8_txIsIlp11GI0k7PtBIMb9GRwb5ObF4MLVg,8
-dbhydra-2.2.5.dist-info/RECORD,,
+dbhydra-2.2.8.dist-info/LICENSE,sha256=k49Yga8CP889JJaHlOpGFzr_be2nqMoep2chYeIDctk,1091
+dbhydra-2.2.8.dist-info/METADATA,sha256=oHsjGJM9YAxfzovKPp2Nlwy9jqomXk1FZzuGBEEgWlM,2298
+dbhydra-2.2.8.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+dbhydra-2.2.8.dist-info/top_level.txt,sha256=oO4Gf1T8_txIsIlp11GI0k7PtBIMb9GRwb5ObF4MLVg,8
+dbhydra-2.2.8.dist-info/RECORD,,