Merge pull request #26 from silvolu/master

Burcu Dogan · Burcu Dogan · commit 3ba83354aac4 · 2014-07-21T15:05:18.000-07:00
Fix for wrong declaration of 'value' for property filters
diff --git a/lib/datastore/entity.js b/lib/datastore/entity.js
@@ -269,7 +269,7 @@ var queryToQueryProto = function(q) {
       if (f.name === '__key__') {
         val.keyValue = keyToKeyProto(null, f.val);
       } else {
-        val.properties = valueToProperty(f.val);
+        val = valueToProperty(f.val);
       }
       var property = {
         property: { name: f.name },
diff --git a/test/datastore.entity.js b/test/datastore.entity.js
@@ -282,9 +282,7 @@ var queryFilterProto = {
                     },
                     "operator": "EQUAL",
                     "value": {
-                        "properties": {
-                            "stringValue": "John"
-                        }
+                        "stringValue": "John"
                     }
                 }
             }, {
diff --git a/test/testdata/proto_query.json b/test/testdata/proto_query.json
@@ -1 +1 @@
-{"projection":[{"property":{"name":"name"}},{"property":{"name":"count"}}],"kinds":[{"name":"Kind"}],"filter":{"compositeFilter":{"filters":[{"propertyFilter":{"property":{"name":"count"},"operator":"GREATER_THAN_OR_EQUAL","value":{"properties":{"integerValue":5}}}},{"propertyFilter":{"property":{"name":"name"},"operator":"EQUAL","value":{"properties":{"stringValue":"Burcu"}}}}],"operator":"AND"}},"order":[{"property":{"name":"count"},"direction":"DESCENDING"}],"groupBy":[{"name":"count"}],"startCursor":"cursor","offset":5,"limit":10}
+{"projection":[{"property":{"name":"name"}},{"property":{"name":"count"}}],"kinds":[{"name":"Kind"}],"filter":{"compositeFilter":{"filters":[{"propertyFilter":{"property":{"name":"count"},"operator":"GREATER_THAN_OR_EQUAL","value":{"integerValue":5}}},{"propertyFilter":{"property":{"name":"name"},"operator":"EQUAL","value":{"stringValue":"Burcu"}}}],"operator":"AND"}},"order":[{"property":{"name":"count"},"direction":"DESCENDING"}],"groupBy":[{"name":"count"}],"startCursor":"cursor","offset":5,"limit":10}

Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ var queryToQueryProto = function(q) {`
`269`	`269`	`if (f.name === '__key__') {`
`270`	`270`	`val.keyValue = keyToKeyProto(null, f.val);`
`271`	`271`	`} else {`
`272`		`- val.properties = valueToProperty(f.val);`
	`272`	`+ val = valueToProperty(f.val);`
`273`	`273`	`}`
`274`	`274`	`var property = {`
`275`	`275`	`property: { name: f.name },`
Original file line number	Diff line number	Diff line change
`@@ -282,9 +282,7 @@ var queryFilterProto = {`
`282`	`282`	`},`
`283`	`283`	`"operator": "EQUAL",`
`284`	`284`	`"value": {`
`285`		`- "properties": {`
`286`		`- "stringValue": "John"`
`287`		`- }`
	`285`	`+ "stringValue": "John"`
`288`	`286`	`}`
`289`	`287`	`}`
`290`	`288`	`}, {`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-{"projection":[{"property":{"name":"name"}},{"property":{"name":"count"}}],"kinds":[{"name":"Kind"}],"filter":{"compositeFilter":{"filters":[{"propertyFilter":{"property":{"name":"count"},"operator":"GREATER_THAN_OR_EQUAL","value":{"properties":{"integerValue":5}}}},{"propertyFilter":{"property":{"name":"name"},"operator":"EQUAL","value":{"properties":{"stringValue":"Burcu"}}}}],"operator":"AND"}},"order":[{"property":{"name":"count"},"direction":"DESCENDING"}],"groupBy":[{"name":"count"}],"startCursor":"cursor","offset":5,"limit":10}
	`1`	+{"projection":[{"property":{"name":"name"}},{"property":{"name":"count"}}],"kinds":[{"name":"Kind"}],"filter":{"compositeFilter":{"filters":[{"propertyFilter":{"property":{"name":"count"},"operator":"GREATER_THAN_OR_EQUAL","value":{"integerValue":5}}},{"propertyFilter":{"property":{"name":"name"},"operator":"EQUAL","value":{"stringValue":"Burcu"}}}],"operator":"AND"}},"order":[{"property":{"name":"count"},"direction":"DESCENDING"}],"groupBy":[{"name":"count"}],"startCursor":"cursor","offset":5,"limit":10}