kysely 0.16.11 → 0.17.0

package/dist/cjs/schema/create-table-builder.d.ts

@@ -39,13 +39,15 @@ export declare class CreateTableBuilder<TB extends string, C extends string = ne
      * ### Examples
      *
      * ```ts
+     * import { sql } from 'kysely'
+     *
      * await db.schema
      *   .createTable('person')
      *   .addColumn('id', 'integer', (col) => col.autoIncrement().primaryKey()),
      *   .addColumn('first_name', 'varchar(50)', (col) => col.notNull())
      *   .addColumn('last_name', 'varchar(255)')
      *   .addColumn('bank_balance', 'numeric(8, 2)')
-     *   .addColumn('data', db.raw('customtype'))
+     *   .addColumn('data', sql`customtype`)
      *   .addColumn('parent_id', 'integer', (col) =>
      *     col.references('person.id').onDelete('cascade'))
      *   )
@@ -111,7 +113,9 @@ export declare class CreateTableBuilder<TB extends string, C extends string = ne
      * ### Examples
      *
      * ```ts
-     * addCheckConstraint('check_legs', db.raw('number_of_legs < 5'))
+     * import { sql } from 'kysely'
+     *
+     * addCheckConstraint('check_legs', sql`number_of_legs < 5`)
      * ```
      */
     addCheckConstraint(constraintName: string, checkExpression: AnyRawBuilder): CreateTableBuilder<TB, C>;

package/dist/cjs/schema/create-table-builder.js

@@ -68,13 +68,15 @@ class CreateTableBuilder {
      * ### Examples
      *
      * ```ts
+     * import { sql } from 'kysely'
+     *
      * await db.schema
      *   .createTable('person')
      *   .addColumn('id', 'integer', (col) => col.autoIncrement().primaryKey()),
      *   .addColumn('first_name', 'varchar(50)', (col) => col.notNull())
      *   .addColumn('last_name', 'varchar(255)')
      *   .addColumn('bank_balance', 'numeric(8, 2)')
-     *   .addColumn('data', db.raw('customtype'))
+     *   .addColumn('data', sql`customtype`)
      *   .addColumn('parent_id', 'integer', (col) =>
      *     col.references('person.id').onDelete('cascade'))
      *   )
@@ -156,7 +158,9 @@ class CreateTableBuilder {
      * ### Examples
      *
      * ```ts
-     * addCheckConstraint('check_legs', db.raw('number_of_legs < 5'))
+     * import { sql } from 'kysely'
+     *
+     * addCheckConstraint('check_legs', sql`number_of_legs < 5`)
      * ```
      */
     addCheckConstraint(constraintName, checkExpression) {

package/dist/cjs/schema/create-view-builder.d.ts

@@ -26,9 +26,9 @@ export declare class CreateViewBuilder implements OperationNodeSource, Compilabl
      *
      * WARNING!
      * Some dialects don't support parameterized queries in DDL statements and therefore
-     * the query or `raw` expression passed here is interpolated into a single string
-     * opening an SQL injection vulnerability. DO NOT pass unchecked user input into
-     * the query or `raw` expression passed to this method!
+     * the query or raw {@link sql } expression passed here is interpolated into a single
+     * string opening an SQL injection vulnerability. DO NOT pass unchecked user input
+     * into the query or raw expression passed to this method!
      */
     as(query: AnySelectQueryBuilder | AnyRawBuilder): CreateViewBuilder;
     toOperationNode(): CreateViewNode;

package/dist/cjs/schema/create-view-builder.js

@@ -64,9 +64,9 @@ class CreateViewBuilder {
      *
      * WARNING!
      * Some dialects don't support parameterized queries in DDL statements and therefore
-     * the query or `raw` expression passed here is interpolated into a single string
-     * opening an SQL injection vulnerability. DO NOT pass unchecked user input into
-     * the query or `raw` expression passed to this method!
+     * the query or raw {@link sql } expression passed here is interpolated into a single
+     * string opening an SQL injection vulnerability. DO NOT pass unchecked user input
+     * into the query or raw expression passed to this method!
      */
     as(query) {
         const queryNode = query

package/dist/cjs/util/query-id.js

@@ -1,11 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createQueryId = void 0;
-const object_utils_js_1 = require("./object-utils.js");
 const random_string_js_1 = require("./random-string.js");
 function createQueryId() {
-    return (0, object_utils_js_1.freeze)({
-        queryId: (0, random_string_js_1.randomString)(8),
-    });
+    return new LazyQueryId();
 }
 exports.createQueryId = createQueryId;
+class LazyQueryId {
+    #queryId;
+    get queryId() {
+        if (this.#queryId === undefined) {
+            this.#queryId = (0, random_string_js_1.randomString)(8);
+        }
+        return this.#queryId;
+    }
+}

package/dist/cjs/util/random-string.js

@@ -1,7 +1,70 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.randomString = void 0;
-const CHARS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+const CHARS = [
+    'A',
+    'B',
+    'C',
+    'D',
+    'E',
+    'F',
+    'G',
+    'H',
+    'I',
+    'J',
+    'K',
+    'L',
+    'M',
+    'N',
+    'O',
+    'P',
+    'Q',
+    'R',
+    'S',
+    'T',
+    'U',
+    'V',
+    'W',
+    'X',
+    'Y',
+    'Z',
+    'a',
+    'b',
+    'c',
+    'd',
+    'e',
+    'f',
+    'g',
+    'h',
+    'i',
+    'j',
+    'k',
+    'l',
+    'm',
+    'n',
+    'o',
+    'p',
+    'q',
+    'r',
+    's',
+    't',
+    'u',
+    'v',
+    'w',
+    'x',
+    'y',
+    'z',
+    '0',
+    '1',
+    '2',
+    '3',
+    '4',
+    '5',
+    '6',
+    '7',
+    '8',
+    '9',
+];
 function randomString(length) {
     let chars = '';
     for (let i = 0; i < length; ++i) {
@@ -11,5 +74,5 @@ function randomString(length) {
 }
 exports.randomString = randomString;
 function randomChar() {
-    return CHARS[Math.floor(Math.random() * CHARS.length)];
+    return CHARS[~~(Math.random() * CHARS.length)];
 }

package/dist/esm/dialect/mysql/mysql-adapter.js

@@ -1,4 +1,5 @@
 /// <reference types="./mysql-adapter.d.ts" />
+import { sql } from '../../raw-builder/sql.js';
 import { DialectAdapterBase } from '../dialect-adapter-base.js';
 const LOCK_ID = 'ea586330-2c93-47c8-908d-981d9d270f9d';
 const LOCK_TIMEOUT_SECONDS = 60 * 60;
@@ -16,11 +17,9 @@ export class MysqlAdapter extends DialectAdapterBase {
         // is released using `release_lock`. This way we know that the lock is either
         // released by us after successfull or failed migrations OR it's released by
         // MySQL if the process gets killed for some reason.
-        await db
-            .raw(`select get_lock('${LOCK_ID}', ${LOCK_TIMEOUT_SECONDS})`)
-            .execute();
+        await sql `select get_lock(${sql.literal(LOCK_ID)}, ${sql.literal(LOCK_TIMEOUT_SECONDS)})`.execute(db);
     }
     async releaseMigrationLock(db) {
-        await db.raw(`select release_lock('${LOCK_ID}')`).execute();
+        await sql `select release_lock(${sql.literal(LOCK_ID)})`.execute(db);
     }
 }

package/dist/esm/dialect/mysql/mysql-introspector.js

@@ -1,6 +1,7 @@
 /// <reference types="./mysql-introspector.d.ts" />
 import { MIGRATION_LOCK_TABLE, MIGRATION_TABLE, } from '../../migration/migrator.js';
 import { freeze } from '../../util/object-utils.js';
+import { sql } from '../../raw-builder/sql.js';
 export class MysqlIntrospector {
     #db;
     constructor(db) {
@@ -10,7 +11,7 @@ export class MysqlIntrospector {
         let query = this.#db
             .selectFrom('information_schema.columns')
             .selectAll()
-            .where('table_schema', '=', this.#db.raw('database()'))
+            .where('table_schema', '=', sql `database()`)
             .castTo();
         if (!options.withInternalKyselyTables) {
             query = query

package/dist/esm/dialect/postgres/postgres-adapter.js

@@ -1,7 +1,8 @@
 /// <reference types="./postgres-adapter.d.ts" />
+import { sql } from '../../raw-builder/sql.js';
 import { DialectAdapterBase } from '../dialect-adapter-base.js';
 // Random id for our transaction lock.
-const LOCK_ID = '3853314791062309107';
+const LOCK_ID = 3853314791062309107n;
 export class PostgresAdapter extends DialectAdapterBase {
     get supportsTransactionalDdl() {
         return true;
@@ -11,7 +12,7 @@ export class PostgresAdapter extends DialectAdapterBase {
     }
     async acquireMigrationLock(db) {
         // Acquire a transaction level advisory lock.
-        await db.raw(`select pg_advisory_xact_lock(${LOCK_ID})`).execute();
+        await sql `select pg_advisory_xact_lock(${sql.literal(LOCK_ID)})`.execute(db);
     }
     async releaseMigrationLock() {
         // Nothing to do here. `pg_advisory_xact_lock` is automatically released at the

package/dist/esm/dialect/sqlite/sqlite-introspector.js

@@ -1,5 +1,6 @@
 /// <reference types="./sqlite-introspector.d.ts" />
 import { MIGRATION_LOCK_TABLE, MIGRATION_TABLE, } from '../../migration/migrator.js';
+import { sql } from '../../raw-builder/sql.js';
 export class SqliteIntrospector {
     #db;
     constructor(db) {
@@ -25,7 +26,7 @@ export class SqliteIntrospector {
     async #getTableMetadata(table) {
         const db = this.#db;
         const columns = await db
-            .selectFrom(db.raw(`PRAGMA_TABLE_INFO(?)`, [table]).as('table_info'))
+            .selectFrom(sql `PRAGMA_TABLE_INFO(${table})`.as('table_info'))
             .select(['name', 'type', 'notnull'])
             .castTo()
             .execute();

package/dist/esm/index-nodeless.d.ts

@@ -17,9 +17,11 @@ export * from './query-builder/delete-result.js';
 export * from './query-builder/update-result.js';
 export * from './query-builder/on-conflict-builder.js';
 export * from './raw-builder/raw-builder.js';
+export * from './raw-builder/sql.js';
 export * from './query-executor/query-executor.js';
 export * from './query-executor/default-query-executor.js';
 export * from './query-executor/noop-query-executor.js';
+export * from './query-executor/query-executor-provider.js';
 export * from './query-compiler/default-query-compiler.js';
 export * from './query-compiler/compiled-query.js';
 export * from './schema/schema.js';

package/dist/esm/index-nodeless.js

@@ -18,9 +18,11 @@ export * from './query-builder/delete-result.js';
 export * from './query-builder/update-result.js';
 export * from './query-builder/on-conflict-builder.js';
 export * from './raw-builder/raw-builder.js';
+export * from './raw-builder/sql.js';
 export * from './query-executor/query-executor.js';
 export * from './query-executor/default-query-executor.js';
 export * from './query-executor/noop-query-executor.js';
+export * from './query-executor/query-executor-provider.js';
 export * from './query-compiler/default-query-compiler.js';
 export * from './query-compiler/compiled-query.js';
 export * from './schema/schema.js';

package/dist/esm/kysely.d.ts

@@ -6,11 +6,9 @@ import { QueryCreator } from './query-creator.js';
 import { KyselyPlugin } from './plugin/kysely-plugin.js';
 import { DatabaseIntrospector } from './dialect/database-introspector.js';
 import { Driver, IsolationLevel } from './driver/driver.js';
-import { ParseContext } from './parser/parse-context.js';
 import { FunctionBuilder } from './query-builder/function-builder.js';
 import { LogConfig } from './util/log.js';
-import { PRIVATE_ADAPTER } from './util/private-symbols.js';
-import { DialectAdapter } from './dialect/dialect-adapter.js';
+import { QueryExecutorProvider } from './query-executor/query-executor-provider.js';
 /**
  * The main Kysely class.
  *
@@ -54,7 +52,7 @@ import { DialectAdapter } from './dialect/dialect-adapter.js';
  *    in the database and values must be interfaces that describe the rows in those
  *    tables. See the examples above.
  */
-export declare class Kysely<DB> extends QueryCreator<DB> {
+export declare class Kysely<DB> extends QueryCreator<DB> implements QueryExecutorProvider {
     #private;
     constructor(args: KyselyConfig);
     constructor(args: KyselyProps);
@@ -226,7 +224,7 @@ export declare class Kysely<DB> extends QueryCreator<DB> {
      * @internal
      * @private
      */
-    get [PRIVATE_ADAPTER](): DialectAdapter;
+    getExecutor(): QueryExecutor;
 }
 export declare class Transaction<DB> extends Kysely<DB> {
     #private;
@@ -357,7 +355,6 @@ export interface KyselyProps {
     readonly driver: Driver;
     readonly executor: QueryExecutor;
     readonly dialect: Dialect;
-    readonly parseContext: ParseContext;
 }
 export declare function isKyselyProps(obj: unknown): obj is KyselyProps;
 export interface KyselyConfig {

package/dist/esm/kysely.js

@@ -9,10 +9,8 @@ import { RuntimeDriver } from './driver/runtime-driver.js';
 import { SingleConnectionProvider } from './driver/single-connection-provider.js';
 import { TRANSACTION_ISOLATION_LEVELS, } from './driver/driver.js';
 import { preventAwait } from './util/prevent-await.js';
-import { DefaultParseContext } from './parser/parse-context.js';
 import { FunctionBuilder } from './query-builder/function-builder.js';
 import { Log } from './util/log.js';
-import { PRIVATE_ADAPTER } from './util/private-symbols.js';
 /**
  * The main Kysely class.
  *
@@ -62,7 +60,7 @@ export class Kysely extends QueryCreator {
         let superProps;
         let props;
         if (isKyselyProps(args)) {
-            superProps = { executor: args.executor, parseContext: args.parseContext };
+            superProps = { executor: args.executor };
             props = { ...args };
         }
         else {
@@ -71,17 +69,15 @@ export class Kysely extends QueryCreator {
             const compiler = dialect.createQueryCompiler();
             const adapter = dialect.createAdapter();
             const log = new Log(args.log ?? []);
-            const parseContext = new DefaultParseContext(adapter);
             const runtimeDriver = new RuntimeDriver(driver, log);
             const connectionProvider = new DefaultConnectionProvider(runtimeDriver);
-            const executor = new DefaultQueryExecutor(compiler, connectionProvider, args.plugins ?? []);
-            superProps = { executor, parseContext };
+            const executor = new DefaultQueryExecutor(compiler, adapter, connectionProvider, args.plugins ?? []);
+            superProps = { executor };
             props = {
                 config: args,
                 executor,
                 dialect,
                 driver: runtimeDriver,
-                parseContext,
             };
         }
         super(superProps);
@@ -137,7 +133,7 @@ export class Kysely extends QueryCreator {
      * ```
      */
     get fn() {
-        return new FunctionBuilder({ executor: this.#props.executor });
+        return new FunctionBuilder();
     }
     /**
      * Creates a {@link TransactionBuilder} that can be used to run queries inside a transaction.
@@ -283,8 +279,8 @@ export class Kysely extends QueryCreator {
      * @internal
      * @private
      */
-    get [PRIVATE_ADAPTER]() {
-        return this.#props.parseContext.adapter;
+    getExecutor() {
+        return this.#props.executor;
     }
 }
 export class Transaction extends Kysely {
@@ -329,8 +325,7 @@ export function isKyselyProps(obj) {
         isObject(obj.config) &&
         isObject(obj.driver) &&
         isObject(obj.executor) &&
-        isObject(obj.dialect) &&
-        isObject(obj.parseContext));
+        isObject(obj.dialect));
 }
 export class ConnectionBuilder {
     #props;

package/dist/esm/migration/migrator.js

@@ -1,6 +1,5 @@
 /// <reference types="./migrator.d.ts" />
 import { freeze, getLast } from '../util/object-utils.js';
-import { PRIVATE_ADAPTER } from '../util/private-symbols.js';
 export const MIGRATION_TABLE = 'kysely_migration';
 export const MIGRATION_LOCK_TABLE = 'kysely_migration_lock';
 export const MIGRATION_LOCK_ID = 'migration_lock';
@@ -260,9 +259,10 @@ export class Migrator {
         return !!lockRow;
     }
     async #runMigrations(getTargetMigrationIndex) {
+        const adapter = this.#props.db.getExecutor().adapter;
         const run = async (db) => {
             try {
-                await this.#props.db[PRIVATE_ADAPTER].acquireMigrationLock(db);
+                await adapter.acquireMigrationLock(db);
                 const state = await this.#getState(db);
                 if (state.migrations.length === 0) {
                     return { results: [] };
@@ -280,10 +280,10 @@ export class Migrator {
                 return { results: [] };
             }
             finally {
-                await this.#props.db[PRIVATE_ADAPTER].releaseMigrationLock(db);
+                await adapter.releaseMigrationLock(db);
             }
         };
-        if (this.#props.db[PRIVATE_ADAPTER].supportsTransactionalDdl) {
+        if (adapter.supportsTransactionalDdl) {
             return this.#props.db.transaction().execute(run);
         }
         else {

package/dist/esm/operation-node/operation-node-transformer.js

@@ -218,7 +218,7 @@ export class OperationNodeTransformer {
         return {
             kind: 'RawNode',
             sqlFragments: freeze([...node.sqlFragments]),
-            params: this.transformNodeList(node.params),
+            parameters: this.transformNodeList(node.parameters),
         };
     }
     transformWhere(node) {

package/dist/esm/operation-node/raw-node.d.ts

@@ -2,13 +2,15 @@ import { OperationNode } from './operation-node.js';
 export interface RawNode extends OperationNode {
     readonly kind: 'RawNode';
     readonly sqlFragments: ReadonlyArray<string>;
-    readonly params: ReadonlyArray<OperationNode>;
+    readonly parameters: ReadonlyArray<OperationNode>;
 }
 /**
  * @internal
  */
 export declare const RawNode: Readonly<{
     is(node: OperationNode): node is RawNode;
-    create(sqlFragments: ReadonlyArray<string>, params: ReadonlyArray<OperationNode>): RawNode;
+    create(sqlFragments: ReadonlyArray<string>, parameters: ReadonlyArray<OperationNode>): RawNode;
     createWithSql(sql: string): RawNode;
+    createWithChild(child: OperationNode): RawNode;
+    createWithChildren(children: ReadonlyArray<OperationNode>): RawNode;
 }>;

package/dist/esm/operation-node/raw-node.js

@@ -7,14 +7,20 @@ export const RawNode = freeze({
     is(node) {
         return node.kind === 'RawNode';
     },
-    create(sqlFragments, params) {
+    create(sqlFragments, parameters) {
         return freeze({
             kind: 'RawNode',
             sqlFragments: freeze(sqlFragments),
-            params: freeze(params),
+            parameters: freeze(parameters),
         });
     },
     createWithSql(sql) {
         return RawNode.create([sql], []);
     },
+    createWithChild(child) {
+        return RawNode.create(['', ''], [child]);
+    },
+    createWithChildren(children) {
+        return RawNode.create(new Array(children.length + 1).fill(''), children);
+    },
 });

package/dist/esm/parser/complex-expression-parser.d.ts

@@ -1,10 +1,10 @@
+import { RawBuilder } from '../index-nodeless.js';
 import { AliasNode } from '../operation-node/alias-node.js';
 import { RawNode } from '../operation-node/raw-node.js';
 import { SelectQueryNode } from '../operation-node/select-query-node.js';
-import { AliasedQueryBuilderFactory, AliasedRawBuilderFactory, AnyAliasedQueryBuilder, AnyAliasedRawBuilder, AnySelectQueryBuilder, AnyRawBuilder, SelectQueryBuilderFactory, RawBuilderFactory } from '../util/type-utils.js';
-import { ParseContext } from './parse-context.js';
-export declare type ComplexExpression<DB, TB extends keyof DB> = AnySelectQueryBuilder | SelectQueryBuilderFactory<DB, TB> | AnyRawBuilder | RawBuilderFactory<DB, TB>;
+import { AliasedQueryBuilderFactory, AliasedRawBuilderFactory, AnyAliasedQueryBuilder, AnyAliasedRawBuilder, AnySelectQueryBuilder, SelectQueryBuilderFactory, RawBuilderFactory } from '../util/type-utils.js';
+export declare type ComplexExpression<DB, TB extends keyof DB, V = any> = AnySelectQueryBuilder | SelectQueryBuilderFactory<DB, TB> | RawBuilder<V> | RawBuilderFactory<DB, TB>;
 export declare type AliasedComplexExpression<DB, TB extends keyof DB> = AnyAliasedQueryBuilder | AliasedQueryBuilderFactory<DB, TB> | AnyAliasedRawBuilder | AliasedRawBuilderFactory<DB, TB>;
-export declare function parseComplexExpression(ctx: ParseContext, exp: ComplexExpression<any, any>): SelectQueryNode | RawNode;
-export declare function parseAliasedComplexExpression(ctx: ParseContext, exp: AliasedComplexExpression<any, any>): AliasNode;
+export declare function parseComplexExpression(exp: ComplexExpression<any, any>): SelectQueryNode | RawNode;
+export declare function parseAliasedComplexExpression(exp: AliasedComplexExpression<any, any>): AliasNode;
 export declare function isComplexExpression(obj: unknown): obj is ComplexExpression<any, any>;

package/dist/esm/parser/complex-expression-parser.js

@@ -1,21 +1,22 @@
 /// <reference types="./complex-expression-parser.d.ts" />
 import { isOperationNodeSource } from '../operation-node/operation-node-source.js';
 import { isFunction } from '../util/object-utils.js';
-export function parseComplexExpression(ctx, exp) {
+import { createExpressionBuilder } from './parse-utils.js';
+export function parseComplexExpression(exp) {
     if (isOperationNodeSource(exp)) {
         return exp.toOperationNode();
     }
     else if (isFunction(exp)) {
-        return exp(ctx.createExpressionBuilder()).toOperationNode();
+        return exp(createExpressionBuilder()).toOperationNode();
     }
     throw new Error(`invalid expression: ${JSON.stringify(exp)}`);
 }
-export function parseAliasedComplexExpression(ctx, exp) {
+export function parseAliasedComplexExpression(exp) {
     if (isOperationNodeSource(exp)) {
         return exp.toOperationNode();
     }
     else if (isFunction(exp)) {
-        return exp(ctx.createExpressionBuilder()).toOperationNode();
+        return exp(createExpressionBuilder()).toOperationNode();
     }
     throw new Error(`invalid aliased expression: ${JSON.stringify(exp)}`);
 }

package/dist/esm/parser/filter-parser.d.ts

@@ -4,21 +4,21 @@ import { Operator } from '../operation-node/operator-node.js';
 import { ExtractTypeFromReferenceExpression, ReferenceExpression } from './reference-parser.js';
 import { ValueExpression, ValueExpressionOrList } from './value-parser.js';
 import { FilterExpressionNode } from '../operation-node/operation-node-utils.js';
-import { ParseContext } from './parse-context.js';
 import { WhereInterface } from '../query-builder/where-interface.js';
 import { HavingInterface } from '../query-builder/having-interface.js';
+import { ComplexExpression } from './complex-expression-parser.js';
 export declare type FilterValueExpression<DB, TB extends keyof DB, RE> = ValueExpression<DB, TB, ExtractTypeFromReferenceExpression<DB, TB, RE>>;
 export declare type FilterValueExpressionOrList<DB, TB extends keyof DB, RE> = ValueExpressionOrList<DB, TB, ExtractTypeFromReferenceExpression<DB, TB, RE>>;
-export declare type ExistsExpression<DB, TB extends keyof DB> = ValueExpression<DB, TB, never>;
+export declare type ExistsExpression<DB, TB extends keyof DB> = ComplexExpression<DB, TB, any>;
 export declare type WhereGrouper<DB, TB extends keyof DB> = (qb: WhereInterface<DB, TB>) => WhereInterface<DB, TB>;
 export declare type HavingGrouper<DB, TB extends keyof DB> = (qb: HavingInterface<DB, TB>) => HavingInterface<DB, TB>;
 export declare type FilterOperator = Operator | AnyRawBuilder;
 declare type FilterType = 'where' | 'having' | 'on';
-export declare function parseWhereFilter(ctx: ParseContext, args: any[]): FilterExpressionNode;
-export declare function parseHavingFilter(ctx: ParseContext, args: any[]): FilterExpressionNode;
-export declare function parseOnFilter(ctx: ParseContext, args: any[]): FilterExpressionNode;
-export declare function parseReferenceFilter(ctx: ParseContext, lhs: ReferenceExpression<any, any>, op: FilterOperator, rhs: ReferenceExpression<any, any>): FilterNode;
-export declare function parseExistFilter(ctx: ParseContext, arg: ExistsExpression<any, any>): FilterNode;
-export declare function parseNotExistFilter(ctx: ParseContext, arg: ExistsExpression<any, any>): FilterNode;
-export declare function parseFilter(ctx: ParseContext, type: FilterType, args: any[]): FilterExpressionNode;
+export declare function parseWhereFilter(args: any[]): FilterExpressionNode;
+export declare function parseHavingFilter(args: any[]): FilterExpressionNode;
+export declare function parseOnFilter(args: any[]): FilterExpressionNode;
+export declare function parseReferenceFilter(lhs: ReferenceExpression<any, any>, op: FilterOperator, rhs: ReferenceExpression<any, any>): FilterNode;
+export declare function parseExistFilter(arg: ExistsExpression<any, any>): FilterNode;
+export declare function parseNotExistFilter(arg: ExistsExpression<any, any>): FilterNode;
+export declare function parseFilter(type: FilterType, args: any[]): FilterExpressionNode;
 export {};