X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=includes%2Flibs%2Frdbms%2Fdatabase%2FIDatabase.php;h=90b888d6a4f7b55dd83b4a3337c7b0ad30dc9cfb;hb=4ef179e3359b79118285038fde2f78e425155fe1;hp=eac9baed0e11f38161b460e396664fa7f2a8d58d;hpb=f059cfda06cec090089436ad86acdce6cb3cc0b7;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/libs/rdbms/database/IDatabase.php b/includes/libs/rdbms/database/IDatabase.php
index eac9baed0e..90b888d6a4 100644
--- a/includes/libs/rdbms/database/IDatabase.php
+++ b/includes/libs/rdbms/database/IDatabase.php
@@ -114,6 +114,11 @@ interface IDatabase {
 	 */
 	const QUERY_PSEUDO_PERMANENT = 2;
 
+	/** @var bool Parameter to unionQueries() for UNION ALL */
+	const UNION_ALL = true;
+	/** @var bool Parameter to unionQueries() for UNION DISTINCT */
+	const UNION_DISTINCT = false;
+
 	/**
 	 * A string describing the current software version, and possibly
 	 * other details in a user-friendly way. Will be listed on Special:Version, etc.
@@ -1384,7 +1389,7 @@ interface IDatabase {
 	 * This is used for providing overload point for other DB abstractions
 	 * not compatible with the MySQL syntax.
 	 * @param array $sqls SQL statements to combine
-	 * @param bool $all Use UNION ALL
+	 * @param bool $all Either IDatabase::UNION_ALL or IDatabase::UNION_DISTINCT
 	 * @return string SQL fragment
 	 */
 	public function unionQueries( $sqls, $all );
@@ -1549,7 +1554,6 @@ interface IDatabase {
 	 *
 	 * @param callable $callback
 	 * @param string $fname Caller name
-	 * @return mixed
 	 * @since 1.28
 	 */
 	public function onTransactionResolution( callable $callback, $fname = __METHOD__ );
@@ -1593,7 +1597,6 @@ interface IDatabase {
 	 *
 	 * @param callable $callback
 	 * @param string $fname
-	 * @return mixed
 	 * @since 1.20
 	 * @deprecated Since 1.32
 	 */
@@ -1639,7 +1642,6 @@ interface IDatabase {
 	 *
 	 * @param string $name Callback name
 	 * @param callable|null $callback Use null to unset a listener
-	 * @return mixed
 	 * @since 1.28
 	 */
 	public function setTransactionListener( $name, callable $callback = null );
@@ -2167,7 +2169,6 @@ interface IDatabase {
 	 * the aliases can be removed, and then the old X-named indexes dropped.
 	 *
 	 * @param string[] $aliases
-	 * @return mixed
 	 * @since 1.31
 	 */
 	public function setIndexAliases( array $aliases );