feat(datasets): support TableDataset credentials
#1218
+126
−16
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,12 +38,24 @@ def connection_config(request, database): | |
| ) | ||
|
|
||
|
|
||
| @pytest.fixture(params=[_SENTINEL]) | ||
| def credentials_config(request, database): | ||
| return ( | ||
| None | ||
| if request.param is _SENTINEL # `None` is a valid value to test | ||
| else request.param | ||
| ) | ||
|
|
||
|
|
||
| @pytest.fixture | ||
| def table_dataset( | ||
| database_name, connection_config, credentials_config, load_args, save_args | ||
| ): | ||
| ds = TableDataset( | ||
| table_name="test", | ||
| database=database_name, | ||
| connection=connection_config, | ||
| credentials=credentials_config, | ||
| load_args=load_args, | ||
| save_args=save_args, | ||
| ) | ||
|
|
@@ -348,6 +360,91 @@ def test_connection_config(self, mocker, table_dataset, connection_config, key): | |
| table_dataset.load() | ||
| assert ("ibis", key) in table_dataset._connections | ||
|
|
||
| @pytest.mark.parametrize( | ||
| ("connection_config", "credentials_config", "key"), | ||
| [ | ||
| ( | ||
| {"backend": "duckdb", "database": "file.db", "extensions": ["spatial"]}, | ||
| {"user": "admin", "password": "secret"}, # pragma: allowlist secret | ||
| ( | ||
| ("backend", "duckdb"), | ||
| ("database", "file.db"), | ||
| ("extensions", ("spatial",)), | ||
| ("password", "secret"), | ||
| ("user", "admin"), | ||
| ), | ||
| ), | ||
| ( | ||
| [], | ||
| { | ||
| "host": "xxx.sql.azuresynapse.net", | ||
| "database": "xxx", | ||
| "query": {"driver": "ODBC Driver 17 for SQL Server"}, | ||
| "backend": "mssql", | ||
| }, | ||
| ( | ||
| ("backend", "mssql"), | ||
| ("database", "xxx"), | ||
| ("host", "xxx.sql.azuresynapse.net"), | ||
| ("query", (("driver", "ODBC Driver 17 for SQL Server"),)), | ||
| ), | ||
| ), | ||
| ( | ||
| None, | ||
| None, | ||
| ( | ||
| ("backend", "duckdb"), | ||
| ("database", ":memory:"), | ||
| ), | ||
| ), | ||
| ], | ||
| indirect=["connection_config", "credentials_config"], | ||
| ) | ||
| def test_connection_config_with_credentials( | ||
| self, mocker, table_dataset, connection_config, credentials_config, key | ||
| ): | ||
| # Fix: handle non-dict connection_config/credentials_config | ||
| if isinstance(connection_config, dict) and "backend" in connection_config: | ||
| backend = connection_config["backend"] | ||
| elif isinstance(credentials_config, dict) and "backend" in credentials_config: | ||
| backend = credentials_config["backend"] | ||
| else: | ||
| backend = "duckdb" | ||
| mocker.patch(f"ibis.{backend}") | ||
| table_dataset.load() | ||
| assert ("ibis", key) in table_dataset._connections | ||
|
|
||
| @pytest.mark.parametrize( | ||
| "credentials,expected_exception,expected_message", | ||
| [ | ||
| ( | ||
| "postgresql://xxx:xxx@localhost/db", # pragma: allowlist secret | ||
| ValueError, | ||
| "Connection string credentials are not supported", | ||
| ), | ||
| (123, TypeError, "Credentials must be a dict"), | ||
| (["backend", "duckdb"], TypeError, "Credentials must be a dict"), | ||
| (("backend", "duckdb"), TypeError, "Credentials must be a dict"), | ||
| (True, TypeError, "Credentials must be a dict"), | ||
| ], | ||
| ) | ||
| def test_invalid_credentials_types_raise( | ||
| self, | ||
| database_name, | ||
| connection_config, | ||
| credentials, | ||
| expected_exception, | ||
| expected_message, | ||
| ): | ||
| """Test that invalid credentials types raise appropriate exceptions.""" | ||
| with pytest.raises(expected_exception, match=expected_message): | ||
| TableDataset( | ||
| table_name="test", | ||
| database=database_name, | ||
| connection=connection_config, | ||
| credentials=credentials, | ||
| ) | ||
|
|
||
| def test_save_data_loaded_using_file_dataset(self, file_dataset, table_dataset): | ||
| """Test interoperability of Ibis datasets sharing a database.""" | ||
| dummy_table = file_dataset.load() | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.