orchid-orm 1.9.13 → 1.9.15

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as pqb from 'pqb';
-import { BelongsToRelation, HasManyRelation, HasOneRelation, Db, IsolationLevel, TransactionOptions, Adapter, FromArgs, Query, FromResult, AdapterOptions, QueryLogOptions, NoPrimaryKeyOption, HasAndBelongsToManyRelation, SetQueryTableAlias, defaultsKey, BaseRelation, RelationQuery, SetQueryReturnsOne, SetQueryReturnsOneOptional, SetQueryReturnsAll, DefaultColumnTypes, ColumnsShape, WhereResult, MergeQuery, SetQueryReturns, QueryReturnType } from 'pqb';
-export { OrchidOrmError, OrchidOrmInternalError, columnTypes } from 'pqb';
+import { BelongsToRelation, HasManyRelation, HasOneRelation, Db, IsolationLevel, TransactionOptions, Adapter, FromArgs, Query, FromResult, AdapterOptions, QueryLogOptions, NoPrimaryKeyOption, HasAndBelongsToManyRelation, SetQueryTableAlias, BaseRelation, RelationQuery, SetQueryReturnsOne, SetQueryReturnsOneOptional, SetQueryReturnsAll, DefaultColumnTypes, ColumnsShape, WhereResult, MergeQuery, SetQueryReturns, QueryReturnType } from 'pqb';
+export { OrchidOrmError, OrchidOrmInternalError, columnTypes, testTransaction } from 'pqb';
 import * as orchid_core from 'orchid-core';
 import { StringKey, EmptyObject, ColumnTypesBase, ColumnShapeOutput } from 'orchid-core';
 import { AppCodeUpdater } from 'rake-db';
@@ -74,6 +74,8 @@ type OrchidORM<T extends TableClasses = TableClasses> = {
     $close(): Promise<void>;
 };
 declare const orchidORM: <T extends TableClasses>({ log, logger, autoPreparedStatements, noPrimaryKey, ...options }: (Omit<AdapterOptions, "log"> | {
+    db: Query;
+} | {
     adapter: Adapter;
 }) & QueryLogOptions & {
     autoPreparedStatements?: boolean | undefined;
@@ -109,7 +111,9 @@ type Relation<T extends Table, Relations extends RelationThunks, K extends Strin
     joinQuery(fromQuery: Query, toQuery: Query): Query;
     defaults: Info['populate'];
     nestedCreateQuery: [Info['populate']] extends [never] ? M : M & {
-        [defaultsKey]: Record<Info['populate'], true>;
+        meta: {
+            defaults: Record<Info['populate'], true>;
+        };
     };
     primaryKey: string;
     options: Relations[K]['options'];

package/dist/index.js

@@ -1357,24 +1357,33 @@ const orchidORM = (_a, tables) => {
     "autoPreparedStatements",
     "noPrimaryKey"
   ]);
-  const adapter = "adapter" in options ? options.adapter : new pqb.Adapter(options);
   const commonOptions = {
     log,
     logger,
     autoPreparedStatements,
     noPrimaryKey
   };
-  const transactionStorage = new node_async_hooks.AsyncLocalStorage();
-  const qb = new pqb.Db(
-    adapter,
-    void 0,
-    void 0,
-    pqb.anyShape,
-    pqb.columnTypes,
-    transactionStorage,
-    commonOptions
-  );
-  qb.queryBuilder = qb;
+  let adapter;
+  let transactionStorage;
+  let qb;
+  if ("db" in options) {
+    adapter = options.db.query.adapter;
+    transactionStorage = options.db.internal.transactionStorage;
+    qb = options.db.queryBuilder;
+  } else {
+    adapter = "adapter" in options ? options.adapter : new pqb.Adapter(options);
+    transactionStorage = new node_async_hooks.AsyncLocalStorage();
+    qb = new pqb.Db(
+      adapter,
+      void 0,
+      void 0,
+      pqb.anyShape,
+      pqb.columnTypes,
+      transactionStorage,
+      commonOptions
+    );
+    qb.queryBuilder = qb;
+  }
   const result = {
     $transaction: transaction,
     $adapter: adapter,
@@ -2836,6 +2845,10 @@ Object.defineProperty(exports, 'columnTypes', {
   enumerable: true,
   get: function () { return pqb.columnTypes; }
 });
+Object.defineProperty(exports, 'testTransaction', {
+  enumerable: true,
+  get: function () { return pqb.testTransaction; }
+});
 exports.AppCodeUpdaterError = AppCodeUpdaterError;
 exports.appCodeUpdater = appCodeUpdater;
 exports.createBaseTable = createBaseTable;