diff --git a/4dev/database/table/edit_access.sql b/4dev/database/table/edit_access.sql index 3b826fb2..17045bc1 100644 --- a/4dev/database/table/edit_access.sql +++ b/4dev/database/table/edit_access.sql @@ -8,12 +8,12 @@ -- DROP TABLE edit_access; CREATE TABLE edit_access ( edit_access_id SERIAL PRIMARY KEY, + enabled SMALLINT NOT NULL DEFAULT 0, + protected SMALLINT DEFAULT 0, + deleted SMALLINT DEFAULT 0, + uid VARCHAR, name VARCHAR UNIQUE, description VARCHAR, color VARCHAR, - uid VARCHAR, - enabled SMALLINT NOT NULL DEFAULT 0, - protected INT, - deleted SMALLINT DEFAULT 0, additional_acl JSONB ) INHERITS (edit_generic) WITHOUT OIDS; diff --git a/4dev/database/table/edit_access_data.sql b/4dev/database/table/edit_access_data.sql index 09ff02a8..8ceb7f4f 100644 --- a/4dev/database/table/edit_access_data.sql +++ b/4dev/database/table/edit_access_data.sql @@ -9,8 +9,8 @@ CREATE TABLE edit_access_data ( edit_access_data_id SERIAL PRIMARY KEY, edit_access_id INT NOT NULL, + enabled SMALLINT NOT NULL DEFAULT 0, name VARCHAR, value VARCHAR, - enabled SMALLINT NOT NULL DEFAULT 0, 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_user.sql b/4dev/database/table/edit_access_user.sql index 7194385c..2cf95da7 100644 --- a/4dev/database/table/edit_access_user.sql +++ b/4dev/database/table/edit_access_user.sql @@ -8,10 +8,10 @@ -- DROP TABLE edit_access_user; CREATE TABLE edit_access_user ( edit_access_user_id SERIAL PRIMARY KEY, - edit_default SMALLINT DEFAULT 0, edit_access_id INT NOT NULL, edit_user_id INT NOT NULL, edit_access_right_id INT NOT NULL, + edit_default SMALLINT DEFAULT 0, enabled SMALLINT NOT NULL DEFAULT 0, FOREIGN KEY (edit_access_id) REFERENCES edit_access (edit_access_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE, FOREIGN KEY (edit_user_id) REFERENCES edit_user (edit_user_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE, diff --git a/4dev/database/table/edit_group.sql b/4dev/database/table/edit_group.sql index ca58b14a..c673057d 100644 --- a/4dev/database/table/edit_group.sql +++ b/4dev/database/table/edit_group.sql @@ -8,11 +8,12 @@ -- DROP TABLE edit_group; CREATE TABLE edit_group ( edit_group_id SERIAL PRIMARY KEY, - name VARCHAR, - enabled SMALLINT NOT NULL DEFAULT 0, - deleted SMALLINT DEFAULT 0, edit_scheme_id INT, edit_access_right_id INT NOT NULL, + enabled SMALLINT NOT NULL DEFAULT 0, + deleted SMALLINT DEFAULT 0, + uid VARCHAR + name VARCHAR, additional_acl JSONB, FOREIGN KEY (edit_scheme_id) REFERENCES edit_scheme (edit_scheme_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE, FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE diff --git a/4dev/database/table/edit_language.sql b/4dev/database/table/edit_language.sql index 633e3af3..ccd51e18 100644 --- a/4dev/database/table/edit_language.sql +++ b/4dev/database/table/edit_language.sql @@ -9,10 +9,10 @@ -- DROP TABLE edit_language; CREATE TABLE edit_language ( edit_language_id SERIAL PRIMARY KEY, - short_name VARCHAR, - long_name VARCHAR, - iso_name VARCHAR, - order_number INT, enabled SMALLINT NOT NULL DEFAULT 0, lang_default SMALLINT NOT NULL DEFAULT 0 + long_name VARCHAR, + short_name VARCHAR, + iso_name VARCHAR, + order_number INT, ) INHERITS (edit_generic) WITHOUT OIDS; diff --git a/4dev/database/table/edit_page.sql b/4dev/database/table/edit_page.sql index 54741a47..b278e1f1 100644 --- a/4dev/database/table/edit_page.sql +++ b/4dev/database/table/edit_page.sql @@ -17,5 +17,6 @@ CREATE TABLE edit_page ( popup SMALLINT NOT NULL DEFAULT 0, popup_x SMALLINT, popup_y SMALLINT, + hostname VARCHAR, FOREIGN KEY (content_alias_edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE, ) INHERITS (edit_generic) WITHOUT OIDS; diff --git a/4dev/database/table/edit_page_access.sql b/4dev/database/table/edit_page_access.sql index 3a7c1100..e64703b4 100644 --- a/4dev/database/table/edit_page_access.sql +++ b/4dev/database/table/edit_page_access.sql @@ -8,10 +8,10 @@ -- DROP TABLE edit_page_access; CREATE TABLE edit_page_access ( edit_page_access_id SERIAL PRIMARY KEY, - enabled SMALLINT NOT NULL DEFAULT 0, edit_group_id INT NOT NULL, edit_page_id INT NOT NULL, edit_access_right_id INT NOT NULL, + enabled SMALLINT NOT NULL DEFAULT 0, FOREIGN KEY (edit_group_id) REFERENCES edit_group (edit_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE, FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE, FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE diff --git a/4dev/database/table/edit_page_content.sql b/4dev/database/table/edit_page_content.sql index ec7299b9..71d5a9ec 100755 --- a/4dev/database/table/edit_page_content.sql +++ b/4dev/database/table/edit_page_content.sql @@ -11,8 +11,8 @@ CREATE TABLE edit_page_content ( edit_page_content_id SERIAL PRIMARY KEY, edit_page_id INT NOT NULL, edit_access_right_id INT NOT NULL, - name VARCHAR, uid VARCHAR UNIQUE, + name VARCHAR, order_number INT NOT NULL, online SMALLINT NOT NULL DEFAULT 0, FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE, diff --git a/4dev/database/table/edit_query_string.sql b/4dev/database/table/edit_query_string.sql index 064127eb..62399112 100644 --- a/4dev/database/table/edit_query_string.sql +++ b/4dev/database/table/edit_query_string.sql @@ -8,10 +8,10 @@ -- DROP TABLE edit_query_string; CREATE TABLE edit_query_string ( edit_query_string_id SERIAL PRIMARY KEY, + edit_page_id INT NOT NULL, + enabled SMALLINT NOT NULL DEFAULT 0, name VARCHAR, value VARCHAR, - enabled SMALLINT NOT NULL DEFAULT 0, dynamic SMALLINT NOT NULL DEFAULT 0, - edit_page_id INT NOT NULL, FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE ) INHERITS (edit_generic) WITHOUT OIDS; diff --git a/4dev/database/table/edit_temp_files.sql b/4dev/database/table/edit_temp_files.sql index 301df712..4217d6b2 100644 --- a/4dev/database/table/edit_temp_files.sql +++ b/4dev/database/table/edit_temp_files.sql @@ -7,5 +7,6 @@ -- DROP TABLE temp_files; CREATE TABLE temp_files ( - filename VARCHAR + filename VARCHAR, + folder VARCHAR ); diff --git a/4dev/database/table/edit_user.sql b/4dev/database/table/edit_user.sql index c7f7430c..47a9aa34 100644 --- a/4dev/database/table/edit_user.sql +++ b/4dev/database/table/edit_user.sql @@ -9,23 +9,23 @@ CREATE TABLE edit_user ( edit_user_id SERIAL PRIMARY KEY, connect_edit_user_id INT, -- possible reference to other user + edit_language_id INT NOT NULL, + edit_group_id INT NOT NULL, + edit_scheme_id INT, + edit_access_right_id INT NOT NULL, + enabled SMALLINT NOT NULL DEFAULT 0, + deleted SMALLINT NOT NULL DEFAULT 0, username VARCHAR UNIQUE, password VARCHAR, first_name VARCHAR, last_name VARCHAR, first_name_furigana VARCHAR, last_name_furigana VARCHAR, - enabled SMALLINT NOT NULL DEFAULT 0, - deleted SMALLINT NOT NULL DEFAULT 0, debug SMALLINT NOT NULL DEFAULT 0, db_debug SMALLINT NOT NULL DEFAULT 0, email VARCHAR, protected SMALLINT NOT NULL DEFAULT 0, admin SMALLINT NOT NULL DEFAULT 0, - edit_language_id INT NOT NULL, - edit_group_id INT NOT NULL, - edit_scheme_id INT, - edit_access_right_id INT NOT NULL, login_error_count INT, login_error_date_last TIMESTAMP WITHOUT TIME ZONE, login_error_date_first TIMESTAMP WITHOUT TIME ZONE, diff --git a/4dev/database/table/edit_visible_group.sql b/4dev/database/table/edit_visible_group.sql index 5414a0f7..467f3921 100644 --- a/4dev/database/table/edit_visible_group.sql +++ b/4dev/database/table/edit_visible_group.sql @@ -11,7 +11,3 @@ CREATE TABLE edit_visible_group ( name VARCHAR, flag VARCHAR ) INHERITS (edit_generic) WITHOUT OIDS; - -DELETE FROM edit_visible_group; -INSERT INTO edit_visible_group (name, flag) VALUES ('Main Menu', 'main'); -INSERT INTO edit_visible_group (name, flag) VALUES ('Data popup Menu', 'datapopup'); diff --git a/4dev/database/update/edit_tables_missing_columns.sql b/4dev/database/update/edit_tables_missing_columns.sql index 14e28dc4..5635b276 100755 --- a/4dev/database/update/edit_tables_missing_columns.sql +++ b/4dev/database/update/edit_tables_missing_columns.sql @@ -8,7 +8,7 @@ ALTER TABLE edit_access ADD protected SMALLINT DEFAULT 0; ALTER TABLE edit_group ADD uid VARCHAR; ALTER TABLE edit_group ADD deleted SMALLINT DEFAULT 0; -ALTER TABLE temp_files ADD folder varchar; -ALTER TABLE edit_page ADD hostname varchar; +ALTER TABLE temp_files ADD folder VARCHAR; +ALTER TABLE edit_page ADD hostname VARCHAR; ALTER TABLE edit_user ADD deleted SMALLINT DEFAULT 0;