Changeset 710

Timestamp:

03/29/08 03:48:57 (5 months ago)

Author:

scorfield

Message:

Incorporate latest scaffolder.

Location:

framework/trunk/scaffolder

Files:

• LICENSE.txt (added)
• scaffolder/Metadata.cfc (modified) (20 diffs)
• scaffolder/cftemplate.cfc (modified) (1 diff)
• templates/ColdSpring/ColdSpring.xml (modified) (4 diffs)
• templates/ColdSpring/accessors.cfc (modified) (1 diff)
• templates/ColdSpring/action_add.xml.cfm (modified) (1 diff)
• templates/ColdSpring/action_update.xml.cfm (modified) (1 diff)
• templates/ColdSpring/add_form.xml.cfm (modified) (2 diffs)
• templates/ColdSpring/baseMessages.cfc (added)
• templates/ColdSpring/baseValidator.cfc (added)
• templates/ColdSpring/display.xml.cfm (modified) (1 diff)
• templates/ColdSpring/dsp_display_.cfm (modified) (8 diffs)
• templates/ColdSpring/dsp_form_.cfm (modified) (15 diffs)
• templates/ColdSpring/dsp_layout.cfm (modified) (2 diffs)
• templates/ColdSpring/dsp_list_.cfm (modified) (9 diffs)
• templates/ColdSpring/edit_form.xml.cfm (modified) (1 diff)
• templates/ColdSpring/getByFields.cfc (modified) (4 diffs)
• templates/ColdSpring/getMessage.cfc (added)
• templates/ColdSpring/getRecordCount.cfc (modified) (3 diffs)
• templates/ColdSpring/listing.xml.cfm (modified) (1 diff)
• templates/ColdSpring/messageTextEnUs.cfc (added)
• templates/ColdSpring/messages.cfc (added)
• templates/ColdSpring/read.cfc (modified) (4 diffs)
• templates/ColdSpring/recordInit.cfc (modified) (1 diff)
• templates/ColdSpring/serviceExists.cfc (added)
• templates/ColdSpring/serviceGet.cfc (modified) (2 diffs)
• templates/ColdSpring/serviceGetAll.cfc (modified) (1 diff)
• templates/ColdSpring/serviceGetMessages.cfc (added)
• templates/ColdSpring/serviceGetMultiple.cfc (modified) (2 diffs)
• templates/ColdSpring/serviceGetRecordCount.cfc (modified) (1 diff)
• templates/ColdSpring/serviceGetSuggest.cfc (added)
• templates/ColdSpring/serviceInit.cfc (modified) (1 diff)
• templates/ColdSpring/serviceValidate.cfc (added)
• templates/ColdSpring/templateDescriptor.cfm (modified) (4 diffs)
• templates/ColdSpring/validate2.cfc (added)
• templates/ColdSpring/validator.cfc (added)
• templates/ColdSpring/validatorInit.cfc (added)
• templates/Reactor/dsp_display_.cfm (modified) (4 diffs)

framework/trunk/scaffolder/scaffolder/Metadata.cfc

@@ -273 +273 @@
                 
                 <cfreturn local.out>
+        </cffunction>
+        
+        <cffunction name="uFirst" returntype="string" access="public" output="No" hint="I make the first character of a string uppercase">
+                <cfargument name="inString" type="string" required="Yes" />
+                
+                <cfreturn UCase(Left(inString,1)) & RemoveChars(inString,1,1)>
+        </cffunction>
+        
+        <cffunction name="lFirst" returntype="string" access="public" output="No" hint="I make the first character of a string lowercase">
+                <cfargument name="inString" type="string" required="Yes" />
+                
+                <cfreturn LCase(Left(inString,1)) & RemoveChars(inString,1,1)>
         </cffunction>
         
@@ -1041 +1053 @@
                 <cfloop query="arguments.qTableData">
                         <!--- Find the field tag position or create a new one --->
-                        <cfset thisFieldIndex = createFieldTag(objectIndex=objectIndex,name=arguments.qTableData.column_name)>
+                        <cfset thisFieldIndex = createFieldTag(objectIndex=objectIndex,name=lFirst(arguments.qTableData.column_name))>
                         
                         <!--- Set up a pointer to the structure containing the attributes of the field tag in the XML --->
@@ -1079 +1091 @@
                         <cfset stProperties = variables.xScaffoldingConfig.scaffolding.objects.object[objectIndex].XmlChildren[thisFieldIndex].XmlAttributes >
                         
-                        <!--- The values of other XML attribute values never get overwritten --->
+                        <!--- The values of these XML attribute values never get overwritten, if they are already present. --->
                         <cfset setAttributeValue(stProperties,"sort",arguments.qTableData.key_seq)>
                         <cfset setAttributeValue(stProperties,"showOnList","true")>
                         <cfset setAttributeValue(stProperties,"showOnForm","true")>
+                        <cfset setAttributeValue(stProperties,"showOnDisplay","true")>
                         <cfif arguments.qTableData.nullable>
                                 <cfset setAttributeValue(stProperties,"required","false")>
@@ -1095 +1108 @@
                                 <cfset setAttributeValue(stProperties,"size","15")>
                                 <cfset setAttributeValue(stProperties,"maxlength",8)>
+                                <cfset setAttributeValue(stProperties,"validation","time")>
                         <cfelseif stProperties.type IS "date">
                                 <cfset setAttributeValue(stProperties,"formType","Date")>
@@ -1100 +1114 @@
                                 <cfset setAttributeValue(stProperties,"size","15")>
                                 <cfset setAttributeValue(stProperties,"maxlength",11)>
+                                <cfset setAttributeValue(stProperties,"validation","date")>
                         <cfelseif isDefined("stProperties.parent") AND stProperties.parent IS NOT "">
                                 <cfset setAttributeValue(stProperties,"formType","Dropdown")>
                                 <cfset setAttributeValue(stProperties,"format","Trim")>
                                 <cfset setAttributeValue(stProperties,"size","1")>
+                                <cfset setAttributeValue(stProperties,"validation","parent")>
                         <cfelseif stProperties.type IS "boolean">
                                 <cfset setAttributeValue(stProperties,"formType","Checkbox")>
                                 <cfset setAttributeValue(stProperties,"format","YesNo")>
                                 <cfset setAttributeValue(stProperties,"size","0")>
+                                <cfset setAttributeValue(stProperties,"validation","boolean")>
                         <cfelseif isDefined("stProperties.identity") AND stProperties.identity>
                                 <cfset setAttributeValue(stProperties,"formType","Hidden")>
@@ -1117 +1134 @@
                                 <cfset setAttributeValue(stProperties,"size","15")>
                                 <cfset setAttributeValue(stProperties,"maxlength",15)>
+                                <cfset setAttributeValue(stProperties,"validation","currency")>
                         <cfelseif stProperties.fuseDocType IS "integer">
                                 <cfset setAttributeValue(stProperties,"formType","Text")>
@@ -1122 +1140 @@
                                 <cfset setAttributeValue(stProperties,"size","15")>
                                 <cfset setAttributeValue(stProperties,"maxlength",15)>
+                                <cfset setAttributeValue(stProperties,"validation","integer")>
                         <cfelseif stProperties.type IS "numeric">
                                 <cfset setAttributeValue(stProperties,"formType","Text")>
@@ -1127 +1146 @@
                                 <cfset setAttributeValue(stProperties,"size","15")>
                                 <cfset setAttributeValue(stProperties,"maxlength",15)>
+                                <cfset setAttributeValue(stProperties,"validation","real")>
                         <cfelseif arguments.qTableData.length gt 200>
                                 <cfset setAttributeValue(stProperties,"formType","Textarea")>
@@ -1138 +1158 @@
                                 <cfset setAttributeValue(stProperties,"maxlength",min(arguments.qTableData.length,getBuffer()))>
                         </cfif>
-                        
+                        <!--- Try to catch any other special types for possible JS validation --->
+                        <cfif NOT structKeyExists(stProperties,"validation")>
+                                <cfif arguments.qTableData.column_name CONTAINS "zip_code" AND arguments.qTableData.length GE 5>
+                                        <cfset setAttributeValue(stProperties,"validation","zip_code")>
+                                <cfelseif arguments.qTableData.column_name CONTAINS "zipcode" AND arguments.qTableData.length GE 5>
+                                        <cfset setAttributeValue(stProperties,"validation","zip_code")>
+                                <cfelseif arguments.qTableData.column_name CONTAINS "postcode" AND arguments.qTableData.length GE 5>
+                                        <cfset setAttributeValue(stProperties,"validation","zip_code")>
+                                <cfelseif arguments.qTableData.column_name CONTAINS "post_code" AND arguments.qTableData.length GE 5>
+                                        <cfset setAttributeValue(stProperties,"validation","zip_code")>
+                                <cfelseif arguments.qTableData.column_name CONTAINS "email" AND arguments.qTableData.length GT 6>
+                                        <cfset setAttributeValue(stProperties,"validation","email")>
+                                <cfelseif arguments.qTableData.column_name CONTAINS "phone" AND arguments.qTableData.length GT 6>
+                                        <cfset setAttributeValue(stProperties,"validation","phone")>
+                                <cfelseif arguments.qTableData.column_name CONTAINS "url" AND arguments.qTableData.length GT 6>
+                                        <cfset setAttributeValue(stProperties,"validation","url")>
+                                <cfelse>
+                                        <cfset setAttributeValue(stProperties,"validation","none")>
+                                </cfif>
+                        </cfif>
                 </cfloop>
         </cffunction>
@@ -1404 +1443 @@
                 <cfloop index="i" from="1" to="#arrayLen(xFields)#">
                         <cfset arrayAppend(aFields,xFields[i].XmlAttributes)>
-                        <cfset aFields[i]["table"] = arguments.table>
+                        <cfset aFields[i]["table"] = uFirst(arguments.table)>
                         <!--- Set default values on missing entries in the XML --->
                         <cfif NOT structKeyExists(aFields[i],"alias")>
-                                <cfset aFields[i]["alias"] = aFields[i]["name"]>
+                                <cfset aFields[i]["alias"] = lFirst(aFields[i]["name"])>
                         </cfif>
                         <cfif NOT structKeyExists(aFields[i],"label")>
@@ -1418 +1457 @@
                                 <cfset aFields[i]["showOnForm"] = "true">
                         </cfif>
+                        <cfif NOT structKeyExists(aFields[i],"showOnDisplay")>
+                                <cfset aFields[i]["showOnDisplay"] = "true">
+                        </cfif>
                         <cfif NOT structKeyExists(aFields[i],"type")>
                                 <cfset aFields[i]["type"] = "string">
+                        </cfif>
+                        <cfif NOT structKeyExists(aFields[i],"fuseDocType")>
+                                <cfset aFields[i]["fuseDocType"] = "string">
                         </cfif>
                         <cfif NOT structKeyExists(aFields[i],"formType")>
@@ -1425 +1470 @@
                                         <cfset aFields[i]["formType"] = "Dropdown">
                                 <cfelseif aFields[i].type IS "date">
-                                        <cfset aFields[i]["formType"] = "Calendar">
+                                        <cfif aFields[i].name CONTAINS "time">
+                                                <cfset aFields[i]["formType"] = "Time">
+                                        <cfelse>
+                                                <cfset aFields[i]["formType"] = "Calendar">
+                                        </cfif>
                                 <cfelseif aFields[i].type IS "boolean">
                                         <cfset aFields[i]["formType"] = "Checkbox">
@@ -1437 +1486 @@
                         <cfif NOT structKeyExists(aFields[i],"format")>
                                 <cfif aFields[i].type IS "date">
-                                        <cfset aFields[i]["format"] = "Date(dd/mmm/yyyy)">
+                                        <cfif aFields[i].name CONTAINS "time">
+                                                <cfset aFields[i]["format"] = "Time">
+                                        <cfelse>
+                                                <cfset aFields[i]["format"] = "Date(dd/mmm/yyyy)">
+                                        </cfif>
                                 <cfelseif aFields[i].type IS "boolean">
                                         <cfset aFields[i]["format"] = "YesNo">
@@ -1448 +1501 @@
                                 <cfelse>
                                         <cfset aFields[i]["format"] = "Trim">
+                                </cfif>
+                        </cfif>
+                        
+                        <cfif NOT structKeyExists(aFields[i],"validation")>
+                                <cfif structKeyExists(aFields[i],"parent")>
+                                        <cfset aFields[i]["validation"] = "parent">
+                                <cfelseif aFields[i].formType IS "Time">
+                                        <cfset aFields[i]["validation"] = "time">
+                                <cfelseif aFields[i].formType IS "Date" OR aFields[i].formType IS "Calendar">
+                                        <cfset aFields[i]["validation"] = "date">
+                                <cfelseif aFields[i].type IS "boolean">
+                                        <cfset aFields[i]["validation"] = "boolean">
+                                <cfelseif aFields[i].type IS "money">
+                                        <cfset aFields[i]["validation"] = "currency">
+                                <cfelseif aFields[i].fuseDocType IS "integer">
+                                        <cfset aFields[i]["validation"] = "integer">
+                                <cfelseif aFields[i].type IS "numeric">
+                                        <cfset aFields[i]["validation"] = "real">
+                                <cfelseif aFields[i].type IS "string" AND aFields[i].name CONTAINS "zip_code" AND structKeyExists(aFields[i],"maxlength") AND aFields[i].maxlength GE 5>
+                                        <cfset aFields[i]["validation"] = "zip_code">
+                                <cfelseif aFields[i].type IS "string" AND aFields[i].name CONTAINS "zipcode" AND structKeyExists(aFields[i],"maxlength") AND aFields[i].maxlength GE 5>
+                                        <cfset aFields[i]["validation"] = "zip_code">
+                                <cfelseif aFields[i].type IS "string" AND aFields[i].name CONTAINS "postcode" AND structKeyExists(aFields[i],"maxlength") AND aFields[i].maxlength GE 5>
+                                        <cfset aFields[i]["validation"] = "zip_code">
+                                <cfelseif aFields[i].type IS "string" AND aFields[i].name CONTAINS "post_code" AND structKeyExists(aFields[i],"maxlength") AND aFields[i].maxlength GE 5>
+                                        <cfset aFields[i]["validation"] = "zip_code">
+                                <cfelseif aFields[i].type IS "string" AND aFields[i].name CONTAINS "email" AND structKeyExists(aFields[i],"maxlength") AND aFields[i].maxlength GT 6>
+                                        <cfset aFields[i]["validation"] = "email">
+                                <cfelseif aFields[i].type IS "string" AND aFields[i].name CONTAINS "phone" AND structKeyExists(aFields[i],"maxlength") AND aFields[i].maxlength GT 6>
+                                        <cfset aFields[i]["validation"] = "phone">
+                                <cfelseif aFields[i].type IS "string" AND aFields[i].name CONTAINS "url" AND structKeyExists(aFields[i],"maxlength") AND aFields[i].maxlength GT 6>
+                                        <cfset aFields[i]["validation"] = "url">
+                                <cfelse>
+                                        <cfset aFields[i]["validation"] = "none">
                                 </cfif>
                         </cfif>
@@ -1474 +1561 @@
                                 hint="I return a list of field aliases for a table." >
                 <cfargument name="table" type="string" required="Yes" hint="I am the name of the table who's fields are to be output.">
+                <cfargument name="select" type="string" required="No" default="All" hint="I am the selction criteria for the fields to be output. Can be All(default), showOnForm, showOnList, showOnDisplay.">
                 <cfset var i = 0>
                 <cfset var aFields = getFieldsFromXML(arguments.table)>
@@ -1479 +1567 @@
                 
                 <cfloop from="1" to="#arrayLen(aFields)#" index="i">
-                        <cfif structKeyExists(aFields[i],"alias")>
-                                <cfset lFields = ListAppend(lFields,aFields[i].alias)>
-                        <cfelse>
-                                <cfset lFields = ListAppend(lFields,aFields[i].name)>
+                        <cfif arguments.select IS "All" OR (structKeyExists(aFields[i],arguments.select) AND aFields[i][arguments.select])>
+                                <cfif structKeyExists(aFields[i],"alias")>
+                                        <cfset lFields = ListAppend(lFields,aFields[i].alias)>
+                                <cfelse>
+                                        <cfset lFields = ListAppend(lFields,aFields[i].name)>
+                                </cfif>
                         </cfif>
                 </cfloop>
@@ -1523 +1613 @@
                                 hint="I return a list of field aliases for the fields of joined tables to a table.">
                 <cfargument name="table" type="string" required="Yes" hint="I am the name of the table who's joined tables fields are to be output.">
-                <cfargument name="type" type="string" required="No" default="" hint="I select the type of field to be displayed, can be List or Form.">
+                <cfargument name="select" type="string" required="No" default="All" hint="The type of field, can be showOnList, showOnForm, showOnDisplay.">
                 <cfset var i = 0>
-                <cfset var aFields = getJoinedFieldsFromXML(arguments.table)>
+                <cfset var aJoinedFields = getJoinedFieldsFromXML(arguments.table)>
                 <cfset var lFields = "">
                 
-                <cfif arguments.type IS "List">
-                        <cfloop from="1" to="#arrayLen(aFields)#" index="i">
-                                <cfif structKeyExists(aFields[i],"showOnList") AND aFields[i].showOnList>
-                                        <cfset lFields = ListAppend(lFields,aFields[i].alias)>
+                <cfloop from="1" to="#arrayLen(aJoinedFields)#" index="i">
+                        <cfif arguments.select IS "All" OR (structKeyExists(aJoinedFields[i],arguments.select) AND aJoinedFields[i][arguments.select])>
+                                <cfif structKeyExists(aJoinedFields[i],"alias")>
+                                        <cfset lFields = ListAppend(lFields,lFirst(aJoinedFields[i].table) & uFirst(aJoinedFields[i].alias))>
+                                <cfelse>
+                                        <cfset lFields = ListAppend(lFields,lFirst(aJoinedFields[i].table) & uFirst(aJoinedFields[i].name))>
                                 </cfif>
-                        </cfloop>
-                <cfelseif arguments.type IS "Form">
-                        <cfloop from="1" to="#arrayLen(aFields)#" index="i">
-                                <cfif structKeyExists(aFields[i],"showOnForm") AND aFields[i].showOnForm>
-                                        <cfset lFields = ListAppend(lFields,aFields[i].alias)>
-                                </cfif>
-                        </cfloop>
-                <cfelse>
-                        <cfloop from="1" to="#arrayLen(aFields)#" index="i">
-                                <cfset lFields = ListAppend(lFields,aFields[i].alias)>
-                        </cfloop>
-                </cfif>
+                        </cfif>
+                </cfloop>
                 
                 <cfreturn lFields>
@@ -1553 +1635 @@
                 <cfargument name="table" type="string" required="Yes" hint="I am the name of the table who's joined tables fields are to be output.">
                 <cfset var i = 0>
-                <cfset var aFields = getFieldsFromXML(arguments.table)>
+                <cfset var aJoinedObjects = getRelationshipsFromXML(arguments.table,"manyToOne")>
                 <cfset var aJoinedFields = arrayNew(1)>
                 
-                <cfloop from="1" to="#arrayLen(aFields)#" index="i">
-                        <cfif structKeyExists(aFields[i],"parent")>
-                                <cfset aJoinedFields = ArrayConcat(aJoinedFields,getFieldsFromXML(aFields[i].parent))>
-                        </cfif>
+                <cfloop from="1" to="#arrayLen(aJoinedObjects)#" index="i">
+                        <cfset aJoinedFields = ArrayConcat(aJoinedFields,getFieldsFromXML(aJoinedObjects[i].name))>
                 </cfloop>
                 
@@ -1579 +1659 @@
                         <cfset stData = structNew()>
                         <cfset stData["Name"] = xRelationships[i].XmlAttributes.name>
+                        <cfset stData["JoinType"] = iif(structkeyExists(xRelationships[i].XmlAttributes,"fkName"),"'INNER'","'LEFT OUTER'")>
                         <cfif structKeyExists(xRelationships[i].XmlAttributes,"alias")>
                                 <cfset stData["Alias"] = xRelationships[i].XmlAttributes.alias>
@@ -1596 +1677 @@
         </cffunction>
         
+        <cffunction name="getFKFieldList" returntype="string" output="No" 
+                                hint="I return a list containing the fields that are foreign keys to tables related to the selected table from the XML Configuration.">
+                <cfargument name="table" required="Yes" hint="I am the name of the table who's realtionships are to be output.">
+                <cfargument name="type" required="Yes" hint="I am the type of relationship required">
+                <cfset var i = 0>
+                <cfset var j = 0>
+                <cfset var lFKFieldList = "">
+                <cfset var quotedTable = "'#arguments.table#'">
+                <cfset var xRelationships = XmlSearch(variables.xScaffoldingConfig,"/scaffolding/objects/object[@name=#quotedTable#]/#arguments.type#")>
+                
+                <cfloop index="i" from="1" to="#arrayLen(xRelationships)#">
+                        <cfloop index="j" from="1" to="#arrayLen(xRelationships[i].XmlChildren)#">
+                                <cfset lFKFieldList = ListAppend(lFKFieldList,xRelationships[i].XmlChildren[j].XmlAttributes.from)>
+                        </cfloop>
+                </cfloop>
+                
+                <cfreturn lFKFieldList>
+        </cffunction>
+        
         <cffunction name="getDottedPath" returntype="string" output="no" 
                                 hint="I return the Path to the model.">

framework/trunk/scaffolder/scaffolder/cftemplate.cfc

@@ -111 +111 @@
         </cffunction>
         
+        <cffunction name="uFirst" returntype="string" access="public" output="No" hint="I make the first character of a string uppercase">
+                <cfargument name="inString" type="string" required="Yes" />
+                
+                <cfreturn UCase(Left(inString,1)) & RemoveChars(inString,1,1)>
+        </cffunction>
+        
+        <cffunction name="lFirst" returntype="string" access="public" output="No" hint="I make the first character of a string lowercase">
+                <cfargument name="inString" type="string" required="Yes" />
+                
+                <cfreturn LCase(Left(inString,1)) & RemoveChars(inString,1,1)>
+        </cffunction>
+        
         <cffunction name="generateScript" returntype="void" access="public" output="yes" hint="I generate a script using a CFTemplate and its associated metadata.">
                 <cfargument Name="TemplateFilePath" type="string" required="yes" hint="I am the filepath (including the file name and extension) of the CF Template to return.">

framework/trunk/scaffolder/templates/ColdSpring/ColdSpring.xml

@@ -21 +21 @@
         <<cfset oMetaData.setSelectedTable(thisTable)>>
         <<cfset aRelManyToOne = oMetaData.getRelationshipsFromXML(thisTable,'manyToOne')>>
-        
         <<cfset aFields = oMetaData.getFieldsFromXML(thisTable)>>
-        
         <bean id="$$oMetaData.getSelectedTableAlias()$$Service" 
                         class="$$oMetaData.getDottedPath(arguments.DestinationFilePath,oMetaData.getProject(),oMetaData.getSelectedTableAlias())$$Service">
@@ -32 +30 @@
                 <constructor-arg name="$$oMetaData.getSelectedTableAlias()$$Gateway">
                         <ref bean="$$oMetaData.getSelectedTableAlias()$$Gateway" />
+                </constructor-arg>
+                
+                <constructor-arg name="$$oMetaData.getSelectedTableAlias()$$Validator">
+                        <ref bean="$$oMetaData.getSelectedTableAlias()$$Validator" />
+                </constructor-arg>
+                
+                <constructor-arg name="$$oMetaData.getSelectedTableAlias()$$Messages">
+                        <ref bean="$$oMetaData.getSelectedTableAlias()$$Messages" />
                 </constructor-arg>
         </bean>
@@ -49 +55 @@
         </bean>
         
+        <bean id="$$oMetaData.getSelectedTableAlias()$$Validator"
+                class="$$oMetaData.getDottedPath(arguments.DestinationFilePath,oMetaData.getProject(),oMetaData.getSelectedTableAlias())$$Validator">
+                <<cfloop from="1" to="$$arrayLen(aRelManyToOne)$$" index="i">>
+                <constructor-arg name="$$aRelManyToOne[i].Alias$$Service">
+                        <ref bean="$$aRelManyToOne[i].Alias$$Service" />
+                </constructor-arg><</cfloop>>
+                
+        </bean>
+        
+        <bean id="$$oMetaData.getSelectedTableAlias()$$Messages"
+                class="$$oMetaData.getDottedPath(arguments.DestinationFilePath,oMetaData.getProject(),oMetaData.getSelectedTableAlias())$$Messages">
+        </bean>
+        
         <bean id="$$oMetaData.getSelectedTableAlias()$$Record"
                 class="$$oMetaData.getDottedPath(arguments.DestinationFilePath,oMetaData.getProject(),oMetaData.getSelectedTableAlias())$$Record">
-                
                 <<!--- <<cfloop from="1" to="$$ArrayLen(aRelManyToOne)$$" index="i">>
                 <property name="$$aRelManyToOne[i].alias$$">
@@ -62 +80 @@
                 class="$$oMetaData.getDottedPath(arguments.DestinationFilePath,oMetaData.getProject(),oMetaData.getSelectedTableAlias())$$To">
         </bean>
-        
 <</cfloop>>
-        
 </beans>
 <</cfoutput>>

framework/trunk/scaffolder/templates/ColdSpring/accessors.cfc

@@ -45 +45 @@
 
         <!--- Fields from joined tables --->
-<<cfloop from="1" to="$$ArrayLen(aJoinedFields)$$" index="i">><<!--- Only add them if they have a unique name --->><<cfif ListFindNoCase(lFields,aJoinedFields[i].alias) EQ 0>><<cfset lFields = ListAppend(lFields, aJoinedFields[i].alias)>>
-        <cffunction name="set$$aJoinedFields[i].alias$$" access="package" returntype="void" output="false">
-                <cfargument name="$$aJoinedFields[i].alias$$" type="any" required="true" />
-                <cfset variables.instance.$$aJoinedFields[i].alias$$ = arguments.$$aJoinedFields[i].alias$$ />
+<<cfloop from="1" to="$$ArrayLen(aJoinedFields)$$" index="i">><<cfset lFields = ListAppend(lFields, aJoinedFields[i].alias)>>
+        <cffunction name="set$$aJoinedFields[i].table$$$$aJoinedFields[i].alias$$" access="package" returntype="void" output="false">
+                <cfargument name="$$aJoinedFields[i].table$$$$aJoinedFields[i].alias$$" type="any" required="true" />
+                <cfset variables.instance.$$aJoinedFields[i].table$$$$aJoinedFields[i].alias$$ = arguments.$$aJoinedFields[i].table$$$$aJoinedFields[i].alias$$ />
         </cffunction>
-        <cffunction name="get$$aJoinedFields[i].alias$$" access="public" returntype="any" output="false">
-                <cfreturn variables.instance.$$aJoinedFields[i].alias$$ />
-        </cffunction><</cfif>>
+        <cffunction name="get$$aJoinedFields[i].table$$$$aJoinedFields[i].alias$$" access="public" returntype="any" output="false">
+                <cfreturn variables.instance.$$aJoinedFields[i].table$$$$aJoinedFields[i].alias$$ />
+        </cffunction>
 <</cfloop>>