From b5c316c9c39b083970e065892ef6c3187e1d10f6 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 31 Jan 2023 17:17:42 +0100 Subject: [PATCH] [ticket/8071] Make nextid alias of sql_last_inserted_id and add deprecation PHPBB3-8071 --- phpBB/phpbb/db/driver/driver.php | 8 ++++++++ phpBB/phpbb/db/driver/driver_interface.php | 9 +++------ phpBB/phpbb/db/driver/factory.php | 4 ++-- phpBB/phpbb/db/driver/mssql_odbc.php | 12 ++---------- phpBB/phpbb/db/driver/mssqlnative.php | 12 ++---------- phpBB/phpbb/db/driver/mysqli.php | 10 +--------- phpBB/phpbb/db/driver/oracle.php | 12 ++---------- phpBB/phpbb/db/driver/postgres.php | 12 ++---------- phpBB/phpbb/db/driver/sqlite3.php | 10 +--------- 9 files changed, 23 insertions(+), 66 deletions(-) diff --git a/phpBB/phpbb/db/driver/driver.php b/phpBB/phpbb/db/driver/driver.php index cd9f1f058e..690cfbf1e9 100644 --- a/phpBB/phpbb/db/driver/driver.php +++ b/phpBB/phpbb/db/driver/driver.php @@ -634,6 +634,14 @@ abstract class driver implements driver_interface return $expression; } + /** + * {@inheritDoc} + */ + public function sql_nextid() + { + return $this->sql_last_inserted_id(); + } + /** * {@inheritDoc} */ diff --git a/phpBB/phpbb/db/driver/driver_interface.php b/phpBB/phpbb/db/driver/driver_interface.php index 7615030a5a..73aabaf4a0 100644 --- a/phpBB/phpbb/db/driver/driver_interface.php +++ b/phpBB/phpbb/db/driver/driver_interface.php @@ -299,8 +299,9 @@ interface driver_interface * The returned value can be used for selecting the item that has just been * inserted or for updating another table with an ID pointing to that item. * - * Will be deprecated in a future version of phpBB in favor of - * `sql_last_inserted_id`. + * Alias of `sql_last_inserted_id`. + * + * @deprecated 3.3.11-RC1 Replaced by sql_last_inserted_id(), to be removed in 4.1.0-a1 * * @return string|false Auto-incremented value of the last inserted row */ @@ -312,11 +313,7 @@ interface driver_interface * just been inserted or for updating another table with an ID pointing to * that item. * - * Alias of `sql_nextid`. - * * @return string|false Auto-incremented value of the last inserted row - * - * @since 3.3.8-RC1 */ public function sql_last_inserted_id(); diff --git a/phpBB/phpbb/db/driver/factory.php b/phpBB/phpbb/db/driver/factory.php index d8865dc524..2541c28481 100644 --- a/phpBB/phpbb/db/driver/factory.php +++ b/phpBB/phpbb/db/driver/factory.php @@ -318,7 +318,7 @@ class factory implements driver_interface */ public function sql_nextid() { - return $this->get_driver()->sql_nextid(); + return $this->get_driver()->sql_last_inserted_id(); } /** @@ -326,7 +326,7 @@ class factory implements driver_interface */ public function sql_last_inserted_id() { - return $this->get_driver()->sql_nextid(); + return $this->get_driver()->sql_last_inserted_id(); } /** diff --git a/phpBB/phpbb/db/driver/mssql_odbc.php b/phpBB/phpbb/db/driver/mssql_odbc.php index 6a08f1100f..ac66d94d0d 100644 --- a/phpBB/phpbb/db/driver/mssql_odbc.php +++ b/phpBB/phpbb/db/driver/mssql_odbc.php @@ -269,9 +269,9 @@ class mssql_odbc extends \phpbb\db\driver\mssql_base } /** - * {@inheritDoc} + * {@inheritdoc} */ - function sql_nextid() + public function sql_last_inserted_id() { $result_id = @odbc_exec($this->db_connect_id, 'SELECT @@IDENTITY'); @@ -289,14 +289,6 @@ class mssql_odbc extends \phpbb\db\driver\mssql_base return false; } - /** - * {@inheritdoc} - */ - public function sql_last_inserted_id() - { - return $this->sql_nextid(); - } - /** * {@inheritDoc} */ diff --git a/phpBB/phpbb/db/driver/mssqlnative.php b/phpBB/phpbb/db/driver/mssqlnative.php index c1955f8b84..357047ace0 100644 --- a/phpBB/phpbb/db/driver/mssqlnative.php +++ b/phpBB/phpbb/db/driver/mssqlnative.php @@ -271,9 +271,9 @@ class mssqlnative extends \phpbb\db\driver\mssql_base } /** - * {@inheritDoc} + * {@inheritdoc} */ - function sql_nextid() + public function sql_last_inserted_id() { $result_id = @sqlsrv_query($this->db_connect_id, 'SELECT @@IDENTITY'); @@ -290,14 +290,6 @@ class mssqlnative extends \phpbb\db\driver\mssql_base } } - /** - * {@inheritdoc} - */ - public function sql_last_inserted_id() - { - return $this->sql_nextid(); - } - /** * {@inheritDoc} */ diff --git a/phpBB/phpbb/db/driver/mysqli.php b/phpBB/phpbb/db/driver/mysqli.php index 1c4a48cbb6..d7a929315b 100644 --- a/phpBB/phpbb/db/driver/mysqli.php +++ b/phpBB/phpbb/db/driver/mysqli.php @@ -288,20 +288,12 @@ class mysqli extends \phpbb\db\driver\mysql_base return ($query_id) ? @mysqli_data_seek($query_id, $rownum) : false; } - /** - * {@inheritDoc} - */ - function sql_nextid() - { - return ($this->db_connect_id) ? @mysqli_insert_id($this->db_connect_id) : false; - } - /** * {@inheritdoc} */ public function sql_last_inserted_id() { - return $this->sql_nextid(); + return ($this->db_connect_id) ? @mysqli_insert_id($this->db_connect_id) : false; } /** diff --git a/phpBB/phpbb/db/driver/oracle.php b/phpBB/phpbb/db/driver/oracle.php index c96201ef0c..dc5eb994ec 100644 --- a/phpBB/phpbb/db/driver/oracle.php +++ b/phpBB/phpbb/db/driver/oracle.php @@ -570,9 +570,9 @@ class oracle extends \phpbb\db\driver\driver } /** - * {@inheritDoc} + * {@inheritdoc} */ - function sql_nextid() + public function sql_last_inserted_id() { $query_id = $this->query_result; @@ -607,14 +607,6 @@ class oracle extends \phpbb\db\driver\driver return false; } - /** - * {@inheritdoc} - */ - public function sql_last_inserted_id() - { - return $this->sql_nextid(); - } - /** * {@inheritDoc} */ diff --git a/phpBB/phpbb/db/driver/postgres.php b/phpBB/phpbb/db/driver/postgres.php index 0f87f5a8f0..02ffa4e3e7 100644 --- a/phpBB/phpbb/db/driver/postgres.php +++ b/phpBB/phpbb/db/driver/postgres.php @@ -342,9 +342,9 @@ class postgres extends \phpbb\db\driver\driver } /** - * {@inheritDoc} + * {@inheritdoc} */ - function sql_nextid() + public function sql_last_inserted_id() { $query_id = $this->query_result; @@ -370,14 +370,6 @@ class postgres extends \phpbb\db\driver\driver return false; } - /** - * {@inheritdoc} - */ - public function sql_last_inserted_id() - { - return $this->sql_nextid(); - } - /** * {@inheritDoc} */ diff --git a/phpBB/phpbb/db/driver/sqlite3.php b/phpBB/phpbb/db/driver/sqlite3.php index 638b9035ed..93a1c36ee9 100644 --- a/phpBB/phpbb/db/driver/sqlite3.php +++ b/phpBB/phpbb/db/driver/sqlite3.php @@ -241,20 +241,12 @@ class sqlite3 extends \phpbb\db\driver\driver return is_object($query_id) ? @$query_id->fetchArray(SQLITE3_ASSOC) : false; } - /** - * {@inheritDoc} - */ - function sql_nextid() - { - return ($this->db_connect_id) ? $this->dbo->lastInsertRowID() : false; - } - /** * {@inheritdoc} */ public function sql_last_inserted_id() { - return $this->sql_nextid(); + return ($this->db_connect_id) ? $this->dbo->lastInsertRowID() : false; } /**