diff options
author | dchill42 <dchill42@gmail.com> | 2012-10-10 14:16:39 +0200 |
---|---|---|
committer | dchill42 <dchill42@gmail.com> | 2012-10-10 14:16:39 +0200 |
commit | 2716398bd2f2ae36d7420c591fc759e0951ba0e2 (patch) | |
tree | 3845d6bacc5660559740a8eddd43210bbb14fefd /system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php | |
parent | eeb6a480a4a25b7fe96e9ba0cf3aef273fd13c67 (diff) | |
parent | e8bc5f4450381b4f978f274f3e93604301115b64 (diff) |
Merge branch 'develop' of github.com:/EllisLab/CodeIgniter into load_config_units
Diffstat (limited to 'system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php')
-rw-r--r-- | system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php b/system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php index 78afe246c..42446889a 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php +++ b/system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php @@ -44,10 +44,6 @@ class CI_DB_pdo_mysql_driver extends CI_DB_pdo_driver { protected $_escape_char = '`'; - // clause and character used for LIKE escape sequences - not used in MySQL - protected $_like_escape_str = ''; - protected $_like_escape_chr = '\\'; - protected $_random_keyword = ' RAND()'; /** @@ -211,6 +207,26 @@ class CI_DB_pdo_mysql_driver extends CI_DB_pdo_driver { return 'TRUNCATE '.$table; } + // -------------------------------------------------------------------- + + /** + * FROM tables + * + * Groups tables in FROM clauses if needed, so there is no confusion + * about operator precedence. + * + * @return string + */ + protected function _from_tables() + { + if ( ! empty($this->qb_join) && count($this->qb_from) > 1) + { + return '('.implode(', ', $this->qb_from).')'; + } + + return implode(', ', $this->qb_from); + } + } /* End of file pdo_mysql_driver.php */ |