diff --git a/Changelog.md b/Changelog.md index 2cae446bb..9a78ae746 100644 --- a/Changelog.md +++ b/Changelog.md @@ -13,7 +13,8 @@ a more pleasant experience, especially for users with larger databases. ([#477](https://github.com/aws/graph-explorer/pull/477)) - **Improved** search using openCypher which will now execute a single request when searching across all labels - ([#493](https://github.com/aws/graph-explorer/pull/493)) + ([#493](https://github.com/aws/graph-explorer/pull/493), + [#532](https://github.com/aws/graph-explorer/pull/532)) - **Improved** error messages for node expansion ([#502](https://github.com/aws/graph-explorer/pull/502)) - **Improved** Gremlin schema sync performance on larger databases, thanks to diff --git a/packages/graph-explorer/src/connector/openCypher/templates/keywordSearchTemplate.test.ts b/packages/graph-explorer/src/connector/openCypher/templates/keywordSearchTemplate.test.ts index 9212b514b..af56008e3 100644 --- a/packages/graph-explorer/src/connector/openCypher/templates/keywordSearchTemplate.test.ts +++ b/packages/graph-explorer/src/connector/openCypher/templates/keywordSearchTemplate.test.ts @@ -11,7 +11,6 @@ describe("OpenCypher > keywordSearchTemplate", () => { normalize(` MATCH (v:\`airport\`) RETURN v AS object - ORDER BY id(v) `) ); }); @@ -26,7 +25,6 @@ describe("OpenCypher > keywordSearchTemplate", () => { MATCH (v) WHERE (v:\`airport\` OR v:\`country\`) RETURN v AS object - ORDER BY id(v) `) ); }); @@ -42,7 +40,6 @@ describe("OpenCypher > keywordSearchTemplate", () => { normalize(` MATCH (v:\`airport\`) RETURN v AS object - ORDER BY id(v) SKIP 10 LIMIT 20 `) ); @@ -62,7 +59,6 @@ describe("OpenCypher > keywordSearchTemplate", () => { WHERE (v:\`airport\` OR v:\`country\`) AND (v.city CONTAINS "JFK" OR v.code CONTAINS "JFK") RETURN v AS object - ORDER BY id(v) `) ); }); @@ -80,7 +76,6 @@ describe("OpenCypher > keywordSearchTemplate", () => { MATCH (v:\`airport\`) WHERE (v.city CONTAINS "JFK" OR v.code CONTAINS "JFK") RETURN v AS object - ORDER BY id(v) `) ); }); @@ -98,7 +93,6 @@ describe("OpenCypher > keywordSearchTemplate", () => { MATCH (v:\`airport\`) WHERE (v.city = "JFK" OR v.code = "JFK") RETURN v AS object - ORDER BY id(v) `) ); }); @@ -117,7 +111,6 @@ describe("OpenCypher > keywordSearchTemplate", () => { MATCH (v:\`airport\`) WHERE (id(v) = "JFK") RETURN v AS object - ORDER BY id(v) `) ); }); @@ -136,7 +129,6 @@ describe("OpenCypher > keywordSearchTemplate", () => { MATCH (v:\`airport\`) WHERE (toString(id(v)) CONTAINS "JFK") RETURN v AS object - ORDER BY id(v) `) ); }); @@ -154,7 +146,6 @@ describe("OpenCypher > keywordSearchTemplate", () => { MATCH (v:\`airport\`) WHERE (toString(id(v)) CONTAINS "JFK" OR v.city CONTAINS "JFK" OR v.code CONTAINS "JFK") RETURN v AS object - ORDER BY id(v) `) ); }); @@ -176,7 +167,6 @@ describe("OpenCypher > keywordSearchTemplate", () => { WHERE (v:\`airport\` OR v:\`country\`) AND (toString(id(v)) CONTAINS "JFK" OR v.city CONTAINS "JFK" OR v.code CONTAINS "JFK") RETURN v AS object - ORDER BY id(v) SKIP 25 LIMIT 50 `) ); diff --git a/packages/graph-explorer/src/connector/openCypher/templates/keywordSearchTemplate.ts b/packages/graph-explorer/src/connector/openCypher/templates/keywordSearchTemplate.ts index ae9e30e8d..ad1e25178 100644 --- a/packages/graph-explorer/src/connector/openCypher/templates/keywordSearchTemplate.ts +++ b/packages/graph-explorer/src/connector/openCypher/templates/keywordSearchTemplate.ts @@ -81,7 +81,6 @@ const keywordSearchTemplate = ({ MATCH (${vertexMatchTemplate}) ${whereTemplate} RETURN v AS object - ORDER BY id(v) ${limitTemplate} `; };