From: Wez Furlong Date: Wed, 6 Jul 2005 06:10:52 +0000 (+0000) Subject: replace pdo_odbc tests with new redirection thingy X-Git-Tag: php-5.1.0b3~167 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e39f37d36b490eac7922d5a89a4450e2ce2cdd2e;p=php replace pdo_odbc tests with new redirection thingy --- diff --git a/ext/pdo_odbc/tests/common.phpt b/ext/pdo_odbc/tests/common.phpt new file mode 100644 index 0000000000..607afb0900 --- /dev/null +++ b/ext/pdo_odbc/tests/common.phpt @@ -0,0 +1,46 @@ +--TEST-- +ODBC +--SKIPIF-- + +--REDIRECTTEST-- +# magic auto-configuration + +$config = array( + 'TESTS' => 'ext/pdo/tests' +); + + +if (false !== getenv('PDO_ODBC_TEST_DSN')) { + # user set them from their shell + $config['ENV']['PDOTEST_DSN'] = getenv('PDO_ODBC_TEST_DSN'); + $config['ENV']['PDOTEST_USER'] = getenv('PDO_ODBC_TEST_USER'); + $config['ENV']['PDOTEST_PASS'] = getenv('PDO_ODBC_TEST_PASS'); + $config['ENV']['PDOTEST_ATTR'] = getenv('PDO_ODBC_TEST_ATTR'); +} elseif (preg_match('/^WIN/i', PHP_OS)) { + # on windows, try to create a temporary MS access database + $path = realpath(dirname(__FILE__)) . '\pdo_odbc.mdb'; + if (!file_exists($path)) { + try { + $adox = new COM('ADOX.Catalog'); + $adox->Create('Provider=Microsoft.Jet.OLEDB.4.0;Data Source=' . $path); + $adox = null; + + } catch (Exception $e) { + } + } + if (file_exists($path)) { + $config['ENV']['PDOTEST_DSN'] = "odbc:Driver={Microsoft Access Driver (*.mdb)};Dbq=$path;Uid=Admin"; + } +} +# other magic autodetection here, eg: for DB2 by inspecting env +/* +$USER = 'db2inst1'; +$PASSWD = 'ibmdb2'; +$DBNAME = 'SAMPLE'; + +$CONNECTION = "odbc:DSN=$DBNAME;UID=$USER;PWD=$PASSWD;"; +*/ + + +return $config; diff --git a/ext/pdo_odbc/tests/connection.inc b/ext/pdo_odbc/tests/connection.inc deleted file mode 100755 index 2c1fb0a9bb..0000000000 --- a/ext/pdo_odbc/tests/connection.inc +++ /dev/null @@ -1,11 +0,0 @@ - diff --git a/ext/pdo_odbc/tests/pdo_001.phpt b/ext/pdo_odbc/tests/pdo_001.phpt deleted file mode 100755 index b9e2caad0f..0000000000 --- a/ext/pdo_odbc/tests/pdo_001.phpt +++ /dev/null @@ -1,41 +0,0 @@ ---TEST-- -PDO_ODBC: PDO_FETCH_ASSOC ---SKIPIF-- - ---FILE-- - -===DONE=== - ---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=== diff --git a/ext/pdo_odbc/tests/pdo_002.phpt b/ext/pdo_odbc/tests/pdo_002.phpt deleted file mode 100755 index 9c1e79fe8c..0000000000 --- a/ext/pdo_odbc/tests/pdo_002.phpt +++ /dev/null @@ -1,41 +0,0 @@ ---TEST-- -PDO_ODBC: PDO_FETCH_NUM ---SKIPIF-- - ---FILE-- - -===DONE=== - ---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=== diff --git a/ext/pdo_odbc/tests/pdo_003.phpt b/ext/pdo_odbc/tests/pdo_003.phpt deleted file mode 100755 index c48d3a4c5a..0000000000 --- a/ext/pdo_odbc/tests/pdo_003.phpt +++ /dev/null @@ -1,53 +0,0 @@ ---TEST-- -PDO_ODBC: PDO_FETCH_BOTH ---SKIPIF-- - ---FILE-- - -===DONE=== - ---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=== diff --git a/ext/pdo_odbc/tests/pdo_004.phpt b/ext/pdo_odbc/tests/pdo_004.phpt deleted file mode 100755 index d5321f1d2a..0000000000 --- a/ext/pdo_odbc/tests/pdo_004.phpt +++ /dev/null @@ -1,41 +0,0 @@ ---TEST-- -PDO_ODBC: PDO_FETCH_OBJ ---SKIPIF-- - ---FILE-- - -===DONE=== - ---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=== diff --git a/ext/pdo_odbc/tests/pdo_005.phpt b/ext/pdo_odbc/tests/pdo_005.phpt deleted file mode 100755 index c302208c6a..0000000000 --- a/ext/pdo_odbc/tests/pdo_005.phpt +++ /dev/null @@ -1,154 +0,0 @@ ---TEST-- -PDO_ODBC: PDO_FETCH_CLASS ---SKIPIF-- - ---FILE-- -'CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(10))' -); - -require_once($PDO_TESTS . 'pdo_005.inc'); - -?> -===DONE=== - ---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 (6) { - ["id"]=> - NULL - ["val:protected"]=> - NULL - ["val2:private"]=> - NULL - ["ID"]=> - string(1) "1" - ["VAL"]=> - string(1) "A" - ["VAL2"]=> - string(2) "AA" - } - [1]=> - object(TestBase)#%d (6) { - ["id"]=> - NULL - ["val:protected"]=> - NULL - ["val2:private"]=> - NULL - ["ID"]=> - string(1) "2" - ["VAL"]=> - string(1) "B" - ["VAL2"]=> - string(2) "BB" - } - [2]=> - object(TestBase)#%d (6) { - ["id"]=> - NULL - ["val:protected"]=> - NULL - ["val2:private"]=> - NULL - ["ID"]=> - string(1) "3" - ["VAL"]=> - string(1) "C" - ["VAL2"]=> - string(2) "CC" - } -} -TestDerived::__construct(0,) -TestDerived::__construct(1,) -TestDerived::__construct(2,) -array(3) { - [0]=> - object(TestDerived)#%d (7) { - ["row:protected"]=> - int(0) - ["id"]=> - NULL - ["val:protected"]=> - NULL - ["val2:private"]=> - NULL - ["ID"]=> - string(1) "1" - ["VAL"]=> - string(1) "A" - ["VAL2"]=> - string(2) "AA" - } - [1]=> - object(TestDerived)#%d (7) { - ["row:protected"]=> - int(1) - ["id"]=> - NULL - ["val:protected"]=> - NULL - ["val2:private"]=> - NULL - ["ID"]=> - string(1) "2" - ["VAL"]=> - string(1) "B" - ["VAL2"]=> - string(2) "BB" - } - [2]=> - object(TestDerived)#%d (7) { - ["row:protected"]=> - int(2) - ["id"]=> - NULL - ["val:protected"]=> - NULL - ["val2:private"]=> - NULL - ["ID"]=> - string(1) "3" - ["VAL"]=> - string(1) "C" - ["VAL2"]=> - string(2) "CC" - } -} -===DONE=== diff --git a/ext/pdo_odbc/tests/pdo_006.phpt b/ext/pdo_odbc/tests/pdo_006.phpt deleted file mode 100755 index 5cb31fe962..0000000000 --- a/ext/pdo_odbc/tests/pdo_006.phpt +++ /dev/null @@ -1,64 +0,0 @@ ---TEST-- -PDO_ODBC: PDO_FETCH_GROUP ---SKIPIF-- - ---FILE-- - -===DONE=== - ---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=== diff --git a/ext/pdo_odbc/tests/pdo_007.phpt b/ext/pdo_odbc/tests/pdo_007.phpt deleted file mode 100755 index 0412b977ab..0000000000 --- a/ext/pdo_odbc/tests/pdo_007.phpt +++ /dev/null @@ -1,54 +0,0 @@ ---TEST-- -PDO_ODBC: PDO_FETCH_UNIQUE ---SKIPIF-- - ---FILE-- -'CREATE TABLE test(id CHAR(1) NOT NULL PRIMARY KEY, val VARCHAR(10))'); - -require_once($PDO_TESTS . 'pdo_007.inc'); - -?> -===DONE=== - ---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=== diff --git a/ext/pdo_odbc/tests/pdo_008.phpt b/ext/pdo_odbc/tests/pdo_008.phpt deleted file mode 100755 index d1b3508b7d..0000000000 --- a/ext/pdo_odbc/tests/pdo_008.phpt +++ /dev/null @@ -1,32 +0,0 @@ ---TEST-- -PDO_ODBC: PDO_FETCH_UNIQUE conflict ---SKIPIF-- - ---FILE-- -'CREATE TABLE test(id CHAR(1) NOT NULL PRIMARY KEY, val VARCHAR(10))'); - -require_once($PDO_TESTS . 'pdo_008.inc'); - -?> -===DONE=== - ---EXPECTF-- -array(2) { - ["A"]=> - array(1) { - [0]=> - string(1) "B" - } - ["C"]=> - array(1) { - [0]=> - string(1) "C" - } -} -===DONE=== diff --git a/ext/pdo_odbc/tests/pdo_009.phpt b/ext/pdo_odbc/tests/pdo_009.phpt deleted file mode 100755 index 291b1e8efb..0000000000 --- a/ext/pdo_odbc/tests/pdo_009.phpt +++ /dev/null @@ -1,94 +0,0 @@ ---TEST-- -PDO_ODBC: PDO_FETCH_CLASSTYPE ---SKIPIF-- - ---FILE-- -'CREATE TABLE classtypes(id INT NOT NULL PRIMARY KEY, name VARCHAR(10) NOT NULL UNIQUE)', - 'create2'=>'CREATE TABLE test(id INT NOT NULL PRIMARY KEY, classtype INT, val VARCHAR(10))' -); - -require_once($PDO_TESTS . 'pdo_009.inc'); - -?> -===DONE=== - ---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=== diff --git a/ext/pdo_odbc/tests/pdo_010.phpt b/ext/pdo_odbc/tests/pdo_010.phpt deleted file mode 100755 index a0c7ab398e..0000000000 --- a/ext/pdo_odbc/tests/pdo_010.phpt +++ /dev/null @@ -1,81 +0,0 @@ ---TEST-- -PDO_ODBC: PDO_FETCH_(CLASSTYPE and GROUP/UNIQUE) ---SKIPIF-- - ---FILE-- -'CREATE TABLE classtypes(id INT NOT NULL PRIMARY KEY, name VARCHAR(10) NOT NULL UNIQUE)', - 'create2'=>'CREATE TABLE test(id INT NOT NULL PRIMARY KEY, classtype INT, val VARCHAR(10), grp VARCHAR(10))' -); - -require_once($PDO_TESTS . 'pdo_010.inc'); - -?> -===DONE=== - ---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=== diff --git a/ext/pdo_odbc/tests/pdo_011.phpt b/ext/pdo_odbc/tests/pdo_011.phpt deleted file mode 100755 index 6514baad2d..0000000000 --- a/ext/pdo_odbc/tests/pdo_011.phpt +++ /dev/null @@ -1,183 +0,0 @@ ---TEST-- -PDO_ODBC: PDO_FETCH_FUNC and statement overloading ---SKIPIF-- - ---FILE-- -'CREATE TABLE test(id INT NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))'); - -require_once($PDO_TESTS . 'pdo_011.inc'); - -?> -===DONE=== - ---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=== diff --git a/ext/pdo_odbc/tests/pdo_012.phpt b/ext/pdo_odbc/tests/pdo_012.phpt deleted file mode 100755 index 59a30b3cf4..0000000000 --- a/ext/pdo_odbc/tests/pdo_012.phpt +++ /dev/null @@ -1,72 +0,0 @@ ---TEST-- -PDO_ODBC: PDOStatement::setFetchMode ---SKIPIF-- - ---FILE-- -'CREATE TABLE test(id INT NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))'); - -require_once($PDO_TESTS . 'pdo_012.inc'); - -?> -===DONE=== - ---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=== diff --git a/ext/pdo_odbc/tests/pdo_013.phpt b/ext/pdo_odbc/tests/pdo_013.phpt deleted file mode 100755 index f573a88f74..0000000000 --- a/ext/pdo_odbc/tests/pdo_013.phpt +++ /dev/null @@ -1,60 +0,0 @@ ---TEST-- -PDO_ODBC: PDOStatement is Traversable ---SKIPIF-- - ---FILE-- -'CREATE TABLE test(id INT NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))'); - -require_once($PDO_TESTS . 'pdo_013.inc'); - -?> -===DONE=== - ---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=== diff --git a/ext/pdo_odbc/tests/pdo_014.phpt b/ext/pdo_odbc/tests/pdo_014.phpt deleted file mode 100755 index f0b1c550bc..0000000000 --- a/ext/pdo_odbc/tests/pdo_014.phpt +++ /dev/null @@ -1,52 +0,0 @@ ---TEST-- -PDO_ODBC: PDOStatement and SPL Iterators ---SKIPIF-- - ---FILE-- -'CREATE TABLE test(id INT NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))'); - -require_once($PDO_TESTS . 'pdo_014.inc'); - -?> -===DONE=== - ---EXPECTF-- -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" -} -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=== diff --git a/ext/pdo_odbc/tests/pdo_015.phpt b/ext/pdo_odbc/tests/pdo_015.phpt deleted file mode 100755 index 9a0bbc39a5..0000000000 --- a/ext/pdo_odbc/tests/pdo_015.phpt +++ /dev/null @@ -1,81 +0,0 @@ ---TEST-- -PDO_ODBC: PDO_FETCH_COLUMN ---SKIPIF-- - ---FILE-- -'CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(10))' -); - -//require_once(dirname(__FILE__).'/../../pdo/tests/pdo.inc'); -require_once($PDO_TESTS . 'pdo_015.inc'); - -?> -===DONE=== - ---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=== diff --git a/ext/pdo_odbc/tests/pdo_016.phpt b/ext/pdo_odbc/tests/pdo_016.phpt deleted file mode 100755 index bf3751d961..0000000000 --- a/ext/pdo_odbc/tests/pdo_016.phpt +++ /dev/null @@ -1,119 +0,0 @@ ---TEST-- -PDO_ODBC: PDO_FETCH_BOUND ---SKIPIF-- - ---FILE-- -setAttribute(PDO_ATTR_CASE, PDO_CASE_LOWER); - -require_once($PDO_TESTS . 'pdo_016.inc'); - -?> -===DONE=== - ---EXPECTF-- -===INIT=== -int(1) -int(1) -int(1) -string(1) "3" -array(3) { - [0]=> - string(7) "String0" - [1]=> - string(7) "String1" - [2]=> - string(7) "String2" -} -===WHILE=== -array(1) { - [0]=> - string(7) "String0" -} -array(1) { - [1]=> - string(7) "String1" -} -array(1) { - [2]=> - string(7) "String2" -} -===ALONE=== -array(1) { - [0]=> - string(7) "String0" -} -bool(true) -bool(true) -bool(true) -bool(true) -array(1) { - [0]=> - string(7) "String0" -} -array(1) { - [1]=> - string(7) "String1" -} -bool(true) -bool(true) -bool(true) -bool(true) -array(1) { - [1]=> - string(7) "String1" -} -array(1) { - [2]=> - string(7) "String2" -} -bool(true) -bool(true) -bool(true) -bool(true) -array(1) { - [2]=> - string(7) "String2" -} -===REBIND/SAME=== -array(1) { - [0]=> - string(7) "String0" -} -bool(true) -bool(true) -string(7) "String0" -bool(true) -bool(true) -string(1) "0" -array(1) { - [1]=> - string(7) "String1" -} -bool(true) -bool(true) -string(7) "String1" -bool(true) -bool(true) -string(1) "1" -array(1) { - [2]=> - string(7) "String2" -} -bool(true) -bool(true) -string(7) "String2" -bool(true) -bool(true) -string(1) "2" -===REBIND/CONFLICT=== -string(7) "String0" -string(7) "String1" -string(7) "String2" -===DONE=== diff --git a/ext/pdo_odbc/tests/pdo_017.phpt b/ext/pdo_odbc/tests/pdo_017.phpt deleted file mode 100755 index 5221c3dfc0..0000000000 --- a/ext/pdo_odbc/tests/pdo_017.phpt +++ /dev/null @@ -1,21 +0,0 @@ ---TEST-- -PDO_ODBC: PDO::beginTransaction / PDO::rollBack ---SKIPIF-- - ---FILE-- - -===DONE=== - ---EXPECT-- -Counted 3 rows after insert. -Counted 0 rows after delete. -Counted 3 rows after rollback. -===DONE=== diff --git a/ext/pdo_odbc/tests/pdo_018.phpt b/ext/pdo_odbc/tests/pdo_018.phpt deleted file mode 100755 index 61aea38b61..0000000000 --- a/ext/pdo_odbc/tests/pdo_018.phpt +++ /dev/null @@ -1,142 +0,0 @@ ---TEST-- -PDO_ODBC: PDO Unserializing ---SKIPIF-- - ---FILE-- -'CREATE TABLE classtypes(id INT NOT NULL PRIMARY KEY, name VARCHAR(20) NOT NULL UNIQUE)', -); - -$DB->setAttribute(PDO_ATTR_CASE, PDO_CASE_LOWER); - -require_once($PDO_TESTS . 'pdo_018.inc'); - -?> -===DONE=== - ---EXPECTF-- -===INIT=== -int(1) -int(1) -int(1) -string(1) "3" -array(3) { - [0]=> - string(8) "stdClass" - [1]=> - string(8) "TestBase" - [2]=> - string(11) "TestDerived" -} -===TYPES=== -array(4) { - ["stdClass"]=> - string(1) "0" - ["TestBase"]=> - string(1) "1" - ["TestDerived"]=> - string(1) "2" - ["TestLeaf"]=> - NULL -} -===INSERT=== -TestBase::serialize() = 'a:3:{s:7:"BasePub";s:6:"Public";s:7:"BasePro";s:9:"Protected";s:7:"BasePri";s:7:"Private";}' -TestDerived::serialize() -TestBase::serialize() = 'a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}' -TestDerived::serialize() -TestBase::serialize() = 'a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}' -===DATA=== -array(4) { - [0]=> - NULL - [1]=> - string(91) "a:3:{s:7:"BasePub";s:6:"Public";s:7:"BasePro";s:9:"Protected";s:7:"BasePri";s:7:"Private";}" - [2]=> - string(144) "a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}" - [3]=> - string(144) "a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}" -} -===FAILURE=== -Exception:SQLSTATE[HY000]: General error: cannot unserialize class -===COUNT=== -string(1) "3" -===DATABASE=== -array(3) { - [0]=> - array(2) { - ["NAME"]=> - string(8) "TestBase" - ["VAL"]=> - string(91) "a:3:{s:7:"BasePub";s:6:"Public";s:7:"BasePro";s:9:"Protected";s:7:"BasePri";s:7:"Private";}" - } - [1]=> - array(2) { - ["NAME"]=> - string(11) "TestDerived" - ["VAL"]=> - string(144) "a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}" - } - [2]=> - array(2) { - ["NAME"]=> - NULL - ["VAL"]=> - string(144) "a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}" - } -} -===FETCHCLASS=== -TestBase::unserialize[22](a:3:{s:7:"BasePub";s:6:"Public";s:7:"BasePro";s:9:"Protected";s:7:"BasePri";s:7:"Private";}) -TestDerived::unserialize() -TestBase::unserialize[22](a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}) -TestDerived::unserialize() -TestBase::unserialize[22](a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}) -array(3) { - [0]=> - object(TestBase)#%d (3) { - ["BasePub"]=> - string(7) "#Public" - ["BasePro:protected"]=> - string(10) "#Protected" - ["BasePri:private"]=> - string(8) "#Private" - } - [1]=> - object(TestDerived)#%d (6) { - ["BasePub"]=> - string(14) "#DerivedPublic" - ["BasePro:protected"]=> - string(17) "#DerivdeProtected" - ["DerivedPub"]=> - string(7) "#Public" - ["DerivedPro:protected"]=> - string(10) "#Protected" - ["DerivedPri:private"]=> - string(7) "Private" - ["BasePri:private"]=> - string(7) "Private" - } - [2]=> - object(TestLeaf)#%d (6) { - ["BasePub"]=> - string(14) "#DerivedPublic" - ["BasePro:protected"]=> - string(17) "#DerivdeProtected" - ["DerivedPub"]=> - string(7) "#Public" - ["DerivedPro:protected"]=> - string(10) "#Protected" - ["DerivedPri:private"]=> - string(7) "Private" - ["BasePri:private"]=> - string(7) "Private" - } -} -===DONE=== diff --git a/ext/pdo_odbc/tests/pdo_019.phpt b/ext/pdo_odbc/tests/pdo_019.phpt deleted file mode 100755 index b35656c7a8..0000000000 --- a/ext/pdo_odbc/tests/pdo_019.phpt +++ /dev/null @@ -1,54 +0,0 @@ ---TEST-- -PDO_ODBC: fetch() and while() ---SKIPIF-- - ---FILE-- -setAttribute(PDO_ATTR_CASE, PDO_CASE_LOWER); - -require_once($PDO_TESTS . 'pdo_019.inc'); - -?> -===DONE=== - ---EXPECTF-- -===INIT=== -int(1) -int(1) -int(1) -int(1) -string(1) "4" -array(4) { - [0]=> - string(7) "String0" - [1]=> - string(7) "String1" - [2]=> - string(7) "String2" - [3]=> - string(7) "String3" -} -===WHILE=== -array(1) { - [0]=> - string(7) "String0" -} -array(1) { - [1]=> - string(7) "String1" -} -array(1) { - [2]=> - string(7) "String2" -} -array(1) { - [3]=> - string(7) "String3" -} -===DONE=== diff --git a/ext/pdo_odbc/tests/pdo_020.phpt b/ext/pdo_odbc/tests/pdo_020.phpt deleted file mode 100755 index 8e00dbdacd..0000000000 --- a/ext/pdo_odbc/tests/pdo_020.phpt +++ /dev/null @@ -1,21 +0,0 @@ ---TEST-- -PDO_ODBC: PDOStatement::columnCount ---SKIPIF-- - ---FILE-- - -===DONE=== - ---EXPECT-- -Counted 2 columns after select1. -Counted 3 columns after select2. -Counted 1 columns after select3. -===DONE=== diff --git a/ext/pdo_odbc/tests/pdo_021.phpt b/ext/pdo_odbc/tests/pdo_021.phpt deleted file mode 100755 index 08a263125f..0000000000 --- a/ext/pdo_odbc/tests/pdo_021.phpt +++ /dev/null @@ -1,20 +0,0 @@ ---TEST-- -PDO_ODBC: PDOStatement::execute with parameter markers. ---SKIPIF-- - ---FILE-- - -===DONE=== - ---EXPECT-- -There are 6 rows in the table. -There are 12 rows in the table. -===DONE=== diff --git a/ext/pdo_odbc/tests/pdo_022.phpt b/ext/pdo_odbc/tests/pdo_022.phpt deleted file mode 100755 index 412fe35571..0000000000 --- a/ext/pdo_odbc/tests/pdo_022.phpt +++ /dev/null @@ -1,84 +0,0 @@ ---TEST-- -PDO_ODBC: PDOStatement::columnMeta results. ---SKIPIF-- - ---FILE-- - -===DONE=== - ---EXPECT-- -array(7) { - ["native_type"]=> - string(7) "integer" - ["odbc:decl_type"]=> - string(3) "INT" - ["flags"]=> - array(0) { - } - ["name"]=> - string(2) "id" - ["len"]=> - int(-1) - ["precision"]=> - int(0) - ["pdo_type"]=> - int(2) -} -array(7) { - ["native_type"]=> - string(6) "string" - ["odbc:decl_type"]=> - string(11) "VARCHAR(10)" - ["flags"]=> - array(0) { - } - ["name"]=> - string(3) "val" - ["len"]=> - int(-1) - ["precision"]=> - int(0) - ["pdo_type"]=> - int(2) -} -array(7) { - ["native_type"]=> - string(6) "string" - ["odbc:decl_type"]=> - string(11) "VARCHAR(16)" - ["flags"]=> - array(0) { - } - ["name"]=> - string(4) "val2" - ["len"]=> - int(-1) - ["precision"]=> - int(0) - ["pdo_type"]=> - int(2) -} -array(6) { - ["native_type"]=> - string(7) "integer" - ["flags"]=> - array(0) { - } - ["name"]=> - string(8) "COUNT(*)" - ["len"]=> - int(-1) - ["precision"]=> - int(0) - ["pdo_type"]=> - int(2) -} -===DONE=== diff --git a/ext/pdo_odbc/tests/pdo_023.phpt b/ext/pdo_odbc/tests/pdo_023.phpt deleted file mode 100755 index 6c6f366620..0000000000 --- a/ext/pdo_odbc/tests/pdo_023.phpt +++ /dev/null @@ -1,60 +0,0 @@ ---TEST-- -PDO_ODBC: Overloading ---SKIPIF-- - ---FILE-- -setAttribute(PDO_ATTR_ERRMODE, PDO_ERRMODE_WARNING); - -require_once($PDO_TESTS . 'pdo_023.inc'); - -?> -===DONE=== - ---EXPECTF-- -int(1) -int(2) -object(PDODatabaseX)#%d (2) { - ["test1"]=> - int(1) - ["test2"]=> - int(22) -} -PDODatabaseX::query() -PDOStatementX::__construct() -PDOStatementX::__destruct() -PDODatabaseX::query() -PDOStatementX::__construct() -PDOStatementX::__destruct() -PDODatabaseX::query() -PDOStatementX::__construct() -PDOStatementX::__destruct() -PDODatabaseX::query() -PDOStatementX::__construct() -object(PDOStatementX)#%d (3) { - ["test1"]=> - int(1) - ["queryString"]=> - string(24) "SELECT val, id FROM test" - ["test2"]=> - int(22) -} -array(2) { - ["A"]=> - string(1) "0" - ["B"]=> - string(1) "1" -} -PDOStatementX::__destruct() -PDODatabaseX::__destruct() -===DONE=== diff --git a/ext/pdo_odbc/tests/pdo_024.phpt b/ext/pdo_odbc/tests/pdo_024.phpt deleted file mode 100755 index 633c2ad341..0000000000 --- a/ext/pdo_odbc/tests/pdo_024.phpt +++ /dev/null @@ -1,25 +0,0 @@ ---TEST-- -PDO_ODBC: Bind does not convert NULL ---SKIPIF-- - ---FILE-- -setAttribute(PDO_ATTR_CASE, PDO_CASE_LOWER); - -require_once($PDO_TESTS . 'pdo_024.inc'); - -?> -===DONE=== - ---EXPECTF-- -bind: success -bool(true) -NULL -===DONE=== diff --git a/ext/pdo_odbc/tests/pdo_025.phpt b/ext/pdo_odbc/tests/pdo_025.phpt deleted file mode 100755 index 569113f9c0..0000000000 --- a/ext/pdo_odbc/tests/pdo_025.phpt +++ /dev/null @@ -1,70 +0,0 @@ ---TEST-- -PDO_ODBC: PDO_FETCH_INTO ---SKIPIF-- - ---FILE-- -setAttribute(PDO_ATTR_CASE, PDO_CASE_LOWER); - -require_once($PDO_TESTS . 'pdo_025.inc'); - -?> -===DONE=== - ---EXPECTF-- -object(Test)#%d (3) { - ["id"]=> - string(2) "10" - ["val"]=> - string(3) "Abc" - ["val2"]=> - string(3) "zxy" -} -object(Test)#%d (3) { - ["id"]=> - string(2) "20" - ["val"]=> - string(3) "Def" - ["val2"]=> - string(3) "wvu" -} -object(Test)#%d (3) { - ["id"]=> - string(2) "30" - ["val"]=> - string(3) "Ghi" - ["val2"]=> - string(3) "tsr" -} -object(Test)#%d (3) { - ["id"]=> - string(2) "40" - ["val"]=> - string(3) "Jkl" - ["val2"]=> - string(3) "qpo" -} -object(Test)#%d (3) { - ["id"]=> - string(2) "50" - ["val"]=> - string(3) "Mno" - ["val2"]=> - string(3) "nml" -} -object(Test)#%d (3) { - ["id"]=> - string(2) "60" - ["val"]=> - string(3) "Pqr" - ["val2"]=> - string(3) "kji" -} -===FAIL=== - -Fatal error: Cannot access protected property Fail::$id in %spdo_025.inc on line %d diff --git a/ext/pdo_odbc/tests/pdo_026.phpt b/ext/pdo_odbc/tests/pdo_026.phpt deleted file mode 100755 index a8837305dc..0000000000 --- a/ext/pdo_odbc/tests/pdo_026.phpt +++ /dev/null @@ -1,50 +0,0 @@ ---TEST-- -PDO_ODBC: Deriving PDO ---SKIPIF-- - ---FILE-- - -===DONE=== - ---EXPECT-- -string(11) "PDODatabase" -string(12) "PDOStatement" -PDODatabase::query() -PDOStatementX::__construct() -string(13) "PDOStatementX" -string(11) "PDODatabase" -array(3) { - ["ID"]=> - string(2) "10" - ["VAL"]=> - string(3) "Abc" - ["VAL2"]=> - string(3) "zxy" -} -array(3) { - ["ID"]=> - string(2) "20" - ["VAL"]=> - string(3) "Def" - ["VAL2"]=> - string(3) "wvu" -} -array(3) { - ["ID"]=> - string(2) "30" - ["VAL"]=> - string(3) "Ghi" - ["VAL2"]=> - string(3) "tsr" -} -===DONE=== -PDODatabase::__destruct() -PDOStatementX::__destruct() diff --git a/ext/pdo_odbc/tests/prepare.inc b/ext/pdo_odbc/tests/prepare.inc deleted file mode 100755 index c5c12a97b7..0000000000 --- a/ext/pdo_odbc/tests/prepare.inc +++ /dev/null @@ -1,24 +0,0 @@ -'CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10))' -); - -//$DB = new pdo($CONNECTION, $USER, $PASSWD); -try { - $DB = new pdo($CONNECTION); -} catch (Exception $tmp) { - $DB = NULL; - return; -} - -foreach(array('test','classtypes') as $name) -{ - $DB->exec("DROP TABLE $name"); -} - -$DB->setAttribute(PDO_ATTR_ERRMODE, PDO_ERRMODE_WARNING); - -?> diff --git a/ext/pdo_odbc/tests/skipif.inc b/ext/pdo_odbc/tests/skipif.inc deleted file mode 100755 index 2d44a6c421..0000000000 --- a/ext/pdo_odbc/tests/skipif.inc +++ /dev/null @@ -1,12 +0,0 @@ -