installer: Replace bad calls to getText() on DBQueryError exceptions
authormainframe98 <k.s.werf@hotmail.com>
Mon, 15 May 2017 15:17:04 +0000 (17:17 +0200)
committerKrinkle <krinklemail@gmail.com>
Wed, 24 May 2017 11:25:02 +0000 (11:25 +0000)
The called method does not exist. Replaced with getMessage(),
similar to PostgresInstaller.php.

Bug: T165319
Change-Id: I900ec8c18307ce6f9e8c9f4cda79b1e33ed66dff

includes/installer/MssqlInstaller.php
includes/installer/MysqlInstaller.php

index ba9818d..43d3574 100644 (file)
@@ -577,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 {
@@ -588,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 );
@@ -620,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
@@ -646,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() );
                        }
                }
 
index 09051f4..64a4077 100644 (file)
@@ -574,7 +574,7 @@ class MysqlInstaller extends DatabaseInstaller {
                                                        // If we couldn't create for some bizzare reason and the
                                                        // user probably doesn't exist, skip the grant
                                                        $this->db->rollback( __METHOD__ );
-                                                       $status->warning( 'config-install-user-create-failed', $dbUser, $dqe->getText() );
+                                                       $status->warning( 'config-install-user-create-failed', $dbUser, $dqe->getMessage() );
                                                }
                                        }
                                } else {
@@ -594,7 +594,7 @@ class MysqlInstaller extends DatabaseInstaller {
                                $this->db->commit( __METHOD__ );
                        } catch ( DBQueryError $dqe ) {
                                $this->db->rollback( __METHOD__ );
-                               $status->fatal( 'config-install-user-grant-failed', $dbUser, $dqe->getText() );
+                               $status->fatal( 'config-install-user-grant-failed', $dbUser, $dqe->getMessage() );
                        }
                }