Author: sergiykarpenko
Date: 2011-09-29 11:05:44 -0400 (Thu, 29 Sep 2011)
New Revision: 5008
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/MSSQLMultiDbJDBCConnection.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/MSSQLSingleDbJDBCConnection.java
Log:
EXOJCR-1506: index names changed to upper case
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/MSSQLMultiDbJDBCConnection.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/MSSQLMultiDbJDBCConnection.java 2011-09-29
15:04:47 UTC (rev 5007)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/MSSQLMultiDbJDBCConnection.java 2011-09-29
15:05:44 UTC (rev 5008)
@@ -38,8 +38,8 @@
*/
public static final String FIND_NODES_AND_PROPERTIES_TEMPLATE =
"select J.*, P.ID AS P_ID, P.NAME AS P_NAME, P.VERSION AS P_VERSION, P.P_TYPE,
P.P_MULTIVALUED,"
- + " V.DATA, V.ORDER_NUM, V.STORAGE_DESC from JCR_MVALUE V WITH (INDEX
(jcr_idx_mvalue_property)), JCR_MITEM P "
- + " join (select TOP ${TOP} I.ID, I.PARENT_ID, I.NAME, I.VERSION,
I.I_INDEX, I.N_ORDER_NUM from JCR_MITEM I WITH (INDEX (jcr_pk_mitem))"
+ + " V.DATA, V.ORDER_NUM, V.STORAGE_DESC from JCR_MVALUE V WITH (INDEX
(JCR_IDX_MVALUE_PROPERTY)), JCR_MITEM P "
+ + " join (select TOP ${TOP} I.ID, I.PARENT_ID, I.NAME, I.VERSION,
I.I_INDEX, I.N_ORDER_NUM from JCR_MITEM I WITH (INDEX (JCR_PK_MITEM))"
+ " where I.I_CLASS=1 AND I.ID > ? order by I.ID) J on P.PARENT_ID =
J.ID"
+ " where P.I_CLASS=2 and V.PROPERTY_ID=P.ID order by J.ID";
@@ -47,7 +47,7 @@
* MSSQL Multidatabase JDBC Connection constructor.
*
* @param dbConnection
- * JDBC connection, shoudl be opened before
+ * JDBC connection, should be opened before
* @param readOnly
* boolean if true the dbConnection was marked as READ-ONLY.
* @param containerName
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/MSSQLSingleDbJDBCConnection.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/MSSQLSingleDbJDBCConnection.java 2011-09-29
15:04:47 UTC (rev 5007)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/MSSQLSingleDbJDBCConnection.java 2011-09-29
15:05:44 UTC (rev 5008)
@@ -40,8 +40,8 @@
*/
private static final String FIND_NODES_AND_PROPERTIES_TEMPLATE =
"select J.*, P.ID AS P_ID, P.NAME AS P_NAME, P.VERSION AS P_VERSION, P.P_TYPE,
P.P_MULTIVALUED,"
- + " V.DATA, V.ORDER_NUM, V.STORAGE_DESC from JCR_SVALUE V WITH (INDEX
(jcr_idx_svalue_property)), JCR_SITEM P "
- + " join (select TOP ${TOP} I.ID, I.PARENT_ID, I.NAME, I.VERSION,
I.I_INDEX, I.N_ORDER_NUM from JCR_SITEM I WITH (INDEX (jcr_pk_sitem))"
+ + " V.DATA, V.ORDER_NUM, V.STORAGE_DESC from JCR_SVALUE V WITH (INDEX
(JCR_IDX_SVALUE_PROPERTY)), JCR_SITEM P "
+ + " join (select TOP ${TOP} I.ID, I.PARENT_ID, I.NAME, I.VERSION,
I.I_INDEX, I.N_ORDER_NUM from JCR_SITEM I WITH (INDEX (JCR_PK_SITEM))"
+ " where I.CONTAINER_NAME=? AND I.I_CLASS=1 AND I.ID > ? order by I.ID)
J on P.PARENT_ID = J.ID"
+ " where P.I_CLASS=2 and P.CONTAINER_NAME=? and V.PROPERTY_ID=P.ID order
by J.ID";