From da188b04c65e6ab85b8213e2f328b0751fa247b3 Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Wed, 17 May 2006 15:36:20 +0000 Subject: [PATCH] Moved key column from access_control_list onto node This eliminates several select statements issued while walking up the parent hierarchy The V1.2.1 - V1.3 script has been updated and tested, but if you want to keep an existing 1.3, then: SET FOREIGN_KEY_CHECKS = 0; ALTER TABLE node ADD `acl_id` bigint(20) default NULL; UPDATE node node SET node.acl_id = (SELECT acl.id FROM access_control_list acl WHERE acl.node_id = node.id); SET FOREIGN_KEY_CHECKS = 1; git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2911 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../permissions/impl/hibernate/HibernatePermissionTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/repo/security/permissions/impl/hibernate/HibernatePermissionTest.java b/source/java/org/alfresco/repo/security/permissions/impl/hibernate/HibernatePermissionTest.java index 87933c23d7..f156694ea8 100644 --- a/source/java/org/alfresco/repo/security/permissions/impl/hibernate/HibernatePermissionTest.java +++ b/source/java/org/alfresco/repo/security/permissions/impl/hibernate/HibernatePermissionTest.java @@ -87,10 +87,9 @@ public class HibernatePermissionTest extends BaseSpringTest { // create a new Node DbAccessControlList accessControlList = new DbAccessControlListImpl(); - accessControlList.setNode(node); accessControlList.setInherits(true); - Serializable id = getSession().save(accessControlList); + node.setAccessControlList(accessControlList); // throw the reference away and get the a new one for the id accessControlList = (DbAccessControlList) getSession().load(DbAccessControlListImpl.class, id); @@ -166,9 +165,9 @@ public class HibernatePermissionTest extends BaseSpringTest { // create a new access control list for the node DbAccessControlList accessControlList = new DbAccessControlListImpl(); - accessControlList.setNode(node); accessControlList.setInherits(true); Serializable nodeAclId = getSession().save(accessControlList); + node.setAccessControlList(accessControlList); DbAuthority recipient = new DbAuthorityImpl(); recipient.setRecipient("Test"); @@ -196,6 +195,7 @@ public class HibernatePermissionTest extends BaseSpringTest assertEquals(1, accessControlEntry.getAuthority().getExternalKeys().size()); // Check that deletion of the list cascades + node.setAccessControlList(null); getSession().delete(accessControlList); try {