PDO DBLIB test fixups

diff --git a/ext/pdo_dblib/tests/bug_38955.phpt b/ext/pdo_dblib/tests/bug_38955.phpt
index 0fbacf730502b5d20557f6213d83038d5af94f96..95f5f204b43752ea7a9923ab78f4f2b90266232c 100644 (file)
--- a/ext/pdo_dblib/tests/bug_38955.phpt
+++ b/ext/pdo_dblib/tests/bug_38955.phpt
@@ -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);
 

diff --git a/ext/pdo_dblib/tests/bug_45876.phpt b/ext/pdo_dblib/tests/bug_45876.phpt
index 5c4269356bb1ab2085c9ef0b03e16d0919240556..6b48e5cafb1221144ebd5b45f04939942a73cd53 100644 (file)
--- a/ext/pdo_dblib/tests/bug_45876.phpt
+++ b/ext/pdo_dblib/tests/bug_45876.phpt
@@ -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 @@ array(8) {
   ["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"]=>

diff --git a/ext/pdo_dblib/tests/bug_47588.phpt b/ext/pdo_dblib/tests/bug_47588.phpt
index 2e2aaa011767814ff46ab0366785a2f8472c7f3b..e1835ffefeabd1236f8409d8eeebbc3de5d7b233 100644 (file)
--- a/ext/pdo_dblib/tests/bug_47588.phpt
+++ b/ext/pdo_dblib/tests/bug_47588.phpt
@@ -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 @@ echo "Done.\n";
 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"
   }
 }

diff --git a/ext/pdo_dblib/tests/bug_50755.phpt b/ext/pdo_dblib/tests/bug_50755.phpt
index 3e057fcba08f5fd7c34160310d09a74317d98e68..8073706de6d6ec8a91170c6e3cf0040e13d087cf 100644 (file)
--- a/ext/pdo_dblib/tests/bug_50755.phpt
+++ b/ext/pdo_dblib/tests/bug_50755.phpt
@@ -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);