orchid-orm 1.24.6 → 1.25.0

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { makeColumnTypes, defaultSchemaConfig, QueryHooks, getColumnTypes, _queryHookAfterCreate, _queryHookAfterUpdate, getQueryAs, setQueryObjectValue, pushQueryOn, VirtualColumn, pushQueryValue, _queryCreateMany, isQueryReturnsAll, _queryHookBeforeUpdate, _queryFindBy, _queryCreate, _queryRows, _queryUpdate, _queryDelete, _queryDefaults, _queryUpdateOrThrow, _queryWhere, toSQLCacheKey, _queryJoinOn, OrchidOrmInternalError, _queryCreateFrom, NotFoundError, _queryFindByOptional, _querySelect, _queryWhereExists, _queryTake, _queryTakeOptional, _queryAll, Adapter, Db, anyShape, addComputedColumns, getClonedQueryData } from 'pqb';
+import { makeColumnTypes, defaultSchemaConfig, QueryHooks, getColumnTypes, getTableData, _queryHookAfterCreate, _queryHookAfterUpdate, getQueryAs, setQueryObjectValue, pushQueryOn, VirtualColumn, pushQueryValue, _queryCreateMany, isQueryReturnsAll, _queryHookBeforeUpdate, _queryFindBy, _queryCreate, _queryRows, _queryUpdate, _queryDelete, _queryDefaults, _queryUpdateOrThrow, _queryWhere, toSQLCacheKey, _queryJoinOn, OrchidOrmInternalError, _queryCreateFrom, NotFoundError, _queryFindByOptional, _querySelect, _queryWhereExists, _queryTake, _queryTakeOptional, _queryAll, Adapter, _initQueryBuilder, Db, addComputedColumns, getClonedQueryData } from 'pqb';
 export * from 'pqb';
 import { getStackTrace, applyMixins, getCallerFilePath, snakeCaseKey, toSnakeCase, emptyArray, objectHasValues, toArray } from 'orchid-core';
 export * from 'orchid-core';
@@ -74,6 +74,7 @@ function createBaseTable({
     setColumns(fn) {
       columnTypes[snakeCaseKey] = this.snakeCase;
       const shape = getColumnTypes(columnTypes, fn, nowSQL, this.language);
+      this.constructor.prototype.tableData = 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 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,
       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 Adapter(options);
     transactionStorage = new AsyncLocalStorage();
-    qb = new Db(
+    qb = _initQueryBuilder(
       adapter,
-      void 0,
-      void 0,
-      anyShape,
       makeColumnTypes(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 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;