@@ -135,10 +135,10 @@ def test_datetime(console: Console, engine: Engine) -> None:
135
135
@click .option (
136
136
"--connect-args" ,
137
137
"-c" ,
138
- "raw_connect_args " ,
138
+ "raw_engine_kwargs " ,
139
139
help = "Connect args as JSON or YAML" ,
140
140
)
141
- def test_db (sqlalchemy_uri : str , raw_connect_args : str | None = None ) -> None :
141
+ def test_db (sqlalchemy_uri : str , raw_engine_kwargs : str | None = None ) -> None :
142
142
"""
143
143
Run a series of tests against an analytical database.
144
144
@@ -161,13 +161,13 @@ def test_db(sqlalchemy_uri: str, raw_connect_args: str | None = None) -> None:
161
161
console .clear ()
162
162
163
163
console .print ("[bold]Collecting additional connection information..." )
164
- connect_args = collect_connection_info (console , sqlalchemy_uri , raw_connect_args )
164
+ engine_kwargs = collect_connection_info (console , sqlalchemy_uri , raw_engine_kwargs )
165
165
166
166
console .print ("[bold]\n Checking for a DB engine spec..." )
167
167
test_db_engine_spec (console , sqlalchemy_uri )
168
168
169
169
console .print ("[bold]\n Testing the SQLAlchemy dialect..." )
170
- engine = test_sqlalchemy_dialect (console , sqlalchemy_uri , connect_args )
170
+ engine = test_sqlalchemy_dialect (console , sqlalchemy_uri , engine_kwargs )
171
171
172
172
console .print ("[bold]\n Testing the database connectivity..." )
173
173
test_database_connectivity (console , engine )
@@ -176,26 +176,26 @@ def test_db(sqlalchemy_uri: str, raw_connect_args: str | None = None) -> None:
176
176
def collect_connection_info (
177
177
console : Console ,
178
178
sqlalchemy_uri : str ,
179
- raw_connect_args : str | None = None ,
179
+ raw_engine_kwargs : str | None = None ,
180
180
) -> dict [str , Any ]:
181
181
"""
182
- Collect ``connect_args `` if needed.
182
+ Collect ``engine_kwargs `` if needed.
183
183
"""
184
184
console .print (f"[green]SQLAlchemy URI: [bold]{ sqlalchemy_uri } " )
185
- if raw_connect_args is None :
186
- configure_connect_args = input (
185
+ if raw_engine_kwargs is None :
186
+ configure_engine_kwargs = input (
187
187
"> Do you want to configure connection arguments? [y/N] "
188
188
)
189
- if configure_connect_args .strip ().lower () == "y" :
189
+ if configure_engine_kwargs .strip ().lower () == "y" :
190
190
console .print (
191
- "Please paste the connect_args as JSON or YAML and press CTRL-D when "
191
+ "Please paste the engine_kwargs as JSON or YAML and press CTRL-D when "
192
192
"finished"
193
193
)
194
- raw_connect_args = sys .stdin .read ()
194
+ raw_engine_kwargs = sys .stdin .read ()
195
195
else :
196
- raw_connect_args = "{}"
196
+ raw_engine_kwargs = "{}"
197
197
198
- return yaml .safe_load (raw_connect_args )
198
+ return yaml .safe_load (raw_engine_kwargs )
199
199
200
200
201
201
def test_db_engine_spec (
@@ -272,12 +272,12 @@ def test_db_engine_spec(
272
272
def test_sqlalchemy_dialect (
273
273
console : Console ,
274
274
sqlalchemy_uri : str ,
275
- connect_args : dict [str , Any ],
275
+ engine_kwargs : dict [str , Any ],
276
276
) -> Engine :
277
277
"""
278
278
Test the SQLAlchemy dialect, making sure it supports everything Superset needs.
279
279
"""
280
- engine = create_engine (sqlalchemy_uri , connect_args = connect_args )
280
+ engine = create_engine (sqlalchemy_uri , ** engine_kwargs )
281
281
dialect = engine .dialect
282
282
283
283
console .print ("[bold]Checking functions used by the inspector..." )
0 commit comments