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

Table.create() now stores configuration in _defaults

Browse source 
When configuration parameters like pk, foreign_keys, not_null, etc.
are passed to Table.create(), they are now stored in self._defaults
so that subsequent operations on the same Table instance (like insert,
upsert) will use those settings automatically.

Previously, calling db["table"].insert({...}, pk="id") would create
the table correctly but subsequent calls to insert() or upsert() on
the same table object would not know about the pk setting, causing
issues like upsert() failing with "requires a pk" error.

Closes #655

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Simon Willison 2025-11-23 14:51:12 -08:00
commit fafa966300
2 changed files with 139 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

50
sqlite_utils/db.py
View file

@ -1703,19 +1703,19 @@ class Table(Queryable):
def create(
self,
columns: Dict[str, Any],
pk: Optional[Any] = None,
foreign_keys: Optional[ForeignKeysType] = None,
column_order: Optional[List[str]] = None,
not_null: Optional[Iterable[str]] = None,
defaults: Optional[Dict[str, Any]] = None,
hash_id: Optional[str] = None,
hash_id_columns: Optional[Iterable[str]] = None,
extracts: Optional[Union[Dict[str, str], List[str]]] = None,
pk: Optional[Any] = DEFAULT,
foreign_keys: Optional[ForeignKeysType] = DEFAULT,
column_order: Optional[List[str]] = DEFAULT,
not_null: Optional[Iterable[str]] = DEFAULT,
defaults: Optional[Dict[str, Any]] = DEFAULT,
hash_id: Optional[str] = DEFAULT,
hash_id_columns: Optional[Iterable[str]] = DEFAULT,
extracts: Optional[Union[Dict[str, str], List[str]]] = DEFAULT,
if_not_exists: bool = False,
replace: bool = False,
ignore: bool = False,
transform: bool = False,
strict: bool = False,
strict: bool = DEFAULT,
) -> "Table":
"""
Create a table with the specified columns.
@ -1737,6 +1737,38 @@ class Table(Queryable):
:param transform: If table already exists transform it to fit the specified schema
:param strict: Apply STRICT mode to table
"""
# Resolve defaults from _defaults (issue #655)
pk = self.value_or_default("pk", pk)
foreign_keys = self.value_or_default("foreign_keys", foreign_keys)
column_order = self.value_or_default("column_order", column_order)
not_null = self.value_or_default("not_null", not_null)
defaults = self.value_or_default("defaults", defaults)
hash_id = self.value_or_default("hash_id", hash_id)
hash_id_columns = self.value_or_default("hash_id_columns", hash_id_columns)
extracts = self.value_or_default("extracts", extracts)
strict = self.value_or_default("strict", strict)
# Store configuration in _defaults for subsequent operations (issue #655)
# Don't store pk if hash_id is set, since pk is derived from hash_id in that case
if pk is not None and hash_id is None:
self._defaults["pk"] = pk
if foreign_keys is not None:
self._defaults["foreign_keys"] = foreign_keys
if column_order is not None:
self._defaults["column_order"] = column_order
if not_null is not None:
self._defaults["not_null"] = not_null
if defaults is not None:
self._defaults["defaults"] = defaults
if hash_id is not None:
self._defaults["hash_id"] = hash_id
if hash_id_columns is not None:
self._defaults["hash_id_columns"] = hash_id_columns
if extracts is not None:
self._defaults["extracts"] = extracts
if strict:
self._defaults["strict"] = strict
columns = {name: value for (name, value) in columns.items()}
with self.db.conn:
self.db.create_table(