antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

Do not append "WHERE" when calling Relation.buildQuery() because the relation

Browse source 
may not need a where clause. Also returned to the way things were before when
getting a node using a hand-set subnodeRelation.
This commit is contained in:
hns 2002-11-11 19:20:26 +00:00
parent 667dfb8544
commit e37d26f94d
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/helma/objectmodel/db/NodeManager.java
View file

@ -754,8 +754,7 @@ public final class NodeManager {
q.append (home.getSubnodeRelation());
} else {
// let relation object build the query
q.append (" where ");
q.append (rel.buildQuery (home, home.getNonVirtualParent (), null, "", false));
q.append (rel.buildQuery (home, home.getNonVirtualParent (), null, " WHERE ", false));
if (rel.getOrder () != null)
q.append (" order by "+rel.getOrder ());
}
@ -1097,15 +1096,15 @@ public final class NodeManager {
StringBuffer q = dbm.getSelect ();
if (home.getSubnodeRelation () != null) {
// combine our key with the constraints in the manually set subnode relation
q.append (home.getSubnodeRelation ());
q.append (" and ");
q.append (" WHERE ");
q.append (rel.accessor);
q.append (" = '");
q.append (escape(kstr));
q.append ("'");
q.append (" AND ");
q.append (home.getSubnodeRelation().trim().substring(5));
} else {
q.append (" where ");
q.append (rel.buildQuery (home, home.getNonVirtualParent (), kstr, "", false));
q.append (rel.buildQuery (home, home.getNonVirtualParent (), kstr, " WHERE ", false));
}
if (logSql)
app.logEvent ("### getNodeByRelation: "+q.toString());