Skip to content

fix: Retrieve columns in compound indexes in correct order #798

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.

Sign up for GitHub

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
olavloite merged 2 commits into from
Nov 10, 2025
Merged

fix: Retrieve columns in compound indexes in correct order #798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f904cbe
fix: Retrieve columns in compound indexes in correct order
waltaskew Nov 7, 2025
6851adf
Merge branch 'main' into index-order
olavloite Nov 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions google/cloud/sqlalchemy_spanner/sqlalchemy_spanner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1267,33 +1267,36 @@ def get_multi_indexes(
i.table_schema,
i.table_name,
i.index_name,
(
SELECT ARRAY_AGG(ic.column_name)
ARRAY(
SELECT ic.column_name
FROM information_schema.index_columns ic
WHERE ic.index_name = i.index_name
AND ic.table_catalog = i.table_catalog
AND ic.table_schema = i.table_schema
AND ic.table_name = i.table_name
AND ic.column_ordering is not null
ORDER BY ic.ordinal_position
) as columns,
i.is_unique,
(
SELECT ARRAY_AGG(ic.column_ordering)
ARRAY(
SELECT ic.column_ordering
FROM information_schema.index_columns ic
WHERE ic.index_name = i.index_name
AND ic.table_catalog = i.table_catalog
AND ic.table_schema = i.table_schema
AND ic.table_name = i.table_name
AND ic.column_ordering is not null
ORDER BY ic.ordinal_position
) as column_orderings,
(
SELECT ARRAY_AGG(storing.column_name)
ARRAY(
SELECT storing.column_name
FROM information_schema.index_columns storing
WHERE storing.index_name = i.index_name
AND storing.table_catalog = i.table_catalog
AND storing.table_schema = i.table_schema
AND storing.table_name = i.table_name
AND storing.column_ordering is null
ORDER BY storing.ordinal_position
) as storing_columns,
FROM information_schema.indexes as i
JOIN information_schema.tables AS t
Expand Down
30 changes: 29 additions & 1 deletion test/system/test_basics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def define_tables(cls, metadata):
Column("a", String, primary_key=True),
Column("b", String, primary_key=True),
)
Table(
composite_fk = Table(
"composite_fk",
metadata,
Column("my_a", String, primary_key=True),
Expand All @@ -118,6 +118,12 @@ def define_tables(cls, metadata):
name="composite_fk_composite_pk_a_b",
),
)
Index(
"idx_composte_fk_all",
composite_fk.c.my_a,
composite_fk.c.my_b,
composite_fk.c.my_c,
)

def test_hello_world(self, connection):
greeting = connection.execute(text("select 'Hello World'"))
Expand Down Expand Up @@ -356,6 +362,28 @@ def test_composite_fk_lookups(self, connection):
insp.get_multi_foreign_keys(filter_names=["composite_fk"]),
)

def test_composite_index_lookups(self, connection):
"""Ensures we introspect composite indexes."""

engine = connection.engine

insp = inspect(engine)
eq_(
{
(None, "composite_fk"): [
{
"name": "idx_composte_fk_all",
"column_names": ["my_a", "my_b", "my_c"],
"unique": False,
"column_sorting": {"my_a": "asc", "my_b": "asc", "my_c": "asc"},
"include_columns": [],
"dialect_options": {},
}
]
},
insp.get_multi_indexes(filter_names=["composite_fk"]),
)

def test_commit_timestamp(self, connection):
"""Ensures commit timestamps are set."""

Expand Down