magnus Tue Mar 1 16:09:12 2005 EDT Added files: /php-src/ext/pdo_oci/tests connection.inc pdo_001.phpt pdo_002.phpt pdo_003.phpt pdo_004.phpt pdo_005.phpt pdo_006.phpt pdo_007.phpt pdo_008.phpt pdo_009.phpt pdo_010.phpt pdo_011.phpt pdo_012.phpt pdo_013.phpt pdo_014.phpt pdo_015.phpt prepare.inc skipif.inc Log: Add Oracle tests for PDO.
http://cvs.php.net/co.php/php-src/ext/pdo_oci/tests/connection.inc?r=1.1&p=1 Index: php-src/ext/pdo_oci/tests/connection.inc +++ php-src/ext/pdo_oci/tests/connection.inc <?php
$DATABASE = 'test'; $CONNECTION = "oci:dbname=$DATABASE"; $USER = 'SYSTEM'; $PASSWORD = 'password'; $PDO_TESTS = dirname(__FILE__) . '/../../pdo/tests/'; ?> http://cvs.php.net/co.php/php-src/ext/pdo_oci/tests/pdo_001.phpt?r=1.1&p=1 Index: php-src/ext/pdo_oci/tests/pdo_001.phpt +++ php-src/ext/pdo_oci/tests/pdo_001.phpt --TEST-- PDO_OCI: PDO_FETCH_ASSOC --SKIPIF-- <?php # vim:ft=php require_once('skipif.inc'); ?> --FILE-- <?php require_once('connection.inc'); require_once('prepare.inc'); require_once($PDO_TESTS . 'pdo_001.inc'); ?> ===DONE=== <?php exit(0); ?> --EXPECT-- array(3) { [0]=> array(2) { ["id"]=> string(1) "1" ["val"]=> string(1) "A" } [1]=> array(2) { ["id"]=> string(1) "2" ["val"]=> string(1) "B" } [2]=> array(2) { ["id"]=> string(1) "3" ["val"]=> string(1) "C" } } ===DONE=== http://cvs.php.net/co.php/php-src/ext/pdo_oci/tests/pdo_002.phpt?r=1.1&p=1 Index: php-src/ext/pdo_oci/tests/pdo_002.phpt +++ php-src/ext/pdo_oci/tests/pdo_002.phpt --TEST-- PDO_OCI: PDO_FETCH_NUM --SKIPIF-- <?php # vim:ft=php require_once('skipif.inc'); ?> --FILE-- <?php require_once('connection.inc'); require_once('prepare.inc'); require_once($PDO_TESTS . 'pdo_002.inc'); ?> ===DONE=== <?php exit(0); ?> --EXPECT-- array(3) { [0]=> array(2) { [0]=> string(1) "1" [1]=> string(1) "A" } [1]=> array(2) { [0]=> string(1) "2" [1]=> string(1) "B" } [2]=> array(2) { [0]=> string(1) "3" [1]=> string(1) "C" } } ===DONE=== http://cvs.php.net/co.php/php-src/ext/pdo_oci/tests/pdo_003.phpt?r=1.1&p=1 Index: php-src/ext/pdo_oci/tests/pdo_003.phpt +++ php-src/ext/pdo_oci/tests/pdo_003.phpt --TEST-- PDO_OCI: PDO_FETCH_BOTH --SKIPIF-- <?php # vim:ft=php require_once('skipif.inc'); ?> --FILE-- <?php require_once('connection.inc'); require_once('prepare.inc'); require_once($PDO_TESTS . 'pdo_003.inc'); ?> ===DONE=== <?php exit(0); ?> --EXPECT-- array(3) { [0]=> array(4) { ["id"]=> string(1) "1" [0]=> string(1) "1" ["val"]=> string(1) "A" [1]=> string(1) "A" } [1]=> array(4) { ["id"]=> string(1) "2" [0]=> string(1) "2" ["val"]=> string(1) "B" [1]=> string(1) "B" } [2]=> array(4) { ["id"]=> string(1) "3" [0]=> string(1) "3" ["val"]=> string(1) "C" [1]=> string(1) "C" } } ===DONE=== http://cvs.php.net/co.php/php-src/ext/pdo_oci/tests/pdo_004.phpt?r=1.1&p=1 Index: php-src/ext/pdo_oci/tests/pdo_004.phpt +++ php-src/ext/pdo_oci/tests/pdo_004.phpt --TEST-- PDO_OCI: PDO_FETCH_OBJ --SKIPIF-- <?php # vim:ft=php require_once('skipif.inc'); ?> --FILE-- <?php require_once('connection.inc'); require_once('prepare.inc'); require_once($PDO_TESTS . 'pdo_004.inc'); ?> ===DONE=== <?php exit(0); ?> --EXPECTF-- array(3) { [0]=> object(stdClass)#%d (2) { ["id"]=> string(1) "1" ["val"]=> string(1) "A" } [1]=> object(stdClass)#%d (2) { ["id"]=> string(1) "2" ["val"]=> string(1) "B" } [2]=> object(stdClass)#%d (2) { ["id"]=> string(1) "3" ["val"]=> string(1) "C" } } ===DONE=== http://cvs.php.net/co.php/php-src/ext/pdo_oci/tests/pdo_005.phpt?r=1.1&p=1 Index: php-src/ext/pdo_oci/tests/pdo_005.phpt +++ php-src/ext/pdo_oci/tests/pdo_005.phpt --TEST-- PDO_OCI: PDO_FETCH_CLASS --SKIPIF-- <?php # vim:ft=php require_once('skipif.inc'); ?> --FILE-- <?php require_once('connection.inc'); require_once('prepare.inc'); require_once($PDO_TESTS . 'pdo_005.inc'); ?> ===DONE=== <?php exit(0); ?> --EXPECTF-- array(3) { [0]=> object(stdClass)#%d (3) { ["id"]=> string(1) "1" ["val"]=> string(1) "A" ["val2"]=> string(2) "AA" } [1]=> object(stdClass)#%d (3) { ["id"]=> string(1) "2" ["val"]=> string(1) "B" ["val2"]=> string(2) "BB" } [2]=> object(stdClass)#%d (3) { ["id"]=> string(1) "3" ["val"]=> string(1) "C" ["val2"]=> string(2) "CC" } } array(3) { [0]=> object(TestBase)#%d (3) { ["id"]=> string(1) "1" ["val:protected"]=> string(1) "A" ["val2:private"]=> string(2) "AA" } [1]=> object(TestBase)#%d (3) { ["id"]=> string(1) "2" ["val:protected"]=> string(1) "B" ["val2:private"]=> string(2) "BB" } [2]=> object(TestBase)#%d (3) { ["id"]=> string(1) "3" ["val:protected"]=> string(1) "C" ["val2:private"]=> string(2) "CC" } } TestDerived::__construct(0,1) TestDerived::__construct(1,2) TestDerived::__construct(2,3) array(3) { [0]=> object(TestDerived)#%d (5) { ["row:protected"]=> int(0) ["id"]=> string(1) "1" ["val:protected"]=> string(1) "A" ["val2:private"]=> NULL ["val2"]=> string(2) "AA" } [1]=> object(TestDerived)#%d (5) { ["row:protected"]=> int(1) ["id"]=> string(1) "2" ["val:protected"]=> string(1) "B" ["val2:private"]=> NULL ["val2"]=> string(2) "BB" } [2]=> object(TestDerived)#%d (5) { ["row:protected"]=> int(2) ["id"]=> string(1) "3" ["val:protected"]=> string(1) "C" ["val2:private"]=> NULL ["val2"]=> string(2) "CC" } } ===DONE=== http://cvs.php.net/co.php/php-src/ext/pdo_oci/tests/pdo_006.phpt?r=1.1&p=1 Index: php-src/ext/pdo_oci/tests/pdo_006.phpt +++ php-src/ext/pdo_oci/tests/pdo_006.phpt --TEST-- PDO_OCI: PDO_FETCH_GROUP --SKIPIF-- <?php # vim:ft=php require_once('skipif.inc'); ?> --FILE-- <?php require_once('connection.inc'); require_once('prepare.inc'); require_once($PDO_TESTS . 'pdo_006.inc'); ?> ===DONE=== <?php exit(0); ?> --EXPECTF-- array(2) { ["A"]=> array(2) { [0]=> array(1) { [0]=> string(1) "1" } [1]=> array(1) { [0]=> string(1) "2" } } ["C"]=> array(1) { [0]=> array(1) { [0]=> string(1) "3" } } } array(2) { ["A"]=> array(2) { [0]=> array(1) { ["id"]=> string(1) "1" } [1]=> array(1) { ["id"]=> string(1) "2" } } ["C"]=> array(1) { [0]=> array(1) { ["id"]=> string(1) "3" } } } ===DONE=== http://cvs.php.net/co.php/php-src/ext/pdo_oci/tests/pdo_007.phpt?r=1.1&p=1 Index: php-src/ext/pdo_oci/tests/pdo_007.phpt +++ php-src/ext/pdo_oci/tests/pdo_007.phpt --TEST-- PDO_OCI: PDO_FETCH_UNIQUE --SKIPIF-- <?php # vim:ft=php require_once('skipif.inc'); ?> --FILE-- <?php require_once('connection.inc'); require_once('prepare.inc'); require_once($PDO_TESTS . 'pdo_007.inc'); ?> ===DONE=== <?php exit(0); ?> --EXPECTF-- array(3) { ["A"]=> array(1) { [0]=> string(1) "A" } ["B"]=> array(1) { [0]=> string(1) "A" } ["C"]=> array(1) { [0]=> string(1) "C" } } array(3) { ["A"]=> array(1) { ["val"]=> string(1) "A" } ["B"]=> array(1) { ["val"]=> string(1) "A" } ["C"]=> array(1) { ["val"]=> string(1) "C" } } ===DONE=== http://cvs.php.net/co.php/php-src/ext/pdo_oci/tests/pdo_008.phpt?r=1.1&p=1 Index: php-src/ext/pdo_oci/tests/pdo_008.phpt +++ php-src/ext/pdo_oci/tests/pdo_008.phpt --TEST-- PDO_OCI: PDO_FETCH_UNIQUE conflict --SKIPIF-- <?php # vim:ft=php require_once('skipif.inc'); ?> --FILE-- <?php require_once('connection.inc'); require_once('prepare.inc'); require_once($PDO_TESTS . 'pdo_008.inc'); ?> ===DONE=== <?php exit(0); ?> --EXPECTF-- array(2) { ["A"]=> array(1) { [0]=> string(1) "B" } ["C"]=> array(1) { [0]=> string(1) "C" } } ===DONE=== http://cvs.php.net/co.php/php-src/ext/pdo_oci/tests/pdo_009.phpt?r=1.1&p=1 Index: php-src/ext/pdo_oci/tests/pdo_009.phpt +++ php-src/ext/pdo_oci/tests/pdo_009.phpt --TEST-- PDO_OCI: PDO_FETCH_CLASSTYPE --SKIPIF-- <?php # vim:ft=php require_once('skipif.inc'); ?> --FILE-- <?php require_once('connection.inc'); require_once('prepare.inc'); require_once($PDO_TESTS . 'pdo_009.inc'); ?> ===DONE=== <?php exit(0); ?> --EXPECTF-- array(4) { [0]=> array(3) { [0]=> string(8) "stdClass" [1]=> string(1) "1" [2]=> string(1) "A" } [1]=> array(3) { [0]=> string(5) "Test1" [1]=> string(1) "2" [2]=> string(1) "B" } [2]=> array(3) { [0]=> string(5) "Test2" [1]=> string(1) "3" [2]=> string(1) "C" } [3]=> array(3) { [0]=> NULL [1]=> string(1) "4" [2]=> string(1) "D" } } Test1::__construct() Test2::__construct() Test3::__construct() array(4) { [0]=> object(stdClass)#%d (2) { ["id"]=> string(1) "1" ["val"]=> string(1) "A" } [1]=> object(Test1)#%d (2) { ["id"]=> string(1) "2" ["val"]=> string(1) "B" } [2]=> object(Test2)#%d (2) { ["id"]=> string(1) "3" ["val"]=> string(1) "C" } [3]=> object(Test3)#%d (2) { ["id"]=> string(1) "4" ["val"]=> string(1) "D" } } ===DONE=== http://cvs.php.net/co.php/php-src/ext/pdo_oci/tests/pdo_010.phpt?r=1.1&p=1 Index: php-src/ext/pdo_oci/tests/pdo_010.phpt +++ php-src/ext/pdo_oci/tests/pdo_010.phpt --TEST-- PDO_OCI: PDO_FETCH_(CLASSTYPE and GROUP/UNIQUE) --SKIPIF-- <?php # vim:ft=php require_once('skipif.inc'); ?> --FILE-- <?php require_once('connection.inc'); require_once('prepare.inc'); require_once($PDO_TESTS . 'pdo_010.inc'); ?> ===DONE=== <?php exit(0); ?> --EXPECTF-- Test1::__construct() Test2::__construct() Test3::__construct() array(2) { ["Group1"]=> array(2) { [0]=> object(stdClass)#%d (2) { ["id"]=> string(1) "1" ["val"]=> string(1) "A" } [1]=> object(Test1)#%d (2) { ["id"]=> string(1) "2" ["val"]=> string(1) "B" } } ["Group2"]=> array(2) { [0]=> object(Test2)#%d (2) { ["id"]=> string(1) "3" ["val"]=> string(1) "C" } [1]=> object(Test3)#%d (2) { ["id"]=> string(1) "4" ["val"]=> string(1) "D" } } } Test1::__construct() Test2::__construct() Test3::__construct() array(2) { ["Group1"]=> object(Test1)#%d (2) { ["id"]=> string(1) "2" ["val"]=> string(1) "B" } ["Group2"]=> object(Test3)#%d (2) { ["id"]=> string(1) "4" ["val"]=> string(1) "D" } } ===DONE=== http://cvs.php.net/co.php/php-src/ext/pdo_oci/tests/pdo_011.phpt?r=1.1&p=1 Index: php-src/ext/pdo_oci/tests/pdo_011.phpt +++ php-src/ext/pdo_oci/tests/pdo_011.phpt --TEST-- PDO_OCI: PDO_FETCH_FUNC and statement overloading --SKIPIF-- <?php # vim:ft=php require_once('skipif.inc'); ?> --FILE-- <?php require_once('connection.inc'); require_once('prepare.inc'); require_once($PDO_TESTS . 'pdo_011.inc'); ?> ===DONE=== <?php exit(0); ?> --EXPECTF-- Test1::__construct(0,0) test(1,N/A) test(2,N/A) test(3,N/A) test(4,N/A) array(2) { ["Group1"]=> array(2) { [0]=> array(1) { [1]=> string(3) "N/A" } [1]=> array(1) { [2]=> string(3) "N/A" } } ["Group2"]=> array(2) { [0]=> array(1) { [3]=> string(3) "N/A" } [1]=> array(1) { [4]=> string(3) "N/A" } } } test(1,A) test(2,B) test(3,C) test(4,D) array(4) { [0]=> array(1) { [1]=> string(1) "A" } [1]=> array(1) { [2]=> string(1) "B" } [2]=> array(1) { [3]=> string(1) "C" } [3]=> array(1) { [4]=> string(1) "D" } } Test1::factory(1,A) Test1::__construct(1,A) Test1::factory(2,B) Test1::__construct(2,B) Test1::factory(3,C) Test1::__construct(3,C) Test1::factory(4,D) Test1::__construct(4,D) array(4) { [0]=> object(Test1)#%d (2) { ["id"]=> string(1) "1" ["val"]=> string(1) "A" } [1]=> object(Test1)#%d (2) { ["id"]=> string(1) "2" ["val"]=> string(1) "B" } [2]=> object(Test1)#%d (2) { ["id"]=> string(1) "3" ["val"]=> string(1) "C" } [3]=> object(Test1)#%d (2) { ["id"]=> string(1) "4" ["val"]=> string(1) "D" } } Test1::factory(1,A) Test1::__construct(1,A) Test1::factory(2,B) Test1::__construct(2,B) Test1::factory(3,C) Test1::__construct(3,C) Test1::factory(4,D) Test1::__construct(4,D) array(4) { [0]=> object(Test1)#%d (2) { ["id"]=> string(1) "1" ["val"]=> string(1) "A" } [1]=> object(Test1)#%d (2) { ["id"]=> string(1) "2" ["val"]=> string(1) "B" } [2]=> object(Test1)#%d (2) { ["id"]=> string(1) "3" ["val"]=> string(1) "C" } [3]=> object(Test1)#%d (2) { ["id"]=> string(1) "4" ["val"]=> string(1) "D" } } DerivedStatement::__construct(Overloaded) string(16) "DerivedStatement" DerivedStatement::retrieve(1,A) DerivedStatement::retrieve(2,B) DerivedStatement::retrieve(3,C) DerivedStatement::retrieve(4,D) array(4) { [0]=> array(1) { [1]=> string(1) "A" } [1]=> array(1) { [2]=> string(1) "B" } [2]=> array(1) { [3]=> string(1) "C" } [3]=> array(1) { [4]=> string(1) "D" } } ===DONE=== http://cvs.php.net/co.php/php-src/ext/pdo_oci/tests/pdo_012.phpt?r=1.1&p=1 Index: php-src/ext/pdo_oci/tests/pdo_012.phpt +++ php-src/ext/pdo_oci/tests/pdo_012.phpt --TEST-- PDO_OCI: PDOStatement::setFetchMode --SKIPIF-- <?php # vim:ft=php require_once('skipif.inc'); ?> --FILE-- <?php require_once('connection.inc'); require_once('prepare.inc'); require_once($PDO_TESTS . 'pdo_012.inc'); ?> ===DONE=== <?php exit(0); ?> --EXPECTF-- array(2) { [0]=> array(2) { [0]=> string(1) "A" [1]=> string(6) "Group1" } [1]=> array(2) { [0]=> string(1) "B" [1]=> string(6) "Group2" } } Test::__construct(N/A) Test::__construct(N/A) array(2) { [0]=> object(Test)#%d (2) { ["val"]=> string(1) "A" ["grp"]=> string(6) "Group1" } [1]=> object(Test)#%d (2) { ["val"]=> string(1) "B" ["grp"]=> string(6) "Group2" } } Test::__construct(Changed) Test::__construct(Changed) array(2) { [0]=> object(Test)#%d (2) { ["val"]=> string(1) "A" ["grp"]=> string(6) "Group1" } [1]=> object(Test)#%d (2) { ["val"]=> string(1) "B" ["grp"]=> string(6) "Group2" } } ===DONE=== http://cvs.php.net/co.php/php-src/ext/pdo_oci/tests/pdo_013.phpt?r=1.1&p=1 Index: php-src/ext/pdo_oci/tests/pdo_013.phpt +++ php-src/ext/pdo_oci/tests/pdo_013.phpt --TEST-- PDO_OCI: PDOStatement is Traversable --SKIPIF-- <?php # vim:ft=php require_once('skipif.inc'); ?> --FILE-- <?php require_once('connection.inc'); require_once('prepare.inc'); require_once($PDO_TESTS . 'pdo_013.inc'); ?> ===DONE=== <?php exit(0); ?> --EXPECTF-- array(2) { [0]=> string(1) "A" [1]=> string(6) "Group1" } array(2) { [0]=> string(1) "B" [1]=> string(6) "Group2" } Test::__construct(N/A) object(Test)#%d (2) { ["val"]=> string(1) "A" ["grp"]=> string(6) "Group1" } Test::__construct(N/A) object(Test)#%d (2) { ["val"]=> string(1) "B" ["grp"]=> string(6) "Group2" } Test::__construct(WOW) object(Test)#%d (2) { ["val"]=> string(1) "A" ["grp"]=> string(6) "Group1" } Test::__construct(WOW) object(Test)#%d (2) { ["val"]=> string(1) "B" ["grp"]=> string(6) "Group2" } ===DONE=== http://cvs.php.net/co.php/php-src/ext/pdo_oci/tests/pdo_014.phpt?r=1.1&p=1 Index: php-src/ext/pdo_oci/tests/pdo_014.phpt +++ php-src/ext/pdo_oci/tests/pdo_014.phpt --TEST-- PDO_OCI: PDOStatement and SPL Iterators --SKIPIF-- <?php # vim:ft=php require_once('skipif.inc'); if (!extension_loaded('SPL')) die('skip SPL not available'); ?> --FILE-- <?php require_once('connection.inc'); require_once('prepare.inc'); require_once($PDO_TESTS . 'pdo_014.inc'); ?> ===DONE=== <?php exit(0); ?> --EXPECTF-- Test::__construct(WOW) object(Test)#4 (2) { ["val"]=> string(1) "A" ["grp"]=> string(6) "Group1" } Test::__construct(WOW) object(Test)#6 (2) { ["val"]=> string(1) "B" ["grp"]=> string(6) "Group2" } NULL bool(false) PDOStatementAggregate::__construct PDOStatementAggregate::getIterator array(2) { [0]=> string(1) "A" [1]=> string(6) "Group1" } array(2) { [0]=> string(1) "B" [1]=> string(6) "Group2" } ===DONE=== http://cvs.php.net/co.php/php-src/ext/pdo_oci/tests/pdo_015.phpt?r=1.1&p=1 Index: php-src/ext/pdo_oci/tests/pdo_015.phpt +++ php-src/ext/pdo_oci/tests/pdo_015.phpt --TEST-- PDO_OCI: PDO_FETCH_COLUMN --SKIPIF-- <?php # vim:ft=php require_once('skipif.inc'); ?> --FILE-- <?php require_once('connection.inc'); require_once('prepare.inc'); require_once(dirname(__FILE__).'/../../pdo/tests/pdo.inc'); require_once($PDO_TESTS . 'pdo_015.inc'); ?> ===DONE=== <?php exit(0); ?> --EXPECTF-- array(2) { [0]=> string(1) "1" [1]=> string(1) "2" } array(2) { [0]=> string(2) "A2" [1]=> string(2) "B2" } array(2) { [1]=> array(1) { [0]=> string(1) "A" } [2]=> array(1) { [0]=> string(1) "A" } } array(2) { [1]=> string(1) "A" [2]=> string(1) "A" } array(2) { [1]=> string(1) "1" [2]=> string(1) "2" } array(2) { [1]=> string(1) "A" [2]=> string(1) "A" } array(2) { [1]=> string(2) "A2" [2]=> string(2) "B2" } array(1) { ["A"]=> array(2) { [0]=> string(2) "A2" [1]=> string(2) "B2" } } ===DONE=== http://cvs.php.net/co.php/php-src/ext/pdo_oci/tests/prepare.inc?r=1.1&p=1 Index: php-src/ext/pdo_oci/tests/prepare.inc +++ php-src/ext/pdo_oci/tests/prepare.inc <?php require_once('connection.inc'); $SQL = array(); $DB = new pdo($CONNECTION, $USER, $PASSWORD); $DB->query('DROP TABLE test'); $DB->query('DROP TABLE classtypes'); $DB->setAttribute(PDO_ATTR_ERRMODE, PDO_ERRMODE_WARNING); $DB->setAttribute(PDO_ATTR_CASE, PDO_CASE_LOWER); ?> http://cvs.php.net/co.php/php-src/ext/pdo_oci/tests/skipif.inc?r=1.1&p=1 Index: php-src/ext/pdo_oci/tests/skipif.inc +++ php-src/ext/pdo_oci/tests/skipif.inc <?php if (!extension_loaded("pdo_oci")) print "skip"; ?>
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php