Index: TECH/Query/impl/QueryAPI.cls.xml
===================================================================
diff -u -r1756 -r1864
--- TECH/Query/impl/QueryAPI.cls.xml	(.../QueryAPI.cls.xml)	(revision 1756)
+++ TECH/Query/impl/QueryAPI.cls.xml	(.../QueryAPI.cls.xml)	(revision 1864)
@@ -12,6 +12,20 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GetResultSet">
+<FormalSpec>Query:TECH.Query</FormalSpec>
+<ReturnType>TECH.ResultSet</ReturnType>
+<Implementation><![CDATA[
+	if Query.%Extends("TECH.ClassQuery") {
+		set ResultSet = ##class(TECH.ResultSet).%New(Query.ClassName_":"_Query.QueryName)
+		do ResultSet.Execute()
+	} else {
+		set ResultSet = ..GetDynamicResultSet(Query.Statement,Query.Parameters,Query.RuntimeMode)
+	}
+	quit ResultSet
+]]></Implementation>
+</Method>
+
 <Method name="GetDynamicResultSet">
 <FormalSpec>Query:%String,lbParams:%List="",RuntimeMode:TECH.enu.ResultSetRuntimeMode=""</FormalSpec>
 <ReturnType>TECH.ResultSet</ReturnType>
FishEye: Tag 1863 refers to a dead (removed) revision in file `TECH/Query.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: TECH/Query/QueryAPI.cls.xml
===================================================================
diff -u -r1756 -r1864
--- TECH/Query/QueryAPI.cls.xml	(.../QueryAPI.cls.xml)	(revision 1756)
+++ TECH/Query/QueryAPI.cls.xml	(.../QueryAPI.cls.xml)	(revision 1864)
@@ -15,6 +15,12 @@
 <ReturnType>TECH.ResultSet</ReturnType>
 </Method>
 
+<Method name="GetResultSet">
+<Abstract>1</Abstract>
+<FormalSpec>Query:TECH.Query</FormalSpec>
+<ReturnType>TECH.ResultSet</ReturnType>
+</Method>
+
 <Method name="HasResultsDynamicQuery">
 <Abstract>1</Abstract>
 <FormalSpec>Query:%String,lbParams:%List="",RuntimeMode:TECH.enu.ResultSetRuntimeMode=""</FormalSpec>
Index: TECH/ResultSetIterator.cls.xml
===================================================================
diff -u
--- TECH/ResultSetIterator.cls.xml	(revision 0)
+++ TECH/ResultSetIterator.cls.xml	(revision 1864)
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.ResultSetIterator">
+<Super>TECH.RegisteredObject,TECH.Iterator</Super>
+
+<Property name="ResultSet">
+<Type>TECH.ResultSet</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="WasNextCalled">
+<Type>%Boolean</Type>
+<InitialExpression>1</InitialExpression>
+<Private>1</Private>
+</Property>
+
+<Property name="WasHasNextCalled">
+<Type>%Boolean</Type>
+<InitialExpression>0</InitialExpression>
+<Private>1</Private>
+</Property>
+
+<Property name="HasNext">
+<Type>%Boolean</Type>
+<InitialExpression>0</InitialExpression>
+<Private>1</Private>
+</Property>
+
+<Property name="Key">
+<Type>TECH.Integer</Type>
+<InitialExpression>0</InitialExpression>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..ResultSet = ResultSet
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GetNext">
+<Private>1</Private>
+<ReturnType>%CacheString</ReturnType>
+<Implementation><![CDATA[	quit ..ResultSet
+]]></Implementation>
+</Method>
+
+<Method name="HasNext">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	if ..WasNextCalled {
+		set ..HasNext = ( ..ResultSet.Next() > 0 )
+		set ..WasNextCalled = $$$false
+		set ..WasHasNextCalled = $$$true
+	}
+	quit ..HasNext
+]]></Implementation>
+</Method>
+
+<Method name="Key">
+<ReturnType>%CacheString</ReturnType>
+<Implementation><![CDATA[
+	#dim Key As %CacheString = ..Key
+	quit Key
+]]></Implementation>
+</Method>
+
+<Method name="Next">
+<ReturnType>%CacheString</ReturnType>
+<Implementation><![CDATA[
+	if '..WasHasNextCalled { 
+		if '..ResultSet.Next() do ..ThrowNextFailedException()
+	} else {
+		set ..WasNextCalled = $$$true
+		set ..WasHasNextCalled = $$$false
+	}	
+	set ..Key = ..Key + 1
+	#dim Next As %CacheString = ..GetNext()
+	quit Next
+]]></Implementation>
+</Method>
+
+<Method name="ThrowNextFailedException">
+<Implementation><![CDATA[
+	set Exception = ##class(TECH.Exceptions.GeneralErrorException).%New(..%ClassName(1)_": end of iterator reached.")
+	do ##class(TECH.ExceptionHandler).Throw(Exception)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: TECH/DynamicQuery.cls.xml
===================================================================
diff -u -r1863 -r1864
--- TECH/DynamicQuery.cls.xml	(.../DynamicQuery.cls.xml)	(revision 1863)
+++ TECH/DynamicQuery.cls.xml	(.../DynamicQuery.cls.xml)	(revision 1864)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="TECH.DynamicQuery">
-<Super>TECH.RegisteredObject</Super>
+<Super>TECH.Query</Super>
 
 <Property name="Statement">
 <Type>TECH.String</Type>
Index: TECH/ClassQuery.cls.xml
===================================================================
diff -u
--- TECH/ClassQuery.cls.xml	(revision 0)
+++ TECH/ClassQuery.cls.xml	(revision 1864)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.ClassQuery">
+<Super>TECH.Query</Super>
+
+<Property name="ClassName">
+<Type>%String</Type>
+</Property>
+
+<Property name="QueryName">
+<Type>%String</Type>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>ClassName:%String,QueryName:%String</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..ClassName =ClassName
+	set ..QueryName = QueryName
+	Quit $$$OK
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>