rado 0.1.56 → 0.1.58

package/dist/lib/Formatter.d.ts

@@ -19,7 +19,7 @@ export interface FormatContext {
     /** Inline all parameters */
     forceInline?: boolean;
     formatAsJson?: boolean;
-    formatAsDefault?: boolean;
+    formatAsInsert?: boolean;
     topLevel?: boolean;
 }
 type FormatSubject = (stmt: Statement, mkSubject: () => void) => void;
@@ -37,7 +37,7 @@ export declare abstract class Formatter implements Sanitizer {
         tableAsExpr?: boolean | undefined;
         forceInline?: boolean | undefined;
         formatAsJson?: boolean | undefined;
-        formatAsDefault?: boolean | undefined;
+        formatAsInsert?: boolean | undefined;
         topLevel?: boolean | undefined;
         skipNewlines?: boolean | undefined;
     };

package/dist/lib/Formatter.js

@@ -117,12 +117,15 @@ var Formatter = class {
     const data = query.set || {};
     stmt.add("UPDATE").addIdentifier(query.table.name).add("SET").space();
     for (const key of stmt.separate(Object.keys(data))) {
+      const column = query.table.columns[key];
+      if (!column)
+        continue;
       stmt.identifier(key).add("=").space();
       const value = data[key];
       if (value instanceof Expr)
         this.formatExprJson(ctx, ExprData.create(data[key]));
       else
-        this.formatValue({ ...ctx, formatAsJson: true }, value);
+        this.formatValue({ ...ctx, formatAsInsert: true }, value);
     }
     this.formatWhere(ctx, query.where);
     this.formatLimit(ctx, query);
@@ -241,7 +244,7 @@ var Formatter = class {
         this.formatExpr(
           {
             ...ctx,
-            formatAsDefault: true,
+            formatAsInsert: true,
             forceInline: true
           },
           column.defaultValue
@@ -293,11 +296,11 @@ var Formatter = class {
       if (column.defaultValue !== void 0) {
         if (typeof column.defaultValue === "function")
           return this.formatExprJson(
-            { ...ctx, formatAsDefault: true },
+            { ...ctx, formatAsInsert: true },
             column.defaultValue()
           );
         return this.formatExprJson(
-          { ...ctx, formatAsDefault: true },
+          { ...ctx, formatAsInsert: true },
           column.defaultValue
         );
       }
@@ -454,15 +457,20 @@ var Formatter = class {
         switch (expr.target.type) {
           case TargetType.Table:
             const column = expr.target.table.columns[field];
+            const asBoolean = column?.type === ColumnType.Boolean && ctx.formatAsJson;
             const asJson = column?.type === ColumnType.Json && ctx.formatAsJson;
             if (asJson) {
               stmt.add("json");
               stmt.openParenthesis();
             }
+            if (asBoolean)
+              stmt.add(`json(iif(`);
             if (!ctx.skipTableName) {
               stmt.identifier(expr.target.table.alias || expr.target.table.name).raw(".");
             }
             stmt.identifier(field);
+            if (asBoolean)
+              stmt.add(`, 'true', 'false'))`);
             if (asJson)
               stmt.closeParenthesis();
             return stmt;
@@ -489,14 +497,14 @@ var Formatter = class {
     }
   }
   formatValue(ctx, rawValue) {
-    const { stmt, formatAsJson, formatAsDefault, forceInline } = ctx;
+    const { stmt, formatAsJson, formatAsInsert, forceInline } = ctx;
+    const asJson = formatAsJson || formatAsInsert;
     switch (true) {
       case (rawValue === null || rawValue === void 0):
         return stmt.raw("NULL");
-      case ((formatAsDefault || !formatAsJson) && typeof rawValue === "boolean"):
+      case ((formatAsInsert || !formatAsJson) && typeof rawValue === "boolean"):
         return rawValue ? stmt.raw("1") : stmt.raw("0");
-      case Array.isArray(rawValue):
-        const asJson = formatAsJson || formatAsDefault;
+      case (!formatAsInsert && Array.isArray(rawValue)):
         if (asJson)
           stmt.raw("json_array");
         stmt.openParenthesis();
@@ -513,7 +521,10 @@ var Formatter = class {
           stmt.raw("json");
           stmt.openParenthesis();
         }
-        this.formatString(ctx, JSON.stringify(rawValue));
+        if (forceInline)
+          this.formatString(ctx, JSON.stringify(rawValue));
+        else
+          stmt.value(JSON.stringify(rawValue));
         if (formatAsJson)
           stmt.closeParenthesis();
         return stmt;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rado",
-  "version": "0.1.56",
+  "version": "0.1.58",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",