typeorm 0.3.0-rc.9 → 0.3.0

package/browser/driver/{aurora-data-api/AuroraDataApiDriver.js → aurora-mysql/AuroraMysqlDriver.js}

@@ -1,20 +1,20 @@
-import * as tslib_1 from "tslib";
 import { DriverUtils } from "../DriverUtils";
-import { AuroraDataApiQueryRunner } from "./AuroraDataApiQueryRunner";
+import { AuroraMysqlQueryRunner } from "./AuroraMysqlQueryRunner";
 import { DateUtils } from "../../util/DateUtils";
 import { PlatformTools } from "../../platform/PlatformTools";
 import { RdbmsSchemaBuilder } from "../../schema-builder/RdbmsSchemaBuilder";
 import { OrmUtils } from "../../util/OrmUtils";
 import { ApplyValueTransformers } from "../../util/ApplyValueTransformers";
+import { TypeORMError } from "../../error";
+import { InstanceChecker } from "../../util/InstanceChecker";
 /**
  * Organizes communication with MySQL DBMS.
  */
-var AuroraDataApiDriver = /** @class */ (function () {
+export class AuroraMysqlDriver {
     // -------------------------------------------------------------------------
     // Constructor
     // -------------------------------------------------------------------------
-    function AuroraDataApiDriver(connection) {
-        var _this = this;
+    constructor(connection) {
         /**
          * Indicates if replication is enabled.
          */
@@ -23,6 +23,10 @@ var AuroraDataApiDriver = /** @class */ (function () {
          * Indicates if tree tables are supported by this driver.
          */
         this.treeSupport = true;
+        /**
+         * Represent transaction support by this driver
+         */
+        this.transactionSupport = "nested";
         /**
          * Gets list of supported column data types by a driver.
          *
@@ -70,6 +74,7 @@ var AuroraDataApiDriver = /** @class */ (function () {
             "longblob",
             "longtext",
             "enum",
+            "set",
             "binary",
             "varbinary",
             // json data type
@@ -82,8 +87,12 @@ var AuroraDataApiDriver = /** @class */ (function () {
             "multipoint",
             "multilinestring",
             "multipolygon",
-            "geometrycollection"
+            "geometrycollection",
         ];
+        /**
+         * Returns type of upsert supported by driver if any
+         */
+        this.supportedUpsertType = "on-duplicate-key-update";
         /**
          * Gets list of spatial column data types.
          */
@@ -95,7 +104,7 @@ var AuroraDataApiDriver = /** @class */ (function () {
             "multipoint",
             "multilinestring",
             "multipolygon",
-            "geometrycollection"
+            "geometrycollection",
         ];
         /**
          * Gets list of column data types that support length by a driver.
@@ -105,7 +114,7 @@ var AuroraDataApiDriver = /** @class */ (function () {
             "varchar",
             "nvarchar",
             "binary",
-            "varbinary"
+            "varbinary",
         ];
         /**
          * Gets list of column data types that support length by a driver.
@@ -117,7 +126,7 @@ var AuroraDataApiDriver = /** @class */ (function () {
             "mediumint",
             "int",
             "integer",
-            "bigint"
+            "bigint",
         ];
         /**
          * Gets list of column data types that support precision by a driver.
@@ -133,7 +142,7 @@ var AuroraDataApiDriver = /** @class */ (function () {
             "real",
             "time",
             "datetime",
-            "timestamp"
+            "timestamp",
         ];
         /**
          * Gets list of column data types that supports scale by a driver.
@@ -146,7 +155,7 @@ var AuroraDataApiDriver = /** @class */ (function () {
             "float",
             "double",
             "double precision",
-            "real"
+            "real",
         ];
         /**
          * Gets list of column data types that supports UNSIGNED and ZEROFILL attributes.
@@ -165,7 +174,7 @@ var AuroraDataApiDriver = /** @class */ (function () {
             "float",
             "double",
             "double precision",
-            "real"
+            "real",
         ];
         /**
          * ORM has special columns and we need to know what database column types should be for those columns.
@@ -178,6 +187,9 @@ var AuroraDataApiDriver = /** @class */ (function () {
             updateDate: "datetime",
             updateDatePrecision: 6,
             updateDateDefault: "CURRENT_TIMESTAMP(6)",
+            deleteDate: "datetime",
+            deleteDatePrecision: 6,
+            deleteDateNullable: true,
             version: "int",
             treeLevel: "int",
             migrationId: "int",
@@ -201,28 +213,28 @@ var AuroraDataApiDriver = /** @class */ (function () {
          * Used in the cases when length/precision/scale is not specified by user.
          */
         this.dataTypeDefaults = {
-            "varchar": { length: 255 },
-            "nvarchar": { length: 255 },
+            varchar: { length: 255 },
+            nvarchar: { length: 255 },
             "national varchar": { length: 255 },
-            "char": { length: 1 },
-            "binary": { length: 1 },
-            "varbinary": { length: 255 },
-            "decimal": { precision: 10, scale: 0 },
-            "dec": { precision: 10, scale: 0 },
-            "numeric": { precision: 10, scale: 0 },
-            "fixed": { precision: 10, scale: 0 },
-            "float": { precision: 12 },
-            "double": { precision: 22 },
-            "time": { precision: 0 },
-            "datetime": { precision: 0 },
-            "timestamp": { precision: 0 },
-            "bit": { width: 1 },
-            "int": { width: 11 },
-            "integer": { width: 11 },
-            "tinyint": { width: 4 },
-            "smallint": { width: 6 },
-            "mediumint": { width: 9 },
-            "bigint": { width: 20 }
+            char: { length: 1 },
+            binary: { length: 1 },
+            varbinary: { length: 255 },
+            decimal: { precision: 10, scale: 0 },
+            dec: { precision: 10, scale: 0 },
+            numeric: { precision: 10, scale: 0 },
+            fixed: { precision: 10, scale: 0 },
+            float: { precision: 12 },
+            double: { precision: 22 },
+            time: { precision: 0 },
+            datetime: { precision: 0 },
+            timestamp: { precision: 0 },
+            bit: { width: 1 },
+            int: { width: 11 },
+            integer: { width: 11 },
+            tinyint: { width: 4 },
+            smallint: { width: 6 },
+            mediumint: { width: 9 },
+            bigint: { width: 20 },
         };
         /**
          * Max length allowed by MySQL for aliases.
@@ -233,7 +245,8 @@ var AuroraDataApiDriver = /** @class */ (function () {
         this.options = connection.options;
         // load mysql package
         this.loadDependencies();
-        this.client = new this.DataApiDriver(this.options.region, this.options.secretArn, this.options.resourceArn, this.options.database, function (query, parameters) { return _this.connection.logger.logQuery(query, parameters); });
+        this.client = new this.DataApiDriver(this.options.region, this.options.secretArn, this.options.resourceArn, this.options.database, (query, parameters) => this.connection.logger.logQuery(query, parameters), this.options.serviceConfigOptions, this.options.formatOptions);
+        this.database = DriverUtils.buildDriverOptions(this.options).database;
         // validate options to make sure everything is set
         // todo: revisit validation with replication in mind
         // if (!(this.options.host || (this.options.extra && this.options.extra.socketPath)) && !this.options.socketPath)
@@ -251,88 +264,130 @@ var AuroraDataApiDriver = /** @class */ (function () {
     /**
      * Performs connection to the database.
      */
-    AuroraDataApiDriver.prototype.connect = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/];
-            });
-        });
-    };
+    async connect() {
+        if (!this.database) {
+            const queryRunner = await this.createQueryRunner("master");
+            this.database = await queryRunner.getCurrentDatabase();
+            await queryRunner.release();
+        }
+    }
     /**
      * Makes any action after connection (e.g. create extensions in Postgres driver).
      */
-    AuroraDataApiDriver.prototype.afterConnect = function () {
+    afterConnect() {
         return Promise.resolve();
-    };
+    }
     /**
      * Closes connection with the database.
      */
-    AuroraDataApiDriver.prototype.disconnect = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/];
-            });
-        });
-    };
+    async disconnect() { }
     /**
      * Creates a schema builder used to build and sync a schema.
      */
-    AuroraDataApiDriver.prototype.createSchemaBuilder = function () {
+    createSchemaBuilder() {
         return new RdbmsSchemaBuilder(this.connection);
-    };
+    }
     /**
      * Creates a query runner used to execute database queries.
      */
-    AuroraDataApiDriver.prototype.createQueryRunner = function (mode) {
-        if (mode === void 0) { mode = "master"; }
-        return new AuroraDataApiQueryRunner(this);
-    };
+    createQueryRunner(mode) {
+        return new AuroraMysqlQueryRunner(this, new this.DataApiDriver(this.options.region, this.options.secretArn, this.options.resourceArn, this.options.database, (query, parameters) => this.connection.logger.logQuery(query, parameters), this.options.serviceConfigOptions, this.options.formatOptions));
+    }
     /**
      * Replaces parameters in the given sql with special escaping character
      * and an array of parameter names to be passed to a query.
      */
-    AuroraDataApiDriver.prototype.escapeQueryWithParameters = function (sql, parameters, nativeParameters) {
-        var escapedParameters = Object.keys(nativeParameters).map(function (key) { return nativeParameters[key]; });
+    escapeQueryWithParameters(sql, parameters, nativeParameters) {
+        const escapedParameters = Object.keys(nativeParameters).map((key) => nativeParameters[key]);
         if (!parameters || !Object.keys(parameters).length)
             return [sql, escapedParameters];
-        var keys = Object.keys(parameters).map(function (parameter) { return "(:(\\.\\.\\.)?" + parameter + "\\b)"; }).join("|");
-        sql = sql.replace(new RegExp(keys, "g"), function (key) {
-            var value;
-            if (key.substr(0, 4) === ":...") {
-                value = parameters[key.substr(4)];
+        sql = sql.replace(/:(\.\.\.)?([A-Za-z0-9_.]+)/g, (full, isArray, key) => {
+            if (!parameters.hasOwnProperty(key)) {
+                return full;
             }
-            else {
-                value = parameters[key.substr(1)];
+            let value = parameters[key];
+            if (isArray) {
+                return value
+                    .map((v) => {
+                    escapedParameters.push(v);
+                    return this.createParameter(key, escapedParameters.length - 1);
+                })
+                    .join(", ");
             }
-            if (value instanceof Function) {
+            if (typeof value === "function") {
                 return value();
             }
-            else {
-                escapedParameters.push(value);
-                return "?";
-            }
+            escapedParameters.push(value);
+            return this.createParameter(key, escapedParameters.length - 1);
         }); // todo: make replace only in value statements, otherwise problems
         return [sql, escapedParameters];
-    };
+    }
     /**
      * Escapes a column name.
      */
-    AuroraDataApiDriver.prototype.escape = function (columnName) {
+    escape(columnName) {
         return "`" + columnName + "`";
-    };
+    }
     /**
      * Build full table name with database name, schema name and table name.
-     * E.g. "myDB"."mySchema"."myTable"
+     * E.g. myDB.mySchema.myTable
      */
-    AuroraDataApiDriver.prototype.buildTableName = function (tableName, schema, database) {
-        return database ? database + "." + tableName : tableName;
-    };
+    buildTableName(tableName, schema, database) {
+        let tablePath = [tableName];
+        if (database) {
+            tablePath.unshift(database);
+        }
+        return tablePath.join(".");
+    }
+    /**
+     * Parse a target table name or other types and return a normalized table definition.
+     */
+    parseTableName(target) {
+        const driverDatabase = this.database;
+        const driverSchema = undefined;
+        if (InstanceChecker.isTable(target) || InstanceChecker.isView(target)) {
+            const parsed = this.parseTableName(target.name);
+            return {
+                database: target.database || parsed.database || driverDatabase,
+                schema: target.schema || parsed.schema || driverSchema,
+                tableName: parsed.tableName,
+            };
+        }
+        if (InstanceChecker.isTableForeignKey(target)) {
+            const parsed = this.parseTableName(target.referencedTableName);
+            return {
+                database: target.referencedDatabase ||
+                    parsed.database ||
+                    driverDatabase,
+                schema: target.referencedSchema || parsed.schema || driverSchema,
+                tableName: parsed.tableName,
+            };
+        }
+        if (InstanceChecker.isEntityMetadata(target)) {
+            // EntityMetadata tableName is never a path
+            return {
+                database: target.database || driverDatabase,
+                schema: target.schema || driverSchema,
+                tableName: target.tableName,
+            };
+        }
+        const parts = target.split(".");
+        return {
+            database: (parts.length > 1 ? parts[0] : undefined) || driverDatabase,
+            schema: driverSchema,
+            tableName: parts.length > 1 ? parts[1] : parts[0],
+        };
+    }
     /**
      * Prepares given value to a value to be persisted, based on its column type and metadata.
      */
-    AuroraDataApiDriver.prototype.preparePersistentValue = function (value, columnMetadata) {
+    preparePersistentValue(value, columnMetadata) {
         if (columnMetadata.transformer)
             value = ApplyValueTransformers.transformTo(columnMetadata.transformer, value);
+        if (!this.options.formatOptions ||
+            this.options.formatOptions.castParameters !== false) {
+            return this.client.preparePersistentValue(value, columnMetadata);
+        }
         if (value === null || value === undefined)
             return value;
         if (columnMetadata.type === Boolean) {
@@ -347,30 +402,43 @@ var AuroraDataApiDriver = /** @class */ (function () {
         else if (columnMetadata.type === "json") {
             return JSON.stringify(value);
         }
-        else if (columnMetadata.type === "timestamp" || columnMetadata.type === "datetime" || columnMetadata.type === Date) {
+        else if (columnMetadata.type === "timestamp" ||
+            columnMetadata.type === "datetime" ||
+            columnMetadata.type === Date) {
             return DateUtils.mixedDateToDate(value);
         }
-        else if (columnMetadata.type === "simple-array") {
+        else if (columnMetadata.type === "simple-array" ||
+            columnMetadata.type === "set") {
             return DateUtils.simpleArrayToString(value);
         }
         else if (columnMetadata.type === "simple-json") {
             return DateUtils.simpleJsonToString(value);
         }
-        else if (columnMetadata.type === "enum" || columnMetadata.type === "simple-enum") {
+        else if (columnMetadata.type === "enum" ||
+            columnMetadata.type === "simple-enum") {
             return "" + value;
         }
         return value;
-    };
+    }
     /**
      * Prepares given value to a value to be persisted, based on its column type or metadata.
      */
-    AuroraDataApiDriver.prototype.prepareHydratedValue = function (value, columnMetadata) {
+    prepareHydratedValue(value, columnMetadata) {
         if (value === null || value === undefined)
-            return columnMetadata.transformer ? ApplyValueTransformers.transformFrom(columnMetadata.transformer, value) : value;
-        if (columnMetadata.type === Boolean || columnMetadata.type === "bool" || columnMetadata.type === "boolean") {
+            return columnMetadata.transformer
+                ? ApplyValueTransformers.transformFrom(columnMetadata.transformer, value)
+                : value;
+        if (!this.options.formatOptions ||
+            this.options.formatOptions.castParameters !== false) {
+            return this.client.prepareHydratedValue(value, columnMetadata);
+        }
+        if (columnMetadata.type === Boolean ||
+            columnMetadata.type === "bool" ||
+            columnMetadata.type === "boolean") {
             value = value ? true : false;
         }
-        else if (columnMetadata.type === "datetime" || columnMetadata.type === Date) {
+        else if (columnMetadata.type === "datetime" ||
+            columnMetadata.type === Date) {
             value = DateUtils.normalizeHydratedDate(value);
         }
         else if (columnMetadata.type === "date") {
@@ -382,27 +450,29 @@ var AuroraDataApiDriver = /** @class */ (function () {
         else if (columnMetadata.type === "time") {
             value = DateUtils.mixedTimeToString(value);
         }
-        else if (columnMetadata.type === "simple-array") {
+        else if (columnMetadata.type === "simple-array" ||
+            columnMetadata.type === "set") {
             value = DateUtils.stringToSimpleArray(value);
         }
         else if (columnMetadata.type === "simple-json") {
             value = DateUtils.stringToSimpleJson(value);
         }
-        else if ((columnMetadata.type === "enum" || columnMetadata.type === "simple-enum")
-            && columnMetadata.enum
-            && !isNaN(value)
-            && columnMetadata.enum.indexOf(parseInt(value)) >= 0) {
+        else if ((columnMetadata.type === "enum" ||
+            columnMetadata.type === "simple-enum") &&
+            columnMetadata.enum &&
+            !isNaN(value) &&
+            columnMetadata.enum.indexOf(parseInt(value)) >= 0) {
             // convert to number if that exists in possible enum options
             value = parseInt(value);
         }
         if (columnMetadata.transformer)
             value = ApplyValueTransformers.transformFrom(columnMetadata.transformer, value);
         return value;
-    };
+    }
     /**
      * Creates a database type from a given column metadata.
      */
-    AuroraDataApiDriver.prototype.normalizeType = function (column) {
+    normalizeType(column) {
         if (column.type === Number || column.type === "integer") {
             return "int";
         }
@@ -421,22 +491,27 @@ var AuroraDataApiDriver = /** @class */ (function () {
         else if (column.type === "uuid") {
             return "varchar";
         }
-        else if (column.type === "simple-array" || column.type === "simple-json") {
+        else if (column.type === "simple-array" ||
+            column.type === "simple-json") {
             return "text";
         }
         else if (column.type === "simple-enum") {
             return "enum";
         }
-        else if (column.type === "double precision" || column.type === "real") {
+        else if (column.type === "double precision" ||
+            column.type === "real") {
             return "double";
         }
-        else if (column.type === "dec" || column.type === "numeric" || column.type === "fixed") {
+        else if (column.type === "dec" ||
+            column.type === "numeric" ||
+            column.type === "fixed") {
             return "decimal";
         }
         else if (column.type === "bool" || column.type === "boolean") {
             return "tinyint";
         }
-        else if (column.type === "nvarchar" || column.type === "national varchar") {
+        else if (column.type === "nvarchar" ||
+            column.type === "national varchar") {
             return "varchar";
         }
         else if (column.type === "nchar" || column.type === "national char") {
@@ -445,44 +520,52 @@ var AuroraDataApiDriver = /** @class */ (function () {
         else {
             return column.type || "";
         }
-    };
+    }
     /**
      * Normalizes "default" value of the column.
      */
-    AuroraDataApiDriver.prototype.normalizeDefault = function (columnMetadata) {
-        var defaultValue = columnMetadata.default;
-        if ((columnMetadata.type === "enum" || columnMetadata.type === "simple-enum") && defaultValue !== undefined) {
-            return "'" + defaultValue + "'";
+    normalizeDefault(columnMetadata) {
+        const defaultValue = columnMetadata.default;
+        if (defaultValue === null) {
+            return undefined;
+        }
+        if ((columnMetadata.type === "enum" ||
+            columnMetadata.type === "simple-enum") &&
+            defaultValue !== undefined) {
+            return `'${defaultValue}'`;
+        }
+        if (columnMetadata.type === "set" && defaultValue !== undefined) {
+            return `'${DateUtils.simpleArrayToString(defaultValue)}'`;
         }
         if (typeof defaultValue === "number") {
-            return "" + defaultValue;
+            return `${defaultValue}`;
         }
-        else if (typeof defaultValue === "boolean") {
-            return defaultValue === true ? "1" : "0";
+        if (typeof defaultValue === "boolean") {
+            return defaultValue ? "1" : "0";
         }
-        else if (typeof defaultValue === "function") {
+        if (typeof defaultValue === "function") {
             return defaultValue();
         }
-        else if (typeof defaultValue === "string") {
-            return "'" + defaultValue + "'";
+        if (typeof defaultValue === "string") {
+            return `'${defaultValue}'`;
         }
-        else if (defaultValue === null) {
-            return "null";
+        if (defaultValue === undefined) {
+            return undefined;
         }
-        else {
-            return defaultValue;
-        }
-    };
+        return `${defaultValue}`;
+    }
     /**
      * Normalizes "isUnique" value of the column.
      */
-    AuroraDataApiDriver.prototype.normalizeIsUnique = function (column) {
-        return column.entityMetadata.indices.some(function (idx) { return idx.isUnique && idx.columns.length === 1 && idx.columns[0] === column; });
-    };
+    normalizeIsUnique(column) {
+        return column.entityMetadata.indices.some((idx) => idx.isUnique &&
+            idx.columns.length === 1 &&
+            idx.columns[0] === column);
+    }
     /**
      * Returns default column lengths, which is required on column creation.
      */
-    AuroraDataApiDriver.prototype.getColumnLength = function (column) {
+    getColumnLength(column) {
         if (column.length)
             return column.length.toString();
         /**
@@ -501,75 +584,82 @@ var AuroraDataApiDriver = /** @class */ (function () {
             default:
                 return "";
         }
-    };
+    }
     /**
      * Creates column type definition including length, precision and scale
      */
-    AuroraDataApiDriver.prototype.createFullType = function (column) {
-        var type = column.type;
+    createFullType(column) {
+        let type = column.type;
         // used 'getColumnLength()' method, because MySQL requires column length for `varchar`, `nvarchar` and `varbinary` data types
         if (this.getColumnLength(column)) {
-            type += "(" + this.getColumnLength(column) + ")";
+            type += `(${this.getColumnLength(column)})`;
         }
         else if (column.width) {
-            type += "(" + column.width + ")";
+            type += `(${column.width})`;
         }
-        else if (column.precision !== null && column.precision !== undefined && column.scale !== null && column.scale !== undefined) {
-            type += "(" + column.precision + "," + column.scale + ")";
+        else if (column.precision !== null &&
+            column.precision !== undefined &&
+            column.scale !== null &&
+            column.scale !== undefined) {
+            type += `(${column.precision},${column.scale})`;
         }
-        else if (column.precision !== null && column.precision !== undefined) {
-            type += "(" + column.precision + ")";
+        else if (column.precision !== null &&
+            column.precision !== undefined) {
+            type += `(${column.precision})`;
         }
         if (column.isArray)
             type += " array";
         return type;
-    };
+    }
     /**
      * Obtains a new database connection to a master server.
      * Used for replication.
      * If replication is not setup then returns default connection's database connection.
      */
-    AuroraDataApiDriver.prototype.obtainMasterConnection = function () {
-        var _this = this;
-        return new Promise(function (ok, fail) {
-            if (_this.poolCluster) {
-                _this.poolCluster.getConnection("MASTER", function (err, dbConnection) {
-                    err ? fail(err) : ok(_this.prepareDbConnection(dbConnection));
+    obtainMasterConnection() {
+        return new Promise((ok, fail) => {
+            if (this.poolCluster) {
+                this.poolCluster.getConnection("MASTER", (err, dbConnection) => {
+                    err
+                        ? fail(err)
+                        : ok(this.prepareDbConnection(dbConnection));
                 });
             }
-            else if (_this.pool) {
-                _this.pool.getConnection(function (err, dbConnection) {
-                    err ? fail(err) : ok(_this.prepareDbConnection(dbConnection));
+            else if (this.pool) {
+                this.pool.getConnection((err, dbConnection) => {
+                    err ? fail(err) : ok(this.prepareDbConnection(dbConnection));
                 });
             }
             else {
-                fail(new Error("Connection is not established with mysql database"));
+                fail(new TypeORMError(`Connection is not established with mysql database`));
             }
         });
-    };
+    }
     /**
      * Obtains a new database connection to a slave server.
      * Used for replication.
      * If replication is not setup then returns master (default) connection's database connection.
      */
-    AuroraDataApiDriver.prototype.obtainSlaveConnection = function () {
-        var _this = this;
+    obtainSlaveConnection() {
         if (!this.poolCluster)
             return this.obtainMasterConnection();
-        return new Promise(function (ok, fail) {
-            _this.poolCluster.getConnection("SLAVE*", function (err, dbConnection) {
-                err ? fail(err) : ok(dbConnection);
+        return new Promise((ok, fail) => {
+            this.poolCluster.getConnection("SLAVE*", (err, dbConnection) => {
+                err ? fail(err) : ok(this.prepareDbConnection(dbConnection));
             });
         });
-    };
+    }
     /**
      * Creates generated map of values generated or returned by database after INSERT query.
      */
-    AuroraDataApiDriver.prototype.createGeneratedMap = function (metadata, insertResult) {
-        var generatedMap = metadata.generatedColumns.reduce(function (map, generatedColumn) {
-            var value;
-            if (generatedColumn.generationStrategy === "increment" && insertResult.insertId) {
-                value = insertResult.insertId;
+    createGeneratedMap(metadata, insertResult, entityIndex) {
+        const generatedMap = metadata.generatedColumns.reduce((map, generatedColumn) => {
+            let value;
+            if (generatedColumn.generationStrategy === "increment" &&
+                insertResult.insertId) {
+                // NOTE: When multiple rows is inserted by a single INSERT statement,
+                // `insertId` is the value generated for the first inserted row only.
+                value = insertResult.insertId + entityIndex;
                 // } else if (generatedColumn.generationStrategy === "uuid") {
                 //     console.log("getting db value:", generatedColumn.databaseName);
                 //     value = generatedColumn.getEntityValue(uuidMap);
@@ -577,15 +667,14 @@ var AuroraDataApiDriver = /** @class */ (function () {
             return OrmUtils.mergeDeep(map, generatedColumn.createValueMap(value));
         }, {});
         return Object.keys(generatedMap).length > 0 ? generatedMap : undefined;
-    };
+    }
     /**
      * Differentiate columns of this table and columns from the given column metadatas columns
      * and returns only changed.
      */
-    AuroraDataApiDriver.prototype.findChangedColumns = function (tableColumns, columnMetadatas) {
-        var _this = this;
-        return columnMetadatas.filter(function (columnMetadata) {
-            var tableColumn = tableColumns.find(function (c) { return c.name === columnMetadata.databaseName; });
+    findChangedColumns(tableColumns, columnMetadatas) {
+        return columnMetadatas.filter((columnMetadata) => {
+            const tableColumn = tableColumns.find((c) => c.name === columnMetadata.databaseName);
             if (!tableColumn)
                 return false; // we don't need new columns, we only need exist and changed
             // console.log("table:", columnMetadata.entityMetadata.tableName);
@@ -599,7 +688,7 @@ var AuroraDataApiDriver = /** @class */ (function () {
             // console.log("unsigned:", tableColumn.unsigned, columnMetadata.unsigned);
             // console.log("asExpression:", tableColumn.asExpression, columnMetadata.asExpression);
             // console.log("generatedType:", tableColumn.generatedType, columnMetadata.generatedType);
-            // console.log("comment:", tableColumn.comment, columnMetadata.comment);
+            // console.log("comment:", tableColumn.comment, this.escapeComment(columnMetadata.comment));
             // console.log("default:", tableColumn.default, columnMetadata.default);
             // console.log("enum:", tableColumn.enum, columnMetadata.enum);
             // console.log("default changed:", !this.compareDefaultValues(this.normalizeDefault(columnMetadata), tableColumn.default));
@@ -610,61 +699,79 @@ var AuroraDataApiDriver = /** @class */ (function () {
             // console.log("isGenerated:", tableColumn.isGenerated, columnMetadata.isGenerated);
             // console.log((columnMetadata.generationStrategy !== "uuid" && tableColumn.isGenerated !== columnMetadata.isGenerated));
             // console.log("==========================================");
-            var columnMetadataLength = columnMetadata.length;
-            if (!columnMetadataLength && columnMetadata.generationStrategy === "uuid") { // fixing #3374
-                columnMetadataLength = _this.getColumnLength(columnMetadata);
+            let columnMetadataLength = columnMetadata.length;
+            if (!columnMetadataLength &&
+                columnMetadata.generationStrategy === "uuid") {
+                // fixing #3374
+                columnMetadataLength = this.getColumnLength(columnMetadata);
             }
-            return tableColumn.name !== columnMetadata.databaseName
-                || tableColumn.type !== _this.normalizeType(columnMetadata)
-                || tableColumn.length !== columnMetadataLength
-                || tableColumn.width !== columnMetadata.width
-                || tableColumn.precision !== columnMetadata.precision
-                || tableColumn.scale !== columnMetadata.scale
-                || tableColumn.zerofill !== columnMetadata.zerofill
-                || tableColumn.unsigned !== columnMetadata.unsigned
-                || tableColumn.asExpression !== columnMetadata.asExpression
-                || tableColumn.generatedType !== columnMetadata.generatedType
-                // || tableColumn.comment !== columnMetadata.comment // todo
-                || !_this.compareDefaultValues(_this.normalizeDefault(columnMetadata), tableColumn.default)
-                || (tableColumn.enum && columnMetadata.enum && !OrmUtils.isArraysEqual(tableColumn.enum, columnMetadata.enum.map(function (val) { return val + ""; })))
-                || tableColumn.onUpdate !== columnMetadata.onUpdate
-                || tableColumn.isPrimary !== columnMetadata.isPrimary
-                || tableColumn.isNullable !== columnMetadata.isNullable
-                || tableColumn.isUnique !== _this.normalizeIsUnique(columnMetadata)
-                || (columnMetadata.generationStrategy !== "uuid" && tableColumn.isGenerated !== columnMetadata.isGenerated);
+            return (tableColumn.name !== columnMetadata.databaseName ||
+                tableColumn.type !== this.normalizeType(columnMetadata) ||
+                tableColumn.length !== columnMetadataLength ||
+                tableColumn.width !== columnMetadata.width ||
+                tableColumn.precision !== columnMetadata.precision ||
+                tableColumn.scale !== columnMetadata.scale ||
+                tableColumn.zerofill !== columnMetadata.zerofill ||
+                tableColumn.unsigned !== columnMetadata.unsigned ||
+                tableColumn.asExpression !== columnMetadata.asExpression ||
+                tableColumn.generatedType !== columnMetadata.generatedType ||
+                tableColumn.comment !==
+                    this.escapeComment(columnMetadata.comment) ||
+                !this.compareDefaultValues(this.normalizeDefault(columnMetadata), tableColumn.default) ||
+                (tableColumn.enum &&
+                    columnMetadata.enum &&
+                    !OrmUtils.isArraysEqual(tableColumn.enum, columnMetadata.enum.map((val) => val + ""))) ||
+                tableColumn.onUpdate !== columnMetadata.onUpdate ||
+                tableColumn.isPrimary !== columnMetadata.isPrimary ||
+                tableColumn.isNullable !== columnMetadata.isNullable ||
+                tableColumn.isUnique !==
+                    this.normalizeIsUnique(columnMetadata) ||
+                (columnMetadata.generationStrategy !== "uuid" &&
+                    tableColumn.isGenerated !== columnMetadata.isGenerated));
         });
-    };
+    }
     /**
      * Returns true if driver supports RETURNING / OUTPUT statement.
      */
-    AuroraDataApiDriver.prototype.isReturningSqlSupported = function () {
+    isReturningSqlSupported() {
         return false;
-    };
+    }
     /**
      * Returns true if driver supports uuid values generation on its own.
      */
-    AuroraDataApiDriver.prototype.isUUIDGenerationSupported = function () {
+    isUUIDGenerationSupported() {
         return false;
-    };
+    }
+    /**
+     * Returns true if driver supports fulltext indices.
+     */
+    isFullTextColumnTypeSupported() {
+        return true;
+    }
     /**
      * Creates an escaped parameter.
      */
-    AuroraDataApiDriver.prototype.createParameter = function (parameterName, index) {
+    createParameter(parameterName, index) {
         return "?";
-    };
+    }
     // -------------------------------------------------------------------------
     // Protected Methods
     // -------------------------------------------------------------------------
     /**
      * Loads all driver dependencies.
      */
-    AuroraDataApiDriver.prototype.loadDependencies = function () {
-        this.DataApiDriver = PlatformTools.load("typeorm-aurora-data-api-driver");
-    };
+    loadDependencies() {
+        const DataApiDriver = this.options.driver ||
+            PlatformTools.load("typeorm-aurora-data-api-driver");
+        this.DataApiDriver = DataApiDriver;
+        // Driver uses rollup for publishing, which has issues when using typeorm in combination with webpack
+        // See https://github.com/webpack/webpack/issues/4742#issuecomment-295556787
+        this.DataApiDriver = this.DataApiDriver.default || this.DataApiDriver;
+    }
     /**
      * Creates a new connection pool for a given database credentials.
      */
-    AuroraDataApiDriver.prototype.createConnectionOptions = function (options, credentials) {
+    createConnectionOptions(options, credentials) {
         credentials = Object.assign({}, credentials, DriverUtils.buildDriverOptions(credentials)); // todo: do it better way
         // build connection options for the driver
         return Object.assign({}, {
@@ -679,47 +786,51 @@ var AuroraDataApiDriver = /** @class */ (function () {
             password: credentials.password,
             database: credentials.database,
             port: credentials.port,
-            ssl: options.ssl
+            ssl: options.ssl,
         }, options.extra || {});
-    };
+    }
     /**
      * Creates a new connection pool for a given database credentials.
      */
-    AuroraDataApiDriver.prototype.createPool = function (connectionOptions) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, {}];
-            });
-        });
-    };
+    async createPool(connectionOptions) {
+        return {};
+    }
     /**
      * Attaches all required base handlers to a database connection, such as the unhandled error handler.
      */
-    AuroraDataApiDriver.prototype.prepareDbConnection = function (connection) {
-        var logger = this.connection.logger;
-        /*
-          Attaching an error handler to connection errors is essential, as, otherwise, errors raised will go unhandled and
-          cause the hosting app to crash.
+    prepareDbConnection(connection) {
+        const { logger } = this.connection;
+        /**
+         * Attaching an error handler to connection errors is essential, as, otherwise, errors raised will go unhandled and
+         * cause the hosting app to crash.
          */
         if (connection.listeners("error").length === 0) {
-            connection.on("error", function (error) { return logger.log("warn", "MySQL connection raised an error. " + error); });
+            connection.on("error", (error) => logger.log("warn", `MySQL connection raised an error. ${error}`));
         }
         return connection;
-    };
+    }
     /**
      * Checks if "DEFAULT" values in the column metadata and in the database are equal.
      */
-    AuroraDataApiDriver.prototype.compareDefaultValues = function (columnMetadataValue, databaseValue) {
-        if (typeof columnMetadataValue === "string" && typeof databaseValue === "string") {
+    compareDefaultValues(columnMetadataValue, databaseValue) {
+        if (typeof columnMetadataValue === "string" &&
+            typeof databaseValue === "string") {
             // we need to cut out "'" because in mysql we can understand returned value is a string or a function
             // as result compare cannot understand if default is really changed or not
             columnMetadataValue = columnMetadataValue.replace(/^'+|'+$/g, "");
             databaseValue = databaseValue.replace(/^'+|'+$/g, "");
         }
         return columnMetadataValue === databaseValue;
-    };
-    return AuroraDataApiDriver;
-}());
-export { AuroraDataApiDriver };
+    }
+    /**
+     * Escapes a given comment.
+     */
+    escapeComment(comment) {
+        if (!comment)
+            return comment;
+        comment = comment.replace(/\u0000/g, ""); // Null bytes aren't allowed in comments
+        return comment;
+    }
+}
 
-//# sourceMappingURL=AuroraDataApiDriver.js.map
+//# sourceMappingURL=AuroraMysqlDriver.js.map