Index: TECH/Algo/SQL/SelectBuilder/InputParameters.cls.xml
===================================================================
diff -u
--- TECH/Algo/SQL/SelectBuilder/InputParameters.cls.xml	(revision 0)
+++ TECH/Algo/SQL/SelectBuilder/InputParameters.cls.xml	(revision 947)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.Algo.SQL.SelectBuilder.InputParameters">
+<Abstract>1</Abstract>
+<Super>TECH.DataTransferObject</Super>
+
+<Parameter name="TabelNaam">
+<Type>%String</Type>
+</Parameter>
+</Class>
+
+
+</Export>
Index: TECH/Algo/SQL/SelectBuilder/Info.cls.xml
===================================================================
diff -u
--- TECH/Algo/SQL/SelectBuilder/Info.cls.xml	(revision 0)
+++ TECH/Algo/SQL/SelectBuilder/Info.cls.xml	(revision 947)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.Algo.SQL.SelectBuilder.Info">
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="Query">
+<Type>%String</Type>
+</Property>
+
+<Property name="Parameters">
+<Type>%List</Type>
+</Property>
+</Class>
+
+
+</Export>
Index: TECH/Algo/SQL/QueryEngine/CombinatieConditie.cls.xml
===================================================================
diff -u -r9 -r947
--- TECH/Algo/SQL/QueryEngine/CombinatieConditie.cls.xml	(.../CombinatieConditie.cls.xml)	(revision 9)
+++ TECH/Algo/SQL/QueryEngine/CombinatieConditie.cls.xml	(.../CombinatieConditie.cls.xml)	(revision 947)
@@ -36,15 +36,14 @@
 <Method name="MaakConditieString">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Set Conditie = ""
+	#dim Conditie As %String = ""
 	Set SubconditiesIterator = ##class(TECH.ListIterator).%New(..Subcondities)
-	While (SubconditiesIterator.HasNext())
-	{
-		Set Subconditie = SubconditiesIterator.Next()
+	While (SubconditiesIterator.HasNext()) {
+		#dim Subconditie As %String = SubconditiesIterator.Next()
 		Set Conditie = Conditie_Subconditie.MaakConditieString()
 		If (SubconditiesIterator.HasNext()) { Set Conditie = Conditie_" "_..CombinatieConditieOperator_" " }
 	}
-	Quit "("_Conditie_")"
+	Quit $select(..Subcondities.Count()>1:"("_Conditie_")",1:Conditie)
 ]]></Implementation>
 </Method>
 
@@ -62,7 +61,13 @@
 
 <Method name="HeeftConditie">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ..Subcondities.Size > 0
+<Implementation><![CDATA[
+	#dim HeeftConditie As %Boolean = 0 
+	#dim KindIterator As TECH.Iterator = ..GeefKindIterator()
+	while KindIterator.HasNext() {
+		set HeeftConditie = HeeftConditie + KindIterator.Next().HeeftConditie()
+	}
+	Quit HeeftConditie
 ]]></Implementation>
 </Method>
 </Class>
Index: TECH/Algo/SQL/SelectBuilder/SelectBuilder.cls.xml
===================================================================
diff -u
--- TECH/Algo/SQL/SelectBuilder/SelectBuilder.cls.xml	(revision 0)
+++ TECH/Algo/SQL/SelectBuilder/SelectBuilder.cls.xml	(revision 947)
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.Algo.SQL.SelectBuilder.SelectBuilder">
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="QueryBuilder">
+<Type>TECH.Algo.SQL.QueryEngine.QueryBuilder</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="QueryParameters">
+<Type>%List</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Tabel">
+<Type>TECH.Algo.SQL.QueryEngine.Tabel</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="WhereConditie">
+<Type>TECH.Algo.SQL.QueryEngine.CombinatieConditie</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="Genereer">
+<FormalSpec>Parameters:vhUnitTest.TECH.Algo.SQL.SelectBuilder.Genereer.InputParameters</FormalSpec>
+<ReturnType>TECH.Algo.SQL.SelectBuilder.Info</ReturnType>
+<Implementation><![CDATA[
+	set ..Tabel = ##class(TECH.Algo.SQL.QueryEngine.Tabel).%New(..GeefTabelNaam(Parameters))
+	set ..WhereConditie = ##class(TECH.Algo.SQL.QueryEngine.CombinatieConditie).%New(##class(TECH.Algo.SQL.QueryEngine.enu.CombinatieConditieOperator).En())
+	
+	do ..QueryBuilder.VoegToeTabel(..Tabel)
+	do ..QueryBuilder.ZetWhereConditie(..WhereConditie)
+	
+	do ..VoegToeSelectieVelden(Parameters)
+	
+	quit ..BuildQueryInfo()
+]]></Implementation>
+</Method>
+
+<Method name="GeefTabelNaam">
+<FormalSpec>Parameters:vhUnitTest.TECH.Algo.SQL.SelectBuilder.Genereer.InputParameters</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	quit ##class(TECH.ClassUtils).GetClassParameterValue(Parameters.%ClassName(1),"TabelNaam")
+]]></Implementation>
+</Method>
+
+<Method name="BuildQueryInfo">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	set QueryInfo = ##class(TECH.Algo.SQL.SelectBuilder.Info).%New()
+	set QueryInfo.Query = ..QueryBuilder.GeefQueryString()
+	set QueryInfo.Parameters = ..QueryParameters
+	quit QueryInfo
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeSelectieVelden">
+<FormalSpec>Parameters:vhUnitTest.TECH.Algo.SQL.SelectBuilder.Genereer.InputParameters</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	do ..QueryBuilder.SelecteerVeldVanTabel("ID",..Tabel)
+
+	#dim Properties As %ListOfDataTypes = ##class(TECH.ClassUtils).GeefProperties(Parameters.%ClassName(1))
+	set PropertyIterator = ##class(TECH.ListIterator).%New(Properties)
+	while PropertyIterator.HasNext() {
+		#dim PropertyNaam As %String = PropertyIterator.Next()
+		#dim Waarden As %ListOfDataTypes = $property(Parameters,PropertyNaam)
+		if Waarden.Count() > 0 {
+			do ..QueryBuilder.SelecteerVeldVanTabel(PropertyNaam,..Tabel)		
+			do ..VerwerkPropertyWaarden(PropertyNaam,Waarden)
+					
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkPropertyWaarden">
+<FormalSpec>PropertyNaam:%String,Waarden:%ListOfDataTypes</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set CombinatieConditie = ##class(TECH.Algo.SQL.QueryEngine.CombinatieConditie).%New(##class(TECH.Algo.SQL.QueryEngine.enu.CombinatieConditieOperator).Of())
+	
+	set WaardenIterator = ##class(TECH.ListIterator).%New(Waarden)
+	while WaardenIterator.HasNext() {
+		set ..QueryParameters = ..QueryParameters _ $listbuild(WaardenIterator.Next())
+		do CombinatieConditie.VoegToeSubconditie(##class(TECH.Algo.SQL.QueryEngine.EnkelvoudigeConditie).%New(PropertyNaam_" = ?"))
+	}
+	do ..WhereConditie.VoegToeSubconditie(CombinatieConditie)
+]]></Implementation>
+</Method>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..QueryBuilder = ##class(TECH.Algo.SQL.QueryEngine.QueryBuilder).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>