pqb 0.31.8 → 0.32.0

package/dist/index.d.ts

@@ -2446,8 +2446,8 @@ declare class DynamicRawSQL<T extends QueryColumn, ColumnTypes = DefaultColumnTy
     constructor(fn: DynamicSQLArg);
     makeSQL(ctx: ToSQLCtx, quotedAs?: string): string;
 }
-declare function raw<T = unknown>(...args: StaticSQLArgs): RawSQL<QueryColumn<T>>;
-declare function raw<T = unknown>(...args: [DynamicSQLArg]): DynamicRawSQL<QueryColumn<T>>;
+declare function raw<T = never>(...args: StaticSQLArgs): RawSQL<QueryColumn<T>>;
+declare function raw<T = never>(...args: [DynamicSQLArg]): DynamicRawSQL<QueryColumn<T>>;
 declare const countSelect: RawSQL<QueryColumn<unknown, orchid_core.CoreBaseOperators>, DefaultColumnTypes<ColumnSchemaConfig<orchid_core.ColumnTypeBase<orchid_core.ColumnTypeSchemaArg, unknown, any, orchid_core.CoreBaseOperators, unknown, unknown, any, unknown, any, orchid_core.ColumnDataBase>>>>[];
 declare function sqlQueryArgsToExpression(args: SQLQueryArgs): RawSQL<QueryColumn>;
 type SqlFn = <T, Args extends [sql: TemplateStringsArray, ...values: unknown[]] | [sql: string] | [values: RecordUnknown, sql?: string]>(this: T, ...args: Args) => Args extends [RecordUnknown] ? (...sql: TemplateLiteralArgs) => RawSQLBase<QueryColumn, T> : RawSQLBase<QueryColumn, T>;

package/dist/index.js

@@ -1740,7 +1740,8 @@ class BooleanColumn extends ColumnType {
   }
 }
 
-const toCodeSkip = { encodeFn: JSON.stringify };
+const encodeFn = (x) => x === null ? x : JSON.stringify(x);
+const toCodeSkip = { encodeFn };
 class JSONColumn extends ColumnType {
   constructor() {
     super(...arguments);
@@ -1751,7 +1752,7 @@ class JSONColumn extends ColumnType {
     return columnCode(this, t, `json()`, m, this.data, toCodeSkip);
   }
 }
-JSONColumn.prototype.encodeFn = JSON.stringify;
+JSONColumn.prototype.encodeFn = encodeFn;
 class JSONTextColumn extends ColumnType {
   constructor(schema) {
     super(schema, schema.stringSchema());
@@ -6411,7 +6412,7 @@ const createCtx = () => ({
 });
 const mapColumnValues = (columns, encoders, data) => {
   return columns.map(
-    (key) => encoders[key] ? encoders[key](data[key]) : data[key]
+    (key) => encoders[key] && !orchidCore.isExpression(data[key]) ? encoders[key](data[key]) : data[key]
   );
 };
 const handleOneData = (q, data, ctx) => {