summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Aker <greg@gregaker.net>2011-08-21 21:44:20 +0200
committerGreg Aker <greg@gregaker.net>2011-08-21 21:44:20 +0200
commitbf53a06961bd1ccc0f46a1e3d19c05da48fb2cad (patch)
tree2b8717e3bfa3bd1961e95375b66d605d3d2fb2cc
parent151b7a9abed49e76232ad195cc2c010bfc82f22a (diff)
parent5137766f2b59daa2d5f99eda0833a950ab2eaf61 (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
-rw-r--r--system/database/DB_active_rec.php2
-rw-r--r--user_guide/changelog.html3
-rw-r--r--user_guide/database/active_record.html7
3 files changed, 11 insertions, 1 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index 841ede28e..37d162bc1 100644
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -196,7 +196,7 @@ class CI_DB_active_record extends CI_DB_driver {
$alias = $this->_create_alias_from_table(trim($select));
}
- $sql = $type.'('.$this->_protect_identifiers(trim($select)).') AS '.$alias;
+ $sql = $type.'('.$this->_protect_identifiers(trim($select)).') AS '.$this->_protect_identifiers(trim($alias));
$this->ar_select[] = $sql;
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 15872c1ac..bb05f99e1 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -78,6 +78,9 @@ Change Log
<ul>
<li class="reactor">Added a <a href="http://www.cubrid.org/" target="_blank">CUBRID</a> driver to the <a href="libraries/database.html">Database Driver</a>. Thanks to the CUBRID team for supplying this patch.</li>
<li class="reactor">Typecast limit and offset in the <a href="database/queries.html">Database Driver</a> to integers to avoid possible injection.</li>
+ <li class="reactor">
+ Added additional option 'none' for the optional third argument for <kbd>$this->db->like()</kbd> in the <a href="database/active_record.html">Database Driver</a>.
+ </li>
</ul>
</li>
<li>Libraries
diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html
index 6609d287e..92d9614d5 100644
--- a/user_guide/database/active_record.html
+++ b/user_guide/database/active_record.html
@@ -334,6 +334,13 @@ $this->db->or_where('id >', $id);
$this-&gt;db-&gt;like('title', 'match', 'both'); <br />
// Produces: WHERE title LIKE '%match%' </code> </li>
+If you do not want to use the wildcard (%) you can pass to the optional third argument the option 'none'.
+
+<code>
+ $this-&gt;db-&gt;like('title', 'match', 'none'); <br />
+// Produces: WHERE title LIKE 'match'
+</code>
+
<li><strong>Associative array method:</strong>
<code>