dbhydra 1.2.6__tar.gz → 1.2.7__tar.gz

{dbhydra-1.2.6 → dbhydra-1.2.7}/PKG-INFO

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

{dbhydra-1.2.6 → dbhydra-1.2.7}/dbhydra/dbhydra_core.py

@@ -252,6 +252,7 @@ class AbstractDB(abc.ABC):
         'Set': 'set',
         'Union': 'object',
         'Optional': 'object',
+        'Jsonable': 'Jsonable',
         # 'FrozenSet': frozenset,
         # 'Deque': list,
         # 'Any': object,
@@ -481,9 +482,9 @@ class Mysqldb(AbstractDB):
     'Jsonable': "json"
     }
 
-    def connect_to_db(self):
-        self.connection = MySQLdb.connect(host=self.DB_SERVER, port=self.DB_PORT, user=self.DB_USERNAME, password=self.DB_PASSWORD, database=self.DB_DATABASE)
-        self.cursor = self.connection.cursor()
+    #def connect_to_db(self):
+    #    self.connection = MySQLdb.connect(host=self.DB_SERVER, port=self.DB_PORT, user=self.DB_USERNAME, password=self.DB_PASSWORD, database=self.DB_DATABASE)
+    #    self.cursor = self.connection.cursor()
 
     # NOT USED, BUT FORCED BY ABSTRACT CLASS
     def connect_locally(self):
@@ -811,8 +812,8 @@ class AbstractTable(AbstractJoinable, abc.ABC):
         if not len(update_df) == 1:
             raise ValueError("There can only be one row in the UPDATE dataframe")
 
-        types_without_id_column = [x for x in self.types if x!=self.id_column_name]
-        
+        types_without_id_column = [type_ for column, type_ in zip(self.columns, self.types) 
+                           if column != self.id_column_name]
         if len(types_without_id_column) != len(update_df.columns):
             raise AttributeError(
                 "Number of columns in dataframe does not match number of columns in table"
@@ -826,7 +827,7 @@ class AbstractTable(AbstractJoinable, abc.ABC):
                 column_value_string += f"{column} = {cell_value}, "
             elif "varchar" in column_type:
                 column_value_string += f"{column} = '{cell_value}', "
-            elif column_type in ["JSON", "text", "mediumtext", "longtext", "datetime"]:
+            elif column_type in ["json", "text", "mediumtext", "longtext", "datetime"]:
                 column_value_string += f"{column} = '{cell_value}', "
             else:
                 raise AttributeError(f"Unknown column type '{column_type}'")
@@ -1598,7 +1599,12 @@ class MysqlTable(MysqlSelectable, AbstractTable):
                 query = "INSERT INTO " + self.name + " ("
                 for i in range(start_index, len(self.columns)):
                     if i < len(rows[k]) + 1:
-                        query += self.columns[i] + ","
+                        # column name containing space needs to be wrapped in `...`, otherwise causes syntax error
+                        if " " in self.columns[i]:
+                            column_name = '`' + self.columns[i] + '`'
+                        else:
+                            column_name = self.columns[i]
+                        query += column_name + ","
                 if len(rows) < len(self.columns):
                     print(len(self.columns) - len(rows), "columns were not specified")
                 if query[-1] == ',':
@@ -1624,6 +1630,10 @@ class MysqlTable(MysqlSelectable, AbstractTable):
                     if replace_apostrophes:
                         rows[k][j] = str(rows[k][j]).replace("'", "")
                     query += "'" + str(rows[k][j]) + "',"
+                elif "char" in self.types[j + start_index]:
+                    if replace_apostrophes:
+                        rows[k][j] = str(rows[k][j]).replace("'", "")
+                    query += "'" + str(rows[k][j]) + "',"
                 elif self.types[j + start_index] == "int":
                     query += str(rows[k][j]) + ","
                 elif "datetime" in self.types[j + start_index]:
@@ -1720,6 +1730,7 @@ class MysqlTable(MysqlSelectable, AbstractTable):
 
 class XlsxDB(AbstractDB):
     def __init__(self, config_file="config.ini", db_details=None):
+        self.locally=True
         if db_details is None:
             self.name="new_db"
             self.directory_path = None
@@ -1742,7 +1753,7 @@ class XlsxDB(AbstractDB):
         'dict': "str",
         'bool': "bool",
         'datetime': "datetime",
-        'jsonable': "str"
+        'Jsonable': "str"
         }
 
         """

{dbhydra-1.2.6 → dbhydra-1.2.7}/dbhydra.egg-info/PKG-INFO

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

{dbhydra-1.2.6 → dbhydra-1.2.7}/setup.py

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