orchid-orm 1.24.6 → 1.25.0

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Query, SelectableFromShape, CreateMethodsNames, AddQueryDefaults, SetQueryReturnsOne, SetQueryReturnsOneOptional, RelationJoinQuery, UpdateData, WhereArg, CreateData, JoinQueryMethod, DeleteMethodsNames, Db, IsolationLevel, TransactionOptions, Adapter, FromArg, FromArgOptions, FromResult, AdapterOptions, QueryLogOptions, NoPrimaryKeyOption, RelationQuery, MapTableScopesOption, ComputedColumnsBase, QueryData, QueryBase, DbTableOptionScopes, DefaultSchemaConfig, DefaultColumnTypes, RelationQueryBase, QueryBeforeHook, QueryAfterHook, AfterHook, WhereResult, MergeQuery } from 'pqb';
+import { Query, SelectableFromShape, CreateMethodsNames, AddQueryDefaults, SetQueryReturnsOne, SetQueryReturnsOneOptional, RelationJoinQuery, UpdateData, WhereArg, CreateData, JoinQueryMethod, DeleteMethodsNames, Db, IsolationLevel, TransactionOptions, Adapter, FromArg, FromArgOptions, FromResult, AdapterOptions, DbSharedOptions, RelationQuery, MapTableScopesOption, ComputedColumnsBase, QueryData, QueryBase, DbTableOptionScopes, DefaultSchemaConfig, DefaultColumnTypes, RelationQueryBase, QueryBeforeHook, QueryAfterHook, AfterHook, WhereResult, MergeQuery } from 'pqb';
 export * from 'pqb';
 import { ColumnsShapeBase, EmptyObject, MaybeArray, RecordUnknown, CoreQueryScopes, ColumnShapeOutput, ColumnShapeInput, ColumnShapeInputPartial, ColumnSchemaConfig, QueryReturnType } from 'orchid-core';
 export * from 'orchid-core';
@@ -257,10 +257,7 @@ type OrchidOrmArg = true | null extends true ? 'Set strict: true to tsconfig' :
     db: Query;
 } | {
     adapter: Adapter;
-} | Omit<AdapterOptions, 'log'>) & QueryLogOptions & {
-    autoPreparedStatements?: boolean;
-    noPrimaryKey?: NoPrimaryKeyOption;
-};
+} | Omit<AdapterOptions, 'log'>) & DbSharedOptions;
 declare const orchidORM: <T extends TableClasses>({ log, logger, autoPreparedStatements, noPrimaryKey, ...options }: OrchidOrmArg, tables: T) => OrchidORM<T>;
 
 interface HasAndBelongsToMany extends RelationThunkBase {
@@ -424,13 +421,14 @@ interface Table {
     computed?: ComputedColumnsBase<never>;
     scopes?: CoreQueryScopes;
     readonly softDelete?: true | string;
+    comment?: string;
 }
 type Queryable<T extends Table> = {
     [K in keyof T['columns']]?: T['columns'][K]['queryType'];
 };
 type Selectable<T extends Table> = ColumnShapeOutput<T['columns']>;
 type Insertable<T extends Table> = ColumnShapeInput<T['columns']>;
-type Updateable<T extends Table> = ColumnShapeInputPartial<T['columns']>;
+type Updatable<T extends Table> = ColumnShapeInputPartial<T['columns']>;
 type BeforeHookMethod = <T extends Table>(cb: QueryBeforeHook) => T;
 type AfterHookMethod = <T extends Table>(cb: QueryAfterHook) => T;
 type AfterSelectableHookMethod = <T extends Table, S extends (keyof T['columns'])[]>(this: T, select: S, cb: AfterHook<S, T['columns']>) => T;
@@ -631,4 +629,4 @@ type Repo<T extends Query, Methods extends MethodsBase<T>> = (<Q extends {
 }>(q: Q) => Query & Q & MapMethods<T, Methods>) & T & MapMethods<T, Methods>;
 declare const createRepo: <T extends Query, Methods extends MethodsBase<T>>(table: T, methods: Methods) => Repo<T, Methods>;
 
-export { BaseTableClass, BaseTableInstance, DbTable, Insertable, MapMethods, MapQueryMethods, MethodsBase, OrchidORM, Queryable, Repo, ScopeFn, Selectable, Table, TableClass, TableClasses, TableToDb, Updateable, createBaseTable, createRepo, orchidORM };
+export { BaseTableClass, BaseTableInstance, DbTable, Insertable, MapMethods, MapQueryMethods, MethodsBase, OrchidORM, Queryable, Repo, ScopeFn, Selectable, Table, TableClass, TableClasses, TableToDb, Updatable, createBaseTable, createRepo, orchidORM };

package/dist/index.js

@@ -74,6 +74,7 @@ function createBaseTable({
     setColumns(fn) {
       columnTypes[orchidCore.snakeCaseKey] = this.snakeCase;
       const shape = pqb.getColumnTypes(columnTypes, fn, nowSQL, this.language);
+      this.constructor.prototype.tableData = pqb.getTableData();
       if (this.snakeCase) {
         for (const key in shape) {
           const column = shape[key];
@@ -1085,8 +1086,9 @@ var __spreadValues$3 = (a, b) => {
 };
 var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
 class HasAndBelongsToManyVirtualColumn extends pqb.VirtualColumn {
-  constructor(schema, key, state) {
+  constructor(joinTable, schema, key, state) {
     super(schema);
+    this.joinTable = joinTable;
     this.key = key;
     this.state = state;
     this.nestedInsert = nestedInsert(state);
@@ -1235,6 +1237,7 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
       });
     },
     virtualColumn: new HasAndBelongsToManyVirtualColumn(
+      subQuery,
       pqb.defaultSchemaConfig,
       relationName,
       state
@@ -1813,6 +1816,7 @@ const orchidORM = (_a, tables) => {
     "autoPreparedStatements",
     "noPrimaryKey"
   ]);
+  var _a2;
   const commonOptions = {
     log,
     logger,
@@ -1829,16 +1833,13 @@ const orchidORM = (_a, tables) => {
   } else {
     adapter = "adapter" in options ? options.adapter : new pqb.Adapter(options);
     transactionStorage = new node_async_hooks.AsyncLocalStorage();
-    qb = new pqb.Db(
+    qb = pqb._initQueryBuilder(
       adapter,
-      void 0,
-      void 0,
-      pqb.anyShape,
       pqb.makeColumnTypes(pqb.defaultSchemaConfig),
       transactionStorage,
-      commonOptions
+      commonOptions,
+      options
     );
-    qb.queryBuilder = qb;
   }
   const result = {
     $transaction: transaction,
@@ -1861,10 +1862,10 @@ const orchidORM = (_a, tables) => {
       language: table.language,
       scopes: table.scopes,
       softDelete: table.softDelete,
-      snakeCase: table.snakeCase
+      snakeCase: table.snakeCase,
+      comment: table.comment,
+      noPrimaryKey: table.noPrimaryKey ? "ignore" : void 0
     });
-    if (table.noPrimaryKey)
-      options2.noPrimaryKey = "ignore";
     const dbTable = new pqb.Db(
       adapter,
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -1873,7 +1874,8 @@ const orchidORM = (_a, tables) => {
       table.columns,
       table.types,
       transactionStorage,
-      options2
+      options2,
+      (_a2 = table.constructor.prototype.tableData) != null ? _a2 : {}
     );
     dbTable.definedAs = key;
     dbTable.db = result;
@@ -1945,13 +1947,13 @@ exports.createBaseTable = createBaseTable;
 exports.createRepo = createRepo;
 exports.orchidORM = orchidORM;
 Object.keys(pqb).forEach(function (k) {
-  if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
+  if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
     enumerable: true,
     get: function () { return pqb[k]; }
   });
 });
 Object.keys(orchidCore).forEach(function (k) {
-  if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
+  if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
     enumerable: true,
     get: function () { return orchidCore[k]; }
   });