diff options
| author | Kyle Farris <kylefarris@gmail.com> | 2011-08-31 17:52:20 +0200 |
|---|---|---|
| committer | Kyle Farris <kylefarris@gmail.com> | 2011-08-31 17:52:20 +0200 |
| commit | 2de2fa022253597c8f5c807218be3aa05fac340e (patch) | |
| tree | 43f87056b43d4b75b5e8062d9ecdb84b28f8dc62 /system/database | |
| parent | 7611601875b619d8201633cf16a790b356182039 (diff) | |
Merged changes with development.
Diffstat (limited to 'system/database')
| -rw-r--r-- | system/database/DB_active_rec.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 46202224b..076cc7ce4 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -199,7 +199,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; @@ -664,7 +664,11 @@ class CI_DB_active_record extends CI_DB_driver { $v = $this->escape_like_str($v); - if ($side == 'before') + if ($side == 'none') + { + $like_statement = $prefix." $k $not LIKE '{$v}'"; + } + elseif ($side == 'before') { $like_statement = $prefix." $k $not LIKE '%{$v}'"; } @@ -1476,7 +1480,7 @@ class CI_DB_active_record extends CI_DB_driver { { if ($this->db_debug) { - return $this->display_error('db_myst_use_index'); + return $this->display_error('db_must_use_index'); } return FALSE; @@ -2233,4 +2237,4 @@ class CI_DB_active_record extends CI_DB_driver { } /* End of file DB_active_rec.php */ -/* Location: ./system/database/DB_active_rec.php */ +/* Location: ./system/database/DB_active_rec.php */
\ No newline at end of file |