orchid-orm 1.49.1 → 1.49.3

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-import { TableData, Query, SelectableFromShape, CreateMethodsNames, CreateData, CreateBelongsToData, AddQueryDefaults, RelationConfigBase, QueryTake, QueryTakeOptional, UpdateData, WhereArg, JoinQueryMethod, DeleteMethodsNames, Db, IsolationLevel, TransactionOptions, Adapter, FromArg, FromResult, AdapterOptions, DbSharedOptions, RelationsBase, ShapeColumnPrimaryKeys, ShapeUniqueColumns, TableDataItemsUniqueColumns, TableDataItemsUniqueColumnTuples, UniqueConstraints, TableDataItemsUniqueConstraints, ComputedColumnsFromOptions, MapTableScopesOption, TableDataItem, ComputedOptionsFactory, QueryData, TableDataFn, DbTableOptionScopes, RawSQL, DynamicRawSQL, DefaultSchemaConfig, DefaultColumnTypes, QueryBeforeHook, QueryAfterHook, AfterHook, WhereResult, MergeQuery } from 'pqb';
+import { TableData, Query, SelectableFromShape, CreateMethodsNames, CreateData, CreateBelongsToData, AddQueryDefaults, RelationConfigBase, QueryTake, QueryTakeOptional, UpdateData, WhereArg, JoinQueryMethod, DeleteMethodsNames, Db, IsolationLevel, TransactionOptions, Adapter, FromArg, FromResult, AdapterOptions, DbSharedOptions, RelationsBase, ShapeColumnPrimaryKeys, ShapeUniqueColumns, TableDataItemsUniqueColumns, TableDataItemsUniqueColumnTuples, UniqueConstraints, TableDataItemsUniqueConstraints, ComputedColumnsFromOptions, MapTableScopesOption, TableDataItem, ComputedOptionsFactory, ComputedOptionsConfig, QueryOrExpression, QueryData, TableDataFn, DbTableOptionScopes, RawSQL, DynamicRawSQL, DefaultSchemaConfig, DefaultColumnTypes, QueryBeforeHook, QueryAfterHook, AfterHook, WhereResult, MergeQuery } from 'pqb';
 export * from 'pqb';
-import { ColumnsShapeBase, ColumnShapeInputPartial, EmptyObject, MaybeArray, RecordUnknown, ShallowSimplify, ColumnShapeOutput, DefaultSelectColumns, ColumnShapeInput, IsQuery, CoreQueryScopes, ColumnSchemaConfig, StaticSQLArgs, QueryColumn, DynamicSQLArg, QueryColumns, QueryReturnType } from 'orchid-core';
+import { ColumnsShapeBase, ColumnShapeInputPartial, EmptyObject, MaybeArray, RecordUnknown, ShallowSimplify, ColumnShapeOutput, DefaultSelectColumns, QueryColumn, ColumnShapeInput, IsQuery, CoreQueryScopes, ColumnSchemaConfig, StaticSQLArgs, DynamicSQLArg, QueryColumns, QueryReturnType } from 'orchid-core';
 export * from 'orchid-core';
 
 interface RelationRefsOptions<Column extends PropertyKey = string, Shape extends ColumnsShapeBase = ColumnsShapeBase> {
@@ -468,8 +468,12 @@ type Queryable<T extends ORMTableInput> = ShallowSimplify<{
     [K in keyof T['columns']['shape']]?: T['columns']['shape'][K]['queryType'];
 }>;
 type DefaultSelect<T extends ORMTableInput> = ShallowSimplify<Pick<ColumnShapeOutput<T['columns']['shape']>, DefaultSelectColumns<T['columns']['shape']>>>;
-type Selectable<T extends ORMTableInput> = T['computed'] extends ComputedOptionsFactory<never, never> ? ShallowSimplify<ColumnShapeOutput<T['columns']['shape']> & {
-    [K in keyof ReturnType<T['computed']>]: ReturnType<T['computed']>[K]['result']['value']['outputType'];
+type Selectable<T extends ORMTableInput> = T['computed'] extends ((t: never) => infer R extends ComputedOptionsConfig) ? ShallowSimplify<ColumnShapeOutput<T['columns']['shape']> & {
+    [K in keyof R]: R[K] extends QueryOrExpression<unknown> ? R[K]['result']['value']['outputType'] : R[K] extends () => {
+        result: {
+            value: infer Value extends QueryColumn;
+        };
+    } ? Value['outputType'] : never;
 }> : ShallowSimplify<ColumnShapeOutput<T['columns']['shape']>>;
 type Insertable<T extends ORMTableInput> = ShallowSimplify<ColumnShapeInput<T['columns']['shape']>>;
 type Updatable<T extends ORMTableInput> = ShallowSimplify<ColumnShapeInputPartial<T['columns']['shape']>>;

package/dist/index.js

@@ -234,7 +234,7 @@ function joinHasRelation(baseQuery, joiningQuery, primaryKeys, foreignKeys, len)
   }
   return q;
 }
-const addAutoForeignKey = (tableConfig, from, to, primaryKeys, foreignKeys, options) => {
+const addAutoForeignKey = (tableConfig, from, to, primaryKeys, foreignKeys, options, originalForeignKeys) => {
   var _a;
   const toTable = to.table;
   let fkeyOptions = options.foreignKey !== void 0 ? options.foreignKey : tableConfig.autoForeignKeys;
@@ -273,7 +273,7 @@ const addAutoForeignKey = (tableConfig, from, to, primaryKeys, foreignKeys, opti
   }
   ((_a = from.internal.tableData).constraints ?? (_a.constraints = [])).push({
     references: {
-      columns: foreignKeys,
+      columns: originalForeignKeys || foreignKeys,
       fnOrTable: toTable,
       foreignColumns: primaryKeys,
       options: fkeyOptions
@@ -307,6 +307,7 @@ const joinQueryChainHOF = (relPKeys, reverseJoin, joinQuery) => (joiningQuery, b
   }
   const item = selectRowNumber(result, relPKeys);
   combineOrdering(result, query);
+  if (!result.q.select) result.q.select = ["*"];
   return wrapQuery(jq, result, item);
 };
 const selectRowNumber = (result, relPKeys) => {
@@ -1317,17 +1318,19 @@ const removeColumnName = (column) => {
 };
 const makeHasAndBelongsToManyMethod = (tableConfig, table, qb, relation, relationName, query) => {
   const { options } = relation;
+  const { snakeCase } = table.internal;
   const primaryKeys = options.columns;
   const foreignKeys = options.references;
+  const originalForeignKeys = snakeCase ? [...foreignKeys] : foreignKeys;
   const joinTable = options.through.table;
   const throughForeignKeys = options.through.columns;
+  const originalThroughForeignKeys = snakeCase ? [...throughForeignKeys] : throughForeignKeys;
   const throughPrimaryKeys = options.through.references;
   const { on } = options;
   if (on) {
     pqb._queryWhere(query, [on]);
     pqb._queryDefaults(query, on);
   }
-  const { snakeCase } = table.internal;
   const foreignKeysFull = foreignKeys.map((key, i) => {
     if (snakeCase) key = foreignKeys[i] = orchidCore.toSnakeCase(key);
     return `${joinTable}.${key}`;
@@ -1369,7 +1372,8 @@ const makeHasAndBelongsToManyMethod = (tableConfig, table, qb, relation, relatio
     table,
     primaryKeys,
     foreignKeys,
-    relation.options
+    relation.options,
+    originalForeignKeys
   );
   addAutoForeignKey(
     tableConfig,
@@ -1377,7 +1381,8 @@ const makeHasAndBelongsToManyMethod = (tableConfig, table, qb, relation, relatio
     query,
     throughPrimaryKeys,
     throughForeignKeys,
-    relation.options.through
+    relation.options.through,
+    originalThroughForeignKeys
   );
   const state = {
     relatedTableQuery: query,
@@ -2080,7 +2085,7 @@ const orchidORM = ({
       table.types,
       transactionStorage,
       options2,
-      table.constructor.prototype.tableData ?? orchidCore.emptyObject
+      table.constructor.prototype.tableData ?? {}
     );
     dbTable.definedAs = key;
     dbTable.db = result;