prisma-ts-select 0.1.6 → 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/bin.cjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
 'use strict';
 
-require('./chunk-GSIFF2TF.cjs');
+require('./chunk-RX2M26LV.cjs');
 

package/dist/bin.js

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-import './chunk-NFKUA5XM.js';
+import './chunk-F7HSD6UA.js';

package/dist/{chunk-NFKUA5XM.js → chunk-F7HSD6UA.js}

@@ -51,6 +51,7 @@ generatorHandler({
       }, []).join(", ")}`);
     }
     const modelToId = {};
+    const m2mMap = {};
     const models = options.dmmf.datamodel.models.reduce((acc, model) => {
       const modelObj = acc[model.name] = acc[model.name] ?? {
         fields: {},
@@ -79,6 +80,11 @@ generatorHandler({
           } else {
             if (!isManyToManyRelationShip(field)) continue;
             const joinTableName = "_" + field.relationName;
+            const src = model.name, tgt = field.type;
+            (m2mMap[src] ??= {})[tgt] ??= /* @__PURE__ */ new Set();
+            m2mMap[src][tgt].add(joinTableName);
+            (m2mMap[tgt] ??= {})[src] ??= /* @__PURE__ */ new Set();
+            m2mMap[tgt][src].add(joinTableName);
             const joinTableModel = acc[joinTableName] = acc[joinTableName] ?? {
               fields: {
                 "A": "",
@@ -214,7 +220,7 @@ export { ${provider}Dialect as dialect, ${provider}Dialect, ${ctxName} as dialec
     const PLACEHOLDER = "type SelectFnContext<_TSources extends TArrSources, _TFields extends TFieldsType> = BaseSelectFnContext<_TSources, _TFields>;";
     const JOIN_RETURN_RE = /type _fJoinReturn<[^>]+>[^;]+;/;
     const joinReturnReplacement = omittedMethods.length > 0 ? `type _fJoinReturn<TSources extends TArrSources, TFields extends TFieldsType, TCTEs extends Record<string, Record<string, any>> = {}> = Omit<_fJoin<TSources, TFields, TCTEs>, ${omittedMethods.map((m) => `"${m}"`).join(" | ")}>;` : `type _fJoinReturn<TSources extends TArrSources, TFields extends TFieldsType, TCTEs extends Record<string, Record<string, any>> = {}> = _fJoin<TSources, TFields, TCTEs>;`;
-    const replacedExtendDts = extendDts.replace("declare const DB: DBType;", declaration).replace(
+    const replacedExtendDts = extendDts.replace("declare const DB: DBType;", declaration).replace("type M2MMap = {};", generateM2MMapDeclaration(m2mMap)).replace(
       PLACEHOLDER,
       `type SelectFnContext<_TSources extends TArrSources, _TFields extends TFieldsType> = Omit<BaseSelectFnContext<_TSources, _TFields>, keyof DialectFns<ColEntries<_TSources, _TFields>, WhereCriteria<_TSources, _TFields>>> & DialectFns<ColEntries<_TSources, _TFields>, WhereCriteria<_TSources, _TFields>>;`
     ).replace(JOIN_RETURN_RE, joinReturnReplacement);
@@ -300,3 +306,19 @@ function generateReadonlyDeclaration(db) {
 ${traverse(db, 1)}
 };`;
 }
+function generateM2MMapDeclaration(m2mMap) {
+  if (Object.keys(m2mMap).length === 0) return "type M2MMap = {};";
+  const lines = ["type M2MMap = {"];
+  for (const [source, targets] of Object.entries(m2mMap)) {
+    lines.push(`  readonly "${source}": {`);
+    for (const [target, junctions] of Object.entries(targets)) {
+      const junctionLiterals = Array.from(junctions).map((j) => `"${j}"`).join(" | ");
+      lines.push(`    readonly "${target}": ${junctionLiterals};`);
+    }
+    lines.push("  };");
+  }
+  lines.push("};");
+  return lines.join("\n");
+}
+
+export { generateM2MMapDeclaration };

package/dist/{chunk-GSIFF2TF.cjs → chunk-RX2M26LV.cjs}

@@ -59,6 +59,7 @@ generatorHelper.generatorHandler({
       }, []).join(", ")}`);
     }
     const modelToId = {};
+    const m2mMap = {};
     const models = options.dmmf.datamodel.models.reduce((acc, model) => {
       const modelObj = acc[model.name] = acc[model.name] ?? {
         fields: {},
@@ -87,6 +88,11 @@ generatorHelper.generatorHandler({
           } else {
             if (!isManyToManyRelationShip(field)) continue;
             const joinTableName = "_" + field.relationName;
+            const src = model.name, tgt = field.type;
+            (m2mMap[src] ??= {})[tgt] ??= /* @__PURE__ */ new Set();
+            m2mMap[src][tgt].add(joinTableName);
+            (m2mMap[tgt] ??= {})[src] ??= /* @__PURE__ */ new Set();
+            m2mMap[tgt][src].add(joinTableName);
             const joinTableModel = acc[joinTableName] = acc[joinTableName] ?? {
               fields: {
                 "A": "",
@@ -222,7 +228,7 @@ export { ${provider}Dialect as dialect, ${provider}Dialect, ${ctxName} as dialec
     const PLACEHOLDER = "type SelectFnContext<_TSources extends TArrSources, _TFields extends TFieldsType> = BaseSelectFnContext<_TSources, _TFields>;";
     const JOIN_RETURN_RE = /type _fJoinReturn<[^>]+>[^;]+;/;
     const joinReturnReplacement = omittedMethods.length > 0 ? `type _fJoinReturn<TSources extends TArrSources, TFields extends TFieldsType, TCTEs extends Record<string, Record<string, any>> = {}> = Omit<_fJoin<TSources, TFields, TCTEs>, ${omittedMethods.map((m) => `"${m}"`).join(" | ")}>;` : `type _fJoinReturn<TSources extends TArrSources, TFields extends TFieldsType, TCTEs extends Record<string, Record<string, any>> = {}> = _fJoin<TSources, TFields, TCTEs>;`;
-    const replacedExtendDts = extendDts.replace("declare const DB: DBType;", declaration).replace(
+    const replacedExtendDts = extendDts.replace("declare const DB: DBType;", declaration).replace("type M2MMap = {};", generateM2MMapDeclaration(m2mMap)).replace(
       PLACEHOLDER,
       `type SelectFnContext<_TSources extends TArrSources, _TFields extends TFieldsType> = Omit<BaseSelectFnContext<_TSources, _TFields>, keyof DialectFns<ColEntries<_TSources, _TFields>, WhereCriteria<_TSources, _TFields>>> & DialectFns<ColEntries<_TSources, _TFields>, WhereCriteria<_TSources, _TFields>>;`
     ).replace(JOIN_RETURN_RE, joinReturnReplacement);
@@ -308,3 +314,19 @@ function generateReadonlyDeclaration(db) {
 ${traverse(db, 1)}
 };`;
 }
+function generateM2MMapDeclaration(m2mMap) {
+  if (Object.keys(m2mMap).length === 0) return "type M2MMap = {};";
+  const lines = ["type M2MMap = {"];
+  for (const [source, targets] of Object.entries(m2mMap)) {
+    lines.push(`  readonly "${source}": {`);
+    for (const [target, junctions] of Object.entries(targets)) {
+      const junctionLiterals = Array.from(junctions).map((j) => `"${j}"`).join(" | ");
+      lines.push(`    readonly "${target}": ${junctionLiterals};`);
+    }
+    lines.push("  };");
+  }
+  lines.push("};");
+  return lines.join("\n");
+}
+
+exports.generateM2MMapDeclaration = generateM2MMapDeclaration;

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>;
@@ -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,16 +13,16 @@ 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>>;

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) => {