Fix pg_lo_read() and make tests useful

Author: Girgias

ext/pgsql/pgsql.c

@@ -2562,31 +2562,31 @@ PHP_FUNCTION(pg_lo_close)
 PHP_FUNCTION(pg_lo_read)
 {
 	zval *pgsql_id;
-	zend_long len = 0;
-	size_t buf_len = PGSQL_LO_READ_BUF_SIZE;
+	zend_long buffer_length = PGSQL_LO_READ_BUF_SIZE;
 	int nbytes;
 	zend_string *buf;
 	pgLofp *pgsql;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|l", &pgsql_id, &len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|l", &pgsql_id, &buffer_length) == FAILURE) {
 		RETURN_THROWS();
 	}
 
 	if ((pgsql = (pgLofp *)zend_fetch_resource(Z_RES_P(pgsql_id), "PostgreSQL large object", le_lofp)) == NULL) {
 		RETURN_THROWS();
 	}
 
-	if (len < 0) {
+	if (buffer_length < 0) {
 		zend_argument_value_error(2, "must be greater or equal than 0");
 		RETURN_THROWS();
 	}
 
-	buf = zend_string_alloc(buf_len, 0);
+	buf = zend_string_alloc(buffer_length, 0);
 	if ((nbytes = lo_read((PGconn *)pgsql->conn, pgsql->lofd, ZSTR_VAL(buf), ZSTR_LEN(buf)))<0) {
 		zend_string_efree(buf);
 		RETURN_FALSE;
 	}
 
+	/* TODO Use truncate API? */
 	ZSTR_LEN(buf) = nbytes;
 	ZSTR_VAL(buf)[ZSTR_LEN(buf)] = '\0';
 	RETURN_NEW_STR(buf);

ext/pgsql/tests/05large_object.phpt

@@ -15,23 +15,32 @@ $oid = pg_lo_create ($db);
 if (!$oid) echo ("pg_lo_create() error\n");
 $handle = pg_lo_open ($db, $oid, "w");
 if (!$handle) echo ("pg_lo_open() error\n");
-pg_lo_write ($handle, "large object data\n");
+pg_lo_write ($handle, "large object data");
 pg_lo_close ($handle);
 pg_exec ($db, "commit");
 
 echo "open/read/tell/seek/close LO\n";
 pg_exec ($db, "begin");
 $handle = pg_lo_open ($db, $oid, "w");
-pg_lo_read($handle, 100);
-pg_lo_tell($handle);
-pg_lo_seek($handle, 2);
+var_dump(pg_lo_read($handle, 5));
+var_dump(pg_lo_tell($handle));
+var_dump(pg_lo_seek($handle, 2, /* PGSQL_SEEK_CUR */)); // This is the default so move cursor from 5
+var_dump(pg_lo_read($handle, 100)); // Read to the end because chunk is larger then remaining content
+var_dump(pg_lo_tell($handle));
+var_dump(pg_lo_seek($handle, 0, PGSQL_SEEK_SET)); /* Reset cursor to beginning */
+var_dump(pg_lo_read($handle));
+var_dump(pg_lo_seek($handle, -4, PGSQL_SEEK_END)); /* Seek from the end */
+var_dump(pg_lo_read($handle));
 pg_lo_close($handle);
 pg_exec ($db, "commit");
 
 echo "open/read_all/close LO\n";
 pg_exec ($db, "begin");
 $handle = pg_lo_open ($db, $oid, "w");
-pg_lo_read_all($handle);
+/* Will write to stdout */
+$bytesWritten = pg_lo_read_all($handle);
+echo "\n";
+var_dump($bytesWritten);
 if (pg_last_error()) echo "pg_lo_read_all() error\n".pg_last_error();
 pg_lo_close($handle);
 pg_exec ($db, "commit");
@@ -95,8 +104,18 @@ echo "OK";
 --EXPECT--
 create/write/close LO
 open/read/tell/seek/close LO
+string(5) "large"
+int(5)
+bool(true)
+string(10) "bject data"
+int(17)
+bool(true)
+string(17) "large object data"
+bool(true)
+string(4) "data"
 open/read_all/close LO
 large object data
+int(17)
 unlink LO
 Test without connection
 Test with string oid value