pdo_dblib - improve test skip messages

diff --git a/ext/pdo_dblib/tests/bug_38955.phpt b/ext/pdo_dblib/tests/bug_38955.phpt
index 95f5f204b43752ea7a9923ab78f4f2b90266232c..1954ed460b54f41ec338f5c075c0d5f74aa5d31f 100644 (file)
--- a/ext/pdo_dblib/tests/bug_38955.phpt
+++ b/ext/pdo_dblib/tests/bug_38955.phpt
@@ -4,18 +4,10 @@
 <?php
 if (!extension_loaded('pdo_dblib')) die('skip not loaded');
 require dirname(__FILE__) . '/config.inc';
-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__) . '/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);
 
 /*We see these rows */
 $db->query("CREATE table php_test(val int)");

diff --git a/ext/pdo_dblib/tests/bug_45876.phpt b/ext/pdo_dblib/tests/bug_45876.phpt
index 6b48e5cafb1221144ebd5b45f04939942a73cd53..920905830a9be5a355b23d35a93ba4b02c6bb103 100644 (file)
--- a/ext/pdo_dblib/tests/bug_45876.phpt
+++ b/ext/pdo_dblib/tests/bug_45876.phpt
@@ -4,18 +4,10 @@ PDO_DBLIB: Does not support get column meta
 <?php
 if (!extension_loaded('pdo_dblib')) die('skip not loaded');
 require dirname(__FILE__) . '/config.inc';
-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__) . '/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);
 
 $stmt = $db->prepare("select ic1.* from information_schema.columns ic1");
 $stmt->execute();

diff --git a/ext/pdo_dblib/tests/bug_47588.phpt b/ext/pdo_dblib/tests/bug_47588.phpt
index e1835ffefeabd1236f8409d8eeebbc3de5d7b233..d8f424e8728efd5cd08c012714c07dbb129db118 100644 (file)
--- a/ext/pdo_dblib/tests/bug_47588.phpt
+++ b/ext/pdo_dblib/tests/bug_47588.phpt
@@ -4,19 +4,10 @@ PDO_DBLIB: Quoted field names
 <?php
 if (!extension_loaded('pdo_dblib')) die('skip not loaded');
 require dirname(__FILE__) . '/config.inc';
-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__) . '/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);
 
 $db->query('CREATE TABLE "Test Table" ("My Field" int, "Another Field" varchar(32) not null default \'test_string\')');
 $db->query('INSERT INTO "Test Table" ("My Field") values(1)');

diff --git a/ext/pdo_dblib/tests/bug_50755.phpt b/ext/pdo_dblib/tests/bug_50755.phpt
index 8073706de6d6ec8a91170c6e3cf0040e13d087cf..95d1a8bc70dfd732e0eb17dfe065ccb838f2d90e 100644 (file)
--- a/ext/pdo_dblib/tests/bug_50755.phpt
+++ b/ext/pdo_dblib/tests/bug_50755.phpt
@@ -4,18 +4,10 @@ PDO_DBLIB: Out of memory on large recordsets
 <?php
 if (!extension_loaded('pdo_dblib')) die('skip not loaded');
 require dirname(__FILE__) . '/config.inc';
-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__) . '/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);
 
 /* This should be sufficient to overflow any buffers */
 $stmt = $db->prepare("select *

diff --git a/ext/pdo_dblib/tests/config.inc b/ext/pdo_dblib/tests/config.inc
index 862d504ec7437c8727d649ae6e3134e12540426b..5b7b4d43273fb52a855d8c9bc94ff3aebd8523c5 100644 (file)
--- a/ext/pdo_dblib/tests/config.inc
+++ b/ext/pdo_dblib/tests/config.inc
@@ -1,20 +1,26 @@
 <?php
 
 if (false !== getenv('PDO_DBLIB_TEST_DSN')) 
-       $config['ENV']['PDOTEST_DSN'] = getenv('PDO_DBLIB_TEST_DSN');
+       $dsn = getenv('PDO_DBLIB_TEST_DSN');
 else
-       $config['ENV']['PDOTEST_DSN'] = 'dblib:host=localhost dbname=test';
+       $dsn = 'dblib:host=localhost;dbname=test';
 
 if (false !== getenv('PDO_DBLIB_TEST_USER'))   
-       $config['ENV']['PDOTEST_USER'] = getenv('PDO_DBLIB_TEST_USER');
+       $user = getenv('PDO_DBLIB_TEST_USER');
+else
+       $user = 'php';
+       
        
 if (false !== getenv('PDO_DBLIB_TEST_PASS'))   
-       $config['ENV']['PDOTEST_PASS'] = getenv('PDO_DBLIB_TEST_PASS');
+       $pass = getenv('PDO_DBLIB_TEST_PASS');
+else
+       $pass = 'password';
 
-if (false !== getenv('PDO_DBLIB_TEST_ATTR'))
-       $config['ENV']['PDOTEST_ATTR'] = getenv('PDO_DBLIB_TEST_ATTR');
-       
-foreach ($config['ENV'] as $k => $v) {
-       putenv("$k=$v");
+try {
+       $db = new PDO($dsn, $user, $pass);
+       $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+       $db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
+} catch (PDOException $e) {
+       die('skip ' . $e->getMessage());
 }
 ?>