Merge branch 'develop' of github.com:1602/express-on-railway into dev…

…elop
b-mandelbrot · Oct 31, 2011 · d33a539 · d33a539
2 parents 18b39bc + 477ef9a
commit d33a539
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/models.js b/lib/models.js
@@ -41,7 +41,7 @@ function prepareContext(exportModels, defSchema) {
     ctx.describe = ctx.define = function (className, callback) {
         cname = className;
         models[cname] = {};
-        callback();
+        callback && callback();
         return ctx[cname] = exportModels[cname] = (schema || defSchema).define(className, models[cname]);
     };
 
@@ -50,7 +50,11 @@ function prepareContext(exportModels, defSchema) {
      */
     ctx.property = function (name, type, params) {
         if (!params) params = {};
-        params.type = type;
+        if (typeof type !== 'function' && typeof type === 'object') {
+            params = type;
+            type = String;
+        }
+        params.type = type || String;
         models[cname][name] = params;
     };