ts-sql-query
Advanced tools
Comparing version 1.63.0 to 1.64.0
@@ -476,7 +476,13 @@ "use strict"; | ||
aggregateAsArray(columns) { | ||
return new ValueSourceImpl_1.AggregateValueAsArrayValueSource(columns, 'InnerResultObject', 'required'); | ||
return new ValueSourceImpl_1.AggregateValueAsArrayValueSource(columns, 'InnerResultObject', 'required', false); | ||
} | ||
aggregateAsArrayOfOneColumn(value) { | ||
return new ValueSourceImpl_1.AggregateValueAsArrayValueSource(value, 'InnerResultObject', 'required'); | ||
return new ValueSourceImpl_1.AggregateValueAsArrayValueSource(value, 'InnerResultObject', 'required', false); | ||
} | ||
aggregateAsArrayDistinct(columns) { | ||
return new ValueSourceImpl_1.AggregateValueAsArrayValueSource(columns, 'InnerResultObject', 'required', true); | ||
} | ||
aggregateAsArrayOfOneColumnDistinct(value) { | ||
return new ValueSourceImpl_1.AggregateValueAsArrayValueSource(value, 'InnerResultObject', 'required', true); | ||
} | ||
dynamicConditionFor(definition, extension) { | ||
@@ -483,0 +489,0 @@ return new DynamicConditionBuilder_1.DynamicConditionBuilder(this.__sqlBuilder, definition, extension); |
@@ -702,3 +702,4 @@ import { SqlBuilder, SqlOperationStatic0, SqlOperationStatic1, SqlOperation1, SqlOperation2, ToSql, HasOperation, SqlSequenceOperation, SqlFragmentOperation, AggregateFunctions0, AggregateFunctions1, AggregateFunctions1or2, SqlFunction0, SqlComparator0, SelectData } from "../sqlBuilders/SqlBuilder"; | ||
__aggreagtedProjectingOptionalValuesAsNullable?: boolean; | ||
constructor(aggregatedArrayColumns: __AggregatedArrayColumns | AnyValueSource, aggregatedArrayMode: __AggregatedArrayMode, _optionalType: OptionalType); | ||
__aggregatedArrayDistinct: boolean; | ||
constructor(aggregatedArrayColumns: __AggregatedArrayColumns | AnyValueSource, aggregatedArrayMode: __AggregatedArrayMode, _optionalType: OptionalType, distict: boolean); | ||
isConstValue(): boolean; | ||
@@ -732,3 +733,3 @@ getConstValue(): any; | ||
__error: Error; | ||
constructor(allowed: boolean, error: Error, aggregatedArrayColumns: __AggregatedArrayColumns | AnyValueSource, aggregatedArrayMode: __AggregatedArrayMode, _optionalType: OptionalType); | ||
constructor(allowed: boolean, error: Error, aggregatedArrayColumns: __AggregatedArrayColumns | AnyValueSource, aggregatedArrayMode: __AggregatedArrayMode, _optionalType: OptionalType, distinct: boolean); | ||
__toSql(sqlBuilder: SqlBuilder, params: any[]): string; | ||
@@ -752,3 +753,4 @@ __isAllowed(sqlBuilder: HasIsValue): boolean; | ||
__aggregatedArrayMode: __AggregatedArrayMode; | ||
constructor(aggregatedArrayColumns: __AggregatedArrayColumns | AnyValueSource, aggregatedArrayMode: __AggregatedArrayMode, _optionalType: OptionalType); | ||
__aggregatedArrayDistinct: boolean; | ||
constructor(aggregatedArrayColumns: __AggregatedArrayColumns | AnyValueSource, aggregatedArrayMode: __AggregatedArrayMode, _optionalType: OptionalType, distinct: boolean); | ||
isConstValue(): boolean; | ||
@@ -776,5 +778,5 @@ getConstValue(): any; | ||
__error: Error; | ||
constructor(allowed: boolean, error: Error, aggregatedArrayColumns: __AggregatedArrayColumns | AnyValueSource, aggregatedArrayMode: __AggregatedArrayMode, _optionalType: OptionalType); | ||
constructor(allowed: boolean, error: Error, aggregatedArrayColumns: __AggregatedArrayColumns | AnyValueSource, aggregatedArrayMode: __AggregatedArrayMode, _optionalType: OptionalType, distinct: boolean); | ||
__toSql(sqlBuilder: SqlBuilder, params: any[]): string; | ||
__isAllowed(sqlBuilder: HasIsValue): boolean; | ||
} |
{ | ||
"name": "ts-sql-query", | ||
"version": "1.63.0", | ||
"version": "1.64.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", |
@@ -5,2 +5,12 @@ "use strict"; | ||
const ChainedQueryRunner_1 = require("./ChainedQueryRunner"); | ||
function now() { | ||
if (typeof process !== 'undefined') { | ||
// NodeJS process module available | ||
return process.hrtime.bigint(); | ||
} | ||
else { | ||
// NodeJS process module not available | ||
return BigInt(Math.floor(performance.now() * 1000 * 1000)); | ||
} | ||
} | ||
class LoggingQueryRunner extends ChainedQueryRunner_1.ChainedQueryRunner { | ||
@@ -13,3 +23,3 @@ constructor(logger, queryRunner) { | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -22,3 +32,3 @@ logger.onQuery('selectOneRow', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('selectOneRow', query, params, r, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('selectOneRow', query, params, r, { startedAt, endedAt: now() }); | ||
} | ||
@@ -28,3 +38,3 @@ return r; | ||
if (logger.onQueryError) { | ||
logger.onQueryError('selectOneRow', query, params, e, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryError('selectOneRow', query, params, e, { startedAt, endedAt: now() }); | ||
} | ||
@@ -38,3 +48,3 @@ throw e; | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -47,3 +57,3 @@ logger.onQuery('selectManyRows', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('selectManyRows', query, params, r, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('selectManyRows', query, params, r, { startedAt, endedAt: now() }); | ||
} | ||
@@ -53,3 +63,3 @@ return r; | ||
if (logger.onQueryError) { | ||
logger.onQueryError('selectManyRows', query, params, e, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryError('selectManyRows', query, params, e, { startedAt, endedAt: now() }); | ||
} | ||
@@ -63,3 +73,3 @@ throw e; | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -72,3 +82,3 @@ logger.onQuery('selectOneColumnOneRow', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('selectOneColumnOneRow', query, params, r, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('selectOneColumnOneRow', query, params, r, { startedAt, endedAt: now() }); | ||
} | ||
@@ -78,3 +88,3 @@ return r; | ||
if (logger.onQueryError) { | ||
logger.onQueryError('selectOneColumnOneRow', query, params, e, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryError('selectOneColumnOneRow', query, params, e, { startedAt, endedAt: now() }); | ||
} | ||
@@ -88,3 +98,3 @@ throw e; | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -97,3 +107,3 @@ logger.onQuery('selectOneColumnManyRows', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('selectOneColumnManyRows', query, params, r, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('selectOneColumnManyRows', query, params, r, { startedAt, endedAt: now() }); | ||
} | ||
@@ -103,3 +113,3 @@ return r; | ||
if (logger.onQueryError) { | ||
logger.onQueryError('selectOneColumnManyRows', query, params, e, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryError('selectOneColumnManyRows', query, params, e, { startedAt, endedAt: now() }); | ||
} | ||
@@ -113,3 +123,3 @@ throw e; | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -122,3 +132,3 @@ logger.onQuery('insert', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('insert', query, params, r, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('insert', query, params, r, { startedAt, endedAt: now() }); | ||
} | ||
@@ -128,3 +138,3 @@ return r; | ||
if (logger.onQueryError) { | ||
logger.onQueryError('insert', query, params, e, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryError('insert', query, params, e, { startedAt, endedAt: now() }); | ||
} | ||
@@ -138,3 +148,3 @@ throw e; | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -147,3 +157,3 @@ logger.onQuery('insertReturningLastInsertedId', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('insertReturningLastInsertedId', query, params, r, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('insertReturningLastInsertedId', query, params, r, { startedAt, endedAt: now() }); | ||
} | ||
@@ -153,3 +163,3 @@ return r; | ||
if (logger.onQueryError) { | ||
logger.onQueryError('insertReturningLastInsertedId', query, params, e, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryError('insertReturningLastInsertedId', query, params, e, { startedAt, endedAt: now() }); | ||
} | ||
@@ -163,3 +173,3 @@ throw e; | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -172,3 +182,3 @@ logger.onQuery('insertReturningMultipleLastInsertedId', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('insertReturningMultipleLastInsertedId', query, params, r, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('insertReturningMultipleLastInsertedId', query, params, r, { startedAt, endedAt: now() }); | ||
} | ||
@@ -178,3 +188,3 @@ return r; | ||
if (logger.onQueryError) { | ||
logger.onQueryError('insertReturningMultipleLastInsertedId', query, params, e, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryError('insertReturningMultipleLastInsertedId', query, params, e, { startedAt, endedAt: now() }); | ||
} | ||
@@ -188,3 +198,3 @@ throw e; | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -197,3 +207,3 @@ logger.onQuery('insertReturningOneRow', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('insertReturningOneRow', query, params, r, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('insertReturningOneRow', query, params, r, { startedAt, endedAt: now() }); | ||
} | ||
@@ -203,3 +213,3 @@ return r; | ||
if (logger.onQueryError) { | ||
logger.onQueryError('insertReturningOneRow', query, params, e, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryError('insertReturningOneRow', query, params, e, { startedAt, endedAt: now() }); | ||
} | ||
@@ -213,3 +223,3 @@ throw e; | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -222,3 +232,3 @@ logger.onQuery('insertReturningManyRows', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('insertReturningManyRows', query, params, r, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('insertReturningManyRows', query, params, r, { startedAt, endedAt: now() }); | ||
} | ||
@@ -228,3 +238,3 @@ return r; | ||
if (logger.onQueryError) { | ||
logger.onQueryError('insertReturningManyRows', query, params, e, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryError('insertReturningManyRows', query, params, e, { startedAt, endedAt: now() }); | ||
} | ||
@@ -238,3 +248,3 @@ throw e; | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -247,3 +257,3 @@ logger.onQuery('insertReturningOneColumnOneRow', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('insertReturningOneColumnOneRow', query, params, r, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('insertReturningOneColumnOneRow', query, params, r, { startedAt, endedAt: now() }); | ||
} | ||
@@ -253,3 +263,3 @@ return r; | ||
if (logger.onQueryError) { | ||
logger.onQueryError('insertReturningOneColumnOneRow', query, params, e, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryError('insertReturningOneColumnOneRow', query, params, e, { startedAt, endedAt: now() }); | ||
} | ||
@@ -263,3 +273,3 @@ throw e; | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -272,3 +282,3 @@ logger.onQuery('insertReturningOneColumnManyRows', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('insertReturningOneColumnManyRows', query, params, r, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('insertReturningOneColumnManyRows', query, params, r, { startedAt, endedAt: now() }); | ||
} | ||
@@ -278,3 +288,3 @@ return r; | ||
if (logger.onQueryError) { | ||
logger.onQueryError('insertReturningOneColumnManyRows', query, params, e, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryError('insertReturningOneColumnManyRows', query, params, e, { startedAt, endedAt: now() }); | ||
} | ||
@@ -288,3 +298,3 @@ throw e; | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -297,3 +307,3 @@ logger.onQuery('update', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('update', query, params, r, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('update', query, params, r, { startedAt, endedAt: now() }); | ||
} | ||
@@ -303,3 +313,3 @@ return r; | ||
if (logger.onQueryError) { | ||
logger.onQueryError('update', query, params, e, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryError('update', query, params, e, { startedAt, endedAt: now() }); | ||
} | ||
@@ -313,3 +323,3 @@ throw e; | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -322,3 +332,3 @@ logger.onQuery('updateReturningOneRow', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('updateReturningOneRow', query, params, r, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('updateReturningOneRow', query, params, r, { startedAt, endedAt: now() }); | ||
} | ||
@@ -328,3 +338,3 @@ return r; | ||
if (logger.onQueryError) { | ||
logger.onQueryError('updateReturningOneRow', query, params, e, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryError('updateReturningOneRow', query, params, e, { startedAt, endedAt: now() }); | ||
} | ||
@@ -338,3 +348,3 @@ throw e; | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -347,3 +357,3 @@ logger.onQuery('updateReturningManyRows', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('updateReturningManyRows', query, params, r, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('updateReturningManyRows', query, params, r, { startedAt, endedAt: now() }); | ||
} | ||
@@ -353,3 +363,3 @@ return r; | ||
if (logger.onQueryError) { | ||
logger.onQueryError('updateReturningManyRows', query, params, e, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryError('updateReturningManyRows', query, params, e, { startedAt, endedAt: now() }); | ||
} | ||
@@ -363,3 +373,3 @@ throw e; | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -372,3 +382,3 @@ logger.onQuery('updateReturningOneColumnOneRow', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('updateReturningOneColumnOneRow', query, params, r, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('updateReturningOneColumnOneRow', query, params, r, { startedAt, endedAt: now() }); | ||
} | ||
@@ -378,3 +388,3 @@ return r; | ||
if (logger.onQueryError) { | ||
logger.onQueryError('updateReturningOneColumnOneRow', query, params, e, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryError('updateReturningOneColumnOneRow', query, params, e, { startedAt, endedAt: now() }); | ||
} | ||
@@ -388,3 +398,3 @@ throw e; | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -397,3 +407,3 @@ logger.onQuery('updateReturningOneColumnManyRows', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('updateReturningOneColumnManyRows', query, params, r, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('updateReturningOneColumnManyRows', query, params, r, { startedAt, endedAt: now() }); | ||
} | ||
@@ -403,3 +413,3 @@ return r; | ||
if (logger.onQueryError) { | ||
logger.onQueryError('updateReturningOneColumnManyRows', query, params, e, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryError('updateReturningOneColumnManyRows', query, params, e, { startedAt, endedAt: now() }); | ||
} | ||
@@ -413,3 +423,3 @@ throw e; | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -422,3 +432,3 @@ logger.onQuery('delete', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('delete', query, params, r, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('delete', query, params, r, { startedAt, endedAt: now() }); | ||
} | ||
@@ -428,3 +438,3 @@ return r; | ||
if (logger.onQueryError) { | ||
logger.onQueryError('delete', query, params, e, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryError('delete', query, params, e, { startedAt, endedAt: now() }); | ||
} | ||
@@ -438,3 +448,3 @@ throw e; | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -447,3 +457,3 @@ logger.onQuery('deleteReturningOneRow', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('deleteReturningOneRow', query, params, r, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('deleteReturningOneRow', query, params, r, { startedAt, endedAt: now() }); | ||
} | ||
@@ -453,3 +463,3 @@ return r; | ||
if (logger.onQueryError) { | ||
logger.onQueryError('deleteReturningOneRow', query, params, e, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryError('deleteReturningOneRow', query, params, e, { startedAt, endedAt: now() }); | ||
} | ||
@@ -463,3 +473,3 @@ throw e; | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -472,3 +482,3 @@ logger.onQuery('deleteReturningManyRows', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('deleteReturningManyRows', query, params, r, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('deleteReturningManyRows', query, params, r, { startedAt, endedAt: now() }); | ||
} | ||
@@ -478,3 +488,3 @@ return r; | ||
if (logger.onQueryError) { | ||
logger.onQueryError('deleteReturningManyRows', query, params, e, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryError('deleteReturningManyRows', query, params, e, { startedAt, endedAt: now() }); | ||
} | ||
@@ -488,3 +498,3 @@ throw e; | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -497,3 +507,3 @@ logger.onQuery('deleteReturningOneColumnOneRow', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('deleteReturningOneColumnOneRow', query, params, r, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('deleteReturningOneColumnOneRow', query, params, r, { startedAt, endedAt: now() }); | ||
} | ||
@@ -503,3 +513,3 @@ return r; | ||
if (logger.onQueryError) { | ||
logger.onQueryError('deleteReturningOneColumnOneRow', query, params, e, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryError('deleteReturningOneColumnOneRow', query, params, e, { startedAt, endedAt: now() }); | ||
} | ||
@@ -513,3 +523,3 @@ throw e; | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -522,3 +532,3 @@ logger.onQuery('deleteReturningOneColumnManyRows', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('deleteReturningOneColumnManyRows', query, params, r, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('deleteReturningOneColumnManyRows', query, params, r, { startedAt, endedAt: now() }); | ||
} | ||
@@ -528,3 +538,3 @@ return r; | ||
if (logger.onQueryError) { | ||
logger.onQueryError('deleteReturningOneColumnManyRows', query, params, e, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryError('deleteReturningOneColumnManyRows', query, params, e, { startedAt, endedAt: now() }); | ||
} | ||
@@ -538,3 +548,3 @@ throw e; | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -547,3 +557,3 @@ logger.onQuery('executeProcedure', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('executeProcedure', query, params, r, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('executeProcedure', query, params, r, { startedAt, endedAt: now() }); | ||
} | ||
@@ -553,3 +563,3 @@ return r; | ||
if (logger.onQueryError) { | ||
logger.onQueryError('executeProcedure', query, params, e, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryError('executeProcedure', query, params, e, { startedAt, endedAt: now() }); | ||
} | ||
@@ -563,3 +573,3 @@ throw e; | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -572,3 +582,3 @@ logger.onQuery('executeFunction', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('executeFunction', query, params, r, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('executeFunction', query, params, r, { startedAt, endedAt: now() }); | ||
} | ||
@@ -578,3 +588,3 @@ return r; | ||
if (logger.onQueryError) { | ||
logger.onQueryError('executeFunction', query, params, e, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryError('executeFunction', query, params, e, { startedAt, endedAt: now() }); | ||
} | ||
@@ -621,3 +631,3 @@ throw e; | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -627,3 +637,3 @@ logger.onQuery('rollback', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('rollback', query, params, undefined, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('rollback', query, params, undefined, { startedAt, endedAt: now() }); | ||
} | ||
@@ -643,3 +653,3 @@ } | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -652,3 +662,3 @@ logger.onQuery('beginTransaction', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('beginTransaction', query, params, r, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('beginTransaction', query, params, r, { startedAt, endedAt: now() }); | ||
} | ||
@@ -658,3 +668,3 @@ return r; | ||
if (logger.onQueryError) { | ||
logger.onQueryError('beginTransaction', query, params, e, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryError('beginTransaction', query, params, e, { startedAt, endedAt: now() }); | ||
} | ||
@@ -670,3 +680,3 @@ throw e; | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -679,3 +689,3 @@ logger.onQuery('commit', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('commit', query, params, r, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('commit', query, params, r, { startedAt, endedAt: now() }); | ||
} | ||
@@ -685,3 +695,3 @@ return r; | ||
if (logger.onQueryError) { | ||
logger.onQueryError('commit', query, params, e, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryError('commit', query, params, e, { startedAt, endedAt: now() }); | ||
} | ||
@@ -697,3 +707,3 @@ throw e; | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -706,3 +716,3 @@ logger.onQuery('rollback', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('rollback', query, params, r, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('rollback', query, params, r, { startedAt, endedAt: now() }); | ||
} | ||
@@ -712,3 +722,3 @@ return r; | ||
if (logger.onQueryError) { | ||
logger.onQueryError('rollback', query, params, e, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryError('rollback', query, params, e, { startedAt, endedAt: now() }); | ||
} | ||
@@ -722,3 +732,3 @@ throw e; | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -731,3 +741,3 @@ logger.onQuery('executeDatabaseSchemaModification', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('executeDatabaseSchemaModification', query, params, r, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('executeDatabaseSchemaModification', query, params, r, { startedAt, endedAt: now() }); | ||
} | ||
@@ -737,3 +747,3 @@ return r; | ||
if (logger.onQueryError) { | ||
logger.onQueryError('executeDatabaseSchemaModification', query, params, e, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryError('executeDatabaseSchemaModification', query, params, e, { startedAt, endedAt: now() }); | ||
} | ||
@@ -747,3 +757,3 @@ throw e; | ||
const logger = this.logger; | ||
const startedAt = process.hrtime.bigint(); | ||
const startedAt = now(); | ||
if (logger.onQuery) { | ||
@@ -756,3 +766,3 @@ logger.onQuery('executeConnectionConfiguration', query, params, { startedAt }); | ||
if (logger.onQueryResult) { | ||
logger.onQueryResult('executeConnectionConfiguration', query, params, r, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryResult('executeConnectionConfiguration', query, params, r, { startedAt, endedAt: now() }); | ||
} | ||
@@ -762,3 +772,3 @@ return r; | ||
if (logger.onQueryError) { | ||
logger.onQueryError('executeConnectionConfiguration', query, params, e, { startedAt, endedAt: process.hrtime.bigint() }); | ||
logger.onQueryError('executeConnectionConfiguration', query, params, e, { startedAt, endedAt: now() }); | ||
} | ||
@@ -765,0 +775,0 @@ throw e; |
@@ -61,4 +61,4 @@ import { ToSql, SelectData, InsertData, UpdateData, DeleteData, OrderByEntry } from "./SqlBuilder"; | ||
_notIn(params: any[], valueSource: ToSql, value: any, columnType: ValueType, columnTypeName: string, typeAdapter: TypeAdapter | undefined): string; | ||
_appendAggragateArrayColumns(aggregatedArrayColumns: __AggregatedArrayColumns | AnyValueSource, params: any[], _query: SelectData | undefined): string; | ||
_appendAggragateArrayColumns(aggregatedArrayColumns: __AggregatedArrayColumns | AnyValueSource, aggregatedArrayDistinct: boolean, params: any[], _query: SelectData | undefined): string; | ||
_appendAggragateArrayWrappedColumns(aggregatedArrayColumns: __AggregatedArrayColumns | AnyValueSource, _params: any[], aggregateId: number): string; | ||
} |
@@ -570,5 +570,6 @@ "use strict"; | ||
} | ||
_appendAggragateArrayColumns(aggregatedArrayColumns, params, _query) { | ||
_appendAggragateArrayColumns(aggregatedArrayColumns, aggregatedArrayDistinct, params, _query) { | ||
const distict = aggregatedArrayDistinct ? 'distinct ' : ''; | ||
if ((0, values_1.isValueSource)(aggregatedArrayColumns)) { | ||
return 'json_arrayagg(' + this._appendSql(aggregatedArrayColumns, params) + ')'; | ||
return 'json_arrayagg(' + distict + this._appendSql(aggregatedArrayColumns, params) + ')'; | ||
} | ||
@@ -585,3 +586,3 @@ else { | ||
} | ||
return 'json_arrayagg(json_object(' + result + '))'; | ||
return 'json_arrayagg(' + distict + 'json_object(' + result + '))'; | ||
} | ||
@@ -588,0 +589,0 @@ } |
@@ -273,4 +273,4 @@ import { ToSql, SqlBuilder, DeleteData, InsertData, UpdateData, SelectData, SqlOperation, WithQueryData, CompoundOperator, JoinData, QueryColumns, WithSelectData, WithValuesData, OrderByEntry } from "./SqlBuilder"; | ||
_appendAggragateArrayWrapperEnd(_query: SelectData, _params: any[], aggregateId: number): string; | ||
_appendAggragateArrayColumns(aggregatedArrayColumns: __AggregatedArrayColumns | AnyValueSource, params: any[], _query: SelectData | undefined): string; | ||
_appendAggragateArrayColumns(aggregatedArrayColumns: __AggregatedArrayColumns | AnyValueSource, aggregatedArrayDistinct: boolean, params: any[], _query: SelectData | undefined): string; | ||
_appendAggragateArrayWrappedColumns(aggregatedArrayColumns: __AggregatedArrayColumns | AnyValueSource, _params: any[], aggregateId: number): string; | ||
} |
@@ -11,3 +11,3 @@ import { AnyValueSource, __AggregatedArrayColumns } from "../expressions/values"; | ||
_buildInsertReturning(query: InsertData, params: any[]): string; | ||
_appendAggragateArrayColumns(aggregatedArrayColumns: __AggregatedArrayColumns | AnyValueSource, params: any[], query: SelectData | undefined): string; | ||
_appendAggragateArrayColumns(aggregatedArrayColumns: __AggregatedArrayColumns | AnyValueSource, aggregatedArrayDistinct: boolean, params: any[], query: SelectData | undefined): string; | ||
} |
@@ -46,6 +46,7 @@ "use strict"; | ||
} | ||
_appendAggragateArrayColumns(aggregatedArrayColumns, params, query) { | ||
_appendAggragateArrayColumns(aggregatedArrayColumns, aggregatedArrayDistinct, params, query) { | ||
const distict = aggregatedArrayDistinct ? 'distinct ' : ''; | ||
let result = ''; | ||
if ((0, values_1.isValueSource)(aggregatedArrayColumns)) { | ||
result += 'json_arrayagg(' + this._appendSql(aggregatedArrayColumns, params); | ||
result += 'json_arrayagg(' + distict + this._appendSql(aggregatedArrayColumns, params); | ||
} | ||
@@ -61,3 +62,3 @@ else { | ||
} | ||
result = 'json_arrayagg(json_object(' + result + ')'; | ||
result = 'json_arrayagg(' + distict + 'json_object(' + result + ')'; | ||
} | ||
@@ -64,0 +65,0 @@ if (query && query.__asInlineAggregatedArrayValue && !this._isAggregateArrayWrapped(params)) { |
@@ -14,3 +14,3 @@ import { AnyValueSource, __AggregatedArrayColumns, ValueType } from "../expressions/values"; | ||
_asString(params: any[], valueSource: ToSql): string; | ||
_appendAggragateArrayColumns(aggregatedArrayColumns: __AggregatedArrayColumns | AnyValueSource, params: any[], _query: SelectData | undefined): string; | ||
_appendAggragateArrayColumns(aggregatedArrayColumns: __AggregatedArrayColumns | AnyValueSource, aggregatedArrayDistinct: boolean, params: any[], _query: SelectData | undefined): string; | ||
_appendAggragateArrayWrappedColumns(aggregatedArrayColumns: __AggregatedArrayColumns | AnyValueSource, _params: any[], aggregateId: number): string; | ||
@@ -17,0 +17,0 @@ _buildWith(withData: WithQueryData, params: any[]): string; |
@@ -44,8 +44,9 @@ "use strict"; | ||
} | ||
_appendAggragateArrayColumns(aggregatedArrayColumns, params, _query) { | ||
_appendAggragateArrayColumns(aggregatedArrayColumns, aggregatedArrayDistinct, params, _query) { | ||
const distict = aggregatedArrayDistinct ? 'distinct ' : ''; | ||
if ((0, values_1.isValueSource)(aggregatedArrayColumns)) { | ||
if ((0, values_1.__isUuidValueSource)((0, values_1.__getValueSourcePrivate)(aggregatedArrayColumns)) && this._getUuidStrategy() === 'binary') { | ||
return 'json_arrayagg(bin_to_uuid(' + this._appendSql(aggregatedArrayColumns, params) + '))'; | ||
return 'json_arrayagg(' + distict + 'bin_to_uuid(' + this._appendSql(aggregatedArrayColumns, params) + '))'; | ||
} | ||
return 'json_arrayagg(' + this._appendSql(aggregatedArrayColumns, params) + ')'; | ||
return 'json_arrayagg(' + distict + this._appendSql(aggregatedArrayColumns, params) + ')'; | ||
} | ||
@@ -69,3 +70,3 @@ else { | ||
} | ||
return 'json_arrayagg(json_object(' + result + '))'; | ||
return 'json_arrayagg(' + distict + 'json_object(' + result + '))'; | ||
} | ||
@@ -72,0 +73,0 @@ } |
@@ -90,4 +90,4 @@ import { ToSql, InsertData, CompoundOperator, SelectData, QueryColumns, WithSelectData, OrderByEntry } from "./SqlBuilder"; | ||
_notIn(params: any[], valueSource: ToSql, value: any, columnType: ValueType, columnTypeName: string, typeAdapter: TypeAdapter | undefined): string; | ||
_appendAggragateArrayColumns(aggregatedArrayColumns: __AggregatedArrayColumns | AnyValueSource, params: any[], _query: SelectData | undefined): string; | ||
_appendAggragateArrayColumns(aggregatedArrayColumns: __AggregatedArrayColumns | AnyValueSource, aggregatedArrayDistinct: boolean, params: any[], _query: SelectData | undefined): string; | ||
_appendAggragateArrayWrappedColumns(aggregatedArrayColumns: __AggregatedArrayColumns | AnyValueSource, _params: any[], aggregateId: number): string; | ||
} |
@@ -70,4 +70,4 @@ import { ToSql, SelectData, InsertData, UpdateData } from "./SqlBuilder"; | ||
_asString(params: any[], valueSource: ToSql): string; | ||
_appendAggragateArrayColumns(aggregatedArrayColumns: __AggregatedArrayColumns | AnyValueSource, params: any[], _query: SelectData | undefined): string; | ||
_appendAggragateArrayColumns(aggregatedArrayColumns: __AggregatedArrayColumns | AnyValueSource, aggregatedArrayDistinct: boolean, params: any[], _query: SelectData | undefined): string; | ||
_appendAggragateArrayWrappedColumns(aggregatedArrayColumns: __AggregatedArrayColumns | AnyValueSource, _params: any[], aggregateId: number): string; | ||
} |
@@ -515,8 +515,9 @@ "use strict"; | ||
} | ||
_appendAggragateArrayColumns(aggregatedArrayColumns, params, _query) { | ||
_appendAggragateArrayColumns(aggregatedArrayColumns, aggregatedArrayDistinct, params, _query) { | ||
const distict = aggregatedArrayDistinct ? 'distinct ' : ''; | ||
if ((0, values_1.isValueSource)(aggregatedArrayColumns)) { | ||
if ((0, values_1.__isUuidValueSource)((0, values_2.__getValueSourcePrivate)(aggregatedArrayColumns)) && this._getUuidStrategy() === 'uuid-extension') { | ||
return 'json_group_array(uuid_str(' + this._appendSql(aggregatedArrayColumns, params) + '))'; | ||
return 'json_group_array(' + distict + 'uuid_str(' + this._appendSql(aggregatedArrayColumns, params) + '))'; | ||
} | ||
return 'json_group_array(' + this._appendSql(aggregatedArrayColumns, params) + ')'; | ||
return 'json_group_array(' + distict + this._appendSql(aggregatedArrayColumns, params) + ')'; | ||
} | ||
@@ -540,3 +541,3 @@ else { | ||
} | ||
return 'json_group_array(json_object(' + result + '))'; | ||
return 'json_group_array(' + distict + 'json_object(' + result + '))'; | ||
} | ||
@@ -543,0 +544,0 @@ } |
@@ -107,3 +107,3 @@ import { ToSql, SelectData, InsertData, DeleteData, UpdateData, QueryColumns, WithValuesData } from "./SqlBuilder"; | ||
_appendAggragateArrayWrapperEnd(query: SelectData, params: any[], aggregateId: number): string; | ||
_appendAggragateArrayColumns(aggregatedArrayColumns: __AggregatedArrayColumns | AnyValueSource, params: any[], _query: SelectData | undefined): string; | ||
_appendAggragateArrayColumns(aggregatedArrayColumns: __AggregatedArrayColumns | AnyValueSource, aggregatedArrayDistinct: boolean, params: any[], _query: SelectData | undefined): string; | ||
_appendJsonValueForAggregate(valueSource: AnyValueSource, params: any[]): string; | ||
@@ -110,0 +110,0 @@ _appendAggragateArrayWrappedColumns(aggregatedArrayColumns: __AggregatedArrayColumns | AnyValueSource, params: any[], aggregateId: number): string; |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
2588529
40606