Merge pull request #963 from hamiltont/cake-682

Using ORM instead of RAW in cakephp

cakephp/app/Controller/FortunesController.php

@@ -9,15 +9,15 @@ class FortunesController extends AppController {
 		$this->layout = 'benchmark';
 		$this->set('title_for_layout', 'Fortunes');
 
-		// using prepared query as encouraged by test rules
-		$db      = $this->Fortune->getDataSource();
-		$results = $db->fetchAll('SELECT * FROM Fortune');
+		// using ORM instead of raw SQL
+		$this->loadModel('Fortune');
+		$results = $this->Fortune->find('all');
 
 		// stuffing in the dynamic data
-		$results[]['Fortune'] = [
+		$results[]['Fortune'] = array(
 			'id'      => 0,
 			'message' => 'Additional fortune added at request time.'
-		];
+		);
 
 		// because we are performance concerned we don't use Hash::sort()
 		foreach ($results as $result) {

cakephp/app/Model/World.php

@@ -1,6 +1,5 @@
 <?php
 class World extends AppModel {
-  public $useTable = 'world'; // This model uses a database table 'world'
+  public $useTable = 'World'; // This model uses a database table 'World'
   public $primaryKey = 'id';
 }
-?>

php/models/World.php

@@ -1,6 +1,6 @@
 <?php
 class World extends ActiveRecord\Model
 {
-  static $table_name = 'world';
+  static $table_name = 'World';
 }
-?>
+