rado 0.1.46 → 0.1.48

package/dist/lib/Formatter.d.ts

@@ -19,6 +19,7 @@ export interface FormatContext {
     /** Inline all parameters */
     forceInline?: boolean;
     formatAsJson?: boolean;
+    formatAsDefault?: boolean;
     topLevel?: boolean;
 }
 type FormatSubject = (stmt: Statement, mkSubject: () => void) => void;

package/dist/lib/Formatter.js

@@ -176,7 +176,7 @@ var Formatter = class {
     const { stmt } = ctx;
     stmt.add("ALTER TABLE").addIdentifier(query.table.name);
     if (query.addColumn) {
-      stmt.add("ADD COLUMN");
+      stmt.add("ADD COLUMN").space();
       this.formatColumn(ctx, query.addColumn);
     } else if (query.dropColumn) {
       stmt.add("DROP COLUMN").addIdentifier(query.dropColumn);
@@ -235,7 +235,7 @@ var Formatter = class {
         this.formatExpr(
           {
             ...ctx,
-            formatAsJson: true,
+            formatAsDefault: true,
             forceInline: true
           },
           column.defaultValue
@@ -286,8 +286,14 @@ var Formatter = class {
     if (isNull) {
       if (column.defaultValue !== void 0) {
         if (typeof column.defaultValue === "function")
-          return this.formatExprJson(ctx, column.defaultValue());
-        return this.formatExprJson(ctx, column.defaultValue);
+          return this.formatExprJson(
+            { ...ctx, formatAsDefault: true },
+            column.defaultValue()
+          );
+        return this.formatExprJson(
+          { ...ctx, formatAsDefault: true },
+          column.defaultValue
+        );
       }
       if (!isOptional)
         throw new TypeError(`Expected value for column ${column.name}`);
@@ -410,7 +416,9 @@ var Formatter = class {
   formatIn(ctx, expr) {
     const { stmt } = ctx;
     switch (expr.type) {
-      case ExprType.Field:
+      case ExprType.Query:
+        return this.formatExprValue(ctx, expr);
+      default:
         stmt.openParenthesis();
         stmt.raw("SELECT value FROM json_each");
         stmt.openParenthesis();
@@ -418,8 +426,6 @@ var Formatter = class {
         stmt.closeParenthesis();
         stmt.closeParenthesis();
         return stmt;
-      default:
-        return this.formatExprValue(ctx, expr);
     }
   }
   retrieveField(expr, field) {
@@ -477,20 +483,20 @@ var Formatter = class {
     }
   }
   formatValue(ctx, rawValue) {
-    const { stmt, formatAsJson, forceInline } = ctx;
+    const { stmt, formatAsJson, formatAsDefault, forceInline } = ctx;
     switch (true) {
       case (rawValue === null || rawValue === void 0):
         return stmt.raw("NULL");
-      case (!formatAsJson && typeof rawValue === "boolean"):
+      case ((formatAsDefault || !formatAsJson) && typeof rawValue === "boolean"):
         return rawValue ? stmt.raw("1") : stmt.raw("0");
       case Array.isArray(rawValue):
-        if (formatAsJson) {
+        if (formatAsDefault || formatAsJson) {
           stmt.raw("json_array");
           stmt.openParenthesis();
         }
         for (const v of stmt.separate(rawValue))
           this.formatValue({ ...ctx, formatAsJson: false }, v);
-        if (formatAsJson)
+        if (formatAsDefault || formatAsJson)
           stmt.closeParenthesis();
         return stmt;
       case (typeof rawValue === "string" || typeof rawValue === "number"):

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rado",
-  "version": "0.1.46",
+  "version": "0.1.48",
   "license": "MIT",
   "type": "module",
   "exports": {