Changeset 410

Timestamp:

1/15/2007 10:00:55 PM (2 years ago)

Author:

dhughes

Message:

This commits some outstanding updates and also adds a useTransaction argument to delete and deleteAll on the iterator object.

Fixes #59

Location:

trunk

Files:

• cfeclipse.properties (added)
• config/reactor.xml (modified) (1 diff)
• create distribution package.bat (modified) (1 diff)
• reactor/iterator/iterator.cfc (modified) (5 diffs)
• reactor/util/ObjectCache.cfc (added)
• testDb.cfm (modified) (1 diff)

trunk/config/reactor.xml

@@ -2 +2 @@
         <config>
                 <project value="Scratch" />
-                <dsn value="scratchMysql5" />
-                <type value="mysql" />
+                <dsn value="scratch" />
+                <type value="mssql" />
                 <mapping value="/reactorData" />
-                <mode value="always" />
+                <mode value="production" />
                 <!-- These config values are not required -->
                 <!-- <username value="" />

trunk/create distribution package.bat

@@ -6 +6 @@
 svn export http://svn.reactorframework.com/reactor/trunk/reactor "C:\Inetpub\Reactor For ColdFusion\distribute\Reactor" --force
 svn export http://svn.reactorframework.com/reactor/trunk/ReactorSamples "C:\Inetpub\Reactor For ColdFusion\distribute\ReactorSamples" --force
-svn export http://svn.reactorframework.com/reactor/trunk/Documentation "C:\Inetpub\Reactor For ColdFusion\distribute\Documentation" --force
+svn export http://svn.reactorframework.com/reactor/trunk/Documentation/Documentation/!SSL! "C:\Inetpub\Reactor For ColdFusion\distribute\Documentation" --force
 
 echo Reactor Version Information > "C:\Inetpub\Reactor For ColdFusion\distribute\version.txt"

trunk/reactor/iterator/iterator.cfc

@@ -147 +147 @@
                 <cfset var field = "" />
                 <cfset var To = "" />
+                <cfset var useTransaction = true />
+                <cfset var args = StructNew() />
+                                
+                <!--- this is a bit of a hack to manage deleting in a manual transaction --->
+                <cfif StructKeyExists(arguments, "useTransaction")>
+                        <cfset useTransaction = arguments.useTransaction />
+                        <cfset structDelete(arguments, "useTransaction") />
+                        <cfset fieldList = ListDeleteAt(fieldList, ListFind(fieldList, "useTransaction")) />
+                </cfif>
                 
                 <cfif NOT StructCount(arguments)>
@@ -160 +169 @@
                         <cfif getLinked()>
                                 <!--- this obeject is in a linked iterator.  we need to delete the object that acts as the midpoint between the parent and this object being deleted --->
-                                <cfset Record._getParent().delete() />
+                                <cfset Record._getParent().delete(useTransaction=useTransaction) />
                         <cfelse>
                                 <!--- delete the record --->
-                                <cfset Record.delete() />
+                                <cfset Record.delete(useTransaction=useTransaction) />
                         </cfif>
 
@@ -201 +210 @@
                                 
                                 <!--- this object is in a linked iterator.  we need to delete the object that acts as the midpoint between the parent and this object being deleted --->
-                                <cfset Record[1]._getParent().delete() />
+                                <cfset Record[1]._getParent().delete(useTransaction=useTransaction) />
                         <cfelse>
                                 <!--- delete the record --->
-                                <cfset Record.delete() />
+                                <cfset Record.delete(useTransaction=useTransaction) />
                         </cfif>
 
@@ -219 +228 @@
                                 <cfloop from="1" to="#ArrayLen(indexArray)#" index="x">
                                         <!--- delete the record --->
-                                        <cfset delete(indexArray[x]) />
+                                        <cfset args[1] = indexArray[x] />
+                                        <cfset args["useTransaction"] = useTransaction />
+                                
+                                        <cfset delete(argumentCollection=args) />
                                 </cfloop>
                         </cfif>
@@ -229 +241 @@
         <!--- deleteAll --->
         <cffunction name="deleteAll" access="public" hint="I delete all elements in this iterator" output="false" returntype="void">
+                <cfargument name="useTransaction" hint="I indicate if this save should be executed within a transaction." required="no" type="any" _type="boolean" default="true" />
                 <cfset var Array = getArray() />
                 <cfset var x = 0 />
+                <cfset var args = StructNew() />
 
                 <cfloop from="#ArrayLen(Array)#" to="1" index="x" step="-1">
-                        <cfset delete(x) />
+                        <cfset args[1] = x />
+                        <cfset args["useTransaction"] = useTransaction />
+                        <cfset delete(argumentCollection=args) />
                 </cfloop>
         </cffunction>

trunk/testDb.cfm

@@ +1 @@
+
 <cfset reactorFactory = CreateObject("Component", "reactor.reactorFactory") />
 <cfset reactorFactory.init("/config/reactor.xml") />
 
-<cfset record = reactorFactory.createRecord("test") />
-<cfdump var="#record#" /><cfabort>
+<cfset CustomerGateway = reactorFactory.createGateway("Customer") />
+
+<cfset total = 0 />
+<cfloop from="1" to="30" index="x">
+        <cfset tick = getTickCount() />
+        <cfset CustomerGateway.test() />
+        <cfset total = total + (getTickCount()-tick) />
+</cfloop>
+
+avg: <cfdump var="#total/30#" />