drizzle-databend 0.1.13 → 0.1.14

package/dist/databend-core/db.d.ts

@@ -11,7 +11,7 @@ export declare class DatabendDatabase {
     query: any;
     constructor(dialect: any, session: any, schema?: any);
     $with(alias: string): {
-        as(qb: any): WithSubquery<string, Record<string, unknown>>;
+        as(qb: any): WithSubquery<string, any>;
     };
     $count(source: any, filters?: any): DatabendCountBuilder;
     with(...queries: any[]): {

package/dist/databend-core/query-builders/query-builder.d.ts

@@ -7,7 +7,7 @@ export declare class QueryBuilder {
     dialectConfig: any;
     constructor(dialect?: any);
     $with(alias: string): {
-        as(qb: any): WithSubquery<string, Record<string, unknown>>;
+        as(qb: any): WithSubquery<string, any>;
     };
     with(...queries: any[]): {
         select: (fields?: any) => DatabendSelectBuilder;

package/dist/databend-core/query-builders/select.d.ts

@@ -45,7 +45,7 @@ declare class DatabendSelectQueryBuilderBase extends TypedQueryBuilder<any, any>
     /** @internal */
     getSQL(): any;
     toSQL(): any;
-    as(alias: string): Subquery<string, Record<string, unknown>>;
+    as(alias: string): Subquery<string, any>;
     /** @internal */
     getSelectedFields(): any;
     $dynamic(): this;

package/dist/index.mjs

@@ -2952,6 +2952,12 @@ import {
   is as is10,
   SQL as SQL8
 } from "drizzle-orm";
+function getFieldSql(field) {
+  const f = field;
+  if (f.sql instanceof SQL8) return f.sql;
+  if (f._?.sql instanceof SQL8) return f._.sql;
+  throw new Error("Cannot extract SQL from field");
+}
 function toDecoderInput(decoder, value) {
   void decoder;
   return value;
@@ -3002,11 +3008,12 @@ function mapResultRow(columns, row, joinsNotNullableMap) {
       } else if (is10(field, SQL8)) {
         decoder = field.decoder;
       } else {
-        const col = field.sql.queryChunks.find((chunk) => is10(chunk, Column3));
+        const fieldSql = getFieldSql(field);
+        const col = fieldSql.queryChunks.find((chunk) => is10(chunk, Column3));
         if (is10(col, DatabendCustomColumn)) {
           decoder = col;
         } else {
-          decoder = field.sql.decoder;
+          decoder = fieldSql.decoder;
         }
       }
       let node = acc;

package/package.json

@@ -3,7 +3,7 @@
   "module": "./dist/index.mjs",
   "main": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "description": "A drizzle ORM driver for use with Databend. Based on drizzle's Postgres driver surface.",
   "type": "module",
   "scripts": {
@@ -18,7 +18,7 @@
   },
   "peerDependencies": {
     "databend-driver": ">=0.33.0",
-    "drizzle-orm": "^0.40.0"
+    "drizzle-orm": ">=0.40.0"
   },
   "peerDependenciesMeta": {
     "databend-driver": {
@@ -29,7 +29,7 @@
     "@biomejs/biome": "^2.4.7",
     "@types/node": "^25.5.0",
     "databend-driver": "^0.33.6",
-    "drizzle-orm": "0.40.0",
+    "drizzle-orm": "0.45.0",
     "esbuild": "^0.25.0",
     "typescript": "^5.8.2",
     "vitest": "^1.6.0"

package/src/sql/result-mapper.ts

@@ -6,6 +6,7 @@ import {
   is,
   type SelectedFieldsOrdered,
   SQL,
+  Subquery,
 } from 'drizzle-orm';
 import { DatabendCustomColumn } from '../databend-core/columns/custom.ts';
 import { DatabendDate } from '../databend-core/columns/date.ts';
@@ -15,6 +16,14 @@ type SQLInternal<T = unknown> = SQL<T> & {
   decoder: DriverValueDecoder<T, any>;
 };
 
+/** Extract SQL from Aliased (has .sql) or Subquery (has _.sql) */
+function getFieldSql(field: unknown): SQL {
+  const f = field as any;
+  if (f.sql instanceof SQL) return f.sql;
+  if (f._?.sql instanceof SQL) return f._.sql;
+  throw new Error('Cannot extract SQL from field');
+}
+
 type DecoderInput<TDecoder extends DriverValueDecoder<unknown, unknown>> =
   Parameters<TDecoder['mapFromDriverValue']>[0];
 
@@ -113,12 +122,13 @@ export function mapResultRow<TResult>(
       } else if (is(field, SQL)) {
         decoder = (field as SQLInternal).decoder;
       } else {
-        const col = field.sql.queryChunks.find((chunk) => is(chunk, Column));
+        const fieldSql = getFieldSql(field);
+        const col = fieldSql.queryChunks.find((chunk) => is(chunk, Column));
 
         if (is(col, DatabendCustomColumn)) {
           decoder = col;
         } else {
-          decoder = (field.sql as SQLInternal).decoder;
+          decoder = (fieldSql as SQLInternal).decoder;
         }
       }
       let node = acc;