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

package/browser/driver/sqlserver/SqlServerQueryRunner.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqlServerQueryRunner = 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");
@@ -171,10 +172,14 @@ class SqlServerQueryRunner 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 release = await this.lock.acquire();
         this.driver.dataSource.logger.logQuery(query, parameters, this);
         await this.broadcaster.broadcast("BeforeQuery", query, parameters);
         const broadcasterResult = new BroadcasterResult_1.BroadcasterResult();
+        const maxQueryExecutionTime = this.driver.options.maxQueryExecutionTime;
+        let queryStartTime;
         try {
             const pool = await (this.mode === "slave"
                 ? this.driver.obtainSlaveConnection()
@@ -197,24 +202,17 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     }
                 });
             }
-            const queryStartTime = Date.now();
-            const raw = await new Promise((ok, fail) => {
-                request.query(query, (err, raw) => {
-                    // log slow queries if maxQueryExecution time is set
-                    const maxQueryExecutionTime = this.driver.options.maxQueryExecutionTime;
-                    const queryEndTime = Date.now();
-                    const queryExecutionTime = queryEndTime - queryStartTime;
-                    this.broadcaster.broadcastAfterQueryEvent(broadcasterResult, query, parameters, true, queryExecutionTime, raw, undefined);
-                    if (maxQueryExecutionTime &&
-                        queryExecutionTime > maxQueryExecutionTime) {
-                        this.driver.dataSource.logger.logQuerySlow(queryExecutionTime, query, parameters, this);
-                    }
-                    if (err) {
-                        fail(new QueryFailedError_1.QueryFailedError(query, parameters, err));
-                    }
-                    ok(raw);
-                });
+            queryStartTime = Date.now();
+            const raw = await request.query(query).catch((err) => {
+                throw new QueryFailedError_1.QueryFailedError(query, parameters, err);
             });
+            // log slow queries if maxQueryExecution time is set
+            const queryExecutionTime = Date.now() - queryStartTime;
+            this.broadcaster.broadcastAfterQueryEvent(broadcasterResult, query, parameters, true, queryExecutionTime, raw, undefined);
+            if (maxQueryExecutionTime &&
+                queryExecutionTime > maxQueryExecutionTime) {
+                this.driver.dataSource.logger.logQuerySlow(queryExecutionTime, query, parameters, this);
+            }
             const result = new QueryResult_1.QueryResult();
             if (raw?.hasOwnProperty("recordset")) {
                 result.records = raw.recordset;
@@ -231,14 +229,17 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 default:
                     result.raw = raw.recordset;
             }
-            if (useStructuredResult) {
-                return result;
-            }
-            else {
-                return result.raw;
-            }
+            return useStructuredResult ? result : result.raw;
         }
         catch (err) {
+            const queryExecutionTime = queryStartTime
+                ? Date.now() - queryStartTime
+                : undefined;
+            if (maxQueryExecutionTime &&
+                queryExecutionTime !== undefined &&
+                queryExecutionTime > maxQueryExecutionTime) {
+                this.driver.dataSource.logger.logQuerySlow(queryExecutionTime, query, parameters, this);
+            }
             this.driver.dataSource.logger.logQueryError(err, query, parameters, this);
             this.broadcaster.broadcastAfterQueryEvent(broadcasterResult, query, parameters, false, undefined, undefined, err);
             throw err;
@@ -527,26 +528,28 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         }
         // if table have column with generated type, we must add the expression to the metadata table
         const generatedColumns = table.columns.filter((column) => column.generatedType && column.asExpression);
-        for (const column of generatedColumns) {
+        if (generatedColumns.length > 0) {
             const parsedTableName = this.driver.parseTableName(table);
             parsedTableName.schema ??= await this.getCurrentSchema();
-            const insertQuery = this.insertTypeormMetadataSql({
-                database: parsedTableName.database,
-                schema: parsedTableName.schema,
-                table: parsedTableName.tableName,
-                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
-                name: column.name,
-                value: column.asExpression,
-            });
-            const deleteQuery = this.deleteTypeormMetadataSql({
-                database: parsedTableName.database,
-                schema: parsedTableName.schema,
-                table: parsedTableName.tableName,
-                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
-                name: column.name,
-            });
-            upQueries.push(insertQuery);
-            downQueries.push(deleteQuery);
+            for (const column of generatedColumns) {
+                const insertQuery = this.insertTypeormMetadataSql({
+                    database: parsedTableName.database,
+                    schema: parsedTableName.schema,
+                    table: parsedTableName.tableName,
+                    type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                    name: column.name,
+                    value: column.asExpression,
+                });
+                const deleteQuery = this.deleteTypeormMetadataSql({
+                    database: parsedTableName.database,
+                    schema: parsedTableName.schema,
+                    table: parsedTableName.tableName,
+                    type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                    name: column.name,
+                });
+                upQueries.push(insertQuery);
+                downQueries.push(deleteQuery);
+            }
         }
         await this.executeQueries(upQueries, downQueries);
     }
@@ -587,26 +590,28 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         downQueries.push(this.createTableSql(table, createForeignKeys));
         // if table had columns with generated type, we must remove the expression from the metadata table
         const generatedColumns = table.columns.filter((column) => column.generatedType && column.asExpression);
-        for (const column of generatedColumns) {
+        if (generatedColumns.length > 0) {
             const parsedTableName = this.driver.parseTableName(table);
             parsedTableName.schema ??= await this.getCurrentSchema();
-            const deleteQuery = this.deleteTypeormMetadataSql({
-                database: parsedTableName.database,
-                schema: parsedTableName.schema,
-                table: parsedTableName.tableName,
-                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
-                name: column.name,
-            });
-            const insertQuery = this.insertTypeormMetadataSql({
-                database: parsedTableName.database,
-                schema: parsedTableName.schema,
-                table: parsedTableName.tableName,
-                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
-                name: column.name,
-                value: column.asExpression,
-            });
-            upQueries.push(deleteQuery);
-            downQueries.push(insertQuery);
+            for (const column of generatedColumns) {
+                const deleteQuery = this.deleteTypeormMetadataSql({
+                    database: parsedTableName.database,
+                    schema: parsedTableName.schema,
+                    table: parsedTableName.tableName,
+                    type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                    name: column.name,
+                });
+                const insertQuery = this.insertTypeormMetadataSql({
+                    database: parsedTableName.database,
+                    schema: parsedTableName.schema,
+                    table: parsedTableName.tableName,
+                    type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                    name: column.name,
+                    value: column.asExpression,
+                });
+                upQueries.push(deleteQuery);
+                downQueries.push(insertQuery);
+            }
         }
         await this.executeQueries(upQueries, downQueries);
     }
@@ -2548,7 +2553,7 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         const end = defaultValue.lastIndexOf(")");
         if (!defaultValue.endsWith(")") || end <= 0)
             return defaultValue;
-        const normalizedDefault = defaultValue.substring(1, end);
+        const normalizedDefault = defaultValue.slice(1, end);
         return this.removeParenthesisFromDefault(normalizedDefault);
     }
     /**