checkpoint

Author: samwillis

packages/db/src/query/builder/index.ts

@@ -24,6 +24,7 @@ import type {
   GroupByCallback,
   JoinOnCallback,
   MergeContext,
+  MergeContextForJoinCallback,
   MergeContextWithJoinType,
   OrderByCallback,
   OrderByOptions,
@@ -142,7 +143,7 @@ export class BaseQueryBuilder<TContext extends Context = Context> {
   >(
     source: TSource,
     onCallback: JoinOnCallback<
-      MergeContext<TContext, SchemaFromSource<TSource>>
+      MergeContextForJoinCallback<TContext, SchemaFromSource<TSource>>
     >,
     type: TJoinType = `left` as TJoinType
   ): QueryBuilder<
@@ -154,7 +155,7 @@ export class BaseQueryBuilder<TContext extends Context = Context> {
     const currentAliases = this._getCurrentAliases()
     const newAliases = [...currentAliases, alias]
     const refProxy = createRefProxy(newAliases) as RefProxyForContext<
-      MergeContext<TContext, SchemaFromSource<TSource>>
+      MergeContextForJoinCallback<TContext, SchemaFromSource<TSource>>
     >
 
     // Get the join condition expression
@@ -209,7 +210,7 @@ export class BaseQueryBuilder<TContext extends Context = Context> {
   leftJoin<TSource extends Source>(
     source: TSource,
     onCallback: JoinOnCallback<
-      MergeContext<TContext, SchemaFromSource<TSource>>
+      MergeContextForJoinCallback<TContext, SchemaFromSource<TSource>>
     >
   ): QueryBuilder<
     MergeContextWithJoinType<TContext, SchemaFromSource<TSource>, `left`>
@@ -235,7 +236,7 @@ export class BaseQueryBuilder<TContext extends Context = Context> {
   rightJoin<TSource extends Source>(
     source: TSource,
     onCallback: JoinOnCallback<
-      MergeContext<TContext, SchemaFromSource<TSource>>
+      MergeContextForJoinCallback<TContext, SchemaFromSource<TSource>>
     >
   ): QueryBuilder<
     MergeContextWithJoinType<TContext, SchemaFromSource<TSource>, `right`>
@@ -261,7 +262,7 @@ export class BaseQueryBuilder<TContext extends Context = Context> {
   innerJoin<TSource extends Source>(
     source: TSource,
     onCallback: JoinOnCallback<
-      MergeContext<TContext, SchemaFromSource<TSource>>
+      MergeContextForJoinCallback<TContext, SchemaFromSource<TSource>>
     >
   ): QueryBuilder<
     MergeContextWithJoinType<TContext, SchemaFromSource<TSource>, `inner`>
@@ -287,7 +288,7 @@ export class BaseQueryBuilder<TContext extends Context = Context> {
   fullJoin<TSource extends Source>(
     source: TSource,
     onCallback: JoinOnCallback<
-      MergeContext<TContext, SchemaFromSource<TSource>>
+      MergeContextForJoinCallback<TContext, SchemaFromSource<TSource>>
     >
   ): QueryBuilder<
     MergeContextWithJoinType<TContext, SchemaFromSource<TSource>, `full`>

packages/db/src/query/builder/types.ts

@@ -323,6 +323,22 @@ export type MergeContext<
   TNewSchema extends ContextSchema,
 > = MergeContextWithJoinType<TContext, TNewSchema, `left`>
 
+// Type for join callbacks that doesn't apply optionality - both tables are available
+export type MergeContextForJoinCallback<
+  TContext extends Context,
+  TNewSchema extends ContextSchema,
+> = {
+  baseSchema: TContext[`baseSchema`]
+  // Merge schemas without applying join optionality - both are non-optional in join condition
+  schema: TContext[`schema`] & TNewSchema
+  fromSourceName: TContext[`fromSourceName`]
+  hasJoins: true
+  joinTypes: TContext[`joinTypes`] extends Record<string, any>
+    ? TContext[`joinTypes`]
+    : {}
+  result: TContext[`result`]
+}
+
 // Helper type for updating context with result type
 export type WithResult<TContext extends Context, TResult> = Prettify<
   Omit<TContext, `result`> & {

packages/db/tests/query/builder/functional-variants.test.ts

@@ -221,7 +221,7 @@ describe(`QueryBuilder functional variants (fn)`, () => {
           ({ employees, departments }) =>
             eq(employees.department_id, departments.id)
         )
-        .groupBy(({ departments }) => departments.name)
+        .groupBy(({ departments }) => departments?.name)
         .fn.having(
           (row) =>
             row.employees.salary > 60000 &&
@@ -245,7 +245,7 @@ describe(`QueryBuilder functional variants (fn)`, () => {
         )
         .fn.where((row) => row.employees.active)
         .fn.where((row) => row.employees.salary > 40000)
-        .groupBy(({ departments }) => departments.name)
+        .groupBy(({ departments }) => departments?.name)
         .fn.having((row) => row.employees.salary > 70000)
         .fn.select((row) => ({
           departmentName: row.departments?.name || `Unknown`,

packages/db/tests/query/builder/join.test.ts

@@ -75,7 +75,7 @@ describe(`QueryBuilder.join`, () => {
           eq(employees.department_id, departments.id)
       )
       .join({ projects: projectsCollection }, ({ departments, projects }) =>
-        eq(departments.id, projects.department_id)
+        eq(departments?.id, projects?.department_id)
       )
 
     const builtQuery = getQueryIR(query)
@@ -360,7 +360,7 @@ describe(`QueryBuilder.join`, () => {
         .innerJoin(
           { projects: projectsCollection },
           ({ departments, projects }) =>
-            eq(departments.id, projects.department_id)
+            eq(departments?.id, projects.department_id)
         )
 
       const builtQuery = getQueryIR(query)