Skip to content

Use quote_identifier() in indexes/xindexes PRAGMA statements #825

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

Open
nyxst4ck wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use quote_identifier() in indexes/xindexes PRAGMA statements #825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 4 additions & 10 deletions sqlite_utils/db.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2283,14 +2283,11 @@ def virtual_table_using(self) -> str | None:
@property
def indexes(self) -> list[Index]:
"List of indexes defined on this table."
sql = f'PRAGMA index_list("{self.name}")'
sql = f"PRAGMA index_list({quote_identifier(self.name)})"
indexes = []
for row in self.db.execute_returning_dicts(sql):
index_name = row["name"]
index_name_quoted = (
f'"{index_name}"' if not index_name.startswith('"') else index_name
)
column_sql = f"PRAGMA index_info({index_name_quoted})"
column_sql = f"PRAGMA index_info({quote_identifier(index_name)})"
columns = []
for seqno, cid, name in self.db.execute(column_sql).fetchall():
columns.append(name)
Expand All @@ -2305,14 +2302,11 @@ def indexes(self) -> list[Index]:
@property
def xindexes(self) -> list[XIndex]:
"List of indexes defined on this table using the more detailed ``XIndex`` format."
sql = f'PRAGMA index_list("{self.name}")'
sql = f"PRAGMA index_list({quote_identifier(self.name)})"
indexes = []
for row in self.db.execute_returning_dicts(sql):
index_name = row["name"]
index_name_quoted = (
f'"{index_name}"' if not index_name.startswith('"') else index_name
)
column_sql = f"PRAGMA index_xinfo({index_name_quoted})"
column_sql = f"PRAGMA index_xinfo({quote_identifier(index_name)})"
index_columns = []
for info in self.db.execute(column_sql).fetchall():
index_columns.append(XIndexColumn(*info))
Expand Down
25 changes: 25 additions & 0 deletions tests/test_introspect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,31 @@ def test_xindexes(fresh_db):
]


def test_indexes_with_double_quotes_in_identifiers(fresh_db):
fresh_db['Go"sh'].insert({"id": 1, 'c"1': 2}, pk="id")
fresh_db['Go"sh'].create_index(['c"1'])
assert [(index.name, index.columns) for index in fresh_db['Go"sh'].indexes] == [
('idx_Go"sh_c"1', ['c"1'])
]
assert fresh_db['Go"sh'].xindexes == [
XIndex(
name='idx_Go"sh_c"1',
columns=[
XIndexColumn(seqno=0, cid=1, name='c"1', desc=0, coll="BINARY", key=1),
XIndexColumn(seqno=1, cid=-1, name=None, desc=0, coll="BINARY", key=0),
],
)
]


def test_transform_table_with_double_quotes_in_identifiers(fresh_db):
fresh_db['Go"sh'].insert({"id": 1, 'c"1': 2, "c2": 3}, pk="id")
fresh_db['Go"sh'].create_index(['c"1'])
fresh_db['Go"sh'].transform(types={"c2": str})
assert fresh_db['Go"sh'].columns_dict["c2"] is str
assert [index.columns for index in fresh_db['Go"sh'].indexes] == [['c"1']]


@pytest.mark.parametrize(
"column,expected_table_guess",
(
Expand Down
Loading