typeorm 0.2.31 → 0.2.32

package/driver/aurora-data-api/AuroraDataApiQueryRunner.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.AuroraDataApiQueryRunner = void 0;
 var tslib_1 = require("tslib");
 var TransactionAlreadyStartedError_1 = require("../../error/TransactionAlreadyStartedError");
 var TransactionNotStartedError_1 = require("../../error/TransactionNotStartedError");
@@ -1819,7 +1820,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                                         }
                                         if (tableColumn.type === "enum" || tableColumn.type === "simple-enum") {
                                             var colType = dbColumn["COLUMN_TYPE"];
-                                            var items = colType.substring(colType.indexOf("(") + 1, colType.indexOf(")")).split(",");
+                                            var items = colType.substring(colType.indexOf("(") + 1, colType.lastIndexOf(")")).split(",");
                                             tableColumn.enum = items.map(function (item) {
                                                 return item.substring(1, item.length - 1);
                                             });
@@ -2076,6 +2077,19 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
             tableName: tableName.indexOf(".") !== -1 ? tableName.split(".")[1] : tableName
         };
     };
+    /**
+     * Escapes a given comment so it's safe to include in a query.
+     */
+    AuroraDataApiQueryRunner.prototype.escapeComment = function (comment) {
+        if (!comment || comment.length === 0) {
+            return "''";
+        }
+        comment = comment
+            .replace("\\", "\\\\") // MySQL allows escaping characters via backslashes
+            .replace(/'/g, "''")
+            .replace("\0", ""); // Null bytes aren't allowed in comments
+        return "'" + comment + "'";
+    };
     /**
      * Escapes given table or view path.
      */
@@ -2119,7 +2133,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
         if (column.isGenerated && column.generationStrategy === "increment") // don't use skipPrimary here since updates can update already exist primary without auto inc.
             c += " AUTO_INCREMENT";
         if (column.comment)
-            c += " COMMENT '" + column.comment + "'";
+            c += " COMMENT " + this.escapeComment(column.comment);
         if (column.default !== undefined && column.default !== null)
             c += " DEFAULT " + column.default;
         if (column.onUpdate)