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

fix named parameters

Browse Source
This commit is contained in:
Sergey Tsalkov
2012-07-22 17:43:34 -07:00
parent 7582961ee1
commit 5b4e5a959a
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
db.class.php
View File

@@ -453,14 +453,11 @@ class MeekroDB {
$arg = $args_all[$arg_number]; $arg = $args_all[$arg_number];
} else if (substr($sql, $new_pos_back, $named_seperator_length) == $this->named_param_seperator) { } else if (substr($sql, $new_pos_back, $named_seperator_length) == $this->named_param_seperator) {
$next_space = strpos($sql, ' ', $new_pos_back + $named_seperator_length); $arg_number_length = strspn($sql, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_',
if ($next_space < $new_pos_back + $named_seperator_length) $next_space = strlen($sql); $new_pos_back + $named_seperator_length) + $named_seperator_length;
$arg_number = substr($sql, $new_pos_back + $named_seperator_length, $next_space - $new_pos_back - 1);
$arg_number_length = strlen($arg_number) + $named_seperator_length;
$arg_number = substr($sql, $new_pos_back + $named_seperator_length, $arg_number_length - $named_seperator_length);
if (count($args_all) != 1) $this->nonSQLError("If you use named parameters, the second argument must be an array of parameters"); if (count($args_all) != 1) $this->nonSQLError("If you use named parameters, the second argument must be an array of parameters");
if (! isset($args_all[0][$arg_number])) $this->nonSQLError("Non existent argument reference (arg $arg_number): $sql"); if (! isset($args_all[0][$arg_number])) $this->nonSQLError("Non existent argument reference (arg $arg_number): $sql");
$arg = $args_all[0][$arg_number]; $arg = $args_all[0][$arg_number];

2
simpletest/BasicTest.php
View File

@@ -150,7 +150,7 @@ class BasicTest extends SimpleTest {
$this->assert($row['password'] === 'blahblahblahblah'); $this->assert($row['password'] === 'blahblahblahblah');
$this->assert($row['favorite_word'] === null); $this->assert($row['favorite_word'] === null);
$row = DB::query("SELECT * FROM accounts WHERE password=%s_mypass AND username=%s_myuser", $row = DB::query("SELECT * FROM accounts WHERE password=%s_mypass AND (password=%s_mypass) AND username=%s_myuser",
array('myuser' => 'newguy', 'mypass' => 'blahblahblahblah') array('myuser' => 'newguy', 'mypass' => 'blahblahblahblah')
); );
$this->assert(count($row) === 1); $this->assert(count($row) === 1);