pqb 0.5.6 → 0.5.7

package/dist/index.d.ts

@@ -203,54 +203,6 @@ declare class TransactionAdapter implements Adapter {
     close(): Promise<void>;
 }
 
-declare type QueryLogObject = {
-    colors: boolean;
-    beforeQuery(sql: Sql): unknown;
-    afterQuery(sql: Sql, logData: unknown): void;
-    onError(error: Error, sql: Sql, logData: unknown): void;
-};
-declare type QueryLogger = {
-    log(message: string): void;
-    error(message: string): void;
-};
-declare type QueryLogOptions = {
-    log?: boolean | Partial<QueryLogObject>;
-    logger?: QueryLogger;
-};
-declare const logColors: {
-    boldCyanBright: (message: string) => string;
-    boldBlue: (message: string) => string;
-    boldYellow: (message: string) => string;
-    boldMagenta: (message: string) => string;
-    boldRed: (message: string) => string;
-};
-declare const logParamToLogObject: (logger: QueryLogger, log: QueryLogOptions['log']) => QueryLogObject | undefined;
-declare class QueryLog {
-    log<T extends Query>(this: T, log?: boolean): T;
-    _log<T extends Query>(this: T, log?: boolean): T;
-}
-
-declare type BeforeCallback<T extends Query = Query> = (query: T) => void | Promise<void>;
-declare type AfterCallback<T extends Query = Query> = (query: T, data: unknown) => void | Promise<void>;
-declare class QueryCallbacks {
-    beforeQuery<T extends Query>(this: T, cb: BeforeCallback<T>): T;
-    _beforeQuery<T extends Query>(this: T, cb: BeforeCallback<T>): T;
-    afterQuery<T extends Query>(this: T, cb: AfterCallback<T>): T;
-    _afterQuery<T extends Query>(this: T, cb: AfterCallback<T>): T;
-    beforeCreate<T extends Query>(this: T, cb: BeforeCallback<T>): T;
-    _beforeCreate<T extends Query>(this: T, cb: BeforeCallback<T>): T;
-    afterCreate<T extends Query>(this: T, cb: AfterCallback<T>): T;
-    _afterCreate<T extends Query>(this: T, cb: AfterCallback<T>): T;
-    beforeUpdate<T extends Query>(this: T, cb: BeforeCallback<T>): T;
-    _beforeUpdate<T extends Query>(this: T, cb: BeforeCallback<T>): T;
-    afterUpdate<T extends Query>(this: T, cb: AfterCallback<T>): T;
-    _afterUpdate<T extends Query>(this: T, cb: AfterCallback<T>): T;
-    beforeDelete<T extends Query>(this: T, cb: BeforeCallback<T>): T;
-    _beforeDelete<T extends Query>(this: T, cb: BeforeCallback<T>): T;
-    afterDelete<T extends Query>(this: T, cb: AfterCallback<T>): T;
-    _afterDelete<T extends Query>(this: T, cb: AfterCallback<T>): T;
-}
-
 declare type Sql = {
     text: string;
     values: unknown[];
@@ -280,6 +232,7 @@ declare type CommonQueryData = {
     afterQuery?: AfterCallback[];
     log?: QueryLogObject;
     logger: QueryLogger;
+    autoPreparedStatements?: boolean;
     [toSqlCacheKey]?: Sql;
 };
 declare type SelectQueryData = CommonQueryData & {
@@ -877,6 +830,7 @@ declare class UnhandledTypeError extends PormInternalError {
 
 declare type DbTableOptions = {
     schema?: string;
+    autoPreparedStatements?: boolean;
 } & QueryLogOptions;
 declare const anyShape: Record<string, ColumnType<unknown, Operators, unknown>>;
 interface Db<Table extends string | undefined = undefined, Shape extends ColumnsShape = Record<string, never>, Relations extends Query['relations'] = Query['relations'], CT extends ColumnTypesBase = ColumnTypesBase> extends QueryMethods {
@@ -942,6 +896,7 @@ declare type DbOptions<CT extends ColumnTypesBase> = ({
     adapter: Adapter;
 } | Omit<AdapterOptions, 'log'>) & QueryLogOptions & {
     columnTypes: CT;
+    autoPreparedStatements?: boolean;
 };
 declare const createDb: <CT extends ColumnTypesBase>({ log, logger, columnTypes: ct, ...options }: DbOptions<CT>) => DbResult<CT>;
 
@@ -1288,6 +1243,54 @@ declare class Window {
     _selectCumeDist<T extends Query, As extends string | undefined = undefined>(this: T, options: WindowFunctionOptions<T, As>): SelectAgg<T, 'cume_dist', As, IntegerColumn>;
 }
 
+declare type QueryLogObject = {
+    colors: boolean;
+    beforeQuery(sql: Sql): unknown;
+    afterQuery(sql: Sql, logData: unknown): void;
+    onError(error: Error, sql: Sql, logData: unknown): void;
+};
+declare type QueryLogger = {
+    log(message: string): void;
+    error(message: string): void;
+};
+declare type QueryLogOptions = {
+    log?: boolean | Partial<QueryLogObject>;
+    logger?: QueryLogger;
+};
+declare const logColors: {
+    boldCyanBright: (message: string) => string;
+    boldBlue: (message: string) => string;
+    boldYellow: (message: string) => string;
+    boldMagenta: (message: string) => string;
+    boldRed: (message: string) => string;
+};
+declare const logParamToLogObject: (logger: QueryLogger, log: QueryLogOptions['log']) => QueryLogObject | undefined;
+declare class QueryLog {
+    log<T extends Query>(this: T, log?: boolean): T;
+    _log<T extends Query>(this: T, log?: boolean): T;
+}
+
+declare type BeforeCallback<T extends Query = Query> = (query: T) => void | Promise<void>;
+declare type AfterCallback<T extends Query = Query> = (query: T, data: unknown) => void | Promise<void>;
+declare class QueryCallbacks {
+    beforeQuery<T extends Query>(this: T, cb: BeforeCallback<T>): T;
+    _beforeQuery<T extends Query>(this: T, cb: BeforeCallback<T>): T;
+    afterQuery<T extends Query>(this: T, cb: AfterCallback<T>): T;
+    _afterQuery<T extends Query>(this: T, cb: AfterCallback<T>): T;
+    beforeCreate<T extends Query>(this: T, cb: BeforeCallback<T>): T;
+    _beforeCreate<T extends Query>(this: T, cb: BeforeCallback<T>): T;
+    afterCreate<T extends Query>(this: T, cb: AfterCallback<T>): T;
+    _afterCreate<T extends Query>(this: T, cb: AfterCallback<T>): T;
+    beforeUpdate<T extends Query>(this: T, cb: BeforeCallback<T>): T;
+    _beforeUpdate<T extends Query>(this: T, cb: BeforeCallback<T>): T;
+    afterUpdate<T extends Query>(this: T, cb: AfterCallback<T>): T;
+    _afterUpdate<T extends Query>(this: T, cb: AfterCallback<T>): T;
+    beforeDelete<T extends Query>(this: T, cb: BeforeCallback<T>): T;
+    _beforeDelete<T extends Query>(this: T, cb: BeforeCallback<T>): T;
+    afterDelete<T extends Query>(this: T, cb: AfterCallback<T>): T;
+    _afterDelete<T extends Query>(this: T, cb: AfterCallback<T>): T;
+}
+
 declare type UpsertData<T extends Query> = {
     update: UpdateData<T>;
     create: CreateData<T>;

package/dist/index.esm.js

@@ -3255,6 +3255,8 @@ function maybeWrappedThen(resolve, reject) {
     return then(this, resolve, reject);
   }
 }
+const queriesNames = {};
+let nameI = 0;
 const then = async (q, resolve, reject) => {
   let sql;
   let logData;
@@ -3277,6 +3279,9 @@ const then = async (q, resolve, reject) => {
       );
     }
     sql = q.toSql();
+    if (q.query.autoPreparedStatements) {
+      sql.name = queriesNames[sql.text] || (queriesNames[sql.text] = (nameI++).toString(36));
+    }
     if (q.query.log) {
       logData = q.query.log.beforeQuery(sql);
     }
@@ -5646,7 +5651,8 @@ class Db {
       adapter,
       handleResult,
       logger,
-      log: logParamToLogObject(logger, options.log)
+      log: logParamToLogObject(logger, options.log),
+      autoPreparedStatements: options.autoPreparedStatements || true
     };
     if (options == null ? void 0 : options.schema) {
       this.query.schema = options.schema;
@@ -5705,8 +5711,13 @@ const createDb = (_a) => {
     "logger",
     "columnTypes"
   ]);
+  var _a2;
   const adapter = "adapter" in options ? options.adapter : new Adapter(options);
-  const commonOptions = { log, logger };
+  const commonOptions = {
+    log,
+    logger,
+    autoPreparedStatements: (_a2 = options.autoPreparedStatements) != null ? _a2 : true
+  };
   const qb = new Db(
     adapter,
     void 0,