remote/sqlite-utils
1
0
Fork 0
mirror of https://github.com/simonw/sqlite-utils.git synced 2026-07-25 02:14:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

foreign_keys= accepts mixed ForeignKey objects, tuples and strings again

Browse source 
resolve_foreign_keys() used all-or-nothing isinstance checks, so mixing
ForeignKey objects with tuples raised "foreign_keys= should be a list of
tuples" - a regression from 3.x, where ForeignKey was a namedtuple and
passed the tuple check. Each item is now normalized individually, which
also allows bare column-name strings in a mixed list.

Refs https://github.com/simonw/sqlite-utils/issues/769#issuecomment-4900034150

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Simon Willison 2026-07-06 21:37:56 -07:00
commit 29ca9d27e2
3 changed files with 50 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

30
sqlite_utils/db.py
View file

@ -1238,21 +1238,23 @@ class Database:
(("campus_name", "dept_code"), "departments", ("campus_name", "dept_code"))
"""
table = self.table(name)
if all(isinstance(fk, ForeignKey) for fk in foreign_keys):
return cast(List[ForeignKey], foreign_keys)
if all(isinstance(fk, str) for fk in foreign_keys):
# It's a list of columns
fks = []
for column in foreign_keys:
column = cast(str, column)
other_table = table.guess_foreign_table(column)
other_column = table.guess_foreign_column(other_table)
fks.append(ForeignKey(name, column, other_table, other_column))
return fks
if not all(isinstance(fk, (tuple, list)) for fk in foreign_keys):
raise ValueError("foreign_keys= should be a list of tuples")
fks = []
for tuple_or_list in cast(Iterable[Sequence[Any]], foreign_keys):
for fk in foreign_keys:
if isinstance(fk, ForeignKey):
fks.append(fk)
continue
if isinstance(fk, str):
# A bare column name - guess the other table and column
other_table = table.guess_foreign_table(fk)
other_column = table.guess_foreign_column(other_table)
fks.append(ForeignKey(name, fk, other_table, other_column))
continue
if not isinstance(fk, (tuple, list)):
raise ValueError(
"foreign_keys= should be a list of tuples, "
"ForeignKey objects or column name strings"
)
tuple_or_list = cast(Sequence[Any], fk)
if len(tuple_or_list) == 4:
if tuple_or_list[0] != name:
raise ValueError(