diff options
| author | Bruno Barão <brunobarao@gmail.com> | 2012-10-08 17:21:36 +0200 |
|---|---|---|
| committer | Bruno Barão <brunobarao@gmail.com> | 2012-10-08 17:21:36 +0200 |
| commit | 02561acf13f19881f4e3f95cf2fb423665d5ce8b (patch) | |
| tree | fb88af9da77e37447d9e1513146aad870e65ea5d /system/database/DB_query_builder.php | |
| parent | b453e16668c70b0eb02b5ae69cd3196d735421f8 (diff) | |
| parent | 960e616d18c77f463e7c53f666d98b09f5ca9057 (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'system/database/DB_query_builder.php')
| -rw-r--r-- | system/database/DB_query_builder.php | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php index 479b7f24a..8bd2ab53c 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -1522,24 +1522,6 @@ abstract class CI_DB_query_builder extends CI_DB_driver { // -------------------------------------------------------------------- /** - * From Tables - * - * This public function implicitly groups FROM tables so there is no confusion - * about operator precedence in harmony with SQL standards - * - * @param array - * @return string - */ - protected function _from_tables($tables) - { - is_array($tables) OR $tables = array($tables); - - return (count($tables) === 1) ? $tables[0] : '('.implode(', ', $tables).')'; - } - - // -------------------------------------------------------------------- - - /** * Get UPDATE query string * * Compiles an update query and returns the sql @@ -2058,7 +2040,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 ".implode(', ', $this->qb_from); } // Write the "JOIN" portion of the query |