Fix handling of default links

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 99f5a74f21dd0f48bb94fa63f285552754f5c0e5..54835354f635506ad88a4da2b29c7dc3c08e7b91 100644 (file)
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -1774,10 +1774,6 @@ PHP_FUNCTION(pg_lo_unlink)
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Requires 1 or 2 arguments.");
                RETURN_FALSE;
        }
-
-       if (pgsql_link == NULL) {
-               RETURN_FALSE;
-       }
        
        ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link, le_plink);
 
@@ -1848,10 +1844,6 @@ PHP_FUNCTION(pg_lo_open)
                RETURN_FALSE;
        }
 
-       if (pgsql_link == NULL) {
-               RETURN_FALSE;
-       }
-       
        ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link, le_plink);
        
        /* r/w/+ is little bit more PHP-like than INV_READ/INV_WRITE and a lot of
@@ -2080,10 +2072,6 @@ PHP_FUNCTION(pg_lo_import)
                WRONG_PARAM_COUNT;
        }
 
-       if (pgsql_link == NULL) {
-               RETURN_FALSE;
-       }
-       
        if (PG(safe_mode) &&(!php_checkuid(file_in, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
                RETURN_FALSE;
        }
@@ -2178,10 +2166,6 @@ PHP_FUNCTION(pg_lo_export)
                RETURN_FALSE;
        }
 
-       if (pgsql_link == NULL) {
-               RETURN_FALSE;
-       }
-       
        if (PG(safe_mode) &&(!php_checkuid(file_out, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
                RETURN_FALSE;
        }

diff --git a/ext/pgsql/tests/05large_object.phpt b/ext/pgsql/tests/05large_object.phpt
index 4f8683625afc6c98a19116e1d0527e078c4207e8..fe33299585a763af7cf845bc97914e7ab0e3ae3a 100644 (file)
--- a/ext/pgsql/tests/05large_object.phpt
+++ b/ext/pgsql/tests/05large_object.phpt
@@ -9,7 +9,7 @@ include('config.inc');
 
 $db = pg_connect($conn_str);
 
-// create/write/close LO
+echo "create/write/close LO\n";
 pg_exec ($db, "begin");
 $oid = pg_lo_create ($db);
 if (!$oid) echo ("pg_lo_create() error\n");
@@ -19,7 +19,7 @@ pg_lo_write ($handle, "large object data\n");
 pg_lo_close ($handle);
 pg_exec ($db, "commit");
 
-// open/read/tell/seek/close LO
+echo "open/read/tell/seek/close LO\n";
 pg_exec ($db, "begin");
 $handle = pg_lo_open ($db, $oid, "w");
 pg_lo_read($handle, 100);
@@ -28,7 +28,7 @@ pg_lo_seek($handle, 2);
 pg_lo_close($handle);
 pg_exec ($db, "commit");
 
-// open/read_all/close LO
+echo "open/read_all/close LO\n";
 pg_exec ($db, "begin");
 $handle = pg_lo_open ($db, $oid, "w");
 pg_lo_read_all($handle);
@@ -36,25 +36,25 @@ if (pg_last_error()) echo "pg_lo_read_all() error\n".pg_last_error();
 pg_lo_close($handle);
 pg_exec ($db, "commit");
 
-// unlink LO
+echo "unlink LO\n";
 pg_exec ($db, "begin");
-pg_lo_unlink($db, $oid) or print("pg_lo_unlink() error\n");
+pg_lo_unlink($db, $oid) or print("pg_lo_unlink() error 1\n");
 pg_exec ($db, "commit");
 
 // more pg_lo_unlink() tests
-// Test without connection 
+echo "Test without connection\n";
 pg_exec ($db, "begin");
 $oid = pg_lo_create ($db) or print("pg_lo_create() error\n");
-pg_lo_unlink($oid) or print("pg_lo_unlink() error\n");
+pg_lo_unlink($oid) or print("pg_lo_unlink() error 2\n");
 pg_exec ($db, "commit");
 
-// Test with string oid value
+echo "Test with string oid value\n";
 pg_exec ($db, "begin");
 $oid = pg_lo_create ($db) or print("pg_lo_create() error\n");
-pg_lo_unlink($db, (string)$oid) or print("pg_lo_unlink() error\n");
+pg_lo_unlink($db, (string)$oid) or print("pg_lo_unlink() error 3\n");
 pg_exec ($db, "commit");
 
-// import/export LO
+echo "import/export LO\n";
 pg_query($db, 'begin');
 $oid = pg_lo_import($db, 'php.gif');
 pg_query($db, 'commit');
@@ -70,5 +70,12 @@ pg_query($db, 'commit');
 echo "OK";
 ?>
 --EXPECT--
+create/write/close LO
+open/read/tell/seek/close LO
+open/read_all/close LO
 large object data
+unlink LO
+Test without connection
+Test with string oid value
+import/export LO
 OK