dbhydra 2.0.7__tar.gz → 2.0.9__tar.gz

{dbhydra-2.0.7 → dbhydra-2.0.9}/PKG-INFO

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

{dbhydra-2.0.7 → dbhydra-2.0.9}/dbhydra/src/abstract_table.py

@@ -66,10 +66,17 @@ class AbstractSelectable:
         
         
     def _get_selected_columns(self, query):
-        column_string = query.lower().split("from")[0]
+        from_keyword_count=query.lower().count("from") #There can be "from" substrings in column names: e.g. SELECT uid,from_node_uid,to_node_uid,channel,visible,pipeline_uid,project_uid FROM edges
+        #print("COUNT", from_keyword_count)
+        if from_keyword_count==1:
+            column_string = query.lower().split("from")[0]
+        else:
+            column_string = "from".join(query.lower().split("from")[0:(from_keyword_count)])
+        #print("column string",column_string)
         if "*" in column_string:
             columns = self.columns
         elif column_string.find(",") == -1:
+            assert column_string.count("select")<=1 #assume there are no table columns containing "select" substring
             columns = [column_string.replace("select","").strip()]
         else:
             columns = [x.strip() for x in column_string.split(",")]

{dbhydra-2.0.7 → dbhydra-2.0.9}/dbhydra/src/tables.py

@@ -603,8 +603,7 @@ class Table(SqlServerTable):
 
 class MysqlTable(AbstractTable):
     def __init__(self, db1, name, columns=None, types=None, id_column_name = "id"):
-        super().__init__(db1, name, columns)
-        self.types = types
+        super().__init__(db1, name, columns, types)
         self.id_column_name = id_column_name
 
     #Disabled because it is inherited
@@ -880,7 +879,6 @@ class MysqlTable(AbstractTable):
 class XlsxTable(AbstractTable):
     def __init__(self, db1, name, columns=None, types=None, id_column_name = "id"):
         super().__init__(db1, name, columns, types)
-        self.types = types
         self.id_column_name = id_column_name
 
         table_filename = f"{self.name}.csv" if self.db1.is_csv else f"{self.name}.xlsx"

{dbhydra-2.0.7 → dbhydra-2.0.9}/dbhydra.egg-info/PKG-INFO

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

{dbhydra-2.0.7 → dbhydra-2.0.9}/setup.py

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