typeorm 0.3.22-dev.72145b8 → 0.3.22-dev.72c6991

package/browser/driver/mysql/MysqlQueryRunner.js

@@ -1538,7 +1538,7 @@ export class MysqlQueryRunner extends BaseQueryRunner {
             this.query(foreignKeysSql),
         ]);
         const isMariaDb = this.driver.options.type === "mariadb";
-        const dbVersion = await this.getVersion();
+        const dbVersion = this.driver.version;
         // create tables for loaded tables
         return Promise.all(dbTables.map(async (dbTable) => {
             const table = new Table();
@@ -1959,7 +1959,7 @@ export class MysqlQueryRunner extends BaseQueryRunner {
      * Builds drop index sql.
      */
     dropIndexSql(table, indexOrName) {
-        let indexName = InstanceChecker.isTableIndex(indexOrName)
+        const indexName = InstanceChecker.isTableIndex(indexOrName)
             ? indexOrName.name
             : indexOrName;
         return new Query(`DROP INDEX \`${indexName}\` ON ${this.escapePath(table)}`);
@@ -2084,7 +2084,13 @@ export class MysqlQueryRunner extends BaseQueryRunner {
     }
     async getVersion() {
         const result = await this.query(`SELECT VERSION() AS \`version\``);
-        return result[0]["version"];
+        // MariaDB: https://mariadb.com/kb/en/version/
+        // - "10.2.27-MariaDB-10.2.27+maria~jessie-log"
+        // MySQL: https://dev.mysql.com/doc/refman/8.4/en/information-functions.html#function_version
+        // - "8.4.3"
+        // - "8.4.4-standard"
+        const versionString = result[0].version;
+        return versionString.replace(/^([\d.]+).*$/, "$1");
     }
     /**
      * Checks if column display width is by default.