From 6e1f689cfd8f820090c4ab15519114f4d3bf929f Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Fri, 10 Apr 2015 21:38:31 -0400
Subject: Overhaul DB impl

Make DB schema aware
Add autoincrement support
Add custom ID field support
---
 app/index.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'app/index.js')

diff --git a/app/index.js b/app/index.js
index b312eb1..fc38b0a 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);
 
@@ -248,7 +251,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;
     }
-- 
cgit v1.2.3-70-g09d2


From 1eff07c9c2ca5b61a28a1037a586d25c3791d67b Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Fri, 10 Apr 2015 22:37:33 -0400
Subject: Add autoincrementing index to resources

---
 app/index.js                       | 2 ++
 app/node_modules/okschema/index.js | 5 +++++
 2 files changed, 7 insertions(+)

(limited to 'app/index.js')

diff --git a/app/index.js b/app/index.js
index fc38b0a..e462b48 100644
--- a/app/index.js
+++ b/app/index.js
@@ -122,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;
   }, {});
diff --git a/app/node_modules/okschema/index.js b/app/node_modules/okschema/index.js
index 4633e7a..d53ed7b 100644
--- a/app/node_modules/okschema/index.js
+++ b/app/node_modules/okschema/index.js
@@ -56,6 +56,11 @@ var types = {
         }];
       }
     }
+  },
+  // Special type for resource meta information
+  'meta': {
+    parent: 'string',
+    assertValid: function(spec, value) {}
   }
 }
 
-- 
cgit v1.2.3-70-g09d2