@514labs/moose-lib 0.6.440 → 0.6.442

package/dist/index.d.mts

@@ -1,8 +1,8 @@
 export { JWT, Key } from './browserCompatible.mjs';
 import * as _clickhouse_client from '@clickhouse/client';
 import { KafkaJS } from '@514labs/kafka-javascript';
-import { aF as MooseUtils, aG as MooseClient, ay as Sql, O as OlapTable, aH as Column, aI as QueryClient, aJ as DataType } from './index-D22Yb8pY.mjs';
-export { A as Aggregated, h as Api, i as ApiConfig, aS as ApiHelpers, ap as ApiUtil, a6 as ClickHouseAlias, Y as ClickHouseByteSize, a8 as ClickHouseCodec, X as ClickHouseDecimal, a3 as ClickHouseDefault, C as ClickHouseEngines, Z as ClickHouseFixedStringSize, _ as ClickHouseFloat, $ as ClickHouseInt, a0 as ClickHouseJson, aM as ClickHouseLineString, a5 as ClickHouseMaterialized, aN as ClickHouseMultiLineString, aP as ClickHouseMultiPolygon, a2 as ClickHouseNamedTuple, aK as ClickHousePoint, aO as ClickHousePolygon, U as ClickHousePrecision, aL as ClickHouseRing, a4 as ClickHouseTTL, j as ConsumptionApi, aT as ConsumptionHelpers, aq as ConsumptionUtil, a9 as DateTime, aa as DateTime64, ac as DateTime64String, ab as DateTimeString, e as DeadLetter, D as DeadLetterModel, f as DeadLetterQueue, ao as Decimal, m as ETLPipeline, n as ETLPipelineConfig, E as EgressConfig, ad as FixedString, ae as Float32, af as Float64, F as FrameworkApp, as as IdentifierBrandedString, I as IngestApi, g as IngestConfig, k as IngestPipeline, ah as Int16, ai as Int32, aj as Int64, ag as Int8, L as LifeCycle, a1 as LowCardinality, M as MaterializedView, at as NonIdentifierBrandedString, a as OlapConfig, av as RawValue, b as S3QueueTableSettings, S as SimpleAggregated, l as SqlResource, aw as SqlTemplateTag, c as Stream, d as StreamConfig, T as Task, al as UInt16, am as UInt32, an as UInt64, ak as UInt8, au as Value, V as View, o as WebApp, p as WebAppConfig, q as WebAppHandler, a7 as WithDefault, W as Workflow, aQ as WorkflowClient, aD as createClickhouseParameter, y as getApi, x as getApis, w as getIngestApi, v as getIngestApis, Q as getMaterializedView, R as getMaterializedViews, B as getSqlResource, z as getSqlResources, u as getStream, t as getStreams, s as getTable, r as getTables, aR as getTemporalClient, aC as getValueFromParameter, N as getView, P as getViews, K as getWebApp, J as getWebApps, H as getWorkflow, G as getWorkflows, aU as joinQueries, aE as mapToClickHouseType, ar as quoteIdentifier, ax as sql, aA as toQuery, aB as toQueryPreview, az as toStaticQuery } from './index-D22Yb8pY.mjs';
+import { aF as MooseUtils, aG as MooseClient, ay as Sql, O as OlapTable, M as MaterializedView, aH as Column, aI as QueryClient, aJ as DataType } from './index-D22Yb8pY.mjs';
+export { A as Aggregated, h as Api, i as ApiConfig, aS as ApiHelpers, ap as ApiUtil, a6 as ClickHouseAlias, Y as ClickHouseByteSize, a8 as ClickHouseCodec, X as ClickHouseDecimal, a3 as ClickHouseDefault, C as ClickHouseEngines, Z as ClickHouseFixedStringSize, _ as ClickHouseFloat, $ as ClickHouseInt, a0 as ClickHouseJson, aM as ClickHouseLineString, a5 as ClickHouseMaterialized, aN as ClickHouseMultiLineString, aP as ClickHouseMultiPolygon, a2 as ClickHouseNamedTuple, aK as ClickHousePoint, aO as ClickHousePolygon, U as ClickHousePrecision, aL as ClickHouseRing, a4 as ClickHouseTTL, j as ConsumptionApi, aT as ConsumptionHelpers, aq as ConsumptionUtil, a9 as DateTime, aa as DateTime64, ac as DateTime64String, ab as DateTimeString, e as DeadLetter, D as DeadLetterModel, f as DeadLetterQueue, ao as Decimal, m as ETLPipeline, n as ETLPipelineConfig, E as EgressConfig, ad as FixedString, ae as Float32, af as Float64, F as FrameworkApp, as as IdentifierBrandedString, I as IngestApi, g as IngestConfig, k as IngestPipeline, ah as Int16, ai as Int32, aj as Int64, ag as Int8, L as LifeCycle, a1 as LowCardinality, at as NonIdentifierBrandedString, a as OlapConfig, av as RawValue, b as S3QueueTableSettings, S as SimpleAggregated, l as SqlResource, aw as SqlTemplateTag, c as Stream, d as StreamConfig, T as Task, al as UInt16, am as UInt32, an as UInt64, ak as UInt8, au as Value, V as View, o as WebApp, p as WebAppConfig, q as WebAppHandler, a7 as WithDefault, W as Workflow, aQ as WorkflowClient, aD as createClickhouseParameter, y as getApi, x as getApis, w as getIngestApi, v as getIngestApis, Q as getMaterializedView, R as getMaterializedViews, B as getSqlResource, z as getSqlResources, u as getStream, t as getStreams, s as getTable, r as getTables, aR as getTemporalClient, aC as getValueFromParameter, N as getView, P as getViews, K as getWebApp, J as getWebApps, H as getWorkflow, G as getWorkflows, aU as joinQueries, aE as mapToClickHouseType, ar as quoteIdentifier, ax as sql, aA as toQuery, aB as toQueryPreview, az as toStaticQuery } from './index-D22Yb8pY.mjs';
 import http from 'http';
 import { IsTuple } from 'typia/lib/typings/IsTuple';
 import { Readable } from 'node:stream';
@@ -725,7 +725,7 @@ interface ColumnDef<TModel = any, TKey extends keyof TModel = keyof TModel> {
  * }
  */
 interface JoinDef {
-    table: OlapTable<any>;
+    table: OlapTable<any> | MaterializedView<any>;
     on?: Sql;
     leftKey?: string;
     rightKey?: string;
@@ -844,8 +844,8 @@ interface QueryModelConfig<TTable, TMetrics extends Record<string, MetricDef>, T
     name?: string;
     /** Tool description used by registerModelTools */
     description?: string;
-    /** The OlapTable to query */
-    table: OlapTable<TTable>;
+    /** The OlapTable or MaterializedView to query. If a MaterializedView is passed, its targetTable is used. */
+    table: OlapTable<TTable> | MaterializedView<TTable>;
     /**
      * Dimension fields — columns used for grouping, filtering, and display.
      *
@@ -1390,4 +1390,4 @@ type DataModelConfig<T> = Partial<{
     parallelism?: number;
 }>;
 
-export { ACKs, BadRequestError, type CSVParsingConfig, CSV_DELIMITERS, type CliLogData, type ColRef, Column, type ColumnDef, DEFAULT_CSV_CONFIG, DEFAULT_JSON_CONFIG, type DataModelConfig, DataSource, type DataSourceConfig, type DimensionDef, type Expr, type ExpressRequestWithMoose, type ExtractionResult, type FilterDefBase, type FilterInputTypeHint, type FilterOperator, type FilterParams, type JSONParsingConfig, type JoinDef, type KafkaClientConfig, type Logger, MAX_RETRIES, MAX_RETRIES_PRODUCER, MAX_RETRY_TIME_MS, MOOSE_RUNTIME_ENV_PREFIX, type MetricDef, type ModelFilterDef, type ModelToolOptions, type ModelToolResult, MooseCache, MooseClient, MooseUtils, type Names, OlapTable, type OperatorValueType, type Producer, type QueryBuilder, QueryClient, type QueryHandler, type QueryModel, type QueryModelBase, type QueryModelConfig, type QueryModelFilter, type QueryParts, type QueryRequest, RETRY_FACTOR_PRODUCER, RETRY_INITIAL_TIME_MS, type SortDir, Sql, type SqlValue, type StripDateIntersection, type TaskConfig, type TaskDefinition, type TaskFunction, type ValidationError, and, antiCachePath, as, assertValid, avg, between, buildQuery, cliLog, columnsFromTable, compilerLog, count, countDistinct, createModelTool, createProducerConfig, createQueryHandler, defineQueryModel, deriveInputTypeFromDataType, empty, eq, expressMiddleware, filter, filtersFromTable, getClickhouseClient, getFileName, getKafkaClient, getKafkaProducer, getLegacyMooseUtils, getMooseClients, getMooseUtils, getMooseUtilsFromRequest, groupBy, gt, gte, having, ilike, inList, isEmpty, isNotNull, isNull, isValidCSVDelimiter, join, like, limit, logError, lt, lte, mapTstoJs, max, min, mooseEnvSecrets, mooseRuntimeEnv, ne, not, notIn, offset, or, orderBy, paginate, parseCSV, parseJSON, parseJSONWithDates, raw, registerModelTools, rewriteImportExtensions, select, sum, timeDimensions, where };
+export { ACKs, BadRequestError, type CSVParsingConfig, CSV_DELIMITERS, type CliLogData, type ColRef, Column, type ColumnDef, DEFAULT_CSV_CONFIG, DEFAULT_JSON_CONFIG, type DataModelConfig, DataSource, type DataSourceConfig, type DimensionDef, type Expr, type ExpressRequestWithMoose, type ExtractionResult, type FilterDefBase, type FilterInputTypeHint, type FilterOperator, type FilterParams, type JSONParsingConfig, type JoinDef, type KafkaClientConfig, type Logger, MAX_RETRIES, MAX_RETRIES_PRODUCER, MAX_RETRY_TIME_MS, MOOSE_RUNTIME_ENV_PREFIX, MaterializedView, type MetricDef, type ModelFilterDef, type ModelToolOptions, type ModelToolResult, MooseCache, MooseClient, MooseUtils, type Names, OlapTable, type OperatorValueType, type Producer, type QueryBuilder, QueryClient, type QueryHandler, type QueryModel, type QueryModelBase, type QueryModelConfig, type QueryModelFilter, type QueryParts, type QueryRequest, RETRY_FACTOR_PRODUCER, RETRY_INITIAL_TIME_MS, type SortDir, Sql, type SqlValue, type StripDateIntersection, type TaskConfig, type TaskDefinition, type TaskFunction, type ValidationError, and, antiCachePath, as, assertValid, avg, between, buildQuery, cliLog, columnsFromTable, compilerLog, count, countDistinct, createModelTool, createProducerConfig, createQueryHandler, defineQueryModel, deriveInputTypeFromDataType, empty, eq, expressMiddleware, filter, filtersFromTable, getClickhouseClient, getFileName, getKafkaClient, getKafkaProducer, getLegacyMooseUtils, getMooseClients, getMooseUtils, getMooseUtilsFromRequest, groupBy, gt, gte, having, ilike, inList, isEmpty, isNotNull, isNull, isValidCSVDelimiter, join, like, limit, logError, lt, lte, mapTstoJs, max, min, mooseEnvSecrets, mooseRuntimeEnv, ne, not, notIn, offset, or, orderBy, paginate, parseCSV, parseJSON, parseJSONWithDates, raw, registerModelTools, rewriteImportExtensions, select, sum, timeDimensions, where };

package/dist/index.d.ts

@@ -1,8 +1,8 @@
 export { JWT, Key } from './browserCompatible.js';
 import * as _clickhouse_client from '@clickhouse/client';
 import { KafkaJS } from '@514labs/kafka-javascript';
-import { aF as MooseUtils, aG as MooseClient, ay as Sql, O as OlapTable, aH as Column, aI as QueryClient, aJ as DataType } from './index-D22Yb8pY.js';
-export { A as Aggregated, h as Api, i as ApiConfig, aS as ApiHelpers, ap as ApiUtil, a6 as ClickHouseAlias, Y as ClickHouseByteSize, a8 as ClickHouseCodec, X as ClickHouseDecimal, a3 as ClickHouseDefault, C as ClickHouseEngines, Z as ClickHouseFixedStringSize, _ as ClickHouseFloat, $ as ClickHouseInt, a0 as ClickHouseJson, aM as ClickHouseLineString, a5 as ClickHouseMaterialized, aN as ClickHouseMultiLineString, aP as ClickHouseMultiPolygon, a2 as ClickHouseNamedTuple, aK as ClickHousePoint, aO as ClickHousePolygon, U as ClickHousePrecision, aL as ClickHouseRing, a4 as ClickHouseTTL, j as ConsumptionApi, aT as ConsumptionHelpers, aq as ConsumptionUtil, a9 as DateTime, aa as DateTime64, ac as DateTime64String, ab as DateTimeString, e as DeadLetter, D as DeadLetterModel, f as DeadLetterQueue, ao as Decimal, m as ETLPipeline, n as ETLPipelineConfig, E as EgressConfig, ad as FixedString, ae as Float32, af as Float64, F as FrameworkApp, as as IdentifierBrandedString, I as IngestApi, g as IngestConfig, k as IngestPipeline, ah as Int16, ai as Int32, aj as Int64, ag as Int8, L as LifeCycle, a1 as LowCardinality, M as MaterializedView, at as NonIdentifierBrandedString, a as OlapConfig, av as RawValue, b as S3QueueTableSettings, S as SimpleAggregated, l as SqlResource, aw as SqlTemplateTag, c as Stream, d as StreamConfig, T as Task, al as UInt16, am as UInt32, an as UInt64, ak as UInt8, au as Value, V as View, o as WebApp, p as WebAppConfig, q as WebAppHandler, a7 as WithDefault, W as Workflow, aQ as WorkflowClient, aD as createClickhouseParameter, y as getApi, x as getApis, w as getIngestApi, v as getIngestApis, Q as getMaterializedView, R as getMaterializedViews, B as getSqlResource, z as getSqlResources, u as getStream, t as getStreams, s as getTable, r as getTables, aR as getTemporalClient, aC as getValueFromParameter, N as getView, P as getViews, K as getWebApp, J as getWebApps, H as getWorkflow, G as getWorkflows, aU as joinQueries, aE as mapToClickHouseType, ar as quoteIdentifier, ax as sql, aA as toQuery, aB as toQueryPreview, az as toStaticQuery } from './index-D22Yb8pY.js';
+import { aF as MooseUtils, aG as MooseClient, ay as Sql, O as OlapTable, M as MaterializedView, aH as Column, aI as QueryClient, aJ as DataType } from './index-D22Yb8pY.js';
+export { A as Aggregated, h as Api, i as ApiConfig, aS as ApiHelpers, ap as ApiUtil, a6 as ClickHouseAlias, Y as ClickHouseByteSize, a8 as ClickHouseCodec, X as ClickHouseDecimal, a3 as ClickHouseDefault, C as ClickHouseEngines, Z as ClickHouseFixedStringSize, _ as ClickHouseFloat, $ as ClickHouseInt, a0 as ClickHouseJson, aM as ClickHouseLineString, a5 as ClickHouseMaterialized, aN as ClickHouseMultiLineString, aP as ClickHouseMultiPolygon, a2 as ClickHouseNamedTuple, aK as ClickHousePoint, aO as ClickHousePolygon, U as ClickHousePrecision, aL as ClickHouseRing, a4 as ClickHouseTTL, j as ConsumptionApi, aT as ConsumptionHelpers, aq as ConsumptionUtil, a9 as DateTime, aa as DateTime64, ac as DateTime64String, ab as DateTimeString, e as DeadLetter, D as DeadLetterModel, f as DeadLetterQueue, ao as Decimal, m as ETLPipeline, n as ETLPipelineConfig, E as EgressConfig, ad as FixedString, ae as Float32, af as Float64, F as FrameworkApp, as as IdentifierBrandedString, I as IngestApi, g as IngestConfig, k as IngestPipeline, ah as Int16, ai as Int32, aj as Int64, ag as Int8, L as LifeCycle, a1 as LowCardinality, at as NonIdentifierBrandedString, a as OlapConfig, av as RawValue, b as S3QueueTableSettings, S as SimpleAggregated, l as SqlResource, aw as SqlTemplateTag, c as Stream, d as StreamConfig, T as Task, al as UInt16, am as UInt32, an as UInt64, ak as UInt8, au as Value, V as View, o as WebApp, p as WebAppConfig, q as WebAppHandler, a7 as WithDefault, W as Workflow, aQ as WorkflowClient, aD as createClickhouseParameter, y as getApi, x as getApis, w as getIngestApi, v as getIngestApis, Q as getMaterializedView, R as getMaterializedViews, B as getSqlResource, z as getSqlResources, u as getStream, t as getStreams, s as getTable, r as getTables, aR as getTemporalClient, aC as getValueFromParameter, N as getView, P as getViews, K as getWebApp, J as getWebApps, H as getWorkflow, G as getWorkflows, aU as joinQueries, aE as mapToClickHouseType, ar as quoteIdentifier, ax as sql, aA as toQuery, aB as toQueryPreview, az as toStaticQuery } from './index-D22Yb8pY.js';
 import http from 'http';
 import { IsTuple } from 'typia/lib/typings/IsTuple';
 import { Readable } from 'node:stream';
@@ -725,7 +725,7 @@ interface ColumnDef<TModel = any, TKey extends keyof TModel = keyof TModel> {
  * }
  */
 interface JoinDef {
-    table: OlapTable<any>;
+    table: OlapTable<any> | MaterializedView<any>;
     on?: Sql;
     leftKey?: string;
     rightKey?: string;
@@ -844,8 +844,8 @@ interface QueryModelConfig<TTable, TMetrics extends Record<string, MetricDef>, T
     name?: string;
     /** Tool description used by registerModelTools */
     description?: string;
-    /** The OlapTable to query */
-    table: OlapTable<TTable>;
+    /** The OlapTable or MaterializedView to query. If a MaterializedView is passed, its targetTable is used. */
+    table: OlapTable<TTable> | MaterializedView<TTable>;
     /**
      * Dimension fields — columns used for grouping, filtering, and display.
      *
@@ -1390,4 +1390,4 @@ type DataModelConfig<T> = Partial<{
     parallelism?: number;
 }>;
 
-export { ACKs, BadRequestError, type CSVParsingConfig, CSV_DELIMITERS, type CliLogData, type ColRef, Column, type ColumnDef, DEFAULT_CSV_CONFIG, DEFAULT_JSON_CONFIG, type DataModelConfig, DataSource, type DataSourceConfig, type DimensionDef, type Expr, type ExpressRequestWithMoose, type ExtractionResult, type FilterDefBase, type FilterInputTypeHint, type FilterOperator, type FilterParams, type JSONParsingConfig, type JoinDef, type KafkaClientConfig, type Logger, MAX_RETRIES, MAX_RETRIES_PRODUCER, MAX_RETRY_TIME_MS, MOOSE_RUNTIME_ENV_PREFIX, type MetricDef, type ModelFilterDef, type ModelToolOptions, type ModelToolResult, MooseCache, MooseClient, MooseUtils, type Names, OlapTable, type OperatorValueType, type Producer, type QueryBuilder, QueryClient, type QueryHandler, type QueryModel, type QueryModelBase, type QueryModelConfig, type QueryModelFilter, type QueryParts, type QueryRequest, RETRY_FACTOR_PRODUCER, RETRY_INITIAL_TIME_MS, type SortDir, Sql, type SqlValue, type StripDateIntersection, type TaskConfig, type TaskDefinition, type TaskFunction, type ValidationError, and, antiCachePath, as, assertValid, avg, between, buildQuery, cliLog, columnsFromTable, compilerLog, count, countDistinct, createModelTool, createProducerConfig, createQueryHandler, defineQueryModel, deriveInputTypeFromDataType, empty, eq, expressMiddleware, filter, filtersFromTable, getClickhouseClient, getFileName, getKafkaClient, getKafkaProducer, getLegacyMooseUtils, getMooseClients, getMooseUtils, getMooseUtilsFromRequest, groupBy, gt, gte, having, ilike, inList, isEmpty, isNotNull, isNull, isValidCSVDelimiter, join, like, limit, logError, lt, lte, mapTstoJs, max, min, mooseEnvSecrets, mooseRuntimeEnv, ne, not, notIn, offset, or, orderBy, paginate, parseCSV, parseJSON, parseJSONWithDates, raw, registerModelTools, rewriteImportExtensions, select, sum, timeDimensions, where };
+export { ACKs, BadRequestError, type CSVParsingConfig, CSV_DELIMITERS, type CliLogData, type ColRef, Column, type ColumnDef, DEFAULT_CSV_CONFIG, DEFAULT_JSON_CONFIG, type DataModelConfig, DataSource, type DataSourceConfig, type DimensionDef, type Expr, type ExpressRequestWithMoose, type ExtractionResult, type FilterDefBase, type FilterInputTypeHint, type FilterOperator, type FilterParams, type JSONParsingConfig, type JoinDef, type KafkaClientConfig, type Logger, MAX_RETRIES, MAX_RETRIES_PRODUCER, MAX_RETRY_TIME_MS, MOOSE_RUNTIME_ENV_PREFIX, MaterializedView, type MetricDef, type ModelFilterDef, type ModelToolOptions, type ModelToolResult, MooseCache, MooseClient, MooseUtils, type Names, OlapTable, type OperatorValueType, type Producer, type QueryBuilder, QueryClient, type QueryHandler, type QueryModel, type QueryModelBase, type QueryModelConfig, type QueryModelFilter, type QueryParts, type QueryRequest, RETRY_FACTOR_PRODUCER, RETRY_INITIAL_TIME_MS, type SortDir, Sql, type SqlValue, type StripDateIntersection, type TaskConfig, type TaskDefinition, type TaskFunction, type ValidationError, and, antiCachePath, as, assertValid, avg, between, buildQuery, cliLog, columnsFromTable, compilerLog, count, countDistinct, createModelTool, createProducerConfig, createQueryHandler, defineQueryModel, deriveInputTypeFromDataType, empty, eq, expressMiddleware, filter, filtersFromTable, getClickhouseClient, getFileName, getKafkaClient, getKafkaProducer, getLegacyMooseUtils, getMooseClients, getMooseUtils, getMooseUtilsFromRequest, groupBy, gt, gte, having, ilike, inList, isEmpty, isNotNull, isNull, isValidCSVDelimiter, join, like, limit, logError, lt, lte, mapTstoJs, max, min, mooseEnvSecrets, mooseRuntimeEnv, ne, not, notIn, offset, or, orderBy, paginate, parseCSV, parseJSON, parseJSONWithDates, raw, registerModelTools, rewriteImportExtensions, select, sum, timeDimensions, where };

package/dist/index.js

@@ -4227,6 +4227,9 @@ function filtersFromTable(table, options) {
 // src/query-layer/query-model.ts
 var applyFilter = filter;
 var identity = (v) => v;
+function resolveTable(tableOrMv) {
+  return tableOrMv instanceof MaterializedView ? tableOrMv.targetTable : tableOrMv;
+}
 function transformFilterValue(op, value, transform) {
   switch (op) {
     case "in":
@@ -4245,7 +4248,7 @@ function transformFilterValue(op, value, transform) {
 }
 function defineQueryModel(config) {
   const {
-    table,
+    table: tableOrMv,
     dimensions,
     metrics,
     columns: columnDefs,
@@ -4254,6 +4257,7 @@ function defineQueryModel(config) {
     sortable,
     defaults = {}
   } = config;
+  const table = resolveTable(tableOrMv);
   const { maxLimit = 1e3 } = defaults;
   const primaryTableName = table.name;
   const hasJoins = joinDefs != null && Object.keys(joinDefs).length > 0;
@@ -4283,7 +4287,7 @@ function defineQueryModel(config) {
             `Column '${name}' references unknown join '${def.join}'`
           );
         }
-        const joinTableName = joinDef.table.name;
+        const joinTableName = resolveTable(joinDef.table).name;
         normalizedColumns[name] = {
           expression: raw(
             `${quoteIdentifier(joinTableName)}.${quoteIdentifier(String(def.column))}`
@@ -4451,9 +4455,10 @@ function defineQueryModel(config) {
     let fromClause = sql`FROM ${table}`;
     for (const [, joinDef] of Object.entries(joinDefs)) {
       const joinType = joinDef.type ?? "LEFT";
+      const joinTable = resolveTable(joinDef.table);
       let onClause;
       if (joinDef.leftKey && joinDef.rightKey) {
-        const joinTableName = joinDef.table.name;
+        const joinTableName = joinTable.name;
         onClause = raw(
           `${quoteIdentifier(primaryTableName)}.${quoteIdentifier(joinDef.leftKey)} = ${quoteIdentifier(joinTableName)}.${quoteIdentifier(joinDef.rightKey)}`
         );
@@ -4462,7 +4467,7 @@ function defineQueryModel(config) {
       } else {
         throw new Error("JoinDef must specify either leftKey/rightKey or on");
       }
-      fromClause = sql`${fromClause} ${raw(joinType)} JOIN ${joinDef.table} ON ${onClause}`;
+      fromClause = sql`${fromClause} ${raw(joinType)} JOIN ${joinTable} ON ${onClause}`;
     }
     return fromClause;
   }