@azure/data-tables 12.2.0-alpha.20211104.1 → 13.0.0-alpha.20211109.2

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Release History
 
-## 12.2.0 (Unreleased)
+## 13.0.0 (Unreleased)
 
 ### Features Added
 
@@ -9,12 +9,15 @@
 
 ### Breaking Changes
 
+- Encode single quote where the partition/row key is used to format the URL - i.e. upsert, update and delete. For more details see [#3356](https://github.com/Azure/azure-sdk/issues/3356)
+
 ### Bugs Fixed
 
 - Document usage of SDK with Azurite. [#18211](https://github.com/Azure/azure-sdk-for-js/pull/18211)
 - Issue #17407 - Correctly handle etag in select filter. [#18211](https://github.com/Azure/azure-sdk-for-js/pull/18211)
 - Issue #18079 - Correctly handle creating entities with properties containing empty strings "". Fixes Insert throws "Unknown EDM type object" error with property value { value: "", type: "String" }. [#18211](https://github.com/Azure/azure-sdk-for-js/pull/18211)
 - Issue #18148 - Correctly deserialize Decimal numbers checking for isSafeInteger. Fixes listEntities always returns an Int32 type for a value of "1.23456789012346e+24". [#18211](https://github.com/Azure/azure-sdk-for-js/pull/18211)
+- Issue #18521 - `upsertEntity` doesn't work with "" for partition or row keys. [#18586](https://github.com/Azure/azure-sdk-for-js/pull/18586)
 
 ### Other Changes
 

package/dist/index.js

@@ -3068,7 +3068,7 @@ class GeneratedClientContext extends coreClient.ServiceClient {
         const defaults = {
             requestContentType: "application/json; charset=utf-8"
         };
-        const packageDetails = `azsdk-js-data-tables/12.2.0`;
+        const packageDetails = `azsdk-js-data-tables/13.0.0`;
         const userAgentPrefix = options.userAgentOptions && options.userAgentOptions.userAgentPrefix
             ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
             : `${packageDetails}`;
@@ -4323,6 +4323,36 @@ function decodeContinuationToken(encodedToken) {
     return continuationToken;
 }
 
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+function escapeQuotesIfString(input, previous) {
+    let result = input;
+    if (typeof input === "string") {
+        result = escapeQuotes(input);
+        // check if we need to escape this literal
+        if (!previous.trim().endsWith("'")) {
+            result = `'${result}'`;
+        }
+    }
+    return result;
+}
+function escapeQuotes(input) {
+    return input.replace(/'/g, "''");
+}
+/**
+ * Escapes an odata filter expression to avoid errors with quoting string literals.
+ */
+function odata(strings, ...values) {
+    const results = [];
+    for (let i = 0; i < strings.length; i++) {
+        results.push(strings[i]);
+        if (i < values.length) {
+            results.push(escapeQuotesIfString(values[i], strings[i]));
+        }
+    }
+    return results.join("");
+}
+
 // Copyright (c) Microsoft Corporation.
 /**
  * A TableClient represents a Client to the Azure Tables service allowing you
@@ -4489,7 +4519,7 @@ class TableClient {
         }
         try {
             const _a = updatedOptions || {}, { disableTypeConversion, queryOptions } = _a, getEntityOptions = tslib.__rest(_a, ["disableTypeConversion", "queryOptions"]);
-            await this.table.queryEntitiesWithPartitionAndRowKey(this.tableName, partitionKey, rowKey, Object.assign(Object.assign({}, getEntityOptions), { queryOptions: serializeQueryOptions(queryOptions || {}), onResponse }));
+            await this.table.queryEntitiesWithPartitionAndRowKey(this.tableName, escapeQuotes(partitionKey), escapeQuotes(rowKey), Object.assign(Object.assign({}, getEntityOptions), { queryOptions: serializeQueryOptions(queryOptions || {}), onResponse }));
             const tableEntity = deserialize(parsedBody, disableTypeConversion !== null && disableTypeConversion !== void 0 ? disableTypeConversion : false);
             return tableEntity;
         }
@@ -4691,7 +4721,7 @@ class TableClient {
         try {
             const _a = updatedOptions || {}, { etag = "*" } = _a, rest = tslib.__rest(_a, ["etag"]);
             const deleteOptions = Object.assign({}, rest);
-            return await this.table.deleteEntity(this.tableName, partitionKey, rowKey, etag, deleteOptions);
+            return await this.table.deleteEntity(this.tableName, escapeQuotes(partitionKey), escapeQuotes(rowKey), etag, deleteOptions);
         }
         catch (e) {
             span.setStatus({ code: coreTracing.SpanStatusCode.ERROR, message: e.message });
@@ -4745,15 +4775,14 @@ class TableClient {
     options = {}) {
         const { span, updatedOptions } = createSpan(`TableClient-updateEntity-${mode}`, options);
         try {
-            if (!entity.partitionKey || !entity.rowKey) {
-                throw new Error("partitionKey and rowKey must be defined");
-            }
+            const partitionKey = escapeQuotes(entity.partitionKey);
+            const rowKey = escapeQuotes(entity.rowKey);
             const _a = updatedOptions || {}, { etag = "*" } = _a, updateEntityOptions = tslib.__rest(_a, ["etag"]);
             if (mode === "Merge") {
-                return await this.table.mergeEntity(this.tableName, entity.partitionKey, entity.rowKey, Object.assign({ tableEntityProperties: serialize(entity), ifMatch: etag }, updateEntityOptions));
+                return await this.table.mergeEntity(this.tableName, partitionKey, rowKey, Object.assign({ tableEntityProperties: serialize(entity), ifMatch: etag }, updateEntityOptions));
             }
             if (mode === "Replace") {
-                return await this.table.updateEntity(this.tableName, entity.partitionKey, entity.rowKey, Object.assign({ tableEntityProperties: serialize(entity), ifMatch: etag }, updateEntityOptions));
+                return await this.table.updateEntity(this.tableName, partitionKey, rowKey, Object.assign({ tableEntityProperties: serialize(entity), ifMatch: etag }, updateEntityOptions));
             }
             throw new Error(`Unexpected value for update mode: ${mode}`);
         }
@@ -4805,14 +4834,13 @@ class TableClient {
     options = {}) {
         const { span, updatedOptions } = createSpan(`TableClient-upsertEntity-${mode}`, options);
         try {
-            if (!entity.partitionKey || !entity.rowKey) {
-                throw new Error("partitionKey and rowKey must be defined");
-            }
+            const partitionKey = escapeQuotes(entity.partitionKey);
+            const rowKey = escapeQuotes(entity.rowKey);
             if (mode === "Merge") {
-                return await this.table.mergeEntity(this.tableName, entity.partitionKey, entity.rowKey, Object.assign({ tableEntityProperties: serialize(entity) }, updatedOptions));
+                return await this.table.mergeEntity(this.tableName, partitionKey, rowKey, Object.assign({ tableEntityProperties: serialize(entity) }, updatedOptions));
             }
             if (mode === "Replace") {
-                return await this.table.updateEntity(this.tableName, entity.partitionKey, entity.rowKey, Object.assign({ tableEntityProperties: serialize(entity) }, updatedOptions));
+                return await this.table.updateEntity(this.tableName, partitionKey, rowKey, Object.assign({ tableEntityProperties: serialize(entity) }, updatedOptions));
             }
             throw new Error(`Unexpected value for update mode: ${mode}`);
         }
@@ -4952,33 +4980,6 @@ class TableClient {
     }
 }
 
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-function escapeQuotesIfString(input, previous) {
-    let result = input;
-    if (typeof input === "string") {
-        result = input.replace(/'/g, "''");
-        // check if we need to escape this literal
-        if (!previous.trim().endsWith("'")) {
-            result = `'${result}'`;
-        }
-    }
-    return result;
-}
-/**
- * Escapes an odata filter expression to avoid errors with quoting string literals.
- */
-function odata(strings, ...values) {
-    const results = [];
-    for (let i = 0; i < strings.length; i++) {
-        results.push(strings[i]);
-        if (i < values.length) {
-            results.push(escapeQuotesIfString(values[i], strings[i]));
-        }
-    }
-    return results.join("");
-}
-
 Object.defineProperty(exports, 'AzureNamedKeyCredential', {
     enumerable: true,
     get: function () {