adding default order on id to CakeTestModel, to ensure correct order.…

… Postgres can return results in any order it considers appropriate if none specified
cakephp · Nov 22, 2011 · 05940ae · 05940ae · markstory · Nov 24, 2011
1 parent f57c287
commit 05940ae
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/lib/Cake/Test/Case/Model/ModelReadTest.php b/lib/Cake/Test/Case/Model/ModelReadTest.php
@@ -6082,6 +6082,7 @@ public function testBuildQuery() {
 		$this->loadFixtures('User');
 		$TestModel = new User();
 		$TestModel->cacheQueries = false;
+		$TestModel->order = null;
 
 		$expected = array(
 			'conditions' => array(

diff --git a/lib/Cake/TestSuite/Fixture/CakeTestModel.php b/lib/Cake/TestSuite/Fixture/CakeTestModel.php
@@ -27,4 +27,21 @@
 class CakeTestModel extends Model {
 	public $useDbConfig = 'test';
 	public $cacheSources = false;
+
+/**
+ * Constructor, sets default order for the model to avoid failing tests caused by
+ * incorrect order when no order has been defined in the finds.
+ * Postgres can return the results in any order it considers appropriate if none is specified
+ *
+ * @param mixed $id Set this ID for this model on startup, can also be an array of options, see Model::__construct().
+ * @param string $table Name of database table to use.
+ * @param string $ds DataSource connection name.
+ */
+	function __construct($id = false, $table = null, $ds = null) {
+		parent::__construct($id, $table, $ds);
+		if ($this->useTable && $this->primaryKey && $this->schema($this->primaryKey)) {
+			$this->order = array($this->alias . '.' . $this->primaryKey => 'ASC');
+		}
+	}
+
 }