chore(core): upgrade drizzle orm to rc5 (#44573)

bun.lock

@@ -1055,7 +1055,6 @@
   "patchedDependencies": {
     "@pierre/trees@1.0.0-beta.4": "patches/@pierre%2Ftrees@1.0.0-beta.4.patch",
     "@tanstack/virtual-core@3.17.8": "patches/@tanstack%2Fvirtual-core@3.17.8.patch",
-    "drizzle-orm@1.0.0-rc.2": "patches/drizzle-orm@1.0.0-rc.2.patch",
     "@modelcontextprotocol/sdk@1.29.0": "patches/@modelcontextprotocol%2Fsdk@1.29.0.patch",
     "@standard-community/standard-openapi@0.2.9": "patches/@standard-community%2Fstandard-openapi@0.2.9.patch",
     "@ai-sdk/mistral@3.0.51": "patches/@ai-sdk%2Fmistral@3.0.51.patch",
@@ -1117,8 +1116,8 @@
     "cross-spawn": "7.0.6",
     "diff": "8.0.2",
     "dompurify": "3.3.1",
-    "drizzle-kit": "1.0.0-rc.2",
-    "drizzle-orm": "1.0.0-rc.2",
+    "drizzle-kit": "1.0.0-rc.5-ab785fc",
+    "drizzle-orm": "1.0.0-rc.5-169397b",
     "effect": "4.0.0-rc.111",
     "fuzzysort": "3.1.0",
     "get-east-asian-width": "1.6.0",
@@ -1684,7 +1683,7 @@
 
     "@dot/log": ["@dot/log@0.1.5", "", { "dependencies": { "chalk": "^4.1.2", "loglevelnext": "^6.0.0", "p-defer": "^3.0.0" } }, "sha512-ECraEVJWv2f2mWK93lYiefUkphStVlKD6yKDzisuoEmxuLKrxO9iGetHK2DoEAkj7sxjE886n0OUVVCUx0YPNg=="],
 
-    "@drizzle-team/brocli": ["@drizzle-team/brocli@0.11.0", "", {}, "sha512-hD3pekGiPg0WPCCGAZmusBBJsDqGUR66Y452YgQsZOnkdQ7ViEPKuyP4huUGEZQefp8g34RRodXYmJ2TbCH+tg=="],
+    "@drizzle-team/brocli": ["@drizzle-team/brocli@0.12.0", "", {}, "sha512-mlUE+rZ8CatQekLhnaiN91Iemdd+e2gFKooGlnRB3oPTL3VghLfX24dx7HrzMNeC1JrIB/0kpsfyty3f5HNfxQ=="],
 
     "@effect/opentelemetry": ["@effect/opentelemetry@4.0.0-rc.111", "", { "peerDependencies": { "@opentelemetry/api": ">=1.9.0 <2.0.0", "@opentelemetry/api-logs": ">=0.203.0 <0.300.0", "@opentelemetry/resources": ">=2.0.0 <3.0.0", "@opentelemetry/sdk-logs": ">=0.203.0 <0.300.0", "@opentelemetry/sdk-metrics": ">=2.0.0 <3.0.0", "@opentelemetry/sdk-trace-base": ">=2.0.0 <3.0.0", "@opentelemetry/sdk-trace-node": ">=2.0.0 <3.0.0", "@opentelemetry/sdk-trace-web": ">=2.0.0 <3.0.0", "@opentelemetry/semantic-conventions": ">=1.33.0 <2.0.0", "effect": "^4.0.0-rc.111" }, "optionalPeers": ["@opentelemetry/api", "@opentelemetry/api-logs", "@opentelemetry/resources", "@opentelemetry/sdk-logs", "@opentelemetry/sdk-metrics", "@opentelemetry/sdk-trace-base", "@opentelemetry/sdk-trace-node", "@opentelemetry/sdk-trace-web"] }, "sha512-bztAYpWoipn/a4tFjECMNvtWLkf2TS+Qn23PBI+f4q5DP9cBKfV00uhX8cwEVcfAtZd+lflSbGURHa4xlSewOA=="],
 
@@ -3830,9 +3829,9 @@
 
     "dotenv-expand": ["dotenv-expand@11.0.7", "", { "dependencies": { "dotenv": "^16.4.5" } }, "sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA=="],
 
-    "drizzle-kit": ["drizzle-kit@1.0.0-rc.2", "", { "dependencies": { "@drizzle-team/brocli": "^0.11.0", "@js-temporal/polyfill": "^0.5.1", "esbuild": "^0.25.10", "get-tsconfig": "^4.13.6", "jiti": "^2.6.1" }, "bin": { "drizzle-kit": "bin.cjs" } }, "sha512-TRxUmj1wDA2QCt3GvuhfamvIa66wJ7+MzSxBMKkpRtYScjHTumT9BE+x6daSzuEacSrPEuUH5/cW1uo5RkoPIg=="],
+    "drizzle-kit": ["drizzle-kit@1.0.0-rc.5-ab785fc", "", { "dependencies": { "@drizzle-team/brocli": "^0.12.0", "@js-temporal/polyfill": "^0.5.1", "esbuild": "^0.25.10", "get-tsconfig": "^4.13.6", "jiti": "^2.6.1" }, "bin": { "drizzle-kit": "bin.cjs" } }, "sha512-TSg7sK1finOxdo48O9mDfyMY3lhi/aHCVIil5TFhthyq/H/89H/3nwX5V9Gdp7HYMUGFHyWJD5iowSn98l0elw=="],
 
-    "drizzle-orm": ["drizzle-orm@1.0.0-rc.2", "", { "peerDependencies": { "@aws-sdk/client-rds-data": ">=3", "@cloudflare/workers-types": ">=4", "@effect/sql-pg": ">=4.0.0-beta.58 || >=4.0.0", "@electric-sql/pglite": ">=0.2.0", "@libsql/client": ">=0.10.0", "@libsql/client-wasm": ">=0.10.0", "@neondatabase/serverless": ">=0.10.0", "@op-engineering/op-sqlite": ">=2", "@opentelemetry/api": "^1.4.1", "@planetscale/database": ">=1.13", "@sinclair/typebox": ">=0.34.8", "@sqlitecloud/drivers": ">=1.0.653", "@tidbcloud/serverless": "*", "@tursodatabase/database": ">=0.2.1", "@tursodatabase/database-common": ">=0.2.1", "@tursodatabase/database-wasm": ">=0.2.1", "@types/better-sqlite3": "*", "@types/mssql": "^9.1.4", "@types/pg": "*", "@types/sql.js": "*", "@upstash/redis": ">=1.34.7", "@vercel/postgres": ">=0.8.0", "@xata.io/client": "*", "arktype": ">=2.0.0", "better-sqlite3": ">=9.3.0", "bun-types": "*", "effect": ">=4.0.0-beta.58 || >=4.0.0", "expo-sqlite": ">=14.0.0", "mssql": "^11.0.1", "mysql2": ">=2", "pg": ">=8", "postgres": ">=3", "sql.js": ">=1", "sqlite3": ">=5", "typebox": ">=1.0.0", "valibot": ">=1.0.0-beta.7", "zod": "^3.25.0 || ^4.0.0" }, "optionalPeers": ["@aws-sdk/client-rds-data", "@cloudflare/workers-types", "@effect/sql-pg", "@electric-sql/pglite", "@libsql/client", "@libsql/client-wasm", "@neondatabase/serverless", "@op-engineering/op-sqlite", "@opentelemetry/api", "@planetscale/database", "@sinclair/typebox", "@sqlitecloud/drivers", "@tidbcloud/serverless", "@tursodatabase/database", "@tursodatabase/database-common", "@tursodatabase/database-wasm", "@types/better-sqlite3", "@types/mssql", "@types/pg", "@types/sql.js", "@upstash/redis", "@vercel/postgres", "@xata.io/client", "arktype", "better-sqlite3", "bun-types", "effect", "expo-sqlite", "mssql", "mysql2", "pg", "postgres", "sql.js", "sqlite3", "typebox", "valibot", "zod"] }, "sha512-UXYDkbplF5wX0hwxll+80QhEwUvAJLBu+tAK/d4fna18kLE6VuliAzufF/ieDEIJeSnLRYgtmsXD6x1Xuy1kIg=="],
+    "drizzle-orm": ["drizzle-orm@1.0.0-rc.5-169397b", "", { "peerDependencies": { "@aws-sdk/client-rds-data": ">=3", "@cloudflare/workers-types": ">=4", "@drizzle-team/minipg": ">=0.3.2", "@effect/sql-d1": ">=4.0.0-beta.105 || >=4.0.0", "@effect/sql-libsql": ">=4.0.0-beta.105 || >=4.0.0", "@effect/sql-mysql2": ">=4.0.0-beta.105 || >=4.0.0", "@effect/sql-pg": ">=4.0.0-beta.105 || >=4.0.0", "@effect/sql-pglite": ">=4.0.0-beta.105 || >=4.0.0", "@effect/sql-sqlite-bun": ">=4.0.0-beta.105 || >=4.0.0", "@effect/sql-sqlite-do": ">=4.0.0-beta.105 || >=4.0.0", "@effect/sql-sqlite-node": ">=4.0.0-beta.105 || >=4.0.0", "@effect/sql-sqlite-wasm": ">=4.0.0-beta.105 || >=4.0.0", "@electric-sql/pglite": ">=0.2.0", "@libsql/client": ">=0.10.0", "@libsql/client-wasm": ">=0.10.0", "@neondatabase/serverless": ">=0.10.0", "@op-engineering/op-sqlite": ">=17", "@opentelemetry/api": "^1.4.1", "@planetscale/database": ">=1.13", "@sinclair/typebox": ">=0.34.8", "@sqlitecloud/drivers": ">=1.0.653", "@tidbcloud/serverless": "*", "@tursodatabase/database": ">=0.7.1", "@tursodatabase/database-common": ">=0.7.1", "@tursodatabase/database-wasm": ">=0.7.1", "@tursodatabase/serverless": ">=1.4.0", "@tursodatabase/sync": ">=0.7.1", "@types/better-sqlite3": "*", "@types/mssql": "^9.1.4", "@types/pg": "*", "@types/sql.js": "*", "@upstash/redis": ">=1.34.7", "@vercel/postgres": ">=0.8.0", "@xata.io/client": "*", "arktype": ">=2.0.0", "better-sqlite3": ">=9.3.0", "bun-types": "*", "effect": ">=4.0.0-beta.105 || >=4.0.0", "expo-sqlite": ">=14.0.0", "mssql": "^11.0.1", "mysql2": ">=2", "pg": ">=8", "postgres": ">=3", "sql.js": ">=1", "sqlite3": ">=5", "typebox": ">=1.2.0", "valibot": ">=1.0.0-beta.7", "zod": "^3.25.0 || ^4.0.0" }, "optionalPeers": ["@aws-sdk/client-rds-data", "@cloudflare/workers-types", "@drizzle-team/minipg", "@effect/sql-d1", "@effect/sql-libsql", "@effect/sql-mysql2", "@effect/sql-pg", "@effect/sql-pglite", "@effect/sql-sqlite-bun", "@effect/sql-sqlite-do", "@effect/sql-sqlite-node", "@effect/sql-sqlite-wasm", "@electric-sql/pglite", "@libsql/client", "@libsql/client-wasm", "@neondatabase/serverless", "@op-engineering/op-sqlite", "@opentelemetry/api", "@planetscale/database", "@sinclair/typebox", "@sqlitecloud/drivers", "@tidbcloud/serverless", "@tursodatabase/database", "@tursodatabase/database-common", "@tursodatabase/database-wasm", "@tursodatabase/serverless", "@tursodatabase/sync", "@types/better-sqlite3", "@types/mssql", "@types/pg", "@types/sql.js", "@upstash/redis", "@vercel/postgres", "@xata.io/client", "arktype", "better-sqlite3", "bun-types", "effect", "expo-sqlite", "mssql", "mysql2", "pg", "postgres", "sql.js", "sqlite3", "typebox", "valibot", "zod"] }, "sha512-xf5TudQhFplMMzjwgmMY5f64Sqbv4iwXxdTHBHqvLMt+SHyY8rAYhzNLQchEkDxiqMclTS/txPEOg5pdQy0Tcw=="],
 
     "dset": ["dset@3.1.4", "", {}, "sha512-2QF/g9/zTaPDc3BjNcVTGoBbXBgYfMTTceLaYcFJ/W9kggFUkhxD/hMEeuLKbugyef9SqAx8cpgwlIP/jinUTA=="],
 
@@ -6500,6 +6499,8 @@
 
     "d3-sankey/d3-shape": ["d3-shape@1.3.7", "", { "dependencies": { "d3-path": "1" } }, "sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw=="],
 
+    "db0/drizzle-orm": ["drizzle-orm@1.0.0-rc.2", "", { "peerDependencies": { "@aws-sdk/client-rds-data": ">=3", "@cloudflare/workers-types": ">=4", "@effect/sql-pg": ">=4.0.0-beta.58 || >=4.0.0", "@electric-sql/pglite": ">=0.2.0", "@libsql/client": ">=0.10.0", "@libsql/client-wasm": ">=0.10.0", "@neondatabase/serverless": ">=0.10.0", "@op-engineering/op-sqlite": ">=2", "@opentelemetry/api": "^1.4.1", "@planetscale/database": ">=1.13", "@sinclair/typebox": ">=0.34.8", "@sqlitecloud/drivers": ">=1.0.653", "@tidbcloud/serverless": "*", "@tursodatabase/database": ">=0.2.1", "@tursodatabase/database-common": ">=0.2.1", "@tursodatabase/database-wasm": ">=0.2.1", "@types/better-sqlite3": "*", "@types/mssql": "^9.1.4", "@types/pg": "*", "@types/sql.js": "*", "@upstash/redis": ">=1.34.7", "@vercel/postgres": ">=0.8.0", "@xata.io/client": "*", "arktype": ">=2.0.0", "better-sqlite3": ">=9.3.0", "bun-types": "*", "effect": ">=4.0.0-beta.58 || >=4.0.0", "expo-sqlite": ">=14.0.0", "mssql": "^11.0.1", "mysql2": ">=2", "pg": ">=8", "postgres": ">=3", "sql.js": ">=1", "sqlite3": ">=5", "typebox": ">=1.0.0", "valibot": ">=1.0.0-beta.7", "zod": "^3.25.0 || ^4.0.0" }, "optionalPeers": ["@aws-sdk/client-rds-data", "@cloudflare/workers-types", "@effect/sql-pg", "@electric-sql/pglite", "@libsql/client", "@libsql/client-wasm", "@neondatabase/serverless", "@op-engineering/op-sqlite", "@opentelemetry/api", "@planetscale/database", "@sinclair/typebox", "@sqlitecloud/drivers", "@tidbcloud/serverless", "@tursodatabase/database", "@tursodatabase/database-common", "@tursodatabase/database-wasm", "@types/better-sqlite3", "@types/mssql", "@types/pg", "@types/sql.js", "@upstash/redis", "@vercel/postgres", "@xata.io/client", "arktype", "better-sqlite3", "bun-types", "effect", "expo-sqlite", "mssql", "mysql2", "pg", "postgres", "sql.js", "sqlite3", "typebox", "valibot", "zod"] }, "sha512-UXYDkbplF5wX0hwxll+80QhEwUvAJLBu+tAK/d4fna18kLE6VuliAzufF/ieDEIJeSnLRYgtmsXD6x1Xuy1kIg=="],
+
     "dir-compare/minimatch": ["minimatch@3.1.5", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w=="],
 
     "dir-compare/p-limit": ["p-limit@3.1.0", "", { "dependencies": { "yocto-queue": "^0.1.0" } }, "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="],

package.json

@@ -71,8 +71,8 @@
       "@tailwindcss/vite": "4.1.11",
       "diff": "8.0.2",
       "dompurify": "3.3.1",
-      "drizzle-kit": "1.0.0-rc.2",
-      "drizzle-orm": "1.0.0-rc.2",
+      "drizzle-kit": "1.0.0-rc.5-ab785fc",
+      "drizzle-orm": "1.0.0-rc.5-169397b",
       "effect": "4.0.0-rc.111",
       "ai": "6.0.168",
       "cross-spawn": "7.0.6",
@@ -166,7 +166,6 @@
     "@npmcli/agent@4.0.2": "patches/@npmcli%2Fagent@4.0.2.patch",
     "@silvia-odwyer/photon-node@0.3.4": "patches/@silvia-odwyer%2Fphoton-node@0.3.4.patch",
     "@standard-community/standard-openapi@0.2.9": "patches/@standard-community%2Fstandard-openapi@0.2.9.patch",
-    "drizzle-orm@1.0.0-rc.2": "patches/drizzle-orm@1.0.0-rc.2.patch",
     "solid-js@1.9.10": "patches/solid-js@1.9.10.patch",
     "@ai-sdk/mistral@3.0.51": "patches/@ai-sdk%2Fmistral@3.0.51.patch",
     "gcp-metadata@8.1.2": "patches/gcp-metadata@8.1.2.patch",

packages/console/core/drizzle.config.ts

@@ -3,7 +3,6 @@ import { defineConfig } from "drizzle-kit"
 
 export default defineConfig({
   out: "./migrations/",
-  strict: true,
   schema: ["./src/**/*.sql.ts"],
   verbose: true,
   dialect: "mysql",

packages/console/core/src/drizzle/index.ts

@@ -3,19 +3,11 @@ import { Resource } from "@opencode-ai/console-resource"
 export * from "drizzle-orm"
 import { Client } from "@planetscale/database"
 
-import { MySqlTransaction, type MySqlTransactionConfig } from "drizzle-orm/mysql-core"
-import type { PlanetScalePreparedQueryHKT, PlanetscaleQueryResultHKT } from "drizzle-orm/planetscale-serverless"
+import type { MySqlTransactionConfig } from "drizzle-orm/mysql-core"
 import { Context } from "../context"
 import { memo } from "../util/memo"
 
 export namespace Database {
-  export type Transaction = MySqlTransaction<
-    PlanetscaleQueryResultHKT,
-    PlanetScalePreparedQueryHKT,
-    Record<string, never>,
-    any
-  >
-
   const client = memo(() => {
     const result = new Client({
       host: Resource.Database.host,
@@ -26,6 +18,7 @@ export namespace Database {
     return db
   })
 
+  export type Transaction = Parameters<Parameters<ReturnType<typeof client>["transaction"]>[0]>[0]
   export type TxOrDb = Transaction | ReturnType<typeof client>
 
   const TransactionContext = Context.create<{

packages/core/src/database/drizzle/effect-sqlite/driver.ts

@@ -6,7 +6,7 @@ import { EffectCache } from "drizzle-orm/cache/core/cache-effect"
 import { EffectLogger } from "drizzle-orm/effect-core"
 import { entityKind } from "drizzle-orm/entity"
 import type { AnyRelations, EmptyRelations } from "drizzle-orm/relations"
-import { SQLiteAsyncDialect } from "drizzle-orm/sqlite-core/dialect"
+import { SQLiteDialect } from "drizzle-orm/sqlite-core/dialect"
 import { SQLiteEffectDatabase } from "../sqlite-core/effect/db.js"
 import type { DrizzleConfig } from "drizzle-orm/utils"
 import { jitCompatCheck } from "../internal/drizzle-utils.js"
@@ -53,12 +53,13 @@ export const make = Effect.fn("SQLiteDrizzle.make")(function* <TRelations extend
   const cache = yield* EffectCache
   const logger = yield* EffectLogger
 
-  const dialect = new SQLiteAsyncDialect()
+  const useJitMappers = jitCompatCheck(config.jit)
+  const dialect = new SQLiteDialect({ useJitMappers })
   const relations = config.relations ?? ({} as TRelations)
   const session = new EffectSQLiteSession(client, dialect, relations, {
     logger,
     cache,
-    useJitMappers: jitCompatCheck(config.jit),
+    useJitMappers,
   })
   const db = new EffectSQLiteDatabase(dialect, session, relations) as EffectSQLiteDatabase<TRelations> & {
     $client: SqlClient

packages/core/src/database/drizzle/effect-sqlite/session.ts

@@ -14,7 +14,7 @@ import { entityKind } from "drizzle-orm/entity"
 import type { AnyRelations } from "drizzle-orm/relations"
 import type { RelationalQueryMapperConfig } from "drizzle-orm/relations"
 import type { Query } from "drizzle-orm/sql/sql"
-import type { SQLiteAsyncDialect } from "drizzle-orm/sqlite-core/dialect"
+import type { SQLiteDialect } from "drizzle-orm/sqlite-core/dialect"
 import {
   SQLiteEffectPreparedQuery,
   SQLiteEffectSession,
@@ -59,7 +59,7 @@ export class EffectSQLiteSession<TRelations extends AnyRelations> extends SQLite
 
   constructor(
     private client: SqlClient,
-    dialect: SQLiteAsyncDialect,
+    dialect: SQLiteDialect,
     protected relations: TRelations,
     private options: EffectSQLiteSessionOptions,
   ) {

packages/core/src/database/drizzle/internal/drizzle-utils.ts

@@ -41,14 +41,34 @@ export function orderSelectedFields<TColumn extends Column>(
 ): SelectedFieldsOrdered {
   return Object.entries(fields).flatMap(([name, field]) => {
     const path = pathPrefix ? [...pathPrefix, name] : [name]
-    if (is(field, Column) || is(field, SQL) || is(field, SQL.Aliased) || is(field, Subquery)) {
-      return [{ path, field }] as SelectedFieldsOrdered
-    }
+    if (is(field, Column)) return [{ path, field, fieldType: "Column", column: field }] as SelectedFieldsOrdered
+    if (is(field, SQL)) return [{ path, field, fieldType: "SQL" }] as SelectedFieldsOrdered
+    if (is(field, SQL.Aliased)) return [{ path, field, fieldType: "SQL.Aliased" }] as SelectedFieldsOrdered
+    if (is(field, Subquery)) return [{ path, field, fieldType: "Subquery" }] as SelectedFieldsOrdered
     if (is(field, Table)) return orderSelectedFields(getTableColumnsRuntime(field as SQLiteTable), path)
     return orderSelectedFields(field as Record<string, unknown>, path)
   }) as SelectedFieldsOrdered
 }
 
+export function resolveNullableObjectPaths(
+  columns: SelectedFieldsOrdered,
+  joinsNotNullableMap: Record<string, boolean> | undefined,
+) {
+  if (!joinsNotNullableMap) return undefined
+  const tableOf = columns
+    .filter((column) => column.path.length > 1 && column.fieldType === "Column")
+    .reduce<Record<string, string | false>>((result, column) => {
+      const key = column.path[0]!
+      const tableName = getTableName(getColumnTable(column.field as Column))
+      const current = result[key]
+      result[key] = current === undefined ? tableName : current === tableName ? current : false
+      return result
+    }, {})
+  return Object.entries(tableOf)
+    .filter(([, tableName]) => typeof tableName === "string" && !joinsNotNullableMap[tableName])
+    .map(([key]) => key)
+}
+
 export function mapUpdateSet<TTable extends SQLiteTable>(table: TTable, values: SQLiteUpdateSetSource<TTable>) {
   const entries = Object.entries(values).filter(([, value]) => value !== undefined)
   if (entries.length === 0) throw new Error("No values to set")

packages/core/src/database/drizzle/sqlite-core/effect/db.ts

@@ -9,7 +9,7 @@ import type { TypedQueryBuilder } from "drizzle-orm/query-builders/query-builder
 import type { AnyRelations, EmptyRelations } from "drizzle-orm/relations"
 import { SelectionProxyHandler } from "drizzle-orm/selection-proxy"
 import { type ColumnsSelection, type SQL, sql, type SQLWrapper } from "drizzle-orm/sql/sql"
-import type { SQLiteAsyncDialect } from "drizzle-orm/sqlite-core/dialect"
+import type { SQLiteDialect } from "drizzle-orm/sqlite-core/dialect"
 import { QueryBuilder } from "drizzle-orm/sqlite-core/query-builders/query-builder"
 import type { SelectedFields } from "drizzle-orm/sqlite-core/query-builders/select.types"
 import type { SQLiteTransactionConfig } from "drizzle-orm/sqlite-core/session"
@@ -45,7 +45,7 @@ export class SQLiteEffectDatabase<
 
   constructor(
     /** @internal */
-    readonly dialect: SQLiteAsyncDialect,
+    readonly dialect: SQLiteDialect,
     /** @internal */
     readonly session: SQLiteEffectSession<TEffectHKT, TRunResult, TRelations>,
     relations: TRelations,

packages/core/src/database/drizzle/sqlite-core/effect/insert.ts

@@ -3,14 +3,15 @@ import type * as Effect from "effect/Effect"
 import { applyEffectWrapper, type QueryEffectHKTBase } from "drizzle-orm/effect-core/query-effect"
 import { entityKind, is } from "drizzle-orm/entity"
 import type { SelectResultFields } from "drizzle-orm/query-builders/select.types"
+import type { TypedQueryBuilder } from "drizzle-orm/query-builders/query-builder"
 import type { RunnableQuery } from "drizzle-orm/runnable-query"
 import type { Query, SQLWrapper } from "drizzle-orm/sql/sql"
-import { Param, SQL, sql } from "drizzle-orm/sql/sql"
+import { SQL, sql } from "drizzle-orm/sql/sql"
 import type { SQLiteDialect } from "drizzle-orm/sqlite-core/dialect"
 import type { IndexColumn } from "drizzle-orm/sqlite-core/indexes"
 import type {
   SQLiteInsertConfig,
-  SQLiteInsertSelectQueryBuilder,
+  SQLiteInsertSelection,
   SQLiteInsertValue,
 } from "drizzle-orm/sqlite-core/query-builders/insert"
 import type { SelectedFieldsFlat } from "drizzle-orm/sqlite-core/query-builders/select.types"
@@ -152,34 +153,24 @@ export class SQLiteEffectInsertBuilder<
     if (values.length === 0) {
       throw new Error("values() must be called with at least one value")
     }
-    const mappedValues = values.map((entry) => {
-      const result: Record<string, Param | SQL> = {}
-      const cols = getTableColumnsRuntime(this.table)
-      for (const colKey of Object.keys(entry)) {
-        const colValue = entry[colKey as keyof typeof entry]
-        result[colKey] = is(colValue, SQL) ? colValue : new Param(colValue, cols[colKey])
-      }
-      return result
-    })
-
-    return new SQLiteEffectInsertBase(this.table, mappedValues, this.session, this.dialect, this.withList)
+    return new SQLiteEffectInsertBase(this.table, values, this.session, this.dialect, this.withList)
   }
 
   select(
-    selectQuery: (qb: QueryBuilder) => SQLiteInsertSelectQueryBuilder<TTable>,
+    selectQuery: (qb: QueryBuilder) => TypedQueryBuilder<SQLiteInsertSelection<TTable>>,
   ): SQLiteEffectInsertBase<TTable, TRunResult, undefined, false, never, TEffectHKT>
   select(
     selectQuery: (qb: QueryBuilder) => SQL,
   ): SQLiteEffectInsertBase<TTable, TRunResult, undefined, false, never, TEffectHKT>
   select(selectQuery: SQL): SQLiteEffectInsertBase<TTable, TRunResult, undefined, false, never, TEffectHKT>
   select(
-    selectQuery: SQLiteInsertSelectQueryBuilder<TTable>,
+    selectQuery: TypedQueryBuilder<SQLiteInsertSelection<TTable>>,
   ): SQLiteEffectInsertBase<TTable, TRunResult, undefined, false, never, TEffectHKT>
   select(
     selectQuery:
       | SQL
-      | SQLiteInsertSelectQueryBuilder<TTable>
-      | ((qb: QueryBuilder) => SQLiteInsertSelectQueryBuilder<TTable> | SQL),
+      | TypedQueryBuilder<SQLiteInsertSelection<TTable>>
+      | ((qb: QueryBuilder) => TypedQueryBuilder<SQLiteInsertSelection<TTable>> | SQL),
   ): SQLiteEffectInsertBase<TTable, TRunResult, undefined, false, never, TEffectHKT> {
     const select = typeof selectQuery === "function" ? selectQuery(new QueryBuilder()) : selectQuery
 

packages/core/src/database/drizzle/sqlite-core/effect/raw.ts

@@ -5,7 +5,7 @@ import { entityKind } from "drizzle-orm/entity"
 import type { RunnableQuery } from "drizzle-orm/runnable-query"
 import type { PreparedQuery } from "drizzle-orm/session"
 import type { Query, SQL, SQLWrapper } from "drizzle-orm/sql/sql"
-import type { SQLiteAsyncDialect } from "drizzle-orm/sqlite-core/dialect"
+import type { SQLiteDialect } from "drizzle-orm/sqlite-core/dialect"
 
 type SQLiteEffectRawAction = "all" | "get" | "values" | "run"
 
@@ -29,7 +29,7 @@ export class SQLiteEffectRaw<TResult, TEffectHKT extends QueryEffectHKTBase = Qu
     /** @internal */
     public getSQL: () => SQL,
     private action: SQLiteEffectRawAction,
-    private dialect: SQLiteAsyncDialect,
+    private dialect: SQLiteDialect,
     private mapBatchResult: (result: unknown) => unknown,
   ) {}
 

packages/core/src/database/drizzle/sqlite-core/effect/select.ts

@@ -15,7 +15,7 @@ import { SQL } from "drizzle-orm/sql/sql"
 import type { ColumnsSelection, SQLWrapper } from "drizzle-orm/sql/sql"
 import type { SQLiteColumn } from "drizzle-orm/sqlite-core/columns"
 import type { SQLiteDialect } from "drizzle-orm/sqlite-core/dialect"
-import { SQLiteSelectQueryBuilderBase } from "drizzle-orm/sqlite-core/query-builders/select"
+import { SQLiteSelectBase } from "drizzle-orm/sqlite-core/query-builders/select"
 import type {
   CreateSQLiteSelectFromBuilderMode,
   SelectedFields,
@@ -97,8 +97,8 @@ export class SQLiteEffectSelectBuilder<
       >
     : CreateSQLiteSelectFromBuilderMode<
         TBuilderMode,
+        SQLiteEffectSelectHKT<TEffectHKT>,
         GetSelectTableName<TFrom>,
-        "async",
         TRunResult,
         TSelection extends undefined ? GetSelectTableSelection<TFrom> : TSelection,
         TSelection extends undefined ? "single" : "partial"
@@ -164,10 +164,9 @@ export interface SQLiteEffectSelectBase<
   out TResult extends any[] = SelectResult<TSelection, TSelectMode, TNullabilityMap>[],
   out TSelectedFields extends ColumnsSelection = BuildSubquerySelection<TSelection, TNullabilityMap>,
   out TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,
-> extends SQLiteSelectQueryBuilderBase<
+> extends SQLiteSelectBase<
       SQLiteEffectSelectHKT<TEffectHKT>,
       TTableName,
-      "async",
       TRunResult,
       TSelection,
       TSelectMode,
@@ -193,10 +192,9 @@ export class SQLiteEffectSelectBase<
     out TSelectedFields extends ColumnsSelection = BuildSubquerySelection<TSelection, TNullabilityMap>,
     out TEffectHKT extends QueryEffectHKTBase = QueryEffectHKTBase,
   >
-  extends SQLiteSelectQueryBuilderBase<
+  extends SQLiteSelectBase<
     SQLiteEffectSelectHKT<TEffectHKT>,
     TTableName,
-    "async",
     TRunResult,
     TSelection,
     TSelectMode,
@@ -215,7 +213,7 @@ export class SQLiteEffectSelectBase<
   }
 
   /** @internal */
-  getSQL(): SQL {
+  override getSQL(): SQL {
     return this.dialect.buildSelectQuery(this.effectConfig)
   }
 
@@ -240,7 +238,7 @@ export class SQLiteEffectSelectBase<
     return query as ReturnType<this["prepare"]>
   }
 
-  $withCache(config?: { config?: CacheConfig; tag?: string; autoInvalidate?: boolean } | false) {
+  override $withCache(config?: { config?: CacheConfig; tag?: string; autoInvalidate?: boolean } | false) {
     this.cacheConfig =
       config === undefined
         ? { config: {}, enabled: true, autoInvalidate: true }

packages/core/src/database/drizzle/sqlite-core/effect/session.ts

@@ -21,12 +21,12 @@ import type {
 import { makeJitRqbMapper } from "drizzle-orm/relations"
 import type { PreparedQuery } from "drizzle-orm/session"
 import { fillPlaceholders, type Query, type SQL, sql } from "drizzle-orm/sql/sql"
-import type { SQLiteAsyncDialect } from "drizzle-orm/sqlite-core/dialect"
+import type { SQLiteDialect } from "drizzle-orm/sqlite-core/dialect"
 import type { SelectedFieldsOrdered } from "drizzle-orm/sqlite-core/query-builders/select.types"
 import type { PreparedQueryConfig, SQLiteExecuteMethod, SQLiteTransactionConfig } from "drizzle-orm/sqlite-core/session"
 import { upgradeIfNeeded } from "../../up-migrations/effect-sqlite.js"
 import { assertUnreachable, makeJitQueryMapper, type RowsMapper } from "drizzle-orm/utils"
-import { mapResultRow } from "../../internal/drizzle-utils.js"
+import { mapResultRow, resolveNullableObjectPaths } from "../../internal/drizzle-utils.js"
 import { SQLiteEffectDatabase } from "./db.js"
 
 type MigrationConfigWithInit = MigrationConfig & { init?: boolean }
@@ -155,7 +155,10 @@ export class SQLiteEffectPreparedQuery<
     return this.useJitMappers
       ? (this.jitMapper =
           (this.jitMapper as RowsMapper<T["all"]>) ??
-          makeJitQueryMapper<T["all"]>(this.fields!, this.joinsNotNullableMap))(rows as unknown[][])
+          makeJitQueryMapper<T["all"]>(
+            this.fields!,
+            resolveNullableObjectPaths(this.fields!, this.joinsNotNullableMap),
+          ))(rows as unknown[][])
       : (rows as unknown[][]).map((row) => mapResultRow(this.fields!, row, this.joinsNotNullableMap))
   }
 
@@ -187,7 +190,10 @@ export class SQLiteEffectPreparedQuery<
     return this.useJitMappers
       ? (this.jitMapper =
           (this.jitMapper as RowsMapper<T["get"][]>) ??
-          makeJitQueryMapper<T["get"][]>(this.fields!, this.joinsNotNullableMap))([row as unknown[]])[0]
+          makeJitQueryMapper<T["get"][]>(
+            this.fields!,
+            resolveNullableObjectPaths(this.fields!, this.joinsNotNullableMap),
+          ))([row as unknown[]])[0]
       : mapResultRow(this.fields!, row as unknown[], this.joinsNotNullableMap)
   }
 
@@ -311,7 +317,7 @@ export abstract class SQLiteEffectSession<
 > {
   static readonly [entityKind]: string = "SQLiteEffectSession"
 
-  constructor(readonly dialect: SQLiteAsyncDialect) {}
+  constructor(readonly dialect: SQLiteDialect) {}
 
   abstract prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(
     query: Query,
@@ -412,7 +418,7 @@ export abstract class SQLiteEffectTransaction<
   static override readonly [entityKind]: string = "SQLiteEffectTransaction"
 
   constructor(
-    dialect: SQLiteAsyncDialect,
+    dialect: SQLiteDialect,
     session: SQLiteEffectSession<TEffectHKT, TRunResult, TRelations>,
     protected relations: TRelations,
   ) {

packages/stats/core/drizzle.config.ts

@@ -6,7 +6,6 @@ export default defineConfig({
   schema: ["./src/database/schema.ts"],
   // schema: ["./src/**/*.sql.ts"],
   out: "./migrations/",
-  strict: true,
   verbose: true,
   dbCredentials: {
     database: Resource.StatsDatabase.database,

packages/stats/core/src/database.ts

@@ -3,7 +3,6 @@ import { drizzle } from "drizzle-orm/planetscale-serverless"
 import { migrate as drizzleMigrate } from "drizzle-orm/planetscale-serverless/migrator"
 import { Config, ConfigProvider, Effect, Layer, Schema } from "effect"
 import * as Context from "effect/Context"
-import * as schema from "./database/schema"
 import { Resource } from "sst/resource"
 
 export const DatabaseUrl = Schema.NonEmptyString.pipe(Schema.brand("DatabaseUrl"))
@@ -32,7 +31,7 @@ export class DatabaseConfig extends Context.Service<DatabaseConfig, DatabaseSett
 }
 
 function makeDrizzle(settings: DatabaseSettings) {
-  return drizzle({ client: new Client({ url: settings.url }), schema })
+  return drizzle({ client: new Client({ url: settings.url }) })
 }
 
 export type Drizzle = ReturnType<typeof makeDrizzle>

patches/drizzle-orm@1.0.0-rc.2.patch

@@ -1,42 +0,0 @@
-diff --git a/cache/core/cache-effect.cjs b/cache/core/cache-effect.cjs
---- a/cache/core/cache-effect.cjs
-+++ b/cache/core/cache-effect.cjs
-@@ -103,1 +103,1 @@
--var EffectCacheError = class extends effect_Schema.TaggedErrorClass()("EffectCacheError", { cause: effect_Schema.Unknown }) {
-+var EffectCacheError = class extends effect_Schema.TaggedError()("EffectCacheError", { cause: effect_Schema.Unknown }) {
-diff --git a/cache/core/cache-effect.js b/cache/core/cache-effect.js
---- a/cache/core/cache-effect.js
-+++ b/cache/core/cache-effect.js
-@@ -97,1 +97,1 @@
--var EffectCacheError = class extends Schema.TaggedErrorClass()("EffectCacheError", { cause: Schema.Unknown }) {
-+var EffectCacheError = class extends Schema.TaggedError()("EffectCacheError", { cause: Schema.Unknown }) {
-diff --git a/effect-core/errors.cjs b/effect-core/errors.cjs
---- a/effect-core/errors.cjs
-+++ b/effect-core/errors.cjs
-@@ -8,1 +8,1 @@
--var EffectDrizzleError = class extends effect_Schema.TaggedErrorClass()("EffectDrizzleError", {
-+var EffectDrizzleError = class extends effect_Schema.TaggedError()("EffectDrizzleError", {
-@@ -14,1 +14,1 @@
--var EffectDrizzleQueryError = class EffectDrizzleQueryError extends effect_Schema.TaggedErrorClass()("EffectDrizzleQueryError", {
-+var EffectDrizzleQueryError = class EffectDrizzleQueryError extends effect_Schema.TaggedError()("EffectDrizzleQueryError", {
-@@ -28,1 +28,1 @@
--var EffectTransactionRollbackError = class extends effect_Schema.TaggedErrorClass()("EffectTransactionRollbackError", {}) {
-+var EffectTransactionRollbackError = class extends effect_Schema.TaggedError()("EffectTransactionRollbackError", {}) {
-@@ -32,1 +32,1 @@
--var MigratorInitError = class extends effect_Schema.TaggedErrorClass()("MigratorInitError", { exitCode: effect_Schema.Literals(["databaseMigrations", "localMigrations"]) }) {
-+var MigratorInitError = class extends effect_Schema.TaggedError()("MigratorInitError", { exitCode: effect_Schema.Literals(["databaseMigrations", "localMigrations"]) }) {
-diff --git a/effect-core/errors.js b/effect-core/errors.js
---- a/effect-core/errors.js
-+++ b/effect-core/errors.js
-@@ -5,1 +5,1 @@
--var EffectDrizzleError = class extends Schema.TaggedErrorClass()("EffectDrizzleError", {
-+var EffectDrizzleError = class extends Schema.TaggedError()("EffectDrizzleError", {
-@@ -11,1 +11,1 @@
--var EffectDrizzleQueryError = class EffectDrizzleQueryError extends Schema.TaggedErrorClass()("EffectDrizzleQueryError", {
-+var EffectDrizzleQueryError = class EffectDrizzleQueryError extends Schema.TaggedError()("EffectDrizzleQueryError", {
-@@ -25,1 +25,1 @@
--var EffectTransactionRollbackError = class extends Schema.TaggedErrorClass()("EffectTransactionRollbackError", {}) {
-+var EffectTransactionRollbackError = class extends Schema.TaggedError()("EffectTransactionRollbackError", {}) {
-@@ -29,1 +29,1 @@
--var MigratorInitError = class extends Schema.TaggedErrorClass()("MigratorInitError", { exitCode: Schema.Literals(["databaseMigrations", "localMigrations"]) }) {
-+var MigratorInitError = class extends Schema.TaggedError()("MigratorInitError", { exitCode: Schema.Literals(["databaseMigrations", "localMigrations"]) }) {