Skip to content

[dammi] Remove deferred #555

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
vkrasnovyd wants to merge 2 commits into
base: feature/dammi
Choose a base branch
from
Open

[dammi] Remove deferred #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71726df
Remove deferred
vkrasnovyd Jul 22, 2026
aef8919
Lint
vkrasnovyd Jul 22, 2026
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: 0 additions & 2 deletions collections/motion_state.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,5 +150,3 @@ fields:
required: true
restriction_mode: A
constant: true
deferred: true

4 changes: 2 additions & 2 deletions dev/sql/schema_relational.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 */
/* Missing attribute handling for on_delete, constant_legacy */
7 changes: 3 additions & 4 deletions dev/src/generate_sql_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -628,9 +627,9 @@ 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,
Expand Down
2 changes: 1 addition & 1 deletion dev/src/validate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down