select fixes

deep-foundation · Aug 28, 2023 · 9cf4f67 · 9cf4f67
1 parent b97df46
commit 9cf4f67
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/migrations/1655979260869-sync-handlers.ts b/migrations/1655979260869-sync-handlers.ts
@@ -605,28 +605,31 @@ const deepFabric =  /*javascript*/`(ownerId, hasura_session) => {
       if (options?.table === 'tree'){
         const { id, link_id, parent_id, depth, root_id, position_id, tree_id } = _where;
         const generateSelectWhere = ${generateSelectWhereCode};
-        let where = generateSelectWhere(_where);
+        let generated = generateSelectWhere(_where);
+        const where = generated.where;
         let links = [];
-        if (where) links = plv8.execute(${selectTreeWithPermissions}, [ this.linkId ]);
+        if (where) links = plv8.execute(${selectTreeWithPermissions}, [ this.linkId, ...generated.values ]);
         if (options?.returning) return { data: links.map(link=>link[options?.returning]) };
         return { data: links };
       }
       if (options?.table === 'can'){
         const { rule_id, subject_id, object_id, action_id } = _where;
         
         const generateSelectWhere = ${generateSelectWhereCode};
-        let where = generateSelectWhere(_where);
+        let generated = generateSelectWhere(_where);
+        const where = generated.where;
         let links = [];
-        if (where) links = plv8.execute(${selectCan});
+        if (where) links = plv8.execute(${selectCan}, generated.values);
         if (options?.returning) return { data: links.map(link=>link[options?.returning]) };
         return { data: links };
       }
       if (options?.table === 'selectors'){
         const { item_id, selector_id, selector_include_id, query_id } = _where;
         const generateSelectWhere = ${generateSelectWhereCode};
-        let where = generateSelectWhere(_where);
+        let generated = generateSelectWhere(_where);
+        const where = generated.where;
         let links = [];
-        if (where) links = plv8.execute(${selectSelectors});
+        if (where) links = plv8.execute(${selectSelectors}, generated.values);
         if (options?.returning) return { data: links.map(link=>link[options?.returning]) };
         return { data: links };
       }