dbhydra 2.3.0__py3-none-any.whl → 2.3.3__py3-none-any.whl

dbhydra/dbhydra_core.py

@@ -27,6 +27,11 @@ class Blob(str):
     pass
 
 
+class LongText(str):
+    """Marker type for columns that should be mapped to LONGTEXT in SQL backends."""
+    pass
+
+
 # dataframe - dictionary auxiliary functions
 def df_to_dict(df, column1, column2):
     dictionary = df.set_index(column1).to_dict()[column2]

dbhydra/src/abstract_table.py

@@ -134,18 +134,32 @@ class AbstractSelectable:
             return(rows)
             
 
-    def select_all(self, debug_mode = False):
+    def select_all(self, debug_mode = False, limit: Optional[int] = None, offset: Optional[int] = None):
         quote = self.db1.identifier_quote
         all_cols_query = ""
         for col in self.columns:
             all_cols_query = all_cols_query + quote + col + quote + ","
         if all_cols_query[-1] == ",":
             all_cols_query = all_cols_query[:-1]
-        list1 = self.select(f"SELECT {all_cols_query} FROM {quote}{self.name}{quote};", debug_mode = debug_mode)
+        
+        query = f"SELECT {all_cols_query} FROM {quote}{self.name}{quote}"
+        
+        # Add LIMIT and OFFSET to the query
+        if limit is not None and limit > 0:
+            if offset is not None and offset > 0:
+                query += f" LIMIT {offset}, {limit}"
+            else:
+                query += f" LIMIT {limit}"
+        elif offset is not None and offset > 0:
+            # MySQL requires LIMIT when using OFFSET, use a large number for all remaining rows
+            query += f" LIMIT {offset}, 18446744073709551615"
+        
+        query += ";"
+        list1 = self.select(query, debug_mode = debug_mode)
         return (list1)
 
-    def select_to_df(self, debug_mode = False):
-        rows = self.select_all(debug_mode = debug_mode)
+    def select_to_df(self, debug_mode = False, limit: Optional[int] = None, offset: Optional[int] = None):
+        rows = self.select_all(debug_mode = debug_mode, limit = limit, offset = offset)
         if self.query_building_enabled:
             self.to_df()
             df=None
@@ -269,10 +283,20 @@ class AbstractTable(AbstractJoinable, abc.ABC):
 
     def update(self, variable_assign, where=None, debug_mode = False):
         quote = self.db1.identifier_quote
-        if where is None:
-            query = f"UPDATE {quote}{self.name}{quote} SET {quote}{variable_assign}{quote}"
-        else:
-            query = f"UPDATE {quote}{self.name}{quote} SET {quote}{variable_assign}{quote} WHERE {quote}{where}{quote}"
+
+        assert "=" in variable_assign 
+        assigned_variable,assigned_value=variable_assign.split("=").strip()
+        
+        query = f"UPDATE {quote}{self.name}{quote} SET {quote}{assigned_variable}{quote} = {assigned_value}"
+        
+        if where:
+            query += f" WHERE {where}"
+
+        #Old broken implementation it gives `` for the SQL syntax query
+        # if where is None:
+        #     query = f"UPDATE {quote}{self.name}{quote} SET {quote}{variable_assign}{quote}"
+        # else:
+        #     query = f"UPDATE {quote}{self.name}{quote} SET {quote}{variable_assign}{quote} WHERE {quote}{where}{quote}"
 
         if debug_mode:
             print(query)

dbhydra/src/mysql_db.py

@@ -21,6 +21,7 @@ class MysqlDb(AbstractDb):
     'datetime': "datetime",
     'Jsonable': "json",
     'Blob': "mediumblob",
+    'LongText': "longtext",
     }
 
     def __init__(self, *args, **kwargs):

dbhydra/src/tables.py

@@ -38,7 +38,6 @@ PYTHON_TO_MYSQL_DATA_MAPPING = {
 
 def save_migration(function, *args, **kw):  # decorator
     def new_function(instance, *args, **kw):
-        print("TOTO TU")
         print(instance)
         print(*args)
         command = function.__name__
@@ -63,9 +62,12 @@ def save_migration(function, *args, **kw):  # decorator
             print(migration_dict)
         # TODO: add other methods
 
-        migrator = instance.db1.migrator
-        migrator.migration_list.append(migration_dict)
-        # migrator.migration_list_to_json()
+        if hasattr(instance.db1, 'migrator'):
+            migrator = instance.db1.migrator
+            migrator.migration_list.append(migration_dict)
+            # migrator.migration_list_to_json()
+        else:
+            print(f"[save_migration] WARNING: db1 object of type {type(instance.db1)} has no 'migrator' attribute. Migration not saved.")
         function(instance, *args, **kw)
 
     return (new_function)
@@ -806,6 +808,11 @@ class MysqlTable(AbstractTable):
                     query += "'" + str(rows[k][j]) + "',"
                 elif "json" in self.types[j + start_index]:
                     query += f"'{rows[k][j]}', "
+                elif "text" in self.types[j + start_index]:
+                    # Covers text, mediumtext, longtext
+                    if replace_apostrophes:
+                        rows[k][j] = str(rows[k][j]).replace("'", "")
+                    query += "'" + str(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')

dbhydra/tests/test_mysql_ddl.py

@@ -0,0 +1,91 @@
+##### DDL (data definition language) tests for MySQL #####
+
+import os
+import pytest
+import random
+import string
+import dbhydra.dbhydra_core as dh
+
+def random_table_name(prefix="test_table_"):
+    return prefix + ''.join(random.choices(string.ascii_lowercase + string.digits, k=8))
+
+# Rename mysqldb fixture and all references to db1
+@pytest.fixture(scope="module")
+def db1():
+    # Get the directory of this test file, then go up one level to the project root
+    root_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+    config_path = os.path.join(root_dir, "config-mysql.ini")
+    return dh.MysqlDb(config_file=config_path)
+
+@pytest.fixture(scope="function")
+def temp_mysql_table(db1):
+    table_name = random_table_name()
+    columns = ["id", "name"]
+    types = ["int", "varchar(255)"]
+    table = dh.MysqlTable(db1, table_name, columns, types)
+    with db1.connect_to_db():
+        table.create()
+        table_dict = db1.generate_table_dict()
+        assert table_name in table_dict, f"Temp table {table_name} was not created!"
+    yield table
+    # Cleanup
+    try:
+        with db1.connect_to_db():
+            table.drop()
+            table_dict = db1.generate_table_dict()
+            assert table_name not in table_dict, f"Temp table {table_name} was not dropped!"
+    except Exception as e:
+        print(f"[CLEANUP] Could not drop table {table_name}: {e}")
+        raise
+
+def test_mysql_create_and_drop_table(db1):
+    table_name = random_table_name()
+    columns = ["id", "name"]
+    types = ["int", "varchar(255)"]
+    table = dh.MysqlTable(db1, table_name, columns, types)
+    with db1.connect_to_db():
+        table.create()
+        table_dict = db1.generate_table_dict()
+        assert table_name in table_dict, f"Table {table_name} was not created!"
+        table.drop()
+        table_dict = db1.generate_table_dict()
+        assert table_name not in table_dict, f"Table {table_name} was not dropped!"
+
+def test_mysql_add_column(temp_mysql_table, db1):
+    table = temp_mysql_table
+    column = "age"
+    type = "int"
+    with db1.connect_to_db():
+        table.add_column(column, type)
+        df = table.select_to_df()
+        columns = df.columns.tolist()
+        assert column in columns, f"Column '{column}' was not added! Columns: {columns}"
+
+def test_mysql_drop_column(temp_mysql_table, db1):
+    table = temp_mysql_table
+    column = "age"
+    type = "int"
+    with db1.connect_to_db():
+        table.add_column(column, type)
+        df = table.select_to_df()
+        columns = df.columns.tolist()
+        assert column in columns, f"Column '{column}' was not added! Columns: {columns}"
+        table.drop_column(column)
+        df = table.select_to_df()
+        columns = df.columns.tolist()
+        assert column not in columns, f"Column '{column}' was not dropped! Columns: {columns}"
+
+def test_mysql_modify_column(temp_mysql_table, db1):
+    table = temp_mysql_table
+    column = "age"
+    type = "int"
+    with db1.connect_to_db():
+        table.add_column(column, type)
+        df = table.select_to_df()
+        columns = df.columns.tolist()
+        assert column in columns, f"Column '{column}' was not added! Columns: {columns}"
+        # Modify column type
+        type2 = "varchar(100)"
+        table.modify_column(column, type2)
+        types = table.get_all_types()
+        assert any("varchar" in t for t in types), f"Column '{column}' was not modified to varchar! Types: {types}" 

{dbhydra-2.3.0.dist-info → dbhydra-2.3.3.dist-info}/METADATA

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

{dbhydra-2.3.0.dist-info → dbhydra-2.3.3.dist-info}/RECORD

@@ -1,25 +1,26 @@
 dbhydra/__init__.py,sha256=DCocEeXf4QxdVlBRlNiFvuP5IZJ5aa77_DbUR-_4C14,65
-dbhydra/dbhydra_core.py,sha256=jn0VC3LkawR2P0Yd_oZNEXqP9o2BPEtOBWGzgFwfJyA,2537
+dbhydra/dbhydra_core.py,sha256=Rs_lR-RdHu2Yoq67-k68syQRri-hrrDYl-MvdkvWK-M,2659
 dbhydra/test_migrator.py,sha256=e3Nnb2mCd3CfjhjSexNg1tXVJMjkl5cCoYcuhbfZ4pM,803
 dbhydra/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbhydra/src/abstract_db.py,sha256=7Rv2XgdaKiQ5yBnU0EDh5uT8XbB3JI5Pis_in6iHn2c,7172
-dbhydra/src/abstract_table.py,sha256=FITmTqwLT6zB2WVVb3wSb8GAPZeLQfGR2u5vKTB8Ja4,19102
+dbhydra/src/abstract_table.py,sha256=uppvejYtc_5j9oFH-kk5EPRVqKs2-R6UkxIsfcDu6SY,20184
 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=lNWaS3YHtQE1Xii-ErWUDhxeo3b6HWgXxQAMJfgiGEE,3583
+dbhydra/src/mysql_db.py,sha256=p0ISoezMfFMXdtKNknPi0sZybdXHa8o5gHh4XtVwzs8,3612
 dbhydra/src/postgres_db.py,sha256=L7MaBq_6ArwDSP_5LaEqK58oLxZ1X7FgIokcDOSB7wk,1805
 dbhydra/src/sqlserver_db.py,sha256=9Xi3NAliqM79MTV8fpNQb0nWMH8Bqjl1leJSEqgyT94,3611
-dbhydra/src/tables.py,sha256=oRbSTIHjeSc5ZCHmn74ZqdOvtBZDy6t_fp2KO-Z_Y-8,47612
+dbhydra/src/tables.py,sha256=obx3x3afBn7vY-J7GInMl8bKz-9IQ-glTPTvB7oH1_k,48092
 dbhydra/src/xlsx_db.py,sha256=glFF-0dQK0GGinAqc2zvf9JQ9iAH9YkDAYd4Jb3oimQ,3616
 dbhydra/src/errors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbhydra/src/errors/exceptions.py,sha256=LVpfbTd3NHfQIM-D5TFAU6hOZwGQ3b5DwFD4B6vtf2U,149
 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_mysql_ddl.py,sha256=-gncZE_HjTOAI1yxOn8u5TZkoqoRdShLMF469Trbb9U,3531
 dbhydra/tests/test_sql.py,sha256=aPFXyA0jh8o9VG3B5f9fNz7qDbuVPZ9TcE2twn5dAeQ,3126
-dbhydra-2.3.0.dist-info/LICENSE,sha256=k49Yga8CP889JJaHlOpGFzr_be2nqMoep2chYeIDctk,1091
-dbhydra-2.3.0.dist-info/METADATA,sha256=zmqV5NBQcLq9SJY7QuUxUZomIJa_WuSeXku1HYs8JXc,2298
-dbhydra-2.3.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-dbhydra-2.3.0.dist-info/top_level.txt,sha256=oO4Gf1T8_txIsIlp11GI0k7PtBIMb9GRwb5ObF4MLVg,8
-dbhydra-2.3.0.dist-info/RECORD,,
+dbhydra-2.3.3.dist-info/LICENSE,sha256=k49Yga8CP889JJaHlOpGFzr_be2nqMoep2chYeIDctk,1091
+dbhydra-2.3.3.dist-info/METADATA,sha256=nW-c2bp-4KlDrB05tmKnowJVKAPobV6ugxQyi3tzELw,2298
+dbhydra-2.3.3.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+dbhydra-2.3.3.dist-info/top_level.txt,sha256=oO4Gf1T8_txIsIlp11GI0k7PtBIMb9GRwb5ObF4MLVg,8
+dbhydra-2.3.3.dist-info/RECORD,,

{dbhydra-2.3.0.dist-info → dbhydra-2.3.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.4)
+Generator: setuptools (75.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any