X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Finstaller%2FMssqlInstaller.php;h=c5ec72b03f91a60957244ea48fde204a16be96c7;hp=c6b89602630749b8c38b77834ac58dfe785a8c60;hb=f43fa6f4f0e2cb60b8543daad661b48a3e0653a9;hpb=fc1ca75323b5f424a9f8d28d42d85a311ed2f721

diff --git a/includes/installer/MssqlInstaller.php b/includes/installer/MssqlInstaller.php
index c6b8960263..c5ec72b03f 100644
--- a/includes/installer/MssqlInstaller.php
+++ b/includes/installer/MssqlInstaller.php
@@ -182,7 +182,7 @@ class MssqlInstaller extends DatabaseInstaller {
 			return $status;
 		}
 		/**
-		 * @var $conn DatabaseBase
+		 * @var $conn Database
 		 */
 		$conn = $status->value;
 
@@ -212,7 +212,7 @@ class MssqlInstaller extends DatabaseInstaller {
 		}
 
 		try {
-			$db = DatabaseBase::factory( 'mssql', [
+			$db = Database::factory( 'mssql', [
 				'host' => $this->getVar( 'wgDBserver' ),
 				'user' => $user,
 				'password' => $password,
@@ -240,7 +240,7 @@ class MssqlInstaller extends DatabaseInstaller {
 			return;
 		}
 		/**
-		 * @var $conn DatabaseBase
+		 * @var $conn Database
 		 */
 		$conn = $status->value;
 		$conn->selectDB( $this->getVar( 'wgDBname' ) );
@@ -261,7 +261,7 @@ class MssqlInstaller extends DatabaseInstaller {
 		if ( !$status->isOK() ) {
 			return false;
 		}
-		/** @var $conn DatabaseBase */
+		/** @var $conn Database */
 		$conn = $status->value;
 
 		// We need the server-level ALTER ANY LOGIN permission to create new accounts
@@ -457,7 +457,7 @@ class MssqlInstaller extends DatabaseInstaller {
 			}
 
 			try {
-				DatabaseBase::factory( 'mssql', [
+				Database::factory( 'mssql', [
 					'host' => $this->getVar( 'wgDBserver' ),
 					'user' => $user,
 					'password' => $password,
@@ -491,7 +491,7 @@ class MssqlInstaller extends DatabaseInstaller {
 		if ( !$status->isOK() ) {
 			return $status;
 		}
-		/** @var DatabaseBase $conn */
+		/** @var Database $conn */
 		$conn = $status->value;
 		$dbName = $this->getVar( 'wgDBname' );
 		$schemaName = $this->getVar( 'wgDBmwschema' );
@@ -500,19 +500,19 @@ class MssqlInstaller extends DatabaseInstaller {
 				"CREATE DATABASE " . $conn->addIdentifierQuotes( $dbName ),
 				__METHOD__
 			);
-			$conn->selectDB( $dbName );
-			if ( !$this->schemaExists( $schemaName ) ) {
-				$conn->query(
-					"CREATE SCHEMA " . $conn->addIdentifierQuotes( $schemaName ),
-					__METHOD__
-				);
-			}
-			if ( !$this->catalogExists( $schemaName ) ) {
-				$conn->query(
-					"CREATE FULLTEXT CATALOG " . $conn->addIdentifierQuotes( $schemaName ),
-					__METHOD__
-				);
-			}
+		}
+		$conn->selectDB( $dbName );
+		if ( !$this->schemaExists( $schemaName ) ) {
+			$conn->query(
+				"CREATE SCHEMA " . $conn->addIdentifierQuotes( $schemaName ),
+				__METHOD__
+			);
+		}
+		if ( !$this->catalogExists( $schemaName ) ) {
+			$conn->query(
+				"CREATE FULLTEXT CATALOG " . $conn->addIdentifierQuotes( $schemaName ),
+				__METHOD__
+			);
 		}
 		$this->setupSchemaVars();