Fixed custom sql operations typing in PongoCollection type

Author: oskardudycz

src/packages/dumbo/src/postgres/pg/execute/execute.ts

@@ -88,8 +88,8 @@ async function batch<Result extends QueryResultRow = QueryResultRow>(
 
   //TODO: make it smarter at some point
   for (let i = 0; i < sqls.length; i++) {
-    const result = await client.query<Result>(sqls[i]!);
     tracer.info('db:sql:query', { sql: sqls[i]! });
+    const result = await client.query<Result>(sqls[i]!);
     results[i] = { rowCount: result.rowCount, rows: result.rows };
   }
   return Array.isArray(sqlOrSqls) ? results : results[0]!;

src/packages/pongo/src/core/typing/operations.ts

@@ -134,52 +134,52 @@ export interface PongoCollection<T extends PongoDocument> {
     options?: CollectionOperationOptions,
   ): Promise<PongoInsertManyResult>;
   updateOne(
-    filter: PongoFilter<T>,
-    update: PongoUpdate<T>,
+    filter: PongoFilter<T> | SQL,
+    update: PongoUpdate<T> | SQL,
     options?: UpdateOneOptions,
   ): Promise<PongoUpdateResult>;
   replaceOne(
-    filter: PongoFilter<T>,
+    filter: PongoFilter<T> | SQL,
     document: WithoutId<T>,
     options?: ReplaceOneOptions,
   ): Promise<PongoUpdateResult>;
   updateMany(
-    filter: PongoFilter<T>,
-    update: PongoUpdate<T>,
+    filter: PongoFilter<T> | SQL,
+    update: PongoUpdate<T> | SQL,
     options?: UpdateManyOptions,
   ): Promise<PongoUpdateManyResult>;
   deleteOne(
-    filter?: PongoFilter<T>,
+    filter?: PongoFilter<T> | SQL,
     options?: DeleteOneOptions,
   ): Promise<PongoDeleteResult>;
   deleteMany(
-    filter?: PongoFilter<T>,
+    filter?: PongoFilter<T> | SQL,
     options?: DeleteManyOptions,
   ): Promise<PongoDeleteResult>;
   findOne(
-    filter?: PongoFilter<T>,
+    filter?: PongoFilter<T> | SQL,
     options?: CollectionOperationOptions,
   ): Promise<T | null>;
   find(
-    filter?: PongoFilter<T>,
+    filter?: PongoFilter<T> | SQL,
     options?: CollectionOperationOptions,
   ): Promise<T[]>;
   findOneAndDelete(
-    filter: PongoFilter<T>,
+    filter: PongoFilter<T> | SQL,
     options?: DeleteOneOptions,
   ): Promise<T | null>;
   findOneAndReplace(
-    filter: PongoFilter<T>,
+    filter: PongoFilter<T> | SQL,
     replacement: WithoutId<T>,
     options?: ReplaceOneOptions,
   ): Promise<T | null>;
   findOneAndUpdate(
-    filter: PongoFilter<T>,
-    update: PongoUpdate<T>,
+    filter: PongoFilter<T> | SQL,
+    update: PongoUpdate<T> | SQL,
     options?: UpdateOneOptions,
   ): Promise<T | null>;
   countDocuments(
-    filter?: PongoFilter<T>,
+    filter?: PongoFilter<T> | SQL,
     options?: CollectionOperationOptions,
   ): Promise<number>;
   drop(options?: CollectionOperationOptions): Promise<boolean>;