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

restore %ss to working, add unit test so it won't break again

Browse Source
This commit is contained in:
Sergey Tsalkov
2013-06-21 16:27:05 -07:00
parent 3741291f44
commit 740ca7bc67
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
db.class.php
View File

@@ -539,7 +539,7 @@ class MeekroDB {
else if ($type == 'd') $result = doubleval($arg); else if ($type == 'd') $result = doubleval($arg);
else if ($type == 'b') $result = $this->formatTableName($arg); else if ($type == 'b') $result = $this->formatTableName($arg);
else if ($type == 'l') $result = $arg; else if ($type == 'l') $result = $arg;
else if ($type == 'ss') $result = "%" . $this->escape(str_replace(array('%', '_'), array('\%', '\_'), $arg)) . "%"; else if ($type == 'ss') $result = $this->escape("%" . str_replace(array('%', '_'), array('\%', '\_'), $arg) . "%");
else if ($type == 't') $result = $this->escape($this->parseTS($arg)); else if ($type == 't') $result = $this->escape($this->parseTS($arg));
else if ($type == 'ls') $result = array_map(array($this, 'escape'), $arg); else if ($type == 'ls') $result = array_map(array($this, 'escape'), $arg);

2
simpletest/BasicTest.php
View File

@@ -256,7 +256,7 @@ class BasicTest extends SimpleTest {
$this->assert($rows[1]['password'] === 'somethingelse'); $this->assert($rows[1]['password'] === 'somethingelse');
$this->assert($rows[1]['username'] === '2ofmany'); $this->assert($rows[1]['username'] === '2ofmany');
$nullrow = DB::queryOneRow("SELECT * FROM accounts WHERE username=%s", '3ofmany'); $nullrow = DB::queryOneRow("SELECT * FROM accounts WHERE username LIKE %ss", '3ofman');
$this->assert($nullrow['password'] === NULL); $this->assert($nullrow['password'] === NULL);
$this->assert($nullrow['age'] === '15'); $this->assert($nullrow['age'] === '15');
} }