Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions sqlite_utils/db.py
Original file line number Diff line number Diff line change
Expand Up @@ -1480,7 +1480,9 @@ def sort_key(p):
column_extras.append(
f"REFERENCES {quote_identifier(fk.other_table)}({quote_identifier(cast(str, fk.other_column))}){_fk_actions_sql(fk)}"
)
column_type_str = COLUMN_TYPE_MAPPING[column_type]
column_type_str = COLUMN_TYPE_MAPPING.get(column_type) or (
column_type if isinstance(column_type, str) else COLUMN_TYPE_MAPPING[column_type]
)
# Special case for strict tables to map FLOAT to REAL
# Refs https://github.com/simonw/sqlite-utils/issues/644
if strict and column_type_str == "FLOAT":
Expand Down Expand Up @@ -3121,7 +3123,9 @@ def add_column(
sql = "ALTER TABLE {} ADD COLUMN {} {col_type}{not_null_default};".format(
quote_identifier(self.name),
quote_identifier(col_name),
col_type=fk_col_type or COLUMN_TYPE_MAPPING[col_type],
col_type=fk_col_type or COLUMN_TYPE_MAPPING.get(col_type) or (
col_type if isinstance(col_type, str) else COLUMN_TYPE_MAPPING[col_type]
),
not_null_default=(" " + not_null_sql) if not_null_sql else "",
)
self.db.execute(sql)
Expand Down
19 changes: 19 additions & 0 deletions tests/test_create.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,13 @@ def test_create_table_with_defaults(fresh_db):
) == table.schema


def test_create_table_with_unknown_string_type(fresh_db):
table = fresh_db.create_table("t", {"id": int, "value": "NUMERIC"}, pk="id")
assert table.schema == 'CREATE TABLE "t" (\n "id" INTEGER PRIMARY KEY,\n "value" NUMERIC\n)'
table2 = fresh_db.create_table("t2", {"id": int, "misc": "ANY"}, pk="id")
assert table2.schema == 'CREATE TABLE "t2" (\n "id" INTEGER PRIMARY KEY,\n "misc" ANY\n)'


def test_create_table_with_bad_not_null(fresh_db):
with pytest.raises(ValueError):
fresh_db.create_table(
Expand Down Expand Up @@ -375,6 +382,18 @@ def test_create_error_if_invalid_self_referential_foreign_keys(fresh_db):
'CREATE TABLE "dogs" (\n "name" TEXT\n, "float" FLOAT)',
),
("blob", "blob", None, 'CREATE TABLE "dogs" (\n "name" TEXT\n, "blob" BLOB)'),
(
"score",
"NUMERIC",
None,
'CREATE TABLE "dogs" (\n "name" TEXT\n, "score" NUMERIC)',
),
(
"misc",
"ANY",
None,
'CREATE TABLE "dogs" (\n "name" TEXT\n, "misc" ANY)',
),
(
"default_str",
None,
Expand Down
Loading