Added SQL exectuor to PongoDB and listing currently known Pongo Collections

Author: oskardudycz

src/packages/pongo/src/core/collection/pongoCollection.ts

@@ -66,7 +66,7 @@ const enlistIntoTransactionIfActive = async <
   return await transaction.enlistDatabase(db);
 };
 
-const transactionExecutorOrDefault = async <
+export const transactionExecutorOrDefault = async <
   ConnectorType extends string = string,
 >(
   db: PongoDb<ConnectorType>,
@@ -467,7 +467,7 @@ export const pongoCollection = <
       ): Promise<Result[]> {
         await ensureCollectionCreated(options);
 
-        const result = await query<Result>(sql);
+        const result = await query<Result>(sql, options);
         return result.rows;
       },
       async command<Result extends QueryResultRow = QueryResultRow>(
@@ -476,7 +476,7 @@ export const pongoCollection = <
       ): Promise<QueryResult<Result>> {
         await ensureCollectionCreated(options);
 
-        return command(sql);
+        return command(sql, options);
       },
     },
     schema: {

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

@@ -67,10 +67,21 @@ export interface PongoDb<ConnectorType extends string = string>
   connect(): Promise<void>;
   close(): Promise<void>;
   collection<T extends PongoDocument>(name: string): PongoCollection<T>;
+  collections(): ReadonlyArray<PongoCollection<PongoDocument>>;
   readonly schema: Readonly<{
     component: SchemaComponent;
     migrate(): Promise<void>;
   }>;
+  sql: {
+    query<Result extends QueryResultRow = QueryResultRow>(
+      sql: SQL,
+      options?: CollectionOperationOptions,
+    ): Promise<Result[]>;
+    command<Result extends QueryResultRow = QueryResultRow>(
+      sql: SQL,
+      options?: CollectionOperationOptions,
+    ): Promise<QueryResult<Result>>;
+  };
 }
 
 export type CollectionOperationOptions = {

src/packages/pongo/src/postgres/dbClient.ts

@@ -4,8 +4,11 @@ import {
   NodePostgresConnectorType,
   runPostgreSQLMigrations,
   schemaComponent,
+  SQL,
   type PostgresConnector,
   type PostgresPoolOptions,
+  type QueryResult,
+  type QueryResultRow,
   type SchemaComponent,
 } from '@event-driven-io/dumbo';
 import type { Document } from 'mongodb';
@@ -14,6 +17,8 @@ import {
   pongoCollection,
   pongoCollectionSchemaComponent,
   proxyPongoDbWithSchema,
+  transactionExecutorOrDefault,
+  type CollectionOperationOptions,
   type PongoCollection,
   type PongoDb,
   type PongoDbClientOptions,
@@ -40,11 +45,29 @@ export const postgresDb = (
 
   const collections = new Map<string, PongoCollection<Document>>();
 
+  const command = async <Result extends QueryResultRow = QueryResultRow>(
+    sql: SQL,
+    options?: CollectionOperationOptions,
+  ) =>
+    (
+      await transactionExecutorOrDefault(db, options, pool.execute)
+    ).command<Result>(sql);
+
+  const query = async <T extends QueryResultRow>(
+    sql: SQL,
+    options?: CollectionOperationOptions,
+  ) =>
+    (await transactionExecutorOrDefault(db, options, pool.execute)).query<T>(
+      sql,
+    );
+
   const db: PongoDb<PostgresConnector> = {
     connectorType: options.connectorType,
     databaseName,
     connect: () => Promise.resolve(),
     close: () => pool.close(),
+
+    collections: () => [...collections.values()],
     collection: (collectionName) =>
       pongoCollection({
         collectionName,
@@ -72,6 +95,22 @@ export const postgresDb = (
           ),
         ),
     },
+
+    sql: {
+      async query<Result extends QueryResultRow = QueryResultRow>(
+        sql: SQL,
+        options?: CollectionOperationOptions,
+      ): Promise<Result[]> {
+        const result = await query<Result>(sql, options);
+        return result.rows;
+      },
+      async command<Result extends QueryResultRow = QueryResultRow>(
+        sql: SQL,
+        options?: CollectionOperationOptions,
+      ): Promise<QueryResult<Result>> {
+        return command(sql, options);
+      },
+    },
   };
 
   const dbsSchema = options?.schema?.definition?.dbs;