bug42496_2.phpt

Christopher Jones Wed, 07 Sep 2011 12:19:18 -0700

sixd                                     Wed, 07 Sep 2011 19:19:00 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=316384


Log:
Use unique object names to reduce potential clashes when testing in parallel

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bug42496_1.phpt
    U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bug42496_2.phpt
    U   php/php-src/branches/PHP_5_4/ext/oci8/tests/bug42496_1.phpt
    U   php/php-src/branches/PHP_5_4/ext/oci8/tests/bug42496_2.phpt
    U   php/php-src/trunk/ext/oci8/tests/bug42496_1.phpt
    U   php/php-src/trunk/ext/oci8/tests/bug42496_2.phpt

Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/bug42496_1.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/bug42496_1.phpt 2011-09-07 
18:51:43 UTC (rev 316383)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/bug42496_1.phpt 2011-09-07 
19:19:00 UTC (rev 316384)
@@ -14,11 +14,11 @@
 // Initialization

 $stmtarray = array(
-       "DROP table bug42496_tab",
-       "CREATE table bug42496_tab(c1 CLOB, c2 CLOB)",
-       "INSERT INTO bug42496_tab VALUES('test1', 'test1')",
-       "INSERT INTO bug42496_tab VALUES('test2', 'test2')",
-       "INSERT INTO bug42496_tab VALUES('test3', 'test3')"
+       "DROP table bug42496_1_tab",
+       "CREATE table bug42496_1_tab(c1 CLOB, c2 CLOB)",
+       "INSERT INTO bug42496_1_tab VALUES('test1', 'test1')",
+       "INSERT INTO bug42496_1_tab VALUES('test2', 'test2')",
+       "INSERT INTO bug42496_1_tab VALUES('test3', 'test3')"
 );

 oci8_test_sql_execute($c, $stmtarray);
@@ -28,7 +28,7 @@
 echo "Test 1\n";

 for ($i = 0; $i < 15000; $i++) {
-       $s = oci_parse($c, "SELECT * from bug42496_tab");
+       $s = oci_parse($c, "SELECT * from bug42496_1_tab");
        oci_define_by_name($s, "C1", $col1);
        oci_define_by_name($s, "C2", $col2);
        if (oci_execute($s)) {
@@ -46,7 +46,7 @@
 // Cleanup

 $stmtarray = array(
-       "DROP table bug42496_tab"
+       "DROP table bug42496_1_tab"
 );

 oci8_test_sql_execute($c, $stmtarray);

Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/bug42496_2.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/bug42496_2.phpt 2011-09-07 
18:51:43 UTC (rev 316383)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/bug42496_2.phpt 2011-09-07 
19:19:00 UTC (rev 316384)
@@ -14,11 +14,11 @@
 // Initialization

 $stmtarray = array(
-       "DROP table bug42496_tab",
-       "CREATE table bug42496_tab(c1 CLOB, c2 CLOB)",
-       "INSERT INTO bug42496_tab VALUES('test1', 'test1')",
-       "INSERT INTO bug42496_tab VALUES('test2', 'test2')",
-       "INSERT INTO bug42496_tab VALUES('test3', 'test3')"
+       "DROP table bug42496_2_tab",
+       "CREATE table bug42496_2_tab(c1 CLOB, c2 CLOB)",
+       "INSERT INTO bug42496_2_tab VALUES('test1', 'test1')",
+       "INSERT INTO bug42496_2_tab VALUES('test2', 'test2')",
+       "INSERT INTO bug42496_2_tab VALUES('test3', 'test3')"
 );

 oci8_test_sql_execute($c, $stmtarray);
@@ -28,7 +28,7 @@
 echo "Test 2\n";

 for ($i = 0; $i < 15000; $i++) {
-       $s = oci_parse($c, "SELECT * from bug42496_tab");
+       $s = oci_parse($c, "SELECT * from bug42496_2_tab");
        if (oci_execute($s)) {
                $arr = array();
                while ($arr = oci_fetch_assoc($s)) {
@@ -44,7 +44,7 @@
 // Cleanup

 $stmtarray = array(
-       "DROP table bug42496_tab"
+       "DROP table bug42496_2_tab"
 );

 oci8_test_sql_execute($c, $stmtarray);

Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/bug42496_1.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/oci8/tests/bug42496_1.phpt 2011-09-07 
18:51:43 UTC (rev 316383)
+++ php/php-src/branches/PHP_5_4/ext/oci8/tests/bug42496_1.phpt 2011-09-07 
19:19:00 UTC (rev 316384)
@@ -14,11 +14,11 @@
 // Initialization

 $stmtarray = array(
-       "DROP table bug42496_tab",
-       "CREATE table bug42496_tab(c1 CLOB, c2 CLOB)",
-       "INSERT INTO bug42496_tab VALUES('test1', 'test1')",
-       "INSERT INTO bug42496_tab VALUES('test2', 'test2')",
-       "INSERT INTO bug42496_tab VALUES('test3', 'test3')"
+       "DROP table bug42496_1_tab",
+       "CREATE table bug42496_1_tab(c1 CLOB, c2 CLOB)",
+       "INSERT INTO bug42496_1_tab VALUES('test1', 'test1')",
+       "INSERT INTO bug42496_1_tab VALUES('test2', 'test2')",
+       "INSERT INTO bug42496_1_tab VALUES('test3', 'test3')"
 );

 oci8_test_sql_execute($c, $stmtarray);
@@ -28,7 +28,7 @@
 echo "Test 1\n";

 for ($i = 0; $i < 15000; $i++) {
-       $s = oci_parse($c, "SELECT * from bug42496_tab");
+       $s = oci_parse($c, "SELECT * from bug42496_1_tab");
        oci_define_by_name($s, "C1", $col1);
        oci_define_by_name($s, "C2", $col2);
        if (oci_execute($s)) {
@@ -46,7 +46,7 @@
 // Cleanup

 $stmtarray = array(
-       "DROP table bug42496_tab"
+       "DROP table bug42496_1_tab"
 );

 oci8_test_sql_execute($c, $stmtarray);

Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/bug42496_2.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/oci8/tests/bug42496_2.phpt 2011-09-07 
18:51:43 UTC (rev 316383)
+++ php/php-src/branches/PHP_5_4/ext/oci8/tests/bug42496_2.phpt 2011-09-07 
19:19:00 UTC (rev 316384)
@@ -14,11 +14,11 @@
 // Initialization

 $stmtarray = array(
-       "DROP table bug42496_tab",
-       "CREATE table bug42496_tab(c1 CLOB, c2 CLOB)",
-       "INSERT INTO bug42496_tab VALUES('test1', 'test1')",
-       "INSERT INTO bug42496_tab VALUES('test2', 'test2')",
-       "INSERT INTO bug42496_tab VALUES('test3', 'test3')"
+       "DROP table bug42496_2_tab",
+       "CREATE table bug42496_2_tab(c1 CLOB, c2 CLOB)",
+       "INSERT INTO bug42496_2_tab VALUES('test1', 'test1')",
+       "INSERT INTO bug42496_2_tab VALUES('test2', 'test2')",
+       "INSERT INTO bug42496_2_tab VALUES('test3', 'test3')"
 );

 oci8_test_sql_execute($c, $stmtarray);
@@ -28,7 +28,7 @@
 echo "Test 2\n";

 for ($i = 0; $i < 15000; $i++) {
-       $s = oci_parse($c, "SELECT * from bug42496_tab");
+       $s = oci_parse($c, "SELECT * from bug42496_2_tab");
        if (oci_execute($s)) {
                $arr = array();
                while ($arr = oci_fetch_assoc($s)) {
@@ -44,7 +44,7 @@
 // Cleanup

 $stmtarray = array(
-       "DROP table bug42496_tab"
+       "DROP table bug42496_2_tab"
 );

 oci8_test_sql_execute($c, $stmtarray);

Modified: php/php-src/trunk/ext/oci8/tests/bug42496_1.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/bug42496_1.phpt    2011-09-07 18:51:43 UTC 
(rev 316383)
+++ php/php-src/trunk/ext/oci8/tests/bug42496_1.phpt    2011-09-07 19:19:00 UTC 
(rev 316384)
@@ -14,11 +14,11 @@
 // Initialization

 $stmtarray = array(
-       "DROP table bug42496_tab",
-       "CREATE table bug42496_tab(c1 CLOB, c2 CLOB)",
-       "INSERT INTO bug42496_tab VALUES('test1', 'test1')",
-       "INSERT INTO bug42496_tab VALUES('test2', 'test2')",
-       "INSERT INTO bug42496_tab VALUES('test3', 'test3')"
+       "DROP table bug42496_1_tab",
+       "CREATE table bug42496_1_tab(c1 CLOB, c2 CLOB)",
+       "INSERT INTO bug42496_1_tab VALUES('test1', 'test1')",
+       "INSERT INTO bug42496_1_tab VALUES('test2', 'test2')",
+       "INSERT INTO bug42496_1_tab VALUES('test3', 'test3')"
 );

 oci8_test_sql_execute($c, $stmtarray);
@@ -28,7 +28,7 @@
 echo "Test 1\n";

 for ($i = 0; $i < 15000; $i++) {
-       $s = oci_parse($c, "SELECT * from bug42496_tab");
+       $s = oci_parse($c, "SELECT * from bug42496_1_tab");
        oci_define_by_name($s, "C1", $col1);
        oci_define_by_name($s, "C2", $col2);
        if (oci_execute($s)) {
@@ -46,7 +46,7 @@
 // Cleanup

 $stmtarray = array(
-       "DROP table bug42496_tab"
+       "DROP table bug42496_1_tab"
 );

 oci8_test_sql_execute($c, $stmtarray);

Modified: php/php-src/trunk/ext/oci8/tests/bug42496_2.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/bug42496_2.phpt    2011-09-07 18:51:43 UTC 
(rev 316383)
+++ php/php-src/trunk/ext/oci8/tests/bug42496_2.phpt    2011-09-07 19:19:00 UTC 
(rev 316384)
@@ -14,11 +14,11 @@
 // Initialization

 $stmtarray = array(
-       "DROP table bug42496_tab",
-       "CREATE table bug42496_tab(c1 CLOB, c2 CLOB)",
-       "INSERT INTO bug42496_tab VALUES('test1', 'test1')",
-       "INSERT INTO bug42496_tab VALUES('test2', 'test2')",
-       "INSERT INTO bug42496_tab VALUES('test3', 'test3')"
+       "DROP table bug42496_2_tab",
+       "CREATE table bug42496_2_tab(c1 CLOB, c2 CLOB)",
+       "INSERT INTO bug42496_2_tab VALUES('test1', 'test1')",
+       "INSERT INTO bug42496_2_tab VALUES('test2', 'test2')",
+       "INSERT INTO bug42496_2_tab VALUES('test3', 'test3')"
 );

 oci8_test_sql_execute($c, $stmtarray);
@@ -28,7 +28,7 @@
 echo "Test 2\n";

 for ($i = 0; $i < 15000; $i++) {
-       $s = oci_parse($c, "SELECT * from bug42496_tab");
+       $s = oci_parse($c, "SELECT * from bug42496_2_tab");
        if (oci_execute($s)) {
                $arr = array();
                while ($arr = oci_fetch_assoc($s)) {
@@ -44,7 +44,7 @@
 // Cleanup

 $stmtarray = array(
-       "DROP table bug42496_tab"
+       "DROP table bug42496_2_tab"
 );

 oci8_test_sql_execute($c, $stmtarray);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/oci8/tests/bug42496_1.phpt branches/PHP_5_3/ext/oci8/tests/bug42496_2.phpt branches/PHP_5_4/ext/oci8/tests/bug42496_1.phpt branches/PHP_5_4/ext/oci8/tests/bug42496_2.phpt trunk/ext/oci8/tests/bug42496_1.phpt trunk/ext/oci8/tests/bug42496_2.phpt

Reply via email to