Changeset 523 for Dev

Timestamp:

03/17/14 22:14:12 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Added version for views.
• Don't automatically upgrade views when starting app, this needs to be done manually.

Location:

Dev/trunk/src/server

Files:

• app.js (modified) (2 diffs)
• bin/heroku.js (modified) (1 diff)
• config/couchdb-design-docs.js (modified) (1 diff)
• config/couchdb-schema.json (modified) (1 diff)

Dev/trunk/src/server/app.js

@@ -12 +12 @@
   , etags = require("./util/etags")
   , cryptoken = require('./util/crypto-token')
+  , Q = require('q')
   ;
 
@@ -22 +23 @@
     
     var schema = require("./config/couchdb-schema.json");
-    return couch.get("schemaInfo").then(function(schemaInfo){
-        if (schemaInfo.version !== schema.version) {
-            var msg =  "Database has version "+schemaInfo.version+" but we expect version "+schema.version;
-            throw new Error(msg);
+    var views = require("./config/couchdb-design-docs.js");
+    return couch.get("schemaInfo")
+    .then(function(schemaInfo){
+        if ( schemaInfo.version !== schema.version ) {
+            return Q.reject(new Error("Found schema version "+schemaInfo.version+
+                                      ", expected "+schema.version));
+        } else if ( schemaInfo.viewsVersion !== views.schemaInfo.viewsVersion ) {
+            return Q.reject(new Error("Found views version "+schemaInfo.viewsVersion+
+                                      ", expected "+views.schemaInfo.viewsVersion));
+        } else {
+            return configureApp(env,couch,schema);
         }
-        return configureApp(env,couch,schema);
     });
 

Dev/trunk/src/server/bin/heroku.js

@@ -4 +4 @@
   ;
 
-console.log("Running on",env.couchServerURL+env.dbName);
+console.log("Using CouchDB on",env.couchServerURL+env.dbName);
 
 require('../app').App(env)
 .then(function(app){
-    configCouch(env.couchServerURL,env.dbName,designDocs);
-    return app;
-}).then(function(app){
     app.listen(env.port, function() {
         console.log('Listening on port',env.port);

Dev/trunk/src/server/config/couchdb-design-docs.js

@@ -3 +3 @@
     "schemaInfo": {
         _id: "schemaInfo",
-        version: "4"
+        version: "4",
+        viewsVersion: "1"
     },
 

Dev/trunk/src/server/config/couchdb-schema.json

@@ -16 +16 @@
           "_id": { "type": "string", "pattern": "^schemaInfo$" },
           "_rev": { "$ref": "#/definitions/nonEmptyString" },
-          "version": { "$ref": "#/definitions/nonEmptyString" }
+          "version": { "$ref": "#/definitions/nonEmptyString" },
+          "viewsVersion": { "$ref": "#/definitions/nonEmptyString" }
       },
       "required": ["_id","version"],