Skip to content

ext/pgsql: remove deprecated default link support #11823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

ext/pgsql: remove deprecated default link support #11823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
518 changes: 245 additions & 273 deletions ext/pgsql/pgsql.c
View file
Open in desktop

Large diffs are not rendered by default.

42 changes: 21 additions & 21 deletions ext/pgsql/pgsql.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,76 +489,76 @@ function pg_pconnect(string $connection_string, int $flags = 0): PgSql\Connectio

function pg_connect_poll(PgSql\Connection $connection): int {}

function pg_close(?PgSql\Connection $connection = null): true {}
function pg_close(PgSql\Connection $connection): true {}

/** @refcount 1 */
function pg_dbname(?PgSql\Connection $connection = null): string {}
function pg_dbname(PgSql\Connection $connection): string {}

function pg_last_error(?PgSql\Connection $connection = null): string {}
function pg_last_error(PgSql\Connection $connection): string {}

/**
* @alias pg_last_error
* @deprecated
*/
function pg_errormessage(?PgSql\Connection $connection = null): string {}
function pg_errormessage(PgSql\Connection $connection): string {}

/** @refcount 1 */
function pg_options(?PgSql\Connection $connection = null): string {}
function pg_options(PgSql\Connection $connection): string {}

/** @refcount 1 */
function pg_port(?PgSql\Connection $connection = null): string {}
function pg_port(PgSql\Connection $connection): string {}

/** @refcount 1 */
function pg_tty(?PgSql\Connection $connection = null): string {}
function pg_tty(PgSql\Connection $connection): string {}

/** @refcount 1 */
function pg_host(?PgSql\Connection $connection = null): string {}
function pg_host(PgSql\Connection $connection): string {}

/**
* @return array<string, int|string|null>
* @refcount 1
*/
function pg_version(?PgSql\Connection $connection = null): array {}
function pg_version(PgSql\Connection $connection): array {}

/**
* @param PgSql\Connection|string $connection
* @refcount 1
*/
function pg_parameter_status($connection, string $name = UNKNOWN): string|false {}
function pg_parameter_status($connection, string $name): string|false {}

function pg_ping(?PgSql\Connection $connection = null): bool {}
function pg_ping(PgSql\Connection $connection): bool {}

/**
* @param PgSql\Connection|string $connection
* @refcount 1
*/
function pg_query($connection, string $query = UNKNOWN): PgSql\Result|false {}
function pg_query($connection, string $query): PgSql\Result|false {}

/**
* @param PgSql\Connection|string $connection
* @alias pg_query
*/
function pg_exec($connection, string $query = UNKNOWN): PgSql\Result|false {}
function pg_exec($connection, string $query): PgSql\Result|false {}

/**
* @param PgSql\Connection|string $connection
* @param string|array $query
* @refcount 1
*/
function pg_query_params($connection, $query, array $params = UNKNOWN): PgSql\Result|false {}
function pg_query_params($connection, $query, array $params): PgSql\Result|false {}

/**
* @param PgSql\Connection|string $connection
* @refcount 1
*/
function pg_prepare($connection, string $statement_name, string $query = UNKNOWN): PgSql\Result|false {}
function pg_prepare($connection, string $statement_name, string $query): PgSql\Result|false {}

/**
* @param PgSql\Connection|string $connection
* @param string|array $statement_name
* @refcount 1
*/
function pg_execute($connection, $statement_name, array $params = UNKNOWN): PgSql\Result|false {}
function pg_execute($connection, $statement_name, array $params): PgSql\Result|false {}

function pg_num_rows(PgSql\Result $result): int {}

Expand Down Expand Up @@ -707,9 +707,9 @@ function pg_last_oid(PgSql\Result $result): string|int|false {}
*/
function pg_getlastoid(PgSql\Result $result): string|int|false {}

function pg_trace(string $filename, string $mode = "w", ?PgSql\Connection $connection = null, int $trace_mode = 0): bool {}
function pg_trace(string $filename, string $mode = "w", PgSql\Connection $connection, int $trace_mode = 0): bool {}

function pg_untrace(?PgSql\Connection $connection = null): true {}
function pg_untrace(PgSql\Connection $connection): true {}

/**
* @param PgSql\Connection $connection
Expand Down Expand Up @@ -840,15 +840,15 @@ function pg_set_client_encoding($connection, string $encoding = UNKNOWN): int {}
*/
function pg_setclientencoding($connection, string $encoding = UNKNOWN): int {}

function pg_client_encoding(?PgSql\Connection $connection = null): string {}
function pg_client_encoding(PgSql\Connection $connection): string {}

/**
* @alias pg_client_encoding
* @deprecated
*/
function pg_clientencoding(?PgSql\Connection $connection = null): string {}
function pg_clientencoding(PgSql\Connection $connection): string {}

function pg_end_copy(?PgSql\Connection $connection = null): bool {}
function pg_end_copy(PgSql\Connection $connection): bool {}

/** @param PgSql\Connection|string $connection */
function pg_put_line($connection, string $query = UNKNOWN): bool {}
Expand Down
42 changes: 20 additions & 22 deletions ext/pgsql/pgsql_arginfo.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion ext/pgsql/php_pgsql.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@ ZEND_BEGIN_MODULE_GLOBALS(pgsql)
zend_long allow_persistent;
zend_long auto_reset_persistent;
int ignore_notices,log_notices;
zend_object *default_link; /* default link when connection is omitted */
HashTable field_oids;
HashTable table_oids;
HashTable connections;
Expand Down
32 changes: 3 additions & 29 deletions ext/pgsql/tests/05large_object.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,6 @@ pg_exec ($db, "begin");
pg_lo_unlink($db, $oid) or print("pg_lo_unlink() error 1\n");
pg_exec ($db, "commit");

// more pg_lo_unlink() tests
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 2\n");
pg_exec ($db, "commit");

echo "Test with string oid value\n";
pg_exec ($db, "begin");
$oid = pg_lo_create ($db) or print("pg_lo_create() error\n");
Expand All @@ -80,21 +73,11 @@ if (!file_exists($path . 'php.gif.exported')) {
pg_query($db, 'commit');

/* invalid OID values */
try {
pg_lo_create(-15);
} catch (\ValueError $e) {
echo $e->getMessage(), \PHP_EOL;
}
try {
pg_lo_create($db, -15);
} catch (\ValueError $e) {
echo $e->getMessage(), \PHP_EOL;
}
try {
pg_lo_create('giberrish');
} catch (\ValueError $e) {
echo $e->getMessage(), \PHP_EOL;
}
try {
pg_lo_create($db, 'giberrish');
} catch (\ValueError $e) {
Expand All @@ -107,29 +90,20 @@ echo "OK";
create/write/close LO
open/read/tell/seek/close LO
string(5) "large"
int(5)
int(%d)
bool(true)
string(10) "bject data"
int(17)
int(%d)
bool(true)
string(17) "large object data"
bool(true)
string(4) "data"
open/read_all/close LO
large object data
int(17)
int(%d)
unlink LO
Test without connection

Deprecated: pg_lo_unlink(): Automatic fetching of PostgreSQL connection is deprecated in %s on line %d
Test with string oid value
import/export LO

Deprecated: pg_lo_create(): Automatic fetching of PostgreSQL connection is deprecated in %s on line %d
Invalid OID value passed
Invalid OID value passed

Deprecated: pg_lo_create(): Automatic fetching of PostgreSQL connection is deprecated in %s on line %d
Invalid OID value passed
Invalid OID value passed
OK
3 changes: 0 additions & 3 deletions ext/pgsql/tests/08escape.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,7 @@ else {

?>
--EXPECTF--
Deprecated: pg_escape_string(): Automatic fetching of PostgreSQL connection is deprecated in %s on line %d
pg_escape_string() is Ok

Deprecated: pg_escape_bytea(): Automatic fetching of PostgreSQL connection is deprecated in %s on line %d
pg_escape_bytea() is Ok
pg_escape_bytea() actually works with database
pg_escape_literal() is Ok
Expand Down
1 change: 0 additions & 1 deletion ext/pgsql/tests/18pg_escape_bytea_before.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,4 @@ else {
}
?>
--EXPECTF--
Deprecated: pg_escape_bytea(): Automatic fetching of PostgreSQL connection is deprecated in %s on line %d
OK
17 changes: 0 additions & 17 deletions ext/pgsql/tests/27large_object_oid.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,26 +32,9 @@ if ($oid != 21001) echo ("pg_lo_create() wrong id\n");
pg_lo_unlink ($db, $oid);
pg_exec ($db, "commit");

echo "create LO using default connection\n";
pg_exec ("begin");
$oid = pg_lo_create (21002);
if (!$oid) echo ("pg_lo_create() error\n");
if ($oid != 21002) echo ("pg_lo_create() wrong id\n");
pg_lo_unlink ($oid);
pg_exec ("commit");

echo "OK";
?>
--EXPECTF--
create LO from int
create LO from string
create LO using default connection

Deprecated: pg_exec(): Automatic fetching of PostgreSQL connection is deprecated in %s on line %d

Deprecated: pg_lo_create(): Automatic fetching of PostgreSQL connection is deprecated in %s on line %d

Deprecated: pg_lo_unlink(): Automatic fetching of PostgreSQL connection is deprecated in %s on line %d

Deprecated: pg_exec(): Automatic fetching of PostgreSQL connection is deprecated in %s on line %d
OK
Loading