Permalink
Browse files

Merge branch 'master' of github.com:LearnBoost/mongoose

  • Loading branch information...
2 parents 865d360 + 7780dc7 commit 6fa9e16d39936ef7dcf1eebfb3d89b051ee43b74 @aheckmann aheckmann committed Mar 25, 2011
Showing with 8 additions and 3 deletions.
  1. +5 −0 History.md
  2. +1 −1 lib/mongoose/index.js
  3. +1 −1 lib/mongoose/schema.js
  4. +1 −1 package.json
View
@@ -1,4 +1,9 @@
+1.1.11 / 2011-03-25
+===================
+
+ * Fixed for use of `type` as a key.
+
1.1.10 / 2011-03-23
===================
@@ -281,7 +281,7 @@ exports.Connection = Connection;
* @param version
*/
-exports.version = '1.1.10';
+exports.version = '1.1.11';
/**
* Export Mongoose constructor
@@ -97,7 +97,7 @@ Schema.prototype.add = function (obj, prefix) {
if (!prefix && !this.tree[i])
this.tree[i] = obj[i];
- if (obj[i].constructor == Object && (!obj[i].type || obj[i].__nested)) {
+ if (obj[i].constructor == Object && (!obj[i].type || obj[i].type.type)) {
if (Object.keys(obj[i]).length)
this.add(obj[i], prefix + i + '.');
else
View
@@ -1,7 +1,7 @@
{
"name": "mongoose"
, "description": "Mongoose MongoDB ORM"
- , "version": "1.1.10"
+ , "version": "1.1.11"
, "author": "Guillermo Rauch <guillermo@learnboost.com>"
, "keywords": ["mongodb", "mongoose", "orm", "data", "datastore", "nosql"]
, "dependencies": {}

0 comments on commit 6fa9e16

Please sign in to comment.