Skip to content

Commit 9b23331

Browse files
committed
Fix role/person tables
1 parent 5d00378 commit 9b23331

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

grails-app/domain/ozone/owf/grails/domain/Person.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class Person implements Serializable {
4444
static mapping = {
4545
cache true
4646
authorities cache: true,
47-
joinTable: [name: 'role_people', key: 'person_id', column: 'role_id']
47+
joinTable: [name: 'person_role', key: 'person_authorities_id', column: 'role_id']
4848
groups cache: true
4949
dashboards lazy: true, cascade : "delete-orphan", cache: true
5050
personWidgetDefinitions lazy: true, cascade : "delete-orphan", cache: true

prodDb.script

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ CREATE MEMORY TABLE PERSON_WIDGET_DEFINITION(ID BIGINT GENERATED BY DEFAULT AS I
1111
CREATE MEMORY TABLE PREFERENCE(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1) NOT NULL PRIMARY KEY,VERSION BIGINT NOT NULL,NAMESPACE VARCHAR(200) NOT NULL,PATH VARCHAR(200) NOT NULL,USER_ID BIGINT NOT NULL,VALUE LONGVARCHAR NOT NULL,CONSTRAINT SYS_CT_590 UNIQUE(PATH,NAMESPACE,USER_ID),CONSTRAINT FKA8FCBCDB8656347D FOREIGN KEY(USER_ID) REFERENCES PERSON(ID))
1212
CREATE MEMORY TABLE REQUESTMAP(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1) NOT NULL PRIMARY KEY,VERSION BIGINT NOT NULL,CONFIG_ATTRIBUTE VARCHAR(255) NOT NULL,URL VARCHAR(255) NOT NULL,CONSTRAINT SYS_CT_594 UNIQUE(URL))
1313
CREATE MEMORY TABLE ROLE(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1) NOT NULL PRIMARY KEY,VERSION BIGINT NOT NULL,AUTHORITY VARCHAR(255) NOT NULL,DESCRIPTION VARCHAR(255) NOT NULL,CONSTRAINT SYS_CT_598 UNIQUE(AUTHORITY))
14-
CREATE MEMORY TABLE ROLE_PEOPLE(ROLE_ID BIGINT NOT NULL,PERSON_ID BIGINT NOT NULL,PRIMARY KEY(ROLE_ID,PERSON_ID),CONSTRAINT FK28B75E7870B353 FOREIGN KEY(ROLE_ID) REFERENCES ROLE(ID),CONSTRAINT FK28B75E78C1F5E0B3 FOREIGN KEY(PERSON_ID) REFERENCES PERSON(ID))
1514
CREATE MEMORY TABLE TAG_LINKS(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1) NOT NULL PRIMARY KEY,VERSION BIGINT NOT NULL,EDITABLE BOOLEAN,POS BIGINT,TAG_ID BIGINT NOT NULL,TAG_REF BIGINT NOT NULL,TYPE VARCHAR(255) NOT NULL,VISIBLE BOOLEAN)
1615
CREATE MEMORY TABLE TAGS(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1) NOT NULL PRIMARY KEY,VERSION BIGINT NOT NULL,NAME VARCHAR(255) NOT NULL,CONSTRAINT SYS_CT_606 UNIQUE(NAME))
1716
CREATE MEMORY TABLE WIDGET_DEFINITION(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1) NOT NULL PRIMARY KEY,VERSION BIGINT NOT NULL,DISPLAY_NAME VARCHAR(256),HEIGHT INTEGER NOT NULL,IMAGE_URL_MEDIUM VARCHAR(2083) NOT NULL,IMAGE_URL_SMALL VARCHAR(2083) NOT NULL,SINGLETON BOOLEAN NOT NULL,VISIBLE BOOLEAN NOT NULL,WIDGET_GUID VARCHAR(255) NOT NULL,WIDGET_URL VARCHAR(2083) NOT NULL,WIDGET_VERSION VARCHAR(2083),WIDTH INTEGER NOT NULL,BACKGROUND BOOLEAN,UNIVERSAL_NAME VARCHAR(255),DESCRIPTOR_URL VARCHAR(2083),DESCRIPTION VARCHAR(4000),MOBILE_READY BOOLEAN DEFAULT FALSE NOT NULL,CONSTRAINT SYS_CT_610 UNIQUE(WIDGET_GUID))
@@ -329,10 +328,6 @@ INSERT INTO PREFERENCE VALUES(153,0,'owf.admin.DashboardEditCopy','guid_to_launc
329328
INSERT INTO PREFERENCE VALUES(154,0,'owf.admin.StackEditCopy','guid_to_launch',1,'72c382a3-89e7-4abf-94db-18db7779e1df')
330329
INSERT INTO ROLE VALUES(26,2,'ROLE_USER','User Role')
331330
INSERT INTO ROLE VALUES(27,1,'ROLE_ADMIN','Admin Role')
332-
INSERT INTO ROLE_PEOPLE VALUES(26,2)
333-
INSERT INTO ROLE_PEOPLE VALUES(26,3)
334-
INSERT INTO ROLE_PEOPLE VALUES(26,28)
335-
INSERT INTO ROLE_PEOPLE VALUES(27,1)
336331
INSERT INTO TAG_LINKS VALUES(153,0,TRUE,-1,152,151,'widgetDefinition',TRUE)
337332
INSERT INTO TAG_LINKS VALUES(155,0,TRUE,-1,152,154,'widgetDefinition',TRUE)
338333
INSERT INTO TAG_LINKS VALUES(157,0,TRUE,-1,152,156,'widgetDefinition',TRUE)
@@ -457,5 +452,7 @@ INSERT INTO APPLICATION_CONFIGURATION VALUES(16,0,NULL,NULL,NULL,NULL,'owf.custo
457452
INSERT INTO APPLICATION_CONFIGURATION VALUES(17,0,NULL,NULL,NULL,NULL,'owf.custom.css',NULL,' ',NULL,'String','BRANDING','Custom Header and Footer',TRUE,5,NULL)
458453
INSERT INTO APPLICATION_CONFIGURATION VALUES(18,0,NULL,NULL,NULL,NULL,'owf.custom.jss',NULL,' ',NULL,'String','BRANDING','Custom Header and Footer',TRUE,6,NULL)
459454
INSERT INTO APPLICATION_CONFIGURATION VALUES(19,0,NULL,NULL,NULL,NULL,'free.warning.content',NULL,' ',NULL,'String','BRANDING',NULL,TRUE,1,NULL)
460-
INSERT INTO PERSON_ROLE VALUES(1,27)
461-
INSERT INTO PERSON_ROLE VALUES(1,26)
455+
INSERT INTO PERSON_ROLE (ROLE_ID, PERSON_AUTHORITIES_ID) VALUES (26, 2);
456+
INSERT INTO PERSON_ROLE (ROLE_ID, PERSON_AUTHORITIES_ID) VALUES (26, 3);
457+
INSERT INTO PERSON_ROLE (ROLE_ID, PERSON_AUTHORITIES_ID) VALUES (26, 28);
458+
INSERT INTO PERSON_ROLE (ROLE_ID, PERSON_AUTHORITIES_ID) VALUES (27, 1);

0 commit comments

Comments
 (0)