Skip to content

Commit 126085b

Browse files
smasponssmaspons
committed
refactor(sys_table): drop column style_id
1 parent 8b1a7d1 commit 126085b

File tree

2 files changed

+36
-33
lines changed

2 files changed

+36
-33
lines changed

‎updates/36/36012/utils/ddl.sql

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -96,53 +96,56 @@ INSERT INTO sys_style SELECT id, idval, NULL, styletype, stylevalue, active FROM
9696
CREATE TABLE cat_style (
9797
id integer NOT NULL,
9898
idval text NOT NULL,
99-
descript text NULL,
99+
descript text NULL,
100100
sys_role varchar(30) NULL,
101101
addparam json NULL,
102102
active bool DEFAULT true NULL,
103103
CONSTRAINT cat_style_pkey PRIMARY KEY (id));
104104

105-
do $$
105+
do $$
106106
declare
107-
v_utils boolean;
107+
v_utils boolean;
108108
begin
109109
SELECT value::boolean INTO v_utils FROM config_param_system WHERE parameter='admin_utils_schema';
110-
110+
111111
if v_utils is true then
112-
113-
-- create fk
114-
ALTER TABLE SCHEMA_NAME.link ADD CONSTRAINT link_muni_id_fkey FOREIGN KEY (muni_id)
112+
113+
-- create fk
114+
ALTER TABLE SCHEMA_NAME.link ADD CONSTRAINT link_muni_id_fkey FOREIGN KEY (muni_id)
115115
REFERENCES utils.ext_municipality (muni_id) MATCH SIMPLE ON UPDATE CASCADE ON DELETE RESTRICT;
116-
117-
ALTER TABLE SCHEMA_NAME.samplepoint ADD CONSTRAINT samplepoint_muni_id_fkey FOREIGN KEY (muni_id)
116+
117+
ALTER TABLE SCHEMA_NAME.samplepoint ADD CONSTRAINT samplepoint_muni_id_fkey FOREIGN KEY (muni_id)
118118
REFERENCES utils.ext_municipality (muni_id) MATCH SIMPLE ON UPDATE CASCADE ON DELETE RESTRICT;
119-
120-
ALTER TABLE SCHEMA_NAME.element ADD CONSTRAINT element_muni_id_fkey FOREIGN KEY (muni_id)
119+
120+
ALTER TABLE SCHEMA_NAME.element ADD CONSTRAINT element_muni_id_fkey FOREIGN KEY (muni_id)
121121
REFERENCES utils.ext_municipality (muni_id) MATCH SIMPLE ON UPDATE CASCADE ON DELETE RESTRICT;
122-
123-
ALTER TABLE SCHEMA_NAME.om_visit ADD CONSTRAINT om_visit_muni_id_fkey FOREIGN KEY (muni_id)
122+
123+
ALTER TABLE SCHEMA_NAME.om_visit ADD CONSTRAINT om_visit_muni_id_fkey FOREIGN KEY (muni_id)
124124
REFERENCES utils.ext_municipality (muni_id) MATCH SIMPLE ON UPDATE CASCADE ON DELETE RESTRICT;
125-
126-
ALTER TABLE SCHEMA_NAME.dimensions ADD CONSTRAINT dimensions_muni_id_fkey FOREIGN KEY (muni_id)
125+
126+
ALTER TABLE SCHEMA_NAME.dimensions ADD CONSTRAINT dimensions_muni_id_fkey FOREIGN KEY (muni_id)
127127
REFERENCES utils.ext_municipality (muni_id) MATCH SIMPLE ON UPDATE CASCADE ON DELETE RESTRICT;
128-
128+
129129
else
130-
131-
-- create fk
132-
ALTER TABLE SCHEMA_NAME.link ADD CONSTRAINT link_muni_id_fkey FOREIGN KEY (muni_id)
130+
131+
-- create fk
132+
ALTER TABLE SCHEMA_NAME.link ADD CONSTRAINT link_muni_id_fkey FOREIGN KEY (muni_id)
133133
REFERENCES SCHEMA_NAME.ext_municipality (muni_id) MATCH SIMPLE ON UPDATE CASCADE ON DELETE RESTRICT;
134-
135-
ALTER TABLE SCHEMA_NAME.samplepoint ADD CONSTRAINT samplepoint_muni_id_fkey FOREIGN KEY (muni_id)
134+
135+
ALTER TABLE SCHEMA_NAME.samplepoint ADD CONSTRAINT samplepoint_muni_id_fkey FOREIGN KEY (muni_id)
136136
REFERENCES SCHEMA_NAME.ext_municipality (muni_id) MATCH SIMPLE ON UPDATE CASCADE ON DELETE RESTRICT;
137-
138-
ALTER TABLE SCHEMA_NAME.element ADD CONSTRAINT element_muni_id_fkey FOREIGN KEY (muni_id)
137+
138+
ALTER TABLE SCHEMA_NAME.element ADD CONSTRAINT element_muni_id_fkey FOREIGN KEY (muni_id)
139139
REFERENCES SCHEMA_NAME.ext_municipality (muni_id) MATCH SIMPLE ON UPDATE CASCADE ON DELETE RESTRICT;
140-
141-
ALTER TABLE SCHEMA_NAME.om_visit ADD CONSTRAINT om_visit_muni_id_fkey FOREIGN KEY (muni_id)
140+
141+
ALTER TABLE SCHEMA_NAME.om_visit ADD CONSTRAINT om_visit_muni_id_fkey FOREIGN KEY (muni_id)
142142
REFERENCES SCHEMA_NAME.ext_municipality (muni_id) MATCH SIMPLE ON UPDATE CASCADE ON DELETE RESTRICT;
143-
144-
ALTER TABLE SCHEMA_NAME.dimensions ADD CONSTRAINT dimensions_muni_id_fkey FOREIGN KEY (muni_id)
143+
144+
ALTER TABLE SCHEMA_NAME.dimensions ADD CONSTRAINT dimensions_muni_id_fkey FOREIGN KEY (muni_id)
145145
REFERENCES SCHEMA_NAME.ext_municipality (muni_id) MATCH SIMPLE ON UPDATE CASCADE ON DELETE RESTRICT;
146-
146+
147147
end if;
148148
end; $$;
149+
150+
151+
SELECT gw_fct_admin_manage_fields($${"data":{"action":"DROP","table":"sys_table", "column":"style_id"}}$$);

‎utils/fct/gw_fct_getaddlayervalues.sql

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,22 @@ v_error_context text;
2727

2828
BEGIN
2929

30-
-- Search path
30+
-- Search path
3131
SET search_path = "SCHEMA_NAME", public;
3232

3333
v_schemaname = 'SCHEMA_NAME';
34-
34+
3535
-- select config values
3636
SELECT project_type, giswater INTO v_project_type, v_version FROM sys_version order by id desc limit 1;
37-
37+
3838
WITH geomtable AS (SELECT column_name, table_name from information_schema.columns WHERE udt_name='geometry' and table_schema='SCHEMA_NAME'),
3939
idtable AS (SELECT column_name, table_name from information_schema.columns WHERE ordinal_position=1 and table_schema='SCHEMA_NAME')
4040
SELECT array_agg(row_to_json(d)) FROM (SELECT context, alias as "layerName", st.id as "tableName",
41-
CASE WHEN c.column_name IS NULL THEN 'None'
41+
CASE WHEN c.column_name IS NULL THEN 'None'
4242
WHEN st.addparam->>'geom' IS NOT NULL THEN st.addparam->>'geom'
4343
ELSE c.column_name END AS "geomField",
4444
CASE WHEN st.addparam->>'pkey' IS NULL THEN i.column_name
45-
ELSE st.addparam->>'pkey' END AS "tableId", st.style_id
45+
ELSE st.addparam->>'pkey' END AS "tableId"
4646
FROM sys_table st
4747
join config_typevalue ct ON ct.id= context
4848
left join geomtable c ON st.id =c.table_name

0 commit comments

Comments
 (0)