diff options
Diffstat (limited to 'ext/pdo_oci')
-rw-r--r-- | ext/pdo_oci/tests/bug46274.phpt | 2 | ||||
-rw-r--r-- | ext/pdo_oci/tests/bug46274_2.phpt | 2 | ||||
-rw-r--r-- | ext/pdo_oci/tests/bug54379.phpt | 2 | ||||
-rw-r--r-- | ext/pdo_oci/tests/bug57702.phpt | 14 | ||||
-rw-r--r-- | ext/pdo_oci/tests/checkliveness.phpt | 4 | ||||
-rw-r--r-- | ext/pdo_oci/tests/pdo_oci_stream_2a.phpt | 4 | ||||
-rw-r--r-- | ext/pdo_oci/tests/pdo_oci_stream_2b.phpt | 12 | ||||
-rw-r--r-- | ext/pdo_oci/tests/pecl_bug_11345.phpt | 2 |
8 files changed, 21 insertions, 21 deletions
diff --git a/ext/pdo_oci/tests/bug46274.phpt b/ext/pdo_oci/tests/bug46274.phpt index 23ee8ee20f..e80451e7ee 100644 --- a/ext/pdo_oci/tests/bug46274.phpt +++ b/ext/pdo_oci/tests/bug46274.phpt @@ -2,7 +2,7 @@ Bug #46274 (pdo_pgsql - Segfault when using PDO::ATTR_STRINGIFY_FETCHES and blob) --SKIPIF-- <?php -if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) +if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) die('skip not loaded'); require dirname(__FILE__).'/../../pdo/tests/pdo_test.inc'; PDOTest::skip(); diff --git a/ext/pdo_oci/tests/bug46274_2.phpt b/ext/pdo_oci/tests/bug46274_2.phpt index cbadcef4f8..3430877b9f 100644 --- a/ext/pdo_oci/tests/bug46274_2.phpt +++ b/ext/pdo_oci/tests/bug46274_2.phpt @@ -2,7 +2,7 @@ Bug #46274 (pdo_pgsql - Segfault when using PDO::ATTR_STRINGIFY_FETCHES and blob) --SKIPIF-- <?php -if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) +if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) die('skip not loaded'); require dirname(__FILE__).'/../../pdo/tests/pdo_test.inc'; PDOTest::skip(); diff --git a/ext/pdo_oci/tests/bug54379.phpt b/ext/pdo_oci/tests/bug54379.phpt index abb6bc73e1..8f3c4f75c0 100644 --- a/ext/pdo_oci/tests/bug54379.phpt +++ b/ext/pdo_oci/tests/bug54379.phpt @@ -2,7 +2,7 @@ Bug #54379 (PDO_OCI: UTF-8 output gets truncated) --SKIPIF-- <?php -if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) +if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) die('skip not loaded'); require dirname(__FILE__).'/../../pdo/tests/pdo_test.inc'; if (!preg_match('/charset=.*utf8/i', getenv('PDOTEST_DSN'))) diff --git a/ext/pdo_oci/tests/bug57702.phpt b/ext/pdo_oci/tests/bug57702.phpt index d0abc6ff8c..10b2d1c945 100644 --- a/ext/pdo_oci/tests/bug57702.phpt +++ b/ext/pdo_oci/tests/bug57702.phpt @@ -25,7 +25,7 @@ $stmt->execute(); function do_insert($db, $id, $data1, $data2) { - $db->beginTransaction(); + $db->beginTransaction(); $stmt = $db->prepare("insert into bug57702 (id, data1, data2) values (:id, empty_blob(), empty_blob()) returning data1, data2 into :blob1, :blob2"); $stmt->bindParam(':id', $id); $stmt->bindParam(':blob1', $blob1, PDO::PARAM_LOB); @@ -34,10 +34,10 @@ function do_insert($db, $id, $data1, $data2) $blob2 = null; $stmt->execute(); - fwrite($blob1, $data1); + fwrite($blob1, $data1); fclose($blob1); - fwrite($blob2, $data2); - fclose($blob2); + fwrite($blob2, $data2); + fclose($blob2); $db->commit(); } @@ -84,7 +84,7 @@ while ($stmt->fetch(PDO::FETCH_BOUND)) { //////////////////// -echo "\nFourth Query\n"; +echo "\nFourth Query\n"; $a = array(); $i = 0; @@ -101,7 +101,7 @@ for ($i = 0; $i < count($a); $i++) { //////////////////// -echo "\nFifth Query\n"; +echo "\nFifth Query\n"; $db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false); // Let's use streams @@ -124,7 +124,7 @@ for ($i = 0; $i < count($a); $i++) { //////////////////// -echo "\nSixth Query\n"; +echo "\nSixth Query\n"; $db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false); // Let's use streams diff --git a/ext/pdo_oci/tests/checkliveness.phpt b/ext/pdo_oci/tests/checkliveness.phpt index 4bb070f40d..293a26b566 100644 --- a/ext/pdo_oci/tests/checkliveness.phpt +++ b/ext/pdo_oci/tests/checkliveness.phpt @@ -19,7 +19,7 @@ $attr = getenv('PDOTEST_ATTR'); try { $db = new PDO($dsn, $user, $pass, array(PDO::ATTR_PERSISTENT => true)); -} +} catch (PDOException $e) { echo 'Connection failed: ' . $e->getMessage(); exit; @@ -28,7 +28,7 @@ catch (PDOException $e) { // This triggers the call to check liveness try { $db = new PDO($dsn, $user, $pass, array(PDO::ATTR_PERSISTENT => true)); -} +} catch (PDOException $e) { echo 'Connection failed: ' . $e->getMessage(); exit; diff --git a/ext/pdo_oci/tests/pdo_oci_stream_2a.phpt b/ext/pdo_oci/tests/pdo_oci_stream_2a.phpt index 72d2ed93b1..8096fe17f7 100644 --- a/ext/pdo_oci/tests/pdo_oci_stream_2a.phpt +++ b/ext/pdo_oci/tests/pdo_oci_stream_2a.phpt @@ -24,7 +24,7 @@ $stmt->execute(); function do_insert($db, $id, $data1, $data2) { - $db->beginTransaction(); + $db->beginTransaction(); $stmt = $db->prepare("insert into pdo_oci_stream_2 (id, data1, data2) values (:id, empty_blob(), empty_blob()) returning data1, data2 into :blob1, :blob2"); $stmt->bindParam(':id', $id); $stmt->bindParam(':blob1', $blob1, PDO::PARAM_LOB); @@ -33,7 +33,7 @@ function do_insert($db, $id, $data1, $data2) $blob2 = null; $stmt->execute(); - fwrite($blob1, $data1); + fwrite($blob1, $data1); fclose($blob1); fwrite($blob2, $data2); fclose($blob2); diff --git a/ext/pdo_oci/tests/pdo_oci_stream_2b.phpt b/ext/pdo_oci/tests/pdo_oci_stream_2b.phpt index 22ae7c6724..db55d244e5 100644 --- a/ext/pdo_oci/tests/pdo_oci_stream_2b.phpt +++ b/ext/pdo_oci/tests/pdo_oci_stream_2b.phpt @@ -27,16 +27,16 @@ $a_val = ord('a'); foreach($db->query("select data1 as d4_1, data2 as d4_2 from pdo_oci_stream_2 order by id") as $row) { $a = $row['d4_1']; $a1 = $row['d4_2']; - + $str1 = stream_get_contents($a); $str2 = stream_get_contents($a1); - + $str1len = strlen($str1); $str2len = strlen($str2); - + $b = ord($str1[0]); $b1 = ord($str2[0]); - + if (($b != ($a_val + $i)) && ($str1len != (4086 + $i)) && ($b1 != ($a_val + $j)) && ($str2len != (4086 + $j))) { printf("There is a bug!\n"); @@ -45,13 +45,13 @@ foreach($db->query("select data1 as d4_1, data2 as d4_2 from pdo_oci_stream_2 or printf("b = %d\n", $b); printf("i = %d\n", $i); printf("str1len = %d\n", $str1len); - + printf("Col2:\n"); printf("a_val = %d\n", $a_val); printf("b1 = %d\n", $b1); printf("j = %d\n", $j); printf("str2len = %d\n", $str1len); - + } $i++; if ($i>9) diff --git a/ext/pdo_oci/tests/pecl_bug_11345.phpt b/ext/pdo_oci/tests/pecl_bug_11345.phpt index b80773a334..8a633f547c 100644 --- a/ext/pdo_oci/tests/pecl_bug_11345.phpt +++ b/ext/pdo_oci/tests/pecl_bug_11345.phpt @@ -15,7 +15,7 @@ PDOTest::skip(); try { $dbh = new PDO('oci:dbname=xxx;charset=yyy', 'abc', 'def'); -} +} catch (PDOException $e) { echo 'Connection failed: ' . $e->getMessage(). "\n"; exit; |