From e9954c589894af039504d432bb974dba4c1a58a5 Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Fri, 11 Jul 2003 09:46:27 +0000
Subject: [PATCH] Use proper subnode relation in getPropertyNames().

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

diff --git a/src/helma/objectmodel/db/NodeManager.java b/src/helma/objectmodel/db/NodeManager.java
index 36c5757e..1ba86361 100644
--- a/src/helma/objectmodel/db/NodeManager.java
+++ b/src/helma/objectmodel/db/NodeManager.java
@@ -1100,11 +1100,7 @@ public final class NodeManager {
                 } else {
                     // let relation object build the query
                     q.append(rel.buildQuery(home, home.getNonVirtualParent(), null,
-                                            " WHERE ", false));
-
-                    if (rel.getOrder() != null) {
-                        q.append(" order by " + rel.getOrder());
-                    }
+                                            " WHERE ", true));
                 }
 
                 if (logSql) {
@@ -1412,9 +1408,16 @@ public final class NodeManager {
             Statement stmt = null;
 
             try {
-                String q = new StringBuffer("SELECT ").append(namefield).append(" FROM ")
-                                                      .append(table).append(" ORDER BY ")
-                                                      .append(namefield).toString();
+                StringBuffer q = new StringBuffer("SELECT ").append(namefield).append(" FROM ")
+                                                      .append(table);
+
+                if (home.getSubnodeRelation() != null) {
+                    q.append(" ").append(home.getSubnodeRelation());
+                } else {
+                    // let relation object build the query
+                    q.append(rel.buildQuery(home, home.getNonVirtualParent(), null,
+                                            " WHERE ", true));
+                }
 
                 stmt = con.createStatement();
 
@@ -1422,7 +1425,7 @@ public final class NodeManager {
                     app.logEvent("### getPropertyNames: " + q);
                 }
 
-                ResultSet rs = stmt.executeQuery(q);
+                ResultSet rs = stmt.executeQuery(q.toString());
 
                 while (rs.next()) {
                     String n = rs.getString(1);