Index: vhUnitTest/TECH/Algo/SQL/QueryEngine/TestQueryEngine.cls.xml
===================================================================
diff -u -r3020 -r3044
--- vhUnitTest/TECH/Algo/SQL/QueryEngine/TestQueryEngine.cls.xml	(.../TestQueryEngine.cls.xml)	(revision 3020)
+++ vhUnitTest/TECH/Algo/SQL/QueryEngine/TestQueryEngine.cls.xml	(.../TestQueryEngine.cls.xml)	(revision 3044)
@@ -7,11 +7,45 @@
 <Super>vhUnitTest.TestCase</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
-<Method name="TestQueryBuilder">
+<Method name="TestEenvoudigeSelectie">
 <Implementation><![CDATA[
 	Set QueryBuilder = ##class(TECH.Algo.SQL.QueryEngine.QueryBuilder).%New()
 	
 	Set TabelA = ##class(TECH.Algo.SQL.QueryEngine.Tabel).%New("TabelA")
+	Do QueryBuilder.VoegToeTabel(TabelA)
+	Do QueryBuilder.SelecteerVeldVanTabel("VeldA",TabelA)
+	
+	Do $$$AssertEquals(QueryBuilder.GeefQueryString(),"SELECT TabelA.VeldA FROM TabelA","De query string")
+]]></Implementation>
+</Method>
+
+<Method name="TestWhereConditie">
+<Implementation><![CDATA[
+	Set QueryBuilder = ##class(TECH.Algo.SQL.QueryEngine.QueryBuilder).%New()
+	
+	Set TabelA = ##class(TECH.Algo.SQL.QueryEngine.Tabel).%New("TabelA")
+	Do QueryBuilder.VoegToeTabel(TabelA)
+	Do QueryBuilder.SelecteerVeldVanTabel("VeldA",TabelA)
+	
+	Set WhereConditie = ##class(TECH.Algo.SQL.QueryEngine.CombinatieConditie).%New(##class(TECH.Algo.SQL.QueryEngine.enu.CombinatieConditieOperator).En())
+	Do WhereConditie.VoegToeSubconditie(##class(TECH.Algo.SQL.QueryEngine.EnkelvoudigeConditie).%New("TabelA.VeldA = 'IetsA'"))
+	Set CombinatieConditie = ##class(TECH.Algo.SQL.QueryEngine.CombinatieConditie).%New(##class(TECH.Algo.SQL.QueryEngine.enu.CombinatieConditieOperator).Of())
+	Do CombinatieConditie.VoegToeSubconditie(##class(TECH.Algo.SQL.QueryEngine.EnkelvoudigeConditie).%New("TabelA.VeldB = 'IetsB'"))
+	Do CombinatieConditie.VoegToeSubconditie(##class(TECH.Algo.SQL.QueryEngine.EnkelvoudigeConditie).%New("TabelA.VeldC = 'IetsC'"))
+	Do WhereConditie.VoegToeSubconditie(CombinatieConditie)
+	Do WhereConditie.VoegToeSubconditie(##class(TECH.Algo.SQL.QueryEngine.EnkelvoudigeConditie).%New("TabelA.VeldD = 'IetsD'"))
+	
+	Do QueryBuilder.ZetWhereConditie(WhereConditie)
+	
+	Do $$$AssertEquals(QueryBuilder.GeefQueryString(),"SELECT TabelA.VeldA FROM TabelA WHERE (TabelA.VeldA = 'IetsA' AND (TabelA.VeldB = 'IetsB' OR TabelA.VeldC = 'IetsC') AND TabelA.VeldD = 'IetsD')","De query string")
+]]></Implementation>
+</Method>
+
+<Method name="TestJoinMeervoudigeParams">
+<Implementation><![CDATA[
+	Set QueryBuilder = ##class(TECH.Algo.SQL.QueryEngine.QueryBuilder).%New()
+	
+	Set TabelA = ##class(TECH.Algo.SQL.QueryEngine.Tabel).%New("TabelA")
 	Set TabelB = ##class(TECH.Algo.SQL.QueryEngine.Tabel).%New("TabelB")
 	
 	Do QueryBuilder.VoegToeTabel(TabelA)
@@ -20,13 +54,40 @@
 	Do QueryBuilder.SelecteerVeldVanTabel("VeldA",TabelA)
 	Do QueryBuilder.SelecteerVeldVanTabel("VeldB",TabelB)
 	
-	Set ForeignKey = ##class(TECH.Algo.SQL.QueryEngine.ForeignKey).%New("VeldA", TabelA, "VeldB", TabelB)
+	Set ForeignKey = ##class(TECH.Algo.SQL.QueryEngine.ForeignKey).%New("VeldB", TabelB, "VeldA", TabelA)
 	Do QueryBuilder.VoegToeForeignKey(ForeignKey)
-	Set ForeignKey = ##class(TECH.Algo.SQL.QueryEngine.ForeignKey).%New("VeldB", TabelA, "VeldC", TabelB)
+	Set ForeignKey = ##class(TECH.Algo.SQL.QueryEngine.ForeignKey).%New("VeldC", TabelB, "VeldB", TabelA)
 	Do QueryBuilder.VoegToeForeignKey(ForeignKey)
 	
-	Do $$$AssertEquals(QueryBuilder.GeefQueryString(),"SELECT TabelA.VeldA, TabelB.VeldB JOIN TabelB ON TabelA.VeldA = TabelB.VeldB AND TabelA.VeldB = TabelB.VeldC FROM TabelA","De query string")
+	Do $$$AssertEquals(QueryBuilder.GeefQueryString(),"SELECT TabelA.VeldA, TabelB.VeldB FROM TabelA JOIN TabelB ON TabelB.VeldB = TabelA.VeldA AND TabelB.VeldC = TabelA.VeldB","De query string")
 ]]></Implementation>
 </Method>
+
+<Method name="TestMeervoudigeJoin">
+<Implementation><![CDATA[
+	Set QueryBuilder = ##class(TECH.Algo.SQL.QueryEngine.QueryBuilder).%New()
+	
+	Set TabelA = ##class(TECH.Algo.SQL.QueryEngine.Tabel).%New("TabelA")
+	Set TabelB = ##class(TECH.Algo.SQL.QueryEngine.Tabel).%New("TabelB")
+	Set TabelC = ##class(TECH.Algo.SQL.QueryEngine.Tabel).%New("TabelC")
+	
+	Do QueryBuilder.VoegToeTabel(TabelA)
+	Do QueryBuilder.VoegToeTabel(TabelB)
+	Do QueryBuilder.VoegToeTabel(TabelC)
+	
+	Do QueryBuilder.SelecteerVeldVanTabel("VeldA",TabelA)
+	Do QueryBuilder.SelecteerVeldVanTabel("VeldB",TabelB)
+	Do QueryBuilder.SelecteerVeldVanTabel("VeldC",TabelC)
+	
+	Set ForeignKey = ##class(TECH.Algo.SQL.QueryEngine.ForeignKey).%New("VeldB", TabelB, "VeldA", TabelA)
+	Do QueryBuilder.VoegToeForeignKey(ForeignKey)
+	Set ForeignKey = ##class(TECH.Algo.SQL.QueryEngine.ForeignKey).%New("VeldC", TabelB, "VeldB", TabelA)
+	Do QueryBuilder.VoegToeForeignKey(ForeignKey)
+	Set ForeignKey = ##class(TECH.Algo.SQL.QueryEngine.ForeignKey).%New("VeldD", TabelC, "VeldA", TabelA)
+	Do QueryBuilder.VoegToeForeignKey(ForeignKey)
+	
+	Do $$$AssertEquals(QueryBuilder.GeefQueryString(),"SELECT TabelA.VeldA, TabelB.VeldB, TabelC.VeldC FROM TabelA JOIN TabelB ON TabelB.VeldB = TabelA.VeldA AND TabelB.VeldC = TabelA.VeldB JOIN TabelC ON TabelC.VeldD = TabelA.VeldA","De query string")
+]]></Implementation>
+</Method>
 </Class>
 </Export>