From 5751903b1baad353521a47a0421c57ea16f614f5 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Wed, 12 Apr 2006 19:21:35 +0000 Subject: [PATCH] fix #37059 (oci_bind_by_name() doesn't support RAW and LONG RAW fields) add tests --- NEWS | 2 ++ ext/oci8/oci8.c | 2 ++ ext/oci8/oci8_statement.c | 6 +++++ ext/oci8/tests/bind_long.phpt | 38 +++++++++++++++++++++++++++++ ext/oci8/tests/bind_long_raw.phpt | 38 +++++++++++++++++++++++++++++ ext/oci8/tests/bind_raw.phpt | 39 ++++++++++++++++++++++++++++++ ext/oci8/tests/test.gif | Bin 0 -> 2523 bytes 7 files changed, 125 insertions(+) create mode 100644 ext/oci8/tests/bind_long.phpt create mode 100644 ext/oci8/tests/bind_long_raw.phpt create mode 100644 ext/oci8/tests/bind_raw.phpt create mode 100644 ext/oci8/tests/test.gif diff --git a/NEWS b/NEWS index cbf459552d..8cab0cfcc3 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,8 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Apr 2006, PHP 5.1.3 +- FIxed bug #37059 (oci_bind_by_name() doesn't support RAW and LONG RAW + fields). (Tony) - Fixed bug #37057 (xmlrpc_decode() may produce arrays with numeric strings, which are unaccessible). (Tony) - Fixed bug #37055 (incorrect reference counting for persistent OCI8 diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index 87e5f3a775..1c73008ed4 100644 --- a/ext/oci8/oci8.c +++ b/ext/oci8/oci8.c @@ -541,6 +541,8 @@ PHP_MINIT_FUNCTION(oci) REGISTER_LONG_CONSTANT("SQLT_FLT",SQLT_FLT, CONST_CS | CONST_PERSISTENT); 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_LBI",SQLT_LBI, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("SQLT_BIN",SQLT_BIN, 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); diff --git a/ext/oci8/oci8_statement.c b/ext/oci8/oci8_statement.c index f930fdaa77..16a2b7e182 100644 --- a/ext/oci8/oci8_statement.c +++ b/ext/oci8/oci8_statement.c @@ -493,6 +493,9 @@ int php_oci_statement_execute(php_oci_statement *statement, ub4 mode TSRMLS_DC) case SQLT_BIN: default: define_type = SQLT_CHR; + if (outcol->data_type == SQLT_BIN) { + define_type = SQLT_BIN; + } if ((outcol->data_type == SQLT_DAT) || (outcol->data_type == SQLT_NUM) #ifdef SQLT_TIMESTAMP || (outcol->data_type == SQLT_TIMESTAMP) @@ -813,6 +816,9 @@ int php_oci_bind_by_name(php_oci_statement *statement, char *name, int name_len, mode = OCI_DEFAULT; break; + case SQLT_LBI: + case SQLT_BIN: + case SQLT_LNG: case SQLT_CHR: /* this is the default case when type was not specified */ convert_to_string(var); diff --git a/ext/oci8/tests/bind_long.phpt b/ext/oci8/tests/bind_long.phpt new file mode 100644 index 0000000000..58590f145a --- /dev/null +++ b/ext/oci8/tests/bind_long.phpt @@ -0,0 +1,38 @@ +--TEST-- +bind LONG field +--SKIPIF-- + +--FILE-- + +--EXPECT-- +string(32) "d04e7036e2f4221abc88fd14e960a45b" +int(2523) +Done diff --git a/ext/oci8/tests/bind_long_raw.phpt b/ext/oci8/tests/bind_long_raw.phpt new file mode 100644 index 0000000000..2a9962eace --- /dev/null +++ b/ext/oci8/tests/bind_long_raw.phpt @@ -0,0 +1,38 @@ +--TEST-- +bind LONG RAW field +--SKIPIF-- + +--FILE-- + +--EXPECT-- +string(32) "614fcbba1effb7caa27ef0ef25c27fcf" +int(2523) +Done diff --git a/ext/oci8/tests/bind_raw.phpt b/ext/oci8/tests/bind_raw.phpt new file mode 100644 index 0000000000..c9087e552b --- /dev/null +++ b/ext/oci8/tests/bind_raw.phpt @@ -0,0 +1,39 @@ +--TEST-- +bind RAW field +--SKIPIF-- + +--FILE-- + +--EXPECT-- +string(32) "88b274d7a257ac6f70435b83abd4e26e" +int(300) +Done diff --git a/ext/oci8/tests/test.gif b/ext/oci8/tests/test.gif new file mode 100644 index 0000000000000000000000000000000000000000..f352c7308fee4c5cb1ab4f2e3dd73d6af6cfc6f6 GIT binary patch literal 2523 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 literal 0 HcmV?d00001 -- 2.50.1