Fix _findByCondition() scope

Author: yidas

README.md

@@ -38,7 +38,7 @@ OUTLINE
   - [Timestamps](#timestamps)
   - [Database Connection](#database-connection)
 - [Basic Usage](#basic-usage)
-  - [Methods](#method)
+  - [Methods](#methods)
     - [find()](#find)
       - [Query Builder Implementation](#query-builder-implementation)
     - [reset()](#reset)
@@ -56,7 +56,7 @@ OUTLINE
   - [Updates](#update)
   - [Deletes](#deletes)
   - [Accessing Data](#accessing-data)
-  - [Methods](#method-1)
+  - [Methods](#methods-1)
     - [findone()](#findone)
     - [findAll()](#findall)
     - [save()](#save)
@@ -105,7 +105,7 @@ The Model would defined database coonnections and table itself.
 ```php
 $records = $this->Posts_model->find()
   ->where('is_public', '1')
-  ->limit(0,25)
+  ->limit(25)
   ->order_by('id')
   ->get()
   ->result_array();
@@ -340,7 +340,7 @@ Create an existent CI Query Builder instance with Model features for query purpo
 ```php
 $records = $this->Model->find()
     ->where('is_public', '1')
-    ->limit(0,25)
+    ->limit(25)
     ->order_by('id')
     ->get()
     ->result_array();

src/Model.php

@@ -6,7 +6,7 @@
  * Base Model
  *
  * @author   Nick Tsai <myintaer@gmail.com>
- * @version  2.9.0
+ * @version  2.9.1
  * @see      https://github.com/yidas/codeigniter-model
  */
 class Model extends \CI_Model implements \ArrayAccess
@@ -992,10 +992,12 @@ protected function _findByCondition($condition=NULL)
         // Reset Query if condition existed
         if ($condition) {
             $this->_dbr->reset_query();
+            $query = $this->find();
+        } else {
+            // Support for previous find(), no need to find() again
+            $query = $this->_dbr;
         }
 
-        $query = $this->find();
-
         // Check condition type
         if (is_array($condition)) {
 
@@ -1018,6 +1020,12 @@ protected function _findByCondition($condition=NULL)
             /* Single Primary Key */
             $query->where($this->_field($this->primaryKey), $condition);
         }
+        else {
+            // No condition situation needs to enable where protection
+            $sql = $this->_dbr->get_compiled_select('', false); // No reset query
+            if (stripos($sql, 'where')===false)
+                throw new Exception("You could not write Model without any condition! Use ->where('1') at least.", 400);
+        }
 
         return $query;
     }