aviat/Query
1
1
Fork 0
Code Issues 1 Pull Requests Releases 2 Activity

switch from pdo_drivers to PDO::getAvailableDrivers

Browse Source
This commit is contained in:
Timothy Warren 2012-07-03 13:00:17 -04:00
parent 977434977e
commit 7649f75cac
6 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autoload.php
View File

@ -68,7 +68,7 @@ function query_autoload($class)
} }
elseif (is_dir($driver_path)) elseif (is_dir($driver_path))
{ {
if (in_array($class, pdo_drivers())) if (in_array($class, PDO::getAvailableDrivers()))
{ {
array_map('do_include', glob("{$driver_path}/*.php")); array_map('do_include', glob("{$driver_path}/*.php"));
} }

2
tests/core/core.php
View File

@ -64,7 +64,7 @@ class CoreTest extends UnitTestCase {
'sqlite', 'sqlite',
); );
$drivers = pdo_drivers(); $drivers = PDO::getAvailableDrivers();
$num_supported = count(array_intersect($drivers, $supported)); $num_supported = count(array_intersect($drivers, $supported));

6
tests/databases/mysql/mysql-qb.php
View File

@ -43,12 +43,16 @@ class MySQLQBTest extends QBTest {
$this->db = new Query_Builder($params); $this->db = new Query_Builder($params);
} }
else
{
die("Error with mysql credentials");
}
} }
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
public function TestExists() public function TestExists()
{ {
$this->assertTrue(in_array('mysql', pdo_drivers())); $this->assertTrue(in_array('mysql', PDO::getAvailableDrivers()));
} }
} }

2
tests/databases/mysql/mysql.php
View File

@ -40,7 +40,7 @@ class MySQLTest extends DBTest {
public function TestExists() public function TestExists()
{ {
$this->assertTrue(in_array('mysql', pdo_drivers())); $this->assertTrue(in_array('mysql', PDO::getAvailableDrivers()));
} }
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------

BIN
tests/db_files/FB_TEST_DB.FDB
View File

Binary file not shown.

4
tests/index.php
View File

@ -37,7 +37,7 @@ require_once(QTEST_DIR . '/core/db_qb_test.php');
$src_path = QBASE_DIR.'drivers/'; $src_path = QBASE_DIR.'drivers/';
$test_path = QTEST_DIR.'/databases/'; $test_path = QTEST_DIR.'/databases/';
foreach(pdo_drivers() as $d) foreach(PDO::getAvailableDrivers() as $d)
{ {
// PDO firebird isn't stable enough to // PDO firebird isn't stable enough to
// bother, so skip it. // bother, so skip it.
@ -48,7 +48,7 @@ foreach(pdo_drivers() as $d)
$src_dir = "{$test_path}{$d}"; $src_dir = "{$test_path}{$d}";
if(is_dir($src_dir)) if (is_dir($src_dir))
{ {
require_once("{$test_path}{$d}/{$d}.php"); require_once("{$test_path}{$d}/{$d}.php");
require_once("{$test_path}{$d}/{$d}-qb.php"); require_once("{$test_path}{$d}/{$d}-qb.php");