drizzle-orm 0.28.6 → 0.28.7-6c67975

package/batch.d.cts

@@ -0,0 +1,8 @@
+import type { SelectResult } from './query-builders/select.types.js';
+import type { SQLiteDelete, SQLiteInsert, SQLiteSelect, SQLiteUpdate } from './sqlite-core/index.js';
+import type { SQLiteRelationalQuery } from './sqlite-core/query-builders/query.js';
+import type { SQLiteRaw } from './sqlite-core/query-builders/raw.js';
+export type BatchParameters<TDriverResult = any> = SQLiteUpdate<any, 'async', TDriverResult, any> | SQLiteSelect<any, 'async', TDriverResult, any, any> | SQLiteDelete<any, 'async', TDriverResult, any> | Omit<SQLiteDelete<any, 'async', TDriverResult, any>, 'where'> | Omit<SQLiteUpdate<any, 'async', TDriverResult, any>, 'where'> | SQLiteInsert<any, 'async', TDriverResult, any> | SQLiteRelationalQuery<'async', any> | SQLiteRaw<any>;
+export type BatchResponse<U extends BatchParameters, TQuery extends Readonly<[U, ...U[]]>> = {
+    [K in keyof TQuery]: TQuery[K] extends SQLiteSelect<infer _TTable, 'async', infer _TRes, infer TSelection, infer TSelectMode, infer TNullabilityMap> ? SelectResult<TSelection, TSelectMode, TNullabilityMap>[] : TQuery[K] extends SQLiteUpdate<infer _TTable, 'async', infer _TRunResult, infer _TReturning> ? _TReturning extends undefined ? _TRunResult : _TReturning[] : TQuery[K] extends Omit<SQLiteUpdate<infer _TTable, 'async', infer _TRunResult, infer _TReturning>, 'where'> ? _TReturning extends undefined ? _TRunResult : _TReturning[] : TQuery[K] extends SQLiteInsert<infer _TTable, 'async', infer _TRunResult, infer _TReturning> ? _TReturning extends undefined ? _TRunResult : _TReturning[] : TQuery[K] extends SQLiteDelete<infer _TTable, 'async', infer _TRunResult, infer _TReturning> ? _TReturning extends undefined ? _TRunResult : _TReturning[] : TQuery[K] extends Omit<SQLiteDelete<infer _TTable, 'async', infer _TRunResult, infer _TReturning>, 'where'> ? _TReturning extends undefined ? _TRunResult : _TReturning[] : TQuery[K] extends SQLiteRelationalQuery<'async', infer TResult> ? TResult : TQuery[K] extends SQLiteRaw<infer TResult> ? TResult : never;
+};

package/batch.d.mts

@@ -0,0 +1,8 @@
+import type { SelectResult } from './query-builders/select.types.js';
+import type { SQLiteDelete, SQLiteInsert, SQLiteSelect, SQLiteUpdate } from './sqlite-core/index.js';
+import type { SQLiteRelationalQuery } from './sqlite-core/query-builders/query.js';
+import type { SQLiteRaw } from './sqlite-core/query-builders/raw.js';
+export type BatchParameters<TDriverResult = any> = SQLiteUpdate<any, 'async', TDriverResult, any> | SQLiteSelect<any, 'async', TDriverResult, any, any> | SQLiteDelete<any, 'async', TDriverResult, any> | Omit<SQLiteDelete<any, 'async', TDriverResult, any>, 'where'> | Omit<SQLiteUpdate<any, 'async', TDriverResult, any>, 'where'> | SQLiteInsert<any, 'async', TDriverResult, any> | SQLiteRelationalQuery<'async', any> | SQLiteRaw<any>;
+export type BatchResponse<U extends BatchParameters, TQuery extends Readonly<[U, ...U[]]>> = {
+    [K in keyof TQuery]: TQuery[K] extends SQLiteSelect<infer _TTable, 'async', infer _TRes, infer TSelection, infer TSelectMode, infer TNullabilityMap> ? SelectResult<TSelection, TSelectMode, TNullabilityMap>[] : TQuery[K] extends SQLiteUpdate<infer _TTable, 'async', infer _TRunResult, infer _TReturning> ? _TReturning extends undefined ? _TRunResult : _TReturning[] : TQuery[K] extends Omit<SQLiteUpdate<infer _TTable, 'async', infer _TRunResult, infer _TReturning>, 'where'> ? _TReturning extends undefined ? _TRunResult : _TReturning[] : TQuery[K] extends SQLiteInsert<infer _TTable, 'async', infer _TRunResult, infer _TReturning> ? _TReturning extends undefined ? _TRunResult : _TReturning[] : TQuery[K] extends SQLiteDelete<infer _TTable, 'async', infer _TRunResult, infer _TReturning> ? _TReturning extends undefined ? _TRunResult : _TReturning[] : TQuery[K] extends Omit<SQLiteDelete<infer _TTable, 'async', infer _TRunResult, infer _TReturning>, 'where'> ? _TReturning extends undefined ? _TRunResult : _TReturning[] : TQuery[K] extends SQLiteRelationalQuery<'async', infer TResult> ? TResult : TQuery[K] extends SQLiteRaw<infer TResult> ? TResult : never;
+};

package/batch.d.ts

@@ -0,0 +1,8 @@
+import type { SelectResult } from './query-builders/select.types.js';
+import type { SQLiteDelete, SQLiteInsert, SQLiteSelect, SQLiteUpdate } from './sqlite-core/index.js';
+import type { SQLiteRelationalQuery } from './sqlite-core/query-builders/query.js';
+import type { SQLiteRaw } from './sqlite-core/query-builders/raw.js';
+export type BatchParameters<TDriverResult = any> = SQLiteUpdate<any, 'async', TDriverResult, any> | SQLiteSelect<any, 'async', TDriverResult, any, any> | SQLiteDelete<any, 'async', TDriverResult, any> | Omit<SQLiteDelete<any, 'async', TDriverResult, any>, 'where'> | Omit<SQLiteUpdate<any, 'async', TDriverResult, any>, 'where'> | SQLiteInsert<any, 'async', TDriverResult, any> | SQLiteRelationalQuery<'async', any> | SQLiteRaw<any>;
+export type BatchResponse<U extends BatchParameters, TQuery extends Readonly<[U, ...U[]]>> = {
+    [K in keyof TQuery]: TQuery[K] extends SQLiteSelect<infer _TTable, 'async', infer _TRes, infer TSelection, infer TSelectMode, infer TNullabilityMap> ? SelectResult<TSelection, TSelectMode, TNullabilityMap>[] : TQuery[K] extends SQLiteUpdate<infer _TTable, 'async', infer _TRunResult, infer _TReturning> ? _TReturning extends undefined ? _TRunResult : _TReturning[] : TQuery[K] extends Omit<SQLiteUpdate<infer _TTable, 'async', infer _TRunResult, infer _TReturning>, 'where'> ? _TReturning extends undefined ? _TRunResult : _TReturning[] : TQuery[K] extends SQLiteInsert<infer _TTable, 'async', infer _TRunResult, infer _TReturning> ? _TReturning extends undefined ? _TRunResult : _TReturning[] : TQuery[K] extends SQLiteDelete<infer _TTable, 'async', infer _TRunResult, infer _TReturning> ? _TReturning extends undefined ? _TRunResult : _TReturning[] : TQuery[K] extends Omit<SQLiteDelete<infer _TTable, 'async', infer _TRunResult, infer _TReturning>, 'where'> ? _TReturning extends undefined ? _TRunResult : _TReturning[] : TQuery[K] extends SQLiteRelationalQuery<'async', infer TResult> ? TResult : TQuery[K] extends SQLiteRaw<infer TResult> ? TResult : never;
+};

package/better-sqlite3/index.mjs

@@ -1,6 +1,6 @@
 import { NoopLogger, DefaultLogger } from '../index.mjs';
 import { e as entityKind, s as sql, f as fillPlaceholders, m as mapResultRow, a as extractTablesRelationalConfig, c as createTableRelationsHelpers } from '../alias-cf8e03cd.mjs';
-import { S as SQLiteSession, a as SQLiteTransaction, P as PreparedQuery$1, B as BaseSQLiteDatabase, b as SQLiteSyncDialect } from '../session-afae3551.mjs';
+import { S as SQLiteSession, a as SQLiteTransaction, P as PreparedQuery$1, B as BaseSQLiteDatabase, b as SQLiteSyncDialect } from '../session-f8888c77.mjs';
 
 class BetterSQLiteSession extends SQLiteSession {
     client;

package/bun-sqlite/index.mjs

@@ -1,6 +1,6 @@
 import { NoopLogger, DefaultLogger } from '../index.mjs';
 import { e as entityKind, s as sql, f as fillPlaceholders, m as mapResultRow, a as extractTablesRelationalConfig, c as createTableRelationsHelpers } from '../alias-cf8e03cd.mjs';
-import { S as SQLiteSession, a as SQLiteTransaction, P as PreparedQuery$1, B as BaseSQLiteDatabase, b as SQLiteSyncDialect } from '../session-afae3551.mjs';
+import { S as SQLiteSession, a as SQLiteTransaction, P as PreparedQuery$1, B as BaseSQLiteDatabase, b as SQLiteSyncDialect } from '../session-f8888c77.mjs';
 
 /// <reference types="bun-types" />
 class SQLiteBunSession extends SQLiteSession {

package/d1/driver.d.cts

@@ -1,5 +1,10 @@
 /// <reference types="@cloudflare/workers-types" />
 import { BaseSQLiteDatabase } from '../sqlite-core/db.js';
 import { type DrizzleConfig } from '../utils.js';
-export type DrizzleD1Database<TSchema extends Record<string, unknown> = Record<string, never>> = BaseSQLiteDatabase<'async', D1Result, TSchema>;
+import { entityKind } from '../entity.js';
+import type { BatchParameters, BatchResponse } from '../batch.js';
+export declare class DrizzleD1Database<TSchema extends Record<string, unknown> = Record<string, never>> extends BaseSQLiteDatabase<'async', D1Result, TSchema> {
+    static readonly [entityKind]: string;
+    batch<U extends BatchParameters<D1Result>, T extends Readonly<[U, ...U[]]>>(batch: T): Promise<BatchResponse<U, T>>;
+}
 export declare function drizzle<TSchema extends Record<string, unknown> = Record<string, never>>(client: D1Database, config?: DrizzleConfig<TSchema>): DrizzleD1Database<TSchema>;

package/d1/driver.d.mts

@@ -1,5 +1,10 @@
 /// <reference types="@cloudflare/workers-types" />
 import { BaseSQLiteDatabase } from '../sqlite-core/db.js';
 import { type DrizzleConfig } from '../utils.js';
-export type DrizzleD1Database<TSchema extends Record<string, unknown> = Record<string, never>> = BaseSQLiteDatabase<'async', D1Result, TSchema>;
+import { entityKind } from '../entity.js';
+import type { BatchParameters, BatchResponse } from '../batch.js';
+export declare class DrizzleD1Database<TSchema extends Record<string, unknown> = Record<string, never>> extends BaseSQLiteDatabase<'async', D1Result, TSchema> {
+    static readonly [entityKind]: string;
+    batch<U extends BatchParameters<D1Result>, T extends Readonly<[U, ...U[]]>>(batch: T): Promise<BatchResponse<U, T>>;
+}
 export declare function drizzle<TSchema extends Record<string, unknown> = Record<string, never>>(client: D1Database, config?: DrizzleConfig<TSchema>): DrizzleD1Database<TSchema>;

package/d1/driver.d.ts

@@ -1,5 +1,10 @@
 /// <reference types="@cloudflare/workers-types" />
 import { BaseSQLiteDatabase } from '../sqlite-core/db.js';
 import { type DrizzleConfig } from '../utils.js';
-export type DrizzleD1Database<TSchema extends Record<string, unknown> = Record<string, never>> = BaseSQLiteDatabase<'async', D1Result, TSchema>;
+import { entityKind } from '../entity.js';
+import type { BatchParameters, BatchResponse } from '../batch.js';
+export declare class DrizzleD1Database<TSchema extends Record<string, unknown> = Record<string, never>> extends BaseSQLiteDatabase<'async', D1Result, TSchema> {
+    static readonly [entityKind]: string;
+    batch<U extends BatchParameters<D1Result>, T extends Readonly<[U, ...U[]]>>(batch: T): Promise<BatchResponse<U, T>>;
+}
 export declare function drizzle<TSchema extends Record<string, unknown> = Record<string, never>>(client: D1Database, config?: DrizzleConfig<TSchema>): DrizzleD1Database<TSchema>;

package/d1/index.cjs

@@ -4,7 +4,7 @@ var index = require('../index-1899b9ae.cjs');
 var session = require('../session-90f70450.cjs');
 
 /// <reference types="@cloudflare/workers-types" />
-var _a, _b, _c;
+var _a$1, _b, _c;
 class SQLiteD1Session extends session.SQLiteSession {
     constructor(client, dialect, schema, options = {}) {
         super(dialect);
@@ -17,6 +17,80 @@ class SQLiteD1Session extends session.SQLiteSession {
         const stmt = this.client.prepare(query.sql);
         return new PreparedQuery(stmt, query.sql, query.params, this.logger, fields, executeMethod, customResultMapper);
     }
+    /**
+     * This function was taken from the D1 implementation: https://github.com/cloudflare/workerd/blob/4aae9f4c7ae30a59a88ca868c4aff88bda85c956/src/cloudflare/internal/d1-api.ts#L287
+     * It may cause issues with duplicated column names in join queries, which should be fixed on the D1 side.
+     * @param results
+     * @returns
+     */
+    d1ToRawMapping(results) {
+        const rows = [];
+        for (const row of results) {
+            const entry = Object.keys(row).map((k) => row[k]);
+            rows.push(entry);
+        }
+        return rows;
+    }
+    /*override */ batch(queries) {
+        const queryToType = [];
+        const builtQueries = queries.map((query) => {
+            if (index.is(query, (session.SQLiteSelect))) {
+                const prepared = query.prepare();
+                prepared.fields === undefined
+                    ? queryToType.push({ mode: 'all' })
+                    : queryToType.push({
+                        mode: 'all_mapped',
+                        config: { fields: prepared.fields, joinsNotNullableMap: prepared.joinsNotNullableMap },
+                    });
+                return prepared.stmt.bind(...prepared.params);
+            }
+            else if (index.is(query, (session.SQLiteInsert)) || index.is(query, (session.SQLiteUpdate))
+                || index.is(query, (session.SQLiteDelete))) {
+                const prepared = query.prepare();
+                queryToType.push(query.config.returning
+                    ? {
+                        mode: 'all_mapped',
+                        config: { fields: query.config.returning },
+                    }
+                    : { mode: 'raw' });
+                return prepared.stmt.bind(...prepared.params);
+            }
+            else if (index.is(query, session.SQLiteRaw)) {
+                const builtQuery = this.dialect.sqlToQuery(query.getSQL());
+                queryToType.push(query.config.action === 'run' ? { mode: 'raw' } : { mode: query.config.action });
+                return this.client.prepare(builtQuery.sql).bind(...builtQuery.params);
+            }
+            else if (index.is(query, session.SQLiteRelationalQuery)) {
+                const preparedRqb = query.prepare();
+                queryToType.push({ mode: 'rqb', mapper: preparedRqb.customResultMapper });
+                return preparedRqb.stmt.bind(...preparedRqb.params);
+            }
+            throw new index.DrizzleError('You can use only drizzle queries in D1 batch api');
+        });
+        const res = this.client.batch(builtQueries).then((stmt) => stmt.map(({ results }, index$1) => {
+            const action = queryToType[index$1];
+            if (action.mode === 'all') {
+                return results;
+            }
+            if (action.mode === 'all_mapped') {
+                const mappedRows = this.d1ToRawMapping(results);
+                return mappedRows.map((row) => {
+                    return index.mapResultRow(action.config.fields, row, action.config.joinsNotNullableMap);
+                });
+            }
+            if (action.mode === 'get') {
+                return results[0];
+            }
+            if (action.mode === 'values') {
+                return this.d1ToRawMapping(results);
+            }
+            if (action.mode === 'raw') {
+                return stmt[index$1];
+            }
+            return action.mapper(this.d1ToRawMapping(results));
+        }));
+        return res;
+    }
     async transaction(transaction, config) {
         const tx = new D1Transaction('async', this.dialect, this, this.schema);
         await this.run(index.sql.raw(`begin${config?.behavior ? ' ' + config.behavior : ''}`));
@@ -31,8 +105,8 @@ class SQLiteD1Session extends session.SQLiteSession {
         }
     }
 }
-_a = index.entityKind;
-SQLiteD1Session[_a] = 'SQLiteD1Session';
+_a$1 = index.entityKind;
+SQLiteD1Session[_a$1] = 'SQLiteD1Session';
 class D1Transaction extends session.SQLiteTransaction {
     async transaction(transaction) {
         const savepointName = `sp${this.nestedIndex}`;
@@ -54,12 +128,12 @@ D1Transaction[_b] = 'D1Transaction';
 class PreparedQuery extends session.PreparedQuery {
     constructor(stmt, queryString, params, logger, fields, executeMethod, customResultMapper) {
         super('async', executeMethod);
-        this.stmt = stmt;
         this.queryString = queryString;
-        this.params = params;
         this.logger = logger;
-        this.fields = fields;
         this.customResultMapper = customResultMapper;
+        this.fields = fields;
+        this.stmt = stmt;
+        this.params = params;
     }
     run(placeholderValues) {
         const params = index.fillPlaceholders(this.params, placeholderValues ?? {});
@@ -104,7 +178,14 @@ class PreparedQuery extends session.PreparedQuery {
 _c = index.entityKind;
 PreparedQuery[_c] = 'D1PreparedQuery';
 
-/// <reference types="@cloudflare/workers-types" />
+var _a;
+class DrizzleD1Database extends session.BaseSQLiteDatabase {
+    async batch(batch) {
+        return await this.session.batch(batch);
+    }
+}
+_a = index.entityKind;
+DrizzleD1Database[_a] = 'LibSQLDatabase';
 function drizzle(client, config = {}) {
     const dialect = new session.SQLiteAsyncDialect();
     let logger;
@@ -124,10 +205,11 @@ function drizzle(client, config = {}) {
         };
     }
     const session$1 = new SQLiteD1Session(client, dialect, schema, { logger });
-    return new session.BaseSQLiteDatabase('async', dialect, session$1, schema);
+    return new DrizzleD1Database('async', dialect, session$1, schema);
 }
 
 exports.D1Transaction = D1Transaction;
+exports.DrizzleD1Database = DrizzleD1Database;
 exports.PreparedQuery = PreparedQuery;
 exports.SQLiteD1Session = SQLiteD1Session;
 exports.drizzle = drizzle;

package/d1/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sources":["../../src/d1/session.ts","../../src/d1/driver.ts"],"sourcesContent":[null,null],"names":["SQLiteSession","NoopLogger","sql","entityKind","SQLiteTransaction","PreparedQueryBase","fillPlaceholders","mapResultRow","SQLiteAsyncDialect","DefaultLogger","extractTablesRelationalConfig","createTableRelationsHelpers","session","BaseSQLiteDatabase"],"mappings":"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"}
+{"version":3,"file":"index.cjs","sources":["../../src/d1/session.ts","../../src/d1/driver.ts"],"sourcesContent":[null,null],"names":["SQLiteSession","NoopLogger","is","SQLiteSelect","SQLiteInsert","SQLiteUpdate","SQLiteDelete","SQLiteRaw","SQLiteRelationalQuery","DrizzleError","index","mapResultRow","sql","entityKind","_a","SQLiteTransaction","PreparedQueryBase","fillPlaceholders","BaseSQLiteDatabase","SQLiteAsyncDialect","DefaultLogger","extractTablesRelationalConfig","createTableRelationsHelpers","session"],"mappings":"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"}

package/d1/index.mjs

@@ -1,6 +1,6 @@
 import { NoopLogger, DefaultLogger } from '../index.mjs';
-import { e as entityKind, s as sql, f as fillPlaceholders, m as mapResultRow, a as extractTablesRelationalConfig, c as createTableRelationsHelpers } from '../alias-cf8e03cd.mjs';
-import { S as SQLiteSession, a as SQLiteTransaction, P as PreparedQuery$1, B as BaseSQLiteDatabase, c as SQLiteAsyncDialect } from '../session-afae3551.mjs';
+import { e as entityKind, i as is, D as DrizzleError, m as mapResultRow, s as sql, f as fillPlaceholders, a as extractTablesRelationalConfig, c as createTableRelationsHelpers } from '../alias-cf8e03cd.mjs';
+import { S as SQLiteSession, c as SQLiteSelect, d as SQLiteInsert, e as SQLiteUpdate, f as SQLiteDelete, g as SQLiteRaw, h as SQLiteRelationalQuery, a as SQLiteTransaction, P as PreparedQuery$1, B as BaseSQLiteDatabase, i as SQLiteAsyncDialect } from '../session-f8888c77.mjs';
 
 /// <reference types="@cloudflare/workers-types" />
 class SQLiteD1Session extends SQLiteSession {
@@ -20,6 +20,80 @@ class SQLiteD1Session extends SQLiteSession {
         const stmt = this.client.prepare(query.sql);
         return new PreparedQuery(stmt, query.sql, query.params, this.logger, fields, executeMethod, customResultMapper);
     }
+    /**
+     * This function was taken from the D1 implementation: https://github.com/cloudflare/workerd/blob/4aae9f4c7ae30a59a88ca868c4aff88bda85c956/src/cloudflare/internal/d1-api.ts#L287
+     * It may cause issues with duplicated column names in join queries, which should be fixed on the D1 side.
+     * @param results
+     * @returns
+     */
+    d1ToRawMapping(results) {
+        const rows = [];
+        for (const row of results) {
+            const entry = Object.keys(row).map((k) => row[k]);
+            rows.push(entry);
+        }
+        return rows;
+    }
+    /*override */ batch(queries) {
+        const queryToType = [];
+        const builtQueries = queries.map((query) => {
+            if (is(query, (SQLiteSelect))) {
+                const prepared = query.prepare();
+                prepared.fields === undefined
+                    ? queryToType.push({ mode: 'all' })
+                    : queryToType.push({
+                        mode: 'all_mapped',
+                        config: { fields: prepared.fields, joinsNotNullableMap: prepared.joinsNotNullableMap },
+                    });
+                return prepared.stmt.bind(...prepared.params);
+            }
+            else if (is(query, (SQLiteInsert)) || is(query, (SQLiteUpdate))
+                || is(query, (SQLiteDelete))) {
+                const prepared = query.prepare();
+                queryToType.push(query.config.returning
+                    ? {
+                        mode: 'all_mapped',
+                        config: { fields: query.config.returning },
+                    }
+                    : { mode: 'raw' });
+                return prepared.stmt.bind(...prepared.params);
+            }
+            else if (is(query, SQLiteRaw)) {
+                const builtQuery = this.dialect.sqlToQuery(query.getSQL());
+                queryToType.push(query.config.action === 'run' ? { mode: 'raw' } : { mode: query.config.action });
+                return this.client.prepare(builtQuery.sql).bind(...builtQuery.params);
+            }
+            else if (is(query, SQLiteRelationalQuery)) {
+                const preparedRqb = query.prepare();
+                queryToType.push({ mode: 'rqb', mapper: preparedRqb.customResultMapper });
+                return preparedRqb.stmt.bind(...preparedRqb.params);
+            }
+            throw new DrizzleError('You can use only drizzle queries in D1 batch api');
+        });
+        const res = this.client.batch(builtQueries).then((stmt) => stmt.map(({ results }, index) => {
+            const action = queryToType[index];
+            if (action.mode === 'all') {
+                return results;
+            }
+            if (action.mode === 'all_mapped') {
+                const mappedRows = this.d1ToRawMapping(results);
+                return mappedRows.map((row) => {
+                    return mapResultRow(action.config.fields, row, action.config.joinsNotNullableMap);
+                });
+            }
+            if (action.mode === 'get') {
+                return results[0];
+            }
+            if (action.mode === 'values') {
+                return this.d1ToRawMapping(results);
+            }
+            if (action.mode === 'raw') {
+                return stmt[index];
+            }
+            return action.mapper(this.d1ToRawMapping(results));
+        }));
+        return res;
+    }
     async transaction(transaction, config) {
         const tx = new D1Transaction('async', this.dialect, this, this.schema);
         await this.run(sql.raw(`begin${config?.behavior ? ' ' + config.behavior : ''}`));
@@ -52,21 +126,25 @@ class D1Transaction extends SQLiteTransaction {
     }
 }
 class PreparedQuery extends PreparedQuery$1 {
-    stmt;
     queryString;
-    params;
     logger;
-    fields;
-    customResultMapper;
     static [entityKind] = 'D1PreparedQuery';
+    /** @internal */
+    customResultMapper;
+    /** @internal */
+    fields;
+    /** @internal */
+    params;
+    /** @internal */
+    stmt;
     constructor(stmt, queryString, params, logger, fields, executeMethod, customResultMapper) {
         super('async', executeMethod);
-        this.stmt = stmt;
         this.queryString = queryString;
-        this.params = params;
         this.logger = logger;
-        this.fields = fields;
         this.customResultMapper = customResultMapper;
+        this.fields = fields;
+        this.stmt = stmt;
+        this.params = params;
     }
     run(placeholderValues) {
         const params = fillPlaceholders(this.params, placeholderValues ?? {});
@@ -110,6 +188,12 @@ class PreparedQuery extends PreparedQuery$1 {
 }
 
 /// <reference types="@cloudflare/workers-types" />
+class DrizzleD1Database extends BaseSQLiteDatabase {
+    static [entityKind] = 'LibSQLDatabase';
+    async batch(batch) {
+        return await this.session.batch(batch);
+    }
+}
 function drizzle(client, config = {}) {
     const dialect = new SQLiteAsyncDialect();
     let logger;
@@ -129,8 +213,8 @@ function drizzle(client, config = {}) {
         };
     }
     const session = new SQLiteD1Session(client, dialect, schema, { logger });
-    return new BaseSQLiteDatabase('async', dialect, session, schema);
+    return new DrizzleD1Database('async', dialect, session, schema);
 }
 
-export { D1Transaction, PreparedQuery, SQLiteD1Session, drizzle };
+export { D1Transaction, DrizzleD1Database, PreparedQuery, SQLiteD1Session, drizzle };
 //# sourceMappingURL=index.mjs.map

package/d1/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":["../../src/d1/session.ts","../../src/d1/driver.ts"],"sourcesContent":[null,null],"names":["PreparedQueryBase"],"mappings":"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"}
+{"version":3,"file":"index.mjs","sources":["../../src/d1/session.ts","../../src/d1/driver.ts"],"sourcesContent":[null,null],"names":["PreparedQueryBase"],"mappings":"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"}

package/d1/session.d.cts

@@ -1,4 +1,5 @@
 /// <reference types="@cloudflare/workers-types" />
+import type { BatchParameters } from '../batch.js';
 import { entityKind } from '../entity.js';
 import type { Logger } from '../logger.js';
 import { type RelationalSchemaConfig, type TablesRelationalConfig } from '../relations.js';
@@ -20,6 +21,14 @@ export declare class SQLiteD1Session<TFullSchema extends Record<string, unknown>
     private logger;
     constructor(client: D1Database, dialect: SQLiteAsyncDialect, schema: RelationalSchemaConfig<TSchema> | undefined, options?: SQLiteD1SessionOptions);
     prepareQuery(query: Query, fields: SelectedFieldsOrdered | undefined, executeMethod: SQLiteExecuteMethod, customResultMapper?: (rows: unknown[][]) => unknown): PreparedQuery;
+    /**
+     * This function was taken from the D1 implementation: https://github.com/cloudflare/workerd/blob/4aae9f4c7ae30a59a88ca868c4aff88bda85c956/src/cloudflare/internal/d1-api.ts#L287
+     * It may cause issues with duplicated column names in join queries, which should be fixed on the D1 side.
+     * @param results
+     * @returns
+     */
+    private d1ToRawMapping;
+    batch<U extends BatchParameters, T extends Readonly<[U, ...U[]]>>(queries: T): Promise<any[]>;
     transaction<T>(transaction: (tx: D1Transaction<TFullSchema, TSchema>) => T | Promise<T>, config?: SQLiteTransactionConfig): Promise<T>;
 }
 export declare class D1Transaction<TFullSchema extends Record<string, unknown>, TSchema extends TablesRelationalConfig> extends SQLiteTransaction<'async', D1Result, TFullSchema, TSchema> {
@@ -34,14 +43,10 @@ export declare class PreparedQuery<T extends PreparedQueryConfig = PreparedQuery
     values: T['values'];
     execute: T['execute'];
 }> {
-    private stmt;
     private queryString;
-    private params;
     private logger;
-    private fields;
-    private customResultMapper?;
     static readonly [entityKind]: string;
-    constructor(stmt: D1PreparedStatement, queryString: string, params: unknown[], logger: Logger, fields: SelectedFieldsOrdered | undefined, executeMethod: SQLiteExecuteMethod, customResultMapper?: ((rows: unknown[][]) => unknown) | undefined);
+    constructor(stmt: D1PreparedStatement, queryString: string, params: unknown[], logger: Logger, fields: SelectedFieldsOrdered | undefined, executeMethod: SQLiteExecuteMethod, customResultMapper?: (rows: unknown[][]) => unknown);
     run(placeholderValues?: Record<string, unknown>): Promise<D1Result>;
     all(placeholderValues?: Record<string, unknown>): Promise<T['all']>;
     get(placeholderValues?: Record<string, unknown>): Promise<T['get']>;

package/d1/session.d.mts

@@ -1,4 +1,5 @@
 /// <reference types="@cloudflare/workers-types" />
+import type { BatchParameters } from '../batch.js';
 import { entityKind } from '../entity.js';
 import type { Logger } from '../logger.js';
 import { type RelationalSchemaConfig, type TablesRelationalConfig } from '../relations.js';
@@ -20,6 +21,14 @@ export declare class SQLiteD1Session<TFullSchema extends Record<string, unknown>
     private logger;
     constructor(client: D1Database, dialect: SQLiteAsyncDialect, schema: RelationalSchemaConfig<TSchema> | undefined, options?: SQLiteD1SessionOptions);
     prepareQuery(query: Query, fields: SelectedFieldsOrdered | undefined, executeMethod: SQLiteExecuteMethod, customResultMapper?: (rows: unknown[][]) => unknown): PreparedQuery;
+    /**
+     * This function was taken from the D1 implementation: https://github.com/cloudflare/workerd/blob/4aae9f4c7ae30a59a88ca868c4aff88bda85c956/src/cloudflare/internal/d1-api.ts#L287
+     * It may cause issues with duplicated column names in join queries, which should be fixed on the D1 side.
+     * @param results
+     * @returns
+     */
+    private d1ToRawMapping;
+    batch<U extends BatchParameters, T extends Readonly<[U, ...U[]]>>(queries: T): Promise<any[]>;
     transaction<T>(transaction: (tx: D1Transaction<TFullSchema, TSchema>) => T | Promise<T>, config?: SQLiteTransactionConfig): Promise<T>;
 }
 export declare class D1Transaction<TFullSchema extends Record<string, unknown>, TSchema extends TablesRelationalConfig> extends SQLiteTransaction<'async', D1Result, TFullSchema, TSchema> {
@@ -34,14 +43,10 @@ export declare class PreparedQuery<T extends PreparedQueryConfig = PreparedQuery
     values: T['values'];
     execute: T['execute'];
 }> {
-    private stmt;
     private queryString;
-    private params;
     private logger;
-    private fields;
-    private customResultMapper?;
     static readonly [entityKind]: string;
-    constructor(stmt: D1PreparedStatement, queryString: string, params: unknown[], logger: Logger, fields: SelectedFieldsOrdered | undefined, executeMethod: SQLiteExecuteMethod, customResultMapper?: ((rows: unknown[][]) => unknown) | undefined);
+    constructor(stmt: D1PreparedStatement, queryString: string, params: unknown[], logger: Logger, fields: SelectedFieldsOrdered | undefined, executeMethod: SQLiteExecuteMethod, customResultMapper?: (rows: unknown[][]) => unknown);
     run(placeholderValues?: Record<string, unknown>): Promise<D1Result>;
     all(placeholderValues?: Record<string, unknown>): Promise<T['all']>;
     get(placeholderValues?: Record<string, unknown>): Promise<T['get']>;

package/d1/session.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="@cloudflare/workers-types" />
+import type { BatchParameters } from '../batch.js';
 import { entityKind } from '../entity.js';
 import type { Logger } from '../logger.js';
 import { type RelationalSchemaConfig, type TablesRelationalConfig } from '../relations.js';
@@ -20,6 +21,14 @@ export declare class SQLiteD1Session<TFullSchema extends Record<string, unknown>
     private logger;
     constructor(client: D1Database, dialect: SQLiteAsyncDialect, schema: RelationalSchemaConfig<TSchema> | undefined, options?: SQLiteD1SessionOptions);
     prepareQuery(query: Query, fields: SelectedFieldsOrdered | undefined, executeMethod: SQLiteExecuteMethod, customResultMapper?: (rows: unknown[][]) => unknown): PreparedQuery;
+    /**
+     * This function was taken from the D1 implementation: https://github.com/cloudflare/workerd/blob/4aae9f4c7ae30a59a88ca868c4aff88bda85c956/src/cloudflare/internal/d1-api.ts#L287
+     * It may cause issues with duplicated column names in join queries, which should be fixed on the D1 side.
+     * @param results
+     * @returns
+     */
+    private d1ToRawMapping;
+    batch<U extends BatchParameters, T extends Readonly<[U, ...U[]]>>(queries: T): Promise<any[]>;
     transaction<T>(transaction: (tx: D1Transaction<TFullSchema, TSchema>) => T | Promise<T>, config?: SQLiteTransactionConfig): Promise<T>;
 }
 export declare class D1Transaction<TFullSchema extends Record<string, unknown>, TSchema extends TablesRelationalConfig> extends SQLiteTransaction<'async', D1Result, TFullSchema, TSchema> {
@@ -34,14 +43,10 @@ export declare class PreparedQuery<T extends PreparedQueryConfig = PreparedQuery
     values: T['values'];
     execute: T['execute'];
 }> {
-    private stmt;
     private queryString;
-    private params;
     private logger;
-    private fields;
-    private customResultMapper?;
     static readonly [entityKind]: string;
-    constructor(stmt: D1PreparedStatement, queryString: string, params: unknown[], logger: Logger, fields: SelectedFieldsOrdered | undefined, executeMethod: SQLiteExecuteMethod, customResultMapper?: ((rows: unknown[][]) => unknown) | undefined);
+    constructor(stmt: D1PreparedStatement, queryString: string, params: unknown[], logger: Logger, fields: SelectedFieldsOrdered | undefined, executeMethod: SQLiteExecuteMethod, customResultMapper?: (rows: unknown[][]) => unknown);
     run(placeholderValues?: Record<string, unknown>): Promise<D1Result>;
     all(placeholderValues?: Record<string, unknown>): Promise<T['all']>;
     get(placeholderValues?: Record<string, unknown>): Promise<T['get']>;

package/libsql/driver.d.cts

@@ -1,17 +1,10 @@
 import type { Client, ResultSet } from '@libsql/client';
 import { entityKind } from '../entity.js';
-import type { SelectResult } from '../query-builders/select.types.js';
 import { BaseSQLiteDatabase } from '../sqlite-core/db.js';
-import type { SQLiteDelete, SQLiteInsert, SQLiteSelect, SQLiteUpdate } from '../sqlite-core/index.js';
-import type { SQLiteRelationalQuery } from '../sqlite-core/query-builders/query.js';
-import type { SQLiteRaw } from '../sqlite-core/query-builders/raw.js';
 import { type DrizzleConfig } from '../utils.js';
-export type BatchParameters = SQLiteUpdate<any, 'async', ResultSet, any> | SQLiteSelect<any, 'async', ResultSet, any, any> | SQLiteDelete<any, 'async', ResultSet, any> | Omit<SQLiteDelete<any, 'async', ResultSet, any>, 'where'> | Omit<SQLiteUpdate<any, 'async', ResultSet, any>, 'where'> | SQLiteInsert<any, 'async', ResultSet, any> | SQLiteRelationalQuery<'async', any> | SQLiteRaw<any>;
-export type BatchResponse<U extends BatchParameters, TQuery extends Readonly<[U, ...U[]]>> = {
-    [K in keyof TQuery]: TQuery[K] extends SQLiteSelect<infer _TTable, 'async', infer _TRes, infer TSelection, infer TSelectMode, infer TNullabilityMap> ? SelectResult<TSelection, TSelectMode, TNullabilityMap>[] : TQuery[K] extends SQLiteUpdate<infer _TTable, 'async', infer _TRunResult, infer _TReturning> ? _TReturning extends undefined ? _TRunResult : _TReturning[] : TQuery[K] extends Omit<SQLiteUpdate<infer _TTable, 'async', infer _TRunResult, infer _TReturning>, 'where'> ? _TReturning extends undefined ? _TRunResult : _TReturning[] : TQuery[K] extends SQLiteInsert<infer _TTable, 'async', infer _TRunResult, infer _TReturning> ? _TReturning extends undefined ? _TRunResult : _TReturning[] : TQuery[K] extends SQLiteDelete<infer _TTable, 'async', infer _TRunResult, infer _TReturning> ? _TReturning extends undefined ? _TRunResult : _TReturning[] : TQuery[K] extends Omit<SQLiteDelete<infer _TTable, 'async', infer _TRunResult, infer _TReturning>, 'where'> ? _TReturning extends undefined ? _TRunResult : _TReturning[] : TQuery[K] extends SQLiteRelationalQuery<'async', infer TResult> ? TResult : TQuery[K] extends SQLiteRaw<infer TResult> ? TResult : never;
-};
+import type { BatchParameters, BatchResponse } from '../batch.js';
 export declare class LibSQLDatabase<TSchema extends Record<string, unknown> = Record<string, never>> extends BaseSQLiteDatabase<'async', ResultSet, TSchema> {
     static readonly [entityKind]: string;
-    batch<U extends BatchParameters, T extends Readonly<[U, ...U[]]>>(batch: T): Promise<BatchResponse<U, T>>;
+    batch<U extends BatchParameters<ResultSet>, T extends Readonly<[U, ...U[]]>>(batch: T): Promise<BatchResponse<U, T>>;
 }
 export declare function drizzle<TSchema extends Record<string, unknown> = Record<string, never>>(client: Client, config?: DrizzleConfig<TSchema>): LibSQLDatabase<TSchema>;