[client][managed][offline] Relax queryId restrictions #521

Azure · Dec 4, 2014 · 3e2f645 · 3e2f645
1 parent 5a06901
commit 3e2f645
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 13 deletions.
diff --git a/sdk/Managed/src/Microsoft.WindowsAzure.MobileServices/Resources.Designer.cs b/sdk/Managed/src/Microsoft.WindowsAzure.MobileServices/Resources.Designer.cs
diff --git a/sdk/Managed/src/Microsoft.WindowsAzure.MobileServices/Resources.resx b/sdk/Managed/src/Microsoft.WindowsAzure.MobileServices/Resources.resx
@@ -391,7 +391,7 @@
     <value>The store is already initialized.</value>
   </data>
   <data name="MobileServiceSyncTable_InvalidQueryId" xml:space="preserve">
-    <value>The query id must start with a letter and can contain only letters, digits, hyphen or underscore.</value>
+    <value>The query id must not contain pipe character and should be less than 50 characters in length.</value>
   </data>
   <data name="MobileServiceSyncTable_IncrementalPullWithOrderNotAllowed" xml:space="preserve">
     <value>Incremental pull query must not have orderby clause.</value>

diff --git a/sdk/Managed/src/Microsoft.WindowsAzure.MobileServices/Table/Sync/MobileServiceSyncTable.cs b/sdk/Managed/src/Microsoft.WindowsAzure.MobileServices/Table/Sync/MobileServiceSyncTable.cs
@@ -15,7 +15,7 @@ namespace Microsoft.WindowsAzure.MobileServices.Sync
 {
     internal class MobileServiceSyncTable : IMobileServiceSyncTable
     {
-        private static readonly Regex queryIdRegex = new Regex("^[a-zA-Z][a-zA-Z0-9_-]{0,24}$");
+        private static readonly Regex queryIdRegex = new Regex("^[^|]{0,50}$");
         private MobileServiceSyncContext syncContext;
 
         public MobileServiceClient MobileServiceClient { get; private set; }

diff --git a/...Microsoft.WindowsAzure.MobileServices.Test.Unit/Table/Sync/MobileServiceSyncTableTests.cs b/...Microsoft.WindowsAzure.MobileServices.Test.Unit/Table/Sync/MobileServiceSyncTableTests.cs
@@ -10,18 +10,18 @@ public class MobileServiceSyncTableTests
         [TestMethod]
         public void ValidateQueryId_Throws_OnInvalidId()
         {
-            var testCases = new[] { "-myitems", "_myitems", "|myitems", "s|myitems", "asdf@#$!@" };
+            var testCases = new[] { "|myitems", "s|myitems", "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz" };
             foreach (var queryId in testCases)
             {
                 var ex = AssertEx.Throws<ArgumentException>(() => MobileServiceSyncTable.ValidateQueryId(queryId));
-                Assert.AreEqual(ex.Message, "The query id must start with a letter and can contain only letters, digits, hyphen or underscore.");
+                Assert.AreEqual(ex.Message, "The query id must not contain pipe character and should be less than 50 characters in length.");
             }
         }
 
         [TestMethod]
         public void ValidateQueryId_Succeeds_OnValidId()
         {
-            var testCases = new[] { "myitems1", "myItems_yourItems1", "my-items123" };
+            var testCases = new[] { "myitems1", "myItems_yourItems1", "my-items123", "-myitems", "_myitems", "asdf@#$!/:^" };
             foreach (var queryId in testCases)
             {
                 MobileServiceSyncTable.ValidateQueryId(queryId);

diff --git a/...dowsAzure.MobileServices.Test/UnitTests/Table/Sync/MobileServiceSyncTable.Generic.Test.cs b/...dowsAzure.MobileServices.Test/UnitTests/Table/Sync/MobileServiceSyncTable.Generic.Test.cs
@@ -821,9 +821,7 @@ public async Task PullAsync_Throws_WhenQueryIdIsInvalid()
 
             IMobileServiceSyncTable<ToDoWithStringId> table = service.GetSyncTable<ToDoWithStringId>();
 
-            await ThrowsAsync<ArgumentException>(() => table.PullAsync("2asdf", table.CreateQuery(), CancellationToken.None));
-            await ThrowsAsync<ArgumentException>(() => table.PullAsync("asd_@#234", table.CreateQuery(), CancellationToken.None));
-            await ThrowsAsync<ArgumentException>(() => table.PullAsync("asd_^^234", table.CreateQuery(), CancellationToken.None));
+            await ThrowsAsync<ArgumentException>(() => table.PullAsync("2as|df", table.CreateQuery(), CancellationToken.None));
         }
 
         private async Task TestPullQueryOverrideThrows(IDictionary<string, string> parameters, string errorMessage)
@@ -926,9 +924,7 @@ public async Task PurgeAsync_Throws_WhenQueryIdIsInvalid()
 
             IMobileServiceSyncTable<ToDoWithStringId> table = service.GetSyncTable<ToDoWithStringId>();
 
-            await ThrowsAsync<ArgumentException>(() => table.PurgeAsync("2asdf", table.CreateQuery(), CancellationToken.None));
-            await ThrowsAsync<ArgumentException>(() => table.PurgeAsync("asd_@#234", table.CreateQuery(), CancellationToken.None));
-            await ThrowsAsync<ArgumentException>(() => table.PurgeAsync("asd_^^234", table.CreateQuery(), CancellationToken.None));
+            await ThrowsAsync<ArgumentException>(() => table.PurgeAsync("2as|df", table.CreateQuery(), CancellationToken.None));
         }
 
         [AsyncTestMethod]