Skip to content

Commit

Permalink
Fix role/person tables
Browse files Browse the repository at this point in the history
  • Loading branch information
rpokorny committed Oct 17, 2016
1 parent 5d00378 commit 9b23331
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion grails-app/domain/ozone/owf/grails/domain/Person.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class Person implements Serializable {
static mapping = {
cache true
authorities cache: true,
joinTable: [name: 'role_people', key: 'person_id', column: 'role_id']
joinTable: [name: 'person_role', key: 'person_authorities_id', column: 'role_id']
groups cache: true
dashboards lazy: true, cascade : "delete-orphan", cache: true
personWidgetDefinitions lazy: true, cascade : "delete-orphan", cache: true
Expand Down
11 changes: 4 additions & 7 deletions prodDb.script
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ CREATE MEMORY TABLE PERSON_WIDGET_DEFINITION(ID BIGINT GENERATED BY DEFAULT AS I
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))
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))
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))
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))
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)
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))
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))
Expand Down Expand Up @@ -329,10 +328,6 @@ INSERT INTO PREFERENCE VALUES(153,0,'owf.admin.DashboardEditCopy','guid_to_launc
INSERT INTO PREFERENCE VALUES(154,0,'owf.admin.StackEditCopy','guid_to_launch',1,'72c382a3-89e7-4abf-94db-18db7779e1df')
INSERT INTO ROLE VALUES(26,2,'ROLE_USER','User Role')
INSERT INTO ROLE VALUES(27,1,'ROLE_ADMIN','Admin Role')
INSERT INTO ROLE_PEOPLE VALUES(26,2)
INSERT INTO ROLE_PEOPLE VALUES(26,3)
INSERT INTO ROLE_PEOPLE VALUES(26,28)
INSERT INTO ROLE_PEOPLE VALUES(27,1)
INSERT INTO TAG_LINKS VALUES(153,0,TRUE,-1,152,151,'widgetDefinition',TRUE)
INSERT INTO TAG_LINKS VALUES(155,0,TRUE,-1,152,154,'widgetDefinition',TRUE)
INSERT INTO TAG_LINKS VALUES(157,0,TRUE,-1,152,156,'widgetDefinition',TRUE)
Expand Down Expand Up @@ -457,5 +452,7 @@ INSERT INTO APPLICATION_CONFIGURATION VALUES(16,0,NULL,NULL,NULL,NULL,'owf.custo
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)
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)
INSERT INTO APPLICATION_CONFIGURATION VALUES(19,0,NULL,NULL,NULL,NULL,'free.warning.content',NULL,' ',NULL,'String','BRANDING',NULL,TRUE,1,NULL)
INSERT INTO PERSON_ROLE VALUES(1,27)
INSERT INTO PERSON_ROLE VALUES(1,26)
INSERT INTO PERSON_ROLE (ROLE_ID, PERSON_AUTHORITIES_ID) VALUES (26, 2);
INSERT INTO PERSON_ROLE (ROLE_ID, PERSON_AUTHORITIES_ID) VALUES (26, 3);
INSERT INTO PERSON_ROLE (ROLE_ID, PERSON_AUTHORITIES_ID) VALUES (26, 28);
INSERT INTO PERSON_ROLE (ROLE_ID, PERSON_AUTHORITIES_ID) VALUES (27, 1);

1 comment on commit 9b23331

@Liberty-OS
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how do you do pull requests?

Please sign in to comment.