ts-sql-query - npm Package Compare versions

Comparing version 1.53.0 to 1.54.0

expressions/delete.d.ts

@@ -11,2 +11,3 @@ import type { AnyValueSource, IBooleanValueSource, IExecutableDeleteQuery, IIfValueSource, ValueSourceOf, ValueSourceValueTypeForResult } from "./values";
     afterDeleteKeyword?: RawFragment<DB>;
+    beforeQuery?: RawFragment<DB>;
     afterQuery?: RawFragment<DB>;
@@ -13,0 +14,0 @@ }

expressions/update.d.ts

@@ -13,2 +13,3 @@ import type { AnyValueSource, IBooleanValueSource, IExecutableUpdateQuery, IIfValueSource, RemapIValueSourceType, RemapIValueSourceTypeWithOptionalType, ValueSourceOf, ValueSourceValueType, ValueSourceValueTypeForResult } from "./values";
     afterUpdateKeyword?: RawFragment<DB>;
+    beforeQuery?: RawFragment<DB>;
     afterQuery?: RawFragment<DB>;
@@ -15,0 +16,0 @@ }

package.json

 {
     "name": "ts-sql-query",
-    "version": "1.53.0",
+    "version": "1.54.0",
     "description": "Type-safe SQL query builder like QueryDSL or JOOQ in Java or Linq in .Net for TypeScript with MariaDB, MySql, Oracle, PostgreSql, Sqlite and SqlServer support.",
@@ -5,0 +5,0 @@ "license": "MIT",

queryBuilders/DeleteQueryBuilder.js

@@ -344,2 +344,3 @@ "use strict";
         this.__customization = customization;
+        (0, ITableOrView_1.__addWiths)(customization.beforeQuery, this.__sqlBuilder, this.__withs);
         (0, ITableOrView_1.__addWiths)(customization.afterDeleteKeyword, this.__sqlBuilder, this.__withs);
@@ -428,2 +429,6 @@ (0, ITableOrView_1.__addWiths)(customization.afterQuery, this.__sqlBuilder, this.__withs);
         if (this.__customization) {
+            result = (0, ITableOrView_1.__isAllowed)(this.__customization.beforeQuery, sqlBuilder);
+            if (!result) {
+                return false;
+            }
             result = (0, ITableOrView_1.__isAllowed)(this.__customization.afterDeleteKeyword, sqlBuilder);
@@ -430,0 +435,0 @@ if (!result) {

queryBuilders/SelectQueryBuilder.js

@@ -438,6 +438,11 @@ "use strict";
         if (customization) {
+            (0, ITableOrView_1.__registerRequiredColumn)(customization.beforeWithQuery, sqlBuilder, requiredColumns, newOnly);
+            (0, ITableOrView_1.__registerRequiredColumn)(customization.beforeQuery, sqlBuilder, requiredColumns, newOnly);
             (0, ITableOrView_1.__registerRequiredColumn)(customization.afterSelectKeyword, sqlBuilder, requiredColumns, newOnly);
             (0, ITableOrView_1.__registerRequiredColumn)(customization.beforeColumns, sqlBuilder, requiredColumns, newOnly);
             (0, ITableOrView_1.__registerRequiredColumn)(customization.customWindow, sqlBuilder, requiredColumns, newOnly);
+            (0, ITableOrView_1.__registerRequiredColumn)(customization.beforeOrderByItems, sqlBuilder, requiredColumns, newOnly);
+            (0, ITableOrView_1.__registerRequiredColumn)(customization.afterOrderByItems, sqlBuilder, requiredColumns, newOnly);
             (0, ITableOrView_1.__registerRequiredColumn)(customization.afterQuery, sqlBuilder, requiredColumns, newOnly);
+            (0, ITableOrView_1.__registerRequiredColumn)(customization.afterWithQuery, sqlBuilder, requiredColumns, newOnly);
         }
@@ -563,2 +568,4 @@ this.__registerRequiredColumnInSelect(sqlBuilder, requiredColumns, newOnly);
         this.__customization = customization;
+        (0, ITableOrView_2.__addWiths)(customization.beforeWithQuery, this.__sqlBuilder, this.__withs);
+        (0, ITableOrView_2.__addWiths)(customization.beforeQuery, this.__sqlBuilder, this.__withs);
         (0, ITableOrView_2.__addWiths)(customization.afterSelectKeyword, this.__sqlBuilder, this.__withs);
@@ -570,2 +577,3 @@ (0, ITableOrView_2.__addWiths)(customization.beforeColumns, this.__sqlBuilder, this.__withs);
         (0, ITableOrView_2.__addWiths)(customization.afterQuery, this.__sqlBuilder, this.__withs);
+        (0, ITableOrView_2.__addWiths)(customization.afterWithQuery, this.__sqlBuilder, this.__withs);
         return this;
@@ -1001,2 +1009,4 @@ }
         if (customization) {
+            (0, ITableOrView_1.__registerTableOrView)(customization.beforeWithQuery, this.__sqlBuilder, requiredTableOrView);
+            (0, ITableOrView_1.__registerTableOrView)(customization.beforeQuery, this.__sqlBuilder, requiredTableOrView);
             (0, ITableOrView_1.__registerTableOrView)(customization.afterSelectKeyword, this.__sqlBuilder, requiredTableOrView);
@@ -1008,2 +1018,3 @@ (0, ITableOrView_1.__registerTableOrView)(customization.beforeColumns, this.__sqlBuilder, requiredTableOrView);
             (0, ITableOrView_1.__registerTableOrView)(customization.afterQuery, this.__sqlBuilder, requiredTableOrView);
+            (0, ITableOrView_1.__registerTableOrView)(customization.afterWithQuery, this.__sqlBuilder, requiredTableOrView);
         }
@@ -1132,2 +1143,10 @@ let registeredCount = requiredTableOrView.size;
         if (this.__customization) {
+            result = (0, ITableOrView_1.__isAllowed)(this.__customization.beforeWithQuery, sqlBuilder);
+            if (!result) {
+                return false;
+            }
+            result = (0, ITableOrView_1.__isAllowed)(this.__customization.beforeQuery, sqlBuilder);
+            if (!result) {
+                return false;
+            }
             result = (0, ITableOrView_1.__isAllowed)(this.__customization.afterSelectKeyword, sqlBuilder);
@@ -1157,2 +1176,6 @@ if (!result) {
             }
+            result = (0, ITableOrView_1.__isAllowed)(this.__customization.afterWithQuery, sqlBuilder);
+            if (!result) {
+                return false;
+            }
         }
@@ -1263,2 +1286,10 @@ return true;
         if (this.__customization) {
+            result = (0, ITableOrView_1.__isAllowed)(this.__customization.beforeWithQuery, sqlBuilder);
+            if (!result) {
+                return false;
+            }
+            result = (0, ITableOrView_1.__isAllowed)(this.__customization.beforeQuery, sqlBuilder);
+            if (!result) {
+                return false;
+            }
             result = (0, ITableOrView_1.__isAllowed)(this.__customization.afterSelectKeyword, sqlBuilder);
@@ -1288,2 +1319,6 @@ if (!result) {
             }
+            result = (0, ITableOrView_1.__isAllowed)(this.__customization.afterWithQuery, sqlBuilder);
+            if (!result) {
+                return false;
+            }
         }
@@ -1290,0 +1325,0 @@ return true;

queryBuilders/UpdateQueryBuilder.js

@@ -899,2 +899,3 @@ "use strict";
         this.__customization = customization;
+        (0, ITableOrView_2.__addWiths)(customization.beforeQuery, this.__sqlBuilder, this.__withs);
         (0, ITableOrView_2.__addWiths)(customization.afterUpdateKeyword, this.__sqlBuilder, this.__withs);
@@ -992,2 +993,6 @@ (0, ITableOrView_2.__addWiths)(customization.afterQuery, this.__sqlBuilder, this.__withs);
         if (this.__customization) {
+            result = (0, ITableOrView_1.__isAllowed)(this.__customization.beforeQuery, sqlBuilder);
+            if (!result) {
+                return false;
+            }
             result = (0, ITableOrView_1.__isAllowed)(this.__customization.afterUpdateKeyword, sqlBuilder);
@@ -994,0 +999,0 @@ if (!result) {

queryRunners/AbstractPoolQueryRunner.d.ts

@@ -36,2 +36,3 @@ import { UnwrapPromiseTuple } from "../utils/PromiseProvider";
     executeDatabaseSchemaModification(query: string, params?: any[]): Promise<void>;
+    executeConnectionConfiguration(query: string, params?: any[]): Promise<void>;
     abstract executeInTransaction<P extends Promise<any>[]>(fn: () => [...P], outermostQueryRunner: QueryRunner): Promise<UnwrapPromiseTuple<P>>;
@@ -38,0 +39,0 @@ abstract executeInTransaction<T>(fn: () => Promise<T>, outermostQueryRunner: QueryRunner): Promise<T>;

queryRunners/AbstractPoolQueryRunner.js

@@ -136,2 +136,8 @@ "use strict";
     }
+    executeConnectionConfiguration(query, params = []) {
+        if (!this.currentQueryRunner) {
+            throw new Error("You are trying to configure a connection when you didn't request a dedicated connection. Begin a transaction to get a dedicated connection");
+        }
+        return this.getQueryRunner().then(queryRunner => queryRunner.executeConnectionConfiguration(query, params)).finally(() => this.releaseIfNeeded());
+    }
     getCurrentNativeTransaction() {
@@ -138,0 +144,0 @@ if (!this.currentQueryRunner) {

queryRunners/AbstractQueryRunner.d.ts

@@ -33,2 +33,3 @@ import { UnwrapPromiseTuple } from "../utils/PromiseProvider";
     executeDatabaseSchemaModification(query: string, params?: any[]): Promise<void>;
+    executeConnectionConfiguration(query: string, params?: any[]): Promise<void>;
     protected abstract executeQueryReturning(query: string, params: any[]): Promise<any[]>;
@@ -35,0 +36,0 @@ protected abstract executeMutation(query: string, params: any[]): Promise<number>;

queryRunners/AbstractQueryRunner.js

@@ -207,2 +207,5 @@ "use strict";
     }
+    executeConnectionConfiguration(query, params = []) {
+        return this.executeMutation(query, params).then(() => undefined);
+    }
     containsInsertReturningClause(query, params) {
@@ -209,0 +212,0 @@ const p = params;

queryRunners/AnyDBPoolQueryRunner.d.ts

@@ -5,2 +5,5 @@ import type { DatabaseType, QueryRunner } from "./QueryRunner";
 import type * as begin from 'any-db-transaction';
+/**
+ * @deprecated
+ */
 export declare class AnyDBPoolQueryRunner extends PromiseBasedPoolQueryRunner {
@@ -7,0 +10,0 @@ readonly database: DatabaseType;

queryRunners/AnyDBPoolQueryRunner.js

@@ -6,2 +6,5 @@ "use strict";
 const AnyDBQueryRunner_1 = require("./AnyDBQueryRunner");
+/**
+ * @deprecated
+ */
 class AnyDBPoolQueryRunner extends PromiseBasedPoolQueryRunner_1.PromiseBasedPoolQueryRunner {
@@ -8,0 +11,0 @@ constructor(pool) {

queryRunners/AnyDBQueryRunner.d.ts

@@ -5,2 +5,5 @@ import type { DatabaseType } from "./QueryRunner";
 import { PromiseBasedQueryRunner } from "./PromiseBasedQueryRunner";
+/**
+ * @deprecated
+ */
 export declare class AnyDBQueryRunner extends PromiseBasedQueryRunner {
@@ -7,0 +10,0 @@ readonly database: DatabaseType;

queryRunners/AnyDBQueryRunner.js

@@ -6,2 +6,5 @@ "use strict";
 const PromiseBasedQueryRunner_1 = require("./PromiseBasedQueryRunner");
+/**
+ * @deprecated
+ */
 class AnyDBQueryRunner extends PromiseBasedQueryRunner_1.PromiseBasedQueryRunner {
@@ -8,0 +11,0 @@ constructor(connection) {

queryRunners/ChainedQueryRunner.d.ts

@@ -42,2 +42,3 @@ import { UnwrapPromiseTuple } from "../utils/PromiseProvider";
     executeDatabaseSchemaModification(query: string, params?: any[]): Promise<void>;
+    executeConnectionConfiguration(query: string, params?: any[]): Promise<void>;
     addParam(params: any[], value: any): string;
@@ -44,0 +45,0 @@ addOutParam(params: any[], name: string): string;

queryRunners/ChainedQueryRunner.js

@@ -110,2 +110,5 @@ "use strict";
     }
+    executeConnectionConfiguration(query, params = []) {
+        return this.queryRunner.executeConnectionConfiguration(query, params);
+    }
     addParam(params, value) {
@@ -112,0 +115,0 @@ return this.queryRunner.addParam(params, value);

queryRunners/InterceptorQueryRunner.d.ts

 import type { QueryRunner } from "./QueryRunner";
 import { ChainedQueryRunner } from "./ChainedQueryRunner";
 import type { UnwrapPromiseTuple } from "../utils/PromiseProvider";
-export type QueryType = 'selectOneRow' | 'selectManyRows' | 'selectOneColumnOneRow' | 'selectOneColumnManyRows' | 'insert' | 'insertReturningLastInsertedId' | 'insertReturningMultipleLastInsertedId' | 'insertReturningOneRow' | 'insertReturningManyRows' | 'insertReturningOneColumnOneRow' | 'insertReturningOneColumnManyRows' | 'update' | 'updateReturningOneRow' | 'updateReturningManyRows' | 'updateReturningOneColumnOneRow' | 'updateReturningOneColumnManyRows' | 'delete' | 'deleteReturningOneRow' | 'deleteReturningManyRows' | 'deleteReturningOneColumnOneRow' | 'deleteReturningOneColumnManyRows' | 'executeProcedure' | 'executeFunction' | 'beginTransaction' | 'commit' | 'rollback' | 'executeDatabaseSchemaModification';
+export type QueryType = 'selectOneRow' | 'selectManyRows' | 'selectOneColumnOneRow' | 'selectOneColumnManyRows' | 'insert' | 'insertReturningLastInsertedId' | 'insertReturningMultipleLastInsertedId' | 'insertReturningOneRow' | 'insertReturningManyRows' | 'insertReturningOneColumnOneRow' | 'insertReturningOneColumnManyRows' | 'update' | 'updateReturningOneRow' | 'updateReturningManyRows' | 'updateReturningOneColumnOneRow' | 'updateReturningOneColumnManyRows' | 'delete' | 'deleteReturningOneRow' | 'deleteReturningManyRows' | 'deleteReturningOneColumnOneRow' | 'deleteReturningOneColumnManyRows' | 'executeProcedure' | 'executeFunction' | 'beginTransaction' | 'commit' | 'rollback' | 'executeDatabaseSchemaModification' | 'executeConnectionConfiguration';
 export declare abstract class InterceptorQueryRunner<PLAYLOAD_TYPE, T extends QueryRunner = QueryRunner> extends ChainedQueryRunner<T> {
@@ -40,2 +40,3 @@ constructor(queryRunner: T);
     executeDatabaseSchemaModification(query: string, params?: any[]): Promise<void>;
+    executeConnectionConfiguration(query: string, params?: any[]): Promise<void>;
 }

queryRunners/InterceptorQueryRunner.js

@@ -320,3 +320,13 @@ "use strict";
     }
+    executeConnectionConfiguration(query, params = []) {
+        const playload = this.onQuery('executeConnectionConfiguration', query, params);
+        return this.queryRunner.executeConnectionConfiguration(query, params).then(r => {
+            this.onQueryResult('executeConnectionConfiguration', query, params, r, playload);
+            return r;
+        }, e => {
+            this.onQueryError('executeConnectionConfiguration', query, params, e, playload);
+            throw e;
+        });
+    }
 }
 exports.InterceptorQueryRunner = InterceptorQueryRunner;

queryRunners/LoggingQueryRunner.d.ts

 import type { QueryRunner } from "./QueryRunner";
 import { ChainedQueryRunner } from "./ChainedQueryRunner";
 import type { UnwrapPromiseTuple } from "../utils/PromiseProvider";
-export type QueryType = 'selectOneRow' | 'selectManyRows' | 'selectOneColumnOneRow' | 'selectOneColumnManyRows' | 'insert' | 'insertReturningLastInsertedId' | 'insertReturningMultipleLastInsertedId' | 'insertReturningOneRow' | 'insertReturningManyRows' | 'insertReturningOneColumnOneRow' | 'insertReturningOneColumnManyRows' | 'update' | 'updateReturningOneRow' | 'updateReturningManyRows' | 'updateReturningOneColumnOneRow' | 'updateReturningOneColumnManyRows' | 'delete' | 'deleteReturningOneRow' | 'deleteReturningManyRows' | 'deleteReturningOneColumnOneRow' | 'deleteReturningOneColumnManyRows' | 'executeProcedure' | 'executeFunction' | 'beginTransaction' | 'commit' | 'rollback' | 'executeDatabaseSchemaModification';
+export type QueryType = 'selectOneRow' | 'selectManyRows' | 'selectOneColumnOneRow' | 'selectOneColumnManyRows' | 'insert' | 'insertReturningLastInsertedId' | 'insertReturningMultipleLastInsertedId' | 'insertReturningOneRow' | 'insertReturningManyRows' | 'insertReturningOneColumnOneRow' | 'insertReturningOneColumnManyRows' | 'update' | 'updateReturningOneRow' | 'updateReturningManyRows' | 'updateReturningOneColumnOneRow' | 'updateReturningOneColumnManyRows' | 'delete' | 'deleteReturningOneRow' | 'deleteReturningManyRows' | 'deleteReturningOneColumnOneRow' | 'deleteReturningOneColumnManyRows' | 'executeProcedure' | 'executeFunction' | 'beginTransaction' | 'commit' | 'rollback' | 'executeDatabaseSchemaModification' | 'executeConnectionConfiguration';
 export interface QueryLogger {
@@ -51,2 +51,3 @@ onQuery?: (queryType: QueryType, query: string, params: any[], timestamps: {
     executeDatabaseSchemaModification(query: string, params?: any[]): Promise<void>;
+    executeConnectionConfiguration(query: string, params?: any[]): Promise<void>;
 }

queryRunners/LoggingQueryRunner.js

@@ -661,3 +661,25 @@ "use strict";
     }
+    executeConnectionConfiguration(query, params = []) {
+        const logger = this.logger;
+        const startedAt = process.hrtime.bigint();
+        if (logger.onQuery) {
+            logger.onQuery('executeConnectionConfiguration', query, params, { startedAt });
+        }
+        let result = this.queryRunner.executeConnectionConfiguration(query, params);
+        if (logger.onQueryResult || logger.onQueryError) {
+            result = result.then(r => {
+                if (logger.onQueryResult) {
+                    logger.onQueryResult('executeConnectionConfiguration', query, params, r, { startedAt, endedAt: process.hrtime.bigint() });
+                }
+                return r;
+            }, e => {
+                if (logger.onQueryError) {
+                    logger.onQueryError('executeConnectionConfiguration', query, params, e, { startedAt, endedAt: process.hrtime.bigint() });
+                }
+                throw e;
+            });
+        }
+        return result;
+    }
 }
 exports.LoggingQueryRunner = LoggingQueryRunner;

queryRunners/LoopBackQueryRunner.d.ts

 import type { DatabaseType, QueryRunner } from "./QueryRunner";
 import type { DataSource, Transaction } from 'loopback-datasource-juggler';
 import { PromiseBasedQueryRunner } from "./PromiseBasedQueryRunner";
+/**
+ * @deprecated
+ */
 export declare function createLoopBackQueryRunner(datasource: DataSource, transaction?: Transaction): LoopbackQueryRunner;
+/**
+ * @deprecated
+ */
 export interface LoopbackQueryRunner extends QueryRunner {
@@ -11,2 +17,5 @@ readonly database: DatabaseType;
 }
+/**
+ * @deprecated
+ */
 export declare abstract class LoopBackAbstractQueryRunner extends PromiseBasedQueryRunner implements LoopbackQueryRunner {
@@ -29,2 +38,5 @@ readonly database: DatabaseType;
 }
+/**
+ * @deprecated
+ */
 export declare class LoopBackMySqlQueryRunner extends LoopBackAbstractQueryRunner {
@@ -37,2 +49,5 @@ constructor(datasource: DataSource, transaction?: Transaction);
 }
+/**
+ * @deprecated
+ */
 export declare class LoopBackOracleQueryRunner extends LoopBackAbstractQueryRunner {
@@ -45,2 +60,5 @@ constructor(datasource: DataSource, transaction?: Transaction);
 }
+/**
+ * @deprecated
+ */
 export declare class LoopBackPostgreSqlQueryRunner extends LoopBackAbstractQueryRunner {
@@ -54,2 +72,5 @@ constructor(datasource: DataSource, transaction?: Transaction);
 }
+/**
+ * @deprecated
+ */
 export declare class LoopBackSqlServerQueryRunner extends LoopBackAbstractQueryRunner {
@@ -56,0 +77,0 @@ constructor(datasource: DataSource, transaction?: Transaction);

queryRunners/LoopBackQueryRunner.js

@@ -6,2 +6,5 @@ "use strict";
 const OracleUtils_1 = require("./OracleUtils");
+/**
+ * @deprecated
+ */
 function createLoopBackQueryRunner(datasource, transaction) {
@@ -28,2 +31,5 @@ const connector = datasource.connector;
 exports.createLoopBackQueryRunner = createLoopBackQueryRunner;
+/**
+ * @deprecated
+ */
 class LoopBackAbstractQueryRunner extends PromiseBasedQueryRunner_1.PromiseBasedQueryRunner {
@@ -88,2 +94,5 @@ constructor(database, datasource, transaction) {
 exports.LoopBackAbstractQueryRunner = LoopBackAbstractQueryRunner;
+/**
+ * @deprecated
+ */
 class LoopBackMySqlQueryRunner extends LoopBackAbstractQueryRunner {
@@ -126,2 +135,5 @@ constructor(datasource, transaction) {
 exports.LoopBackMySqlQueryRunner = LoopBackMySqlQueryRunner;
+/**
+ * @deprecated
+ */
 class LoopBackOracleQueryRunner extends LoopBackAbstractQueryRunner {
@@ -159,2 +171,5 @@ constructor(datasource, transaction) {
 exports.LoopBackOracleQueryRunner = LoopBackOracleQueryRunner;
+/**
+ * @deprecated
+ */
 class LoopBackPostgreSqlQueryRunner extends LoopBackAbstractQueryRunner {
@@ -228,2 +243,5 @@ constructor(datasource, transaction) {
 exports.LoopBackPostgreSqlQueryRunner = LoopBackPostgreSqlQueryRunner;
+/**
+ * @deprecated
+ */
 class LoopBackSqlServerQueryRunner extends LoopBackAbstractQueryRunner {
@@ -264,2 +282,5 @@ constructor(datasource, transaction) {
 exports.LoopBackSqlServerQueryRunner = LoopBackSqlServerQueryRunner;
+/**
+ * @deprecated
+ */
 class LoopBackSqliteQueryRunner extends LoopBackAbstractQueryRunner {
@@ -266,0 +287,0 @@ constructor(datasource, transaction) {

queryRunners/MariaDBQueryRunner.js

@@ -43,4 +43,10 @@ "use strict";
     executeBeginTransaction() {
+        if (this.transactionLevel >= 1) {
+            throw new Error("MariaDB doesn't support nested transactions. This error is thrown to avoid MariaDB silently finishing the previous transaction");
+        }
         return this.connection.beginTransaction().then(() => {
             this.transactionLevel++;
+            if (this.transactionLevel >= 2) {
+                throw new Error("MariaDB doesn't support nested transactions. The previous transaction was silently finished");
+            }
             return undefined;
@@ -47,0 +53,0 @@ });

queryRunners/MockQueryRunner.d.ts

 import type { PromiseProvider, UnwrapPromiseTuple } from "../utils/PromiseProvider";
 import type { DatabaseType, QueryRunner } from "./QueryRunner";
-export type QueryType = 'selectOneRow' | 'selectManyRows' | 'selectOneColumnOneRow' | 'selectOneColumnManyRows' | 'insert' | 'insertReturningLastInsertedId' | 'insertReturningMultipleLastInsertedId' | 'insertReturningOneRow' | 'insertReturningManyRows' | 'insertReturningOneColumnOneRow' | 'insertReturningOneColumnManyRows' | 'update' | 'updateReturningOneRow' | 'updateReturningManyRows' | 'updateReturningOneColumnOneRow' | 'updateReturningOneColumnManyRows' | 'delete' | 'deleteReturningOneRow' | 'deleteReturningManyRows' | 'deleteReturningOneColumnOneRow' | 'deleteReturningOneColumnManyRows' | 'executeProcedure' | 'executeFunction' | 'beginTransaction' | 'commit' | 'rollback' | 'executeDatabaseSchemaModification' | 'isTransactionActive';
+export type QueryType = 'selectOneRow' | 'selectManyRows' | 'selectOneColumnOneRow' | 'selectOneColumnManyRows' | 'insert' | 'insertReturningLastInsertedId' | 'insertReturningMultipleLastInsertedId' | 'insertReturningOneRow' | 'insertReturningManyRows' | 'insertReturningOneColumnOneRow' | 'insertReturningOneColumnManyRows' | 'update' | 'updateReturningOneRow' | 'updateReturningManyRows' | 'updateReturningOneColumnOneRow' | 'updateReturningOneColumnManyRows' | 'delete' | 'deleteReturningOneRow' | 'deleteReturningManyRows' | 'deleteReturningOneColumnOneRow' | 'deleteReturningOneColumnManyRows' | 'executeProcedure' | 'executeFunction' | 'beginTransaction' | 'commit' | 'rollback' | 'executeDatabaseSchemaModification' | 'isTransactionActive' | 'executeConnectionConfiguration';
 export type QueryExecutor = (type: QueryType, query: string, params: any[], index: number) => any;
@@ -47,2 +47,3 @@ export interface MockQueryRunnerConfig {
     executeDatabaseSchemaModification(query: string, params?: any[]): Promise<void>;
+    executeConnectionConfiguration(query: string, params?: any[]): Promise<void>;
     addParam(params: any[], value: any): string;
@@ -49,0 +50,0 @@ addOutParam(params: any[], name: string): string;

queryRunners/MockQueryRunner.js

@@ -419,2 +419,15 @@ "use strict";
     }
+    executeConnectionConfiguration(query, params = []) {
+        try {
+            const index = this.count++;
+            const result = this.queryExecutor('executeConnectionConfiguration', query, params, index);
+            if (result !== undefined && result !== null) {
+                throw new Error('Invalid test case result for a executeConnectionConfiguration with index ' + index + '. Your mock function provided to the MockQueryRunner must returns null or undefined');
+            }
+            return this.promise.resolve(undefined);
+        }
+        catch (e) {
+            return this.promise.reject(e);
+        }
+    }
     addParam(params, value) {
@@ -421,0 +434,0 @@ const index = params.length;

queryRunners/MySql2QueryRunner.js

@@ -70,2 +70,5 @@ "use strict";
     executeBeginTransaction() {
+        if (this.transactionLevel >= 1) {
+            throw new Error("MySql doesn't support nested transactions. This error is thrown to avoid MariaDB silently finishing the previous transaction");
+        }
         return new Promise((resolve, reject) => {
@@ -78,3 +81,8 @@ this.connection.beginTransaction((error) => {
                     this.transactionLevel++;
-                    resolve();
+                    if (this.transactionLevel >= 2) {
+                        reject(new Error("MySql doesn't support nested transactions. The previous transaction was silently finished"));
+                    }
+                    else {
+                        resolve();
+                    }
                 }
@@ -81,0 +89,0 @@ });

queryRunners/MySqlQueryRunner.js

@@ -70,2 +70,5 @@ "use strict";
     executeBeginTransaction() {
+        if (this.transactionLevel >= 1) {
+            throw new Error("MySql doesn't support nested transactions. This error is thrown to avoid MariaDB silently finishing the previous transaction");
+        }
         return new Promise((resolve, reject) => {
@@ -78,3 +81,8 @@ this.connection.beginTransaction((error) => {
                     this.transactionLevel++;
-                    resolve();
+                    if (this.transactionLevel >= 2) {
+                        reject(new Error("MySql doesn't support nested transactions. The previous transaction was silently finished"));
+                    }
+                    else {
+                        resolve();
+                    }
                 }
@@ -81,0 +89,0 @@ });

queryRunners/NoopQueryRunner.d.ts

@@ -44,2 +44,3 @@ import type { PromiseProvider, UnwrapPromiseTuple } from "../utils/PromiseProvider";
     executeDatabaseSchemaModification(_query: string, _params?: any[]): Promise<void>;
+    executeConnectionConfiguration(_query: string, _params?: any[]): Promise<void>;
     addParam(params: any[], value: any): string;
@@ -46,0 +47,0 @@ addOutParam(params: any[], name: string): string;

queryRunners/NoopQueryRunner.js

@@ -113,2 +113,5 @@ "use strict";
     }
+    executeConnectionConfiguration(_query, _params = []) {
+        return this.promise.resolve();
+    }
     addParam(params, value) {
@@ -115,0 +118,0 @@ const index = params.length;

queryRunners/QueryRunner.d.ts

@@ -39,2 +39,3 @@ import { UnwrapPromiseTuple } from "../utils/PromiseProvider";
     executeDatabaseSchemaModification(query: string, params?: any[]): Promise<void>;
+    executeConnectionConfiguration(query: string, params?: any[]): Promise<void>;
     addParam(params: any[], value: any): string;
@@ -41,0 +42,0 @@ addOutParam(params: any[], name: string): string;

queryRunners/TediousPoolQueryRunner.d.ts

 import type { DatabaseType, QueryRunner } from "./QueryRunner";
 import type * as ConnectionPool from 'tedious-connection-pool';
 import { PromiseBasedPoolQueryRunner } from "./PromiseBasedPoolQueryRunner";
+/**
+ * @deprecated
+ */
 export declare class TediousPoolQueryRunner extends PromiseBasedPoolQueryRunner {
@@ -5,0 +8,0 @@ readonly database: DatabaseType;

queryRunners/TediousPoolQueryRunner.js

@@ -6,2 +6,5 @@ "use strict";
 const TediousQueryRunner_1 = require("./TediousQueryRunner");
+/**
+ * @deprecated
+ */
 class TediousPoolQueryRunner extends PromiseBasedPoolQueryRunner_1.PromiseBasedPoolQueryRunner {
@@ -8,0 +11,0 @@ constructor(pool) {

sqlBuilders/AbstractMySqlMariaBDSqlBuilder.js

@@ -243,3 +243,7 @@ "use strict";
         const customization = query.__customization;
-        let insertQuery = 'insert ';
+        let insertQuery = '';
+        if (customization && customization.beforeQuery) {
+            insertQuery += this._appendRawFragment(customization.beforeQuery, params) + ' ';
+        }
+        insertQuery += 'insert ';
         if (customization && customization.afterInsertKeyword) {
@@ -246,0 +250,0 @@ insertQuery += this._appendRawFragment(customization.afterInsertKeyword, params) + ' ';

sqlBuilders/OracleSqlBuilder.js

@@ -443,2 +443,5 @@ "use strict";
         for (let i = 0, length = multiple.length; i < length; i++) {
+            if (customization && customization.beforeQuery) {
+                insertQuery += this._appendRawFragment(customization.beforeQuery, params) + ' ';
+            }
             if (returning) {
@@ -601,2 +604,5 @@ insertQuery += 'insert ';
         let insertQuery = '';
+        if (customization && customization.beforeQuery) {
+            insertQuery += this._appendRawFragment(customization.beforeQuery, params) + ' ';
+        }
         if (this._insertSupportWith) {
@@ -603,0 +609,0 @@ insertQuery += this._buildWith(query, params);

No alert changes

Improved metrics

Total package byte prevSize

2280419

increased by0.47%

Lines of code

38138

increased by0.63%

No dependency changes