Merge lp:~jameinel/u1db/index-bug into lp:u1db

[John A Meinel]

Fixes a bug in InMemoryIndex and adds a per-backend test for it.

[Samuele Pedroni (pedronis)]

+1

review: Approve

=== modified file 'u1db/backends/inmemory.py'
--- u1db/backends/inmemory.py	2011-10-28 09:17:26 +0000
+++ u1db/backends/inmemory.py	2011-11-01 18:32:24 +0000
@@ -196,6 +196,8 @@
     def remove_json(self, doc_id, doc):
         """Remove this json doc from the index."""
         key = self.evaluate_json(doc)
+        if key is None:
+            return
         doc_ids = self._values[key]
         doc_ids.remove(doc_id)
         if not doc_ids:

=== modified file 'u1db/tests/test_backends.py'
--- u1db/tests/test_backends.py	2011-10-28 09:17:26 +0000
+++ u1db/tests/test_backends.py	2011-11-01 18:32:24 +0000
@@ -263,6 +263,15 @@
         self.assertEqual([(doc_id, new_doc_rev, new_doc)],
             self.db.get_from_index('test-idx', [('altval',)]))
 
+    def test_put_updates_when_adding_key(self):
+        doc_id, doc_rev = self.db.create_doc("{}")
+        self.db.create_index('test-idx', ['key'])
+        self.assertEqual([],
+            self.db.get_from_index('test-idx', [('*',)]))
+        new_doc_rev = self.db.put_doc(doc_id, doc_rev, simple_doc)
+        self.assertEqual([(doc_id, new_doc_rev, simple_doc)],
+            self.db.get_from_index('test-idx', [('*',)]))
+
     def test_get_all_from_index(self):
         self.db.create_index('test-idx', ['key'])
         doc1_id, doc1_rev = self.db.create_doc(simple_doc)