Index: TECH/Algo/SQL/QueryEngine/QueryBuilder.cls.xml
===================================================================
diff -u -r3044 -r3067
--- TECH/Algo/SQL/QueryEngine/QueryBuilder.cls.xml	(.../QueryBuilder.cls.xml)	(revision 3044)
+++ TECH/Algo/SQL/QueryEngine/QueryBuilder.cls.xml	(.../QueryBuilder.cls.xml)	(revision 3067)
@@ -28,6 +28,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="FromTabel">
+<Type>TECH.Algo.SQL.QueryEngine.Tabel</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="VoegToeTabel">
 <FormalSpec>Tabel:TECH.Algo.SQL.QueryEngine.Tabel</FormalSpec>
 <Implementation><![CDATA[	Do ..Tabellen.SetAt(Tabel,Tabel.GeefNaam())
@@ -40,6 +45,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetFromTabel">
+<FormalSpec>Tabel:TECH.Algo.SQL.QueryEngine.Tabel</FormalSpec>
+<Implementation><![CDATA[	Set ..FromTabel = Tabel
+]]></Implementation>
+</Method>
+
 <Method name="SelecteerVeldVanTabel">
 <FormalSpec>Veld:%String,Tabel:TECH.Algo.SQL.QueryEngine.Tabel</FormalSpec>
 <Implementation><![CDATA[	Do ..SelectieVelden.Insert(##class(TECH.Algo.SQL.QueryEngine.SelectieVeld).%New(Veld, Tabel))
@@ -73,9 +84,9 @@
 <Implementation><![CDATA[
 	Set TabellenIterator = ##class(TECH.ListIterator).%New(..Tabellen)
 	
-	Set Query = "SELECT"
-	Set Query = Query_..GeefTeSelecterenVeldenString()
-	If (TabellenIterator.HasNext()) Set Query = Query_" "_..GeefFromTabelString(TabellenIterator.Next())
+	If ('$IsObject(..FromTabel)) && (TabellenIterator.HasNext()) Do ..ZetFromTabel(TabellenIterator.Next())
+	
+	Set Query = "SELECT"_..GeefTeSelecterenVeldenString()_" "_..GeefFromTabelString()
 	While (TabellenIterator.HasNext()) { Set Query = Query_" "_..GeefJoinTabelString(TabellenIterator.Next()) }
 	If ($IsObject(..WhereConditie)) Set Query = Query_" WHERE "_..WhereConditie.MaakConditieString()
 	
@@ -100,10 +111,9 @@
 </Method>
 
 <Method name="GeefFromTabelString">
-<FormalSpec>Tabel:TECH.Algo.SQL.QueryEngine.Tabel</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit "FROM "_Tabel.GeefNaam()
+<Implementation><![CDATA[	Quit "FROM "_..FromTabel.GeefNaam()
 ]]></Implementation>
 </Method>