Deleted: php/php-src/branches/PHP_5_3/ext/oci8/tests/commit.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/commit.phpt	2010-03-16 21:43:12 UTC (rev 296305)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/commit.phpt	2010-03-16 23:13:50 UTC (rev 296306)
@@ -1,156 +0,0 @@
---TEST--
-Test OCI_NO_AUTO_COMMIT constant
---SKIPIF--
-<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---FILE--
-<?php
-
-require(dirname(__FILE__)."/connect.inc");
-require(dirname(__FILE__).'/create_table.inc');
-
-$insert_sql = "insert into ".$schema.$table_name." (id, value) values (1,1)";
-
-if (!($s = oci_parse($c, $insert_sql))) {
-	die("oci_parse(insert) failed!\n");
-}
-
-/* check with OCI_NO_AUTO_COMMIT mode  */
-for ($i = 0; $i<3; $i++) {
-	if (!oci_execute($s, OCI_NO_AUTO_COMMIT)) {
-		die("oci_execute(insert) failed!\n");
-	}
-}
-
-for ($i = 0; $i<3; $i++) {
-	if (!oci_execute($s, OCI_DEFAULT)) {
-		die("oci_execute(insert) failed!\n");
-	}
-}
-
-
-var_dump(oci_rollback($c));
-
-$select_sql = "select * from ".$schema.$table_name."";
-
-if (!($select = oci_parse($c, $select_sql))) {
-	die("oci_parse(select) failed!\n");
-}
-
-/* oci_fetch_all */
-if (!oci_execute($select)) {
-	die("oci_execute(select) failed!\n");
-}
-var_dump(oci_fetch_all($select, $all));
-var_dump($all);
-
-/* ocifetchstatement */
-if (!oci_execute($s)) {
-	die("oci_execute(select) failed!\n");
-}
-
-$insert_sql = "insert into ".$schema.$table_name." (id, value) values (1,1)";
-
-if (!($s = oci_parse($c, $insert_sql))) {
-    die("oci_parse(insert) failed!\n");
-}
-
-for ($i = 0; $i<3; $i++) {
-    if (!oci_execute($s, OCI_DEFAULT)) {
-        die("oci_execute(insert) failed!\n");
-    }
-}
-
-var_dump(oci_commit($c));
-
-/* oci_fetch_all */
-if (!oci_execute($select)) {
-	die("oci_execute(select) failed!\n");
-}
-var_dump(oci_fetch_all($select, $all));
-var_dump($all);
-
-
-require(dirname(__FILE__).'/drop_table.inc');
-
-echo "Done\n";
-?>
---EXPECTF--
-bool(true)
-int(0)
-array(5) {
-  [%u|b%"ID"]=>
-  array(0) {
-  }
-  [%u|b%"VALUE"]=>
-  array(0) {
-  }
-  [%u|b%"BLOB"]=>
-  array(0) {
-  }
-  [%u|b%"CLOB"]=>
-  array(0) {
-  }
-  [%u|b%"STRING"]=>
-  array(0) {
-  }
-}
-bool(true)
-int(4)
-array(5) {
-  [%u|b%"ID"]=>
-  array(4) {
-    [0]=>
-    %string|unicode%(1) "1"
-    [1]=>
-    %string|unicode%(1) "1"
-    [2]=>
-    %string|unicode%(1) "1"
-    [3]=>
-    %string|unicode%(1) "1"
-  }
-  [%u|b%"VALUE"]=>
-  array(4) {
-    [0]=>
-    %string|unicode%(1) "1"
-    [1]=>
-    %string|unicode%(1) "1"
-    [2]=>
-    %string|unicode%(1) "1"
-    [3]=>
-    %string|unicode%(1) "1"
-  }
-  [%u|b%"BLOB"]=>
-  array(4) {
-    [0]=>
-    NULL
-    [1]=>
-    NULL
-    [2]=>
-    NULL
-    [3]=>
-    NULL
-  }
-  [%u|b%"CLOB"]=>
-  array(4) {
-    [0]=>
-    NULL
-    [1]=>
-    NULL
-    [2]=>
-    NULL
-    [3]=>
-    NULL
-  }
-  [%u|b%"STRING"]=>
-  array(4) {
-    [0]=>
-    NULL
-    [1]=>
-    NULL
-    [2]=>
-    NULL
-    [3]=>
-    NULL
-  }
-}
-Done

Copied: php/php-src/branches/PHP_5_3/ext/oci8/tests/commit_001.phpt (from rev 296287, php/php-src/branches/PHP_5_3/ext/oci8/tests/commit.phpt)
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/commit_001.phpt	                        (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/commit_001.phpt	2010-03-16 23:13:50 UTC (rev 296306)
@@ -0,0 +1,156 @@
+--TEST--
+Test OCI_NO_AUTO_COMMIT constant
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+--FILE--
+<?php
+
+require(dirname(__FILE__)."/connect.inc");
+require(dirname(__FILE__).'/create_table.inc');
+
+$insert_sql = "insert into ".$schema.$table_name." (id, value) values (1,1)";
+
+if (!($s = oci_parse($c, $insert_sql))) {
+	die("oci_parse(insert) failed!\n");
+}
+
+/* check with OCI_NO_AUTO_COMMIT mode  */
+for ($i = 0; $i<3; $i++) {
+	if (!oci_execute($s, OCI_NO_AUTO_COMMIT)) {
+		die("oci_execute(insert) failed!\n");
+	}
+}
+
+for ($i = 0; $i<3; $i++) {
+	if (!oci_execute($s, OCI_DEFAULT)) {
+		die("oci_execute(insert) failed!\n");
+	}
+}
+
+
+var_dump(oci_rollback($c));
+
+$select_sql = "select * from ".$schema.$table_name."";
+
+if (!($select = oci_parse($c, $select_sql))) {
+	die("oci_parse(select) failed!\n");
+}
+
+/* oci_fetch_all */
+if (!oci_execute($select)) {
+	die("oci_execute(select) failed!\n");
+}
+var_dump(oci_fetch_all($select, $all));
+var_dump($all);
+
+/* ocifetchstatement */
+if (!oci_execute($s)) {
+	die("oci_execute(select) failed!\n");
+}
+
+$insert_sql = "insert into ".$schema.$table_name." (id, value) values (1,1)";
+
+if (!($s = oci_parse($c, $insert_sql))) {
+    die("oci_parse(insert) failed!\n");
+}
+
+for ($i = 0; $i<3; $i++) {
+    if (!oci_execute($s, OCI_DEFAULT)) {
+        die("oci_execute(insert) failed!\n");
+    }
+}
+
+var_dump(oci_commit($c));
+
+/* oci_fetch_all */
+if (!oci_execute($select)) {
+	die("oci_execute(select) failed!\n");
+}
+var_dump(oci_fetch_all($select, $all));
+var_dump($all);
+
+
+require(dirname(__FILE__).'/drop_table.inc');
+
+echo "Done\n";
+?>
+--EXPECTF--
+bool(true)
+int(0)
+array(5) {
+  [%u|b%"ID"]=>
+  array(0) {
+  }
+  [%u|b%"VALUE"]=>
+  array(0) {
+  }
+  [%u|b%"BLOB"]=>
+  array(0) {
+  }
+  [%u|b%"CLOB"]=>
+  array(0) {
+  }
+  [%u|b%"STRING"]=>
+  array(0) {
+  }
+}
+bool(true)
+int(4)
+array(5) {
+  [%u|b%"ID"]=>
+  array(4) {
+    [0]=>
+    %string|unicode%(1) "1"
+    [1]=>
+    %string|unicode%(1) "1"
+    [2]=>
+    %string|unicode%(1) "1"
+    [3]=>
+    %string|unicode%(1) "1"
+  }
+  [%u|b%"VALUE"]=>
+  array(4) {
+    [0]=>
+    %string|unicode%(1) "1"
+    [1]=>
+    %string|unicode%(1) "1"
+    [2]=>
+    %string|unicode%(1) "1"
+    [3]=>
+    %string|unicode%(1) "1"
+  }
+  [%u|b%"BLOB"]=>
+  array(4) {
+    [0]=>
+    NULL
+    [1]=>
+    NULL
+    [2]=>
+    NULL
+    [3]=>
+    NULL
+  }
+  [%u|b%"CLOB"]=>
+  array(4) {
+    [0]=>
+    NULL
+    [1]=>
+    NULL
+    [2]=>
+    NULL
+    [3]=>
+    NULL
+  }
+  [%u|b%"STRING"]=>
+  array(4) {
+    [0]=>
+    NULL
+    [1]=>
+    NULL
+    [2]=>
+    NULL
+    [3]=>
+    NULL
+  }
+}
+Done

Added: php/php-src/branches/PHP_5_3/ext/oci8/tests/commit_002.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/commit_002.phpt	                        (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/commit_002.phpt	2010-03-16 23:13:50 UTC (rev 296306)
@@ -0,0 +1,90 @@
+--TEST--
+Test oci_commit failure
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); ?>
+--FILE--
+<?php
+
+require(dirname(__FILE__).'/connect.inc');
+
+// Initialization
+
+$stmtarray = array(
+	"drop table commit_002_tab",
+	"create table commit_002_tab
+     ( x int constraint commit_002_tab_check_x check ( x > 0 ) deferrable initially immediate,
+       y int constraint commit_002_tab_check_y check ( y > 0 ) deferrable initially deferred)"
+);
+
+foreach ($stmtarray as $stmt) {
+	$s = oci_parse($c, $stmt);
+	$r = @oci_execute($s);
+	if (!$r) {
+		$m = oci_error($s);
+		if (!in_array($m['code'], array(   // ignore expected errors
+			    942 // table or view does not exist
+			,  2289 // sequence does not exist
+			,  4080 // trigger does not exist
+			, 38802 // edition does not exist
+                ))) {
+			echo $stmt . PHP_EOL . $m['message'] . PHP_EOL;
+		}
+	}
+}
+
+// Run Test
+
+echo "First Insert\n";
+$s = oci_parse($c, "insert into commit_002_tab values (-1, 1)");
+$r = @oci_execute($s, OCI_DEFAULT);
+if (!$r) {
+    $m = oci_error($s);
+    echo 'Could not execute: '. $m['message'] . "\n";
+}
+$r = oci_commit($c);
+if (!$r) {
+    $m = oci_error($c);
+    echo 'Could not commit: '. $m['message'] . "\n";
+}
+
+
+echo "Second Insert\n";
+$s = oci_parse($c, "insert into commit_002_tab values (1, -1)");
+$r = @oci_execute($s, OCI_NO_AUTO_COMMIT);
+if (!$r) {
+    $m = oci_error($s);
+    echo 'Could not execute: '. $m['message'] . "\n";
+}
+$r = oci_commit($c);
+if (!$r) {
+    $m = oci_error($c);
+    echo 'Could not commit: '. $m['message'] . "\n";
+}
+
+
+// Clean up
+
+$stmtarray = array(
+	"drop table commit_002_tab"
+);
+
+foreach ($stmtarray as $stmt) {
+	$s = oci_parse($c, $stmt);
+	oci_execute($s);
+}
+
+oci_close($c);
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+First Insert
+Could not execute: ORA-02290: check constraint (SYSTEM.COMMIT_002_TAB_CHECK_X) violated
+Second Insert
+
+Warning: oci_commit(): ORA-02091: transaction rolled back
+ORA-02290: %s (SYSTEM.COMMIT_002_TAB_CHECK_Y) %s in %scommit_002.php on line %d
+Could not commit: ORA-02091: transaction rolled back
+ORA-02290: %s (SYSTEM.COMMIT_002_TAB_CHECK_Y) %s
+===DONE===


Property changes on: php/php-src/branches/PHP_5_3/ext/oci8/tests/commit_002.phpt
___________________________________________________________________
Added: svn:keywords
   + Id Rev Revision
Added: svn:eol-style
   + native