Fixed.
This commit is contained in:
@@ -60,7 +60,7 @@ app:
|
||||
mail:
|
||||
serverSendEmail: root@localhost
|
||||
supportEmail: root@localhost
|
||||
|
||||
enabled: false
|
||||
#######################################################################################
|
||||
# Google OAuth Authentication
|
||||
#######################################################################################
|
||||
|
||||
@@ -1 +1 @@
|
||||
SET DATABASE SQL SYNTAX MYS TRUE;
|
||||
SET DATABASE SQL SYNTAX MYS TRUE;
|
||||
@@ -1 +1 @@
|
||||
INSERT IGNORE INTO COLLABORATOR (id, email, creation_date) VALUES (1, 'test@wisemapping.org', CURRENT_DATE());
|
||||
INSERT IGNORE INTO COLLABORATOR (id, email, creation_date) VALUES (1, 'test@wisemapping.org', CURRENT_DATE());
|
||||
@@ -7,7 +7,7 @@ CREATE TABLE COLLABORATOR (
|
||||
CREATE TABLE "USER" (
|
||||
authentication_type TEXT NOT NULL,
|
||||
authenticator_uri VARCHAR(255),
|
||||
colaborator_id INTEGER NOT NULL PRIMARY KEY,
|
||||
collaborator_id INTEGER NOT NULL PRIMARY KEY,
|
||||
firstname VARCHAR(255) NOT NULL,
|
||||
lastname VARCHAR(255) NOT NULL,
|
||||
password VARCHAR(255) NOT NULL,
|
||||
@@ -18,7 +18,7 @@ CREATE TABLE "USER" (
|
||||
google_sync BOOLEAN,
|
||||
sync_code VARCHAR(255),
|
||||
google_token VARCHAR(255),
|
||||
FOREIGN KEY (colaborator_id) REFERENCES COLLABORATOR (id) ON DELETE CASCADE ON UPDATE NO ACTION
|
||||
FOREIGN KEY (collaborator_id) REFERENCES COLLABORATOR (id) ON DELETE CASCADE ON UPDATE NO ACTION
|
||||
);
|
||||
|
||||
CREATE TABLE "LABEL" (
|
||||
@@ -27,7 +27,7 @@ CREATE TABLE "LABEL" (
|
||||
creator_id INTEGER NOT NULL,
|
||||
parent_label_id INTEGER,
|
||||
color VARCHAR(7) NOT NULL,
|
||||
FOREIGN KEY (creator_id) REFERENCES "USER" (colaborator_id)
|
||||
FOREIGN KEY (creator_id) REFERENCES "USER" (collaborator_id)
|
||||
);
|
||||
|
||||
CREATE TABLE MINDMAP (
|
||||
@@ -40,7 +40,7 @@ CREATE TABLE MINDMAP (
|
||||
edition_date TIMESTAMP,
|
||||
creator_id INTEGER NOT NULL,
|
||||
last_editor_id INTEGER NOT NULL --,
|
||||
--FOREIGN KEY(creator_id) REFERENCES "USER"(colaborator_id) ON DELETE CASCADE ON UPDATE NO ACTION
|
||||
--FOREIGN KEY(creator_id) REFERENCES "USER"(collaborator_id) ON DELETE CASCADE ON UPDATE NO ACTION
|
||||
);
|
||||
|
||||
CREATE TABLE R_LABEL_MINDMAP (
|
||||
@@ -69,11 +69,11 @@ CREATE TABLE COLLABORATION_PROPERTIES (
|
||||
|
||||
CREATE TABLE COLLABORATION (
|
||||
id SERIAL NOT NULL PRIMARY KEY,
|
||||
colaborator_id INTEGER NOT NULL,
|
||||
collaborator_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 (collaborator_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
|
||||
);
|
||||
@@ -82,5 +82,5 @@ 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" (collaborator_id) ON DELETE CASCADE ON UPDATE NO ACTION
|
||||
);
|
||||
@@ -5,10 +5,10 @@
|
||||
<cache name="com.wisemapping.model.Collaborator"
|
||||
maxElementsInMemory="10000" eternal="false" timeToIdleSeconds="600"
|
||||
timeToLiveSeconds="3600" overflowToDisk="false"/>
|
||||
<cache name="com.wisemapping.model.User"
|
||||
<cache name="com.wisemapping.model.Account"
|
||||
maxElementsInMemory="10000" eternal="false" timeToIdleSeconds="600"
|
||||
timeToLiveSeconds="3600" overflowToDisk="false"/>
|
||||
<cache name="com.wisemapping.model.Label"
|
||||
<cache name="com.wisemapping.model.MindmapLabel"
|
||||
maxElementsInMemory="10000" eternal="false" timeToIdleSeconds="600"
|
||||
timeToLiveSeconds="3600" overflowToDisk="false"/>
|
||||
</ehcache>
|
||||
@@ -1 +1 @@
|
||||
CREATE TABLE IF NOT EXISTS COLLABORATOR (
|
||||
CREATE TABLE IF NOT EXISTS COLLABORATOR (
|
||||
@@ -5,8 +5,8 @@ CREATE TABLE IF NOT EXISTS COLLABORATOR (
|
||||
)
|
||||
CHARACTER SET UTF8MB4;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS USER (
|
||||
colaborator_id INTEGER NOT NULL PRIMARY KEY,
|
||||
CREATE TABLE IF NOT EXISTS ACCOUNT (
|
||||
collaborator_id INTEGER NOT NULL PRIMARY KEY,
|
||||
authentication_type CHAR(1)
|
||||
CHARACTER SET UTF8MB4 NOT NULL,
|
||||
authenticator_uri VARCHAR(255)
|
||||
@@ -21,7 +21,7 @@ CREATE TABLE IF NOT EXISTS USER (
|
||||
google_sync BOOL,
|
||||
sync_code VARCHAR(255),
|
||||
google_token VARCHAR(255),
|
||||
FOREIGN KEY (colaborator_id) REFERENCES COLLABORATOR (id)
|
||||
FOREIGN KEY (collaborator_id) REFERENCES COLLABORATOR (id)
|
||||
ON DELETE CASCADE
|
||||
ON UPDATE NO ACTION
|
||||
) CHARACTER SET UTF8MB4;
|
||||
@@ -38,21 +38,21 @@ CREATE TABLE IF NOT EXISTS MINDMAP (
|
||||
edition_date DATETIME,
|
||||
creator_id INTEGER NOT NULL,
|
||||
last_editor_id INTEGER NOT NULL,
|
||||
FOREIGN KEY (creator_id) REFERENCES USER (colaborator_id)
|
||||
FOREIGN KEY (creator_id) REFERENCES ACCOUNT (collaborator_id)
|
||||
ON DELETE CASCADE
|
||||
ON UPDATE NO ACTION
|
||||
)
|
||||
CHARACTER SET UTF8MB4;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS LABEL (
|
||||
CREATE TABLE IF NOT EXISTS MINDMAP_LABEL (
|
||||
id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
|
||||
title VARCHAR(30)
|
||||
CHARACTER SET UTF8MB4 NOT NULL,
|
||||
creator_id INTEGER NOT NULL,
|
||||
parent_label_id INTEGER,
|
||||
color VARCHAR(7) NOT NULL,
|
||||
FOREIGN KEY (creator_id) REFERENCES USER (colaborator_id),
|
||||
FOREIGN KEY (parent_label_id) REFERENCES LABEL (id)
|
||||
FOREIGN KEY (creator_id) REFERENCES ACCOUNT (collaborator_id),
|
||||
FOREIGN KEY (parent_label_id) REFERENCES MINDMAP_LABEL (id)
|
||||
ON DELETE CASCADE
|
||||
ON UPDATE NO ACTION
|
||||
)
|
||||
@@ -63,7 +63,7 @@ CREATE TABLE IF NOT EXISTS 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)
|
||||
FOREIGN KEY (label_id) REFERENCES MINDMAP_LABEL (id)
|
||||
ON DELETE CASCADE
|
||||
ON UPDATE NO ACTION
|
||||
)
|
||||
@@ -91,12 +91,12 @@ CREATE TABLE IF NOT EXISTS COLLABORATION_PROPERTIES (
|
||||
|
||||
CREATE TABLE IF NOT EXISTS COLLABORATION (
|
||||
id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
|
||||
colaborator_id INTEGER NOT NULL,
|
||||
collaborator_id INTEGER NOT NULL,
|
||||
properties_id INTEGER NOT NULL,
|
||||
mindmap_id INTEGER NOT NULL,
|
||||
role_id INTEGER NOT NULL,
|
||||
UNIQUE KEY UC_ROLE (mindmap_id,colaborator_id),
|
||||
FOREIGN KEY (colaborator_id) REFERENCES COLLABORATOR (id),
|
||||
UNIQUE KEY UC_ROLE (mindmap_id,collaborator_id),
|
||||
FOREIGN KEY (collaborator_id) REFERENCES COLLABORATOR (id),
|
||||
FOREIGN KEY (mindmap_id) REFERENCES MINDMAP (id)
|
||||
ON DELETE CASCADE
|
||||
ON UPDATE NO ACTION,
|
||||
@@ -110,7 +110,7 @@ CREATE TABLE IF NOT EXISTS 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)
|
||||
FOREIGN KEY (user_id) REFERENCES ACCOUNT (collaborator_id)
|
||||
ON DELETE CASCADE
|
||||
ON UPDATE NO ACTION
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user