Merge pull request #1327 from chapmandu/issue-1319-model-datasource-bug

issue #1319 model datasource bug

box.json

@@ -1,6 +1,6 @@
 {
     "name":"CFWheels",
-    "version":"2.5.0",
+    "version":"2.5.1",
     "author":"CFWheels Core Team and Community",
     "shortDescription":"CFWheels MVC Framework Core Directory",
     "location":"ForgeboxStorage",

wheels/model/read.cfm

@@ -47,7 +47,7 @@ public any function findAll(
 	boolean callbacks = "true",
 	boolean includeSoftDeletes = "false",
 	struct useIndex = {},
-	string dataSource = application.wheels.dataSourceName,
+	string dataSource = variables.wheels.class.dataSource,
 	numeric $limit = "0",
 	numeric $offset = "0"
 ) {
@@ -396,7 +396,7 @@ public any function findByKey(
 	string returnAs,
 	boolean callbacks = "true",
 	boolean includeSoftDeletes = "false",
-	string dataSource = application.wheels.dataSourceName
+	string dataSource = variables.wheels.class.dataSource
 ) {
 	$args(name = "findByKey", args = arguments);
 	$setDebugName(name = "FindByKey", args = arguments);
@@ -445,7 +445,7 @@ public any function findOne(
 	string returnAs,
 	boolean includeSoftDeletes = "false",
 	struct useIndex = {},
-	string dataSource = application.wheels.dataSourceName
+	string dataSource = variables.wheels.class.dataSource
 ) {
 	$args(name = "findOne", args = arguments);
 	$setDebugName(name = "findOne", args = arguments);

wheels/tests/_assets/models/AuthorAlternateDatasource.cfc

@@ -0,0 +1,8 @@
+component extends="Model" {
+
+	function config() {
+		table("authors");
+		dataSource("wheelstestdb_h2");
+	}
+
+}

wheels/tests/model/read/datasource.cfc

@@ -34,6 +34,17 @@ component extends="wheels.tests.Test" {
 		finderArgs = {where = "firstName = '#firstName#'", datasource = altDatasource};
 	}
 
+	function test_findall_respects_model_config_datasource() {
+		if (!isTestable) return;
+		transaction {
+			this.db_setup();
+			// ensure this is using the wheelstestdb_h2 as defined in the model config
+			actual = model("AuthorAlternateDatasource").findAll(where = "firstName = '#firstName#'");
+			TransactionRollback();
+		}
+		assert("actual.recordCount");
+	}
+
 	function test_findall_with_datasource_argument() {
 		if (!isTestable) return;
 		transaction {