pqb 0.30.2 → 0.30.4

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { ExpressionTypeMethod, Expression, RawSQLBase, emptyObject, isTemplateLiteralArgs, ColumnTypeBase, setColumnData, pushColumnData, quoteObjectKey, toArray, singleQuote, addCode, singleQuoteArray, objectHasValues, columnDefaultArgumentToCode, columnErrorMessagesToCode, getValueKey, isExpression, joinTruthy, numberDataToCode, stringDataToCode, getDefaultLanguage, dateDataToCode, pushOrNewArrayToObject, arrayDataToCode, noop, emptyArray, callWithThis, setParserToQuery, applyTransforms, isRawSQL, pushOrNewArray, setDefaultNowFn, setDefaultLanguage, makeTimestampsHelpers, setCurrentColumnName, setAdapterConnectRetry, isObjectEmpty, applyMixins, toSnakeCase, snakeCaseKey } from 'orchid-core';
+import { ExpressionTypeMethod, Expression, RawSQLBase, emptyObject, isTemplateLiteralArgs, ColumnTypeBase, setColumnData, pushColumnData, quoteObjectKey, toArray, singleQuote, addCode, singleQuoteArray, objectHasValues, columnDefaultArgumentToCode, columnErrorMessagesToCode, getValueKey, addValue, isExpression, joinTruthy, numberDataToCode, stringDataToCode, getDefaultLanguage, dateDataToCode, pushOrNewArrayToObject, arrayDataToCode, noop, emptyArray, callWithThis, setParserToQuery, applyTransforms, isRawSQL, pushOrNewArray, setDefaultNowFn, setDefaultLanguage, makeTimestampsHelpers, setCurrentColumnName, setAdapterConnectRetry, isObjectEmpty, ValExpression, applyMixins, toSnakeCase, snakeCaseKey } from 'orchid-core';
 import pg from 'pg';
 import { inspect } from 'node:util';
 import { AsyncLocalStorage } from 'node:async_hooks';
@@ -27,8 +27,8 @@ const templateLiteralToSQL = (template, ctx, quotedAs) => {
 class RawSQL extends RawSQLBase {
   constructor(sql, values, type) {
     super(sql, values);
+    this.result = { value: type };
     if (type) {
-      this.result = { value: type };
       Object.assign(this, type.operators);
     }
   }
@@ -834,102 +834,6 @@ const columnCode = (type, t, code, migration, data = type.data, skip) => {
   return code.length === 1 && typeof code[0] === "string" ? code[0] : code;
 };
 
-function simpleColumnToSQL(ctx, key, column, quotedAs) {
-  if (!column)
-    return `"${key}"`;
-  const { data } = column;
-  return data.computed ? data.computed.toSQL(ctx, quotedAs) : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
-}
-function simpleExistingColumnToSQL(ctx, key, column, quotedAs) {
-  const { data } = column;
-  return data.computed ? data.computed.toSQL(ctx, quotedAs) : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
-}
-const columnToSql = (ctx, data, shape, column, quotedAs, select) => {
-  var _a, _b, _c, _d, _e;
-  const index = column.indexOf(".");
-  if (index !== -1) {
-    const table = column.slice(0, index);
-    const key = column.slice(index + 1);
-    if (key === "*") {
-      if ((_a = data.joinedShapes) == null ? void 0 : _a[table]) {
-        return select ? `row_to_json("${table}".*)` : `"${table}".r`;
-      }
-      return column;
-    }
-    const tableName = ((_b = data.joinOverrides) == null ? void 0 : _b[table]) || table;
-    const quoted = `"${table}"`;
-    const col = quoted === quotedAs ? shape[key] : (_d = (_c = data.joinedShapes) == null ? void 0 : _c[tableName]) == null ? void 0 : _d[key];
-    if (col) {
-      if (col.data.name) {
-        return `"${tableName}"."${col.data.name}"`;
-      }
-      if (col.data.computed) {
-        return `${col.data.computed.toSQL(ctx, quoted)}`;
-      }
-      return `"${tableName}"."${key}"`;
-    }
-    return `"${tableName}"."${key}"`;
-  }
-  if (!select && ((_e = data.joinedShapes) == null ? void 0 : _e[column])) {
-    return `"${column}".r`;
-  }
-  return simpleColumnToSQL(ctx, column, shape[column], quotedAs);
-};
-const columnToSqlWithAs = (ctx, data, column, quotedAs, select) => {
-  var _a, _b, _c, _d;
-  const index = column.indexOf(".");
-  if (index !== -1) {
-    const table = column.slice(0, index);
-    const key = column.slice(index + 1);
-    if (key === "*") {
-      if ((_a = data.joinedShapes) == null ? void 0 : _a[table]) {
-        return select ? `row_to_json("${table}".*) "${table}"` : `"${table}".r "${table}"`;
-      }
-      return column;
-    }
-    const tableName = ((_b = data.joinOverrides) == null ? void 0 : _b[table]) || table;
-    const quoted = `"${table}"`;
-    const col2 = quoted === quotedAs ? data.shape[key] : (_c = data.joinedShapes) == null ? void 0 : _c[tableName][key];
-    if (col2) {
-      if (col2.data.name && col2.data.name !== key) {
-        return `"${tableName}"."${col2.data.name}" "${key}"`;
-      }
-      if (col2.data.computed) {
-        return `${col2.data.computed.toSQL(ctx, quoted)} "${key}"`;
-      }
-    }
-    return `"${tableName}"."${key}"`;
-  }
-  if (!select && ((_d = data.joinedShapes) == null ? void 0 : _d[column])) {
-    return select ? `row_to_json("${column}".*) "${column}"` : `"${column}".r "${column}"`;
-  }
-  const col = data.shape[column];
-  if (col) {
-    if (col.data.name && col.data.name !== column) {
-      return `${quotedAs ? `${quotedAs}.` : ""}"${col.data.name}" "${column}"`;
-    }
-    if (col.data.computed) {
-      return `${col.data.computed.toSQL(ctx, quotedAs)} "${column}"`;
-    }
-  }
-  return `${quotedAs ? `${quotedAs}.` : ""}"${column}"`;
-};
-const ownColumnToSql = (data, column, quotedAs) => {
-  var _a;
-  const name = (_a = data.shape[column]) == null ? void 0 : _a.data.name;
-  return `${quotedAs ? `${quotedAs}.` : ""}"${name || column}"${name && name !== column ? ` "${column}"` : ""}`;
-};
-const rawOrColumnToSql = (ctx, data, expr, quotedAs, shape = data.shape, select) => {
-  return typeof expr === "string" ? columnToSql(ctx, data, shape, expr, quotedAs, select) : expr.toSQL(ctx, quotedAs);
-};
-const quoteSchemaAndTable = (schema, table) => {
-  return schema ? `"${schema}"."${table}"` : `"${table}"`;
-};
-const addValue = (values, value) => {
-  values.push(value);
-  return `$${values.length}`;
-};
-
 var __defProp$f = Object.defineProperty;
 var __defProps$7 = Object.defineProperties;
 var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
@@ -1859,6 +1763,98 @@ const queryTypeWithLimitOne = {
 };
 const isQueryReturnsAll = (q) => !q.q.returnType || q.q.returnType === "all";
 
+function simpleColumnToSQL(ctx, key, column, quotedAs) {
+  if (!column)
+    return `"${key}"`;
+  const { data } = column;
+  return data.computed ? data.computed.toSQL(ctx, quotedAs) : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
+}
+function simpleExistingColumnToSQL(ctx, key, column, quotedAs) {
+  const { data } = column;
+  return data.computed ? data.computed.toSQL(ctx, quotedAs) : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
+}
+const columnToSql = (ctx, data, shape, column, quotedAs, select) => {
+  var _a, _b, _c, _d, _e;
+  const index = column.indexOf(".");
+  if (index !== -1) {
+    const table = column.slice(0, index);
+    const key = column.slice(index + 1);
+    if (key === "*") {
+      if ((_a = data.joinedShapes) == null ? void 0 : _a[table]) {
+        return select ? `row_to_json("${table}".*)` : `"${table}".r`;
+      }
+      return column;
+    }
+    const tableName = ((_b = data.joinOverrides) == null ? void 0 : _b[table]) || table;
+    const quoted = `"${table}"`;
+    const col = quoted === quotedAs ? shape[key] : (_d = (_c = data.joinedShapes) == null ? void 0 : _c[tableName]) == null ? void 0 : _d[key];
+    if (col) {
+      if (col.data.name) {
+        return `"${tableName}"."${col.data.name}"`;
+      }
+      if (col.data.computed) {
+        return `${col.data.computed.toSQL(ctx, quoted)}`;
+      }
+      return `"${tableName}"."${key}"`;
+    }
+    return `"${tableName}"."${key}"`;
+  }
+  if (!select && ((_e = data.joinedShapes) == null ? void 0 : _e[column])) {
+    return `"${column}".r`;
+  }
+  return simpleColumnToSQL(ctx, column, shape[column], quotedAs);
+};
+const columnToSqlWithAs = (ctx, data, column, quotedAs, select) => {
+  var _a, _b, _c, _d;
+  const index = column.indexOf(".");
+  if (index !== -1) {
+    const table = column.slice(0, index);
+    const key = column.slice(index + 1);
+    if (key === "*") {
+      if ((_a = data.joinedShapes) == null ? void 0 : _a[table]) {
+        return select ? `row_to_json("${table}".*) "${table}"` : `"${table}".r "${table}"`;
+      }
+      return column;
+    }
+    const tableName = ((_b = data.joinOverrides) == null ? void 0 : _b[table]) || table;
+    const quoted = `"${table}"`;
+    const col2 = quoted === quotedAs ? data.shape[key] : (_c = data.joinedShapes) == null ? void 0 : _c[tableName][key];
+    if (col2) {
+      if (col2.data.name && col2.data.name !== key) {
+        return `"${tableName}"."${col2.data.name}" "${key}"`;
+      }
+      if (col2.data.computed) {
+        return `${col2.data.computed.toSQL(ctx, quoted)} "${key}"`;
+      }
+    }
+    return `"${tableName}"."${key}"`;
+  }
+  if (!select && ((_d = data.joinedShapes) == null ? void 0 : _d[column])) {
+    return select ? `row_to_json("${column}".*) "${column}"` : `"${column}".r "${column}"`;
+  }
+  const col = data.shape[column];
+  if (col) {
+    if (col.data.name && col.data.name !== column) {
+      return `${quotedAs ? `${quotedAs}.` : ""}"${col.data.name}" "${column}"`;
+    }
+    if (col.data.computed) {
+      return `${col.data.computed.toSQL(ctx, quotedAs)} "${column}"`;
+    }
+  }
+  return `${quotedAs ? `${quotedAs}.` : ""}"${column}"`;
+};
+const ownColumnToSql = (data, column, quotedAs) => {
+  var _a;
+  const name = (_a = data.shape[column]) == null ? void 0 : _a.data.name;
+  return `${quotedAs ? `${quotedAs}.` : ""}"${name || column}"${name && name !== column ? ` "${column}"` : ""}`;
+};
+const rawOrColumnToSql = (ctx, data, expr, quotedAs, shape = data.shape, select) => {
+  return typeof expr === "string" ? columnToSql(ctx, data, shape, expr, quotedAs, select) : expr.toSQL(ctx, quotedAs);
+};
+const quoteSchemaAndTable = (schema, table) => {
+  return schema ? `"${schema}"."${table}"` : `"${table}"`;
+};
+
 const pushDistinctSql = (ctx, table, distinct, quotedAs) => {
   ctx.sql.push("DISTINCT");
   if (distinct.length) {
@@ -2026,13 +2022,23 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
     qb.q.and = qb.q.or = void 0;
     qb.q.isSubQuery = true;
     const res = resolveSubQueryCallback(qb, data);
-    const expr = res instanceof Expression ? res : res.q.expr;
-    if (!(res instanceof Expression) && res.q.expr) {
-      const q = joinSubQuery(table, res);
-      q.q.select = [expr];
-      ands.push(`(${makeSQL(q, ctx).text})`);
+    if (isExpression(res)) {
+      ands.push(`(${res.toSQL(ctx, quotedAs)})`);
     } else {
-      pushWhereToSql(ands, ctx, res, res.q, quotedAs, true);
+      if (res.q.expr) {
+        const q = joinSubQuery(table, res);
+        q.q.select = [res.q.expr];
+        ands.push(`(${makeSQL(q, ctx).text})`);
+      } else {
+        pushWhereToSql(
+          ands,
+          ctx,
+          res,
+          res.q,
+          quotedAs,
+          true
+        );
+      }
     }
     return;
   }
@@ -2210,9 +2216,15 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
         }
       }
     } else {
-      ands.push(
-        `${columnToSql(ctx, query, query.shape, key, quotedAs)} ${value === null ? "IS NULL" : `= ${addValue(ctx.values, value)}`}`
-      );
+      const column = columnToSql(ctx, query, query.shape, key, quotedAs);
+      if (typeof value === "function") {
+        const expr = value(table);
+        ands.push(`${column} = ${expr.toSQL(ctx, quotedAs)}`);
+      } else {
+        ands.push(
+          `${column} ${value === null ? "IS NULL" : `= ${addValue(ctx.values, value)}`}`
+        );
+      }
     }
   }
 };
@@ -3688,7 +3700,6 @@ class From {
    * ```ts
    * const value = 123;
    * db.table.fromSql`value = ${value}`;
-   * db.table.fromSql(db.table.sql`value = ${value}`);
    * ```
    *
    * @param args - SQL expression
@@ -4709,7 +4720,7 @@ const makeSQL = (table, options) => {
     sql.push(`WINDOW ${window.join(", ")}`);
   }
   if (query.union) {
-    query.union.forEach((item) => {
+    for (const item of query.union) {
       let itemSql;
       if (isExpression(item.arg)) {
         itemSql = item.arg.toSQL(ctx, quotedAs);
@@ -4718,7 +4729,7 @@ const makeSQL = (table, options) => {
         itemSql = argSql.text;
       }
       sql.push(`${item.kind} ${item.wrap ? `(${itemSql})` : itemSql}`);
-    });
+    }
   }
   if (query.order) {
     pushOrderBySql(ctx, query, quotedAs, query.order);
@@ -5412,7 +5423,8 @@ class FnExpression extends Expression {
   }
 }
 function makeFnExpression(self, type, fn, args, options) {
-  const q = self.clone();
+  const q = extendQuery(self, type.operators);
+  q.baseQuery.type = ExpressionTypeMethod.prototype.type;
   new FnExpression(
     q,
     fn,
@@ -5434,49 +5446,6 @@ nullableInt.parseItem = nullableInt.parseFn = (input) => input === null ? null :
 const nullableFloat = new RealColumn(defaultSchemaConfig);
 nullableFloat.parseItem = nullableFloat.parseFn = (input) => input === null ? null : parseFloat(input);
 class AggregateMethods {
-  /**
-   * `fn` allows to call an arbitrary SQL function.
-   *
-   * For example, calling `sqrt` function to get a square root from some numeric column:
-   *
-   * ```ts
-   * const q = await User.select({
-   *   // todo: use type callback instead of generic type
-   *   sqrt: (q) => q.fn<number>('sqrt', ['numericColumn']),
-   * }).take();
-   *
-   * q.sqrt; // has type `number` just as provided
-   * ```
-   *
-   * If this is an aggregate function, you can specify aggregation options via third parameter.
-   *
-   * Forth parameter is for runtime column type. When specified, allows to chain the function with the column operators:
-   *
-   * ```ts
-   * const q = await User.select({
-   *   // chain `sqrt("numericColumn")` with the "greater than 5"
-   *   sqrtIsGreaterThan5: (q) => q.fn('sqrt', ['numericColumn'], {}, (t) => t.float()).gt(5),
-   * }).take();
-   *
-   * // Return type is boolean | null
-   * // todo: it should be just boolean if the column is not nullable, but for now it's always nullable
-   * q.sqrtIsGreaterThan5
-   * ```
-   *
-   * @param fn
-   * @param args
-   * @param options
-   * @param type
-   */
-  fn(fn, args, options, type) {
-    return makeFnExpression(
-      this,
-      (type == null ? void 0 : type(this.columnTypes)) || emptyObject,
-      fn,
-      args,
-      options
-    );
-  }
   /**
    * Use `exists()` to check if there is at least one record-matching condition.
    *
@@ -5821,7 +5790,7 @@ class AggregateMethods {
    *     // select a column with alias
    *     nameAlias: 'name',
    *     // select raw SQL with alias
-   *     foo: db.table.sql<string>`"bar" || "baz"`,
+   *     foo: sql<string>`"bar" || "baz"`,
    *   },
    *   aggregateOptions,
    * );
@@ -5831,7 +5800,7 @@ class AggregateMethods {
    *   object: (q) =>
    *     q.jsonObjectAgg({
    *       nameAlias: 'name',
-   *       foo: db.table.sql<string>`"bar" || "baz"`,
+   *       foo: sql<string>`"bar" || "baz"`,
    *     }),
    * });
    * ```
@@ -6303,7 +6272,7 @@ class Create {
    *
    * await db.table.create({
    *   // raw SQL
-   *   column1: db.table.sql`'John' | 'Doe'`,
+   *   column1: sql`'John' || ' ' || 'Doe'`,
    *
    *   // query that returns a single value
    *   // returning multiple values will result in Postgres error
@@ -6366,7 +6335,7 @@ class Create {
    * ```ts
    * const oneRecord = await db.table.createRaw({
    *   columns: ['name', 'amount'],
-   *   values: db.table.sql`'name', random()`,
+   *   values: sql`'name', random()`,
    * });
    * ```
    *
@@ -6395,7 +6364,7 @@ class Create {
    * ```ts
    * const manyRecords = await db.table.createManyRaw({
    *   columns: ['name', 'amount'],
-   *   values: [db.table.sql`'one', 2`, db.table.sql`'three', 4`],
+   *   values: [sql`'one', 2`, sql`'three', 4`],
    * });
    * ```
    *
@@ -6549,11 +6518,11 @@ class Create {
    * // raw SQL expression:
    * db.table
    *   .create(data)
-   *   .onConfict(db.table.sql`(email) where condition`)
+   *   .onConfict(sql`(email) where condition`)
    *   .merge();
    * ```
    *
-   * You can use the db.table.sql function in onConflict.
+   * You can use the `sql` function exported from your `BaseTable` file in onConflict.
    * It can be useful to specify a condition when you have a partial index:
    *
    * ```ts
@@ -6564,7 +6533,7 @@ class Create {
    *     active: true,
    *   })
    *   // ignore only when having conflicting email and when active is true.
-   *   .onConflict(db.table.sql`(email) where active`)
+   *   .onConflict(sql`(email) where active`)
    *   .ignore();
    * ```
    *
@@ -6664,7 +6633,7 @@ class OnConflictQueryBuilder {
    * db.table
    *   .create(data)
    *   .onConflict()
-   *   .set(db.table.sql`raw SQL expression`);
+   *   .set(sql`raw SQL expression`);
    *
    * // update records only on certain conditions
    * db.table
@@ -6838,16 +6807,20 @@ class For {
 
 class QueryGet {
   /**
-   * `.get` returns a single value, it will add `LIMIT 1` to the query, and accepts a column name or a raw expression.
-   * It will throw `NotFoundError` when not found.
+   * `.get` returns a single value, adds `LIMIT 1` to the query, and accepts a column name or a raw SQL expression.
+   *
+   * `get` throws a `NotFoundError` when not found, and `getOptional` returns `undefined`.
    *
    * ```ts
    * import { NumberColumn } from 'orchid-orm';
+   * import { sql } from './baseTable';
    *
    * const firstName: string = await db.table.get('name');
    *
-   * const rawResult: number = await db.table.get(
-   *   db.table.sql((t) => t.integer())`1 + 1`,
+   * const rawResult: number = await db.table.get(sql((t) => t.integer())`1 + 1`);
+   *
+   * const firstNameOptional: string | undefined = await db.table.getOptional(
+   *   'name',
    * );
    * ```
    *
@@ -6935,7 +6908,7 @@ class Having {
    * Provide SQL expression for the `HAVING` SQL statement:
    *
    * ```ts
-   * db.table.having`count(*) >= ${10}`;
+   * db.table.havingSql`count(*) >= ${10}`;
    * ```
    *
    * @param args - SQL expression
@@ -7449,7 +7422,8 @@ class Join {
    * ```ts
    * db.user.join(
    *   db.message,
-   *   db.user.sql`lower("message"."text") = lower("user"."name")`,
+   *   // `sql` can be imported from your `BaseTable` file
+   *   sql`lower("message"."text") = lower("user"."name")`,
    * );
    * ```
    *
@@ -7458,16 +7432,16 @@ class Join {
    * ```ts
    * db.user.join(
    *   db.message,
-   *   db.user.sql`lower("message"."text")`,
-   *   db.user.sql`lower("user"."name")`,
+   *   sql`lower("message"."text")`,
+   *   sql`lower("user"."name")`,
    * );
    *
    * // with operator:
    * db.user.join(
    *   db.message,
-   *   db.user.sql`lower("message"."text")`,
+   *   sql`lower("message"."text")`,
    *   '!=',
-   *   db.user.sql`lower("user"."name")`,
+   *   sql`lower("user"."name")`,
    * );
    * ```
    *
@@ -7481,7 +7455,7 @@ class Join {
    *   'message.userId': 'user.id',
    *
    *   // value can be a raw SQL expression:
-   *   text: db.user.sql`lower("user"."name")`,
+   *   text: sql`lower("user"."name")`,
    * });
    * ```
    *
@@ -8271,7 +8245,7 @@ class With {
    *     id: columnTypes.integer(),
    *     name: columnTypes.text(3, 100),
    *   },
-   *   db.table.sql`SELECT id, name FROM "someTable"`,
+   *   sql`SELECT id, name FROM "someTable"`,
    * );
    *
    * // accepts query:
@@ -8279,7 +8253,7 @@ class With {
    *
    * // accepts a callback for a query builder:
    * db.table.with('alias', (qb) =>
-   *   qb.select({ one: db.table.sql`1`.type((t) => t.integer()) }),
+   *   qb.select({ one: sql`1`.type((t) => t.integer()) }),
    * );
    *
    * // All mentioned forms can accept options as a second argument:
@@ -8331,7 +8305,7 @@ class Union {
    * SomeTable.select('id', 'name').union(
    *   [
    *     OtherTable.select('id', 'name'),
-   *     SomeTable.sql`SELECT id, name FROM "thirdTable"`,
+   *     sql`SELECT id, name FROM "thirdTable"`,
    *   ],
    *   true, // optional wrap parameter
    * );
@@ -8526,7 +8500,13 @@ class Where {
    *   },
    *
    *   // where column equals to raw SQL
-   *   column: db.table.sql`sql expression`,
+   *   // import `sql` from your `BaseTable`
+   *   column: sql`sql expression`,
+   *   // or use `(q) => q.sql` for the same
+   *   column2: (q) => q.sql`sql expression`,
+   *
+   *   // reference other columns in such a way:
+   *   firstName: (q) => q.ref('lastName'),
    * });
    * ```
    *
@@ -8575,12 +8555,7 @@ class Where {
    * `where` supports raw SQL:
    *
    * ```ts
-   * db.table.where(db.table.sql`a = b`);
-   *
-   * // or
-   * import { raw } from 'orchid-orm';
-   *
-   * db.table.where(raw`a = b`);
+   * db.table.where(sql`a = b`);
    * ```
    *
    * `where` can accept a callback with a specific query builder containing all "where" methods such as `where`, `orWhere`, `whereNot`, `whereIn`, `whereExists`:
@@ -8601,7 +8576,7 @@ class Where {
    * db.table.where(
    *   { id: 1 },
    *   db.table.where({ name: 'John' }),
-   *   db.table.sql`a = b`,
+   *   sql`a = b`,
    * );
    * ```
    *
@@ -8714,8 +8689,6 @@ class Where {
    * All column operators can take a value of the same type as the column, a sub-query, or a raw SQL expression:
    *
    * ```ts
-   * import { sql } from 'orchid-orm';
-   *
    * db.table.where({
    *   numericColumn: {
    *     // lower than 5
@@ -8764,7 +8737,7 @@ class Where {
    *     // WHERE "column" IN (SELECT "column" FROM "otherTable")
    *     in: OtherTable.select('column'),
    *
-   *     in: db.table.sql`('a', 'b')`,
+   *     in: sql`('a', 'b')`,
    *   },
    * });
    * ```
@@ -8811,7 +8784,7 @@ class Where {
    *     between: [1, 10],
    *
    *     // sub-query and raw SQL expression
-   *     between: [OtherTable.select('column').take(), db.table.sql`2 + 2`],
+   *     between: [OtherTable.select('column').take(), sql`2 + 2`],
    *   },
    * });
    * ```
@@ -8903,15 +8876,7 @@ class Where {
    * Use a custom SQL expression in `WHERE` statement:
    *
    * ```ts
-   * db.table.where`a = b`;
-   *
-   * // or
-   * db.table.where(db.table.sql`a = b`);
-   *
-   * // or
-   * import { raw } from 'orchid-orm';
-   *
-   * db.table.where(raw`a = b`);
+   * db.table.whereSql`a = b`;
    * ```
    *
    * @param args - SQL expression
@@ -8944,10 +8909,10 @@ class Where {
     );
   }
   /**
-   * `whereNot` version accepting SQL expression:
+   * `whereNotSql` is a version of `whereNot` accepting SQL expression:
    *
    * ```ts
-   * db.table.whereNot`sql expression`
+   * db.table.whereNotSql`sql expression`
    * ```
    *
    * @param args - SQL expression
@@ -9024,7 +8989,7 @@ class Where {
    * It supports raw SQL expression:
    *
    * ```ts
-   * db.table.whereIn(['id', 'name'], db.table.sql`((1, 'one'), (2, 'two'))`);
+   * db.table.whereIn(['id', 'name'], sql`((1, 'one'), (2, 'two'))`);
    * ```
    */
   whereIn(...args) {
@@ -9338,7 +9303,7 @@ class Update {
    *   column1: 123,
    *
    *   // use raw SQL to update the column
-   *   column2: db.table.sql`2 + 2`,
+   *   column2: sql`2 + 2`,
    *
    *   // use query that returns a single value
    *   // returning multiple values will result in Postgres error
@@ -9466,7 +9431,7 @@ class Update {
    * const updatedCount = await db.table.find(1).updateRaw`name = ${value}`;
    *
    * // or update with `sql` function:
-   * await db.table.find(1).updateRaw(db.table.sql`name = ${value}`);
+   * await db.table.find(1).updateRaw(sql`name = ${value}`);
    * ```
    * @param args - raw SQL via a template string or by using a `sql` method
    */
@@ -10149,7 +10114,7 @@ class QueryUpsertOrCreate {
   }
 }
 
-class RawSqlMethods {
+class SqlMethod {
   sql(...args) {
     const sql = raw(...args);
     sql.columnTypes = this.columnTypes;
@@ -10390,6 +10355,144 @@ class RefExpression extends Expression {
     return columnToSql(ctx, this.q, this.q.shape, this.ref, quotedAs);
   }
 }
+class OrExpression extends Expression {
+  constructor(args) {
+    super();
+    this.args = args;
+    this.q = { expr: this };
+  }
+  makeSQL(ctx, quotedAs) {
+    const res = [];
+    for (const arg of this.args) {
+      if (arg) {
+        if (isExpression(arg)) {
+          const sql = arg.toSQL(ctx, quotedAs);
+          if (sql)
+            res.push(sql);
+        } else {
+          res.push(`(${arg.toSQL(ctx).text})`);
+        }
+      }
+    }
+    return `(${res.join(" OR ")})`;
+  }
+}
+Object.assign(OrExpression.prototype, Operators.boolean);
+class ExpressionMethods {
+  /**
+   * `column` references a table column, this can be used in raw SQL or when building a column expression.
+   * Only for referencing a column in the query's table. For referencing joined table's columns, see [ref](#ref).
+   *
+   * ```ts
+   * await db.table.select({
+   *   // select `("table"."id" = 1 OR "table"."name" = 'name') AS "one"`,
+   *   // returns a boolean
+   *   one: (q) =>
+   *     q.sql<boolean>`${q.column('id')} = ${1} OR ${q.column('name')} = ${'name'}`,
+   *
+   *   // selects the same as above, but by building a query
+   *   two: (q) => q.column('id').equals(1).or(q.column('name').equals('name')),
+   * });
+   * ```
+   *
+   * @param name - column name
+   */
+  column(name) {
+    const column = this.shape[name];
+    return new ColumnRefExpression(
+      column,
+      name
+    );
+  }
+  /**
+   * `ref` is similar to [column](#column), but it also allows to reference a column of joined table,
+   * and other dynamically defined columns.
+   *
+   * ```ts
+   * await db.table.join('otherTable').select({
+   *   // select `("otherTable"."id" = 1 OR "otherTable"."name" = 'name') AS "one"`,
+   *   // returns a boolean
+   *   one: (q) =>
+   *     q.sql<boolean>`${q.ref('otherTable.id')} = ${1} OR ${q.ref(
+   *       'otherTable.name',
+   *     )} = ${'name'}`,
+   *
+   *   // selects the same as above, but by building a query
+   *   two: (q) =>
+   *     q
+   *       .ref('otherTable.id')
+   *       .equals(1)
+   *       .or(q.ref('otherTable.name').equals('name')),
+   * });
+   * ```
+   *
+   * @param arg - any available column name, such as of a joined table
+   */
+  ref(arg) {
+    const q = this.clone();
+    const { shape } = q.q;
+    let column;
+    const index = arg.indexOf(".");
+    if (index !== -1) {
+      const table = arg.slice(0, index);
+      const col = arg.slice(index + 1);
+      if (table === (q.q.as || q.table)) {
+        column = shape[col];
+      } else {
+        column = q.q.joinedShapes[table][col];
+      }
+    } else {
+      column = shape[arg];
+    }
+    return new RefExpression(column, q.q, arg);
+  }
+  val(value) {
+    return new ValExpression(value);
+  }
+  /**
+   * `fn` allows to call an arbitrary SQL function.
+   *
+   * For example, calling `sqrt` function to get a square root from some numeric column:
+   *
+   * ```ts
+   * const q = await User.select({
+   *   sqrt: (q) => q.fn<number>('sqrt', ['numericColumn']),
+   * }).take();
+   *
+   * q.sqrt; // has type `number` just as provided
+   * ```
+   *
+   * If this is an aggregate function, you can specify aggregation options (see [Aggregate](/guide/aggregate.html)) via third parameter.
+   *
+   * Use `type` method to specify a column type so that its operators such as `lt` and `gt` become available:
+   *
+   * ```ts
+   * const q = await User.select({
+   *   // Produces `sqrt("numericColumn") > 5`
+   *   sqrtIsGreaterThan5: (q) =>
+   *     q
+   *       .fn('sqrt', ['numericColumn'])
+   *       .type((t) => t.float())
+   *       .gt(5),
+   * }).take();
+   *
+   * // Return type is boolean | null
+   * // todo: it should be just boolean if the column is not nullable, but for now it's always nullable
+   * q.sqrtIsGreaterThan5;
+   * ```
+   *
+   * @param fn
+   * @param args
+   * @param options
+   */
+  fn(fn, args, options) {
+    return makeFnExpression(this, emptyObject, fn, args, options);
+  }
+  or(...args) {
+    return new OrExpression(args);
+  }
+}
+
 const _queryAll = (q) => {
   q.q.returnType = "all";
   q.q.all = true;
@@ -10534,11 +10637,13 @@ class QueryMethods {
    * db.table.distinct().select('name');
    * ```
    *
-   * Can accept column names or raw expressions to place it to `DISTINCT ON (...)`:
+   * Can accept column names or raw SQL expressions to place it to `DISTINCT ON (...)`:
    *
    * ```ts
+   * import { sql } from './baseTable';
+   *
    * // Distinct on the name and raw SQL
-   * db.table.distinct('name', db.table.sql`raw sql`).select('id', 'name');
+   * db.table.distinct('name', sql`raw sql`).select('id', 'name');
    * ```
    *
    * @param columns - column names or a raw SQL
@@ -10698,9 +10803,11 @@ class QueryMethods {
    * Also, it's possible to group by a selected value:
    *
    * ```ts
+   * import { sql } from './baseTable';
+   *
    * const results = db.product
    *   .select({
-   *     month: db.product.sql`extract(month from "createdAt")`.type((t) =>
+   *     month: sql`extract(month from "createdAt")`.type((t) =>
    *       // month is returned as string, parse it to int
    *       t.string().parse(parseInt),
    *     ),
@@ -10804,8 +10911,6 @@ class QueryMethods {
    *
    * ```ts
    * db.table.orderSql`raw sql`;
-   * // or
-   * db.table.orderSql(db.table.sql`raw sql`);
    * ```
    *
    * @param args - SQL expression
@@ -10999,73 +11104,6 @@ class QueryMethods {
       return fn(q, ...args);
     };
   }
-  /**
-   * `column` references a table column, this can be used in raw SQL or when building a column expression.
-   * Only for referencing a column in the query's table. For referencing joined table's columns, see [ref](#ref).
-   *
-   * ```ts
-   * await db.table.select({
-   *   // select `("table"."id" = 1 OR "table"."name" = 'name') AS "one"`,
-   *   // returns a boolean
-   *   one: (q) =>
-   *     q.sql<boolean>`${q.column('id')} = ${1} OR ${q.column('name')} = ${'name'}`,
-   *
-   *   // selects the same as above, but by building a query
-   *   two: (q) => q.column('id').equals(1).or(q.column('name').equals('name')),
-   * });
-   * ```
-   *
-   * @param name - column name
-   */
-  column(name) {
-    const column = this.shape[name];
-    return new ColumnRefExpression(
-      column,
-      name
-    );
-  }
-  /**
-   * `ref` is similar to [column](#column), but it also allows to reference a column of joined table,
-   * and other dynamically defined columns.
-   *
-   * ```ts
-   * await db.table.join('otherTable').select({
-   *   // select `("otherTable"."id" = 1 OR "otherTable"."name" = 'name') AS "one"`,
-   *   // returns a boolean
-   *   one: (q) =>
-   *     q.sql<boolean>`${q.ref('otherTable.id')} = ${1} OR ${q.ref(
-   *       'otherTable.name',
-   *     )} = ${'name'}`,
-   *
-   *   // selects the same as above, but by building a query
-   *   two: (q) =>
-   *     q
-   *       .ref('otherTable.id')
-   *       .equals(1)
-   *       .or(q.ref('otherTable.name').equals('name')),
-   * });
-   * ```
-   *
-   * @param arg - any available column name, such as of a joined table
-   */
-  ref(arg) {
-    const q = this.clone();
-    const { shape } = q.q;
-    let column;
-    const index = arg.indexOf(".");
-    if (index !== -1) {
-      const table = arg.slice(0, index);
-      const col = arg.slice(index + 1);
-      if (table === (q.q.as || q.table)) {
-        column = shape[col];
-      } else {
-        column = q.q.joinedShapes[table][col];
-      }
-    } else {
-      column = shape[arg];
-    }
-    return new RefExpression(column, q.q, arg);
-  }
   /**
    * Narrows a part of the query output type.
    * Use with caution, type-safety isn't guaranteed with it.
@@ -11122,10 +11160,11 @@ applyMixins(QueryMethods, [
   QueryUpsertOrCreate,
   QueryGet,
   MergeQueryMethods,
-  RawSqlMethods,
+  SqlMethod,
   TransformMethods,
   ScopeMethods,
-  SoftDeleteMethods
+  SoftDeleteMethods,
+  ExpressionMethods
 ]);
 
 const makeIndex = (columns, first, second) => {
@@ -11702,5 +11741,5 @@ function copyTableData(query, arg) {
   return q;
 }
 
-export { Adapter, AggregateMethods, ArrayColumn, AsMethods, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CharColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ColumnRefExpression, ColumnType, Create, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeTzBaseClass, Db, DecimalColumn, Delete, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, FnExpression, For, From, Having, InetColumn, IntegerBaseColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, Join, JsonMethods, JsonModifiers, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, OnConflictQueryBuilder, OnMethods, Operators, OrchidOrmError, OrchidOrmInternalError, PathColumn, PointColumn, PolygonColumn, QueryBase, QueryError, QueryGet, QueryHooks, QueryLog, QueryMethods, QueryUpsertOrCreate, RawSQL, RawSqlMethods, RealColumn, RefExpression, SearchMethods, Select, SerialColumn, SmallIntColumn, SmallSerialColumn, StringColumn, TextBaseColumn, TextColumn, Then, TimeColumn, TimestampColumn, TimestampTZColumn, Transaction, TransactionAdapter, TransformMethods, TsQueryColumn, TsVectorColumn, UUIDColumn, UnhandledTypeError, Union, UnknownColumn, Update, VarCharColumn, VirtualColumn, Where, With, XMLColumn, _initQueryBuilder, _queryAfterSaveCommit, _queryAll, _queryAs, _queryChangeCounter, _queryCreate, _queryCreateFrom, _queryCreateMany, _queryCreateManyFrom, _queryCreateManyRaw, _queryCreateRaw, _queryDefaults, _queryDelete, _queryExec, _queryFindBy, _queryFindByOptional, _queryGet, _queryGetOptional, _queryHookAfterCreate, _queryHookAfterCreateCommit, _queryHookAfterDelete, _queryHookAfterDeleteCommit, _queryHookAfterQuery, _queryHookAfterSave, _queryHookAfterUpdate, _queryHookAfterUpdateCommit, _queryHookBeforeCreate, _queryHookBeforeDelete, _queryHookBeforeQuery, _queryHookBeforeSave, _queryHookBeforeUpdate, _queryInsert, _queryInsertFrom, _queryInsertMany, _queryInsertManyFrom, _queryInsertManyRaw, _queryInsertRaw, _queryJoinOn, _queryJoinOnJsonPathEquals, _queryJoinOrOn, _queryOr, _queryOrNot, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotSql, _queryWhereSql, addComputedColumns, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, checkIfASimpleQuery, cloneQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, extendQuery, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getPrimaryKeys, getQueryAs, getShapeFromSelect, handleResult, identityToCode, indexInnerToCode, indexToCode, instantiateColumn, isDefaultTimeStamp, isQueryReturnsAll, isSelectingCount, joinSubQuery, logColors, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, makeRegexToFindInSql, makeSQL, parseRecord, parseResult, parseTableData, parseTableDataInput, primaryKeyInnerToCode, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOrOn, pushQueryValue, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, quote, quoteString, raw, referencesArgsToCode, resolveSubQueryCallback, saveSearchAlias, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfNoWhere, toSQL, toSQLCacheKey };
+export { Adapter, AggregateMethods, ArrayColumn, AsMethods, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CharColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ColumnRefExpression, ColumnType, Create, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeTzBaseClass, Db, DecimalColumn, Delete, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionMethods, FnExpression, For, From, Having, InetColumn, IntegerBaseColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, Join, JsonMethods, JsonModifiers, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, OnConflictQueryBuilder, OnMethods, Operators, OrExpression, OrchidOrmError, OrchidOrmInternalError, PathColumn, PointColumn, PolygonColumn, QueryBase, QueryError, QueryGet, QueryHooks, QueryLog, QueryMethods, QueryUpsertOrCreate, RawSQL, RealColumn, RefExpression, SearchMethods, Select, SerialColumn, SmallIntColumn, SmallSerialColumn, SqlMethod, StringColumn, TextBaseColumn, TextColumn, Then, TimeColumn, TimestampColumn, TimestampTZColumn, Transaction, TransactionAdapter, TransformMethods, TsQueryColumn, TsVectorColumn, UUIDColumn, UnhandledTypeError, Union, UnknownColumn, Update, VarCharColumn, VirtualColumn, Where, With, XMLColumn, _initQueryBuilder, _queryAfterSaveCommit, _queryAll, _queryAs, _queryChangeCounter, _queryCreate, _queryCreateFrom, _queryCreateMany, _queryCreateManyFrom, _queryCreateManyRaw, _queryCreateRaw, _queryDefaults, _queryDelete, _queryExec, _queryFindBy, _queryFindByOptional, _queryGet, _queryGetOptional, _queryHookAfterCreate, _queryHookAfterCreateCommit, _queryHookAfterDelete, _queryHookAfterDeleteCommit, _queryHookAfterQuery, _queryHookAfterSave, _queryHookAfterUpdate, _queryHookAfterUpdateCommit, _queryHookBeforeCreate, _queryHookBeforeDelete, _queryHookBeforeQuery, _queryHookBeforeSave, _queryHookBeforeUpdate, _queryInsert, _queryInsertFrom, _queryInsertMany, _queryInsertManyFrom, _queryInsertManyRaw, _queryInsertRaw, _queryJoinOn, _queryJoinOnJsonPathEquals, _queryJoinOrOn, _queryOr, _queryOrNot, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotSql, _queryWhereSql, addComputedColumns, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, checkIfASimpleQuery, cloneQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, extendQuery, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getPrimaryKeys, getQueryAs, getShapeFromSelect, handleResult, identityToCode, indexInnerToCode, indexToCode, instantiateColumn, isDefaultTimeStamp, isQueryReturnsAll, isSelectingCount, joinSubQuery, logColors, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, makeRegexToFindInSql, makeSQL, parseRecord, parseResult, parseTableData, parseTableDataInput, primaryKeyInnerToCode, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOrOn, pushQueryValue, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, quote, quoteString, raw, referencesArgsToCode, resolveSubQueryCallback, saveSearchAlias, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfNoWhere, toSQL, toSQLCacheKey };
 //# sourceMappingURL=index.mjs.map