Beta21 (#5614)

* commutative fixes

* feat

feat

* fix env

* fix

* Fixed import tests

* Fixed migrator

---------

Co-authored-by: Sergey Reka <71607800+Sukairo-02@users.noreply.github.com>
Co-authored-by: Sukairo-02 <sreka9056@gmail.com>

Author: AndriiSherman

.github/workflows/release-feature-branch.yaml

@@ -25,6 +25,8 @@ on:
         required: true
       TURBO_TOKEN: 
         required: true
+      NETLIFY_DB_URL: 
+        required: true
 
 concurrency:
   group: feature-${{ github.workflow }}-${{ github.ref }}
@@ -234,6 +236,7 @@ jobs:
           TEST_CONFIG_PATH_PREFIX: ./tests/cli/
           SQLITE_CLOUD_CONNECTION_STRING: ${{ secrets.SQLITE_CLOUD_CONNECTION_STRING }}
           SQLITE_MANY_CLOUD_CONNECTION_STRING: ${{ secrets.SQLITE_MANY_CLOUD_CONNECTION_STRING }}
+          NETLIFY_DB_URL: ${{ secrets.NETLIFY_DB_URL }}
         working-directory: integration-tests
         shell: bash
         run: |

.github/workflows/release-latest.yaml

@@ -468,8 +468,8 @@ jobs:
 
   release:
     permissions:
-      contents: read
-      id-token: write
+      contents: write # for creating GitHub releases
+      id-token: write # for OIDC
     needs:
       - test
       - attw

.github/workflows/router.yaml

@@ -43,6 +43,7 @@ jobs:
       SQLITE_CLOUD_CONNECTION_STRING: ${{ secrets.SQLITE_CLOUD_CONNECTION_STRING }}
       SQLITE_MANY_CLOUD_CONNECTION_STRING: ${{ secrets.SQLITE_MANY_CLOUD_CONNECTION_STRING }}
       TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+      NETLIFY_DB_URL: ${{ secrets.NETLIFY_DB_URL }}
 
   run-latest:
     needs: switch

changelogs/drizzle-kit/0.31.8.md

@@ -1,3 +1,4 @@
 ### Bug fixes
 
-- Fixed `algorythm` => `algorithm` typo
+- Fixed `algorythm` => `algorithm` typo.
+- Fixed external dependencies in build configuration.

changelogs/drizzle-kit/0.31.9.md

@@ -0,0 +1 @@
+- drizzle-kit api improvements for D1 connections

changelogs/drizzle-kit/1.0.0-beta.21.md

@@ -0,0 +1,4 @@
+More fixes for the drizzle-kit migration process and commutativity checks
+
+- Adding a value to a PostgreSQL enum will no longer be treated as commutative
+- Enum values added in different leaves will now be merged properly

changelogs/drizzle-orm/0.45.1.md

@@ -0,0 +1 @@
+- Fixed pg-native Pool detection in node-postgres transactions breaking in environments with forbidden `require()` ([#5107](https://github.com/drizzle-team/drizzle-orm/issues/5107))  

drizzle-kit/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-kit",
-	"version": "1.0.0-beta.20",
+	"version": "1.0.0-beta.21",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
 		"drizzle",
@@ -148,6 +148,30 @@
 			},
 			"types": "./api-postgres.d.mts",
 			"default": "./api-postgres.mjs"
+		},
+		"./api-mysql": {
+			"import": {
+				"types": "./api-mysql.d.mts",
+				"default": "./api-mysql.mjs"
+			},
+			"require": {
+				"types": "./api-mysql.d.ts",
+				"default": "./api-mysql.js"
+			},
+			"types": "./api-mysql.d.mts",
+			"default": "./api-mysql.mjs"
+		},
+		"./api-sqlite": {
+			"import": {
+				"types": "./api-sqlite.d.mts",
+				"default": "./api-sqlite.mjs"
+			},
+			"require": {
+				"types": "./api-sqlite.d.ts",
+				"default": "./api-sqlite.js"
+			},
+			"types": "./api-sqlite.d.mts",
+			"default": "./api-sqlite.mjs"
 		}
 	}
 }

drizzle-kit/src/cli/commands/studio.ts

@@ -1,3 +1,4 @@
+/// <reference types="@cloudflare/workers-types" />
 import type { PGlite } from '@electric-sql/pglite';
 import { serve } from '@hono/node-server';
 import { zValidator } from '@hono/zod-validator';
@@ -68,6 +69,7 @@ export type Setup = {
 		| 'mysql2'
 		| '@planetscale/database'
 		| 'd1-http'
+		| 'd1'
 		| '@libsql/client'
 		| 'better-sqlite3'
 		| '@sqlitecloud/drivers'
@@ -76,7 +78,7 @@ export type Setup = {
 		| 'duckdb'
 		| '@duckdb/node-api'
 		| 'node:sqlite';
-	driver?: 'aws-data-api' | 'd1-http' | 'turso' | 'pglite' | 'sqlite-cloud';
+	driver?: 'aws-data-api' | 'd1-http' | 'd1' | 'turso' | 'pglite' | 'sqlite-cloud';
 	databaseName?: string; // for planetscale (driver remove database name from connection string)
 	proxy: Proxy;
 	transactionProxy: TransactionProxy;
@@ -457,17 +459,45 @@ export const drizzleForMySQL = async (
 // 	};
 // };
 
+// D1 binding credentials type (mirrors the one in connections.ts)
+type D1BindingCredentials = {
+	driver: 'd1';
+	binding: D1Database;
+};
+
 export const drizzleForSQLite = async (
-	credentials: SqliteCredentials,
+	credentials: SqliteCredentials | D1BindingCredentials,
 	sqliteSchema: Record<string, Record<string, AnySQLiteTable>>,
 	relations: Record<string, Relations>,
 	schemaFiles?: SchemaFile[],
 	casing?: CasingType,
 ): Promise<Setup> => {
-	const { connectToSQLite } = await import('../connections');
+	const customDefaults = getCustomDefaults(sqliteSchema, casing);
 
+	if ('driver' in credentials && credentials.driver === 'd1') {
+		const { connectToD1 } = await import('../connections');
+		const sqliteDB = await connectToD1(credentials.binding);
+
+		const dbUrl = 'd1://binding';
+		const dbHash = createHash('sha256').update(dbUrl).digest('hex');
+
+		return {
+			dbHash,
+			dialect: 'sqlite',
+			driver: 'd1',
+			packageName: 'd1',
+			proxy: sqliteDB.proxy,
+			transactionProxy: sqliteDB.transactionProxy,
+			customDefaults,
+			schema: sqliteSchema,
+			relations,
+			schemaFiles,
+			casing,
+		};
+	}
+
+	const { connectToSQLite } = await import('../connections');
 	const sqliteDB = await connectToSQLite(credentials);
-	const customDefaults = getCustomDefaults(sqliteSchema, casing);
 
 	let dbUrl: string;
 

drizzle-kit/src/cli/connections.ts

@@ -1,3 +1,4 @@
+/// <reference types="@cloudflare/workers-types" />
 import type { PGlite } from '@electric-sql/pglite';
 import type { SQLiteCloudRowset } from '@sqlitecloud/drivers';
 import type { AwsDataApiPgQueryResult, AwsDataApiSessionOptions } from 'drizzle-orm/aws-data-api/pg';
@@ -1702,7 +1703,7 @@ const prepareSqliteParams = (params: any[], driver?: string) => {
 				? JSON.stringify(param.value)
 				: (param.value as string);
 
-			if (driver === 'd1-http') {
+			if (driver === 'd1-http' || driver === 'd1') {
 				return value;
 			}
 
@@ -1731,6 +1732,84 @@ const preparePGliteParams = (params: any[]) => {
 	});
 };
 
+export type D1Credentials = {
+	driver: 'd1';
+	binding: D1Database;
+};
+
+export const connectToD1 = async (
+	d1: D1Database,
+): Promise<
+	& SQLiteDB
+	& {
+		packageName: 'd1';
+		migrate: (config: MigrationConfig) => Promise<void | MigratorInitFailResponse>;
+		proxy: Proxy;
+		transactionProxy: TransactionProxy;
+	}
+> => {
+	const db: SQLiteDB = {
+		query: async <T>(sql: string, params?: any[]) => {
+			const stmt = d1.prepare(sql);
+			const boundStmt = params && params.length > 0 ? stmt.bind(...params) : stmt;
+			const result = await boundStmt.all<T>();
+			return (result.results ?? []) as T[];
+		},
+		run: async (query: string) => {
+			const stmt = d1.prepare(query);
+			await stmt.run();
+		},
+		batch: async (statements: string[]) => {
+			await d1.batch(statements.map((s) => d1.prepare(s)));
+		},
+	};
+
+	const proxy: Proxy = async (params) => {
+		const preparedParams = prepareSqliteParams(params.params || [], 'd1');
+		const stmt = d1.prepare(params.sql);
+		const boundStmt = preparedParams.length > 0 ? stmt.bind(...preparedParams) : stmt;
+
+		try {
+			if (params.mode === 'array') {
+				return await boundStmt.raw();
+			}
+			const result = await boundStmt.all();
+			return result.results ?? [];
+		} catch (error: any) {
+			// D1 doesn't allow certain introspection queries (sqlite_master with pragma functions)
+			// Return empty array for SQLITE_AUTH errors on these system queries
+			if (error?.message?.includes('SQLITE_AUTH') || error?.message?.includes('not authorized')) {
+				return [];
+			}
+			throw error;
+		}
+	};
+
+	const transactionProxy: TransactionProxy = async (queries) => {
+		const results: any[] = [];
+		try {
+			// D1 doesn't support true transactions via binding, use batch instead
+			const statements = queries.map((q) => d1.prepare(q.sql));
+			const batchResults = await d1.batch(statements);
+			for (const result of batchResults) {
+				results.push(result.results ?? []);
+			}
+		} catch (error) {
+			results.push(error as Error);
+		}
+		return results;
+	};
+
+	const { drizzle } = await import('drizzle-orm/d1');
+	const { migrate } = await import('drizzle-orm/d1/migrator');
+	const drzl = drizzle(d1);
+	const migrateFn = async (config: MigrationConfig) => {
+		return migrate(drzl, config);
+	};
+
+	return { ...db, packageName: 'd1', proxy, transactionProxy, migrate: migrateFn };
+};
+
 export const connectToSQLite = async (
 	credentials: SqliteCredentials,
 ): Promise<