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