dbhydra 2.2.16__py3-none-any.whl → 2.3.0__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -78,9 +78,10 @@ class AbstractSelectable:
78
78
  columns = self.columns
79
79
  elif column_string.find(",") == -1:
80
80
  assert column_string.count("select")<=1 #assume there are no table columns containing "select" substring
81
- columns = [column_string.replace("select","").strip()]
81
+ columns = [column_string.replace("select","").replace(self.db1.identifier_quote,"").strip()]
82
82
  else:
83
- columns = [x.strip() for x in column_string.split(",")]
83
+ assert column_string.count("select")<=1
84
+ columns = [x.replace("select","").replace(self.db1.identifier_quote,"").strip() for x in column_string.split(",")]
84
85
  return(columns)
85
86
 
86
87
 
@@ -208,7 +209,7 @@ class AbstractSelectable:
208
209
  queries, queries_destinations=self._build_queries_from_blocks()
209
210
  self._query_blocks=[]
210
211
  for i,query in enumerate(queries):
211
- self.db1.execute()
212
+ self.db1.execute(query)
212
213
 
213
214
  if "SELECT" in query:
214
215
  selected_columns=self._get_selected_columns(query)
dbhydra/src/xlsx_db.py CHANGED
@@ -18,6 +18,7 @@ class XlsxDb(AbstractDb):
18
18
  def __init__(self, config_file="config.ini", db_details=None, is_csv=False):
19
19
  self.locally=True
20
20
  self.is_csv = is_csv
21
+ self.debug_mode = False #Defined because of AbstractDb method calls
21
22
  if db_details is None:
22
23
  self.name="new_db"
23
24
  self.db_directory_path = None
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: dbhydra
3
- Version: 2.2.16
3
+ Version: 2.3.0
4
4
  Summary: Data science friendly ORM combining Python
5
5
  Home-page: https://github.com/DovaX/dbhydra
6
6
  Author: DovaX
@@ -3,7 +3,7 @@ dbhydra/dbhydra_core.py,sha256=jn0VC3LkawR2P0Yd_oZNEXqP9o2BPEtOBWGzgFwfJyA,2537
3
3
  dbhydra/test_migrator.py,sha256=e3Nnb2mCd3CfjhjSexNg1tXVJMjkl5cCoYcuhbfZ4pM,803
4
4
  dbhydra/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
5
5
  dbhydra/src/abstract_db.py,sha256=7Rv2XgdaKiQ5yBnU0EDh5uT8XbB3JI5Pis_in6iHn2c,7172
6
- dbhydra/src/abstract_table.py,sha256=UAjiejG8z7VVCWZ6bjMDkbEl_w8shVAX2euGytCgYWQ,18947
6
+ dbhydra/src/abstract_table.py,sha256=FITmTqwLT6zB2WVVb3wSb8GAPZeLQfGR2u5vKTB8Ja4,19102
7
7
  dbhydra/src/bigquery_db.py,sha256=77XsgvYbANlvYaJnuVve-kz-PNBx_CHoYCL-eYnA8e4,1834
8
8
  dbhydra/src/migrator.py,sha256=QzaODEFfraD9_6HN_Osaidaj-nLYQryCYYWwJtUu3n8,18931
9
9
  dbhydra/src/mongo_db.py,sha256=mP48zRjI7mXKpm45R8prroZI-Eo7JKf0KJqGX-oTy3w,1922
@@ -11,15 +11,15 @@ dbhydra/src/mysql_db.py,sha256=lNWaS3YHtQE1Xii-ErWUDhxeo3b6HWgXxQAMJfgiGEE,3583
11
11
  dbhydra/src/postgres_db.py,sha256=L7MaBq_6ArwDSP_5LaEqK58oLxZ1X7FgIokcDOSB7wk,1805
12
12
  dbhydra/src/sqlserver_db.py,sha256=9Xi3NAliqM79MTV8fpNQb0nWMH8Bqjl1leJSEqgyT94,3611
13
13
  dbhydra/src/tables.py,sha256=oRbSTIHjeSc5ZCHmn74ZqdOvtBZDy6t_fp2KO-Z_Y-8,47612
14
- dbhydra/src/xlsx_db.py,sha256=deLmOXu3ZuM4a2Fzf7LLcdYG8JQIfULaLd4jZzMnceo,3539
14
+ dbhydra/src/xlsx_db.py,sha256=glFF-0dQK0GGinAqc2zvf9JQ9iAH9YkDAYd4Jb3oimQ,3616
15
15
  dbhydra/src/errors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
16
16
  dbhydra/src/errors/exceptions.py,sha256=LVpfbTd3NHfQIM-D5TFAU6hOZwGQ3b5DwFD4B6vtf2U,149
17
17
  dbhydra/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
18
18
  dbhydra/tests/test_cases.py,sha256=eAFGaHaIaab3md3HHm2_ryb_HHfObtcXDAEzLh4qWx8,508
19
19
  dbhydra/tests/test_mongo.py,sha256=M8TD72M0iQAk7ZcLTWwLmcmmF_zwALnYEGTWjhQlq0s,1979
20
20
  dbhydra/tests/test_sql.py,sha256=aPFXyA0jh8o9VG3B5f9fNz7qDbuVPZ9TcE2twn5dAeQ,3126
21
- dbhydra-2.2.16.dist-info/LICENSE,sha256=k49Yga8CP889JJaHlOpGFzr_be2nqMoep2chYeIDctk,1091
22
- dbhydra-2.2.16.dist-info/METADATA,sha256=6y-GKoIrOdzKPGl2QkPSKQ_mNPWczfyb-_yJj1XSnT8,2299
23
- dbhydra-2.2.16.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
24
- dbhydra-2.2.16.dist-info/top_level.txt,sha256=oO4Gf1T8_txIsIlp11GI0k7PtBIMb9GRwb5ObF4MLVg,8
25
- dbhydra-2.2.16.dist-info/RECORD,,
21
+ dbhydra-2.3.0.dist-info/LICENSE,sha256=k49Yga8CP889JJaHlOpGFzr_be2nqMoep2chYeIDctk,1091
22
+ dbhydra-2.3.0.dist-info/METADATA,sha256=zmqV5NBQcLq9SJY7QuUxUZomIJa_WuSeXku1HYs8JXc,2298
23
+ dbhydra-2.3.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
24
+ dbhydra-2.3.0.dist-info/top_level.txt,sha256=oO4Gf1T8_txIsIlp11GI0k7PtBIMb9GRwb5ObF4MLVg,8
25
+ dbhydra-2.3.0.dist-info/RECORD,,