dbhydra 2.3.1__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
@@ -270,7 +284,10 @@ class AbstractTable(AbstractJoinable, abc.ABC):
     def update(self, variable_assign, where=None, debug_mode = False):
         quote = self.db1.identifier_quote
 
-        query = f"UPDATE {quote}{self.name}{quote} SET {variable_assign}"
+        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}"

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

@@ -808,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-2.3.1.dist-info → dbhydra-2.3.3.dist-info}/METADATA

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

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

@@ -1,16 +1,16 @@
 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=5sTNPpUD31l4UbZ0at5CMg-AbLlOYodpq_sHmT1Lrb8,19331
+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=Xt0c8o93ZthxTF6YF9TGS3Ud719qXSD3iF7-wGbckW4,47799
+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
@@ -19,8 +19,8 @@ dbhydra/tests/test_cases.py,sha256=eAFGaHaIaab3md3HHm2_ryb_HHfObtcXDAEzLh4qWx8,5
 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.1.dist-info/LICENSE,sha256=k49Yga8CP889JJaHlOpGFzr_be2nqMoep2chYeIDctk,1091
-dbhydra-2.3.1.dist-info/METADATA,sha256=Mwdf3U9g9K4GXTATZYRdO9qu1TZIYBREDdBp39YgSgk,2298
-dbhydra-2.3.1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-dbhydra-2.3.1.dist-info/top_level.txt,sha256=oO4Gf1T8_txIsIlp11GI0k7PtBIMb9GRwb5ObF4MLVg,8
-dbhydra-2.3.1.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,,