prisma-ts-select 0.1.7 → 0.1.8

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Adrian Elton-Browning
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/extend/dialects/index.js

@@ -48,7 +48,7 @@ var sqliteContextFns = (quoteFn, condFn) => ({
     if (isDistinct(col) && sep !== void 0) {
       throw new Error("SQLite does not support GROUP_CONCAT(DISTINCT col, sep) \u2014 omit the separator.");
     }
-    return sqlExpr(`GROUP_CONCAT(${inner}${sep !== void 0 ? `, '${sep.replace(/'/g, "''")}'` : ""})`);
+    return sqlExpr(`GROUP_CONCAT(${inner}${sep !== void 0 ? `, '${esc(sep)}'` : ""})`);
   },
   total: (col) => sqlExpr(`TOTAL(${quoteFn(col)})`),
   // SQLite MIN/MAX return bigint for integer columns — override base (number) return types
@@ -123,11 +123,11 @@ var sqliteDialect = {
   name: "sqlite",
   needsBooleanCoercion: () => true,
   quote: (name, _isAlias) => {
-    if (_isAlias) return "`" + name + "`";
+    if (_isAlias) return "`" + name.replace(/`/g, "``") + "`";
     return name;
   },
   quoteTableIdentifier: (name, _isAlias) => {
-    if (_isAlias) return "`" + name + "`";
+    if (_isAlias) return "`" + name.replace(/`/g, "``") + "`";
     return name;
   },
   quoteQualifiedColumn: (ref) => {
@@ -151,12 +151,12 @@ var sqliteDialect = {
 var mysqlDialect = {
   name: "mysql",
   needsBooleanCoercion: () => true,
-  quote: (id, _isAlias) => `\`${id}\``,
-  quoteTableIdentifier: (name, _isAlias) => `\`${name}\``,
+  quote: (id, _isAlias) => `\`${id.replace(/`/g, "``")}\``,
+  quoteTableIdentifier: (name, _isAlias) => `\`${name.replace(/`/g, "``")}\``,
   quoteQualifiedColumn: (ref) => {
-    if (!ref.includes(".")) return `\`${ref}\``;
+    if (!ref.includes(".")) return `\`${ref.replace(/`/g, "``")}\``;
     const [table, col] = ref.split(".", 2);
-    return `\`${table}\`.\`${col}\``;
+    return `\`${table.replace(/`/g, "``")}\`.\`${col.replace(/`/g, "``")}\``;
   },
   quoteOrderByClause: (clause) => {
     const parts = clause.trim().split(/\s+/);
@@ -174,12 +174,12 @@ var mysqlDialect = {
 var postgresqlDialect = {
   name: "postgresql",
   needsBooleanCoercion: () => false,
-  quote: (id, _isAlias) => `"${id}"`,
-  quoteTableIdentifier: (name, _isAlias) => `"${name}"`,
+  quote: (id, _isAlias) => `"${id.replace(/"/g, '""')}"`,
+  quoteTableIdentifier: (name, _isAlias) => `"${name.replace(/"/g, '""')}"`,
   quoteQualifiedColumn: (ref) => {
-    if (!ref.includes(".")) return `"${ref}"`;
+    if (!ref.includes(".")) return `"${ref.replace(/"/g, '""')}"`;
     const [table, col] = ref.split(".", 2);
-    return `"${table}"."${col}"`;
+    return `"${table.replace(/"/g, '""')}"."${col.replace(/"/g, '""')}"`;
   },
   quoteOrderByClause: (clause) => {
     const parts = clause.trim().split(/\s+/);

package/dist/extend/dialects/mysql-v6.d.ts

@@ -1,7 +1,7 @@
 import { IntervalUnit } from './mysql.js';
 export { mysqlDialect } from './mysql.js';
 import { J as JSONValue, a as JSONObject } from '../types-B0F8m0ok.js';
-import { S as SQLExpr, a as SQLDistinct } from '../sql-expr-BGSEwzCi.js';
+import { S as SQLExpr, a as SQLDistinct, D as DISTINCT_BRAND } from '../sql-expr-BGSEwzCi.js';
 import { ColName, FilterCols, ColTypeOf, FilterJsonCols } from './shared.js';
 import * as _prisma_client_runtime_client from '@prisma/client/runtime/client';
 import './types.js';
@@ -16,10 +16,12 @@ declare const mysqlV6ContextFns: <TColEntries extends [string, unknown] = never,
     floor: (col: FilterCols<TColEntries, number> | SQLExpr<number>) => SQLExpr<bigint | number>;
     mod: (col: FilterCols<TColEntries, number> | SQLExpr<number>, divisor: number) => SQLExpr<bigint | number>;
     sign: (col: FilterCols<TColEntries, number> | SQLExpr<number>) => SQLExpr<bigint | number>;
-    avg: (col: SQLExpr<number> | FilterCols<TColEntries, number>) => SQLExpr<_prisma_client_runtime_client.Decimal>;
-    sum: (col: SQLExpr<number> | FilterCols<TColEntries, number>) => SQLExpr<_prisma_client_runtime_client.Decimal>;
-    distinct: <Col extends ColName<TColEntries>>(col: Col) => SQLDistinct<NonNullable<ColTypeOf<TColEntries, Col>>>;
-    groupConcat: (col: SQLExpr<string> | ColName<TColEntries>, sep?: string) => SQLExpr<string>;
+    avg: (col: SQLExpr<number | null> | FilterCols<TColEntries, number>) => SQLExpr<_prisma_client_runtime_client.Decimal>;
+    sum: (col: SQLExpr<number | null> | FilterCols<TColEntries, number>) => SQLExpr<_prisma_client_runtime_client.Decimal>;
+    distinct: <Col extends ColName<TColEntries>>(col: Col) => SQLDistinct<ColTypeOf<TColEntries, Col>>;
+    groupConcat: (<T extends string | null>(col: SQLDistinct<T>, sep?: string) => SQLExpr<T>) & (<Col extends ColName<TColEntries>>(col: Col, sep?: string) => SQLExpr<null extends ColTypeOf<TColEntries, Col> ? string | (ColTypeOf<TColEntries, Col> & null) : string>) & (<T extends string | null>(col: SQLExpr<T> & {
+        readonly [DISTINCT_BRAND]?: never;
+    }, sep?: string) => SQLExpr<T>);
     bitAnd: (col: FilterCols<TColEntries, number>) => SQLExpr<number>;
     bitOr: (col: FilterCols<TColEntries, number>) => SQLExpr<number>;
     bitXor: (col: FilterCols<TColEntries, number>) => SQLExpr<number>;
@@ -47,7 +49,7 @@ declare const mysqlV6ContextFns: <TColEntries extends [string, unknown] = never,
     hour: (col: SQLExpr<Date> | FilterCols<TColEntries, Date>) => SQLExpr<bigint>;
     minute: (col: SQLExpr<Date> | FilterCols<TColEntries, Date>) => SQLExpr<number>;
     second: (col: SQLExpr<Date> | FilterCols<TColEntries, Date>) => SQLExpr<number>;
-    $if: <T>(cond: SQLExpr<unknown> | TCriteria, trueVal: SQLExpr<T>, falseVal: SQLExpr<T>) => SQLExpr<T>;
+    $if: <T>(cond: TCriteria | SQLExpr<unknown>, trueVal: SQLExpr<T>, falseVal: SQLExpr<T>) => SQLExpr<T>;
     ifNull: <T>(col: FilterCols<TColEntries, T> | SQLExpr<T>, fallback: SQLExpr<NonNullable<T>>) => SQLExpr<NonNullable<T>>;
     greatest: <T>(args_0: FilterCols<TColEntries, T> | SQLExpr<T>, ...args: (FilterCols<TColEntries, T> | SQLExpr<T>)[]) => SQLExpr<T | null>;
     least: <T>(args_0: FilterCols<TColEntries, T> | SQLExpr<T>, ...args: (FilterCols<TColEntries, T> | SQLExpr<T>)[]) => SQLExpr<T | null>;
@@ -101,4 +103,4 @@ declare const mysqlV6ContextFns: <TColEntries extends [string, unknown] = never,
 };
 type DialectFns<TColEntries extends [string, unknown] = never, TCriteria extends object = object> = ReturnType<typeof mysqlV6ContextFns<TColEntries, TCriteria>>;
 
-export { type DialectFns, IntervalUnit, mysqlV6ContextFns };
+export { DISTINCT_BRAND, type DialectFns, IntervalUnit, mysqlV6ContextFns };

package/dist/extend/dialects/mysql-v6.js

@@ -128,12 +128,12 @@ var mysqlContextFns = (quoteFn, condFn) => ({
 var mysqlDialect = {
   name: "mysql",
   needsBooleanCoercion: () => true,
-  quote: (id, _isAlias) => `\`${id}\``,
-  quoteTableIdentifier: (name, _isAlias) => `\`${name}\``,
+  quote: (id, _isAlias) => `\`${id.replace(/`/g, "``")}\``,
+  quoteTableIdentifier: (name, _isAlias) => `\`${name.replace(/`/g, "``")}\``,
   quoteQualifiedColumn: (ref) => {
-    if (!ref.includes(".")) return `\`${ref}\``;
+    if (!ref.includes(".")) return `\`${ref.replace(/`/g, "``")}\``;
     const [table, col] = ref.split(".", 2);
-    return `\`${table}\`.\`${col}\``;
+    return `\`${table.replace(/`/g, "``")}\`.\`${col.replace(/`/g, "``")}\``;
   },
   quoteOrderByClause: (clause) => {
     const parts = clause.trim().split(/\s+/);
@@ -161,4 +161,4 @@ var mysqlV6ContextFns = (quoteFn, condFn) => ({
   sign: (col) => sqlExpr(`SIGN(${resolveArg(col, quoteFn)})`)
 });
 
-export { mysqlDialect, mysqlV6ContextFns };
+export { DISTINCT_BRAND, mysqlDialect, mysqlV6ContextFns };

package/dist/extend/dialects/mysql-v7.js

@@ -128,12 +128,12 @@ var mysqlContextFns = (quoteFn, condFn) => ({
 var mysqlDialect = {
   name: "mysql",
   needsBooleanCoercion: () => true,
-  quote: (id, _isAlias) => `\`${id}\``,
-  quoteTableIdentifier: (name, _isAlias) => `\`${name}\``,
+  quote: (id, _isAlias) => `\`${id.replace(/`/g, "``")}\``,
+  quoteTableIdentifier: (name, _isAlias) => `\`${name.replace(/`/g, "``")}\``,
   quoteQualifiedColumn: (ref) => {
-    if (!ref.includes(".")) return `\`${ref}\``;
+    if (!ref.includes(".")) return `\`${ref.replace(/`/g, "``")}\``;
     const [table, col] = ref.split(".", 2);
-    return `\`${table}\`.\`${col}\``;
+    return `\`${table.replace(/`/g, "``")}\`.\`${col.replace(/`/g, "``")}\``;
   },
   quoteOrderByClause: (clause) => {
     const parts = clause.trim().split(/\s+/);

package/dist/extend/dialects/mysql.d.ts

@@ -1,5 +1,5 @@
 import { Dialect } from './types.js';
-import { S as SQLExpr, a as SQLDistinct } from '../sql-expr-BGSEwzCi.js';
+import { S as SQLExpr, a as SQLDistinct, D as DISTINCT_BRAND } from '../sql-expr-BGSEwzCi.js';
 import { J as JSONValue, a as JSONObject } from '../types-B0F8m0ok.js';
 import { Decimal } from '@prisma/client/runtime/client';
 import { FilterCols, ColName, ColTypeOf, FilterJsonCols } from './shared.js';
@@ -19,14 +19,16 @@ type MySQLCastTypeMap = {
 };
 type IntervalUnit = 'MICROSECOND' | 'SECOND' | 'MINUTE' | 'HOUR' | 'DAY' | 'WEEK' | 'MONTH' | 'QUARTER' | 'YEAR';
 declare const mysqlContextFns: <TColEntries extends [string, unknown] = never, TCriteria extends object = object>(quoteFn: (ref: string) => string, condFn: (criteria: TCriteria) => string) => {
-    avg: (col: FilterCols<TColEntries, number> | SQLExpr<number>) => SQLExpr<Decimal>;
-    sum: (col: FilterCols<TColEntries, number> | SQLExpr<number>) => SQLExpr<Decimal>;
+    avg: (col: FilterCols<TColEntries, number> | SQLExpr<number | null>) => SQLExpr<Decimal>;
+    sum: (col: FilterCols<TColEntries, number> | SQLExpr<number | null>) => SQLExpr<Decimal>;
     countAll: () => SQLExpr<bigint>;
     count: (col: ColName<TColEntries> | "*" | SQLExpr<unknown>) => SQLExpr<bigint>;
     countDistinct: (col: ColName<TColEntries>) => SQLExpr<bigint>;
-    distinct: <Col extends ColName<TColEntries>>(col: Col) => SQLDistinct<NonNullable<ColTypeOf<TColEntries, Col>>>;
+    distinct: <Col extends ColName<TColEntries>>(col: Col) => SQLDistinct<ColTypeOf<TColEntries, Col>>;
     length: (col: FilterCols<TColEntries, string> | SQLExpr<string>) => SQLExpr<bigint>;
-    groupConcat: (col: ColName<TColEntries> | SQLExpr<string>, sep?: string) => SQLExpr<string>;
+    groupConcat: ((<T extends string | null>(col: SQLDistinct<T>, sep?: string) => SQLExpr<T>) & (<Col extends ColName<TColEntries>>(col: Col, sep?: string) => SQLExpr<null extends ColTypeOf<TColEntries, Col> ? string | null : string>) & (<T extends string | null>(col: SQLExpr<T> & {
+        readonly [DISTINCT_BRAND]?: never;
+    }, sep?: string) => SQLExpr<T>));
     bitAnd: (col: FilterCols<TColEntries, number>) => SQLExpr<number>;
     bitOr: (col: FilterCols<TColEntries, number>) => SQLExpr<number>;
     bitXor: (col: FilterCols<TColEntries, number>) => SQLExpr<number>;

package/dist/extend/dialects/mysql.js

@@ -146,12 +146,12 @@ var supportedJoinMethods = [
 var mysqlDialect = {
   name: "mysql",
   needsBooleanCoercion: () => true,
-  quote: (id, _isAlias) => `\`${id}\``,
-  quoteTableIdentifier: (name, _isAlias) => `\`${name}\``,
+  quote: (id, _isAlias) => `\`${id.replace(/`/g, "``")}\``,
+  quoteTableIdentifier: (name, _isAlias) => `\`${name.replace(/`/g, "``")}\``,
   quoteQualifiedColumn: (ref) => {
-    if (!ref.includes(".")) return `\`${ref}\``;
+    if (!ref.includes(".")) return `\`${ref.replace(/`/g, "``")}\``;
     const [table, col] = ref.split(".", 2);
-    return `\`${table}\`.\`${col}\``;
+    return `\`${table.replace(/`/g, "``")}\`.\`${col.replace(/`/g, "``")}\``;
   },
   quoteOrderByClause: (clause) => {
     const parts = clause.trim().split(/\s+/);

package/dist/extend/dialects/postgresql-v6.d.ts

@@ -3,7 +3,7 @@ import { Decimal } from '@prisma/client/runtime/client';
 import { PgExtractField, PgDateTruncUnit } from './postgresql.js';
 export { postgresqlDialect } from './postgresql.js';
 import { J as JSONValue, a as JSONObject } from '../types-B0F8m0ok.js';
-import { S as SQLExpr, a as SQLDistinct } from '../sql-expr-BGSEwzCi.js';
+import { S as SQLExpr, a as SQLDistinct, D as DISTINCT_BRAND } from '../sql-expr-BGSEwzCi.js';
 import { ColName, FilterCols, ColTypeOf, FilterJsonCols } from './shared.js';
 import './types.js';
 
@@ -13,11 +13,13 @@ declare const postgresqlV6ContextFns: <TColEntries extends [string, unknown] = n
     countDistinct: (col: ColName<TColEntries>) => SQLExpr<bigint>;
     ceil: (col: FilterCols<TColEntries, number> | SQLExpr<number>) => SQLExpr<number | Decimal>;
     floor: (col: FilterCols<TColEntries, number> | SQLExpr<number>) => SQLExpr<number | Decimal>;
-    avg: (col: SQLExpr<number> | FilterCols<TColEntries, number>) => SQLExpr<number>;
-    sum: (col: SQLExpr<number> | FilterCols<TColEntries, number>) => SQLExpr<number>;
-    distinct: <Col extends ColName<TColEntries>>(col: Col) => SQLDistinct<NonNullable<ColTypeOf<TColEntries, Col>>>;
+    avg: (col: SQLExpr<number | null> | FilterCols<TColEntries, number>) => SQLExpr<number>;
+    sum: (col: SQLExpr<number | null> | FilterCols<TColEntries, number>) => SQLExpr<number>;
+    distinct: <Col extends ColName<TColEntries>>(col: Col) => SQLDistinct<ColTypeOf<TColEntries, Col>>;
     length: (col: SQLExpr<string> | FilterCols<TColEntries, string>) => SQLExpr<number>;
-    stringAgg: (col: SQLExpr<string> | ColName<TColEntries>, sep: string) => SQLExpr<string>;
+    stringAgg: (<T extends string | null>(col: SQLDistinct<T>, sep: string) => SQLExpr<T>) & (<Col extends ColName<TColEntries>>(col: Col, sep: string) => SQLExpr<null extends ColTypeOf<TColEntries, Col> ? string | (ColTypeOf<TColEntries, Col> & null) : string>) & (<T extends string | null>(col: SQLExpr<T> & {
+        readonly [DISTINCT_BRAND]?: never;
+    }, sep: string) => SQLExpr<T>);
     arrayAgg: (col: SQLExpr<unknown> | ColName<TColEntries>) => SQLExpr<unknown[]>;
     stddevPop: (col: FilterCols<TColEntries, number>) => SQLExpr<number>;
     stddevSamp: (col: FilterCols<TColEntries, number>) => SQLExpr<number>;
@@ -99,4 +101,4 @@ declare const postgresqlV6ContextFns: <TColEntries extends [string, unknown] = n
 };
 type DialectFns<TColEntries extends [string, unknown] = never, _TCriteria extends object = object> = ReturnType<typeof postgresqlV6ContextFns<TColEntries>>;
 
-export { type DialectFns, PgDateTruncUnit, PgExtractField, postgresqlV6ContextFns };
+export { DISTINCT_BRAND, type DialectFns, PgDateTruncUnit, PgExtractField, postgresqlV6ContextFns };

package/dist/extend/dialects/postgresql-v6.js

@@ -122,12 +122,12 @@ var postgresqlContextFns = (quoteFn) => ({
 var postgresqlDialect = {
   name: "postgresql",
   needsBooleanCoercion: () => false,
-  quote: (id, _isAlias) => `"${id}"`,
-  quoteTableIdentifier: (name, _isAlias) => `"${name}"`,
+  quote: (id, _isAlias) => `"${id.replace(/"/g, '""')}"`,
+  quoteTableIdentifier: (name, _isAlias) => `"${name.replace(/"/g, '""')}"`,
   quoteQualifiedColumn: (ref) => {
-    if (!ref.includes(".")) return `"${ref}"`;
+    if (!ref.includes(".")) return `"${ref.replace(/"/g, '""')}"`;
     const [table, col] = ref.split(".", 2);
-    return `"${table}"."${col}"`;
+    return `"${table.replace(/"/g, '""')}"."${col.replace(/"/g, '""')}"`;
   },
   quoteOrderByClause: (clause) => {
     const parts = clause.trim().split(/\s+/);
@@ -151,4 +151,4 @@ var postgresqlV6ContextFns = (quoteFn) => ({
   floor: (col) => sqlExpr(`FLOOR(${resolveArg(col, quoteFn)})`)
 });
 
-export { postgresqlDialect, postgresqlV6ContextFns };
+export { DISTINCT_BRAND, postgresqlDialect, postgresqlV6ContextFns };

package/dist/extend/dialects/postgresql-v7.d.ts

@@ -3,7 +3,7 @@ import { Decimal } from '@prisma/client/runtime/client';
 import { PgExtractField, PgDateTruncUnit } from './postgresql.js';
 export { postgresqlDialect } from './postgresql.js';
 import { J as JSONValue, a as JSONObject } from '../types-B0F8m0ok.js';
-import { S as SQLExpr, a as SQLDistinct } from '../sql-expr-BGSEwzCi.js';
+import { S as SQLExpr, a as SQLDistinct, D as DISTINCT_BRAND } from '../sql-expr-BGSEwzCi.js';
 import { ColName, FilterCols, ColTypeOf, FilterJsonCols } from './shared.js';
 import './types.js';
 
@@ -13,11 +13,13 @@ declare const postgresqlV7ContextFns: <TColEntries extends [string, unknown] = n
     countDistinct: (col: ColName<TColEntries>) => SQLExpr<bigint>;
     ceil: (col: FilterCols<TColEntries, number> | SQLExpr<number>) => SQLExpr<number | Decimal>;
     floor: (col: FilterCols<TColEntries, number> | SQLExpr<number>) => SQLExpr<number | Decimal>;
-    avg: (col: SQLExpr<number> | FilterCols<TColEntries, number>) => SQLExpr<number>;
-    sum: (col: SQLExpr<number> | FilterCols<TColEntries, number>) => SQLExpr<number>;
-    distinct: <Col extends ColName<TColEntries>>(col: Col) => SQLDistinct<NonNullable<ColTypeOf<TColEntries, Col>>>;
+    avg: (col: SQLExpr<number | null> | FilterCols<TColEntries, number>) => SQLExpr<number>;
+    sum: (col: SQLExpr<number | null> | FilterCols<TColEntries, number>) => SQLExpr<number>;
+    distinct: <Col extends ColName<TColEntries>>(col: Col) => SQLDistinct<ColTypeOf<TColEntries, Col>>;
     length: (col: SQLExpr<string> | FilterCols<TColEntries, string>) => SQLExpr<number>;
-    stringAgg: (col: SQLExpr<string> | ColName<TColEntries>, sep: string) => SQLExpr<string>;
+    stringAgg: (<T extends string | null>(col: SQLDistinct<T>, sep: string) => SQLExpr<T>) & (<Col extends ColName<TColEntries>>(col: Col, sep: string) => SQLExpr<null extends ColTypeOf<TColEntries, Col> ? string | (ColTypeOf<TColEntries, Col> & null) : string>) & (<T extends string | null>(col: SQLExpr<T> & {
+        readonly [DISTINCT_BRAND]?: never;
+    }, sep: string) => SQLExpr<T>);
     arrayAgg: (col: SQLExpr<unknown> | ColName<TColEntries>) => SQLExpr<unknown[]>;
     stddevPop: (col: FilterCols<TColEntries, number>) => SQLExpr<number>;
     stddevSamp: (col: FilterCols<TColEntries, number>) => SQLExpr<number>;
@@ -99,4 +101,4 @@ declare const postgresqlV7ContextFns: <TColEntries extends [string, unknown] = n
 };
 type DialectFns<TColEntries extends [string, unknown] = never, _TCriteria extends object = object> = ReturnType<typeof postgresqlV7ContextFns<TColEntries>>;
 
-export { type DialectFns, PgDateTruncUnit, PgExtractField, postgresqlV7ContextFns };
+export { DISTINCT_BRAND, type DialectFns, PgDateTruncUnit, PgExtractField, postgresqlV7ContextFns };

package/dist/extend/dialects/postgresql-v7.js

@@ -122,12 +122,12 @@ var postgresqlContextFns = (quoteFn) => ({
 var postgresqlDialect = {
   name: "postgresql",
   needsBooleanCoercion: () => false,
-  quote: (id, _isAlias) => `"${id}"`,
-  quoteTableIdentifier: (name, _isAlias) => `"${name}"`,
+  quote: (id, _isAlias) => `"${id.replace(/"/g, '""')}"`,
+  quoteTableIdentifier: (name, _isAlias) => `"${name.replace(/"/g, '""')}"`,
   quoteQualifiedColumn: (ref) => {
-    if (!ref.includes(".")) return `"${ref}"`;
+    if (!ref.includes(".")) return `"${ref.replace(/"/g, '""')}"`;
     const [table, col] = ref.split(".", 2);
-    return `"${table}"."${col}"`;
+    return `"${table.replace(/"/g, '""')}"."${col.replace(/"/g, '""')}"`;
   },
   quoteOrderByClause: (clause) => {
     const parts = clause.trim().split(/\s+/);
@@ -151,4 +151,4 @@ var postgresqlV7ContextFns = (quoteFn) => ({
   floor: (col) => sqlExpr(`FLOOR(${resolveArg(col, quoteFn)})`)
 });
 
-export { postgresqlDialect, postgresqlV7ContextFns };
+export { DISTINCT_BRAND, postgresqlDialect, postgresqlV7ContextFns };

package/dist/extend/dialects/postgresql.d.ts

@@ -1,5 +1,5 @@
 import { Dialect } from './types.js';
-import { S as SQLExpr, a as SQLDistinct } from '../sql-expr-BGSEwzCi.js';
+import { S as SQLExpr, a as SQLDistinct, D as DISTINCT_BRAND } from '../sql-expr-BGSEwzCi.js';
 import { J as JSONValue, a as JSONObject } from '../types-B0F8m0ok.js';
 import { FilterCols, ColName, ColTypeOf, FilterJsonCols } from './shared.js';
 import '@prisma/client/runtime/client';
@@ -19,14 +19,16 @@ type PgCastTypeMap = {
 type PgExtractField = 'YEAR' | 'MONTH' | 'DAY' | 'HOUR' | 'MINUTE' | 'SECOND' | 'DOW' | 'DOY' | 'EPOCH' | 'WEEK' | 'QUARTER';
 type PgDateTruncUnit = 'microseconds' | 'milliseconds' | 'second' | 'minute' | 'hour' | 'day' | 'week' | 'month' | 'quarter' | 'year' | 'decade' | 'century' | 'millennium';
 declare const postgresqlContextFns: <TColEntries extends [string, unknown] = never>(quoteFn: (ref: string) => string) => {
-    avg: (col: FilterCols<TColEntries, number> | SQLExpr<number>) => SQLExpr<number>;
-    sum: (col: FilterCols<TColEntries, number> | SQLExpr<number>) => SQLExpr<number>;
+    avg: (col: FilterCols<TColEntries, number> | SQLExpr<number | null>) => SQLExpr<number>;
+    sum: (col: FilterCols<TColEntries, number> | SQLExpr<number | null>) => SQLExpr<number>;
     countAll: () => SQLExpr<number>;
     count: (col: ColName<TColEntries> | "*" | SQLExpr<unknown>) => SQLExpr<number>;
     countDistinct: (col: ColName<TColEntries>) => SQLExpr<number>;
-    distinct: <Col extends ColName<TColEntries>>(col: Col) => SQLDistinct<NonNullable<ColTypeOf<TColEntries, Col>>>;
+    distinct: <Col extends ColName<TColEntries>>(col: Col) => SQLDistinct<ColTypeOf<TColEntries, Col>>;
     length: (col: FilterCols<TColEntries, string> | SQLExpr<string>) => SQLExpr<number>;
-    stringAgg: (col: ColName<TColEntries> | SQLExpr<string>, sep: string) => SQLExpr<string>;
+    stringAgg: ((<T extends string | null>(col: SQLDistinct<T>, sep: string) => SQLExpr<T>) & (<Col extends ColName<TColEntries>>(col: Col, sep: string) => SQLExpr<null extends ColTypeOf<TColEntries, Col> ? string | null : string>) & (<T extends string | null>(col: SQLExpr<T> & {
+        readonly [DISTINCT_BRAND]?: never;
+    }, sep: string) => SQLExpr<T>));
     arrayAgg: (col: ColName<TColEntries> | SQLExpr<unknown>) => SQLExpr<unknown[]>;
     stddevPop: (col: FilterCols<TColEntries, number>) => SQLExpr<number>;
     stddevSamp: (col: FilterCols<TColEntries, number>) => SQLExpr<number>;

package/dist/extend/dialects/postgresql.js

@@ -143,12 +143,12 @@ var supportedJoinMethods = [
 var postgresqlDialect = {
   name: "postgresql",
   needsBooleanCoercion: () => false,
-  quote: (id, _isAlias) => `"${id}"`,
-  quoteTableIdentifier: (name, _isAlias) => `"${name}"`,
+  quote: (id, _isAlias) => `"${id.replace(/"/g, '""')}"`,
+  quoteTableIdentifier: (name, _isAlias) => `"${name.replace(/"/g, '""')}"`,
   quoteQualifiedColumn: (ref) => {
-    if (!ref.includes(".")) return `"${ref}"`;
+    if (!ref.includes(".")) return `"${ref.replace(/"/g, '""')}"`;
     const [table, col] = ref.split(".", 2);
-    return `"${table}"."${col}"`;
+    return `"${table.replace(/"/g, '""')}"."${col.replace(/"/g, '""')}"`;
   },
   quoteOrderByClause: (clause) => {
     const parts = clause.trim().split(/\s+/);

package/dist/extend/dialects/sqlite.d.ts

@@ -13,20 +13,20 @@ type SqliteCastTypeMap = {
     BLOB: Buffer;
 };
 declare const sqliteContextFns: <TColEntries extends [string, unknown] = never, TCriteria extends object = object>(quoteFn: (ref: string) => string, condFn: (criteria: TCriteria) => string) => {
-    avg: (col: FilterCols<TColEntries, number> | SQLExpr<number>) => SQLExpr<number>;
-    sum: (col: FilterCols<TColEntries, number> | SQLExpr<number>) => SQLExpr<bigint | number>;
+    avg: (col: FilterCols<TColEntries, number> | SQLExpr<number | null>) => SQLExpr<number>;
+    sum: (col: FilterCols<TColEntries, number> | SQLExpr<number | null>) => SQLExpr<bigint | number>;
     countAll: () => SQLExpr<bigint>;
     count: (col: ColName<TColEntries> | "*" | SQLExpr<unknown>) => SQLExpr<bigint>;
     countDistinct: (col: ColName<TColEntries>) => SQLExpr<bigint>;
-    distinct: <Col extends ColName<TColEntries>>(col: Col) => SQLDistinct<NonNullable<ColTypeOf<TColEntries, Col>>>;
+    distinct: <Col extends ColName<TColEntries>>(col: Col) => SQLDistinct<ColTypeOf<TColEntries, Col>>;
     length: (col: FilterCols<TColEntries, string> | SQLExpr<string>) => SQLExpr<bigint>;
-    groupConcat: (((col: SQLDistinct<string>) => SQLExpr<string>) & ((col: ColName<TColEntries> | (SQLExpr<string> & {
+    groupConcat: ((<T extends string | null>(col: SQLDistinct<T>) => SQLExpr<T>) & (<Col extends ColName<TColEntries>>(col: Col, sep?: string) => SQLExpr<null extends ColTypeOf<TColEntries, Col> ? string | null : string>) & (<T extends string | null>(col: SQLExpr<T> & {
         readonly [DISTINCT_BRAND]?: never;
-    }), sep?: string) => SQLExpr<string>));
+    }, sep?: string) => SQLExpr<T>));
     total: (col: ColName<TColEntries>) => SQLExpr<number>;
     min: <Col extends ColName<TColEntries>>(col: Col) => SQLExpr<SqliteMinMaxResult<TColEntries, Col>>;
     max: <Col extends ColName<TColEntries>>(col: Col) => SQLExpr<SqliteMinMaxResult<TColEntries, Col>>;
-    concat: (args_0: SQLExpr<string> | FilterCols<TColEntries, string>, ...args: (SQLExpr<string> | FilterCols<TColEntries, string>)[]) => SQLExpr<string>;
+    concat: (args_0: FilterCols<TColEntries, string> | SQLExpr<string>, ...args: (FilterCols<TColEntries, string> | SQLExpr<string>)[]) => SQLExpr<string>;
     substr: (col: FilterCols<TColEntries, string> | SQLExpr<string>, start: number, len?: number) => SQLExpr<string>;
     instr: (col: FilterCols<TColEntries, string> | SQLExpr<string>, substr: string) => SQLExpr<bigint>;
     char: (...codes: number[]) => SQLExpr<string>;
@@ -60,7 +60,7 @@ declare const sqliteContextFns: <TColEntries extends [string, unknown] = never,
     log2: (x: FilterCols<TColEntries, number> | SQLExpr<number>) => SQLExpr<number>;
     log10: (x: FilterCols<TColEntries, number> | SQLExpr<number>) => SQLExpr<number>;
     jsonExtract: (col: FilterJsonCols<TColEntries> | SQLExpr<JSONValue>, path: string) => SQLExpr<JSONValue>;
-    jsonArray: (args_0: ColName<TColEntries> | SQLExpr<unknown>, ...args: (ColName<TColEntries> | SQLExpr<unknown>)[]) => SQLExpr<JSONValue[]>;
+    jsonArray: (args_0: SQLExpr<unknown> | ColName<TColEntries>, ...args: (SQLExpr<unknown> | ColName<TColEntries>)[]) => SQLExpr<JSONValue[]>;
     jsonObject: (pairs: [string, ColName<TColEntries> | SQLExpr<unknown>][]) => SQLExpr<JSONObject>;
     cast: <T extends keyof SqliteCastTypeMap>(expr: ColName<TColEntries> | SQLExpr<unknown>, type: T) => SQLExpr<SqliteCastTypeMap[T]>;
 };

package/dist/extend/dialects/sqlite.js

@@ -45,7 +45,7 @@ var sqliteContextFns = (quoteFn, condFn) => ({
     if (isDistinct(col) && sep !== void 0) {
       throw new Error("SQLite does not support GROUP_CONCAT(DISTINCT col, sep) \u2014 omit the separator.");
     }
-    return sqlExpr(`GROUP_CONCAT(${inner}${sep !== void 0 ? `, '${sep.replace(/'/g, "''")}'` : ""})`);
+    return sqlExpr(`GROUP_CONCAT(${inner}${sep !== void 0 ? `, '${esc(sep)}'` : ""})`);
   },
   total: (col) => sqlExpr(`TOTAL(${quoteFn(col)})`),
   // SQLite MIN/MAX return bigint for integer columns — override base (number) return types
@@ -135,11 +135,11 @@ var sqliteDialect = {
   name: "sqlite",
   needsBooleanCoercion: () => true,
   quote: (name, _isAlias) => {
-    if (_isAlias) return "`" + name + "`";
+    if (_isAlias) return "`" + name.replace(/`/g, "``") + "`";
     return name;
   },
   quoteTableIdentifier: (name, _isAlias) => {
-    if (_isAlias) return "`" + name + "`";
+    if (_isAlias) return "`" + name.replace(/`/g, "``") + "`";
     return name;
   },
   quoteQualifiedColumn: (ref) => {

package/dist/extend/extend.d.ts

@@ -237,7 +237,7 @@ type WhereCriteriaMulti<T extends TArrSources, TFields extends TFieldsType, F =
 type WhereCriteria<T extends TArrSources, TFields extends TFieldsType> = T['length'] extends 1 ? T[0] extends TVirtualTableSource ? WhereCriteriaMulti<T, TFields> : WhereCriteriaSingle<TFields[GetAliasTableNames<T[0]>]> : WhereCriteriaMulti<T, TFields>;
 type JoinWhereCriteria<Table extends string, TAlias extends string | never> = [
     TAlias
-] extends [never] ? WhereCriteriaMulti<[Table], Record<Table, GetFieldsFromTable<Table>>> : WhereCriteriaMulti<[[Table, TAlias]], Record<TAlias, GetFieldsFromTable<Table>>>;
+] extends [never] ? WhereCriteriaMulti<[Table], Record<Table, GetFieldsFromTable<Table>>> : WhereCriteriaMulti<[[Table, TAlias]], Record<Table, GetFieldsFromTable<Table>>>;
 type WhereCriteria_Fields<T extends Array<TTableSources>, TFields extends TFieldsType, acc = {}> = T extends readonly [infer HEAD, ...infer Rest] ? HEAD extends string ? Rest extends Array<TTableSources> ? WhereCriteria_Fields<Rest, TFields, OptionalObject<acc & (TableFieldType<HEAD, TFields[HEAD]> | SQLCondition<TableFieldType<HEAD, TFields[HEAD]>>)>> : WhereCriteria_Fields<[], TFields, OptionalObject<acc & (TableFieldType<HEAD, TFields[HEAD]> | SQLCondition<TableFieldType<HEAD, TFields[HEAD]>>)>> : HEAD extends readonly ["__cte__", infer CTE_NAME extends string] ? Rest extends Array<TTableSources> ? WhereCriteria_Fields<Rest, TFields, OptionalObject<acc & (TableFieldType<CTE_NAME, TFields[CTE_NAME]> | SQLCondition<TableFieldType<CTE_NAME, TFields[CTE_NAME]>>)>> : WhereCriteria_Fields<[], TFields, OptionalObject<acc & (TableFieldType<CTE_NAME, TFields[CTE_NAME]> | SQLCondition<TableFieldType<CTE_NAME, TFields[CTE_NAME]>>)>> : HEAD extends [infer R_NAME extends string, infer A_NAME extends string] ? Rest extends Array<TTableSources> ? WhereCriteria_Fields<Rest, TFields, OptionalObject<acc & (TableFieldType<A_NAME, TFields[R_NAME]> | SQLCondition<TableFieldType<A_NAME, TFields[R_NAME]>>)>> : WhereCriteria_Fields<[], TFields, OptionalObject<acc & (TableFieldType<A_NAME, TFields[R_NAME]> | SQLCondition<TableFieldType<A_NAME, TFields[R_NAME]>>)>> : never : acc;
 type OnlyNull<T, R> = T extends null ? R : never;
 type FindColsWithNull<TFields extends TFieldsType> = Prettify<{
@@ -307,6 +307,9 @@ type FieldsByTypeByTable = Prettify<{
 }>;
 type GetColumnType<Table extends TTableSources, Col1 extends keyof _db[Table extends string ? Table : `Come back to 8`]["fields"]> = RemoveNullChar<IsString<_db[Table extends string ? Table : `Come back to 9`]["fields"][Col1]>>;
 type GetJoinOnColsType<Type extends string, TSources extends TArrSources> = GetJoinColsType<TSources[number], Type>;
+type GetCTECols<TCTEs extends Record<string, Record<string, any>>> = {
+    [K in keyof TCTEs & string]: `${K}.${keyof TCTEs[K] & string}`;
+}[keyof TCTEs & string];
 type GetColsFromTableType<TDBBase extends TTableSources, Type extends string> = FieldsByTypeByTable[Loop<keyof FieldsByTypeByTable, Type>][GetRealTableNames<TDBBase>];
 type Loop<Keys extends string, Type extends string> = Keys extends Type ? Type : never;
 type GetJoinColsType<TDBBase extends TTableSources, Type extends string> = IterateFields<TDBBase, IsString<GetColsFromTableType<TDBBase, Type>>>;
@@ -336,7 +339,7 @@ type BaseSelectFnContext<_TSources extends TArrSources, _TFields extends TFields
     ltrim: (col: GetColumnsOfType<_TSources, _TFields, string> | SQLExpr<string>) => SQLExpr<string>;
     rtrim: (col: GetColumnsOfType<_TSources, _TFields, string> | SQLExpr<string>) => SQLExpr<string>;
     cond: (criteria: WhereCriteria<_TSources, _TFields>) => SQLExpr<boolean>;
-    coalesce: <T>(...args: [GetColumnsOfType<_TSources, _TFields, T> | SQLExpr<T>, ...Array<GetColumnsOfType<_TSources, _TFields, T> | SQLExpr<T>>]) => SQLExpr<T>;
+    coalesce: <T>(...args: [GetColumnsOfType<_TSources, _TFields, T> | SQLExpr<T>, ...Array<GetColumnsOfType<_TSources, _TFields, T> | SQLExpr<T>>]) => SQLExpr<NonNullable<T>>;
     nullif: <T>(expr1: SQLExpr<T>, expr2: SQLExpr<T>) => SQLExpr<T | null>;
     caseWhen: <T, TElse extends SQLExpr<T> | undefined = undefined>(cases: [{
         when: WhereCriteria<_TSources, _TFields>;
@@ -355,6 +358,7 @@ type GetJunctionTable<TSource extends TTables, TTarget extends TTables> = TSourc
 type AvailableRefNames<TSource extends TTables> = TSource extends keyof M2MMap ? M2MMap[TSource][keyof M2MMap[TSource]] extends infer J ? J extends `_${infer R}` ? R : never : never : never;
 declare class _fJoin<TSources extends TArrSources, TFields extends TFieldsType, TCTEs extends Record<string, Record<string, any>> = {}> extends _fWhere<TSources, TFields> {
     join<const TName extends keyof TCTEs & string>(cteName: TName, local: keyof TCTEs[TName] & string, remote: GetJoinCols<TSources[number]>, opts?: {
+        where?: WhereCriteriaMulti<[readonly ["__cte__", TName]], Record<TName, TCTEs[TName]>>;
         joinType?: JoinType;
     }): _fJoin<[...TSources, readonly ["__cte__", TName]], TFields & Record<TName, TCTEs[TName]>, TCTEs>;
     join<const Table extends AvailableJoins<TSources>, TJoinCols extends [string, string] = ValidStringTuple<GetUnionOfRelations<MapJoinsToKnownTables<SafeJoins<Table, TSources>, TSources>>>, TCol1 extends TJoinCols[0] = never, TAlias extends string = never>(options: {
@@ -370,7 +374,7 @@ declare class _fJoin<TSources extends TArrSources, TFields extends TFieldsType,
         joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [never] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
     private _joinImpl;
-    joinUnsafeTypeEnforced<const Table extends TTables | `${TTables} ${string}`, TCol1 extends GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>, TAlias extends string = never>(options: {
+    joinUnsafeTypeEnforced<const Table extends TTables | `${TTables} ${string}`, TCol1 extends GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> | GetCTECols<TCTEs>, TAlias extends string = never>(options: {
         table: Table;
         src: TCol1;
         on: TCol2;
@@ -378,7 +382,7 @@ declare class _fJoin<TSources extends TArrSources, TFields extends TFieldsType,
         where?: JoinWhereCriteria<Table, TAlias>;
         joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [undefined] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [undefined] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
-    joinUnsafeTypeEnforced<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> = GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>>(table: TableInput, field: TCol1, reference: TCol2, options?: {
+    joinUnsafeTypeEnforced<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> | GetCTECols<TCTEs> = GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>>(table: TableInput, field: TCol1, reference: TCol2, options?: {
         where?: JoinWhereCriteria<Table, TAlias>;
         joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [undefined] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
@@ -403,91 +407,163 @@ declare class _fJoin<TSources extends TArrSources, TFields extends TFieldsType,
         TJunction,
         [TAlias] extends [never] ? TTarget : [TTarget, TAlias]
     ], Prettify<TFields & Record<TJunction, GetFieldsFromTable<TJunction>> & Record<[TAlias] extends [never] ? TTarget : TAlias, GetFieldsFromTable<TTarget>>>>;
+    innerJoin<const TName extends keyof TCTEs & string>(cteName: TName, local: keyof TCTEs[TName] & string, remote: GetJoinCols<TSources[number]>, opts?: {
+        where?: WhereCriteriaMulti<[readonly ["__cte__", TName]], Record<TName, TCTEs[TName]>>;
+    }): _fJoin<[...TSources, readonly ["__cte__", TName]], TFields & Record<TName, TCTEs[TName]>, TCTEs>;
     innerJoin<const Table extends AvailableJoins<TSources>, TJoinCols extends [string, string] = ValidStringTuple<GetUnionOfRelations<MapJoinsToKnownTables<SafeJoins<Table, TSources>, TSources>>>, TCol1 extends TJoinCols[0] = never, TAlias extends string = never>(options: {
         table: Table;
         src: TCol1;
         on: find<TJoinCols, TCol1>;
         alias?: TAlias;
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [undefined] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [undefined] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
-    innerJoin<const TableInput extends `${AvailableJoins<TSources>}` | `${AvailableJoins<TSources>} ${string}`, Table extends AvailableJoins<TSources> = ExtractTableName<TableInput> & AvailableJoins<TSources>, TAlias extends string | never = ExtractAlias<TableInput>, TJoinCols extends [string, string] = ValidStringTuple<GetUnionOfRelations<MapJoinsToKnownTables<SafeJoins<Table, TSources>, TSources>>>, TCol1 extends TJoinCols[0] = never>(table: TableInput, field: TCol1, reference: find<TJoinCols, TCol1>): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [never] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
+    innerJoin<const TableInput extends `${AvailableJoins<TSources>}` | `${AvailableJoins<TSources>} ${string}`, Table extends AvailableJoins<TSources> = ExtractTableName<TableInput> & AvailableJoins<TSources>, TAlias extends string | never = ExtractAlias<TableInput>, TJoinCols extends [string, string] = ValidStringTuple<GetUnionOfRelations<MapJoinsToKnownTables<SafeJoins<Table, TSources>, TSources>>>, TCol1 extends TJoinCols[0] = never>(table: TableInput, field: TCol1, reference: find<TJoinCols, TCol1>, options?: {
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
+    }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [never] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
+    leftJoin<const TName extends keyof TCTEs & string>(cteName: TName, local: keyof TCTEs[TName] & string, remote: GetJoinCols<TSources[number]>, opts?: {
+        where?: WhereCriteriaMulti<[readonly ["__cte__", TName]], Record<TName, TCTEs[TName]>>;
+    }): _fJoin<[...TSources, readonly ["__cte__", TName]], TFields & Record<TName, TCTEs[TName]>, TCTEs>;
     leftJoin<const Table extends AvailableJoins<TSources>, TJoinCols extends [string, string] = ValidStringTuple<GetUnionOfRelations<MapJoinsToKnownTables<SafeJoins<Table, TSources>, TSources>>>, TCol1 extends TJoinCols[0] = never, TAlias extends string = never>(options: {
         table: Table;
         src: TCol1;
         on: find<TJoinCols, TCol1>;
         alias?: TAlias;
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [undefined] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [undefined] ? Table : TAlias, MakeNullable<GetFieldsFromTable<Table>>>>, TCTEs>;
-    leftJoin<const TableInput extends `${AvailableJoins<TSources>}` | `${AvailableJoins<TSources>} ${string}`, Table extends AvailableJoins<TSources> = ExtractTableName<TableInput> & AvailableJoins<TSources>, TAlias extends string | never = ExtractAlias<TableInput>, TJoinCols extends [string, string] = ValidStringTuple<GetUnionOfRelations<MapJoinsToKnownTables<SafeJoins<Table, TSources>, TSources>>>, TCol1 extends TJoinCols[0] = never>(table: TableInput, field: TCol1, reference: find<TJoinCols, TCol1>): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [never] ? Table : TAlias, MakeNullable<GetFieldsFromTable<Table>>>>, TCTEs>;
+    leftJoin<const TableInput extends `${AvailableJoins<TSources>}` | `${AvailableJoins<TSources>} ${string}`, Table extends AvailableJoins<TSources> = ExtractTableName<TableInput> & AvailableJoins<TSources>, TAlias extends string | never = ExtractAlias<TableInput>, TJoinCols extends [string, string] = ValidStringTuple<GetUnionOfRelations<MapJoinsToKnownTables<SafeJoins<Table, TSources>, TSources>>>, TCol1 extends TJoinCols[0] = never>(table: TableInput, field: TCol1, reference: find<TJoinCols, TCol1>, options?: {
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
+    }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [never] ? Table : TAlias, MakeNullable<GetFieldsFromTable<Table>>>>, TCTEs>;
+    rightJoin<const TName extends keyof TCTEs & string>(cteName: TName, local: keyof TCTEs[TName] & string, remote: GetJoinCols<TSources[number]>, opts?: {
+        where?: WhereCriteriaMulti<[readonly ["__cte__", TName]], Record<TName, TCTEs[TName]>>;
+    }): _fJoin<[...TSources, readonly ["__cte__", TName]], TFields & Record<TName, TCTEs[TName]>, TCTEs>;
     rightJoin<const Table extends AvailableJoins<TSources>, TJoinCols extends [string, string] = ValidStringTuple<GetUnionOfRelations<MapJoinsToKnownTables<SafeJoins<Table, TSources>, TSources>>>, TCol1 extends TJoinCols[0] = never, TAlias extends string = never>(options: {
         table: Table;
         src: TCol1;
         on: find<TJoinCols, TCol1>;
         alias?: TAlias;
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [undefined] ? Table : [Table, TAlias]], Prettify<NullifyTableFields<TFields> & Record<[TAlias] extends [undefined] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
-    rightJoin<const TableInput extends `${AvailableJoins<TSources>}` | `${AvailableJoins<TSources>} ${string}`, Table extends AvailableJoins<TSources> = ExtractTableName<TableInput> & AvailableJoins<TSources>, TAlias extends string | never = ExtractAlias<TableInput>, TJoinCols extends [string, string] = ValidStringTuple<GetUnionOfRelations<MapJoinsToKnownTables<SafeJoins<Table, TSources>, TSources>>>, TCol1 extends TJoinCols[0] = never>(table: TableInput, field: TCol1, reference: find<TJoinCols, TCol1>): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<NullifyTableFields<TFields> & Record<[TAlias] extends [never] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
+    rightJoin<const TableInput extends `${AvailableJoins<TSources>}` | `${AvailableJoins<TSources>} ${string}`, Table extends AvailableJoins<TSources> = ExtractTableName<TableInput> & AvailableJoins<TSources>, TAlias extends string | never = ExtractAlias<TableInput>, TJoinCols extends [string, string] = ValidStringTuple<GetUnionOfRelations<MapJoinsToKnownTables<SafeJoins<Table, TSources>, TSources>>>, TCol1 extends TJoinCols[0] = never>(table: TableInput, field: TCol1, reference: find<TJoinCols, TCol1>, options?: {
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
+    }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<NullifyTableFields<TFields> & Record<[TAlias] extends [never] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
+    fullJoin<const TName extends keyof TCTEs & string>(cteName: TName, local: keyof TCTEs[TName] & string, remote: GetJoinCols<TSources[number]>, opts?: {
+        where?: WhereCriteriaMulti<[readonly ["__cte__", TName]], Record<TName, TCTEs[TName]>>;
+    }): _fJoin<[...TSources, readonly ["__cte__", TName]], TFields & Record<TName, TCTEs[TName]>, TCTEs>;
     fullJoin<const Table extends AvailableJoins<TSources>, TJoinCols extends [string, string] = ValidStringTuple<GetUnionOfRelations<MapJoinsToKnownTables<SafeJoins<Table, TSources>, TSources>>>, TCol1 extends TJoinCols[0] = never, TAlias extends string = never>(options: {
         table: Table;
         src: TCol1;
         on: find<TJoinCols, TCol1>;
         alias?: TAlias;
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [undefined] ? Table : [Table, TAlias]], Prettify<NullifyTableFields<TFields> & Record<[TAlias] extends [undefined] ? Table : TAlias, MakeNullable<GetFieldsFromTable<Table>>>>, TCTEs>;
-    fullJoin<const TableInput extends `${AvailableJoins<TSources>}` | `${AvailableJoins<TSources>} ${string}`, Table extends AvailableJoins<TSources> = ExtractTableName<TableInput> & AvailableJoins<TSources>, TAlias extends string | never = ExtractAlias<TableInput>, TJoinCols extends [string, string] = ValidStringTuple<GetUnionOfRelations<MapJoinsToKnownTables<SafeJoins<Table, TSources>, TSources>>>, TCol1 extends TJoinCols[0] = never>(table: TableInput, field: TCol1, reference: find<TJoinCols, TCol1>): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<NullifyTableFields<TFields> & Record<[TAlias] extends [never] ? Table : TAlias, MakeNullable<GetFieldsFromTable<Table>>>>, TCTEs>;
+    fullJoin<const TableInput extends `${AvailableJoins<TSources>}` | `${AvailableJoins<TSources>} ${string}`, Table extends AvailableJoins<TSources> = ExtractTableName<TableInput> & AvailableJoins<TSources>, TAlias extends string | never = ExtractAlias<TableInput>, TJoinCols extends [string, string] = ValidStringTuple<GetUnionOfRelations<MapJoinsToKnownTables<SafeJoins<Table, TSources>, TSources>>>, TCol1 extends TJoinCols[0] = never>(table: TableInput, field: TCol1, reference: find<TJoinCols, TCol1>, options?: {
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
+    }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<NullifyTableFields<TFields> & Record<[TAlias] extends [never] ? Table : TAlias, MakeNullable<GetFieldsFromTable<Table>>>>, TCTEs>;
     crossJoin<const TableInput extends `${AvailableJoins<TSources>}` | `${AvailableJoins<TSources>} ${string}`, Table extends AvailableJoins<TSources> = ExtractTableName<TableInput> & AvailableJoins<TSources>, TAlias extends string | never = ExtractAlias<TableInput>>(table: TableInput): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [never] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
-    innerJoinUnsafeTypeEnforced<const Table extends TTables | `${TTables} ${string}`, TCol1 extends GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>, TAlias extends string = never>(options: {
+    innerJoinUnsafeTypeEnforced<const Table extends TTables | `${TTables} ${string}`, TCol1 extends GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> | GetCTECols<TCTEs>, TAlias extends string = never>(options: {
         table: Table;
         src: TCol1;
         on: TCol2;
         alias?: TAlias;
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [undefined] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [undefined] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
-    innerJoinUnsafeTypeEnforced<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> = GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>>(table: TableInput, field: TCol1, reference: TCol2): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [undefined] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
+    innerJoinUnsafeTypeEnforced<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> | GetCTECols<TCTEs> = GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>>(table: TableInput, field: TCol1, reference: TCol2, options?: {
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
+    }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [undefined] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
     innerJoinUnsafeIgnoreType<const Table extends TTables, TCol1 extends GetColsBaseTable<Table>, TCol2 extends GetJoinCols<TSources[number]>, TAlias extends string = never>(options: {
         table: Table;
         src: TCol1;
         on: TCol2;
         alias?: TAlias;
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
+    }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], TFields & Record<Table, GetFieldsFromTable<Table>>, TCTEs>;
+    innerJoinUnsafeIgnoreType<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinCols<TSources[number]> = GetJoinCols<TSources[number]>>(table: TableInput, field: TCol1, reference: TCol2, options?: {
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], TFields & Record<Table, GetFieldsFromTable<Table>>, TCTEs>;
-    innerJoinUnsafeIgnoreType<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinCols<TSources[number]> = GetJoinCols<TSources[number]>>(table: TableInput, field: TCol1, reference: TCol2): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], TFields & Record<Table, GetFieldsFromTable<Table>>, TCTEs>;
-    leftJoinUnsafeTypeEnforced<const Table extends TTables | `${TTables} ${string}`, TCol1 extends GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>, TAlias extends string = never>(options: {
+    leftJoinUnsafeTypeEnforced<const Table extends TTables | `${TTables} ${string}`, TCol1 extends GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> | GetCTECols<TCTEs>, TAlias extends string = never>(options: {
         table: Table;
         src: TCol1;
         on: TCol2;
         alias?: TAlias;
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [undefined] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [undefined] ? Table : TAlias, MakeNullable<GetFieldsFromTable<Table>>>>, TCTEs>;
-    leftJoinUnsafeTypeEnforced<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> = GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>>(table: TableInput, field: TCol1, reference: TCol2): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [undefined] ? Table : TAlias, MakeNullable<GetFieldsFromTable<Table>>>>, TCTEs>;
+    leftJoinUnsafeTypeEnforced<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> | GetCTECols<TCTEs> = GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>>(table: TableInput, field: TCol1, reference: TCol2, options?: {
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
+    }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [undefined] ? Table : TAlias, MakeNullable<GetFieldsFromTable<Table>>>>, TCTEs>;
     leftJoinUnsafeIgnoreType<const Table extends TTables, TCol1 extends GetColsBaseTable<Table>, TCol2 extends GetJoinCols<TSources[number]>, TAlias extends string = never>(options: {
         table: Table;
         src: TCol1;
         on: TCol2;
         alias?: TAlias;
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], TFields & Record<Table, MakeNullable<GetFieldsFromTable<Table>>>, TCTEs>;
-    leftJoinUnsafeIgnoreType<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinCols<TSources[number]> = GetJoinCols<TSources[number]>>(table: TableInput, field: TCol1, reference: TCol2): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], TFields & Record<Table, MakeNullable<GetFieldsFromTable<Table>>>, TCTEs>;
-    rightJoinUnsafeTypeEnforced<const Table extends TTables | `${TTables} ${string}`, TCol1 extends GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>, TAlias extends string = never>(options: {
+    leftJoinUnsafeIgnoreType<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinCols<TSources[number]> = GetJoinCols<TSources[number]>>(table: TableInput, field: TCol1, reference: TCol2, options?: {
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
+    }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], TFields & Record<Table, MakeNullable<GetFieldsFromTable<Table>>>, TCTEs>;
+    rightJoinUnsafeTypeEnforced<const Table extends TTables | `${TTables} ${string}`, TCol1 extends GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> | GetCTECols<TCTEs>, TAlias extends string = never>(options: {
         table: Table;
         src: TCol1;
         on: TCol2;
         alias?: TAlias;
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [undefined] ? Table : [Table, TAlias]], Prettify<NullifyTableFields<TFields> & Record<[TAlias] extends [undefined] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
-    rightJoinUnsafeTypeEnforced<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> = GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>>(table: TableInput, field: TCol1, reference: TCol2): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<NullifyTableFields<TFields> & Record<[TAlias] extends [undefined] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
+    rightJoinUnsafeTypeEnforced<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> | GetCTECols<TCTEs> = GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>>(table: TableInput, field: TCol1, reference: TCol2, options?: {
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
+    }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<NullifyTableFields<TFields> & Record<[TAlias] extends [undefined] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
     rightJoinUnsafeIgnoreType<const Table extends TTables, TCol1 extends GetColsBaseTable<Table>, TCol2 extends GetJoinCols<TSources[number]>, TAlias extends string = never>(options: {
         table: Table;
         src: TCol1;
         on: TCol2;
         alias?: TAlias;
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], NullifyTableFields<TFields> & Record<Table, GetFieldsFromTable<Table>>, TCTEs>;
-    rightJoinUnsafeIgnoreType<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinCols<TSources[number]> = GetJoinCols<TSources[number]>>(table: TableInput, field: TCol1, reference: TCol2): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], NullifyTableFields<TFields> & Record<Table, GetFieldsFromTable<Table>>, TCTEs>;
-    fullJoinUnsafeTypeEnforced<const Table extends TTables | `${TTables} ${string}`, TCol1 extends GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>, TAlias extends string = never>(options: {
+    rightJoinUnsafeIgnoreType<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinCols<TSources[number]> = GetJoinCols<TSources[number]>>(table: TableInput, field: TCol1, reference: TCol2, options?: {
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
+    }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], NullifyTableFields<TFields> & Record<Table, GetFieldsFromTable<Table>>, TCTEs>;
+    fullJoinUnsafeTypeEnforced<const Table extends TTables | `${TTables} ${string}`, TCol1 extends GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> | GetCTECols<TCTEs>, TAlias extends string = never>(options: {
         table: Table;
         src: TCol1;
         on: TCol2;
         alias?: TAlias;
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [undefined] ? Table : [Table, TAlias]], Prettify<NullifyTableFields<TFields> & Record<[TAlias] extends [undefined] ? Table : TAlias, MakeNullable<GetFieldsFromTable<Table>>>>, TCTEs>;
-    fullJoinUnsafeTypeEnforced<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> = GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>>(table: TableInput, field: TCol1, reference: TCol2): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<NullifyTableFields<TFields> & Record<[TAlias] extends [undefined] ? Table : TAlias, MakeNullable<GetFieldsFromTable<Table>>>>, TCTEs>;
+    fullJoinUnsafeTypeEnforced<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> | GetCTECols<TCTEs> = GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>>(table: TableInput, field: TCol1, reference: TCol2, options?: {
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
+    }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<NullifyTableFields<TFields> & Record<[TAlias] extends [undefined] ? Table : TAlias, MakeNullable<GetFieldsFromTable<Table>>>>, TCTEs>;
     fullJoinUnsafeIgnoreType<const Table extends TTables, TCol1 extends GetColsBaseTable<Table>, TCol2 extends GetJoinCols<TSources[number]>, TAlias extends string = never>(options: {
         table: Table;
         src: TCol1;
         on: TCol2;
         alias?: TAlias;
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
+    }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], NullifyTableFields<TFields> & Record<Table, MakeNullable<GetFieldsFromTable<Table>>>, TCTEs>;
+    fullJoinUnsafeIgnoreType<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinCols<TSources[number]> = GetJoinCols<TSources[number]>>(table: TableInput, field: TCol1, reference: TCol2, options?: {
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], NullifyTableFields<TFields> & Record<Table, MakeNullable<GetFieldsFromTable<Table>>>, TCTEs>;
-    fullJoinUnsafeIgnoreType<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinCols<TSources[number]> = GetJoinCols<TSources[number]>>(table: TableInput, field: TCol1, reference: TCol2): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], NullifyTableFields<TFields> & Record<Table, MakeNullable<GetFieldsFromTable<Table>>>, TCTEs>;
     crossJoinUnsafeTypeEnforced<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>>(table: TableInput): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [never] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
     crossJoinUnsafeIgnoreType<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>>(table: TableInput): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [never] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
 }

package/dist/extend/extend.js

@@ -300,17 +300,25 @@ var DbSelect = class {
   }
 };
 function applyCondition(quotedField, value) {
+  const sqlVal = (v2) => {
+    if (typeof v2 === "string") return `'${esc(v2)}'`;
+    if (v2 instanceof Date) return `'${v2.toISOString()}'`;
+    if (v2 === null) return "NULL";
+    if (typeof v2 === "number" || typeof v2 === "bigint" || typeof v2 === "boolean")
+      return String(v2);
+    throw new Error(`Unsupported value type in sqlVal: ${typeof v2}`);
+  };
   if (typeof value === "object" && value !== null && !Array.isArray(value) && "op" in value) {
     const opObj = value;
     switch (opObj.op) {
       case "IN":
       case "NOT IN": {
-        const valuesList = opObj.values.map((v2) => typeof v2 === "string" ? `'${esc(v2)}'` : v2).join(", ");
+        const valuesList = opObj.values.map((v2) => sqlVal(v2)).join(", ");
         return `${quotedField} ${opObj.op} (${valuesList})`;
       }
       case "BETWEEN": {
         const [start, end] = opObj.values;
-        return `${quotedField} BETWEEN ${typeof start === "string" ? `'${esc(start)}'` : start} AND ${typeof end === "string" ? `'${esc(end)}'` : end}`;
+        return `${quotedField} BETWEEN ${sqlVal(start)} AND ${sqlVal(end)}`;
       }
       case "LIKE":
       case "NOT LIKE":
@@ -324,7 +332,7 @@ function applyCondition(quotedField, value) {
       case "<=":
       case "!=":
       case "=":
-        return `${quotedField} ${opObj.op} ${typeof opObj.value === "string" ? `'${esc(opObj.value)}'` : opObj.value}`;
+        return `${quotedField} ${opObj.op} ${sqlVal(opObj.value)}`;
       default:
         throw new Error(`Unsupported operation: ${opObj.op}`);
     }
@@ -336,10 +344,10 @@ function applyCondition(quotedField, value) {
       const parts = value.map((opObj) => applyCondition(quotedField, opObj));
       return parts.length === 1 ? parts[0] : "(" + parts.join(" OR ") + ")";
     }
-    const valuesList = value.map((v2) => typeof v2 === "string" ? `'${esc(v2)}'` : v2).join(", ");
+    const valuesList = value.map((v2) => sqlVal(v2)).join(", ");
     return `${quotedField} IN (${valuesList})`;
   } else {
-    return `${quotedField} = ${typeof value === "string" ? `'${esc(value)}'` : value}`;
+    return `${quotedField} = ${sqlVal(value)}`;
   }
 }
 function processConditions(condition, formatted = false) {
@@ -533,7 +541,7 @@ var _fSelect = class __fSelect extends _fOrderBy {
         }
         return new __fSelect(this.db, {
           ...this.values,
-          selects: [...this.values.selects, `${dialect.quoteQualifiedColumn(select)} AS ${dialect.quote(select, true)}`]
+          selects: [...this.values.selects, `${dialect.quoteQualifiedColumn(select)} AS ${dialect.quote(alias ?? select, true)}`]
         });
       }
       if (colName === "*") {
@@ -847,45 +855,45 @@ var _fJoin = class __fJoin extends _fWhere {
     const remoteRef = `${sourceAlias}.${srcLocalCol}`;
     return this.joinUnsafeIgnoreType(junctionTable, srcJunctionCol, remoteRef).joinUnsafeIgnoreType(safeAlias ? `${safeTbl} ${safeAlias}` : safeTbl, tgtLocalCol, `${junctionTable}.${tgtJunctionCol}`);
   }
-  innerJoin(tableOrOptions, field, reference) {
-    return this._joinImpl("INNER", tableOrOptions, field, reference);
+  innerJoin(tableOrOptions, field, reference, opts) {
+    return this._joinImpl("INNER", tableOrOptions, field, reference, opts);
   }
-  leftJoin(tableOrOptions, field, reference) {
-    return this._joinImpl("LEFT", tableOrOptions, field, reference);
+  leftJoin(tableOrOptions, field, reference, opts) {
+    return this._joinImpl("LEFT", tableOrOptions, field, reference, opts);
   }
-  rightJoin(tableOrOptions, field, reference) {
-    return this._joinImpl("RIGHT", tableOrOptions, field, reference);
+  rightJoin(tableOrOptions, field, reference, opts) {
+    return this._joinImpl("RIGHT", tableOrOptions, field, reference, opts);
   }
-  fullJoin(tableOrOptions, field, reference) {
-    return this._joinImpl("FULL", tableOrOptions, field, reference);
+  fullJoin(tableOrOptions, field, reference, opts) {
+    return this._joinImpl("FULL", tableOrOptions, field, reference, opts);
   }
   // crossJoin: no ON clause — table only (with optional inline alias)
   crossJoin(table) {
     return this._joinImpl("CROSS", table);
   }
-  innerJoinUnsafeTypeEnforced(tableOrOptions, field, reference) {
-    return this._joinImpl("INNER", tableOrOptions, field, reference);
+  innerJoinUnsafeTypeEnforced(tableOrOptions, field, reference, opts) {
+    return this._joinImpl("INNER", tableOrOptions, field, reference, opts);
   }
-  innerJoinUnsafeIgnoreType(tableOrOptions, field, reference) {
-    return this._joinImpl("INNER", tableOrOptions, field, reference);
+  innerJoinUnsafeIgnoreType(tableOrOptions, field, reference, opts) {
+    return this._joinImpl("INNER", tableOrOptions, field, reference, opts);
   }
-  leftJoinUnsafeTypeEnforced(tableOrOptions, field, reference) {
-    return this._joinImpl("LEFT", tableOrOptions, field, reference);
+  leftJoinUnsafeTypeEnforced(tableOrOptions, field, reference, opts) {
+    return this._joinImpl("LEFT", tableOrOptions, field, reference, opts);
   }
-  leftJoinUnsafeIgnoreType(tableOrOptions, field, reference) {
-    return this._joinImpl("LEFT", tableOrOptions, field, reference);
+  leftJoinUnsafeIgnoreType(tableOrOptions, field, reference, opts) {
+    return this._joinImpl("LEFT", tableOrOptions, field, reference, opts);
   }
-  rightJoinUnsafeTypeEnforced(tableOrOptions, field, reference) {
-    return this._joinImpl("RIGHT", tableOrOptions, field, reference);
+  rightJoinUnsafeTypeEnforced(tableOrOptions, field, reference, opts) {
+    return this._joinImpl("RIGHT", tableOrOptions, field, reference, opts);
   }
-  rightJoinUnsafeIgnoreType(tableOrOptions, field, reference) {
-    return this._joinImpl("RIGHT", tableOrOptions, field, reference);
+  rightJoinUnsafeIgnoreType(tableOrOptions, field, reference, opts) {
+    return this._joinImpl("RIGHT", tableOrOptions, field, reference, opts);
   }
-  fullJoinUnsafeTypeEnforced(tableOrOptions, field, reference) {
-    return this._joinImpl("FULL", tableOrOptions, field, reference);
+  fullJoinUnsafeTypeEnforced(tableOrOptions, field, reference, opts) {
+    return this._joinImpl("FULL", tableOrOptions, field, reference, opts);
   }
-  fullJoinUnsafeIgnoreType(tableOrOptions, field, reference) {
-    return this._joinImpl("FULL", tableOrOptions, field, reference);
+  fullJoinUnsafeIgnoreType(tableOrOptions, field, reference, opts) {
+    return this._joinImpl("FULL", tableOrOptions, field, reference, opts);
   }
   // crossJoinUnsafeTypeEnforced — CROSS semantics, type-enforced columns
   crossJoinUnsafeTypeEnforced(table) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prisma-ts-select",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "type": "module",
   "bin": {
     "prisma-ts-select": "dist/bin.cjs"
@@ -28,30 +28,6 @@
       }
     }
   },
-  "scripts": {
-    "bp": "pnpm build && pnpm version patch && pnpm pack",
-    "build": "pnpm exec rimraf dist && tsup",
-    "reset": "rm -rf prisma/migrations/ && prisma migrate dev --name init  && prisma generate",
-    "start": "tsx src/index.ts",
-    "prisma-upgrade": "pnpm i --save-dev prisma@latest && pnpm i @prisma/client@latest",
-    "lint:ts": "tsc --noEmit -p tsconfig.json",
-    "lint:tsw": "pnpm tsc -w",
-    "lint": "tsc --noEmit ; eslint \"scripts/**/*.{j,t}s{,x}\" --cache --max-warnings=0",
-    "lint:s": "eslint --config .eslintrc.style.json \"scripts/**/*.{j,t}s{,x}\" --cache --max-warnings=0",
-    "lint:fix": "eslint --config .eslintrc.style.json \"scripts/**/*.{j,t}s{,x}\" --cache --max-warnings=0 --fix",
-    "p:gen": "pnpm exec prisma generate",
-    "p:dbp": "pnpm exec prisma db push",
-    "p:migrate": "pnpm exec prisma migrate dev",
-    "p:update": "pnpm add -D prisma@latest && pnpm add @prisma/client@latest",
-    "test": "node --test tests/**/*.spec.ts",
-    "test:jest": "jest",
-    "2postinstall": "node src/scripts/postinstall.js",
-    "doc": "pnpm exec markdown-toc -i README.md",
-    "mdcode-ts": "pnpm exec mdcode",
-    "readme:extract": "pnpm mdcode extract README.md",
-    "readme:update": "pnpm mdcode update --transform ./transforms/readme-sql-clean.ts README.md",
-    "readme:test": "pnpm --filter usage-sqlite-v7 test -- tests/readme"
-  },
   "dependencies": {
     "@prisma/generator-helper": "^6.0.0",
     "@prisma/internals": "^6.0.0",
@@ -175,5 +151,29 @@
   "publishConfig": {
     "access": "public",
     "name": "prisma-ts-select"
+  },
+  "scripts": {
+    "bp": "pnpm build && pnpm version patch && pnpm pack",
+    "build": "pnpm exec rimraf dist && tsup",
+    "reset": "rm -rf prisma/migrations/ && prisma migrate dev --name init  && prisma generate",
+    "start": "tsx src/index.ts",
+    "prisma-upgrade": "pnpm i --save-dev prisma@latest && pnpm i @prisma/client@latest",
+    "lint:ts": "tsc --noEmit -p tsconfig.json",
+    "lint:tsw": "pnpm tsc -w",
+    "lint": "tsc --noEmit ; eslint \"scripts/**/*.{j,t}s{,x}\" --cache --max-warnings=0",
+    "lint:s": "eslint --config .eslintrc.style.json \"scripts/**/*.{j,t}s{,x}\" --cache --max-warnings=0",
+    "lint:fix": "eslint --config .eslintrc.style.json \"scripts/**/*.{j,t}s{,x}\" --cache --max-warnings=0 --fix",
+    "p:gen": "pnpm exec prisma generate",
+    "p:dbp": "pnpm exec prisma db push",
+    "p:migrate": "pnpm exec prisma migrate dev",
+    "p:update": "pnpm add -D prisma@latest && pnpm add @prisma/client@latest",
+    "test": "node --test tests/**/*.spec.ts",
+    "test:jest": "jest",
+    "2postinstall": "node src/scripts/postinstall.js",
+    "doc": "pnpm exec markdown-toc -i README.md",
+    "mdcode-ts": "pnpm exec mdcode",
+    "readme:extract": "pnpm mdcode extract README.md",
+    "readme:update": "pnpm mdcode update --transform ./transforms/readme-sql-clean.ts README.md",
+    "readme:test": "pnpm --filter usage-sqlite-v7 test -- tests/readme"
   }
-}
+}