From: Thies C. Arntzen <thies@php.net>
Date: Tue, 18 Jan 2000 08:35:55 +0000 (+0000)
Subject: @- Ora_GetColumn()/Ora_FetchInto() now return NULL for NULL-Columns. (Thies)
X-Git-Tag: BEFORE_SAPIFICATION_FEB_10_2000~208
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c6df8ab565a12326173cb5ac16c4378bb928a704;p=php

@- Ora_GetColumn()/Ora_FetchInto() now return NULL for NULL-Columns. (Thies)
also changed return-type for list-dtor
---

diff --git a/ext/oracle/oracle.c b/ext/oracle/oracle.c
index 5a5b260a81..1b132dd5ff 100644
--- a/ext/oracle/oracle.c
+++ b/ext/oracle/oracle.c
@@ -36,7 +36,7 @@
 #if HAVE_ORACLE
 
 #include "php_oracle.h"
-#define HASH_DTOR (int (*)(void *))
+#define HASH_DTOR (void (*)(void *))
 
 #ifdef WIN32
 # include "variables.h"
@@ -207,13 +207,12 @@ static int _close_oraconn(oraConnection *conn)
 	return 1;
 }
 
-static int
+static void
 pval_ora_param_destructor(oraParam *param)
 {
 	if (param->progv) {
 		efree(param->progv);
 	}
-	return 1;
 }
 
 
@@ -1112,9 +1111,7 @@ PHP_FUNCTION(ora_fetch_into)
 				continue; /* don't add anything for NULL columns, unless the calles wants it */
 			} else {
 				MAKE_STD_ZVAL(tmp);
-				
-				tmp->type = IS_BOOL; /* return false for NULL columns */
-				tmp->value.lval = 0;
+				ZVAL_NULL(tmp);
 			}
 		} else if (cursor->columns[i].col_retcode != 0 &&
 				   cursor->columns[i].col_retcode != 1406) {
@@ -1387,6 +1384,10 @@ PHP_FUNCTION(ora_getcolumn)
 
  	type = column->dbtype; 
 
+	if (column->col_retcode == 1405) {
+		RETURN_NULL;
+	}
+
 	if (column->col_retcode != 0 && column->col_retcode != 1406) {
 		/* So error fetching column.  The most common is 1405, a NULL
 		 * was retreived.  1406 is ASCII or string buffer data was