pqb 0.67.5 → 0.67.7

package/dist/index.js

@@ -2059,8 +2059,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 +2140,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 +2153,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 +2367,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 +2998,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);
 		},
@@ -9865,6 +9866,34 @@ const getSqlText = (sql) => {
 	if ("text" in sql) return sql.text;
 	throw new Error(`Batch SQL is not supported in this query`);
 };
+const queryToSql = (query) => {
+	const sql = query.toSQL();
+	if ("batch" in sql) throw new OrchidOrmInternalError(query, "Batch SQL is not supported in query definitions");
+	return sql;
+};
+const rawSqlToSql = (sql) => {
+	if (typeof sql === "string") return { text: sql };
+	const values = [];
+	return {
+		text: sql.toSQL({ values }),
+		values
+	};
+};
+const sqlToRawSql = (sql) => {
+	const { values } = sql;
+	if (!values?.length) return raw({ raw: sql.text });
+	const rawValues = {};
+	for (let i = 0; i < values.length; i++) rawValues[`queryValue${i + 1}`] = values[i];
+	return raw({ raw: replaceSqlPlaceholders(sql.text, values.length) }).values(rawValues);
+};
+const replaceSqlPlaceholders = (sql, valuesCount) => {
+	const parts = sql.split("'");
+	for (let i = 0; i < parts.length; i += 2) parts[i] = parts[i].replace(/\$(\d+)/g, (match, index) => {
+		const number = Number(index);
+		return number > 0 && number <= valuesCount ? `$queryValue${number}` : match;
+	});
+	return parts.join("'");
+};
 var QuerySql = class {
 	sql(...args) {
 		const sql = raw(...args);
@@ -11117,7 +11146,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);
 			}
 		}
 	}
@@ -13917,6 +13946,7 @@ var Db = class extends QueryMethods {
 			comment: options.comment,
 			readOnly: options.readOnly,
 			materialized: options.materialized,
+			generatorIgnored: options.generatorIgnore,
 			nowSQL: options.nowSQL,
 			viewData,
 			tableData,
@@ -14611,11 +14641,13 @@ exports.primaryKeyInnerToCode = primaryKeyInnerToCode;
 exports.pushQueryOnForOuter = pushQueryOnForOuter;
 exports.pushQueryValueImmutable = pushQueryValueImmutable;
 exports.pushTableDataCode = pushTableDataCode;
+exports.queryToSql = queryToSql;
 exports.quoteIdentifier = quoteIdentifier;
 exports.quoteObjectKey = quoteObjectKey;
 exports.quoteTableWithSchema = quoteTableWithSchema;
 exports.raw = raw;
 exports.rawSqlToCode = rawSqlToCode;
+exports.rawSqlToSql = rawSqlToSql;
 exports.referencesArgsToCode = referencesArgsToCode;
 exports.refreshMaterializedView = refreshMaterializedView;
 exports.returnArg = returnArg;
@@ -14629,6 +14661,7 @@ exports.setDefaultLanguage = setDefaultLanguage;
 exports.setFreeAlias = setFreeAlias;
 exports.setQueryObjectValueImmutable = setQueryObjectValueImmutable;
 exports.singleQuote = singleQuote;
+exports.sqlToRawSql = sqlToRawSql;
 exports.tableDataMethods = tableDataMethods;
 exports.testTransaction = testTransaction;
 exports.toArray = toArray;