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

More Firebird tests

Browse Source
This commit is contained in:
Timothy Warren 2012-03-06 16:53:40 -05:00
parent ee8bbc61a7
commit 9d2ceb49e6
2 changed files with 48 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/databases/firebird-ibase.php
View File

@ -19,7 +19,7 @@
*/ */
class firebird extends DB_PDO { class firebird extends DB_PDO {
protected $conn, $statement, $trans, $count, $result; protected $statement, $trans, $count, $result;
/** /**
* Open the link to the database * Open the link to the database
@ -30,7 +30,11 @@ class firebird extends DB_PDO {
*/ */
public function __construct($dbpath, $user='sysdba', $pass='masterkey') public function __construct($dbpath, $user='sysdba', $pass='masterkey')
{ {
$this->conn = ibase_connect($dbpath, $user, $pass, 'utf-8'); // More a pain than it is worth to actually
// pass around the resource that this provides.
// Since the resource is not required by the
// functions that would use it, I'm dumping it.
ibase_connect($dbpath, $user, $pass, 'utf-8');
$class = __CLASS__."_sql"; $class = __CLASS__."_sql";
$this->sql = new $class; $this->sql = new $class;
@ -43,7 +47,7 @@ class firebird extends DB_PDO {
*/ */
public function __destruct() public function __destruct()
{ {
@ibase_close($this->conn); @ibase_close();
@ibase_free_result($this->statement); @ibase_free_result($this->statement);
} }
@ -73,7 +77,16 @@ class firebird extends DB_PDO {
public function query($sql) public function query($sql)
{ {
$this->count = 0; $this->count = 0;
$this->statement = ibase_query($this->conn, $sql);
if (isset($this->trans))
{
$this->statement = ibase_query($this->trans, $sql);
}
else
{
$this->statement = ibase_query($sql);
}
return $this->statement; return $this->statement;
} }
@ -135,7 +148,7 @@ class firebird extends DB_PDO {
*/ */
public function prepare($query, $options=NULL) public function prepare($query, $options=NULL)
{ {
$this->statement = ibase_prepare($this->conn, $query); $this->statement = ibase_prepare($query);
return $this->statement; return $this->statement;
} }
@ -202,7 +215,7 @@ SQL;
*/ */
public function affected_rows($statement="") public function affected_rows($statement="")
{ {
return ibase_affected_rows($this->conn); return ibase_affected_rows();
} }
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
@ -235,7 +248,7 @@ SQL;
*/ */
public function beginTransaction() public function beginTransaction()
{ {
if(($this->trans =& ibase_trans($this->conn)) !== NULL) if(($this->trans = ibase_trans()) !== NULL)
{ {
return TRUE; return TRUE;
} }

28
tests/databases/firebird.php
View File

@ -68,6 +68,12 @@ class FirebirdTest extends UnitTestCase {
$this->assertTrue($only_system); $this->assertTrue($only_system);
} }
function TestCreateTransaction()
{
$res = $this->db->beginTransaction();
$this->assertTrue($res);
}
function TestCreateTable() function TestCreateTable()
{ {
@ -92,6 +98,28 @@ class FirebirdTest extends UnitTestCase {
$this->assertTrue($table_exists);*/ $this->assertTrue($table_exists);*/
} }
function TestCommitTransaction()
{
$this->TestCreateTransaction();
$sql = 'INSERT INTO "create_test" ("id", "key", "val") VALUES (10, 12, 14)';
$this->db->query($sql);
$res = $this->db->commit();
$this->assertTrue($res);
}
function TestRollbackTransaction()
{
$this->TestCreateTransaction();
$sql = 'INSERT INTO "create_test" ("id", "key", "val") VALUES (182, 96, 43)';
$this->db->query($sql);
$res = $this->db->rollback();
$this->assertTrue($res);
}
function TestPreparedStatements() function TestPreparedStatements()
{ {
$sql = <<<SQL $sql = <<<SQL