From ca27e37c4b3b4c68bae0a23ee8cd015bba436d89 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Wed, 15 Feb 2023 22:47:42 -0800 Subject: [PATCH] Fix postgress support --- config/database/postgres/create-database.sql | 3 +- config/database/postgres/create-schemas.sql | 18 ++- config/database/postgres/drop-schemas.sql | 19 ++- .../mysql-init/0001create-database.sql | 10 -- .../mysql-init/0002create-schemas.sql | 129 ------------------ .../mysql-init/0003apopulate-schemas.sql | 13 -- .../src/main/webapp/WEB-INF/app.properties | 4 +- .../main/webapp/WEB-INF/wisemapping-dao.xml | 1 + 8 files changed, 25 insertions(+), 172 deletions(-) delete mode 100644 distribution/mysql-init/0001create-database.sql delete mode 100644 distribution/mysql-init/0002create-schemas.sql delete mode 100644 distribution/mysql-init/0003apopulate-schemas.sql diff --git a/config/database/postgres/create-database.sql b/config/database/postgres/create-database.sql index 7000f0e2..3a1305f2 100644 --- a/config/database/postgres/create-database.sql +++ b/config/database/postgres/create-database.sql @@ -1,3 +1,4 @@ CREATE DATABASE wisemapping; CREATE USER wisemapping WITH PASSWORD 'password'; -GRANT ALL PRIVILEGES ON DATABASE wisemapping TO wisemapping; + +GRANT ALL PRIVILEGES ON DATABASE wisemapping TO wisemapping; \ No newline at end of file diff --git a/config/database/postgres/create-schemas.sql b/config/database/postgres/create-schemas.sql index c9ec9b20..1cc23a03 100644 --- a/config/database/postgres/create-schemas.sql +++ b/config/database/postgres/create-schemas.sql @@ -4,7 +4,7 @@ CREATE TABLE COLLABORATOR ( creation_date DATE ); -CREATE TABLE "user" ( +CREATE TABLE "USER" ( authentication_type TEXT NOT NULL, authenticator_uri VARCHAR(255), colaborator_id INTEGER NOT NULL PRIMARY KEY, @@ -21,19 +21,20 @@ CREATE TABLE "user" ( FOREIGN KEY (colaborator_id) REFERENCES COLLABORATOR (id) ON DELETE CASCADE ON UPDATE NO ACTION ); -CREATE TABLE LABEL ( +CREATE TABLE "LABEL" ( id INTEGER NOT NULL PRIMARY KEY, title VARCHAR(255), creator_id INTEGER NOT NULL, parent_label_id INTEGER, - color VARCHAR(7) NOT NULL - --FOREIGN KEY (creator_id) REFERENCES USER (colaborator_id) + color VARCHAR(7) NOT NULL, + iconName VARCHAR(50) NOT NULL, + FOREIGN KEY (creator_id) REFERENCES "USER" (colaborator_id) ); CREATE TABLE MINDMAP ( id SERIAL NOT NULL PRIMARY KEY, title VARCHAR(255) NOT NULL, - description VARCHAR(255) NOT NULL, + description VARCHAR(255), xml BYTEA NOT NULL, public BOOL NOT NULL DEFAULT FALSE, creation_date TIMESTAMP, @@ -48,7 +49,7 @@ CREATE TABLE R_LABEL_MINDMAP ( label_id INTEGER NOT NULL, PRIMARY KEY (mindmap_id, label_id), FOREIGN KEY (mindmap_id) REFERENCES MINDMAP (id), - FOREIGN KEY (label_id) REFERENCES LABEL (id) ON DELETE CASCADE ON UPDATE NO ACTION + FOREIGN KEY (label_id) REFERENCES "LABEL" (id) ON DELETE CASCADE ON UPDATE NO ACTION ); CREATE TABLE MINDMAP_HISTORY @@ -82,8 +83,11 @@ CREATE TABLE ACCESS_AUDITORY ( id SERIAL NOT NULL PRIMARY KEY, login_date DATE, user_id INTEGER NOT NULL, - FOREIGN KEY (user_id) REFERENCES "user" (colaborator_id) ON DELETE CASCADE ON UPDATE NO ACTION + FOREIGN KEY (user_id) REFERENCES "USER" (colaborator_id) ON DELETE CASCADE ON UPDATE NO ACTION ); +GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO wisemapping; +GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO wisemapping; + COMMIT; diff --git a/config/database/postgres/drop-schemas.sql b/config/database/postgres/drop-schemas.sql index 0db61fdf..6b49abbe 100644 --- a/config/database/postgres/drop-schemas.sql +++ b/config/database/postgres/drop-schemas.sql @@ -1,11 +1,10 @@ -DROP TABLE TAG; -DROP TABLE ACCESS_AUDITORY; -DROP TABLE COLLABORATION; -DROP TABLE COLLABORATION_PROPERTIES; -DROP TABLE MINDMAP_HISTORY; -DROP TABLE R_LABEL_MINDMAP; -DROP TABLE LABEL; -DROP TABLE MINDMAP; -DROP TABLE "user"; -DROP TABLE COLLABORATOR; +DROP TABLE IF EXISTS ACCESS_AUDITORY; +DROP TABLE IF EXISTS COLLABORATION; +DROP TABLE IF EXISTS COLLABORATION_PROPERTIES; +DROP TABLE IF EXISTS MINDMAP_HISTORY; +DROP TABLE IF EXISTS R_LABEL_MINDMAP; +DROP TABLE IF EXISTS "LABEL"; +DROP TABLE IF EXISTS MINDMAP; +DROP TABLE IF EXISTS "USER"; +DROP TABLE IF EXISTS COLLABORATOR; COMMIT; \ No newline at end of file diff --git a/distribution/mysql-init/0001create-database.sql b/distribution/mysql-init/0001create-database.sql deleted file mode 100644 index 6d2cd226..00000000 --- a/distribution/mysql-init/0001create-database.sql +++ /dev/null @@ -1,10 +0,0 @@ -# -# Command: mysql -u root -p < create_database.sql -# -DROP DATABASE IF EXISTS wisemapping; - -CREATE DATABASE IF NOT EXISTS wisemapping - CHARACTER SET = 'utf8' - COLLATE = 'utf8_unicode_ci'; -GRANT ALL ON wisemapping.* TO 'wisemapping'@'localhost'; -SET PASSWORD FOR 'wisemapping'@'localhost' = PASSWORD('password'); \ No newline at end of file diff --git a/distribution/mysql-init/0002create-schemas.sql b/distribution/mysql-init/0002create-schemas.sql deleted file mode 100644 index 1fee2371..00000000 --- a/distribution/mysql-init/0002create-schemas.sql +++ /dev/null @@ -1,129 +0,0 @@ -# -# Command: mysql -u root -p < create_schemas.sql -# - -USE wisemapping; - -CREATE TABLE COLLABORATOR ( - id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT, - email VARCHAR(255) - CHARACTER SET utf8 NOT NULL UNIQUE, - creation_date DATE -) - CHARACTER SET utf8; - -CREATE TABLE USER ( - colaborator_id INTEGER NOT NULL PRIMARY KEY, - authentication_type CHAR(1) - CHARACTER SET utf8 NOT NULL, - authenticator_uri VARCHAR(255) - CHARACTER SET utf8, - firstname VARCHAR(255) CHARACTER SET utf8 NOT NULL, - lastname VARCHAR(255) CHARACTER SET utf8 NOT NULL, - password VARCHAR(255) CHARACTER SET utf8 NOT NULL, - activation_code BIGINT(20) NOT NULL, - activation_date DATE, - allow_send_email CHAR(1) CHARACTER SET utf8 NOT NULL DEFAULT 0, - locale VARCHAR(5), - google_sync BOOL, - sync_code VARCHAR(255), - google_token VARCHAR(255), - FOREIGN KEY (colaborator_id) REFERENCES COLLABORATOR (id) - ON DELETE CASCADE - ON UPDATE NO ACTION -) - CHARACTER SET utf8; - -CREATE TABLE MINDMAP ( - id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT, - title VARCHAR(255) - CHARACTER SET utf8 NOT NULL, - description VARCHAR(255) - CHARACTER SET utf8 NOT NULL, - xml MEDIUMBLOB NOT NULL, - public BOOL NOT NULL DEFAULT 0, - creation_date DATETIME, - edition_date DATETIME, - creator_id INTEGER NOT NULL, - tags VARCHAR(1014) - CHARACTER SET utf8, - last_editor_id INTEGER NOT NULL, - FOREIGN KEY (creator_id) REFERENCES USER (colaborator_id) - ON DELETE CASCADE - ON UPDATE NO ACTION -) - CHARACTER SET utf8; - -CREATE TABLE LABEL ( - id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT, - title VARCHAR(30) - CHARACTER SET utf8 NOT NULL, - creator_id INTEGER NOT NULL, - parent_label_id INTEGER, - color VARCHAR(7) NOT NULL, - iconName VARCHAR(50) NOT NULL, - FOREIGN KEY (creator_id) REFERENCES USER (colaborator_id), - FOREIGN KEY (parent_label_id) REFERENCES LABEL (id) - ON DELETE CASCADE - ON UPDATE NO ACTION -) - CHARACTER SET utf8; - -CREATE TABLE R_LABEL_MINDMAP ( - mindmap_id INTEGER NOT NULL, - label_id INTEGER NOT NULL, - PRIMARY KEY (mindmap_id, label_id), - FOREIGN KEY (mindmap_id) REFERENCES MINDMAP (id), - FOREIGN KEY (label_id) REFERENCES LABEL (id) - ON DELETE CASCADE - ON UPDATE NO ACTION -) - CHARACTER SET utf8; - -CREATE TABLE MINDMAP_HISTORY -(id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT, - xml MEDIUMBLOB NOT NULL, - mindmap_id INTEGER NOT NULL, - creation_date DATETIME, - editor_id INTEGER NOT NULL, - FOREIGN KEY (mindmap_id) REFERENCES MINDMAP (id) - ON DELETE CASCADE - ON UPDATE NO ACTION -) - CHARACTER SET utf8; - -CREATE TABLE COLLABORATION_PROPERTIES ( - id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT, - starred BOOL NOT NULL DEFAULT 0, - mindmap_properties VARCHAR(512) - CHARACTER SET utf8 -) - CHARACTER SET utf8; - -CREATE TABLE COLLABORATION ( - id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT, - colaborator_id INTEGER NOT NULL, - properties_id INTEGER NOT NULL, - mindmap_id INTEGER NOT NULL, - role_id INTEGER NOT NULL, - FOREIGN KEY (colaborator_id) REFERENCES COLLABORATOR (id), - FOREIGN KEY (mindmap_id) REFERENCES MINDMAP (id) - ON DELETE CASCADE - ON UPDATE NO ACTION, - FOREIGN KEY (properties_id) REFERENCES COLLABORATION_PROPERTIES (id) - ON DELETE CASCADE - ON UPDATE NO ACTION -) - CHARACTER SET utf8; - -CREATE TABLE ACCESS_AUDITORY ( - id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT, - login_date DATE, - user_id INTEGER NOT NULL, - FOREIGN KEY (user_id) REFERENCES USER (colaborator_id) - ON DELETE CASCADE - ON UPDATE NO ACTION -) - CHARACTER SET utf8; - -COMMIT; \ No newline at end of file diff --git a/distribution/mysql-init/0003apopulate-schemas.sql b/distribution/mysql-init/0003apopulate-schemas.sql deleted file mode 100644 index a4daf933..00000000 --- a/distribution/mysql-init/0003apopulate-schemas.sql +++ /dev/null @@ -1,13 +0,0 @@ -# -# Command: mysql -u root -p < apopulate_schemas.sql -# - -INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (1, 'test@wisemapping.org', CURRENT_DATE()); -INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type) - VALUES (1, 'Test', 'User', 'ENC:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3', 1237, CURRENT_DATE(), 1,'D'); - -INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (2, 'admin@wisemapping.org', CURRENT_DATE()); -INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type) - VALUES (2, 'Admin', 'User', 'ENC:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3', 1237, CURRENT_DATE(), 1,'D'); - -COMMIT; diff --git a/wise-webapp/src/main/webapp/WEB-INF/app.properties b/wise-webapp/src/main/webapp/WEB-INF/app.properties index 82720249..ed574965 100755 --- a/wise-webapp/src/main/webapp/WEB-INF/app.properties +++ b/wise-webapp/src/main/webapp/WEB-INF/app.properties @@ -15,8 +15,8 @@ #database.url=jdbc:postgresql:///wisemapping #database.driver=org.postgresql.Driver #database.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect -#database.username= -#database.password= +#database.username=wisemapping +#database.password=password #database.validation.enabled=true #database.validation.query= #database.validation.enabled=false diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml index 4b66b72b..14cd3740 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml @@ -25,6 +25,7 @@ org.hibernate.cache.ehcache.EhCacheRegionFactory 200 true + true