Do not use params for RecordIDs

Related-to: - orientechnologies/orientjs#380 - orientechnologies/orientjs#376
bcgsc · Jul 19, 2019 · 45471da · 45471da
1 parent 46897aa
commit 45471da
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 28 deletions.
diff --git a/app/repo/query/search.js b/app/repo/query/search.js
@@ -157,8 +157,8 @@ const searchByLinkedRecords = (opt) => {
                 }
             } else if (propModel.iterable) {
                 // Positive intersection of lists
-                const paramKey = aliasParameter(propModel.validate(values));
-                clauses.push(`${fieldName} CONTAINSANY :${paramKey}`);
+                const paramKeys = values.map(value => aliasParameter(propModel.validate(value)));
+                clauses.push(`${fieldName} CONTAINSANY [${paramKeys.map(p => `:${p}`).join(', ')}]`);
             } else {
                 // in any of the items from the list
                 const paramKeys = values.map(v => aliasParameter(propModel.validate(v)));

diff --git a/app/repo/query/statement.js b/app/repo/query/statement.js
@@ -44,35 +44,26 @@ const keywordSearch = (keywordsIn, opt = {}) => {
     };
 
     let query = `
-    SELECT ${DEFAULT_PROJECTION} FROM (SELECT expand(uniqueRecs) FROM (
-        SELECT distinct(@rid) as uniqueRecs FROM (
-            SELECT expand($v)
+    SELECT ${DEFAULT_PROJECTION} FROM (
+            SELECT expand($statements)
             LET $ont = (SELECT * from Ontology WHERE ${
     subContainsClause(['sourceId', 'name'])
 }),
-                $variants = (SELECT * FROM Variant WHERE ${
-    subContainsClause([
-        'type.name',
-        'type.sourceId',
-        'reference1.name',
-        'reference1.sourceId',
-        'reference2.name',
-        'reference2.sourceId'
-    ])
-}),
-                $implicable = (SELECT expand(inE('ImpliedBy').outV()) from (select expand(UNIONALL($ont, $variants)))),
-                $statements = (SELECT * FROM Statement WHERE ${
-    subContainsClause([
-        'appliesTo.name',
-        'appliesTo.sourceId',
-        'relevance.name',
-        'relevance.sourceId'
-    ])
-}),
-                $v = (SELECT expand(UNIONALL($statements, $implicable)))
-        ) WHERE deletedAt IS NULL
-    ))`;
-    query = postConditionalQueryOptions(query, opt);
+                $variants = (SELECT * FROM Variant WHERE type IN $ont OR reference1 in $ont OR reference2 IN $ont),
+                $implicable = (SELECT expand(UNIONALL($ont, $variants))),
+                $statements = (SELECT * FROM Statement
+                    WHERE
+                        impliedBy CONTAINSANY (SELECT expand($implicable))
+                        OR supportedBy CONTAINSANY (SELECT expand($ont))
+                        OR appliesTo IN (SELECT expand($implicable))
+                        OR relevance IN (SELECT expand($ont))
+                )
+        )${
+    activeOnly
+        ? 'WHERE deletedAt IS NULL'
+        : ''
+}`;
+    query = postConditionalQueryOptions(query, rest);
     return {query, params};
 };