effect-qb 0.17.0 → 0.20.0

package/src/sqlite/internal/dsl.ts

@@ -1,4 +1,4 @@
-import { pipeArguments } from "effect/Pipeable"
+import { pipeArguments, type Pipeable } from "effect/Pipeable"
 import * as Schema from "effect/Schema"
 
 import { sqliteDatatypes } from "../datatypes/index.js"
@@ -6,6 +6,12 @@ import { sqliteDatatypes } from "../datatypes/index.js"
 import * as Expression from "../../internal/scalar.js"
 import * as Plan from "../../internal/row-set.js"
 import * as Table from "../../internal/table.js"
+import type {
+  LiteralStringInput,
+  NonEmptyStringInput,
+  SafeSqlIdentifierInput,
+  SafeSqlIdentifierPathInput
+} from "../../internal/table-options.js"
 import type { CastTargetError, OperandCompatibilityError } from "../../internal/coercion/errors.js"
 import type { RuntimeOfDbType } from "../../internal/coercion/analysis.js"
 import type { CanCastDbType, CanCompareDbTypes, CanContainDbTypes, CanTextuallyCoerceDbType } from "../../internal/coercion/rules.js"
@@ -71,6 +77,7 @@ import {
   type ScopedNamesOfPlan,
   type SelectionOfPlan,
   type SelectionShape,
+  type SelectionProjectionAliasCollisionConstraint,
   type SetCompatiblePlan,
   type SetCompatibleRightPlan,
   type SchemaTableLike,
@@ -80,10 +87,8 @@ import {
   type TableDialectOf,
   type StatementOfPlan,
   type MutationInputOf,
-  type MutationTargetLike,
   type MutationTargetOfPlan,
   type MergeCapabilities,
-  type MutationTargetInput,
   type MutationValuesInput,
   type SourceDialectOf,
   type SourceLike,
@@ -100,7 +105,6 @@ import {
   type TableLike,
   type UpdateInputOfTarget,
   type MutationTargetNamesOf,
-  type MutationTargetTuple,
   type TupleDependencies,
   type TupleDialect,
   type ResultRow
@@ -138,6 +142,10 @@ import * as ProjectionAlias from "../../internal/projection-alias.js"
 import * as QueryAst from "../../internal/query-ast.js"
 import { normalizeColumnList } from "../../internal/table-options.js"
 
+type MutationTargetLike = Table.AnyTable<Dialect | "standard">
+type MutationTargetTuple = readonly [MutationTargetLike, MutationTargetLike, ...MutationTargetLike[]]
+type MutationTargetInput = MutationTargetLike | MutationTargetTuple
+
 /**
  * Dialect-specific DB type profile used to specialize the shared query
  * operator surface.
@@ -710,7 +718,7 @@ type NumericExpressionDialectInput<
   BoolDb extends Expression.DbType.Any,
   TimestampDb extends Expression.DbType.Any,
   NullDb extends Expression.DbType.Any
-> = Exclude<DialectOfDialectNumericInput<Value, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>, Dialect> extends never
+> = Exclude<DialectOfDialectNumericInput<Value, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>, Dialect | "standard"> extends never
   ? unknown
   : {
       readonly __effect_qb_error__: "effect-qb: numeric expressions cannot mix dialects"
@@ -803,6 +811,35 @@ type DialectExpressionArray<
   ? Tuple
   : never
 
+type ExtractFunctionFieldInput<
+  Value extends ExpressionInput
+> = Value extends string
+  ? SafeSqlIdentifierInput<Value>
+  : Value extends { readonly [ExpressionAst.TypeId]: ExpressionAst.LiteralNode<infer Field extends string> }
+    ? SafeSqlIdentifierInput<Field> extends never ? never : Value
+  : never
+
+type GenericFunctionNameInput<Name extends string> =
+  Name extends "current_date" | "extract" ? never : SafeSqlIdentifierPathInput<Name>
+
+type FunctionCallApi = {
+  (name: "current_date"): Expression.Any
+  <Field extends string, Source extends ExpressionInput>(
+    name: "extract",
+    field: SafeSqlIdentifierInput<Field>,
+    source: Source
+  ): Expression.Any
+  <Field extends Expression.Any, Source extends ExpressionInput>(
+    name: "extract",
+    field: Field & ExtractFunctionFieldInput<Field>,
+    source: Source
+  ): Expression.Any
+  <Name extends string, Args extends readonly ExpressionInput[]>(
+    name: GenericFunctionNameInput<Name>,
+    ...args: Args
+  ): Expression.Any
+}
+
 /** Normalized expression tuple for generic string operator inputs. */
 type DialectStringExpressionTuple<
   Values extends readonly ExpressionInput[],
@@ -1069,6 +1106,9 @@ type JsonPathInput = JsonPath.Path<any> | JsonPath.CanonicalSegment
 
 type JsonQueryInput = JsonPath.Path<any> | StringExpressionInput
 
+type JsonQueryValue<Query extends JsonQueryInput> =
+  Query extends string ? LiteralStringInput<Query> : Query
+
 type JsonPathOutputOf<
   Root,
   Target extends JsonPathInput,
@@ -1543,18 +1583,21 @@ const profile: QueryDialectProfile<Dialect, TextDb, NumericDb, BoolDb, Timestamp
   type: sqliteDatatypes
 }
   const ValuesInputProto = {
-    pipe(this: unknown) {
+    pipe(this: Pipeable) {
       return pipeArguments(this, arguments)
     }
   }
 
   const literalSchemaOf = <Value extends LiteralValue>(
     value: Value
-  ): Schema.Schema.Any | undefined => {
+  ): Schema.Top | undefined => {
     if (value === null || value instanceof Date) {
       return undefined
     }
-    return Schema.Literal(value) as unknown as Schema.Schema.Any
+    if (typeof value === "number" && !Number.isFinite(value)) {
+      return undefined
+    }
+    return Schema.Literal(value) as unknown as Schema.Top
   }
 
   const literal = <const Value extends LiteralValue>(
@@ -1641,7 +1684,7 @@ const profile: QueryDialectProfile<Dialect, TextDb, NumericDb, BoolDb, Timestamp
     value: Expression.Any,
     target: Expression.Any
   ): Expression.Any => {
-    const ast = (value as unknown as { readonly [ExpressionAst.TypeId]: ExpressionAst.Any })[ExpressionAst.TypeId]
+    const ast = (value as Expression.Any & { readonly [ExpressionAst.TypeId]: ExpressionAst.Any })[ExpressionAst.TypeId]
     if (ast.kind !== "literal") {
       return value
     }
@@ -1662,8 +1705,8 @@ const profile: QueryDialectProfile<Dialect, TextDb, NumericDb, BoolDb, Timestamp
     left: Expression.Any,
     right: Expression.Any
   ): readonly [Expression.Any, Expression.Any] => {
-    const leftAst = (left as unknown as { readonly [ExpressionAst.TypeId]: ExpressionAst.Any })[ExpressionAst.TypeId]
-    const rightAst = (right as unknown as { readonly [ExpressionAst.TypeId]: ExpressionAst.Any })[ExpressionAst.TypeId]
+    const leftAst = (left as Expression.Any & { readonly [ExpressionAst.TypeId]: ExpressionAst.Any })[ExpressionAst.TypeId]
+    const rightAst = (right as Expression.Any & { readonly [ExpressionAst.TypeId]: ExpressionAst.Any })[ExpressionAst.TypeId]
     if (leftAst.kind === "literal" && rightAst.kind !== "literal") {
       return [retargetLiteralExpression(left, right), right]
     }
@@ -1696,7 +1739,7 @@ const profile: QueryDialectProfile<Dialect, TextDb, NumericDb, BoolDb, Timestamp
   ): readonly Expression.Any[] => {
     const flattened: Array<Expression.Any> = []
     for (const value of values) {
-      const ast = (value as unknown as { readonly [ExpressionAst.TypeId]: ExpressionAst.Any })[ExpressionAst.TypeId]
+      const ast = (value as Expression.Any & { readonly [ExpressionAst.TypeId]: ExpressionAst.Any })[ExpressionAst.TypeId]
       if (ast.kind === kind) {
         flattened.push(...ast.values)
       } else {
@@ -1742,7 +1785,33 @@ const profile: QueryDialectProfile<Dialect, TextDb, NumericDb, BoolDb, Timestamp
         if (operations.every((operation) => typeof operation === "function")) {
           return pipeArguments(this, arguments)
         }
-        throw new TypeError(`Cannot mix query expressions and pipe functions inside ${kind}(...).pipe(...)`)
+        const valuesForMixedPipe = (value: unknown): readonly Expression.Any[] => {
+          if (typeof value !== "object" || value === null || !(Expression.TypeId in value)) {
+            return []
+          }
+          const expression = value as Expression.Any & {
+            readonly [ExpressionAst.TypeId]: ExpressionAst.Any
+          }
+          const ast = expression[ExpressionAst.TypeId]
+          if (ast.kind === kind) {
+            return (ast as {
+              readonly values: readonly Expression.Any[]
+            }).values
+          }
+          return [expression]
+        }
+        let current: unknown = this
+        for (const operation of operations) {
+          if (typeof operation === "function") {
+            current = (operation as (value: unknown) => unknown)(current)
+            continue
+          }
+          current = makeVariadicBooleanExpression(
+            kind,
+            [...valuesForMixedPipe(current), toDialectExpression(operation as ExpressionInput)] as const
+          )
+        }
+        return current
       }
     })
 
@@ -1763,9 +1832,6 @@ const profile: QueryDialectProfile<Dialect, TextDb, NumericDb, BoolDb, Timestamp
     const partitionBy = [...(spec?.partitionBy ?? [])] as unknown as PartitionBy
     const orderBy = (spec?.orderBy ?? []).map((term) => {
       const direction = term.direction ?? "asc"
-      if (direction !== "asc" && direction !== "desc") {
-        throw new Error("window order direction must be asc or desc")
-      }
       return {
         value: term.value,
         direction
@@ -1906,7 +1972,8 @@ type BinaryPredicateExpression<
   >(
     ...args: ComparableArgs<Left, Right, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb, "eq">
   ): BinaryPredicateExpression<Left, Right, "eq"> => {
-    const [left, right] = args as unknown as [Left, Right]
+    const left = args[0] as Left
+    const right = args[1] as Right
     return buildBinaryPredicate(left as ExpressionInput, right as ExpressionInput, "eq")
   }
 
@@ -1916,7 +1983,8 @@ type BinaryPredicateExpression<
   >(
     ...args: ComparableArgs<Left, Right, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb, "neq">
   ): BinaryPredicateExpression<Left, Right, "neq"> => {
-    const [left, right] = args as unknown as [Left, Right]
+    const left = args[0] as Left
+    const right = args[1] as Right
     return buildBinaryPredicate(left as ExpressionInput, right as ExpressionInput, "neq")
   }
 
@@ -1926,7 +1994,8 @@ type BinaryPredicateExpression<
   >(
     ...args: ComparableArgs<Left, Right, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb, "lt">
   ): BinaryPredicateExpression<Left, Right, "lt"> => {
-    const [left, right] = args as unknown as [Left, Right]
+    const left = args[0] as Left
+    const right = args[1] as Right
     return buildBinaryPredicate(left as ExpressionInput, right as ExpressionInput, "lt")
   }
 
@@ -1936,7 +2005,8 @@ type BinaryPredicateExpression<
   >(
     ...args: ComparableArgs<Left, Right, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb, "lte">
   ): BinaryPredicateExpression<Left, Right, "lte"> => {
-    const [left, right] = args as unknown as [Left, Right]
+    const left = args[0] as Left
+    const right = args[1] as Right
     return buildBinaryPredicate(left as ExpressionInput, right as ExpressionInput, "lte")
   }
 
@@ -1946,7 +2016,8 @@ type BinaryPredicateExpression<
   >(
     ...args: ComparableArgs<Left, Right, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb, "gt">
   ): BinaryPredicateExpression<Left, Right, "gt"> => {
-    const [left, right] = args as unknown as [Left, Right]
+    const left = args[0] as Left
+    const right = args[1] as Right
     return buildBinaryPredicate(left as ExpressionInput, right as ExpressionInput, "gt")
   }
 
@@ -1956,7 +2027,8 @@ type BinaryPredicateExpression<
   >(
     ...args: ComparableArgs<Left, Right, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb, "gte">
   ): BinaryPredicateExpression<Left, Right, "gte"> => {
-    const [left, right] = args as unknown as [Left, Right]
+    const left = args[0] as Left
+    const right = args[1] as Right
     return buildBinaryPredicate(left as ExpressionInput, right as ExpressionInput, "gte")
   }
 
@@ -1966,7 +2038,8 @@ type BinaryPredicateExpression<
   >(
     ...args: TextArgs<Left, Right, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb, "like">
   ): BinaryPredicateExpression<Left, Right, "like"> => {
-    const [left, right] = args as unknown as [Left, Right]
+    const left = args[0] as Left
+    const right = args[1] as Right
     return buildBinaryPredicate(left as ExpressionInput, right as ExpressionInput, "like")
   }
 
@@ -1976,7 +2049,8 @@ type BinaryPredicateExpression<
   >(
     ...args: TextArgs<Left, Right, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb, "ilike">
   ): BinaryPredicateExpression<Left, Right, "ilike"> => {
-    const [left, right] = args as unknown as [Left, Right]
+    const left = args[0] as Left
+    const right = args[1] as Right
     return buildBinaryPredicate(left as ExpressionInput, right as ExpressionInput, "ilike")
   }
 
@@ -1986,7 +2060,8 @@ type BinaryPredicateExpression<
   >(
     ...args: TextArgs<Left, Right, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb, "regexMatch">
   ): BinaryPredicateExpression<Left, Right, "regexMatch"> => {
-    const [left, right] = args as unknown as [Left, Right]
+    const left = args[0] as Left
+    const right = args[1] as Right
     return buildBinaryPredicate(left as ExpressionInput, right as ExpressionInput, "regexMatch")
   }
 
@@ -1996,7 +2071,8 @@ type BinaryPredicateExpression<
   >(
     ...args: TextArgs<Left, Right, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb, "regexIMatch">
   ): BinaryPredicateExpression<Left, Right, "regexIMatch"> => {
-    const [left, right] = args as unknown as [Left, Right]
+    const left = args[0] as Left
+    const right = args[1] as Right
     return buildBinaryPredicate(left as ExpressionInput, right as ExpressionInput, "regexIMatch")
   }
 
@@ -2006,7 +2082,8 @@ type BinaryPredicateExpression<
   >(
     ...args: TextArgs<Left, Right, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb, "regexNotMatch">
   ): BinaryPredicateExpression<Left, Right, "regexNotMatch"> => {
-    const [left, right] = args as unknown as [Left, Right]
+    const left = args[0] as Left
+    const right = args[1] as Right
     return buildBinaryPredicate(left as ExpressionInput, right as ExpressionInput, "regexNotMatch")
   }
 
@@ -2016,7 +2093,8 @@ type BinaryPredicateExpression<
   >(
     ...args: TextArgs<Left, Right, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb, "regexNotIMatch">
   ): BinaryPredicateExpression<Left, Right, "regexNotIMatch"> => {
-    const [left, right] = args as unknown as [Left, Right]
+    const left = args[0] as Left
+    const right = args[1] as Right
     return buildBinaryPredicate(left as ExpressionInput, right as ExpressionInput, "regexNotIMatch")
   }
 
@@ -2026,7 +2104,8 @@ type BinaryPredicateExpression<
   >(
     ...args: ComparableArgs<Left, Right, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb, "isDistinctFrom">
   ): BinaryPredicateExpression<Left, Right, "isDistinctFrom", "never"> => {
-    const [left, right] = args as unknown as [Left, Right]
+    const left = args[0] as Left
+    const right = args[1] as Right
     return buildBinaryPredicate(left as ExpressionInput, right as ExpressionInput, "isDistinctFrom", "never")
   }
 
@@ -2036,7 +2115,8 @@ type BinaryPredicateExpression<
   >(
     ...args: ComparableArgs<Left, Right, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb, "isNotDistinctFrom">
   ): BinaryPredicateExpression<Left, Right, "isNotDistinctFrom", "never"> => {
-    const [left, right] = args as unknown as [Left, Right]
+    const left = args[0] as Left
+    const right = args[1] as Right
     return buildBinaryPredicate(left as ExpressionInput, right as ExpressionInput, "isNotDistinctFrom", "never")
   }
 
@@ -2187,62 +2267,62 @@ type BinaryPredicateExpression<
   })
 
   const range = <Kind extends string, Subtype extends Expression.DbType.Any>(
-    kind: Kind,
+    kind: NonEmptyStringInput<Kind>,
     subtype: Subtype
   ): Expression.DbType.Range<Dialect, Subtype, Kind> => ({
     dialect: profile.dialect,
-    kind,
+    kind: kind as Kind,
     subtype
   })
 
   const multirange = <Kind extends string, Subtype extends Expression.DbType.Any>(
-    kind: Kind,
+    kind: NonEmptyStringInput<Kind>,
     subtype: Subtype
   ): Expression.DbType.Multirange<Dialect, Subtype, Kind> => ({
     dialect: profile.dialect,
-    kind,
+    kind: kind as Kind,
     subtype
   })
 
   const record = <Kind extends string, Fields extends Record<string, Expression.DbType.Any>>(
-    kind: Kind,
+    kind: NonEmptyStringInput<Kind>,
     fields: Fields
   ): Expression.DbType.Composite<Dialect, Fields, Kind> => ({
     dialect: profile.dialect,
-    kind,
+    kind: kind as Kind,
     fields
   })
 
   const domain = <Kind extends string, Base extends Expression.DbType.Any>(
-    kind: Kind,
+    kind: NonEmptyStringInput<Kind>,
     base: Base
   ): Expression.DbType.Domain<Dialect, Base, Kind> => ({
     dialect: profile.dialect,
-    kind,
+    kind: kind as Kind,
     base
   })
 
   const enum_ = <Kind extends string>(
-    kind: Kind
+    kind: NonEmptyStringInput<Kind>
   ): Expression.DbType.Enum<Dialect, Kind> => ({
     dialect: profile.dialect,
-    kind,
+    kind: kind as Kind,
     variant: "enum"
   })
 
   const set = <Kind extends string>(
-    kind: Kind
+    kind: NonEmptyStringInput<Kind>
   ): Expression.DbType.Set<Dialect, Kind> => ({
     dialect: profile.dialect,
-    kind,
+    kind: kind as Kind,
     variant: "set"
   })
 
   const custom = <Kind extends string>(
-    kind: Kind
+    kind: NonEmptyStringInput<Kind>
   ): Expression.DbType.Base<Dialect, Kind> => ({
     dialect: profile.dialect,
-    kind
+    kind: kind as Kind
   })
 
   const driverValueMapping = <Db extends Expression.DbType.Any>(
@@ -3050,9 +3130,12 @@ type BinaryPredicateExpression<
     }
   )
 
-  const jsonPathExists = <Base extends JsonExpressionLike<any>>(
+  const jsonPathExists = <
+    Base extends JsonExpressionLike<any>,
+    Query extends JsonQueryInput
+  >(
     base: Base,
-    query: JsonQueryInput
+    query: JsonQueryValue<Query>
   ) => {
     if (isJsonPathValue(query)) {
       return buildJsonNodeExpression(
@@ -3100,9 +3183,12 @@ type BinaryPredicateExpression<
     }
   )
 
-  const jsonPathMatch = <Base extends JsonExpressionLike<any>>(
+  const jsonPathMatch = <
+    Base extends JsonExpressionLike<any>,
+    Query extends JsonQueryInput
+  >(
     base: Base,
-    query: JsonQueryInput
+    query: JsonQueryValue<Query>
   ) => {
     if (isJsonPathValue(query)) {
       return buildJsonNodeExpression(
@@ -3329,7 +3415,8 @@ type BinaryPredicateExpression<
   >(
     ...args: ContainmentArgs<Left, Right, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb, "contains">
   ): BinaryPredicateExpression<Left, Right, "contains"> => {
-    const [left, right] = args as unknown as [Left, Right]
+    const left = args[0] as Left
+    const right = args[1] as Right
     return buildBinaryPredicate(left as ExpressionInput, right as ExpressionInput, "contains")
   }
 
@@ -3339,7 +3426,8 @@ type BinaryPredicateExpression<
   >(
     ...args: ContainmentArgs<Left, Right, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb, "containedBy">
   ): BinaryPredicateExpression<Left, Right, "containedBy"> => {
-    const [left, right] = args as unknown as [Left, Right]
+    const left = args[0] as Left
+    const right = args[1] as Right
     return buildBinaryPredicate(left as ExpressionInput, right as ExpressionInput, "containedBy")
   }
 
@@ -3349,7 +3437,8 @@ type BinaryPredicateExpression<
   >(
     ...args: ContainmentArgs<Left, Right, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb, "overlaps">
   ): BinaryPredicateExpression<Left, Right, "overlaps"> => {
-    const [left, right] = args as unknown as [Left, Right]
+    const left = args[0] as Left
+    const right = args[1] as Right
     return buildBinaryPredicate(left as ExpressionInput, right as ExpressionInput, "overlaps")
   }
 
@@ -3776,12 +3865,9 @@ type BinaryPredicateExpression<
     >
   }
 
-  const call = <
-    Name extends string,
-    Args extends readonly ExpressionInput[]
-  >(
-    name: Name,
-    ...args: Args
+  const call: FunctionCallApi = (
+    name: string,
+    ...args: readonly ExpressionInput[]
   ): Expression.Any => {
     const expressions = args.map((value) => toDialectExpression(value)) as readonly Expression.Any[]
     return makeExpression({
@@ -4017,9 +4103,6 @@ type BinaryPredicateExpression<
     ExpressionAst.ExcludedNode<AstOf<Value> extends ExpressionAst.ColumnNode<any, infer ColumnName extends string> ? ColumnName : string>
   > => {
     const ast = ((value as unknown) as Expression.Any & { readonly [ExpressionAst.TypeId]: ExpressionAst.Any })[ExpressionAst.TypeId]
-    if (ast.kind !== "column") {
-      throw new Error("excluded(...) only accepts bound table columns")
-    }
     return makeExpression({
       runtime: undefined as Expression.RuntimeOf<Value>,
       dbType: value[Expression.TypeId].dbType as Expression.DbTypeOf<Value>,
@@ -4032,7 +4115,7 @@ type BinaryPredicateExpression<
       dependencies: {}
     }, {
       kind: "excluded",
-      columnName: ast.columnName
+      columnName: (ast as ExpressionAst.ColumnNode<any, string>).columnName
     }) as unknown as AstBackedExpression<
       Expression.RuntimeOf<Value>,
       Expression.DbTypeOf<Value>,
@@ -4065,7 +4148,7 @@ type BinaryPredicateExpression<
     }
     if (value !== null && typeof value === "object" && Expression.TypeId in value) {
       const expression = value as unknown as Expression.Any
-      const ast = (expression as unknown as { readonly [ExpressionAst.TypeId]: ExpressionAst.Any })[ExpressionAst.TypeId]
+      const ast = (expression as Expression.Any & { readonly [ExpressionAst.TypeId]: ExpressionAst.Any })[ExpressionAst.TypeId]
       if (ast.kind === "literal") {
         const normalizedValue = normalizeMutationValue(ast.value)
         return makeExpression({
@@ -4134,8 +4217,8 @@ type BinaryPredicateExpression<
               : ">="
 
   const targetSourceDetails = (table: MutationTargetLike | SchemaTableLike) => {
-    const sourceName = (table as unknown as TableLike)[Table.TypeId].name
-    const sourceBaseName = (table as unknown as TableLike)[Table.TypeId].baseName
+    const sourceName = (table as TableLike)[Table.TypeId].name
+    const sourceBaseName = (table as TableLike)[Table.TypeId].baseName
     return {
       sourceName,
       sourceBaseName
@@ -4225,12 +4308,7 @@ type BinaryPredicateExpression<
 
   const normalizeUnnestColumns = (columns: UnnestColumnsInput): Record<string, readonly Expression.Any[]> =>
     Object.fromEntries(
-      Object.entries(columns).map(([key, values]) => {
-        if (!Array.isArray(values)) {
-          throw new Error("unnest(...) expects every value to be an array")
-        }
-        return [key, values.map((value) => toDialectExpression(value))]
-      })
+      Object.entries(columns).map(([key, values]) => [key, values.map((value) => toDialectExpression(value))])
     ) as Record<string, readonly Expression.Any[]>
 
   const normalizeMutationTargets = (
@@ -4276,13 +4354,7 @@ type BinaryPredicateExpression<
   const getMutationColumn = (
     columns: Record<string, unknown>,
     columnName: string
-  ): Expression.Any => {
-    const column = columns[columnName]
-    if (column === undefined || column === null || typeof column !== "object" || !(Expression.TypeId in column)) {
-      throw new Error("effect-qb: unknown mutation column")
-    }
-    return column as Expression.Any
-  }
+  ): Expression.Any => columns[columnName] as Expression.Any
 
   const buildMutationAssignments = <Target extends MutationTargetInput, Values>(
     target: Target,
@@ -4298,7 +4370,7 @@ type BinaryPredicateExpression<
     }
     const valueMap = values as Record<string, Record<string, unknown> | undefined>
     return targets.flatMap((table) => {
-      const targetName = (table as unknown as TableLike)[Table.TypeId].name
+      const targetName = (table as TableLike)[Table.TypeId].name
       const scopedValues = valueMap[targetName] ?? {}
       const columns = table as unknown as Record<string, Expression.Any>
       return Object.entries(scopedValues).map(([columnName, value]) => ({
@@ -4319,20 +4391,17 @@ type BinaryPredicateExpression<
   } => {
     const firstRow = rows[0]
     const firstColumns = Object.keys(firstRow)
-    if (firstColumns.length === 0) {
-      throw new Error("values(...) rows must specify at least one column; use insert(target) for default-only inserts instead")
-    }
     const columns = firstColumns as [string, ...string[]]
-    const normalizedRows = rows.map((row) => {
-      const rowKeys = Object.keys(row)
-      if (rowKeys.length !== columns.length || columns.some((column) => !(column in row))) {
-        throw new Error("All values(...) rows must project the same columns in the same shape")
-      }
+    const normalizeRow = (row: InsertRowInput<Target>) => {
       const assignments = buildMutationAssignments(target, row) as readonly QueryAst.AssignmentClause[]
       return {
         values: columns.map((columnName) => assignments.find((assignment) => assignment.columnName === columnName)!)
       } satisfies QueryAst.InsertValuesRowClause
-    }) as unknown as [QueryAst.InsertValuesRowClause, ...QueryAst.InsertValuesRowClause[]]
+    }
+    const normalizedRows: readonly [QueryAst.InsertValuesRowClause, ...QueryAst.InsertValuesRowClause[]] = [
+      normalizeRow(rows[0]),
+      ...rows.slice(1).map(normalizeRow)
+    ]
     const required = normalizedRows.flatMap((row) =>
       row.values.flatMap((entry) => Object.keys(entry.value[Expression.TypeId].dependencies))
     )
@@ -4347,9 +4416,6 @@ type BinaryPredicateExpression<
     selection: Record<string, Expression.Any>
   ): readonly [string, ...string[]] => {
     const columns = Object.keys(selection)
-    if (columns.length === 0) {
-      throw new Error("insert(...).pipe(from(subquery)) requires at least one projected column")
-    }
     return columns as [string, ...string[]]
   }
 
@@ -4364,27 +4430,11 @@ type BinaryPredicateExpression<
     }[]
   } => {
     const entries = Object.entries(values)
-    if (entries.length === 0) {
-      throw new Error("unnest(...) requires at least one column array")
-    }
     const columns = entries.map(([columnName]) => columnName) as [string, ...string[]]
-    const normalized = entries.map(([columnName, items]) => {
-      if (!Array.isArray(items)) {
-        throw new Error("unnest(...) expects every value to be an array")
-      }
-      return {
-        columnName,
-        values: items
-      }
-    })
-    const expectedLength = normalized[0]!.values.length
-    if (normalized.some((entry) => entry.values.length !== expectedLength)) {
-      throw new Error("unnest(...) expects every column array to have the same length")
-    }
-    const knownColumns = new Set(Object.keys(target[Table.TypeId].fields))
-    if (columns.some((columnName) => !knownColumns.has(columnName))) {
-      throw new Error("unnest(...) received a column that does not exist on the target table")
-    }
+    const normalized = entries.map(([columnName, items]) => ({
+      columnName,
+      values: items
+    }))
     return {
       columns,
       values: normalized
@@ -4396,10 +4446,6 @@ type BinaryPredicateExpression<
     columnsInput: string | readonly string[]
   ): readonly [string, ...string[]] => {
     const columns = normalizeColumnList(columnsInput) as readonly [string, ...string[]]
-    const knownColumns = new Set(Object.keys(target[Table.TypeId].fields))
-    if (columns.some((columnName) => !knownColumns.has(columnName))) {
-      throw new Error("effect-qb: unknown conflict target column")
-    }
     return columns
   }
 
@@ -4414,7 +4460,10 @@ type BinaryPredicateExpression<
       }
     }
     if (!Array.isArray(input) && "constraint" in input) {
-      throw new Error("Unsupported sqlite named conflict constraint")
+      return {
+        kind: "constraint",
+        name: input.constraint
+      }
     }
     const columnTarget = input as {
       readonly columns: string | readonly string[]
@@ -4475,14 +4524,91 @@ type ValidateTargetColumnInput<
   Columns extends DdlColumnInput
 > = ValidateTargetColumns<Target, NormalizeDdlColumns<Columns>> extends never ? never : Columns
 
-type CreateIndexOptions = {
-  readonly name?: string
+type SameColumnSet<
+  Left extends readonly string[],
+  Right extends readonly string[]
+> = string extends Left[number] | Right[number]
+  ? false
+  : Exclude<Left[number], Right[number]> extends never
+    ? Exclude<Right[number], Left[number]> extends never
+      ? true
+      : false
+    : false
+
+type ConflictArbitersOf<Target extends MutationTargetLike> =
+  Target[typeof Table.TypeId]["conflictArbiters"][number]
+
+type MatchingConflictArbiter<
+  Target extends MutationTargetLike,
+  Columns extends readonly string[],
+  AllowPartial extends boolean
+> = ConflictArbitersOf<Target> extends infer Arbiter extends Table.ConflictArbiter
+  ? Arbiter extends Table.ConflictArbiter
+    ? SameColumnSet<Arbiter["columns"], Columns> extends true
+      ? Arbiter["scope"] extends "unconditional"
+        ? true
+        : AllowPartial extends true ? true : never
+      : never
+    : never
+  : never
+
+type HasInlineConflictArbiter<
+  Target extends MutationTargetLike,
+  Columns extends readonly string[]
+> = Columns extends readonly [infer Column extends Extract<keyof Target[typeof Table.TypeId]["fields"], string>]
+  ? Target[typeof Table.TypeId]["fields"][Column] extends { readonly metadata: { readonly primaryKey: true } | { readonly unique: true } }
+    ? true
+    : false
+  : false
+
+type HasConflictArbiter<
+  Target extends MutationTargetLike,
+  Columns extends readonly string[],
+  AllowPartial extends boolean
+> = string extends Extract<keyof Target[typeof Table.TypeId]["fields"], string>
+  ? true
+  : HasInlineConflictArbiter<Target, Columns> extends true
+    ? true
+  : true extends MatchingConflictArbiter<Target, Columns, AllowPartial> ? true : false
+
+type ConflictTargetArbiterError<
+  Columns,
+  AllowPartial extends boolean
+> = {
+  readonly __effect_qb_error__: "effect-qb: conflict target columns must match a primary key, unique constraint, or unique index"
+  readonly __effect_qb_conflict_columns__: Columns
+  readonly __effect_qb_partial_target__: AllowPartial
+  readonly __effect_qb_hint__: "Declare the target columns as primaryKey/unique, add a table-level Unique.make(...), or use a simple Pg.Index.uniqueIndex(...)"
+}
+
+type ValidateConflictColumnInput<
+  Target extends MutationTargetLike,
+  Columns extends DdlColumnInput,
+  AllowPartial extends boolean
+> = ValidateTargetColumnInput<Target, Columns> extends never
+  ? never
+  : HasConflictArbiter<Target, NormalizeDdlColumns<Columns>, AllowPartial> extends true
+    ? Columns
+    : ConflictTargetArbiterError<NormalizeDdlColumns<Columns>, AllowPartial>
+
+type ConflictColumnPlanConstraint<
+  Target extends MutationTargetLike,
+  Columns extends DdlColumnInput,
+  AllowPartial extends boolean
+> = ValidateTargetColumnInput<Target, Columns> extends never
+  ? never
+  : HasConflictArbiter<Target, NormalizeDdlColumns<Columns>, AllowPartial> extends true
+    ? unknown
+    : ConflictTargetArbiterError<NormalizeDdlColumns<Columns>, AllowPartial>
+
+type CreateIndexOptions<Name extends string = string> = {
+  readonly name?: NonEmptyStringInput<Name>
   readonly unique?: boolean
   readonly ifNotExists?: boolean
 }
 
-type DropIndexOptions = {
-  readonly name?: string
+type DropIndexOptions<Name extends string = string> = {
+  readonly name?: NonEmptyStringInput<Name>
   readonly ifExists?: boolean
 }
 
@@ -4581,7 +4707,7 @@ type ValuesRowsDialectInput<
   BoolDb extends Expression.DbType.Any,
   TimestampDb extends Expression.DbType.Any,
   NullDb extends Expression.DbType.Any
-> = Exclude<ValuesRowsDialect<Rows, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>, Dialect> extends never
+> = Exclude<ValuesRowsDialect<Rows, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>, Dialect | "standard"> extends never
   ? unknown
   : {
       readonly __effect_qb_error__: "effect-qb: values rows cannot mix dialects"
@@ -4636,7 +4762,7 @@ type UnnestColumnsDialectInput<
   BoolDb extends Expression.DbType.Any,
   TimestampDb extends Expression.DbType.Any,
   NullDb extends Expression.DbType.Any
-> = Exclude<UnnestColumnsDialect<Columns, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>, Dialect> extends never
+> = Exclude<UnnestColumnsDialect<Columns, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>, Dialect | "standard"> extends never
   ? unknown
   : {
       readonly __effect_qb_error__: "effect-qb: unnest columns cannot mix dialects"
@@ -4971,6 +5097,26 @@ type ConflictTargetInput<
           readonly constraint?: string
         }>)
 
+type ConflictConstraintNameConstraint<Target> =
+  Target extends { readonly constraint: infer Constraint extends string }
+    ? { readonly constraint: NonEmptyStringInput<Constraint> }
+    : unknown
+
+type ConflictTargetHasPredicate<Target> =
+  Target extends { readonly where: PredicateInput } ? true : false
+
+type ConflictTargetPlanConstraint<
+  Target extends MutationTargetLike,
+  ConflictTarget
+> =
+  ConflictTarget extends { readonly constraint: string }
+    ? unknown
+    : ConflictTarget extends { readonly columns: infer Columns extends DdlColumnInput }
+      ? ConflictColumnPlanConstraint<Target, Columns, ConflictTargetHasPredicate<ConflictTarget>>
+      : ConflictTarget extends DdlColumnInput
+        ? ConflictColumnPlanConstraint<Target, ConflictTarget, false>
+        : unknown
+
 type ConflictActionInput<
   Target extends MutationTargetLike,
   Dialect extends string,
@@ -5122,7 +5268,7 @@ type MutationOrderLimitSupported<PlanValue extends QueryPlan<any, any, any, any,
 type MutationTargetTupleDialectConstraint<
   Targets extends MutationTargetTuple,
   Dialect extends string
-> = Exclude<TableDialectOf<Targets[number]>, Dialect> extends never ? unknown : never
+> = Exclude<TableDialectOf<Targets[number]>, Dialect | "standard"> extends never ? unknown : never
 
 type MutationRequiredFromValues<Values extends Record<string, unknown>> = {
   [K in keyof Values]: Values[K] extends Expression.Any ? RequiredFromDependencies<DependenciesOf<Values[K]>> : never
@@ -5176,7 +5322,7 @@ type KnownIncompatibleMutationDialectFromValues<
   BoolDb extends Expression.DbType.Any,
   TimestampDb extends Expression.DbType.Any,
   NullDb extends Expression.DbType.Any
-> = Exclude<KnownMutationDialectFromValues<Values, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>, Dialect>
+> = Exclude<KnownMutationDialectFromValues<Values, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>, Dialect | "standard">
 
 type MutationValuesDialectConstraint<
   Values,
@@ -5228,9 +5374,11 @@ type SourceDialectConstraint<
   Dialect extends string
 > = [SourceDialectOf<CurrentSource>] extends [never]
   ? unknown
-  : Extract<SourceDialectOf<CurrentSource>, Dialect> extends never
-    ? never
-    : unknown
+  : Exclude<SourceDialectOf<CurrentSource>, Dialect | "standard"> extends never
+    ? unknown
+    : Dialect extends "standard"
+      ? unknown
+      : never
 
 type SourceRequirementConstraint<
   PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>,
@@ -5494,7 +5642,7 @@ type AsCurriedResult<
   function as<
     Alias extends string
   >(
-    alias: Alias
+    alias: LiteralStringInput<Alias>
   ): <Value extends AsCurriedInput<Dialect>>(
     value: Value
   ) => AsCurriedResult<Value, Alias, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>
@@ -5503,7 +5651,7 @@ type AsCurriedResult<
     Alias extends string
   >(
     value: Value,
-    alias: Alias
+    alias: LiteralStringInput<Alias>
   ): ProjectionAliasedExpression<DialectAsExpression<Value, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>, Alias>
   function as<
     Rows extends ValuesRowsInput,
@@ -5514,7 +5662,7 @@ type AsCurriedResult<
       ValuesOutputShape<Rows, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>,
       Dialect
     >,
-    alias: Alias
+    alias: LiteralStringInput<Alias>
   ): ValuesSource<
     Rows,
     ValuesOutputShape<Rows, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>,
@@ -5526,11 +5674,11 @@ type AsCurriedResult<
     Alias extends string
   >(
     value: DerivedTableCompatiblePlan<PlanValue>,
-    alias: Alias
+    alias: LiteralStringInput<Alias>
   ): DerivedSource<PlanValue, Alias>
   function as(valueOrAlias: unknown, alias?: string): unknown {
     if (alias === undefined) {
-      return (value: unknown) => as(value as any, valueOrAlias as string)
+      return (value: unknown) => as(value as any, valueOrAlias as never)
     }
     const resolvedAlias = alias
     const value = valueOrAlias
@@ -5570,7 +5718,7 @@ type AsCurriedResult<
   function with_<
     Alias extends string
   >(
-    alias: Alias
+    alias: LiteralStringInput<Alias>
   ): <PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>>(
     value: SqliteCteCompatiblePlan<PlanValue>
   ) => import("../../internal/query.js").CteSource<PlanValue, Alias>
@@ -5579,11 +5727,11 @@ type AsCurriedResult<
     Alias extends string
   >(
     value: SqliteCteCompatiblePlan<PlanValue>,
-    alias: Alias
+    alias: LiteralStringInput<Alias>
   ): import("../../internal/query.js").CteSource<PlanValue, Alias>
   function with_(valueOrAlias: unknown, alias?: string): unknown {
     if (alias === undefined) {
-      return (value: unknown) => with_(value as any, valueOrAlias as string)
+      return (value: unknown) => with_(value as any, valueOrAlias as never)
     }
     return makeCteSource(
       valueOrAlias as CompletePlan<QueryPlan<any, any, any, any, any, any, any, any, any, any>>,
@@ -5594,7 +5742,7 @@ type AsCurriedResult<
   function withRecursive_<
     Alias extends string
   >(
-    alias: Alias
+    alias: LiteralStringInput<Alias>
   ): <PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>>(
     value: SqliteCteCompatiblePlan<PlanValue>
   ) => import("../../internal/query.js").CteSource<PlanValue, Alias>
@@ -5603,11 +5751,11 @@ type AsCurriedResult<
     Alias extends string
   >(
     value: SqliteCteCompatiblePlan<PlanValue>,
-    alias: Alias
+    alias: LiteralStringInput<Alias>
   ): import("../../internal/query.js").CteSource<PlanValue, Alias>
   function withRecursive_(valueOrAlias: unknown, alias?: string): unknown {
     if (alias === undefined) {
-      return (value: unknown) => withRecursive_(value as any, valueOrAlias as string)
+      return (value: unknown) => withRecursive_(value as any, valueOrAlias as never)
     }
     return makeCteSource(
       valueOrAlias as CompletePlan<QueryPlan<any, any, any, any, any, any, any, any, any, any>>,
@@ -5619,7 +5767,7 @@ type AsCurriedResult<
   function lateral<
     Alias extends string
   >(
-    alias: Alias
+    alias: LiteralStringInput<Alias>
   ): <PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>>(
     value: LateralSourceCompatiblePlan<PlanValue>
   ) => import("../../internal/query.js").LateralSource<PlanValue, Alias>
@@ -5628,11 +5776,11 @@ type AsCurriedResult<
     Alias extends string
   >(
     value: LateralSourceCompatiblePlan<PlanValue>,
-    alias: Alias
+    alias: LiteralStringInput<Alias>
   ): import("../../internal/query.js").LateralSource<PlanValue, Alias>
   function lateral(valueOrAlias: unknown, alias?: string): unknown {
     if (alias === undefined) {
-      return (value: unknown) => lateral(value as any, valueOrAlias as string)
+      return (value: unknown) => lateral(value as any, valueOrAlias as never)
     }
     return makeLateralSource(
       valueOrAlias as QueryPlan<any, any, any, any, any, any, any, any, any, any>,
@@ -5659,7 +5807,7 @@ type AsCurriedResult<
     columns: Columns
       & UnnestColumnsShapeInput<Columns>
       & UnnestColumnsDialectInput<Columns, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>,
-    alias: Alias
+    alias: LiteralStringInput<Alias>
   ) => UnnestSource<
     UnnestOutputShape<Columns, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>,
     Alias,
@@ -5675,7 +5823,7 @@ type AsCurriedResult<
     start: Start & NumericExpressionDialectInput<Start, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>,
     stop: Stop & NumericExpressionDialectInput<Stop, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>,
     step?: Step & (Step extends NumericExpressionInput ? NumericExpressionDialectInput<Step, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb> : unknown),
-    alias?: Alias
+    alias?: LiteralStringInput<Alias>
   ) => Dialect extends "postgres"
     ? TableFunctionSource<
         GenerateSeriesOutputShape<Start, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>,
@@ -5722,8 +5870,8 @@ type AsCurriedResult<
       ? SelectSelectionNonEmptyError<Selection>
       : unknown
 
-  export type SelectApi = <Selection extends SelectionShape>(
-    selection: Selection & SelectionRootObjectConstraint<Selection> & SelectionNestedNonEmptyConstraint<Selection> & SelectSelectionNonEmptyConstraint<Selection>
+  export type SelectApi = <const Selection extends SelectionShape>(
+    selection: Selection & SelectionRootObjectConstraint<Selection> & SelectionNestedNonEmptyConstraint<Selection> & SelectSelectionNonEmptyConstraint<Selection> & SelectionProjectionAliasCollisionConstraint<Selection>
   ) => QueryPlan<
     Selection,
     ExtractRequired<Selection>,
@@ -6188,8 +6336,8 @@ type AsCurriedResult<
         : unknown
 
   type ReturningApi = Dialect extends "postgres" | "sqlite"
-    ? <Selection extends SelectionShape>(
-        selection: Selection & SelectionRootObjectConstraint<Selection> & SelectionNestedNonEmptyConstraint<Selection> & ReturningSelectionNonEmptyConstraint<Selection>
+    ? <const Selection extends SelectionShape>(
+        selection: Selection & SelectionRootObjectConstraint<Selection> & SelectionNestedNonEmptyConstraint<Selection> & ReturningSelectionNonEmptyConstraint<Selection> & SelectionProjectionAliasCollisionConstraint<Selection>
       ) =>
         <PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>>(
           plan: PlanValue & RequireMutationStatement<PlanValue>
@@ -6258,13 +6406,13 @@ type AsCurriedResult<
     const Columns extends DdlColumnInput,
     UpdateValues extends MutationInputOf<Table.UpdateOf<Target>> | undefined = MutationInputOf<Table.UpdateOf<Target>> | undefined,
     Options extends ConflictActionInput<Target, Dialect, UpdateValues> = ConflictActionInput<Target, Dialect, UpdateValues>,
-    ConflictTarget extends ConflictTargetInput<Target, Dialect, Columns> = ConflictTargetInput<Target, Dialect, Columns>
+    const ConflictTarget extends ConflictTargetInput<Target, Dialect, Columns> = ConflictTargetInput<Target, Dialect, Columns>
   >(
-    target: ConflictTarget,
+    target: ConflictTarget & ConflictConstraintNameConstraint<ConflictTarget>,
     options?: Options & ConflictActionUpdateNonEmptyConstraint<Options>
-  ) =>
+	  ) =>
     <PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>>(
-      plan: PlanValue & RequireInsertStatement<PlanValue>
+      plan: PlanValue & RequireInsertStatement<PlanValue> & ConflictTargetPlanConstraint<MutationTargetOfPlan<PlanValue>, ConflictTarget>
     ) => QueryPlan<
       SelectionOfPlan<PlanValue>,
       Exclude<RequiredOfPlan<PlanValue> | ConflictRequired<UpdateValues, Options, ConflictTarget>, AvailableNames<AvailableOfPlan<PlanValue>>>,
@@ -6328,7 +6476,7 @@ type AsCurriedResult<
   >(
     target: Target,
     values: Values & MutationValuesDialectConstraint<Values, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>,
-    conflictColumns: ValidateTargetColumnInput<Target, Columns>,
+    conflictColumns: ValidateConflictColumnInput<Target, Columns, false>,
     updateValues?: UpdateValues & UpdateValuesNonEmptyConstraint<Exclude<UpdateValues, undefined>> & MutationValuesDialectConstraint<Exclude<UpdateValues, undefined>, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>
   ) => QueryPlan<
     {},
@@ -6422,7 +6570,7 @@ type AsCurriedResult<
     target: Target,
     source: Source & (
       SourceRequiredOf<Source> extends never ? unknown : SourceRequirementError<Source>
-    ),
+    ) & SourceDialectConstraint<Source, Dialect>,
     on: On,
     options: MergeOptions<Target, MatchedValues, InsertValues, MatchedPredicate, NotMatchedPredicate>
   ) => QueryPlan<
@@ -6636,7 +6784,7 @@ type AsCurriedResult<
     "rollback"
   >
 
-  type SavepointApi = <Name extends string>(name: Name) => QueryPlan<
+  type SavepointApi = <Name extends string>(name: NonEmptyStringInput<Name>) => QueryPlan<
     {},
     never,
     {},
@@ -6649,7 +6797,7 @@ type AsCurriedResult<
     "savepoint"
   >
 
-  type RollbackToApi = <Name extends string>(name: Name) => QueryPlan<
+  type RollbackToApi = <Name extends string>(name: NonEmptyStringInput<Name>) => QueryPlan<
     {},
     never,
     {},
@@ -6662,7 +6810,7 @@ type AsCurriedResult<
     "rollbackTo"
   >
 
-  type ReleaseSavepointApi = <Name extends string>(name: Name) => QueryPlan<
+  type ReleaseSavepointApi = <Name extends string>(name: NonEmptyStringInput<Name>) => QueryPlan<
     {},
     never,
     {},
@@ -6707,10 +6855,10 @@ type AsCurriedResult<
     "dropTable"
   >
 
-  type CreateIndexApi = <Target extends SchemaTableLike, const Columns extends DdlColumnInput>(
+  type CreateIndexApi = <Target extends SchemaTableLike, const Columns extends DdlColumnInput, Name extends string = string>(
     target: Target,
     columns: Columns & ValidateDdlColumnInput<Target, Columns>,
-    options?: CreateIndexOptions
+    options?: CreateIndexOptions<Name>
   ) => QueryPlan<
     {},
     never,
@@ -6724,10 +6872,10 @@ type AsCurriedResult<
     "createIndex"
   >
 
-  type DropIndexApi = <Target extends SchemaTableLike, const Columns extends DdlColumnInput>(
+  type DropIndexApi = <Target extends SchemaTableLike, const Columns extends DdlColumnInput, Name extends string = string>(
     target: Target,
     columns: Columns & ValidateDdlColumnInput<Target, Columns>,
-    options?: DropIndexOptions
+    options?: DropIndexOptions<Name>
   ) => QueryPlan<
     {},
     never,