Merge "Move around "ا" to after "آ" and not before"

[lhc/web/wiklou.git] / includes / installer / MssqlInstaller.php

diff --git a/includes/installer/MssqlInstaller.php b/includes/installer/MssqlInstaller.php
index 8307d8b..d01f954 100644 (file)
--- a/includes/installer/MssqlInstaller.php
+++ b/includes/installer/MssqlInstaller.php
@@ -22,6 +22,8 @@
  */
 
 use Wikimedia\Rdbms\Database;
+use Wikimedia\Rdbms\DBQueryError;
+use Wikimedia\Rdbms\DBConnectionError;
 
 /**
  * Class for setting up the MediaWiki database using Microsoft SQL Server.
@@ -264,7 +266,7 @@ class MssqlInstaller extends DatabaseInstaller {
                if ( !$status->isOK() ) {
                        return false;
                }
-               /** @var $conn Database */
+               /** @var Database $conn */
                $conn = $status->value;
 
                // We need the server-level ALTER ANY LOGIN permission to create new accounts
@@ -575,7 +577,7 @@ class MssqlInstaller extends DatabaseInstaller {
                                        $grantableNames[] = $dbUser;
                                } catch ( DBQueryError $dqe ) {
                                        $this->db->rollback();
-                                       $status->warning( 'config-install-user-create-failed', $dbUser, $dqe->getText() );
+                                       $status->warning( 'config-install-user-create-failed', $dbUser, $dqe->getMessage() );
                                }
                        } elseif ( !$this->userExists( $dbUser ) ) {
                                try {
@@ -586,7 +588,7 @@ class MssqlInstaller extends DatabaseInstaller {
                                        $grantableNames[] = $dbUser;
                                } catch ( DBQueryError $dqe ) {
                                        $this->db->rollback();
-                                       $status->warning( 'config-install-user-create-failed', $dbUser, $dqe->getText() );
+                                       $status->warning( 'config-install-user-create-failed', $dbUser, $dqe->getMessage() );
                                }
                        } else {
                                $status->warning( 'config-install-user-alreadyexists', $dbUser );
@@ -618,7 +620,7 @@ class MssqlInstaller extends DatabaseInstaller {
                                        $this->db->commit();
                                } catch ( DBQueryError $dqe ) {
                                        $this->db->rollback();
-                                       $status->fatal( 'config-install-user-grant-failed', $dbUser, $dqe->getText() );
+                                       $status->fatal( 'config-install-user-grant-failed', $dbUser, $dqe->getMessage() );
                                }
                                // Also try to grant SHOWPLAN on the db, but don't fail if we can't
                                // (just makes a couple things in mediawiki run slower since
@@ -644,7 +646,7 @@ class MssqlInstaller extends DatabaseInstaller {
                                $this->db->query( "CREATE FULLTEXT INDEX ON $searchindex (si_title, si_text) "
                                        . "KEY INDEX si_page ON $schema" );
                        } catch ( DBQueryError $dqe ) {
-                               $status->fatal( 'config-install-tables-failed', $dqe->getText() );
+                               $status->fatal( 'config-install-tables-failed', $dqe->getMessage() );
                        }
                }