Merge "Enable IP ranges in HTMLUserTextField"

[lhc/web/wiklou.git] / includes / libs / rdbms / database / IDatabase.php

diff --git a/includes/libs/rdbms/database/IDatabase.php b/includes/libs/rdbms/database/IDatabase.php
index 736447f..5d0e03f 100644 (file)
--- a/includes/libs/rdbms/database/IDatabase.php
+++ b/includes/libs/rdbms/database/IDatabase.php
@@ -206,6 +206,7 @@ interface IDatabase {
         * Returns true if this database does an implicit sort when doing GROUP BY
         *
         * @return bool
+        * @deprecated Since 1.30; only use grouped or aggregated fields in the SELECT
         */
        public function implicitGroupby();
 
@@ -345,6 +346,7 @@ interface IDatabase {
         * Alias for getDomainID()
         *
         * @return string
+        * @deprecated 1.30
         */
        public function getWikiID();
 
@@ -420,12 +422,9 @@ interface IDatabase {
        /**
         * Get the inserted value of an auto-increment row
         *
-        * The value inserted should be fetched from nextSequenceValue()
-        *
-        * Example:
-        * $id = $dbw->nextSequenceValue( 'page_page_id_seq' );
-        * $dbw->insert( 'page', [ 'page_id' => $id ] );
-        * $id = $dbw->insertId();
+        * This should only be called after an insert that used an auto-incremented
+        * value. If no such insert was previously done in the current database
+        * session, the return value is undefined.
         *
         * @return int
         */