Fixed counts

Author: Sukairo-02

changelogs/drizzle-orm/1.0.0-rc.4.md

@@ -5,4 +5,5 @@
 - Fixed codecs not getting applied to `SQL` field when `.mapWith(column)` is set  (fixes [#5724](https://github.com/drizzle-team/drizzle-orm/issues/5724))
 - Fixed `Subquery` fields' columns' codecs not being applied to subquery  
 - Fixed broken in `rc.3` `db.select` in `bun-sql/pg` driver  
-- Updated SQLite `db.$count` builder to include `.sync()` executor for sync drivers
+- Updated SQLite `db.$count` builder to include `.sync()` executor for sync drivers
+- Fixed missing `customResultMapper` (RQBv1, temporarily `$count`) code paths in `sql-js`, `sqlite-cloud`, `tursodatabase` drivers

drizzle-orm/src/sql-js/session.ts

@@ -52,6 +52,7 @@ export class SQLJsSession<
 		query: Query,
 		fields: SelectedFieldsOrdered | undefined,
 		executeMethod: SQLiteExecuteMethod,
+		customResultMapper: (rows: unknown[][]) => unknown,
 	): PreparedQuery<T> {
 		return new PreparedQuery(
 			this.client,
@@ -60,6 +61,7 @@ export class SQLJsSession<
 			fields,
 			executeMethod,
 			this.options.useJitMappers,
+			customResultMapper,
 		);
 	}
 

drizzle-orm/src/sqlite-cloud/session.ts

@@ -273,6 +273,12 @@ export class SQLiteCloudPreparedQuery<
 		}
 
 		const rows = await this.values(placeholderValues) as unknown[][];
+		if (customResultMapper) {
+			return (customResultMapper as (
+				rows: unknown[][],
+				mapColumnValue?: (value: unknown) => unknown,
+			) => unknown)([rows]);
+		}
 
 		return this.useJitMappers
 			? (this.jitMapper = this.jitMapper as RowsMapper<T['all']>
@@ -333,6 +339,12 @@ export class SQLiteCloudPreparedQuery<
 		});
 
 		if (row === undefined) return row;
+		if (customResultMapper) {
+			return (customResultMapper as (
+				rows: unknown[][],
+				mapColumnValue?: (value: unknown) => unknown,
+			) => unknown)([row]);
+		}
 
 		return this.useJitMappers
 			? (this.jitMapper = this.jitMapper as RowsMapper<T['get'][]>

drizzle-orm/src/sqlite-core/query-builders/count.ts

@@ -70,11 +70,12 @@ export class SQLiteCountBuilder extends SQL<number> implements SQLWrapper<number
 				if (typeof v === 'number') return v;
 				return v ? Number(v) : 0;
 			},
-		).execute(placeholderValues) as any;
+		).get(placeholderValues) as any;
 	}
 
-	execute(placeholderValues?: Record<string, unknown>): Promise<number> {
-		return this.executeRaw(placeholderValues) as Promise<number>;
+	// async-await to avoid crashing when used on sync drivers with .then(), .catch() for compatibility
+	async execute(placeholderValues?: Record<string, unknown>): Promise<number> {
+		return await (this.executeRaw(placeholderValues));
 	}
 }
 

drizzle-orm/src/tursodatabase/session.ts

@@ -271,6 +271,12 @@ export class TursoDatabasePreparedQuery<
 		}
 
 		const rows = await this.values(placeholderValues) as unknown[][];
+		if (customResultMapper) {
+			return (customResultMapper as (
+				rows: unknown[][],
+				mapColumnValue?: (value: unknown) => unknown,
+			) => unknown)(rows);
+		}
 
 		return this.useJitMappers
 			? (this.jitMapper = this.jitMapper as RowsMapper<T['all']>
@@ -313,6 +319,12 @@ export class TursoDatabasePreparedQuery<
 		});
 
 		if (row === undefined) return row;
+		if (customResultMapper) {
+			return (customResultMapper as (
+				rows: unknown[][],
+				mapColumnValue?: (value: unknown) => unknown,
+			) => unknown)([row]);
+		}
 
 		return this.useJitMappers
 			? (this.jitMapper = this.jitMapper as RowsMapper<T['get'][]>