@remix-run/data-table-postgres 0.2.0 → 0.3.0

package/README.md

@@ -62,20 +62,6 @@ await db.transaction(async (txDb) => txDb.exec('select 1'), {
 })
 ```
 
-### Capability Overrides For Testing
-
-You can override capabilities to verify fallback paths in tests.
-
-```ts
-import { createPostgresDatabaseAdapter } from 'remix/data-table-postgres'
-
-let adapter = createPostgresDatabaseAdapter(pool, {
-  capabilities: {
-    returning: false,
-  },
-})
-```
-
 ## Related Packages
 
 - [`data-table`](https://github.com/remix-run/remix/tree/main/packages/data-table) - Core query/relations API

package/dist/index.d.ts

@@ -1,3 +1,2 @@
-export type { PostgresDatabaseAdapterOptions } from './lib/adapter.ts';
 export { createPostgresDatabaseAdapter, PostgresDatabaseAdapter } from './lib/adapter.ts';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,8BAA8B,EAAE,MAAM,kBAAkB,CAAA;AACtE,OAAO,EAAE,6BAA6B,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAA"}

package/dist/lib/adapter.d.ts

@@ -1,12 +1,6 @@
-import type { AdapterCapabilityOverrides, DataMigrationRequest, DataManipulationRequest, DataMigrationResult, DataMigrationOperation, DataManipulationResult, DataManipulationOperation, DatabaseAdapter, SqlStatement, TableRef, TransactionOptions, TransactionToken } from '@remix-run/data-table';
-import type { Pool as PostgresPool, PoolClient as PostgresPoolClient } from 'pg';
-/**
- * Postgres adapter configuration.
- */
-export type PostgresDatabaseAdapterOptions = {
-    capabilities?: AdapterCapabilityOverrides;
-};
-type PostgresQueryable = PostgresPool | PostgresPoolClient;
+import type { DataMigrationRequest, DataManipulationRequest, DataMigrationResult, DataMigrationOperation, DataManipulationResult, DataManipulationOperation, DatabaseAdapter, SqlStatement, TableRef, TransactionOptions, TransactionToken } from '@remix-run/data-table';
+import type { Client as PostgresClient, Pool as PostgresPool, PoolClient as PostgresPoolClient } from 'pg';
+type PostgresQueryable = PostgresClient | PostgresPool | PostgresPoolClient;
 /**
  * `DatabaseAdapter` implementation for postgres-compatible clients.
  */
@@ -26,7 +20,7 @@ export declare class PostgresDatabaseAdapter implements DatabaseAdapter {
         transactionalDdl: boolean;
         migrationLock: boolean;
     };
-    constructor(client: PostgresQueryable, options?: PostgresDatabaseAdapterOptions);
+    constructor(client: PostgresQueryable);
     /**
      * Compiles a data or migration operation to postgres SQL statements.
      * @param operation Operation to compile.
@@ -126,6 +120,6 @@ export declare class PostgresDatabaseAdapter implements DatabaseAdapter {
  * let db = createDatabase(adapter)
  * ```
  */
-export declare function createPostgresDatabaseAdapter(client: PostgresQueryable, options?: PostgresDatabaseAdapterOptions): PostgresDatabaseAdapter;
+export declare function createPostgresDatabaseAdapter(client: PostgresQueryable): PostgresDatabaseAdapter;
 export {};
 //# sourceMappingURL=adapter.d.ts.map

package/dist/lib/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/lib/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,0BAA0B,EAC1B,oBAAoB,EACpB,uBAAuB,EACvB,mBAAmB,EACnB,sBAAsB,EACtB,sBAAsB,EACtB,yBAAyB,EACzB,eAAe,EAEf,YAAY,EACZ,QAAQ,EACR,kBAAkB,EAClB,gBAAgB,EACjB,MAAM,uBAAuB,CAAA;AAO9B,OAAO,KAAK,EAAE,IAAI,IAAI,YAAY,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,IAAI,CAAA;AAIhF;;GAEG;AACH,MAAM,MAAM,8BAA8B,GAAG;IAC3C,YAAY,CAAC,EAAE,0BAA0B,CAAA;CAC1C,CAAA;AAOD,KAAK,iBAAiB,GAAG,YAAY,GAAG,kBAAkB,CAAA;AAE1D;;GAEG;AACH,qBAAa,uBAAwB,YAAW,eAAe;;IAC7D;;OAEG;IACH,OAAO,SAAa;IAEpB;;OAEG;IACH,YAAY;;;;;;MAAA;IAMZ,YAAY,MAAM,EAAE,iBAAiB,EAAE,OAAO,CAAC,EAAE,8BAA8B,EAS9E;IAED;;;;OAIG;IACH,UAAU,CAAC,SAAS,EAAE,yBAAyB,GAAG,sBAAsB,GAAG,YAAY,EAAE,CAOxF;IAED;;;;OAIG;IACG,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAuB/E;IAED;;;;OAIG;IACG,OAAO,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAWzE;IAED;;;;;OAKG;IACG,QAAQ,CAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAMhF;IAED;;;;;;OAMG;IACG,SAAS,CACb,KAAK,EAAE,QAAQ,EACf,MAAM,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,gBAAgB,GAC7B,OAAO,CAAC,OAAO,CAAC,CASlB;IAED;;;;OAIG;IACG,gBAAgB,CAAC,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA0B9E;IAED;;;;OAIG;IACG,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgB9D;IAED;;;;OAIG;IACG,mBAAmB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBhE;IAED;;;;;OAKG;IACG,eAAe,CAAC,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG1E;IAED;;;;;OAKG;IACG,mBAAmB,CAAC,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG9E;IAED;;;;;OAKG;IACG,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG3E;IAED;;;OAGG;IACG,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAE1C;IAED;;;OAGG;IACG,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAE1C;CAmBF;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,iBAAiB,EACzB,OAAO,CAAC,EAAE,8BAA8B,GACvC,uBAAuB,CAEzB"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/lib/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EACpB,uBAAuB,EACvB,mBAAmB,EACnB,sBAAsB,EACtB,sBAAsB,EACtB,yBAAyB,EACzB,eAAe,EAEf,YAAY,EACZ,QAAQ,EACR,kBAAkB,EAClB,gBAAgB,EACjB,MAAM,uBAAuB,CAAA;AAO9B,OAAO,KAAK,EACV,MAAM,IAAI,cAAc,EACxB,IAAI,IAAI,YAAY,EACpB,UAAU,IAAI,kBAAkB,EACjC,MAAM,IAAI,CAAA;AASX,KAAK,iBAAiB,GAAG,cAAc,GAAG,YAAY,GAAG,kBAAkB,CAAA;AAE3E;;GAEG;AACH,qBAAa,uBAAwB,YAAW,eAAe;;IAC7D;;OAEG;IACH,OAAO,SAAa;IAEpB;;OAEG;IACH,YAAY;;;;;;MAAA;IAMZ,YAAY,MAAM,EAAE,iBAAiB,EASpC;IAED;;;;OAIG;IACH,UAAU,CAAC,SAAS,EAAE,yBAAyB,GAAG,sBAAsB,GAAG,YAAY,EAAE,CAOxF;IAED;;;;OAIG;IACG,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAuB/E;IAED;;;;OAIG;IACG,OAAO,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAWzE;IAED;;;;;OAKG;IACG,QAAQ,CAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAMhF;IAED;;;;;;OAMG;IACG,SAAS,CACb,KAAK,EAAE,QAAQ,EACf,MAAM,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,gBAAgB,GAC7B,OAAO,CAAC,OAAO,CAAC,CASlB;IAED;;;;OAIG;IACG,gBAAgB,CAAC,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA0B9E;IAED;;;;OAIG;IACG,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgB9D;IAED;;;;OAIG;IACG,mBAAmB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBhE;IAED;;;;;OAKG;IACG,eAAe,CAAC,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG1E;IAED;;;;;OAKG;IACG,mBAAmB,CAAC,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG9E;IAED;;;;;OAKG;IACG,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG3E;IAED;;;OAGG;IACG,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAE1C;IAED;;;OAGG;IACG,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAE1C;CAmBF;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,iBAAiB,GAAG,uBAAuB,CAEhG"}

package/dist/lib/adapter.js

@@ -16,14 +16,14 @@ export class PostgresDatabaseAdapter {
     #client;
     #transactions = new Map();
     #transactionCounter = 0;
-    constructor(client, options) {
+    constructor(client) {
         this.#client = client;
         this.capabilities = {
-            returning: options?.capabilities?.returning ?? true,
-            savepoints: options?.capabilities?.savepoints ?? true,
-            upsert: options?.capabilities?.upsert ?? true,
-            transactionalDdl: options?.capabilities?.transactionalDdl ?? true,
-            migrationLock: options?.capabilities?.migrationLock ?? true,
+            returning: true,
+            savepoints: true,
+            upsert: true,
+            transactionalDdl: true,
+            migrationLock: true,
         };
     }
     /**
@@ -247,8 +247,8 @@ export class PostgresDatabaseAdapter {
  * let db = createDatabase(adapter)
  * ```
  */
-export function createPostgresDatabaseAdapter(client, options) {
-    return new PostgresDatabaseAdapter(client, options);
+export function createPostgresDatabaseAdapter(client) {
+    return new PostgresDatabaseAdapter(client);
 }
 function isPostgresPool(client) {
     return 'connect' in client && typeof client.connect === 'function';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/data-table-postgres",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "PostgreSQL adapter for remix/data-table",
   "author": "Michael Jackson <mjijackson@gmail.com>",
   "license": "MIT",

package/src/index.ts

@@ -1,2 +1 @@
-export type { PostgresDatabaseAdapterOptions } from './lib/adapter.ts'
 export { createPostgresDatabaseAdapter, PostgresDatabaseAdapter } from './lib/adapter.ts'

package/src/lib/adapter.ts

@@ -1,5 +1,4 @@
 import type {
-  AdapterCapabilityOverrides,
   DataMigrationRequest,
   DataManipulationRequest,
   DataMigrationResult,
@@ -19,23 +18,20 @@ import {
   quoteLiteral as quoteLiteralHelper,
   quoteTableRef as quoteTableRefHelper,
 } from '@remix-run/data-table/sql-helpers'
-import type { Pool as PostgresPool, PoolClient as PostgresPoolClient } from 'pg'
+import type {
+  Client as PostgresClient,
+  Pool as PostgresPool,
+  PoolClient as PostgresPoolClient,
+} from 'pg'
 
 import { compilePostgresOperation } from './sql-compiler.ts'
 
-/**
- * Postgres adapter configuration.
- */
-export type PostgresDatabaseAdapterOptions = {
-  capabilities?: AdapterCapabilityOverrides
-}
-
 type TransactionState = {
-  client: PostgresPoolClient
+  client: PostgresClient | PostgresPoolClient
   releaseOnClose: boolean
 }
 
-type PostgresQueryable = PostgresPool | PostgresPoolClient
+type PostgresQueryable = PostgresClient | PostgresPool | PostgresPoolClient
 
 /**
  * `DatabaseAdapter` implementation for postgres-compatible clients.
@@ -55,14 +51,14 @@ export class PostgresDatabaseAdapter implements DatabaseAdapter {
   #transactions = new Map<string, TransactionState>()
   #transactionCounter = 0
 
-  constructor(client: PostgresQueryable, options?: PostgresDatabaseAdapterOptions) {
+  constructor(client: PostgresQueryable) {
     this.#client = client
     this.capabilities = {
-      returning: options?.capabilities?.returning ?? true,
-      savepoints: options?.capabilities?.savepoints ?? true,
-      upsert: options?.capabilities?.upsert ?? true,
-      transactionalDdl: options?.capabilities?.transactionalDdl ?? true,
-      migrationLock: options?.capabilities?.migrationLock ?? true,
+      returning: true,
+      savepoints: true,
+      upsert: true,
+      transactionalDdl: true,
+      migrationLock: true,
     }
   }
 
@@ -171,7 +167,7 @@ export class PostgresDatabaseAdapter implements DatabaseAdapter {
    */
   async beginTransaction(options?: TransactionOptions): Promise<TransactionToken> {
     let releaseOnClose = false
-    let transactionClient: PostgresPoolClient
+    let transactionClient: PostgresClient | PostgresPoolClient
 
     if (isPostgresPool(this.#client)) {
       transactionClient = await this.#client.connect()
@@ -300,7 +296,7 @@ export class PostgresDatabaseAdapter implements DatabaseAdapter {
     return this.#transactionClient(token)
   }
 
-  #transactionClient(token: TransactionToken): PostgresPoolClient {
+  #transactionClient(token: TransactionToken): PostgresClient | PostgresPoolClient {
     let transaction = this.#transactions.get(token.id)
 
     if (!transaction) {
@@ -327,18 +323,15 @@ export class PostgresDatabaseAdapter implements DatabaseAdapter {
  * let db = createDatabase(adapter)
  * ```
  */
-export function createPostgresDatabaseAdapter(
-  client: PostgresQueryable,
-  options?: PostgresDatabaseAdapterOptions,
-): PostgresDatabaseAdapter {
-  return new PostgresDatabaseAdapter(client, options)
+export function createPostgresDatabaseAdapter(client: PostgresQueryable): PostgresDatabaseAdapter {
+  return new PostgresDatabaseAdapter(client)
 }
 
 function isPostgresPool(client: PostgresQueryable): client is PostgresPool {
   return 'connect' in client && typeof client.connect === 'function'
 }
 
-function releasePostgresClient(client: PostgresPoolClient): void {
+function releasePostgresClient(client: PostgresClient | PostgresPoolClient): void {
   let release = (client as { release?: () => void }).release
   release?.()
 }