diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-07-19 12:06:02 +0200 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-07-19 12:06:02 +0200 |
commit | c9b924c1498847d8f324d81c8994fff0b95f26dc (patch) | |
tree | c78ca7d7ad67df0cf69414180e36a037c8c45970 /system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php | |
parent | 94611df88cf99ae530258a25e2051e901b9ffcc7 (diff) |
Remove _limit()'s extra parameters and qb_limit, qb_offset unneeded typecasts + add _compile_group_by() method
Diffstat (limited to 'system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php')
-rw-r--r-- | system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php b/system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php index ee21ed22f..5b36342d2 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php +++ b/system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php @@ -211,22 +211,20 @@ class CI_DB_pdo_firebird_driver extends CI_DB_pdo_driver { * Generates a platform-specific LIMIT clause * * @param string the sql query string - * @param int the number of rows to limit the query to - * @param int the offset value * @return string */ - protected function _limit($sql, $limit, $offset) + protected function _limit($sql) { // Limit clause depends on if Interbase or Firebird if (stripos($this->version(), 'firebird') !== FALSE) { - $select = 'FIRST '. (int) $limit - .($offset > 0 ? ' SKIP '. (int) $offset : ''); + $select = 'FIRST '.$this->qb_limit + .($this->qb_offset > 0 ? ' SKIP '.$this->qb_offset : ''); } else { $select = 'ROWS ' - .($offset > 0 ? (int) $offset.' TO '.($limit + $offset) : (int) $limit); + .($this->qb_offset > 0 ? $this->qb_offset.' TO '.($this->qb_limit + $this->qb_offset) : $this->qb_limit); } return preg_replace('`SELECT`i', 'SELECT '.$select, $sql); |