From: Christopher Jones <sixd@php.net>
Date: Thu, 19 Jun 2008 20:24:00 +0000 (+0000)
Subject: MFB: sync with 5.3
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~1501
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98730e6b457a08d6f5cff0deec76a582252446b9;p=php

MFB: sync with 5.3
---

diff --git a/ext/oci8/README b/ext/oci8/README
index 74d1e18c28..3b26318d4d 100644
--- a/ext/oci8/README
+++ b/ext/oci8/README
@@ -169,12 +169,11 @@ directory will contain logs of any failures.
 6. DRCP and FAN Support
 -----------------------
 
-The PHP 6 OCI8 Beta extension has support for the Oracle Database
-Resident Connection Pool (DRCP) and Fast Application Notification
-(FAN).
+The PHP OCI8 extension has support for the Oracle Database Resident
+Connection Pool (DRCP) and Fast Application Notification (FAN).
 
-This release is for Beta testing only.  Questions and issues can be
-raised on the Oracle OTN forum (free registration required)
+Questions and issues can be raised on the Oracle OTN forum (free
+registration required):
 http://www.oracle.com/technology/forums/php.html
 
 
@@ -184,9 +183,9 @@ The OCI8 extension will compile with Oracle libraries from version
 9iR2 onwards.  However, full functionality (e.g. DRCP support) is only
 available when Oracle 11g is used.
 
-For other, general database functionality, the version of the Oracle
-libraries used by PHP does not necessarily have to match the version
-of the database.
+For general database functionality the version of the Oracle libraries
+used by PHP does not necessarily have to match the version of the
+database.
 
 
 6.2. Database Resident Connection Pooling (DRCP)
@@ -329,16 +328,15 @@ restriction of Oracle Database 11g.
 
 6.4.2 Closing Connections
 
-With the PHP 5.3 OCI8 Beta extension, persistent connections can now
-be closed by the user, allowing greater control over connection
-resource usage.  Persistent connections will now also be closed
-automatically when there is no PHP variable referencing them, such as
-at the end of scope of a PHP user function.  This will rollback any
-uncommitted transaction.  These changes to persistent connections make
-them behave similarly to non-persistent connections, simplifying the
-interface, allowing for greater application consistency and
-predictability.  Use oci8.old_oci_close_semantics=1 to retain the
-historical behavior.
+With the PHP 6 OCI8 extension, persistent connections can now be
+closed by the user, allowing greater control over connection resource
+usage.  Persistent connections will now also be closed automatically
+when there is no PHP variable referencing them, such as at the end of
+scope of a PHP user function.  This will rollback any uncommitted
+transaction.  These changes to persistent connections make them behave
+similarly to non-persistent connections, simplifying the interface,
+allowing for greater application consistency and predictability.  Use
+oci8.old_oci_close_semantics=1 to retain the historical behavior.
 
 6.4.3 LOGON Triggers can be used to set session properties
 
diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h
index 66eaff9b07..d0c19bf713 100644
--- a/ext/oci8/php_oci8.h
+++ b/ext/oci8/php_oci8.h
@@ -39,7 +39,7 @@
 /*
  * The version of the OCI8 extension.
  */
-#define PHP_OCI8_VERSION "1.3.3-dev"
+#define PHP_OCI8_VERSION "1.3.3"
 
 extern zend_module_entry oci8_module_entry;
 #define phpext_oci8_ptr &oci8_module_entry
diff --git a/ext/oci8/tests/bind_char_1.phpt b/ext/oci8/tests/bind_char_1.phpt
index 5f5c62920f..d9c95eb004 100644
--- a/ext/oci8/tests/bind_char_1.phpt
+++ b/ext/oci8/tests/bind_char_1.phpt
@@ -1,7 +1,15 @@
 --TEST--
 SELECT oci_bind_by_name with SQLT_AFC aka CHAR
 --SKIPIF--
-<?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); ?>
+<?php
+if (!extension_loaded('oci8')) die ("skip no oci8 extension");
+require(dirname(__FILE__)."/connect.inc");
+$sv = oci_server_version($c);
+$sv = preg_match('/11.1/', $sv, $matches);
+if ($sv !== 1) {
+	die ("skip expected output only valid when using Oracle 11g database");
+}
+?>
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/bind_char_2.phpt b/ext/oci8/tests/bind_char_2.phpt
index 16e9c0d38c..1a8f782c2a 100644
--- a/ext/oci8/tests/bind_char_2.phpt
+++ b/ext/oci8/tests/bind_char_2.phpt
@@ -1,7 +1,15 @@
 --TEST--
 SELECT oci_bind_by_name with SQLT_AFC aka CHAR and dates
 --SKIPIF--
-<?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); ?>
+<?php
+if (!extension_loaded('oci8')) die ("skip no oci8 extension");
+require(dirname(__FILE__)."/connect.inc");
+$sv = oci_server_version($c);
+$sv = preg_match('/11.1/', $sv, $matches);
+if ($sv !== 1) {
+	die ("skip expected output only valid when using Oracle 11g database");
+}
+?>
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/bind_char_3.phpt b/ext/oci8/tests/bind_char_3.phpt
index 3d63fbb762..34e30858e3 100644
--- a/ext/oci8/tests/bind_char_3.phpt
+++ b/ext/oci8/tests/bind_char_3.phpt
@@ -1,7 +1,15 @@
 --TEST--
 PL/SQL oci_bind_by_name with SQLT_AFC aka CHAR to CHAR parameter
 --SKIPIF--
-<?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); ?>
+<?php
+if (!extension_loaded('oci8')) die ("skip no oci8 extension");
+require(dirname(__FILE__)."/connect.inc");
+$sv = oci_server_version($c);
+$sv = preg_match('/11.1/', $sv, $matches);
+if ($sv !== 1) {
+	die ("skip expected output only valid when using Oracle 11g database");
+}
+?>
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/bind_char_4.phpt b/ext/oci8/tests/bind_char_4.phpt
index 6cef39c567..23daa08f81 100644
--- a/ext/oci8/tests/bind_char_4.phpt
+++ b/ext/oci8/tests/bind_char_4.phpt
@@ -1,7 +1,15 @@
 --TEST--
 PL/SQL oci_bind_by_name with SQLT_AFC aka CHAR to VARCHAR2 parameter
 --SKIPIF--
-<?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); ?>
+<?php
+if (!extension_loaded('oci8')) die ("skip no oci8 extension");
+require(dirname(__FILE__)."/connect.inc");
+$sv = oci_server_version($c);
+$sv = preg_match('/11.1/', $sv, $matches);
+if ($sv !== 1) {
+	die ("skip expected output only valid when using Oracle 11g database");
+}
+?>
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/bug27303.phpt b/ext/oci8/tests/bug27303.phpt
index 4dcb8e8612..a89101b499 100644
--- a/ext/oci8/tests/bug27303.phpt
+++ b/ext/oci8/tests/bug27303.phpt
@@ -1,7 +1,15 @@
 --TEST--
 Bug #27303 (OCIBindByName binds numeric PHP values as characters)
 --SKIPIF--
-<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+<?php
+if (!extension_loaded('oci8')) die ("skip no oci8 extension");
+require(dirname(__FILE__)."/connect.inc");
+$sv = oci_server_version($c);
+$sv = preg_match('/11.1/', $sv, $matches);
+if ($sv !== 1) {
+	die ("skip expected output only valid when using Oracle 11g database");
+}
+?>
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/bug27303_2.phpt b/ext/oci8/tests/bug27303_2.phpt
index 4fb01caf4e..99157baceb 100644
--- a/ext/oci8/tests/bug27303_2.phpt
+++ b/ext/oci8/tests/bug27303_2.phpt
@@ -1,7 +1,15 @@
 --TEST--
 Bug #27303 (OCIBindByName binds numeric PHP values as characters)
 --SKIPIF--
-<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+<?php
+if (!extension_loaded('oci8')) die ("skip no oci8 extension");
+require(dirname(__FILE__)."/connect.inc");
+$sv = oci_server_version($c);
+$sv = preg_match('/11.1/', $sv, $matches);
+if ($sv !== 1) {
+	die ("skip expected output only valid when using Oracle 11g database");
+}
+?>
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/bug27303_4.phpt b/ext/oci8/tests/bug27303_4.phpt
index 3323991b20..3138aed009 100644
--- a/ext/oci8/tests/bug27303_4.phpt
+++ b/ext/oci8/tests/bug27303_4.phpt
@@ -1,7 +1,15 @@
 --TEST--
 Bug #27303 (OCIBindByName binds numeric PHP values as characters)
 --SKIPIF--
-<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+<?php
+if (!extension_loaded('oci8')) die ("skip no oci8 extension");
+require(dirname(__FILE__)."/connect.inc");
+$sv = oci_server_version($c);
+$sv = preg_match('/11.1/', $sv, $matches);
+if ($sv !== 1) {
+	die ("skip expected output only valid when using Oracle 11g database");
+}
+?>
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/connect.inc b/ext/oci8/tests/connect.inc
index 452976e8fe..8a116290e7 100644
--- a/ext/oci8/tests/connect.inc
+++ b/ext/oci8/tests/connect.inc
@@ -2,29 +2,17 @@
 
 include "details.inc";
 
-/* 
- * You should have privileges to create tables in this schema 
- * 
- * */
-/*
-$schema     = "system"; 
-*/
+if (!empty($dbase)) {
+	$c = @oci_connect($user, $password, $dbase);
+}
+else {
+	$c = @oci_connect($user, $password);
+}
 
-$table_name = "tb".substr(str_replace(Array(".", "-"), "_", php_uname("n")), 0, 5);
-$type_name = strtoupper("tp".substr(str_replace(Array(".", "-"), "_", php_uname("n")), 0, 5));
- 
-    if (!empty($dbase)) {
-        $c = ocilogon($user,$password,$dbase);
-    }
-    else {
-        $c = ocilogon($user,$password);
-    }
-
-    if (!empty($schema)) {
-        $schema = $schema.".";
-    }
-    else {
-        $schema = '';
-    }
+if (!$c) {
+	echo "connect.inc: Failed to connect as '$user' to '$dbase'\n";
+	$e = oci_error();
+	echo $e['message']."\n";
+}
 
 ?>
diff --git a/ext/oci8/tests/debug.phpt b/ext/oci8/tests/debug.phpt
index a0ff731b58..deed632eaf 100644
--- a/ext/oci8/tests/debug.phpt
+++ b/ext/oci8/tests/debug.phpt
@@ -1,11 +1,20 @@
 --TEST--
 oci_internal_debug()
 --SKIPIF--
-<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+<?php 
+if (!extension_loaded('oci8')) die("skip no oci8 extension"); 
+ob_start();
+phpinfo(INFO_MODULES);
+$phpinfo = ob_get_clean();
+$iv = preg_match('/Oracle .*Version => 11/', $phpinfo);
+if ($iv !== 1) {
+	die ("skip expected output only valid when using Oracle 11g client libraries");
+}
+?>
 --FILE--
 <?php
 
-require dirname(__FILE__)."/connect.inc";
+require(dirname(__FILE__)."/details.inc");
 
 oci_internal_debug(true);
 
@@ -20,14 +29,33 @@ echo "Done\n";
 
 ?>
 --EXPECTF--
-OCI8 DEBUG L1: Got a cached connection: (%s) at (%s:%d) 
-Done
+OCI8 DEBUG: OCINlsEnvironmentVariableGet at (%s:%d) 
+OCI8 DEBUG L1: Got NO cached connection at (%s:%d) 
+OCI8 DEBUG: OCIEnvNlsCreate at (%s:%d) 
+OCI8 DEBUG: OCIHandleAlloc at (%s:%d) 
+OCI8 DEBUG: OCIHandleAlloc at (%s:%d) 
+OCI8 DEBUG: OCISessionPoolCreate at (%s:%d) 
+OCI8 DEBUG: OCIAttrSet at (%s:%d) 
+OCI8 DEBUG L1: create_spool: (%s:%d) 
+OCI8 DEBUG L1: using shared pool: (%s:%d) 
+OCI8 DEBUG: OCIHandleAlloc at (%s:%d) 
+OCI8 DEBUG: OCIHandleAlloc at (%s:%d) 
+OCI8 DEBUG: OCIAttrSet at (%s:%d) 
+OCI8 DEBUG: OCIAttrSet at (%s:%d) 
+OCI8 DEBUG: OCIAttrGet at (%s:%d) 
+OCI8 DEBUG: OCIAttrGet at (%s:%d) 
+OCI8 DEBUG L1: (%s:%d) 
+OCI8 DEBUG: OCISessionGet at (%s:%d) 
+OCI8 DEBUG: OCIAttrGet at (%s:%d) 
+OCI8 DEBUG: OCIAttrGet at (%s:%d) 
+OCI8 DEBUG: OCIContextGetValue at (%s:%d) 
+OCI8 DEBUG: OCIContextGetValue at (%s:%d) 
+OCI8 DEBUG: OCIMemoryAlloc at (%s:%d) 
+OCI8 DEBUG: OCIContextSetValue at (%s:%d) 
+OCI8 DEBUG: OCIAttrSet at (%s:%d) 
+OCI8 DEBUG L1: New Non-Persistent Connection address: (%s) at (%s:%d) 
+OCI8 DEBUG L1: num_persistent=(%s:%d) 
 OCI8 DEBUG: OCISessionRelease at (%s:%d) 
 OCI8 DEBUG: OCIHandleFree at (%s:%d) 
 OCI8 DEBUG: OCIHandleFree at (%s:%d) 
-OCI8 DEBUG: OCISessionPoolDestroy at (%s:%d) 
-OCI8 DEBUG: OCIHandleFree at (%s:%d) 
-OCI8 DEBUG: OCIHandleFree at (%s:%d) 
-OCI8 DEBUG: OCIHandleFree at (%s:%d) 
-OCI8 DEBUG: OCIHandleFree at (%s:%d) 
-OCI8 DEBUG: OCIHandleFree at (%s:%d)
+Done
diff --git a/ext/oci8/tests/details.inc b/ext/oci8/tests/details.inc
index 226ab359de..9e8377c43c 100644
--- a/ext/oci8/tests/details.inc
+++ b/ext/oci8/tests/details.inc
@@ -33,9 +33,17 @@ if (false !== getenv('PHP_OCI8_TEST_DB')) {
 } else {
 	$user						= "system";
 	$password					= "system";
-	$dbase						= "oracle";
-	$oracle_on_localhost		= FALSE;
+	$dbase						= "localhost/XE";
+	$oracle_on_localhost		= TRUE;
 	$test_drcp					= FALSE;
 }
 
+/*
+ * Common object names for scripts to use
+ */
+
+$table_name = "tb".substr(str_replace(Array(".", "-"), "_", php_uname("n")), 0, 5);
+$type_name = strtoupper("tp".substr(str_replace(Array(".", "-"), "_", php_uname("n")), 0, 5));
+$schema = '';
+
 ?>