diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php index a4ef7d44f..d23a35c91 100644 --- a/system/dbupdate_3.4.php +++ b/system/dbupdate_3.4.php @@ -54,7 +54,7 @@ require_once('dbupdate_3.4/37107_fristenmanagement.php'); require_once('dbupdate_3.4/33003_bis_meldung_personal.php'); require_once('dbupdate_3.4/36275_zeitaufzeichnung_karenz.php'); require_once('dbupdate_3.4/21620_neues_feld_zum_erfassen_des_ESI.php'); -require_once('dbupdate_3.4/25999_C4_ma0594.php'); +require_once('dbupdate_3.4/25999_C4_profil.php'); require_once('dbupdate_3.4/25999_cis4_cms.php'); require_once('dbupdate_3.4/36530_bis_internationsalisierung_codextabelle_neuerungen.php'); require_once('dbupdate_3.4/34543_ux_template.php'); diff --git a/system/dbupdate_3.4/25999_C4_ma0594.php b/system/dbupdate_3.4/25999_C4_profil.php similarity index 100% rename from system/dbupdate_3.4/25999_C4_ma0594.php rename to system/dbupdate_3.4/25999_C4_profil.php diff --git a/system/dbupdate_3.4/41134_C4_bookmark_dashboardWidget.php b/system/dbupdate_3.4/41134_C4_bookmark_dashboardWidget.php index c54b4c2ca..5528473bb 100644 --- a/system/dbupdate_3.4/41134_C4_bookmark_dashboardWidget.php +++ b/system/dbupdate_3.4/41134_C4_bookmark_dashboardWidget.php @@ -1,67 +1,36 @@ db_query("SELECT to_regclass('dashboard.tbl_bookmark')")) +if ($result = @$db->db_query("SELECT * FROM information_schema.tables WHERE table_name='tbl_bookmark' AND table_schema='dashboard'")) { - if (!$db->db_query("BEGIN;")) + if($db->db_num_rows($result) == 0) { - echo 'wasnt able to start transaction for 41134_C4_bookmark_dashboardWidget: ' . $db->db_last_error() . '
'; - } - $qry = " - CREATE TABLE IF NOT EXISTS dashboard.tbl_bookmark( - bookmark_id BIGINT PRIMARY KEY, - uid VARCHAR(255) NOT NULL, - url VARCHAR(511) NOT NULL, - title VARCHAR(255) NOT NULL, - tag VARCHAR(255) NULL, - insertamum TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP, - insertvon VARCHAR(255) NULL REFERENCES public.tbl_benutzer(uid), - updateamum TIMESTAMP NULL, - updatevon VARCHAR(255) NULL REFERENCES public.tbl_benutzer(uid) - ); + $qry = " + CREATE TABLE IF NOT EXISTS dashboard.tbl_bookmark( + bookmark_id BIGSERIAL PRIMARY KEY, + uid VARCHAR(255) NOT NULL, + url VARCHAR(511) NOT NULL, + title VARCHAR(255) NOT NULL, + tag VARCHAR(255) NULL, + insertamum TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP, + insertvon VARCHAR(255) NULL REFERENCES public.tbl_benutzer(uid), + updateamum TIMESTAMP NULL, + updatevon VARCHAR(255) NULL REFERENCES public.tbl_benutzer(uid) + ); - ALTER TABLE dashboard.tbl_bookmark ADD CONSTRAINT tbl_bookmark_fk FOREIGN KEY(uid) REFERENCES public.tbl_benutzer(uid); + ALTER TABLE dashboard.tbl_bookmark ADD CONSTRAINT tbl_bookmark_fk FOREIGN KEY(uid) REFERENCES public.tbl_benutzer(uid); - CREATE SEQUENCE IF NOT EXISTS dashboard.tbl_bookmark_sequence - AS BIGINT - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - START WITH 1 - CACHE 1 - OWNED BY dashboard.tbl_bookmark.bookmark_id; + GRANT SELECT, INSERT, UPDATE, DELETE ON dashboard.tbl_bookmark TO vilesci; + GRANT SELECT, INSERT, UPDATE, DELETE ON dashboard.tbl_bookmark TO web; + GRANT SELECT, UPDATE ON dashboard.tbl_bookmark_bookmark_id_seq TO vilesci; + GRANT SELECT, UPDATE ON dashboard.tbl_bookmark_bookmark_id_seq TO web; + "; - ALTER TABLE dashboard.tbl_bookmark ALTER COLUMN bookmark_id SET DEFAULT nextval('dashboard.tbl_bookmark_sequence '); - - GRANT SELECT, INSERT, UPDATE, DELETE ON dashboard.tbl_bookmark TO vilesci; - GRANT SELECT, INSERT, UPDATE, DELETE ON dashboard.tbl_bookmark TO web; - GRANT SELECT, UPDATE ON dashboard.tbl_bookmark_sequence TO vilesci; - GRANT SELECT, UPDATE ON dashboard.tbl_bookmark_sequence TO web; - "; - - if (!$db->db_query($qry)) - { - // Rollback - if (!$db->db_query("ROLLBACK;")) + if (!$db->db_query($qry)) { - echo 'wasnt able to rollback: ' . $db->db_last_error() . '
'; - } - else - { - echo 'ROLLED BACK 41134_C4_bookmark_dashboardWidget
'; + echo 'error occurred during tbl_bookmark creation: ' . $db->db_last_error() . '
'; } - echo 'error occurred during tbl_bookmark creation: ' . $db->db_last_error() . '
'; - } - else - { - // Commit - if (!$db->db_query("COMMIT;")) + else { - echo 'wasnt able to commit: ' . $db->db_last_error() . '
'; - } - else - { - echo 'COMMITED 41134_C4_bookmark_dashboardWidget
'; + echo '
dashboard.tbl_bookmark successfully created'; } - echo '
dashboard.tbl_bookmark and dashboard.tbl_bookmark_sequence was created'; } }