Field _id in documents is treated as one more field: can be string, list, dictionary...

[mojodb.git] / collection.py

diff --git a/collection.py b/collection.py
index bbc56cacfbc7fcf7aeb5619dc9932eea58a252ea..1dad48846b9077e9e08e3742c5819ca29c494926 100644 (file)
--- a/collection.py
+++ b/collection.py
@@ -34,12 +34,6 @@ class Collection(object):
     def exists(self):
         return (self.database.exists() and self.table_name in self.database.collection_names())
 
-    def _create_table(self):
-        fields = [
-            {'name': 'id', 'type': 'char', 'size': 512, 'primary': True},
-            ]
-        return self.database.connection._create_table(self.database.db_name, '%s$_id' % self.table_name, fields)
-
     def _create_field(self, field_name):
         fields = [
             {'name': 'id', 'type': 'char', 'size': 512, 'primary': True},
@@ -62,37 +56,33 @@ class Collection(object):
         if not self.database.db_name in self.database.connection.database_names():
             self.database._create_database()
         if not self.table_name in self.database.collection_names():
-            self._create_table()
+            self._create_field('_id')
 
         if not type(doc_or_docs) in (list, tuple):
             docs = [doc_or_docs]
         else:
             docs = doc_or_docs
         for doc in docs:
+            doc_id = uuid.uuid4().hex
             if not '_id' in doc:
-                doc['_id'] = uuid.uuid4().hex
-            self._insert_document(doc)
+                doc['_id'] = doc_id
+            self._insert_document(doc_id, doc)
 
         if type(doc_or_docs) in (list, tuple):
             return [d['_id'] for d in docs]
         else:
             return docs[0]['_id']
 
-    def _insert_document(self, doc):
-        table_id = '%s$_id' % self.table_name
+    def _insert_document(self, doc_id, doc):
         fields = self._get_fields()
-        coded_id = msgpack.dumps(doc['_id'])
-        self.database.connection._insert(self.database.db_name, table_id, {'id': coded_id})
         for f in doc:
-            if f == '_id':
-                continue
             if not f in fields:
                 self._create_field(f)
-            table_f = '%s$%s' % (self.table_name, f)
             values = {
-                'id': coded_id,
+                'id': doc_id,
                 'value': msgpack.dumps(doc[f]),
                 }
             if type(doc[f]) in (int, float):
                 values['number'] = doc[f]
+            table_f = '%s$%s' % (self.table_name, f)
             self.database.connection._insert(self.database.db_name, table_f, values)