Index: MDB2/Driver/pgsql.php =================================================================== RCS file: /repository/pear/MDB2/MDB2/Driver/pgsql.php,v retrieving revision 1.60 diff -u -r1.60 pgsql.php --- MDB2/Driver/pgsql.php 6 Mar 2005 18:53:19 -0000 1.60 +++ MDB2/Driver/pgsql.php 21 Mar 2005 14:27:57 -0000 @@ -100,7 +100,7 @@ if (is_resource($error)) { $native_msg = @pg_result_error($error); } elseif ($this->connection) { - $native_msg = @pg_errormessage($this->connection); + $native_msg = @pg_last_error($this->connection); } // Fall back to MDB2_ERROR if there was no mapping. @@ -451,7 +451,7 @@ $connection = $this->connection; } - $result = @pg_exec($connection, $query); + $result = @pg_query($connection, $query); if (!$result) { return $this->raiseError(); } @@ -754,4 +754,4 @@ { } -?> \ No newline at end of file +?> Index: MDB2/Driver/Datatype/pgsql.php =================================================================== RCS file: /repository/pear/MDB2/MDB2/Driver/Datatype/pgsql.php,v retrieving revision 1.17 diff -u -r1.17 pgsql.php --- MDB2/Driver/Datatype/pgsql.php 17 Mar 2005 17:10:48 -0000 1.17 +++ MDB2/Driver/Datatype/pgsql.php 21 Mar 2005 14:27:58 -0000 @@ -392,7 +392,7 @@ if (MDB2::isError($connect)) { return $connect; } - if (!$db->in_transaction && !@pg_exec($db->connection, 'BEGIN')) { + if (!$db->in_transaction && !@pg_query($db->connection, 'BEGIN')) { return $db->raiseError(MDB2_ERROR, null, null, 'error starting transaction'); } @@ -414,14 +414,14 @@ } $result = false; if (is_resource($value)) { - if (($lo = @pg_locreate($db->connection))) { - if (($handle = @pg_loopen($db->connection, $lo, 'w'))) { + if (($lo = @pg_lo_create($db->connection))) { + if (($handle = @pg_lo_open($db->connection, $lo, 'w'))) { while (!@feof($value)) { $data = @fread($value, $db->options['lob_buffer_length']); if ($data === '') { break; } - if (!@pg_lowrite($handle, $data)) { + if (!@pg_lo_write($handle, $data)) { $result = $db->raiseError(); break; } @@ -429,10 +429,10 @@ if (!PEAR::isError($result)) { $result = strval($lo); } - @pg_loclose($handle); + @pg_lo_close($handle); } else { $result = $db->raiseError(); - @pg_lounlink($db->connection, $lo); + @pg_lo_unlink($db->connection, $lo); } } if ($close) { @@ -445,9 +445,9 @@ } if (!$db->in_transaction) { if (PEAR::isError($result)) { - @pg_exec($db->connection, 'ROLLBACK'); + @pg_query($db->connection, 'ROLLBACK'); } else { - @pg_exec($db->connection, 'COMMIT'); + @pg_query($db->connection, 'COMMIT'); } } return $result; @@ -560,16 +560,16 @@ } if (!isset($db->lobs[$lob]['handle'])) { if (!$db->in_transaction) { - if (!pg_exec($db->connection, 'BEGIN')) { + if (!pg_query($db->connection, 'BEGIN')) { return $db->raiseError(); } $db->lobs[$lob]['in_transaction'] = true; } $db->lobs[$lob]['handle'] = - @pg_loopen($db->connection, $db->lobs[$lob]['value'], 'r'); + @pg_lo_open($db->connection, $db->lobs[$lob]['value'], 'r'); if (!$db->lobs[$lob]['handle']) { if (isset($db->lobs[$lob]['in_transaction'])) { - @pg_Exec($db->connection, 'END'); + @pg_query($db->connection, 'END'); unset($db->lobs[$lob]['in_transaction']); } unset($db->lobs[$lob]['value']); @@ -621,7 +621,7 @@ if (MDB2::isError($lobresult)) { return $lobresult; } - $data = @pg_loread($db->lobs[$lob]['handle'], $length); + $data = @pg_lo_read($db->lobs[$lob]['handle'], $length); if (!is_string($data)) { return $db->raiseError(); } @@ -646,9 +646,9 @@ $db =& $GLOBALS['_MDB2_databases'][$this->db_index]; if (isset($db->lobs[$lob])) { if (isset($db->lobs[$lob]['value'])) { - @pg_loclose($db->lobs[$lob]['handle']); + @pg_lo_close($db->lobs[$lob]['handle']); if (isset($db->lobs[$lob]['in_transaction'])) { - @pg_Exec($db->connection, 'END'); + @pg_query($db->connection, 'END'); } } $db->lobs[$lob] = ''; @@ -656,4 +656,4 @@ } } -?> \ No newline at end of file +?> Index: MDB2/Driver/Native/pgsql.php =================================================================== RCS file: /repository/pear/MDB2/MDB2/Driver/Native/pgsql.php,v retrieving revision 1.5 diff -u -r1.5 pgsql.php --- MDB2/Driver/Native/pgsql.php 2 Jan 2005 21:44:25 -0000 1.5 +++ MDB2/Driver/Native/pgsql.php 21 Mar 2005 14:27:58 -0000 @@ -83,11 +83,11 @@ function deleteOID($OID) { $db =& $GLOBALS['_MDB2_databases'][$this->db_index]; - if (!@pg_lounlink($db->connection, $OID)) { + if (!@pg_lo_unlink($db->connection, $OID)) { return $db->raiseError(); } return MDB2_OK; } } -?> \ No newline at end of file +?> Index: MDB2/Driver/Reverse/pgsql.php =================================================================== RCS file: /repository/pear/MDB2/MDB2/Driver/Reverse/pgsql.php,v retrieving revision 1.15 diff -u -r1.15 pgsql.php --- MDB2/Driver/Reverse/pgsql.php 4 Mar 2005 12:37:58 -0000 1.15 +++ MDB2/Driver/Reverse/pgsql.php 21 Mar 2005 14:27:58 -0000 @@ -321,7 +321,7 @@ $case_func = 'strval'; } - $count = @pg_numfields($id); + $count = @pg_num_fields($id); $res = array(); if ($mode) { @@ -331,9 +331,9 @@ for ($i = 0; $i < $count; $i++) { $res[$i] = array( 'table' => $got_string ? $case_func($result) : '', - 'name' => $case_func(@pg_fieldname($id, $i)), - 'type' => @pg_fieldtype($id, $i), - 'len' => @pg_fieldsize($id, $i), + 'name' => $case_func(@pg_field_name($id, $i)), + 'type' => @pg_field_type($id, $i), + 'len' => @pg_field_size($id, $i), 'flags' => $got_string ? $this->_pgFieldFlags($id, $i, $result) : '', @@ -348,7 +348,7 @@ // free the result only if we were called on a table if ($got_string) { - @pg_freeresult($id); + @pg_free_result($id); } return $res; } @@ -373,20 +373,20 @@ function _pgFieldFlags($resource, $num_field, $table_name) { $db =& $GLOBALS['_MDB2_databases'][$this->db_index]; - $field_name = @pg_fieldname($resource, $num_field); + $field_name = @pg_field_name($resource, $num_field); - $result = @pg_exec($db->connection, "SELECT f.attnotnull, f.atthasdef + $result = @pg_query($db->connection, "SELECT f.attnotnull, f.atthasdef FROM pg_attribute f, pg_class tab, pg_type typ WHERE tab.relname = typ.typname AND typ.typrelid = f.attrelid AND f.attname = '$field_name' AND tab.relname = '$table_name'"); - if (@pg_numrows($result) > 0) { + if (@pg_num_rows($result) > 0) { $row = @pg_fetch_row($result, 0); $flags = ($row[0] == 't') ? 'not_null ' : ''; if ($row[1] == 't') { - $result = @pg_exec($db->connection, "SELECT a.adsrc + $result = @pg_query($db->connection, "SELECT a.adsrc FROM pg_attribute f, pg_class tab, pg_type typ, pg_attrdef a WHERE tab.relname = typ.typname AND typ.typrelid = f.attrelid AND f.attrelid = a.adrelid AND f.attname = '$field_name' @@ -398,14 +398,14 @@ } else { $flags = ''; } - $result = @pg_exec($db->connection, "SELECT i.indisunique, i.indisprimary, i.indkey + $result = @pg_query($db->connection, "SELECT i.indisunique, i.indisprimary, i.indkey FROM pg_attribute f, pg_class tab, pg_type typ, pg_index i WHERE tab.relname = typ.typname AND typ.typrelid = f.attrelid AND f.attrelid = i.indrelid AND f.attname = '$field_name' AND tab.relname = '$table_name'"); - $count = @pg_numrows($result); + $count = @pg_num_rows($result); for ($i = 0; $i < $count ; $i++) { $row = @pg_fetch_row($result, $i); @@ -422,4 +422,4 @@ return trim($flags); } } -?> \ No newline at end of file +?>