neoorm 0.8.0 → 0.8.2

package/dist/runtime/query/execute.js

@@ -1,7 +1,8 @@
 import { postgresDialect } from "../../dialect/postgres.js";
 import { getAppliedMigrations, listPendingMigrations, } from "../../migrate/runner.js";
 import { SCHEMA_DRIFT_QUERY_CODES, } from "../error-codes.js";
-import { createQueryError, NeoOrmQueryError, } from "../errors.js";
+import { createQueryError, NeoOrmDriverError, NeoOrmQueryError, } from "../errors.js";
+import { enrichMysqlError, isMysqlError } from "../mysql-error.js";
 import { emptyReturningContext, enrichPgError, isPgError, isSchemaDriftPgCode, } from "../pg-error.js";
 import { enrichSqliteError, isSqliteError } from "../sqlite-error.js";
 async function resolveMigrationHint(driver, dialect, migrationsDir, schema, driftCode) {
@@ -32,6 +33,16 @@ async function resolveMigrationHint(driver, dialect, migrationsDir, schema, drif
         return undefined;
     }
 }
+function unwrapDriverError(err) {
+    if (err instanceof NeoOrmDriverError) {
+        return err.cause ?? err;
+    }
+    return err;
+}
+function isKnownDriverError(err) {
+    const inner = unwrapDriverError(err);
+    return isSqliteError(inner) || isPgError(inner) || isMysqlError(inner);
+}
 function isSchemaDriftCode(code) {
     if (isSchemaDriftPgCode(code)) {
         return true;
@@ -40,11 +51,15 @@ function isSchemaDriftCode(code) {
 }
 async function enrichQueryError(runtime, ctx, sql, err) {
     const base = queryBaseContext(ctx, sql);
-    if (isSqliteError(err)) {
-        return enrichSqliteError(err, runtime.manifest, base);
+    const inner = unwrapDriverError(err);
+    if (isSqliteError(inner)) {
+        return enrichSqliteError(inner, runtime.manifest, base);
+    }
+    if (isPgError(inner)) {
+        return enrichPgError(inner, runtime.manifest, base);
     }
-    if (isPgError(err)) {
-        return enrichPgError(err, runtime.manifest, base);
+    if (isMysqlError(inner)) {
+        return enrichMysqlError(inner, runtime.manifest, base);
     }
     throw err;
 }
@@ -62,7 +77,7 @@ export async function runQuery(executor, runtime, ctx, sql, params = []) {
         return await executor.query(sql, params);
     }
     catch (err) {
-        if (isSqliteError(err) || isPgError(err)) {
+        if (isKnownDriverError(err)) {
             const enriched = await enrichQueryError(runtime, ctx, sql, err);
             await throwQueryError(runtime, enriched, err);
         }
@@ -74,7 +89,7 @@ export async function runExecute(executor, runtime, ctx, sql, params = []) {
         return await executor.execute(sql, params);
     }
     catch (err) {
-        if (isSqliteError(err) || isPgError(err)) {
+        if (isKnownDriverError(err)) {
             const enriched = await enrichQueryError(runtime, ctx, sql, err);
             await throwQueryError(runtime, enriched, err);
         }
@@ -97,7 +112,7 @@ export async function runQueryOne(executor, runtime, ctx, sql, params = []) {
         if (err instanceof NeoOrmQueryError) {
             throw err;
         }
-        if (isSqliteError(err) || isPgError(err)) {
+        if (isKnownDriverError(err)) {
             const enriched = await enrichQueryError(runtime, ctx, sql, err);
             await throwQueryError(runtime, enriched, err);
         }

package/dist/runtime/query/execute.js.map

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

package/dist/runtime/query/find-or-create.d.ts

@@ -15,5 +15,5 @@ export declare function findOrCreateRecord(executor: Executor, runtime: QueryRun
 export declare function findOrCreatePk(executor: Executor, runtime: QueryRuntime, tableAccessor: string, item: {
     where: Record<string, unknown>;
     create: Record<string, unknown>;
-}): Promise<string>;
+}, fkTsName?: string): Promise<unknown>;
 //# sourceMappingURL=find-or-create.d.ts.map

package/dist/runtime/query/find-or-create.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"find-or-create.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/find-or-create.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAO/C,OAAO,EAAE,KAAK,YAAY,EAAe,MAAM,cAAc,CAAC;AAC9D,OAAO,EAA2B,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AAGpE,OAAO,EACN,KAAK,oBAAoB,EAGzB,MAAM,iBAAiB,CAAC;AAIzB,MAAM,MAAM,kBAAkB,GAAG;IAChC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,OAAO,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC9B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CACjC,GAAG,oBAAoB,CAAC;AAgDzB,wBAAsB,kBAAkB,CACvC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,gBAAgB,GACpB,OAAO,CAAC,kBAAkB,CAAC,CAiE7B;AA6DD,wBAAgB,cAAc,CAC7B,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE;IACL,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChC,GACC,OAAO,CAAC,MAAM,CAAC,CASjB"}
+{"version":3,"file":"find-or-create.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/find-or-create.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAO/C,OAAO,EAAE,KAAK,YAAY,EAAe,MAAM,cAAc,CAAC;AAC9D,OAAO,EAA2B,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AAGpE,OAAO,EACN,KAAK,oBAAoB,EAGzB,MAAM,iBAAiB,CAAC;AAIzB,MAAM,MAAM,kBAAkB,GAAG;IAChC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,OAAO,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC9B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CACjC,GAAG,oBAAoB,CAAC;AAkDzB,wBAAsB,kBAAkB,CACvC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,gBAAgB,GACpB,OAAO,CAAC,kBAAkB,CAAC,CAoE7B;AA8DD,wBAAgB,cAAc,CAC7B,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE;IACL,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChC,EACD,QAAQ,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC,CAkBlB"}

package/dist/runtime/query/find-or-create.js

@@ -10,7 +10,7 @@ import { fillMissingPrimaryKeys, rowScalarPkValue } from "./primary-key.js";
 import { projectFindRow, resolveParentProjection, } from "./projection.js";
 import { getTableIndex, requireTable } from "./table-index.js";
 import { assertUniqueWhere } from "./unique.js";
-function toFindLookupArgs(args) {
+function toFindLookupArgs(args, andSql) {
     return {
         where: args.where,
         take: 1,
@@ -20,6 +20,7 @@ function toFindLookupArgs(args) {
         ...(args.includeHidden !== undefined
             ? { includeHidden: args.includeHidden }
             : {}),
+        ...(andSql !== undefined ? { andSql } : {}),
     };
 }
 async function finalizeFindOrCreateRecord(executor, runtime, table, tableAccessor, args, row, created, options = {}) {
@@ -45,20 +46,20 @@ export async function findOrCreateRecord(executor, runtime, tableAccessor, args)
     const lookupArgs = { ...args, where: uniqueWhere };
     const createData = { ...args.create, ...uniqueWhere };
     fillMissingPrimaryKeys(table, createData, tableIndex);
-    if (dialect.name === "sqlite") {
-        return findOrCreateSqlite(executor, runtime, tableAccessor, lookupArgs, createData);
+    if (!dialect.supportsXmax) {
+        return findOrCreateWithoutReturning(executor, runtime, tableAccessor, lookupArgs, createData, constraint.whereSql);
     }
     const { keys: insertKeys, values: insertValues } = dataToSqlValues(table, createData, undefined, runtime.tableIndex, dialect);
-    const findOrCreateSql = buildFindOrCreateQuery(table, insertKeys, constraint.sqlColumns, runtime.tableIndex, projection.hasProjection ? projection.sqlColumns : undefined, projection.includeHidden);
+    const findOrCreateSql = buildFindOrCreateQuery(table, insertKeys, constraint.sqlColumns, runtime.tableIndex, projection.hasProjection ? projection.sqlColumns : undefined, projection.includeHidden, dialect, constraint.whereSql);
     const row = await runQueryOne(executor, runtime, { operation: "findOrCreate", tableAccessor }, findOrCreateSql, insertValues);
     const created = row[FIND_OR_CREATE_FLAG] === true;
     const { [FIND_OR_CREATE_FLAG]: _createdFlag, ...rawRow } = row;
     return finalizeFindOrCreateRecord(executor, runtime, table, tableAccessor, args, rawRow, created);
 }
-async function findOrCreateSqlite(executor, runtime, tableAccessor, args, createData) {
+async function findOrCreateWithoutReturning(executor, runtime, tableAccessor, args, createData, andSql) {
     const { manifest } = runtime;
     const table = requireTable(manifest, tableAccessor, "select");
-    const existing = await findMany(executor, runtime, tableAccessor, toFindLookupArgs(args));
+    const existing = await findMany(executor, runtime, tableAccessor, toFindLookupArgs(args, andSql));
     if (existing.length > 0) {
         const existingRow = existing[0];
         if (existingRow) {
@@ -77,7 +78,7 @@ async function findOrCreateSqlite(executor, runtime, tableAccessor, args, create
         if (!isUniqueViolation(err)) {
             throw err;
         }
-        const retry = await findMany(executor, runtime, tableAccessor, toFindLookupArgs(args));
+        const retry = await findMany(executor, runtime, tableAccessor, toFindLookupArgs(args, andSql));
         if (retry.length > 0) {
             const retryRow = retry[0];
             if (retryRow) {
@@ -87,7 +88,7 @@ async function findOrCreateSqlite(executor, runtime, tableAccessor, args, create
         compileError("findOrCreate insert failed and record was not found");
     }
 }
-export function findOrCreatePk(executor, runtime, tableAccessor, item) {
+export function findOrCreatePk(executor, runtime, tableAccessor, item, fkTsName) {
     return findOrCreateRecord(executor, runtime, tableAccessor, {
         where: item.where,
         create: item.create,
@@ -95,6 +96,13 @@ export function findOrCreatePk(executor, runtime, tableAccessor, item) {
         const table = runtime.manifest.tables[tableAccessor];
         if (!table)
             compileError(`Unknown table: ${tableAccessor}`);
+        if (fkTsName) {
+            const value = record[fkTsName];
+            if (value == null) {
+                compileError(`Missing primary key "${fkTsName}" on table "${tableAccessor}"`);
+            }
+            return value;
+        }
         return rowScalarPkValue(record, table);
     });
 }

package/dist/runtime/query/find-or-create.js.map

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

package/dist/runtime/query/find.d.ts

@@ -28,6 +28,8 @@ type FindManyArgs = {
     omit?: readonly string[] | Record<string, boolean | undefined>;
     with?: Record<string, WithInput>;
     includeHidden?: boolean;
+    /** Extra AND predicate (partial unique index `WHERE`). */
+    andSql?: string;
 };
 type FindByIdArgs = {
     select?: readonly string[] | Record<string, boolean | undefined>;

package/dist/runtime/query/find.d.ts.map

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

package/dist/runtime/query/find.js

@@ -1,4 +1,7 @@
-import { postgresDialect, quoteIdentifier, tableRef, } from "../../dialect/postgres.js";
+import { relationFkPairs } from "../../dialect/fk.js";
+import { joinPlaceholders } from "../../dialect/placeholders.js";
+import { postgresDialect } from "../../dialect/postgres.js";
+import { dialectDisplayName, dialectSupportsDistinctOn, } from "../../dialect/resolve.js";
 import { rebaseParamRefs } from "../../sql/template.js";
 import { compileError } from "../compile-error.js";
 import { buildFindByIdQuery, buildFindManyQuery, buildSelectColumns, compileOrderBy, compileWhere, getCachedFindManyQuery, getCachedOrderByClause, getCachedWhereClause, isImpossibleWhere, normalizeLimitOffset, normalizeSelectColumns, } from "./compile.js";
@@ -9,6 +12,7 @@ import { primaryKeyTsNames, requireScalarPrimaryKey, resolvePkWhere, rowPkKey, t
 import { projectFindRow, projectFindRows, projectionSignature, resolveParentProjection, } from "./projection.js";
 import { buildCountAggregateGroupBy, buildPlanExtraSelectCols, compileCountOrderBy, getCachedFindByIdWithQuery, getCachedRelationPlan, hydrateRowsWithPlan, planRelationLoad, withShapeSignature, } from "./relation-planner.js";
 import { columnBySqlName, getTableIndex, requireTable, } from "./table-index.js";
+import { appendUniquePredicate } from "./unique.js";
 function isRelationSpec(withSpec) {
     if (typeof withSpec !== "object" || withSpec === null)
         return false;
@@ -20,6 +24,13 @@ function isRelationSpec(withSpec) {
         "with" in withSpec ||
         "includeHidden" in withSpec);
 }
+function assertDistinctOnSupported(distinctOn, dialect) {
+    if (!distinctOn || distinctOn.length === 0)
+        return;
+    if (dialectSupportsDistinctOn(dialect))
+        return;
+    compileError(`distinct is not supported on ${dialectDisplayName(dialect.name)} (DISTINCT ON is PostgreSQL-only). Use groupBy or orderBy + a manual query instead.`);
+}
 function validateDistinctOrderBy(distinct, orderBy) {
     if (!distinct || distinct.length === 0)
         return;
@@ -77,10 +88,9 @@ async function loadRelationCounts(executor, runtime, parentTable, parentRows, co
         const counts = await countRelationLinks(executor, runtime, parentTable, relationName, parentIds, whereFilter);
         for (const parent of parentRows) {
             const parentKey = rowPkKey(parent, parentTable);
-            const bucket = parent["_count"] ??
-                {};
+            const bucket = parent._count ?? {};
             bucket[relationName] = counts.get(parentKey) ?? 0;
-            parent["_count"] = bucket;
+            parent._count = bucket;
         }
     }));
 }
@@ -92,14 +102,14 @@ async function countRelationLinks(executor, runtime, parentTable, relationName,
         return countM2MLinks(executor, runtime, parentTable, m2m, parentIds, whereFilter);
     }
     const relation = findRelation(parentTable, relationName);
-    if (!relation || relation.cardinality !== "many") {
+    if (relation?.cardinality !== "many") {
         return new Map();
     }
     const targetTable = manifest.tables[relation.targetAccessor];
     if (!targetTable)
         return new Map();
-    const fkCol = quoteIdentifier(relation.fkSqlColumn);
-    const placeholders = parentIds.map((_, i) => `$${i + 1}`).join(", ");
+    const fkCol = dialect.quoteIdentifier(relation.fkSqlColumn);
+    const placeholders = joinPlaceholders(dialect, parentIds.length);
     let extraWhere = "";
     let extraParams = [];
     if (whereFilter) {
@@ -110,7 +120,7 @@ async function countRelationLinks(executor, runtime, parentTable, relationName,
             extraParams = compiled.params;
         }
     }
-    const sql = `SELECT ${fkCol} AS parent_id, ${dialect.castToInt("COUNT(*)")} AS count FROM ${tableRef(targetTable)} WHERE ${fkCol} IN (${placeholders})${extraWhere} GROUP BY ${fkCol}`;
+    const sql = `SELECT ${fkCol} AS parent_id, ${dialect.castToInt("COUNT(*)")} AS count FROM ${dialect.tableRef(targetTable)} WHERE ${fkCol} IN (${placeholders})${extraWhere} GROUP BY ${fkCol}`;
     const rows = await runQuery(executor, runtime, { operation: "select", tableAccessor: targetTable.accessor }, sql, [...parentIds, ...extraParams]);
     return new Map(rows.map((row) => [String(row.parent_id), row.count]));
 }
@@ -125,27 +135,27 @@ async function countM2MLinks(executor, runtime, parentTable, m2m, parentIds, whe
         return new Map();
     const parentFkCol = isLeft ? m2m.leftFkColumn : m2m.rightFkColumn;
     const targetFkCol = isLeft ? m2m.rightFkColumn : m2m.leftFkColumn;
-    const placeholders = parentIds.map((_, i) => `$${i + 1}`).join(", ");
+    const placeholders = joinPlaceholders(dialect, parentIds.length);
     let joinSql = "";
     let extraWhere = "";
     let extraParams = [];
     if (whereFilter) {
         const compiled = compileWhere(manifest, targetTable, whereFilter, dialect, 1, runtime.tableIndex);
-        joinSql = ` JOIN ${tableRef(targetTable)} t ON t.${quoteIdentifier(targetRelationPkSql(targetTable))} = j.${quoteIdentifier(targetFkCol)}`;
+        joinSql = ` JOIN ${dialect.tableRef(targetTable)} t ON t.${dialect.quoteIdentifier(targetRelationPkSql(targetTable))} = j.${dialect.quoteIdentifier(targetFkCol)}`;
         if (compiled.sql) {
             const adjusted = rebaseParamRefs(compiled.sql, parentIds.length);
             extraWhere = ` AND ${adjusted.replace(/^WHERE\s+/i, "")}`;
             extraParams = compiled.params;
         }
     }
-    const sql = `SELECT j.${quoteIdentifier(parentFkCol)} AS parent_id, ${dialect.castToInt("COUNT(*)")} AS count FROM ${tableRef(throughTable)} j${joinSql} WHERE j.${quoteIdentifier(parentFkCol)} IN (${placeholders})${extraWhere} GROUP BY j.${quoteIdentifier(parentFkCol)}`;
+    const sql = `SELECT j.${dialect.quoteIdentifier(parentFkCol)} AS parent_id, ${dialect.castToInt("COUNT(*)")} AS count FROM ${dialect.tableRef(throughTable)} j${joinSql} WHERE j.${dialect.quoteIdentifier(parentFkCol)} IN (${placeholders})${extraWhere} GROUP BY j.${dialect.quoteIdentifier(parentFkCol)}`;
     const rows = await runQuery(executor, runtime, { operation: "select", tableAccessor: throughTable.accessor }, sql, [...parentIds, ...extraParams]);
     return new Map(rows.map((row) => [String(row.parent_id), row.count]));
 }
-function columnsForSelect(table, withSpec, manifestIndex, tableAlias) {
+function columnsForSelect(table, withSpec, manifestIndex, tableAlias, dialect = postgresDialect) {
     const nestedSpec = isRelationSpec(withSpec) ? withSpec : undefined;
     const selectKeys = normalizeSelectColumns(nestedSpec?.select);
-    return buildSelectColumns(table, selectKeys ? [...selectKeys] : undefined, manifestIndex, nestedSpec?.includeHidden, tableAlias);
+    return buildSelectColumns(table, selectKeys ? [...selectKeys] : undefined, manifestIndex, nestedSpec?.includeHidden, tableAlias, dialect);
 }
 const BATCH_PARENT_ID = "_parent_id";
 const BATCH_ROW_NUMBER = "_neoorm_rn";
@@ -166,14 +176,14 @@ function stripBatchRelationMeta(row) {
     return targetRow;
 }
 function applyPerParentTakeSkip(args) {
-    const { selectList, fromSql, partitionBy, orderBySql, take, skip } = args;
+    const { selectList, fromSql, partitionBy, orderBySql, take, skip, dialect, } = args;
     if (take === undefined && skip === undefined) {
         return `SELECT ${selectList} ${fromSql}${orderBySql ? ` ${orderBySql}` : ""}`;
     }
     const takeN = take !== undefined ? normalizeLimitOffset(take, "take") : undefined;
     const skipN = skip !== undefined ? normalizeLimitOffset(skip, "skip") : 0;
-    const rank = quoteIdentifier(BATCH_ROW_NUMBER);
-    const ranked = quoteIdentifier(BATCH_RANKED_ALIAS);
+    const rank = dialect.quoteIdentifier(BATCH_ROW_NUMBER);
+    const ranked = dialect.quoteIdentifier(BATCH_RANKED_ALIAS);
     const overOrder = orderBySql ? ` ${orderBySql}` : "";
     const filter = takeN !== undefined
         ? `${rank} > ${skipN} AND ${rank} <= ${skipN + takeN}`
@@ -188,6 +198,7 @@ async function loadNestedRelations(executor, runtime, targetTable, childRows, ne
 async function loadOneRelation(executor, runtime, parentTable, parentRows, relationName, withSpec) {
     if (parentRows.length === 0)
         return;
+    const dialect = runtime.dialect ?? postgresDialect;
     const { manifest } = runtime;
     const m2m = findM2M(manifest, parentTable.accessor, relationName);
     if (m2m) {
@@ -206,45 +217,80 @@ async function loadOneRelation(executor, runtime, parentTable, parentRows, relat
     const nestedSpec = isRelationSpec(withSpec) ? withSpec : undefined;
     if (relation.cardinality === "one" &&
         tableOwnsFkColumn(parentTable, relation)) {
-        const fkValues = parentRows
-            .map((r) => r[relation.fkColumn])
-            .filter((v) => v != null);
-        if (fkValues.length === 0)
+        const pairs = relationFkPairs(relation);
+        const parentWithFk = parentRows.filter((row) => pairs.every((pair) => row[pair.fkColumn] != null));
+        if (parentWithFk.length === 0)
             return;
-        const placeholders = fkValues.map((_, i) => `$${i + 1}`).join(", ");
-        const targetPkCol = quoteIdentifier(targetRelationPkSql(targetTable, relation));
-        const selectCols = columnsForSelect(targetTable, withSpec, runtime.tableIndex);
-        const [targetPkTsName] = primaryKeyTsNames(targetTable);
-        if (!targetPkTsName) {
-            compileError(`No primary key defined for table "${targetTable.accessor}"`);
-        }
-        const { extraWhere, extraParams } = compileBatchedRelationWhere(runtime, targetTable, nestedSpec?.where, fkValues.length);
-        const rows = await runQuery(executor, runtime, { operation: "select", tableAccessor: targetTable.accessor }, `SELECT ${selectCols} FROM ${tableRef(targetTable)} WHERE ${targetPkCol} IN (${placeholders})${extraWhere}`, [...fkValues, ...extraParams]);
+        const selectCols = columnsForSelect(targetTable, withSpec, runtime.tableIndex, undefined, dialect);
         const targetTableIndex = getTableIndex(runtime.tableIndex, targetTable.accessor);
+        if (pairs.length === 1) {
+            const fkValues = parentWithFk.map((r) => r[relation.fkColumn]);
+            const placeholders = joinPlaceholders(dialect, fkValues.length);
+            const targetPkCol = dialect.quoteIdentifier(targetRelationPkSql(targetTable, relation));
+            const [targetPkTsName] = primaryKeyTsNames(targetTable);
+            if (!targetPkTsName) {
+                compileError(`No primary key defined for table "${targetTable.accessor}"`);
+            }
+            const { extraWhere, extraParams } = compileBatchedRelationWhere(runtime, targetTable, nestedSpec?.where, fkValues.length);
+            const rows = await runQuery(executor, runtime, { operation: "select", tableAccessor: targetTable.accessor }, `SELECT ${selectCols} FROM ${dialect.tableRef(targetTable)} WHERE ${targetPkCol} IN (${placeholders})${extraWhere}`, [...fkValues, ...extraParams]);
+            const mapped = mapRowsToTs(targetTableIndex, targetTable, rows);
+            const byId = new Map(mapped.map((r) => [String(r[targetPkTsName]), r]));
+            for (const parent of parentRows) {
+                const fkVal = parent[relation.fkColumn];
+                parent[relationName] =
+                    fkVal != null ? (byId.get(fkVal) ?? null) : null;
+            }
+            return;
+        }
+        const params = [];
+        const orSql = parentWithFk
+            .map((parent) => {
+            const andSql = pairs.map((pair) => {
+                params.push(parent[pair.fkColumn]);
+                return `${dialect.quoteIdentifier(pair.targetColumn)} = ${dialect.placeholder(params.length)}`;
+            });
+            return `(${andSql.join(" AND ")})`;
+        })
+            .join(" OR ");
+        const { extraWhere, extraParams } = compileBatchedRelationWhere(runtime, targetTable, nestedSpec?.where, params.length);
+        const rows = await runQuery(executor, runtime, { operation: "select", tableAccessor: targetTable.accessor }, `SELECT ${selectCols} FROM ${dialect.tableRef(targetTable)} WHERE (${orSql})${extraWhere}`, [...params, ...extraParams]);
         const mapped = mapRowsToTs(targetTableIndex, targetTable, rows);
-        const byId = new Map(mapped.map((r) => [String(r[targetPkTsName]), r]));
+        const byKey = new Map(mapped.map((row) => [
+            pairs
+                .map((pair) => {
+                const ts = targetTable.columns.find((col) => col.sqlName === pair.targetColumn ||
+                    col.tsName === pair.targetColumn)?.tsName ?? pair.targetColumn;
+                return String(row[ts] ?? "");
+            })
+                .join("\0"),
+            row,
+        ]));
         for (const parent of parentRows) {
-            const fkVal = parent[relation.fkColumn];
-            parent[relationName] =
-                fkVal != null ? (byId.get(fkVal) ?? null) : null;
+            const key = pairs
+                .map((pair) => String(parent[pair.fkColumn] ?? ""))
+                .join("\0");
+            parent[relationName] = pairs.every((pair) => parent[pair.fkColumn] != null)
+                ? (byKey.get(key) ?? null)
+                : null;
         }
     }
     else {
-        const fkCol = quoteIdentifier(relation.fkSqlColumn);
-        const placeholders = parentIds.map((_, i) => `$${i + 1}`).join(", ");
-        const selectCols = columnsForSelect(targetTable, withSpec, runtime.tableIndex);
-        const parentIdSelect = `${fkCol} AS ${quoteIdentifier(BATCH_PARENT_ID)}`;
+        const fkCol = dialect.quoteIdentifier(relation.fkSqlColumn);
+        const placeholders = joinPlaceholders(dialect, parentIds.length);
+        const selectCols = columnsForSelect(targetTable, withSpec, runtime.tableIndex, undefined, dialect);
+        const parentIdSelect = `${fkCol} AS ${dialect.quoteIdentifier(BATCH_PARENT_ID)}`;
         const { extraWhere, extraParams } = compileBatchedRelationWhere(runtime, targetTable, nestedSpec?.where, parentIds.length);
         const orderBySql = nestedSpec?.orderBy
-            ? compileOrderBy(targetTable, nestedSpec.orderBy, undefined, runtime.tableIndex)
+            ? compileOrderBy(targetTable, nestedSpec.orderBy, undefined, runtime.tableIndex, dialect)
             : "";
         const sql = applyPerParentTakeSkip({
             selectList: `${selectCols}, ${parentIdSelect}`,
-            fromSql: `FROM ${tableRef(targetTable)} WHERE ${fkCol} IN (${placeholders})${extraWhere}`,
+            fromSql: `FROM ${dialect.tableRef(targetTable)} WHERE ${fkCol} IN (${placeholders})${extraWhere}`,
             partitionBy: fkCol,
             orderBySql,
             take: nestedSpec?.take,
             skip: nestedSpec?.skip,
+            dialect,
         });
         const rows = await runQuery(executor, runtime, { operation: "select", tableAccessor: targetTable.accessor }, sql, [...parentIds, ...extraParams]);
         const targetTableIndex = getTableIndex(runtime.tableIndex, targetTable.accessor);
@@ -283,6 +329,7 @@ async function loadOneRelation(executor, runtime, parentTable, parentRows, relat
     }
 }
 async function loadM2MRelation(executor, runtime, parentTable, parentRows, m2m, relationName, withSpec) {
+    const dialect = runtime.dialect ?? postgresDialect;
     const { manifest } = runtime;
     const isLeft = m2m.leftAccessor === parentTable.accessor;
     const targetAccessor = isLeft ? m2m.rightAccessor : m2m.leftAccessor;
@@ -297,23 +344,24 @@ async function loadM2MRelation(executor, runtime, parentTable, parentRows, m2m,
         .filter(Boolean);
     if (parentIds.length === 0)
         return;
-    const placeholders = parentIds.map((_, i) => `$${i + 1}`).join(", ");
+    const placeholders = joinPlaceholders(dialect, parentIds.length);
     const nestedSpec = isRelationSpec(withSpec) ? withSpec : undefined;
-    const selectCols = columnsForSelect(targetTable, withSpec, runtime.tableIndex, "t");
-    const targetPkCol = quoteIdentifier(targetRelationPkSql(targetTable));
-    const parentFkSql = quoteIdentifier(parentFkCol);
-    const targetFkSql = quoteIdentifier(targetFkCol);
+    const selectCols = columnsForSelect(targetTable, withSpec, runtime.tableIndex, "t", dialect);
+    const targetPkCol = dialect.quoteIdentifier(targetRelationPkSql(targetTable));
+    const parentFkSql = dialect.quoteIdentifier(parentFkCol);
+    const targetFkSql = dialect.quoteIdentifier(targetFkCol);
     const { extraWhere, extraParams } = compileBatchedRelationWhere(runtime, targetTable, nestedSpec?.where, parentIds.length, "t");
     const orderBySql = nestedSpec?.orderBy
-        ? compileOrderBy(targetTable, nestedSpec.orderBy, "t", runtime.tableIndex)
+        ? compileOrderBy(targetTable, nestedSpec.orderBy, "t", runtime.tableIndex, dialect)
         : "";
     const sql = applyPerParentTakeSkip({
-        selectList: `${selectCols}, j.${parentFkSql} AS ${quoteIdentifier(BATCH_PARENT_ID)}`,
-        fromSql: `FROM ${tableRef(throughTable)} j JOIN ${tableRef(targetTable)} t ON t.${targetPkCol} = j.${targetFkSql} WHERE j.${parentFkSql} IN (${placeholders})${extraWhere}`,
+        selectList: `${selectCols}, j.${parentFkSql} AS ${dialect.quoteIdentifier(BATCH_PARENT_ID)}`,
+        fromSql: `FROM ${dialect.tableRef(throughTable)} j JOIN ${dialect.tableRef(targetTable)} t ON t.${targetPkCol} = j.${targetFkSql} WHERE j.${parentFkSql} IN (${placeholders})${extraWhere}`,
         partitionBy: `j.${parentFkSql}`,
         orderBySql,
         take: nestedSpec?.take,
         skip: nestedSpec?.skip,
+        dialect,
     });
     const rows = await runQuery(executor, runtime, { operation: "select", tableAccessor: targetTable.accessor }, sql, [...parentIds, ...extraParams]);
     const targetTableIndex = getTableIndex(runtime.tableIndex, targetTable.accessor);
@@ -367,9 +415,9 @@ async function executeFindManyWithRelations(executor, runtime, tableAccessor, ta
     }
     const extraSelect = buildPlanExtraSelectCols(manifest, table, plan, dialect, runtime.tableIndex, params.length + 1);
     const extraSelectCols = extraSelect.cols;
-    const countOrderSql = compileCountOrderBy(manifest, table, args.orderBy, plan, runtime.tableIndex);
+    const countOrderSql = compileCountOrderBy(manifest, table, args.orderBy, plan, runtime.tableIndex, dialect);
     const orderSqlForWith = countOrderSql ||
-        getCachedOrderByClause(table, args.orderBy, needsQualifiedRefs ? table.sqlName : undefined, runtime.tableIndex);
+        getCachedOrderByClause(table, args.orderBy, needsQualifiedRefs ? table.sqlName : undefined, runtime.tableIndex, dialect);
     const joinClauses = plan.countAggregate && plan.countAggregate.joins.length > 0
         ? plan.countAggregate.joins
         : plan.hasManyAggregate && plan.hasManyAggregate.joins.length > 0
@@ -379,14 +427,13 @@ async function executeFindManyWithRelations(executor, runtime, tableAccessor, ta
                 : undefined;
     const groupBySql = buildCountAggregateGroupBy(plan);
     const distinctOn = normalizeSelectColumns(args.distinct);
-    if (distinctOn && distinctOn.length > 0 && dialect.name === "sqlite") {
-        compileError("distinct is not supported on SQLite (DISTINCT ON is PostgreSQL-only). Use groupBy or orderBy + a manual query instead.");
-    }
+    validateDistinctOrderBy(distinctOn, args.orderBy);
+    assertDistinctOnSupported(distinctOn, dialect);
     const withSignature = withShapeSignature(args.with);
     const planMode = planOptions?.useHasManyAggregate === false ? "corr" : "agg";
     const projSig = projectionSignature(projection.sqlColumns, projection.includeHidden);
     const signature = `${whereSql}|${orderSqlForWith}|${args.take ?? ""}|${args.skip ?? ""}|${distinctOn?.join(",") ?? ""}|${withSignature}|${planMode}|${groupBySql}|${projSig}`;
-    const query = getCachedFindManyQuery(tableIndex, signature, () => buildFindManyQuery(table, whereSql, orderSqlForWith, args.take, args.skip, distinctOn, extraSelectCols.length > 0 ? extraSelectCols : undefined, joinClauses, runtime.tableIndex, groupBySql || undefined, projection.sqlColumns, projection.includeHidden));
+    const query = getCachedFindManyQuery(tableIndex, signature, () => buildFindManyQuery(table, whereSql, orderSqlForWith, args.take, args.skip, distinctOn, extraSelectCols.length > 0 ? extraSelectCols : undefined, joinClauses, runtime.tableIndex, groupBySql || undefined, projection.sqlColumns, projection.includeHidden, dialect));
     const rows = await runQuery(executor, runtime, { operation: "select", tableAccessor }, query, [...params, ...extraSelect.params]);
     const hydrated = await hydrateAndLoadRelations(executor, runtime, table, rows, args.with, plan);
     return projectFindRows(hydrated, projection, args.with);
@@ -422,25 +469,23 @@ export async function findMany(executor, runtime, tableAccessor, args) {
     }
     const distinctOn = normalizeSelectColumns(args?.distinct);
     validateDistinctOrderBy(distinctOn, args?.orderBy);
-    if (distinctOn && distinctOn.length > 0 && dialect.name === "sqlite") {
-        compileError("distinct is not supported on SQLite (DISTINCT ON is PostgreSQL-only). Use groupBy or orderBy + a manual query instead.");
-    }
+    assertDistinctOnSupported(distinctOn, dialect);
     const compiledWhere = getCachedWhereClause(manifest, table, args?.where, dialect, 1, runtime.tableIndex);
     if (compiledWhere.impossible || isImpossibleWhere(compiledWhere.sql)) {
         return [];
     }
-    const whereSql = compiledWhere.sql;
+    const whereSql = appendUniquePredicate(compiledWhere.sql, args?.andSql);
     const params = compiledWhere.params;
     const hasWith = Boolean(args?.with && Object.keys(args.with).length > 0);
     if (!hasWith) {
-        const orderSql = getCachedOrderByClause(table, args?.orderBy, undefined, runtime.tableIndex);
+        const orderSql = getCachedOrderByClause(table, args?.orderBy, undefined, runtime.tableIndex, dialect);
         const projSig = projectionSignature(projection.sqlColumns, projection.includeHidden);
         const signature = `${whereSql}|${orderSql}|${args?.take ?? ""}|${args?.skip ?? ""}|${distinctOn?.join(",") ?? ""}|${projSig}`;
-        const query = getCachedFindManyQuery(tableIndex, signature, () => buildFindManyQuery(table, whereSql, orderSql, args?.take, args?.skip, distinctOn, undefined, undefined, runtime.tableIndex, undefined, projection.sqlColumns, projection.includeHidden));
+        const query = getCachedFindManyQuery(tableIndex, signature, () => buildFindManyQuery(table, whereSql, orderSql, args?.take, args?.skip, distinctOn, undefined, undefined, runtime.tableIndex, undefined, projection.sqlColumns, projection.includeHidden, dialect));
         const rows = await runQuery(executor, runtime, { operation: "select", tableAccessor }, query, params);
         return projectFindRows(mapRowsToTs(tableIndex, table, rows), projection);
     }
-    return executeFindManyWithRelations(executor, runtime, tableAccessor, table, tableIndex, { ...(args ?? {}), with: args.with }, whereSql, params, { useHasManyAggregate: true }, projection);
+    return executeFindManyWithRelations(executor, runtime, tableAccessor, table, tableIndex, { ...(args ?? {}), with: args?.with ?? {} }, whereSql, params, { useHasManyAggregate: true }, projection);
 }
 export async function findFirst(executor, runtime, tableAccessor, args) {
     const dialect = runtime.dialect ?? postgresDialect;
@@ -454,20 +499,22 @@ export async function findFirst(executor, runtime, tableAccessor, args) {
         if (compiledWhere.impossible || isImpossibleWhere(compiledWhere.sql)) {
             return null;
         }
-        const { sql: whereSql, params } = compiledWhere;
+        const { params } = compiledWhere;
+        const whereSql = appendUniquePredicate(compiledWhere.sql, args?.andSql);
         const distinctOn = normalizeSelectColumns(args?.distinct);
         validateDistinctOrderBy(distinctOn, args?.orderBy);
-        if (distinctOn && distinctOn.length > 0 && dialect.name === "sqlite") {
-            compileError("distinct is not supported on SQLite (DISTINCT ON is PostgreSQL-only). Use groupBy or orderBy + a manual query instead.");
-        }
-        const orderSql = getCachedOrderByClause(table, args?.orderBy, undefined, runtime.tableIndex);
+        assertDistinctOnSupported(distinctOn, dialect);
+        const orderSql = getCachedOrderByClause(table, args?.orderBy, undefined, runtime.tableIndex, dialect);
         const projSig = projectionSignature(projection.sqlColumns, projection.includeHidden);
         const signature = `${whereSql}|${orderSql}|1|${args?.skip ?? ""}|${distinctOn?.join(",") ?? ""}|${projSig}`;
-        const query = getCachedFindManyQuery(tableIndex, signature, () => buildFindManyQuery(table, whereSql, orderSql, 1, args?.skip, distinctOn, undefined, undefined, runtime.tableIndex, undefined, projection.sqlColumns, projection.includeHidden));
+        const query = getCachedFindManyQuery(tableIndex, signature, () => buildFindManyQuery(table, whereSql, orderSql, 1, args?.skip, distinctOn, undefined, undefined, runtime.tableIndex, undefined, projection.sqlColumns, projection.includeHidden, dialect));
         const rows = await runQuery(executor, runtime, { operation: "select", tableAccessor }, query, params);
         if (rows.length === 0)
             return null;
-        return projectFindRow(mapRowToTs(tableIndex, table, rows[0]), projection);
+        const row = rows[0];
+        if (row === undefined)
+            return null;
+        return projectFindRow(mapRowToTs(tableIndex, table, row), projection);
     }
     const compiledWhere = getCachedWhereClause(manifest, table, args?.where, dialect, 1, runtime.tableIndex);
     if (compiledWhere.impossible || isImpossibleWhere(compiledWhere.sql)) {
@@ -475,7 +522,8 @@ export async function findFirst(executor, runtime, tableAccessor, args) {
     }
     const distinctOn = normalizeSelectColumns(args?.distinct);
     validateDistinctOrderBy(distinctOn, args?.orderBy);
-    const rows = await executeFindManyWithRelations(executor, runtime, tableAccessor, table, tableIndex, { ...args, with: args.with, take: 1 }, compiledWhere.sql, compiledWhere.params, { useHasManyAggregate: false }, projection);
+    assertDistinctOnSupported(distinctOn, dialect);
+    const rows = await executeFindManyWithRelations(executor, runtime, tableAccessor, table, tableIndex, { ...args, with: args?.with ?? {}, take: 1 }, appendUniquePredicate(compiledWhere.sql, args?.andSql), compiledWhere.params, { useHasManyAggregate: false }, projection);
     return rows[0] ?? null;
 }
 function extractScalarPkValue(table, id) {