Merge pull request #1486 from cfwheels/architecture-3.0

bpamiri · web-flow · commit c6f78a328f7d · 2025-01-28T18:48:49.000-08:00
diff --git a/vendor/wheels/model/sql.cfc b/vendor/wheels/model/sql.cfc
@@ -282,9 +282,10 @@ component {
 			local.rv = "";
 			local.addedProperties = "";
 			local.addedPropertiesByModel = {};
-			local.iEnd = ListLen(arguments.list);
+			local.selectArray = $splitByCommasOutsideFunctions(arguments.list);
+			local.iEnd = arrayLen(local.selectArray);
 			for (local.i = 1; local.i <= local.iEnd; local.i++) {
-				local.iItem = Trim(ListGetAt(arguments.list, local.i));
+				local.iItem = Trim(local.selectArray[i]);
 
 				// look for duplicates
 				local.duplicateCount = ListValueCountNoCase(local.addedProperties, local.iItem);
@@ -920,4 +921,45 @@ component {
 		}
 		return local.rv;
 	}
+
+	public array function $splitByCommasOutsideFunctions(required string list) {
+		local.rv = [];
+		local.temp = "";
+		local.insideFunction = false;
+		local.bracketCount = 0;
+
+		for (i = 1; i <= len(arguments.list); i++) {
+			local.char = mid(arguments.list, i, 1);
+
+			// Check if we are entering or exiting a function's parentheses
+			if (local.char == "(") {
+				local.bracketCount++;
+			} else if (local.char == ")") {
+				local.bracketCount--;
+			}
+
+			// Determine if we are inside a function (any content enclosed by parentheses)
+			if (local.bracketCount > 0) {
+				local.insideFunction = true;
+			} else if (local.bracketCount == 0) {
+				local.insideFunction = false;
+			}
+
+			// Split based on commas outside functions
+			if (local.char == "," && !local.insideFunction) {
+				arrayAppend(local.rv, trim(local.temp));
+				local.temp = "";
+			} else {
+				local.temp &= local.char;
+			}
+		}
+
+		// Append the final segment
+		if (len(trim(local.temp))) {
+			arrayAppend(local.rv, trim(local.temp));
+		}
+
+		return local.rv;
+	}
+
 }
diff --git a/vendor/wheels/tests/model/validations/conditional_validations.cfc b/vendor/wheels/tests/model/validations/conditional_validations.cfc
@@ -1,7 +1,7 @@
 component extends="wheels.tests.Test" {
 
 	function setup() {
-		user = CreateObject("component", "wheels.tests._assets.models.Model").$initModelClass(
+		user = application.wirebox.getInstance( "wheels.tests._assets.models.Model" ).$initModelClass(
 			name = "Users",
 			path = get("modelPath")
 		);
diff --git a/vendor/wheels/tests/plugins/dependant.cfc b/vendor/wheels/tests/plugins/dependant.cfc
@@ -6,7 +6,7 @@ component extends="wheels.tests.Test" {
 		config = {
 			path = "wheels",
 			fileName = "Plugins",
-			method = "init",
+			method = "$init",
 			pluginPath = "/wheels/tests/_assets/plugins/standard",
 			deletePluginDirectories = false,
 			overwritePlugins = false,
diff --git a/vendor/wheels/tests/plugins/injection.cfc b/vendor/wheels/tests/plugins/injection.cfc
@@ -6,7 +6,7 @@ component extends="wheels.tests.Test" {
 		config = {
 			path = "wheels",
 			fileName = "Plugins",
-			method = "init",
+			method = "$init",
 			pluginPath = "/wheels/tests/_assets/plugins/standard",
 			deletePluginDirectories = false,
 			overwritePlugins = false,
@@ -18,7 +18,7 @@ component extends="wheels.tests.Test" {
 		_params = {controller = "test", action = "index"};
 		c = controller("test", _params);
 		d = $createObjectFromRoot(path = "wheels", fileName = "Dispatch", method = "$init");
-		t = CreateObject("component", "wheels.Test");
+		t = application.wirebox.getInstance("wheels.Test");
 	}
 
 	function teardown() {
diff --git a/vendor/wheels/tests/plugins/overwriting.cfc b/vendor/wheels/tests/plugins/overwriting.cfc
@@ -6,7 +6,7 @@ component extends="wheels.tests.Test" {
 		config = {
 			path = "wheels",
 			fileName = "Plugins",
-			method = "init",
+			method = "$init",
 			pluginPath = "/wheels/tests/_assets/plugins/overwriting",
 			deletePluginDirectories = false,
 			overwritePlugins = true,
diff --git a/vendor/wheels/tests/plugins/removing.cfc b/vendor/wheels/tests/plugins/removing.cfc
@@ -6,7 +6,7 @@ component extends="wheels.tests.Test" {
 		config = {
 			path = "wheels",
 			fileName = "Plugins",
-			method = "init",
+			method = "$init",
 			pluginPath = "/wheels/tests/_assets/plugins/removing",
 			deletePluginDirectories = true,
 			overwritePlugins = false,
diff --git a/vendor/wheels/tests/plugins/runner.cfc b/vendor/wheels/tests/plugins/runner.cfc
@@ -18,7 +18,7 @@ component extends="wheels.tests.Test" {
 		config = {
 			path = "wheels",
 			fileName = "Plugins",
-			method = "init",
+			method = "$init",
 			pluginPath = "/wheels/tests/_assets/plugins/runner",
 			deletePluginDirectories = false,
 			overwritePlugins = false,
diff --git a/vendor/wheels/tests/plugins/standard.cfc b/vendor/wheels/tests/plugins/standard.cfc
@@ -6,7 +6,7 @@ component extends="wheels.tests.Test" {
 		config = {
 			path = "wheels",
 			fileName = "Plugins",
-			method = "init",
+			method = "$init",
 			pluginPath = "/wheels/tests/_assets/plugins/standard",
 			deletePluginDirectories = false,
 			overwritePlugins = false,
diff --git a/vendor/wheels/tests/plugins/unpacking.cfc b/vendor/wheels/tests/plugins/unpacking.cfc
@@ -6,7 +6,7 @@ component extends="wheels.tests.Test" {
 		config = {
 			path = "wheels",
 			fileName = "Plugins",
-			method = "init",
+			method = "$init",
 			pluginPath = "/wheels/tests/_assets/plugins/unpacking",
 			deletePluginDirectories = false,
 			overwritePlugins = false,
diff --git a/vendor/wheels/tests/view/forms/checkbox.cfc b/vendor/wheels/tests/view/forms/checkbox.cfc
@@ -1,7 +1,7 @@
 component extends="wheels.tests.Test" {
 
 	function setup() {
-		_controller = CreateObject("component", "wheels.tests._assets.controllers.ControllerWithModel");
+		_controller = application.wirebox.getInstance("wheels.tests._assets.controllers.ControllerWithModel");
 		args = {};
 		args.objectName = "user";
 		args.label = false;
diff --git a/vendor/wheels/tests/view/forms/label.cfc b/vendor/wheels/tests/view/forms/label.cfc
@@ -1,8 +1,7 @@
 component extends="wheels.tests.Test" {
 
-	include "/wheels/view/functions.cfm";
-
 	function setup() {
+		_controller = controller(name = "ControllerWithModel");
 		set(functionName = "checkBoxTag", encode = false);
 		set(functionName = "textField", encode = false);
 		set(functionName = "textFieldTag", encode = false);
@@ -17,35 +16,35 @@ component extends="wheels.tests.Test" {
 	/* plain helpers */
 
 	function test_label_to_the_left() {
-		actual = checkBoxTag(name = "the-name", label = "The Label:");
+		actual = _controller.checkBoxTag(name = "the-name", label = "The Label:");
 		expected = '<label for="the-name-1">The Label:<input id="the-name-1" name="the-name" type="checkbox" value="1"></label>';
 		assert('actual eq expected');
-		actual = checkBoxTag(name = "the-name", label = "The Label:", labelPlacement = "around");
+		actual = _controller.checkBoxTag(name = "the-name", label = "The Label:", labelPlacement = "around");
 		assert('actual eq expected');
-		actual = checkBoxTag(name = "the-name", label = "The Label:", labelPlacement = "aroundLeft");
+		actual = _controller.checkBoxTag(name = "the-name", label = "The Label:", labelPlacement = "aroundLeft");
 		assert('actual eq expected');
 	}
 
 	function test_label_to_the_right() {
-		actual = checkBoxTag(name = "the-name", label = "The Label", labelPlacement = "aroundRight");
+		actual = _controller.checkBoxTag(name = "the-name", label = "The Label", labelPlacement = "aroundRight");
 		expected = '<label for="the-name-1"><input id="the-name-1" name="the-name" type="checkbox" value="1">The Label</label>';
 		assert('actual eq expected');
 	}
 
 	function test_custom_label_on_plain_helper() {
-		actual = checkBoxTag(name = "the-name", label = "The Label:");
+		actual = _controller.checkBoxTag(name = "the-name", label = "The Label:");
 		expected = '<label for="the-name-1">The Label:<input id="the-name-1" name="the-name" type="checkbox" value="1"></label>';
 		assert('actual eq expected');
 	}
 
 	function test_custom_label_on_plain_helper_and_overriding_id() {
-		actual = checkBoxTag(name = "the-name", label = "The Label:", id = "the-id");
+		actual = _controller.checkBoxTag(name = "the-name", label = "The Label:", id = "the-id");
 		expected = '<label for="the-id">The Label:<input id="the-id" name="the-name" type="checkbox" value="1"></label>';
 		assert('actual eq expected');
 	}
 
 	function test_blank_label_on_plain_helper() {
-		actual = textFieldTag(name = "the-name", label = "");
+		actual = _controller.textFieldTag(name = "the-name", label = "");
 		expected = '<input id="the-name" name="the-name" type="text" value="">';
 		assert('actual eq expected');
 	}
@@ -54,56 +53,49 @@ component extends="wheels.tests.Test" {
 	/* object based helpers */
 
 	function test_custom_label_on_object_helper() {
-		tag = model("tag").findOne(order = "id");
-		actual = textField(objectName = "tag", property = "name", label = "The Label:");
-		expected = '<label for="tag-name">The Label:<input id="tag-name" maxlength="50" name="tag[name]" type="text" value="releases"></label>';
+		actual = _controller.textField(objectName = "user", property = "username", label = "The Label:");
+		expected = '<label for="user-username">The Label:<input id="user-username" maxlength="50" name="user[username]" type="text" value="tonyp"></label>';
 		assert('actual eq expected');
 	}
 
 	function test_custom_label_on_object_helper_and_overriding_id() {
-		tag = model("tag").findOne(order = "id");
-		actual = textField(
-			objectName = "tag",
-			property = "name",
+		actual = _controller.textField(
+			objectName = "user",
+			property = "username",
 			label = "The Label:",
 			id = "the-id"
 		);
-		expected = '<label for="the-id">The Label:<input id="the-id" maxlength="50" name="tag[name]" type="text" value="releases"></label>';
+		expected = '<label for="the-id">The Label:<input id="the-id" maxlength="50" name="user[username]" type="text" value="tonyp"></label>';
 		assert('actual eq expected');
 	}
 
 	function test_blank_label_on_object_helper() {
-		tag = model("tag").findOne(order = "id");
-		actual = textField(objectName = "tag", property = "name", label = "");
-		expected = '<input id="tag-name" maxlength="50" name="tag[name]" type="text" value="releases">';
+		actual = _controller.textField(objectName = "user", property = "username", label = "");
+		expected = '<input id="user-username" maxlength="50" name="user[username]" type="text" value="tonyp">';
 		assert('actual eq expected');
 	}
 
 	function test_automatic_label_on_object_helper_with_around_placement() {
-		tag = model("tag").findOne(order = "id");
-		actual = textField(objectName = "tag", property = "name", labelPlacement = "around");
-		expected = '<label for="tag-name">Tag name<input id="tag-name" maxlength="50" name="tag[name]" type="text" value="releases"></label>';
+		actual = _controller.textField(objectName = "user", property = "username", labelPlacement = "around");
+		expected = '<label for="user-username">Username<input id="user-username" maxlength="50" name="user[username]" type="text" value="tonyp"></label>';
 		assert('actual eq expected');
 	}
 
 	function test_automatic_label_on_object_helper_with_before_placement() {
-		tag = model("tag").findOne(order = "id");
-		actual = textField(objectName = "tag", property = "name", labelPlacement = "before");
-		expected = '<label for="tag-name">Tag name</label><input id="tag-name" maxlength="50" name="tag[name]" type="text" value="releases">';
+		actual = _controller.textField(objectName = "user", property = "username", labelPlacement = "before");
+		expected = '<label for="user-username">Username</label><input id="user-username" maxlength="50" name="user[username]" type="text" value="tonyp">';
 		assert('actual eq expected');
 	}
 
 	function test_automatic_label_on_object_helper_with_after_placement() {
-		tag = model("tag").findOne(order = "id");
-		actual = textField(objectName = "tag", property = "name", labelPlacement = "after");
-		expected = '<input id="tag-name" maxlength="50" name="tag[name]" type="text" value="releases"><label for="tag-name">Tag name</label>';
+		actual = _controller.textField(objectName = "user", property = "username", labelPlacement = "after")
+		expected = '<input id="user-username" maxlength="50" name="user[username]" type="text" value="tonyp"><label for="user-username">Username</label>'
 		assert('actual eq expected');
 	}
 
 	function test_automatic_label_on_object_helper_with_non_persisted_property() {
-		tag = model("tag").findOne(order = "id");
-		actual = textField(objectName = "tag", property = "virtual");
-		expected = '<label for="tag-virtual">Virtual property<input id="tag-virtual" name="tag[virtual]" type="text" value=""></label>';
+		actual = _controller.textField(objectName = "user", property = "virtual");
+		expected = '<label for="user-virtual">Virtual<input id="user-virtual" name="user[virtual]" type="text" value=""></label>';
 		assert('actual eq expected');
 	}
 
diff --git a/vendor/wheels/tests/view/forms/yearSelect.cfc b/vendor/wheels/tests/view/forms/yearSelect.cfc
@@ -1,7 +1,7 @@
 component extends="wheels.tests.Test" {
 
 	function setup() {
-		_controller = CreateObject("component", "wheels.tests._assets.controllers.ControllerWithModel");
+		_controller = application.wirebox.getInstance("wheels.tests._assets.controllers.ControllerWithModel");
 		args = {};
 		args.objectName = "user";
 		args.property = "birthday";
diff --git a/vendor/wheels/tests/view/miscellaneous/getobject.cfc b/vendor/wheels/tests/view/miscellaneous/getobject.cfc
@@ -1,22 +1,24 @@
 component extends="wheels.tests.Test" {
 
-	include "/wheels/view/miscellaneous.cfm";
+	function setup(){
+		_controller = application.wirebox.getInstance( "wheels.Controller" );
+	}
 
 	function test_getting_object_from_request_scope() {
 		request.obj = model("post").findOne();
-		result = $getObject("request.obj");
+		result = _controller.$getObject( objectname = "request.obj", variableScope = variables );
 		assert("IsObject(result)");
 	}
 
 	function test_getting_object_from_default_scope() {
 		obj = model("post").findOne();
-		result = $getObject("obj");
+		result = _controller.$getObject( objectname = "obj", variableScope = variables );
 		assert("IsObject(result)");
 	}
 
 	function test_getting_object_from_variables_scope() {
 		variables.obj = model("post").findOne();
-		result = $getObject("variables.obj");
+		result = _controller.$getObject( objectname = "variables.obj", variableScope = variables );
 		assert("IsObject(result)");
 	}
 
diff --git a/vendor/wheels/tests_testbox/specs/model/sql.cfc b/vendor/wheels/tests_testbox/specs/model/sql.cfc
@@ -113,6 +113,20 @@ component extends="testbox.system.BaseSpec" {
 
 				expect(actual.recordcount).toBeGT(0)
 			})
+
+			it( "CONCAT works with table alias", function(){
+				actual = g.model("user").findAll(where = "username='tonyp'", select = "CONCAT(users.firstname,' ',users.lastname) as fullname")
+
+				expect(	actual.fullname ).toBe("Tony Petruzzi")
+			});
+
+			it( "CONCAT fails without table alias", function(){
+
+				expect(	function(){
+					g.model("user").findAll(where = "username='tonyp'", select = "CONCAT(firstname,' ',lastname) as fullname")
+				}).toThrow("Wheels.ColumnNotFound");
+
+			});
 		})
 	}
 }
