@graffy/pg 0.16.7 → 0.16.9-alpha.1

package/index.cjs

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const common = require("@graffy/common");
-const pg$1 = require("pg");
 const debug = require("debug");
+const pg$1 = require("pg");
 class Sql {
   constructor(rawStrings, rawValues) {
     if (rawStrings.length - 1 !== rawValues.length) {
@@ -98,6 +98,22 @@ const inverse = {
 function getAst(filter) {
   return simplify(construct(filter));
 }
+function isValidSubQuery(node) {
+  if (!node || typeof node !== "object")
+    return false;
+  const keys = Object.keys(node);
+  for (const key of keys) {
+    if (key[0] === "$" && !["$and", "$or", "$not"].includes(key))
+      return false;
+    if (key[0] !== "$")
+      return true;
+  }
+  for (const key in node) {
+    if (!isValidSubQuery(node[key]))
+      return false;
+  }
+  return false;
+}
 function construct(node, prop, op) {
   if (!node || typeof node !== "object" || prop && op) {
     if (op && prop)
@@ -109,6 +125,9 @@ function construct(node, prop, op) {
   if (Array.isArray(node)) {
     return ["$or", node.map((item) => construct(item, prop, op))];
   }
+  if (prop && isValidSubQuery(node)) {
+    return ["$sub", prop, construct(node)];
+  }
   return [
     "$and",
     Object.entries(node).map(([key, val]) => {
@@ -127,9 +146,6 @@ function construct(node, prop, op) {
           throw Error(`pgast.expected_prop_before:${key}`);
         return construct(val, prop, key);
       }
-      if (prop) {
-        return ["$sub", prop, construct({ [key]: val })];
-      }
       return construct(val, key);
     })
   ];
@@ -282,14 +298,44 @@ function castValue(value, type, name, isPut) {
     return cubeLiteralSql(value);
   return value;
 }
-const getInsert = (row, options) => {
+const getInsert = (rows, options) => {
+  const { verCol, schema } = options;
   const cols = [];
+  const colSqls = [];
+  const colIx = {};
+  const colUsed = [];
+  for (const col of Object.keys(options.schema.types)) {
+    colIx[col] = cols.length;
+    colUsed[cols.length] = false;
+    cols.push(col);
+    colSqls.push(sql`"${raw(col)}"`);
+  }
+  colUsed[colIx[verCol]] = true;
   const vals = [];
-  Object.entries(row).filter(([col]) => col !== options.verCol && col[0] !== "$").concat([[options.verCol, sql`default`]]).forEach(([col, val]) => {
-    cols.push(sql`"${raw(col)}"`);
-    vals.push(castValue(val, options.schema.types[col], col, row.$put));
-  });
-  return { cols: join(cols, ", "), vals: join(vals, ", ") };
+  for (const row of rows) {
+    const rowVals = Array(cols.length).fill(null);
+    rowVals[colIx[verCol]] = sql`default`;
+    for (const col of cols) {
+      if (col === verCol || !(col in row))
+        continue;
+      const ix = colIx[col];
+      colUsed[ix] = true;
+      rowVals[ix] = castValue(row[col], schema.types[col], col, row.$put);
+    }
+    vals.push(rowVals);
+  }
+  const isUsed = (_, ix) => colUsed[ix];
+  return {
+    cols: join(colSqls.filter(isUsed), ", "),
+    vals: join(
+      vals.map((rowVals) => sql`(${join(rowVals.filter(isUsed), ", ")})`),
+      ", "
+    ),
+    updates: join(
+      colSqls.map((col, ix) => sql`${col} =  "excluded".${col}`).filter(isUsed),
+      ", "
+    )
+  };
 };
 const getUpdates = (row, options) => {
   return join(
@@ -579,23 +625,35 @@ function patch(object, arg, options) {
     WHERE ${where}
     RETURNING ${getSelectCols(options)}, ${meta}`;
 }
-function put(object, arg, options) {
+function put(puts, options) {
   const { idCol, table } = options;
-  const row = object;
-  let meta;
-  let conflictTarget;
-  if (common.isPlainObject(arg)) {
-    ({ meta } = getArgSql(arg, options));
-    conflictTarget = join(Object.keys(arg).map((col) => sql`"${raw(col)}"`));
-  } else {
-    meta = getIdMeta(options);
-    conflictTarget = sql`"${raw(idCol)}"`;
+  const sqls = [];
+  const addSql = (rows, meta, conflictTarget) => {
+    const { cols, vals, updates } = getInsert(rows, options);
+    sqls.push(sql`
+      INSERT INTO "${raw(table)}" (${cols}) VALUES ${vals}
+      ON CONFLICT (${conflictTarget}) DO UPDATE SET ${updates}
+      RETURNING ${getSelectCols(options)}, ${meta}`);
+  };
+  const idRows = [];
+  for (const put2 of puts) {
+    const [row, arg] = put2;
+    if (!common.isPlainObject(arg)) {
+      idRows.push(row);
+      continue;
+    }
+    const { meta } = getArgSql(arg, options);
+    const conflictTarget = join(
+      Object.keys(arg).map((col) => sql`"${raw(col)}"`)
+    );
+    addSql([row], meta, conflictTarget);
   }
-  const { cols, vals } = getInsert(row, options);
-  return sql`
-    INSERT INTO "${raw(table)}" (${cols}) VALUES (${vals})
-    ON CONFLICT (${conflictTarget}) DO UPDATE SET (${cols}) = (${vals})
-    RETURNING ${getSelectCols(options)}, ${meta}`;
+  if (idRows.length) {
+    const meta = getIdMeta(options);
+    const conflictTarget = sql`"${raw(idCol)}"`;
+    addSql(idRows, meta, conflictTarget);
+  }
+  return sqls;
 }
 function del(arg, options) {
   const { table } = options;
@@ -660,7 +718,7 @@ class Db {
     if (!res.rowCount) {
       throw Error(`pg.nothing_written ${sql2.text} with ${sql2.values}`);
     }
-    return res.rows[0];
+    return res.rows;
   }
   async ensureSchema(tableOptions, typeOids) {
     if (tableOptions.schema)
@@ -724,11 +782,11 @@ class Db {
         selectByIds(Object.keys(idQueries), null, tableOptions),
         tableOptions
       );
-      result.forEach((object) => {
+      for (const object of result) {
         const wrappedGraph = common.encodeGraph(common.wrapObject(object, rawPrefix));
         log("getByIds", wrappedGraph);
         common.merge(results, wrappedGraph);
-      });
+      }
     };
     const query = common.unwrap(rootQuery, prefix);
     for (const node of query) {
@@ -759,28 +817,40 @@ class Db {
     const prefix = common.encodePath(rawPrefix);
     await this.ensureSchema(tableOptions);
     const change = common.unwrap(rootChange, prefix);
-    const sqls = change.map((node) => {
+    const puts = [];
+    const sqls = [];
+    for (const node of change) {
       const arg = common.decodeArgs(node);
       if (common.isRange(node)) {
-        if (common.cmp(node.key, node.end) === 0)
-          return del(arg, tableOptions);
+        if (common.cmp(node.key, node.end) === 0) {
+          log("delete", node);
+          sqls.push(del(arg, tableOptions));
+          continue;
+        }
         throw Error("pg_write.write_range_unsupported");
       }
       const object = common.decodeGraph(node.children);
       if (common.isPlainObject(arg)) {
         common.mergeObject(object, arg);
       } else {
-        object.id = arg;
+        object[tableOptions.idCol] = arg;
       }
       if (object.$put && object.$put !== true) {
         throw Error("pg_write.partial_put_unsupported");
       }
-      return object.$put ? put(object, arg, tableOptions) : patch(object, arg, tableOptions);
-    });
+      if (object.$put) {
+        puts.push([object, arg]);
+      } else {
+        sqls.push(patch(object, arg, tableOptions));
+      }
+    }
+    if (puts.length)
+      sqls.push(...put(puts, tableOptions));
     const result = [];
     await Promise.all(
       sqls.map(
         (sql2) => this.writeSql(sql2, tableOptions).then((object) => {
+          log("returned_object_wrapped", common.wrapObject(object, rawPrefix));
           common.merge(result, common.encodeGraph(common.wrapObject(object, rawPrefix)));
         })
       )

package/index.mjs

@@ -1,6 +1,6 @@
-import { isEmpty, isPlainObject, encodePath, unwrap, decodeArgs, decodeQuery, finalize, wrap, isRange, cmp, decodeGraph, mergeObject, merge, encodeGraph, wrapObject, remove } from "@graffy/common";
-import pg$1 from "pg";
+import { isEmpty, isPlainObject, encodePath, unwrap, decodeArgs, decodeQuery, finalize, wrap, isRange, cmp, decodeGraph, mergeObject, wrapObject, merge, encodeGraph, remove } from "@graffy/common";
 import debug from "debug";
+import pg$1 from "pg";
 class Sql {
   constructor(rawStrings, rawValues) {
     if (rawStrings.length - 1 !== rawValues.length) {
@@ -96,6 +96,22 @@ const inverse = {
 function getAst(filter) {
   return simplify(construct(filter));
 }
+function isValidSubQuery(node) {
+  if (!node || typeof node !== "object")
+    return false;
+  const keys = Object.keys(node);
+  for (const key of keys) {
+    if (key[0] === "$" && !["$and", "$or", "$not"].includes(key))
+      return false;
+    if (key[0] !== "$")
+      return true;
+  }
+  for (const key in node) {
+    if (!isValidSubQuery(node[key]))
+      return false;
+  }
+  return false;
+}
 function construct(node, prop, op) {
   if (!node || typeof node !== "object" || prop && op) {
     if (op && prop)
@@ -107,6 +123,9 @@ function construct(node, prop, op) {
   if (Array.isArray(node)) {
     return ["$or", node.map((item) => construct(item, prop, op))];
   }
+  if (prop && isValidSubQuery(node)) {
+    return ["$sub", prop, construct(node)];
+  }
   return [
     "$and",
     Object.entries(node).map(([key, val]) => {
@@ -125,9 +144,6 @@ function construct(node, prop, op) {
           throw Error(`pgast.expected_prop_before:${key}`);
         return construct(val, prop, key);
       }
-      if (prop) {
-        return ["$sub", prop, construct({ [key]: val })];
-      }
       return construct(val, key);
     })
   ];
@@ -280,14 +296,44 @@ function castValue(value, type, name, isPut) {
     return cubeLiteralSql(value);
   return value;
 }
-const getInsert = (row, options) => {
+const getInsert = (rows, options) => {
+  const { verCol, schema } = options;
   const cols = [];
+  const colSqls = [];
+  const colIx = {};
+  const colUsed = [];
+  for (const col of Object.keys(options.schema.types)) {
+    colIx[col] = cols.length;
+    colUsed[cols.length] = false;
+    cols.push(col);
+    colSqls.push(sql`"${raw(col)}"`);
+  }
+  colUsed[colIx[verCol]] = true;
   const vals = [];
-  Object.entries(row).filter(([col]) => col !== options.verCol && col[0] !== "$").concat([[options.verCol, sql`default`]]).forEach(([col, val]) => {
-    cols.push(sql`"${raw(col)}"`);
-    vals.push(castValue(val, options.schema.types[col], col, row.$put));
-  });
-  return { cols: join(cols, ", "), vals: join(vals, ", ") };
+  for (const row of rows) {
+    const rowVals = Array(cols.length).fill(null);
+    rowVals[colIx[verCol]] = sql`default`;
+    for (const col of cols) {
+      if (col === verCol || !(col in row))
+        continue;
+      const ix = colIx[col];
+      colUsed[ix] = true;
+      rowVals[ix] = castValue(row[col], schema.types[col], col, row.$put);
+    }
+    vals.push(rowVals);
+  }
+  const isUsed = (_, ix) => colUsed[ix];
+  return {
+    cols: join(colSqls.filter(isUsed), ", "),
+    vals: join(
+      vals.map((rowVals) => sql`(${join(rowVals.filter(isUsed), ", ")})`),
+      ", "
+    ),
+    updates: join(
+      colSqls.map((col, ix) => sql`${col} =  "excluded".${col}`).filter(isUsed),
+      ", "
+    )
+  };
 };
 const getUpdates = (row, options) => {
   return join(
@@ -577,23 +623,35 @@ function patch(object, arg, options) {
     WHERE ${where}
     RETURNING ${getSelectCols(options)}, ${meta}`;
 }
-function put(object, arg, options) {
+function put(puts, options) {
   const { idCol, table } = options;
-  const row = object;
-  let meta;
-  let conflictTarget;
-  if (isPlainObject(arg)) {
-    ({ meta } = getArgSql(arg, options));
-    conflictTarget = join(Object.keys(arg).map((col) => sql`"${raw(col)}"`));
-  } else {
-    meta = getIdMeta(options);
-    conflictTarget = sql`"${raw(idCol)}"`;
+  const sqls = [];
+  const addSql = (rows, meta, conflictTarget) => {
+    const { cols, vals, updates } = getInsert(rows, options);
+    sqls.push(sql`
+      INSERT INTO "${raw(table)}" (${cols}) VALUES ${vals}
+      ON CONFLICT (${conflictTarget}) DO UPDATE SET ${updates}
+      RETURNING ${getSelectCols(options)}, ${meta}`);
+  };
+  const idRows = [];
+  for (const put2 of puts) {
+    const [row, arg] = put2;
+    if (!isPlainObject(arg)) {
+      idRows.push(row);
+      continue;
+    }
+    const { meta } = getArgSql(arg, options);
+    const conflictTarget = join(
+      Object.keys(arg).map((col) => sql`"${raw(col)}"`)
+    );
+    addSql([row], meta, conflictTarget);
   }
-  const { cols, vals } = getInsert(row, options);
-  return sql`
-    INSERT INTO "${raw(table)}" (${cols}) VALUES (${vals})
-    ON CONFLICT (${conflictTarget}) DO UPDATE SET (${cols}) = (${vals})
-    RETURNING ${getSelectCols(options)}, ${meta}`;
+  if (idRows.length) {
+    const meta = getIdMeta(options);
+    const conflictTarget = sql`"${raw(idCol)}"`;
+    addSql(idRows, meta, conflictTarget);
+  }
+  return sqls;
 }
 function del(arg, options) {
   const { table } = options;
@@ -658,7 +716,7 @@ class Db {
     if (!res.rowCount) {
       throw Error(`pg.nothing_written ${sql2.text} with ${sql2.values}`);
     }
-    return res.rows[0];
+    return res.rows;
   }
   async ensureSchema(tableOptions, typeOids) {
     if (tableOptions.schema)
@@ -722,11 +780,11 @@ class Db {
         selectByIds(Object.keys(idQueries), null, tableOptions),
         tableOptions
       );
-      result.forEach((object) => {
+      for (const object of result) {
         const wrappedGraph = encodeGraph(wrapObject(object, rawPrefix));
         log("getByIds", wrappedGraph);
         merge(results, wrappedGraph);
-      });
+      }
     };
     const query = unwrap(rootQuery, prefix);
     for (const node of query) {
@@ -757,28 +815,40 @@ class Db {
     const prefix = encodePath(rawPrefix);
     await this.ensureSchema(tableOptions);
     const change = unwrap(rootChange, prefix);
-    const sqls = change.map((node) => {
+    const puts = [];
+    const sqls = [];
+    for (const node of change) {
       const arg = decodeArgs(node);
       if (isRange(node)) {
-        if (cmp(node.key, node.end) === 0)
-          return del(arg, tableOptions);
+        if (cmp(node.key, node.end) === 0) {
+          log("delete", node);
+          sqls.push(del(arg, tableOptions));
+          continue;
+        }
         throw Error("pg_write.write_range_unsupported");
       }
       const object = decodeGraph(node.children);
       if (isPlainObject(arg)) {
         mergeObject(object, arg);
       } else {
-        object.id = arg;
+        object[tableOptions.idCol] = arg;
       }
       if (object.$put && object.$put !== true) {
         throw Error("pg_write.partial_put_unsupported");
       }
-      return object.$put ? put(object, arg, tableOptions) : patch(object, arg, tableOptions);
-    });
+      if (object.$put) {
+        puts.push([object, arg]);
+      } else {
+        sqls.push(patch(object, arg, tableOptions));
+      }
+    }
+    if (puts.length)
+      sqls.push(...put(puts, tableOptions));
     const result = [];
     await Promise.all(
       sqls.map(
         (sql2) => this.writeSql(sql2, tableOptions).then((object) => {
+          log("returned_object_wrapped", wrapObject(object, rawPrefix));
           merge(result, encodeGraph(wrapObject(object, rawPrefix)));
         })
       )

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graffy/pg",
   "description": "The standard Postgres module for Graffy. Each instance this module mounts a Postgres table as a Graffy subtree.",
   "author": "aravind (https://github.com/aravindet)",
-  "version": "0.16.7",
+  "version": "0.16.9-alpha.1",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -16,7 +16,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@graffy/common": "0.16.7",
+    "@graffy/common": "0.16.9-alpha.1",
     "debug": "^4.3.3"
   },
   "peerDependencies": {

package/types/sql/clauses.d.ts

@@ -3,9 +3,10 @@ export function getJsonBuildTrusted(variadic: any): Sql;
 export function lookup(prop: any, options: any): Sql;
 export function lookupNumeric(prop: any): Sql;
 export function getSelectCols(options: any, projection?: any): Sql;
-export function getInsert(row: any, options: any): {
+export function getInsert(rows: any, options: any): {
     cols: Sql;
     vals: Sql;
+    updates: Sql;
 };
 export function getUpdates(row: any, options: any): Sql;
 import { Sql } from "sql-template-tag";

package/types/sql/upsert.d.ts

@@ -1,3 +1,3 @@
 export function patch(object: any, arg: any, options: any): import("sql-template-tag").Sql;
-export function put(object: any, arg: any, options: any): import("sql-template-tag").Sql;
+export function put(puts: any, options: any): any[];
 export function del(arg: any, options: any): import("sql-template-tag").Sql;