Index: TECH/Algo/SQL/QueryEngine/QueryBuilder.cls.xml
===================================================================
diff -u -r3020 -r3044
--- TECH/Algo/SQL/QueryEngine/QueryBuilder.cls.xml	(.../QueryBuilder.cls.xml)	(revision 3020)
+++ TECH/Algo/SQL/QueryEngine/QueryBuilder.cls.xml	(.../QueryBuilder.cls.xml)	(revision 3044)
@@ -7,7 +7,7 @@
 
 <Property name="Tabellen">
 <Type>TECH.Algo.SQL.QueryEngine.Tabel</Type>
-<Collection>list</Collection>
+<Collection>array</Collection>
 <Private>1</Private>
 </Property>
 
@@ -23,13 +23,18 @@
 <Private>1</Private>
 </Property>
 
+<Property name="WhereConditie">
+<Type>TECH.Algo.SQL.QueryEngine.IWhereConditie</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="VoegToeTabel">
 <FormalSpec>Tabel:TECH.Algo.SQL.QueryEngine.Tabel</FormalSpec>
-<Implementation><![CDATA[	Do ..Tabellen.Insert(Tabel)
+<Implementation><![CDATA[	Do ..Tabellen.SetAt(Tabel,Tabel.GeefNaam())
 ]]></Implementation>
 </Method>
 
-<Method name="GeefTabellenIterator">
+<Method name="GeefTabelIterator">
 <ReturnType>TECH.ListIterator</ReturnType>
 <Implementation><![CDATA[	Quit ##class(TECH.ListIterator).%New(..Tabellen)
 ]]></Implementation>
@@ -43,56 +48,83 @@
 
 <Method name="VoegToeForeignKey">
 <FormalSpec>ForeignKey:TECH.Algo.SQL.QueryEngine.ForeignKey</FormalSpec>
+<Implementation><![CDATA[	Do ..MapForeignKeyOpTabel(ForeignKey, ForeignKey.GeefTabel1())
+]]></Implementation>
+</Method>
+
+<Method name="MapForeignKeyOpTabel">
+<FormalSpec>ForeignKey:TECH.Algo.SQL.QueryEngine.ForeignKey,Tabel:TECH.Algo.SQL.QueryEngine.Tabel</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
-	Set TabelNaam1 = ForeignKey.GeefTabel1().GeefNaam()
-	If ('..ForeignKeys.IsDefined(TabelNaam1)) { Do ..ForeignKeys.SetAt(##class(%ListOfObjects).%New(),TabelNaam1) }
-	Do ..ForeignKeys.GetAt(TabelNaam1).Insert(ForeignKey)
-	
-	Set TabelNaam2 = ForeignKey.GeefTabel2().GeefNaam()
-	If ('..ForeignKeys.IsDefined(TabelNaam2)) { Do ..ForeignKeys.SetAt(##class(%ListOfObjects).%New(),TabelNaam2) }
-	Do ..ForeignKeys.GetAt(TabelNaam2).Insert(ForeignKey)
+	Set TabelNaam = Tabel.GeefNaam()
+	If ('..ForeignKeys.IsDefined(TabelNaam)) { Do ..ForeignKeys.SetAt(##class(%ListOfObjects).%New(),TabelNaam) }
+	Do ..ForeignKeys.GetAt(TabelNaam).Insert(ForeignKey)
 ]]></Implementation>
 </Method>
 
+<Method name="ZetWhereConditie">
+<FormalSpec>WhereConditie:TECH.Algo.SQL.QueryEngine.IWhereConditie</FormalSpec>
+<Implementation><![CDATA[	Set ..WhereConditie = WhereConditie
+]]></Implementation>
+</Method>
+
 <Method name="GeefQueryString">
 <ReturnType>%String</ReturnType>
 <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())
+	While (TabellenIterator.HasNext()) { Set Query = Query_" "_..GeefJoinTabelString(TabellenIterator.Next()) }
+	If ($IsObject(..WhereConditie)) Set Query = Query_" WHERE "_..WhereConditie.MaakConditieString()
 	
+	Quit Query
+]]></Implementation>
+</Method>
+
+<Method name="GeefTeSelecterenVeldenString">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set SelectieVeldString = ""
 	Set SelectieVeldenIterator = ##class(TECH.ListIterator).%New(..SelectieVelden)
 	While (SelectieVeldenIterator.HasNext())
 	{
 		Set SelectieVeld = SelectieVeldenIterator.Next()
-		Set Query = Query_" "_SelectieVeld.GeefTabel().GeefNaam()_"."_SelectieVeld.GeefVeld()
-		If (SelectieVeldenIterator.HasNext()) Set Query = Query_","
+		Set SelectieVeldString = SelectieVeldString_" "_SelectieVeld.GeefTabel().GeefNaam()_"."_SelectieVeld.GeefVeld()
+		If (SelectieVeldenIterator.HasNext()) Set SelectieVeldString = SelectieVeldString_","
 	}
-	
-	Set From = ""
-	Set TabellenIterator = ##class(TECH.ListIterator).%New(..Tabellen)
-	If (TabellenIterator.HasNext())
+	Quit SelectieVeldString
+]]></Implementation>
+</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>
+</Method>
+
+<Method name="GeefJoinTabelString">
+<FormalSpec>Tabel:TECH.Algo.SQL.QueryEngine.Tabel</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set JoinString = "JOIN "_Tabel.GeefNaam()
+	If (..ForeignKeys.IsDefined(Tabel.GeefNaam()))
 	{
-		Set From = "FROM "_ TabellenIterator.Next().GeefNaam()
-	}
-	
-	Set Joins = ""
-	While (TabellenIterator.HasNext())
-	{
-		Set Tabel = TabellenIterator.Next()
-		Set Joins = Joins_" JOIN "_Tabel.GeefNaam()
 		Set ForeignKeyIterator = ##class(TECH.ListIterator).%New(..ForeignKeys.GetAt(Tabel.GeefNaam()))
-		If (ForeignKeyIterator.HasNext()) Set Joins = Joins_" ON"
+		If (ForeignKeyIterator.HasNext()) Set JoinString = JoinString_" ON"
 		While (ForeignKeyIterator.HasNext())
 		{
 			Set ForeignKey = ForeignKeyIterator.Next()
-			Set Joins = Joins_" "_ForeignKey.GeefTabel1().GeefNaam()_"."_ForeignKey.GeefVeld1()_" = "_ForeignKey.GeefTabel2().GeefNaam()_"."_ForeignKey.GeefVeld2()
-			If (ForeignKeyIterator.HasNext()) { Set Joins = Joins_" AND" }
+			Set JoinString = JoinString_" "_ForeignKey.GeefTabel1().GeefNaam()_"."_ForeignKey.GeefVeld1()_" = "_ForeignKey.GeefTabel2().GeefNaam()_"."_ForeignKey.GeefVeld2()
+			If (ForeignKeyIterator.HasNext()) { Set JoinString = JoinString_" AND" }
 		}
 	}
-	
-	If ($Length(Joins) > 0) { Set Query = Query_Joins }
-	Set Query = Query_" "_From
-	
-	Quit Query
+	Quit JoinString
 ]]></Implementation>
 </Method>
 </Class>