From fca93a0754ca3124185dbebbc2431c6c5f4d774b Mon Sep 17 00:00:00 2001
From: artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>
Date: Wed, 26 Mar 2008 12:45:46 +0000
Subject:  - improvements for Oracle (Artem)

git-svn-id: svn://svn.zabbix.com/trunk@5536 97f52cf1-0a1b-0410-bd0e-c28be96e8082
---
 frontends/php/include/db.inc.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'frontends/php/include/db.inc.php')

diff --git a/frontends/php/include/db.inc.php b/frontends/php/include/db.inc.php
index df1fdd52..6a4a86b6 100644
--- a/frontends/php/include/db.inc.php
+++ b/frontends/php/include/db.inc.php
@@ -282,7 +282,7 @@
 				$result = DBexecute('commit;');
 				break;
 			case "ORACLE":
-				$result = ocicommit();
+				$result = ocicommit($DB);
 				$DB_TRANSACTIONS = 0;
 				break;
 			case "SQLITE3":
@@ -313,7 +313,7 @@
 				$result = DBexecute('rollback;');
 				break;
 			case "ORACLE":
-				$result = ocirollback();
+				$result = ocirollback($DB);
 				$DB_TRANSACTIONS = 0;
 				break;
 			case "SQLITE3":
@@ -475,7 +475,7 @@
 	return $result;
 	}
 
-	function	DBfetch(&$cursor){
+	function DBfetch(&$cursor){
 		global $DB, $DB_TYPE;
 	
 		$result = false;
@@ -492,7 +492,7 @@
 				if(ocifetchinto($cursor, $row, (OCI_ASSOC+OCI_RETURN_NULLS))){
 					$result = array();
 					foreach($row as $key => $value){
-						$result[strtolower($key)] = $value;
+						$result[strtolower($key)] = (str_in_array(strtolower(ocicolumntype($cursor,$key)),array('varchar2','blob','clob')) && is_null($value))?'':$value;
 					}
 				}
 				break;
-- 
cgit