@reasoningco/infer 0.1.4 → 0.1.5

package/dist/schemas.d.ts

@@ -2,15 +2,15 @@ import { z } from "zod";
 export declare const FilterSchema: z.ZodObject<{
     field: z.ZodString;
     op: z.ZodEnum<["=", "!=", ">", "<", ">=", "<=", "in", "not_in", "like", "ilike", "is_null", "is_not_null"]>;
-    value: z.ZodUnion<[z.ZodString, z.ZodNumber, z.ZodBoolean, z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodNumber]>, "many">]>;
+    value: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodNumber, z.ZodBoolean, z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodNumber]>, "many">]>>;
 }, "strip", z.ZodTypeAny, {
-    value: string | number | boolean | (string | number)[];
     field: string;
     op: "=" | ">" | "!=" | "<" | ">=" | "<=" | "in" | "not_in" | "like" | "ilike" | "is_null" | "is_not_null";
+    value?: string | number | boolean | (string | number)[] | undefined;
 }, {
-    value: string | number | boolean | (string | number)[];
     field: string;
     op: "=" | ">" | "!=" | "<" | ">=" | "<=" | "in" | "not_in" | "like" | "ilike" | "is_null" | "is_not_null";
+    value?: string | number | boolean | (string | number)[] | undefined;
 }>;
 export declare const EntityFilterSchema: z.ZodObject<{
     resolver: z.ZodString;
@@ -33,15 +33,15 @@ export declare const ExistsFilterSchema: z.ZodObject<{
     filters: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
         field: z.ZodString;
         op: z.ZodEnum<["=", "!=", ">", "<", ">=", "<=", "in", "not_in", "like", "ilike", "is_null", "is_not_null"]>;
-        value: z.ZodUnion<[z.ZodString, z.ZodNumber, z.ZodBoolean, z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodNumber]>, "many">]>;
+        value: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodNumber, z.ZodBoolean, z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodNumber]>, "many">]>>;
     }, "strip", z.ZodTypeAny, {
-        value: string | number | boolean | (string | number)[];
         field: string;
         op: "=" | ">" | "!=" | "<" | ">=" | "<=" | "in" | "not_in" | "like" | "ilike" | "is_null" | "is_not_null";
+        value?: string | number | boolean | (string | number)[] | undefined;
     }, {
-        value: string | number | boolean | (string | number)[];
         field: string;
         op: "=" | ">" | "!=" | "<" | ">=" | "<=" | "in" | "not_in" | "like" | "ilike" | "is_null" | "is_not_null";
+        value?: string | number | boolean | (string | number)[] | undefined;
     }>, "many">>>;
 }, "strip", z.ZodTypeAny, {
     mode: "not_exists" | "exists";
@@ -49,9 +49,9 @@ export declare const ExistsFilterSchema: z.ZodObject<{
     joinColumn: string;
     foreignColumn: string;
     filters: {
-        value: string | number | boolean | (string | number)[];
         field: string;
         op: "=" | ">" | "!=" | "<" | ">=" | "<=" | "in" | "not_in" | "like" | "ilike" | "is_null" | "is_not_null";
+        value?: string | number | boolean | (string | number)[] | undefined;
     }[];
 }, {
     mode: "not_exists" | "exists";
@@ -59,9 +59,9 @@ export declare const ExistsFilterSchema: z.ZodObject<{
     joinColumn: string;
     foreignColumn: string;
     filters?: {
-        value: string | number | boolean | (string | number)[];
         field: string;
         op: "=" | ">" | "!=" | "<" | ">=" | "<=" | "in" | "not_in" | "like" | "ilike" | "is_null" | "is_not_null";
+        value?: string | number | boolean | (string | number)[] | undefined;
     }[] | undefined;
 }>;
 export declare const DateRangeSchema: z.ZodObject<{
@@ -92,40 +92,44 @@ export declare const OrderBySchema: z.ZodObject<{
 }>;
 export declare const SmartQueryPlanSchema: z.ZodObject<{
     dataset: z.ZodString;
-    select: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString, "many">>>;
-    metrics: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString, "many">>>;
-    groupBy: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString, "many">>>;
+    select: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString, "many">>>, string[], unknown>;
+    metrics: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString, "many">>>, string[], unknown>;
+    groupBy: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString, "many">>>, string[], unknown>;
     timeBucket: z.ZodEffects<z.ZodOptional<z.ZodEnum<["hour", "day", "week", "month", "quarter", "year"]>>, "month" | "day" | "week" | "quarter" | "year" | "hour" | undefined, unknown>;
     extractBucket: z.ZodEffects<z.ZodOptional<z.ZodEnum<["hour_of_day", "day_of_week", "month_of_year", "quarter", "year", "week"]>>, "week" | "quarter" | "year" | "hour_of_day" | "day_of_week" | "month_of_year" | undefined, unknown>;
-    filters: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
+    filters: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
         field: z.ZodString;
         op: z.ZodEnum<["=", "!=", ">", "<", ">=", "<=", "in", "not_in", "like", "ilike", "is_null", "is_not_null"]>;
-        value: z.ZodUnion<[z.ZodString, z.ZodNumber, z.ZodBoolean, z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodNumber]>, "many">]>;
+        value: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodNumber, z.ZodBoolean, z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodNumber]>, "many">]>>;
     }, "strip", z.ZodTypeAny, {
-        value: string | number | boolean | (string | number)[];
         field: string;
         op: "=" | ">" | "!=" | "<" | ">=" | "<=" | "in" | "not_in" | "like" | "ilike" | "is_null" | "is_not_null";
+        value?: string | number | boolean | (string | number)[] | undefined;
     }, {
-        value: string | number | boolean | (string | number)[];
         field: string;
         op: "=" | ">" | "!=" | "<" | ">=" | "<=" | "in" | "not_in" | "like" | "ilike" | "is_null" | "is_not_null";
-    }>, "many">>>;
+        value?: string | number | boolean | (string | number)[] | undefined;
+    }>, "many">>>, {
+        field: string;
+        op: "=" | ">" | "!=" | "<" | ">=" | "<=" | "in" | "not_in" | "like" | "ilike" | "is_null" | "is_not_null";
+        value?: string | number | boolean | (string | number)[] | undefined;
+    }[], unknown>;
     having: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
         field: z.ZodString;
         op: z.ZodEnum<["=", "!=", ">", "<", ">=", "<=", "in", "not_in", "like", "ilike", "is_null", "is_not_null"]>;
-        value: z.ZodUnion<[z.ZodString, z.ZodNumber, z.ZodBoolean, z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodNumber]>, "many">]>;
+        value: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodNumber, z.ZodBoolean, z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodNumber]>, "many">]>>;
     }, "strip", z.ZodTypeAny, {
-        value: string | number | boolean | (string | number)[];
         field: string;
         op: "=" | ">" | "!=" | "<" | ">=" | "<=" | "in" | "not_in" | "like" | "ilike" | "is_null" | "is_not_null";
+        value?: string | number | boolean | (string | number)[] | undefined;
     }, {
-        value: string | number | boolean | (string | number)[];
         field: string;
         op: "=" | ">" | "!=" | "<" | ">=" | "<=" | "in" | "not_in" | "like" | "ilike" | "is_null" | "is_not_null";
+        value?: string | number | boolean | (string | number)[] | undefined;
     }>, "many">>>, {
-        value: string | number | boolean | (string | number)[];
         field: string;
         op: "=" | ">" | "!=" | "<" | ">=" | "<=" | "in" | "not_in" | "like" | "ilike" | "is_null" | "is_not_null";
+        value?: string | number | boolean | (string | number)[] | undefined;
     }[], unknown>;
     existsFilters: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
         mode: z.ZodEnum<["exists", "not_exists"]>;
@@ -135,15 +139,15 @@ export declare const SmartQueryPlanSchema: z.ZodObject<{
         filters: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
             field: z.ZodString;
             op: z.ZodEnum<["=", "!=", ">", "<", ">=", "<=", "in", "not_in", "like", "ilike", "is_null", "is_not_null"]>;
-            value: z.ZodUnion<[z.ZodString, z.ZodNumber, z.ZodBoolean, z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodNumber]>, "many">]>;
+            value: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodNumber, z.ZodBoolean, z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodNumber]>, "many">]>>;
         }, "strip", z.ZodTypeAny, {
-            value: string | number | boolean | (string | number)[];
             field: string;
             op: "=" | ">" | "!=" | "<" | ">=" | "<=" | "in" | "not_in" | "like" | "ilike" | "is_null" | "is_not_null";
+            value?: string | number | boolean | (string | number)[] | undefined;
         }, {
-            value: string | number | boolean | (string | number)[];
             field: string;
             op: "=" | ">" | "!=" | "<" | ">=" | "<=" | "in" | "not_in" | "like" | "ilike" | "is_null" | "is_not_null";
+            value?: string | number | boolean | (string | number)[] | undefined;
         }>, "many">>>;
     }, "strip", z.ZodTypeAny, {
         mode: "not_exists" | "exists";
@@ -151,9 +155,9 @@ export declare const SmartQueryPlanSchema: z.ZodObject<{
         joinColumn: string;
         foreignColumn: string;
         filters: {
-            value: string | number | boolean | (string | number)[];
             field: string;
             op: "=" | ">" | "!=" | "<" | ">=" | "<=" | "in" | "not_in" | "like" | "ilike" | "is_null" | "is_not_null";
+            value?: string | number | boolean | (string | number)[] | undefined;
         }[];
     }, {
         mode: "not_exists" | "exists";
@@ -161,9 +165,9 @@ export declare const SmartQueryPlanSchema: z.ZodObject<{
         joinColumn: string;
         foreignColumn: string;
         filters?: {
-            value: string | number | boolean | (string | number)[];
             field: string;
             op: "=" | ">" | "!=" | "<" | ">=" | "<=" | "in" | "not_in" | "like" | "ilike" | "is_null" | "is_not_null";
+            value?: string | number | boolean | (string | number)[] | undefined;
         }[] | undefined;
     }>, "many">>>, {
         mode: "not_exists" | "exists";
@@ -171,12 +175,12 @@ export declare const SmartQueryPlanSchema: z.ZodObject<{
         joinColumn: string;
         foreignColumn: string;
         filters: {
-            value: string | number | boolean | (string | number)[];
             field: string;
             op: "=" | ">" | "!=" | "<" | ">=" | "<=" | "in" | "not_in" | "like" | "ilike" | "is_null" | "is_not_null";
+            value?: string | number | boolean | (string | number)[] | undefined;
         }[];
     }[], unknown>;
-    entityFilters: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
+    entityFilters: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
         resolver: z.ZodString;
         input: z.ZodString;
         outputColumn: z.ZodString;
@@ -188,7 +192,11 @@ export declare const SmartQueryPlanSchema: z.ZodObject<{
         input: string;
         resolver: string;
         outputColumn: string;
-    }>, "many">>>;
+    }>, "many">>>, {
+        input: string;
+        resolver: string;
+        outputColumn: string;
+    }[], unknown>;
     dateRange: z.ZodEffects<z.ZodOptional<z.ZodObject<{
         mode: z.ZodEnum<["relative", "explicit", "latest", "none"]>;
         phrase: z.ZodOptional<z.ZodString>;
@@ -210,7 +218,7 @@ export declare const SmartQueryPlanSchema: z.ZodObject<{
         endDate?: string | undefined;
         phrase?: string | undefined;
     } | undefined, unknown>;
-    orderBy: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
+    orderBy: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
         field: z.ZodString;
         dir: z.ZodDefault<z.ZodEnum<["asc", "desc"]>>;
     }, "strip", z.ZodTypeAny, {
@@ -219,22 +227,25 @@ export declare const SmartQueryPlanSchema: z.ZodObject<{
     }, {
         field: string;
         dir?: "desc" | "asc" | undefined;
-    }>, "many">>>;
+    }>, "many">>>, {
+        field: string;
+        dir: "desc" | "asc";
+    }[], unknown>;
     limit: z.ZodEffects<z.ZodOptional<z.ZodNumber>, number | undefined, unknown>;
     answerMode: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodEnum<["rows", "aggregate_table", "scalar"]>>>, "aggregate_table" | "rows" | "scalar", unknown>;
     compareMode: z.ZodEffects<z.ZodOptional<z.ZodEnum<["previous_period", "year_over_year"]>>, "previous_period" | "year_over_year" | undefined, unknown>;
 }, "strip", z.ZodTypeAny, {
     select: string[];
     having: {
-        value: string | number | boolean | (string | number)[];
         field: string;
         op: "=" | ">" | "!=" | "<" | ">=" | "<=" | "in" | "not_in" | "like" | "ilike" | "is_null" | "is_not_null";
+        value?: string | number | boolean | (string | number)[] | undefined;
     }[];
     dataset: string;
     filters: {
-        value: string | number | boolean | (string | number)[];
         field: string;
         op: "=" | ">" | "!=" | "<" | ">=" | "<=" | "in" | "not_in" | "like" | "ilike" | "is_null" | "is_not_null";
+        value?: string | number | boolean | (string | number)[] | undefined;
     }[];
     metrics: string[];
     groupBy: string[];
@@ -244,9 +255,9 @@ export declare const SmartQueryPlanSchema: z.ZodObject<{
         joinColumn: string;
         foreignColumn: string;
         filters: {
-            value: string | number | boolean | (string | number)[];
             field: string;
             op: "=" | ">" | "!=" | "<" | ">=" | "<=" | "in" | "not_in" | "like" | "ilike" | "is_null" | "is_not_null";
+            value?: string | number | boolean | (string | number)[] | undefined;
         }[];
     }[];
     entityFilters: {
@@ -271,28 +282,17 @@ export declare const SmartQueryPlanSchema: z.ZodObject<{
     compareMode?: "previous_period" | "year_over_year" | undefined;
 }, {
     dataset: string;
-    select?: string[] | undefined;
+    select?: unknown;
     having?: unknown;
-    filters?: {
-        value: string | number | boolean | (string | number)[];
-        field: string;
-        op: "=" | ">" | "!=" | "<" | ">=" | "<=" | "in" | "not_in" | "like" | "ilike" | "is_null" | "is_not_null";
-    }[] | undefined;
-    metrics?: string[] | undefined;
-    groupBy?: string[] | undefined;
+    filters?: unknown;
+    metrics?: unknown;
+    groupBy?: unknown;
     timeBucket?: unknown;
     extractBucket?: unknown;
     existsFilters?: unknown;
-    entityFilters?: {
-        input: string;
-        resolver: string;
-        outputColumn: string;
-    }[] | undefined;
+    entityFilters?: unknown;
     dateRange?: unknown;
-    orderBy?: {
-        field: string;
-        dir?: "desc" | "asc" | undefined;
-    }[] | undefined;
+    orderBy?: unknown;
     limit?: unknown;
     answerMode?: unknown;
     compareMode?: unknown;

package/dist/schemas.js

@@ -5,10 +5,10 @@ export const FilterSchema = z.object({
     op: z.enum(["=", "!=", ">", "<", ">=", "<=", "in", "not_in", "like", "ilike", "is_null", "is_not_null"]),
     value: z.union([
         z.string(),
-        z.number(),
+        z.number().finite(),
         z.boolean(),
-        z.array(z.union([z.string(), z.number()])),
-    ]),
+        z.array(z.union([z.string(), z.number().finite()])),
+    ]).optional(),
 });
 // ── Entity filter schema ──
 export const EntityFilterSchema = z.object({
@@ -39,15 +39,15 @@ export const OrderBySchema = z.object({
 // ── Smart query plan schema ──
 export const SmartQueryPlanSchema = z.object({
     dataset: z.string(),
-    select: z.array(z.string()).optional().default([]),
-    metrics: z.array(z.string()).optional().default([]),
-    groupBy: z.array(z.string()).optional().default([]),
+    select: z.preprocess((v) => (v === null ? [] : v), z.array(z.string()).optional().default([])),
+    metrics: z.preprocess((v) => (v === null ? [] : v), z.array(z.string()).optional().default([])),
+    groupBy: z.preprocess((v) => (v === null ? [] : v), z.array(z.string()).optional().default([])),
     timeBucket: z.preprocess((v) => (v === null ? undefined : v), z.enum(["hour", "day", "week", "month", "quarter", "year"]).optional()),
     extractBucket: z.preprocess((v) => (v === null ? undefined : v), z.enum(["hour_of_day", "day_of_week", "month_of_year", "quarter", "year", "week"]).optional()),
-    filters: z.array(FilterSchema).optional().default([]),
+    filters: z.preprocess((v) => (v === null ? [] : v), z.array(FilterSchema).optional().default([])),
     having: z.preprocess((v) => (v === null ? [] : v), z.array(FilterSchema).optional().default([])),
     existsFilters: z.preprocess((v) => (v === null ? [] : v), z.array(ExistsFilterSchema).optional().default([])),
-    entityFilters: z.array(EntityFilterSchema).optional().default([]),
+    entityFilters: z.preprocess((v) => (v === null ? [] : v), z.array(EntityFilterSchema).optional().default([])),
     dateRange: z.preprocess((v) => {
         if (v === null)
             return undefined;
@@ -55,8 +55,8 @@ export const SmartQueryPlanSchema = z.object({
             return undefined;
         return v;
     }, DateRangeSchema.optional()),
-    orderBy: z.array(OrderBySchema).optional().default([]),
-    limit: z.preprocess((v) => (v === null ? undefined : v), z.number().int().positive().max(200).optional()),
+    orderBy: z.preprocess((v) => (v === null ? [] : v), z.array(OrderBySchema).optional().default([])),
+    limit: z.preprocess((v) => (v === null ? undefined : v), z.number().finite().int().positive().max(200).optional()),
     answerMode: z.preprocess((v) => (v === null ? undefined : v), z.enum(["rows", "aggregate_table", "scalar"]).optional().default("rows")),
     compareMode: z.preprocess((v) => (v === null ? undefined : v), z.enum(['previous_period', 'year_over_year']).optional()),
 });

package/dist/schemas.js.map

@@ -1 +1 @@
-{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../src/schemas.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../src/schemas.ts"],"names":[],"mappings":"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"}

package/dist/sql-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sql-builder.d.ts","sourceRoot":"","sources":["../src/sql-builder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAIpF,iBAAS,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAM3C;AAED,OAAO,EAAE,eAAe,EAAE,CAAC;AAE3B,wBAAgB,UAAU,CAAC,IAAI,EAAE,kBAAkB,EAAE,GAAG,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE,OAAO,YAAY,EAAE,YAAY,GAAG,WAAW,CA6VpI"}
+{"version":3,"file":"sql-builder.d.ts","sourceRoot":"","sources":["../src/sql-builder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAIpF,iBAAS,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAM3C;AAED,OAAO,EAAE,eAAe,EAAE,CAAC;AAE3B,wBAAgB,UAAU,CAAC,IAAI,EAAE,kBAAkB,EAAE,GAAG,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE,OAAO,YAAY,EAAE,YAAY,GAAG,WAAW,CA2YpI"}

package/dist/sql-builder.js

@@ -2,8 +2,8 @@ import { InferError } from './errors.js';
 // Use pg driver's native escapeIdentifier pattern
 // Since we can't import pg at compile time (it's optional), we implement the safe quoting
 function quoteIdentifier(id) {
-    // Validate: identifiers must be alphanumeric + underscore (no SQL injection via identifiers)
-    if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(id)) {
+    // Validate: identifiers must be alphanumeric, underscore, or hyphen (no SQL injection)
+    if (!/^[a-zA-Z_][a-zA-Z0-9_-]*$/.test(id)) {
         throw new InferError('SQL_VALIDATION_FAILED', 'compiler', `Invalid identifier: ${id}`);
     }
     return `"${id.replace(/"/g, '""')}"`;
@@ -45,16 +45,38 @@ export function compileSQL(plan, ctx, catalog) {
             const nameCol = targetDs.selectableColumns.find(c => ['name', 'title', 'label', 'display_name', 'full_name', 'username', 'email'].includes(c));
             if (!nameCol)
                 continue;
-            if (!joinAliases.has(bareTable)) {
+            let alias = bareTable;
+            if (joinAliases.has(bareTable)) {
+                // Table already joined — use a unique alias to avoid conflicts (e.g. two FKs to same table)
+                alias = `${bareTable}__${col}`;
+                if (!joinAliases.has(alias)) {
+                    const targetFull = `${quoteIdentifier(targetDs.table.schema)}.${quoteIdentifier(targetDs.table.name)}`;
+                    joinAliases.set(alias, alias);
+                    joinClauses.push(`LEFT JOIN ${targetFull} AS ${quoteIdentifier(alias)} ON ${quoteIdentifier(mainAlias)}.${quoteIdentifier(col)} = ${quoteIdentifier(alias)}.${quoteIdentifier(joinDef.foreignColumn)}`);
+                }
+            }
+            else {
                 const targetFull = `${quoteIdentifier(targetDs.table.schema)}.${quoteIdentifier(targetDs.table.name)}`;
                 joinAliases.set(bareTable, bareTable);
                 joinClauses.push(`LEFT JOIN ${targetFull} AS ${quoteIdentifier(bareTable)} ON ${quoteIdentifier(mainAlias)}.${quoteIdentifier(col)} = ${quoteIdentifier(bareTable)}.${quoteIdentifier(joinDef.foreignColumn)}`);
             }
-            const fkRef = `${quoteIdentifier(bareTable)}.${quoteIdentifier(nameCol)}`;
-            fkNameColumns.push(`${fkRef} AS ${quoteIdentifier(col.replace(/_id$/, '_name'))}`);
+            const fkRef = `${quoteIdentifier(alias)}.${quoteIdentifier(nameCol)}`;
+            // Use a unique alias that won't collide with existing columns
+            const fkAlias = col.replace(/_id$/, '') + '_name';
+            const safeFkAlias = plan.dataset.selectableColumns.includes(fkAlias) ? `${fkAlias}_fk` : fkAlias;
+            fkNameColumns.push(`${fkRef} AS ${quoteIdentifier(safeFkAlias)}`);
             fkGroupByRefs.push(fkRef);
         }
     }
+    // ── Validate time/extract buckets at runtime ──
+    const VALID_TIME_BUCKETS = new Set(['hour', 'day', 'week', 'month', 'quarter', 'year']);
+    const VALID_EXTRACT_BUCKETS = new Set(['hour_of_day', 'day_of_week', 'month_of_year', 'quarter', 'year', 'week']);
+    if (plan.timeBucket && !VALID_TIME_BUCKETS.has(plan.timeBucket)) {
+        throw new InferError('SQL_VALIDATION_FAILED', 'compiler', `Invalid timeBucket: ${plan.timeBucket}`);
+    }
+    if (plan.extractBucket && !VALID_EXTRACT_BUCKETS.has(plan.extractBucket)) {
+        throw new InferError('SQL_VALIDATION_FAILED', 'compiler', `Invalid extractBucket: ${plan.extractBucket}`);
+    }
     // ── Determine which groupBy columns need DATE_TRUNC or EXTRACT ──
     const dateGroupColumns = new Set();
     const extractGroupColumns = new Set();
@@ -83,7 +105,7 @@ export function compileSQL(plan, ctx, catalog) {
             case 'quarter': return `EXTRACT(QUARTER FROM ${ref})`;
             case 'year': return `EXTRACT(YEAR FROM ${ref})`;
             case 'week': return `EXTRACT(WEEK FROM ${ref})`;
-            default: return ref;
+            default: throw new InferError('SQL_VALIDATION_FAILED', 'compiler', `Invalid extractBucket: ${plan.extractBucket}`);
         }
     };
     // Helper: resolve a column reference (supports dot-notation for joins)
@@ -147,11 +169,11 @@ export function compileSQL(plan, ctx, catalog) {
             return expr;
         // Replace bare column refs (not already qualified with table.) inside the expression
         // Match word chars that aren't SQL keywords or already qualified
-        return expr.replace(/"([a-zA-Z_][a-zA-Z0-9_]*)"/g, (match, colName) => {
+        return expr.replace(/(?<!\.)("([a-zA-Z_][a-zA-Z0-9_]*)")(?!\.)/g, (match, quoted, colName) => {
             // Check if this column exists on the main dataset
             if (plan.dataset.selectableColumns.includes(colName) ||
                 plan.dataset.filterableColumns.includes(colName)) {
-                return `${quoteIdentifier(mainAlias)}.${match}`;
+                return `${quoteIdentifier(mainAlias)}.${quoted}`;
             }
             return match;
         });
@@ -164,14 +186,14 @@ export function compileSQL(plan, ctx, catalog) {
         selectCols = [...groupCols, ...metricCols];
     }
     else if (plan.select.length > 0) {
-        selectCols = plan.select.map(col => quoteIdentifier(col));
+        selectCols = plan.select.map(col => resolveColRef(col));
     }
     else if (plan.groupBy.length > 0 && plan.metrics.length === 0) {
         // In rows mode with groupBy but no explicit select, only select grouped columns
-        selectCols = plan.groupBy.map(col => quoteIdentifier(col));
+        selectCols = plan.groupBy.map(col => resolveColRef(col));
     }
     else {
-        selectCols = plan.dataset.selectableColumns.map(col => quoteIdentifier(col));
+        selectCols = plan.dataset.selectableColumns.map(col => resolveColRef(col));
     }
     // Append FK name columns (auto-resolved human-readable names)
     if (fkNameColumns.length > 0) {
@@ -182,19 +204,23 @@ export function compileSQL(plan, ctx, catalog) {
     }
     // ── Build WHERE clause ──
     const whereParts = [];
-    // Tenant isolation (ALWAYS injected server-side)
-    if (!ctx.tenantId || ctx.tenantId.trim() === '') {
-        throw new InferError('SQL_VALIDATION_FAILED', 'compiler', 'Tenant ID is required but was not provided');
-    }
-    const tenantCol = ctx.tenantColumn ?? 'tenant_id';
-    if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(tenantCol)) {
-        throw new InferError('SQL_VALIDATION_FAILED', 'compiler', `Invalid tenant column name: ${tenantCol}`);
+    // Tenant isolation (ALWAYS injected server-side when multi-tenant)
+    let tenantParamIdx = null;
+    if (ctx.tenantColumn !== undefined || (ctx.tenantId && ctx.tenantId.trim() !== '')) {
+        if (!ctx.tenantId || ctx.tenantId.trim() === '') {
+            throw new InferError('SQL_VALIDATION_FAILED', 'compiler', 'Tenant ID is required but was not provided');
+        }
+        const tenantCol = ctx.tenantColumn ?? 'tenant_id';
+        if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(tenantCol)) {
+            throw new InferError('SQL_VALIDATION_FAILED', 'compiler', `Invalid tenant column name: ${tenantCol}`);
+        }
+        const tenantRef = joinClauses.length > 0
+            ? `${quoteIdentifier(mainAlias)}.${quoteIdentifier(tenantCol)}`
+            : quoteIdentifier(tenantCol);
+        params.push(ctx.tenantId);
+        tenantParamIdx = paramIdx;
+        whereParts.push(`${tenantRef} = $${paramIdx++}`);
     }
-    const tenantRef = joinClauses.length > 0
-        ? `${quoteIdentifier(mainAlias)}.${quoteIdentifier(tenantCol)}`
-        : quoteIdentifier(tenantCol);
-    params.push(ctx.tenantId);
-    whereParts.push(`${tenantRef} = $${paramIdx++}`);
     // Location scoping (optional)
     if (ctx.locationIds && ctx.locationIds.length > 0) {
         const locationRef = joinClauses.length > 0
@@ -206,9 +232,9 @@ export function compileSQL(plan, ctx, catalog) {
     // Date range
     if (plan.dateRange && plan.dataset.dateColumn) {
         params.push(plan.dateRange.startDate);
-        whereParts.push(`${quoteIdentifier(plan.dataset.dateColumn)} >= $${paramIdx++}`);
+        whereParts.push(`${resolveColRef(plan.dataset.dateColumn)} >= $${paramIdx++}`);
         params.push(plan.dateRange.endDate);
-        whereParts.push(`${quoteIdentifier(plan.dataset.dateColumn)} <= $${paramIdx++}`);
+        whereParts.push(`${resolveColRef(plan.dataset.dateColumn)} <= $${paramIdx++}`);
     }
     // User filters (parameterized)
     for (const filter of plan.filters) {
@@ -218,7 +244,7 @@ export function compileSQL(plan, ctx, catalog) {
             col = buildExtractExpr(resolveColRef(filter.field));
         }
         else {
-            col = quoteIdentifier(filter.field);
+            col = resolveColRef(filter.field);
         }
         const op = sanitizeOperator(filter.op);
         if (op === 'IS NULL') {
@@ -243,7 +269,7 @@ export function compileSQL(plan, ctx, catalog) {
     // Entity filters (resolved IDs)
     for (const entity of plan.resolvedEntities) {
         if (entity.resolvedIds.length > 0) {
-            const col = quoteIdentifier(entity.outputColumn);
+            const col = resolveColRef(entity.outputColumn);
             params.push(entity.resolvedIds);
             whereParts.push(`${col} = ANY($${paramIdx++})`);
         }
@@ -266,6 +292,11 @@ export function compileSQL(plan, ctx, catalog) {
                 subWhere += ` AND ${quoteIdentifier(subAlias)}.${quoteIdentifier(f.field)} ${op} $${paramIdx++}`;
             }
         }
+        // Add tenant isolation to EXISTS subquery
+        if (tenantParamIdx !== null) {
+            const tenantCol = ctx.tenantColumn ?? 'tenant_id';
+            subWhere += ` AND ${quoteIdentifier(subAlias)}.${quoteIdentifier(tenantCol)} = $${tenantParamIdx}`;
+        }
         const existsOp = ef.mode === 'not_exists' ? 'NOT EXISTS' : 'EXISTS';
         whereParts.push(`${existsOp} (SELECT 1 FROM ${targetTable} AS ${quoteIdentifier(subAlias)} WHERE ${subWhere})`);
     }
@@ -288,6 +319,10 @@ export function compileSQL(plan, ctx, catalog) {
             else if (op === 'IS NOT NULL') {
                 havingParts.push(`${fieldRef} IS NOT NULL`);
             }
+            else if (op === 'IN' || op === 'NOT IN') {
+                params.push(filter.value);
+                havingParts.push(`${fieldRef} ${op === 'NOT IN' ? 'NOT ' : ''}= ANY($${paramIdx++})`);
+            }
             else {
                 params.push(filter.value);
                 havingParts.push(`${fieldRef} ${op} $${paramIdx++}`);
@@ -298,14 +333,16 @@ export function compileSQL(plan, ctx, catalog) {
     // ── Build ORDER BY (direction whitelisted to ASC/DESC only) ──
     const orderBySql = plan.orderBy.length > 0
         ? `ORDER BY ${plan.orderBy.map(o => {
-            const ref = dateGroupColumns.has(o.field) && plan.timeBucket
-                ? formatGroupByRef(o.field)
-                : quoteIdentifier(o.field);
-            return `${ref} ${o.dir === 'desc' ? 'DESC' : 'ASC'}`;
+            const ref = extractGroupColumns.has(o.field) && plan.extractBucket
+                ? buildExtractExpr(resolveColRef(o.field))
+                : dateGroupColumns.has(o.field) && plan.timeBucket
+                    ? formatGroupByRef(o.field)
+                    : resolveColRef(o.field);
+            return `${ref} ${o.dir === 'desc' ? 'DESC NULLS LAST' : 'ASC'}`;
         }).join(', ')}`
         : '';
     // ── LIMIT (always applied) ──
-    params.push(plan.limit);
+    params.push(Math.max(1, plan.limit));
     const limitSql = `LIMIT $${paramIdx++}`;
     // ── OFFSET (optional pagination) ──
     let offsetSql = '';
@@ -331,8 +368,16 @@ export function compileSQL(plan, ctx, catalog) {
     // compareMode: wrap in CTE with LAG window functions
     if (plan.compareMode && plan.metrics.length > 0 && (plan.timeBucket || plan.extractBucket)) {
         const metricAliases = plan.metrics.map(m => quoteIdentifier(m.id));
+        const timeCol = plan.groupBy.find(col => {
+            const t = plan.dataset.columnTypes[col];
+            return t === 'date' || t === 'timestamp';
+        }) || plan.groupBy[0] || 'period';
+        // Use the column alias as it appears in the inner query (after DATE_TRUNC/EXTRACT)
+        const timeAlias = colAlias(timeCol);
+        const partitionCols = plan.groupBy.filter(col => col !== timeCol).map(c => colAlias(c));
+        const partitionBy = partitionCols.length > 0 ? `PARTITION BY ${partitionCols.map(c => quoteIdentifier(c)).join(', ')} ` : '';
         const lagCols = metricAliases.map(alias => {
-            return `${alias} - LAG(${alias}) OVER (ORDER BY ${quoteIdentifier(plan.groupBy[0] || 'period')}) AS ${alias.replace(/"$/, '_delta"')}`;
+            return `${alias} - LAG(${alias}) OVER (${partitionBy}ORDER BY ${quoteIdentifier(timeAlias)}) AS ${alias.replace(/"$/, '_delta"')}`;
         });
         const wrappedSql = `WITH _base AS (\n${sql}\n)\nSELECT *, ${lagCols.join(', ')} FROM _base`;
         return { sql: wrappedSql, params };