typeorm 0.3.26-dev.bdb8326 → 0.3.26-dev.f351757

package/driver/mysql/MysqlDriver.d.ts

@@ -210,7 +210,7 @@ export declare class MysqlDriver implements Driver {
     /**
      * Creates generated map of values generated or returned by database after INSERT query.
      */
-    createGeneratedMap(metadata: EntityMetadata, insertResult: any, entityIndex: number): any;
+    createGeneratedMap(metadata: EntityMetadata, insertResult: any, entityIndex: number): ObjectLiteral | undefined;
     /**
      * Differentiate columns of this table and columns from the given column metadatas columns
      * and returns only changed.

package/driver/mysql/MysqlQueryRunner.js

@@ -153,7 +153,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 const queryPayload = enableQueryTimeout && maxQueryExecutionTime
                     ? { sql: query, timeout: maxQueryExecutionTime }
                     : query;
-                databaseConnection.query(queryPayload, parameters, async (err, raw) => {
+                databaseConnection.query(queryPayload, parameters, (err, raw) => {
                     // log slow queries if maxQueryExecution time is set
                     const maxQueryExecutionTime = this.driver.options.maxQueryExecutionTime;
                     const queryEndTime = Date.now();
@@ -1030,7 +1030,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
      * Drops the columns in the table.
      */
     async dropColumns(tableOrName, columns) {
-        for (const column of columns) {
+        for (const column of [...columns]) {
             await this.dropColumn(tableOrName, column);
         }
     }
@@ -2091,13 +2091,13 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         return c;
     }
     async getVersion() {
-        const result = await this.query(`SELECT VERSION() AS \`version\``);
+        const result = await this.query("SELECT 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;
+        const versionString = result[0]["version()"];
         return versionString.replace(/^([\d.]+).*$/, "$1");
     }
     /**