@graffy/pg 0.16.3-alpha.2 → 0.16.3-alpha.3

package/index.cjs

@@ -442,7 +442,12 @@ function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $curs
   if (!common.isEmpty(filter))
     where.push(getSql(filter, options));
   if (!hasRangeArg)
-    return { meta: meta(baseKey), where, limit: 1 };
+    return {
+      meta: meta(baseKey),
+      where,
+      limit: 1,
+      ensureSingleRow: $group === true
+    };
   const groupCols = Array.isArray($group) && $group.length && $group.map((prop) => lookup(prop, options));
   const group = groupCols ? join(groupCols, ", ") : void 0;
   const orderCols = ($order || [idCol]).map(
@@ -469,7 +474,8 @@ function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $curs
     where,
     order,
     group,
-    limit: $first || $last
+    limit: $first || $last,
+    ensureSingleRow: true
   };
 }
 function getBoundCond(orderCols, bound, kind) {
@@ -503,9 +509,23 @@ function getBoundCond(orderCols, bound, kind) {
 }
 const MAX_LIMIT = 4096;
 function selectByArgs(args, projection, options) {
-  const { table } = options;
-  const { where, order, group, limit, meta } = getArgSql(args, options);
+  const { table, idCol } = options;
+  const { where, order, group, limit, meta, ensureSingleRow } = getArgSql(
+    args,
+    options
+  );
   const clampedLimit = Math.min(MAX_LIMIT, limit || MAX_LIMIT);
+  if (!ensureSingleRow) {
+    return sql`
+      SELECT
+      ${getSelectCols(options, projection)}, ${meta}
+      FROM "${raw(table)}" WHERE "${raw(idCol)}" = (
+        SELECT "${raw(idCol)}" FROM "${raw(table)}"
+        ${where.length ? sql`WHERE ${join(where, " AND ")}` : empty}
+        LIMIT 2
+      )
+    `;
+  }
   return sql`
     SELECT
     ${getSelectCols(options, projection)}, ${meta}
@@ -541,7 +561,7 @@ function getSingleSql(arg, options) {
         SELECT "${raw(idCol)}"
         FROM "${raw(table)}"
         WHERE ${join(where, " AND ")}
-        LIMIT 1
+        LIMIT 2
       )`,
     meta
   };

package/index.mjs

@@ -440,7 +440,12 @@ function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $curs
   if (!isEmpty(filter))
     where.push(getSql(filter, options));
   if (!hasRangeArg)
-    return { meta: meta(baseKey), where, limit: 1 };
+    return {
+      meta: meta(baseKey),
+      where,
+      limit: 1,
+      ensureSingleRow: $group === true
+    };
   const groupCols = Array.isArray($group) && $group.length && $group.map((prop) => lookup(prop, options));
   const group = groupCols ? join(groupCols, ", ") : void 0;
   const orderCols = ($order || [idCol]).map(
@@ -467,7 +472,8 @@ function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $curs
     where,
     order,
     group,
-    limit: $first || $last
+    limit: $first || $last,
+    ensureSingleRow: true
   };
 }
 function getBoundCond(orderCols, bound, kind) {
@@ -501,9 +507,23 @@ function getBoundCond(orderCols, bound, kind) {
 }
 const MAX_LIMIT = 4096;
 function selectByArgs(args, projection, options) {
-  const { table } = options;
-  const { where, order, group, limit, meta } = getArgSql(args, options);
+  const { table, idCol } = options;
+  const { where, order, group, limit, meta, ensureSingleRow } = getArgSql(
+    args,
+    options
+  );
   const clampedLimit = Math.min(MAX_LIMIT, limit || MAX_LIMIT);
+  if (!ensureSingleRow) {
+    return sql`
+      SELECT
+      ${getSelectCols(options, projection)}, ${meta}
+      FROM "${raw(table)}" WHERE "${raw(idCol)}" = (
+        SELECT "${raw(idCol)}" FROM "${raw(table)}"
+        ${where.length ? sql`WHERE ${join(where, " AND ")}` : empty}
+        LIMIT 2
+      )
+    `;
+  }
   return sql`
     SELECT
     ${getSelectCols(options, projection)}, ${meta}
@@ -539,7 +559,7 @@ function getSingleSql(arg, options) {
         SELECT "${raw(idCol)}"
         FROM "${raw(table)}"
         WHERE ${join(where, " AND ")}
-        LIMIT 1
+        LIMIT 2
       )`,
     meta
   };

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.3-alpha.2",
+  "version": "0.16.3-alpha.3",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -16,7 +16,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@graffy/common": "0.16.3-alpha.2",
+    "@graffy/common": "0.16.3-alpha.3",
     "debug": "^4.3.3"
   },
   "peerDependencies": {

package/types/sql/getArgSql.d.ts

@@ -5,7 +5,7 @@
   @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 }}
+  @return {{ meta: Sql, where: Sql[], order?: Sql, group?: Sql, limit: number, ensureSingleRow: boolean }}
 */
 export default function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $cursor: _, ...rest }: object, options: {
     prefix: string;
@@ -17,6 +17,7 @@ export default function getArgSql({ $first, $last, $after, $before, $since, $unt
     order?: Sql;
     group?: Sql;
     limit: number;
+    ensureSingleRow: boolean;
 };
 /**
  * Uses the args object (typically passed in the $key attribute)