diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-10-12 10:56:34 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-10-12 10:56:34 +0200 |
| commit | bffe3fb935c8a28e1ccacf56f678a491edcff043 (patch) | |
| tree | 5a39ba6907623d5ad46b7d13ef17e360df1dfe5e /system/database/DB_query_builder.php | |
| parent | 55b82c95be57a6727d45d6ae9652ff612f96bc37 (diff) | |
| parent | 9ae82faaad2f6b07a050d79129652b74483d1da0 (diff) | |
Merge changes from develop
Diffstat (limited to 'system/database/DB_query_builder.php')
| -rw-r--r-- | system/database/DB_query_builder.php | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php index 416132e16..139f467e6 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -1483,19 +1483,18 @@ abstract class CI_DB_query_builder extends CI_DB_driver { // -------------------------------------------------------------------- /** - * From Tables + * FROM tables * - * This public function implicitly groups FROM tables so there is no confusion - * about operator precedence in harmony with SQL standards + * Groups tables in FROM clauses if needed, so there is no confusion + * about operator precedence. * - * @param array - * @return string + * Note: This is only used (and overriden) by MySQL and CUBRID. + * + * @return string */ - protected function _from_tables($tables) + protected function _from_tables() { - is_array($tables) OR $tables = array($tables); - - return (count($tables) === 1) ? $tables[0] : '('.implode(', ', $tables).')'; + return implode(', ', $this->qb_from); } // -------------------------------------------------------------------- @@ -2010,7 +2009,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver { // Write the "FROM" portion of the query if (count($this->qb_from) > 0) { - $sql .= "\nFROM ".$this->_from_tables($this->qb_from); + $sql .= "\nFROM ".$this->_from_tables(); } // Write the "JOIN" portion of the query |