workers-qb 1.10.2 → 1.11.1

package/README.md

@@ -54,6 +54,7 @@ workers-qb is a lightweight query builder designed specifically for Cloudflare W
 - CRUD operations (insert/update/select/delete)
 - Bulk inserts
 - JOIN queries
+- Subqueries
 - Modular SELECT queries
 - ON CONFLICT handling
 - UPSERT support

package/dist/index.d.mts

@@ -40,6 +40,42 @@ declare class QueryWithExtra<GenericResultWrapper, Result = any, IsAsync extends
 }
 declare function trimQuery(query: string): string;
 
+interface SelectExecuteOptions {
+    lazy?: boolean;
+}
+declare class SelectBuilder<GenericResultWrapper, GenericResult = DefaultReturnObject, IsAsync extends boolean = true> {
+    _debugger: boolean;
+    _options: Partial<SelectAll>;
+    _fetchAll: (params: SelectAll) => QueryWithExtra<GenericResultWrapper, any, IsAsync>;
+    _fetchOne: (params: SelectOne) => QueryWithExtra<GenericResultWrapper, any, IsAsync>;
+    constructor(options: Partial<SelectAll>, fetchAll: (params: SelectAll) => QueryWithExtra<GenericResultWrapper, any, IsAsync>, fetchOne: (params: SelectOne) => QueryWithExtra<GenericResultWrapper, any, IsAsync>);
+    setDebugger(state: boolean): void;
+    tableName(tableName: SelectAll['tableName']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    fields(fields: SelectAll['fields']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    where(conditions: string | Array<string>, params?: Primitive | Primitive[]): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    whereIn<T extends string | Array<string>, P extends T extends Array<string> ? Primitive[][] : Primitive[]>(fields: T, values: P): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    join(join: SelectAll['join']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    groupBy(groupBy: SelectAll['groupBy']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    having(conditions: string | Array<string>, params?: Primitive | Primitive[]): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    orderBy(orderBy: SelectAll['orderBy']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    offset(offset: SelectAll['offset']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    limit(limit: SelectAll['limit']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    _parseArray(fieldName: string, option: any, value: any): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    getQueryAll<P extends SelectExecuteOptions = SelectExecuteOptions>(options?: P): Query<ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends {
+        lazy: true;
+    } ? true : false>, IsAsync>;
+    getQueryOne(): Query<OneResult<GenericResultWrapper, GenericResult>, IsAsync>;
+    execute<P extends SelectExecuteOptions = SelectExecuteOptions>(options?: P): ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends {
+        lazy: true;
+    } ? true : false>;
+    all<P extends SelectExecuteOptions = SelectExecuteOptions>(options?: P): ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends {
+        lazy: true;
+    } ? true : false>;
+    one(): MaybeAsync<IsAsync, OneResult<GenericResultWrapper, GenericResult>>;
+    count(): MaybeAsync<IsAsync, CountResult<GenericResultWrapper>>;
+    getOptions(): SelectAll;
+}
+
 type OmitIndexSignature<ObjectType> = {
     [KeyType in keyof ObjectType as {} extends Record<KeyType, unknown> ? never : KeyType]: ObjectType[KeyType];
 };
@@ -54,7 +90,7 @@ type SimpleMerge<Destination, Source> = {
 } & Source;
 type Merge<Destination, Source> = Simplify<SimpleMerge<PickIndexSignature<Destination>, PickIndexSignature<Source>> & SimpleMerge<OmitIndexSignature<Destination>, OmitIndexSignature<Source>>>;
 
-type Primitive = null | string | number | boolean | bigint | Raw;
+type Primitive = null | string | number | boolean | bigint | Raw | SelectAll | SelectBuilder<any, any, any>;
 type QueryLoggerMeta = {
     duration?: number;
 };
@@ -69,7 +105,7 @@ type Where = {
 } | string | Array<string>;
 type Join = {
     type?: string | JoinTypes;
-    table: string | SelectAll;
+    table: string | SelectAll | SelectBuilder<any, any, any>;
     on: string;
     alias?: string;
 };
@@ -79,9 +115,11 @@ type SelectOne = {
     where?: Where;
     join?: Join | Array<Join>;
     groupBy?: string | Array<string>;
-    having?: string | Array<string>;
+    having?: Where;
     orderBy?: string | Array<string> | Record<string, string | OrderTypes>;
     offset?: number;
+    subQueryPlaceholders?: Record<string, SelectAll>;
+    subQueryTokenNextId?: number;
 };
 type RawQuery = {
     query: string;
@@ -158,9 +196,15 @@ type D1Result = {
     duration: number;
     last_row_id?: string | number;
     served_by: string;
+    rowsRead?: number;
+    rowsWritten?: number;
     meta?: D1Meta;
     success: boolean;
 };
+type DOResult = {
+    rowsRead: number;
+    rowsWritten: number;
+};
 type PGResult = {
     command: string;
     lastRowId?: string | number;
@@ -191,41 +235,6 @@ declare function defaultLogger(query: RawQuery, meta: QueryLoggerMeta): any;
 declare function asyncLoggerWrapper<Async extends boolean = true>(query: Query<any, Async> | Query<any, Async>[], loggerFunction: CallableFunction | undefined, innerFunction: () => any): Promise<any>;
 declare function syncLoggerWrapper<Async extends boolean = false>(query: Query<any, Async> | Query<any, Async>[], loggerFunction: CallableFunction | undefined, innerFunction: () => any): any;
 
-interface SelectExecuteOptions {
-    lazy?: boolean;
-}
-declare class SelectBuilder<GenericResultWrapper, GenericResult = DefaultReturnObject, IsAsync extends boolean = true> {
-    _debugger: boolean;
-    _options: Partial<SelectAll>;
-    _fetchAll: (params: SelectAll) => QueryWithExtra<GenericResultWrapper, any, IsAsync>;
-    _fetchOne: (params: SelectOne) => QueryWithExtra<GenericResultWrapper, any, IsAsync>;
-    constructor(options: Partial<SelectAll>, fetchAll: (params: SelectAll) => QueryWithExtra<GenericResultWrapper, any, IsAsync>, fetchOne: (params: SelectOne) => QueryWithExtra<GenericResultWrapper, any, IsAsync>);
-    setDebugger(state: boolean): void;
-    tableName(tableName: SelectAll['tableName']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    fields(fields: SelectAll['fields']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    where(conditions: string | Array<string>, params?: Primitive | Primitive[]): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    whereIn<T extends string | Array<string>, P extends T extends Array<string> ? Primitive[][] : Primitive[]>(fields: T, values: P): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    join(join: SelectAll['join']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    groupBy(groupBy: SelectAll['groupBy']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    having(having: SelectAll['having']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    orderBy(orderBy: SelectAll['orderBy']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    offset(offset: SelectAll['offset']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    limit(limit: SelectAll['limit']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    _parseArray(fieldName: string, option: any, value: any): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    getQueryAll<P extends SelectExecuteOptions = SelectExecuteOptions>(options?: P): Query<ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends {
-        lazy: true;
-    } ? true : false>, IsAsync>;
-    getQueryOne(): Query<OneResult<GenericResultWrapper, GenericResult>, IsAsync>;
-    execute<P extends SelectExecuteOptions = SelectExecuteOptions>(options?: P): ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends {
-        lazy: true;
-    } ? true : false>;
-    all<P extends SelectExecuteOptions = SelectExecuteOptions>(options?: P): ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends {
-        lazy: true;
-    } ? true : false>;
-    one(): MaybeAsync<IsAsync, OneResult<GenericResultWrapper, GenericResult>>;
-    count(): MaybeAsync<IsAsync, CountResult<GenericResultWrapper>>;
-}
-
 declare class QueryBuilder<GenericResultWrapper, IsAsync extends boolean = true> {
     protected options: QueryBuilderOptions<IsAsync>;
     loggerWrapper: typeof asyncLoggerWrapper;
@@ -263,12 +272,25 @@ declare class QueryBuilder<GenericResultWrapper, IsAsync extends boolean = true>
     protected _insert(params: Insert): string;
     protected _update(params: Update): string;
     protected _delete(params: Delete): string;
-    protected _select(params: SelectAll): string;
+    protected _select(params: SelectAll, queryArgs?: any[]): string;
     protected _fields(value?: string | Array<string>): string;
-    protected _where(value?: Where): string;
-    protected _join(value?: Join | Array<Join>): string;
+    protected _where(value: Where | undefined, context?: {
+        subQueryPlaceholders?: Record<string, SelectAll>;
+        queryArgs: any[];
+        toSQLCompiler?: (params: SelectAll, queryArgs: any[]) => string;
+    }): string;
+    protected _join(value: Join | Array<Join> | undefined, context: {
+        subQueryPlaceholders?: Record<string, SelectAll>;
+        queryArgs: any[];
+        toSQLCompiler: (params: SelectAll, queryArgs: any[]) => string;
+    }): string;
     protected _groupBy(value?: string | Array<string>): string;
-    protected _having(value?: string | Array<string>): string;
+    protected _having(value: Where | undefined, // Using Where type as Having structure is similar for conditions/params
+    context: {
+        subQueryPlaceholders?: Record<string, SelectAll>;
+        queryArgs: any[];
+        toSQLCompiler?: (params: SelectAll, queryArgs: any[]) => string;
+    }): string;
     protected _orderBy(value?: string | Array<string> | Record<string, string | OrderTypes>): string;
     protected _limit(value?: number): string;
     protected _offset(value?: number): string;
@@ -309,9 +331,14 @@ declare class asyncMigrationsBuilder<GenericResultWrapper> {
     apply(): Promise<Array<Migration>>;
 }
 
+interface D1Database {
+    prepare: any;
+    batch: any;
+    exec: any;
+}
 declare class D1QB extends QueryBuilder<D1Result> {
     db: any;
-    constructor(db: any, options?: QueryBuilderOptions);
+    constructor(db: D1Database, options?: QueryBuilderOptions);
     migrations(options: MigrationOptions): asyncMigrationsBuilder<D1Result>;
     execute(query: Query): Promise<any>;
     batchExecute(queryArray: Query[]): Promise<any>;
@@ -327,13 +354,19 @@ declare class PGQB extends QueryBuilder<PGResult> {
     execute(query: Query): Promise<any>;
 }
 
-declare class DOQB extends QueryBuilder<{}, false> {
-    db: any;
+interface SqlStorage {
+    exec: any;
+    prepare: any;
+    Cursor: any;
+    Statement: any;
+}
+declare class DOQB extends QueryBuilder<DOResult, false> {
+    db: SqlStorage;
     loggerWrapper: typeof syncLoggerWrapper;
-    constructor(db: any, options?: QueryBuilderOptions<false>);
-    migrations(options: MigrationOptions): syncMigrationsBuilder<{}>;
+    constructor(db: SqlStorage, options?: QueryBuilderOptions<false>);
+    migrations(options: MigrationOptions): syncMigrationsBuilder<DOResult>;
     execute(query: Query<any, false>): any;
     lazyExecute(query: Query<any, false>): Iterable<any>;
 }
 
-export { type ArrayResult, type AsyncType, ConflictTypes, type ConflictUpsert, type CountResult, type D1Meta, D1QB, type D1Result, DOQB, type DefaultObject, type DefaultReturnObject, type Delete, type DeleteReturning, type DeleteWithoutReturning, FetchTypes, type FullArrayResult, type Insert, type InsertMultiple, type InsertOne, type InsertWithoutReturning, type IterableResult, type Join, JoinTypes, type MaybeAsync, type Migration, type MigrationEntry, type MigrationOptions, type OneResult, OrderTypes, PGQB, type PGResult, type Primitive, Query, QueryBuilder, type QueryBuilderOptions, type QueryLoggerMeta, QueryWithExtra, Raw, type RawQuery, type RawQueryFetchAll, type RawQueryFetchOne, type RawQueryWithoutFetching, type SelectAll, type SelectOne, type SyncType, type Update, type UpdateReturning, type UpdateWithoutReturning, type Where, asyncLoggerWrapper, asyncMigrationsBuilder, defaultLogger, syncLoggerWrapper, syncMigrationsBuilder, type test, trimQuery };
+export { type ArrayResult, type AsyncType, ConflictTypes, type ConflictUpsert, type CountResult, type D1Meta, D1QB, type D1Result, DOQB, type DOResult, type DefaultObject, type DefaultReturnObject, type Delete, type DeleteReturning, type DeleteWithoutReturning, FetchTypes, type FullArrayResult, type Insert, type InsertMultiple, type InsertOne, type InsertWithoutReturning, type IterableResult, type Join, JoinTypes, type MaybeAsync, type Migration, type MigrationEntry, type MigrationOptions, type OneResult, OrderTypes, PGQB, type PGResult, type Primitive, Query, QueryBuilder, type QueryBuilderOptions, type QueryLoggerMeta, QueryWithExtra, Raw, type RawQuery, type RawQueryFetchAll, type RawQueryFetchOne, type RawQueryWithoutFetching, type SelectAll, type SelectOne, type SyncType, type Update, type UpdateReturning, type UpdateWithoutReturning, type Where, asyncLoggerWrapper, asyncMigrationsBuilder, defaultLogger, syncLoggerWrapper, syncMigrationsBuilder, type test, trimQuery };

package/dist/index.d.ts

@@ -40,6 +40,42 @@ declare class QueryWithExtra<GenericResultWrapper, Result = any, IsAsync extends
 }
 declare function trimQuery(query: string): string;
 
+interface SelectExecuteOptions {
+    lazy?: boolean;
+}
+declare class SelectBuilder<GenericResultWrapper, GenericResult = DefaultReturnObject, IsAsync extends boolean = true> {
+    _debugger: boolean;
+    _options: Partial<SelectAll>;
+    _fetchAll: (params: SelectAll) => QueryWithExtra<GenericResultWrapper, any, IsAsync>;
+    _fetchOne: (params: SelectOne) => QueryWithExtra<GenericResultWrapper, any, IsAsync>;
+    constructor(options: Partial<SelectAll>, fetchAll: (params: SelectAll) => QueryWithExtra<GenericResultWrapper, any, IsAsync>, fetchOne: (params: SelectOne) => QueryWithExtra<GenericResultWrapper, any, IsAsync>);
+    setDebugger(state: boolean): void;
+    tableName(tableName: SelectAll['tableName']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    fields(fields: SelectAll['fields']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    where(conditions: string | Array<string>, params?: Primitive | Primitive[]): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    whereIn<T extends string | Array<string>, P extends T extends Array<string> ? Primitive[][] : Primitive[]>(fields: T, values: P): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    join(join: SelectAll['join']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    groupBy(groupBy: SelectAll['groupBy']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    having(conditions: string | Array<string>, params?: Primitive | Primitive[]): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    orderBy(orderBy: SelectAll['orderBy']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    offset(offset: SelectAll['offset']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    limit(limit: SelectAll['limit']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    _parseArray(fieldName: string, option: any, value: any): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    getQueryAll<P extends SelectExecuteOptions = SelectExecuteOptions>(options?: P): Query<ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends {
+        lazy: true;
+    } ? true : false>, IsAsync>;
+    getQueryOne(): Query<OneResult<GenericResultWrapper, GenericResult>, IsAsync>;
+    execute<P extends SelectExecuteOptions = SelectExecuteOptions>(options?: P): ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends {
+        lazy: true;
+    } ? true : false>;
+    all<P extends SelectExecuteOptions = SelectExecuteOptions>(options?: P): ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends {
+        lazy: true;
+    } ? true : false>;
+    one(): MaybeAsync<IsAsync, OneResult<GenericResultWrapper, GenericResult>>;
+    count(): MaybeAsync<IsAsync, CountResult<GenericResultWrapper>>;
+    getOptions(): SelectAll;
+}
+
 type OmitIndexSignature<ObjectType> = {
     [KeyType in keyof ObjectType as {} extends Record<KeyType, unknown> ? never : KeyType]: ObjectType[KeyType];
 };
@@ -54,7 +90,7 @@ type SimpleMerge<Destination, Source> = {
 } & Source;
 type Merge<Destination, Source> = Simplify<SimpleMerge<PickIndexSignature<Destination>, PickIndexSignature<Source>> & SimpleMerge<OmitIndexSignature<Destination>, OmitIndexSignature<Source>>>;
 
-type Primitive = null | string | number | boolean | bigint | Raw;
+type Primitive = null | string | number | boolean | bigint | Raw | SelectAll | SelectBuilder<any, any, any>;
 type QueryLoggerMeta = {
     duration?: number;
 };
@@ -69,7 +105,7 @@ type Where = {
 } | string | Array<string>;
 type Join = {
     type?: string | JoinTypes;
-    table: string | SelectAll;
+    table: string | SelectAll | SelectBuilder<any, any, any>;
     on: string;
     alias?: string;
 };
@@ -79,9 +115,11 @@ type SelectOne = {
     where?: Where;
     join?: Join | Array<Join>;
     groupBy?: string | Array<string>;
-    having?: string | Array<string>;
+    having?: Where;
     orderBy?: string | Array<string> | Record<string, string | OrderTypes>;
     offset?: number;
+    subQueryPlaceholders?: Record<string, SelectAll>;
+    subQueryTokenNextId?: number;
 };
 type RawQuery = {
     query: string;
@@ -158,9 +196,15 @@ type D1Result = {
     duration: number;
     last_row_id?: string | number;
     served_by: string;
+    rowsRead?: number;
+    rowsWritten?: number;
     meta?: D1Meta;
     success: boolean;
 };
+type DOResult = {
+    rowsRead: number;
+    rowsWritten: number;
+};
 type PGResult = {
     command: string;
     lastRowId?: string | number;
@@ -191,41 +235,6 @@ declare function defaultLogger(query: RawQuery, meta: QueryLoggerMeta): any;
 declare function asyncLoggerWrapper<Async extends boolean = true>(query: Query<any, Async> | Query<any, Async>[], loggerFunction: CallableFunction | undefined, innerFunction: () => any): Promise<any>;
 declare function syncLoggerWrapper<Async extends boolean = false>(query: Query<any, Async> | Query<any, Async>[], loggerFunction: CallableFunction | undefined, innerFunction: () => any): any;
 
-interface SelectExecuteOptions {
-    lazy?: boolean;
-}
-declare class SelectBuilder<GenericResultWrapper, GenericResult = DefaultReturnObject, IsAsync extends boolean = true> {
-    _debugger: boolean;
-    _options: Partial<SelectAll>;
-    _fetchAll: (params: SelectAll) => QueryWithExtra<GenericResultWrapper, any, IsAsync>;
-    _fetchOne: (params: SelectOne) => QueryWithExtra<GenericResultWrapper, any, IsAsync>;
-    constructor(options: Partial<SelectAll>, fetchAll: (params: SelectAll) => QueryWithExtra<GenericResultWrapper, any, IsAsync>, fetchOne: (params: SelectOne) => QueryWithExtra<GenericResultWrapper, any, IsAsync>);
-    setDebugger(state: boolean): void;
-    tableName(tableName: SelectAll['tableName']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    fields(fields: SelectAll['fields']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    where(conditions: string | Array<string>, params?: Primitive | Primitive[]): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    whereIn<T extends string | Array<string>, P extends T extends Array<string> ? Primitive[][] : Primitive[]>(fields: T, values: P): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    join(join: SelectAll['join']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    groupBy(groupBy: SelectAll['groupBy']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    having(having: SelectAll['having']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    orderBy(orderBy: SelectAll['orderBy']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    offset(offset: SelectAll['offset']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    limit(limit: SelectAll['limit']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    _parseArray(fieldName: string, option: any, value: any): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    getQueryAll<P extends SelectExecuteOptions = SelectExecuteOptions>(options?: P): Query<ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends {
-        lazy: true;
-    } ? true : false>, IsAsync>;
-    getQueryOne(): Query<OneResult<GenericResultWrapper, GenericResult>, IsAsync>;
-    execute<P extends SelectExecuteOptions = SelectExecuteOptions>(options?: P): ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends {
-        lazy: true;
-    } ? true : false>;
-    all<P extends SelectExecuteOptions = SelectExecuteOptions>(options?: P): ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends {
-        lazy: true;
-    } ? true : false>;
-    one(): MaybeAsync<IsAsync, OneResult<GenericResultWrapper, GenericResult>>;
-    count(): MaybeAsync<IsAsync, CountResult<GenericResultWrapper>>;
-}
-
 declare class QueryBuilder<GenericResultWrapper, IsAsync extends boolean = true> {
     protected options: QueryBuilderOptions<IsAsync>;
     loggerWrapper: typeof asyncLoggerWrapper;
@@ -263,12 +272,25 @@ declare class QueryBuilder<GenericResultWrapper, IsAsync extends boolean = true>
     protected _insert(params: Insert): string;
     protected _update(params: Update): string;
     protected _delete(params: Delete): string;
-    protected _select(params: SelectAll): string;
+    protected _select(params: SelectAll, queryArgs?: any[]): string;
     protected _fields(value?: string | Array<string>): string;
-    protected _where(value?: Where): string;
-    protected _join(value?: Join | Array<Join>): string;
+    protected _where(value: Where | undefined, context?: {
+        subQueryPlaceholders?: Record<string, SelectAll>;
+        queryArgs: any[];
+        toSQLCompiler?: (params: SelectAll, queryArgs: any[]) => string;
+    }): string;
+    protected _join(value: Join | Array<Join> | undefined, context: {
+        subQueryPlaceholders?: Record<string, SelectAll>;
+        queryArgs: any[];
+        toSQLCompiler: (params: SelectAll, queryArgs: any[]) => string;
+    }): string;
     protected _groupBy(value?: string | Array<string>): string;
-    protected _having(value?: string | Array<string>): string;
+    protected _having(value: Where | undefined, // Using Where type as Having structure is similar for conditions/params
+    context: {
+        subQueryPlaceholders?: Record<string, SelectAll>;
+        queryArgs: any[];
+        toSQLCompiler?: (params: SelectAll, queryArgs: any[]) => string;
+    }): string;
     protected _orderBy(value?: string | Array<string> | Record<string, string | OrderTypes>): string;
     protected _limit(value?: number): string;
     protected _offset(value?: number): string;
@@ -309,9 +331,14 @@ declare class asyncMigrationsBuilder<GenericResultWrapper> {
     apply(): Promise<Array<Migration>>;
 }
 
+interface D1Database {
+    prepare: any;
+    batch: any;
+    exec: any;
+}
 declare class D1QB extends QueryBuilder<D1Result> {
     db: any;
-    constructor(db: any, options?: QueryBuilderOptions);
+    constructor(db: D1Database, options?: QueryBuilderOptions);
     migrations(options: MigrationOptions): asyncMigrationsBuilder<D1Result>;
     execute(query: Query): Promise<any>;
     batchExecute(queryArray: Query[]): Promise<any>;
@@ -327,13 +354,19 @@ declare class PGQB extends QueryBuilder<PGResult> {
     execute(query: Query): Promise<any>;
 }
 
-declare class DOQB extends QueryBuilder<{}, false> {
-    db: any;
+interface SqlStorage {
+    exec: any;
+    prepare: any;
+    Cursor: any;
+    Statement: any;
+}
+declare class DOQB extends QueryBuilder<DOResult, false> {
+    db: SqlStorage;
     loggerWrapper: typeof syncLoggerWrapper;
-    constructor(db: any, options?: QueryBuilderOptions<false>);
-    migrations(options: MigrationOptions): syncMigrationsBuilder<{}>;
+    constructor(db: SqlStorage, options?: QueryBuilderOptions<false>);
+    migrations(options: MigrationOptions): syncMigrationsBuilder<DOResult>;
     execute(query: Query<any, false>): any;
     lazyExecute(query: Query<any, false>): Iterable<any>;
 }
 
-export { type ArrayResult, type AsyncType, ConflictTypes, type ConflictUpsert, type CountResult, type D1Meta, D1QB, type D1Result, DOQB, type DefaultObject, type DefaultReturnObject, type Delete, type DeleteReturning, type DeleteWithoutReturning, FetchTypes, type FullArrayResult, type Insert, type InsertMultiple, type InsertOne, type InsertWithoutReturning, type IterableResult, type Join, JoinTypes, type MaybeAsync, type Migration, type MigrationEntry, type MigrationOptions, type OneResult, OrderTypes, PGQB, type PGResult, type Primitive, Query, QueryBuilder, type QueryBuilderOptions, type QueryLoggerMeta, QueryWithExtra, Raw, type RawQuery, type RawQueryFetchAll, type RawQueryFetchOne, type RawQueryWithoutFetching, type SelectAll, type SelectOne, type SyncType, type Update, type UpdateReturning, type UpdateWithoutReturning, type Where, asyncLoggerWrapper, asyncMigrationsBuilder, defaultLogger, syncLoggerWrapper, syncMigrationsBuilder, type test, trimQuery };
+export { type ArrayResult, type AsyncType, ConflictTypes, type ConflictUpsert, type CountResult, type D1Meta, D1QB, type D1Result, DOQB, type DOResult, type DefaultObject, type DefaultReturnObject, type Delete, type DeleteReturning, type DeleteWithoutReturning, FetchTypes, type FullArrayResult, type Insert, type InsertMultiple, type InsertOne, type InsertWithoutReturning, type IterableResult, type Join, JoinTypes, type MaybeAsync, type Migration, type MigrationEntry, type MigrationOptions, type OneResult, OrderTypes, PGQB, type PGResult, type Primitive, Query, QueryBuilder, type QueryBuilderOptions, type QueryLoggerMeta, QueryWithExtra, Raw, type RawQuery, type RawQueryFetchAll, type RawQueryFetchOne, type RawQueryWithoutFetching, type SelectAll, type SelectOne, type SyncType, type Update, type UpdateReturning, type UpdateWithoutReturning, type Where, asyncLoggerWrapper, asyncMigrationsBuilder, defaultLogger, syncLoggerWrapper, syncMigrationsBuilder, type test, trimQuery };