summaryrefslogtreecommitdiffstats
path: root/system/database/DB_query_builder.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-10-06 20:27:01 +0200
committerAndrey Andreev <narf@bofh.bg>2012-10-06 20:27:01 +0200
commitcd50592b26a26a2e55fc193529a2463d9a465378 (patch)
tree2a3f842171809bad6fb3e7c13796da6c7cd5f036 /system/database/DB_query_builder.php
parent956631d2b8f0f1173f55134b8465b41d2018edfa (diff)
Fix issue #1257
Diffstat (limited to 'system/database/DB_query_builder.php')
-rw-r--r--system/database/DB_query_builder.php20
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