From: Pierre Joye <pajoye@php.net>
Date: Mon, 21 Jul 2008 17:17:58 +0000 (+0000)
Subject: - #41996, Problem accessing Oracle ROWID (Martin Jansen)
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~1162
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b0a4aa7e3b9a11c52c1915974394c215cc1ee521;p=php

- #41996, Problem accessing Oracle ROWID (Martin Jansen)
---

diff --git a/ext/pdo_oci/oci_statement.c b/ext/pdo_oci/oci_statement.c
index fd3c1bd48e..c41b1bd83f 100755
--- a/ext/pdo_oci/oci_statement.c
+++ b/ext/pdo_oci/oci_statement.c
@@ -415,7 +415,7 @@ static int oci_stmt_describe(pdo_stmt_t *stmt, int colno TSRMLS_DC) /* {{{ */
 		case SQLT_BIN:
 		default:
 			dyn = FALSE;
-			if (dtype == SQLT_DAT || dtype == SQLT_NUM
+			if (dtype == SQLT_DAT || dtype == SQLT_NUM || dtype == SQLT_RDD
 #ifdef SQLT_TIMESTAMP
 					|| dtype == SQLT_TIMESTAMP
 #endif
diff --git a/ext/pdo_oci/tests/bug41996.phpt b/ext/pdo_oci/tests/bug41996.phpt
new file mode 100644
index 0000000000..ac8e35fe60
--- /dev/null
+++ b/ext/pdo_oci/tests/bug41996.phpt
@@ -0,0 +1,20 @@
+--TEST--
+PDO OCI Bug #41996 (Problem accessing Oracle ROWID)
+--SKIPIF--
+<?php
+/* $Id$ */
+if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) die('skip not loaded');
+require dirname(__FILE__).'/../../pdo/tests/pdo_test.inc';
+PDOTest::skip();
+?>
+--FILE--
+<?php
+require 'ext/pdo/tests/pdo_test.inc';
+$db = PDOTest::test_factory('ext/pdo_oci/tests/common.phpt');
+
+$stmt = $db->prepare('SELECT rowid FROM dual');
+$stmt->execute();
+$row = $stmt->fetch();
+var_dump(strlen($row[0]) > 0);
+--EXPECTF--
+bool(true)