Commits

gfouquet committed fdab297

[Issue 1758] Changed SQL ACL_OBJECT_IDENTITY into "delete from
ACL_OBJECT_IDENTITY" because mysql would not run it

Comments (0)

Files changed (3)

core/core.service/src/main/java/org/squashtest/csp/core/security/acls/jdbc/JdbcManageableAclService.java

 			+ "inner join ACL_RESPONSIBILITY_SCOPE_ENTRY arse on arse.OBJECT_IDENTITY_ID = aoi.ID "
 			+ "where u.ID = arse.USER_ID " + "and ac.CLASSNAME = ? " + "and aoi.IDENTITY = ?) ";
 
-	private static final String DELETE_OBJECT_IDENTITY = "delete ACL_OBJECT_IDENTITY where IDENTITY = ? and CLASS_ID = ?";
+	private static final String DELETE_OBJECT_IDENTITY = "delete from ACL_OBJECT_IDENTITY where IDENTITY = ? and CLASS_ID = ?";
 
 	private static final String DELETE_ALL_RESPONSABILITY_ENTRIES = "delete from ACL_RESPONSIBILITY_SCOPE_ENTRY " +
 			"where OBJECT_IDENTITY_ID = (select oid.ID from ACL_OBJECT_IDENTITY oid " +

integration-tests/src/it/resources/repository/dependencies-scan-context.xml

 	
 	<context:component-scan base-package="org.squashtest.csp.tm.internal.repository" />
 	<context:component-scan base-package="org.squashtest.csp.core.internal.api" />
-<!-- 	<context:component-scan base-package="org.squashtest.tm.internal.repository" />
- -->	<bean class="org.squashtest.csp.core.service.security.StubUserContextService" />
+<bean class="org.squashtest.csp.core.service.security.StubUserContextService" />
  
 
 </beans>

integration-tests/src/it/resources/service/dependencies-scan-context.xml

 
 	<context:component-scan  base-package="org.squashtest.csp.tm.internal" />
 	<context:component-scan base-package="org.squashtest.csp.core.security" />
-<!-- 	<context:component-scan base-package="org.squashtest.tm.internal" />
-	<context:component-scan base-package="org.squashtest.tm.plugin" />
- -->
+
 	<!--  stubs  -->
 	<bean id="bugTrackersService" class="org.squashtest.csp.core.bugtracker.service.StubBugTrackerService" primary="true"/>
 	<bean class="org.squashtest.csp.core.service.security.StubUserContextService" primary="true"/>