Deprecate implicit default PGSQL connection

Author: Girgias

ext/pgsql/pgsql.c

@@ -80,7 +80,11 @@
 		zend_throw_error(NULL, "No PostgreSQL link opened yet"); \
 		RETURN_THROWS(); \
 	}
-#define FETCH_DEFAULT_LINK()  PGG(default_link)
+
+/* This is a bit hacky as the macro usage is "link = FETCH_DEFAULT_LINK();" */
+#define FETCH_DEFAULT_LINK() \
+		PGG(default_link); \
+		php_error_docref(NULL, E_DEPRECATED, "Automatic fetching of PostgreSQL link is deprecated")
 
 #ifndef HAVE_PQFREEMEM
 #define PQfreemem free
@@ -735,6 +739,7 @@ PHP_FUNCTION(pg_close)
 	}
 
 	if (!pgsql_link) {
+		php_error_docref(NULL, E_DEPRECATED, "Automatic fetching of PostgreSQL link is deprecated");
 		link = PGG(default_link);
 		CHECK_DEFAULT_LINK(link);
 		zend_list_delete(link);

ext/pgsql/tests/01createdb.phpt

@@ -20,7 +20,7 @@ else {
     echo pg_last_error()."\n";
 }
 
-$v = pg_version();
+$v = pg_version($db);
 if (version_compare($v['server'], '9.2', '>=') && (!($q = @pg_query($db, "SELECT * FROM ".$table_name_92)) || !@pg_num_rows($q)))
 {
     pg_query($db,$table_def_92); // Create table here

ext/pgsql/tests/05large_object.phpt

@@ -32,7 +32,7 @@ echo "open/read_all/close LO\n";
 pg_exec ($db, "begin");
 $handle = pg_lo_open ($db, $oid, "w");
 pg_lo_read_all($handle);
-if (pg_last_error()) echo "pg_lo_read_all() error\n".pg_last_error();
+if (pg_last_error($db)) echo "pg_lo_read_all() error\n".pg_last_error();
 pg_lo_close($handle);
 pg_exec ($db, "commit");
 
@@ -92,17 +92,23 @@ try {
 
 echo "OK";
 ?>
---EXPECT--
+--EXPECTF--
 create/write/close LO
 open/read/tell/seek/close LO
 open/read_all/close LO
 large object data
 unlink LO
 Test without connection
+
+Deprecated: pg_lo_unlink(): Automatic fetching of PostgreSQL link is deprecated in %s on line %d
 Test with string oid value
 import/export LO
+
+Deprecated: pg_lo_create(): Automatic fetching of PostgreSQL link is deprecated in %s on line %d
 Invalid OID value passed
 Invalid OID value passed
+
+Deprecated: pg_lo_create(): Automatic fetching of PostgreSQL link is deprecated in %s on line %d
 Invalid OID value passed
 Invalid OID value passed
 OK

ext/pgsql/tests/07optional.phpt

@@ -14,9 +14,9 @@ $enc = pg_client_encoding($db);
 pg_set_client_encoding($db, $enc);
 
 if (function_exists('pg_set_error_verbosity')) {
-    pg_set_error_verbosity(PGSQL_ERRORS_TERSE);
-    pg_set_error_verbosity(PGSQL_ERRORS_DEFAULT);
-    pg_set_error_verbosity(PGSQL_ERRORS_VERBOSE);
+    pg_set_error_verbosity($db, PGSQL_ERRORS_TERSE);
+    pg_set_error_verbosity($db, PGSQL_ERRORS_DEFAULT);
+    pg_set_error_verbosity($db, PGSQL_ERRORS_VERBOSE);
 }
 echo "OK";
 ?>

ext/pgsql/tests/08escape.phpt

@@ -43,7 +43,7 @@ $db   = pg_connect($conn_str);
 
 // Insert binary to DB
 $escaped_data = pg_escape_bytea($data);
-pg_query("DELETE FROM ".$table_name." WHERE num = 10000;");
+pg_query($db, "DELETE FROM ".$table_name." WHERE num = 10000;");
 $sql = "INSERT INTO ".$table_name." (num, bin) VALUES (10000, CAST ('".$escaped_data."' AS BYTEA));";
 pg_query($db, $sql);
 
@@ -96,9 +96,18 @@ else {
 }
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: pg_escape_string(): Automatic fetching of PostgreSQL link is deprecated in %s on line %d
 pg_escape_string() is Ok
+
+Deprecated: pg_escape_bytea(): Automatic fetching of PostgreSQL link is deprecated in %s on line %d
 pg_escape_bytea() is Ok
+
+Deprecated: pg_escape_bytea(): Automatic fetching of PostgreSQL link is deprecated in %s on line %d
 pg_escape_bytea() actually works with database
+
+Deprecated: pg_escape_literal(): Automatic fetching of PostgreSQL link is deprecated in %s on line %d
 pg_escape_literal() is Ok
+
+Deprecated: pg_escape_identifier(): Automatic fetching of PostgreSQL link is deprecated in %s on line %d
 pg_escape_identifier() is Ok

ext/pgsql/tests/09notice.phpt

@@ -18,7 +18,7 @@ ini_set('pgsql.ignore_notice', FALSE);
 
 $db = pg_connect($conn_str);
 
-_set_lc_messages();
+_set_lc_messages($db);
 
 $res = pg_query($db, 'SET client_min_messages TO NOTICE;');
 var_dump($res);

ext/pgsql/tests/13pg_select_9.phpt

@@ -12,7 +12,7 @@ error_reporting(E_ALL);
 include 'config.inc';
 
 $db = pg_connect($conn_str);
-pg_query("SET bytea_output = 'hex'");
+pg_query($db, "SET bytea_output = 'hex'");
 
 $fields = array('num'=>'1234', 'str'=>'ABC', 'bin'=>'XYZ');
 $ids = array('num'=>'1234');

ext/pgsql/tests/18pg_escape_bytea_before.phpt

@@ -26,5 +26,6 @@ else {
     echo "OK";
 }
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: pg_escape_bytea(): Automatic fetching of PostgreSQL link is deprecated in %s on line %d
 OK

ext/pgsql/tests/18pg_escape_bytea_esc.phpt

@@ -26,5 +26,6 @@ else {
     echo "OK";
 }
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: pg_escape_bytea(): Automatic fetching of PostgreSQL link is deprecated in %s on line %d
 OK

ext/pgsql/tests/18pg_escape_bytea_hex.phpt

@@ -29,5 +29,6 @@ else {
     echo "OK";
 }
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: pg_escape_bytea(): Automatic fetching of PostgreSQL link is deprecated in %s on line %d
 OK

ext/pgsql/tests/27large_object_oid.phpt

@@ -40,8 +40,16 @@ pg_exec ("commit");
 
 echo "OK";
 ?>
---EXPECT--
+--EXPECTF--
 create LO from int
 create LO from string
 create LO using default connection
+
+Deprecated: pg_exec(): Automatic fetching of PostgreSQL link is deprecated in %s on line %d
+
+Deprecated: pg_lo_create(): Automatic fetching of PostgreSQL link is deprecated in %s on line %d
+
+Deprecated: pg_lo_unlink(): Automatic fetching of PostgreSQL link is deprecated in %s on line %d
+
+Deprecated: pg_exec(): Automatic fetching of PostgreSQL link is deprecated in %s on line %d
 OK

ext/pgsql/tests/28large_object_import_oid.phpt

@@ -82,14 +82,26 @@ try {
 
 echo "OK";
 ?>
---EXPECT--
+--EXPECTF--
 import LO from int
 import LO from string
 import LO using default connection
+
+Deprecated: pg_exec(): Automatic fetching of PostgreSQL link is deprecated in %s on line %d
+
+Deprecated: pg_lo_unlink(): Automatic fetching of PostgreSQL link is deprecated in %s on line %d
+
+Deprecated: pg_exec(): Automatic fetching of PostgreSQL link is deprecated in %s on line %d
+
+Deprecated: pg_lo_import(): Automatic fetching of PostgreSQL link is deprecated in %s on line %d
 Invalid OID value passed
 Invalid OID value passed
+
+Deprecated: pg_lo_import(): Automatic fetching of PostgreSQL link is deprecated in %s on line %d
 Invalid OID value passed
 Invalid OID value passed
+
+Deprecated: pg_lo_import(): Automatic fetching of PostgreSQL link is deprecated in %s on line %d
 OID value must be of type string|int, bool given
 OID value must be of type string|int, array given
 OID value must be of type string|int, stdClass given

ext/pgsql/tests/80_bug24499.phpt

@@ -14,12 +14,12 @@ if (!$dbh) {
     die ("Could not connect to the server");
 }
 
-@pg_query("DROP SEQUENCE id_id_seq");
-@pg_query("DROP TABLE id");
-pg_query("CREATE TABLE id (id SERIAL, t INT)");
+@pg_query($dbh, "DROP SEQUENCE id_id_seq");
+@pg_query($dbh, "DROP TABLE id");
+pg_query($dbh, "CREATE TABLE id (id SERIAL, t INT)");
 
 for ($i=0; $i<4; $i++) {
-    pg_query("INSERT INTO id (t) VALUES ($i)");
+    pg_query($dbh, "INSERT INTO id (t) VALUES ($i)");
 }
 
 class Id

ext/pgsql/tests/80_bug27597.phpt

@@ -14,19 +14,19 @@ if (!$dbh) {
     die ("Could not connect to the server");
 }
 
-@pg_query("DROP TABLE id");
-pg_query("CREATE TABLE id (id INT)");
+@pg_query($dbh, "DROP TABLE id");
+pg_query($dbh, "CREATE TABLE id (id INT)");
 
 for ($i=0; $i<4; $i++) {
-    pg_query("INSERT INTO id (id) VALUES ($i)");
+    pg_query($dbh, "INSERT INTO id (id) VALUES ($i)");
 }
 
 function xi_fetch_array($res, $type = PGSQL_ASSOC) {
     $a = pg_fetch_array($res, NULL, $type) ;
     return $a ;
 }
 
-$res = pg_query("SELECT * FROM id");
+$res = pg_query($dbh, "SELECT * FROM id");
 $i = 0; // endless-loop protection
 while($row = xi_fetch_array($res)) {
     print_r($row);

ext/pgsql/tests/80_bug32223.phpt

@@ -4,7 +4,7 @@ Bug #32223 (weird behaviour of pg_last_notice)
 <?php
 require_once('skipif.inc');
 
-_skip_lc_messages();
+_skip_lc_messages($conn);
 
 @pg_query($conn, "CREATE LANGUAGE 'plpgsql' HANDLER plpgsql_call_handler LANCOMPILER 'PL/pgSQL'");
 $res = @pg_query($conn, "CREATE OR REPLACE FUNCTION test_notice() RETURNS boolean AS '
@@ -28,7 +28,7 @@ if (!$dbh) {
     die ("Could not connect to the server");
 }
 
-_set_lc_messages();
+_set_lc_messages($dbh);
 
 $res = pg_query($dbh, "CREATE OR REPLACE FUNCTION test_notice() RETURNS boolean AS '
 begin

ext/pgsql/tests/80_bug32223b.phpt

@@ -28,7 +28,7 @@ if (!dbh) {
         die ("Could not connect to the server");
 }
 
-_set_lc_messages();
+_set_lc_messages(dbh);
 
 $res = pg_query(dbh, "CREATE OR REPLACE FUNCTION test_notice() RETURNS boolean AS '
 begin

ext/pgsql/tests/80_bug39971.phpt

@@ -14,7 +14,7 @@ if (!$dbh) {
     die ("Could not connect to the server");
 }
 
-pg_query("CREATE TABLE php_test (id SERIAL, tm timestamp NOT NULL)");
+pg_query($dbh, "CREATE TABLE php_test (id SERIAL, tm timestamp NOT NULL)");
 
 $values = array('tm' => 'now()');
 pg_insert($dbh, 'php_test', $values);

ext/pgsql/tests/80_bug42783.phpt

@@ -14,11 +14,11 @@ if (!$dbh) {
     die ("Could not connect to the server");
 }
 
-pg_query("CREATE TABLE php_test (id SERIAL PRIMARY KEY, time TIMESTAMP NOT NULL DEFAULT now())");
+pg_query($dbh, "CREATE TABLE php_test (id SERIAL PRIMARY KEY, time TIMESTAMP NOT NULL DEFAULT now())");
 
 pg_insert($dbh, 'php_test', array());
 
-var_dump(pg_fetch_assoc(pg_query("SELECT * FROM php_test")));
+var_dump(pg_fetch_assoc(pg_query($dbh, "SELECT * FROM php_test")));
 
 pg_query($dbh, "DROP TABLE php_test");
 pg_close($dbh);

ext/pgsql/tests/98old_api.phpt

@@ -8,7 +8,7 @@ PostgreSQL old api
 include('config.inc');
 
 $db = pg_connect($conn_str);
-$result = pg_exec("SELECT * FROM ".$table_name);
+$result = pg_exec($db, "SELECT * FROM ".$table_name);
 pg_numrows($result);
 pg_numfields($result);
 pg_fieldname($result, 0);
@@ -18,11 +18,11 @@ pg_fieldprtlen($result, 0);
 pg_fieldisnull($result, 0);
 
 pg_result($result,0,0);
-$result = pg_exec("INSERT INTO ".$table_name." VALUES (7777, 'KKK')");
+$result = pg_exec($db, "INSERT INTO ".$table_name." VALUES (7777, 'KKK')");
 $oid = pg_getlastoid($result);
 pg_freeresult($result);
-pg_errormessage();
-$result = pg_exec("UPDATE ".$table_name." SET str = 'QQQ' WHERE str like 'RGD';");
+pg_errormessage($db);
+$result = pg_exec($db, "UPDATE ".$table_name." SET str = 'QQQ' WHERE str like 'RGD';");
 pg_cmdtuples($result);
 
 

ext/pgsql/tests/bug37100_9.phpt

@@ -12,20 +12,20 @@ include 'config.inc';
 
 $db = pg_connect($conn_str);
 
-@pg_query('DROP TABLE test_bug');
+@pg_query($db, 'DROP TABLE test_bug');
 
-pg_query('CREATE TABLE test_bug (binfield byteA) ;');
-pg_query("INSERT INTO test_bug VALUES (decode('0103AA000812','hex'))");
+pg_query($db, 'CREATE TABLE test_bug (binfield byteA) ;');
+pg_query($db, "INSERT INTO test_bug VALUES (decode('0103AA000812','hex'))");
 
 
-$data = pg_query("SELECT binfield FROM test_bug");
+$data = pg_query($db, "SELECT binfield FROM test_bug");
 $res = pg_fetch_result($data,0);
 var_dump($res);
 var_dump(bin2hex(pg_unescape_bytea($res)));
 
 $sql = "BEGIN; DECLARE mycursor BINARY CURSOR FOR SELECT binfield FROM test_bug; FETCH ALL IN mycursor;";
 
-$data = pg_query($sql);
+$data = pg_query($db, $sql);
 $res = pg_fetch_result($data,0);
 
 var_dump(strlen($res));
@@ -34,7 +34,7 @@ var_dump(bin2hex($res));
 pg_close($db);
 
 $db = pg_connect($conn_str);
-pg_query('DROP TABLE test_bug');
+pg_query($db, 'DROP TABLE test_bug');
 pg_close($db);
 
 

ext/pgsql/tests/bug47199.phpt

@@ -11,13 +11,13 @@ require_once('config.inc');
 
 $dbh = pg_connect($conn_str);
 $tbl_name = 'test_47199';
-@pg_query("DROP TABLE $tbl_name");
-pg_query("CREATE TABLE $tbl_name (null_field INT, not_null_field INT NOT NULL)");
+@pg_query($dbh, "DROP TABLE $tbl_name");
+pg_query($dbh, "CREATE TABLE $tbl_name (null_field INT, not_null_field INT NOT NULL)");
 
 pg_insert($dbh, $tbl_name, array('null_field' => null, 'not_null_field' => 1));
 pg_insert($dbh, $tbl_name, array('null_field' => null, 'not_null_field' => 2));
 
-var_dump(pg_fetch_all(pg_query('SELECT * FROM '. $tbl_name)));
+var_dump(pg_fetch_all(pg_query($dbh, 'SELECT * FROM '. $tbl_name)));
 
 $query = pg_delete($dbh, $tbl_name, array('null_field' => NULL,'not_null_field' => 2), PGSQL_DML_STRING|PGSQL_DML_EXEC);
 
@@ -27,9 +27,9 @@ $query = pg_update($dbh, $tbl_name, array('null_field' => NULL, 'not_null_field'
 
 echo $query, "\n";
 
-var_dump(pg_fetch_all(pg_query('SELECT * FROM '. $tbl_name)));
+var_dump(pg_fetch_all(pg_query($dbh, 'SELECT * FROM '. $tbl_name)));
 
-@pg_query("DROP TABLE $tbl_name");
+@pg_query($dbh, "DROP TABLE $tbl_name");
 pg_close($dbh);
 
 echo PHP_EOL."Done".PHP_EOL;

ext/pgsql/tests/bug60244.phpt

@@ -10,7 +10,7 @@ include("skipif.inc");
 include 'config.inc';
 
 $db = pg_connect($conn_str);
-$result = pg_query("select 'a' union select 'b'");
+$result = pg_query($db, "select 'a' union select 'b'");
 
 try {
     var_dump(pg_fetch_array($result, -1));