From d64830f5ec02be5a356f1e85640118699f7b4c85 Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Mon, 6 Sep 2010 12:16:50 +0000 Subject: [PATCH] Fixed ALF-4619: alf_access_control_entry unique index uses incorrect columns - Simply removed the 'context_id' column from the unique key for all create scripts git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22267 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../AlfrescoCreate-RepoTables.sql | 2 +- .../AlfrescoCreate-RepoTables.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-RepoTables.sql b/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-RepoTables.sql index c711410ec1..b1729d78af 100644 --- a/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-RepoTables.sql +++ b/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-RepoTables.sql @@ -87,7 +87,7 @@ CREATE TABLE alf_access_control_entry applies INTEGER NOT NULL, context_id BIGINT, PRIMARY KEY (id), - UNIQUE KEY permission_id (permission_id, authority_id, allowed, applies, context_id), + UNIQUE KEY permission_id (permission_id, authority_id, allowed, applies), KEY fk_alf_ace_ctx (context_id), KEY fk_alf_ace_perm (permission_id), KEY fk_alf_ace_auth (authority_id), diff --git a/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-RepoTables.sql b/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-RepoTables.sql index 99e22c6e11..b90242eee3 100644 --- a/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-RepoTables.sql +++ b/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-RepoTables.sql @@ -97,7 +97,7 @@ CREATE TABLE alf_access_control_entry CONSTRAINT fk_alf_ace_ctx FOREIGN KEY (context_id) REFERENCES alf_ace_context (id), CONSTRAINT fk_alf_ace_perm FOREIGN KEY (permission_id) REFERENCES alf_permission (id) ); -CREATE UNIQUE INDEX permission_id ON alf_access_control_entry (permission_id, authority_id, allowed, applies, context_id); +CREATE UNIQUE INDEX permission_id ON alf_access_control_entry (permission_id, authority_id, allowed, applies); CREATE INDEX fk_alf_ace_ctx ON alf_access_control_entry (context_id); CREATE INDEX fk_alf_ace_perm ON alf_access_control_entry (permission_id); CREATE INDEX fk_alf_ace_auth ON alf_access_control_entry (authority_id);