Index: vhTest/Fake/TECH/Query/PrepareOnlyQueryAPI.cls.xml
===================================================================
diff -u -r2401 -r3063
--- vhTest/Fake/TECH/Query/PrepareOnlyQueryAPI.cls.xml	(.../PrepareOnlyQueryAPI.cls.xml)	(revision 2401)
+++ vhTest/Fake/TECH/Query/PrepareOnlyQueryAPI.cls.xml	(.../PrepareOnlyQueryAPI.cls.xml)	(revision 3063)
@@ -3,12 +3,26 @@
 <Class name="vhTest.Fake.TECH.Query.PrepareOnlyQueryAPI">
 <Super>TECH.RegisteredObject,TECH.Query.QueryAPI</Super>
 
+<Property name="DataList">
+<Type>%ListOfDataTypes</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Columns">
+<Type>%ListOfDataTypes</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
+<FormalSpec>DataList:%ListOfDataTypes="",Columns:%ListOfDataTypes=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
-<Implementation><![CDATA[	Quit $$$OK
+<Implementation><![CDATA[
+	Set ..DataList = DataList
+	set ..Columns = Columns
+	Quit $$$OK
 ]]></Implementation>
 </Method>
 
@@ -19,27 +33,27 @@
 <Method name="GetDynamicResultSet">
 <FormalSpec>Query:%String,lbParams:%List="",RuntimeMode:TECH.enu.ResultSetRuntimeMode=""</FormalSpec>
 <ReturnType>TECH.ResultSet</ReturnType>
-<Implementation><![CDATA[	Quit ..PrepareResultSet(Query)
+<Implementation><![CDATA[
+	Do ..PrepareResultSet(##class(TECH.DynamicQuery).%New(Query,lbParams,RuntimeMode))
+	Quit ##class(vhTest.Fake.TECH.ResultSet).%New(..DataList,..Columns)
 ]]></Implementation>
 </Method>
 
 <Method name="GetResultSet">
 <FormalSpec>Query:TECH.Query</FormalSpec>
 <ReturnType>TECH.ResultSet</ReturnType>
-<Implementation><![CDATA[	Quit ..PrepareResultSet(Query)
+<Implementation><![CDATA[
+	Do ..PrepareResultSet(Query)
+	Quit ##class(vhTest.Fake.TECH.ResultSet).%New(..DataList,..Columns)
 ]]></Implementation>
 </Method>
 
 <Method name="PrepareResultSet">
 <FormalSpec>Query:TECH.Query</FormalSpec>
 <Private>1</Private>
-<ReturnType>TECH.ResultSet</ReturnType>
 <Implementation><![CDATA[
 	#dim ResultSet As TECH.ResultSet = ##class(TECH.ResultSet).%New()
-	
 	Do ResultSet.Prepare(Query.Statement)
-
-	Quit ResultSet
 ]]></Implementation>
 </Method>
 </Class>