drizzle-databend 0.1.12 → 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

@@ -26,6 +26,7 @@ declare class DatabendSelectQueryBuilderBase extends TypedQueryBuilder<any, any>
     rightJoin: (table: any, on: any) => this;
     innerJoin: (table: any, on: any) => this;
     fullJoin: (table: any, on: any) => this;
+    crossJoin: (table: any) => this;
     private createSetOperator;
     union: (rightSelection: any) => this;
     unionAll: (rightSelection: any) => this;
@@ -44,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

@@ -1065,6 +1065,7 @@ var DatabendDialect = class {
       }
       const table = joinMeta.table;
       const lateralSql = joinMeta.lateral ? sql3` lateral` : void 0;
+      const onClause = joinMeta.on ? sql3` on ${joinMeta.on}` : void 0;
       if (is(table, DatabendTable)) {
         const t = table;
         const tableName = t[DatabendTable.Symbol.Name];
@@ -1072,7 +1073,7 @@ var DatabendDialect = class {
         const origTableName = t[DatabendTable.Symbol.OriginalName];
         const alias2 = tableName === origTableName ? void 0 : joinMeta.alias;
         joinsArray.push(
-          sql3`${sql3.raw(joinMeta.joinType)} join${lateralSql} ${tableSchema ? sql3`${sql3.identifier(tableSchema)}.` : void 0}${sql3.identifier(origTableName)}${alias2 && sql3` ${sql3.identifier(alias2)}`} on ${joinMeta.on}`
+          sql3`${sql3.raw(joinMeta.joinType)} join${lateralSql} ${tableSchema ? sql3`${sql3.identifier(tableSchema)}.` : void 0}${sql3.identifier(origTableName)}${alias2 && sql3` ${sql3.identifier(alias2)}`}${onClause}`
         );
       } else if (is(table, View2)) {
         const viewName = table[ViewBaseConfig].name;
@@ -1080,11 +1081,11 @@ var DatabendDialect = class {
         const origViewName = table[ViewBaseConfig].originalName;
         const alias2 = viewName === origViewName ? void 0 : joinMeta.alias;
         joinsArray.push(
-          sql3`${sql3.raw(joinMeta.joinType)} join${lateralSql} ${viewSchema ? sql3`${sql3.identifier(viewSchema)}.` : void 0}${sql3.identifier(origViewName)}${alias2 && sql3` ${sql3.identifier(alias2)}`} on ${joinMeta.on}`
+          sql3`${sql3.raw(joinMeta.joinType)} join${lateralSql} ${viewSchema ? sql3`${sql3.identifier(viewSchema)}.` : void 0}${sql3.identifier(origViewName)}${alias2 && sql3` ${sql3.identifier(alias2)}`}${onClause}`
         );
       } else {
         joinsArray.push(
-          sql3`${sql3.raw(joinMeta.joinType)} join${lateralSql} ${table} on ${joinMeta.on}`
+          sql3`${sql3.raw(joinMeta.joinType)} join${lateralSql} ${table}${onClause}`
         );
       }
       if (index2 < joins.length - 1) {
@@ -1807,6 +1808,32 @@ var DatabendSelectQueryBuilderBase = class extends TypedQueryBuilder {
   rightJoin = this.createJoin("right");
   innerJoin = this.createJoin("inner");
   fullJoin = this.createJoin("full");
+  crossJoin = (table) => {
+    const baseTableName = this.tableName;
+    const tableName = getTableLikeName(table);
+    if (typeof tableName === "string" && this.config.joins?.some((join) => join.alias === tableName)) {
+      throw new Error(`Alias "${tableName}" is already used in this query`);
+    }
+    if (!this.isPartialSelect) {
+      if (Object.keys(this.joinsNotNullableMap).length === 1 && typeof baseTableName === "string") {
+        this.config.fields = {
+          [baseTableName]: this.config.fields
+        };
+      }
+      if (typeof tableName === "string" && !is5(table, SQL4)) {
+        const selection = is5(table, Subquery2) ? table._.selectedFields : is5(table, View3) ? table[ViewBaseConfig2].selectedFields : table[Table4.Symbol.Columns];
+        this.config.fields[tableName] = selection;
+      }
+    }
+    if (!this.config.joins) {
+      this.config.joins = [];
+    }
+    this.config.joins.push({ on: void 0, table, joinType: "cross", alias: tableName });
+    if (typeof tableName === "string") {
+      this.joinsNotNullableMap[tableName] = true;
+    }
+    return this;
+  };
   createSetOperator(type, isAll) {
     return (rightSelection) => {
       const rightSelect = typeof rightSelection === "function" ? rightSelection(getDatabendSetOperators()) : rightSelection;
@@ -2925,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;
@@ -2975,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.12",
+  "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/databend-core/dialect.ts

@@ -206,6 +206,7 @@ export class DatabendDialect {
       }
       const table = joinMeta.table;
       const lateralSql = joinMeta.lateral ? sql` lateral` : undefined;
+      const onClause = joinMeta.on ? sql` on ${joinMeta.on}` : undefined;
       if (is(table, DatabendTable)) {
         const t = table as any;
         const tableName = t[(DatabendTable as any).Symbol.Name];
@@ -213,7 +214,7 @@ export class DatabendDialect {
         const origTableName = t[(DatabendTable as any).Symbol.OriginalName];
         const alias = tableName === origTableName ? undefined : joinMeta.alias;
         joinsArray.push(
-          sql`${sql.raw(joinMeta.joinType)} join${lateralSql} ${tableSchema ? sql`${sql.identifier(tableSchema)}.` : undefined}${sql.identifier(origTableName)}${alias && sql` ${sql.identifier(alias)}`} on ${joinMeta.on}`
+          sql`${sql.raw(joinMeta.joinType)} join${lateralSql} ${tableSchema ? sql`${sql.identifier(tableSchema)}.` : undefined}${sql.identifier(origTableName)}${alias && sql` ${sql.identifier(alias)}`}${onClause}`
         );
       } else if (is(table, View)) {
         const viewName = (table as any)[ViewBaseConfig].name;
@@ -221,11 +222,11 @@ export class DatabendDialect {
         const origViewName = (table as any)[ViewBaseConfig].originalName;
         const alias = viewName === origViewName ? undefined : joinMeta.alias;
         joinsArray.push(
-          sql`${sql.raw(joinMeta.joinType)} join${lateralSql} ${viewSchema ? sql`${sql.identifier(viewSchema)}.` : undefined}${sql.identifier(origViewName)}${alias && sql` ${sql.identifier(alias)}`} on ${joinMeta.on}`
+          sql`${sql.raw(joinMeta.joinType)} join${lateralSql} ${viewSchema ? sql`${sql.identifier(viewSchema)}.` : undefined}${sql.identifier(origViewName)}${alias && sql` ${sql.identifier(alias)}`}${onClause}`
         );
       } else {
         joinsArray.push(
-          sql`${sql.raw(joinMeta.joinType)} join${lateralSql} ${table} on ${joinMeta.on}`
+          sql`${sql.raw(joinMeta.joinType)} join${lateralSql} ${table}${onClause}`
         );
       }
       if (index < joins.length - 1) {

package/src/databend-core/query-builders/select.ts

@@ -170,6 +170,41 @@ class DatabendSelectQueryBuilderBase extends TypedQueryBuilder<any, any> {
   innerJoin = this.createJoin('inner');
   fullJoin = this.createJoin('full');
 
+  crossJoin = (table: any) => {
+    const baseTableName = this.tableName;
+    const tableName = getTableLikeName(table);
+
+    if (typeof tableName === 'string' && this.config.joins?.some((join: any) => join.alias === tableName)) {
+      throw new Error(`Alias "${tableName}" is already used in this query`);
+    }
+
+    if (!this.isPartialSelect) {
+      if (Object.keys(this.joinsNotNullableMap).length === 1 && typeof baseTableName === 'string') {
+        this.config.fields = {
+          [baseTableName]: this.config.fields,
+        };
+      }
+      if (typeof tableName === 'string' && !is(table, SQL)) {
+        const selection = is(table, Subquery)
+          ? table._.selectedFields
+          : is(table, View)
+            ? (table as any)[ViewBaseConfig].selectedFields
+            : table[(Table as any).Symbol.Columns];
+        this.config.fields[tableName] = selection;
+      }
+    }
+
+    if (!this.config.joins) {
+      this.config.joins = [];
+    }
+    this.config.joins.push({ on: undefined, table, joinType: 'cross', alias: tableName });
+
+    if (typeof tableName === 'string') {
+      this.joinsNotNullableMap[tableName] = true;
+    }
+    return this;
+  };
+
   private createSetOperator(type: string, isAll: boolean) {
     return (rightSelection: any) => {
       const rightSelect = typeof rightSelection === 'function'

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;