Author: sergiykarpenko Date: 2010-09-13 03:57:40 -0400 (Mon, 13 Sep 2010) New Revision: 3108 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBCleaner.java Log: EXOJCR-939: queries updated Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBCleaner.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBCleaner.java 2010-09-13 07:18:05 UTC (rev 3107) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBCleaner.java 2010-09-13 07:57:40 UTC (rev 3108) @@ -16,14 +16,14 @@ */ package org.exoplatform.services.jcr.impl.util.jdbc; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; import java.sql.Statement; -import org.exoplatform.services.log.ExoLogger; -import org.exoplatform.services.log.Log; - /** * The goal of this class is remove workspace data from database. * Created by The eXo Platform SAS. @@ -102,7 +102,7 @@ } catch (SQLException e) { - + // TODO do we need rollback here? try { @@ -133,17 +133,14 @@ REMOVE_ITEMS = "delete from JCR_SITEM where CONTAINER_NAME=?"; REMOVE_VALUES = - "delete from JCR_SVALUE V where exists " - + "( select * from JCR_SITEM I where I.ID=V.PROPERTY_ID and I.CONTAINER_NAME=? )"; + "delete from JCR_SVALUE where exists" + + "(select * from JCR_SITEM where JCR_SITEM.ID=JCR_SVALUE.PROPERTY_ID and JCR_SITEM.CONTAINER_NAME=?)"; - //TODO R.PROPERTY_ID or R.NODE_ID? REMOVE_REFERENCES = - "delete from JCR_SREF R where exists " - + "( select * from JCR_SITEM I where I.ID=R.PROPERTY_ID and I.CONTAINER_NAME=? )"; + "delete from JCR_SREF where exists" + + "(select * from JCR_SITEM where JCR_SITEM.ID=JCR_SREF.PROPERTY_ID and JCR_SITEM.CONTAINER_NAME=?)"; // for multi db support - //TODO do we need remove indexes? - //different databases may be configured to use different indexes DROP_JCR_MITEM_TABLE = "DROP TABLE JCR_MITEM"; DROP_JCR_MVALUE_TABLE = "DROP TABLE JCR_MVALUE"; DROP_MREF_TABLE = "DROP TABLE JCR_MREF";