pqb 0.67.7 → 0.68.1

package/dist/index.d.ts

@@ -604,6 +604,17 @@ interface AfterCommitStandaloneHook {
 declare const makeConnectRetryConfig: (config: AdapterConfigConnectRetryParam) => AdapterConfigConnectRetry;
 declare const wrapAdapterFnWithConnectRetry: <Fn extends (...args: any[]) => any>(connectRetryConfig: AdapterConfigConnectRetry, fn: Fn) => Fn;
 declare const getDriverErrorCode: (err: object) => unknown;
+interface SqlJoinExpression<T extends Column.Pick.QueryColumn> extends Expression<T>, ExpressionTypeMethod {}
+declare class SqlJoinExpression<T extends Column.Pick.QueryColumn = Column.Pick.QueryColumn> extends Expression<T> {
+  items: readonly unknown[];
+  separator?: RawSqlBase | undefined;
+  result: {
+    value: T;
+  };
+  q: ExpressionData;
+  constructor(items: readonly unknown[], separator?: RawSqlBase | undefined);
+  makeSQL(ctx: ToSqlValues, quotedAs?: string): string;
+}
 /**
  * Expression for a SQL identifier reference.
  * Used to safely quote identifiers in raw SQL queries.
@@ -5242,6 +5253,8 @@ declare class Db<Table extends string | undefined = undefined, Shape extends Col
   then: QueryThenShallowSimplifyArr<ColumnsShape.DefaultOutput<Shape>>;
   windows: EmptyObject;
   relations: EmptyObject;
+  relationsDataForCreate: EmptyObject;
+  relationsDataForCreateOptional: EmptyObject;
   relationQueries: EmptyObject;
   withData: EmptyObject;
   error: new (message: string, length: number, name: QueryErrorName) => QueryError<this>;
@@ -5322,6 +5335,7 @@ interface DbTableConstructor<ColumnTypes> {
 interface DbSqlMethod<ColumnTypes> {
   <T>(...args: StaticSQLArgs): RawSql<Column.Pick.QueryColumnOfType<T>, ColumnTypes>;
   <T>(...args: [DynamicSQLArg<Column.Pick.QueryColumnOfType<T>>]): DynamicRawSQL<Column.Pick.QueryColumnOfType<T>, ColumnTypes>;
+  join<T = unknown>(items: readonly unknown[], separator?: RawSqlBase): SqlJoinExpression<Column.Pick.QueryColumnOfType<T>>;
   ref(name: string): SqlRefExpression;
   unsafe(sql: string | number | boolean): UnsafeSqlExpression;
 }
@@ -5531,6 +5545,37 @@ declare function raw<T = never>(...args: StaticSQLArgs): RawSql<Column.Pick.Quer
 declare function raw<T = never>(...args: [DynamicSQLArg<Column.Pick.QueryColumnOfType<T>>]): DynamicRawSQL<Column.Pick.QueryColumnOfType<T>>;
 interface SqlFn {
   <T, Args extends TemplateLiteralArgs | [sql: string] | [values: RecordUnknown, sql?: string]>(this: T, ...args: Args): Args extends [RecordUnknown] ? (...sql: TemplateLiteralArgs) => RawSql<Column.Pick.QueryColumn, T> : RawSql<Column.Pick.QueryColumn, T>;
+  /**
+   * `sql.join` builds a SQL list from values and expressions.
+   * Plain values are bound as query parameters, while SQL expressions render as SQL.
+   *
+   * Use it for SQL constructs such as `ARRAY[...]`, `IN (...)`, function arguments,
+   * or tuple lists. The default separator is `, `. Provide a SQL expression as the
+   * custom separator when a different separator is needed.
+   *
+   * ```ts
+   * await db.user.whereSql`"id" IN (${sql.join([1, 2, 3])})`;
+   * ```
+   *
+   * ```ts
+   * await db.user.whereSql`
+   *   (${sql.join([sql.ref('name'), sql.ref('age')])}) IN (${sql.join(
+   *     users.map((user) => sql`(${user.name}, ${user.age})`),
+   *   )})
+   * `;
+   * ```
+   *
+   * ```ts
+   * await db.user.select({
+   *   displayName: (q) =>
+   *     sql<string>`concat(${sql.join(
+   *       [q.column('firstName'), q.column('lastName')],
+   *       sql` || ' ' || `,
+   *     )})`,
+   * });
+   * ```
+   */
+  join<T = unknown>(items: readonly unknown[], separator?: RawSqlBase): SqlJoinExpression<Column.Pick.QueryColumnOfType<T>>;
   /**
    * `sql.ref` quotes a SQL identifier such as a table name, column name, or schema name.
    * Use it when you need to dynamically reference an identifier in raw SQL.
@@ -5790,6 +5835,8 @@ interface Base$1<Value> {
   __hasSelect: true;
   equals: Operator<Value | IsQuery | Expression, BooleanQueryColumn>;
   not: Operator<Value | IsQuery | Expression, BooleanQueryColumn>;
+  isDistinctFrom: Operator<Value | IsQuery | Expression, BooleanQueryColumn>;
+  isNotDistinctFrom: Operator<Value | IsQuery | Expression, BooleanQueryColumn>;
   in: Operator<Value[] | IsQuery | Expression, BooleanQueryColumn>;
   notIn: Operator<Value[] | IsQuery | Expression, BooleanQueryColumn>;
 }
@@ -6568,7 +6615,7 @@ declare namespace Column {
         unique: Name;
       };
     };
-    export type Nullable<T extends Column.Pick.ForNullable, InputSchema, OutputSchema, QuerySchema> = { [K in keyof T]: K extends '__type' ? T['__type'] | null : K extends '__inputType' ? T['__inputType'] | null : K extends 'inputSchema' ? InputSchema : K extends '__outputType' ? T['__outputType'] | (unknown extends T['__nullType'] ? null : T['__nullType']) : K extends 'outputSchema' ? OutputSchema : K extends '__queryType' ? T['__queryType'] | null : K extends 'querySchema' ? QuerySchema : K extends 'data' ? T['data'] & DataNullable : K extends 'operators' ? { [K in keyof T['operators']]: K extends 'equals' | 'not' ? Operator<T | null> : T['operators'][K] } : T[K] };
+    export type Nullable<T extends Column.Pick.ForNullable, InputSchema, OutputSchema, QuerySchema> = { [K in keyof T]: K extends '__type' ? T['__type'] | null : K extends '__inputType' ? T['__inputType'] | null : K extends 'inputSchema' ? InputSchema : K extends '__outputType' ? T['__outputType'] | (unknown extends T['__nullType'] ? null : T['__nullType']) : K extends 'outputSchema' ? OutputSchema : K extends '__queryType' ? T['__queryType'] | null : K extends 'querySchema' ? QuerySchema : K extends 'data' ? T['data'] & DataNullable : K extends 'operators' ? { [K in keyof T['operators']]: K extends 'equals' | 'not' | 'isDistinctFrom' | 'isNotDistinctFrom' ? Operator<T | null> : T['operators'][K] } : T[K] };
     export type QueryColumnToNullable<C> = { [K in keyof C]: K extends '__outputType' | '__queryType' ? C[K] | null : C[K] };
     export type QueryColumnToOptional<C> = { [K in keyof C]: K extends '__outputType' ? C[K] | undefined : C[K] };
     interface DataNullable {
@@ -6578,6 +6625,8 @@ declare namespace Column {
     export interface OperatorsNullable<T> {
       equals: Operator<T | null>;
       not: Operator<T | null>;
+      isDistinctFrom: Operator<T | null>;
+      isNotDistinctFrom: Operator<T | null>;
     }
     export type Encode<T, InputSchema, Input> = { [K in keyof T]: K extends '__inputType' ? Input : K extends 'inputSchema' ? InputSchema : T[K] };
     export type Parse<T extends Pick.ForParse, OutputSchema, Output> = { [K in keyof T]: K extends '__outputType' ? null extends T['__type'] ? (Output extends null ? never : Output) | (unknown extends T['__nullType'] ? null : T['__nullType']) : Output : K extends 'outputSchema' ? null extends T['__type'] ? OutputSchema | T['nullSchema'] : OutputSchema : T[K] };
@@ -7803,13 +7852,14 @@ declare class QueryCreateFrom {
    */
   insertForEachFrom<T extends CreateSelf>(this: T, query: IsQuery): InsertManyFromResult<T>;
 }
-interface CreateSelf extends PickQueryHasSelect, PickQueryDefaults, PickQueryResult, PickQueryRelations, PickQueryWithData, PickQueryReturnType, PickQueryShape, PickQueryUniqueProperties, PickQueryInputType, Query.Pick.IsNotReadOnly {}
+interface CreateSelf extends PickQueryHasSelect, PickQueryDefaults, PickQueryResult, PickQueryRelations, PickQueryRelationsDataForCreate, PickQueryRelationsDataForCreateOptional, PickQueryWithData, PickQueryReturnType, PickQueryShape, PickQueryUniqueProperties, PickQueryInputType, Query.Pick.IsNotReadOnly {}
 type CreateData<T extends CreateSelf> = EmptyObject extends T['relations'] ? CreateDataWithDefaults<T, keyof T['__defaults']> : CreateRelationsData<T>;
 type CreateDataWithDefaults<T extends CreateSelf, Defaults extends PropertyKey> = { [K in keyof T['__inputType'] as K extends Defaults ? never : K]: K extends Defaults ? never : CreateColumn<T, K> } & { [K in Defaults]?: K extends keyof T['__inputType'] ? CreateColumn<T, K> : never };
 type CreateDataWithDefaultsForRelations<T extends CreateSelf, Defaults extends keyof T['__inputType'], OmitFKeys extends PropertyKey> = { [K in keyof T['__inputType'] as K extends Defaults | OmitFKeys ? never : K]: K extends Defaults | OmitFKeys ? never : CreateColumn<T, K> } & { [K in Defaults as K extends OmitFKeys ? never : K]?: CreateColumn<T, K> };
 type CreateColumn<T extends CreateSelf, K extends keyof T['__inputType']> = T['__inputType'][K] | ((q: T) => QueryOrExpression<T['__inputType'][K]>);
-type CreateRelationsData<T extends CreateSelf> = CreateDataWithDefaultsForRelations<T, keyof T['__defaults'], T['relations'][keyof T['relations']]['omitForeignKeyInCreate']> & CreateRelationsDataOmittingFKeys<T, T['relations'][keyof T['relations']]['dataForCreate']>;
-type CreateRelationsDataOmittingFKeys<T extends CreateSelf, Union> = (Union extends RelationConfigDataForCreate ? (u: Union['columns'] extends keyof T['__defaults'] ? Pick<CreateDataWithDefaults<T, keyof T['__defaults']>, Union['columns']> & Partial<Union['nested']> : (Pick<{ [P in keyof T['__inputType']]: CreateColumn<T, P> }, Union['columns'] & keyof T['__inputType']> & { [K in keyof Union['nested']]?: never }) | Union['nested']) => void : (u: Union) => void) extends ((u: infer Obj) => void) ? Obj : never;
+type CreateRelationsData<T extends CreateSelf> = CreateDataWithDefaultsForRelations<T, keyof T['__defaults'], T['relations'][keyof T['relations']]['omitForeignKeyInCreate']> & CreateRelationsDataOmittingFKeys<T, T['relationsDataForCreate']> & T['relationsDataForCreateOptional'];
+type CreateRelationsDataOmittingFKeys<T extends CreateSelf, Data> = EmptyObject extends Data ? EmptyObject : { [K in keyof Data]: CreateRelationDataOmittingFKeys<T, Data[K]> }[keyof Data] extends ((u: infer Obj) => void) ? Obj : never;
+type CreateRelationDataOmittingFKeys<T extends CreateSelf, Union> = (u: Union extends RelationConfigDataForCreate ? Union['columns'] extends keyof T['__defaults'] ? Pick<CreateDataWithDefaults<T, keyof T['__defaults']>, Union['columns']> & Partial<Union['nested']> : (Pick<{ [P in keyof T['__inputType']]: CreateColumn<T, P> }, Union['columns'] & keyof T['__inputType']> & { [K in keyof Union['nested']]?: never }) | Union['nested'] : Union) => void;
 type CreateResult<T extends CreateSelf, Data> = T extends {
   isCount: true;
 } ? T : T['returnType'] extends undefined | 'all' ? SetQueryReturnsOneResult<T, NarrowCreateResult<T, Data>> : T['returnType'] extends 'pluck' ? SetQueryReturnsColumnResult<T, NarrowCreateResult<T, Data>> : SetQueryResult<T, NarrowCreateResult<T, Data>>;
@@ -10612,6 +10662,8 @@ interface Query extends IsQuery, PickQueryTable, PickQueryShape, PickQuerySelect
   catch: QueryCatch;
   windows: EmptyObject;
   relations: RelationsBase;
+  relationsDataForCreate: RelationsDataForCreateBase;
+  relationsDataForCreateOptional: RelationsDataForCreateOptionalBase;
   relationQueries: IsQueries;
   error: new (message: string, length: number, name: QueryErrorName) => QueryError;
   __readOnly: true | undefined;
@@ -10711,7 +10763,6 @@ interface RelationConfigBase extends IsQuery {
   queryRelated(params: unknown): unknown;
   modifyRelatedQuery?(relatedQuery: IsQuery): (query: IsQuery) => void;
   omitForeignKeyInCreate: PropertyKey;
-  dataForCreate: unknown;
   dataForUpdate: unknown;
   dataForUpdateOne: unknown;
   primaryKeys: string[];
@@ -10721,7 +10772,13 @@ interface RelationConfigDataForCreate {
   nested: RecordUnknown;
 }
 interface RelationsBase {
-  [K: string]: RelationConfigBase;
+  [relationName: string]: RelationConfigBase;
+}
+interface RelationsDataForCreateBase {
+  [relationName: string]: unknown;
+}
+interface RelationsDataForCreateOptionalBase {
+  [relationName: string]: unknown;
 }
 type RelationQueryMaybeSingle<T extends RelationConfigBase> = T['returnsOne'] extends true ? T['required'] extends true ? QueryManyTake<T['query']> : QueryManyTakeOptional<T['query']> : T['query'];
 interface PickQueryTable {
@@ -10811,6 +10868,12 @@ interface PickQueryWindows {
 interface PickQueryRelations {
   relations: RelationsBase;
 }
+interface PickQueryRelationsDataForCreate {
+  relationsDataForCreate: RelationsDataForCreateBase;
+}
+interface PickQueryRelationsDataForCreateOptional {
+  relationsDataForCreateOptional: RelationsDataForCreateOptionalBase;
+}
 interface PickQueryColumTypes {
   columnTypes: unknown;
 }

package/dist/index.js

@@ -338,6 +338,29 @@ const templateLiteralSQLToCode = (sql) => {
 	code += parts[i];
 	return code + "`";
 };
+var SqlJoinExpression = class extends Expression {
+	constructor(items, separator) {
+		super();
+		this.items = items;
+		this.separator = separator;
+		this.result = { value: emptyObject };
+		this.q = { expr: this };
+	}
+	makeSQL(ctx, quotedAs) {
+		let sql = "";
+		for (let i = 0; i < this.items.length; i++) {
+			if (i > 0) sql += this.separator ? this.separator.toSQL(ctx, quotedAs) : ", ";
+			const item = this.items[i];
+			if (item instanceof Expression) sql += item.toSQL(ctx, quotedAs);
+			else {
+				ctx.values.push(item);
+				sql += `$${ctx.values.length}`;
+			}
+		}
+		return sql;
+	}
+};
+SqlJoinExpression.prototype.type = ExpressionTypeMethod.prototype.type;
 /**
 * Expression for a SQL identifier reference.
 * Used to safely quote identifiers in raw SQL queries.
@@ -458,6 +481,7 @@ const sqlFn = ((...args) => {
 	return (...args) => new RawSql(args, arg);
 });
 sqlFn.ref = (name) => new SqlRefExpression(name);
+sqlFn.join = (items, separator) => new SqlJoinExpression(items, separator);
 sqlFn.unsafe = (sql) => new UnsafeSqlExpression(sql);
 var UnsafeSqlExpression = class extends Expression {
 	constructor(sql) {
@@ -1841,6 +1865,8 @@ const quoteLikeValue = (arg, ctx, quotedAs, jsonArray) => {
 const base = {
 	equals: make((key, value, ctx, quotedAs) => value === null ? `${key} IS NULL` : `${key} = ${quoteValue(value, ctx, quotedAs)}`),
 	not: make((key, value, ctx, quotedAs) => value === null ? `${key} IS NOT NULL` : `${key} <> ${quoteValue(value, ctx, quotedAs)}`),
+	isDistinctFrom: make((key, value, ctx, quotedAs) => `${key} IS DISTINCT FROM ${quoteValue(value, ctx, quotedAs)}`),
+	isNotDistinctFrom: make((key, value, ctx, quotedAs) => `${key} IS NOT DISTINCT FROM ${quoteValue(value, ctx, quotedAs)}`),
 	in: make((key, value, ctx, quotedAs) => Array.isArray(value) && !value.length ? "false" : `${key} IN ${quoteValue(value, ctx, quotedAs, true)}`),
 	notIn: make((key, value, ctx, quotedAs) => Array.isArray(value) && !value.length ? "true" : `NOT ${key} IN ${quoteValue(value, ctx, quotedAs, true)}`)
 };
@@ -1872,9 +1898,11 @@ const ordinalText = {
 };
 const encodeJsonPath = (ctx, path) => addValue(ctx.values, `{${Array.isArray(path) ? path.join(", ") : path}}`);
 const jsonPathQueryOp = (key, [path, options], ctx) => `jsonb_path_query_first(${key}, ${addValue(ctx.values, path)}${options?.vars ? `, ${addValue(ctx.values, JSON.stringify(options.vars))}${options.silent ? ", true" : ""}` : options?.silent ? ", NULL, true" : ""})`;
+const shouldEncodeJson = (ctx) => ctx.q.adapter.driverAdapter.schemaConfig?.jsonEncodedByDriver === false;
 const quoteJsonValue = (arg, ctx, quotedAs, IN) => {
 	if (arg && typeof arg === "object") {
-		if (IN && Array.isArray(arg)) return `(${arg.map((value) => addValue(ctx.values, JSON.stringify(value)) + "::jsonb").join(", ")})`;
+		if (IN && Array.isArray(arg)) return `(${arg.map((value) => shouldEncodeJson(ctx) ? addValue(ctx.values, JSON.stringify(value)) : addValue(ctx.values, value)).join(", ")})`;
+		if (Array.isArray(arg)) return shouldEncodeJson(ctx) ? addValue(ctx.values, JSON.stringify(arg)) : addValue(ctx.values, arg);
 		if (isExpression(arg)) return "to_jsonb(" + arg.toSQL(ctx, quotedAs) + ")";
 		if ("toSQL" in arg) return `to_jsonb((${moveMutativeQueryToCte$1(ctx, arg)}))`;
 	}
@@ -1899,6 +1927,8 @@ const Operators = {
 		...ord,
 		equals: make((key, value, ctx, quotedAs) => value === null ? `nullif(${key}, 'null'::jsonb) IS NULL` : `${key} = ${quoteJsonValue(value, ctx, quotedAs)}`),
 		not: make((key, value, ctx, quotedAs) => value === null ? `nullif(${key}, 'null'::jsonb) IS NOT NULL` : `${key} != ${quoteJsonValue(value, ctx, quotedAs)}`),
+		isDistinctFrom: make((key, value, ctx, quotedAs) => `${key} IS DISTINCT FROM ${quoteJsonValue(value, ctx, quotedAs)}`),
+		isNotDistinctFrom: make((key, value, ctx, quotedAs) => `${key} IS NOT DISTINCT FROM ${quoteJsonValue(value, ctx, quotedAs)}`),
 		in: make((key, value, ctx, quotedAs) => Array.isArray(value) && !value.length ? "false" : `${key} IN ${quoteJsonValue(value, ctx, quotedAs, true)}`),
 		notIn: make((key, value, ctx, quotedAs) => Array.isArray(value) && !value.length ? "true" : `NOT ${key} IN ${quoteJsonValue(value, ctx, quotedAs, true)}`),
 		jsonPathQueryFirst: Object.assign(function(path, options) {
@@ -6514,130 +6544,75 @@ const resolveSubQueryCallback = (q, cb) => {
 	_setSubQueryAliases(arg);
 	return cb(arg);
 };
-/**
-* Acts as {@link simpleExistingColumnToSQL} except that the column is optional and will return quoted key if no column.
-*/
-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) => {
-	let index = column.indexOf(".");
-	if (index === -1) {
-		const joinAs = data.valuesJoinedAs?.[column];
-		if (joinAs) {
-			column = joinAs + "." + column;
-			index = joinAs.length;
-		}
-	}
-	if (index !== -1) return columnWithDotToSql(ctx, data, shape, column, index, quotedAs, select);
-	return simpleColumnToSQL(ctx, column, shape[column], quotedAs);
-};
-const selectedColumnToSql = (ctx, data, shape, column, quotedAs) => {
-	const index = column.indexOf(".");
-	return index !== -1 ? selectedColumnWithDotToSql(ctx, data, shape, column, index, quotedAs) : selectedSimpleColumnToSql(ctx, column, shape[column], quotedAs);
-};
-const selectedSimpleColumnToSql = (ctx, key, column, quotedAs) => {
-	if (!column) return `"${key}"`;
-	const { data } = column;
-	return data.selectSql ? `(${data.selectSql.toSQL(ctx, quotedAs)})` : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
-};
-/**
-* in a case when ordering or grouping by a column which was selected as expression:
-* ```ts
-* table.select({ x: (q) => q.sum('x') }).group('x').order('x')
-* ```
-* the column must not be prefixed with a table name.
-*/
-const maybeSelectedColumnToSql = (ctx, data, column, quotedAs) => {
-	const index = column.indexOf(".");
-	if (index !== -1) return columnWithDotToSql(ctx, data, data.shape, column, index, quotedAs);
-	else {
-		if (data.joinedShapes?.[column]) return `"${column}"."${column}"`;
-		if (data.select) {
-			for (const s of data.select) if (typeof s === "object" && "selectAs" in s) {
-				if (column in s.selectAs) return simpleColumnToSQL(ctx, column, data.shape[column]);
+function simpleColumnToSQL(ctx, queryData, shape, key, column, quotedAs, select, as, jsonList, useSelectList, skipSelectSql) {
+	let sql;
+	let dontAlias;
+	if (useSelectList && queryData.select) {
+		for (const s of queryData.select) if (typeof s === "object" && "selectAs" in s) {
+			if (key in s.selectAs) {
+				dontAlias = true;
+				sql = simpleColumnToSQL(ctx, queryData, shape, key, shape[key]);
+				break;
 			}
 		}
-		return simpleColumnToSQL(ctx, column, data.shape[column], quotedAs);
 	}
-};
-const columnWithDotToSql = (ctx, data, shape, column, index, quotedAs, select) => {
-	const table = column.slice(0, index);
-	const key = column.slice(index + 1);
-	if (key === "*") {
-		const shape = data.joinedShapes?.[table];
-		return shape ? select ? makeRowToJson(ctx, table, shape, true) : `"${table}".*` : column;
-	}
-	const tableName = _getQueryAliasOrName(data, table);
-	const quoted = `"${table}"`;
-	const col = quoted === quotedAs ? shape[key] : data.joinedShapes?.[tableName]?.[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}"`;
-};
-const selectedColumnWithDotToSql = (ctx, data, shape, column, index, quotedAs) => {
-	const table = column.slice(0, index);
-	const key = column.slice(index + 1);
-	if (key === "*") {
-		const shape = data.joinedShapes?.[table];
-		return shape ? makeRowToJson(ctx, table, shape, true) : column;
-	}
-	const tableName = _getQueryAliasOrName(data, table);
-	const quoted = `"${table}"`;
-	const col = quoted === quotedAs ? shape[key] : data.joinedShapes?.[tableName]?.[key];
-	if (col) {
-		if (col.data.selectSql) return `(${col.data.selectSql.toSQL(ctx, quoted)})`;
-		if (col.data.name) return `"${tableName}"."${col.data.name}"`;
+	if (!sql) if (!column) {
+		dontAlias = key === as;
+		sql = `${quotedAs ? `${quotedAs}.` : ""}"${key}"`;
+	} else {
+		if (jsonList && as) jsonList[as] = column && getSelectedColumnData(column);
+		const { data } = column;
+		if (select && data.selectSql && !skipSelectSql) sql = `(${data.selectSql.toSQL(ctx, quotedAs)})`;
+		else if (data.computed) sql = `(${data.computed.toSQL(ctx, quotedAs)})`;
+		else {
+			const name = data.name || key;
+			dontAlias = name === as;
+			sql = `${quotedAs ? `${quotedAs}.` : ""}"${name}"`;
+		}
 	}
-	return `"${tableName}"."${key}"`;
-};
-const columnToSqlWithAs = (ctx, data, column, as, quotedAs, select, jsonList) => {
-	const index = column.indexOf(".");
-	return index !== -1 ? tableColumnToSqlWithAs(ctx, data, column, column.slice(0, index), column.slice(index + 1), as, quotedAs, select, jsonList) : ownColumnToSqlWithAs(ctx, data, column, as, quotedAs, select, jsonList);
-};
-const tableColumnToSqlWithAs = (ctx, data, column, table, key, as, quotedAs, select, jsonList) => {
+	if (as && !dontAlias) sql = `${sql} "${as}"`;
+	return sql;
+}
+const tableColumnToSql = (ctx, data, shape, table, key, quotedAs, select, as, jsonList) => {
+	let sql;
+	let dontAlias;
 	if (key === "*") {
-		if (jsonList) jsonList[as] = void 0;
+		if (jsonList && as) jsonList[as] = void 0;
 		const shape = data.joinedShapes?.[table];
-		if (shape) {
-			if (select) return makeRowToJson(ctx, table, shape, true) + ` "${as}"`;
-			return `"${table}"."${table}" "${as}"`;
+		if (shape) sql = select ? makeRowToJson(ctx, table, shape, true) : `"${table}".*`;
+		else {
+			sql = `"${table}"."${key}"`;
+			dontAlias = true;
+		}
+	} else {
+		const tableName = _getQueryAliasOrName(data, table);
+		const quoted = `"${table}"`;
+		const col = quoted === quotedAs ? shape[key] : data.joinedShapes?.[tableName]?.[key];
+		if (jsonList && as) jsonList[as] = col && getSelectedColumnData(col);
+		if (col?.data.selectSql) sql = `(${col.data.selectSql.toSQL(ctx, quoted)})`;
+		else if (col?.data.name) sql = `"${tableName}"."${col.data.name}"`;
+		else if (col?.data.computed) sql = `(${col.data.computed.toSQL(ctx, quoted)})`;
+		else {
+			sql = `"${tableName}"."${key}"`;
+			dontAlias = key === as;
 		}
-		return column;
-	}
-	const tableName = _getQueryAliasOrName(data, table);
-	const quoted = `"${table}"`;
-	const col = quoted === quotedAs ? data.shape[key] : data.joinedShapes?.[tableName][key];
-	if (jsonList) jsonList[as] = col && getSelectedColumnData(col);
-	if (col) {
-		if (col.data.selectSql) return `(${col.data.selectSql.toSQL(ctx, quoted)}) "${as}"`;
-		if (col.data.name && col.data.name !== key) return `"${tableName}"."${col.data.name}" "${as}"`;
 	}
-	return `"${tableName}"."${key}"${key === as ? "" : ` "${as}"`}`;
+	if (as && !dontAlias) sql = `${sql} "${as}"`;
+	return sql;
 };
-const ownColumnToSqlWithAs = (ctx, data, column, as, quotedAs, select, jsonList) => {
-	if (!select && data.joinedShapes?.[column]) {
-		if (jsonList) jsonList[as] = void 0;
-		return `"${column}"."${column}" "${as}"`;
-	}
-	const col = data.shape[column];
-	if (jsonList) jsonList[as] = col && getSelectedColumnData(col);
-	if (col) {
-		if (col.data.selectSql) return `(${col.data.selectSql.toSQL(ctx, quotedAs)}) "${as}"`;
-		if (col.data.name && col.data.name !== column) return `${quotedAs ? `${quotedAs}.` : ""}"${col.data.name}"${col.data.name === as ? "" : ` "${as}"`}`;
+const columnToSql = (ctx, data, shape, column, quotedAs, select, as, jsonList, useSelectList) => {
+	let index = column.indexOf(".");
+	if (index === -1 && !select) {
+		const joinAs = data.valuesJoinedAs?.[column];
+		if (joinAs) {
+			column = joinAs + "." + column;
+			index = joinAs.length;
+		}
 	}
-	return `${quotedAs ? `${quotedAs}.` : ""}"${column}"${column === as ? "" : ` "${as}"`}`;
+	if (index !== -1) return tableColumnToSql(ctx, data, shape, column.slice(0, index), column.slice(index + 1), quotedAs, select, as, jsonList);
+	return simpleColumnToSQL(ctx, data, shape, column, shape[column], quotedAs, select, as, jsonList, useSelectList);
 };
-const rawOrColumnToSql = (ctx, data, expr, quotedAs, shape = data.shape, select) => {
+const rawOrColumnToSql = (ctx, data, shape, expr, quotedAs, select) => {
 	return typeof expr === "string" ? columnToSql(ctx, data, shape, expr, quotedAs, select) : expr.toSQL(ctx, quotedAs);
 };
 const processJoinItem = (ctx, table, query, args, quotedAs) => {
@@ -6747,7 +6722,7 @@ const getConditionsFor3Or4LengthItem = (ctx, query, target, quotedAs, args, join
 	const [leftColumn, opOrRightColumn, maybeRightColumn] = args;
 	const op = maybeRightColumn ? opOrRightColumn : "=";
 	const rightColumn = maybeRightColumn ? maybeRightColumn : opOrRightColumn;
-	return `${rawOrColumnToSql(ctx, query, leftColumn, target, joinShape)} ${op} ${rawOrColumnToSql(ctx, query, rightColumn, quotedAs, query.shape)}`;
+	return `${rawOrColumnToSql(ctx, query, joinShape, leftColumn, target)} ${op} ${rawOrColumnToSql(ctx, query, query.shape, rightColumn, quotedAs)}`;
 };
 const getObjectOrRawConditions = (ctx, query, data, quotedAs, joinAs, joinShape) => {
 	if (data === true) return "true";
@@ -6757,7 +6732,7 @@ const getObjectOrRawConditions = (ctx, query, data, quotedAs, joinAs, joinShape)
 		const shape = query.shape;
 		for (const key in data) {
 			const value = data[key];
-			pairs.push(`${columnToSql(ctx, query, joinShape, key, joinAs)} = ${rawOrColumnToSql(ctx, query, value, quotedAs, shape)}`);
+			pairs.push(`${columnToSql(ctx, query, joinShape, key, joinAs)} = ${rawOrColumnToSql(ctx, query, shape, value, quotedAs)}`);
 		}
 		return pairs.join(", ");
 	}
@@ -6789,7 +6764,7 @@ var SelectItemExpression = class extends Expression {
 	}
 	makeSQL(ctx, quotedAs) {
 		const q = this.q;
-		return typeof this.item === "string" ? this.item === "*" ? selectAllSql(q, quotedAs, void 0, ctx).join(", ") : selectedColumnToSql(ctx, q, q.shape, this.item, quotedAs) : this.item.toSQL(ctx, quotedAs);
+		return typeof this.item === "string" ? this.item === "*" ? selectAllSql(q, quotedAs, void 0, ctx).join(", ") : columnToSql(ctx, q, q.shape, this.item, quotedAs, true) : this.item.toSQL(ctx, quotedAs);
 	}
 };
 const _getSelectableColumn = (q, arg) => {
@@ -7082,13 +7057,13 @@ const selectToSqlList = (ctx, table, query, quotedAs, hookSelect = query.hookSel
 						(selected ??= {})[key] = `"${tableName}"`;
 						(selectedAs ??= {})[key] = key;
 					}
-					sql = tableColumnToSqlWithAs(ctx, table.q, item, tableName, key, key === "*" ? tableName : key, quotedAs, true, jsonList);
+					sql = tableColumnToSql(ctx, table.q, table.q.shape, tableName, key, quotedAs, true, key === "*" ? tableName : key, jsonList);
 				} else {
 					if (hookSelect?.get(item)) {
 						(selected ??= {})[item] = quotedAs;
 						(selectedAs ??= {})[item] = item;
 					}
-					sql = ownColumnToSqlWithAs(ctx, table.q, item, item, quotedAs, true, jsonList);
+					sql = simpleColumnToSQL(ctx, table.q, table.q.shape, item, table.q.shape[item], quotedAs, true, item, jsonList);
 				}
 			}
 			list.push(sql);
@@ -7110,7 +7085,7 @@ const selectToSqlList = (ctx, table, query, quotedAs, hookSelect = query.hookSel
 				}
 				else if (value) {
 					if (hookSelect) (selectedAs ??= {})[value] = as;
-					list.push(columnToSqlWithAs(ctx, table.q, value, as, quotedAs, true, jsonList));
+					list.push(columnToSql(ctx, table.q, table.q.shape, value, quotedAs, true, as, jsonList));
 					aliases?.push(as);
 				}
 			}
@@ -7146,12 +7121,12 @@ const selectToSqlList = (ctx, table, query, quotedAs, hookSelect = query.hookSel
 				quotedTable = `"${tableName}"`;
 				columnName = select.slice(index + 1);
 				col = table.q.joinedShapes?.[tableName]?.[columnName];
-				sql = selectedColumnToSql(ctx, table.q, table.q.shape, select, void 0);
+				sql = columnToSql(ctx, table.q, table.q.shape, select, void 0, true);
 			} else {
 				quotedTable = quotedAs;
 				columnName = select;
 				col = query.shape[select];
-				sql = selectedColumnToSql(ctx, table.q, query.shape, select, quotedAs);
+				sql = columnToSql(ctx, table.q, query.shape, select, quotedAs, true);
 			}
 		} else {
 			columnName = column;
@@ -7425,7 +7400,7 @@ const whereExprOrQuery = (ctx, ands, query, key, value, quotedAs) => {
 	else {
 		let column = query.shape[key];
 		let quotedColumn;
-		if (column) quotedColumn = simpleExistingColumnToSQL(ctx, key, column, quotedAs);
+		if (column) quotedColumn = simpleColumnToSQL(ctx, query, query.shape, key, column, quotedAs);
 		else if (!column) {
 			const index = key.indexOf(".");
 			if (index !== -1) {
@@ -7433,7 +7408,7 @@ const whereExprOrQuery = (ctx, ands, query, key, value, quotedAs) => {
 				const quoted = `"${table}"`;
 				const name = key.slice(index + 1);
 				column = quotedAs === quoted ? query.shape[name] : query.joinedShapes?.[table]?.[name];
-				quotedColumn = simpleColumnToSQL(ctx, name, column, quoted);
+				quotedColumn = simpleColumnToSQL(ctx, query, query.shape, name, column, quoted);
 			} else {
 				column = query.joinedShapes?.[key]?.value;
 				quotedColumn = `"${key}"."${key}"`;
@@ -7993,13 +7968,13 @@ const addOrder = (ctx, data, column, quotedAs, dir) => {
 		const order = dir || (!search.order || search.order === true ? emptyObject : search.order);
 		return `${order.coverDensity ? "ts_rank_cd" : "ts_rank"}(${order.weights ? `${addValue(ctx.values, `{${order.weights}}`)}, ` : ""}${search.vectorSQL}, "${column}"${order.normalization !== void 0 ? `, ${addValue(ctx.values, order.normalization)}` : ""}) ${order.dir || "DESC"}`;
 	}
-	return `${maybeSelectedColumnToSql(ctx, data, column, quotedAs)} ${dir || "ASC"}`;
+	return `${columnToSql(ctx, data, data.shape, column, quotedAs, void 0, void 0, void 0, true)} ${dir || "ASC"}`;
 };
 const windowToSql = (ctx, data, window, quotedAs) => {
 	if (typeof window === "string") return `"${window}"`;
 	if (isExpression(window)) return `(${window.toSQL(ctx, quotedAs)})`;
 	const sql = [];
-	if (window.partitionBy) sql.push(`PARTITION BY ${Array.isArray(window.partitionBy) ? window.partitionBy.map((partitionBy) => rawOrColumnToSql(ctx, data, partitionBy, quotedAs)).join(", ") : rawOrColumnToSql(ctx, data, window.partitionBy, quotedAs)}`);
+	if (window.partitionBy) sql.push(`PARTITION BY ${Array.isArray(window.partitionBy) ? window.partitionBy.map((partitionBy) => rawOrColumnToSql(ctx, data, data.shape, partitionBy, quotedAs)).join(", ") : rawOrColumnToSql(ctx, data, data.shape, window.partitionBy, quotedAs)}`);
 	if (window.order) sql.push(`ORDER BY ${orderByToSql(ctx, data, window.order, quotedAs)}`);
 	return `(${sql.join(" ")})`;
 };
@@ -8066,7 +8041,7 @@ var FnExpression = class extends Expression {
 const fnArgToSql = (ctx, data, arg, quotedAs) => {
 	if (typeof arg === "string") {
 		if (arg.endsWith(".*") || data.valuesJoinedAs?.[arg]) return columnToSql(ctx, data, data.shape, arg, quotedAs);
-		return selectedColumnToSql(ctx, data, data.shape, arg, quotedAs);
+		return columnToSql(ctx, data, data.shape, arg, quotedAs, true);
 	}
 	return arg.toSQL(ctx, quotedAs);
 };
@@ -9421,7 +9396,7 @@ var OnConflictQueryBuilder = class {
 const pushDistinctSql = (ctx, table, distinct, quotedAs) => {
 	ctx.sql.push("DISTINCT");
 	if (distinct.length) {
-		const columns = distinct?.map((item) => rawOrColumnToSql(ctx, table.q, item, quotedAs));
+		const columns = distinct?.map((item) => rawOrColumnToSql(ctx, table.q, table.q.shape, item, quotedAs));
 		ctx.sql.push(`ON (${columns?.join(", ") || ""})`);
 	}
 };
@@ -12331,7 +12306,7 @@ var ColumnRefExpression = class extends Expression {
 		Object.assign(this, value.operators);
 	}
 	makeSQL(ctx, quotedAs) {
-		return simpleExistingColumnToSQL(ctx, this.name, this.result.value, quotedAs);
+		return simpleColumnToSQL(ctx, emptyObject, emptyObject, this.name, this.result.value, quotedAs, void 0, void 0, void 0, void 0, true);
 	}
 };
 var OrExpression = class extends Expression {
@@ -14260,6 +14235,7 @@ function _createDbSqlMethod(columnTypes) {
 		return sql;
 	});
 	fn.ref = sqlFn.ref;
+	fn.join = sqlFn.join;
 	fn.unsafe = sqlFn.unsafe;
 	return fn;
 }