Skip to content

fix: use default values when loading fixtures with missing columns #1434

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
mlbiche wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: use default values when loading fixtures with missing columns #1434

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
2 changes: 1 addition & 1 deletion piccolo/utils/pydantic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ def create_pydantic_model(

params: dict[str, Any] = {}
if is_optional:
params["default"] = None
params["default"] = column.get_default_value()

if column._meta.db_column_name != column._meta.name:
params["alias"] = column._meta.db_column_name
Expand Down
83 changes: 83 additions & 0 deletions tests/apps/fixtures/commands/test_dump_load.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import datetime
import decimal
import json
import os
import tempfile
import uuid
Expand All @@ -10,6 +11,7 @@
dump_to_json_string,
)
from piccolo.apps.fixtures.commands.load import load, load_json_string
from piccolo.apps.fixtures.commands.shared import create_pydantic_fixture_model
from piccolo.utils.sync import run_sync
from tests.base import engines_only
from tests.example_apps.mega.tables import MegaTable, SmallTable
Expand Down Expand Up @@ -124,6 +126,7 @@ def _run_comparison(self, table_class_names: list[str]):
"json_col": '{"a":1}',
"jsonb_col": '{"a":1}',
"numeric_col": decimal.Decimal("1.1"),
"null_with_default_col": "Default value",
"real_col": 1.1,
"double_precision_col": 1.344,
"smallint_col": 1,
Expand Down Expand Up @@ -226,6 +229,7 @@ def test_dump_load_cockroach(self):
"json_col": '{"a":1}',
"jsonb_col": '{"a":1}',
"numeric_col": decimal.Decimal("1.1"),
"null_with_default_col": "Default value",
"real_col": 1.1,
"double_precision_col": 1.344,
"smallint_col": 1,
Expand All @@ -242,6 +246,85 @@ def test_dump_load_cockroach(self):
},
)

def test_load_with_defaults(self):
"""
Make sure we can load JSON fixtures into the database, without
providing columns with default values.
"""
# We need to clear the data out now, otherwise when loading the data
# back in, there will be constraint errors over clashing primary
# keys.
MegaTable.delete(force=True).run_sync()

pydantic_model = create_pydantic_fixture_model(
fixture_configs=[
FixtureConfig(
app_name="mega",
table_class_names=["SmallTable", "MegaTable"],
)
]
)

run_sync(
load_json_string(
pydantic_model(
**{
"mega": {
"SmallTable": [{"id": 1, "varchar_col": "Test"}],
"MegaTable": [
{
"id": 1,
"bigint_col": 1,
"boolean_col": True,
"bytea_col": "hello".encode("utf8"),
"date_col": datetime.date(
year=2021, month=1, day=1
),
"foreignkey_col": 1,
"integer_col": 1,
"interval_col": datetime.timedelta(
seconds=10
),
"json_col": json.dumps({"a": 1}),
"jsonb_col": json.dumps({"a": 1}).encode(
"utf8"
),
"numeric_col": decimal.Decimal("1.1"),
"real_col": 1.1,
"double_precision_col": 1.344,
"smallint_col": 1,
"text_col": "hello",
"timestamp_col": datetime.datetime(
year=2021, month=1, day=1
),
"timestamptz_col": datetime.datetime(
year=2021,
month=1,
day=1,
tzinfo=datetime.timezone.utc,
),
"uuid_col": uuid.UUID(
"12783854-c012-4c15-8183-8eecb46f2c4e"
),
"varchar_col": "hello",
"unique_col": "hello",
"null_col": None,
"not_null_col": "hello",
}
],
}
},
).model_dump_json(indent=4)
)
)

mega_table_data = MegaTable.select().run_sync()

self.assertTrue(len(mega_table_data) == 1)
self.assertTrue(
mega_table_data[0]["null_with_default_col"] == "Default value"
)


class TestOnConflict(TestCase):
def setUp(self) -> None:
Expand Down
22 changes: 22 additions & 0 deletions tests/example_apps/mega/piccolo_migrations/2021-09-20T21-23-25-698988.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,28 @@ async def forwards():
},
)

manager.add_column(
table_class_name="MegaTable",
tablename="mega_table",
column_name="null_with_default_col",
db_column_name="null_with_default_col",
column_class_name="Varchar",
column_class=Varchar,
params={
"length": 255,
"default": "Default value",
"null": True,
"primary_key": False,
"unique": False,
"index": False,
"index_method": IndexMethod.btree,
"choices": None,
"db_column_name": None,
"secret": False,
},
schema=None,
)

manager.add_column(
table_class_name="SmallTable",
tablename="small_table",
Expand Down
2 changes: 2 additions & 0 deletions tests/example_apps/mega/tables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ class MegaTable(Table): # type: ignore
unique_col = Varchar(unique=True)
null_col = Varchar(null=True)
not_null_col = Varchar(null=False)
null_with_default_col = Varchar(null=True, default="Default value")

else:

Expand Down Expand Up @@ -92,3 +93,4 @@ class MegaTable(Table): # type: ignore
unique_col = Varchar(unique=True)
null_col = Varchar(null=True)
not_null_col = Varchar(null=False)
null_with_default_col = Varchar(null=True, default="Default value")