From f2802894fa896d6a3f363f57554829467b02f607 Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Fri, 12 Dec 2003 19:01:58 +0000
Subject: [PATCH] additionalTables fix from Juerg

---
 src/helma/objectmodel/db/DbMapping.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/helma/objectmodel/db/DbMapping.java b/src/helma/objectmodel/db/DbMapping.java
index 3e0c7ec5..0d541aea 100644
--- a/src/helma/objectmodel/db/DbMapping.java
+++ b/src/helma/objectmodel/db/DbMapping.java
@@ -938,10 +938,6 @@ public final class DbMapping implements Updatable {
         s.append(table);
         s.append(".*");
 
-        if (rel != null && rel.additionalTables != null) {
-            s.append(',').append(rel.additionalTables);
-        }
-
         for (int i = 0; i < joins.length; i++) {
             if (!joins[i].otherType.isRelational()) {
                 continue;
@@ -955,6 +951,11 @@ public final class DbMapping implements Updatable {
         s.append(" FROM ");
 
         s.append(table);
+
+        if (rel != null && rel.additionalTables != null) {
+            s.append(',').append(rel.additionalTables);
+        }
+
         s.append(" ");
 
         for (int i = 0; i < joins.length; i++) {