New database scheme, storing key name inside tables for improving searching

[mojodb.git] / collection.py

diff --git a/collection.py b/collection.py
index 1dad48846b9077e9e08e3742c5819ca29c494926..3c93b8b3192f909f1d31b01100fa5072e8fb7e01 100644 (file)
--- a/collection.py
+++ b/collection.py
@@ -37,6 +37,7 @@ class Collection(object):
     def _create_field(self, field_name):
         fields = [
             {'name': 'id', 'type': 'char', 'size': 512, 'primary': True},
+            {'name': 'name', 'type': 'char', 'size': 64, 'primary': True},
             {'name': 'value', 'type': 'text', 'null': False},
             {'name': 'number', 'type': 'float'},
             ]
@@ -78,11 +79,23 @@ class Collection(object):
         for f in doc:
             if not f in fields:
                 self._create_field(f)
-            values = {
-                '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)
+            self._insert_field(doc_id, table_f, f, doc[f])
+
+    def _insert_field(self, doc_id, field_table, field_name, field_value):
+        values = {
+            'id': doc_id,
+            'name': field_name,
+            'value': msgpack.dumps(field_value),
+            }
+        if type(field_value) in (int, float):
+            values['number'] = field_value
+
+        self.database.connection._insert(self.database.db_name, field_table, values)
+
+        if type(field_value) in (list, tuple) and not '.' in field_name:
+            for i in xrange(len(field_value)):
+                self._insert_field(doc_id, field_table, "%s..%s" % (field_name, i), field_value[i])
+        elif type(field_value) is dict:
+            for k, v in field_value.iteritems():
+                self._insert_field(doc_id, field_table, "%s.%s" % (field_name, k), v)