K2.4 has its own parentheses support

This commit is contained in:
Bharat Mediratta
2009-11-24 19:24:38 -08:00
parent 3ed7a5af46
commit 01e10d1708

View File

@@ -17,45 +17,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
class Database extends Database_Core {
abstract class Database extends Database_Core {
protected $_table_names;
public function open_paren() {
$this->where[] = "(";
return $this;
}
public function close_paren() {
// Search backwards for the last opening paren and resolve it
$i = count($this->where) - 1;
$this->where[$i] .= ")";
while (--$i >= 0) {
if ($this->where[$i] == "(") {
// Remove the paren from the where clauses, and add it to the right of the operator of the
// next where clause. If removing the paren makes the next where clause the first element
// in the where list, then the operator shouldn't be there. It's there because we
// calculate whether or not we need an operator based on the number of where clauses, and
// the open paren seems like a where clause even though it isn't.
array_splice($this->where, $i, 1);
$this->where[$i] = preg_replace("/^(AND|OR) /", $i ? "\\1 (" : "(", $this->where[$i]);
return $this;
}
}
throw new Kohana_Database_Exception('database.missing_open_paren');
}
/**
* Parse the query string and convert any strings of the form `\([a-zA-Z0-9_]*?)\]
* table prefix . $1
*/
public function query($sql = '') {
if (!empty($sql)) {
$sql = $this->add_table_prefixes($sql);
}
return parent::query($sql);
}
public function add_table_prefixes($sql) {
$prefix = $this->config["table_prefix"];
if (strpos($sql, "SHOW TABLES") === 0) {