summaryrefslogtreecommitdiff
path: root/app/index.js
diff options
context:
space:
mode:
authorSean Fridman <fridman@mail.sfsu.edu>2015-04-10 21:38:31 -0400
committerSean Fridman <fridman@mail.sfsu.edu>2015-04-10 21:41:01 -0400
commit6e1f689cfd8f820090c4ab15519114f4d3bf929f (patch)
tree3ce5f2515fb37777660bb36f635071afbb9bf224 /app/index.js
parent5abbdf600396144fbbe32b97e83beaabf6ed5c39 (diff)
Overhaul DB impl
Make DB schema aware Add autoincrement support Add custom ID field support
Diffstat (limited to 'app/index.js')
-rw-r--r--app/index.js7
1 files changed, 5 insertions, 2 deletions
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;
}