dbhydra 2.3.1__tar.gz → 2.3.4__tar.gz

dbhydra-2.3.4/LICENSE

@@ -0,0 +1,22 @@
+MIT License
+        
+        Copyright (c) 2020 DovaX
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+    

{dbhydra-2.3.1 → dbhydra-2.3.4}/PKG-INFO

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

{dbhydra-2.3.1 → dbhydra-2.3.4}/dbhydra/dbhydra_core.py

@@ -26,6 +26,15 @@ class Blob(str):
     """Store BLOBs up to 16MB."""    
     pass
 
+class LongText(str):
+    """Store long text strings (maps to MySQL LONGTEXT)."""    
+    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):

{dbhydra-2.3.1 → dbhydra-2.3.4}/dbhydra/src/abstract_db.py

@@ -59,6 +59,7 @@ class AbstractDb(abc.ABC):
         'Optional': 'object',
         'Jsonable': 'Jsonable',
         'Blob': 'Blob',
+        'LongText': 'LongText',
         # 'FrozenSet': frozenset,
         # 'Deque': list,
         # 'Any': object,

{dbhydra-2.3.1 → dbhydra-2.3.4}/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-2.3.1 → dbhydra-2.3.4}/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-2.3.1 → dbhydra-2.3.4}/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 → dbhydra-2.3.4}/dbhydra/src/xlsx_db.py

@@ -43,7 +43,8 @@ class XlsxDb(AbstractDb):
         'bool': "bool",
         'datetime': "datetime",
         'Jsonable': "str",
-        'Blob': "Blob"
+        'Blob': "Blob",
+        'LongText': "str"
         }
 
         

{dbhydra-2.3.1 → dbhydra-2.3.4}/dbhydra.egg-info/PKG-INFO

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

{dbhydra-2.3.1 → dbhydra-2.3.4}/setup.py

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

dbhydra-2.3.1/LICENSE

@@ -1,19 +0,0 @@
-Copyright (c) 2020 The Python Packaging Authority
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.