drizzle-kit 0.31.8 → 0.31.9

package/api.d.mts

@@ -3110,7 +3110,10 @@ declare const pushSQLiteSchema: (imports: Record<string, unknown>, drizzleInstan
     statementsToExecute: string[];
     apply: () => Promise<void>;
 }>;
-declare const startStudioSQLiteServer: (imports: Record<string, unknown>, credentials: SqliteCredentials, options?: {
+declare const startStudioSQLiteServer: (imports: Record<string, unknown>, credentials: SqliteCredentials | {
+    driver: "d1";
+    binding: D1Database;
+}, options?: {
     host?: string;
     port?: number;
     casing?: CasingType;

package/api.d.ts

@@ -3110,7 +3110,10 @@ declare const pushSQLiteSchema: (imports: Record<string, unknown>, drizzleInstan
     statementsToExecute: string[];
     apply: () => Promise<void>;
 }>;
-declare const startStudioSQLiteServer: (imports: Record<string, unknown>, credentials: SqliteCredentials, options?: {
+declare const startStudioSQLiteServer: (imports: Record<string, unknown>, credentials: SqliteCredentials | {
+    driver: "d1";
+    binding: D1Database;
+}, options?: {
     host?: string;
     port?: number;
     casing?: CasingType;

package/api.js

@@ -72173,6 +72173,7 @@ var require_index_node = __commonJS({
 // src/cli/connections.ts
 var connections_exports = {};
 __export(connections_exports, {
+  connectToD1: () => connectToD1,
   connectToLibSQL: () => connectToLibSQL,
   connectToMySQL: () => connectToMySQL,
   connectToSQLite: () => connectToSQLite,
@@ -72180,7 +72181,7 @@ __export(connections_exports, {
   prepareGelDB: () => prepareGelDB,
   preparePostgresDB: () => preparePostgresDB
 });
-var preparePostgresDB, prepareGelDB, parseSingleStoreCredentials, connectToSingleStore, parseMysqlCredentials, connectToMySQL, prepareSqliteParams, preparePGliteParams, connectToSQLite, connectToLibSQL;
+var preparePostgresDB, prepareGelDB, parseSingleStoreCredentials, connectToSingleStore, parseMysqlCredentials, connectToMySQL, prepareSqliteParams, preparePGliteParams, connectToD1, connectToSQLite, connectToLibSQL;
 var init_connections = __esm({
   "src/cli/connections.ts"() {
     "use strict";
@@ -72847,7 +72848,7 @@ To link your project, please refer https://docs.geldata.com/reference/cli/gel_in
       return params.map((param) => {
         if (param && typeof param === "object" && "type" in param && "value" in param && param.type === "binary") {
           const value = typeof param.value === "object" ? JSON.stringify(param.value) : param.value;
-          if (driver2 === "d1-http") {
+          if (driver2 === "d1-http" || driver2 === "d1") {
             return value;
           }
           return Buffer.from(value);
@@ -72864,6 +72865,57 @@ To link your project, please refer https://docs.geldata.com/reference/cli/gel_in
         return param;
       });
     };
+    connectToD1 = async (d1) => {
+      const db = {
+        query: async (sql, params) => {
+          const stmt = d1.prepare(sql);
+          const boundStmt = params && params.length > 0 ? stmt.bind(...params) : stmt;
+          const result = await boundStmt.all();
+          return result.results ?? [];
+        },
+        run: async (query) => {
+          const stmt = d1.prepare(query);
+          await stmt.run();
+        }
+      };
+      const 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 (error2) {
+          if (error2?.message?.includes("SQLITE_AUTH") || error2?.message?.includes("not authorized")) {
+            return [];
+          }
+          throw error2;
+        }
+      };
+      const transactionProxy = async (queries) => {
+        const results = [];
+        try {
+          const statements = queries.map((q5) => d1.prepare(q5.sql));
+          const batchResults = await d1.batch(statements);
+          for (const result of batchResults) {
+            results.push(result.results ?? []);
+          }
+        } catch (error2) {
+          results.push(error2);
+        }
+        return results;
+      };
+      const { drizzle } = require("drizzle-orm/d1");
+      const { migrate } = require("drizzle-orm/d1/migrator");
+      const drzl = drizzle(d1);
+      const migrateFn = async (config) => {
+        return migrate(drzl, config);
+      };
+      return { ...db, packageName: "d1", proxy, transactionProxy, migrate: migrateFn };
+    };
     connectToSQLite = async (credentials2) => {
       if ("driver" in credentials2) {
         const { driver: driver2 } = credentials2;
@@ -73372,9 +73424,28 @@ var init_studio2 = __esm({
       };
     };
     drizzleForSQLite = async (credentials2, sqliteSchema2, relations, schemaFiles, casing2) => {
+      const customDefaults = getCustomDefaults(sqliteSchema2, casing2);
+      if ("driver" in credentials2 && credentials2.driver === "d1") {
+        const { connectToD1: connectToD12 } = await Promise.resolve().then(() => (init_connections(), connections_exports));
+        const sqliteDB2 = await connectToD12(credentials2.binding);
+        const dbUrl2 = "d1://binding";
+        const dbHash2 = (0, import_crypto7.createHash)("sha256").update(dbUrl2).digest("hex");
+        return {
+          dbHash: dbHash2,
+          dialect: "sqlite",
+          driver: "d1",
+          packageName: "d1",
+          proxy: sqliteDB2.proxy,
+          transactionProxy: sqliteDB2.transactionProxy,
+          customDefaults,
+          schema: sqliteSchema2,
+          relations,
+          schemaFiles,
+          casing: casing2
+        };
+      }
       const { connectToSQLite: connectToSQLite2 } = await Promise.resolve().then(() => (init_connections(), connections_exports));
       const sqliteDB = await connectToSQLite2(credentials2);
-      const customDefaults = getCustomDefaults(sqliteSchema2, casing2);
       let dbUrl;
       if ("driver" in credentials2) {
         const { driver: driver2 } = credentials2;

package/api.mjs

@@ -72214,6 +72214,7 @@ var require_index_node = __commonJS({
 // src/cli/connections.ts
 var connections_exports = {};
 __export(connections_exports, {
+  connectToD1: () => connectToD1,
   connectToLibSQL: () => connectToLibSQL,
   connectToMySQL: () => connectToMySQL,
   connectToSQLite: () => connectToSQLite,
@@ -72221,7 +72222,7 @@ __export(connections_exports, {
   prepareGelDB: () => prepareGelDB,
   preparePostgresDB: () => preparePostgresDB
 });
-var preparePostgresDB, prepareGelDB, parseSingleStoreCredentials, connectToSingleStore, parseMysqlCredentials, connectToMySQL, prepareSqliteParams, preparePGliteParams, connectToSQLite, connectToLibSQL;
+var preparePostgresDB, prepareGelDB, parseSingleStoreCredentials, connectToSingleStore, parseMysqlCredentials, connectToMySQL, prepareSqliteParams, preparePGliteParams, connectToD1, connectToSQLite, connectToLibSQL;
 var init_connections = __esm({
   "src/cli/connections.ts"() {
     "use strict";
@@ -72888,7 +72889,7 @@ To link your project, please refer https://docs.geldata.com/reference/cli/gel_in
       return params.map((param) => {
         if (param && typeof param === "object" && "type" in param && "value" in param && param.type === "binary") {
           const value = typeof param.value === "object" ? JSON.stringify(param.value) : param.value;
-          if (driver2 === "d1-http") {
+          if (driver2 === "d1-http" || driver2 === "d1") {
             return value;
           }
           return Buffer.from(value);
@@ -72905,6 +72906,57 @@ To link your project, please refer https://docs.geldata.com/reference/cli/gel_in
         return param;
       });
     };
+    connectToD1 = async (d1) => {
+      const db = {
+        query: async (sql, params) => {
+          const stmt = d1.prepare(sql);
+          const boundStmt = params && params.length > 0 ? stmt.bind(...params) : stmt;
+          const result = await boundStmt.all();
+          return result.results ?? [];
+        },
+        run: async (query) => {
+          const stmt = d1.prepare(query);
+          await stmt.run();
+        }
+      };
+      const 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 (error2) {
+          if (error2?.message?.includes("SQLITE_AUTH") || error2?.message?.includes("not authorized")) {
+            return [];
+          }
+          throw error2;
+        }
+      };
+      const transactionProxy = async (queries) => {
+        const results = [];
+        try {
+          const statements = queries.map((q5) => d1.prepare(q5.sql));
+          const batchResults = await d1.batch(statements);
+          for (const result of batchResults) {
+            results.push(result.results ?? []);
+          }
+        } catch (error2) {
+          results.push(error2);
+        }
+        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) => {
+        return migrate(drzl, config);
+      };
+      return { ...db, packageName: "d1", proxy, transactionProxy, migrate: migrateFn };
+    };
     connectToSQLite = async (credentials2) => {
       if ("driver" in credentials2) {
         const { driver: driver2 } = credentials2;
@@ -73423,9 +73475,28 @@ var init_studio2 = __esm({
       };
     };
     drizzleForSQLite = async (credentials2, sqliteSchema2, relations, schemaFiles, casing2) => {
+      const customDefaults = getCustomDefaults(sqliteSchema2, casing2);
+      if ("driver" in credentials2 && credentials2.driver === "d1") {
+        const { connectToD1: connectToD12 } = await Promise.resolve().then(() => (init_connections(), connections_exports));
+        const sqliteDB2 = await connectToD12(credentials2.binding);
+        const dbUrl2 = "d1://binding";
+        const dbHash2 = createHash3("sha256").update(dbUrl2).digest("hex");
+        return {
+          dbHash: dbHash2,
+          dialect: "sqlite",
+          driver: "d1",
+          packageName: "d1",
+          proxy: sqliteDB2.proxy,
+          transactionProxy: sqliteDB2.transactionProxy,
+          customDefaults,
+          schema: sqliteSchema2,
+          relations,
+          schemaFiles,
+          casing: casing2
+        };
+      }
       const { connectToSQLite: connectToSQLite2 } = await Promise.resolve().then(() => (init_connections(), connections_exports));
       const sqliteDB = await connectToSQLite2(credentials2);
-      const customDefaults = getCustomDefaults(sqliteSchema2, casing2);
       let dbUrl;
       if ("driver" in credentials2) {
         const { driver: driver2 } = credentials2;

package/bin.cjs

@@ -80456,6 +80456,7 @@ var require_index_node = __commonJS({
 // src/cli/connections.ts
 var connections_exports = {};
 __export(connections_exports, {
+  connectToD1: () => connectToD1,
   connectToLibSQL: () => connectToLibSQL,
   connectToMySQL: () => connectToMySQL,
   connectToSQLite: () => connectToSQLite,
@@ -80463,7 +80464,7 @@ __export(connections_exports, {
   prepareGelDB: () => prepareGelDB,
   preparePostgresDB: () => preparePostgresDB
 });
-var preparePostgresDB, prepareGelDB, parseSingleStoreCredentials, connectToSingleStore, parseMysqlCredentials, connectToMySQL, prepareSqliteParams, preparePGliteParams, connectToSQLite, connectToLibSQL;
+var preparePostgresDB, prepareGelDB, parseSingleStoreCredentials, connectToSingleStore, parseMysqlCredentials, connectToMySQL, prepareSqliteParams, preparePGliteParams, connectToD1, connectToSQLite, connectToLibSQL;
 var init_connections = __esm({
   "src/cli/connections.ts"() {
     "use strict";
@@ -81130,7 +81131,7 @@ To link your project, please refer https://docs.geldata.com/reference/cli/gel_in
       return params.map((param) => {
         if (param && typeof param === "object" && "type" in param && "value" in param && param.type === "binary") {
           const value = typeof param.value === "object" ? JSON.stringify(param.value) : param.value;
-          if (driver2 === "d1-http") {
+          if (driver2 === "d1-http" || driver2 === "d1") {
             return value;
           }
           return Buffer.from(value);
@@ -81147,6 +81148,58 @@ To link your project, please refer https://docs.geldata.com/reference/cli/gel_in
         return param;
       });
     };
+    connectToD1 = async (d1) => {
+      const db = {
+        query: async (sql, params) => {
+          const stmt = d1.prepare(sql);
+          const boundStmt = params && params.length > 0 ? stmt.bind(...params) : stmt;
+          const result = await boundStmt.all();
+          return result.results ?? [];
+        },
+        run: async (query) => {
+          const stmt = d1.prepare(query);
+          await stmt.run();
+        }
+      };
+      const proxy = async (params) => {
+        var _a2, _b;
+        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 (error2) {
+          if (((_a2 = error2 == null ? void 0 : error2.message) == null ? void 0 : _a2.includes("SQLITE_AUTH")) || ((_b = error2 == null ? void 0 : error2.message) == null ? void 0 : _b.includes("not authorized"))) {
+            return [];
+          }
+          throw error2;
+        }
+      };
+      const transactionProxy = async (queries) => {
+        const results = [];
+        try {
+          const statements = queries.map((q3) => d1.prepare(q3.sql));
+          const batchResults = await d1.batch(statements);
+          for (const result of batchResults) {
+            results.push(result.results ?? []);
+          }
+        } catch (error2) {
+          results.push(error2);
+        }
+        return results;
+      };
+      const { drizzle } = await import("drizzle-orm/d1");
+      const { migrate: migrate2 } = await import("drizzle-orm/d1/migrator");
+      const drzl = drizzle(d1);
+      const migrateFn = async (config) => {
+        return migrate2(drzl, config);
+      };
+      return { ...db, packageName: "d1", proxy, transactionProxy, migrate: migrateFn };
+    };
     connectToSQLite = async (credentials2) => {
       if ("driver" in credentials2) {
         const { driver: driver2 } = credentials2;
@@ -91495,9 +91548,28 @@ var init_studio2 = __esm({
       };
     };
     drizzleForSQLite = async (credentials2, sqliteSchema2, relations5, schemaFiles, casing2) => {
+      const customDefaults = getCustomDefaults(sqliteSchema2, casing2);
+      if ("driver" in credentials2 && credentials2.driver === "d1") {
+        const { connectToD1: connectToD12 } = await Promise.resolve().then(() => (init_connections(), connections_exports));
+        const sqliteDB2 = await connectToD12(credentials2.binding);
+        const dbUrl2 = "d1://binding";
+        const dbHash2 = (0, import_crypto9.createHash)("sha256").update(dbUrl2).digest("hex");
+        return {
+          dbHash: dbHash2,
+          dialect: "sqlite",
+          driver: "d1",
+          packageName: "d1",
+          proxy: sqliteDB2.proxy,
+          transactionProxy: sqliteDB2.transactionProxy,
+          customDefaults,
+          schema: sqliteSchema2,
+          relations: relations5,
+          schemaFiles,
+          casing: casing2
+        };
+      }
       const { connectToSQLite: connectToSQLite2 } = await Promise.resolve().then(() => (init_connections(), connections_exports));
       const sqliteDB = await connectToSQLite2(credentials2);
-      const customDefaults = getCustomDefaults(sqliteSchema2, casing2);
       let dbUrl;
       if ("driver" in credentials2) {
         const { driver: driver2 } = credentials2;
@@ -94333,7 +94405,7 @@ init_utils5();
 var version2 = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "0.31.8";
+  const envVersion = "0.31.9";
   const kitVersion = envVersion ? `v${envVersion}` : "--";
   const versions = `drizzle-kit: ${kitVersion}
 ${ormVersion}`;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-kit",
-	"version": "0.31.8",
+	"version": "0.31.9",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
 		"drizzle",