From: Antony Dovgal <tony2001@php.net>
Date: Sat, 26 Nov 2005 17:34:35 +0000 (+0000)
Subject: show OIC version in phpinfo(); if possible
X-Git-Tag: RELEASE_2_0_2~66
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9fdd2b69409de5375f12aab2d6367c9d82574db6;p=php

show OIC version in phpinfo(); if possible
fix build with older versions: SQLT_BDOUBLE & SQLT_BFLOAT first appeared in Oracle 10
---

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 59cd96d2b7..2eca5e38f6 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -539,8 +539,10 @@ PHP_MINIT_FUNCTION(oci)
 	REGISTER_LONG_CONSTANT("SQLT_UIN",SQLT_UIN, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("SQLT_LNG",SQLT_LNG, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("SQLT_ODT",SQLT_ODT, CONST_CS | CONST_PERSISTENT);
+#if defined(HAVE_OCI_INSTANT_CLIENT) || (defined(OCI_MAJOR_VERSION) && OCI_MAJOR_VERSION > 10)
 	REGISTER_LONG_CONSTANT("SQLT_BDOUBLE",SQLT_BDOUBLE, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("SQLT_BFLOAT",SQLT_BFLOAT, CONST_CS | CONST_PERSISTENT);
+#endif
 
 #ifdef PHP_OCI8_HAVE_COLLECTIONS
 	REGISTER_LONG_CONSTANT("OCI_B_NTY",SQLT_NTY, CONST_CS | CONST_PERSISTENT);
@@ -644,6 +646,11 @@ PHP_MINFO_FUNCTION(oci)
 	php_info_print_table_row(2, "Oracle Version", PHP_OCI8_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 
+#	if defined(HAVE_OCI_INSTANT_CLIENT) && defined(OCI_MAJOR_VERSION) && defined(OCI_MINOR_VERSION) 
+	sprintf(buf, "%d.%d", OCI_MAJOR_VERSION, OCI_MINOR_VERSION);
+	php_info_print_table_row(2, "Oracle Instant Client Version", buf);
+#	endif
 #endif
 
 #ifdef HAVE_OCI8_TEMP_LOB