From 71726df2019b28d541d7a4770c056c82e2d2ad88 Mon Sep 17 00:00:00 2001 From: vkrasnovyd Date: Wed, 22 Jul 2026 12:44:13 +0200 Subject: [PATCH 1/2] Remove deferred --- collections/motion_state.yml | 2 -- dev/sql/schema_relational.sql | 4 ++-- dev/src/generate_sql_schema.py | 5 +---- dev/src/validate.py | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/collections/motion_state.yml b/collections/motion_state.yml index 23d8b7a7..7fa845a9 100644 --- a/collections/motion_state.yml +++ b/collections/motion_state.yml @@ -150,5 +150,3 @@ fields: required: true restriction_mode: A constant: true - deferred: true - diff --git a/dev/sql/schema_relational.sql b/dev/sql/schema_relational.sql index b0ecac7c..23f19762 100644 --- a/dev/sql/schema_relational.sql +++ b/dev/sql/schema_relational.sql @@ -1,7 +1,7 @@ -- schema_relational.sql for initial database setup OpenSlides -- Code generated. DO NOT EDIT. --- MODELS_YML_CHECKSUM = '472dd223307f11a19a864edd93b78230' +-- MODELS_YML_CHECKSUM = 'cb15bc708625beb8da58772522adacc6' -- ENUM definitions @@ -6287,4 +6287,4 @@ There are 2 errors/warnings projection/content: type:JSON is marked as a calculated field and not generated in schema */ -/* Missing attribute handling for on_delete, constant_legacy, deferred */ \ No newline at end of file +/* Missing attribute handling for on_delete, constant_legacy */ \ No newline at end of file diff --git a/dev/src/generate_sql_schema.py b/dev/src/generate_sql_schema.py index 4d196b1e..4ec677e2 100644 --- a/dev/src/generate_sql_schema.py +++ b/dev/src/generate_sql_schema.py @@ -69,7 +69,6 @@ class SubstDict(TypedDict, total=False): minimum: str maximum: str minLength: str - deferred: str check_enum: str check_timezone: str unique: str @@ -628,9 +627,7 @@ def get_relation_type( own_table_field, foreign_table_field, state ) ) - initially_deferred = fdata.get( - "deferred" - ) or ModelsHelper.is_fk_initially_deferred(table_name, foreign_table) + initially_deferred = ModelsHelper.is_fk_initially_deferred(table_name, foreign_table) text["alter_table_final"] = ( Helper.get_foreign_key_table_constraint_as_alter_table( table_name, diff --git a/dev/src/validate.py b/dev/src/validate.py index feb2cb1f..c2602f0f 100644 --- a/dev/src/validate.py +++ b/dev/src/validate.py @@ -328,7 +328,7 @@ def check_field( valid_attributes.append("reference") if nested and type in ("relation", "relation-list"): valid_attributes.append("enum") - valid_attributes.extend(("deferred", "sql")) + valid_attributes.append("sql") if field.get("sql"): valid_attributes.append("log_triggers") self.check_log_triggers(collectionfield, field) From aef89194ee5b851080f55a2294e55b24c13b6fd1 Mon Sep 17 00:00:00 2001 From: vkrasnovyd Date: Wed, 22 Jul 2026 12:53:49 +0200 Subject: [PATCH 2/2] Lint --- dev/src/generate_sql_schema.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev/src/generate_sql_schema.py b/dev/src/generate_sql_schema.py index 4ec677e2..984deac8 100644 --- a/dev/src/generate_sql_schema.py +++ b/dev/src/generate_sql_schema.py @@ -627,7 +627,9 @@ def get_relation_type( own_table_field, foreign_table_field, state ) ) - initially_deferred = ModelsHelper.is_fk_initially_deferred(table_name, foreign_table) + initially_deferred = ModelsHelper.is_fk_initially_deferred( + table_name, foreign_table + ) text["alter_table_final"] = ( Helper.get_foreign_key_table_constraint_as_alter_table( table_name,