Fixed misnamed tests
This commit is contained in:
parent
c6e2831793
commit
f335fa744d
@ -19,7 +19,7 @@
|
|||||||
*/
|
*/
|
||||||
class firebird extends DB_PDO {
|
class firebird extends DB_PDO {
|
||||||
|
|
||||||
protected $conn, $statement, $trans, $count;
|
protected $conn, $statement, $trans, $count, $result;
|
||||||
private $esc_char = "''";
|
private $esc_char = "''";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -90,13 +90,6 @@ class firebird extends DB_PDO {
|
|||||||
return ibase_fetch_row($this->statement, IBASE_FETCH_BLOBS);
|
return ibase_fetch_row($this->statement, IBASE_FETCH_BLOBS);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PDO::FETCH_BOTH:
|
|
||||||
return array_merge(
|
|
||||||
ibase_fetch_row($this->statement, IBASE_FETCH_BLOBS),
|
|
||||||
ibase_fetch_assoc($this->statement, IBASE_FETCH_BLOBS)
|
|
||||||
);
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return ibase_fetch_assoc($this->statement, IBASE_FETCH_BLOBS);
|
return ibase_fetch_assoc($this->statement, IBASE_FETCH_BLOBS);
|
||||||
break;
|
break;
|
||||||
@ -117,6 +110,8 @@ class firebird extends DB_PDO {
|
|||||||
{
|
{
|
||||||
$all[] = $row;
|
$all[] = $row;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$this->result = $all;
|
||||||
|
|
||||||
return $all;
|
return $all;
|
||||||
}
|
}
|
||||||
|
@ -69,13 +69,13 @@ class FirebirdTest extends UnitTestCase {
|
|||||||
$this->assertTrue($only_system);
|
$this->assertTrue($only_system);
|
||||||
}
|
}
|
||||||
|
|
||||||
function TestCreateDatabase()
|
function TestCreateTable()
|
||||||
{
|
{
|
||||||
//Attempt to create the table
|
//Attempt to create the table
|
||||||
$sql = $this->db->manip->create_table('create_test', array('id' => 'SMALLINT'));
|
$sql = $this->db->manip->create_table('create_test', array('id' => 'SMALLINT'));
|
||||||
$this->db->query($sql);
|
$this->db->query($sql);
|
||||||
|
|
||||||
//This test fails for an unknown reason, when clearly the database exists
|
//This test fails for an unknown reason, when clearly the table exists
|
||||||
//Reset
|
//Reset
|
||||||
/*$this->tearDown();
|
/*$this->tearDown();
|
||||||
$this->setUp();
|
$this->setUp();
|
||||||
@ -88,7 +88,7 @@ class FirebirdTest extends UnitTestCase {
|
|||||||
$this->assertTrue($table_exists);*/
|
$this->assertTrue($table_exists);*/
|
||||||
}
|
}
|
||||||
|
|
||||||
function TestDeleteDatabase()
|
function TestDeleteTable()
|
||||||
{
|
{
|
||||||
//Attempt to delete the table
|
//Attempt to delete the table
|
||||||
$sql = $this->db->manip->delete_table('create_test');
|
$sql = $this->db->manip->delete_table('create_test');
|
||||||
|
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user