Author: knguyen
Date: Mon Oct 15 12:33:17 2007
New Revision: 18863
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18863&repname=
=3Djahia
Log:
fix SQL wrong column name with Bitset optimization: container.comp_id are r=
enamed container.comp_id.id =
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/dao/Jahi=
aContainerDAO.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/da=
o/JahiaContainerDAO.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/dao/JahiaContainerDAO.java&rev=3D=
18863&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/dao/Jahi=
aContainerDAO.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/dao/Jahi=
aContainerDAO.java Mon Oct 15 12:33:17 2007
@@ -67,7 +67,7 @@
}
=
public List getAllContainerIds(BitSet ids) {
- String inClause =3D JahiaTools.getConditionalInClauseFromBitSet(id=
s, "c.comp_id", "=3D", "");
+ String inClause =3D JahiaTools.getConditionalInClauseFromBitSet(id=
s, "c.comp_id.id", "=3D", "");
String hql =3D "select distinct c.comp_id.id,c.rank from JahiaCont=
ainer c where " + inClause + " order by c.rank";
final HibernateTemplate hibernateTemplate =3D getHibernateTemplate=
();
hibernateTemplate.setCacheQueries(true);
@@ -88,7 +88,7 @@
}
=
public List getAllNonDeletedStagingContainerIds(BitSet ids) {
- String inClause =3D JahiaTools.getConditionalInClauseFromBitSet(id=
s, "c.comp_id", "=3D", "and"); =
+ String inClause =3D JahiaTools.getConditionalInClauseFromBitSet(id=
s, "c.comp_id.id", "=3D", "and");
String hql =3D "select distinct c.comp_id.id,c.comp_id.versionId,c=
.rank,c.comp_id.workflowState from JahiaContainer c "+
"where " + inClause + " c.comp_id.workflowState>=3D1 =
"+
"order by c.comp_id.id,c.comp_id.workflowState desc";
@@ -112,7 +112,7 @@
}
=
public List getAllPublishedContainerIds(BitSet ids) {
- String inClause =3D JahiaTools.getConditionalInClauseFromBitSet(id=
s, "c.comp_id", "=3D", "and"); =
+ String inClause =3D JahiaTools.getConditionalInClauseFromBitSet(id=
s, "c.comp_id.id", "=3D", "and");
String hql =3D "select distinct c.comp_id.id,c.rank from JahiaCont=
ainer c where "+
inClause + " c.comp_id.workflowState=3D1 "+
"order by c.rank,c.comp_id.id";
@@ -136,7 +136,7 @@
}
=
public List getAllStagingContainerIds(BitSet ids) {
- String inClause =3D JahiaTools.getConditionalInClauseFromBitSet(id=
s, "c.comp_id", "=3D", "and"); =
+ String inClause =3D JahiaTools.getConditionalInClauseFromBitSet(id=
s, "c.comp_id.id", "=3D", "and");
String hql =3D "select distinct c.comp_id.id,c.comp_id.versionId,c=
.rank,c.comp_id.workflowState from JahiaContainer c "+
"where " + inClause + " c.comp_id.workflowState>=3D1 =
"+
"order by c.comp_id.id,c.comp_id.workflowState desc";
@@ -491,7 +491,7 @@
public List getAllVersionedContainerIds(Long version, BitSet ids) {
List retVal =3D null;
if (version !=3D null) {
- String inClause =3D JahiaTools.getConditionalInClauseFromBitSe=
t(ids, "c.comp_id", "=3D", "and"); =
+ String inClause =3D JahiaTools.getConditionalInClauseFromBitSe=
t(ids, "c.comp_id.id", "=3D", "and");
String hql =3D "select distinct c.comp_id.id,c.comp_id.version=
Id,c.rank from JahiaContainer c "
+ "where " + inClause + " c.comp_id.workflowState<=3D1=
and c.comp_id.versionId>-1 and c.comp_id.versionId<=3D? "
+ "order by c.comp_id.id,c.comp_id.versionId desc";
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
