@pothos/plugin-drizzle 0.11.1 → 0.12.0

package/src/connection-helpers.ts

@@ -2,7 +2,6 @@ import type { InputFieldMap, InputShapeFromFields, SchemaTypes } from '@pothos/c
 import type {
   BuildQueryResult,
   DBQueryConfig,
-  ExtractTablesWithRelations,
   RelationsFilter,
   TableRelationalConfig,
 } from 'drizzle-orm';
@@ -21,9 +20,9 @@ import { createState, mergeSelection, selectionToQuery } from './utils/selection
 
 export function drizzleConnectionHelpers<
   Types extends SchemaTypes,
-  Type extends DrizzleRef<Types> | keyof Types['DrizzleRelationsConfig'],
-  Selection extends DBQueryConfig<'one', Types['DrizzleRelationsConfig'], Table> | true,
-  Table extends TableRelationalConfig = Types['DrizzleRelationsConfig'][Type extends DrizzleRef<
+  Type extends DrizzleRef<Types> | keyof Types['DrizzleRelations'],
+  Selection extends DBQueryConfig<'one', Types['DrizzleRelations'], TableConfig> | true,
+  TableConfig extends TableRelationalConfig = Types['DrizzleRelations'][Type extends DrizzleRef<
     Types,
     infer T
   >
@@ -32,14 +31,14 @@ export function drizzleConnectionHelpers<
   Shape = Type extends DrizzleRef<
     // biome-ignore lint/suspicious/noExplicitAny: this is fine
     any,
-    keyof Types['DrizzleRelationsConfig'],
+    keyof Types['DrizzleRelations'],
     infer S
   >
     ? S
-    : BuildQueryResult<Types['DrizzleRelationsConfig'], Table, true>,
+    : BuildQueryResult<Types['DrizzleRelations'], TableConfig, true>,
   EdgeShape = true extends Selection
     ? Shape
-    : BuildQueryResult<Types['DrizzleRelationsConfig'], Table, Selection>,
+    : BuildQueryResult<Types['DrizzleRelations'], TableConfig, Selection>,
   NodeShape = EdgeShape,
   ExtraArgs extends InputFieldMap = {},
 >(
@@ -59,7 +58,7 @@ export function drizzleConnectionHelpers<
       args: InputShapeFromFields<ExtraArgs> & PothosSchemaTypes.DefaultConnectionArguments,
       ctx: Types['Context'],
     ) => Selection;
-    query?: QueryForDrizzleConnection<Types, Table> extends infer QueryConfig
+    query?: QueryForDrizzleConnection<Types, TableConfig> extends infer QueryConfig
       ?
           | QueryConfig
           | ((args: InputShapeFromFields<ExtraArgs>, context: Types['Context']) => QueryConfig)
@@ -116,7 +115,7 @@ export function drizzleConnectionHelpers<
   ) => {
     const { limit, orderBy, where, ...fieldQuery } =
       (typeof query === 'function' ? query(args, ctx) : query) ?? {};
-    const table = config.relations.tablesConfig[tableName] as Table;
+    const table = config.relations[tableName];
 
     const { cursorColumns, columns, ...connectionQuery } = drizzleCursorConnectionQuery({
       ctx,
@@ -169,7 +168,7 @@ export function drizzleConnectionHelpers<
     const queryArgs = getQueryArgs(args, ctx);
 
     const selectState = createState(
-      config.relations.tablesConfig[tableName],
+      config.relations[tableName],
       builder.options.drizzle?.skipDeferredFragments ?? true,
     );
 
@@ -187,9 +186,11 @@ export function drizzleConnectionHelpers<
       ...queryResult,
     } as unknown as Omit<Selection, 'orderBy'> & {
       orderBy: {
-        [K in keyof Table['columns']]?: 'asc' | 'desc' | undefined;
+        [K in TableConfig['table']['_'] extends { columns: infer Columns }
+          ? keyof Columns
+          : never]?: 'asc' | 'desc' | undefined;
       };
-      where: RelationsFilter<Table, ExtractTablesWithRelations<Types['DrizzleRelations']>>;
+      where: RelationsFilter<TableConfig, Types['DrizzleRelations']>;
     };
   }
 

package/src/drizzle-field-builder.ts

@@ -18,7 +18,7 @@ import {
   type TypeParam,
 } from '@pothos/core';
 import {
-  getTableUniqueName,
+  getTableName,
   type InferSelectModel,
   Many,
   type Table,
@@ -197,13 +197,11 @@ export class DrizzleObjectFieldBuilder<
     edgeOptions = {},
   ) {
     const schemaConfig = getSchemaConfig(this.builder);
-    const relationField =
-      schemaConfig.relations.tablesConfig?.[this.table].relations[name as string];
-    const tableUniqueName = getTableUniqueName(relationField.targetTable as Table);
-    const tableName = schemaConfig.relations.tableNamesMap[tableUniqueName];
-    const relatedModel = schemaConfig.relations.tables[tableName] as Table;
+    const relationField = schemaConfig.relations?.[this.table].relations[name as string];
+    const tableName = getTableName(relationField.targetTable as Table);
+    const relatedTable = schemaConfig.relations[tableName];
 
-    if (!relatedModel) {
+    if (!relatedTable) {
       throw new PothosSchemaError(
         `Could not find relation ${name as string} on table ${this.table}`,
       );
@@ -216,20 +214,17 @@ export class DrizzleObjectFieldBuilder<
       const { limit, orderBy, where, ...fieldQuery } =
         (typeof query === 'function' ? query(args, ctx) : query) ?? {};
 
-      const tableUniqueName = getTableUniqueName(relatedModel as Table);
-      const tableName = schemaConfig.relations.tableNamesMap[tableUniqueName];
-
       const { cursorColumns, columns, ...connectionQuery } = drizzleCursorConnectionQuery({
         ctx,
         maxSize,
         defaultSize,
         args,
         orderBy:
-          (typeof orderBy === 'function' ? orderBy(relatedModel) : orderBy) ??
+          (typeof orderBy === 'function' ? orderBy(relatedTable.table) : orderBy) ??
           getSchemaConfig(this.builder).getPrimaryKey(tableName),
         where,
         config: schemaConfig,
-        table: schemaConfig.relations.tablesConfig[tableName],
+        table: relatedTable,
       });
 
       return {
@@ -315,7 +310,7 @@ export class DrizzleObjectFieldBuilder<
   }
 
   variant<
-    Variant extends DrizzleRef<Types, TableConfig['tsName']> | TableConfig['tsName'],
+    Variant extends DrizzleRef<Types, TableConfig['name']> | TableConfig['name'],
     Args extends InputFieldMap,
     Nullable,
     ResolveShape,
@@ -326,7 +321,7 @@ export class DrizzleObjectFieldBuilder<
       [
         options: VariantFieldOptions<
           Types,
-          TableConfig['tsName'] & keyof Types['DrizzleRelationsConfig'],
+          TableConfig['name'] & keyof Types['DrizzleRelations'],
           Variant,
           Args,
           Nullable,
@@ -393,19 +388,16 @@ export class DrizzleObjectFieldBuilder<
   ): FieldRef<Types, TypesForRelation<Types, TableConfig['relations'][Field]>, 'Object'> {
     const [options = {} as never] = allArgs;
     const schemaConfig = getSchemaConfig(this.builder);
-    const relationField =
-      schemaConfig.relations.tablesConfig?.[this.table].relations[name as string];
-
-    const tableUniqueName = getTableUniqueName(relationField.targetTable as Table);
-    const tableName = schemaConfig.relations.tableNamesMap[tableUniqueName];
-    const relatedModel = schemaConfig.relations.tables[tableName];
+    const relationField = schemaConfig.relations?.[this.table].relations[name as string];
+    const tableName = getTableName(relationField.targetTable as Table);
+    const relatedTable = schemaConfig.relations[tableName];
 
-    if (!relatedModel) {
+    if (!relatedTable) {
       throw new PothosSchemaError(
         `Could not find relation ${name as string} on table ${this.table}`,
       );
     }
-    const ref = options.type ?? getRefFromModel(tableName, this.builder);
+    const ref = options.type ?? getRefFromModel(relatedTable.name, this.builder);
 
     const { query = {}, extensions, ...rest } = options;
 
@@ -459,13 +451,13 @@ export class DrizzleObjectFieldBuilder<
           >,
       ]
     >
-  ) {
+  ): FieldRef<Types, ShapeFromTypeParam<Types, Type, Nullable>, 'DrizzleObject'> {
     const [name, options = {} as never] = args;
 
     const typeConfig = this.builder.configStore.getTypeConfig(this.typename, this.graphqlKind);
     const usingSelect = !!typeConfig.extensions?.pothosDrizzleSelect;
 
-    return this.exposeField(name as never, {
+    return this.exposeField<Type, Nullable, never>(name as never, {
       ...options,
       extensions: {
         ...options.extensions,

package/src/global-types.ts

@@ -2,7 +2,6 @@ import type {
   FieldKind,
   FieldMap,
   FieldNullability,
-  FieldRef,
   InputFieldMap,
   InterfaceParam,
   NormalizeArgs,
@@ -13,10 +12,8 @@ import type {
   TypeParam,
 } from '@pothos/core';
 import type {
-  AnyRelations,
   BuildQueryResult,
   DBQueryConfig,
-  ExtractTablesWithRelations,
   TableRelationalConfig,
   TablesRelationalConfig,
 } from 'drizzle-orm';
@@ -55,30 +52,24 @@ declare global {
     }
 
     export interface UserSchemaTypes {
-      DrizzleRelations: AnyRelations;
-      DrizzleRelationsConfig: TablesRelationalConfig;
+      DrizzleRelations: TablesRelationalConfig;
     }
 
     export interface ExtendDefaultTypes<PartialTypes extends Partial<UserSchemaTypes>> {
       DrizzleRelations: PartialTypes['DrizzleRelations'] & {};
-      DrizzleRelationsConfig: ExtractTablesWithRelations<PartialTypes['DrizzleRelations'] & {}>;
     }
 
     export interface SchemaBuilder<Types extends SchemaTypes> {
       drizzleObject: <
         const Interfaces extends InterfaceParam<Types>[],
-        Table extends keyof Types['DrizzleRelations']['tables'],
+        Table extends keyof Types['DrizzleRelations'],
         Selection extends
-          | DBQueryConfig<
-              'one',
-              Types['DrizzleRelationsConfig'],
-              Types['DrizzleRelationsConfig'][Table]
-            >
+          | DBQueryConfig<'one', Types['DrizzleRelations'], Types['DrizzleRelations'][Table]>
           | true,
         Shape = BuildQueryResult<
-          Types['DrizzleRelationsConfig'],
-          Types['DrizzleRelationsConfig'][Table],
-          Selection
+          Types['DrizzleRelations'],
+          Types['DrizzleRelations'][Table],
+          true extends Selection ? true : Selection & { columns: {} }
         >,
       >(
         table: Table,
@@ -87,18 +78,14 @@ declare global {
 
       drizzleInterface: <
         const Interfaces extends InterfaceParam<Types>[],
-        Table extends keyof Types['DrizzleRelationsConfig'],
+        Table extends keyof Types['DrizzleRelations'],
         Selection extends
-          | DBQueryConfig<
-              'one',
-              Types['DrizzleRelationsConfig'],
-              Types['DrizzleRelationsConfig'][Table]
-            >
+          | DBQueryConfig<'one', Types['DrizzleRelations'], Types['DrizzleRelations'][Table]>
           | true,
         Shape = BuildQueryResult<
-          Types['DrizzleRelationsConfig'],
-          Types['DrizzleRelationsConfig'][Table],
-          Selection
+          Types['DrizzleRelations'],
+          Types['DrizzleRelations'][Table],
+          true extends Selection ? true : Selection & { columns: {} }
         >,
       >(
         table: Table,
@@ -108,19 +95,15 @@ declare global {
       drizzleNode: 'relay' extends PluginName
         ? <
             const Interfaces extends InterfaceParam<Types>[],
-            Table extends keyof Types['DrizzleRelationsConfig'],
+            Table extends keyof Types['DrizzleRelations'],
             Selection extends
-              | DBQueryConfig<
-                  'one',
-                  Types['DrizzleRelationsConfig'],
-                  Types['DrizzleRelationsConfig'][Table]
-                >
+              | DBQueryConfig<'one', Types['DrizzleRelations'], Types['DrizzleRelations'][Table]>
               | true,
             IDColumns,
             Shape = BuildQueryResult<
-              Types['DrizzleRelationsConfig'],
-              Types['DrizzleRelationsConfig'][Table],
-              Selection
+              Types['DrizzleRelations'],
+              Types['DrizzleRelations'][Table],
+              true extends Selection ? true : Selection & { columns: {} }
             >,
           >(
             table: Table,
@@ -129,17 +112,17 @@ declare global {
         : '@pothos/plugin-relay is required to use this method';
 
       drizzleObjectField: <
-        Type extends DrizzleObjectRef<Types> | keyof Types['DrizzleRelationsConfig'],
+        Type extends DrizzleObjectRef<Types> | keyof Types['DrizzleRelations'],
         TableConfig extends TableRelationalConfig = Type extends DrizzleObjectRef<Types>
           ? Type[typeof drizzleTableKey]
-          : Types['DrizzleRelationsConfig'][Type & keyof Types['DrizzleRelationsConfig']],
+          : Types['DrizzleRelations'][Type & keyof Types['DrizzleRelations']],
         Shape extends {} = Type extends DrizzleObjectRef<
           Types,
-          keyof Types['DrizzleRelationsConfig'],
+          keyof Types['DrizzleRelations'],
           infer S
         >
-          ? S & { [drizzleTableName]?: TableConfig['tsName'] }
-          : BuildQueryResult<Types['DrizzleRelationsConfig'], TableConfig, true> & {
+          ? S & { [drizzleTableName]?: TableConfig['name'] }
+          : BuildQueryResult<Types['DrizzleRelations'], TableConfig, true> & {
               [drizzleTableName]?: Type;
             },
       >(
@@ -149,17 +132,17 @@ declare global {
       ) => void;
 
       drizzleInterfaceField: <
-        Type extends DrizzleInterfaceRef<Types> | keyof Types['DrizzleRelationsConfig'],
+        Type extends DrizzleInterfaceRef<Types> | keyof Types['DrizzleRelations'],
         TableConfig extends TableRelationalConfig = Type extends DrizzleInterfaceRef<Types>
           ? Type[typeof drizzleTableKey]
-          : Types['DrizzleRelationsConfig'][Type & keyof Types['DrizzleRelationsConfig']],
+          : Types['DrizzleRelations'][Type & keyof Types['DrizzleRelations']],
         Shape extends {} = Type extends DrizzleInterfaceRef<
           Types,
-          keyof Types['DrizzleRelationsConfig'],
+          keyof Types['DrizzleRelations'],
           infer S
         >
-          ? S & { [drizzleTableName]?: TableConfig['tsName'] }
-          : BuildQueryResult<Types['DrizzleRelationsConfig'], TableConfig, true> & {
+          ? S & { [drizzleTableName]?: TableConfig['name'] }
+          : BuildQueryResult<Types['DrizzleRelations'], TableConfig, true> & {
               [drizzleTableName]?: Type;
             },
       >(
@@ -169,17 +152,17 @@ declare global {
       ) => void;
 
       drizzleObjectFields: <
-        Type extends DrizzleObjectRef<Types> | keyof Types['DrizzleRelationsConfig'],
+        Type extends DrizzleObjectRef<Types> | keyof Types['DrizzleRelations'],
         TableConfig extends TableRelationalConfig = Type extends DrizzleObjectRef<Types>
           ? Type[typeof drizzleTableKey]
-          : Types['DrizzleRelationsConfig'][Type & keyof Types['DrizzleRelationsConfig']],
+          : Types['DrizzleRelations'][Type & keyof Types['DrizzleRelations']],
         Shape extends {} = Type extends DrizzleObjectRef<
           Types,
-          keyof Types['DrizzleRelationsConfig'],
+          keyof Types['DrizzleRelations'],
           infer S
         >
-          ? S & { [drizzleTableName]?: TableConfig['tsName'] }
-          : BuildQueryResult<Types['DrizzleRelationsConfig'], TableConfig, true> & {
+          ? S & { [drizzleTableName]?: TableConfig['name'] }
+          : BuildQueryResult<Types['DrizzleRelations'], TableConfig, true> & {
               [drizzleTableName]?: Type;
             },
       >(
@@ -188,17 +171,17 @@ declare global {
       ) => void;
 
       drizzleInterfaceFields: <
-        Type extends DrizzleInterfaceRef<Types> | keyof Types['DrizzleRelationsConfig'],
+        Type extends DrizzleInterfaceRef<Types> | keyof Types['DrizzleRelations'],
         TableConfig extends TableRelationalConfig = Type extends DrizzleInterfaceRef<Types>
           ? Type[typeof drizzleTableKey]
-          : Types['DrizzleRelationsConfig'][Type & keyof Types['DrizzleRelationsConfig']],
+          : Types['DrizzleRelations'][Type & keyof Types['DrizzleRelations']],
         Shape extends {} = Type extends DrizzleInterfaceRef<
           Types,
-          keyof Types['DrizzleRelationsConfig'],
+          keyof Types['DrizzleRelations'],
           infer S
         >
-          ? S & { [drizzleTableName]?: TableConfig['tsName'] }
-          : BuildQueryResult<Types['DrizzleRelationsConfig'], TableConfig, true> & {
+          ? S & { [drizzleTableName]?: TableConfig['name'] }
+          : BuildQueryResult<Types['DrizzleRelations'], TableConfig, true> & {
               [drizzleTableName]?: Type;
             },
       >(
@@ -207,7 +190,7 @@ declare global {
       ) => void;
 
       // drizzleGraphQLOrderBy: 'addGraphQL' extends PluginName
-      //   ? <Table extends keyof Types['DrizzleRelationsConfig']>(
+      //   ? <Table extends keyof Types['DrizzleRelations']>(
       //       table: Table,
       //       type: GraphQLInputObjectType,
       //       ...args: NormalizeArgs<[options: AddGraphQLInputTypeOptions<Types, {}>]>
@@ -215,7 +198,7 @@ declare global {
       //   : '@pothos/plugin-add-graphql is required to use this method';
 
       // drizzleGraphQLFilters: 'addGraphQL' extends PluginName
-      //   ? <Table extends keyof Types['DrizzleRelationsConfig']>(
+      //   ? <Table extends keyof Types['DrizzleRelations']>(
       //       table: Table,
       //       type: GraphQLInputObjectType,
       //       ...args: NormalizeArgs<[options: AddGraphQLInputTypeOptions<Types, {}>]>
@@ -223,7 +206,7 @@ declare global {
       //   : '@pothos/plugin-add-graphql is required to use this method';
 
       // drizzleGraphQLInsert: 'addGraphQL' extends PluginName
-      //   ? <Table extends keyof Types['DrizzleRelationsConfig']>(
+      //   ? <Table extends keyof Types['DrizzleRelations']>(
       //       table: Table,
       //       type: GraphQLInputObjectType,
       //       ...args: NormalizeArgs<[options: AddGraphQLInputTypeOptions<Types, {}>]>
@@ -231,7 +214,7 @@ declare global {
       //   : '@pothos/plugin-add-graphql is required to use this method';
 
       // drizzleGraphQLUpdate: 'addGraphQL' extends PluginName
-      //   ? <Table extends keyof Types['DrizzleRelationsConfig']>(
+      //   ? <Table extends keyof Types['DrizzleRelations']>(
       //       table: Table,
       //       type: GraphQLInputObjectType,
       //       ...args: NormalizeArgs<[options: AddGraphQLInputTypeOptions<Types, {}>]>
@@ -271,8 +254,8 @@ declare global {
       drizzleField: <
         Args extends InputFieldMap,
         Param extends
-          | keyof Types['DrizzleRelationsConfig']
-          | [keyof Types['DrizzleRelationsConfig']]
+          | keyof Types['DrizzleRelations']
+          | [keyof Types['DrizzleRelations']]
           // biome-ignore lint/suspicious/noExplicitAny: this is fine
           | DrizzleRef<any>
           // biome-ignore lint/suspicious/noExplicitAny: this is fine
@@ -281,16 +264,16 @@ declare global {
         ResolveShape,
         ResolveReturnShape,
         Table extends
-          keyof Types['DrizzleRelationsConfig'] = Param extends keyof Types['DrizzleRelationsConfig']
+          keyof Types['DrizzleRelations'] = Param extends keyof Types['DrizzleRelations']
           ? Param
-          : Param extends [keyof Types['DrizzleRelationsConfig']]
+          : Param extends [keyof Types['DrizzleRelations']]
             ? Param[0]
             : // biome-ignore lint/suspicious/noExplicitAny: this is fine
               Param extends DrizzleRef<any, infer T>
-              ? T & keyof Types['DrizzleRelationsConfig']
+              ? T & keyof Types['DrizzleRelations']
               : // biome-ignore lint/suspicious/noExplicitAny: this is fine
                 Param extends [DrizzleRef<any, infer T>]
-                ? T & keyof Types['DrizzleRelationsConfig']
+                ? T & keyof Types['DrizzleRelations']
                 : never,
         // biome-ignore lint/suspicious/noExplicitAny: this is fine
         Type extends TypeParam<Types> = Param extends DrizzleRef<any> | [DrizzleRef<any>]
@@ -300,19 +283,15 @@ declare global {
                 ObjectRef<
                   Types,
                   BuildQueryResult<
-                    Types['DrizzleRelationsConfig'],
-                    Types['DrizzleRelationsConfig'][Table],
+                    Types['DrizzleRelations'],
+                    Types['DrizzleRelations'][Table],
                     true
                   >
                 >,
               ]
             : ObjectRef<
                 Types,
-                BuildQueryResult<
-                  Types['DrizzleRelationsConfig'],
-                  Types['DrizzleRelationsConfig'][Table],
-                  true
-                >
+                BuildQueryResult<Types['DrizzleRelations'], Types['DrizzleRelations'][Table], true>
               >,
       >(
         options: DrizzleFieldOptions<
@@ -331,21 +310,20 @@ declare global {
       drizzleConnection: 'relay' extends PluginName
         ? <
             Type extends // biome-ignore lint/suspicious/noExplicitAny: this is fine
-              | DrizzleRef<any, keyof Types['DrizzleRelationsConfig']>
-              | keyof Types['DrizzleRelationsConfig'],
+            DrizzleRef<any, keyof Types['DrizzleRelations']> | keyof Types['DrizzleRelations'],
             Nullable extends boolean,
             ResolveReturnShape,
             Args extends InputFieldMap = {},
             Shape = Type extends DrizzleRef<
               // biome-ignore lint/suspicious/noExplicitAny: this is fine
               any,
-              keyof Types['DrizzleRelationsConfig'],
+              keyof Types['DrizzleRelations'],
               infer S
             >
               ? S
               : BuildQueryResult<
-                  Types['DrizzleRelationsConfig'],
-                  Types['DrizzleRelationsConfig'][Type & keyof Types['DrizzleRelationsConfig']],
+                  Types['DrizzleRelations'],
+                  Types['DrizzleRelations'][Type & keyof Types['DrizzleRelations']],
                   true
                 >,
             const ConnectionInterfaces extends InterfaceParam<Types>[] = [],
@@ -356,9 +334,9 @@ declare global {
               ParentShape,
               Type,
               // biome-ignore lint/suspicious/noExplicitAny: this is fine
-              Types['DrizzleRelationsConfig'][Type extends DrizzleRef<any, infer K>
+              Types['DrizzleRelations'][Type extends DrizzleRef<any, infer K>
                 ? K
-                : Type & keyof Types['DrizzleRelationsConfig']],
+                : Type & keyof Types['DrizzleRelations']],
               ObjectRef<Types, Shape>,
               Nullable,
               Args,
@@ -403,8 +381,8 @@ declare global {
       drizzleFieldWithInput: 'withInput' extends PluginName
         ? <
             Param extends
-              | keyof Types['DrizzleRelationsConfig']
-              | [keyof Types['DrizzleRelationsConfig']]
+              | keyof Types['DrizzleRelations']
+              | [keyof Types['DrizzleRelations']]
               // biome-ignore lint/suspicious/noExplicitAny: this is fine
               | DrizzleRef<any>
               // biome-ignore lint/suspicious/noExplicitAny: this is fine
@@ -417,24 +395,20 @@ declare global {
             Args extends InputFieldMap = {},
             InputName extends string = 'input',
             Table extends
-              keyof Types['DrizzleRelationsConfig'] = Param extends keyof Types['DrizzleRelationsConfig']
+              keyof Types['DrizzleRelations'] = Param extends keyof Types['DrizzleRelations']
               ? Param
-              : Param extends [keyof Types['DrizzleRelationsConfig']]
+              : Param extends [keyof Types['DrizzleRelations']]
                 ? Param[0]
                 : // biome-ignore lint/suspicious/noExplicitAny: this is fine
                   Param extends DrizzleRef<any, infer T>
-                  ? T & keyof Types['DrizzleRelationsConfig']
+                  ? T & keyof Types['DrizzleRelations']
                   : // biome-ignore lint/suspicious/noExplicitAny: this is fine
                     Param extends [DrizzleRef<any, infer T>]
-                    ? T & keyof Types['DrizzleRelationsConfig']
+                    ? T & keyof Types['DrizzleRelations']
                     : never,
             Type extends TypeParam<Types> = ObjectRef<
               Types,
-              BuildQueryResult<
-                Types['DrizzleRelationsConfig'],
-                Types['DrizzleRelationsConfig'][Table],
-                true
-              >
+              BuildQueryResult<Types['DrizzleRelations'], Types['DrizzleRelations'][Table], true>
             >,
           >(
             options: DrizzleFieldWithInputOptions<

package/src/index.ts

@@ -121,13 +121,18 @@ export class PothosDrizzlePlugin<Types extends SchemaTypes> extends BasePlugin<T
                   args: {},
                   ctx: Types['Context'],
                   nestedQuery: (query: unknown, path?: string[]) => never,
-                ) =>
-                  (select as (args: unknown, ctx: unknown, nestedQuery: unknown) => {})(
+                ) => ({
+                  columns: {},
+                  ...(select as (args: unknown, ctx: unknown, nestedQuery: unknown) => {})(
                     args,
                     ctx,
                     nestedQuery,
-                  )
-              : select,
+                  ),
+                })
+              : {
+                  columns: {},
+                  ...select,
+                },
         },
       };
     }

package/src/interface-ref.ts

@@ -4,7 +4,7 @@ import { type DrizzleObjectRef, drizzleTableKey } from './object-ref';
 
 export type DrizzleRef<
   Types extends SchemaTypes,
-  Table extends keyof Types['DrizzleRelationsConfig'] = keyof Types['DrizzleRelationsConfig'],
+  Table extends keyof Types['DrizzleRelations'] = keyof Types['DrizzleRelations'],
   T = {},
 > =
   | DrizzleInterfaceRef<Types, Table, T>
@@ -13,10 +13,10 @@ export type DrizzleRef<
 
 export class DrizzleInterfaceRef<
   Types extends SchemaTypes,
-  Table extends keyof Types['DrizzleRelationsConfig'] = keyof Types['DrizzleRelationsConfig'],
+  Table extends keyof Types['DrizzleRelations'] = keyof Types['DrizzleRelations'],
   T = {},
 > extends InterfaceRef<Types, T> {
-  [drizzleTableKey]!: Types['DrizzleRelationsConfig'][Table];
+  [drizzleTableKey]!: Types['DrizzleRelations'][Table];
 
   tableName: string;
 

package/src/model-loader.ts

@@ -2,6 +2,7 @@ import { createContextCache, type SchemaTypes } from '@pothos/core';
 import {
   type AnyTable,
   type Column,
+  getTableColumns,
   inArray,
   type SQL,
   sql,
@@ -54,16 +55,16 @@ export class ModelLoader {
     this.builder = builder;
     this.modelName = modelName;
     this.config = getSchemaConfig(builder);
-    this.table = this.config.relations.tablesConfig[modelName];
+    this.table = this.config.relations[modelName];
     this.primaryKey = this.config.getPrimaryKey(modelName);
     this.columns = columns ?? this.primaryKey;
     this.selectSQL = (table) => {
       const columns = this.columns.map((column) =>
-        Object.values(table).find(
+        Object.values(getTableColumns(table)).find(
           (tblColumn) => 'columnType' in tblColumn && tblColumn.name === column.name,
         ),
       );
-      return columns.length > 1 ? sql`(${sql.join(columns, sql`, `)})` : columns[0].getSQL();
+      return columns.length > 1 ? sql`(${sql.join(columns, sql`, `)})` : columns[0]!.getSQL();
     };
   }
 

package/src/node-ref.ts

@@ -5,7 +5,7 @@ export const relayIDShapeKey = Symbol.for('Pothos.relayIDShapeKey');
 
 export class DrizzleNodeRef<
   Types extends SchemaTypes,
-  Table extends keyof Types['DrizzleRelationsConfig'] = keyof Types['DrizzleRelationsConfig'],
+  Table extends keyof Types['DrizzleRelations'] = keyof Types['DrizzleRelations'],
   T = {},
   IDShape = string,
 > extends DrizzleObjectRef<Types, Table, T> {

package/src/object-ref.ts

@@ -11,10 +11,10 @@ export const drizzleTableKey = Symbol.for('Pothos.drizzleTableKey');
 
 export class DrizzleObjectRef<
   Types extends SchemaTypes,
-  Table extends keyof Types['DrizzleRelationsConfig'] = keyof Types['DrizzleRelationsConfig'],
+  Table extends keyof Types['DrizzleRelations'] = keyof Types['DrizzleRelations'],
   T = {},
 > extends ObjectRef<Types, T> {
-  [drizzleTableKey]!: Types['DrizzleRelationsConfig'][Table];
+  [drizzleTableKey]!: Types['DrizzleRelations'][Table];
 
   [abstractReturnShapeKey]!: WithBrand<T>;