[exo-jcr-commits] exo-jcr SVN: r5438 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc.

[do-not-reply at jboss.org]

Author: tolusha
Date: 2012-01-11 05:08:28 -0500 (Wed, 11 Jan 2012)
New Revision: 5438

Modified:
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java
Log:
EXOJCR-1697: Improve SQL access, fix query for CheckController

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java	2012-01-11 09:17:07 UTC (rev 5437)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainerChecker.java	2012-01-11 10:08:28 UTC (rev 5438)
@@ -218,13 +218,13 @@
       queries
          .add(new InspectionQuery(
             jdbcDataContainer.multiDb
-               ? "select * from JCR_MITEM I where EXISTS (select count(VERSION) from JCR_MITEM J"
+               ? "select * from JCR_MITEM I where EXISTS (select * from JCR_MITEM J"
                   + " WHERE I.PARENT_ID = J.PARENT_ID AND I.NAME = J.NAME and I.I_INDEX = J.I_INDEX and I.I_CLASS = J.I_CLASS"
-                  + " GROUP BY PARENT_ID, NAME, I_INDEX, I_CLASS HAVING count(VERSION) > 1)"
+                  + " and I.VERSION != J.VERSION)"
                : "select * from JCR_SITEM I where I.CONTAINER_NAME='" + jdbcDataContainer.containerName + "' and"
-                  + " EXISTS (select count(VERSION) from JCR_SITEM J WHERE I.CONTAINER_NAME = J.CONTAINER_NAME and"
+                  + " EXISTS (select * from JCR_SITEM J WHERE I.CONTAINER_NAME = J.CONTAINER_NAME and"
                   + " I.PARENT_ID = J.PARENT_ID AND I.NAME = J.NAME and I.I_INDEX = J.I_INDEX and I.I_CLASS = J.I_CLASS"
-                  + " GROUP BY CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS HAVING count(VERSION) > 1)",
+                  + " and I.VERSION != J.VERSION)",
             new String[]{
                DBConstants.COLUMN_ID, DBConstants.COLUMN_PARENTID, DBConstants.COLUMN_NAME, DBConstants.COLUMN_VERSION,
                DBConstants.COLUMN_CLASS, DBConstants.COLUMN_INDEX}, "Several versions of same item.",