-
Notifications
You must be signed in to change notification settings - Fork 1.7k
fix(sqlalchemy-spanner): handle TOKENLIST and unknown column types in introspection #16622
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
waiho-gumloop
wants to merge
1
commit into
googleapis:main
Choose a base branch
from
waiho-gumloop:fix/sqlalchemy-spanner-tokenlist-type
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+111
−1
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| # Copyright 2026 Google LLC | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| import warnings | ||
|
|
||
| from sqlalchemy import types | ||
| from sqlalchemy.testing.plugin.plugin_base import fixtures | ||
|
|
||
| from google.cloud.sqlalchemy_spanner import sqlalchemy_spanner | ||
|
|
||
|
|
||
| class TestDesignateType(fixtures.TestBase): | ||
| """Unit tests for SpannerDialect._designate_type.""" | ||
|
|
||
| def setup_method(self): | ||
| self.dialect = sqlalchemy_spanner.SpannerDialect() | ||
|
|
||
| def test_known_types(self): | ||
| assert isinstance(self.dialect._designate_type("BOOL"), types.Boolean) | ||
| assert isinstance(self.dialect._designate_type("INT64"), types.BIGINT) | ||
| assert isinstance(self.dialect._designate_type("FLOAT64"), types.Float) | ||
| assert isinstance(self.dialect._designate_type("DATE"), types.DATE) | ||
| assert isinstance(self.dialect._designate_type("TIMESTAMP"), types.TIMESTAMP) | ||
| assert isinstance(self.dialect._designate_type("JSON"), types.JSON) | ||
|
|
||
| def test_string_with_length(self): | ||
| result = self.dialect._designate_type("STRING(255)") | ||
| assert isinstance(result, types.String) | ||
| assert result.length == 255 | ||
|
|
||
| def test_bytes_with_length(self): | ||
| result = self.dialect._designate_type("BYTES(1024)") | ||
| assert isinstance(result, types.LargeBinary) | ||
| assert result.length == 1024 | ||
|
|
||
| def test_tokenlist_returns_tokenlist_type(self): | ||
| result = self.dialect._designate_type("TOKENLIST") | ||
| assert isinstance(result, sqlalchemy_spanner.TOKENLIST) | ||
|
|
||
| def test_unknown_type_returns_nulltype_with_warning(self): | ||
| with warnings.catch_warnings(record=True) as caught: | ||
| warnings.simplefilter("always") | ||
| result = self.dialect._designate_type("SOME_FUTURE_TYPE") | ||
| assert isinstance(result, types.NullType) | ||
| assert len(caught) == 1 | ||
| assert "SOME_FUTURE_TYPE" in str(caught[0].message) | ||
|
|
||
| def test_array_of_known_type(self): | ||
| result = self.dialect._designate_type("ARRAY<INT64>") | ||
| assert isinstance(result, types.ARRAY) | ||
|
|
||
|
|
||
| class TestTokenlistType(fixtures.TestBase): | ||
| """Verify TOKENLIST is a proper first-class type.""" | ||
|
|
||
| def test_in_type_map(self): | ||
| assert "TOKENLIST" in sqlalchemy_spanner._type_map | ||
| assert sqlalchemy_spanner._type_map["TOKENLIST"] is sqlalchemy_spanner.TOKENLIST | ||
|
|
||
| def test_in_inverse_type_map(self): | ||
| assert sqlalchemy_spanner.TOKENLIST in sqlalchemy_spanner._type_map_inv | ||
| assert sqlalchemy_spanner._type_map_inv[sqlalchemy_spanner.TOKENLIST] == "TOKENLIST" | ||
|
|
||
| def test_type_compiler_roundtrip(self): | ||
| compiler = sqlalchemy_spanner.SpannerTypeCompiler( | ||
| sqlalchemy_spanner.SpannerDialect() | ||
| ) | ||
| assert compiler.process(sqlalchemy_spanner.TOKENLIST()) == "TOKENLIST" | ||
|
|
||
| def test_is_type_engine(self): | ||
| assert issubclass(sqlalchemy_spanner.TOKENLIST, types.TypeEngine) |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is an inconsistency in the return types of
_designate_type. When a type is found in_type_map, the code returns the type class (e.g.,types.Boolean), but the fallback returns an instance (types.NullType()).Furthermore, the unit tests added in this PR (e.g.,
test_known_typesandtest_tokenlist_maps_to_nulltype) useisinstance(result, types.Boolean), which will fail if a class is returned instead of an instance.To ensure consistency and fix the tests, you should instantiate the type from the map. Additionally, adding
stacklevel=2to the warning is recommended so it points to the caller of the introspection.