rlkollman/meekrodb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bugfix: insert/update type functions don't break when using a param_char other than %

Browse Source
This commit is contained in:
Sergey Tsalkov
2014-06-14 02:41:06 +00:00
parent 7c819bfc24
commit 1d797b306e
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
db.class.php
View File

@@ -299,7 +299,7 @@ class MeekroDB {
$params = array_shift($args); $params = array_shift($args);
$where = array_shift($args); $where = array_shift($args);
$query = "UPDATE %b SET %? WHERE " . $where; $query = str_replace('%', $this->param_char, "UPDATE %b SET %? WHERE ") . $where;
array_unshift($args, $params); array_unshift($args, $params);
array_unshift($args, $table); array_unshift($args, $table);
@@ -327,17 +327,23 @@ class MeekroDB {
if (isset($options['update']) && is_array($options['update']) && $options['update'] && strtolower($which) == 'insert') { if (isset($options['update']) && is_array($options['update']) && $options['update'] && strtolower($which) == 'insert') {
if (array_values($options['update']) !== $options['update']) { if (array_values($options['update']) !== $options['update']) {
return $this->query("INSERT INTO %b %lb VALUES %? ON DUPLICATE KEY UPDATE %?", $table, $keys, $values, $options['update']); return $this->query(
str_replace('%', $this->param_char, "INSERT INTO %b %lb VALUES %? ON DUPLICATE KEY UPDATE %?"),
$table, $keys, $values, $options['update']);
} else { } else {
$update_str = array_shift($options['update']); $update_str = array_shift($options['update']);
$query_param = array("INSERT INTO %b %lb VALUES %? ON DUPLICATE KEY UPDATE $update_str", $table, $keys, $values); $query_param = array(
str_replace('%', $this->param_char, "INSERT INTO %b %lb VALUES %? ON DUPLICATE KEY UPDATE ") . $update_str,
$table, $keys, $values);
$query_param = array_merge($query_param, $options['update']); $query_param = array_merge($query_param, $options['update']);
return call_user_func_array(array($this, 'query'), $query_param); return call_user_func_array(array($this, 'query'), $query_param);
} }
} }
return $this->query("%l INTO %b %lb VALUES %?", $which, $table, $keys, $values); return $this->query(
str_replace('%', $this->param_char, "%l INTO %b %lb VALUES %?"),
$which, $table, $keys, $values);
} }
public function insert($table, $data) { return $this->insertOrReplace('INSERT', $table, $data); } public function insert($table, $data) { return $this->insertOrReplace('INSERT', $table, $data); }

2
simpletest/BasicTest.php
View File

@@ -114,6 +114,8 @@ class BasicTest extends SimpleTest {
$bart = DB::queryFirstRow("SELECT * FROM accounts WHERE age IN ###li AND height IN ###ld AND username IN ###ls", $bart = DB::queryFirstRow("SELECT * FROM accounts WHERE age IN ###li AND height IN ###ld AND username IN ###ls",
array(15, 25), array(10.371, 150.123), array('Bart', 'Barts')); array(15, 25), array(10.371, 150.123), array('Bart', 'Barts'));
$this->assert($bart['username'] === 'Bart'); $this->assert($bart['username'] === 'Bart');
DB::insert('accounts', array('username' => 'f_u'));
DB::query("DELETE FROM accounts WHERE username=###s", 'f_u');
DB::$param_char = '%'; DB::$param_char = '%';
$charlie_password = DB::queryFirstField("SELECT password FROM accounts WHERE username IN %ls AND username = %s", $charlie_password = DB::queryFirstField("SELECT password FROM accounts WHERE username IN %ls AND username = %s",