From 3aaa9b3f0dcacc2186215b31efee1dd7f6caa130 Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Fri, 15 Jul 2016 10:13:29 +0900 Subject: [PATCH] Remove old SVN $id$, add edit_access_data table edit_access_data table can hold name/value pairs for additional info in the access group --- 4dev/database/bin/create_default_trigger.sh | 1 - 4dev/database/bin/drop_data.sh | 1 - 4dev/database/bin/drop_reload.sh | 2 -- 4dev/database/bin/import_data.sh | 1 - 4dev/database/function/update_function.sql | 1 - 4dev/database/table/edit_access.sql | 1 - 4dev/database/table/edit_access_data.sql | 15 +++++++++++++++ 4dev/database/table/edit_access_right.sql | 1 - 4dev/database/table/edit_access_user.sql | 1 - 4dev/database/table/edit_generic.sql | 1 - 4dev/database/table/edit_group.sql | 1 - 4dev/database/table/edit_language.sql | 1 - 4dev/database/table/edit_log.sql | 1 - 4dev/database/table/edit_menu_group.sql | 1 - 4dev/database/table/edit_page.sql | 1 - 4dev/database/table/edit_page_access.sql | 1 - 4dev/database/table/edit_page_menu_group.sql | 1 - 4dev/database/table/edit_page_visible_group.sql | 1 - 4dev/database/table/edit_query_string.sql | 1 - 4dev/database/table/edit_scheme.sql | 1 - 4dev/database/table/edit_temp_files.sql | 1 - 4dev/database/table/edit_user.sql | 1 - 4dev/database/table/edit_visible_group.sql | 1 - 4dev/database/table/generic.sql | 1 - 4dev/database/trigger/trg_edit_access.sql | 2 -- 4dev/database/trigger/trg_edit_access_data.sql | 4 ++++ 4dev/database/trigger/trg_edit_access_right.sql | 2 -- 4dev/database/trigger/trg_edit_access_user.sql | 2 -- 4dev/database/trigger/trg_edit_group.sql | 2 -- 4dev/database/trigger/trg_edit_language.sql | 2 -- 4dev/database/trigger/trg_edit_log.sql | 2 -- 4dev/database/trigger/trg_edit_menu_group.sql | 2 -- 4dev/database/trigger/trg_edit_page.sql | 2 -- 4dev/database/trigger/trg_edit_page_access.sql | 2 -- 4dev/database/trigger/trg_edit_query_string.sql | 2 -- 4dev/database/trigger/trg_edit_scheme.sql | 2 -- 4dev/database/trigger/trg_edit_user.sql | 2 -- 4dev/database/trigger/trg_edit_visible_group.sql | 2 -- 38 files changed, 19 insertions(+), 50 deletions(-) create mode 100644 4dev/database/table/edit_access_data.sql create mode 100644 4dev/database/trigger/trg_edit_access_data.sql diff --git a/4dev/database/bin/create_default_trigger.sh b/4dev/database/bin/create_default_trigger.sh index 77897e42..e029f057 100755 --- a/4dev/database/bin/create_default_trigger.sh +++ b/4dev/database/bin/create_default_trigger.sh @@ -1,6 +1,5 @@ #!/bin/bash -# $Id: create_default_trigger.sh 3158 2010-09-02 02:49:00Z gullevek $ # creates the default on update trigger for the inherited generic tables (date/name) orig_file="../tmpl/trigger.tmpl" diff --git a/4dev/database/bin/drop_data.sh b/4dev/database/bin/drop_data.sh index 450359ee..a5dc8ea3 100755 --- a/4dev/database/bin/drop_data.sh +++ b/4dev/database/bin/drop_data.sh @@ -1,6 +1,5 @@ #!/bin/bash -# $Id: drop_data.sh 3158 2010-09-02 02:49:00Z gullevek $ # quick hack for import #echo "EXIT"; diff --git a/4dev/database/bin/drop_reload.sh b/4dev/database/bin/drop_reload.sh index b7ffa00f..7c24cd8c 100755 --- a/4dev/database/bin/drop_reload.sh +++ b/4dev/database/bin/drop_reload.sh @@ -1,7 +1,5 @@ #!/bin/bash -# $Id: drop_reload.sh 3158 2010-09-02 02:49:00Z gullevek $ - rm error; rm output; bin/drop_data.sh; diff --git a/4dev/database/bin/import_data.sh b/4dev/database/bin/import_data.sh index cd59418c..caecf081 100755 --- a/4dev/database/bin/import_data.sh +++ b/4dev/database/bin/import_data.sh @@ -1,6 +1,5 @@ #!/bin/bash -# $Id: import_data.sh 4382 2013-02-18 07:27:24Z gullevek $ # quick hack for import #echo "EXIT"; diff --git a/4dev/database/function/update_function.sql b/4dev/database/function/update_function.sql index e5f1ed50..720a4822 100644 --- a/4dev/database/function/update_function.sql +++ b/4dev/database/function/update_function.sql @@ -1,4 +1,3 @@ --- $Id: update_function.sql 3158 2010-09-02 02:49:00Z gullevek $ -- adds the created or updated date tags CREATE OR REPLACE FUNCTION set_generic() RETURNS TRIGGER AS ' diff --git a/4dev/database/table/edit_access.sql b/4dev/database/table/edit_access.sql index 1bbc8295..b2fa3322 100644 --- a/4dev/database/table/edit_access.sql +++ b/4dev/database/table/edit_access.sql @@ -1,4 +1,3 @@ --- $Id: edit_access.sql 4382 2013-02-18 07:27:24Z gullevek $ -- AUTHOR: Clemens Schwaighofer -- DATE: 2005/07/05 -- DESCRIPTION: diff --git a/4dev/database/table/edit_access_data.sql b/4dev/database/table/edit_access_data.sql new file mode 100644 index 00000000..3ceacb0e --- /dev/null +++ b/4dev/database/table/edit_access_data.sql @@ -0,0 +1,15 @@ +-- AUTHOR: Clemens Schwaighofer +-- DATE: 2016/7/15 +-- DESCRIPTION: +-- sub table to edit access, holds additional data for access group +-- TABLE: edit_access_data +-- HISTORY: + +-- DROP TABLE edit_access_data; +CREATE TABLE edit_access_data ( + edit_access_data_id SERIAL PRIMARY KEY, + edit_access_id INT NOT NULL, + name VARCHAR, + value VARCHAR, + FOREIGN KEY (edit_access_id) REFERENCES edit_access (edit_access_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE +) INHERITS (edit_generic) WITHOUT OIDS; diff --git a/4dev/database/table/edit_access_right.sql b/4dev/database/table/edit_access_right.sql index 95bf4ad9..fc3e5ac6 100644 --- a/4dev/database/table/edit_access_right.sql +++ b/4dev/database/table/edit_access_right.sql @@ -1,4 +1,3 @@ --- $Id: edit_access_right.sql 4382 2013-02-18 07:27:24Z gullevek $ -- AUTHOR: Clemens Schwaighofer -- DATE: 2005/07/05 -- DESCRIPTION: diff --git a/4dev/database/table/edit_access_user.sql b/4dev/database/table/edit_access_user.sql index 8f20ae27..8348d169 100644 --- a/4dev/database/table/edit_access_user.sql +++ b/4dev/database/table/edit_access_user.sql @@ -1,4 +1,3 @@ --- $Id: edit_access_user.sql 3158 2010-09-02 02:49:00Z gullevek $ -- AUTHOR: Clemens Schwaighofer -- DATE: 2005/07/05 -- DESCRIPTION: diff --git a/4dev/database/table/edit_generic.sql b/4dev/database/table/edit_generic.sql index 56f3fb97..dfbbc791 100644 --- a/4dev/database/table/edit_generic.sql +++ b/4dev/database/table/edit_generic.sql @@ -1,4 +1,3 @@ --- $Id: edit_generic.sql 3158 2010-09-02 02:49:00Z gullevek $ -- AUTHOR: Clemens Schwaighofer -- DATE: 2005/07/05 -- DESCRIPTION: diff --git a/4dev/database/table/edit_group.sql b/4dev/database/table/edit_group.sql index 1f63fdc5..ef6348cb 100644 --- a/4dev/database/table/edit_group.sql +++ b/4dev/database/table/edit_group.sql @@ -1,4 +1,3 @@ --- $Id: edit_group.sql 3158 2010-09-02 02:49:00Z gullevek $ -- AUTHOR: Clemens Schwaighofer -- DATE: 2005/07/05 -- DESCRIPTION: diff --git a/4dev/database/table/edit_language.sql b/4dev/database/table/edit_language.sql index dcce360e..654eccd6 100644 --- a/4dev/database/table/edit_language.sql +++ b/4dev/database/table/edit_language.sql @@ -1,4 +1,3 @@ --- $Id: edit_language.sql 3158 2010-09-02 02:49:00Z gullevek $ -- AUTHOR: Clemens Schwaighofer -- DATE: 2005/07/05 -- DESCRIPTION: diff --git a/4dev/database/table/edit_log.sql b/4dev/database/table/edit_log.sql index 4415ae19..dd337ac2 100644 --- a/4dev/database/table/edit_log.sql +++ b/4dev/database/table/edit_log.sql @@ -1,4 +1,3 @@ --- $Id: edit_log.sql 4382 2013-02-18 07:27:24Z gullevek $ -- AUTHOR: Clemens Schwaighofer -- DATE: 2005/07/05 -- DESCRIPTION: diff --git a/4dev/database/table/edit_menu_group.sql b/4dev/database/table/edit_menu_group.sql index d60f33cc..34f64896 100644 --- a/4dev/database/table/edit_menu_group.sql +++ b/4dev/database/table/edit_menu_group.sql @@ -1,4 +1,3 @@ --- $Id: edit_menu_group.sql 4382 2013-02-18 07:27:24Z gullevek $ -- AUTHOR: Clemens Schwaighofer -- DATE: 2005/07/05 -- DESCRIPTION: diff --git a/4dev/database/table/edit_page.sql b/4dev/database/table/edit_page.sql index b1dafea5..ee98585c 100644 --- a/4dev/database/table/edit_page.sql +++ b/4dev/database/table/edit_page.sql @@ -1,4 +1,3 @@ --- $Id: edit_page.sql 4382 2013-02-18 07:27:24Z gullevek $ -- AUTHOR: Clemens Schwaighofer -- DATE: 2005/07/05 -- DESCRIPTION: diff --git a/4dev/database/table/edit_page_access.sql b/4dev/database/table/edit_page_access.sql index 6bd8ce05..165f6a23 100644 --- a/4dev/database/table/edit_page_access.sql +++ b/4dev/database/table/edit_page_access.sql @@ -1,4 +1,3 @@ --- $Id: edit_page_access.sql 4382 2013-02-18 07:27:24Z gullevek $ -- AUTHOR: Clemens Schwaighofer -- DATE: 2005/07/05 -- DESCRIPTION: diff --git a/4dev/database/table/edit_page_menu_group.sql b/4dev/database/table/edit_page_menu_group.sql index 7472ba8f..c4d25a5f 100644 --- a/4dev/database/table/edit_page_menu_group.sql +++ b/4dev/database/table/edit_page_menu_group.sql @@ -1,4 +1,3 @@ --- $Id: edit_page_menu_group.sql 3158 2010-09-02 02:49:00Z gullevek $ -- AUTHOR: Clemens Schwaighofer -- DATE: 2005/07/05 -- DESCRIPTION: diff --git a/4dev/database/table/edit_page_visible_group.sql b/4dev/database/table/edit_page_visible_group.sql index 1f944eb4..c083aa1e 100644 --- a/4dev/database/table/edit_page_visible_group.sql +++ b/4dev/database/table/edit_page_visible_group.sql @@ -1,4 +1,3 @@ --- $Id: edit_page_visible_group.sql 3158 2010-09-02 02:49:00Z gullevek $ -- AUTHOR: Clemens Schwaighofer -- DATE: 2005/07/05 -- DESCRIPTION: diff --git a/4dev/database/table/edit_query_string.sql b/4dev/database/table/edit_query_string.sql index 98f8f77d..f919af7a 100644 --- a/4dev/database/table/edit_query_string.sql +++ b/4dev/database/table/edit_query_string.sql @@ -1,4 +1,3 @@ --- $Id: edit_query_string.sql 3158 2010-09-02 02:49:00Z gullevek $ -- AUTHOR: Clemens Schwaighofer -- DATE: 2005/07/05 -- DESCRIPTION: diff --git a/4dev/database/table/edit_scheme.sql b/4dev/database/table/edit_scheme.sql index d3b77112..c04bd9ae 100644 --- a/4dev/database/table/edit_scheme.sql +++ b/4dev/database/table/edit_scheme.sql @@ -1,4 +1,3 @@ --- $Id: edit_scheme.sql 3158 2010-09-02 02:49:00Z gullevek $ -- AUTHOR: Clemens Schwaighofer -- DATE: 2005/07/05 -- DESCRIPTION: diff --git a/4dev/database/table/edit_temp_files.sql b/4dev/database/table/edit_temp_files.sql index e72ca240..f822eda0 100644 --- a/4dev/database/table/edit_temp_files.sql +++ b/4dev/database/table/edit_temp_files.sql @@ -1,4 +1,3 @@ --- $Id: edit_temp_files.sql 4382 2013-02-18 07:27:24Z gullevek $ -- AUTHOR: Clemens Schwaighofer -- DATE: 2005/07/08 -- DESCRIPTION: diff --git a/4dev/database/table/edit_user.sql b/4dev/database/table/edit_user.sql index 6a31a89c..db412dee 100644 --- a/4dev/database/table/edit_user.sql +++ b/4dev/database/table/edit_user.sql @@ -1,4 +1,3 @@ --- $Id: edit_user.sql 4226 2012-11-02 07:19:57Z gullevek $ -- AUTHOR: Clemens Schwaighofer -- DATE: 2005/07/06 -- DESCRIPTION: diff --git a/4dev/database/table/edit_visible_group.sql b/4dev/database/table/edit_visible_group.sql index d88ab428..eb794d1e 100644 --- a/4dev/database/table/edit_visible_group.sql +++ b/4dev/database/table/edit_visible_group.sql @@ -1,4 +1,3 @@ --- $Id: edit_visible_group.sql 4382 2013-02-18 07:27:24Z gullevek $ -- AUTHOR: Clemens Schwaighofer -- DATE: 2005/07/05 -- DESCRIPTION: diff --git a/4dev/database/table/generic.sql b/4dev/database/table/generic.sql index 84eaef7d..8e946ef7 100644 --- a/4dev/database/table/generic.sql +++ b/4dev/database/table/generic.sql @@ -1,4 +1,3 @@ --- $Id: generic.sql 3158 2010-09-02 02:49:00Z gullevek $ -- AUTHOR: Clemens Schwaighofer -- DATE: 2005/07/05 -- DESCRIPTION: diff --git a/4dev/database/trigger/trg_edit_access.sql b/4dev/database/trigger/trg_edit_access.sql index 17e5f640..a88bf94c 100644 --- a/4dev/database/trigger/trg_edit_access.sql +++ b/4dev/database/trigger/trg_edit_access.sql @@ -1,5 +1,3 @@ --- $Id: trg_edit_access.sql 3158 2010-09-02 02:49:00Z gullevek $ - -- DROP TRIGGER trg_edit_access ON edit_access; CREATE TRIGGER trg_edit_access BEFORE INSERT OR UPDATE ON edit_access diff --git a/4dev/database/trigger/trg_edit_access_data.sql b/4dev/database/trigger/trg_edit_access_data.sql new file mode 100644 index 00000000..ecc6d503 --- /dev/null +++ b/4dev/database/trigger/trg_edit_access_data.sql @@ -0,0 +1,4 @@ +-- DROP TRIGGER trg_edit_access_data ON edit_access_data; +CREATE TRIGGER trg_edit_access_data +BEFORE INSERT OR UPDATE ON edit_access_data +FOR EACH ROW EXECUTE PROCEDURE set_generic(); diff --git a/4dev/database/trigger/trg_edit_access_right.sql b/4dev/database/trigger/trg_edit_access_right.sql index ba6ce2de..8ef6509b 100644 --- a/4dev/database/trigger/trg_edit_access_right.sql +++ b/4dev/database/trigger/trg_edit_access_right.sql @@ -1,5 +1,3 @@ --- $Id: trg_edit_access_right.sql 3158 2010-09-02 02:49:00Z gullevek $ - -- DROP TRIGGER trg_edit_access_right ON edit_access_right; CREATE TRIGGER trg_edit_access_right BEFORE INSERT OR UPDATE ON edit_access_right diff --git a/4dev/database/trigger/trg_edit_access_user.sql b/4dev/database/trigger/trg_edit_access_user.sql index 5f8a62b2..842e3c09 100644 --- a/4dev/database/trigger/trg_edit_access_user.sql +++ b/4dev/database/trigger/trg_edit_access_user.sql @@ -1,5 +1,3 @@ --- $Id: trg_edit_access_user.sql 3158 2010-09-02 02:49:00Z gullevek $ - -- DROP TRIGGER trg_edit_access_user ON edit_access_user; CREATE TRIGGER trg_edit_access_user BEFORE INSERT OR UPDATE ON edit_access_user diff --git a/4dev/database/trigger/trg_edit_group.sql b/4dev/database/trigger/trg_edit_group.sql index 191b5c2d..21def0aa 100644 --- a/4dev/database/trigger/trg_edit_group.sql +++ b/4dev/database/trigger/trg_edit_group.sql @@ -1,5 +1,3 @@ --- $Id: trg_edit_group.sql 3158 2010-09-02 02:49:00Z gullevek $ - -- DROP TRIGGER trg_edit_group ON edit_group; CREATE TRIGGER trg_edit_group BEFORE INSERT OR UPDATE ON edit_group diff --git a/4dev/database/trigger/trg_edit_language.sql b/4dev/database/trigger/trg_edit_language.sql index 8b3961de..949ae574 100644 --- a/4dev/database/trigger/trg_edit_language.sql +++ b/4dev/database/trigger/trg_edit_language.sql @@ -1,5 +1,3 @@ --- $Id: trg_edit_language.sql 3158 2010-09-02 02:49:00Z gullevek $ - -- DROP TRIGGER trg_edit_language ON edit_language; CREATE TRIGGER trg_edit_language BEFORE INSERT OR UPDATE ON edit_language diff --git a/4dev/database/trigger/trg_edit_log.sql b/4dev/database/trigger/trg_edit_log.sql index acfa2db1..98518208 100644 --- a/4dev/database/trigger/trg_edit_log.sql +++ b/4dev/database/trigger/trg_edit_log.sql @@ -1,5 +1,3 @@ --- $Id: trg_edit_log.sql 3158 2010-09-02 02:49:00Z gullevek $ - -- DROP TRIGGER trg_edit_log ON edit_log; CREATE TRIGGER trg_edit_log BEFORE INSERT OR UPDATE ON edit_log diff --git a/4dev/database/trigger/trg_edit_menu_group.sql b/4dev/database/trigger/trg_edit_menu_group.sql index 3f35c6a8..4639bd24 100644 --- a/4dev/database/trigger/trg_edit_menu_group.sql +++ b/4dev/database/trigger/trg_edit_menu_group.sql @@ -1,5 +1,3 @@ --- $Id: trg_edit_menu_group.sql 3158 2010-09-02 02:49:00Z gullevek $ - -- DROP TRIGGER trg_edit_visible_group ON edit_visible_group; CREATE TRIGGER trg_edit_menu_group BEFORE INSERT OR UPDATE ON edit_menu_group diff --git a/4dev/database/trigger/trg_edit_page.sql b/4dev/database/trigger/trg_edit_page.sql index 4553aef4..f88f93bb 100644 --- a/4dev/database/trigger/trg_edit_page.sql +++ b/4dev/database/trigger/trg_edit_page.sql @@ -1,5 +1,3 @@ --- $Id: trg_edit_page.sql 3158 2010-09-02 02:49:00Z gullevek $ - -- DROP TRIGGER trg_edit_page ON edit_page; CREATE TRIGGER trg_edit_page BEFORE INSERT OR UPDATE ON edit_page diff --git a/4dev/database/trigger/trg_edit_page_access.sql b/4dev/database/trigger/trg_edit_page_access.sql index f79f2822..f287a7d4 100644 --- a/4dev/database/trigger/trg_edit_page_access.sql +++ b/4dev/database/trigger/trg_edit_page_access.sql @@ -1,5 +1,3 @@ --- $Id: trg_edit_page_access.sql 3158 2010-09-02 02:49:00Z gullevek $ - -- DROP TRIGGER trg_edit_page_access ON edit_page_access; CREATE TRIGGER trg_edit_page_access BEFORE INSERT OR UPDATE ON edit_page_access diff --git a/4dev/database/trigger/trg_edit_query_string.sql b/4dev/database/trigger/trg_edit_query_string.sql index 0557d904..bfddab30 100644 --- a/4dev/database/trigger/trg_edit_query_string.sql +++ b/4dev/database/trigger/trg_edit_query_string.sql @@ -1,5 +1,3 @@ --- $Id: trg_edit_query_string.sql 3158 2010-09-02 02:49:00Z gullevek $ - -- DROP TRIGGER trg_edit_query_string ON edit_query_string; CREATE TRIGGER trg_edit_query_string BEFORE INSERT OR UPDATE ON edit_query_string diff --git a/4dev/database/trigger/trg_edit_scheme.sql b/4dev/database/trigger/trg_edit_scheme.sql index d1bd088d..926728ac 100644 --- a/4dev/database/trigger/trg_edit_scheme.sql +++ b/4dev/database/trigger/trg_edit_scheme.sql @@ -1,5 +1,3 @@ --- $Id: trg_edit_scheme.sql 3158 2010-09-02 02:49:00Z gullevek $ - -- DROP TRIGGER trg_edit_scheme ON edit_scheme; CREATE TRIGGER trg_edit_scheme BEFORE INSERT OR UPDATE ON edit_scheme diff --git a/4dev/database/trigger/trg_edit_user.sql b/4dev/database/trigger/trg_edit_user.sql index 37bbd6c1..e9731473 100644 --- a/4dev/database/trigger/trg_edit_user.sql +++ b/4dev/database/trigger/trg_edit_user.sql @@ -1,5 +1,3 @@ --- $Id: trg_edit_user.sql 3158 2010-09-02 02:49:00Z gullevek $ - -- DROP TRIGGER trg_edit_user ON edit_user; CREATE TRIGGER trg_edit_user BEFORE INSERT OR UPDATE ON edit_user diff --git a/4dev/database/trigger/trg_edit_visible_group.sql b/4dev/database/trigger/trg_edit_visible_group.sql index e88601e8..d48ce8d6 100644 --- a/4dev/database/trigger/trg_edit_visible_group.sql +++ b/4dev/database/trigger/trg_edit_visible_group.sql @@ -1,5 +1,3 @@ --- $Id: trg_edit_visible_group.sql 3158 2010-09-02 02:49:00Z gullevek $ - -- DROP TRIGGER trg_edit_visible_group ON edit_visible_group; CREATE TRIGGER trg_edit_visible_group BEFORE INSERT OR UPDATE ON edit_visible_group