sixd Tue Mar 25 02:01:00 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/main build-defs.h.in /php-src/ext/oci8 config.m4 config.w32 oci8.c oci8_interface.c php_oci8.h php_oci8_int.h Log: rename PHP_OCI8_VERSION in preparation for peclversioning RFC. Remove obsolete HAVE_OCI8_ATTR_STATEMENT macro
http://cvs.php.net/viewvc.cgi/php-src/main/build-defs.h.in?r1=1.15.2.2.2.2&r2=1.15.2.2.2.2.2.1&diff_format=u Index: php-src/main/build-defs.h.in diff -u php-src/main/build-defs.h.in:1.15.2.2.2.2 php-src/main/build-defs.h.in:1.15.2.2.2.2.2.1 --- php-src/main/build-defs.h.in:1.15.2.2.2.2 Sun Jul 15 15:10:04 2007 +++ php-src/main/build-defs.h.in Tue Mar 25 02:00:26 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: build-defs.h.in,v 1.15.2.2.2.2 2007/07/15 15:10:04 jani Exp $ */ +/* $Id: build-defs.h.in,v 1.15.2.2.2.2.2.1 2008/03/25 02:00:26 sixd Exp $ */ #define CONFIGURE_COMMAND "@CONFIGURE_COMMAND@" #define PHP_ADA_INCLUDE "" @@ -53,7 +53,7 @@ #define PHP_ODBC_TYPE "@ODBC_TYPE@" #define PHP_OCI8_SHARED_LIBADD "@OCI8_SHARED_LIBADD@" #define PHP_OCI8_DIR "@OCI8_DIR@" -#define PHP_OCI8_VERSION "@OCI8_VERSION@" +#define PHP_OCI8_ORACLE_VERSION "@OCI8_ORACLE_VERSION@" #define PHP_ORACLE_SHARED_LIBADD "@ORACLE_SHARED_LIBADD@" #define PHP_ORACLE_DIR "@ORACLE_DIR@" #define PHP_ORACLE_VERSION "@ORACLE_VERSION@" http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/config.m4?r1=1.55.2.3.2.11.2.2&r2=1.55.2.3.2.11.2.3&diff_format=u Index: php-src/ext/oci8/config.m4 diff -u php-src/ext/oci8/config.m4:1.55.2.3.2.11.2.2 php-src/ext/oci8/config.m4:1.55.2.3.2.11.2.3 --- php-src/ext/oci8/config.m4:1.55.2.3.2.11.2.2 Wed Jan 16 00:38:03 2008 +++ php-src/ext/oci8/config.m4 Tue Mar 25 02:00:27 2008 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.55.2.3.2.11.2.2 2008/01/16 00:38:03 sixd Exp $ +dnl $Id: config.m4,v 1.55.2.3.2.11.2.3 2008/03/25 02:00:27 sixd Exp $ dnl if test -z "$SED"; then @@ -55,7 +55,7 @@ if test ! -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME; then AC_MSG_ERROR([Link from $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME to libclntsh.$SHLIB_SUFFIX_NAME.11.1 not found]) fi - OCI8_VERSION=11.1 + OCI8_ORACLE_VERSION=11.1 else AC_MSG_ERROR([Oracle Instant Client library version not supported]) fi @@ -64,42 +64,42 @@ if test ! -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME; then AC_MSG_ERROR([Link from $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME to libclntsh.$SHLIB_SUFFIX_NAME.10.1 not found]) fi - OCI8_VERSION=10.1 + OCI8_ORACLE_VERSION=10.1 else AC_MSG_ERROR([Oracle Instant Client library version not supported]) fi else AC_MSG_ERROR([Oracle Instant Client libraries not found]) fi - AC_MSG_RESULT([$OCI8_VERSION]) + AC_MSG_RESULT([$OCI8_ORACLE_VERSION]) ]) -AC_DEFUN([AC_OCI8_VERSION],[ +AC_DEFUN([AC_OCI8_ORACLE_VERSION],[ AC_MSG_CHECKING([Oracle version]) if test -s "$OCI8_DIR/orainst/unix.rgs"; then - OCI8_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | $PHP_OCI8_SED 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4` - test -z "$OCI8_VERSION" && OCI8_VERSION=7.3 + OCI8_ORACLE_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | $PHP_OCI8_SED 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4` + test -z "$OCI8_ORACLE_VERSION" && OCI8_ORACLE_VERSION=7.3 elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then - OCI8_VERSION=11.1 + OCI8_ORACLE_VERSION=11.1 elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then - OCI8_VERSION=10.1 + OCI8_ORACLE_VERSION=10.1 elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then - OCI8_VERSION=9.0 + OCI8_ORACLE_VERSION=9.0 elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then - OCI8_VERSION=8.1 + OCI8_ORACLE_VERSION=8.1 elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then - OCI8_VERSION=8.0 + OCI8_ORACLE_VERSION=8.0 elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.a; then if test -f $OCI8_DIR/$OCI8_LIB_DIR/libcore4.a; then - OCI8_VERSION=8.0 + OCI8_ORACLE_VERSION=8.0 else - OCI8_VERSION=8.1 + OCI8_ORACLE_VERSION=8.1 fi else AC_MSG_ERROR(Oracle-OCI8 needed libraries not found) fi - AC_MSG_RESULT($OCI8_VERSION) + AC_MSG_RESULT($OCI8_ORACLE_VERSION) ]) @@ -200,21 +200,16 @@ PHP_EVAL_LIBLINE(`cat $OCI8_DIR/rdbms/$OCI8_LIB_DIR/sysliblist`, OCI8_SYSLIB) fi - AC_OCI8_VERSION($OCI8_DIR) + AC_OCI8_ORACLE_VERSION($OCI8_DIR) - case $OCI8_VERSION in - 8.0) - AC_MSG_ERROR([Oracle client libraries < 9.0 are not supported any more. Please consider upgrading.]) - ;; - - 8.1) + case $OCI8_ORACLE_VERSION in + 7.3|8.0|8.1) AC_MSG_ERROR([Oracle client libraries < 9.0 are not supported any more. Please consider upgrading.]) ;; 9.0) PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD) PHP_ADD_LIBPATH($OCI8_DIR/$OCI8_LIB_DIR, OCI8_SHARED_LIBADD) - AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ]) dnl These functions are only available in version >= 9.2 PHP_CHECK_LIBRARY(clntsh, OCIEnvNlsCreate, @@ -222,7 +217,7 @@ PHP_CHECK_LIBRARY(clntsh, OCINlsCharSetNameToId, [ AC_DEFINE(HAVE_OCI_ENV_NLS_CREATE,1,[ ]) - OCI8_VERSION=9.2 + OCI8_ORACLE_VERSION=9.2 ], [], [ -L$OCI8_DIR/$OCI8_LIB_DIR $OCI8_SHARED_LIBADD ]) @@ -250,13 +245,11 @@ ], [], [ -L$OCI8_DIR/$OCI8_LIB_DIR $OCI8_SHARED_LIBADD ]) - ;; 11.1|10.1) PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD) PHP_ADD_LIBPATH($OCI8_DIR/$OCI8_LIB_DIR, OCI8_SHARED_LIBADD) - AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ]) AC_DEFINE(HAVE_OCI_ENV_NLS_CREATE,1,[ ]) AC_DEFINE(HAVE_OCI_ENV_CREATE,1,[ ]) AC_DEFINE(HAVE_OCI_STMT_PREPARE2,1,[ ]) @@ -264,8 +257,9 @@ AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ]) AC_DEFINE(PHP_OCI8_HAVE_COLLECTIONS,1,[ ]) ;; + *) - AC_MSG_ERROR([Oracle version $OCI8_VERSION is not supported]) + AC_MSG_ERROR([Oracle version $OCI8_ORACLE_VERSION is not supported]) ;; esac @@ -306,7 +300,7 @@ PHP_SUBST_OLD(OCI8_SHARED_LIBADD) PHP_SUBST_OLD(OCI8_DIR) - PHP_SUBST_OLD(OCI8_VERSION) + PHP_SUBST_OLD(OCI8_ORACLE_VERSION) elif test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" != "no"; then @@ -364,7 +358,7 @@ fi AC_OCI8IC_VERSION($PHP_OCI8_INSTANT_CLIENT) - case $OCI8_VERSION in + case $OCI8_ORACLE_VERSION in 11.1|10.1) PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD) PHP_ADD_LIBPATH($PHP_OCI8_INSTANT_CLIENT, OCI8_SHARED_LIBADD) @@ -376,7 +370,6 @@ esac AC_DEFINE(HAVE_OCI_INSTANT_CLIENT,1,[ ]) - AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ]) AC_DEFINE(HAVE_OCI_ENV_NLS_CREATE,1,[ ]) AC_DEFINE(HAVE_OCI_ENV_CREATE,1,[ ]) AC_DEFINE(HAVE_OCI_STMT_PREPARE2,1,[ ]) @@ -389,6 +382,6 @@ PHP_SUBST_OLD(OCI8_SHARED_LIBADD) PHP_SUBST_OLD(OCI8_DIR) - PHP_SUBST_OLD(OCI8_VERSION) + PHP_SUBST_OLD(OCI8_ORACLE_VERSION) fi http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/config.w32?r1=1.3.4.2.2.2&r2=1.3.4.2.2.2.2.1&diff_format=u Index: php-src/ext/oci8/config.w32 diff -u php-src/ext/oci8/config.w32:1.3.4.2.2.2 php-src/ext/oci8/config.w32:1.3.4.2.2.2.2.1 --- php-src/ext/oci8/config.w32:1.3.4.2.2.2 Mon May 22 04:17:42 2006 +++ php-src/ext/oci8/config.w32 Tue Mar 25 02:00:28 2008 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.3.4.2.2.2 2006/05/22 04:17:42 tony2001 Exp $ +// $Id: config.w32,v 1.3.4.2.2.2.2.1 2008/03/25 02:00:28 sixd Exp $ // vim:ft=javascript ARG_WITH("oci8", "OCI8 support", "no"); @@ -13,7 +13,6 @@ AC_DEFINE('HAVE_OCI8', 1); AC_DEFINE('HAVE_OCI_INSTANT_CLIENT', 1); - AC_DEFINE('HAVE_OCI8_ATTR_STATEMENT', 1); AC_DEFINE('HAVE_OCI_ENV_NLS_CREATE', 1); AC_DEFINE('HAVE_OCI_ENV_CREATE', 1); AC_DEFINE('HAVE_OCI_STMT_PREPARE2', 1); @@ -22,7 +21,7 @@ AC_DEFINE('PHP_OCI8_HAVE_COLLECTIONS', 1); } else { - WARNING("oci8 not enabled; libraries and headers not found"); + WARNING("oci8 not enabled; Oracle Database libraries or Oracle 10g Instant Client not found"); } } http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16.2.38.2.11&r2=1.269.2.16.2.38.2.12&diff_format=u Index: php-src/ext/oci8/oci8.c diff -u php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.11 php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.12 --- php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.11 Sat Mar 22 01:27:50 2008 +++ php-src/ext/oci8/oci8.c Tue Mar 25 02:00:28 2008 @@ -26,7 +26,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.269.2.16.2.38.2.11 2008/03/22 01:27:50 sixd Exp $ */ +/* $Id: oci8.c,v 1.269.2.16.2.38.2.12 2008/03/25 02:00:28 sixd Exp $ */ /* TODO * * file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty() with OCI_ATTR_LOBEMPTY @@ -715,8 +715,8 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Version", "1.3.1 Beta"); - php_info_print_table_row(2, "Revision", "$Revision: 1.269.2.16.2.38.2.11 $"); + php_info_print_table_row(2, "Version", PHP_OCI8_VERSION); + php_info_print_table_row(2, "Revision", "$Revision: 1.269.2.16.2.38.2.12 $"); snprintf(buf, sizeof(buf), "%ld", OCI_G(num_persistent)); php_info_print_table_row(2, "Active Persistent Connections", buf); @@ -724,7 +724,7 @@ php_info_print_table_row(2, "Active Connections", buf); #if !defined(PHP_WIN32) && !defined(HAVE_OCI_INSTANT_CLIENT) - php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION ); + php_info_print_table_row(2, "Oracle Version", PHP_OCI8_ORACLE_VERSION ); php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR ); php_info_print_table_row(2, "Libraries Used", PHP_OCI8_SHARED_LIBADD ); #else @@ -1019,7 +1019,6 @@ return error_code; } /* }}} */ -#ifdef HAVE_OCI8_ATTR_STATEMENT /* {{{ php_oci_fetch_sqltext_offset() Compute offset in the SQL statement */ int php_oci_fetch_sqltext_offset(php_oci_statement *statement, text **sqltext, ub2 *error_offset TSRMLS_DC) @@ -1044,7 +1043,6 @@ } return 0; } /* }}} */ -#endif /* {{{ php_oci_do_connect() Connect wrapper */ http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_interface.c?r1=1.8.2.7.2.13.2.3&r2=1.8.2.7.2.13.2.4&diff_format=u Index: php-src/ext/oci8/oci8_interface.c diff -u php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.13.2.3 php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.13.2.4 --- php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.13.2.3 Mon Feb 25 23:50:51 2008 +++ php-src/ext/oci8/oci8_interface.c Tue Mar 25 02:00:30 2008 @@ -25,7 +25,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8_interface.c,v 1.8.2.7.2.13.2.3 2008/02/25 23:50:51 sixd Exp $ */ +/* $Id: oci8_interface.c,v 1.8.2.7.2.13.2.4 2008/03/25 02:00:30 sixd Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1598,10 +1598,8 @@ sb4 errcode = 0; sword error = OCI_SUCCESS; dvoid *errh = NULL; -#ifdef HAVE_OCI8_ATTR_STATEMENT ub2 error_offset = 0; text *sqltext = NULL; -#endif if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &arg) == FAILURE) { return; @@ -1614,11 +1612,9 @@ errh = statement->err; error = statement->errcode; -#ifdef HAVE_OCI8_ATTR_STATEMENT if (php_oci_fetch_sqltext_offset(statement, &sqltext, &error_offset TSRMLS_CC)) { RETURN_FALSE; } -#endif goto go_out; } @@ -1656,10 +1652,8 @@ array_init(return_value); add_assoc_long(return_value, "code", errcode); add_assoc_string(return_value, "message", (char*) errbuf, 0); -#ifdef HAVE_OCI8_ATTR_STATEMENT add_assoc_long(return_value, "offset", error_offset); add_assoc_string(return_value, "sqltext", sqltext ? (char *) sqltext : "", 1); -#endif } else { RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/php_oci8.h?r1=1.36.2.2.2.1.2.2&r2=1.36.2.2.2.1.2.3&diff_format=u Index: php-src/ext/oci8/php_oci8.h diff -u php-src/ext/oci8/php_oci8.h:1.36.2.2.2.1.2.2 php-src/ext/oci8/php_oci8.h:1.36.2.2.2.1.2.3 --- php-src/ext/oci8/php_oci8.h:1.36.2.2.2.1.2.2 Thu Jan 3 16:20:31 2008 +++ php-src/ext/oci8/php_oci8.h Tue Mar 25 02:00:31 2008 @@ -25,7 +25,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_oci8.h,v 1.36.2.2.2.1.2.2 2008/01/03 16:20:31 nlopess Exp $ */ +/* $Id: php_oci8.h,v 1.36.2.2.2.1.2.3 2008/03/25 02:00:31 sixd Exp $ */ #if HAVE_OCI8 # ifndef PHP_OCI8_H @@ -35,6 +35,12 @@ # include "TSRM.h" #endif + +/* + * The version of the OCI8 extension. + */ +#define PHP_OCI8_VERSION "1.3.1 Beta" + extern zend_module_entry oci8_module_entry; #define phpext_oci8_ptr &oci8_module_entry http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/php_oci8_int.h?r1=1.11.2.6.2.21.2.7&r2=1.11.2.6.2.21.2.8&diff_format=u Index: php-src/ext/oci8/php_oci8_int.h diff -u php-src/ext/oci8/php_oci8_int.h:1.11.2.6.2.21.2.7 php-src/ext/oci8/php_oci8_int.h:1.11.2.6.2.21.2.8 --- php-src/ext/oci8/php_oci8_int.h:1.11.2.6.2.21.2.7 Sat Mar 22 01:27:50 2008 +++ php-src/ext/oci8/php_oci8_int.h Tue Mar 25 02:00:32 2008 @@ -25,7 +25,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_oci8_int.h,v 1.11.2.6.2.21.2.7 2008/03/22 01:27:50 sixd Exp $ */ +/* $Id: php_oci8_int.h,v 1.11.2.6.2.21.2.8 2008/03/25 02:00:32 sixd Exp $ */ #if HAVE_OCI8 # ifndef PHP_OCI8_INT_H @@ -349,9 +349,7 @@ sb4 php_oci_error (OCIError *, sword TSRMLS_DC); sb4 php_oci_fetch_errmsg(OCIError *, text ** TSRMLS_DC); -#ifdef HAVE_OCI8_ATTR_STATEMENT int php_oci_fetch_sqltext_offset(php_oci_statement *, text **, ub2 * TSRMLS_DC); -#endif void php_oci_do_connect (INTERNAL_FUNCTION_PARAMETERS, int , int); php_oci_connection *php_oci_do_connect_ex(char *username, int username_len, char *password, int password_len, char *new_password, int new_password_len, char *dbname, int dbname_len, char *charset, long session_mode, int persistent, int exclusive TSRMLS_DC);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php