Save can raise exception if error

.gitignore

@@ -6,4 +6,9 @@ build
 rethinkengine.egg-info
 .coverage
 docs/_build
-dist
+dist
+bin
+include
+lib
+man
+.python

.pep8

@@ -0,0 +1,3 @@
+[pep8]
+ignore=E401
+max-line-length=140

rethinkengine/document.py

@@ -16,6 +16,10 @@ class ValidationError(Exception):
     pass
 
 
+class RqlOperationError(Exception):
+    pass
+
+
 class Meta(object):
     order_by = None
     primary_key_field = 'id'
@@ -143,6 +147,10 @@ def save(self):
             result = table.get(self.pk).update(doc).run(get_conn())
         else:
             result = table.insert(doc).run(get_conn())
+
+        if result.get('errors', False) == 1:
+            raise RqlOperationError(result['first_error'])
+
         self._dirty = False
         if 'generated_keys' in result:
             self._data['pk'] = result['generated_keys'][0]

rethinkengine/query_set.py

@@ -52,12 +52,12 @@ def _build_cursor_obj(self):
                     order_by_r.append(r.asc(field))
             self._cursor_obj = self._cursor_obj.order_by(*order_by_r)
 
-        if self._limit:
-            self._cursor_obj = self._cursor_obj.limit(self._limit)
-
         if self._skip:
             self._cursor_obj = self._cursor_obj.skip(self._skip)
 
+        if self._limit:
+            self._cursor_obj = self._cursor_obj.limit(self._limit)
+
         self._iter_index = 0
         self._cursor_iter = iter(self._cursor_obj.run(get_conn()))
 
@@ -160,6 +160,15 @@ def get_or_create(self, **kwargs):
             created = True
         return created, doc
 
+    def first(self, **kwargs):
+        self.filter(**kwargs)
+        self._limit = 1
+        try:
+            doc = self.next()
+        except StopIteration:
+            doc = None
+        return doc
+
     def create(self, **kwargs):
         doc = self._document(**kwargs)
         doc.save()

tests/__init__.py

@@ -14,13 +14,23 @@ class Foo(Document):
     number = IntegerField(required=False)
 
 
+class User(Document):
+    class Meta(object):
+        primary_key_field = 'email'
+
+    email = StringField()
+
+
 def setUp():
     connect(DB_NAME)
     try:
         Foo.table_create()
+        User.table_create()
+
     except r.RqlRuntimeError:
         pass
 
+
 def tearDown():
     try:
         disconnect(DB_NAME)

tests/document/test_document.py

@@ -1,13 +1,13 @@
-from .. import Foo
-from rethinkengine import *
+from .. import Foo, User
+from rethinkengine import RqlOperationError
 
-import rethinkdb as r
 import unittest2 as unittest
 
 
 class DocumentTestCase(unittest.TestCase):
     def setUp(self):
         Foo.objects.all().delete()
+        User.objects.all().delete()
 
     def test_set_does_not_exist(self):
         # Should not raise an error
@@ -73,3 +73,14 @@ def test_save_and_update(self):
         # Retrieve doc and make sure pks are equal
         f = Foo.objects.get(name='Jack')
         self.assertEqual(f.pk, pk)
+
+    def test_rql_operation_error(self):
+        user1 = User(email='[email protected]')
+        user1.save()
+
+        user2 = User(email='[email protected]')
+        user2.save()
+
+        with self.assertRaises(RqlOperationError):
+            user3 = User(email='[email protected]')
+            user3.save()

tests/query_set/test_first.py

@@ -0,0 +1,18 @@
+from .. import Foo
+
+import unittest2 as unittest
+
+
+class GetTestCase(unittest.TestCase):
+    def setUp(self):
+        Foo.objects.delete()
+
+        Foo(name='foo').save()
+
+    def test_get_none(self):
+        f = Foo.objects.first(name='bar')
+        self.assertIsNone(f)
+
+    def test_get_one(self):
+        f = Foo.objects.first(name='foo')
+        self.assertIsInstance(f, Foo)

tests/query_set/test_skip.py

@@ -33,6 +33,5 @@ def test_filter_and_skip(self):
         self.assertEqual(len(result), 1)
 
     def test_limit_and_skip(self):
-        result = Foo.objects.limit(3).skip(1)
+        result = Foo.objects.skip(3).limit(3)
         self.assertEqual(len(result), 2)
-