effect-qb 0.17.0 → 4.0.0-beta.66

package/src/mysql/column.ts

@@ -21,7 +21,7 @@ const enrichDbType = <Db extends Expression.DbType.Any>(dbType: Db): Db => {
 }
 
 const primitive = <Type, Db extends Expression.DbType.Any>(
-  schema: Schema.Schema<Type, any, any>,
+  schema: Schema.Schema<Type>,
   dbType: Db
 ): ColumnDefinition<Type, Type, Type, Db, false, false, false, false, false, undefined> =>
   makeColumnDefinition(schema as Schema.Schema<NonNullable<Type>>, {
@@ -46,11 +46,11 @@ const renderNumericDdlType = (
     : `${kind}(${options.precision},${options.scale})`
 }
 
-export const custom = <SchemaType extends Schema.Schema.Any, Db extends Expression.DbType.Any>(
+export const custom = <SchemaType extends Schema.Top, Db extends Expression.DbType.Any>(
   schema: SchemaType,
   dbType: Db
 ) =>
-  makeColumnDefinition(schema as unknown as Schema.Schema<NonNullable<Schema.Schema.Type<SchemaType>>, any, any>, {
+  makeColumnDefinition(schema as unknown as Schema.Schema<NonNullable<Schema.Schema.Type<SchemaType>>>, {
     dbType: enrichDbType(dbType),
     nullable: false,
     hasDefault: false,
@@ -62,7 +62,7 @@ export const custom = <SchemaType extends Schema.Schema.Any, Db extends Expressi
     identity: undefined
   })
 
-export const uuid = () => primitive(Schema.UUID, mysqlDatatypes.uuid())
+export const uuid = () => primitive(Schema.String.check(Schema.isUUID()), mysqlDatatypes.uuid())
 export const text = () => primitive(Schema.String, mysqlDatatypes.text())
 export const int = () => primitive(Schema.Int, mysqlDatatypes.int())
 export const number = (options?: BaseColumn.NumericOptions) =>
@@ -81,8 +81,8 @@ export const boolean = () => primitive(Schema.Boolean, mysqlDatatypes.boolean())
 export const date = () => primitive(LocalDateStringSchema, mysqlDatatypes.date())
 export const datetime = () => primitive(LocalDateTimeStringSchema, mysqlDatatypes.datetime())
 export const timestamp = () => primitive(LocalDateTimeStringSchema, mysqlDatatypes.timestamp())
-export const json = <SchemaType extends Schema.Schema.Any>(schema: SchemaType) =>
-  makeColumnDefinition(schema as unknown as Schema.Schema<NonNullable<Schema.Schema.Type<SchemaType>>, any, any>, {
+export const json = <SchemaType extends Schema.Top>(schema: SchemaType) =>
+  makeColumnDefinition(schema as unknown as Schema.Schema<NonNullable<Schema.Schema.Type<SchemaType>>>, {
     dbType: { ...mysqlDatatypes.json(), variant: "json" } as Expression.DbType.Json<"mysql", "json">,
     nullable: false,
     hasDefault: false,

package/src/mysql/executor.ts

@@ -1,5 +1,5 @@
 import * as Effect from "effect/Effect"
-import * as SqlClient from "@effect/sql/SqlClient"
+import * as SqlClient from "effect/unstable/sql/SqlClient"
 import * as Stream from "effect/Stream"
 
 import * as CoreExecutor from "../internal/executor.js"
@@ -131,10 +131,10 @@ const fromDriver = <
   stream(plan) {
     const rendered = renderer.render(plan)
     return Stream.mapError(
-      Stream.mapChunksEffect(
+      Stream.mapArrayEffect(
         sqlDriver.stream(rendered),
         (rows) => Effect.try({
-          try: () => CoreExecutor.decodeChunk(rendered, plan, rows, { driverMode, valueMappings }),
+          try: () => CoreExecutor.decodeRows(rendered, plan, rows, { driverMode, valueMappings }) as never,
           catch: (error) => error as RowDecodeError
         })
       ),
@@ -164,7 +164,7 @@ const sqlClientDriver = (): Driver<any, SqlClient.SqlClient> =>
  * Creates the standard MySQL executor pipeline.
  *
  * By default this uses the built-in MySQL renderer plus the ambient
- * `@effect/sql` `SqlClient`. Advanced callers can override the renderer,
+ * `effect/unstable/sql` `SqlClient`. Advanced callers can override the renderer,
  * driver, or both.
  */
 export function make(): QueryExecutor<SqlClient.SqlClient>

package/src/mysql/function/temporal.ts

@@ -35,7 +35,7 @@ const makeTemporal = <
 >(
   name: Name,
   dbType: Db,
-  runtimeSchema: Schema.Schema<Runtime, any, any>
+  runtimeSchema: Schema.Schema<Runtime>
 ): TemporalExpression<Runtime, Db, Name> =>
   makeExpression({
     runtime: undefined as unknown as Runtime,

package/src/mysql/internal/dsl.ts

@@ -80,10 +80,8 @@ import {
   type TableDialectOf,
   type StatementOfPlan,
   type MutationInputOf,
-  type MutationTargetLike,
   type MutationTargetOfPlan,
   type MergeCapabilities,
-  type MutationTargetInput,
   type MutationValuesInput,
   type SourceDialectOf,
   type SourceLike,
@@ -100,7 +98,6 @@ import {
   type TableLike,
   type UpdateInputOfTarget,
   type MutationTargetNamesOf,
-  type MutationTargetTuple,
   type TupleDependencies,
   type TupleDialect,
   type ResultRow
@@ -138,6 +135,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>
+type MutationTargetTuple = readonly [MutationTargetLike, MutationTargetLike, ...MutationTargetLike[]]
+type MutationTargetInput = MutationTargetLike | MutationTargetTuple
+
 /**
  * Dialect-specific DB type profile used to specialize the shared query
  * operator surface.
@@ -1533,11 +1534,11 @@ const profile: QueryDialectProfile<Dialect, TextDb, NumericDb, BoolDb, Timestamp
 
   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
+    return Schema.Literal(value) as unknown as Schema.Top
   }
 
   const literal = <const Value extends LiteralValue>(
@@ -5033,6 +5034,11 @@ type MutationTargetTupleDialectConstraint<
   Dialect extends string
 > = Exclude<TableDialectOf<Targets[number]>, Dialect> extends never ? unknown : never
 
+type TableDialectConstraint<
+  Target extends TableLike,
+  Dialect extends string
+> = Exclude<TableDialectOf<Target>, Dialect> extends never ? unknown : never
+
 type DuplicateMutationTargetSourceName<
   Targets extends readonly MutationTargetLike[],
   Seen extends string = never
@@ -6148,7 +6154,7 @@ type AsCurriedResult<
 
   export interface InsertApi {
     <Target extends MutationTargetLike>(
-      target: Target
+      target: Target & TableDialectConstraint<Target, Dialect>
     ): QueryPlan<
       {},
       never,
@@ -6165,7 +6171,7 @@ type AsCurriedResult<
       EmptyFacts
     >
     <Target extends MutationTargetLike, Values extends Record<string, unknown>>(
-      target: Target,
+      target: Target & TableDialectConstraint<Target, Dialect>,
       values: MutationValuesInput<"insert", Target, Values> & MutationValuesDialectConstraint<Values, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>
     ): QueryPlan<
       {},
@@ -6237,7 +6243,7 @@ type AsCurriedResult<
       EmptyFacts
     >
     <Target extends MutationTargetLike, Values extends Record<string, unknown>>(
-      target: Target,
+      target: Target & TableDialectConstraint<Target, Dialect>,
       values: MutationValuesInput<"update", Target, Values> & UpdateValuesNonEmptyConstraint<Values> & MutationValuesDialectConstraint<Values, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>
     ): QueryPlan<
       {},
@@ -6262,7 +6268,7 @@ type AsCurriedResult<
     const Columns extends DdlColumnInput,
     UpdateValues extends MutationInputOf<Table.UpdateOf<Target>> | undefined = undefined
   >(
-    target: Target,
+    target: Target & TableDialectConstraint<Target, Dialect>,
     values: Values & MutationValuesDialectConstraint<Values, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>,
     conflictColumns: ValidateTargetColumnInput<Target, Columns>,
     updateValues?: UpdateValues & UpdateValuesNonEmptyConstraint<Exclude<UpdateValues, undefined>> & MutationValuesDialectConstraint<Exclude<UpdateValues, undefined>, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>
@@ -6286,7 +6292,7 @@ type AsCurriedResult<
 
   interface DeleteApi {
     <Target extends MutationTargetLike>(
-      target: Target
+      target: Target & TableDialectConstraint<Target, Dialect>
     ): QueryPlan<
       {},
       never,
@@ -6322,7 +6328,7 @@ type AsCurriedResult<
   }
 
   type TruncateApi = <Target extends MutationTargetLike>(
-    target: Target,
+    target: Target & TableDialectConstraint<Target, Dialect>,
     options?: TruncateOptions
   ) => QueryPlan<
     {},
@@ -6355,10 +6361,10 @@ type AsCurriedResult<
     MatchedPredicate extends PredicateInput | undefined = undefined,
     NotMatchedPredicate extends PredicateInput | undefined = undefined
   >(
-    target: Target,
+    target: Target & TableDialectConstraint<Target, Dialect>,
     source: Source & (
       SourceRequiredOf<Source> extends never ? unknown : SourceRequirementError<Source>
-    ),
+    ) & SourceDialectConstraint<Source, Dialect>,
     on: On,
     options: MergeOptions<Target, MatchedValues, InsertValues, MatchedPredicate, NotMatchedPredicate>
   ) => QueryPlan<
@@ -6612,7 +6618,7 @@ type AsCurriedResult<
   >
 
   type CreateTableApi = <Target extends SchemaTableLike>(
-    target: Target,
+    target: Target & TableDialectConstraint<Target, Dialect>,
     options?: CreateTableOptions
   ) => QueryPlan<
     {},
@@ -6628,7 +6634,7 @@ type AsCurriedResult<
   >
 
   type DropTableApi = <Target extends SchemaTableLike>(
-    target: Target,
+    target: Target & TableDialectConstraint<Target, Dialect>,
     options?: DropTableOptions
   ) => QueryPlan<
     {},
@@ -6644,7 +6650,7 @@ type AsCurriedResult<
   >
 
   type CreateIndexApi = <Target extends SchemaTableLike, const Columns extends DdlColumnInput>(
-    target: Target,
+    target: Target & TableDialectConstraint<Target, Dialect>,
     columns: Columns & ValidateDdlColumnInput<Target, Columns>,
     options?: CreateIndexOptions
   ) => QueryPlan<
@@ -6661,7 +6667,7 @@ type AsCurriedResult<
   >
 
   type DropIndexApi = <Target extends SchemaTableLike, const Columns extends DdlColumnInput>(
-    target: Target,
+    target: Target & TableDialectConstraint<Target, Dialect>,
     columns: Columns & ValidateDdlColumnInput<Target, Columns>,
     options?: DropIndexOptions
   ) => QueryPlan<

package/src/mysql/table.ts

@@ -1,5 +1,3 @@
-import type * as Schema from "effect/Schema"
-
 import type * as Expression from "../internal/scalar.js"
 import { ColumnTypeId, type AnyColumnDefinition } from "../internal/column-state.js"
 import * as BaseTable from "../internal/table.js"
@@ -33,25 +31,17 @@ export type TableClassStatic<
   SchemaName extends string | undefined = undefined
 > = BaseTable.TableClassStatic<Name, Fields, PrimaryKeyColumns, SchemaName>
 
-export type AnyTable = BaseTable.AnyTable
+export type AnyTable = BaseTable.AnyTable<Dialect>
 
-type FieldsOfTable<Table> = Table extends BaseTable.TableDefinition<any, infer Fields extends DialectFieldMap, any, any, any>
+type FieldsOfTable<Table extends BaseTable.AnyTable> = Table[typeof BaseTable.TypeId]["fields"] extends infer Fields extends DialectFieldMap
   ? Fields
-  : Table extends BaseTable.TableClassStatic<any, infer Fields extends DialectFieldMap, any, any>
-    ? Fields
-    : never
-
-type PrimaryKeyOfTable<Table> = Table extends BaseTable.TableDefinition<any, any, infer PrimaryKeyColumns extends string, any, any>
-  ? PrimaryKeyColumns
-  : Table extends BaseTable.TableClassStatic<any, any, infer PrimaryKeyColumns extends string, any>
-    ? PrimaryKeyColumns
-    : never
-
-type SchemaNameOfTable<Table> = Table extends BaseTable.TableDefinition<any, any, any, any, infer SchemaName>
-  ? SchemaName
-  : Table extends BaseTable.TableClassStatic<any, any, any, infer SchemaName>
-    ? SchemaName
-    : never
+  : never
+
+type ColumnNamesOfTable<Table extends BaseTable.AnyTable> = Extract<keyof FieldsOfTable<Table>, string>
+
+type PrimaryKeyOfTable<Table extends BaseTable.AnyTable> = Table[typeof BaseTable.TypeId]["primaryKey"][number]
+
+type SchemaNameOfTable<Table extends BaseTable.AnyTable> = Table[typeof BaseTable.TypeId]["schemaName"]
 
 type ApplySchemaTableOptions<
   Name extends string,
@@ -169,15 +159,28 @@ export const foreignKey = <
   columns: LocalColumns & BaseTable.NonEmptyColumnInput<LocalColumns>,
   target: () => TargetTable,
   referencedColumns: TargetColumns & BaseTable.NonEmptyColumnInput<TargetColumns> & BaseTable.MatchingColumnArityInput<LocalColumns, TargetColumns>
-): BaseTable.TableOption =>
-  BaseTable.foreignKey<LocalColumns, BaseTable.AnyTable, TargetColumns>(
+): BaseTable.TableOption<{
+  readonly kind: "foreignKey"
+  readonly columns: BaseTable.NormalizeColumns<LocalColumns>
+  readonly references: () => {
+    readonly tableName: string
+    readonly schemaName?: string
+    readonly columns: BaseTable.NormalizeColumns<TargetColumns>
+    readonly knownColumns: readonly ColumnNamesOfTable<TargetTable>[]
+  }
+}> =>
+  BaseTable.foreignKey<LocalColumns, TargetTable, TargetColumns>(
     columns as LocalColumns & BaseTable.NonEmptyColumnInput<LocalColumns>,
-    target as () => BaseTable.AnyTable,
+    target,
     referencedColumns as TargetColumns & BaseTable.NonEmptyColumnInput<TargetColumns> & BaseTable.MatchingColumnArityInput<LocalColumns, TargetColumns>
   )
 
 export const check = BaseTable.check
 
-export type SelectOf<Table extends { readonly schemas: { readonly select: Schema.Schema<any> } }> = BaseTable.SelectOf<Table>
-export type InsertOf<Table extends { readonly schemas: { readonly insert: Schema.Schema<any> } }> = BaseTable.InsertOf<Table>
-export type UpdateOf<Table extends { readonly schemas: { readonly update: Schema.Schema<any> } }> = BaseTable.UpdateOf<Table>
+export const selectSchema = BaseTable.selectSchema
+export const insertSchema = BaseTable.insertSchema
+export const updateSchema = BaseTable.updateSchema
+
+export type SelectOf<Table extends AnyTable> = BaseTable.SelectOf<Table>
+export type InsertOf<Table extends AnyTable> = BaseTable.InsertOf<Table>
+export type UpdateOf<Table extends AnyTable> = BaseTable.UpdateOf<Table>

package/src/postgres/column.ts

@@ -29,7 +29,7 @@ const enrichDbType = <Db extends Expression.DbType.Any>(dbType: Db): Db => {
 }
 
 const primitive = <Type, Db extends Expression.DbType.Any>(
-  schema: Schema.Schema<Type, any, any>,
+  schema: Schema.Schema<Type>,
   dbType: Db
 ): ColumnDefinition<Type, Type, Type, Db, false, false, false, false, false, undefined> =>
   makeColumnDefinition(schema as Schema.Schema<NonNullable<Type>>, {
@@ -57,15 +57,15 @@ const renderNumericDdlType = (
 const boundedString = (length?: number): Schema.Schema<string> =>
   length === undefined
     ? Schema.String
-    : Schema.String.pipe(Schema.maxLength(length))
+    : Schema.String.check(Schema.isMaxLength(length))
 
-const finiteNumber = Schema.Number.pipe(Schema.finite())
+const finiteNumber = Schema.Number.check(Schema.isFinite())
 
-export const custom = <SchemaType extends Schema.Schema.Any, Db extends Expression.DbType.Any>(
+export const custom = <SchemaType extends Schema.Top, Db extends Expression.DbType.Any>(
   schema: SchemaType,
   dbType: Db
 ) =>
-  makeColumnDefinition(schema as unknown as Schema.Schema<NonNullable<Schema.Schema.Type<SchemaType>>, any, any>, {
+  makeColumnDefinition(schema as unknown as Schema.Schema<NonNullable<Schema.Schema.Type<SchemaType>>>, {
     dbType: enrichDbType(dbType),
     nullable: false,
     hasDefault: false,
@@ -77,7 +77,7 @@ export const custom = <SchemaType extends Schema.Schema.Any, Db extends Expressi
     identity: undefined
   })
 
-export const uuid = () => primitive(Schema.UUID, postgresDatatypes.uuid())
+export const uuid = () => primitive(Schema.String.check(Schema.isUUID()), postgresDatatypes.uuid())
 export const text = () => primitive(Schema.String, postgresDatatypes.text())
 export const int = () => primitive(Schema.Int, postgresDatatypes.int4())
 export const int2 = () => primitive(Schema.Int, postgresDatatypes.int2())
@@ -103,7 +103,7 @@ export const time = () => primitive(LocalTimeStringSchema, postgresDatatypes.tim
 export const timetz = () => primitive(OffsetTimeStringSchema, postgresDatatypes.timetz())
 export const timestamptz = () => primitive(InstantStringSchema, postgresDatatypes.timestamptz())
 export const interval = () => primitive(Schema.String, postgresDatatypes.interval())
-export const bytea = () => primitive(Schema.Uint8ArrayFromSelf, postgresDatatypes.bytea())
+export const bytea = () => primitive(Schema.Uint8Array, postgresDatatypes.bytea())
 export const name = () => primitive(Schema.String, postgresDatatypes.name())
 export const oid = () => primitive(Schema.Int, postgresDatatypes.oid())
 export const regclass = () => primitive(Schema.String, postgresDatatypes.regclass())
@@ -135,8 +135,8 @@ export const varchar = (length?: number) =>
     ddlType: length === undefined ? "varchar" : `varchar(${length})`,
     identity: undefined
   })
-export const json = <SchemaType extends Schema.Schema.Any>(schema: SchemaType) =>
-  makeColumnDefinition(schema as unknown as Schema.Schema<NonNullable<Schema.Schema.Type<SchemaType>>, any, any>, {
+export const json = <SchemaType extends Schema.Top>(schema: SchemaType) =>
+  makeColumnDefinition(schema as unknown as Schema.Schema<NonNullable<Schema.Schema.Type<SchemaType>>>, {
     dbType: postgresDatatypes.json(),
     nullable: false,
     hasDefault: false,
@@ -147,8 +147,8 @@ export const json = <SchemaType extends Schema.Schema.Any>(schema: SchemaType) =
     ddlType: undefined,
     identity: undefined
   })
-export const jsonb = <SchemaType extends Schema.Schema.Any>(schema: SchemaType) =>
-  makeColumnDefinition(schema as unknown as Schema.Schema<NonNullable<Schema.Schema.Type<SchemaType>>, any, any>, {
+export const jsonb = <SchemaType extends Schema.Top>(schema: SchemaType) =>
+  makeColumnDefinition(schema as unknown as Schema.Schema<NonNullable<Schema.Schema.Type<SchemaType>>>, {
     dbType: postgresDatatypes.jsonb(),
     nullable: false,
     hasDefault: false,

package/src/postgres/executor.ts

@@ -1,5 +1,5 @@
 import * as Effect from "effect/Effect"
-import * as SqlClient from "@effect/sql/SqlClient"
+import * as SqlClient from "effect/unstable/sql/SqlClient"
 import * as Stream from "effect/Stream"
 
 import * as CoreExecutor from "../internal/executor.js"
@@ -140,10 +140,10 @@ const fromDriver = <
   stream(plan) {
     const rendered = renderer.render(plan)
     return Stream.mapError(
-      Stream.mapChunksEffect(
+      Stream.mapArrayEffect(
         sqlDriver.stream(rendered),
         (rows) => Effect.try({
-          try: () => CoreExecutor.decodeChunk(rendered, plan, rows, { driverMode, valueMappings }),
+          try: () => CoreExecutor.decodeRows(rendered, plan, rows, { driverMode, valueMappings }) as never,
           catch: (error) => error as RowDecodeError
         })
       ),
@@ -173,7 +173,7 @@ const sqlClientDriver = (): Driver<any, SqlClient.SqlClient> =>
  * Creates the standard Postgres executor pipeline.
  *
  * By default this uses the built-in Postgres renderer plus the ambient
- * `@effect/sql` `SqlClient`. Advanced callers can override the renderer,
+ * `effect/unstable/sql` `SqlClient`. Advanced callers can override the renderer,
  * driver, or both.
  */
 export function make(): QueryExecutor<SqlClient.SqlClient>

package/src/postgres/function/temporal.ts

@@ -39,7 +39,7 @@ const makeTemporal = <
 >(
   name: Name,
   dbType: Db,
-  runtimeSchema: Schema.Schema<Runtime, any, any>
+  runtimeSchema: Schema.Schema<Runtime>
 ): TemporalExpression<Runtime, Db, Name> =>
   makeExpression({
     runtime: undefined as unknown as Runtime,

package/src/postgres/internal/dsl.ts

@@ -80,10 +80,8 @@ import {
   type TableDialectOf,
   type StatementOfPlan,
   type MutationInputOf,
-  type MutationTargetLike,
   type MutationTargetOfPlan,
   type MergeCapabilities,
-  type MutationTargetInput,
   type MutationValuesInput,
   type SourceDialectOf,
   type SourceLike,
@@ -100,7 +98,6 @@ import {
   type TableLike,
   type UpdateInputOfTarget,
   type MutationTargetNamesOf,
-  type MutationTargetTuple,
   type TupleDependencies,
   type TupleDialect,
   type ResultRow
@@ -138,6 +135,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>
+type MutationTargetTuple = readonly [MutationTargetLike, MutationTargetLike, ...MutationTargetLike[]]
+type MutationTargetInput = MutationTargetLike | MutationTargetTuple
+
 /**
  * Dialect-specific DB type profile used to specialize the shared query
  * operator surface.
@@ -1512,11 +1513,11 @@ const profile: QueryDialectProfile<Dialect, TextDb, NumericDb, BoolDb, Timestamp
 
   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
+    return Schema.Literal(value) as unknown as Schema.Top
   }
 
   const literal = <const Value extends LiteralValue>(
@@ -5065,6 +5066,11 @@ type MutationTargetTupleDialectConstraint<
   Dialect extends string
 > = Exclude<TableDialectOf<Targets[number]>, Dialect> extends never ? unknown : never
 
+type TableDialectConstraint<
+  Target extends TableLike,
+  Dialect extends string
+> = Exclude<TableDialectOf<Target>, Dialect> 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
 }[keyof Values]
@@ -6220,7 +6226,7 @@ type AsCurriedResult<
 
   export interface InsertApi {
     <Target extends MutationTargetLike>(
-      target: Target
+      target: Target & TableDialectConstraint<Target, Dialect>
     ): QueryPlan<
       {},
       never,
@@ -6237,7 +6243,7 @@ type AsCurriedResult<
       EmptyFacts
     >
     <Target extends MutationTargetLike, Values extends Record<string, unknown>>(
-      target: Target,
+      target: Target & TableDialectConstraint<Target, Dialect>,
       values: MutationValuesInput<"insert", Target, Values> & MutationValuesDialectConstraint<Values, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>
     ): QueryPlan<
       {},
@@ -6309,7 +6315,7 @@ type AsCurriedResult<
       EmptyFacts
     >
     <Target extends MutationTargetLike, Values extends Record<string, unknown>>(
-      target: Target,
+      target: Target & TableDialectConstraint<Target, Dialect>,
       values: MutationValuesInput<"update", Target, Values> & UpdateValuesNonEmptyConstraint<Values> & MutationValuesDialectConstraint<Values, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>
     ): QueryPlan<
       {},
@@ -6334,7 +6340,7 @@ type AsCurriedResult<
     const Columns extends DdlColumnInput,
     UpdateValues extends MutationInputOf<Table.UpdateOf<Target>> | undefined = undefined
   >(
-    target: Target,
+    target: Target & TableDialectConstraint<Target, Dialect>,
     values: Values & MutationValuesDialectConstraint<Values, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>,
     conflictColumns: ValidateTargetColumnInput<Target, Columns>,
     updateValues?: UpdateValues & UpdateValuesNonEmptyConstraint<Exclude<UpdateValues, undefined>> & MutationValuesDialectConstraint<Exclude<UpdateValues, undefined>, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>
@@ -6358,7 +6364,7 @@ type AsCurriedResult<
 
   interface DeleteApi {
     <Target extends MutationTargetLike>(
-      target: Target
+      target: Target & TableDialectConstraint<Target, Dialect>
     ): QueryPlan<
       {},
       never,
@@ -6394,7 +6400,7 @@ type AsCurriedResult<
   }
 
   type TruncateApi = <Target extends MutationTargetLike>(
-    target: Target,
+    target: Target & TableDialectConstraint<Target, Dialect>,
     options?: TruncateOptions
   ) => QueryPlan<
     {},
@@ -6421,10 +6427,10 @@ type AsCurriedResult<
     MatchedPredicate extends PredicateInput | undefined = undefined,
     NotMatchedPredicate extends PredicateInput | undefined = undefined
   >(
-    target: Target,
+    target: Target & TableDialectConstraint<Target, Dialect>,
     source: Source & (
       SourceRequiredOf<Source> extends never ? unknown : SourceRequirementError<Source>
-    ) & MergeSourceNameConstraint<Target, Source>,
+    ) & MergeSourceNameConstraint<Target, Source> & SourceDialectConstraint<Source, Dialect>,
     on: On,
     options: MergeOptions<Target, MatchedValues, InsertValues, MatchedPredicate, NotMatchedPredicate>
   ) => QueryPlan<
@@ -6626,7 +6632,7 @@ type AsCurriedResult<
   >
 
   type CreateTableApi = <Target extends SchemaTableLike>(
-    target: Target,
+    target: Target & TableDialectConstraint<Target, Dialect>,
     options?: CreateTableOptions
   ) => QueryPlan<
     {},
@@ -6642,7 +6648,7 @@ type AsCurriedResult<
   >
 
   type DropTableApi = <Target extends SchemaTableLike>(
-    target: Target,
+    target: Target & TableDialectConstraint<Target, Dialect>,
     options?: DropTableOptions
   ) => QueryPlan<
     {},
@@ -6658,7 +6664,7 @@ type AsCurriedResult<
   >
 
   type CreateIndexApi = <Target extends SchemaTableLike, const Columns extends DdlColumnInput>(
-    target: Target,
+    target: Target & TableDialectConstraint<Target, Dialect>,
     columns: Columns & ValidateDdlColumnInput<Target, Columns>,
     options?: CreateIndexOptions
   ) => QueryPlan<
@@ -6675,7 +6681,7 @@ type AsCurriedResult<
   >
 
   type DropIndexApi = <Target extends SchemaTableLike, const Columns extends DdlColumnInput>(
-    target: Target,
+    target: Target & TableDialectConstraint<Target, Dialect>,
     columns: Columns & ValidateDdlColumnInput<Target, Columns>,
     options?: DropIndexOptions
   ) => QueryPlan<

package/src/postgres/schema-management.ts

@@ -137,9 +137,8 @@ const EnumProto = {
     }
   },
   column(this: EnumDefinition) {
-    const values = this.values.map((value) => Schema.Literal(value)) as unknown as readonly [Schema.Schema.Any, ...Schema.Schema.Any[]]
     return makeColumnDefinition(
-      values.length === 1 ? values[0]! : Schema.Union(...values),
+      Schema.Literals(this.values),
       {
         dbType: this.type(),
         nullable: false,

package/src/postgres/table.ts

@@ -1,5 +1,3 @@
-import type * as Schema from "effect/Schema"
-
 import type * as Expression from "../internal/scalar.js"
 import { ColumnTypeId, type AnyColumnDefinition } from "../internal/column-state.js"
 import * as BaseTable from "../internal/table.js"
@@ -34,27 +32,17 @@ export type TableClassStatic<
   SchemaName extends string | undefined = "public"
 > = BaseTable.TableClassStatic<Name, Fields, PrimaryKeyColumns, SchemaName>
 
-export type AnyTable = BaseTable.AnyTable
+export type AnyTable = BaseTable.AnyTable<Dialect>
 
-type FieldsOfTable<Table> = Table extends BaseTable.TableDefinition<any, infer Fields extends DialectFieldMap, any, any, any>
+type FieldsOfTable<Table extends BaseTable.AnyTable> = Table[typeof BaseTable.TypeId]["fields"] extends infer Fields extends DialectFieldMap
   ? Fields
-  : Table extends BaseTable.TableClassStatic<any, infer Fields extends DialectFieldMap, any, any>
-    ? Fields
-    : never
+  : never
 
-type ColumnNamesOfTable<Table> = Extract<keyof FieldsOfTable<Table>, string>
+type ColumnNamesOfTable<Table extends BaseTable.AnyTable> = Extract<keyof FieldsOfTable<Table>, string>
 
-type PrimaryKeyOfTable<Table> = Table extends BaseTable.TableDefinition<any, any, infer PrimaryKeyColumns extends string, any, any>
-  ? PrimaryKeyColumns
-  : Table extends BaseTable.TableClassStatic<any, any, infer PrimaryKeyColumns extends string, any>
-    ? PrimaryKeyColumns
-    : never
+type PrimaryKeyOfTable<Table extends BaseTable.AnyTable> = Table[typeof BaseTable.TypeId]["primaryKey"][number]
 
-type SchemaNameOfTable<Table> = Table extends BaseTable.TableDefinition<any, any, any, any, infer SchemaName>
-  ? SchemaName
-  : Table extends BaseTable.TableClassStatic<any, any, any, infer SchemaName>
-    ? SchemaName
-    : never
+type SchemaNameOfTable<Table extends BaseTable.AnyTable> = Table[typeof BaseTable.TypeId]["schemaName"]
 
 type ApplySchemaTableOptions<
   Name extends string,
@@ -562,6 +550,10 @@ export const check: {
             })
       })()) as never
 
-export type SelectOf<Table extends { readonly schemas: { readonly select: Schema.Schema<any> } }> = BaseTable.SelectOf<Table>
-export type InsertOf<Table extends { readonly schemas: { readonly insert: Schema.Schema<any> } }> = BaseTable.InsertOf<Table>
-export type UpdateOf<Table extends { readonly schemas: { readonly update: Schema.Schema<any> } }> = BaseTable.UpdateOf<Table>
+export const selectSchema = BaseTable.selectSchema
+export const insertSchema = BaseTable.insertSchema
+export const updateSchema = BaseTable.updateSchema
+
+export type SelectOf<Table extends AnyTable> = BaseTable.SelectOf<Table>
+export type InsertOf<Table extends AnyTable> = BaseTable.InsertOf<Table>
+export type UpdateOf<Table extends AnyTable> = BaseTable.UpdateOf<Table>