pqb 0.7.6 → 0.7.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pqb",
-  "version": "0.7.6",
+  "version": "0.7.8",
   "description": "Postgres query builder",
   "homepage": "https://orchid-orm.netlify.app/guide/query-builder-setup.html",
   "repository": {

package/src/adapter.ts

@@ -41,8 +41,9 @@ for (const key in types.builtins) {
 
 const returnArg = (arg: unknown) => arg;
 
-export type AdapterOptions = Omit<PoolConfig, 'types'> & {
+export type AdapterOptions = Omit<PoolConfig, 'types' | 'connectionString'> & {
   types?: TypeParsers;
+  databaseURL?: string;
 };
 
 export class Adapter {
@@ -51,6 +52,13 @@ export class Adapter {
 
   constructor({ types = defaultTypeParsers, ...config }: AdapterOptions) {
     this.types = types;
+    if (config.databaseURL) {
+      (config as PoolConfig).connectionString = config.databaseURL;
+      const url = new URL(config.databaseURL);
+      if (url.searchParams.get('ssl') === 'true') {
+        config.ssl = true;
+      }
+    }
     this.pool = new Pool(config);
   }
 

package/src/db.test.ts

@@ -2,6 +2,7 @@ import {
   adapter,
   assertType,
   db,
+  dbOptions,
   expectSql,
   User,
   userData,
@@ -153,4 +154,16 @@ describe('db', () => {
       expect(logger.warn).not.toBeCalled();
     });
   });
+
+  it('should use ssl when ssl=true query parameter provided on a databaseUrl option', () => {
+    const db = createDb({
+      ...dbOptions,
+      databaseURL: dbOptions.databaseURL + '?ssl=true',
+    });
+
+    expect(
+      (db.adapter.pool as unknown as { options: Record<string, unknown> })
+        .options.ssl,
+    ).toBe(true);
+  });
 });

package/src/errors.ts

@@ -1,4 +1,3 @@
-import { DatabaseError } from 'pg';
 import { ColumnsShape } from './columnSchema';
 
 export class PormError extends Error {}
@@ -34,7 +33,7 @@ export type QueryErrorName =
 
 export class QueryError<
   T extends { shape: ColumnsShape } = { shape: ColumnsShape },
-> extends DatabaseError {
+> extends Error {
   message!: string;
   name!: QueryErrorName;
   stack: string | undefined;

package/src/test-utils/test-utils.ts

@@ -12,11 +12,11 @@ import { MaybeArray, toArray } from '../utils';
 import { Adapter } from '../adapter';
 
 export const dbOptions = {
-  connectionString: process.env.DATABASE_URL,
+  databaseURL: process.env.DATABASE_URL,
   columnTypes,
 };
 
-export const dbClient = new Client(dbOptions);
+export const dbClient = new Client({ connectionString: dbOptions.databaseURL });
 
 export const adapter = new Adapter(dbOptions);
 

package/src/test-utils/user.csv

@@ -1 +0,0 @@
-1,name,password,,,,,,,,