@pothos/plugin-drizzle 0.8.1 → 0.9.0

package/lib/utils/selections.js

@@ -40,10 +40,9 @@ function selectionCompatible(state, selectionMap, ignoreQuery = false) {
         !selectionCompatible(state.with.get(key), value))) {
         return false;
     }
-    const resolvedExtras = typeof extras === 'function' ? extras(state.table.columns, (0, _drizzleorm.getOperators)()) : extras;
-    if (resolvedExtras && Object.entries(resolvedExtras).some(([key, value])=>{
-        const sql = state.extras.get(key);
-        return sql && (sql.sql !== value.sql || sql.fieldAlias !== value.fieldAlias);
+    if (extras && Object.entries(extras).some(([key, value])=>{
+        const existing = state.extras.get(key);
+        return existing && existing !== value;
     })) {
         return false;
     }
@@ -90,22 +89,24 @@ function createState(table, skipDeferredFragments, parent) {
         depth: parent ? parent.depth + 1 : 0
     };
 }
-function mergeSelection(config, state, { with: withSelection, extras, columns, ...query }) {
+function mergeSelection(config, state, selection) {
+    const { with: withSelection, extras, columns, ...query } = typeof selection === 'boolean' ? {} : selection;
     if (withSelection) {
         for (const [key, value] of Object.entries(withSelection)){
             const relation = state.table.relations[key];
             if (!relation) {
                 throw new _core.PothosValidationError(`Relation ${key} does not exist on ${state.table.dbName}`);
             }
-            merge(config.dbToSchema[relation.referencedTableName], key, value);
+            const tableUniqueName = (0, _drizzleorm.getTableUniqueName)(relation.targetTable);
+            const tableName = config.relations.tableNamesMap[tableUniqueName];
+            merge(config.relations.tablesConfig[tableName], key, value);
         }
     }
     if (Object.keys(query).length > 0) {
         state.query = query;
     }
-    const resolvedExtras = typeof extras === 'function' ? extras(state.table.columns, (0, _drizzleorm.getOperators)()) : extras;
-    if (resolvedExtras) {
-        for (const [key, value] of Object.entries(resolvedExtras)){
+    if (extras) {
+        for (const [key, value] of Object.entries(extras)){
             state.extras.set(key, value);
         }
     }
@@ -116,24 +117,23 @@ function mergeSelection(config, state, { with: withSelection, extras, columns, .
         for (const key of Object.keys(columns)){
             state.columns.add(key);
         }
-    } else {
+    } else if (selection === true) {
         state.allColumns = true;
     }
     function merge(table, key, value) {
         if (!value) {
             return;
         }
-        const selection = value === true ? {} : value;
         if (state.with.has(key)) {
-            mergeSelection(config, state.with.get(key), selection);
+            mergeSelection(config, state.with.get(key), value);
         } else {
             const relatedState = createState(table, state.skipDeferredFragments, state);
-            mergeSelection(config, relatedState, selection);
+            mergeSelection(config, relatedState, value);
             state.with.set(key, relatedState);
         }
     }
 }
-function selectionToQuery(state) {
+function selectionToQuery(config, state) {
     const query = {
         ...state.query,
         with: {},
@@ -148,15 +148,16 @@ function selectionToQuery(state) {
         for (const key of state.columns){
             query.columns[key] = true;
         }
-        for (const { name } of state.table.primaryKey){
-            query.columns[name] = true;
+        for (const column of config.getPrimaryKey(state.table.tsName)){
+            const tsName = config.columnToTsName(column);
+            query.columns[tsName] = true;
         }
     }
     for (const [key, value] of state.extras){
         query.extras[key] = value;
     }
     state.with.forEach((sel, relation)=>{
-        query.with[relation] = selectionToQuery(sel);
+        query.with[relation] = selectionToQuery(config, sel);
     });
     return query;
 }

package/lib/utils/selections.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/selections.ts"],"names":["createState","mergeSelection","mergeState","selectionCompatible","selectionToQuery","stateCompatible","state","selectionMap","ignoreQuery","Object","keys","query","length","with","withSelection","extras","columns","entries","some","key","value","has","get","resolvedExtras","table","getOperators","sql","fieldAlias","deepEqual","newState","name","relationState","allColumns","add","set","skipDeferredFragments","parent","Set","Map","mappings","depth","config","relation","relations","PothosValidationError","dbName","merge","dbToSchema","referencedTableName","selection","relatedState","primaryKey","forEach","sel"],"mappings":"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"}
+{"version":3,"sources":["../../src/utils/selections.ts"],"names":["createState","mergeSelection","mergeState","selectionCompatible","selectionToQuery","stateCompatible","state","selectionMap","ignoreQuery","Object","keys","query","length","with","withSelection","extras","columns","entries","some","key","value","has","get","existing","deepEqual","newState","name","relationState","allColumns","add","set","table","skipDeferredFragments","parent","Set","Map","mappings","depth","config","selection","relation","relations","PothosValidationError","dbName","tableUniqueName","getTableUniqueName","targetTable","tableName","tableNamesMap","merge","tablesConfig","relatedState","column","getPrimaryKey","tsName","columnToTsName","forEach","sel"],"mappings":";;;;;;;;;;;IAqGgBA,WAAW;eAAXA;;IAmBAC,cAAc;eAAdA;;IAzCAC,UAAU;eAAVA;;IAnDAC,mBAAmB;eAAnBA;;IA0JAC,gBAAgB;eAAhBA;;IArHAC,eAAe;eAAfA;;;sBAjEsB;4BAQ/B;2BAEmB;AAkBnB,SAASF,oBACdG,KAAqB,EACrBC,YAAoC,EACpCC,cAAc,KAAK;IAEnB,IAAI,OAAOD,iBAAiB,WAAW;QACrC,OAAOC,eAAe,CAACD,gBAAgBE,OAAOC,IAAI,CAACJ,MAAMK,KAAK,EAAEC,MAAM,KAAK;IAC7E;IAEA,MAAM,EAAEC,MAAMC,aAAa,EAAEC,MAAM,EAAEC,OAAO,EAAE,GAAGL,OAAO,GAAGJ;IAE3D,IACEO,iBACAL,OAAOQ,OAAO,CAACH,eAAeI,IAAI,CAChC,CAAC,CAACC,KAAKC,MAAM,GACXA,SACAd,MAAMO,IAAI,CAACQ,GAAG,CAACF,QACf,+CAA+C;QAC/C,CAAChB,oBAAoBG,MAAMO,IAAI,CAACS,GAAG,CAACH,MAAOC,SAE/C;QACA,OAAO;IACT;IAEA,IACEL,UACAN,OAAOQ,OAAO,CAACF,QAAQG,IAAI,CAAC,CAAC,CAACC,KAAKC,MAAM;QACvC,MAAMG,WAAWjB,MAAMS,MAAM,CAACO,GAAG,CAACH;QAClC,OAAOI,YAAYA,aAAaH;IAClC,IACA;QACA,OAAO;IACT;IAEA,OAAOZ,eAAegB,IAAAA,oBAAS,EAAClB,MAAMK,KAAK,EAAEA;AAC/C;AAEO,SAASN,gBACdC,KAAqB,EACrBmB,QAAwB,EACxBjB,cAAc,KAAK;IAEnB,KAAK,MAAM,CAACkB,MAAMC,cAAc,IAAIF,SAASZ,IAAI,CAAE;QACjD,IAAIP,MAAMO,IAAI,CAACQ,GAAG,CAACK,SAAS,CAACrB,gBAAgBC,MAAMO,IAAI,CAACS,GAAG,CAACI,OAAQC,gBAAgB;YAClF,OAAO;QACT;IACF;IAEA,OAAOnB,eAAegB,IAAAA,oBAAS,EAAClB,MAAMK,KAAK,EAAEc,SAASd,KAAK;AAC7D;AAEO,SAAST,WAAWI,KAAqB,EAAEmB,QAAwB;IACxE,KAAK,MAAM,CAACC,MAAMC,cAAc,IAAIF,SAASZ,IAAI,CAAE;QACjD,IAAIP,MAAMO,IAAI,CAACQ,GAAG,CAACK,OAAO;YACxBxB,WAAWI,MAAMO,IAAI,CAACS,GAAG,CAACI,OAAQC;QACpC;IACF;IAEA,IAAI,CAACrB,MAAMsB,UAAU,EAAE;QACrB,IAAIH,SAASG,UAAU,EAAE;YACvBtB,MAAMsB,UAAU,GAAG;QACrB,OAAO;YACL,KAAK,MAAMF,QAAQD,SAAST,OAAO,CAAE;gBACnCV,MAAMU,OAAO,CAACa,GAAG,CAACH;YACpB;QACF;IACF;IAEA,KAAK,MAAM,CAACA,MAAMN,MAAM,IAAIK,SAASV,MAAM,CAAE;QAC3CT,MAAMS,MAAM,CAACe,GAAG,CAACJ,MAAMN;IACzB;AACF;AAEO,SAASpB,YACd+B,KAA4B,EAC5BC,qBAA8B,EAC9BC,MAAuB;IAEvB,OAAO;QACLF;QACAC;QACAC;QACAtB,OAAO,CAAC;QACRK,SAAS,IAAIkB;QACbrB,MAAM,IAAIsB;QACVpB,QAAQ,IAAIoB;QACZC,UAAU,CAAC;QACXR,YAAY;QACZS,OAAOJ,SAASA,OAAOI,KAAK,GAAG,IAAI;IACrC;AACF;AAEO,SAASpC,eACdqC,MAAiC,EACjChC,KAAqB,EACrBiC,SAAiC;IAEjC,MAAM,EACJ1B,MAAMC,aAAa,EACnBC,MAAM,EACNC,OAAO,EACP,GAAGL,OACJ,GAAG,OAAO4B,cAAc,YAAY,CAAC,IAAIA;IAC1C,IAAIzB,eAAe;QACjB,KAAK,MAAM,CAACK,KAAKC,MAAM,IAAIX,OAAOQ,OAAO,CAACH,eAAgB;YACxD,MAAM0B,WAAWlC,MAAMyB,KAAK,CAACU,SAAS,CAACtB,IAAI;YAE3C,IAAI,CAACqB,UAAU;gBACb,MAAM,IAAIE,2BAAqB,CAAC,CAAC,SAAS,EAAEvB,IAAI,mBAAmB,EAAEb,MAAMyB,KAAK,CAACY,MAAM,EAAE;YAC3F;YAEA,MAAMC,kBAAkBC,IAAAA,8BAAkB,EAACL,SAASM,WAAW;YAC/D,MAAMC,YAAYT,OAAOG,SAAS,CAACO,aAAa,CAACJ,gBAAgB;YACjEK,MAAMX,OAAOG,SAAS,CAACS,YAAY,CAACH,UAAU,EAAE5B,KAAKC;QACvD;IACF;IAEA,IAAIX,OAAOC,IAAI,CAACC,OAAOC,MAAM,GAAG,GAAG;QACjCN,MAAMK,KAAK,GAAGA;IAChB;IAEA,IAAII,QAAQ;QACV,KAAK,MAAM,CAACI,KAAKC,MAAM,IAAIX,OAAOQ,OAAO,CAACF,QAAS;YACjDT,MAAMS,MAAM,CAACe,GAAG,CAACX,KAAKC;QACxB;IACF;IAEA,IAAId,MAAMsB,UAAU,EAAE;QACpB;IACF;IAEA,IAAIZ,SAAS;QACX,KAAK,MAAMG,OAAOV,OAAOC,IAAI,CAACM,SAAU;YACtCV,MAAMU,OAAO,CAACa,GAAG,CAACV;QACpB;IACF,OAAO,IAAIoB,cAAc,MAAM;QAC7BjC,MAAMsB,UAAU,GAAG;IACrB;IAEA,SAASqB,MAAMlB,KAA4B,EAAEZ,GAAW,EAAEC,KAA8B;QACtF,IAAI,CAACA,OAAO;YACV;QACF;QAEA,IAAId,MAAMO,IAAI,CAACQ,GAAG,CAACF,MAAM;YACvBlB,eAAeqC,QAAQhC,MAAMO,IAAI,CAACS,GAAG,CAACH,MAAOC;QAC/C,OAAO;YACL,MAAM+B,eAAenD,YAAY+B,OAAOzB,MAAM0B,qBAAqB,EAAE1B;YACrEL,eAAeqC,QAAQa,cAAc/B;YACrCd,MAAMO,IAAI,CAACiB,GAAG,CAACX,KAAKgC;QACtB;IACF;AACF;AAEO,SAAS/C,iBACdkC,MAAiC,EACjChC,KAAqB;IAErB,MAAMK,QAA4D;QAChE,GAAGL,MAAMK,KAAK;QACdE,MAAM,CAAC;QACPG,SAAS,CAAC;QACVD,QAAQ,CAAC;IACX;IAEA,IAAIT,MAAMsB,UAAU,EAAE;QACpB,KAAK,MAAMT,OAAOV,OAAOC,IAAI,CAACJ,MAAMyB,KAAK,CAACf,OAAO,EAAG;YAClDL,MAAMK,OAAO,AAAC,CAACG,IAAI,GAAG;QACxB;IACF,OAAO;QACL,KAAK,MAAMA,OAAOb,MAAMU,OAAO,CAAE;YAC/BL,MAAMK,OAAO,AAAC,CAACG,IAAI,GAAG;QACxB;QAEA,KAAK,MAAMiC,UAAUd,OAAOe,aAAa,CAAC/C,MAAMyB,KAAK,CAACuB,MAAM,EAAG;YAC7D,MAAMA,SAAShB,OAAOiB,cAAc,CAACH;YACrCzC,MAAMK,OAAO,AAAC,CAACsC,OAAO,GAAG;QAC3B;IACF;IAEA,KAAK,MAAM,CAACnC,KAAKC,MAAM,IAAId,MAAMS,MAAM,CAAE;QACvCJ,MAAMI,MAAM,AAAC,CAACI,IAAI,GAAGC;IACvB;IAEAd,MAAMO,IAAI,CAAC2C,OAAO,CAAC,CAACC,KAAKjB;QACvB7B,MAAME,IAAI,AAAC,CAAC2B,SAAS,GAAGpC,iBAAiBkC,QAAQmB;IACnD;IAEA,OAAO9C;AACT"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pothos/plugin-drizzle",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "description": "A Pothos plugin for drizzle",
   "main": "./lib/index.js",
   "types": "./dts/index.d.ts",
@@ -35,24 +35,24 @@
   },
   "peerDependencies": {
     "@pothos/core": "*",
-    "graphql": ">=16.6.0"
+    "graphql": "^16.10.0",
+    "drizzle-orm": "^1.0.0"
   },
   "devDependencies": {
-    "@libsql/client": "^0.14.0",
+    "@libsql/client": "^0.15.4",
     "drizzle-graphql": "^0.8.5",
-    "drizzle-kit": "^0.28.1",
-    "drizzle-orm": "^0.36.4",
-    "graphql": "^16.8.1",
-    "graphql-scalars": "^1.24.0",
+    "drizzle-kit": "1.0.0-beta.1-c0277c0",
+    "drizzle-orm": "1.0.0-beta.1-c0277c0",
+    "graphql-scalars": "^1.24.2",
     "graphql-tag": "^2.12.6",
     "postgres": "^3.4.5",
-    "@pothos/core": "4.6.0",
-    "@pothos/plugin-add-graphql": "4.2.2",
-    "@pothos/plugin-errors": "4.2.0",
-    "@pothos/plugin-relay": "4.4.1",
-    "@pothos/plugin-scope-auth": "4.1.2",
-    "@pothos/plugin-with-input": "4.1.0",
-    "@pothos/test-utils": "2.1.0"
+    "@pothos/core": "4.6.2",
+    "@pothos/plugin-add-graphql": "4.2.3",
+    "@pothos/plugin-errors": "4.2.1",
+    "@pothos/plugin-scope-auth": "4.1.3",
+    "@pothos/plugin-relay": "4.4.2",
+    "@pothos/plugin-with-input": "4.1.1",
+    "@pothos/test-utils": "2.1.1"
   },
   "scripts": {
     "type": "tsc --project tsconfig.type.json",

package/src/connection-helpers.ts

@@ -0,0 +1,184 @@
+import type { InputFieldMap, InputShapeFromFields, SchemaTypes } from '@pothos/core';
+import type { BuildQueryResult, DBQueryConfig, Table, TableRelationalConfig } from 'drizzle-orm';
+import type { DrizzleRef } from './interface-ref';
+import type { QueryForDrizzleConnection } from './types';
+import { getSchemaConfig } from './utils/config';
+import {
+  drizzleCursorConnectionQuery,
+  getCursorFormatter,
+  wrapConnectionResult,
+} from './utils/cursors';
+import { getRefFromModel } from './utils/refs';
+import { createState, mergeSelection, selectionToQuery } from './utils/selections';
+
+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<
+    Types,
+    infer T
+  >
+    ? T
+    : Type],
+  Shape = Type extends DrizzleRef<
+    // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+    any,
+    keyof Types['DrizzleRelationsConfig'],
+    infer S
+  >
+    ? S
+    : BuildQueryResult<Types['DrizzleRelationsConfig'], Table, true>,
+  EdgeShape = true extends Selection
+    ? Shape
+    : BuildQueryResult<Types['DrizzleRelationsConfig'], Table, Selection>,
+  NodeShape = EdgeShape,
+  ExtraArgs extends InputFieldMap = {},
+>(
+  builder: PothosSchemaTypes.SchemaBuilder<Types>,
+  refOrType: Type,
+  {
+    select,
+    resolveNode,
+    query,
+    args: createArgs,
+    maxSize = builder.options.drizzle?.maxConnectionSize,
+    defaultSize = builder.options.drizzle?.defaultConnectionSize,
+  }: {
+    args?: (t: PothosSchemaTypes.InputFieldBuilder<Types, 'Arg'>) => ExtraArgs;
+    select?: (
+      nestedSelection: <T extends true | {}>(selection?: T) => T,
+      args: InputShapeFromFields<ExtraArgs> & PothosSchemaTypes.DefaultConnectionArguments,
+      ctx: Types['Context'],
+    ) => Selection;
+    query?: QueryForDrizzleConnection<Types, Table> extends infer QueryConfig
+      ?
+          | QueryConfig
+          | ((args: InputShapeFromFields<ExtraArgs>, context: Types['Context']) => QueryConfig)
+      : never;
+    defaultSize?:
+      | number
+      | ((
+          args: InputShapeFromFields<ExtraArgs> & PothosSchemaTypes.DefaultConnectionArguments,
+          ctx: Types['Context'],
+        ) => number);
+    maxSize?:
+      | number
+      | ((args: PothosSchemaTypes.DefaultConnectionArguments, ctx: Types['Context']) => number);
+    resolveNode?: (edge: EdgeShape) => NodeShape;
+  },
+) {
+  const config = getSchemaConfig(builder);
+  const tableName =
+    typeof refOrType === 'string'
+      ? refOrType
+      : (refOrType as DrizzleRef<Types, Type extends DrizzleRef<Types, infer T> ? T : Type>)
+          .tableName;
+
+  function resolve<Parent = unknown>(
+    list: (EdgeShape & {})[],
+    args: InputShapeFromFields<ExtraArgs> & PothosSchemaTypes.DefaultConnectionArguments,
+    ctx: Types['Context'],
+    parent?: Parent,
+  ) {
+    const { select, cursorColumns } = getQueryArgs(args, ctx);
+    const formatCursor = getCursorFormatter(cursorColumns, config);
+    return wrapConnectionResult(
+      list,
+      args,
+      select.limit,
+      formatCursor,
+      (resolveNode as never) ?? ((edge: unknown) => edge),
+      parent,
+    ) as unknown as {
+      edges: (Omit<EdgeShape, 'cursor' | 'node'> & { node: NodeShape; cursor: string })[];
+      pageInfo: {
+        startCursor: string | null;
+        endCursor: string | null;
+        hasPreviousPage: boolean;
+        hasNextPage: boolean;
+      };
+    };
+  }
+
+  const getQueryArgs = (
+    args: InputShapeFromFields<ExtraArgs> & PothosSchemaTypes.DefaultConnectionArguments,
+    ctx: {},
+  ) => {
+    const { limit, orderBy, where, ...fieldQuery } =
+      (typeof query === 'function' ? query(args, ctx) : query) ?? {};
+    const table = config.relations.tablesConfig[tableName] as Table;
+
+    const { cursorColumns, columns, ...connectionQuery } = drizzleCursorConnectionQuery({
+      ctx,
+      maxSize,
+      defaultSize: typeof defaultSize === 'function' ? defaultSize(args, ctx) : defaultSize,
+      args,
+      orderBy:
+        (typeof orderBy === 'function' ? orderBy(table) : orderBy) ??
+        getSchemaConfig(builder).getPrimaryKey(tableName),
+      where,
+      config,
+      table,
+    });
+
+    return {
+      select: {
+        ...fieldQuery,
+        ...connectionQuery,
+        columns: {
+          ...fieldQuery.columns,
+          ...columns,
+        },
+        limit: Math.abs(limit ?? connectionQuery.limit),
+      },
+      cursorColumns,
+    };
+  };
+
+  function getQuery(
+    args: InputShapeFromFields<ExtraArgs> & PothosSchemaTypes.DefaultConnectionArguments,
+    ctx: Types['Context'],
+    nestedSelection: <T extends true | {}>(selection?: T, path?: string[]) => T,
+  ) {
+    const nestedSelect: Record<string, unknown> | true = select
+      ? select((sel) => nestedSelection(sel, ['edges', 'node']), args, ctx)
+      : nestedSelection(true, ['edges', 'node']);
+    const queryArgs = getQueryArgs(args, ctx);
+
+    const selectState = createState(
+      config.relations.tablesConfig[tableName],
+      builder.options.drizzle?.skipDeferredFragments ?? true,
+    );
+
+    mergeSelection(config, selectState, queryArgs.select);
+
+    if (typeof nestedSelect === 'object' && nestedSelect) {
+      mergeSelection(config, selectState, nestedSelect);
+    }
+
+    const baseQuery = typeof query === 'function' ? query(args, ctx) : (query ?? {});
+    const queryResult = selectionToQuery(config, selectState);
+
+    return {
+      ...baseQuery,
+      ...queryResult,
+    } as unknown as Omit<Selection, 'orderBy'> & {
+      orderBy: {
+        [K in keyof Table['columns']]?: 'asc' | 'desc' | undefined;
+      };
+    };
+  }
+
+  const getArgs = () => (createArgs ? builder.args(createArgs) : {}) as ExtraArgs;
+
+  return {
+    ref: (typeof refOrType === 'string'
+      ? getRefFromModel(refOrType, builder)
+      : refOrType) as DrizzleRef<Types, Type extends DrizzleRef<Types, infer T> ? T : Type, Shape>,
+    resolve,
+    select: select ?? {},
+    getQuery,
+    getArgs,
+  };
+}

package/src/drizzle-field-builder.ts

@@ -17,10 +17,11 @@ import {
   isThenable,
 } from '@pothos/core';
 import {
-  type InferModelFromColumns,
+  type InferSelectModel,
   Many,
+  type Table,
   type TableRelationalConfig,
-  getOperators,
+  getTableUniqueName,
 } from 'drizzle-orm';
 import type { DrizzleRef } from './interface-ref';
 import type {
@@ -50,13 +51,11 @@ const RootBuilder: {
   ): PothosSchemaTypes.RootFieldBuilder<Types, Shape, Kind>;
 } = RootFieldBuilder as never;
 
-const ops = getOperators();
-
 export class DrizzleObjectFieldBuilder<
   Types extends SchemaTypes,
   TableConfig extends TableRelationalConfig,
   Shape,
-  ExposableShape = InferModelFromColumns<TableConfig['columns']>,
+  ExposableShape = InferSelectModel<Extract<TableConfig['table'], { _: { brand: 'Table' } }>>,
 > extends RootBuilder<Types, Shape, 'DrizzleObject'> {
   exposeBoolean = this.createExpose('Boolean');
 
@@ -197,8 +196,11 @@ export class DrizzleObjectFieldBuilder<
     edgeOptions = {},
   ) {
     const schemaConfig = getSchemaConfig(this.builder);
-    const relationField = schemaConfig.schema?.[this.table].relations[name as string];
-    const relatedModel = schemaConfig.dbToSchema[relationField?.referencedTableName];
+    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;
 
     if (!relatedModel) {
       throw new PothosSchemaError(
@@ -206,28 +208,27 @@ export class DrizzleObjectFieldBuilder<
       );
     }
 
-    const ref = options.type ?? getRefFromModel(relatedModel.tsName, this.builder);
+    const ref = options.type ?? getRefFromModel(tableName, this.builder);
     let typeName: string | undefined;
 
     const getQuery = (args: PothosSchemaTypes.DefaultConnectionArguments, ctx: {}) => {
       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: orderBy
-          ? typeof orderBy === 'function'
-            ? orderBy(relatedModel.columns)
-            : orderBy
-          : relatedModel.primaryKey,
-        where: where
-          ? typeof where === 'function'
-            ? where(relatedModel.columns, ops)
-            : where
-          : undefined,
+        orderBy:
+          (typeof orderBy === 'function' ? orderBy(relatedModel) : orderBy) ??
+          getSchemaConfig(this.builder).getPrimaryKey(tableName),
+        where,
+        config: schemaConfig,
+        table: schemaConfig.relations.tablesConfig[tableName],
       });
 
       return {
@@ -322,7 +323,7 @@ export class DrizzleObjectFieldBuilder<
       [
         options: VariantFieldOptions<
           Types,
-          TableConfig['tsName'] & keyof Types['DrizzleRelationSchema'],
+          TableConfig['tsName'] & keyof Types['DrizzleRelationsConfig'],
           Variant,
           Args,
           Nullable,
@@ -341,7 +342,7 @@ export class DrizzleObjectFieldBuilder<
       _args: object,
       _context: object,
       nestedQuery: (query: unknown) => unknown,
-    ) => nestedQuery({});
+    ) => nestedQuery(options.select ?? {});
 
     return this.field({
       ...(options as {}),
@@ -389,16 +390,19 @@ export class DrizzleObjectFieldBuilder<
   ): FieldRef<Types, TypesForRelation<Types, TableConfig['relations'][Field]>, 'Object'> {
     const [options = {} as never] = allArgs;
     const schemaConfig = getSchemaConfig(this.builder);
-    const relationField = schemaConfig.schema?.[this.table].relations[name as string];
-    const relatedModel = schemaConfig.dbToSchema[relationField?.referencedTableName];
+    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];
 
     if (!relatedModel) {
       throw new PothosSchemaError(
         `Could not find relation ${name as string} on table ${this.table}`,
       );
     }
-
-    const ref = options.type ?? getRefFromModel(relatedModel.tsName, this.builder);
+    const ref = options.type ?? getRefFromModel(tableName, this.builder);
 
     const { query = {}, extensions, ...rest } = options;
 
@@ -455,7 +459,7 @@ export class DrizzleObjectFieldBuilder<
   ) {
     const [name, options = {} as never] = args;
 
-    const typeConfig = this.builder.configStore.getTypeConfig(this.typename, 'Object');
+    const typeConfig = this.builder.configStore.getTypeConfig(this.typename, this.graphqlKind);
     const usingSelect = !!typeConfig.extensions?.pothosDrizzleSelect;
 
     return this.exposeField(name as never, {
@@ -467,7 +471,7 @@ export class DrizzleObjectFieldBuilder<
           columns: { [name as string]: true },
         },
       },
-    });
+    }) as FieldRef<Types, ShapeFromTypeParam<Types, Type, Nullable>, 'DrizzleObject'>;
   }
 
   private createExpose<Type extends TypeParam<Types>>(type: Type) {

package/src/field-builder.ts

@@ -90,8 +90,8 @@ fieldBuilderProto.drizzleFieldWithInput = function drizzleFieldWithInput(
 
 fieldBuilderProto.drizzleConnection = function drizzleConnection<
   Type extends
-    | DrizzleRef<SchemaTypes, keyof SchemaTypes['DrizzleRelationSchema']>
-    | keyof SchemaTypes['DrizzleRelationSchema'],
+    | DrizzleRef<SchemaTypes, keyof SchemaTypes['DrizzleRelations']['config']>
+    | keyof SchemaTypes['DrizzleRelations']['config'],
   Nullable extends boolean,
   ResolveReturnShape,
 >(
@@ -118,6 +118,7 @@ fieldBuilderProto.drizzleConnection = function drizzleConnection<
 ) {
   const ref = typeof type === 'string' ? getRefFromModel(type, this.builder) : type;
   const typeName = this.builder.configStore.getTypeConfig(ref).name;
+  const tableName = typeof type === 'string' ? type : (ref as DrizzleRef<SchemaTypes>).tableName;
   const fieldRef = (
     this as typeof fieldBuilderProto & {
       connection: (...args: unknown[]) => FieldRef<SchemaTypes, unknown>;
@@ -132,12 +133,8 @@ fieldBuilderProto.drizzleConnection = function drizzleConnection<
         context: {},
         info: GraphQLResolveInfo,
       ) => {
-        const drizzleModel = getSchemaConfig(this.builder).schema?.[
-          typeof type === 'string' ? type : (ref as DrizzleRef<SchemaTypes>).tableName
-        ]!;
-
         return resolveDrizzleCursorConnection(
-          drizzleModel,
+          tableName,
           info,
           typeName,
           getSchemaConfig(this.builder),