Fixed part of firebird tests with native driver

This commit is contained in:
Timothy Warren 2012-03-05 16:14:35 -05:00
parent c481827935
commit e3fefa1aca
3 changed files with 5 additions and 3 deletions

View File

@ -100,7 +100,7 @@ foreach(pdo_drivers() as $d)
} }
// Load Firebird if there is support // Load Firebird if there is support
if(function_exists('ibase_connect')) if(function_exists('ibase_connect') && ! in_array('firebird', pdo_drivers()))
{ {
require_once("{$path}firebird-ibase.php"); require_once("{$path}firebird-ibase.php");
require_once("{$path}firebird_sql.php"); require_once("{$path}firebird_sql.php");

View File

@ -19,9 +19,12 @@ class Firebird extends DB_PDO {
/** /**
* Constructor * Constructor
*/ */
public function __construct($dbpath, $user, $pass) public function __construct($dbpath, $user='sysdba', $pass='masterkey')
{ {
parent::__construct("firebird:{$dbpath}", $user, $pass); parent::__construct("firebird:{$dbpath}", $user, $pass);
$class = __CLASS__."_sql";
$this->sql = new $class;
} }
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------

View File

@ -15,7 +15,6 @@
/** /**
* Unit test bootstrap - Using php simpletest * Unit test bootstrap - Using php simpletest
*/ */
define('BASE_DIR', '../src'); define('BASE_DIR', '../src');
// Include simpletest // Include simpletest