pqb 0.67.6 → 0.68.0

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) {
@@ -1872,9 +1896,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)}))`;
 	}
@@ -2059,8 +2085,8 @@ var IntervalColumn = class extends Column {
 	}
 };
 var ArrayColumn = class ArrayColumn extends Column {
-	constructor(schema, item, inputType, defaultEncode, outputType, queryType) {
-		super(schema, inputType, outputType, queryType);
+	constructor(schema, item, __inputType, defaultEncode, __outputType, __queryType) {
+		super(schema, __inputType, __outputType, __queryType);
 		this.dataType = "array";
 		this.operators = Operators.array;
 		item.data.isNullable = true;
@@ -2140,8 +2166,8 @@ const parsePostgresArray = (source, entries, transform) => {
 };
 const encodeJson = (x) => x === null ? x : JSON.stringify(x);
 var JSONColumn = class extends Column {
-	constructor(schema, inputType, encodedByDriver = true) {
-		super(schema, inputType);
+	constructor(schema, __inputType, encodedByDriver = true) {
+		super(schema, __inputType);
 		this.dataType = "jsonb";
 		this.operators = Operators.json;
 		if (!encodedByDriver) this.data.encode = encodeJson;
@@ -2153,10 +2179,10 @@ var JSONColumn = class extends Column {
 };
 var JSONTextColumn = class JSONTextColumn extends Column {
 	static get instance() {
-		return this._instance ??= new JSONTextColumn(internalSchemaConfig);
+		return this._instance ??= new JSONTextColumn(internalSchemaConfig, void 0);
 	}
-	constructor(schema) {
-		super(schema, schema.stringSchema());
+	constructor(schema, __inputType) {
+		super(schema, __inputType);
 		this.dataType = "json";
 		this.operators = Operators.text;
 	}
@@ -2367,6 +2393,9 @@ const defaultSchemaConfig = (options) => {
 		json() {
 			return new JSONColumn(schemaConfig, void 0, options?.jsonEncodedByDriver);
 		},
+		jsonText() {
+			return new JSONTextColumn(schemaConfig, void 0);
+		},
 		setErrors: noop,
 		smallint: () => new SmallIntColumn(schemaConfig),
 		integer: () => new IntegerColumn(schemaConfig),
@@ -2995,9 +3024,7 @@ const makeColumnTypes = (schema) => {
 			return new XMLColumn(schema);
 		},
 		json: schema.json,
-		jsonText() {
-			return new JSONTextColumn(schema);
-		},
+		jsonText: schema.jsonText,
 		type(dataType) {
 			return new CustomTypeColumn(schema, dataType);
 		},
@@ -11145,7 +11172,7 @@ const getShapeFromSelect = (q, isSubQuery) => {
 				if (returnType === "value" || returnType === "valueOrThrow") {
 					const type = it.q.getColumn;
 					result[key] = type ? mapSubSelectColumn(type, isSubQuery) : UnknownColumn.instance;
-				} else result[key] = new JSONTextColumn(internalSchemaConfig);
+				} else result[key] = new JSONTextColumn(internalSchemaConfig, void 0);
 			}
 		}
 	}
@@ -14259,6 +14286,7 @@ function _createDbSqlMethod(columnTypes) {
 		return sql;
 	});
 	fn.ref = sqlFn.ref;
+	fn.join = sqlFn.join;
 	fn.unsafe = sqlFn.unsafe;
 	return fn;
 }