@dbsp/adapter-pgsql 1.4.0 → 1.6.0

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { ExpressionRef, IndexInfo, TruncateOptions, VacuumOptions, AlterColumnOptions, CreateIndexOptions, DropIndexOptions, ModelIR as ModelIR$1 } from '@dbsp/core';
 export { normalizeSQL } from '@dbsp/core';
 import * as _dbsp_types from '@dbsp/types';
-import { ParamIntent, DialectCapabilities, ModelIR, DbCasing, ColumnIR, HierarchyIR, WhereIntent, Adapter, AdapterLogger, AdapterCapabilities, PlanReport, CompiledNqlQuery, CompileOptions, CompiledQuery, CompileResultWithIncludes, SubqueryIncludeInfo, ExpressionIntent, InsertIntent, InsertFromIntent, UpdateIntent, BatchUpdateIntent, DeleteIntent, UpsertIntent, UpsertFromIntent, RecursivePlanReport, CteQueryIntent, SetOperationIntent, DumpMeta, Dump, AdapterStreamOptions, CompileOnlyAdapter, QueryIntent } from '@dbsp/types';
+import { ColumnListInput, ParamIntent, JsonAggOrderByEntry, DialectCapabilities, ModelIR, DbCasing, ColumnIR, HierarchyIR, WhereIntent, Adapter, AdapterLogger, AdapterCapabilities, PlanReport, CompiledNqlQuery, CompileOptions, CompiledQuery, CompileResultWithIncludes, SubqueryIncludeInfo, ExpressionIntent, InsertIntent, InsertFromIntent, UpdateIntent, BatchUpdateIntent, DeleteIntent, UpsertIntent, UpsertFromIntent, RecursivePlanReport, CteQueryIntent, SetOperationIntent, DumpMeta, Dump, AdapterStreamOptions, CompileOnlyAdapter, QueryIntent } from '@dbsp/types';
 import * as _pgsql_types from '@pgsql/types';
 import { Node, OnConflictClause, ParamRef } from '@pgsql/types';
 import { Pool, PoolClient } from 'pg';
@@ -99,6 +99,10 @@ declare function getNamingPluginForDbCasing(casing: 'snake_case' | 'camelCase' |
 
 type BindingNameRegistry = ReadonlySet<string>;
 
+type PlanExpressionOrderBy = readonly {
+    field: string;
+    direction?: 'asc' | 'desc';
+}[];
 /**
  * Simplified PlanDecision for the spike
  * (In production, import from @dbsp/core)
@@ -115,8 +119,8 @@ interface PlanDecision {
     readonly direction?: 'ASC' | 'DESC';
     readonly nulls?: 'FIRST' | 'LAST';
     readonly joinType?: 'inner' | 'left';
-    readonly sourceColumn?: string;
-    readonly targetColumn?: string;
+    readonly sourceColumn?: ColumnListInput;
+    readonly targetColumn?: ColumnListInput;
     readonly targetTable?: string;
     readonly function?: string;
     readonly args?: readonly unknown[];
@@ -134,18 +138,17 @@ interface PlanDecision {
         paramIndex: number;
     };
     readonly partitionBy?: readonly string[];
-    readonly orderBy?: readonly {
-        field: string;
-        direction?: 'asc' | 'desc';
-    }[];
+    readonly orderBy?: PlanExpressionOrderBy | readonly JsonAggOrderByEntry[];
     readonly dataType?: string;
     readonly sourceTable?: string;
     readonly relationName?: string;
     readonly relationPath?: string;
     readonly hydrationPrefix?: string;
     readonly relationType?: 'belongsTo' | 'hasMany' | 'hasOne';
-    readonly foreignKey?: string;
-    readonly parentKey?: string;
+    readonly foreignKey?: ColumnListInput;
+    readonly parentKey?: ColumnListInput;
+    readonly targetPrimaryKey?: readonly JsonAggOrderByEntry[];
+    readonly orderByFallback?: boolean;
     readonly children?: readonly PlanDecision[];
     readonly intentPath?: string;
     readonly choice?: string;
@@ -289,6 +292,8 @@ declare class PlanCompiler {
     private rawJoins;
     /** CTE nodes from include handlers (e.g., CTE strategy) */
     private pendingCtes;
+    /** Local aliases for binding relation-column scalar subqueries. */
+    private bindingRelationColumnSubqueryIndex;
     /**
      * Maps relation-dotted include path → JOIN alias for multi-hop FK resolution.
      * Populated as join decisions are compiled so later hops can find the
@@ -347,6 +352,9 @@ declare class PlanCompiler {
     /** Build a fresh HandlerCompilerState sharing the current parameter array. */
     private createHandlerState;
     private schemaForRangeVar;
+    private isNqlBindingRoot;
+    private buildCorrelatedRelationRefs;
+    private compileBindingRelationColumnSubquery;
     private compileExpressionSubquery;
     private compileGenericNqlFunction;
     private compileNqlFunctionArg;
@@ -1147,8 +1155,8 @@ interface Decision {
     readonly direction?: 'ASC' | 'DESC';
     readonly nulls?: 'FIRST' | 'LAST';
     readonly joinType?: 'inner' | 'left';
-    readonly sourceColumn?: string;
-    readonly targetColumn?: string;
+    readonly sourceColumn?: ColumnListInput;
+    readonly targetColumn?: ColumnListInput;
     readonly targetTable?: string;
     readonly function?: string;
     readonly args?: readonly unknown[];
@@ -1172,8 +1180,10 @@ interface Decision {
     readonly hydrationPrefix?: string;
     readonly include?: readonly Decision[];
     readonly relationType?: 'belongsTo' | 'hasMany' | 'hasOne';
-    readonly foreignKey?: string;
-    readonly parentKey?: string;
+    readonly foreignKey?: ColumnListInput;
+    readonly parentKey?: ColumnListInput;
+    readonly targetPrimaryKey?: readonly JsonAggOrderByEntry[];
+    readonly orderByFallback?: boolean;
     readonly children?: readonly Decision[];
     readonly partition?: readonly string[];
     readonly orderBy?: readonly {