Skip to content
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

introduce serial pk on default values #342

Merged
merged 7 commits into from
Aug 8, 2024
Merged

introduce serial pk on default values #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f8e935d
introduce serial pk on default values
cymed Jul 26, 2024
be7647f
alter for app too
cymed Jul 26, 2024
5ff4b73
remove not null
cymed Jul 26, 2024
2497ee2
treat fetchall as tuples
cymed Jul 26, 2024
f0e7464
rename iterator
cymed Aug 2, 2024
85cb5b5
typo
cymed Aug 2, 2024
fa1646b
do not check for fk_dataprovider
cymed Aug 5, 2024
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 datamodel/app/view/set_default_value_for_views.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ BEGIN
LEFT JOIN information_schema.tables t
ON c.table_name = t.table_name
AND c.table_schema = t.table_schema
WHERE c.column_name IN ('fk_provider','fk_dataowner')
WHERE c.column_name IN (SELECT fieldname FROM tww_od.default_values)
AND c.table_schema ='tww_app'
AND t.table_type = 'VIEW'
LOOP
Expand Down
11 changes: 7 additions & 4 deletions datamodel/changelogs/0001/14_default_values.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
CREATE TABLE tww_od.default_values
(
fieldname text NOT NULL,
id serial,
fieldname text,
value_obj_id varchar(16),
CONSTRAINT pkey_tww_sys_default_values_fieldname PRIMARY KEY (fieldname)
CONSTRAINT pkey_tww_sys_default_values_id PRIMARY KEY (id)
);

CREATE UNIQUE INDEX in_od_default_values_fieldname ON tww_od.default_values USING btree (fieldname ASC NULLS LAST);

-- function for retrieving default obj_id
CREATE OR REPLACE FUNCTION tww_sys.get_default_values(field_name text)
RETURNS varchar(16) AS
Expand All @@ -25,7 +28,7 @@ $BODY$
LANGUAGE plpgsql STABLE SECURITY DEFINER
COST 100;

-- Set defaults on all fk_provider,fk_dataowner
-- Set defaults on all fk_provider,fk_dataowner,fk_owner
DO $do$
DECLARE
tbl text;
Expand All @@ -39,7 +42,7 @@ BEGIN
LEFT JOIN information_schema.tables t
ON c.table_name = t.table_name
and c.table_schema = t.table_schema
WHERE c.column_name IN ('fk_provider','fk_dataowner')
WHERE c.column_name IN ('fk_provider','fk_dataowner','fk_owner')
and c.table_schema ='tww_od'
and t.table_type = 'BASE TABLE'
LOOP
Expand Down
4 changes: 2 additions & 2 deletions plugin/teksi_wastewater/utils/database_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,8 @@ def check_fk_defaults() -> List[str]:
for item in DatabaseUtils.fetchall(
"SELECT fieldname,value_obj_id from tww_od.default_values;"
):
defaults.append(item["fieldname"])
vals.append(item["value_obj_id"])
defaults.append(item[0])
vals.append(item[1])

msg_list = []
if None in vals:
Expand Down
Loading