Fixed strings used for equals, added quotes when needed

Jeff Treuting · Jeff Treuting · commit a57858c1657d · 2013-01-29T11:52:35.000-08:00
diff --git a/SharpRepository.ODataRepository/Linq/ODataQuery.cs b/SharpRepository.ODataRepository/Linq/ODataQuery.cs
@@ -25,6 +25,7 @@ public IEnumerable<T> Enumerable<T>()
         {
             var querystring = String.Empty;
             var resultType = typeof (T);
+            var hasFilter = false;
 
             if (_queryParts.ReturnCount)
             {
@@ -52,6 +53,9 @@ public IEnumerable<T> Enumerable<T>()
             var fullUrl = _url + "/" + _collectionName + querystring;
             var json = UrlHelper.Get(fullUrl);
 
+            // Netflix retuns a separate array inside d when a filter is used for some reason, so hard-coded check for now during tests
+            hasFilter = !querystring.EndsWith("$format=json&");
+
             //var json = ODataRequest.Execute(fullUrl, "POST", _queryParts.BuildODataApiPostData(), "application/json");
 
             JObject res;
@@ -69,6 +73,10 @@ public IEnumerable<T> Enumerable<T>()
             // get the rows property and deserialize that
             var jobject = JsonConvert.DeserializeObject(json) as JObject;
             var rows = jobject["d"];
+            if (hasFilter)
+            {
+                rows = rows["results"];
+            }
 
             var items = rows.Select(row => row.ToObject<T>());
 
diff --git a/SharpRepository.ODataRepository/Linq/ODataQueryable.cs b/SharpRepository.ODataRepository/Linq/ODataQueryable.cs
@@ -17,7 +17,7 @@ private static IQueryExecutor CreateExecutor (string url, string databaseName)
     
         // This constructor is called by our users, create a new IQueryExecutor.
         public ODataQueryable (string url, string databaseName)
-            : base (QueryParser.CreateDefault(), CreateExecutor (url, databaseName))
+            : base (QueryParser.CreateDefault(), CreateExecutor(url, databaseName))
         {
         }
 
diff --git a/SharpRepository.ODataRepository/Linq/QueryGeneration/ODataApiGeneratorExpressionTreeVisitor.cs b/SharpRepository.ODataRepository/Linq/QueryGeneration/ODataApiGeneratorExpressionTreeVisitor.cs
@@ -125,28 +125,28 @@ protected override Expression VisitMemberExpression (MemberExpression expression
         protected override Expression VisitConstantExpression (ConstantExpression expression)
         {           
             // check to see if we don't need the quotes
-//            var quotes = "'";
-//            var value = expression.Value.ToString();
-//            if (
-//                expression.Type == typeof(Int32)
-//                || expression.Type == typeof(Int16)
-//                || expression.Type == typeof(Int64)
-//                || expression.Type == typeof(Decimal)
-//                || expression.Type == typeof(Double)
-//                || expression.Type == typeof(Boolean)
-//                )
-//            {
-//                quotes = "";
-//            }
-//            else if (expression.Type == typeof(DateTime) || expression.Type == typeof(DateTime?))
-//            {
-//                quotes = "";
-//                value = String.Format("new Date('{0}')", value);
-//            }
-//
-//             _expression.AppendFormat("{1}{0}{1}", value, quotes);
-
-            _expression.Append(expression.Value.ToString());
+            var quotes = "'";
+            var value = expression.Value.ToString();
+            if (
+                expression.Type == typeof(Int32)
+                || expression.Type == typeof(Int16)
+                || expression.Type == typeof(Int64)
+                || expression.Type == typeof(Decimal)
+                || expression.Type == typeof(Double)
+                || expression.Type == typeof(Boolean)
+                )
+            {
+                quotes = "";
+            }
+            else if (expression.Type == typeof(DateTime) || expression.Type == typeof(DateTime?))
+            {
+                quotes = "";
+                value = String.Format("new Date('{0}')", value);
+            }
+
+             _expression.AppendFormat("{1}{0}{1}", value, quotes);
+
+            //_expression.Append(expression.Value.ToString());
 
           return expression;
         }
diff --git a/SharpRepository.ODataRepository/ODataDbRepositoryBase.cs b/SharpRepository.ODataRepository/ODataDbRepositoryBase.cs
@@ -11,7 +11,7 @@ namespace SharpRepository.ODataRepository
         //protected ODataClient<T> Client;
         private readonly string _serverUrl;
         private readonly string _database;
-        private string _typeName;
+        private readonly string _typeName;
 
         //private readonly ODataQueryProvider _provider;
         //private readonly IQueryable<T> _baseQuery;
diff --git a/SharpRepository.Tests.Integration/Spikes/ODataSpikes.cs b/SharpRepository.Tests.Integration/Spikes/ODataSpikes.cs
@@ -21,9 +21,10 @@ public void NetflixTest()
         public void NetflixFindAllTest()
         {
             var repository = new ODataRepository<Title>("http://odata.netflix.com/v2/Catalog");
-            var results = repository.FindAll(x => x.ReleaseYear == 1991);
+            //var results = repository.FindAll(x => x.ReleaseYear == 1991 && x.ShortName.StartsWith("The")); // messes up the query syntax, look into this
+            var results = repository.FindAll(x => x.ReleaseYear == 1991 && x.ShortName == "Backdraft");
 
-            results.Count().ShouldEqual(326);
+            results.Count().ShouldEqual(1);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ private static IQueryExecutor CreateExecutor (string url, string databaseName)`
`17`	`17`
`18`	`18`	`// This constructor is called by our users, create a new IQueryExecutor.`
`19`	`19`	`public ODataQueryable (string url, string databaseName)`
`20`		`- : base (QueryParser.CreateDefault(), CreateExecutor (url, databaseName))`
	`20`	`+ : base (QueryParser.CreateDefault(), CreateExecutor(url, databaseName))`
`21`	`21`	`{`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,10 @@ public void NetflixTest()`
`21`	`21`	`public void NetflixFindAllTest()`
`22`	`22`	`{`
`23`	`23`	`var repository = new ODataRepository<Title>("http://odata.netflix.com/v2/Catalog");`
`24`		`- var results = repository.FindAll(x => x.ReleaseYear == 1991);`
	`24`	`+ //var results = repository.FindAll(x => x.ReleaseYear == 1991 && x.ShortName.StartsWith("The")); // messes up the query syntax, look into this`
	`25`	`+ var results = repository.FindAll(x => x.ReleaseYear == 1991 && x.ShortName == "Backdraft");`
`25`	`26`
`26`		`- results.Count().ShouldEqual(326);`
	`27`	`+ results.Count().ShouldEqual(1);`
`27`	`28`	`}`
`28`	`29`	`}`
`29`	`30`