@graffy/pg 0.15.24 → 0.15.25-alpha.1

package/index.cjs

@@ -188,22 +188,22 @@ const aggSql = {
 };
 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[]`;
@@ -341,19 +341,16 @@ 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, { verDefault }) => getJsonBuildTrusted({
-  $key: key,
-  $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"]);
@@ -428,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}
@@ -440,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)})
   `;
@@ -473,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;
@@ -490,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;
@@ -498,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 {
@@ -510,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 = [
@@ -527,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;
   }
@@ -537,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)
@@ -548,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"]`
@@ -563,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 = {
@@ -180,22 +180,22 @@ const aggSql = {
 };
 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[]`;
@@ -316,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}`
@@ -328,24 +328,21 @@ 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, { verDefault }) => getJsonBuildTrusted({
-  $key: key,
-  $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"]);
@@ -420,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}
@@ -432,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)})
   `;
@@ -465,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;
@@ -482,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;
@@ -490,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 {
@@ -502,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 = [
@@ -519,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;
   }
@@ -529,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)
@@ -540,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
@@ -555,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.24",
+  "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.24",
+    "@graffy/common": "0.15.25-alpha.1",
     "sql-template-tag": "^4.1.0",
     "debug": "^4.3.3"
   },