From f25262044b247038f070739089f3b5b7a0353917 Mon Sep 17 00:00:00 2001 From: Jan Kvetina Date: Fri, 11 Mar 2022 21:56:42 +0100 Subject: [PATCH] Fix data types --- tables/log_events.sql | 2 +- tables/logs.sql | 9 ++++----- tables/logs_blacklist.sql | 2 +- tables/sessions.sql | 2 +- tables/user_roles.sql | 8 ++++---- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/tables/log_events.sql b/tables/log_events.sql index 76f56f0..b7b800e 100644 --- a/tables/log_events.sql +++ b/tables/log_events.sql @@ -6,7 +6,7 @@ CREATE TABLE log_events ( app_id NUMBER(4) CONSTRAINT nn_log_events_app_id NOT NULL, page_id NUMBER(6) CONSTRAINT nn_log_events_page_id NOT NULL, user_id VARCHAR2(30) CONSTRAINT nn_log_events_user_id NOT NULL, - session_id NUMBER CONSTRAINT nn_log_events_session_id NOT NULL, + session_id INTEGER CONSTRAINT nn_log_events_session_id NOT NULL, -- event_id VARCHAR2(30) CONSTRAINT nn_log_events_event_id NOT NULL, event_value NUMBER, diff --git a/tables/logs.sql b/tables/logs.sql index 0cd58f9..696015c 100644 --- a/tables/logs.sql +++ b/tables/logs.sql @@ -2,10 +2,9 @@ UPDATE sessions SET log_id = NULL; UPDATE uploaded_file_sheets SET result_log_id = NULL; -- -DROP TABLE logs_events PURGE; -DROP TABLE logs_lobs PURGE; -DROP TABLE logs_setup PURGE; -DROP TABLE logs PURGE; +DROP TABLE log_events PURGE; +DROP TABLE logs_blacklist PURGE; +DROP TABLE logs PURGE; -- SELECT * FROM logs ORDER BY 1 DESC; */ @@ -25,7 +24,7 @@ CREATE TABLE logs ( arguments VARCHAR2(2000), payload VARCHAR2(4000), -- - session_id NUMBER, + session_id INTEGER, created_at TIMESTAMP CONSTRAINT nn_logs_created_at NOT NULL, -- CONSTRAINT pk_logs diff --git a/tables/logs_blacklist.sql b/tables/logs_blacklist.sql index b7a1e5a..a0b5c03 100644 --- a/tables/logs_blacklist.sql +++ b/tables/logs_blacklist.sql @@ -1,6 +1,6 @@ --DROP TABLE logs_blacklist CASCADE CONSTRAINTS PURGE; CREATE TABLE logs_blacklist ( - app_id NUMBER(4) CONSTRAINT nn_logs_blacklist_app_id NOT NULL, + app_id NUMBER(4), -- CONSTRAINT nn_logs_blacklist_app_id NOT NULL, flag CHAR(1), user_id VARCHAR2(30), page_id NUMBER(6), diff --git a/tables/sessions.sql b/tables/sessions.sql index dcd3ca1..bb65c76 100644 --- a/tables/sessions.sql +++ b/tables/sessions.sql @@ -1,7 +1,7 @@ --DROP TABLE sessions PURGE; CREATE TABLE sessions ( app_id NUMBER(4) CONSTRAINT nn_sessions_app_id NOT NULL, - session_id NUMBER CONSTRAINT nn_sessions_session_id NOT NULL, + session_id INTEGER CONSTRAINT nn_sessions_session_id NOT NULL, user_id VARCHAR2(30) CONSTRAINT nn_sessions_user_id NOT NULL, -- created_at DATE CONSTRAINT nn_sessions_created_at NOT NULL, diff --git a/tables/user_roles.sql b/tables/user_roles.sql index 147455c..da6c2b8 100644 --- a/tables/user_roles.sql +++ b/tables/user_roles.sql @@ -10,23 +10,23 @@ CREATE TABLE user_roles ( CONSTRAINT pk_user_roles PRIMARY KEY (app_id, user_id, role_id), -- - CONSTRAINT fk_users_roles_app_id + CONSTRAINT fk_user_roles_app_id FOREIGN KEY (app_id) REFERENCES apps (app_id), -- - CONSTRAINT fk_users_roles_user_id + CONSTRAINT fk_user_roles_user_id FOREIGN KEY (user_id) REFERENCES users (user_id) DEFERRABLE INITIALLY DEFERRED, -- - CONSTRAINT fk_users_roles_role_id + CONSTRAINT fk_user_roles_role_id FOREIGN KEY (app_id, role_id) REFERENCES roles (app_id, role_id) DEFERRABLE INITIALLY DEFERRED ) STORAGE (BUFFER_POOL KEEP); -- -ALTER TABLE user_roles MODIFY CONSTRAINT fk_users_roles_user_id DISABLE; -- to assign roles before user is created +ALTER TABLE user_roles MODIFY CONSTRAINT fk_user_roles_user_id DISABLE; -- to assign roles before user is created -- COMMENT ON TABLE user_roles IS '[CORE] List of roles assigned to users'; --