From 63d6e6dfc35e6d82c4a64f37c408794c163becd4 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 28 Sep 2011 15:16:41 -0400
Subject: [PATCH] Bump versions to 0.6 stable
---
program/lib/MDB2/Driver/Native/pgsql.php | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/program/lib/MDB2/Driver/Native/pgsql.php b/program/lib/MDB2/Driver/Native/pgsql.php
old mode 100755
new mode 100644
index f121a9a..80495c5
--- a/program/lib/MDB2/Driver/Native/pgsql.php
+++ b/program/lib/MDB2/Driver/Native/pgsql.php
@@ -2,7 +2,7 @@
// +----------------------------------------------------------------------+
// | PHP versions 4 and 5 |
// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2004 Manuel Lemos, Tomas V.V.Cox, |
+// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox, |
// | Stig. S. Bakken, Lukas Smith |
// | All rights reserved. |
// +----------------------------------------------------------------------+
@@ -42,7 +42,9 @@
// | Author: Paul Cooper <pgc@ucecom.com> |
// +----------------------------------------------------------------------+
//
-// $Id$
+// $Id: pgsql.php 295587 2010-02-28 17:16:38Z quipo $
+
+require_once 'MDB2/Driver/Native/Common.php';
/**
* MDB2 PostGreSQL driver for the native module
@@ -51,7 +53,7 @@
* @category Database
* @author Paul Cooper <pgc@ucecom.com>
*/
-class MDB2_Driver_Native_pgsql extends MDB2_Module_Common
+class MDB2_Driver_Native_pgsql extends MDB2_Driver_Native_Common
{
// }}}
// {{{ deleteOID()
@@ -65,13 +67,19 @@
*/
function deleteOID($OID)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
- if (!@pg_lo_unlink($db->connection, $OID)) {
- return $db->raiseError();
+ $connection = $db->getConnection();
+ if (PEAR::isError($connection)) {
+ return $connection;
+ }
+
+ if (!@pg_lo_unlink($connection, $OID)) {
+ return $db->raiseError(null, null, null,
+ 'Unable to unlink OID: '.$OID, __FUNCTION__);
}
return MDB2_OK;
}
--
Gitblit v1.9.1