dbhydra 2.0.7__py3-none-any.whl → 2.0.9__py3-none-any.whl

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/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.dist-info → dbhydra-2.0.9.dist-info}/METADATA

@@ -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.dist-info → dbhydra-2.0.9.dist-info}/RECORD

@@ -11,14 +11,14 @@ dbhydra/mongo.py,sha256=GeNsv8rkt5DmjN7eEjvgJ5F9XUCwf8zir9DqbAuJswc,1836
 dbhydra/test.py,sha256=SQDd8D_gpAE_14QFw5WCWJCsFq4iEnsvxoGD8vcB9G8,448
 dbhydra/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbhydra/src/abstract_db.py,sha256=tY4sNuRQw2qXMXxha9eo9tAmP2z_hcirf04tfDBpwxs,5607
-dbhydra/src/abstract_table.py,sha256=CoHqoc8bID1X-PvY5dnYa9GD9rqXelHVV9moI2R3uxw,15669
+dbhydra/src/abstract_table.py,sha256=n5-U3WThLzqoWNiQiMZltMmjiOeRuaWEkoFM2PR1w-4,16226
 dbhydra/src/bigquery_db.py,sha256=77XsgvYbANlvYaJnuVve-kz-PNBx_CHoYCL-eYnA8e4,1834
 dbhydra/src/migrator.py,sha256=l2MBmiAsv2hv97YmA5IvfbPUK2aAPt46jFulLXBUFHc,4412
 dbhydra/src/mongo_db.py,sha256=mP48zRjI7mXKpm45R8prroZI-Eo7JKf0KJqGX-oTy3w,1922
 dbhydra/src/mysql_db.py,sha256=7U-nBhbK3iwbnb1hRF9t2IoYRFA2m4L6w_ixEMJI4hA,2761
 dbhydra/src/postgres_db.py,sha256=L7MaBq_6ArwDSP_5LaEqK58oLxZ1X7FgIokcDOSB7wk,1805
 dbhydra/src/sqlserver_db.py,sha256=9Xi3NAliqM79MTV8fpNQb0nWMH8Bqjl1leJSEqgyT94,3611
-dbhydra/src/tables.py,sha256=uMapAfI6CeqK30qc6SmwKZi9UbPP0GNJIW89QMBfVfM,42934
+dbhydra/src/tables.py,sha256=NWoGLL2JwDaZryCWdDjqvlEyPuCK_m92SMkkbsF8dys,42885
 dbhydra/src/xlsx_db.py,sha256=Ccxjhbdw4fPHXR5eHjY9KCsMVa-s_NBHVIItxf2eEXY,2813
 dbhydra/src/errors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbhydra/src/errors/exceptions.py,sha256=LVpfbTd3NHfQIM-D5TFAU6hOZwGQ3b5DwFD4B6vtf2U,149
@@ -26,8 +26,8 @@ dbhydra/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbhydra/tests/test_cases.py,sha256=eAFGaHaIaab3md3HHm2_ryb_HHfObtcXDAEzLh4qWx8,508
 dbhydra/tests/test_mongo.py,sha256=M8TD72M0iQAk7ZcLTWwLmcmmF_zwALnYEGTWjhQlq0s,1979
 dbhydra/tests/test_sql.py,sha256=aPFXyA0jh8o9VG3B5f9fNz7qDbuVPZ9TcE2twn5dAeQ,3126
-dbhydra-2.0.7.dist-info/LICENSE,sha256=k49Yga8CP889JJaHlOpGFzr_be2nqMoep2chYeIDctk,1091
-dbhydra-2.0.7.dist-info/METADATA,sha256=Qpx4a2Pm5iSe8rj2ElpXaBGAWCjWaVhDu4-oSUq1UKs,2298
-dbhydra-2.0.7.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-dbhydra-2.0.7.dist-info/top_level.txt,sha256=oO4Gf1T8_txIsIlp11GI0k7PtBIMb9GRwb5ObF4MLVg,8
-dbhydra-2.0.7.dist-info/RECORD,,
+dbhydra-2.0.9.dist-info/LICENSE,sha256=k49Yga8CP889JJaHlOpGFzr_be2nqMoep2chYeIDctk,1091
+dbhydra-2.0.9.dist-info/METADATA,sha256=FNEI4oq-QzCLvkr35b78eIktr7W4HWeQnEApKDCy7zc,2298
+dbhydra-2.0.9.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+dbhydra-2.0.9.dist-info/top_level.txt,sha256=oO4Gf1T8_txIsIlp11GI0k7PtBIMb9GRwb5ObF4MLVg,8
+dbhydra-2.0.9.dist-info/RECORD,,