Revert "Test Case Implement"

This reverts commit 931d719.

Conflicts:

	core/MY_Model.php

Author: jamierumbelow

core/MY_Model.php

@@ -103,10 +103,10 @@ public function __construct()
 
         $this->load->helper('inflector');
 
-        $this->_database = $this->db;
-
         $this->_fetch_table();
 
+        $this->_database = $this->db;
+
         array_unshift($this->before_create, 'protect_attributes');
         array_unshift($this->before_update, 'protect_attributes');
 
@@ -611,14 +611,6 @@ public function table()
         return $this->_table;
     }
 
-    /**
-     * Getter for the primary key
-     */
-    public function primary_key()
-    {
-        return $this->primary_key;
-    }
-
     /* --------------------------------------------------------------
      * GLOBAL SCOPES
      * ------------------------------------------------------------ */
@@ -871,7 +863,7 @@ private function _fetch_table()
     /**
      * Guess the primary key for current table
      */
-    protected function _fetch_primary_key()
+    private function _fetch_primary_key()
     {
         if($this->primary_key == NULl)
         {

tests/MY_Model_test.php

@@ -41,24 +41,6 @@ public function test_constructor_guesses_the_table_name()
         $this->assertEquals($this->model->table(), 'records');
     }
 
-    public function test_constructor_guess_the_primary_key()
-    {
-        $this->model = new Book_model($this->model->_database, 'id');
-
-        $this->model->_database->expects($this->once())
-            ->method('query')
-            ->with($this->equalTo("SHOW KEYS FROM `books` WHERE Key_name = 'PRIMARY'"))
-            ->will($this->returnValue($this->model->_database))
-        ;
-        $this->model->_database->expects($this->once())
-            ->method('row')
-            ->will($this->returnValue((object)array('Column_name'=>'fake_primary_key')));
-
-        $this->model = $this->model->__construct($this->model->_database);
-
-        $this->assertEquals($this->model->primary_key(), 'fake_primary_key');
-    }
-
     /* --------------------------------------------------------------
      * CRUD INTERFACE
      * ------------------------------------------------------------ */

tests/support/database.php

@@ -31,7 +31,6 @@ public function limit() { }
     public function count_all_results() { }
     public function count_all() { }
     public function truncate() { }
-    public function query() { }
 
     /**
      * CI_DB_Result

tests/support/models/after_callback_model.php

@@ -18,7 +18,6 @@ class After_callback_model extends MY_Model
     protected $after_update = array('test_throw');
     protected $after_get = array('test_data_callback', 'test_data_callback_two');
     protected $after_delete = array('test_throw');
-    protected $primary_key = 'id';
 
     protected function test_throw($row)
     {

tests/support/models/before_callback_model.php

@@ -18,7 +18,6 @@ class Before_callback_model extends MY_Model
     protected $before_update = array('test_data_callback', 'test_data_callback_two');
     protected $before_get = array('test_throw');
     protected $before_delete = array('test_throw');
-    protected $primary_key = 'id';
 
     protected function test_throw($row)
     {

tests/support/models/book_model.php

@@ -15,7 +15,6 @@
 class Callback_parameter_model extends MY_Model
 {
 	public $callback = array('some_callback(some_param,another_param)');
-    protected $primary_key = 'id';
 
 	public function some_method()
 	{

tests/support/models/callback_parameter_model.php

@@ -14,5 +14,4 @@
 class Protected_attributes_model extends MY_Model
 {
 	public $protected_attributes = array( 'id', 'hash' );
-    protected $primary_key = 'id';
 }

tests/support/models/protected_attributes_model.php

@@ -1,5 +1,3 @@
 <?php
 
-class Record_model extends MY_Model {
-    protected $primary_key = 'id';
-}
+class Record_model extends MY_Model { }

tests/support/models/record_model.php

@@ -15,11 +15,9 @@ class Belongs_to_model extends MY_Model
 {
     public $belongs_to = array( 'author' );
     public $has_many = array( 'comments' );
-    protected $primary_key = 'id';
 }
 
 class Author_model extends MY_Model
 {
     protected $_table = 'authors';
-    protected $primary_key = 'id';
 }