Fix #132: enforce 64-bit ranges on long values for protobuf attrs.

gcloud/datastore/helpers.py

@@ -2,11 +2,14 @@
 import calendar
 from datetime import datetime, timedelta
 
+from google.protobuf.internal.type_checkers import Int64ValueChecker
 import pytz
 
 from gcloud.datastore.key import Key
 
 
+INT64 = Int64ValueChecker().CheckValue
+
 def get_protobuf_attribute_and_value(val):
  """Given a value, return the protobuf attribute name and proper value.
 
@@ -53,7 +56,7 @@ def get_protobuf_attribute_and_value(val):
  elif isinstance(val, float):
  name, value = 'double', val
  elif isinstance(val, (int, long)):
- name, value = 'integer', val
+ name, value = 'integer', INT64(val)
  elif isinstance(val, basestring):
  name, value = 'string', val
 

gcloud/datastore/test_helpers.py

@@ -56,11 +56,19 @@ def test_int(self):
  self.assertEqual(value, 42)
 
  def test_long(self):
- must_be_long = 1 << 63
+ must_be_long = (1 << 63) - 1
  name, value = self._callFUT(must_be_long)
  self.assertEqual(name, 'integer_value')
  self.assertEqual(value, must_be_long)
 
+ def test_long_too_small(self):
+ too_small = -(1 << 63) - 1
+ self.assertRaises(ValueError, self._callFUT, too_small)
+
+ def test_long_too_large(self):
+ too_large = 1 << 63
+ self.assertRaises(ValueError, self._callFUT, too_large)
+
  def test_native_str(self):
  name, value = self._callFUT('str')
  self.assertEqual(name, 'string_value')