sixd            Thu Jun 19 20:24:00 2008 UTC

  Modified files:              
    /php-src/ext/oci8   README php_oci8.h 
    /php-src/ext/oci8/tests     bind_char_1.phpt bind_char_2.phpt 
                                bind_char_3.phpt bind_char_4.phpt 
                                bug27303.phpt bug27303_2.phpt 
                                bug27303_4.phpt connect.inc debug.phpt 
                                details.inc 
  Log:
  MFB: sync with 5.3
  
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/README?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/oci8/README
diff -u php-src/ext/oci8/README:1.6 php-src/ext/oci8/README:1.7
--- php-src/ext/oci8/README:1.6 Thu Jun  5 23:40:42 2008
+++ php-src/ext/oci8/README     Thu Jun 19 20:24:00 2008
@@ -169,12 +169,11 @@
 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 @@
 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 @@
 
 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
 
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/php_oci8.h?r1=1.46&r2=1.47&diff_format=u
Index: php-src/ext/oci8/php_oci8.h
diff -u php-src/ext/oci8/php_oci8.h:1.46 php-src/ext/oci8/php_oci8.h:1.47
--- php-src/ext/oci8/php_oci8.h:1.46    Fri Apr 18 02:35:08 2008
+++ php-src/ext/oci8/php_oci8.h Thu Jun 19 20:24:00 2008
@@ -25,7 +25,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_oci8.h,v 1.46 2008/04/18 02:35:08 sixd Exp $ */
+/* $Id: php_oci8.h,v 1.47 2008/06/19 20:24:00 sixd Exp $ */
 
 #if HAVE_OCI8
 # ifndef 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
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/bind_char_1.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/oci8/tests/bind_char_1.phpt
diff -u php-src/ext/oci8/tests/bind_char_1.phpt:1.2 
php-src/ext/oci8/tests/bind_char_1.phpt:1.3
--- php-src/ext/oci8/tests/bind_char_1.phpt:1.2 Tue May 27 14:30:37 2008
+++ php-src/ext/oci8/tests/bind_char_1.phpt     Thu Jun 19 20:24:00 2008
@@ -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
 
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/bind_char_2.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/oci8/tests/bind_char_2.phpt
diff -u php-src/ext/oci8/tests/bind_char_2.phpt:1.2 
php-src/ext/oci8/tests/bind_char_2.phpt:1.3
--- php-src/ext/oci8/tests/bind_char_2.phpt:1.2 Tue May 27 14:30:37 2008
+++ php-src/ext/oci8/tests/bind_char_2.phpt     Thu Jun 19 20:24:00 2008
@@ -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
 
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/bind_char_3.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/oci8/tests/bind_char_3.phpt
diff -u php-src/ext/oci8/tests/bind_char_3.phpt:1.2 
php-src/ext/oci8/tests/bind_char_3.phpt:1.3
--- php-src/ext/oci8/tests/bind_char_3.phpt:1.2 Tue May 27 14:30:37 2008
+++ php-src/ext/oci8/tests/bind_char_3.phpt     Thu Jun 19 20:24:00 2008
@@ -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
 
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/bind_char_4.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/oci8/tests/bind_char_4.phpt
diff -u php-src/ext/oci8/tests/bind_char_4.phpt:1.2 
php-src/ext/oci8/tests/bind_char_4.phpt:1.3
--- php-src/ext/oci8/tests/bind_char_4.phpt:1.2 Tue May 27 14:30:37 2008
+++ php-src/ext/oci8/tests/bind_char_4.phpt     Thu Jun 19 20:24:00 2008
@@ -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
 
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/bug27303.phpt?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/oci8/tests/bug27303.phpt
diff -u php-src/ext/oci8/tests/bug27303.phpt:1.7 
php-src/ext/oci8/tests/bug27303.phpt:1.8
--- php-src/ext/oci8/tests/bug27303.phpt:1.7    Tue May 27 14:30:37 2008
+++ php-src/ext/oci8/tests/bug27303.phpt        Thu Jun 19 20:24:00 2008
@@ -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
 
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/bug27303_2.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/oci8/tests/bug27303_2.phpt
diff -u php-src/ext/oci8/tests/bug27303_2.phpt:1.6 
php-src/ext/oci8/tests/bug27303_2.phpt:1.7
--- php-src/ext/oci8/tests/bug27303_2.phpt:1.6  Tue May 27 14:30:37 2008
+++ php-src/ext/oci8/tests/bug27303_2.phpt      Thu Jun 19 20:24:00 2008
@@ -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
 
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/bug27303_4.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/oci8/tests/bug27303_4.phpt
diff -u php-src/ext/oci8/tests/bug27303_4.phpt:1.6 
php-src/ext/oci8/tests/bug27303_4.phpt:1.7
--- php-src/ext/oci8/tests/bug27303_4.phpt:1.6  Tue May 27 14:30:37 2008
+++ php-src/ext/oci8/tests/bug27303_4.phpt      Thu Jun 19 20:24:00 2008
@@ -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
 
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/connect.inc?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/oci8/tests/connect.inc
diff -u php-src/ext/oci8/tests/connect.inc:1.4 
php-src/ext/oci8/tests/connect.inc:1.5
--- php-src/ext/oci8/tests/connect.inc:1.4      Tue Dec 12 12:57:02 2006
+++ php-src/ext/oci8/tests/connect.inc  Thu Jun 19 20:24:00 2008
@@ -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";
+}
 
 ?>
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/debug.phpt?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/oci8/tests/debug.phpt
diff -u php-src/ext/oci8/tests/debug.phpt:1.7 
php-src/ext/oci8/tests/debug.phpt:1.8
--- php-src/ext/oci8/tests/debug.phpt:1.7       Tue May 27 14:30:37 2008
+++ php-src/ext/oci8/tests/debug.phpt   Thu Jun 19 20:24:00 2008
@@ -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 @@
 
 ?>
 --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
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/details.inc?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/oci8/tests/details.inc
diff -u php-src/ext/oci8/tests/details.inc:1.5 
php-src/ext/oci8/tests/details.inc:1.6
--- php-src/ext/oci8/tests/details.inc:1.5      Tue Feb 19 01:44:29 2008
+++ php-src/ext/oci8/tests/details.inc  Thu Jun 19 20:24:00 2008
@@ -33,9 +33,17 @@
 } 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 = '';
+
 ?>

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

Reply via email to