-
Notifications
You must be signed in to change notification settings - Fork 1.7k
fix(sqlalchemy-spanner): fix get_multi_indexes crash on SEARCH indexes #17907
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
Merged
Merged
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| [run] | ||
| branch = True | ||
| source = google/cloud/sqlalchemy_spanner | ||
|
|
||
| [report] | ||
| fail_under = 30 |
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 |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| # 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. | ||
|
|
||
| from unittest.mock import MagicMock | ||
| from sqlalchemy.testing import eq_ | ||
| from sqlalchemy.testing.plugin.plugin_base import fixtures | ||
| from google.cloud.sqlalchemy_spanner.sqlalchemy_spanner import SpannerDialect | ||
|
|
||
|
|
||
| class TestSpannerDialect(fixtures.TestBase): | ||
| def test_get_multi_indexes_excludes_search_indexes_sql(self): | ||
| """Test that get_multi_indexes SQL query excludes SEARCH indexes.""" | ||
| dialect = SpannerDialect() | ||
| connection = MagicMock() | ||
| mock_snapshot = MagicMock() | ||
| mock_snapshot.execute_sql.return_value = [] | ||
| connection.connection.database.snapshot.return_value.__enter__.return_value = ( | ||
| mock_snapshot | ||
| ) | ||
|
|
||
| dialect.get_multi_indexes(connection) | ||
|
|
||
| # Retrieve the SQL executed by snapshot | ||
| executed_sql = mock_snapshot.execute_sql.call_args[0][0] | ||
| assert "i.index_type != 'SEARCH'" in executed_sql | ||
|
|
||
| def test_get_multi_indexes_handles_none_column_ordering(self): | ||
| """Test get_multi_indexes with None column ordering.""" | ||
| dialect = SpannerDialect() | ||
| connection = MagicMock() | ||
| mock_snapshot = MagicMock() | ||
| # Mock row: schema, table, index_name, columns, | ||
| # is_unique, column_orderings, storing_columns | ||
| mock_row = [ | ||
| "public", | ||
| "my_table", | ||
| "idx_search", | ||
| ["col1"], | ||
| False, | ||
| [None], # column_ordering is None | ||
| [], | ||
| ] | ||
| mock_snapshot.execute_sql.return_value = [mock_row] | ||
| connection.connection.database.snapshot.return_value.__enter__.return_value = ( | ||
| mock_snapshot | ||
| ) | ||
|
|
||
| res = dialect.get_multi_indexes(connection) | ||
| assert ("public", "my_table") in res | ||
| index_info = res[("public", "my_table")][0] | ||
| eq_(index_info["column_sorting"], {}) | ||
|
|
||
| def test_get_multi_indexes_handles_null_column_orderings_array(self): | ||
| """Test get_multi_indexes when column_orderings array is None.""" | ||
| dialect = SpannerDialect() | ||
| connection = MagicMock() | ||
| mock_snapshot = MagicMock() | ||
| mock_row = [ | ||
| "public", | ||
| "my_table", | ||
| "idx_test", | ||
| ["col1"], | ||
| False, | ||
| None, # row[5] is None | ||
| [], | ||
| ] | ||
| mock_snapshot.execute_sql.return_value = [mock_row] | ||
| connection.connection.database.snapshot.return_value.__enter__.return_value = ( | ||
| mock_snapshot | ||
| ) | ||
|
|
||
| res = dialect.get_multi_indexes(connection) | ||
| assert ("public", "my_table") in res | ||
| index_info = res[("public", "my_table")][0] | ||
| eq_(index_info["column_sorting"], {}) |
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.