effect-qb 0.15.0 → 0.17.0

package/src/postgres/internal/renderer.ts

@@ -1,4 +1,5 @@
 import * as Query from "../../internal/query.js"
+import type * as Expression from "../../internal/scalar.js"
 import { type RenderState } from "../../internal/dialect.js"
 import { postgresDialect } from "./dialect.js"
 import { type Projection } from "../../internal/projections.js"
@@ -14,18 +15,26 @@ export interface PostgresRenderResult {
   readonly sql: string
   readonly params: readonly unknown[]
   readonly projections: readonly Projection[]
+  readonly valueMappings?: Expression.DriverValueMappings
+}
+
+export interface PostgresRenderOptions {
+  readonly valueMappings?: Expression.DriverValueMappings
 }
 
 /**
  * Renders the current query AST into Postgres SQL plus bind parameters.
  */
 export const renderPostgresPlan = <PlanValue extends Query.Plan.Any>(
-  plan: Query.DialectCompatiblePlan<PlanValue, "postgres">
+  plan: Query.DialectCompatiblePlan<PlanValue, "postgres">,
+  options: PostgresRenderOptions = {}
 ): PostgresRenderResult => {
   const state: RenderState = {
     params: [],
+    valueMappings: options.valueMappings,
     ctes: [],
-    cteNames: new Set<string>()
+    cteNames: new Set<string>(),
+    cteSources: new Map<string, unknown>()
   }
   const rendered = renderQueryAst(
     Query.getAst(plan as Query.Plan.Any) as any,
@@ -35,6 +44,7 @@ export const renderPostgresPlan = <PlanValue extends Query.Plan.Any>(
   return {
     sql: rendered.sql,
     params: state.params,
-    projections: rendered.projections
+    projections: rendered.projections,
+    valueMappings: state.valueMappings
   }
 }

package/src/postgres/internal/schema-ddl.ts

@@ -42,7 +42,8 @@ export const renderDdlExpressionSql = (expression: DdlExpressionLike): string =>
     : renderExpression(expression as Expression.Any, {
         params: [],
         ctes: [],
-        cteNames: new Set()
+        cteNames: new Set(),
+        cteSources: new Map()
       }, inlineLiteralDialect)
 
 const stripRedundantOuterParens = (value: string): string => {

package/src/postgres/internal/schema-model.ts

@@ -121,17 +121,17 @@ export const fromDiscoveredValues = (values: ReadonlyArray<unknown>): SchemaMode
   const enums = new Map<string, EnumModel>()
   for (const value of values) {
     if (isEnumDefinition(value)) {
-      enums.set(enumKey(value.schemaName, value.name), toEnumModel(value))
+      enums.set(modelIdentityKey(value.schemaName, value.name), toEnumModel(value))
     } else if (isTableDefinition(value)) {
       for (const enumModel of enumModelsOfTable(value)) {
-        const key = enumKey(enumModel.schemaName, enumModel.name)
+        const key = modelIdentityKey(enumModel.schemaName, enumModel.name)
         const existing = enums.get(key)
         if (existing === undefined) {
           enums.set(key, enumModel)
           continue
         }
         if (JSON.stringify(existing.values) !== JSON.stringify(enumModel.values)) {
-          throw new Error(`Conflicting enum definitions discovered for '${key}'`)
+          throw new Error(`Conflicting enum definitions discovered for '${enumKey(enumModel.schemaName, enumModel.name)}'`)
         }
       }
     }
@@ -148,3 +148,6 @@ export const tableKey = (schemaName: string | undefined, name: string): string =
 
 export const enumKey = (schemaName: string | undefined, name: string): string =>
   `${schemaName ?? "public"}.${name}`
+
+const modelIdentityKey = (schemaName: string | undefined, name: string): string =>
+  JSON.stringify([schemaName ?? "public", name])