effect-qb 0.15.0 → 0.17.0

package/src/mysql/datatypes/index.ts

@@ -50,12 +50,33 @@ type MysqlUuidWitness = Expression.DbType.Base<"mysql", "uuid"> & {
   }
 }
 
+type MysqlJsonWitness = Expression.DbType.Base<"mysql", "json"> & {
+  readonly family: "json"
+  readonly runtime: "json"
+  readonly compareGroup: "json"
+  readonly castTargets: readonly ["json", "text"]
+  readonly driverValueMapping: {
+    readonly toDriver: (value: unknown) => unknown
+  }
+}
+
+mysqlDatatypeModule.json = () => ({
+  ...withMetadata("json"),
+  driverValueMapping: {
+    toDriver: (value: unknown) =>
+      value !== null && typeof value === "object"
+        ? JSON.stringify(value)
+        : value
+  }
+}) as MysqlJsonWitness
+
 export const mysqlDatatypes = mysqlDatatypeModule as DatatypeModule<
   "mysql",
   typeof mysqlDatatypeKinds,
   typeof mysqlDatatypeFamilies
 > & {
   readonly uuid: () => MysqlUuidWitness
+  readonly json: () => MysqlJsonWitness
 }
 
 export type MysqlDatatypeModule = typeof mysqlDatatypes

package/src/mysql/errors/catalog.ts

@@ -51636,17 +51636,17 @@ export const mysqlErrorCatalogByNumber = {
   "MY-015153": [mysqlErrorCatalogBySymbol["ER_WARN_AUDIT_LOG_FILTER_RECOVERY_LOGGING_DISABLED_LOG"]!],
 } as const
 
-const mysqlSymbolPattern = /^(?:[A-Z][A-Z0-9_]*|MY-\d+)$/
-const mysqlNumberPattern = /^(?:\d+|MY-\d+)$/
-
 export type MysqlErrorSymbol = keyof typeof mysqlErrorCatalogBySymbol
 export type MysqlErrorDescriptor<Symbol extends MysqlErrorSymbol = MysqlErrorSymbol> = (typeof mysqlErrorCatalogBySymbol)[Symbol]
 export type MysqlErrorNumber = keyof typeof mysqlErrorCatalogByNumber
 export type MysqlErrorTag<Symbol extends MysqlErrorSymbol = MysqlErrorSymbol> = MysqlErrorDescriptor<Symbol>["tag"]
 export type MysqlErrorDescriptorsByNumber<Number extends MysqlErrorNumber = MysqlErrorNumber> = (typeof mysqlErrorCatalogByNumber)[Number]
 
-export const isMysqlErrorSymbol = (value: string): value is MysqlErrorSymbol => mysqlSymbolPattern.test(value)
-export const isMysqlErrorNumber = (value: string): value is MysqlErrorNumber => mysqlNumberPattern.test(value)
+export const isMysqlErrorSymbol = (value: string): value is MysqlErrorSymbol =>
+  value in mysqlErrorCatalogBySymbol
+
+export const isMysqlErrorNumber = (value: string): value is MysqlErrorNumber =>
+  value in mysqlErrorCatalogByNumber
 
 export const getMysqlErrorDescriptor = <Symbol extends MysqlErrorSymbol>(symbol: Symbol): MysqlErrorDescriptor<Symbol> =>
   mysqlErrorCatalogBySymbol[symbol]

package/src/mysql/errors/normalize.ts

@@ -48,8 +48,8 @@ const asNumber = (value: unknown): number | undefined => {
   if (typeof value === "number" && Number.isFinite(value)) {
     return value
   }
-  if (typeof value === "string" && value.trim() !== "") {
-    const parsed = Number(value)
+  if (typeof value === "string" && /^[+-]?\d+$/.test(value.trim())) {
+    const parsed = Number(value.trim())
     return Number.isFinite(parsed) ? parsed : undefined
   }
   return undefined

package/src/mysql/executor.ts

@@ -5,6 +5,7 @@ import * as Stream from "effect/Stream"
 import * as CoreExecutor from "../internal/executor.js"
 import * as CoreQuery from "../internal/query.js"
 import * as CoreRenderer from "../internal/renderer.js"
+import type * as Expression from "../internal/scalar.js"
 import { renderMysqlPlan } from "./internal/renderer.js"
 import {
   narrowMysqlDriverErrorForReadQuery,
@@ -28,6 +29,7 @@ export interface MakeOptions<Error = never, Context = never> {
   readonly renderer?: Renderer
   readonly driver?: Driver<Error, Context>
   readonly driverMode?: CoreExecutor.DriverMode
+  readonly valueMappings?: Expression.DriverValueMappings
 }
 /** Standard composed error shape for MySQL executors. */
 export type MysqlExecutorError = MysqlDriverError | RowDecodeError
@@ -101,7 +103,8 @@ const fromDriver = <
 >(
   renderer: Renderer,
   sqlDriver: Driver<Error, Context>,
-  driverMode: CoreExecutor.DriverMode = "raw"
+  driverMode: CoreExecutor.DriverMode = "raw",
+  valueMappings?: Expression.DriverValueMappings
 ): QueryExecutor<Context> => ({
   dialect: "mysql",
   execute(plan) {
@@ -110,7 +113,7 @@ const fromDriver = <
       Effect.flatMap(
         sqlDriver.execute(rendered),
         (rows) => Effect.try({
-          try: () => CoreExecutor.decodeRows(rendered, plan, rows, { driverMode }),
+          try: () => CoreExecutor.decodeRows(rendered, plan, rows, { driverMode, valueMappings }),
           catch: (error) => error as RowDecodeError
         })
       ),
@@ -131,7 +134,7 @@ const fromDriver = <
       Stream.mapChunksEffect(
         sqlDriver.stream(rendered),
         (rows) => Effect.try({
-          try: () => CoreExecutor.decodeChunk(rendered, plan, rows, { driverMode }),
+          try: () => CoreExecutor.decodeChunk(rendered, plan, rows, { driverMode, valueMappings }),
           catch: (error) => error as RowDecodeError
         })
       ),
@@ -169,6 +172,7 @@ export function make(
   options: {
     readonly renderer?: Renderer
     readonly driverMode?: CoreExecutor.DriverMode
+    readonly valueMappings?: Expression.DriverValueMappings
   }
 ): QueryExecutor<SqlClient.SqlClient>
 export function make<Error = never, Context = never>(
@@ -176,15 +180,26 @@ export function make<Error = never, Context = never>(
     readonly renderer?: Renderer
     readonly driver: Driver<Error, Context>
     readonly driverMode?: CoreExecutor.DriverMode
+    readonly valueMappings?: Expression.DriverValueMappings
   }
 ): QueryExecutor<Context>
 export function make<Error = never, Context = never>(
   options: MakeOptions<Error, Context> = {}
 ): QueryExecutor<any> {
   if (options.driver) {
-    return fromDriver(options.renderer ?? CoreRenderer.make("mysql", renderMysqlPlan), options.driver, options.driverMode)
+    return fromDriver(
+      options.renderer ?? CoreRenderer.make("mysql", (plan) => renderMysqlPlan(plan, { valueMappings: options.valueMappings })),
+      options.driver,
+      options.driverMode,
+      options.valueMappings
+    )
   }
-  return fromDriver(options.renderer ?? CoreRenderer.make("mysql", renderMysqlPlan), sqlClientDriver(), options.driverMode)
+  return fromDriver(
+    options.renderer ?? CoreRenderer.make("mysql", (plan) => renderMysqlPlan(plan, { valueMappings: options.valueMappings })),
+    sqlClientDriver(),
+    options.driverMode,
+    options.valueMappings
+  )
 }
 
 /** Creates a MySQL-specialized executor from a typed implementation callback. */

package/src/mysql/internal/dialect.ts

@@ -1,15 +1,21 @@
-import type { RenderState, SqlDialect } from "../../internal/dialect.js"
+import type { RenderState, RenderValueContext, SqlDialect } from "../../internal/dialect.js"
+import { toDriverValue } from "../../internal/runtime/driver-value-mapping.js"
 
 const quoteIdentifier = (value: string): string => `\`${value.replaceAll("`", "``")}\``
 
-const renderLiteral = (value: unknown, state: RenderState): string => {
-  if (value === null) {
+const renderLiteral = (value: unknown, state: RenderState, context: RenderValueContext = {}): string => {
+  const driverValue = toDriverValue(value, {
+    dialect: "mysql",
+    valueMappings: state.valueMappings,
+    ...context
+  })
+  if (driverValue === null) {
     return "null"
   }
-  if (typeof value === "boolean") {
-    return value ? "true" : "false"
+  if (typeof driverValue === "boolean") {
+    return driverValue ? "true" : "false"
   }
-  state.params.push(value)
+  state.params.push(driverValue)
   return "?"
 }