effect-qb 0.12.3 → 0.13.0

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "effect-qb",
-  "version": "0.12.3",
+  "version": "0.13.0",
   "type": "module",
   "files": [
     "dist",
     "src",
+    "CHANGELOG.md",
     "README.md"
   ],
   "exports": {
@@ -18,11 +19,17 @@
     },
     "./package.json": "./package.json"
   },
+  "imports": {
+    "#postgres": "./src/postgres.ts",
+    "#mysql": "./src/mysql.ts",
+    "#internal/*": "./src/internal/*"
+  },
   "publishConfig": {
     "access": "public"
   },
   "scripts": {
     "build": "bun scripts/build-package.ts",
+    "release": "bun scripts/release.ts",
     "test": "bun test",
     "test:types": "bunx tsgo -p tsconfig.type-tests.json",
     "test:integration": "bun scripts/test-integration.ts",

package/src/internal/column-state.ts

@@ -42,6 +42,8 @@ export interface ColumnState<
   readonly primaryKey: PrimaryKey
   readonly unique: Unique
   readonly references: Ref
+  readonly defaultValue?: Expression.Any
+  readonly generatedValue?: Expression.Any
   readonly source: Source
   readonly dependencies: Dependencies
 }
@@ -93,6 +95,8 @@ export interface ColumnDefinition<
     readonly primaryKey: PrimaryKey
     readonly unique: Unique
     readonly references: Ref
+    readonly defaultValue?: Expression.Any
+    readonly generatedValue?: Expression.Any
   }
 }
 
@@ -249,6 +253,8 @@ export const makeColumnDefinition = <
     primaryKey: metadata.primaryKey,
     unique: metadata.unique,
     references: metadata.references,
+    defaultValue: metadata.defaultValue,
+    generatedValue: metadata.generatedValue,
     source: undefined as Source,
     dependencies: {} as Dependencies
   }
@@ -338,7 +344,9 @@ export const remapColumnDefinition = <
     generated: metadata.generated,
     primaryKey: metadata.primaryKey,
     unique: metadata.unique,
-    references: metadata.references
+    references: metadata.references,
+    defaultValue: metadata.defaultValue,
+    generatedValue: metadata.generatedValue
   }
   if (ExpressionAst.TypeId in column) {
     next[ExpressionAst.TypeId] = (column as unknown as {

package/src/internal/column.ts

@@ -105,6 +105,11 @@ type GeneratedColumn<Column extends AnyColumnDefinition> = ColumnDefinition<
   ReferencesOf<Column>
 >
 
+type CompatibleColumnExpression<
+  Column extends AnyColumnDefinition,
+  Value extends Expression.Any
+> = [Expression.RuntimeOf<Value>] extends [SelectType<Column>] ? Column : never
+
 type ReferencingColumn<
   Column extends AnyColumnDefinition,
   Target extends AnyBoundColumn
@@ -378,24 +383,30 @@ export const unique = <Column extends AnyColumnDefinition>(
     unique: true
   })
 
-/** Marks a column as having a server-side default and therefore optional on insert. */
-export const hasDefault = <Column extends AnyColumnDefinition>(
-  column: Column[typeof ColumnTypeId]["generated"] extends true ? never : Column
-): HasDefaultColumn<Column> =>
-  mapColumn(column, {
-    ...column.metadata,
-    hasDefault: true
-  })
+/** Marks a column as having a database default expression and therefore optional on insert. */
+export const default_ = <Value extends Expression.Any>(value: Value) =>
+  <Column extends AnyColumnDefinition>(
+    column: Column[typeof ColumnTypeId]["generated"] extends true ? never : CompatibleColumnExpression<Column, Value>
+  ): HasDefaultColumn<Column> =>
+    mapColumn(column, {
+      ...column.metadata,
+      hasDefault: true,
+      defaultValue: value,
+      generatedValue: undefined
+    })
 
-/** Marks a column as generated by the database and omitted from insert/update. */
-export const generated = <Column extends AnyColumnDefinition>(
-  column: Column[typeof ColumnTypeId]["hasDefault"] extends true ? never : Column
-): GeneratedColumn<Column> =>
-  mapColumn(column, {
-    ...column.metadata,
-    generated: true,
-    hasDefault: false
-  })
+/** Marks a column as generated by the database expression and omitted from insert/update. */
+export const generated = <Value extends Expression.Any>(value: Value) =>
+  <Column extends AnyColumnDefinition>(
+    column: Column[typeof ColumnTypeId]["hasDefault"] extends true ? never : CompatibleColumnExpression<Column, Value>
+  ): GeneratedColumn<Column> =>
+    mapColumn(column, {
+      ...column.metadata,
+      generated: true,
+      hasDefault: false,
+      defaultValue: undefined,
+      generatedValue: value
+    })
 
 /**
  * Attaches a lazy foreign-key reference to another bound column.
@@ -415,3 +426,5 @@ export const references = <Target extends AnyBoundColumn>(target: () => Target)
 export type Any = AnyColumnDefinition
 /** Convenience alias for any bound column. */
 export type AnyBound = BoundColumn<any, any, any, any, any, any, any, any, any, any, any, any>
+
+export { default_ as default }

package/src/internal/expression-ast.ts

@@ -34,6 +34,16 @@ export interface CastNode<
   readonly target: Target
 }
 
+/** General SQL function call captured by the internal expression AST. */
+export interface FunctionCallNode<
+  Name extends string = string,
+  Args extends readonly Expression.Any[] = readonly Expression.Any[]
+> {
+  readonly kind: "function"
+  readonly name: Name
+  readonly args: Args
+}
+
 /** `excluded.column` reference used inside insert conflict handlers. */
 export interface ExcludedNode<
   ColumnName extends string = string
@@ -325,6 +335,7 @@ export type Any =
   | ColumnNode
   | LiteralNode
   | CastNode
+  | FunctionCallNode
   | ExcludedNode
   | UnaryNode
   | BinaryNode

package/src/internal/expression.ts

@@ -168,6 +168,8 @@ export declare namespace DbType {
   export type PgDate = Base<"postgres", "date">
   export type PgTime = Base<"postgres", "time">
   export type PgTimestamp = Base<"postgres", "timestamp">
+  export type PgTimetz = Base<"postgres", "timetz">
+  export type PgTimestamptz = Base<"postgres", "timestamptz">
   export type PgInterval = Base<"postgres", "interval">
   export type PgBytea = Base<"postgres", "bytea">
   export type PgJsonb = Base<"postgres", "jsonb">

package/src/internal/query-factory.ts

@@ -3802,7 +3802,7 @@ export function makeDialectQuery<
     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 defaultValues(...) instead")
+      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) => {
@@ -4072,12 +4072,6 @@ type InsertPlanSelectionShapeError<
   readonly __effect_qb_hint__: "Project a flat object like select({ id: ..., email: ... }) with column-name keys"
 }
 
-type DefaultValuesError<Target extends MutationTargetLike> = Target & {
-  readonly __effect_qb_error__: "effect-qb: defaultValues(...) requires every insert column to be optional or generated"
-  readonly __effect_qb_required_columns__: RequiredKeys<Table.InsertOf<Target>>
-  readonly __effect_qb_hint__: "Use insert(...) for required columns, or mark columns nullable/hasDefault/generated"
-}
-
 type MysqlConflictTargetError<Target> = Target & {
   readonly __effect_qb_error__: "effect-qb: mysql does not support named or predicate-scoped conflict targets"
   readonly __effect_qb_hint__: "Use a column tuple target, or rely on MySQL duplicate-key resolution without target predicates"
@@ -4558,34 +4552,77 @@ type AsCurriedResult<
     return makeDerivedSource(value as CompletePlan<QueryPlan<any, any, any, any, any, any, any, any, any, any>>, resolvedAlias)
   }
 
+  function with_<
+    Alias extends string
+  >(
+    alias: Alias
+  ): <PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>>(
+    value: CompletePlan<PlanValue>
+  ) => import("./query.js").CteSource<PlanValue, Alias>
   function with_<
     PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>,
     Alias extends string
   >(
     value: CompletePlan<PlanValue>,
     alias: Alias
-  ): import("./query.js").CteSource<PlanValue, Alias> {
-    return makeCteSource(value, alias)
+  ): import("./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 makeCteSource(
+      valueOrAlias as CompletePlan<QueryPlan<any, any, any, any, any, any, any, any, any, any>>,
+      alias
+    )
   }
 
+  function withRecursive_<
+    Alias extends string
+  >(
+    alias: Alias
+  ): <PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>>(
+    value: CompletePlan<PlanValue>
+  ) => import("./query.js").CteSource<PlanValue, Alias>
   function withRecursive_<
     PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>,
     Alias extends string
   >(
     value: CompletePlan<PlanValue>,
     alias: Alias
-  ): import("./query.js").CteSource<PlanValue, Alias> {
-    return makeCteSource(value, alias, true)
+  ): import("./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 makeCteSource(
+      valueOrAlias as CompletePlan<QueryPlan<any, any, any, any, any, any, any, any, any, any>>,
+      alias,
+      true
+    )
   }
 
+  function lateral<
+    Alias extends string
+  >(
+    alias: Alias
+  ): <PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>>(
+    value: PlanValue
+  ) => import("./query.js").LateralSource<PlanValue, Alias>
   function lateral<
     PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>,
     Alias extends string
   >(
     value: PlanValue,
     alias: Alias
-  ): import("./query.js").LateralSource<PlanValue, Alias> {
-    return makeLateralSource(value, alias)
+  ): import("./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 makeLateralSource(
+      valueOrAlias as QueryPlan<any, any, any, any, any, any, any, any, any, any>,
+      alias
+    )
   }
 
   const values = <
@@ -5714,55 +5751,6 @@ type AsCurriedResult<
     }, undefined as unknown as TrueFormula, "write", "insert", target, insertState)
   }
 
-  const defaultValues = <
-    Target extends MutationTargetLike
-  >(
-    target: RequiredKeys<Table.InsertOf<Target>> extends never ? Target : DefaultValuesError<Target>
-  ): QueryPlan<
-    {},
-    never,
-    AddAvailable<{}, SourceNameOf<Target>>,
-    TableDialectOf<Target>,
-    never,
-    SourceNameOf<Target>,
-    never,
-    TrueFormula,
-    "write",
-    "insert",
-    Target,
-    "ready"
-  > => {
-    const { sourceName, sourceBaseName } = targetSourceDetails(target as Target)
-    return makePlan({
-      selection: {},
-      required: [] as never,
-      available: {
-        [sourceName]: {
-          name: sourceName,
-          mode: "required",
-          baseName: sourceBaseName
-        }
-      } as AddAvailable<{}, SourceNameOf<Target>>,
-      dialect: (target as Target)[Plan.TypeId].dialect as TableDialectOf<Target>
-    }, {
-      kind: "insert",
-      select: {},
-      into: {
-        kind: "from",
-        tableName: sourceName,
-        baseTableName: sourceBaseName,
-        source: target as Target
-      },
-      values: [],
-      conflict: undefined,
-      where: [],
-      having: [],
-      joins: [],
-      groupBy: [],
-      orderBy: []
-    }, undefined as unknown as TrueFormula, "write", "insert", target as Target, "ready")
-  }
-
   const attachInsertSource = (
     plan: QueryPlan<any, any, any, any, any, any, any, any, any, "insert", MutationTargetLike, "missing">,
     source: AnyValuesInput | AnyValuesSource | AnyUnnestSource | CompletePlan<QueryPlan<any, any, any, any, any, any, any, any, any, any>>
@@ -6711,7 +6699,6 @@ type AsCurriedResult<
     unnest,
     generateSeries,
     returning,
-    defaultValues,
     onConflict,
     insert,
     update,

package/src/internal/query.ts

@@ -1206,9 +1206,21 @@ type InsertSourceCompletenessError<
   PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>
 > = PlanValue & {
   readonly __effect_qb_error__: "effect-qb: insert plan is missing inline values or a source"
-  readonly __effect_qb_hint__: "Pass values directly to insert(...), use defaultValues(...), or pipe the insert plan into from(...)"
+  readonly __effect_qb_hint__: "Pass values directly to insert(...), or pipe the insert plan into from(...)"
 }
 
+type RequiredKeys<Shape> = Extract<{
+  [K in keyof Shape]-?: {} extends Pick<Shape, K> ? never : K
+}[keyof Shape], string>
+
+type InsertHasOptionalDefaults<
+  PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>
+> = MutationTargetOfPlan<PlanValue> extends infer Target extends MutationTargetLike
+  ? RequiredKeys<Table.InsertOf<Target>> extends never
+    ? true
+    : false
+  : false
+
 /** Narrows a query plan to aggregate-compatible selections. */
 export type AggregationCompatiblePlan<
   PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>
@@ -1221,7 +1233,9 @@ export type CompletePlan<PlanValue extends QueryPlan<any, any, any, any, any, an
   PlanValue extends QueryPlan<infer Selection, infer Required, any, any, infer Grouped, any, any, any, any, infer Statement, any, infer InsertState>
     ? Statement extends "insert"
       ? InsertState extends "missing"
-        ? InsertSourceCompletenessError<PlanValue>
+        ? InsertHasOptionalDefaults<PlanValue> extends true
+          ? PlanValue
+          : InsertSourceCompletenessError<PlanValue>
         : HasKnownOutstanding<Required> extends true
           ? SourceCompletenessError<PlanValue, Extract<Required, string>>
           : IsAggregationCompatibleSelection<Selection, Grouped> extends true ? PlanValue : AggregationCompatibilityError<PlanValue>

package/src/internal/sql-expression-renderer.ts

@@ -46,6 +46,7 @@ const renderCastType = (
 
 const renderColumnDefinition = (
   dialect: SqlDialect,
+  state: RenderState,
   columnName: string,
   column: Table.AnyTable[typeof Table.TypeId]["fields"][string]
 ): string => {
@@ -53,6 +54,11 @@ const renderColumnDefinition = (
     dialect.quoteIdentifier(columnName),
     renderDbType(dialect, column.metadata.dbType)
   ]
+  if (column.metadata.generatedValue) {
+    clauses.push(`generated always as (${renderExpression(column.metadata.generatedValue, state, dialect)}) stored`)
+  } else if (column.metadata.defaultValue) {
+    clauses.push(`default ${renderExpression(column.metadata.defaultValue, state, dialect)}`)
+  }
   if (!column.metadata.nullable) {
     clauses.push("not null")
   }
@@ -60,17 +66,11 @@ const renderColumnDefinition = (
 }
 
 const renderCheckPredicate = (
-  predicate: unknown,
+  predicate: Expression.Any,
   state: RenderState,
   dialect: SqlDialect
 ): string => {
-  if (typeof predicate === "string") {
-    return predicate
-  }
-  if (predicate !== null && typeof predicate === "object" && Expression.TypeId in predicate) {
-    return renderExpression(predicate as Expression.Any, state, dialect)
-  }
-  throw new Error("Unsupported check constraint predicate for DDL rendering")
+  return renderExpression(predicate, state, dialect)
 }
 
 const renderCreateTableSql = (
@@ -82,7 +82,7 @@ const renderCreateTableSql = (
   const table = targetSource.source as Table.AnyTable
   const fields = table[Table.TypeId].fields
   const definitions = Object.entries(fields).map(([columnName, column]) =>
-    renderColumnDefinition(dialect, columnName, column)
+    renderColumnDefinition(dialect, state, columnName, column)
   )
   for (const option of table[Table.OptionsSymbol]) {
     switch (option.kind) {
@@ -305,6 +305,28 @@ const renderJsonOpaquePath = (
   throw new Error("Unsupported SQL/JSON path input")
 }
 
+const renderFunctionCall = (
+  name: string,
+  args: readonly Expression.Any[],
+  state: RenderState,
+  dialect: SqlDialect
+): string => {
+  const renderedArgs = args.map((arg) => renderExpression(arg, state, dialect)).join(", ")
+  if (args.length === 0) {
+    switch (name) {
+      case "current_date":
+      case "current_time":
+      case "current_timestamp":
+      case "localtime":
+      case "localtimestamp":
+        return name
+      default:
+        return `${name}()`
+    }
+  }
+  return `${name}(${renderedArgs})`
+}
+
 const renderJsonExpression = (
   ast: Record<string, unknown>,
   state: RenderState,
@@ -1190,6 +1212,8 @@ export const renderExpression = (
         : `excluded.${dialect.quoteIdentifier(ast.columnName)}`
     case "cast":
       return `cast(${renderExpression(ast.value, state, dialect)} as ${renderCastType(dialect, ast.target)})`
+    case "function":
+      return renderFunctionCall(ast.name, Array.isArray(ast.args) ? ast.args : [], state, dialect)
     case "eq":
       return `(${renderExpression(ast.left, state, dialect)} = ${renderExpression(ast.right, state, dialect)})`
     case "neq":

package/src/internal/table-options.ts

@@ -4,6 +4,7 @@ import {
   type AnyColumnDefinition,
   type IsNullable
 } from "./column-state.js"
+import type { Any as AnyExpression } from "./expression.js"
 import type { TableFieldMap } from "./schema-derivation.js"
 
 /** Non-empty list of column names. */
@@ -36,7 +37,7 @@ export type TableOptionSpec =
   | {
       readonly kind: "check"
       readonly name: string
-      readonly predicate: unknown
+      readonly predicate: AnyExpression
     }
 
 /** Thin wrapper used by the public `Table.*` option builders. */

package/src/internal/table.ts

@@ -2,6 +2,7 @@ import { pipeArguments, type Pipeable } from "effect/Pipeable"
 import * as Schema from "effect/Schema"
 
 import * as Plan from "./plan.js"
+import type { Any as AnyExpression } from "./expression.js"
 import type { BoundColumnFrom } from "./column-state.js"
 import { bindColumn, type AnyColumnDefinition } from "./column-state.js"
 import {
@@ -646,14 +647,14 @@ export const foreignKey = <
   })
 })
 
-/** Declares a metadata-only check constraint placeholder. */
+/** Declares a check constraint expression. */
 export const check = <Name extends string>(
   name: Name,
-  predicate: unknown
+  predicate: AnyExpression
 ): TableOption<{
   readonly kind: "check"
   readonly name: Name
-  readonly predicate: unknown
+  readonly predicate: AnyExpression
 }> => makeOption({
   kind: "check",
   name,

package/src/mysql/column.ts

@@ -21,10 +21,11 @@ export const custom = BaseColumn.mysql.custom
 export const nullable = BaseColumn.nullable
 export const primaryKey = BaseColumn.primaryKey
 export const unique = BaseColumn.unique
-export const hasDefault = BaseColumn.hasDefault
+const default_ = BaseColumn.default_
 export const generated = BaseColumn.generated
 export const references = BaseColumn.references
 export const schema = BaseColumn.schema
+export { default_ as default }
 
 export type Any = BaseColumn.Any
 export type AnyBound = BaseColumn.AnyBound

package/src/mysql/executor.ts

@@ -2,8 +2,9 @@ import * as Effect from "effect/Effect"
 import * as SqlClient from "@effect/sql/SqlClient"
 
 import * as CoreExecutor from "../internal/executor.js"
-import * as Query from "./query.js"
-import * as Renderer from "./renderer.js"
+import * as CoreQuery from "../internal/query.js"
+import * as CoreRenderer from "../internal/renderer.js"
+import { renderMysqlPlan } from "../internal/mysql-renderer.js"
 import {
   narrowMysqlDriverErrorForReadQuery,
   normalizeMysqlDriverError,
@@ -19,17 +20,19 @@ export type RowDecodeError = CoreExecutor.RowDecodeError
 export type Driver<Error = never, Context = never> = CoreExecutor.Driver<"mysql", Error, Context>
 /** MySQL-specialized executor contract. */
 export type Executor<Error = never, Context = never> = CoreExecutor.Executor<"mysql", Error, Context>
+/** MySQL-specialized renderer contract. */
+export type Renderer = CoreRenderer.Renderer<"mysql">
 /** Optional renderer / driver overrides for the standard MySQL executor pipeline. */
 export interface MakeOptions<Error = never, Context = never> {
-  readonly renderer?: Renderer.Renderer
+  readonly renderer?: Renderer
   readonly driver?: Driver<Error, Context>
   readonly driverMode?: CoreExecutor.DriverMode
 }
 /** Standard composed error shape for MySQL executors. */
 export type MysqlExecutorError = MysqlDriverError | RowDecodeError
 /** Read-query error surface emitted by built-in MySQL executors. */
-export type MysqlQueryError<PlanValue extends Query.QueryPlan<any, any, any, any, any, any, any, any, any, any>> =
-  Exclude<Query.CapabilitiesOfPlan<PlanValue>, "read"> extends never ? MysqlReadQueryError : MysqlExecutorError
+export type MysqlQueryError<PlanValue extends CoreQuery.QueryPlan<any, any, any, any, any, any, any, any, any, any>> =
+  Exclude<CoreQuery.CapabilitiesOfPlan<PlanValue>, "read"> extends never ? MysqlReadQueryError : MysqlExecutorError
 
 /** Runs an effect within the ambient MySQL SQL transaction service. */
 export const withTransaction = CoreExecutor.withTransaction
@@ -39,9 +42,9 @@ export const withSavepoint = CoreExecutor.withSavepoint
 /** MySQL executor whose error channel narrows based on the query plan. */
 export interface QueryExecutor<Context = never> {
   readonly dialect: "mysql"
-  execute<PlanValue extends Query.QueryPlan<any, any, any, any, any, any, any, any, any, any>>(
-    plan: Query.DialectCompatiblePlan<PlanValue, "mysql">
-  ): Effect.Effect<Query.ResultRows<PlanValue>, MysqlQueryError<PlanValue>, Context>
+  execute<PlanValue extends CoreQuery.QueryPlan<any, any, any, any, any, any, any, any, any, any>>(
+    plan: CoreQuery.DialectCompatiblePlan<PlanValue, "mysql">
+  ): Effect.Effect<CoreQuery.ResultRows<PlanValue>, MysqlQueryError<PlanValue>, Context>
 }
 
 /** Constructs a MySQL-specialized SQL driver. */
@@ -50,7 +53,7 @@ export const driver = <
   Context = never
 >(
   execute: <Row>(
-    query: Renderer.RenderedQuery<Row>
+    query: CoreRenderer.RenderedQuery<Row, "mysql">
   ) => Effect.Effect<ReadonlyArray<FlatRow>, Error, Context>
 ): Driver<Error, Context> =>
   CoreExecutor.driver("mysql", execute)
@@ -59,7 +62,7 @@ const fromDriver = <
   Error = never,
   Context = never
 >(
-  renderer: Renderer.Renderer,
+  renderer: Renderer,
   sqlDriver: Driver<Error, Context>,
   driverMode: CoreExecutor.DriverMode = "raw"
 ): QueryExecutor<Context> => ({
@@ -102,13 +105,13 @@ const sqlClientDriver = (): Driver<any, SqlClient.SqlClient> =>
 export function make(): QueryExecutor<SqlClient.SqlClient>
 export function make(
   options: {
-    readonly renderer?: Renderer.Renderer
+    readonly renderer?: Renderer
     readonly driverMode?: CoreExecutor.DriverMode
   }
 ): QueryExecutor<SqlClient.SqlClient>
 export function make<Error = never, Context = never>(
   options: {
-    readonly renderer?: Renderer.Renderer
+    readonly renderer?: Renderer
     readonly driver: Driver<Error, Context>
     readonly driverMode?: CoreExecutor.DriverMode
   }
@@ -117,9 +120,9 @@ export function make<Error = never, Context = never>(
   options: MakeOptions<Error, Context> = {}
 ): QueryExecutor<any> {
   if (options.driver) {
-    return fromDriver(options.renderer ?? Renderer.make(), options.driver, options.driverMode)
+    return fromDriver(options.renderer ?? CoreRenderer.make("mysql", renderMysqlPlan), options.driver, options.driverMode)
   }
-  return fromDriver(options.renderer ?? Renderer.make(), sqlClientDriver(), options.driverMode)
+  return fromDriver(options.renderer ?? CoreRenderer.make("mysql", renderMysqlPlan), sqlClientDriver(), options.driverMode)
 }
 
 /** Creates a MySQL-specialized executor from a typed implementation callback. */
@@ -127,8 +130,8 @@ export const custom = <
   Error = never,
   Context = never
 >(
-  execute: <PlanValue extends Query.QueryPlan<any, any, any, any, any, any, any, any, any, any>>(
-    plan: Query.DialectCompatiblePlan<PlanValue, "mysql">
-  ) => Effect.Effect<Query.ResultRows<PlanValue>, Error, Context>
+  execute: <PlanValue extends CoreQuery.QueryPlan<any, any, any, any, any, any, any, any, any, any>>(
+    plan: CoreQuery.DialectCompatiblePlan<PlanValue, "mysql">
+  ) => Effect.Effect<CoreQuery.ResultRows<PlanValue>, Error, Context>
 ): Executor<Error, Context> =>
   CoreExecutor.make("mysql", execute as any) as Executor<Error, Context>

package/src/mysql/function/aggregate.ts

@@ -0,0 +1,6 @@
+import { mysqlQuery } from "../private/query.js"
+
+/** MySQL aggregate functions. */
+export const count = mysqlQuery.count
+export const max = mysqlQuery.max
+export const min = mysqlQuery.min

package/src/mysql/function/core.ts

@@ -0,0 +1,4 @@
+import { mysqlQuery } from "../private/query.js"
+
+/** MySQL scalar core functions. */
+export const coalesce = mysqlQuery.coalesce

package/src/mysql/function/index.ts

@@ -0,0 +1,19 @@
+export * as core from "./core.js"
+export * as string from "./string.js"
+export * as aggregate from "./aggregate.js"
+export * as window from "./window.js"
+export { json } from "./json.js"
+export * as temporal from "./temporal.js"
+
+export { coalesce } from "./core.js"
+export { lower, upper, concat } from "./string.js"
+export { count, max, min } from "./aggregate.js"
+export { over, rowNumber, rank, denseRank } from "./window.js"
+export {
+  currentDate,
+  currentTime,
+  currentTimestamp,
+  localTime,
+  localTimestamp,
+  now
+} from "./temporal.js"

package/src/mysql/function/json.ts

@@ -0,0 +1,4 @@
+import { mysqlQuery } from "../private/query.js"
+
+/** MySQL JSON expression helpers. */
+export const json = mysqlQuery.json