merge

1 files changed, 7 insertions, 2 deletions

diff --git a/app/index.js b/app/index.js
index b312eb1..e462b48 100644
--- a/app/index.js
+++ b/app/index.js
@@ -77,8 +77,11 @@ function OKCMS(options) {
   var adminTemplateProvider = this._adminTemplateProvider =
       new OKTemplate({root: adminTemplateRoot});
 
-  var db = new OKDB(options.db || 'fs');
   var schemas = this._schemas = this._createSchemas(schemaConfig);
+  var db = new OKDB({
+    db: options.db || 'fs',
+    schemas: schemas
+  });
   var resourceCache = this._resourceCache =
       this._createResources(resourceConfig, db, schemas);
 
@@ -119,6 +122,8 @@ OKCMS.prototype._createSchemas = function(schemaConfig) {
   schemaConfig = schemaConfig || {};
   return Object.keys(schemaConfig).reduce(function(cache, key) {
     var spec = schemaConfig[key];
+    // All resources have an autoincrementing index so we can order them suckas
+    spec.__index = {type: 'meta', autoincrement: true};
     cache[key] = OKSchema(spec);
     return cache;
   }, {});
@@ -248,7 +253,7 @@ function ResourceCache(resources) {
       throw new Error('Undefined resource given to ResourceCache');
     if (resource.bound) {
       cache[resource.type] = resource.parent;
-      cache[resource.type + ':' + resource.id] = resource;
+      cache[resource.type + ':' + resource.getID()] = resource;
     } else {
       cache[resource.type] = resource;
     }