Index: TECH/Algo/SQL/QueryEngine/ForeignKey.cls.xml
===================================================================
diff -u
--- TECH/Algo/SQL/QueryEngine/ForeignKey.cls.xml	(revision 0)
+++ TECH/Algo/SQL/QueryEngine/ForeignKey.cls.xml	(revision 3020)
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="TECH.Algo.SQL.QueryEngine.ForeignKey">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject</Super>
+
+<Property name="Veld1">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Tabel1">
+<Type>TECH.Algo.SQL.QueryEngine.Tabel</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Veld2">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Tabel2">
+<Type>TECH.Algo.SQL.QueryEngine.Tabel</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>Veld1:%String,Tabel1:TECH.Algo.SQL.QueryEngine.Tabel,Veld2:%String,Tabel2:TECH.Algo.SQL.QueryEngine.Tabel</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..Veld1 = Veld1
+	Set ..Tabel1 = Tabel1
+	Set ..Veld2 = Veld2
+	Set ..Tabel2 = Tabel2
+	Quit $$$OK
+
+]]></Implementation>
+</Method>
+
+<Method name="GeefVeld1">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Quit ..Veld1
+
+]]></Implementation>
+</Method>
+
+<Method name="GeefTabel1">
+<ReturnType>TECH.Algo.SQL.QueryEngine.Tabel</ReturnType>
+<Implementation><![CDATA[
+	Quit ..Tabel1
+
+]]></Implementation>
+</Method>
+
+<Method name="GeefVeld2">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Quit ..Veld2
+
+]]></Implementation>
+</Method>
+
+<Method name="GeefTabel2">
+<ReturnType>TECH.Algo.SQL.QueryEngine.Tabel</ReturnType>
+<Implementation><![CDATA[
+	Quit ..Tabel2
+
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: vhUnitTest/TECH/Algo/SQL/QueryEngine/TestQueryEngine.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/Algo/SQL/QueryEngine/TestQueryEngine.cls.xml	(revision 0)
+++ vhUnitTest/TECH/Algo/SQL/QueryEngine/TestQueryEngine.cls.xml	(revision 3020)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.TECH.Algo.SQL.QueryEngine.TestQueryEngine">
+<Description>
+do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","TECH.Algo.SQL.QueryEngine.TestQueryEngine")</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhUnitTest.TestCase</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="TestQueryBuilder">
+<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)
+	Do QueryBuilder.VoegToeTabel(TabelB)
+	
+	Do QueryBuilder.SelecteerVeldVanTabel("VeldA",TabelA)
+	Do QueryBuilder.SelecteerVeldVanTabel("VeldB",TabelB)
+	
+	Set ForeignKey = ##class(TECH.Algo.SQL.QueryEngine.ForeignKey).%New("VeldA", TabelA, "VeldB", TabelB)
+	Do QueryBuilder.VoegToeForeignKey(ForeignKey)
+	Set ForeignKey = ##class(TECH.Algo.SQL.QueryEngine.ForeignKey).%New("VeldB", TabelA, "VeldC", TabelB)
+	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")
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: TECH/Algo/SQL/QueryEngine/QueryBuilder.cls.xml
===================================================================
diff -u
--- TECH/Algo/SQL/QueryEngine/QueryBuilder.cls.xml	(revision 0)
+++ TECH/Algo/SQL/QueryEngine/QueryBuilder.cls.xml	(revision 3020)
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="TECH.Algo.SQL.QueryEngine.QueryBuilder">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="Tabellen">
+<Type>TECH.Algo.SQL.QueryEngine.Tabel</Type>
+<Collection>list</Collection>
+<Private>1</Private>
+</Property>
+
+<Property name="SelectieVelden">
+<Type>TECH.Algo.SQL.QueryEngine.SelectieVeld</Type>
+<Collection>list</Collection>
+<Private>1</Private>
+</Property>
+
+<Property name="ForeignKeys">
+<Type>%String</Type>
+<Collection>array</Collection>
+<Private>1</Private>
+</Property>
+
+<Method name="VoegToeTabel">
+<FormalSpec>Tabel:TECH.Algo.SQL.QueryEngine.Tabel</FormalSpec>
+<Implementation><![CDATA[	Do ..Tabellen.Insert(Tabel)
+]]></Implementation>
+</Method>
+
+<Method name="GeefTabellenIterator">
+<ReturnType>TECH.ListIterator</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.ListIterator).%New(..Tabellen)
+]]></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))
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeForeignKey">
+<FormalSpec>ForeignKey:TECH.Algo.SQL.QueryEngine.ForeignKey</FormalSpec>
+<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)
+]]></Implementation>
+</Method>
+
+<Method name="GeefQueryString">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set Query = "SELECT"
+	
+	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 From = ""
+	Set TabellenIterator = ##class(TECH.ListIterator).%New(..Tabellen)
+	If (TabellenIterator.HasNext())
+	{
+		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"
+		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" }
+		}
+	}
+	
+	If ($Length(Joins) > 0) { Set Query = Query_Joins }
+	Set Query = Query_" "_From
+	
+	Quit Query
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: TECH/Algo/SQL/QueryEngine/SelectieVeld.cls.xml
===================================================================
diff -u
--- TECH/Algo/SQL/QueryEngine/SelectieVeld.cls.xml	(revision 0)
+++ TECH/Algo/SQL/QueryEngine/SelectieVeld.cls.xml	(revision 3020)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="TECH.Algo.SQL.QueryEngine.SelectieVeld">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="Veld">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Tabel">
+<Type>TECH.Algo.SQL.QueryEngine.Tabel</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>Veld:%String,Tabel:TECH.Algo.SQL.QueryEngine.Tabel</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..Veld = Veld
+	Set ..Tabel = Tabel
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefVeld">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..Veld
+]]></Implementation>
+</Method>
+
+<Method name="GeefTabel">
+<ReturnType>TECH.Algo.SQL.QueryEngine.Tabel</ReturnType>
+<Implementation><![CDATA[	Quit ..Tabel
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: TECH/Algo/SQL/QueryEngine/Tabel.cls.xml
===================================================================
diff -u
--- TECH/Algo/SQL/QueryEngine/Tabel.cls.xml	(revision 0)
+++ TECH/Algo/SQL/QueryEngine/Tabel.cls.xml	(revision 3020)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="TECH.Algo.SQL.QueryEngine.Tabel">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="Naam">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>Naam:%String</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..Naam = Naam
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefNaam">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..Naam
+]]></Implementation>
+</Method>
+</Class>
+</Export>