rado 0.1.63 → 0.2.0

package/dist/lib/Formatter.js

@@ -61,12 +61,14 @@ var Formatter = class {
         return this.formatDelete(ctx, query);
       case QueryType.CreateTable:
         return this.formatCreateTable(ctx, query);
+      case QueryType.AlterTable:
+        return this.formatAlterTable(ctx, query);
+      case QueryType.DropTable:
+        return this.formatDropTable(ctx, query);
       case QueryType.CreateIndex:
         return this.formatCreateIndex(ctx, query);
       case QueryType.DropIndex:
         return this.formatDropIndex(ctx, query);
-      case QueryType.AlterTable:
-        return this.formatAlterTable(ctx, query);
       case QueryType.Transaction:
         return this.formatTransaction(ctx, query);
       case QueryType.Batch:
@@ -83,8 +85,10 @@ var Formatter = class {
       query.selection,
       topLevel ? formatAsResultObject : void 0
     );
-    stmt.addLine("FROM").space();
-    this.formatTarget(ctx, query.from);
+    if (query.from) {
+      stmt.addLine("FROM").space();
+      this.formatTarget(ctx, query.from);
+    }
     this.formatWhere(ctx, query.where);
     this.formatGroupBy(ctx, query.groupBy);
     this.formatHaving(ctx, query.having);
@@ -94,18 +98,28 @@ var Formatter = class {
   }
   formatInsert(ctx, query) {
     const { stmt } = ctx;
-    const columns = Object.values(query.into.columns);
+    const columns = Object.values(query.into.columns).map((c) => c.name);
     stmt.add("INSERT INTO").addIdentifier(query.into.name);
     if (query.into.alias)
       stmt.raw("AS").addIdentifier(query.into.alias);
     for (const column of stmt.call(columns))
-      this.formatString(ctx, column.name);
-    stmt.add("VALUES");
-    if (query.data.length === 0)
-      stmt.add("()");
-    else
+      this.formatString(ctx, column);
+    if (query.data) {
+      stmt.add("VALUES").space();
       for (const row of stmt.separate(query.data))
         this.formatInsertRow(ctx, query.into.columns, row);
+    }
+    if (query.select) {
+      stmt.space();
+      this.formatSelect(
+        {
+          ...ctx,
+          topLevel: false,
+          selectAsColumns: true
+        },
+        query.select
+      );
+    }
     if (query.selection) {
       stmt.add("RETURNING").space();
       this.formatSelection(ctx, query.selection, formatAsResultObject);
@@ -181,17 +195,33 @@ var Formatter = class {
   }
   formatAlterTable(ctx, query) {
     const { stmt } = ctx;
-    stmt.add("ALTER TABLE").addIdentifier(query.table.name);
+    stmt.add("ALTER TABLE").addIdentifier(
+      query.renameTable ? query.renameTable.from : query.table.name
+    );
     if (query.addColumn) {
       stmt.add("ADD COLUMN").space();
       this.formatColumn(ctx, query.addColumn);
     } else if (query.dropColumn) {
       stmt.add("DROP COLUMN").addIdentifier(query.dropColumn);
+    } else if (query.renameColumn) {
+      stmt.add("RENAME COLUMN");
+      stmt.addIdentifier(query.renameColumn.from).add("TO");
+      stmt.addIdentifier(query.renameColumn.to);
+    } else if (query.renameTable) {
+      stmt.add("RENAME TO").addIdentifier(query.table.name);
     } else if (query.alterColumn) {
       throw new Error(`Not available in this formatter: alter column`);
     }
     return stmt;
   }
+  formatDropTable(ctx, query) {
+    const { stmt } = ctx;
+    stmt.add("DROP TABLE");
+    if (query.ifExists)
+      stmt.add("IF EXISTS");
+    stmt.addIdentifier(query.table.name);
+    return stmt;
+  }
   formatTransaction(ctx, { op, id }) {
     const { stmt } = ctx;
     switch (op) {
@@ -321,8 +351,6 @@ var Formatter = class {
           throw new TypeError(`Expected boolean for column ${column.name}`);
         return stmt.raw(this.escapeValue(columnValue));
       case ColumnType.Json:
-        if (typeof columnValue !== "object")
-          throw new TypeError(`Expected object for column ${column.name}`);
         return stmt.value(JSON.stringify(columnValue));
     }
   }
@@ -390,12 +418,15 @@ var Formatter = class {
     return stmt;
   }
   formatLimit(ctx, { limit, offset, singleResult }) {
-    const { stmt } = ctx;
+    const { stmt, forceInline } = ctx;
     if (!limit && !offset && !singleResult)
       return stmt;
-    stmt.newline().raw("LIMIT").addValue(singleResult ? 1 : limit);
-    if (offset && offset > 0)
-      stmt.raw("OFFSET").addValue(offset);
+    stmt.newline().raw("LIMIT").space();
+    this.formatValue(ctx, singleResult ? 1 : limit);
+    if (offset && offset > 0) {
+      stmt.add("OFFSET").space();
+      this.formatValue(ctx, offset);
+    }
     return stmt;
   }
   formatSelection(ctx, selection, formatSubject) {
@@ -411,7 +442,8 @@ var Formatter = class {
       formatSubject(stmt, mkSubject);
     else
       this.formatExpr(ctx, selection);
-    stmt.add("AS").addIdentifier("result");
+    if (!ctx.selectAsColumns)
+      stmt.add("AS").addIdentifier("result");
     return stmt;
   }
   formatExprJson(ctx, expr) {
@@ -441,7 +473,8 @@ var Formatter = class {
           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;
+            const jsonColumn = column?.type === ColumnType.Json;
+            const asJson = jsonColumn && ctx.formatAsJson;
             if (asJson) {
               stmt.raw("json");
               stmt.openParenthesis();
@@ -456,6 +489,8 @@ var Formatter = class {
               stmt.add(`, 'true', 'false'))`);
             if (asJson)
               stmt.closeParenthesis();
+            if (jsonColumn && !asJson)
+              stmt.raw("->>'$'");
             return stmt;
         }
       default:
@@ -573,12 +608,12 @@ var Formatter = class {
           return stmt.closeParenthesis();
         }
         if (expr.query.singleResult) {
-          stmt.raw("json").openParenthesis().openParenthesis();
-          this.format(ctx, expr.query);
-          return stmt.closeParenthesis().closeParenthesis();
+          stmt.openParenthesis();
+          this.format({ ...ctx, topLevel: true }, expr.query);
+          return stmt.closeParenthesis().raw(`->'$.result'`);
         }
-        stmt.openParenthesis().raw("SELECT json_group_array(json(result))").newline().raw("FROM").space().openParenthesis();
-        this.format(ctx, expr.query);
+        stmt.openParenthesis().raw(`SELECT json_group_array(result->'$.result')`).newline().raw("FROM").space().openParenthesis();
+        this.format({ ...ctx, topLevel: true }, expr.query);
         return stmt.closeParenthesis().closeParenthesis();
       case ExprType.Row:
         switch (expr.target.type) {
@@ -609,12 +644,21 @@ var Formatter = class {
         this.formatExpr({ ...ctx, formatAsJson: true }, expr.b);
         return stmt.closeParenthesis();
       case ExprType.Record:
-        stmt.identifier("json_object");
-        for (const [key, value] of stmt.call(Object.entries(expr.fields))) {
+        if (ctx.selectAsColumns) {
+          const inner = { ...ctx, selectAsColumns: false };
+          for (const [key, value] of stmt.separate(
+            Object.entries(expr.fields)
+          )) {
+            this.formatExprJson(inner, value);
+          }
+          return stmt;
+        }
+        stmt.identifier("json_object").openParenthesis();
+        for (const [key, value] of stmt.separate(Object.entries(expr.fields))) {
           this.formatString(ctx, key).raw(", ");
           this.formatExprJson(ctx, value);
         }
-        return stmt;
+        return stmt.closeParenthesis();
       case ExprType.Filter: {
         const { target, condition } = expr;
         switch (target.type) {

package/package.json

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