Reverts code for #89.

cfwheels · Aug 20, 2014 · 26f827b · 26f827b
1 parent b036610
commit 26f827b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/wheels/CHANGELOG b/wheels/CHANGELOG
@@ -17,7 +17,6 @@ Bug Fixes
 * Fixed bug with static caching on Adobe ColdFusion 9 - #332 [Charley Contreras]
 * Allow for format auto-detection when HTTP ACCEPT contains multiple values - #297 [Raul Riera, Singgih Cahyono] 
 * Fixed so that sendEmail() can use the "remove" attribute to delete attachments - #339 [Simon Allard]
-* Fixed issue with using group by with calculated properties - #89 [Adam Chapman, Per Djurner]
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 

diff --git a/wheels/model/sql.cfm b/wheels/model/sql.cfm
@@ -175,18 +175,15 @@
 		// if we want a distinct statement, we can do it grouping every field in the select
 		if (arguments.distinct)
 		{
-			loc.returnValue = $createSQLFieldList(list=arguments.select, include=arguments.include, returnAs=arguments.returnAs, renameFields=false, addCalculatedProperties=true);
+			loc.returnValue = $createSQLFieldList(list=arguments.select, include=arguments.include, returnAs=arguments.returnAs, renameFields=false, addCalculatedProperties=false);
 		}
 		else if (Len(arguments.group))
 		{
-			loc.returnValue = $createSQLFieldList(list=arguments.group, include=arguments.include, returnAs=arguments.returnAs, renameFields=false, addCalculatedProperties=true);
+			loc.returnValue = $createSQLFieldList(list=arguments.group, include=arguments.include, returnAs=arguments.returnAs, renameFields=false, addCalculatedProperties=false);
 		}
 		if (Len(loc.returnValue))
 		{
 			loc.returnValue = "GROUP BY " & loc.returnValue;
-			// this is a little ugly because I want to contain any possible issues to group by for 1.3.x releases
-			// for 2.0.x we should probably strip out the " AS x" part in the $createSQLFieldList function instead
-			loc.returnValue = REReplaceNoCase(loc.returnValue, " AS [a-z0-9-_]*", "", "all");
 		}
 	</cfscript>
 	<cfreturn loc.returnValue>

diff --git a/wheels/tests/_assets/models/User2.cfc b/wheels/tests/_assets/models/User2.cfc
@@ -3,8 +3,9 @@
 	<cffunction name="init">
 		<cfset settablenameprefix("tbl")>
 		<cfset table("users")>
-		<cfset property(name="firstLetter", sql="SUBSTRING(tblusers.username, 1, 1)")>
-		<cfset property(name="groupCount", sql="COUNT(tblusers.id)")>
+		<!--- uncomment for testing "test_group_by_calculated_property" --->
+		<!--- <cfset property(name="firstLetter", sql="SUBSTRING(tblusers.username, 1, 1)")>
+		<cfset property(name="groupCount", sql="COUNT(tblusers.id)")> --->
 	</cffunction>
 
 </cfcomponent>
diff --git a/wheels/tests/model/crud/group.cfc b/wheels/tests/model/crud/group.cfc
@@ -5,10 +5,10 @@
 		<cfset assert('loc.r.recordcount eq 4')>
 	</cffunction>
 
-	<cffunction name="test_group_by_calculated_property">
+	<!--- <cffunction name="test_group_by_calculated_property">
 		<cfset loc.r = model("user2").findAll(select="firstLetter, groupCount", group="firstLetter", order="groupCount DESC")>
 		<cfset assert('loc.r.recordcount eq 2')>
-	</cffunction>
+	</cffunction> --->
 
 	<cffunction name="test_distinct_works_with_group_by">
 		<cfset loc.r = model("post").findAll(select="views", distinct=true)>