From bdcd83c579d6569b3433e2e5d910cb98c9d6f797 Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Thu, 16 Feb 2017 10:29:50 +0900 Subject: [PATCH] Generic table update --- 4dev/database/function/set_generic.sql | 12 ++++++++++++ 4dev/database/table/edit_generic.sql | 4 +--- 4dev/database/table/edit_log.sql | 2 +- 4dev/database/table/generic.sql | 5 +---- www/admin/class_test.php | 2 +- 5 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 4dev/database/function/set_generic.sql diff --git a/4dev/database/function/set_generic.sql b/4dev/database/function/set_generic.sql new file mode 100644 index 00000000..d9ee552e --- /dev/null +++ b/4dev/database/function/set_generic.sql @@ -0,0 +1,12 @@ +-- adds the created or updated date tags + +CREATE OR REPLACE FUNCTION set_generic() RETURNS TRIGGER AS ' + BEGIN + IF TG_OP = ''INSERT'' THEN + NEW.date_created := ''now''; + ELSIF TG_OP = ''UPDATE'' THEN + NEW.date_updated := ''now''; + END IF; + RETURN NEW; + END; +' LANGUAGE 'plpgsql'; diff --git a/4dev/database/table/edit_generic.sql b/4dev/database/table/edit_generic.sql index dfbbc791..88c80f22 100644 --- a/4dev/database/table/edit_generic.sql +++ b/4dev/database/table/edit_generic.sql @@ -9,7 +9,5 @@ CREATE TABLE edit_generic ( eg_status INT, date_created TIMESTAMP WITHOUT TIME ZONE DEFAULT clock_timestamp(), - date_updated TIMESTAMP WITHOUT TIME ZONE, - user_created VARCHAR(25) DEFAULT CURRENT_USER, - user_updated VARCHAR(25) + date_updated TIMESTAMP WITHOUT TIME ZONE ); diff --git a/4dev/database/table/edit_log.sql b/4dev/database/table/edit_log.sql index dd337ac2..ec7f2c1f 100644 --- a/4dev/database/table/edit_log.sql +++ b/4dev/database/table/edit_log.sql @@ -10,7 +10,7 @@ CREATE TABLE edit_log ( edit_log_id SERIAL PRIMARY KEY, username VARCHAR, password VARCHAR, - event_date TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP, + event_date TIMESTAMP WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP, ip VARCHAR, error TEXT, event TEXT, diff --git a/4dev/database/table/generic.sql b/4dev/database/table/generic.sql index 8e946ef7..196ba4bf 100644 --- a/4dev/database/table/generic.sql +++ b/4dev/database/table/generic.sql @@ -7,9 +7,6 @@ -- DROP TABLE edit_generic; CREATE TABLE generic ( - row_status INT, date_created TIMESTAMP WITHOUT TIME ZONE DEFAULT clock_timestamp(), - date_updated TIMESTAMP WITHOUT TIME ZONE, - user_created VARCHAR(25) DEFAULT CURRENT_USER, - user_updated VARCHAR(25) + date_updated TIMESTAMP WITHOUT TIME ZONE ); diff --git a/www/admin/class_test.php b/www/admin/class_test.php index 6270e4f5..f8a7fad8 100644 --- a/www/admin/class_test.php +++ b/www/admin/class_test.php @@ -1,5 +1,5 @@