typeorm 1.0.0-beta.2 → 1.0.0-beta.3

package/driver/postgres/PostgresQueryRunner.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PostgresQueryRunner = void 0;
 const error_1 = require("../../error");
+const NamedPlaceholdersNotSupportedError_1 = require("../../error/NamedPlaceholdersNotSupportedError");
 const QueryFailedError_1 = require("../../error/QueryFailedError");
 const QueryRunnerAlreadyReleasedError_1 = require("../../error/QueryRunnerAlreadyReleasedError");
 const TransactionNotStartedError_1 = require("../../error/TransactionNotStartedError");
@@ -184,6 +185,8 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     async query(query, parameters, useStructuredResult = false) {
         if (this.isReleased)
             throw new QueryRunnerAlreadyReleasedError_1.QueryRunnerAlreadyReleasedError();
+        if (parameters && !Array.isArray(parameters))
+            throw new NamedPlaceholdersNotSupportedError_1.NamedPlaceholdersNotSupportedError();
         const databaseConnection = await this.connect();
         this.driver.dataSource.logger.logQuery(query, parameters, this);
         await this.broadcaster.broadcast("BeforeQuery", query, parameters);
@@ -2159,7 +2162,8 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     const sql = `SELECT "e"."enumlabel" AS "value" FROM "pg_enum" "e" ` +
                         `INNER JOIN "pg_type" "t" ON "t"."oid" = "e"."enumtypid" ` +
                         `INNER JOIN "pg_namespace" "n" ON "n"."oid" = "t"."typnamespace" ` +
-                        `WHERE "n"."nspname" = '${dbTable["table_schema"]}' AND "t"."typname" = '${enumName ?? name}'`;
+                        `WHERE "n"."nspname" = '${dbTable["table_schema"]}' AND "t"."typname" = '${enumName ?? name}' ` +
+                        `ORDER BY "e"."enumsortorder"`;
                     const results = await this.query(sql);
                     if (results.length) {
                         tableColumn.type = "enum";
@@ -2259,7 +2263,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     dbColumn["column_default"] !== undefined) {
                     const serialDefaultName = `nextval('${this.buildSequenceName(table, dbColumn["column_name"])}'::regclass)`;
                     const serialDefaultPath = `nextval('${this.buildSequencePath(table, dbColumn["column_name"])}'::regclass)`;
-                    const defaultWithoutQuotes = dbColumn["column_default"].replace(/"/g, "");
+                    const defaultWithoutQuotes = dbColumn["column_default"].replaceAll('"', "");
                     if (defaultWithoutQuotes ===
                         serialDefaultName ||
                         defaultWithoutQuotes === serialDefaultPath) {
@@ -2284,7 +2288,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                             dbColumn["column_default"];
                     }
                     else {
-                        tableColumn.default = dbColumn["column_default"].replace(/::[\w\s.[\]\-"]+/g, "");
+                        tableColumn.default = dbColumn["column_default"].replaceAll(/::[\w\s.[\]\-"]+/g, "");
                         tableColumn.default =
                             tableColumn.default.replace(/^(-?\d+)$/, "'$1'");
                     }
@@ -2366,7 +2370,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             table.exclusions = tableExclusionConstraints.map((constraint) => {
                 return new TableExclusion_1.TableExclusion({
                     name: constraint["constraint_name"],
-                    expression: constraint["expression"].substring(8), // trim EXCLUDE from start of expression
+                    expression: constraint["expression"].slice(8), // trim EXCLUDE from start of expression
                 });
             });
             // find foreign key constraints of table, group them by constraint name and build TableForeignKey.
@@ -2870,7 +2874,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         let seqName = `${tableName}_${columnName}_seq`;
         if (seqName.length > this.dataSource.driver.maxAliasLength) {
             // note doesn't yet handle corner cases where .length differs from number of UTF-8 bytes
-            seqName = `${tableName.substring(0, 29)}_${columnName.substring(0, Math.max(29, 63 - table.name.length - 5))}_seq`;
+            seqName = `${tableName.slice(0, 29)}_${columnName.slice(0, Math.max(29, 63 - table.name.length - 5))}_seq`;
         }
         return seqName;
     }
@@ -2914,8 +2918,8 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         // ----
         // so, we must remove this underscore character from enum type name
         let udtName = result[0]["udt_name"];
-        if (udtName.indexOf("_") === 0) {
-            udtName = udtName.substring(1, udtName.length);
+        if (udtName.startsWith("_")) {
+            udtName = udtName.slice(1);
         }
         return {
             schema: result[0]["udt_schema"],
@@ -2931,7 +2935,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         if (!comment || comment.length === 0) {
             return "NULL";
         }
-        comment = comment.replace(/'/g, "''").replace(/\u0000/g, ""); // Null bytes aren't allowed in comments
+        comment = comment.replaceAll("'", "''").replaceAll("\u0000", ""); // Null bytes aren't allowed in comments
         return `'${comment}'`;
     }
     /**