archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

enable temporary LOBs when we detect oracle 8.1

Browse source 
enabled by default in Win32 project!
This commit is contained in:
Thies C. Arntzen 2001-04-14 09:51:29 +00:00
parent 8ac2502dfe
commit c42f260145
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ext/oci8/config.m4
View file

@ -73,6 +73,7 @@ if test "$PHP_OCI8" != "no"; then
8.1) 8.1)
PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD) PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD)
PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD) PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD)
AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ])
;; ;;
*) *)
AC_MSG_ERROR(Unsupported Oracle version!) AC_MSG_ERROR(Unsupported Oracle version!)

8
ext/oci8/oci8.c
View file

@ -54,7 +54,7 @@
#include "php.h" #include "php.h"
#include "ext/standard/info.h" #include "ext/standard/info.h"
/* #define WITH_TEMP_LOBS 1 */ /* #define HAVE_OCI8_TEMP_LOB 1 */
#define WITH_COLLECTIONS 1 #define WITH_COLLECTIONS 1
#if HAVE_OCI8 #if HAVE_OCI8
@ -209,7 +209,7 @@ PHP_FUNCTION(ociserverversion);
PHP_FUNCTION(ocistatementtype); PHP_FUNCTION(ocistatementtype);
PHP_FUNCTION(ocirowcount); PHP_FUNCTION(ocirowcount);
PHP_FUNCTION(ocisetprefetch); PHP_FUNCTION(ocisetprefetch);
#ifdef WITH_TEMP_LOBS #ifdef HAVE_OCI8_TEMP_LOB
PHP_FUNCTION(ociwritetemporarylob); PHP_FUNCTION(ociwritetemporarylob);
PHP_FUNCTION(ocicloselob); PHP_FUNCTION(ocicloselob);
#endif #endif
@ -328,7 +328,7 @@ static zend_function_entry php_oci_functions[] = {
static zend_function_entry php_oci_lob_class_functions[] = { static zend_function_entry php_oci_lob_class_functions[] = {
PHP_FALIAS(load, ociloadlob, NULL) PHP_FALIAS(load, ociloadlob, NULL)
PHP_FALIAS(writetofile, ociwritelobtofile,NULL) PHP_FALIAS(writetofile, ociwritelobtofile,NULL)
#ifdef WITH_TEMP_LOBS #ifdef HAVE_OCI8_TEMP_LOB
PHP_FALIAS(writetemporary, ociwritetemporarylob,NULL) PHP_FALIAS(writetemporary, ociwritetemporarylob,NULL)
PHP_FALIAS(close, ocicloselob, NULL) PHP_FALIAS(close, ocicloselob, NULL)
#endif #endif
@ -3182,7 +3182,7 @@ PHP_FUNCTION(ociwritelobtofile)
} }
/* }}} */ /* }}} */
#ifdef WITH_TEMP_LOBS #ifdef HAVE_OCI8_TEMP_LOB
/* {{{ proto int ociwritetemporarylob(int stmt, int loc, string var) /* {{{ proto int ociwritetemporarylob(int stmt, int loc, string var)
Return the row count of an OCI statement */ Return the row count of an OCI statement */

4
ext/oci8/oci8.dsp
View file

@ -44,7 +44,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D ZTS=1 /YX /FD /c # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D ZTS=1 /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\..\php_build\oci805\include" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_OCI8=1 /D COMPILE_DL_OCI8=1 /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\..\php_build\oci805\include" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_OCI8=1 /D HAVE_OCI8_TEMP_LOB=1 /D COMPILE_DL_OCI8=1 /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x406 /d "NDEBUG" # ADD BASE RSC /l 0x406 /d "NDEBUG"
@ -71,7 +71,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D ZTS=1 /YX /FD /c # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D ZTS=1 /YX /FD /c
# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\\" /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\..\php_build\include\oci805" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FTP_EXPORTS" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_OCI8=1 /D COMPILE_DL_OCI8=1 /FR /YX /FD /c # ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\\" /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\..\php_build\include\oci805" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FTP_EXPORTS" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_OCI8=1 /D HAVE_OCI8_TEMP_LOB=1 /D COMPILE_DL_OCI8=1 /FR /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x406 /d "NDEBUG" # ADD BASE RSC /l 0x406 /d "NDEBUG"