dbhydra 2.2.3__tar.gz → 2.2.6__tar.gz

{dbhydra-2.2.3 → dbhydra-2.2.6}/PKG-INFO

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

{dbhydra-2.2.3 → dbhydra-2.2.6}/dbhydra/src/abstract_table.py

@@ -258,21 +258,23 @@ class AbstractTable(AbstractJoinable, abc.ABC):
         return cls(db1, name, columns, types, id_column_name=id_column_name)
     
     
-    def drop(self):
+    def drop(self, debug_mode = False):
         query = "DROP TABLE " + self.name
-        print(query)
+        if debug_mode:
+            print(query)
         self.execute(query)
 
-    def update(self, variable_assign, where=None):
+    def update(self, variable_assign, where=None, debug_mode = False):
         if where is None:
             query = "UPDATE " + self.name + " SET " + variable_assign
         else:
             query = "UPDATE " + self.name + " SET " + variable_assign + " WHERE " + where
-        print(query)
+        if debug_mode:
+            print(query)
         return self.execute(query)
 
     def update_from_df(
-            self, update_df: pd.DataFrame, where_column: Optional[str] = None, where_value: Any = None) -> None:
+            self, update_df: pd.DataFrame, where_column: Optional[str] = None, where_value: Any = None, debug_mode = False) -> None:
         """Build UPDATE SQL query from a dataframe and execute it.
 
         :param update_df: Dataframe with updated values - MUST only hold a single row
@@ -322,8 +324,8 @@ class AbstractTable(AbstractJoinable, abc.ABC):
             sql_query += f" WHERE {where_column} = {where_value};"
         else:
             sql_query += ";"
-
-        print(sql_query)
+        if debug_mode:
+            print(sql_query)
         self.execute(sql_query)
 
     def _adjust_df(self, df: pd.DataFrame, debug_mode=False) -> pd.DataFrame:
@@ -398,7 +400,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):

{dbhydra-2.2.3 → dbhydra-2.2.6}/dbhydra/src/tables.py

@@ -141,7 +141,7 @@ class PostgresTable(AbstractTable):
         return (cls(db1, name, columns, types))
 
     # @save_migration
-    def create(self, foreign_keys=None):
+    def create(self, foreign_keys=None, debug_mode = False):
         assert len(self.columns) == len(self.types)
         assert self.columns[0] == self.id_column_name
         assert self.types[0].lower() == "int" or self.types[0].lower() == "integer"
@@ -151,7 +151,8 @@ class PostgresTable(AbstractTable):
 
         query = query[:-1]
         query += ");"
-        print(query)
+        if debug_mode:
+            print(query)
         try:
             self.db1.execute(query)
         except Exception as e:
@@ -293,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
@@ -495,7 +497,7 @@ class SqlServerTable(AbstractTable):
         types = information_schema_table.select(query)
         return (types)
 
-    def create(self):
+    def create(self, debug_mode = False):
         assert len(self.columns) == len(self.types)
         assert self.columns[0] == self.id_column_name
         assert self.types[0].lower() == "int"
@@ -503,8 +505,8 @@ class SqlServerTable(AbstractTable):
         for i in range(1, len(self.columns)):
             query += self.columns[i] + " " + self.types[i] + ","
         query += "PRIMARY KEY("+self.id_column_name+"))"
-
-        print(query)
+        if debug_mode:
+            print(query)
         try:
             self.db1.execute(query)
         except Exception as e:
@@ -729,13 +731,14 @@ class MysqlTable(AbstractTable):
 
         return num_of_records[0][0]
 
-    def drop(self):
+    def drop(self, debug_mode = False):
         query = "DROP TABLE `" + self.name + "`;"
-        print(query)
+        if debug_mode:
+            print(query)
         self.db1.execute(query)
 
     # @save_migration #TODO: Uncomment
-    def create(self, foreign_keys=None):
+    def create(self, foreign_keys=None, debug_mode = False):
         assert len(self.columns) == len(self.types)
         assert self.columns[0] == self.id_column_name
         assert self.types[0].lower() == "int"
@@ -745,8 +748,8 @@ class MysqlTable(AbstractTable):
             [f"`{column}` {type_.upper()}" for column, type_ in column_type_pairs]
         )
         query = f"CREATE TABLE `{self.name}` ({self.id_column_name} INT UNSIGNED AUTO_INCREMENT PRIMARY KEY, {fields})"
-
-        print(query)
+        if debug_mode:
+            print(query)
         try:
             self.db1.execute(query)
         except Exception as e:

{dbhydra-2.2.3 → dbhydra-2.2.6}/dbhydra.egg-info/PKG-INFO

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

{dbhydra-2.2.3 → dbhydra-2.2.6}/setup.py

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