Merge branch 'master' into users/aisayas/pkey-whitespace

src/Utils/QueryUtils.test.ts

@@ -350,6 +350,25 @@ describe("Query Utils", () => {
       expect(partitionKeyValues.length).toBe(2);
       expect(partitionKeyValues).toEqual(["Japan", "hello"]);
     });
+
+    it("should extract partition key value when path has surrounding whitespace", () => {
+      const doc = {
+        id: "test-id",
+        Country: "United States",
+        Location: {
+          type: "Point",
+        },
+      };
+
+      const partitionKeyDefinition: PartitionKeyDefinition = {
+        kind: PartitionKeyKind.MultiHash,
+        paths: ["/ Country ", "/ Location / type "],
+      };
+
+      const partitionKeyValues: PartitionKey[] = extractPartitionKeyValues(doc, partitionKeyDefinition);
+      expect(partitionKeyValues.length).toBe(2);
+      expect(partitionKeyValues).toEqual(["United States", "Point"]);
+    });
   });
 
   describe("stripDoubleQuotesFromSegment", () => {

src/Utils/QueryUtils.ts

@@ -157,7 +157,11 @@ export const extractPartitionKeyValues = (
   const partitionKeyValues: PartitionKey[] = [];
 
   partitionKeyDefinition.paths.forEach((partitionKeyPath: string) => {
-    const pathSegments: string[] = partitionKeyPath.substring(1).split("/").map(stripDoubleQuotesFromSegment);
+    const pathSegments: string[] = partitionKeyPath
+      .substring(1)
+      .split("/")
+      .map(stripDoubleQuotesFromSegment)
+      .map((s) => s.trim());
     const value = getValueForPath(documentContent, pathSegments);
 
     if (value !== undefined) {

test/sql/testCases.ts

@@ -272,4 +272,27 @@ export const documentTestCases: DocumentTestCase[] = [
       },
     ],
   },
+  {
+    name: "Single Partition Key With Whitespace",
+    databaseId: "e2etests-sql-readonly",
+    containerId: "whitespacePartitionKey",
+    documents: [
+      {
+        documentId: "whitespacePartitionKey",
+        partitionKeys: [{ key: "/ partitionKey ", value: "whitespaceValue" }],
+      },
+      {
+        documentId: "whitespacePartitionKey_empty_string",
+        partitionKeys: [{ key: "/ partitionKey ", value: "" }],
+      },
+      {
+        documentId: "whitespacePartitionKey_null",
+        partitionKeys: [{ key: "/ partitionKey ", value: null }],
+      },
+      {
+        documentId: "whitespacePartitionKey_missing",
+        partitionKeys: [],
+      },
+    ],
+  },
 ];