aviat
/
OpenSQLManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't run tests on databases that don't exist! 

And remove query echoing
This commit is contained in:
Timothy Warren 2012-03-19 14:36:20 -04:00
parent bf98dc55d4
commit a59ab40061
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/db/query_builder.php
View File

@ -1063,7 +1063,7 @@ class Query_Builder {
break; break;
} }
echo $sql.'<br />'; // echo $sql.'<br />';
return $sql; return $sql;
} }

18
tests/parent.php
View File

@ -12,8 +12,6 @@
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// --------------------------------------------------------------------------
/** /**
* Parent Database Test Class * Parent Database Test Class
*/ */
@ -23,17 +21,21 @@ abstract class DBTest extends UnitTestCase {
function tearDown() function tearDown()
{ {
unset($this->db); $this->db = NULL;
} }
function TestGetTables() function TestGetTables()
{ {
if (empty($this->db)) return;
$tables = $this->db->get_tables(); $tables = $this->db->get_tables();
$this->assertTrue(is_array($tables)); $this->assertTrue(is_array($tables));
} }
function TestGetSystemTables() function TestGetSystemTables()
{ {
if (empty($this->db)) return;
$tables = $this->db->get_system_tables(); $tables = $this->db->get_system_tables();
$this->assertTrue(is_array($tables)); $this->assertTrue(is_array($tables));
@ -41,12 +43,16 @@ abstract class DBTest extends UnitTestCase {
function TestCreateTransaction() function TestCreateTransaction()
{ {
if (empty($this->db)) return;
$res = $this->db->beginTransaction(); $res = $this->db->beginTransaction();
$this->assertTrue($res); $this->assertTrue($res);
} }
function TestPreparedStatements() function TestPreparedStatements()
{ {
if (empty($this->db)) return;
$sql = <<<SQL $sql = <<<SQL
INSERT INTO "create_test" ("id", "key", "val") INSERT INTO "create_test" ("id", "key", "val")
VALUES (?,?,?) VALUES (?,?,?)
@ -59,6 +65,8 @@ SQL;
function TestPrepareExecute() function TestPrepareExecute()
{ {
if (empty($this->db)) return;
$sql = <<<SQL $sql = <<<SQL
INSERT INTO "create_test" ("id", "key", "val") INSERT INTO "create_test" ("id", "key", "val")
VALUES (?,?,?) VALUES (?,?,?)
@ -71,6 +79,8 @@ SQL;
function TestCommitTransaction() function TestCommitTransaction()
{ {
if (empty($this->db)) return;
$res = $this->db->beginTransaction(); $res = $this->db->beginTransaction();
$sql = 'INSERT INTO "create_test" ("id", "key", "val") VALUES (10, 12, 14)'; $sql = 'INSERT INTO "create_test" ("id", "key", "val") VALUES (10, 12, 14)';
@ -82,6 +92,8 @@ SQL;
function TestRollbackTransaction() function TestRollbackTransaction()
{ {
if (empty($this->db)) return;
$res = $this->db->beginTransaction(); $res = $this->db->beginTransaction();
$sql = 'INSERT INTO "create_test" ("id", "key", "val") VALUES (182, 96, 43)'; $sql = 'INSERT INTO "create_test" ("id", "key", "val") VALUES (182, 96, 43)';