cvs: php4 /pear/DB oci8.php

ssb Mon Mar 12 04:50:44 2001 EDT Modified files: /php4/pear/DB oci8.php Log: * added "@" in front of all OCI* function calls Index: php4/pear/DB/oci8.php diff -u php4/pear/DB/oci8.php:1.19 php4/pear/DB/oci8.php:1.20 --- php4/pear/DB/oci8.php:1.19 Mon Feb 19 04:22:26 2001 +++ php4/pear/DB/oci8.php Mon Mar 12 04:50:44 2001 @@ -87,9 +87,9 @@ DB::assertExtension("oci8"); $connect_function = $persistent ? 'OCIPLogon' : 'OCILogon'; if ($hostspec) { - $conn = $connect_function($user,$pw,$hostspec); + $conn = @$connect_function($user,$pw,$hostspec); } elseif ($user || $pw) { - $conn = $connect_function($user,$pw); + $conn = @$connect_function($user,$pw); } else { $conn = false; } @@ -110,7 +110,7 @@ */ function disconnect() { - return OCILogOff($this->connection); + return @OCILogOff($this->connection); } // }}} @@ -130,15 +130,15 @@ { $this->last_query = $query; $query = $this->modifyQuery($query); - $result = OCIParse($this->connection, $query); + $result = @OCIParse($this->connection, $query); if (!$result) { return $this->raiseError(); } if ($this->autoCommit) { - $success=OCIExecute($result,OCI_COMMIT_ON_SUCCESS); + $success = @OCIExecute($result,OCI_COMMIT_ON_SUCCESS); } else { - $success=OCIExecute($result,OCI_DEFAULT); + $success = @OCIExecute($result,OCI_DEFAULT); } if (!$success) { return $this->raiseError(); @@ -167,9 +167,9 @@ $fetchmode = $this->fetchmode; } if ($fetchmode & DB_FETCHMODE_ASSOC) { - $moredata = OCIFetchInto($result, $row, OCI_ASSOC + OCI_RETURN_NULLS + OCI_RETURN_LOBS); + $moredata = @OCIFetchInto($result, $row, OCI_ASSOC + OCI_RETURN_NULLS + OCI_RETURN_LOBS); } else { - $moredata = OCIFetchInto($result, $row, OCI_RETURN_NULLS + OCI_RETURN_LOBS); + $moredata = @OCIFetchInto($result, $row, OCI_RETURN_NULLS + OCI_RETURN_LOBS); } if (!$row) { return $this->raiseError(); @@ -198,9 +198,9 @@ $fetchmode = $this->fetchmode; } if ($fetchmode & DB_FETCHMODE_ASSOC) { - $moredata=OCIFetchInto($result,$arr,OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS); + $moredata = @OCIFetchInto($result,$arr,OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS); } else { - $moredata=OCIFetchInto($result,$arr,OCI_RETURN_NULLS+OCI_RETURN_LOBS); + $moredata = @OCIFetchInto($result,$arr,OCI_RETURN_NULLS+OCI_RETURN_LOBS); } if (!($arr && $moredata)) { return $this->raiseError(); @@ -221,7 +221,7 @@ function freeResult($result) { if (is_resource($result)) { - return OCIFreeStatement($result); + return @OCIFreeStatement($result); } if (!isset($this->prepare_tokens[$result])) { return false; @@ -243,7 +243,7 @@ */ function numCols($result) { - $cols = OCINumCols($result); + $cols = @OCINumCols($result); if (!$cols) { return $this->raiseError(); } @@ -263,7 +263,7 @@ */ function errorNative() { - $error=OCIError($this->connection); + $error = @OCIError($this->connection); if (is_array($error)) { return $error['code']; } @@ -302,7 +302,7 @@ $newquery .= $tokens[$i]; $this->last_query = $query; $newquery = $this->modifyQuery($newquery); - $stmt=OCIParse($this->connection, $newquery); + $stmt = @OCIParse($this->connection, $newquery); $this->prepare_types[$stmt] = $types; $this->manip_query[$stmt] = DB::isManip($query); return $stmt; @@ -343,15 +343,15 @@ } } } - if (!OCIBindByName($stmt,":bind".$i,$pdata[$i],-1)) { + if (!@OCIBindByName($stmt,":bind".$i,$pdata[$i],-1)) { return $this->raiseError(); } } if ($this->autoCommit) { - $success=OCIExecute($stmt,OCI_COMMIT_ON_SUCCESS); + $success = @OCIExecute($stmt,OCI_COMMIT_ON_SUCCESS); } else { - $success=OCIExecute($stmt,OCI_DEFAULT); + $success = @OCIExecute($stmt,OCI_DEFAULT); } if (!$success) { return $this->raiseError(); @@ -393,7 +393,7 @@ */ function commit() { - $result = OCICommit($this->connection); + $result = @OCICommit($this->connection); if (!$result) { return $this->raiseError(); } @@ -410,7 +410,7 @@ */ function rollback() { - $result = OCIRollback($this->connection); + $result = @OCIRollback($this->connection); if (!$result) { return $this->raiseError(); } @@ -431,7 +431,7 @@ if ($this->last_stmt === false) { return $this->raiseError(); } - $result = OCIRowCount($this->last_stmt); + $result = @OCIRowCount($this->last_stmt); if ($result === false) { return $this->raiseError(); }