From e1b65bdc8b86966d9b7d44c129e51261ef6a44e7 Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Wed, 11 Feb 2004 16:13:44 +0000
Subject: [PATCH] Implement/fix aggressive property loading for Oracle when
 loading through manually set subnodeRelation.

---
 src/helma/objectmodel/db/NodeManager.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/helma/objectmodel/db/NodeManager.java b/src/helma/objectmodel/db/NodeManager.java
index 80225eb7..a06b6723 100644
--- a/src/helma/objectmodel/db/NodeManager.java
+++ b/src/helma/objectmodel/db/NodeManager.java
@@ -1589,9 +1589,15 @@ public final class NodeManager {
                     q.append(" = '");
                     q.append(escape(kstr));
                     q.append("'");
-                    q.append(" AND (");
-                    q.append(home.getSubnodeRelation().trim().substring(5));
-                    q.append(")");
+                    // add join contraints in case this is an old oracle style join
+                    dbm.addJoinConstraints(q, " AND ");
+                    // add potential constraints from manually set subnodeRelation
+                    String subrel = home.getSubnodeRelation().trim();
+                    if (subrel.length() > 5) {
+                        q.append(" AND (");
+                        q.append(subrel.substring(5).trim());
+                        q.append(")");
+                    }
                 } else {
                     q.append(rel.buildQuery(home,
                                             home.getNonVirtualParent(),