helly Fri May 30 12:51:00 2003 EDT
Modified files:
/php4/ext/pgsql pgsql.c
/php4/ext/pgsql/tests 05large_object.phpt
Log:
Fix handling of default links
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.273 php4/ext/pgsql/pgsql.c:1.274
--- php4/ext/pgsql/pgsql.c:1.273 Fri May 30 11:42:46 2003
+++ php4/ext/pgsql/pgsql.c Fri May 30 12:51:00 2003
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql.c,v 1.273 2003/05/30 15:42:46 helly Exp $ */
+/* $Id: pgsql.c,v 1.274 2003/05/30 16:51:00 helly Exp $ */
#include <stdlib.h>
@@ -1774,10 +1774,6 @@
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 @@
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 @@
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 @@
RETURN_FALSE;
}
- if (pgsql_link == NULL) {
- RETURN_FALSE;
- }
-
if (PG(safe_mode) &&(!php_checkuid(file_out, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
RETURN_FALSE;
}
Index: php4/ext/pgsql/tests/05large_object.phpt
diff -u php4/ext/pgsql/tests/05large_object.phpt:1.2
php4/ext/pgsql/tests/05large_object.phpt:1.3
--- php4/ext/pgsql/tests/05large_object.phpt:1.2 Mon May 19 20:14:46 2003
+++ php4/ext/pgsql/tests/05large_object.phpt Fri May 30 12:51:00 2003
@@ -9,7 +9,7 @@
$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_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_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 @@
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 @@
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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
