@graffy/pg 0.15.23 → 0.15.25-alpha.1

package/index.cjs

@@ -27,7 +27,8 @@ var __objRest = (source, exclude) => {
     }
   return target;
 };
-Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+Object.defineProperty(exports, "__esModule", { value: true });
+exports[Symbol.toStringTag] = "Module";
 var common = require("@graffy/common");
 var pg$1 = require("pg");
 var sql = require("sql-template-tag");
@@ -174,31 +175,35 @@ const lookup = (prop) => {
   const [prefix, ...suffix] = common.encodePath(prop);
   return suffix.length ? sql__default["default"]`"${sql.raw(prefix)}" #> ${suffix}` : sql__default["default"]`"${sql.raw(prefix)}"`;
 };
+const lookupNumeric = (prop) => {
+  const [prefix, ...suffix] = common.encodePath(prop);
+  return suffix.length ? sql__default["default"]`CASE WHEN "${sql.raw(prefix)}" #> ${suffix} = 'null'::jsonb THEN 0 ELSE ("${sql.raw(prefix)}" #> ${suffix})::numeric END` : sql__default["default"]`"${sql.raw(prefix)}"`;
+};
 const aggSql = {
-  $sum: (prop) => sql__default["default"]`sum((${lookup(prop)})::numeric)`,
+  $sum: (prop) => sql__default["default"]`sum((${lookupNumeric(prop)})::numeric)`,
   $card: (prop) => sql__default["default"]`count(distinct(${lookup(prop)}))`,
-  $avg: (prop) => sql__default["default"]`sum((${lookup(prop)})::numeric)`,
-  $max: (prop) => sql__default["default"]`sum((${lookup(prop)})::numeric)`,
-  $min: (prop) => sql__default["default"]`sum((${lookup(prop)})::numeric)`
+  $avg: (prop) => sql__default["default"]`avg((${lookupNumeric(prop)})::numeric)`,
+  $max: (prop) => sql__default["default"]`max((${lookupNumeric(prop)})::numeric)`,
+  $min: (prop) => sql__default["default"]`min((${lookupNumeric(prop)})::numeric)`
 };
 const getSelectCols = (table, projection = null) => {
   if (!projection)
-    return sql__default["default"]`to_jsonb("${sql.raw(table)}")`;
+    return sql__default["default"]`*`;
   const sqls = [];
   for (const key in projection) {
     if (key === "$count") {
-      sqls.push(sql__default["default"]`'$count', count(*)`);
+      sqls.push(sql__default["default"]`count(*) AS "$count"`);
     } else if (aggSql[key]) {
       const subSqls = [];
       for (const prop in projection[key]) {
         subSqls.push(sql__default["default"]`${prop}::text, ${aggSql[key](prop)}`);
       }
-      sqls.push(sql__default["default"]`${key}::text, jsonb_build_object(${sql.join(subSqls, ", ")})`);
+      sqls.push(sql__default["default"]`jsonb_build_object(${sql.join(subSqls, ", ")}) AS "${sql.raw(key)}"`);
     } else {
-      sqls.push(sql__default["default"]`${key}::text, "${sql.raw(key)}"`);
+      sqls.push(sql__default["default"]`"${sql.raw(key)}"`);
     }
   }
-  return sql__default["default"]`jsonb_build_object(${sql.join(sqls, ", ")})`;
+  return sql.join(sqls, ", ");
 };
 function vertexSql(array, nullValue) {
   return sql__default["default"]`array[${sql.join(array.map((num) => num === null ? nullValue : num))}]::float8[]`;
@@ -336,49 +341,46 @@ function getSql(filter, options) {
   }
   return getNodeSql(getAst(filter));
 }
-const getIdMeta = ({ idCol, verDefault }) => getJsonBuildTrusted({
-  $key: sql__default["default"]`"${sql.raw(idCol)}"`,
-  $ver: sql.raw(verDefault)
-});
-const getArgMeta = (key, { prefix, idCol, verDefault }) => getJsonBuildTrusted({
-  $key: key,
-  $ref: sql__default["default"]`jsonb_build_array(${sql.join(prefix.map((k) => sql__default["default"]`${k}::text`))}, "${sql.raw(idCol)}")`,
-  $ver: sql.raw(verDefault)
-});
-const getAggMeta = (key, $group, { verDefault }) => getJsonBuildTrusted({
-  $key: sql.join([key, getJsonBuildTrusted({ $group })].filter(Boolean), " || "),
-  $ver: sql.raw(verDefault)
-});
+const getIdMeta = ({ idCol, verDefault }) => sql__default["default"]`"${sql.raw(idCol)}" AS "$key", ${sql.raw(verDefault)} AS "$ver"`;
+const getArgMeta = (key, { prefix, idCol, verDefault }) => sql__default["default"]`
+    ${key} AS "$key",
+    ${sql.raw(verDefault)} AS "$ver",
+    array[
+      ${sql.join(prefix.map((k) => sql__default["default"]`${k}::text`))},
+      "${sql.raw(idCol)}"
+    ]::text[] AS "$ref"
+  `;
+const getAggMeta = (key, { verDefault }) => sql__default["default"]`${key} AS "$key", ${sql.raw(verDefault)} AS "$ver"`;
 function getArgSql(_a, options) {
   var _b = _a, { $first, $last, $after, $before, $since, $until, $all, $cursor: _ } = _b, rest = __objRest(_b, ["$first", "$last", "$after", "$before", "$since", "$until", "$all", "$cursor"]);
   const _a2 = rest, { $order, $group } = _a2, filter = __objRest(_a2, ["$order", "$group"]);
   const { prefix, idCol } = options;
+  const meta = (key2) => $group ? getAggMeta(key2, options) : getArgMeta(key2, options);
+  const hasRangeArg = $before || $after || $since || $until || $first || $last || $all;
   if ($order && $group) {
     throw Error("pg_arg.order_and_group_unsupported in " + prefix);
   }
-  const meta = (key2) => $group ? getAggMeta(key2, $group, options) : getArgMeta(key2, options);
-  const groupCols = Array.isArray($group) && $group.length && $group.map(lookup);
-  const group = groupCols ? sql.join(groupCols, ", ") : void 0;
-  const hasRangeArg = $before || $after || $since || $until || $first || $last || $all || $order;
-  let key;
+  if (($order || $group && $group !== true) && !hasRangeArg) {
+    throw Error("pg_arg.range_arg_expected in " + prefix);
+  }
+  const baseKey = sql__default["default"]`${JSON.stringify(rest)}::jsonb`;
   const where = [];
-  if (!common.isEmpty(filter)) {
+  if (!common.isEmpty(filter))
     where.push(getSql(filter, options));
-    key = sql__default["default"]`${JSON.stringify(filter)}::jsonb`;
-  }
   if (!hasRangeArg)
-    return { meta: meta(key), where, group, limit: 1 };
+    return { meta: meta(baseKey), where, limit: 1 };
+  const groupCols = Array.isArray($group) && $group.length && $group.map(lookup);
+  const group = groupCols ? sql.join(groupCols, ", ") : void 0;
   const orderCols = ($order || [idCol]).map((orderItem) => orderItem[0] === "!" ? sql__default["default"]`-(${lookup(orderItem.slice(1))})::float8` : lookup(orderItem));
   Object.entries({ $after, $before, $since, $until }).forEach(([name, value]) => {
     if (value)
       where.push(getBoundCond(orderCols, value, name));
   });
   const order = !$group && sql.join(($order || [idCol]).map((orderItem) => orderItem[0] === "!" ? sql__default["default"]`${lookup(orderItem.slice(1))} ${$last ? sql__default["default"]`ASC` : sql__default["default"]`DESC`}` : sql__default["default"]`${lookup(orderItem)} ${$last ? sql__default["default"]`DESC` : sql__default["default"]`ASC`}`), `, `);
-  const orderKey = $order && getJsonBuildTrusted({ $order: sql__default["default"]`${JSON.stringify($order)}::jsonb` });
   const cursorKey = getJsonBuildTrusted({
-    $cursor: sql__default["default"]`jsonb_build_array(${sql.join(groupCols || orderCols)})`
+    $cursor: $group === true ? sql__default["default"]`''` : sql__default["default"]`jsonb_build_array(${sql.join(groupCols || orderCols)})`
   });
-  key = sql__default["default"]`(${sql.join([key, orderKey, cursorKey].filter(Boolean), ` || `)})`;
+  const key = sql__default["default"]`(${baseKey} || ${cursorKey})`;
   return {
     meta: meta(key),
     where,
@@ -423,7 +425,7 @@ function selectByArgs(args, projection, options) {
   const clampedLimit = Math.min(MAX_LIMIT, limit || MAX_LIMIT);
   return sql__default["default"]`
     SELECT
-    ${getSelectCols(table, projection)} || ${meta}
+    ${getSelectCols(table, projection)}, ${meta}
     FROM "${sql.raw(table)}"
     ${where.length ? sql__default["default"]`WHERE ${sql.join(where, ` AND `)}` : sql.empty}
     ${group ? sql__default["default"]`GROUP BY ${group}` : sql.empty}
@@ -435,7 +437,7 @@ function selectByIds(ids, projection, options) {
   const { table, idCol } = options;
   return sql__default["default"]`
     SELECT
-    ${getSelectCols(table, projection)} || ${getIdMeta(options)}
+    ${getSelectCols(table, projection)}, ${getIdMeta(options)}
     FROM "${sql.raw(table)}"
     WHERE "${sql.raw(idCol)}" IN (${sql.join(ids)})
   `;
@@ -468,7 +470,7 @@ function patch(object, arg, options) {
   return sql__default["default"]`
     UPDATE "${sql.raw(table)}" SET ${getUpdates(row, options)}
     WHERE ${where}
-    RETURNING (${getSelectCols(table)} || ${meta})`;
+    RETURNING ${getSelectCols(table)}, ${meta}`;
 }
 function put(object, arg, options) {
   const { idCol, table } = options;
@@ -485,7 +487,7 @@ function put(object, arg, options) {
   return sql__default["default"]`
     INSERT INTO "${sql.raw(table)}" (${cols}) VALUES (${vals})
     ON CONFLICT (${conflictTarget}) DO UPDATE SET (${cols}) = (${vals})
-    RETURNING (${getSelectCols(table)} || ${meta})`;
+    RETURNING ${getSelectCols(table)}, ${meta}`;
 }
 function del(arg, options) {
   const { table } = options;
@@ -493,7 +495,7 @@ function del(arg, options) {
   return sql__default["default"]`
     DELETE FROM "${sql.raw(table)}"
     WHERE ${where}
-    RETURNING (${getJsonBuildTrusted({ $key: arg })})`;
+    RETURNING ${arg} "$key"`;
 }
 const log = debug__default["default"]("graffy:pg:db");
 class Db {
@@ -505,9 +507,16 @@ class Db {
     }
   }
   async query(sql2) {
-    sql2.rowMode = "array";
     log("Making SQL query: " + sql2.text, sql2.values);
     try {
+      sql2.types = {
+        getTypeParser: (oid, format) => {
+          if (oid === pg$1.types.builtins.INT8) {
+            return (value) => parseInt(value, 10);
+          }
+          return pg$1.types.getTypeParser(oid, format);
+        }
+      };
       return await this.client.query(sql2);
     } catch (e) {
       const message = [
@@ -522,7 +531,7 @@ class Db {
     }
   }
   async readSql(sql2) {
-    const result = (await this.query(sql2)).rows.flat();
+    const result = (await this.query(sql2)).rows;
     log("Read result", result);
     return result;
   }
@@ -532,7 +541,7 @@ class Db {
     if (!res.rowCount) {
       throw Error("pg.nothing_written " + sql2.text + " with " + sql2.values);
     }
-    return res.rows[0][0];
+    return res.rows[0];
   }
   async ensureSchema(tableOptions) {
     if (tableOptions.schema)
@@ -543,13 +552,13 @@ class Db {
         FROM information_schema.tables
         WHERE table_name = ${table}
         ORDER BY array_position(current_schemas(false)::text[], table_schema::text) ASC
-        LIMIT 1`)).rows[0][0];
+        LIMIT 1`)).rows[0].table_schema;
     const types = (await this.query(sql__default["default"]`
-        SELECT jsonb_object_agg(column_name, udt_name)
+        SELECT jsonb_object_agg(column_name, udt_name) AS column_types
         FROM information_schema.columns
         WHERE
           table_name = ${table} AND
-          table_schema = ${tableSchema}`)).rows[0][0];
+          table_schema = ${tableSchema}`)).rows[0].column_types;
     if (!types)
       throw Error(`pg.missing_table ${table}`);
     const verDefault = (await this.query(sql__default["default"]`
@@ -558,7 +567,7 @@ class Db {
         WHERE
           table_name = ${table} AND
           table_schema = ${tableSchema} AND
-          column_name = ${verCol}`)).rows[0][0];
+          column_name = ${verCol}`)).rows[0].column_default;
     if (!verDefault) {
       throw Error(`pg.verCol_without_default ${verCol}`);
     }

package/index.mjs

@@ -27,7 +27,7 @@ var __objRest = (source, exclude) => {
   return target;
 };
 import { isEmpty, encodePath, isPlainObject, unwrap, decodeArgs, decodeQuery, finalize, wrap, isRange, decodeGraph, mergeObject, merge, encodeGraph, wrapObject, remove } from "@graffy/common";
-import { Pool, Client } from "pg";
+import { Pool, Client, types } from "pg";
 import sql, { join, raw, Sql, empty } from "sql-template-tag";
 import debug from "debug";
 const valid = {
@@ -167,31 +167,35 @@ const lookup = (prop) => {
   const [prefix, ...suffix] = encodePath(prop);
   return suffix.length ? sql`"${raw(prefix)}" #> ${suffix}` : sql`"${raw(prefix)}"`;
 };
+const lookupNumeric = (prop) => {
+  const [prefix, ...suffix] = encodePath(prop);
+  return suffix.length ? sql`CASE WHEN "${raw(prefix)}" #> ${suffix} = 'null'::jsonb THEN 0 ELSE ("${raw(prefix)}" #> ${suffix})::numeric END` : sql`"${raw(prefix)}"`;
+};
 const aggSql = {
-  $sum: (prop) => sql`sum((${lookup(prop)})::numeric)`,
+  $sum: (prop) => sql`sum((${lookupNumeric(prop)})::numeric)`,
   $card: (prop) => sql`count(distinct(${lookup(prop)}))`,
-  $avg: (prop) => sql`sum((${lookup(prop)})::numeric)`,
-  $max: (prop) => sql`sum((${lookup(prop)})::numeric)`,
-  $min: (prop) => sql`sum((${lookup(prop)})::numeric)`
+  $avg: (prop) => sql`avg((${lookupNumeric(prop)})::numeric)`,
+  $max: (prop) => sql`max((${lookupNumeric(prop)})::numeric)`,
+  $min: (prop) => sql`min((${lookupNumeric(prop)})::numeric)`
 };
 const getSelectCols = (table, projection = null) => {
   if (!projection)
-    return sql`to_jsonb("${raw(table)}")`;
+    return sql`*`;
   const sqls = [];
   for (const key in projection) {
     if (key === "$count") {
-      sqls.push(sql`'$count', count(*)`);
+      sqls.push(sql`count(*) AS "$count"`);
     } else if (aggSql[key]) {
       const subSqls = [];
       for (const prop in projection[key]) {
         subSqls.push(sql`${prop}::text, ${aggSql[key](prop)}`);
       }
-      sqls.push(sql`${key}::text, jsonb_build_object(${join(subSqls, ", ")})`);
+      sqls.push(sql`jsonb_build_object(${join(subSqls, ", ")}) AS "${raw(key)}"`);
     } else {
-      sqls.push(sql`${key}::text, "${raw(key)}"`);
+      sqls.push(sql`"${raw(key)}"`);
     }
   }
-  return sql`jsonb_build_object(${join(sqls, ", ")})`;
+  return join(sqls, ", ");
 };
 function vertexSql(array, nullValue) {
   return sql`array[${join(array.map((num) => num === null ? nullValue : num))}]::float8[]`;
@@ -312,10 +316,10 @@ function getSql(filter, options) {
       return sql`${opSql[op]} (${getNodeSql(ast[1])})`;
     }
     const [prefix, ...suffix] = encodePath(ast[1]);
-    const { types } = options.schema;
-    if (!types[prefix])
+    const { types: types2 } = options.schema;
+    if (!types2[prefix])
       throw Error("pg.no_column " + prefix);
-    if (types[prefix] === "jsonb") {
+    if (types2[prefix] === "jsonb") {
       const [lhs, textLhs] = suffix.length ? [
         sql`"${raw(prefix)}" #> ${suffix}`,
         sql`"${raw(prefix)}" #>> ${suffix}`
@@ -324,54 +328,51 @@ function getSql(filter, options) {
     } else {
       if (suffix.length)
         throw Error("pg.lookup_not_jsonb " + prefix);
-      return getBinarySql(sql`"${raw(prefix)}"`, types[prefix], op, ast[2]);
+      return getBinarySql(sql`"${raw(prefix)}"`, types2[prefix], op, ast[2]);
     }
   }
   return getNodeSql(getAst(filter));
 }
-const getIdMeta = ({ idCol, verDefault }) => getJsonBuildTrusted({
-  $key: sql`"${raw(idCol)}"`,
-  $ver: raw(verDefault)
-});
-const getArgMeta = (key, { prefix, idCol, verDefault }) => getJsonBuildTrusted({
-  $key: key,
-  $ref: sql`jsonb_build_array(${join(prefix.map((k) => sql`${k}::text`))}, "${raw(idCol)}")`,
-  $ver: raw(verDefault)
-});
-const getAggMeta = (key, $group, { verDefault }) => getJsonBuildTrusted({
-  $key: join([key, getJsonBuildTrusted({ $group })].filter(Boolean), " || "),
-  $ver: raw(verDefault)
-});
+const getIdMeta = ({ idCol, verDefault }) => sql`"${raw(idCol)}" AS "$key", ${raw(verDefault)} AS "$ver"`;
+const getArgMeta = (key, { prefix, idCol, verDefault }) => sql`
+    ${key} AS "$key",
+    ${raw(verDefault)} AS "$ver",
+    array[
+      ${join(prefix.map((k) => sql`${k}::text`))},
+      "${raw(idCol)}"
+    ]::text[] AS "$ref"
+  `;
+const getAggMeta = (key, { verDefault }) => sql`${key} AS "$key", ${raw(verDefault)} AS "$ver"`;
 function getArgSql(_a, options) {
   var _b = _a, { $first, $last, $after, $before, $since, $until, $all, $cursor: _ } = _b, rest = __objRest(_b, ["$first", "$last", "$after", "$before", "$since", "$until", "$all", "$cursor"]);
   const _a2 = rest, { $order, $group } = _a2, filter = __objRest(_a2, ["$order", "$group"]);
   const { prefix, idCol } = options;
+  const meta = (key2) => $group ? getAggMeta(key2, options) : getArgMeta(key2, options);
+  const hasRangeArg = $before || $after || $since || $until || $first || $last || $all;
   if ($order && $group) {
     throw Error("pg_arg.order_and_group_unsupported in " + prefix);
   }
-  const meta = (key2) => $group ? getAggMeta(key2, $group, options) : getArgMeta(key2, options);
-  const groupCols = Array.isArray($group) && $group.length && $group.map(lookup);
-  const group = groupCols ? join(groupCols, ", ") : void 0;
-  const hasRangeArg = $before || $after || $since || $until || $first || $last || $all || $order;
-  let key;
+  if (($order || $group && $group !== true) && !hasRangeArg) {
+    throw Error("pg_arg.range_arg_expected in " + prefix);
+  }
+  const baseKey = sql`${JSON.stringify(rest)}::jsonb`;
   const where = [];
-  if (!isEmpty(filter)) {
+  if (!isEmpty(filter))
     where.push(getSql(filter, options));
-    key = sql`${JSON.stringify(filter)}::jsonb`;
-  }
   if (!hasRangeArg)
-    return { meta: meta(key), where, group, limit: 1 };
+    return { meta: meta(baseKey), where, limit: 1 };
+  const groupCols = Array.isArray($group) && $group.length && $group.map(lookup);
+  const group = groupCols ? join(groupCols, ", ") : void 0;
   const orderCols = ($order || [idCol]).map((orderItem) => orderItem[0] === "!" ? sql`-(${lookup(orderItem.slice(1))})::float8` : lookup(orderItem));
   Object.entries({ $after, $before, $since, $until }).forEach(([name, value]) => {
     if (value)
       where.push(getBoundCond(orderCols, value, name));
   });
   const order = !$group && join(($order || [idCol]).map((orderItem) => orderItem[0] === "!" ? sql`${lookup(orderItem.slice(1))} ${$last ? sql`ASC` : sql`DESC`}` : sql`${lookup(orderItem)} ${$last ? sql`DESC` : sql`ASC`}`), `, `);
-  const orderKey = $order && getJsonBuildTrusted({ $order: sql`${JSON.stringify($order)}::jsonb` });
   const cursorKey = getJsonBuildTrusted({
-    $cursor: sql`jsonb_build_array(${join(groupCols || orderCols)})`
+    $cursor: $group === true ? sql`''` : sql`jsonb_build_array(${join(groupCols || orderCols)})`
   });
-  key = sql`(${join([key, orderKey, cursorKey].filter(Boolean), ` || `)})`;
+  const key = sql`(${baseKey} || ${cursorKey})`;
   return {
     meta: meta(key),
     where,
@@ -416,7 +417,7 @@ function selectByArgs(args, projection, options) {
   const clampedLimit = Math.min(MAX_LIMIT, limit || MAX_LIMIT);
   return sql`
     SELECT
-    ${getSelectCols(table, projection)} || ${meta}
+    ${getSelectCols(table, projection)}, ${meta}
     FROM "${raw(table)}"
     ${where.length ? sql`WHERE ${join(where, ` AND `)}` : empty}
     ${group ? sql`GROUP BY ${group}` : empty}
@@ -428,7 +429,7 @@ function selectByIds(ids, projection, options) {
   const { table, idCol } = options;
   return sql`
     SELECT
-    ${getSelectCols(table, projection)} || ${getIdMeta(options)}
+    ${getSelectCols(table, projection)}, ${getIdMeta(options)}
     FROM "${raw(table)}"
     WHERE "${raw(idCol)}" IN (${join(ids)})
   `;
@@ -461,7 +462,7 @@ function patch(object, arg, options) {
   return sql`
     UPDATE "${raw(table)}" SET ${getUpdates(row, options)}
     WHERE ${where}
-    RETURNING (${getSelectCols(table)} || ${meta})`;
+    RETURNING ${getSelectCols(table)}, ${meta}`;
 }
 function put(object, arg, options) {
   const { idCol, table } = options;
@@ -478,7 +479,7 @@ function put(object, arg, options) {
   return sql`
     INSERT INTO "${raw(table)}" (${cols}) VALUES (${vals})
     ON CONFLICT (${conflictTarget}) DO UPDATE SET (${cols}) = (${vals})
-    RETURNING (${getSelectCols(table)} || ${meta})`;
+    RETURNING ${getSelectCols(table)}, ${meta}`;
 }
 function del(arg, options) {
   const { table } = options;
@@ -486,7 +487,7 @@ function del(arg, options) {
   return sql`
     DELETE FROM "${raw(table)}"
     WHERE ${where}
-    RETURNING (${getJsonBuildTrusted({ $key: arg })})`;
+    RETURNING ${arg} "$key"`;
 }
 const log = debug("graffy:pg:db");
 class Db {
@@ -498,9 +499,16 @@ class Db {
     }
   }
   async query(sql2) {
-    sql2.rowMode = "array";
     log("Making SQL query: " + sql2.text, sql2.values);
     try {
+      sql2.types = {
+        getTypeParser: (oid, format) => {
+          if (oid === types.builtins.INT8) {
+            return (value) => parseInt(value, 10);
+          }
+          return types.getTypeParser(oid, format);
+        }
+      };
       return await this.client.query(sql2);
     } catch (e) {
       const message = [
@@ -515,7 +523,7 @@ class Db {
     }
   }
   async readSql(sql2) {
-    const result = (await this.query(sql2)).rows.flat();
+    const result = (await this.query(sql2)).rows;
     log("Read result", result);
     return result;
   }
@@ -525,7 +533,7 @@ class Db {
     if (!res.rowCount) {
       throw Error("pg.nothing_written " + sql2.text + " with " + sql2.values);
     }
-    return res.rows[0][0];
+    return res.rows[0];
   }
   async ensureSchema(tableOptions) {
     if (tableOptions.schema)
@@ -536,14 +544,14 @@ class Db {
         FROM information_schema.tables
         WHERE table_name = ${table}
         ORDER BY array_position(current_schemas(false)::text[], table_schema::text) ASC
-        LIMIT 1`)).rows[0][0];
-    const types = (await this.query(sql`
-        SELECT jsonb_object_agg(column_name, udt_name)
+        LIMIT 1`)).rows[0].table_schema;
+    const types2 = (await this.query(sql`
+        SELECT jsonb_object_agg(column_name, udt_name) AS column_types
         FROM information_schema.columns
         WHERE
           table_name = ${table} AND
-          table_schema = ${tableSchema}`)).rows[0][0];
-    if (!types)
+          table_schema = ${tableSchema}`)).rows[0].column_types;
+    if (!types2)
       throw Error(`pg.missing_table ${table}`);
     const verDefault = (await this.query(sql`
         SELECT column_default
@@ -551,12 +559,12 @@ class Db {
         WHERE
           table_name = ${table} AND
           table_schema = ${tableSchema} AND
-          column_name = ${verCol}`)).rows[0][0];
+          column_name = ${verCol}`)).rows[0].column_default;
     if (!verDefault) {
       throw Error(`pg.verCol_without_default ${verCol}`);
     }
-    log("ensureSchema", types);
-    tableOptions.schema = { types };
+    log("ensureSchema", types2);
+    tableOptions.schema = { types: types2 };
     tableOptions.verDefault = verDefault;
   }
   async read(rootQuery, tableOptions) {

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.15.23",
+  "version": "0.15.25-alpha.1",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -16,7 +16,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@graffy/common": "0.15.23",
+    "@graffy/common": "0.15.25-alpha.1",
     "sql-template-tag": "^4.1.0",
     "debug": "^4.3.3"
   },

package/types/sql/clauses.d.ts

@@ -1,6 +1,7 @@
 export function cubeLiteralSql(value: any): Sql;
 export function getJsonBuildTrusted(variadic: any): Sql;
 export function lookup(prop: any): Sql;
+export function lookupNumeric(prop: any): Sql;
 export function getSelectCols(table: any, projection?: any): Sql;
 export function getInsert(row: any, options: any): {
     cols: Sql;

package/types/sql/getArgSql.d.ts

@@ -2,7 +2,7 @@
   Uses the args object (typically passed in the $key attribute)
 
   @param {object} args
-  @param {{prefix: string, idCol: string}} options
+  @param {{prefix: string, idCol: string, verDefault: string}} options
 
   @typedef { import('sql-template-tag').Sql } Sql
   @return {{ meta: Sql, where: Sql[], order?: Sql, group?: Sql, limit: number }}
@@ -10,6 +10,7 @@
 export default function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $cursor: _, ...rest }: object, options: {
     prefix: string;
     idCol: string;
+    verDefault: string;
 }): {
     meta: Sql;
     where: Sql[];

package/types/sql/getMeta.d.ts

@@ -7,6 +7,6 @@ export function getArgMeta(key: any, { prefix, idCol, verDefault }: {
     idCol: any;
     verDefault: any;
 }): import("sql-template-tag").Sql;
-export function getAggMeta(key: any, $group: any, { verDefault }: {
+export function getAggMeta(key: any, { verDefault }: {
     verDefault: any;
 }): import("sql-template-tag").Sql;