ssufficool Tue, 29 Jun 2010 14:08:22 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=300858
Log:
PDO DBLIB test fixups
Changed paths:
U php/php-src/trunk/ext/pdo_dblib/tests/bug_38955.phpt
U php/php-src/trunk/ext/pdo_dblib/tests/bug_45876.phpt
U php/php-src/trunk/ext/pdo_dblib/tests/bug_47588.phpt
U php/php-src/trunk/ext/pdo_dblib/tests/bug_50755.phpt
Modified: php/php-src/trunk/ext/pdo_dblib/tests/bug_38955.phpt
===================================================================
--- php/php-src/trunk/ext/pdo_dblib/tests/bug_38955.phpt 2010-06-29
13:32:47 UTC (rev 300857)
+++ php/php-src/trunk/ext/pdo_dblib/tests/bug_38955.phpt 2010-06-29
14:08:22 UTC (rev 300858)
@@ -2,15 +2,18 @@
PDO_DBLIB driver does not support transactions
--SKIPIF--
<?php
-if (!extension_loaded('pdo') || !extension_loaded('pdo_dblib')) die('skip not
loaded');
+if (!extension_loaded('pdo_dblib')) die('skip not loaded');
require dirname(__FILE__) . '/config.inc';
-require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
-PDOTest::skip();
+try {
+ $db = new PDO( getenv('PDOTEST_DSN'), getenv('PDOTEST_USER'),
getenv('PDOTEST_PASS'));
+} catch (PDOException $e) {
+ die('skip ' . $e->getMessage());
+}
?>
--FILE--
<?php
-require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
-$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
+require dirname(__FILE__) . '/config.inc';
+$db = new PDO( getenv('PDOTEST_DSN'), getenv('PDOTEST_USER'),
getenv('PDOTEST_PASS'));
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
Modified: php/php-src/trunk/ext/pdo_dblib/tests/bug_45876.phpt
===================================================================
--- php/php-src/trunk/ext/pdo_dblib/tests/bug_45876.phpt 2010-06-29
13:32:47 UTC (rev 300857)
+++ php/php-src/trunk/ext/pdo_dblib/tests/bug_45876.phpt 2010-06-29
14:08:22 UTC (rev 300858)
@@ -2,15 +2,18 @@
PDO_DBLIB: Does not support get column meta
--SKIPIF--
<?php
-if (!extension_loaded('pdo') || !extension_loaded('pdo_dblib')) die('skip not
loaded');
+if (!extension_loaded('pdo_dblib')) die('skip not loaded');
require dirname(__FILE__) . '/config.inc';
-require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
-PDOTest::skip();
+try {
+ $db = new PDO( getenv('PDOTEST_DSN'), getenv('PDOTEST_USER'),
getenv('PDOTEST_PASS'));
+} catch (PDOException $e) {
+ die('skip ' . $e->getMessage());
+}
?>
--FILE--
<?php
-require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
-$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
+require dirname(__FILE__) . '/config.inc';
+$db = new PDO( getenv('PDOTEST_DSN'), getenv('PDOTEST_USER'),
getenv('PDOTEST_PASS'));
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
@@ -28,11 +31,11 @@
["scale"]=>
int(0)
["column_source"]=>
- string(13) "table_catalog"
+ string(13) "TABLE_CATALOG"
["native_type"]=>
string(4) "char"
["name"]=>
- string(13) "table_catalog"
+ string(13) "TABLE_CATALOG"
["len"]=>
int(255)
["pdo_type"]=>
Modified: php/php-src/trunk/ext/pdo_dblib/tests/bug_47588.phpt
===================================================================
--- php/php-src/trunk/ext/pdo_dblib/tests/bug_47588.phpt 2010-06-29
13:32:47 UTC (rev 300857)
+++ php/php-src/trunk/ext/pdo_dblib/tests/bug_47588.phpt 2010-06-29
14:08:22 UTC (rev 300858)
@@ -2,15 +2,19 @@
PDO_DBLIB: Quoted field names
--SKIPIF--
<?php
-if (!extension_loaded('pdo') || !extension_loaded('pdo_dblib')) die('skip not
loaded');
+if (!extension_loaded('pdo_dblib')) die('skip not loaded');
require dirname(__FILE__) . '/config.inc';
-require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
-PDOTest::skip();
+try {
+ $db = new PDO( getenv('PDOTEST_DSN'), getenv('PDOTEST_USER'),
getenv('PDOTEST_PASS'));
+} catch (PDOException $e) {
+ die('skip ' . $e->getMessage());
+}
+
?>
--FILE--
<?php
-require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
-$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
+require dirname(__FILE__) . '/config.inc';
+$db = new PDO( getenv('PDOTEST_DSN'), getenv('PDOTEST_USER'),
getenv('PDOTEST_PASS'));
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
@@ -27,23 +31,23 @@
array(3) {
[0]=>
array(2) {
- ["my field"]=>
+ ["My Field"]=>
string(1) "1"
- ["another field"]=>
+ ["Another Field"]=>
string(11) "test_string"
}
[1]=>
array(2) {
- ["my field"]=>
+ ["My Field"]=>
string(1) "2"
- ["another field"]=>
+ ["Another Field"]=>
string(11) "test_string"
}
[2]=>
array(2) {
- ["my field"]=>
+ ["My Field"]=>
string(1) "3"
- ["another field"]=>
+ ["Another Field"]=>
string(11) "test_string"
}
}
Modified: php/php-src/trunk/ext/pdo_dblib/tests/bug_50755.phpt
===================================================================
--- php/php-src/trunk/ext/pdo_dblib/tests/bug_50755.phpt 2010-06-29
13:32:47 UTC (rev 300857)
+++ php/php-src/trunk/ext/pdo_dblib/tests/bug_50755.phpt 2010-06-29
14:08:22 UTC (rev 300858)
@@ -2,15 +2,18 @@
PDO_DBLIB: Out of memory on large recordsets
--SKIPIF--
<?php
-if (!extension_loaded('pdo') || !extension_loaded('pdo_dblib')) die('skip not
loaded');
+if (!extension_loaded('pdo_dblib')) die('skip not loaded');
require dirname(__FILE__) . '/config.inc';
-require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
-PDOTest::skip();
+try {
+ $db = new PDO( getenv('PDOTEST_DSN'), getenv('PDOTEST_USER'),
getenv('PDOTEST_PASS'));
+} catch (PDOException $e) {
+ die('skip ' . $e->getMessage());
+}
?>
--FILE--
<?php
-require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
-$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
+require dirname(__FILE__) . '/config.inc';
+$db = new PDO( getenv('PDOTEST_DSN'), getenv('PDOTEST_USER'),
getenv('PDOTEST_PASS'));
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
