From c46f6902ef4b25a63616c1550c33204a1acd02ec Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 10 Jan 2013 09:38:41 +0000
Subject: [PATCH 0001/1246] Adds possibility to create a Model and use
 associations without fetching instances (#15)

After defining a model and associations it's possible to do something
similar to:

```js
Model(ID).getAssociation(....);
```
(where ID is an instance of the model in the database and
getAssociation is a method created by the association)

This allows to fetch associations without needing to fetch an instance
first.
---
 lib/Model.js | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/lib/Model.js b/lib/Model.js
index c4896c7b..07fa815c 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -15,8 +15,34 @@ function Model(opts) {
 	var association_properties = [];
 
 	var model = function (data) {
+		if (typeof data == "number") {
+			var data2 = {};
+			data2[opts.id] = data;
+
+			var instance = new Instance({
+				data                   : data2,
+				autoSave               : false,
+				driver                 : opts.driver,
+				table                  : opts.table,
+				properties             : opts.properties,
+				hooks                  : opts.hooks,
+				methods                : opts.methods,
+				validations            : opts.validations,
+				association_properties : association_properties
+			});
+			OneAssociation.extend(instance, opts.driver, one_associations, {
+				autoFetch      : false
+			}, function () {
+				ManyAssociation.extend(instance, opts.driver, many_associations, {
+					autoFetch      : false
+				}, function () {
+					// ..
+				});
+			});
+			return instance;
+		}
 		return new Instance({
-			is_new                 : true,
+			is_new                 : !data.hasOwnProperty(opts.id),
 			data                   : data,
 			autoSave               : opts.autoSave,
 			driver                 : opts.driver,

From 0b63e4149dc81acbf56a40aebe3be29a7d04f5c6 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 10 Jan 2013 14:03:45 +0000
Subject: [PATCH 0002/1246] Fixes indentation on mysql driver file

---
 lib/Drivers/mysql.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Drivers/mysql.js b/lib/Drivers/mysql.js
index f453572b..132c9274 100644
--- a/lib/Drivers/mysql.js
+++ b/lib/Drivers/mysql.js
@@ -55,7 +55,7 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 		this.QuerySelect.order(opts.order[0], opts.order[1]);
 	}
 	for (var k in conditions) {
-    this.QuerySelect.where(k, conditions[k]);
+		this.QuerySelect.where(k, conditions[k]);
 	}
 
 	this.db.query(this.QuerySelect.build(), cb);

From 246aaba915f89e64898e6b7b1d1550c01f85237c Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 10 Jan 2013 14:08:12 +0000
Subject: [PATCH 0003/1246] Adds a Tools file with some special objects to use
 in .find() conditions

---
 lib/sql/Tools.js | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 lib/sql/Tools.js

diff --git a/lib/sql/Tools.js b/lib/sql/Tools.js
new file mode 100644
index 00000000..80ebb93a
--- /dev/null
+++ b/lib/sql/Tools.js
@@ -0,0 +1,32 @@
+exports.between = function (a, b) {
+	return createSpecialObject({ from: a, to: b }, 'between');
+};
+
+exports.eq = function (v) {
+	return createSpecialObject({ val: v }, 'eq');
+};
+exports.ne = function (v) {
+	return createSpecialObject({ val: v }, 'ne');
+};
+exports.gt = function (v) {
+	return createSpecialObject({ val: v }, 'gt');
+};
+exports.gte = function (v) {
+	return createSpecialObject({ val: v }, 'gte');
+};
+exports.lt = function (v) {
+	return createSpecialObject({ val: v }, 'lt');
+};
+exports.lte = function (v) {
+	return createSpecialObject({ val: v }, 'lte');
+};
+
+function createSpecialObject(obj, tag) {
+	Object.defineProperty(obj, "orm_special_object", {
+		configurable : false,
+		enumerable   : false,
+		value        : function () { return tag; }
+	});
+
+	return obj;
+}

From 6ab45c3331987174e86299702c448aa8574b93db Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 10 Jan 2013 14:08:34 +0000
Subject: [PATCH 0004/1246] Exports Tools methods to create the previously
 created special objects

---
 lib/ORM.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/ORM.js b/lib/ORM.js
index 6fb1bbc9..ac3c7091 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -1,9 +1,14 @@
 var DriverAliases = require("./Drivers/aliases");
 var Validators    = require("./Validators");
 var Property      = require("./Property");
+var SqlTools      = require("./sql/Tools");
 
 exports.validators = Validators;
 
+for (var tool in SqlTools) {
+	exports[tool] = SqlTools[tool];
+}
+
 exports.use = function (connection, proto, opts, cb) {
 	if (DriverAliases[proto]) {
 		proto = DriverAliases[proto];

From 1ed3dc5edd329c89e5e3aaeb77068b28f41dc23b Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 10 Jan 2013 14:12:08 +0000
Subject: [PATCH 0005/1246] Changes sql SELECT to support special objects in
 condition values (fixes #19)

Example:

```js
Person.find({ age: orm.between(20, 30) }, cb);
```

Other special objects:

- orm.eq(val): equal to val
- orm.ne(val): not equal to val
- orm.gt(val): greater than val
- orm.gte(val): greater or equal to val
- orm.lt(val): lesser than val
- orm.lte(val): lesser or equal to val
---
 lib/sql/Select.js                   | 44 ++++++++++++++++++++++++++---
 test/integration/test-find-where.js |  2 +-
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/lib/sql/Select.js b/lib/sql/Select.js
index 63d771ea..6e4068a8 100644
--- a/lib/sql/Select.js
+++ b/lib/sql/Select.js
@@ -30,10 +30,11 @@ Builder.prototype.table = function (table) {
 };
 
 Builder.prototype.where = function (field, value, comparison) {
-  if (!Array.isArray(value) && typeof(value) === 'object') {
-    comparison = value.op || value.operator || value.comp || value.comparison;
-    value = value.value;
-  }
+	// stand by for now..
+	// if (!Array.isArray(value) && typeof(value) === 'object') {
+	// 	comparison = value.op || value.operator || value.comp || value.comparison;
+	// 	value = value.value;
+	// }
 	this.opts.where.push({
 		field : field,
 		value : value,
@@ -118,6 +119,41 @@ Builder.prototype.build = function () {
 	// where
 	lst = [];
 	for (i = 0; i < this.opts.where.length; i++) {
+		if (typeof this.opts.where[i].value.orm_special_object == "function") {
+			var op = this.opts.where[i].value.orm_special_object();
+			switch (op) {
+				case "between":
+					lst.push([
+						this.escapeId(this.opts.where[i].field),
+						"BETWEEN",
+						this.escape(this.opts.where[i].value.from),
+						"AND",
+						this.escape(this.opts.where[i].value.to)
+					].join(" "));
+					break;
+				case "eq":
+				case "ne":
+				case "gt":
+				case "gte":
+				case "lt":
+				case "lte":
+					switch (op) {
+						case "eq"  : op = "=";  break;
+						case "ne"  : op = "<>";  break;
+						case "gt"  : op = ">";  break;
+						case "gte" : op = ">="; break;
+						case "lt"  : op = "<";  break;
+						case "lte" : op = "<="; break;
+					}
+					lst.push([
+						this.escapeId(this.opts.where[i].field),
+						op,
+						this.escape(this.opts.where[i].value.val)
+					].join(" "));
+					break;
+			}
+			continue;
+		}
 		lst.push([
 			this.escapeId(this.opts.where[i].field),
 			this.opts.where[i].comp,
diff --git a/test/integration/test-find-where.js b/test/integration/test-find-where.js
index d1f1563c..f54bbdef 100644
--- a/test/integration/test-find-where.js
+++ b/test/integration/test-find-where.js
@@ -12,7 +12,7 @@ common.createConnection(function (err, db) {
 
 			var TestModel = db.define(tableName, common.getModelProperties());
 
-			TestModel.find({ id: { value: 1, comparison: '<>' }}, function (err, Instances) {
+			TestModel.find({ id: common.ORM.ne(1) }, function (err, Instances) {
 				assert.equal(err, null);
 				assert.equal(Array.isArray(Instances), true);
 				assert.equal(Instances[0].id, 2);

From 53af25b1b7a51a714c8e605537b11417d047804a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 10 Jan 2013 23:05:08 +0000
Subject: [PATCH 0006/1246] Fixes new instances not exporting instance id after
 first save (fixes #18)

---
 lib/Instance.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/Instance.js b/lib/Instance.js
index 30d9d15f..a64b14b3 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -228,6 +228,9 @@ function Instance(opts) {
 		});
 	};
 
+	if (!opts.data.hasOwnProperty(opts.id)) {
+		addInstanceProperty(opts.id);
+	}
 	for (var k in opts.data) {
 		if (!opts.data.hasOwnProperty(k)) continue;
 		if (!opts.properties.hasOwnProperty(k) && k != opts.id && opts.association_properties.indexOf(k) == -1) {

From 2e7c1b16fcb66ff86be929bbdd63363d3d30f612 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 10 Jan 2013 23:08:53 +0000
Subject: [PATCH 0007/1246] Bumps version to 2.0.0-alpha7

---
 package.json | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index e3f93dd1..f7e0b083 100644
--- a/package.json
+++ b/package.json
@@ -2,12 +2,14 @@
   "author": "Diogo Resende <dresende@thinkdigital.pt>",
   "name": "orm",
   "description": "NodeJS Object-relational mapping",
-  "version": "2.0.0-alpha6",
+  "version": "2.0.0-alpha7",
   "repository": {
-    "url": ""
+    "url": "http://dresende.github.com/node-orm2"
   },
   "contributors": [
-    { "name": "Bramus Van Damme", "email": "bramus@bram.us" }
+    { "name": "Bramus Van Damme", "email": "bramus@bram.us" },
+    { "name": "Lorien Gamaroff", "email": "lorien@gamaroff.org" },
+    { "name": "preslavrachev" }
   ],
   "main": "./lib/ORM",
   "scripts": {
@@ -19,7 +21,7 @@
   "devDependencies": {
     "utest": "0.0.6",
     "urun": "0.0.6",
-    "mysql": "2.0.0-alpha4",
+    "mysql": "2.0.0-alpha5",
     "pg": "0.8.7",
     "sqlite3": "2.1.5"
   },

From d22a89b5064d0b50ec2617052b55a2e723013b36 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 10 Jan 2013 23:18:57 +0000
Subject: [PATCH 0008/1246] Updates Readme to add examples of condition
 comparisons other than equal

---
 Readme.md | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 56de334f..fed39f1c 100644
--- a/Readme.md
+++ b/Readme.md
@@ -126,6 +126,26 @@ Person.find({ surname: "Doe" }).limit(3).offset(2).only("name", "surname").run(f
 });
 ```
 
+#### Conditions
+
+Conditions are defined as an object where every key is a property (table column). All keys are supposed
+to be concatenated by the logical `AND`. Values are considered to match exactly, unless you're passing
+an `Array`. In this case it is considered a list to compare the property with.
+
+```js
+{ col1: 123, col2: "foo" } // `col1` = 123 AND `col2` = 'foo'
+{ col1: [ 1, 3, 5 ] } // `col1` IN (1, 3, 5)
+```
+
+If you need other comparisons, you have to use a special object created by some helper functions. Here are
+a few examples to describe it:
+
+```js
+{ col1: orm.ne(123) } // `col1` <> 123
+{ col1: orm.gte(123) } // `col1` >= 123
+{ col1: orm.between(123, 456) } // `col1` BETWEEN 123 AND 456
+```
+
 ## Associations
 
 An association is a relation between one or more tables.
@@ -213,4 +233,4 @@ var Person = db.define('person', {
 Person.hasMany("friends", {
     rate : Number
 });
-```
\ No newline at end of file
+```

From 1ed578c30042f69ee3e65b13f89e8dd5c3f20623 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 10 Jan 2013 23:23:04 +0000
Subject: [PATCH 0009/1246] Updates version number in Readme

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index fed39f1c..a85c7aac 100644
--- a/Readme.md
+++ b/Readme.md
@@ -5,7 +5,7 @@
 ## Install
 
 ```sh
-npm install orm@2.0.0-alpha6
+npm install orm@2.0.0-alpha7
 ```
 
 Despite the alpha tag, this is the recommended version for new applications.

From 068a19f84bacbcb1e12952c7f69d0eee086d5e45 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 21 Jan 2013 17:46:43 +0000
Subject: [PATCH 0010/1246] Removes internal prepare() and creates a real
 object called ORM

---
 lib/ORM.js | 79 +++++++++++++++++++++++++++---------------------------
 1 file changed, 40 insertions(+), 39 deletions(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index ac3c7091..e67ebcb4 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -1,3 +1,7 @@
+var util          = require("util");
+var events        = require("events");
+
+var Model         = require("./Model").Model;
 var DriverAliases = require("./Drivers/aliases");
 var Validators    = require("./Validators");
 var Property      = require("./Property");
@@ -24,9 +28,7 @@ exports.use = function (connection, proto, opts, cb) {
 			debug: (opts.query && opts.query.debug == 'true')
 		});
 
-		var ORM = prepare(driver);
-
-		return cb(null, ORM);
+		return cb(null, new ORM(driver));
 	} catch (ex) {
 		return cb(ex);
 	}
@@ -62,48 +64,47 @@ exports.connect = function (opts, cb) {
 				return cb(err);
 			}
 
-			var ORM = prepare(driver);
-
-			return cb(null, ORM);
+			return cb(null, new ORM(driver));
 		});
 	} catch (ex) {
 		return cb(ex);
 	}
 };
 
-function prepare(driver) {
-	var Model = require("./Model").Model;
+function ORM(driver) {
+	this.models = {};
+	this.driver = driver;
+	this.validators = Validators;
 
-	return {
-		define: function (name, properties, opts) {
-			properties = properties || {};
-			opts       = opts || {};
+	events.EventEmitter.call(this);
+}
 
-			for (var k in properties) {
-				properties[k] = Property.check(properties[k]);
-			}
+util.inherits(ORM, events.EventEmitter);
 
-			this.models[name] = new Model({
-				driver         : driver,
-				table          : name,
-				properties     : properties,
-				cache          : opts.cache,
-				autoSave       : opts.autoSave || false,
-				autoFetch      : opts.autoFetch || false,
-				autoFetchLimit : opts.autoFetchLimit,
-				hooks          : opts.hooks || {},
-				methods        : opts.methods || {},
-				validations    : opts.validations || {}
-			});
-			return this.models[name];
-		},
-		close: function (cb) {
-			driver.close(cb);
-
-			return this;
-		},
-		models: {},
-		validators: Validators,
-		driver: driver
-	};
-}
+ORM.prototype.define = function (name, properties, opts) {
+	properties = properties || {};
+	opts       = opts || {};
+
+	for (var k in properties) {
+		properties[k] = Property.check(properties[k]);
+	}
+
+	this.models[name] = new Model({
+		driver         : this.driver,
+		table          : name,
+		properties     : properties,
+		cache          : opts.cache,
+		autoSave       : opts.autoSave || false,
+		autoFetch      : opts.autoFetch || false,
+		autoFetchLimit : opts.autoFetchLimit,
+		hooks          : opts.hooks || {},
+		methods        : opts.methods || {},
+		validations    : opts.validations || {}
+	});
+	return this.models[name];
+};
+ORM.prototype.close = function (cb) {
+	this.driver.close(cb);
+
+	return this;
+};

From 44d55071d0c360f8bec585c12ebee42d391b1b26 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 21 Jan 2013 17:48:19 +0000
Subject: [PATCH 0011/1246] Exports sql tools (operators, etc..) in db (like in
 orm)

This avoids having to have access to orm object to do a more specific
query operation. This way only the connection object is needed.
---
 lib/ORM.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/ORM.js b/lib/ORM.js
index e67ebcb4..0cd75622 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -75,6 +75,7 @@ function ORM(driver) {
 	this.models = {};
 	this.driver = driver;
 	this.validators = Validators;
+	this.tools = SqlTools;
 
 	events.EventEmitter.call(this);
 }

From 8fddf2c587534940ce79ffa5ba52bf5eecf31eec Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 21 Jan 2013 17:58:43 +0000
Subject: [PATCH 0012/1246] Pipes drivers error event to db object

I'm not sure sqlite3 emits errors but both mysql and postgres do
(connection resets for example).
---
 lib/Drivers/mysql.js    | 7 +++++++
 lib/Drivers/postgres.js | 7 +++++++
 lib/Drivers/sqlite.js   | 7 +++++++
 lib/ORM.js              | 4 ++++
 4 files changed, 25 insertions(+)

diff --git a/lib/Drivers/mysql.js b/lib/Drivers/mysql.js
index 132c9274..e3543a55 100644
--- a/lib/Drivers/mysql.js
+++ b/lib/Drivers/mysql.js
@@ -23,6 +23,13 @@ function Driver(config, connection, opts) {
 	this.QueryRemove = new (require("../sql/Remove"))(escapes);
 }
 
+Driver.prototype.on = function (ev, cb) {
+	if (ev == "error") {
+		this.db.on("error", cb);
+	}
+	return this;
+};
+
 Driver.prototype.connect = function (cb) {
 	this.db.connect(cb);
 };
diff --git a/lib/Drivers/postgres.js b/lib/Drivers/postgres.js
index 0abe6b4b..c9fabda2 100644
--- a/lib/Drivers/postgres.js
+++ b/lib/Drivers/postgres.js
@@ -18,6 +18,13 @@ function Driver(config, connection, opts) {
 	this.QueryRemove = new (require("../sql/Remove"))(escapes);
 }
 
+Driver.prototype.on = function (ev, cb) {
+	if (ev == "error") {
+		this.db.on("error", cb);
+	}
+	return this;
+};
+
 Driver.prototype.connect = function (cb) {
 	this.db.connect(cb);
 };
diff --git a/lib/Drivers/sqlite.js b/lib/Drivers/sqlite.js
index 197fd730..575379bb 100644
--- a/lib/Drivers/sqlite.js
+++ b/lib/Drivers/sqlite.js
@@ -18,6 +18,13 @@ function Driver(config, connection, opts) {
 	this.QueryRemove = new (require("../sql/Remove"))(escapes);
 }
 
+Driver.prototype.on = function (ev, cb) {
+	if (ev == "error") {
+		this.db.on("error", cb);
+	}
+	return this;
+};
+
 Driver.prototype.connect = function (cb) {
 	process.nextTick(cb);
 };
diff --git a/lib/ORM.js b/lib/ORM.js
index 0cd75622..c8120676 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -78,6 +78,10 @@ function ORM(driver) {
 	this.tools = SqlTools;
 
 	events.EventEmitter.call(this);
+
+	driver.on("error", function (err) {
+		this.emit("error", err);
+	}.bind(this));
 }
 
 util.inherits(ORM, events.EventEmitter);

From 181ef18745e6406b00041194a3fa6b3d579ac75e Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 21 Jan 2013 18:22:31 +0000
Subject: [PATCH 0013/1246] Passes uid column name from model definition down
 until instance

---
 lib/Model.js | 4 ++++
 lib/ORM.js   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/lib/Model.js b/lib/Model.js
index 07fa815c..8f0297e3 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -20,6 +20,7 @@ function Model(opts) {
 			data2[opts.id] = data;
 
 			var instance = new Instance({
+				id                     : opts.id,
 				data                   : data2,
 				autoSave               : false,
 				driver                 : opts.driver,
@@ -42,6 +43,7 @@ function Model(opts) {
 			return instance;
 		}
 		return new Instance({
+			id                     : opts.id,
 			is_new                 : !data.hasOwnProperty(opts.id),
 			data                   : data,
 			autoSave               : opts.autoSave,
@@ -82,6 +84,7 @@ function Model(opts) {
 			}
 			Singleton.get(opts.table + "/" + id, { cache: options.cache }, function (cb) {
 				var instance = new Instance({
+					id                     : opts.id,
 					data                   : data[0],
 					autoSave               : opts.autoSave,
 					driver                 : opts.driver,
@@ -168,6 +171,7 @@ function Model(opts) {
 				              { cache: options.cache },
 				function (cb) {
 					var instance = new Instance({
+						id                     : opts.id,
 						data                   : data,
 						extra                  : options.extra,
 						extra_info             : options.extra_info,
diff --git a/lib/ORM.js b/lib/ORM.js
index c8120676..947c44bb 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -99,6 +99,7 @@ ORM.prototype.define = function (name, properties, opts) {
 		table          : name,
 		properties     : properties,
 		cache          : opts.cache,
+		id             : opts.id || "id",
 		autoSave       : opts.autoSave || false,
 		autoFetch      : opts.autoFetch || false,
 		autoFetchLimit : opts.autoFetchLimit,

From 691470accace4e59079960410e20140ee556de4b Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 22 Jan 2013 14:03:48 +0000
Subject: [PATCH 0014/1246] Updates sqlite driver to accept paths with drive
 letter (win32) (related to #20)

---
 lib/Drivers/sqlite.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/Drivers/sqlite.js b/lib/Drivers/sqlite.js
index 575379bb..5b749823 100644
--- a/lib/Drivers/sqlite.js
+++ b/lib/Drivers/sqlite.js
@@ -5,7 +5,14 @@ exports.Driver = Driver;
 function Driver(config, connection, opts) {
 	this.config = config || {};
 	this.opts   = opts || {};
-	this.db = (connection ? connection : new sqlite3.Database(config.pathname || ':memory:'));
+	if (connection) {
+		this.db = connection;
+	} else {
+		// on Windows, paths have a drive letter which is parsed by
+		// url.parse() has the hostname. If host is defined, assume
+		// it's the drive letter and add ":"
+		this.db = new sqlite3.Database(((config.host ? config.host + ":" : "") + config.pathname) || ':memory:');
+	}
 
 	var escapes = {
 		escape   : escape,

From 0f00a0f36e274da52887ebe962cdfbc1a1014297 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 22 Jan 2013 15:56:18 +0000
Subject: [PATCH 0015/1246] Allow the table name to be set/overridden (#22) -
 Paul Dixon

---
 lib/ORM.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index 947c44bb..e8a29dcf 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -96,7 +96,7 @@ ORM.prototype.define = function (name, properties, opts) {
 
 	this.models[name] = new Model({
 		driver         : this.driver,
-		table          : name,
+		table          : opts.table || opts.collection || name,
 		properties     : properties,
 		cache          : opts.cache,
 		id             : opts.id || "id",

From 9f2edad5d3825f91d1dbddd55e191b5d5607b405 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 22 Jan 2013 16:07:33 +0000
Subject: [PATCH 0016/1246] Moves all drivers to a subfolder called DML

DML - Data Manipulation Language

This commit gives space for drivers to create a separate file for DDL
(Data Definition Language) to be able to sync models.
---
 lib/Drivers/{ => DML}/mysql.js    | 8 ++++----
 lib/Drivers/{ => DML}/postgres.js | 8 ++++----
 lib/Drivers/{ => DML}/sqlite.js   | 8 ++++----
 lib/ORM.js                        | 4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)
 rename lib/Drivers/{ => DML}/mysql.js (93%)
 rename lib/Drivers/{ => DML}/postgres.js (93%)
 rename lib/Drivers/{ => DML}/sqlite.js (93%)

diff --git a/lib/Drivers/mysql.js b/lib/Drivers/DML/mysql.js
similarity index 93%
rename from lib/Drivers/mysql.js
rename to lib/Drivers/DML/mysql.js
index e3543a55..b0860de1 100644
--- a/lib/Drivers/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -17,10 +17,10 @@ function Driver(config, connection, opts) {
 		escapeId : escapeId
 	};
 
-	this.QuerySelect = new (require("../sql/Select"))(escapes);
-	this.QueryInsert = new (require("../sql/Insert"))(escapes);
-	this.QueryUpdate = new (require("../sql/Update"))(escapes);
-	this.QueryRemove = new (require("../sql/Remove"))(escapes);
+	this.QuerySelect = new (require("../../sql/Select"))(escapes);
+	this.QueryInsert = new (require("../../sql/Insert"))(escapes);
+	this.QueryUpdate = new (require("../../sql/Update"))(escapes);
+	this.QueryRemove = new (require("../../sql/Remove"))(escapes);
 }
 
 Driver.prototype.on = function (ev, cb) {
diff --git a/lib/Drivers/postgres.js b/lib/Drivers/DML/postgres.js
similarity index 93%
rename from lib/Drivers/postgres.js
rename to lib/Drivers/DML/postgres.js
index c9fabda2..1f135ed7 100644
--- a/lib/Drivers/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -12,10 +12,10 @@ function Driver(config, connection, opts) {
 		escapeId : escapeId
 	};
 
-	this.QuerySelect = new (require("../sql/Select"))(escapes);
-	this.QueryInsert = new (require("../sql/Insert"))(escapes);
-	this.QueryUpdate = new (require("../sql/Update"))(escapes);
-	this.QueryRemove = new (require("../sql/Remove"))(escapes);
+	this.QuerySelect = new (require("../../sql/Select"))(escapes);
+	this.QueryInsert = new (require("../../sql/Insert"))(escapes);
+	this.QueryUpdate = new (require("../../sql/Update"))(escapes);
+	this.QueryRemove = new (require("../../sql/Remove"))(escapes);
 }
 
 Driver.prototype.on = function (ev, cb) {
diff --git a/lib/Drivers/sqlite.js b/lib/Drivers/DML/sqlite.js
similarity index 93%
rename from lib/Drivers/sqlite.js
rename to lib/Drivers/DML/sqlite.js
index 5b749823..e67f328a 100644
--- a/lib/Drivers/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -19,10 +19,10 @@ function Driver(config, connection, opts) {
 		escapeId : escapeId
 	};
 
-	this.QuerySelect = new (require("../sql/Select"))(escapes);
-	this.QueryInsert = new (require("../sql/Insert"))(escapes);
-	this.QueryUpdate = new (require("../sql/Update"))(escapes);
-	this.QueryRemove = new (require("../sql/Remove"))(escapes);
+	this.QuerySelect = new (require("../../sql/Select"))(escapes);
+	this.QueryInsert = new (require("../../sql/Insert"))(escapes);
+	this.QueryUpdate = new (require("../../sql/Update"))(escapes);
+	this.QueryRemove = new (require("../../sql/Remove"))(escapes);
 }
 
 Driver.prototype.on = function (ev, cb) {
diff --git a/lib/ORM.js b/lib/ORM.js
index e8a29dcf..a305452c 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -23,7 +23,7 @@ exports.use = function (connection, proto, opts, cb) {
 	}
 
 	try {
-		var Driver = require("./Drivers/" + proto).Driver;
+		var Driver = require("./Drivers/DML/" + proto).Driver;
 		var driver = new Driver(null, connection, {
 			debug: (opts.query && opts.query.debug == 'true')
 		});
@@ -54,7 +54,7 @@ exports.connect = function (opts, cb) {
 	}
 
 	try {
-		var Driver = require("./Drivers/" + proto).Driver;
+		var Driver = require("./Drivers/DML/" + proto).Driver;
 		var driver = new Driver(opts, null, {
 			debug: (opts.query && opts.query.debug == 'true')
 		});

From a96fe3935469a97df2f6a178f66b2e5b159f3aee Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 22 Jan 2013 17:29:19 +0000
Subject: [PATCH 0017/1246] Adds Model.sync()

Driver must implement .sync() or Model.sync() will return an error on
callback.
---
 lib/Model.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/lib/Model.js b/lib/Model.js
index 8f0297e3..49fbd614 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -60,6 +60,22 @@ function Model(opts) {
 	OneAssociation.prepare(model, one_associations, association_properties);
 	ManyAssociation.prepare(model, many_associations);
 
+	model.sync = function (cb) {
+		if (typeof opts.driver.sync == "function") {
+			opts.driver.sync({
+				id                : opts.id,
+				table             : opts.table,
+				properties        : opts.properties,
+				one_associations  : one_associations,
+				many_associations : many_associations
+			}, cb);
+
+			return this;
+		}
+
+		return cb(new Error("Driver does not support Model.sync()"));
+	};
+
 	model.get = function (id, options, cb) {
 		var conditions = {};
 		conditions[opts.id] = id;

From 551cfa6cbcd9851bcc8c0d585732441e6b511eaf Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 22 Jan 2013 17:30:28 +0000
Subject: [PATCH 0018/1246] Adds initial mysql driver sync

Fields are still very static, I need to create options for almost every
property to allow for tweaks (like VARCHAR size, FLOAT/INT size, DATE
instead of DATETIME, ...)
---
 lib/Drivers/DDL/mysql.js | 64 ++++++++++++++++++++++++++++++++++++++++
 lib/Drivers/DML/mysql.js | 12 +++++---
 2 files changed, 72 insertions(+), 4 deletions(-)
 create mode 100644 lib/Drivers/DDL/mysql.js

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
new file mode 100644
index 00000000..d8471743
--- /dev/null
+++ b/lib/Drivers/DDL/mysql.js
@@ -0,0 +1,64 @@
+exports.sync = function (driver, opts, cb) {
+	var tables = [];
+	var definitions = [];
+	var k, i, pending;
+
+	definitions.push(driver.escapeId(opts.id) + " INT(11) UNSIGNED NOT NULL AUTO_INCREMENT");
+
+	for (k in opts.properties) {
+		switch (opts.properties[k].type) {
+			case "text":
+				definitions.push(driver.escapeId(k) + " VARCHAR(255)");
+				break;
+			case "number":
+				definitions.push(driver.escapeId(k) + " FLOAT");
+				break;
+			case "boolean":
+				definitions.push(driver.escapeId(k) + " TINYINT(1) UNSIGNED NOT NULL");
+				break;
+			case "date":
+				definitions.push(driver.escapeId(k) + " DATETIME");
+				break;
+			case "binary":
+				definitions.push(driver.escapeId(k) + " BLOB");
+				break;
+			default:
+				throw new Error("Unknown property type: '" + opts.properties[k].type + "'");
+		}
+	}
+
+	for (i = 0; i < opts.one_associations.length; i++) {
+		definitions.push(driver.escapeId(opts.one_associations[i].field) + " INT(11) UNSIGNED NOT NULL");
+	}
+
+	definitions.push("INDEX (" + driver.escapeId(opts.id) + ")");
+	for (i = 0; i < opts.one_associations.length; i++) {
+		definitions.push("INDEX (" + driver.escapeId(opts.one_associations[i].field) + ")");
+	}
+
+	tables.push({
+		name        : opts.table,
+		definitions : definitions
+	});
+
+	for (i = 0; i < opts.many_associations.length; i++) {
+		tables.push({
+			name        : opts.many_associations[i].mergeTable,
+			definitions : [
+				driver.escapeId(opts.many_associations[i].mergeId) + " INT(11) UNSIGNED NOT NULL",
+				driver.escapeId(opts.many_associations[i].mergeAssocId) + " INT(11) UNSIGNED NOT NULL",
+				"INDEX (" + driver.escapeId(opts.many_associations[i].mergeId) + ", " + driver.escapeId(opts.many_associations[i].mergeAssocId) + ")"
+			]
+		});
+	}
+
+	pending = tables.length;
+	for (i = 0; i < tables.length; i++) {
+		driver.db.query("CREATE TABLE IF NOT EXISTS " + driver.escapeId(tables[i].name)) +
+		                " (" + tables[i].definitions.join(", ") + ")", function (err) {
+			if (--pending === 0) {
+				return cb(err);
+			}
+		});
+	}
+};
diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index b0860de1..4271fc39 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -14,7 +14,7 @@ function Driver(config, connection, opts) {
 
 	var escapes = {
 		escape   : this.db.escape.bind(this.db),
-		escapeId : escapeId
+		escapeId : this.escapeId.bind(this)
 	};
 
 	this.QuerySelect = new (require("../../sql/Select"))(escapes);
@@ -23,6 +23,10 @@ function Driver(config, connection, opts) {
 	this.QueryRemove = new (require("../../sql/Remove"))(escapes);
 }
 
+Driver.prototype.sync = function (opts, cb) {
+	return require("../DDL/mysql").sync(this, opts, cb);
+};
+
 Driver.prototype.on = function (ev, cb) {
 	if (ev == "error") {
 		this.db.on("error", cb);
@@ -124,7 +128,7 @@ Driver.prototype.remove = function (table, conditions, cb) {
 };
 
 Driver.prototype.clear = function (table, cb) {
-	var query = "TRUNCATE TABLE " + escapeId(table);
+	var query = "TRUNCATE TABLE " + this.escapeId(table);
 	if (this.opts.debug) {
 		require("../Debug").sql('mysql', query);
 	}
@@ -158,10 +162,10 @@ Driver.prototype.propertyToValue = function (value, property) {
 	}
 };
 
-function escapeId(id) {
+Driver.prototype.escapeId = function (id) {
 	var m = id.match(/^(.+)\.\*$/);
 	if (m) {
 		return '`' + m[1].replace(/\`/g, '``') + '`.*';
 	}
 	return '`' + id.replace(/\`/g, '``').replace(/\./g, '`.`') + '`';
-}
+};

From 3342795f8b2259c080fe54b5c15c4467154ec9b6 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 22 Jan 2013 17:35:32 +0000
Subject: [PATCH 0019/1246] Fixes bug from previous commit having an extra
 parenthesis

---
 lib/Drivers/DDL/mysql.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index d8471743..0c7b263c 100644
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -54,7 +54,7 @@ exports.sync = function (driver, opts, cb) {
 
 	pending = tables.length;
 	for (i = 0; i < tables.length; i++) {
-		driver.db.query("CREATE TABLE IF NOT EXISTS " + driver.escapeId(tables[i].name)) +
+		driver.db.query("CREATE TABLE IF NOT EXISTS " + driver.escapeId(tables[i].name) +
 		                " (" + tables[i].definitions.join(", ") + ")", function (err) {
 			if (--pending === 0) {
 				return cb(err);

From 8f2b98759e98c4fe7e74ac6c8a2f1faf5c01ff63 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 22 Jan 2013 17:37:41 +0000
Subject: [PATCH 0020/1246] Adds test for Model.sync()

Currently there's only mysql.sync
---
 test/integration/test-sync.js | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 test/integration/test-sync.js

diff --git a/test/integration/test-sync.js b/test/integration/test-sync.js
new file mode 100644
index 00000000..2a553235
--- /dev/null
+++ b/test/integration/test-sync.js
@@ -0,0 +1,31 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	var TestModel = db.define('test_sync', common.getModelProperties());
+
+	TestModel.sync(function (err) {
+		if (err !== null) {
+			// not supported by all drivers
+			return db.close();
+		}
+
+		TestModel.clear(function (err) {
+			assert.equal(err, null);
+
+			var Test1 = new TestModel({
+				name: "test1"
+			});
+			Test1.save(function (err) {
+				assert.equal(err, null);
+
+				TestModel.find({ name: "test1" }, function (err, tests) {
+					assert.equal(err, null);
+					assert.equal(tests.length, 1);
+
+					db.close();
+				});
+			});
+		});
+	});
+});

From 49f48535178fcf4239210ab90a60f1971ac6e7aa Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 22 Jan 2013 17:41:02 +0000
Subject: [PATCH 0021/1246] Moves escapeId from postgres driver to Driver
 object

I'll need it later on
---
 lib/Drivers/DML/postgres.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 1f135ed7..ffd78380 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -9,7 +9,7 @@ function Driver(config, connection, opts) {
 
 	var escapes = {
 		escape   : escape,
-		escapeId : escapeId
+		escapeId : this.escapeId.bind(this)
 	};
 
 	this.QuerySelect = new (require("../../sql/Select"))(escapes);
@@ -114,7 +114,7 @@ Driver.prototype.remove = function (table, conditions, cb) {
 };
 
 Driver.prototype.clear = function (table, cb) {
-	var query = "TRUNCATE TABLE " + escapeId(table);
+	var query = "TRUNCATE TABLE " + this.escapeId(table);
 
 	if (this.opts.debug) {
 		require("../Debug").sql('postgres', query);
@@ -145,6 +145,14 @@ Driver.prototype.propertyToValue = function (value, property) {
 	}
 };
 
+Driver.prototype.escapeId = function (id) {
+	var m = id.match(/^(.+)\.\*$/);
+	if (m) {
+		return '"' + m[1].replace(/\"/g, '""') + '".*';
+	}
+	return '"' + id.replace(/\"/g, '""').replace(/\./g, '"."') + '"';
+};
+
 function handleQuery(cb) {
 	return function (err, result) {
 		if (err) {
@@ -165,11 +173,3 @@ function escape(value) {
 
 	return "'" + value.replace(/\'/g, "''") + "'";
 }
-
-function escapeId(id) {
-	var m = id.match(/^(.+)\.\*$/);
-	if (m) {
-		return '"' + m[1].replace(/\"/g, '""') + '".*';
-	}
-	return '"' + id.replace(/\"/g, '""').replace(/\./g, '"."') + '"';
-}

From 28490c46d94597f35692ce97e493a067040903f0 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 22 Jan 2013 17:58:46 +0000
Subject: [PATCH 0022/1246] Changes mysql sync to create direct queries instead
 of storing as tables list

---
 lib/Drivers/DDL/mysql.js | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index 0c7b263c..6b3edfa9 100644
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -1,5 +1,5 @@
 exports.sync = function (driver, opts, cb) {
-	var tables = [];
+	var queries = [];
 	var definitions = [];
 	var k, i, pending;
 
@@ -36,26 +36,25 @@ exports.sync = function (driver, opts, cb) {
 		definitions.push("INDEX (" + driver.escapeId(opts.one_associations[i].field) + ")");
 	}
 
-	tables.push({
-		name        : opts.table,
-		definitions : definitions
-	});
+	queries.push(
+		"CREATE TABLE IF NOT EXISTS " + driver.escapeId(opts.table) +
+		" (" + definitions.join(", ") + ")"
+	);
 
 	for (i = 0; i < opts.many_associations.length; i++) {
-		tables.push({
-			name        : opts.many_associations[i].mergeTable,
-			definitions : [
-				driver.escapeId(opts.many_associations[i].mergeId) + " INT(11) UNSIGNED NOT NULL",
-				driver.escapeId(opts.many_associations[i].mergeAssocId) + " INT(11) UNSIGNED NOT NULL",
-				"INDEX (" + driver.escapeId(opts.many_associations[i].mergeId) + ", " + driver.escapeId(opts.many_associations[i].mergeAssocId) + ")"
-			]
-		});
+		queries.push(
+			"CREATE TABLE IF NOT EXISTS " + driver.escapeId(opts.many_associations[i].mergeTable) +
+			" (" +
+			driver.escapeId(opts.many_associations[i].mergeId) + " INT(11) UNSIGNED NOT NULL, " +
+			driver.escapeId(opts.many_associations[i].mergeAssocId) + " INT(11) UNSIGNED NOT NULL, " +
+			"INDEX (" + driver.escapeId(opts.many_associations[i].mergeId) + ", " + driver.escapeId(opts.many_associations[i].mergeAssocId) + ")" +
+			")"
+		);
 	}
 
-	pending = tables.length;
-	for (i = 0; i < tables.length; i++) {
-		driver.db.query("CREATE TABLE IF NOT EXISTS " + driver.escapeId(tables[i].name) +
-		                " (" + tables[i].definitions.join(", ") + ")", function (err) {
+	pending = queries.length;
+	for (i = 0; i < queries.length; i++) {
+		driver.db.query(queries[i], function (err) {
 			if (--pending === 0) {
 				return cb(err);
 			}

From b863586407aefc98d2a1b609dc6b5bb50a5540b2 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 22 Jan 2013 18:01:18 +0000
Subject: [PATCH 0023/1246] Adds initial postgres Driver.sync()

---
 lib/Drivers/DDL/postgres.js | 75 +++++++++++++++++++++++++++++++++++++
 lib/Drivers/DML/postgres.js |  4 ++
 2 files changed, 79 insertions(+)
 create mode 100644 lib/Drivers/DDL/postgres.js

diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
new file mode 100644
index 00000000..b47c3f53
--- /dev/null
+++ b/lib/Drivers/DDL/postgres.js
@@ -0,0 +1,75 @@
+exports.sync = function (driver, opts, cb) {
+	var queries = [];
+	var definitions = [];
+	var k, i, pending;
+
+	definitions.push(driver.escapeId(opts.id) + " SERIAL");
+
+	for (k in opts.properties) {
+		switch (opts.properties[k].type) {
+			case "text":
+				definitions.push(driver.escapeId(k) + " VARCHAR(255)");
+				break;
+			case "number":
+				definitions.push(driver.escapeId(k) + " REAL");
+				break;
+			case "boolean":
+				definitions.push(driver.escapeId(k) + " BOOLEAN NOT NULL");
+				break;
+			case "date":
+				definitions.push(driver.escapeId(k) + " TIMESTAMP WITHOUT TIME ZONE"); // hmm... I'm not sure..
+				break;
+			case "binary":
+				definitions.push(driver.escapeId(k) + " BYTEA");
+				break;
+			default:
+				throw new Error("Unknown property type: '" + opts.properties[k].type + "'");
+		}
+	}
+
+	for (i = 0; i < opts.one_associations.length; i++) {
+		definitions.push(driver.escapeId(opts.one_associations[i].field) + " INTEGER UNSIGNED NOT NULL");
+	}
+
+	queries.push(
+		"CREATE TABLE IF NOT EXISTS " + driver.escapeId(opts.table) +
+		" (" + definitions.join(", ") + ")"
+	);
+	queries.push(
+		"CREATE INDEX ON " + driver.escapeId(opts.table) +
+		" (" + driver.escapeId(opts.id) + ")"
+	);
+
+	for (i = 0; i < opts.one_associations.length; i++) {
+		queries.push(
+			"CREATE INDEX ON " + driver.escapeId(opts.table) +
+			" (" + driver.escapeId(opts.one_associations[i].field) + ")"
+		);
+	}
+
+	for (i = 0; i < opts.many_associations.length; i++) {
+		queries.push(
+			"CREATE TABLE IF NOT EXISTS " + driver.escapeId(opts.many_associations[i].mergeTable) +
+			" (" +
+			driver.escapeId(opts.many_associations[i].mergeId) + " INTEGER UNSIGNED NOT NULL, " +
+			driver.escapeId(opts.many_associations[i].mergeAssocId) + " INTEGER UNSIGNED NOT NULL" +
+			")"
+		);
+		queries.push(
+			"CREATE INDEX ON " + driver.escapeId(opts.many_associations[i].mergeTable) +
+			" (" +
+			driver.escapeId(opts.many_associations[i].mergeId) + ", " +
+			driver.escapeId(opts.many_associations[i].mergeAssocId) +
+			")"
+		);
+	}
+
+	pending = queries.length;
+	for (i = 0; i < queries.length; i++) {
+		driver.db.query(queries[i], function (err) {
+			if (--pending === 0) {
+				return cb(err);
+			}
+		});
+	}
+};
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index ffd78380..64f0c693 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -18,6 +18,10 @@ function Driver(config, connection, opts) {
 	this.QueryRemove = new (require("../../sql/Remove"))(escapes);
 }
 
+Driver.prototype.sync = function (opts, cb) {
+	return require("../DDL/postgres").sync(this, opts, cb);
+};
+
 Driver.prototype.on = function (ev, cb) {
 	if (ev == "error") {
 		this.db.on("error", cb);

From cde0646fda519c5a30f40b16ab76ef69694b0555 Mon Sep 17 00:00:00 2001
From: Paul Dixon <paul.dixon@mintbridge.co.uk>
Date: Tue, 22 Jan 2013 18:40:07 +0000
Subject: [PATCH 0024/1246] Adding a instance loaded hook

Adding a hook that is trigger once the model instance has been loaded, allows extra "calculated" attributes to be set
---
 lib/Instance.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Instance.js b/lib/Instance.js
index a64b14b3..9e2d3b93 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -299,5 +299,7 @@ function Instance(opts) {
 		opts.changes = Object.keys(opts.data);
 	}
 
+	Hook.trigger(instance, opts.hooks.loaded);
+	
 	return instance;
 }

From b391b45ac46d878681a1086399af6155a8d79982 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 22 Jan 2013 18:41:41 +0000
Subject: [PATCH 0025/1246] Adds enum type support for mysql.sync()

---
 lib/Drivers/DDL/mysql.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index 6b3edfa9..444f6f6e 100644
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -22,6 +22,10 @@ exports.sync = function (driver, opts, cb) {
 			case "binary":
 				definitions.push(driver.escapeId(k) + " BLOB");
 				break;
+			case "enum":
+				definitions.push(driver.escapeId(k) + " ENUM (" +
+				                 opts.properties[k].values.map(driver.db.escape.bind(driver.db)) + ")");
+				break;
 			default:
 				throw new Error("Unknown property type: '" + opts.properties[k].type + "'");
 		}

From edd4d9fbfdfe7d80de2dc4b19b469ba54ea43a5d Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 22 Jan 2013 18:42:03 +0000
Subject: [PATCH 0026/1246] Moves postgres escape function to Driver object

---
 lib/Drivers/DML/postgres.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 64f0c693..f7540258 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -8,7 +8,7 @@ function Driver(config, connection, opts) {
 	this.db = (connection ? connection : new postgres.Client(config.href || config));
 
 	var escapes = {
-		escape   : escape,
+		escape   : this.escape.bind(this),
 		escapeId : this.escapeId.bind(this)
 	};
 
@@ -157,18 +157,9 @@ Driver.prototype.escapeId = function (id) {
 	return '"' + id.replace(/\"/g, '""').replace(/\./g, '"."') + '"';
 };
 
-function handleQuery(cb) {
-	return function (err, result) {
-		if (err) {
-			return cb(err);
-		}
-		return cb(null, result.rows);
-	};
-}
-
-function escape(value) {
+Driver.prototype.escape = function (value) {
 	if (Array.isArray(value)) {
-		return "(" + value.map(escape) + ")";
+		return "(" + value.map(this.escape.bind(this)) + ")";
 	}
 	switch (typeof value) {
 		case "number":
@@ -176,4 +167,13 @@ function escape(value) {
 	}
 
 	return "'" + value.replace(/\'/g, "''") + "'";
+};
+
+function handleQuery(cb) {
+	return function (err, result) {
+		if (err) {
+			return cb(err);
+		}
+		return cb(null, result.rows);
+	};
 }

From 3276ab6689bab4be63bf98488008541f976195ad Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 22 Jan 2013 18:42:21 +0000
Subject: [PATCH 0027/1246] Adds enum type to postgres.sync()

---
 lib/Drivers/DDL/postgres.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index b47c3f53..e9fd0e59 100644
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -1,7 +1,7 @@
 exports.sync = function (driver, opts, cb) {
 	var queries = [];
 	var definitions = [];
-	var k, i, pending;
+	var k, i, pending, tmp;
 
 	definitions.push(driver.escapeId(opts.id) + " SERIAL");
 
@@ -22,13 +22,21 @@ exports.sync = function (driver, opts, cb) {
 			case "binary":
 				definitions.push(driver.escapeId(k) + " BYTEA");
 				break;
+			case "enum":
+				tmp = driver.escapeId("enum_" + opts.table + "_" + k);
+				queries.push(
+					"CREATE TYPE " + tmp + " AS ENUM (" +
+					opts.properties[k].values.map(driver.escape.bind(driver.db)) + ")"
+				);
+				definitions.push(driver.escapeId(k) + " " + tmp);
+				break;
 			default:
 				throw new Error("Unknown property type: '" + opts.properties[k].type + "'");
 		}
 	}
 
 	for (i = 0; i < opts.one_associations.length; i++) {
-		definitions.push(driver.escapeId(opts.one_associations[i].field) + " INTEGER UNSIGNED NOT NULL");
+		definitions.push(driver.escapeId(opts.one_associations[i].field) + " INTEGER NOT NULL");
 	}
 
 	queries.push(
@@ -51,8 +59,8 @@ exports.sync = function (driver, opts, cb) {
 		queries.push(
 			"CREATE TABLE IF NOT EXISTS " + driver.escapeId(opts.many_associations[i].mergeTable) +
 			" (" +
-			driver.escapeId(opts.many_associations[i].mergeId) + " INTEGER UNSIGNED NOT NULL, " +
-			driver.escapeId(opts.many_associations[i].mergeAssocId) + " INTEGER UNSIGNED NOT NULL" +
+			driver.escapeId(opts.many_associations[i].mergeId) + " INTEGER NOT NULL, " +
+			driver.escapeId(opts.many_associations[i].mergeAssocId) + " INTEGER NOT NULL" +
 			")"
 		);
 		queries.push(
@@ -68,6 +76,8 @@ exports.sync = function (driver, opts, cb) {
 	for (i = 0; i < queries.length; i++) {
 		driver.db.query(queries[i], function (err) {
 			if (--pending === 0) {
+				// this will bring trouble in the future...
+				// some errors are not avoided (like ENUM types already defined, etc..)
 				return cb(err);
 			}
 		});

From dbed316b368612359fc00be676989d886016448d Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 22 Jan 2013 19:13:44 +0000
Subject: [PATCH 0028/1246] Changes "loaded" hook name to "afterLoad" (to be
 similar to others)

---
 lib/Instance.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 9e2d3b93..7b1902d3 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -299,7 +299,7 @@ function Instance(opts) {
 		opts.changes = Object.keys(opts.data);
 	}
 
-	Hook.trigger(instance, opts.hooks.loaded);
-	
+	Hook.trigger(instance, opts.hooks.afterLoad);
+
 	return instance;
 }

From 14817048d028cd636568933c1a78b291ff2727ab Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 22 Jan 2013 19:19:38 +0000
Subject: [PATCH 0029/1246] Adds test for afterLoad hook

---
 test/integration/test-hook-after-load.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 test/integration/test-hook-after-load.js

diff --git a/test/integration/test-hook-after-load.js b/test/integration/test-hook-after-load.js
new file mode 100644
index 00000000..3f317f9e
--- /dev/null
+++ b/test/integration/test-hook-after-load.js
@@ -0,0 +1,19 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_hook_before_save', db.driver.db, function () {
+		var calledAfterLoad = false;
+		var TestModel = db.define('test_hook_before_save', common.getModelProperties(), {
+			hooks: {
+				afterLoad: function () {
+					calledAfterLoad = true;
+
+					db.close();
+				}
+			}
+		});
+
+		var Test = new TestModel({ name: "beforeSave" });
+	});
+});

From 6bcaa5fc00e497e5324c76acb9da1219cc92241a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 10:06:33 +0000
Subject: [PATCH 0030/1246] Adds Roadmap to Readme

So I don't forget about some good stuff to improve module
---
 Readme.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Readme.md b/Readme.md
index a85c7aac..8af8b167 100644
--- a/Readme.md
+++ b/Readme.md
@@ -16,6 +16,15 @@ Despite the alpha tag, this is the recommended version for new applications.
 - PostgreSQL
 - SQLite
 
+## Roadmap (Future updates)
+
+- Add SQLite Model.sync()
+- Add Model.drop()
+- Add Model.count(), Model.exists(id)
+- Add Instance.has*() for hasMany and hasOne associations
+- Add DB.import() to load definitions from files
+- Add ChainFind.remove() (and maybe some more interesting methods)
+
 ## Introduction
 
 This is a node.js object relational mapping module.

From 7e46f761f5b1a867ea5a00844637d89dd29ba985 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 10:08:26 +0000
Subject: [PATCH 0031/1246] Updates Roadmap

---
 Readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Readme.md b/Readme.md
index 8af8b167..dd0fb0d0 100644
--- a/Readme.md
+++ b/Readme.md
@@ -19,6 +19,7 @@ Despite the alpha tag, this is the recommended version for new applications.
 ## Roadmap (Future updates)
 
 - Add SQLite Model.sync()
+- Add options to Property to allow people to better define the type of coluns in the database
 - Add Model.drop()
 - Add Model.count(), Model.exists(id)
 - Add Instance.has*() for hasMany and hasOne associations

From 31f5b2fa2a4e23441d8eb3357a22034c383079f6 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 10:11:43 +0000
Subject: [PATCH 0032/1246] Modes sqlite.escapeId to Driver object, adds
 sqlite.sync()

---
 lib/Drivers/DDL/sqlite.js | 76 +++++++++++++++++++++++++++++++++++++++
 lib/Drivers/DML/sqlite.js | 24 +++++++------
 2 files changed, 90 insertions(+), 10 deletions(-)
 create mode 100644 lib/Drivers/DDL/sqlite.js

diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
new file mode 100644
index 00000000..babc8eef
--- /dev/null
+++ b/lib/Drivers/DDL/sqlite.js
@@ -0,0 +1,76 @@
+exports.sync = function (driver, opts, cb) {
+	var queries = [];
+	var definitions = [];
+	var k, i, pending;
+
+	definitions.push(driver.escapeId(opts.id) + " INTEGER PRIMARY KEY AUTOINCREMENT");
+
+	for (k in opts.properties) {
+		switch (opts.properties[k].type) {
+			case "text":
+				definitions.push(driver.escapeId(k) + " TEXT");
+				break;
+			case "number":
+				definitions.push(driver.escapeId(k) + " REAL");
+				break;
+			case "boolean":
+				definitions.push(driver.escapeId(k) + " INTEGER UNSIGNED NOT NULL");
+				break;
+			case "date":
+				definitions.push(driver.escapeId(k) + " DATETIME");
+				break;
+			case "binary":
+				definitions.push(driver.escapeId(k) + " BLOB");
+				break;
+			case "enum":
+				definitions.push(driver.escapeId(k) + " INTEGER");
+				break;
+			default:
+				throw new Error("Unknown property type: '" + opts.properties[k].type + "'");
+		}
+	}
+
+	for (i = 0; i < opts.one_associations.length; i++) {
+		definitions.push(driver.escapeId(opts.one_associations[i].field) + " INTEGER UNSIGNED NOT NULL");
+	}
+
+	queries.push(
+		"CREATE TABLE IF NOT EXISTS " + driver.escapeId(opts.table) +
+		" (" + definitions.join(", ") + ")"
+	);
+
+	for (i = 0; i < opts.one_associations.length; i++) {
+		queries.push(
+			"CREATE INDEX IF NOT EXISTS " + driver.escapeId(opts.table + "_" + opts.one_associations[i].field) +
+			" ON " + driver.escapeId(opts.table) +
+			" (" + driver.escapeId(opts.one_associations[i].field) + ")"
+		);
+	}
+
+	for (i = 0; i < opts.many_associations.length; i++) {
+		queries.push(
+			"CREATE TABLE IF NOT EXISTS " + driver.escapeId(opts.many_associations[i].mergeTable) +
+			" (" +
+			driver.escapeId(opts.many_associations[i].mergeId) + " INTEGER UNSIGNED NOT NULL, " +
+			driver.escapeId(opts.many_associations[i].mergeAssocId) + " INTEGER UNSIGNED NOT NULL" +
+			")"
+		);
+		queries.push(
+			"CREATE INDEX IF NOT EXISTS " + driver.escapeId(opts.many_associations[i].mergeTable) +
+			" ON " + driver.escapeId(opts.table) +
+			" (" + driver.escapeId(opts.many_associations[i].mergeId) + ", " + driver.escapeId(opts.many_associations[i].mergeAssocId) + ")"
+		);
+	}
+
+	console.log(queries);
+
+	pending = queries.length;
+	for (i = 0; i < queries.length; i++) {
+		driver.db.all(queries[i], function (err) {
+			console.log(err);
+			if (--pending === 0) {
+				return cb(err);
+			}
+		});
+	}
+};
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index e67f328a..019d9ea9 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -16,7 +16,7 @@ function Driver(config, connection, opts) {
 
 	var escapes = {
 		escape   : escape,
-		escapeId : escapeId
+		escapeId : this.escapeId.bind(this)
 	};
 
 	this.QuerySelect = new (require("../../sql/Select"))(escapes);
@@ -25,6 +25,10 @@ function Driver(config, connection, opts) {
 	this.QueryRemove = new (require("../../sql/Remove"))(escapes);
 }
 
+Driver.prototype.sync = function (opts, cb) {
+	return require("../DDL/sqlite").sync(this, opts, cb);
+};
+
 Driver.prototype.on = function (ev, cb) {
 	if (ev == "error") {
 		this.db.on("error", cb);
@@ -132,7 +136,7 @@ Driver.prototype.remove = function (table, conditions, cb) {
 };
 
 Driver.prototype.clear = function (table, cb) {
-	var query = "DELETE FROM " + escapeId(table);
+	var query = "DELETE FROM " + this.escapeId(table);
 
 	if (this.opts.debug) {
 		require("../Debug").sql('sqlite', query);
@@ -140,6 +144,14 @@ Driver.prototype.clear = function (table, cb) {
 	this.db.all(query, cb);
 };
 
+Driver.prototype.escapeId = function (id) {
+	var m = id.match(/^(.+)\.\*$/);
+	if (m) {
+		return '`' + m[1].replace(/\`/g, '``') + '`.*';
+	}
+	return '`' + id.replace(/\`/g, '``').replace(/\./g, '`.`') + '`';
+};
+
 function escape(value) {
 	if (Array.isArray(value)) {
 		return "(" + value.map(escape) + ")";
@@ -151,11 +163,3 @@ function escape(value) {
 
 	return "'" + value.replace(/\'/g, "''") + "'";
 }
-
-function escapeId(id) {
-	var m = id.match(/^(.+)\.\*$/);
-	if (m) {
-		return '`' + m[1].replace(/\`/g, '``') + '`.*';
-	}
-	return '`' + id.replace(/\`/g, '``').replace(/\./g, '`.`') + '`';
-}

From cd16f2d49d525b1e45c026e123048038fc8a591e Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 10:13:07 +0000
Subject: [PATCH 0033/1246] Updates Roadmap - 'Add SQLite Model.sync()' done

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index dd0fb0d0..a72f126f 100644
--- a/Readme.md
+++ b/Readme.md
@@ -18,7 +18,7 @@ Despite the alpha tag, this is the recommended version for new applications.
 
 ## Roadmap (Future updates)
 
-- Add SQLite Model.sync()
+- ~~Add SQLite Model.sync()~~
 - Add options to Property to allow people to better define the type of coluns in the database
 - Add Model.drop()
 - Add Model.count(), Model.exists(id)

From 289d7f0bd3957c2dcf29eecc422f4f33b658d066 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 10:23:52 +0000
Subject: [PATCH 0034/1246] Adds text property size option

Allows people to do:

```js
db.define('person', {
  name: { type: "text", size: 50 } // VARCHAR(50)
});
```
---
 lib/Drivers/DDL/mysql.js    | 2 +-
 lib/Drivers/DDL/postgres.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index 444f6f6e..a55be8dc 100644
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -8,7 +8,7 @@ exports.sync = function (driver, opts, cb) {
 	for (k in opts.properties) {
 		switch (opts.properties[k].type) {
 			case "text":
-				definitions.push(driver.escapeId(k) + " VARCHAR(255)");
+				definitions.push(driver.escapeId(k) + " VARCHAR(" + Math.min(Math.max(parseInt(opts.properties[k].size, 10) || 255, 1), 65535) + ")");
 				break;
 			case "number":
 				definitions.push(driver.escapeId(k) + " FLOAT");
diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index e9fd0e59..89da388e 100644
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -8,7 +8,7 @@ exports.sync = function (driver, opts, cb) {
 	for (k in opts.properties) {
 		switch (opts.properties[k].type) {
 			case "text":
-				definitions.push(driver.escapeId(k) + " VARCHAR(255)");
+				definitions.push(driver.escapeId(k) + " VARCHAR(" + Math.min(Math.max(parseInt(opts.properties[k].size, 10) || 255, 1), 10485760) + ")");
 				break;
 			case "number":
 				definitions.push(driver.escapeId(k) + " REAL");

From 9d769162de5ecb0d5d63961366dfa8803e32e0e0 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 10:29:26 +0000
Subject: [PATCH 0035/1246] Changes sqlite date type to text, it has no
 datetime type

Driver needs to use the builtin functions to convert from/to date
---
 lib/Drivers/DDL/sqlite.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index babc8eef..16584494 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -17,7 +17,7 @@ exports.sync = function (driver, opts, cb) {
 				definitions.push(driver.escapeId(k) + " INTEGER UNSIGNED NOT NULL");
 				break;
 			case "date":
-				definitions.push(driver.escapeId(k) + " DATETIME");
+				definitions.push(driver.escapeId(k) + " TEXT");
 				break;
 			case "binary":
 				definitions.push(driver.escapeId(k) + " BLOB");
@@ -62,8 +62,6 @@ exports.sync = function (driver, opts, cb) {
 		);
 	}
 
-	console.log(queries);
-
 	pending = queries.length;
 	for (i = 0; i < queries.length; i++) {
 		driver.db.all(queries[i], function (err) {

From 2892dddd0ee2a7e8c0a8eefe7320d71812785aeb Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 10:30:24 +0000
Subject: [PATCH 0036/1246] Adds mysql/postgres support for date-only types

Se `time: false` to date property to avoid storing times
---
 lib/Drivers/DDL/mysql.js    | 6 +++++-
 lib/Drivers/DDL/postgres.js | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index a55be8dc..2d605326 100644
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -17,7 +17,11 @@ exports.sync = function (driver, opts, cb) {
 				definitions.push(driver.escapeId(k) + " TINYINT(1) UNSIGNED NOT NULL");
 				break;
 			case "date":
-				definitions.push(driver.escapeId(k) + " DATETIME");
+				if (opts.properties[k].time === false) {
+					definitions.push(driver.escapeId(k) + " DATE");
+				} else {
+					definitions.push(driver.escapeId(k) + " DATETIME");
+				}
 				break;
 			case "binary":
 				definitions.push(driver.escapeId(k) + " BLOB");
diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index 89da388e..7d9144a5 100644
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -17,7 +17,11 @@ exports.sync = function (driver, opts, cb) {
 				definitions.push(driver.escapeId(k) + " BOOLEAN NOT NULL");
 				break;
 			case "date":
-				definitions.push(driver.escapeId(k) + " TIMESTAMP WITHOUT TIME ZONE"); // hmm... I'm not sure..
+				if (opts.properties[k].time === false) {
+					definitions.push(driver.escapeId(k) + " DATE");
+				} else {
+					definitions.push(driver.escapeId(k) + " TIMESTAMP WITHOUT TIME ZONE"); // hmm... I'm not sure..
+				}
 				break;
 			case "binary":
 				definitions.push(driver.escapeId(k) + " BYTEA");

From 206be8c2d0749d79693d7e3b7da84bbe21c77eda Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 10:32:20 +0000
Subject: [PATCH 0037/1246] Changes sqlite date type back to datetime

Is seems sqlite accepts datetime as an affinity to numeric
---
 lib/Drivers/DDL/sqlite.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index 16584494..18309766 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -17,7 +17,7 @@ exports.sync = function (driver, opts, cb) {
 				definitions.push(driver.escapeId(k) + " INTEGER UNSIGNED NOT NULL");
 				break;
 			case "date":
-				definitions.push(driver.escapeId(k) + " TEXT");
+				definitions.push(driver.escapeId(k) + " DATETIME");
 				break;
 			case "binary":
 				definitions.push(driver.escapeId(k) + " BLOB");

From 3eab7f1f5d5572525f95eb782a4db8eb8f128eef Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 10:36:27 +0000
Subject: [PATCH 0038/1246] Adds unsigned option to number property

---
 lib/Drivers/DDL/mysql.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index 2d605326..19339e1d 100644
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -12,9 +12,12 @@ exports.sync = function (driver, opts, cb) {
 				break;
 			case "number":
 				definitions.push(driver.escapeId(k) + " FLOAT");
+				if (opts.properties[k].unsigned === true) {
+					definitions[definitions.length - 1] += " UNSIGNED";
+				}
 				break;
 			case "boolean":
-				definitions.push(driver.escapeId(k) + " TINYINT(1) UNSIGNED NOT NULL");
+				definitions.push(driver.escapeId(k) + " BOOLEAN NOT NULL");
 				break;
 			case "date":
 				if (opts.properties[k].time === false) {

From 15daddc7daf884f65b9684fc74fd7077bd2824e8 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 10:38:38 +0000
Subject: [PATCH 0039/1246] Adds chainfind.skip() as an alias to
 chainfind.offset()

---
 lib/ChainFind.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 65a07b5f..f92eb36d 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -16,6 +16,9 @@ function ChainFind(opts) {
 			opts.limit = limit;
 			return this;
 		},
+		skip: function (offset) {
+			return this.offset(offset);
+		},
 		offset: function (offset) {
 			opts.offset = offset;
 			return this;

From a9478f83e4b53e24aa94ab71f84a87a174400357 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 10:40:07 +0000
Subject: [PATCH 0040/1246] Onelines decrementing+checking chainfind pending
 items counter

---
 lib/ChainFind.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index f92eb36d..4c5a393c 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -47,9 +47,7 @@ function ChainFind(opts) {
 						opts.newInstance(data[idx], function (err, instance) {
 							data[idx] = instance;
 
-							pending -= 1;
-
-							if (pending === 0) {
+							if (--pending === 0) {
 								return cb(null, data);
 							}
 						});

From b144ff25681e501a6346de86e28ab67a6d84a4c2 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 10:49:19 +0000
Subject: [PATCH 0041/1246] Adds initial Model.drop()

Depends on drivers to support it
---
 lib/Model.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/lib/Model.js b/lib/Model.js
index 49fbd614..d60edd46 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -60,6 +60,22 @@ function Model(opts) {
 	OneAssociation.prepare(model, one_associations, association_properties);
 	ManyAssociation.prepare(model, many_associations);
 
+	model.drop = function (cb) {
+		if (typeof opts.driver.drop == "function") {
+			opts.driver.drop({
+				id                : opts.id,
+				table             : opts.table,
+				properties        : opts.properties,
+				one_associations  : one_associations,
+				many_associations : many_associations
+			}, cb);
+
+			return this;
+		}
+
+		return cb(new Error("Driver does not support Model.drop()"));
+	};
+
 	model.sync = function (cb) {
 		if (typeof opts.driver.sync == "function") {
 			opts.driver.sync({

From 0c788c8bec6fa5ac4babf50d9e9e4b65a73b8f36 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 10:49:53 +0000
Subject: [PATCH 0042/1246] Adds driver.drop() to all 3 drivers

---
 Readme.md                   |  2 +-
 lib/Drivers/DDL/mysql.js    | 19 +++++++++++++++++++
 lib/Drivers/DDL/postgres.js | 19 +++++++++++++++++++
 lib/Drivers/DDL/sqlite.js   | 19 +++++++++++++++++++
 lib/Drivers/DML/mysql.js    |  4 ++++
 lib/Drivers/DML/postgres.js |  4 ++++
 lib/Drivers/DML/sqlite.js   |  4 ++++
 7 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index a72f126f..de5e713e 100644
--- a/Readme.md
+++ b/Readme.md
@@ -20,7 +20,7 @@ Despite the alpha tag, this is the recommended version for new applications.
 
 - ~~Add SQLite Model.sync()~~
 - Add options to Property to allow people to better define the type of coluns in the database
-- Add Model.drop()
+- ~~Add Model.drop()~~
 - Add Model.count(), Model.exists(id)
 - Add Instance.has*() for hasMany and hasOne associations
 - Add DB.import() to load definitions from files
diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index 19339e1d..641394be 100644
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -1,3 +1,22 @@
+exports.drop = function (driver, opts, cb) {
+	var queries = [], pending;
+
+	queries.push("DROP TABLE IF EXISTS " + driver.escapeId(opts.table));
+
+	for (i = 0; i < opts.many_associations.length; i++) {
+		queries.push("DROP TABLE IF EXISTS " + driver.escapeId(opts.many_associations[i].mergeTable));
+	}
+
+	pending = queries.length;
+	for (i = 0; i < queries.length; i++) {
+		driver.db.query(queries[i], function (err) {
+			if (--pending === 0) {
+				return cb(err);
+			}
+		});
+	}
+};
+
 exports.sync = function (driver, opts, cb) {
 	var queries = [];
 	var definitions = [];
diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index 7d9144a5..f0f6837f 100644
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -1,3 +1,22 @@
+exports.drop = function (driver, opts, cb) {
+	var queries = [], pending;
+
+	queries.push("DROP TABLE IF EXISTS " + driver.escapeId(opts.table));
+
+	for (i = 0; i < opts.many_associations.length; i++) {
+		queries.push("DROP TABLE IF EXISTS " + driver.escapeId(opts.many_associations[i].mergeTable));
+	}
+
+	pending = queries.length;
+	for (i = 0; i < queries.length; i++) {
+		driver.db.query(queries[i], function (err) {
+			if (--pending === 0) {
+				return cb(err);
+			}
+		});
+	}
+};
+
 exports.sync = function (driver, opts, cb) {
 	var queries = [];
 	var definitions = [];
diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index 18309766..ab384634 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -1,3 +1,22 @@
+exports.drop = function (driver, opts, cb) {
+	var queries = [], pending;
+
+	queries.push("DROP TABLE IF EXISTS " + driver.escapeId(opts.table));
+
+	for (i = 0; i < opts.many_associations.length; i++) {
+		queries.push("DROP TABLE IF EXISTS " + driver.escapeId(opts.many_associations[i].mergeTable));
+	}
+
+	pending = queries.length;
+	for (i = 0; i < queries.length; i++) {
+		driver.db.all(queries[i], function (err) {
+			if (--pending === 0) {
+				return cb(err);
+			}
+		});
+	}
+};
+
 exports.sync = function (driver, opts, cb) {
 	var queries = [];
 	var definitions = [];
diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 4271fc39..30fc3346 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -27,6 +27,10 @@ Driver.prototype.sync = function (opts, cb) {
 	return require("../DDL/mysql").sync(this, opts, cb);
 };
 
+Driver.prototype.drop = function (opts, cb) {
+	return require("../DDL/mysql").drop(this, opts, cb);
+};
+
 Driver.prototype.on = function (ev, cb) {
 	if (ev == "error") {
 		this.db.on("error", cb);
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index f7540258..7e75d314 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -22,6 +22,10 @@ Driver.prototype.sync = function (opts, cb) {
 	return require("../DDL/postgres").sync(this, opts, cb);
 };
 
+Driver.prototype.drop = function (opts, cb) {
+	return require("../DDL/postgres").drop(this, opts, cb);
+};
+
 Driver.prototype.on = function (ev, cb) {
 	if (ev == "error") {
 		this.db.on("error", cb);
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 019d9ea9..f534f140 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -29,6 +29,10 @@ Driver.prototype.sync = function (opts, cb) {
 	return require("../DDL/sqlite").sync(this, opts, cb);
 };
 
+Driver.prototype.drop = function (opts, cb) {
+	return require("../DDL/sqlite").drop(this, opts, cb);
+};
+
 Driver.prototype.on = function (ev, cb) {
 	if (ev == "error") {
 		this.db.on("error", cb);

From 1c8c10d888a257dde662e9b955da92f3f01ad590 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 10:50:23 +0000
Subject: [PATCH 0043/1246] Adds a simple model.drop() test

It actually does not test it, I have to find another way (like SHOW
TABLES)
---
 test/integration/test-drop.js | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 test/integration/test-drop.js

diff --git a/test/integration/test-drop.js b/test/integration/test-drop.js
new file mode 100644
index 00000000..30b14d31
--- /dev/null
+++ b/test/integration/test-drop.js
@@ -0,0 +1,22 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	var TestModel = db.define('test_drop', common.getModelProperties());
+
+	TestModel.sync(function (err) {
+		if (err !== null) {
+			// not supported by all drivers
+			return db.close();
+		}
+
+		TestModel.drop(function (err) {
+			if (err !== null) {
+				// not supported by all drivers
+				return db.close();
+			}
+
+			db.close();
+		});
+	});
+});

From 53a17a14e497c63a6fb0aad8d50c13b2e3083880 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 10:51:49 +0000
Subject: [PATCH 0044/1246] Bumps version to 2.0.0-alpha8

---
 Readme.md    | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Readme.md b/Readme.md
index de5e713e..54ada8fd 100644
--- a/Readme.md
+++ b/Readme.md
@@ -5,7 +5,7 @@
 ## Install
 
 ```sh
-npm install orm@2.0.0-alpha7
+npm install orm@2.0.0-alpha8
 ```
 
 Despite the alpha tag, this is the recommended version for new applications.
diff --git a/package.json b/package.json
index f7e0b083..91be510e 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "author": "Diogo Resende <dresende@thinkdigital.pt>",
   "name": "orm",
   "description": "NodeJS Object-relational mapping",
-  "version": "2.0.0-alpha7",
+  "version": "2.0.0-alpha8",
   "repository": {
     "url": "http://dresende.github.com/node-orm2"
   },

From 9cf204516f9c4d78dec6562d9e0cac40f83914af Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 12:00:25 +0000
Subject: [PATCH 0045/1246] Adds Model.count()

Method is available using chaining too, altought some options are
ignored (like offset, limit and order).
---
 Readme.md                                 |  2 +-
 lib/ChainFind.js                          |  9 +++++++
 lib/Drivers/DML/mysql.js                  | 25 ++++++++++++++----
 lib/Drivers/DML/postgres.js               | 25 ++++++++++++++----
 lib/Drivers/DML/sqlite.js                 | 25 ++++++++++++++----
 lib/Model.js                              | 32 +++++++++++++++++++++++
 lib/sql/Select.js                         | 10 ++++++-
 test/integration/test-count.js            | 24 +++++++++++++++++
 test/integration/test-find-chain-count.js | 23 ++++++++++++++++
 9 files changed, 158 insertions(+), 17 deletions(-)
 create mode 100644 test/integration/test-count.js
 create mode 100644 test/integration/test-find-chain-count.js

diff --git a/Readme.md b/Readme.md
index 54ada8fd..3e53680c 100644
--- a/Readme.md
+++ b/Readme.md
@@ -21,7 +21,7 @@ Despite the alpha tag, this is the recommended version for new applications.
 - ~~Add SQLite Model.sync()~~
 - Add options to Property to allow people to better define the type of coluns in the database
 - ~~Add Model.drop()~~
-- Add Model.count(), Model.exists(id)
+- ~~Add Model.count(),~~ Model.exists(id)
 - Add Instance.has*() for hasMany and hasOne associations
 - Add DB.import() to load definitions from files
 - Add ChainFind.remove() (and maybe some more interesting methods)
diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 4c5a393c..dd9f5d7b 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -27,6 +27,15 @@ function ChainFind(opts) {
 			opts.order = [ property, order ];
 			return this;
 		},
+		count: function (cb) {
+			opts.driver.count(opts.table, opts.conditions, {}, function (err, data) {
+				if (err || data.length === 0) {
+					return cb(err);
+				}
+				return cb(null, data[0].c);
+			});
+			return this;
+		},
 		run: function (cb) {
 			opts.driver.find(opts.only, opts.table, opts.conditions, {
 				limit  : opts.limit,
diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 30fc3346..bbf24358 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -75,7 +75,22 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 
 	this.db.query(this.QuerySelect.build(), cb);
 	if (this.opts.debug) {
-		require("../Debug").sql('mysql', this.QuerySelect.build());
+		require("../../Debug").sql('mysql', this.QuerySelect.build());
+	}
+};
+
+Driver.prototype.count = function (table, conditions, opts, cb) {
+	this.QuerySelect
+		.clear()
+		.count()
+		.table(table);
+	for (var k in conditions) {
+		this.QuerySelect.where(k, conditions[k]);
+	}
+
+	this.db.query(this.QuerySelect.build(), cb);
+	if (this.opts.debug) {
+		require("../../Debug").sql('mysql', this.QuerySelect.build());
 	}
 };
 
@@ -88,7 +103,7 @@ Driver.prototype.insert = function (table, data, cb) {
 	}
 
 	if (this.opts.debug) {
-		require("../Debug").sql('mysql', this.QueryInsert.build());
+		require("../../Debug").sql('mysql', this.QueryInsert.build());
 	}
 	this.db.query(this.QueryInsert.build(), function (err, info) {
 		if (err) {
@@ -112,7 +127,7 @@ Driver.prototype.update = function (table, changes, conditions, cb) {
 	}
 
 	if (this.opts.debug) {
-		require("../Debug").sql('mysql', this.QueryUpdate.build());
+		require("../../Debug").sql('mysql', this.QueryUpdate.build());
 	}
 	this.db.query(this.QueryUpdate.build(), cb);
 };
@@ -126,7 +141,7 @@ Driver.prototype.remove = function (table, conditions, cb) {
 	}
 
 	if (this.opts.debug) {
-		require("../Debug").sql('mysql', this.QueryRemove.build());
+		require("../../Debug").sql('mysql', this.QueryRemove.build());
 	}
 	this.db.query(this.QueryRemove.build(), cb);
 };
@@ -134,7 +149,7 @@ Driver.prototype.remove = function (table, conditions, cb) {
 Driver.prototype.clear = function (table, cb) {
 	var query = "TRUNCATE TABLE " + this.escapeId(table);
 	if (this.opts.debug) {
-		require("../Debug").sql('mysql', query);
+		require("../../Debug").sql('mysql', query);
 	}
 	this.db.query(query, cb);
 };
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 7e75d314..960ee63a 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -66,7 +66,22 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	}
 
 	if (this.opts.debug) {
-		require("../Debug").sql('postgres', this.QuerySelect.build());
+		require("../../Debug").sql('postgres', this.QuerySelect.build());
+	}
+	this.db.query(this.QuerySelect.build(), handleQuery(cb));
+};
+
+Driver.prototype.count = function (table, conditions, opts, cb) {
+	this.QuerySelect
+		.clear()
+		.count()
+		.table(table);
+	for (var k in conditions) {
+		this.QuerySelect.where(k, conditions[k]);
+	}
+
+	if (this.opts.debug) {
+		require("../../Debug").sql('postgres', this.QuerySelect.build());
 	}
 	this.db.query(this.QuerySelect.build(), handleQuery(cb));
 };
@@ -79,7 +94,7 @@ Driver.prototype.insert = function (table, data, cb) {
 		this.QueryInsert.set(k, data[k]);
 	}
 	if (this.opts.debug) {
-		require("../Debug").sql('postgres', this.QueryInsert.build());
+		require("../../Debug").sql('postgres', this.QueryInsert.build());
 	}
 	this.db.query(this.QueryInsert.build() + " RETURNING *", function (err, result) {
 		if (err) {
@@ -102,7 +117,7 @@ Driver.prototype.update = function (table, changes, conditions, cb) {
 		this.QueryUpdate.set(k, changes[k]);
 	}
 	if (this.opts.debug) {
-		require("../Debug").sql('postgres', this.QueryUpdate.build());
+		require("../../Debug").sql('postgres', this.QueryUpdate.build());
 	}
 	this.db.query(this.QueryUpdate.build(), handleQuery(cb));
 };
@@ -116,7 +131,7 @@ Driver.prototype.remove = function (table, conditions, cb) {
 	}
 
 	if (this.opts.debug) {
-		require("../Debug").sql('postgres', this.QueryRemove.build());
+		require("../../Debug").sql('postgres', this.QueryRemove.build());
 	}
 	this.db.query(this.QueryRemove.build(), handleQuery(cb));
 };
@@ -125,7 +140,7 @@ Driver.prototype.clear = function (table, cb) {
 	var query = "TRUNCATE TABLE " + this.escapeId(table);
 
 	if (this.opts.debug) {
-		require("../Debug").sql('postgres', query);
+		require("../../Debug").sql('postgres', query);
 	}
 	this.db.query(query, handleQuery(cb));
 };
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index f534f140..142148c1 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -77,7 +77,22 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	}
 
 	if (this.opts.debug) {
-		require("../Debug").sql('sqlite', this.QuerySelect.build());
+		require("../../Debug").sql('sqlite', this.QuerySelect.build());
+	}
+	this.db.all(this.QuerySelect.build(), cb);
+};
+
+Driver.prototype.count = function (table, conditions, opts, cb) {
+	this.QuerySelect
+		.clear()
+		.count()
+		.table(table);
+	for (var k in conditions) {
+		this.QuerySelect.where(k, conditions[k]);
+	}
+
+	if (this.opts.debug) {
+		require("../../Debug").sql('sqlite', this.QuerySelect.build());
 	}
 	this.db.all(this.QuerySelect.build(), cb);
 };
@@ -91,7 +106,7 @@ Driver.prototype.insert = function (table, data, cb) {
 	}
 
 	if (this.opts.debug) {
-		require("../Debug").sql('sqlite', this.QueryInsert.build());
+		require("../../Debug").sql('sqlite', this.QueryInsert.build());
 	}
 	this.db.all(this.QueryInsert.build(), function (err, info) {
 		if (err) {
@@ -120,7 +135,7 @@ Driver.prototype.update = function (table, changes, conditions, cb) {
 	}
 
 	if (this.opts.debug) {
-		require("../Debug").sql('sqlite', this.QueryUpdate.build());
+		require("../../Debug").sql('sqlite', this.QueryUpdate.build());
 	}
 	this.db.all(this.QueryUpdate.build(), cb);
 };
@@ -134,7 +149,7 @@ Driver.prototype.remove = function (table, conditions, cb) {
 	}
 
 	if (this.opts.debug) {
-		require("../Debug").sql('sqlite', this.QueryRemove.build());
+		require("../../Debug").sql('sqlite', this.QueryRemove.build());
 	}
 	this.db.all(this.QueryRemove.build(), cb);
 };
@@ -143,7 +158,7 @@ Driver.prototype.clear = function (table, cb) {
 	var query = "DELETE FROM " + this.escapeId(table);
 
 	if (this.opts.debug) {
-		require("../Debug").sql('sqlite', query);
+		require("../../Debug").sql('sqlite', query);
 	}
 	this.db.all(query, cb);
 };
diff --git a/lib/Model.js b/lib/Model.js
index d60edd46..e6d6a91f 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -103,6 +103,10 @@ function Model(opts) {
 			options = options || {};
 		}
 
+		if (typeof cb != "function") {
+			throw new Error("Missing Model.get() callback");
+		}
+
 		if (!options.hasOwnProperty("cache")) {
 			options.cache = opts.cache;
 		}
@@ -241,6 +245,34 @@ function Model(opts) {
 		return this;
 	};
 
+	model.count = function () {
+		var conditions = null;
+		var cb         = null;
+
+		for (var i = 0; i < arguments.length; i++) {
+			switch (typeof arguments[i]) {
+				case "object":
+					conditions = arguments[i];
+					break;
+				case "function":
+					cb = arguments[i];
+					break;
+			}
+		}
+
+		if (typeof cb != "function") {
+			throw new Error("Missing Model.count() callback");
+		}
+
+		opts.driver.count(opts.table, conditions, {}, function (err, data) {
+			if (err || data.length === 0) {
+				return cb(err);
+			}
+			return cb(null, data[0].c);
+		});
+		return this;
+	};
+
 	model.clear = function (cb) {
 		opts.driver.clear(opts.table, function (err) {
 			if (typeof cb == "function") cb(err);
diff --git a/lib/sql/Select.js b/lib/sql/Select.js
index 6e4068a8..ed5a365b 100644
--- a/lib/sql/Select.js
+++ b/lib/sql/Select.js
@@ -17,6 +17,12 @@ Builder.prototype.clear = function () {
 	return this;
 };
 
+Builder.prototype.count = function () {
+	this.opts.count = true;
+
+	return this;
+};
+
 Builder.prototype.fields = function (fields) {
 	this.opts.fields = fields;
 
@@ -87,7 +93,9 @@ Builder.prototype.build = function () {
 	var i, lst;
 	var query = "SELECT ";
 
-	if (Array.isArray(this.opts.fields)) {
+	if (this.opts.count) {
+		query += "COUNT(*) AS c";
+	} else if (Array.isArray(this.opts.fields)) {
 		query += this.opts.fields.map(this.escapeId).join(", ");
 	} else if (this.opts.fields) {
 		query += this.escapeId(this.opts.fields);
diff --git a/test/integration/test-count.js b/test/integration/test-count.js
new file mode 100644
index 00000000..51660375
--- /dev/null
+++ b/test/integration/test-count.js
@@ -0,0 +1,24 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_count', db.driver.db, function () {
+		common.insertModelData('test_count', db.driver.db, [
+			{ id : 1, name : 'test1' },
+			{ id : 2, name : 'test2' },
+			{ id : 3, name : 'test3' },
+			{ id : 4, name : 'test4' },
+			{ id : 5, name : 'test5' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_count', common.getModelProperties());
+
+			TestModel.count({ id: common.ORM.gt(2) }, function (err, count) {
+				assert.equal(err, null);
+				assert.equal(count, 3);
+				db.close();
+			});
+		});
+	});
+});
diff --git a/test/integration/test-find-chain-count.js b/test/integration/test-find-chain-count.js
new file mode 100644
index 00000000..1fed67fe
--- /dev/null
+++ b/test/integration/test-find-chain-count.js
@@ -0,0 +1,23 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_find_chain_count', db.driver.db, function () {
+		common.insertModelData('test_find_chain_count', db.driver.db, [
+			{ id : 1, name : 'test1' },
+			{ id : 2, name : 'test2' },
+			{ id : 3, name : 'test3' },
+			{ id : 4, name : 'test4' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_find_chain_count', common.getModelProperties());
+
+			TestModel.find().count(function (err, count) {
+				assert.equal(err, null);
+				assert.equal(count, 4);
+				db.close();
+			});
+		});
+	});
+});

From dc7db2e9b79919aecfee703ce97e9ce4bb3aa533 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 12:00:39 +0000
Subject: [PATCH 0046/1246] Fixes test-find-chain-limit table name

---
 test/integration/test-find-chain-limit.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/integration/test-find-chain-limit.js b/test/integration/test-find-chain-limit.js
index 6b4a8d25..9a6eb9d6 100644
--- a/test/integration/test-find-chain-limit.js
+++ b/test/integration/test-find-chain-limit.js
@@ -2,14 +2,14 @@ var common     = require('../common');
 var assert     = require('assert');
 
 common.createConnection(function (err, db) {
-	common.createModelTable('test_find_limit', db.driver.db, function () {
-		common.insertModelData('test_find_limit', db.driver.db, [
+	common.createModelTable('test_find_chain_limit', db.driver.db, function () {
+		common.insertModelData('test_find_chain_limit', db.driver.db, [
 			{ id : 1, name : 'test1' },
 			{ id : 2, name : 'test2' }
 		], function (err) {
 			if (err) throw err;
 
-			var TestModel = db.define('test_find_limit', common.getModelProperties());
+			var TestModel = db.define('test_find_chain_limit', common.getModelProperties());
 
 			TestModel.find().limit(1).run(function (err, Instances) {
 				assert.equal(err, null);

From 3725f1c9f9830adb115ffaa532f0bb1020a75352 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 12:12:15 +0000
Subject: [PATCH 0047/1246] Adds Model.exists()

---
 Readme.md                       |  2 +-
 lib/ChainFind.js                |  2 +-
 lib/Drivers/DML/mysql.js        |  2 +-
 lib/Drivers/DML/postgres.js     |  2 +-
 lib/Drivers/DML/sqlite.js       |  2 +-
 lib/Model.js                    | 19 +++++++++++++-
 test/integration/test-exists.js | 44 +++++++++++++++++++++++++++++++++
 7 files changed, 67 insertions(+), 6 deletions(-)
 create mode 100644 test/integration/test-exists.js

diff --git a/Readme.md b/Readme.md
index 3e53680c..222720f4 100644
--- a/Readme.md
+++ b/Readme.md
@@ -21,7 +21,7 @@ Despite the alpha tag, this is the recommended version for new applications.
 - ~~Add SQLite Model.sync()~~
 - Add options to Property to allow people to better define the type of coluns in the database
 - ~~Add Model.drop()~~
-- ~~Add Model.count(),~~ Model.exists(id)
+- ~~Add Model.count(), ChainFind.count(), Model.exists(id)~~
 - Add Instance.has*() for hasMany and hasOne associations
 - Add DB.import() to load definitions from files
 - Add ChainFind.remove() (and maybe some more interesting methods)
diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index dd9f5d7b..be1f13db 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -28,7 +28,7 @@ function ChainFind(opts) {
 			return this;
 		},
 		count: function (cb) {
-			opts.driver.count(opts.table, opts.conditions, {}, function (err, data) {
+			opts.driver.count(opts.table, opts.conditions, function (err, data) {
 				if (err || data.length === 0) {
 					return cb(err);
 				}
diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index bbf24358..76672156 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -79,7 +79,7 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	}
 };
 
-Driver.prototype.count = function (table, conditions, opts, cb) {
+Driver.prototype.count = function (table, conditions, cb) {
 	this.QuerySelect
 		.clear()
 		.count()
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 960ee63a..d4ae3e63 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -71,7 +71,7 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	this.db.query(this.QuerySelect.build(), handleQuery(cb));
 };
 
-Driver.prototype.count = function (table, conditions, opts, cb) {
+Driver.prototype.count = function (table, conditions, cb) {
 	this.QuerySelect
 		.clear()
 		.count()
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 142148c1..02ba0059 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -82,7 +82,7 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	this.db.all(this.QuerySelect.build(), cb);
 };
 
-Driver.prototype.count = function (table, conditions, opts, cb) {
+Driver.prototype.count = function (table, conditions, cb) {
 	this.QuerySelect
 		.clear()
 		.count()
diff --git a/lib/Model.js b/lib/Model.js
index e6d6a91f..5fe7ed9c 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -264,7 +264,7 @@ function Model(opts) {
 			throw new Error("Missing Model.count() callback");
 		}
 
-		opts.driver.count(opts.table, conditions, {}, function (err, data) {
+		opts.driver.count(opts.table, conditions, function (err, data) {
 			if (err || data.length === 0) {
 				return cb(err);
 			}
@@ -273,6 +273,23 @@ function Model(opts) {
 		return this;
 	};
 
+	model.exists = function (id, cb) {
+		if (typeof cb != "function") {
+			throw new Error("Missing Model.exists() callback");
+		}
+
+		var conditions = {};
+		conditions[opts.id] = id;
+
+		opts.driver.count(opts.table, conditions, function (err, data) {
+			if (err || data.length === 0) {
+				return cb(err);
+			}
+			return cb(null, data[0].c > 0);
+		});
+		return this;
+	};
+
 	model.clear = function (cb) {
 		opts.driver.clear(opts.table, function (err) {
 			if (typeof cb == "function") cb(err);
diff --git a/test/integration/test-exists.js b/test/integration/test-exists.js
new file mode 100644
index 00000000..9d8509a6
--- /dev/null
+++ b/test/integration/test-exists.js
@@ -0,0 +1,44 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_count', db.driver.db, function () {
+		common.insertModelData('test_count', db.driver.db, [
+			{ id : 1, name : 'test1' },
+			{ id : 2, name : 'test2' },
+			{ id : 3, name : 'test3' },
+			{ id : 4, name : 'test4' },
+			{ id : 5, name : 'test5' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_count', common.getModelProperties());
+			var tests = 3;
+
+			TestModel.exists(4, function (err, exists) {
+				assert.equal(err, null);
+				assert.equal(exists, true);
+
+				if (--tests === 0) {
+					db.close();
+				}
+			});
+			TestModel.exists(6, function (err, exists) {
+				assert.equal(err, null);
+				assert.equal(exists, false);
+
+				if (--tests === 0) {
+					db.close();
+				}
+			});
+			TestModel.exists(-2, function (err, exists) {
+				assert.equal(err, null);
+				assert.equal(exists, false);
+
+				if (--tests === 0) {
+					db.close();
+				}
+			});
+		});
+	});
+});

From f058a2b8e5ed79c8c1ddca1d633de85cf1a25689 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 13:53:48 +0000
Subject: [PATCH 0048/1246] Adds instance.has*() for hasone and hasmany
 associations

Example:

```js
Person.hasOne("pet", Pet);

John.hasPet(Bobby, function (err, has) {
    console.log("has?", has);
});
```
---
 Readme.md                |  2 +-
 lib/Associations/Many.js | 35 +++++++++++++++++++++++++++++++++++
 lib/Associations/One.js  | 26 +++++++++++++++++++++++---
 3 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/Readme.md b/Readme.md
index 222720f4..0e43a9a8 100644
--- a/Readme.md
+++ b/Readme.md
@@ -22,7 +22,7 @@ Despite the alpha tag, this is the recommended version for new applications.
 - Add options to Property to allow people to better define the type of coluns in the database
 - ~~Add Model.drop()~~
 - ~~Add Model.count(), ChainFind.count(), Model.exists(id)~~
-- Add Instance.has*() for hasMany and hasOne associations
+- ~~Add Instance.has*() for hasMany and hasOne associations~~
 - Add DB.import() to load definitions from files
 - Add ChainFind.remove() (and maybe some more interesting methods)
 
diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index b19bc80a..d6815bdb 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -44,6 +44,7 @@ exports.prepare = function (Model, associations) {
 			mergeAssocId   : opts.mergeAssocId || (name + "_id"),
 			getFunction    : opts.getFunction || ("get" + assocName),
 			setFunction    : opts.setFunction || ("set" + assocName),
+			hasFunction    : opts.hasFunction || ("has" + assocName),
 			delFunction    : opts.delFunction || ("remove" + assocName),
 			addFunction    : opts.addFunction || ("add" + assocName)
 		});
@@ -71,6 +72,40 @@ exports.extend = function (Instance, Driver, associations, opts, cb) {
 };
 
 function extendInstance(Instance, Driver, association, opts, cb) {
+	Object.defineProperty(Instance, association.hasFunction, {
+		value: function () {
+			var Instances = Array.prototype.slice.apply(arguments);
+			var cb = Instances.pop();
+			var conditions = {}, options = {};
+
+			options.__merge = {
+				from: { table: association.mergeTable, field: association.mergeAssocId },
+				to: { table: association.model.table, field: association.model.id }
+			};
+			options.extra = association.props;
+			options.extra_info = {
+				table: association.mergeTable,
+				id: Instance.id,
+				id_prop: association.mergeId,
+				assoc_prop: association.mergeAssocId
+			};
+
+			conditions[association.mergeTable + "." + association.mergeId] = [];
+
+			for (var i = 0; i < Instances.length; i++) {
+				conditions[association.mergeTable + "." + association.mergeId].push(Instances[i].id);
+			}
+
+			association.model.find(conditions, options, function (err, instances) {
+				if (err) {
+					return cb(err);
+				}
+				return cb(null, instances.length == Instances.length);
+			});
+			return this;
+		},
+		enumerable: false
+	});
 	Object.defineProperty(Instance, association.getFunction, {
 		value: function () {
 			var conditions = null;
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index 768553e1..195a2dfb 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -16,6 +16,7 @@ exports.prepare = function (Model, associations, association_properties) {
 			field          : opts.field || (name + "_id"),
 			getFunction    : opts.getFunction || ("get" + assocName),
 			setFunction    : opts.setFunction || ("set" + assocName),
+			hasFunction    : opts.hasFunction || ("has" + assocName),
 			delFunction    : opts.delFunction || ("remove" + assocName)
 		};
 		associations.push(association);
@@ -53,6 +54,25 @@ exports.extend = function (Instance, Driver, associations, opts, cb) {
 };
 
 function extendInstance(Instance, Driver, association, opts, cb) {
+	Object.defineProperty(Instance, association.hasFunction, {
+		value: function (opts, cb) {
+			if (typeof opts == "function") {
+				cb = opts;
+				opts = {};
+			}
+
+			if (Instance[association.field]) {
+				association.model.get(Instance[association.field], opts, function (err, instance) {
+					return cb(err, instance ? true : false);
+				});
+			} else {
+				cb(null, false);
+			}
+
+			return this;
+		},
+		enumerable: false
+	});
 	Object.defineProperty(Instance, association.getFunction, {
 		value: function (opts, cb) {
 			if (typeof opts == "function") {
@@ -66,13 +86,13 @@ function extendInstance(Instance, Driver, association, opts, cb) {
 					conditions[association.field] = Instance.id;
 					association.model.find(conditions, opts, cb);
 				} else {
-					cb();
+					cb(null);
 				}
 			} else {
-				if (Instance[association.field] > 0) {
+				if (Instance[association.field]) {
 					association.model.get(Instance[association.field], opts, cb);
 				} else {
-					cb();
+					cb(null);
 				}
 			}
 

From 683ecccda8575de967192766cb12bfa4fe2541c6 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 14:12:04 +0000
Subject: [PATCH 0049/1246] Fixes instance.has*() hasMany association query,
 adds tests for instance.has*()

---
 lib/Associations/Many.js                      |  5 +-
 lib/Drivers/DML/postgres.js                   |  3 +
 lib/Drivers/DML/sqlite.js                     |  3 +
 .../test-association-hasmany-has.js           | 55 +++++++++++++++++++
 .../test-association-hasone-has.js            | 29 ++++++++++
 5 files changed, 93 insertions(+), 2 deletions(-)
 create mode 100644 test/integration/test-association-hasmany-has.js
 create mode 100644 test/integration/test-association-hasone-has.js

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index d6815bdb..e39a9ead 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -90,10 +90,11 @@ function extendInstance(Instance, Driver, association, opts, cb) {
 				assoc_prop: association.mergeAssocId
 			};
 
-			conditions[association.mergeTable + "." + association.mergeId] = [];
+			conditions[association.mergeTable + "." + association.mergeId] = Instance.id;
+			conditions[association.mergeTable + "." + association.mergeAssocId] = [];
 
 			for (var i = 0; i < Instances.length; i++) {
-				conditions[association.mergeTable + "." + association.mergeId].push(Instances[i].id);
+				conditions[association.mergeTable + "." + association.mergeAssocId].push(Instances[i].id);
 			}
 
 			association.model.find(conditions, options, function (err, instances) {
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index d4ae3e63..61af11ea 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -178,6 +178,9 @@ Driver.prototype.escapeId = function (id) {
 
 Driver.prototype.escape = function (value) {
 	if (Array.isArray(value)) {
+		if (value.length === 1 && Array.isArray(value[0])) {
+			return "(" + value[0].map(this.escape.bind(this)) + ")";
+		}
 		return "(" + value.map(this.escape.bind(this)) + ")";
 	}
 	switch (typeof value) {
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 02ba0059..57b5d653 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -173,6 +173,9 @@ Driver.prototype.escapeId = function (id) {
 
 function escape(value) {
 	if (Array.isArray(value)) {
+		if (value.length === 1 && Array.isArray(value[0])) {
+			return "(" + value[0].map(escape) + ")";
+		}
 		return "(" + value.map(escape) + ")";
 	}
 	switch (typeof value) {
diff --git a/test/integration/test-association-hasmany-has.js b/test/integration/test-association-hasmany-has.js
new file mode 100644
index 00000000..b1e5bdd0
--- /dev/null
+++ b/test/integration/test-association-hasmany-has.js
@@ -0,0 +1,55 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_association_hasmany_has', db.driver.db, function () {
+		common.createModelAssocTable('test_association_hasmany_has', 'assocs', db.driver.db, function () {
+			common.insertModelData('test_association_hasmany_has', db.driver.db, [
+				{ id : 1, name : 'test1' },
+				{ id : 2, name : 'test2' },
+				{ id : 3, name : 'test3' },
+				{ id : 4, name : 'test4' }
+			], function (err) {
+				if (err) throw err;
+
+				common.insertModelAssocData('test_association_hasmany_has_assocs', db.driver.db, [
+					[ 1, 2 ],
+					[ 1, 3 ]
+				], function (err) {
+					if (err) throw err;
+
+					var TestModel = db.define('test_association_hasmany_has', common.getModelProperties());
+					TestModel.hasMany("assocs");
+
+					TestModel.get(1, function (err, Test1) {
+						assert.equal(err, null);
+
+						TestModel.get(2, function (err, Test2) {
+							assert.equal(err, null);
+
+							TestModel.get(3, function (err, Test3) {
+								assert.equal(err, null);
+
+								TestModel.get(4, function (err, Test4) {
+									assert.equal(err, null);
+
+									Test1.hasAssocs(Test2, Test3, function (err, has23) {
+										assert.equal(err, null);
+										assert.equal(has23, true);
+
+										Test1.hasAssocs(Test2, Test4, function (err, has24) {
+											assert.equal(err, null);
+											assert.equal(has24, false);
+
+											db.close();
+										});
+									});
+								});
+							});
+						});
+					});
+				});
+			});
+		});
+	});
+});
diff --git a/test/integration/test-association-hasone-has.js b/test/integration/test-association-hasone-has.js
new file mode 100644
index 00000000..f6486dee
--- /dev/null
+++ b/test/integration/test-association-hasone-has.js
@@ -0,0 +1,29 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModel2Table('test_association_hasone_has', db.driver.db, function () {
+			common.insertModel2Data('test_association_hasone_has', db.driver.db, [
+				{ id : 1, name : 'test1', assoc: 2 },
+				{ id : 2, name : 'test2', assoc: 0 }
+			], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_association_hasone_has', common.getModelProperties());
+			TestModel.hasOne("assoc");
+
+			TestModel.get(1, function (err, Test1) {
+				assert.equal(err, null);
+				TestModel.get(2, function (err, Test2) {
+					assert.equal(err, null);
+					Test1.hasAssoc(Test2, function (err, has) {
+						assert.equal(err, null);
+						assert.equal(has, true);
+
+						db.close();
+					});
+				});
+			});
+		});
+	});
+});

From 133817e2243422d67376f90e5a342453187fcf8d Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 14:14:31 +0000
Subject: [PATCH 0050/1246] Updates Readme about property options on roadmap

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 0e43a9a8..3cca942f 100644
--- a/Readme.md
+++ b/Readme.md
@@ -19,7 +19,7 @@ Despite the alpha tag, this is the recommended version for new applications.
 ## Roadmap (Future updates)
 
 - ~~Add SQLite Model.sync()~~
-- Add options to Property to allow people to better define the type of coluns in the database
+- ~~Add options to Property to allow people to better define the type of coluns in the database~~ (_some added_)
 - ~~Add Model.drop()~~
 - ~~Add Model.count(), ChainFind.count(), Model.exists(id)~~
 - ~~Add Instance.has*() for hasMany and hasOne associations~~

From 199f3a64b4e01333d76a0afc05fa56faaa718ca0 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 14:18:32 +0000
Subject: [PATCH 0051/1246] Adds db.sync()

This method calls .sync() methods from all models sequentially.
---
 lib/ORM.js | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/lib/ORM.js b/lib/ORM.js
index a305452c..ebc7fa69 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -114,3 +114,27 @@ ORM.prototype.close = function (cb) {
 
 	return this;
 };
+ORM.prototype.sync = function (cb) {
+	var modelIds = Object.keys(this.models);
+	var syncNext = function () {
+		if (modelIds.length === 0) {
+			return cb();
+		}
+
+		var modelId = modelIds.shift();
+
+		this.models[modelId].sync(function (err) {
+			if (err) {
+				err.model = modelId;
+
+				return cb(err);
+			}
+
+			return syncNext();
+		});
+	}.bind(this);
+
+	syncNext();
+
+	return this;
+};

From e82358dc354e33fb3f627670a0ae3450844fdddd Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 14:28:41 +0000
Subject: [PATCH 0052/1246] Updates Readme with some more information about
 Models

---
 Readme.md | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/Readme.md b/Readme.md
index 3cca942f..b60ef664 100644
--- a/Readme.md
+++ b/Readme.md
@@ -77,6 +77,45 @@ A Model is a structure binded to one or more tables, depending on the associatio
 
 After defining a Model you can get a specific element or find one or more based on some conditions.
 
+## Defining Models
+
+To define a model, you use the reference to the database connection and call `define`. The function will define a Model
+and will return it to you. You can get it later by it's id directly from the database connection so you don't actually
+need to store a reference to it.
+
+```js
+var Person = db.define('person', {        // 'person' will be the table in the database as well as the model id
+	// properties
+	name    : String,                     // you can use native objects to define the property type
+	surname : { type: "text", size: 50 }  // or you can be specific and define aditional options
+}, {
+	// options (optional)
+});
+```
+
+## Synching Models
+
+If you don't have the tables on the database you have to call the `.sync()` on every Model. This will just create the
+tables necessary for your Model. If you have more than one Model you can call `.sync()` directly on the database
+connection to syncronize all Models.
+
+```js
+// db.sync() can also be used
+Person.sync(function (err) {
+	!err && console.log("done!");
+});
+```
+
+## Dropping Models
+
+If you want to drop a Model and remove all tables you can use the `.drop()` method.
+
+```js
+Person.drop(function (err) {
+	!err && console.log("person model no longer exists!");
+});
+```
+
 ## Finding Items
 
 ### Model.get(id, [ options ], cb)
@@ -119,6 +158,27 @@ Person.find({ surname: "Doe" }, { offset: 2 }, function (err, people) {
 });
 ```
 
+### Model.count([ conditions, ] cb)
+
+If you just want to count the number of items that match a condition you can just use `.count()` instead of finding all
+of them and counting. This will actually tell the database server to do a count, the count is not done in javascript.
+
+```js
+Person.count({ surname: "Doe" }, function (err, count) {
+	console.log("We have %d Does in our db", count);
+});
+```
+
+### Model.exists([ conditions, ] cb)
+
+Similar to `.count()`, this method just checks if the count is greater than zero or not.
+
+```js
+Person.exists({ surname: "Doe" }, function (err, exists) {
+	console.log("We %s Does in our db", exists ? "have" : "don't have");
+});
+```
+
 #### Available options
 
 - `offset`: discards the first `N` elements

From e361be88820a812f61681a8fdd91d32d0874bf29 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 14:34:39 +0000
Subject: [PATCH 0053/1246] Adds a few more bits to Readme

---
 Readme.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Readme.md b/Readme.md
index b60ef664..68e9c8d9 100644
--- a/Readme.md
+++ b/Readme.md
@@ -196,6 +196,14 @@ Person.find({ surname: "Doe" }).limit(3).offset(2).only("name", "surname").run(f
 });
 ```
 
+You can also chain and just get the count in the end. In this case, offset, limit and order are ignored.
+
+```js
+Person.find({ surname: "Doe" }).count(function (err, people) {
+    // people = number of people with surname="Doe"
+});
+```
+
 #### Conditions
 
 Conditions are defined as an object where every key is a property (table column). All keys are supposed
@@ -211,8 +219,12 @@ If you need other comparisons, you have to use a special object created by some
 a few examples to describe it:
 
 ```js
+{ col1: orm.eq(123) } // `col1` = 123 (default)
 { col1: orm.ne(123) } // `col1` <> 123
+{ col1: orm.gt(123) } // `col1` > 123
 { col1: orm.gte(123) } // `col1` >= 123
+{ col1: orm.lt(123) } // `col1` < 123
+{ col1: orm.lte(123) } // `col1` <= 123
 { col1: orm.between(123, 456) } // `col1` BETWEEN 123 AND 456
 ```
 

From 395406f250b4305c125fa344cdf04fbb18751f61 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 15:59:13 +0000
Subject: [PATCH 0054/1246] Adds db.load() to load stuff from external files

Example in the Readme "Loading Models"
---
 Readme.md  | 38 ++++++++++++++++++++++++++++++++++++++
 lib/ORM.js |  7 +++++++
 2 files changed, 45 insertions(+)

diff --git a/Readme.md b/Readme.md
index 68e9c8d9..79de3755 100644
--- a/Readme.md
+++ b/Readme.md
@@ -93,6 +93,44 @@ var Person = db.define('person', {        // 'person' will be the table in the d
 });
 ```
 
+## Loading Models
+
+If you prefer to have your models defined in separated files, you can define them in a function inside a module and
+export the function has the entire module. You can have cascading loads.
+
+```js
+// your main file (after connecting)
+db.load("./models", function (err) {
+    // loaded!
+    var Person = db.models.person;
+    var Pet    = db.models.pet;
+});
+
+// models.js
+module.exports = function (db, cb) {
+    db.load("./models-extra", function (err) {
+        if (err) {
+            return cb(err);
+        }
+
+        db.define('person', {
+            name : String
+        });
+
+        return cb();
+    });
+};
+
+// models-extra.js
+module.exports = function (db, cb) {
+    db.define('pet', {
+        name : String
+    });
+
+    return cb();
+};
+```
+
 ## Synching Models
 
 If you don't have the tables on the database you have to call the `.sync()` on every Model. This will just create the
diff --git a/lib/ORM.js b/lib/ORM.js
index ebc7fa69..80c2779f 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -114,6 +114,13 @@ ORM.prototype.close = function (cb) {
 
 	return this;
 };
+ORM.prototype.load = function (file, cb) {
+	try {
+		require(file)(this, cb);
+	} catch (ex) {
+		return cb(ex);
+	}
+};
 ORM.prototype.sync = function (cb) {
 	var modelIds = Object.keys(this.models);
 	var syncNext = function () {

From c75c73e3da4bce99a934141545592c885ba0c036 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 16:00:24 +0000
Subject: [PATCH 0055/1246] Updates Readme roadmap - 'Add DB.load() ..' done

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 79de3755..3f6599bf 100644
--- a/Readme.md
+++ b/Readme.md
@@ -23,7 +23,7 @@ Despite the alpha tag, this is the recommended version for new applications.
 - ~~Add Model.drop()~~
 - ~~Add Model.count(), ChainFind.count(), Model.exists(id)~~
 - ~~Add Instance.has*() for hasMany and hasOne associations~~
-- Add DB.import() to load definitions from files
+- ~~Add DB.load() to load definitions from files~~
 - Add ChainFind.remove() (and maybe some more interesting methods)
 
 ## Introduction

From 91485b76054419490f3cba81efe1918b010973b6 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 16:07:14 +0000
Subject: [PATCH 0056/1246] Fixes sqlite pathname being undefined

---
 lib/Drivers/DML/sqlite.js | 2 +-
 test/common.js            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 57b5d653..5fa86718 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -11,7 +11,7 @@ function Driver(config, connection, opts) {
 		// on Windows, paths have a drive letter which is parsed by
 		// url.parse() has the hostname. If host is defined, assume
 		// it's the drive letter and add ":"
-		this.db = new sqlite3.Database(((config.host ? config.host + ":" : "") + config.pathname) || ':memory:');
+		this.db = new sqlite3.Database(((config.host ? config.host + ":" : "") + (config.pathname || "")) || ':memory:');
 	}
 
 	var escapes = {
diff --git a/test/common.js b/test/common.js
index 0f137d9f..ae9295c0 100644
--- a/test/common.js
+++ b/test/common.js
@@ -47,7 +47,7 @@ common.getConnectionString = function () {
 				       '@' + (config.host || 'localhost') +
 				       '/' + (config.database || 'orm_test');
 			case 'sqlite':
-				return 'sqlite://' + config.pathname;
+				return 'sqlite://' + (config.pathname || "");
 			default:
 				throw new Error("Unknown protocol");
 		}

From 5c73ef8de46bc077f2ea99db1f848766cb558c0c Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 16:19:59 +0000
Subject: [PATCH 0057/1246] Adds ChainFind.remove(), updates Readme roadmap

Need... more... features.. argh!
---
 Readme.md                                  |  3 ++-
 lib/ChainFind.js                           | 26 +++++++++++++++++++++
 lib/Model.js                               |  1 +
 test/integration/test-find-chain-remove.js | 27 ++++++++++++++++++++++
 4 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 test/integration/test-find-chain-remove.js

diff --git a/Readme.md b/Readme.md
index 3f6599bf..a40e6eb1 100644
--- a/Readme.md
+++ b/Readme.md
@@ -24,7 +24,8 @@ Despite the alpha tag, this is the recommended version for new applications.
 - ~~Add Model.count(), ChainFind.count(), Model.exists(id)~~
 - ~~Add Instance.has*() for hasMany and hasOne associations~~
 - ~~Add DB.load() to load definitions from files~~
-- Add ChainFind.remove() (and maybe some more interesting methods)
+- ~~Add ChainFind.remove() (and maybe some more interesting methods)~~
+- Add some kind of bulk insert
 
 ## Introduction
 
diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index be1f13db..131ee451 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -36,6 +36,32 @@ function ChainFind(opts) {
 			});
 			return this;
 		},
+		remove: function (cb) {
+			opts.driver.find([ opts.id ], opts.table, opts.conditions, {
+				limit  : opts.limit,
+				order  : opts.order,
+				merge  : opts.merge,
+				offset : opts.offset
+			}, function (err, data) {
+				if (err) {
+					return cb(err);
+				}
+				if (data.length === 0) {
+					return cb(null);
+				}
+
+				var ids = [], conditions = {};
+
+				for (var i = 0; i < data.length; i++) {
+					ids.push(data[i][opts.id]);
+				}
+
+				conditions[opts.id] = ids;
+
+				return opts.driver.remove(opts.table, conditions, cb);
+			});
+			return this;
+		},
 		run: function (cb) {
 			opts.driver.find(opts.only, opts.table, opts.conditions, {
 				limit  : opts.limit,
diff --git a/lib/Model.js b/lib/Model.js
index 5fe7ed9c..56503151 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -195,6 +195,7 @@ function Model(opts) {
 
 		var chain = new ChainFind({
 			only       : options.only || null,
+			id         : opts.id,
 			table      : opts.table,
 			driver     : opts.driver,
 			conditions : conditions,
diff --git a/test/integration/test-find-chain-remove.js b/test/integration/test-find-chain-remove.js
new file mode 100644
index 00000000..171299ef
--- /dev/null
+++ b/test/integration/test-find-chain-remove.js
@@ -0,0 +1,27 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_find_chain_remove', db.driver.db, function () {
+		common.insertModelData('test_find_chain_remove', db.driver.db, [
+			{ id : 1, name : 'test1' },
+			{ id : 2, name : 'test2' },
+			{ id : 3, name : 'test3' },
+			{ id : 4, name : 'test4' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_find_chain_remove', common.getModelProperties());
+
+			TestModel.find({ name: [ 'test2', 'test3' ] }).remove(function (err) {
+				assert.equal(err, null);
+
+				TestModel.find().count(function (err, count) {
+					assert.equal(err, null);
+					assert.equal(count, 2);
+					db.close();
+				});
+			});
+		});
+	});
+});

From 4ebad12d7ddd091699b9799d8891f5d52587aeeb Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 16:22:26 +0000
Subject: [PATCH 0058/1246] Adds mention to chainfind.remove() to the readme

---
 Readme.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Readme.md b/Readme.md
index a40e6eb1..df4c2864 100644
--- a/Readme.md
+++ b/Readme.md
@@ -243,6 +243,14 @@ Person.find({ surname: "Doe" }).count(function (err, people) {
 });
 ```
 
+Also available is the option to remove the selected items.
+
+```js
+Person.find({ surname: "Doe" }).remove(function (err) {
+    // Does gone..
+});
+```
+
 #### Conditions
 
 Conditions are defined as an object where every key is a property (table column). All keys are supposed

From ccdde3440b753ca28882a17f00d75bd6ebe6e77f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 16:56:01 +0000
Subject: [PATCH 0059/1246] Updates package.json

Adds keywords, license, test script
---
 package.json | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/package.json b/package.json
index 91be510e..be5c11f4 100644
--- a/package.json
+++ b/package.json
@@ -2,10 +2,22 @@
   "author": "Diogo Resende <dresende@thinkdigital.pt>",
   "name": "orm",
   "description": "NodeJS Object-relational mapping",
+  "keywords": [
+    "orm",
+    "odm",
+    "database",
+    "mysql",
+    "postgres",
+    "sqlite"
+  ],
   "version": "2.0.0-alpha8",
+  "license": "MIT",
   "repository": {
     "url": "http://dresende.github.com/node-orm2"
   },
+  "scripts": {
+    "test": "make"
+  },
   "contributors": [
     { "name": "Bramus Van Damme", "email": "bramus@bram.us" },
     { "name": "Lorien Gamaroff", "email": "lorien@gamaroff.org" },
@@ -18,6 +30,7 @@
   "engines": {
     "node": "*"
   },
+  "analyse": false,
   "devDependencies": {
     "utest": "0.0.6",
     "urun": "0.0.6",

From c5fb184615b08112f68c8abad53ccfa9022ba40d Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 22:42:37 +0000
Subject: [PATCH 0060/1246] Adds Model.create()

Example:

```js
Person.create([
    { name: "John" },
    { name: "Jane" }
], function (err, people) {
    console.log(people[1].name); // Jane
});
```
---
 lib/Model.js                    | 55 +++++++++++++++++++++++++++++++++
 test/integration/test-create.js | 20 ++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 test/integration/test-create.js

diff --git a/lib/Model.js b/lib/Model.js
index 56503151..a8e8f2dc 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -291,6 +291,61 @@ function Model(opts) {
 		return this;
 	};
 
+	model.create = function () {
+		var Instances = [];
+		var options = {};
+		var cb = null, idx = 0;
+		var createNext = function () {
+			if (idx >= Instances.length) {
+				return cb(null, Instances);
+			}
+			Instances[idx] = new Instance({
+				id                     : opts.id,
+				is_new                 : true,
+				data                   : Instances[idx],
+				autoSave               : opts.autoSave,
+				driver                 : opts.driver,
+				table                  : opts.table,
+				properties             : opts.properties,
+				hooks                  : opts.hooks,
+				methods                : opts.methods,
+				validations            : opts.validations,
+				association_properties : association_properties
+			});
+			Instances[idx].save(function (err) {
+				if (err) {
+					err.index = idx;
+					err.instance = Instances[idx];
+
+					return cb(err);
+				}
+
+				idx += 1;
+				createNext();
+			});
+		};
+
+		for (var i = 0; i < arguments.length; i++) {
+			if (Array.isArray(arguments[i])) {
+				Instances = Instances.concat(arguments[i]);
+				continue;
+			}
+
+			switch (typeof arguments[i]) {
+				case "object":
+					options = arguments[i];
+					break;
+				case "function":
+					cb = arguments[i];
+					break;
+			}
+		}
+
+		createNext();
+
+		return this;
+	};
+
 	model.clear = function (cb) {
 		opts.driver.clear(opts.table, function (err) {
 			if (typeof cb == "function") cb(err);
diff --git a/test/integration/test-create.js b/test/integration/test-create.js
new file mode 100644
index 00000000..00478f33
--- /dev/null
+++ b/test/integration/test-create.js
@@ -0,0 +1,20 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_create', db.driver.db, function () {
+		var TestModel = db.define('test_create', common.getModelProperties());
+
+		TestModel.create([
+			{ name: 'test1' },
+			{ name: 'test2' },
+			{ name: 'test3' }
+		], function (err) {
+			TestModel.count(function (err, count) {
+				assert.equal(err, null);
+				assert.equal(count, 3);
+				db.close();
+			});
+		});
+	});
+});

From 2ef1b3f3798f3e1037d2fec1d491b74d21c8329a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 22:47:25 +0000
Subject: [PATCH 0061/1246] Removes roadmap (all done), adds feature list

---
 Readme.md | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/Readme.md b/Readme.md
index df4c2864..aa2fee95 100644
--- a/Readme.md
+++ b/Readme.md
@@ -16,16 +16,12 @@ Despite the alpha tag, this is the recommended version for new applications.
 - PostgreSQL
 - SQLite
 
-## Roadmap (Future updates)
-
-- ~~Add SQLite Model.sync()~~
-- ~~Add options to Property to allow people to better define the type of coluns in the database~~ (_some added_)
-- ~~Add Model.drop()~~
-- ~~Add Model.count(), ChainFind.count(), Model.exists(id)~~
-- ~~Add Instance.has*() for hasMany and hasOne associations~~
-- ~~Add DB.load() to load definitions from files~~
-- ~~Add ChainFind.remove() (and maybe some more interesting methods)~~
-- Add some kind of bulk insert
+## Features
+
+- Create Models, sync, drop, bulk create, get, find, remove, count
+- Create Model associations, find, check, create and remove
+- Define custom validations (several builtin validations, check instance properties before saving)
+- Instance singleton (table rows fetched twice are the same object, changes to one change all)
 
 ## Introduction
 

From 50365967e17d0aebe74f5f165cf65df07517d36d Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 23 Jan 2013 22:57:08 +0000
Subject: [PATCH 0062/1246] Fixes unique predefined validator, adds test to it

---
 lib/Instance.js                               |  2 +-
 lib/Model.js                                  |  5 ++++
 lib/Validators.js                             |  4 +--
 .../test-predefined-validation-unique.js      | 27 +++++++++++++++++++
 4 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 test/integration/test-predefined-validation-unique.js

diff --git a/lib/Instance.js b/lib/Instance.js
index 7b1902d3..0d3a38ef 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -52,7 +52,7 @@ function Instance(opts) {
 				}
 
 				return checkNextValidation();
-			});
+			}, instance, opts.model, validation[0]);
 		};
 		return checkNextValidation();
 	};
diff --git a/lib/Model.js b/lib/Model.js
index a8e8f2dc..a17690dd 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -23,6 +23,7 @@ function Model(opts) {
 				id                     : opts.id,
 				data                   : data2,
 				autoSave               : false,
+				model                  : model,
 				driver                 : opts.driver,
 				table                  : opts.table,
 				properties             : opts.properties,
@@ -47,6 +48,7 @@ function Model(opts) {
 			is_new                 : !data.hasOwnProperty(opts.id),
 			data                   : data,
 			autoSave               : opts.autoSave,
+			model                  : model,
 			driver                 : opts.driver,
 			table                  : opts.table,
 			properties             : opts.properties,
@@ -122,6 +124,7 @@ function Model(opts) {
 				var instance = new Instance({
 					id                     : opts.id,
 					data                   : data[0],
+					model                  : model,
 					autoSave               : opts.autoSave,
 					driver                 : opts.driver,
 					table                  : opts.table,
@@ -212,6 +215,7 @@ function Model(opts) {
 						data                   : data,
 						extra                  : options.extra,
 						extra_info             : options.extra_info,
+						model                  : model,
 						autoSave               : opts.autoSave,
 						driver                 : opts.driver,
 						table                  : opts.table,
@@ -303,6 +307,7 @@ function Model(opts) {
 				id                     : opts.id,
 				is_new                 : true,
 				data                   : Instances[idx],
+				model                  : model,
 				autoSave               : opts.autoSave,
 				driver                 : opts.driver,
 				table                  : opts.table,
diff --git a/lib/Validators.js b/lib/Validators.js
index ddfc8f6d..35a1fb4a 100644
--- a/lib/Validators.js
+++ b/lib/Validators.js
@@ -86,9 +86,9 @@ validators.notEmptyString = function (msg) {
  * on this property so this should not worry you.
  **/
 validators.unique = function (msg) {
-	return function (v, next, data, Model, prop) {
+	return function (v, next, data, Model, property) {
 		var query = {};
-		query[prop] = v;
+		query[property] = v;
 
 		Model.find(query, function (err, records) {
 			if (err) {
diff --git a/test/integration/test-predefined-validation-unique.js b/test/integration/test-predefined-validation-unique.js
new file mode 100644
index 00000000..440ea1df
--- /dev/null
+++ b/test/integration/test-predefined-validation-unique.js
@@ -0,0 +1,27 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_predefined_validation_unique', db.driver.db, function () {
+		var TestModel = db.define('test_predefined_validation_unique', common.getModelProperties(), {
+			validations: {
+				name: db.validators.unique()
+			}
+		});
+
+		var Test1 = new TestModel({ name: "test-predefined-validation-unique" });
+		Test1.save(function (err) {
+			assert.equal(err, null);
+
+			var Test2 = new TestModel({ name: "test-predefined-validation-unique" });
+			Test2.save(function (err) {
+				assert.equal(typeof err, "object");
+				assert.equal(err.field, "name");
+				assert.equal(err.value, "test-predefined-validation-unique");
+				assert.equal(err.msg, "not-unique");
+
+				db.close();
+			});
+		});
+	});
+});

From 889641e6136d8ec08e62e2cb1a340e6b550c8429 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 24 Jan 2013 18:35:49 +0000
Subject: [PATCH 0063/1246] Changes postgres.sync() to check if table creation
 is successfull before adding subqueries (indexes, types, ..) (fixes #24)

---
 lib/Drivers/DDL/postgres.js | 61 +++++++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 19 deletions(-)

diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index f0f6837f..7d880a21 100644
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -18,7 +18,8 @@ exports.drop = function (driver, opts, cb) {
 };
 
 exports.sync = function (driver, opts, cb) {
-	var queries = [];
+	var tables = [];
+	var subqueries = [];
 	var definitions = [];
 	var k, i, pending, tmp;
 
@@ -47,7 +48,7 @@ exports.sync = function (driver, opts, cb) {
 				break;
 			case "enum":
 				tmp = driver.escapeId("enum_" + opts.table + "_" + k);
-				queries.push(
+				subqueries.push(
 					"CREATE TYPE " + tmp + " AS ENUM (" +
 					opts.properties[k].values.map(driver.escape.bind(driver.db)) + ")"
 				);
@@ -62,31 +63,35 @@ exports.sync = function (driver, opts, cb) {
 		definitions.push(driver.escapeId(opts.one_associations[i].field) + " INTEGER NOT NULL");
 	}
 
-	queries.push(
-		"CREATE TABLE IF NOT EXISTS " + driver.escapeId(opts.table) +
-		" (" + definitions.join(", ") + ")"
-	);
-	queries.push(
+	tables.push({
+		name       : opts.table,
+		query      : "CREATE TABLE " + driver.escapeId(opts.table) +
+		             " (" + definitions.join(", ") + ")",
+		subqueries : subqueries
+	});
+	tables[tables.length - 1].subqueries.push(
 		"CREATE INDEX ON " + driver.escapeId(opts.table) +
 		" (" + driver.escapeId(opts.id) + ")"
 	);
 
 	for (i = 0; i < opts.one_associations.length; i++) {
-		queries.push(
+		tables[tables.length - 1].subqueries.push(
 			"CREATE INDEX ON " + driver.escapeId(opts.table) +
 			" (" + driver.escapeId(opts.one_associations[i].field) + ")"
 		);
 	}
 
 	for (i = 0; i < opts.many_associations.length; i++) {
-		queries.push(
-			"CREATE TABLE IF NOT EXISTS " + driver.escapeId(opts.many_associations[i].mergeTable) +
-			" (" +
-			driver.escapeId(opts.many_associations[i].mergeId) + " INTEGER NOT NULL, " +
-			driver.escapeId(opts.many_associations[i].mergeAssocId) + " INTEGER NOT NULL" +
-			")"
-		);
-		queries.push(
+		tables.push({
+			name       : opts.many_associations[i].mergeTable,
+			query      : "CREATE TABLE IF NOT EXISTS " + driver.escapeId(opts.many_associations[i].mergeTable) +
+			             " (" +
+			             driver.escapeId(opts.many_associations[i].mergeId) + " INTEGER NOT NULL, " +
+			             driver.escapeId(opts.many_associations[i].mergeAssocId) + " INTEGER NOT NULL" +
+			             ")",
+			subqueries : []
+		});
+		tables[tables.length - 1].subqueries.push(
 			"CREATE INDEX ON " + driver.escapeId(opts.many_associations[i].mergeTable) +
 			" (" +
 			driver.escapeId(opts.many_associations[i].mergeId) + ", " +
@@ -95,9 +100,9 @@ exports.sync = function (driver, opts, cb) {
 		);
 	}
 
-	pending = queries.length;
-	for (i = 0; i < queries.length; i++) {
-		driver.db.query(queries[i], function (err) {
+	pending = tables.length;
+	for (i = 0; i < tables.length; i++) {
+		createTableSchema(driver, tables[i], function (err) {
 			if (--pending === 0) {
 				// this will bring trouble in the future...
 				// some errors are not avoided (like ENUM types already defined, etc..)
@@ -106,3 +111,21 @@ exports.sync = function (driver, opts, cb) {
 		});
 	}
 };
+
+function createTableSchema(driver, table, cb) {
+	driver.db.query(table.query, function (err) {
+		if (err || table.subqueries.length === 0) {
+			return cb();
+		}
+
+		var pending = table.subqueries.length;
+
+		for (var i = 0; i < table.subqueries.length; i++) {
+			driver.db.query(table.subqueries[i], function (err) {
+				if (--pending === 0) {
+					return cb();
+				}
+			});
+		}
+	});
+}

From 04a6cac3c038be14250ae1fbf9a247e62aef5f2f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 24 Jan 2013 18:53:28 +0000
Subject: [PATCH 0064/1246] Adds support for "unique": true property options
 (only for model synching)

---
 lib/Drivers/DDL/mysql.js    | 5 +++++
 lib/Drivers/DDL/postgres.js | 5 +++++
 lib/Drivers/DDL/sqlite.js   | 9 +++++++++
 3 files changed, 19 insertions(+)

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index 641394be..5dbaa414 100644
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -62,6 +62,11 @@ exports.sync = function (driver, opts, cb) {
 	}
 
 	definitions.push("INDEX (" + driver.escapeId(opts.id) + ")");
+	for (k in opts.properties) {
+		if (opts.properties[k].unique === true) {
+			definitions.push("UNIQUE KEY " + driver.escapeId(k) + " (" + driver.escapeId(k) + ")");
+		}
+	}
 	for (i = 0; i < opts.one_associations.length; i++) {
 		definitions.push("INDEX (" + driver.escapeId(opts.one_associations[i].field) + ")");
 	}
diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index 7d880a21..be1f494a 100644
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -62,6 +62,11 @@ exports.sync = function (driver, opts, cb) {
 	for (i = 0; i < opts.one_associations.length; i++) {
 		definitions.push(driver.escapeId(opts.one_associations[i].field) + " INTEGER NOT NULL");
 	}
+	for (k in opts.properties) {
+		if (opts.properties[k].unique === true) {
+			definitions.push("UNIQUE (" + driver.escapeId(k) + ")");
+		}
+	}
 
 	tables.push({
 		name       : opts.table,
diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index ab384634..0db67699 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -57,6 +57,15 @@ exports.sync = function (driver, opts, cb) {
 		"CREATE TABLE IF NOT EXISTS " + driver.escapeId(opts.table) +
 		" (" + definitions.join(", ") + ")"
 	);
+	for (k in opts.properties) {
+		if (opts.properties[k].unique === true) {
+			queries.push(
+				"CREATE UNIQUE INDEX IF NOT EXISTS " + driver.escapeId(k) +
+				" ON " + driver.escapeId(opts.table) +
+				" (" + driver.escapeId(k) + ")"
+			);
+		}
+	}
 
 	for (i = 0; i < opts.one_associations.length; i++) {
 		queries.push(

From b851dc9be3d873b45598bdf4fd39cf538a1f99b8 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 24 Jan 2013 20:44:30 +0000
Subject: [PATCH 0065/1246] Adds chainfind.first() to run and return only the
 first result (or null if none)

---
 lib/ChainFind.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 131ee451..9664ccae 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -62,6 +62,11 @@ function ChainFind(opts) {
 			});
 			return this;
 		},
+		first: function (cb) {
+			return this.run(function (err, items) {
+				return cb(err, items.length > 0 ? items[0] : null);
+			});
+		},
 		run: function (cb) {
 			opts.driver.find(opts.only, opts.table, opts.conditions, {
 				limit  : opts.limit,

From 98c33eb9dcfce8e845d448396ad4618e1270cd46 Mon Sep 17 00:00:00 2001
From: Tape <dave@davidkosub.com>
Date: Thu, 24 Jan 2013 15:08:56 -0600
Subject: [PATCH 0066/1246] Allow undefined to create an empty model instance

---
 lib/Model.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Model.js b/lib/Model.js
index a17690dd..317cb9d6 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -42,6 +42,8 @@ function Model(opts) {
 				});
 			});
 			return instance;
+		} else if (typeof data == "undefined") {
+			data = {};
 		}
 		return new Instance({
 			id                     : opts.id,

From c85d2833f9be75079515fcb683b9ba1ba3259bb4 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 24 Jan 2013 21:15:24 +0000
Subject: [PATCH 0067/1246] Adds lazyload experiment

I'll describe it when I'm confident about it
---
 lib/LazyLoad.js | 73 +++++++++++++++++++++++++++++++++++++++++++++++++
 lib/Model.js    | 30 ++++++++++++++++++--
 2 files changed, 101 insertions(+), 2 deletions(-)
 create mode 100644 lib/LazyLoad.js

diff --git a/lib/LazyLoad.js b/lib/LazyLoad.js
new file mode 100644
index 00000000..76dcec24
--- /dev/null
+++ b/lib/LazyLoad.js
@@ -0,0 +1,73 @@
+exports.extend = function (Instance, Model, properties) {
+	for (var k in properties) {
+		if (properties[k].lazyload === true) {
+			addLazyLoadProperty(properties[k].lazyname || k, Instance, Model, k);
+		}
+	}
+};
+
+function addLazyLoadProperty(name, Instance, Model, property) {
+	var method = ucfirst(name);
+
+	Object.defineProperty(Instance, "get" + method, {
+		value: function (cb) {
+			var conditions = {};
+			conditions[Model.id] = Instance.id;
+
+			Model.find(conditions, { cache: false }).only(property).first(function (err, item) {
+				return cb(err, item ? item[property] : null);
+			});
+
+			return this;
+		},
+		enumerable: false
+	});
+	Object.defineProperty(Instance, "remove" + method, {
+		value: function (cb) {
+			var conditions = {};
+			conditions[Model.id] = Instance.id;
+
+			Model.find(conditions, { cache: false }).only(property).first(function (err, item) {
+				if (err) {
+					return cb(err);
+				}
+				if (!item) {
+					return cb(null);
+				}
+
+				item[Model.id] = Instance.id;
+				item[property] = null;
+				return item.save(cb);
+			});
+
+			return this;
+		},
+		enumerable: false
+	});
+	Object.defineProperty(Instance, "set" + method, {
+		value: function (data, cb) {
+			var conditions = {};
+			conditions[Model.id] = Instance.id;
+
+			Model.find(conditions, { cache: false }).only(property).first(function (err, item) {
+				if (err) {
+					return cb(err);
+				}
+				if (!item) {
+					return cb(null);
+				}
+
+				item[Model.id] = Instance.id;
+				item[property] = data;
+				return item.save(cb);
+			});
+
+			return this;
+		},
+		enumerable: false
+	});
+}
+
+function ucfirst(text) {
+	return text[0].toUpperCase() + text.substr(1).toLowerCase();
+}
diff --git a/lib/Model.js b/lib/Model.js
index a17690dd..6d4db360 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -3,6 +3,7 @@ var Singleton       = require("./Singleton");
 var OneAssociation  = require("./Associations/One");
 var ManyAssociation = require("./Associations/Many");
 var ChainFind       = require("./ChainFind");
+var LazyLoad        = require("./LazyLoad");
 
 exports.Model = Model;
 
@@ -13,6 +14,7 @@ function Model(opts) {
 	var one_associations = [];
 	var many_associations = [];
 	var association_properties = [];
+	var model_fields = null;
 
 	var model = function (data) {
 		if (typeof data == "number") {
@@ -32,6 +34,9 @@ function Model(opts) {
 				validations            : opts.validations,
 				association_properties : association_properties
 			});
+			if (model_fields !== null) {
+				LazyLoad.extend(instance, model, opts.properties);
+			}
 			OneAssociation.extend(instance, opts.driver, one_associations, {
 				autoFetch      : false
 			}, function () {
@@ -59,6 +64,18 @@ function Model(opts) {
 		});
 	};
 
+	for (var k in opts.properties) {
+		if (opts.properties[k].lazyload === true) {
+			model_fields = [ opts.id ];
+			for (k in opts.properties) {
+				if (opts.properties[k].lazyload !== true) {
+					model_fields.push(k);
+				}
+			}
+			break;
+		}
+	}
+
 	OneAssociation.prepare(model, one_associations, association_properties);
 	ManyAssociation.prepare(model, many_associations);
 
@@ -113,7 +130,7 @@ function Model(opts) {
 			options.cache = opts.cache;
 		}
 
-		opts.driver.find(null, opts.table, conditions, { limit: 1 }, function (err, data) {
+		opts.driver.find(model_fields, opts.table, conditions, { limit: 1 }, function (err, data) {
 			if (err) {
 				return cb(err);
 			}
@@ -134,6 +151,9 @@ function Model(opts) {
 					validations            : opts.validations,
 					association_properties : association_properties
 				});
+				if (model_fields !== null) {
+					LazyLoad.extend(instance, model, opts.properties);
+				}
 				OneAssociation.extend(instance, opts.driver, one_associations, {
 					autoFetch      : (options.autoFetchLimit === 0 ? false : opts.autoFetch),
 					autoFetchLimit : options.autoFetchLimit || opts.autoFetchLimit
@@ -197,7 +217,7 @@ function Model(opts) {
 		}
 
 		var chain = new ChainFind({
-			only       : options.only || null,
+			only       : options.only || model_fields,
 			id         : opts.id,
 			table      : opts.table,
 			driver     : opts.driver,
@@ -225,6 +245,9 @@ function Model(opts) {
 						validations            : opts.validations,
 						association_properties : association_properties
 					});
+					if (model_fields !== null) {
+						LazyLoad.extend(instance, model, opts.properties);
+					}
 					OneAssociation.extend(instance, opts.driver, one_associations, {
 						autoFetch      : (options.autoFetchLimit === 0 ? false : opts.autoFetch),
 						autoFetchLimit : options.autoFetchLimit
@@ -317,6 +340,9 @@ function Model(opts) {
 				validations            : opts.validations,
 				association_properties : association_properties
 			});
+			if (model_fields !== null) {
+				LazyLoad.extend(Instances[idx], model, opts.properties);
+			}
 			Instances[idx].save(function (err) {
 				if (err) {
 					err.index = idx;

From a2c22cc4f5eb9c8b0b9dc3e2800c21ae880beb8a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 24 Jan 2013 21:30:08 +0000
Subject: [PATCH 0068/1246] Bumps version to 2.0.0-alpha9

Adds 3 contributors, published to npm
---
 Readme.md    | 2 +-
 package.json | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Readme.md b/Readme.md
index aa2fee95..8c0db4f3 100644
--- a/Readme.md
+++ b/Readme.md
@@ -5,7 +5,7 @@
 ## Install
 
 ```sh
-npm install orm@2.0.0-alpha8
+npm install orm@2.0.0-alpha9
 ```
 
 Despite the alpha tag, this is the recommended version for new applications.
diff --git a/package.json b/package.json
index be5c11f4..bc07bc9a 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "postgres",
     "sqlite"
   ],
-  "version": "2.0.0-alpha8",
+  "version": "2.0.0-alpha9",
   "license": "MIT",
   "repository": {
     "url": "http://dresende.github.com/node-orm2"
@@ -21,7 +21,10 @@
   "contributors": [
     { "name": "Bramus Van Damme", "email": "bramus@bram.us" },
     { "name": "Lorien Gamaroff", "email": "lorien@gamaroff.org" },
-    { "name": "preslavrachev" }
+    { "name": "preslavrachev" },
+    { "name": "Chris Cowan", "email": "me@chriscowan.us" },
+    { "name": "Paul Dixon", "email": "paul.dixon@mintbridge.co.uk" },
+    { "name": "David Kosub" }
   ],
   "main": "./lib/ORM",
   "scripts": {

From 808be1a61cff15f1b501893a8f25bca0bd724113 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 24 Jan 2013 23:23:11 +0000
Subject: [PATCH 0069/1246] Changes Model to accept opts.id without default. No
 need, it's always defined

---
 lib/Model.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Model.js b/lib/Model.js
index f4cbc2cf..ed169511 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -9,7 +9,7 @@ exports.Model = Model;
 
 function Model(opts) {
 	opts = opts || {};
-	opts.id = opts.id || "id";
+	opts.id = opts.id;
 
 	var one_associations = [];
 	var many_associations = [];

From 4a43aa797bbcdaa128d9e579df46987481b4a3fe Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 24 Jan 2013 23:25:29 +0000
Subject: [PATCH 0070/1246] Adds settings object to orm

There's only 1 option available now. Example:

```js
console.log(orm.settings.get("properties.primary_key")); // "id"
orm.settings.get("properties.primary_key", "name");
```

This would force models created after this statement to use "name" as
primary key:

```js
Person.get("John", cb); // SELECT * FROM person WHERE name = 'John'
```
---
 lib/ORM.js      |  4 +++-
 lib/Settings.js | 43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 lib/Settings.js

diff --git a/lib/ORM.js b/lib/ORM.js
index 80c2779f..048a54d9 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -6,8 +6,10 @@ var DriverAliases = require("./Drivers/aliases");
 var Validators    = require("./Validators");
 var Property      = require("./Property");
 var SqlTools      = require("./sql/Tools");
+var Settings      = require("./Settings");
 
 exports.validators = Validators;
+exports.settings   = Settings;
 
 for (var tool in SqlTools) {
 	exports[tool] = SqlTools[tool];
@@ -99,7 +101,7 @@ ORM.prototype.define = function (name, properties, opts) {
 		table          : opts.table || opts.collection || name,
 		properties     : properties,
 		cache          : opts.cache,
-		id             : opts.id || "id",
+		id             : opts.id || Settings.get("properties.primary_key"),
 		autoSave       : opts.autoSave || false,
 		autoFetch      : opts.autoFetch || false,
 		autoFetchLimit : opts.autoFetchLimit,
diff --git a/lib/Settings.js b/lib/Settings.js
new file mode 100644
index 00000000..0ddd1551
--- /dev/null
+++ b/lib/Settings.js
@@ -0,0 +1,43 @@
+var settings = {
+	properties : {
+		primary_key : "id"
+	}
+};
+
+exports.set = function (key, value) {
+	set(key, value, settings);
+
+	return this;
+};
+
+exports.get = function (key) {
+	return get(key, settings);
+};
+
+function set(key, value, obj) {
+	var p = key.indexOf(".");
+
+	if (p == -1) {
+		return obj[key] = value;
+	}
+
+	if (!obj.hasOwnProperty(key.substr(0, p))) {
+		obj[key.substr(0, p)] = {};
+	}
+
+	return set(key.substr(p + 1), value, obj[key.substr(0, p)]);
+}
+
+function get(key, obj) {
+	var p = key.indexOf(".");
+
+	if (p == -1) {
+		return obj[key];
+	}
+
+	if (!obj.hasOwnProperty(key.substr(0, p))) {
+		return undefined;
+	}
+
+	return get(key.substr(p + 1), obj[key.substr(0, p)]);
+}

From ef512eb8ed9fa06bf5c55a3e1dabf03d2588063f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 24 Jan 2013 23:29:54 +0000
Subject: [PATCH 0071/1246] Fixes possible bug when removing instances where
 primary key is not called "id"

---
 lib/Instance.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 0d3a38ef..ab6efeec 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -150,7 +150,7 @@ function Instance(opts) {
 			return cb(null);
 		}
 		var conditions = {};
-		conditions[opts.id] = opts.data.id;
+		conditions[opts.id] = opts.data[opts.id];
 
 		Hook.trigger(instance, opts.hooks.beforeRemove);
 		opts.driver.remove(opts.table, conditions, function (err, data) {

From 34e89dc7784dc95f635518552488b4859f5af040 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 24 Jan 2013 23:32:43 +0000
Subject: [PATCH 0072/1246] Adds test for primary key property name setting

---
 .../test-settings-properties-primary-key.js   | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 test/integration/test-settings-properties-primary-key.js

diff --git a/test/integration/test-settings-properties-primary-key.js b/test/integration/test-settings-properties-primary-key.js
new file mode 100644
index 00000000..074b7535
--- /dev/null
+++ b/test/integration/test-settings-properties-primary-key.js
@@ -0,0 +1,33 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_settings_properties_primary_key', db.driver.db, function () {
+		common.insertModelData('test_settings_properties_primary_key', db.driver.db, [
+			{ id : 1, name : 'test1' },
+			{ id : 2, name : 'test2' },
+			{ id : 3, name : 'test3' },
+			{ id : 4, name : 'test4' },
+			{ id : 5, name : 'test5' }
+		], function (err) {
+			if (err) throw err;
+
+			common.ORM.settings.set('properties.primary_key', 'name');
+
+			var properties = common.getModelProperties();
+			// since "id" is no longer primary key and instances ignore non model properties,
+			// we have to define "id" as a common property so we can check it later
+			properties.id = Number;
+
+			var TestModel = db.define('test_settings_properties_primary_key', properties);
+
+			TestModel.get('test4', function (err, Test4) {
+				assert.equal(err, null);
+				assert.equal(Test4.id, 4);
+				assert.equal(Test4.name, 'test4');
+
+				db.close();
+			});
+		});
+	});
+});

From 7a7d5f23d6347442e3eb77eb48f3d38ee8376eb8 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 25 Jan 2013 00:41:35 +0000
Subject: [PATCH 0073/1246] Changes options.*Function to options.*Accessor in
 hasOne and hasMany associations

---
 lib/Associations/Many.js | 26 +++++++++++++-------------
 lib/Associations/One.js  | 18 +++++++++---------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index e39a9ead..609cbde3 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -42,11 +42,11 @@ exports.prepare = function (Model, associations) {
 			mergeTable     : opts.mergeTable || (Model.table + "_" + name),
 			mergeId        : opts.mergeId || (Model.table + "_id"),
 			mergeAssocId   : opts.mergeAssocId || (name + "_id"),
-			getFunction    : opts.getFunction || ("get" + assocName),
-			setFunction    : opts.setFunction || ("set" + assocName),
-			hasFunction    : opts.hasFunction || ("has" + assocName),
-			delFunction    : opts.delFunction || ("remove" + assocName),
-			addFunction    : opts.addFunction || ("add" + assocName)
+			getAccessor    : opts.getAccessor || ("get" + assocName),
+			setAccessor    : opts.setAccessor || ("set" + assocName),
+			hasAccessor    : opts.hasAccessor || ("has" + assocName),
+			delAccessor    : opts.delAccessor || ("remove" + assocName),
+			addAccessor    : opts.addAccessor || ("add" + assocName)
 		});
 		return this;
 	};
@@ -72,7 +72,7 @@ exports.extend = function (Instance, Driver, associations, opts, cb) {
 };
 
 function extendInstance(Instance, Driver, association, opts, cb) {
-	Object.defineProperty(Instance, association.hasFunction, {
+	Object.defineProperty(Instance, association.hasAccessor, {
 		value: function () {
 			var Instances = Array.prototype.slice.apply(arguments);
 			var cb = Instances.pop();
@@ -107,7 +107,7 @@ function extendInstance(Instance, Driver, association, opts, cb) {
 		},
 		enumerable: false
 	});
-	Object.defineProperty(Instance, association.getFunction, {
+	Object.defineProperty(Instance, association.getAccessor, {
 		value: function () {
 			var conditions = null;
 			var options = {};
@@ -157,23 +157,23 @@ function extendInstance(Instance, Driver, association, opts, cb) {
 		},
 		enumerable: false
 	});
-	Object.defineProperty(Instance, association.setFunction, {
+	Object.defineProperty(Instance, association.setAccessor, {
 		value: function () {
 			var Instances = Array.prototype.slice.apply(arguments);
 			var cb = Instances.pop();
 
-			Instance[association.delFunction](function (err) {
+			Instance[association.delAccessor](function (err) {
 				if (err) {
 					return cb(err);
 				}
 				Instances.push(cb);
-				Instance[association.addFunction].apply(Instance, Instances);
+				Instance[association.addAccessor].apply(Instance, Instances);
 			});
 			return this;
 		},
 		enumerable: false
 	});
-	Object.defineProperty(Instance, association.delFunction, {
+	Object.defineProperty(Instance, association.delAccessor, {
 		value: function () {
 			var Associations = Array.prototype.slice.apply(arguments);
 			var cb = Associations.pop();
@@ -204,7 +204,7 @@ function extendInstance(Instance, Driver, association, opts, cb) {
 		},
 		enumerable: false
 	});
-	Object.defineProperty(Instance, association.addFunction, {
+	Object.defineProperty(Instance, association.addAccessor, {
 		value: function () {
 			var Associations = [];
 			var opts = {};
@@ -270,7 +270,7 @@ function extendInstance(Instance, Driver, association, opts, cb) {
 		return cb();
 	}
 
-	Instance[association.getFunction]({}, { autoFetchLimit: opts.autoFetchLimit - 1 }, function (err, Assoc) {
+	Instance[association.getAccessor]({}, { autoFetchLimit: opts.autoFetchLimit - 1 }, function (err, Assoc) {
 		if (!err) {
 			Instance[association.name] = Assoc;
 		}
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index 195a2dfb..b366d946 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -14,10 +14,10 @@ exports.prepare = function (Model, associations, association_properties) {
 			autoFetch      : opts.autoFetch || false,
 			autoFetchLimit : opts.autoFetchLimit || 2,
 			field          : opts.field || (name + "_id"),
-			getFunction    : opts.getFunction || ("get" + assocName),
-			setFunction    : opts.setFunction || ("set" + assocName),
-			hasFunction    : opts.hasFunction || ("has" + assocName),
-			delFunction    : opts.delFunction || ("remove" + assocName)
+			getAccessor    : opts.getAccessor || ("get" + assocName),
+			setAccessor    : opts.setAccessor || ("set" + assocName),
+			hasAccessor    : opts.hasAccessor || ("has" + assocName),
+			delAccessor    : opts.delAccessor || ("remove" + assocName)
 		};
 		associations.push(association);
 		association_properties.push(association.field);
@@ -54,7 +54,7 @@ exports.extend = function (Instance, Driver, associations, opts, cb) {
 };
 
 function extendInstance(Instance, Driver, association, opts, cb) {
-	Object.defineProperty(Instance, association.hasFunction, {
+	Object.defineProperty(Instance, association.hasAccessor, {
 		value: function (opts, cb) {
 			if (typeof opts == "function") {
 				cb = opts;
@@ -73,7 +73,7 @@ function extendInstance(Instance, Driver, association, opts, cb) {
 		},
 		enumerable: false
 	});
-	Object.defineProperty(Instance, association.getFunction, {
+	Object.defineProperty(Instance, association.getAccessor, {
 		value: function (opts, cb) {
 			if (typeof opts == "function") {
 				cb = opts;
@@ -101,7 +101,7 @@ function extendInstance(Instance, Driver, association, opts, cb) {
 		enumerable: false
 	});
 	if (!association.reversed) {
-		Object.defineProperty(Instance, association.setFunction, {
+		Object.defineProperty(Instance, association.setAccessor, {
 			value: function (OtherInstance, cb) {
 				OtherInstance.save(function (err) {
 					if (err) {
@@ -117,7 +117,7 @@ function extendInstance(Instance, Driver, association, opts, cb) {
 			},
 			enumerable: false
 		});
-		Object.defineProperty(Instance, association.delFunction, {
+		Object.defineProperty(Instance, association.delAccessor, {
 			value: function (cb) {
 				Instance[association.field] = 0;
 				Instance.save(cb);
@@ -136,7 +136,7 @@ function extendInstance(Instance, Driver, association, opts, cb) {
 		return cb();
 	}
 
-	Instance[association.getFunction]({ autoFetchLimit: opts.autoFetchLimit - 1 }, function (err, Assoc) {
+	Instance[association.getAccessor]({ autoFetchLimit: opts.autoFetchLimit - 1 }, function (err, Assoc) {
 		if (!err) {
 			Instance[association.name] = Assoc;
 		}

From 5c31ae6a22b8bdc14a3dd441734a40a0ef668f50 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 25 Jan 2013 00:52:55 +0000
Subject: [PATCH 0074/1246] Adds setting properties.association_key
 (defualt='{name}_id')

---
 lib/Associations/Many.js | 5 +++--
 lib/Associations/One.js  | 4 +++-
 lib/Settings.js          | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 609cbde3..27e027dc 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -38,10 +38,11 @@ exports.prepare = function (Model, associations) {
 			props          : props,
 			autoFetch      : opts.autoFetch || false,
 			autoFetchLimit : opts.autoFetchLimit || 2,
-			field          : opts.field || (name + "_id"),
+			// I'm not sure the next key is used..
+			field          : opts.field || Settings.get("properties.association_key").replace("{name}", name),
 			mergeTable     : opts.mergeTable || (Model.table + "_" + name),
 			mergeId        : opts.mergeId || (Model.table + "_id"),
-			mergeAssocId   : opts.mergeAssocId || (name + "_id"),
+			mergeAssocId   : opts.mergeAssocId || Settings.get("properties.association_key").replace("{name}", name),
 			getAccessor    : opts.getAccessor || ("get" + assocName),
 			setAccessor    : opts.setAccessor || ("set" + assocName),
 			hasAccessor    : opts.hasAccessor || ("has" + assocName),
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index b366d946..e6ba1b13 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -1,3 +1,5 @@
+var Settings = require("../Settings");
+
 exports.prepare = function (Model, associations, association_properties) {
 	Model.hasOne = function (name, OtherModel, opts) {
 		if (typeof OtherModel == "object" && !OtherModel.table) {
@@ -13,7 +15,7 @@ exports.prepare = function (Model, associations, association_properties) {
 			reversed       : opts.reversed,
 			autoFetch      : opts.autoFetch || false,
 			autoFetchLimit : opts.autoFetchLimit || 2,
-			field          : opts.field || (name + "_id"),
+			field          : opts.field || Settings.get("properties.association_key").replace("{name}", name),
 			getAccessor    : opts.getAccessor || ("get" + assocName),
 			setAccessor    : opts.setAccessor || ("set" + assocName),
 			hasAccessor    : opts.hasAccessor || ("has" + assocName),
diff --git a/lib/Settings.js b/lib/Settings.js
index 0ddd1551..260094a1 100644
--- a/lib/Settings.js
+++ b/lib/Settings.js
@@ -1,6 +1,7 @@
 var settings = {
 	properties : {
-		primary_key : "id"
+		primary_key     : "id",
+		association_key : "{name}_id"
 	}
 };
 

From 5d733aafae23ce313ab53d5af01859d4caebf1dd Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 25 Jan 2013 00:53:55 +0000
Subject: [PATCH 0075/1246] Adds missing Settings include in
 Associations/Many.js

---
 lib/Associations/Many.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 27e027dc..679c587e 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -1,5 +1,6 @@
 var InstanceConstructor = require("../Instance").Instance;
 var Singleton           = require("../Singleton");
+var Settings            = require("../Settings");
 
 exports.prepare = function (Model, associations) {
 	Model.hasMany = function () {

From 32d3fca9238ef3a66e5044e4f9353976ad36fcf9 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 25 Jan 2013 00:58:02 +0000
Subject: [PATCH 0076/1246] Changes hasMany associations mergeId option to also
 use properties.association_key setting as default value

---
 lib/Associations/Many.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 679c587e..3614d62a 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -42,7 +42,7 @@ exports.prepare = function (Model, associations) {
 			// I'm not sure the next key is used..
 			field          : opts.field || Settings.get("properties.association_key").replace("{name}", name),
 			mergeTable     : opts.mergeTable || (Model.table + "_" + name),
-			mergeId        : opts.mergeId || (Model.table + "_id"),
+			mergeId        : opts.mergeId || Settings.get("properties.association_key").replace("{name}", Model.table),
 			mergeAssocId   : opts.mergeAssocId || Settings.get("properties.association_key").replace("{name}", name),
 			getAccessor    : opts.getAccessor || ("get" + assocName),
 			setAccessor    : opts.setAccessor || ("set" + assocName),

From ed85d1fd79d2895151133eefd594f8db0f37ac8b Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 25 Jan 2013 01:03:53 +0000
Subject: [PATCH 0077/1246] Changes Setting.get() to accept a default value if
 setting is not found

---
 lib/Settings.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/Settings.js b/lib/Settings.js
index 260094a1..0f49b74f 100644
--- a/lib/Settings.js
+++ b/lib/Settings.js
@@ -11,8 +11,8 @@ exports.set = function (key, value) {
 	return this;
 };
 
-exports.get = function (key) {
-	return get(key, settings);
+exports.get = function (key, def) {
+	return get(key, def, settings);
 };
 
 function set(key, value, obj) {
@@ -29,16 +29,19 @@ function set(key, value, obj) {
 	return set(key.substr(p + 1), value, obj[key.substr(0, p)]);
 }
 
-function get(key, obj) {
+function get(key, def, obj) {
 	var p = key.indexOf(".");
 
 	if (p == -1) {
-		return obj[key];
+		if (!obj.hasOwnProperty(key)) {
+			return obj[key];
+		}
+		return def;
 	}
 
 	if (!obj.hasOwnProperty(key.substr(0, p))) {
-		return undefined;
+		return def;
 	}
 
-	return get(key.substr(p + 1), obj[key.substr(0, p)]);
+	return get(key.substr(p + 1), def, obj[key.substr(0, p)]);
 }

From cb890196779b1bb0f4d7f2301d45642f30e037cd Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 25 Jan 2013 14:12:44 +0000
Subject: [PATCH 0078/1246] Fixes previous change to add a default value for
 settings.get()

---
 lib/Settings.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/Settings.js b/lib/Settings.js
index 0f49b74f..1308a1b0 100644
--- a/lib/Settings.js
+++ b/lib/Settings.js
@@ -33,10 +33,7 @@ function get(key, def, obj) {
 	var p = key.indexOf(".");
 
 	if (p == -1) {
-		if (!obj.hasOwnProperty(key)) {
-			return obj[key];
-		}
-		return def;
+		return obj.hasOwnProperty(key) ? obj[key] : def;
 	}
 
 	if (!obj.hasOwnProperty(key.substr(0, p))) {

From b5fc027bb9d4cfdeb6f24fa2afa6aad1036664ea Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 25 Jan 2013 14:49:08 +0000
Subject: [PATCH 0079/1246] Adds generic settings object test

---
 test/integration/test-settings.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 test/integration/test-settings.js

diff --git a/test/integration/test-settings.js b/test/integration/test-settings.js
new file mode 100644
index 00000000..a2569fa3
--- /dev/null
+++ b/test/integration/test-settings.js
@@ -0,0 +1,15 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.ORM.settings.set("some.sub.object", 123.45);
+
+assert.equal(common.ORM.settings.get("some.sub.object"), 123.45);
+assert.equal(common.ORM.settings.get("some.other.sub.object", 789), 789);
+
+var testFunction = function () {
+	return "test";
+};
+
+common.ORM.settings.set("some....object", testFunction);
+
+assert.equal(common.ORM.settings.get("some....object"), testFunction);

From 034b1c2879f2937231ce13ebc62606b265a79d20 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 25 Jan 2013 14:52:15 +0000
Subject: [PATCH 0080/1246] Adds settings.unset(key, ...)

---
 lib/Settings.js                   | 25 ++++++++++++++++++++++++-
 test/integration/test-settings.js |  5 +++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/lib/Settings.js b/lib/Settings.js
index 1308a1b0..63ef358c 100644
--- a/lib/Settings.js
+++ b/lib/Settings.js
@@ -10,10 +10,18 @@ exports.set = function (key, value) {
 
 	return this;
 };
-
 exports.get = function (key, def) {
 	return get(key, def, settings);
 };
+exports.unset = function () {
+	for (var i = 0; i < arguments.length; i++) {
+		if (typeof arguments[i] == "string") {
+			unset(arguments[i], settings);
+		}
+	}
+
+	return this;
+};
 
 function set(key, value, obj) {
 	var p = key.indexOf(".");
@@ -42,3 +50,18 @@ function get(key, def, obj) {
 
 	return get(key.substr(p + 1), def, obj[key.substr(0, p)]);
 }
+
+function unset(key, obj) {
+	var p = key.indexOf(".");
+
+	if (p == -1) {
+		delete obj[key];
+		return;
+	}
+
+	if (!obj.hasOwnProperty(key.substr(0, p))) {
+		return;
+	}
+
+	return unset(key.substr(p + 1), obj[key.substr(0, p)]);
+}
diff --git a/test/integration/test-settings.js b/test/integration/test-settings.js
index a2569fa3..ca64bd92 100644
--- a/test/integration/test-settings.js
+++ b/test/integration/test-settings.js
@@ -13,3 +13,8 @@ var testFunction = function () {
 common.ORM.settings.set("some....object", testFunction);
 
 assert.equal(common.ORM.settings.get("some....object"), testFunction);
+
+common.ORM.settings.unset("some....object", "some.sub.object");
+
+assert.equal(common.ORM.settings.get("some....object"), undefined);
+assert.equal(common.ORM.settings.get("some.sub.object"), undefined);

From 6afe28fb46862991aad9e88716d56b42b5ae98bd Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 25 Jan 2013 15:03:46 +0000
Subject: [PATCH 0081/1246] Fixes bug on settings.unset(), adds
 settings.get('foo.bar.*'), adds tests

---
 lib/Settings.js                   | 13 +++++++++++--
 test/integration/test-settings.js | 11 +++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/lib/Settings.js b/lib/Settings.js
index 63ef358c..076f6349 100644
--- a/lib/Settings.js
+++ b/lib/Settings.js
@@ -41,6 +41,9 @@ function get(key, def, obj) {
 	var p = key.indexOf(".");
 
 	if (p == -1) {
+		if (key == '*') {
+			return obj;
+		}
 		return obj.hasOwnProperty(key) ? obj[key] : def;
 	}
 
@@ -55,7 +58,11 @@ function unset(key, obj) {
 	var p = key.indexOf(".");
 
 	if (p == -1) {
-		delete obj[key];
+		if (key == '*') {
+			return 'reset';
+		} else {
+			delete obj[key];
+		}
 		return;
 	}
 
@@ -63,5 +70,7 @@ function unset(key, obj) {
 		return;
 	}
 
-	return unset(key.substr(p + 1), obj[key.substr(0, p)]);
+	if (unset(key.substr(p + 1), obj[key.substr(0, p)]) == 'reset') {
+		obj[key.substr(0, p)] = {};
+	}
 }
diff --git a/test/integration/test-settings.js b/test/integration/test-settings.js
index ca64bd92..fb349c05 100644
--- a/test/integration/test-settings.js
+++ b/test/integration/test-settings.js
@@ -18,3 +18,14 @@ common.ORM.settings.unset("some....object", "some.sub.object");
 
 assert.equal(common.ORM.settings.get("some....object"), undefined);
 assert.equal(common.ORM.settings.get("some.sub.object"), undefined);
+
+common.ORM.settings.set("some.other.stuff", 123.45);
+common.ORM.settings.set("some.more.stuff", 123.45);
+common.ORM.settings.unset("some.*");
+
+assert.equal(common.ORM.settings.get("some.other.stuff"), undefined);
+assert.equal(common.ORM.settings.get("some.more.stuff"), undefined);
+assert.equal(typeof common.ORM.settings.get("some.*"), "object");
+assert.equal(Object.keys(common.ORM.settings.get("some.*")).length, 0);
+assert.equal(typeof common.ORM.settings.get("some"), "object");
+assert.equal(Object.keys(common.ORM.settings.get("some")).length, 0);

From 7618fffb9b92c66bc89d52d2f7d676720f7a45e3 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 25 Jan 2013 15:14:19 +0000
Subject: [PATCH 0082/1246] Changes orm.settings() to be global and then pass
 snapshots of it when connecting to a specific database

This allows people to have different settings for different drivers or
connections
---
 lib/Associations/Many.js |  6 +++---
 lib/Associations/One.js  |  2 +-
 lib/Model.js             |  2 ++
 lib/ORM.js               | 18 +++++++++--------
 lib/Settings.js          | 43 +++++++++++++++++++++++++---------------
 5 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 3614d62a..29591ced 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -40,10 +40,10 @@ exports.prepare = function (Model, associations) {
 			autoFetch      : opts.autoFetch || false,
 			autoFetchLimit : opts.autoFetchLimit || 2,
 			// I'm not sure the next key is used..
-			field          : opts.field || Settings.get("properties.association_key").replace("{name}", name),
+			field          : opts.field || Model.settings.get("properties.association_key").replace("{name}", name),
 			mergeTable     : opts.mergeTable || (Model.table + "_" + name),
-			mergeId        : opts.mergeId || Settings.get("properties.association_key").replace("{name}", Model.table),
-			mergeAssocId   : opts.mergeAssocId || Settings.get("properties.association_key").replace("{name}", name),
+			mergeId        : opts.mergeId || Model.settings.get("properties.association_key").replace("{name}", Model.table),
+			mergeAssocId   : opts.mergeAssocId || Model.settings.get("properties.association_key").replace("{name}", name),
 			getAccessor    : opts.getAccessor || ("get" + assocName),
 			setAccessor    : opts.setAccessor || ("set" + assocName),
 			hasAccessor    : opts.hasAccessor || ("has" + assocName),
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index e6ba1b13..9d544f7d 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -15,7 +15,7 @@ exports.prepare = function (Model, associations, association_properties) {
 			reversed       : opts.reversed,
 			autoFetch      : opts.autoFetch || false,
 			autoFetchLimit : opts.autoFetchLimit || 2,
-			field          : opts.field || Settings.get("properties.association_key").replace("{name}", name),
+			field          : opts.field || Model.settings.get("properties.association_key").replace("{name}", name),
 			getAccessor    : opts.getAccessor || ("get" + assocName),
 			setAccessor    : opts.setAccessor || ("set" + assocName),
 			hasAccessor    : opts.hasAccessor || ("has" + assocName),
diff --git a/lib/Model.js b/lib/Model.js
index ed169511..579aa308 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -81,6 +81,8 @@ function Model(opts) {
 	OneAssociation.prepare(model, one_associations, association_properties);
 	ManyAssociation.prepare(model, many_associations);
 
+	model.settings = opts.settings;
+
 	model.drop = function (cb) {
 		if (typeof opts.driver.drop == "function") {
 			opts.driver.drop({
diff --git a/lib/ORM.js b/lib/ORM.js
index 048a54d9..c783cb6a 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -9,7 +9,7 @@ var SqlTools      = require("./sql/Tools");
 var Settings      = require("./Settings");
 
 exports.validators = Validators;
-exports.settings   = Settings;
+exports.settings   = new Settings.Container(Settings.defaults());
 
 for (var tool in SqlTools) {
 	exports[tool] = SqlTools[tool];
@@ -30,7 +30,7 @@ exports.use = function (connection, proto, opts, cb) {
 			debug: (opts.query && opts.query.debug == 'true')
 		});
 
-		return cb(null, new ORM(driver));
+		return cb(null, new ORM(driver, new Settings.Container(exports.settings.get('*'))));
 	} catch (ex) {
 		return cb(ex);
 	}
@@ -66,18 +66,19 @@ exports.connect = function (opts, cb) {
 				return cb(err);
 			}
 
-			return cb(null, new ORM(driver));
+			return cb(null, new ORM(driver, new Settings.Container(exports.settings.get('*'))));
 		});
 	} catch (ex) {
 		return cb(ex);
 	}
 };
 
-function ORM(driver) {
-	this.models = {};
-	this.driver = driver;
+function ORM(driver, settings) {
+	this.tools      = SqlTools;
 	this.validators = Validators;
-	this.tools = SqlTools;
+	this.settings   = settings;
+	this.driver     = driver;
+	this.models     = {};
 
 	events.EventEmitter.call(this);
 
@@ -97,11 +98,12 @@ ORM.prototype.define = function (name, properties, opts) {
 	}
 
 	this.models[name] = new Model({
+		settings       : this.settings,
 		driver         : this.driver,
 		table          : opts.table || opts.collection || name,
 		properties     : properties,
 		cache          : opts.cache,
-		id             : opts.id || Settings.get("properties.primary_key"),
+		id             : opts.id || this.settings.get("properties.primary_key"),
 		autoSave       : opts.autoSave || false,
 		autoFetch      : opts.autoFetch || false,
 		autoFetchLimit : opts.autoFetchLimit,
diff --git a/lib/Settings.js b/lib/Settings.js
index 076f6349..ad28454a 100644
--- a/lib/Settings.js
+++ b/lib/Settings.js
@@ -1,27 +1,38 @@
-var settings = {
+var default_settings = {
 	properties : {
 		primary_key     : "id",
 		association_key : "{name}_id"
 	}
 };
 
-exports.set = function (key, value) {
-	set(key, value, settings);
-
-	return this;
-};
-exports.get = function (key, def) {
-	return get(key, def, settings);
+exports.Container = Settings;
+exports.defaults = function () {
+	return default_settings;
 };
-exports.unset = function () {
-	for (var i = 0; i < arguments.length; i++) {
-		if (typeof arguments[i] == "string") {
-			unset(arguments[i], settings);
-		}
-	}
 
-	return this;
-};
+function Settings(settings) {
+	this.settings = settings;
+
+	return {
+		set: function (key, value) {
+			set(key, value, settings);
+
+			return this;
+		},
+		get: function (key, def) {
+			return get(key, def, settings);
+		},
+		unset: function () {
+			for (var i = 0; i < arguments.length; i++) {
+				if (typeof arguments[i] == "string") {
+					unset(arguments[i], settings);
+				}
+			}
+
+			return this;
+		}
+	};
+}
 
 function set(key, value, obj) {
 	var p = key.indexOf(".");

From 943be48b13876c13c5c80603b4b5bff6c4d1e110 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 25 Jan 2013 15:18:06 +0000
Subject: [PATCH 0083/1246] Adds Settings description to database

---
 Readme.md | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/Readme.md b/Readme.md
index 8c0db4f3..711f1989 100644
--- a/Readme.md
+++ b/Readme.md
@@ -30,17 +30,17 @@ This is a node.js object relational mapping module.
 Here is an example on how to use it:
 
 ```js
-var orm = require('orm');
+var orm = require("orm");
 
 orm.connect("mysql://username:password@host/database", function (err, db) {
 	if (err) throw err;
 
-	var Person = db.define('person', {
+	var Person = db.define("person", {
 		name      : String,
 		surname   : String,
 		age       : Number,
 		male      : Boolean,
-		continent : [ 'Europe', 'America', 'Asia', 'Africa', 'Australia', 'Antartica' ], // ENUM type
+		continent : [ "Europe", "America", "Asia", "Africa", "Australia", "Antartica" ], // ENUM type
 		photo     : Buffer, // BLOB/BINARY
 		data      : Object // JSON encoded
 	}, {
@@ -50,7 +50,7 @@ orm.connect("mysql://username:password@host/database", function (err, db) {
 			}
 		},
 		validations: {
-			age: orm.validators.rangeNumber(18, undefined, 'under-age')
+			age: orm.validators.rangeNumber(18, undefined, "under-age")
 		}
 	});
 
@@ -62,12 +62,27 @@ orm.connect("mysql://username:password@host/database", function (err, db) {
 
 		people[0].age = 16;
 		people[0].save(function (err) {
-			// err.msg = 'under-age';
+			// err.msg = "under-age";
 		});
 	});
 });
 ```
 
+## Settings
+
+You have a global settings object and one for each connection.
+
+```js
+var orm = require("orm");
+
+orm.settings.set("some.deep.value", 123);
+
+orm.connect("....", function (err, db) {
+	console.log(db.settings.get("some.deep.value")); // 123
+	console.log(db.settings.get("some.deep"));       // { value: 123 }
+});
+```
+
 ## Models
 
 A Model is a structure binded to one or more tables, depending on the associations. The model name is assumed to be the table name. After defining a model you can use it to manipulate the table.

From e6376bc35a8342528729625b2e0ffb7db203ef76 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 25 Jan 2013 15:20:16 +0000
Subject: [PATCH 0084/1246] Adds a bit of information about global and local
 settings to Readme

---
 Readme.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Readme.md b/Readme.md
index 711f1989..ed066216 100644
--- a/Readme.md
+++ b/Readme.md
@@ -78,6 +78,9 @@ var orm = require("orm");
 orm.settings.set("some.deep.value", 123);
 
 orm.connect("....", function (err, db) {
+    // db.settings is a snapshot of the settings at the moment
+    // of orm.connect(). changes to it don't affect orm.settings
+
 	console.log(db.settings.get("some.deep.value")); // 123
 	console.log(db.settings.get("some.deep"));       // { value: 123 }
 });

From 93692bac99ac3e90bbd8c422ff1a79a28f27bb6b Mon Sep 17 00:00:00 2001
From: "johnlouis.swaine@axomic.com" <johnlouis.swaine@axomic.com>
Date: Thu, 31 Jan 2013 09:44:57 +0000
Subject: [PATCH 0085/1246] Added a different postgres driver to the orm which
 uses the client pooling functionality in Brianc's Postgres driver.

---
 lib/Drivers/DDL/postgresaxomic.js | 136 ++++++++++++++++++
 lib/Drivers/DML/postgresaxomic.js | 224 ++++++++++++++++++++++++++++++
 lib/Drivers/aliases.js            |   3 +-
 3 files changed, 362 insertions(+), 1 deletion(-)
 create mode 100644 lib/Drivers/DDL/postgresaxomic.js
 create mode 100644 lib/Drivers/DML/postgresaxomic.js

diff --git a/lib/Drivers/DDL/postgresaxomic.js b/lib/Drivers/DDL/postgresaxomic.js
new file mode 100644
index 00000000..be1f494a
--- /dev/null
+++ b/lib/Drivers/DDL/postgresaxomic.js
@@ -0,0 +1,136 @@
+exports.drop = function (driver, opts, cb) {
+	var queries = [], pending;
+
+	queries.push("DROP TABLE IF EXISTS " + driver.escapeId(opts.table));
+
+	for (i = 0; i < opts.many_associations.length; i++) {
+		queries.push("DROP TABLE IF EXISTS " + driver.escapeId(opts.many_associations[i].mergeTable));
+	}
+
+	pending = queries.length;
+	for (i = 0; i < queries.length; i++) {
+		driver.db.query(queries[i], function (err) {
+			if (--pending === 0) {
+				return cb(err);
+			}
+		});
+	}
+};
+
+exports.sync = function (driver, opts, cb) {
+	var tables = [];
+	var subqueries = [];
+	var definitions = [];
+	var k, i, pending, tmp;
+
+	definitions.push(driver.escapeId(opts.id) + " SERIAL");
+
+	for (k in opts.properties) {
+		switch (opts.properties[k].type) {
+			case "text":
+				definitions.push(driver.escapeId(k) + " VARCHAR(" + Math.min(Math.max(parseInt(opts.properties[k].size, 10) || 255, 1), 10485760) + ")");
+				break;
+			case "number":
+				definitions.push(driver.escapeId(k) + " REAL");
+				break;
+			case "boolean":
+				definitions.push(driver.escapeId(k) + " BOOLEAN NOT NULL");
+				break;
+			case "date":
+				if (opts.properties[k].time === false) {
+					definitions.push(driver.escapeId(k) + " DATE");
+				} else {
+					definitions.push(driver.escapeId(k) + " TIMESTAMP WITHOUT TIME ZONE"); // hmm... I'm not sure..
+				}
+				break;
+			case "binary":
+				definitions.push(driver.escapeId(k) + " BYTEA");
+				break;
+			case "enum":
+				tmp = driver.escapeId("enum_" + opts.table + "_" + k);
+				subqueries.push(
+					"CREATE TYPE " + tmp + " AS ENUM (" +
+					opts.properties[k].values.map(driver.escape.bind(driver.db)) + ")"
+				);
+				definitions.push(driver.escapeId(k) + " " + tmp);
+				break;
+			default:
+				throw new Error("Unknown property type: '" + opts.properties[k].type + "'");
+		}
+	}
+
+	for (i = 0; i < opts.one_associations.length; i++) {
+		definitions.push(driver.escapeId(opts.one_associations[i].field) + " INTEGER NOT NULL");
+	}
+	for (k in opts.properties) {
+		if (opts.properties[k].unique === true) {
+			definitions.push("UNIQUE (" + driver.escapeId(k) + ")");
+		}
+	}
+
+	tables.push({
+		name       : opts.table,
+		query      : "CREATE TABLE " + driver.escapeId(opts.table) +
+		             " (" + definitions.join(", ") + ")",
+		subqueries : subqueries
+	});
+	tables[tables.length - 1].subqueries.push(
+		"CREATE INDEX ON " + driver.escapeId(opts.table) +
+		" (" + driver.escapeId(opts.id) + ")"
+	);
+
+	for (i = 0; i < opts.one_associations.length; i++) {
+		tables[tables.length - 1].subqueries.push(
+			"CREATE INDEX ON " + driver.escapeId(opts.table) +
+			" (" + driver.escapeId(opts.one_associations[i].field) + ")"
+		);
+	}
+
+	for (i = 0; i < opts.many_associations.length; i++) {
+		tables.push({
+			name       : opts.many_associations[i].mergeTable,
+			query      : "CREATE TABLE IF NOT EXISTS " + driver.escapeId(opts.many_associations[i].mergeTable) +
+			             " (" +
+			             driver.escapeId(opts.many_associations[i].mergeId) + " INTEGER NOT NULL, " +
+			             driver.escapeId(opts.many_associations[i].mergeAssocId) + " INTEGER NOT NULL" +
+			             ")",
+			subqueries : []
+		});
+		tables[tables.length - 1].subqueries.push(
+			"CREATE INDEX ON " + driver.escapeId(opts.many_associations[i].mergeTable) +
+			" (" +
+			driver.escapeId(opts.many_associations[i].mergeId) + ", " +
+			driver.escapeId(opts.many_associations[i].mergeAssocId) +
+			")"
+		);
+	}
+
+	pending = tables.length;
+	for (i = 0; i < tables.length; i++) {
+		createTableSchema(driver, tables[i], function (err) {
+			if (--pending === 0) {
+				// this will bring trouble in the future...
+				// some errors are not avoided (like ENUM types already defined, etc..)
+				return cb(err);
+			}
+		});
+	}
+};
+
+function createTableSchema(driver, table, cb) {
+	driver.db.query(table.query, function (err) {
+		if (err || table.subqueries.length === 0) {
+			return cb();
+		}
+
+		var pending = table.subqueries.length;
+
+		for (var i = 0; i < table.subqueries.length; i++) {
+			driver.db.query(table.subqueries[i], function (err) {
+				if (--pending === 0) {
+					return cb();
+				}
+			});
+		}
+	});
+}
diff --git a/lib/Drivers/DML/postgresaxomic.js b/lib/Drivers/DML/postgresaxomic.js
new file mode 100644
index 00000000..4a6a4e17
--- /dev/null
+++ b/lib/Drivers/DML/postgresaxomic.js
@@ -0,0 +1,224 @@
+var postgres       = require("pg"),
+	connectionString = '';
+
+exports.Driver = Driver;
+
+function Driver(config, connection, opts) {
+	this.connectionString = "postgresql"+config.href.substring(14);
+	this.config = config || {};
+	this.opts   = opts || {};
+	this.db = postgres;
+	var escapes = {
+		escape   : this.escape.bind(this),
+		escapeId : this.escapeId.bind(this)
+	};
+
+	this.QuerySelect = new (require("../../sql/Select"))(escapes);
+	this.QueryInsert = new (require("../../sql/Insert"))(escapes);
+	this.QueryUpdate = new (require("../../sql/Update"))(escapes);
+	this.QueryRemove = new (require("../../sql/Remove"))(escapes);
+}
+Driver.prototype.sync = function (opts, cb) {
+	return require("../DDL/postgres").sync(this, opts, cb);
+};
+
+Driver.prototype.drop = function (opts, cb) {
+	return require("../DDL/postgres").drop(this, opts, cb);
+};
+Driver.prototype.connect = function (cb) {
+	//console.log("connect called");
+	cb(null);
+	//this.db.connect(cb);
+};
+
+Driver.prototype.close = function (cb) {
+	//console.log("end called");
+	cb(null);
+	//
+	//this.db.end(cb);
+};
+Driver.prototype.on = function (ev, cb) {
+	//console.log("Driver.on called");
+	//console.log(ev);
+	if (ev == "error") {
+//		this.db.on("error", cb);
+	}
+	return this;
+};
+
+Driver.prototype.find = function (fields, table, conditions, opts, cb) {
+	this.QuerySelect
+		.clear()
+		.fields(fields)
+		.table(table);
+	if (opts.fields) {
+		this.QuerySelect.fields(opts.fields);
+	}
+	if (opts.merge) {
+		this.QuerySelect.merge(opts.merge.from, opts.merge.to);
+	}
+	if (opts.offset) {
+		this.QuerySelect.offset(opts.offset);
+	}
+	if (typeof opts.limit == "number") {
+		this.QuerySelect.limit(opts.limit);
+	}
+	if (opts.order) {
+		this.QuerySelect.order(opts.order[0], opts.order[1]);
+	}
+	for (var k in conditions) {
+		this.QuerySelect.where(k, conditions[k]);
+	}
+
+	if (this.opts.debug) {
+		require("../Debug").sql('postgres', this.QuerySelect.build());
+	}
+	this.hijackQuery(this.QuerySelect.build(), handleQuery(cb));
+};
+Driver.prototype.count = function (table, conditions, cb) {
+	this.QuerySelect
+		.clear()
+		.count()
+		.table(table);
+	for (var k in conditions) {
+		this.QuerySelect.where(k, conditions[k]);
+	}
+
+	if (this.opts.debug) {
+		require("../../Debug").sql('postgres', this.QuerySelect.build());
+	}
+	this.hijackQuery(this.QuerySelect.build(), handleQuery(cb));
+};
+Driver.prototype.insert = function (table, data, cb) {
+	this.QueryInsert
+		.clear()
+		.table(table);
+	for (var k in data) {
+		this.QueryInsert.set(k, data[k]);
+	}
+	if (this.opts.debug) {
+		require("../../Debug").sql('postgres', this.QueryInsert.build());
+	}
+	this.hijackQuery(this.QueryInsert.build() + " RETURNING *", function (err, result) {
+		if (err) {
+			return cb(err);
+		}
+		return cb(null, {
+			id: result.rows[0].id || null
+		});
+	});
+};
+
+Driver.prototype.update = function (table, changes, conditions, cb) {
+	this.QueryUpdate
+		.clear()
+		.table(table);
+	for (var k in conditions) {
+		this.QueryUpdate.where(k, conditions[k]);
+	}
+	for (k in changes) {
+		this.QueryUpdate.set(k, changes[k]);
+	}
+	if (this.opts.debug) {
+		require("../../Debug").sql('postgres', this.QueryUpdate.build());
+	}
+	this.hijackQuery(this.QueryUpdate.build(), handleQuery(cb));
+};
+
+Driver.prototype.remove = function (table, conditions, cb) {
+	this.QueryRemove
+		.clear()
+		.table(table);
+	for (var k in conditions) {
+		this.QueryRemove.where(k, conditions[k]);
+	}
+
+	if (this.opts.debug) {
+		require("../../Debug").sql('postgres', this.QueryRemove.build());
+	}
+	this.hijackQuery(this.QueryRemove.build(), handleQuery(cb));
+};
+
+Driver.prototype.clear = function (table, cb) {
+	var query = "TRUNCATE TABLE " + escapeId(table);
+
+	if (this.opts.debug) {
+		require("../../Debug").sql('postgres', query);
+	}
+	this.hijackQuery(query, handleQuery(cb));
+};
+
+Driver.prototype.valueToProperty = function (value, property) {
+	switch (property.type) {
+		case "object":
+			try {
+				return JSON.parse(value);
+			} catch (e) {
+				return null;
+			}
+			break;
+		default:
+			return value;
+	}
+};
+
+Driver.prototype.propertyToValue = function (value, property) {
+	switch (property.type) {
+		case "object":
+			return JSON.stringify(value);
+		default:
+			return value;
+	}
+};
+
+Driver.prototype.hijackQuery = function (receievedQuery, cb) {
+
+  this.db.connect(this.connectionString, function(err, client) {
+	  if(err){
+		  console.log("Error from PostgresAxomic");
+		  console.log(err);
+	  }
+	client.query(receievedQuery, cb);
+  })
+}
+
+Driver.prototype.escapeId = function (id) {
+	var m = id.match(/^(.+)\.\*$/);
+	if (m) {
+		return '"' + m[1].replace(/\"/g, '""') + '".*';
+	}
+	return '"' + id.replace(/\"/g, '""').replace(/\./g, '"."') + '"';
+};
+
+Driver.prototype.escape = function (value) {
+	if (Array.isArray(value)) {
+		if (value.length === 1 && Array.isArray(value[0])) {
+			return "(" + value[0].map(this.escape.bind(this)) + ")";
+		}
+		return "(" + value.map(this.escape.bind(this)) + ")";
+	}
+	switch (typeof value) {
+		case "number":
+			return value;
+	}
+
+
+	if(!value) {
+		return value
+	} else {
+		return "'" + value.replace(/\'/g, "''") + "'";
+	}
+};
+
+function handleQuery(cb) {
+	return function (err, result) {
+		if (err) {
+			return cb(err);
+		}
+		return cb(null, result.rows);
+	};
+}
+
+
+
+
diff --git a/lib/Drivers/aliases.js b/lib/Drivers/aliases.js
index bf8c9f5e..f9cf881f 100644
--- a/lib/Drivers/aliases.js
+++ b/lib/Drivers/aliases.js
@@ -1,4 +1,5 @@
 module.exports = {
 	postgresql : "postgres",
-	pg         : "postgres"
+	pg         : "postgres",
+	postgresaxomic: "postgresaxomic"
 };

From d1b2bfdf4a66d393544823edbe474bf9f4b6285d Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 13 Feb 2013 00:07:07 +0000
Subject: [PATCH 0086/1246] Sets id as PRIMARY KEY on Model.sync() for mysql
 and posgres (#29)

---
 lib/Drivers/DDL/mysql.js    | 2 +-
 lib/Drivers/DDL/postgres.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index 5dbaa414..b384c62d 100644
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -22,7 +22,7 @@ exports.sync = function (driver, opts, cb) {
 	var definitions = [];
 	var k, i, pending;
 
-	definitions.push(driver.escapeId(opts.id) + " INT(11) UNSIGNED NOT NULL AUTO_INCREMENT");
+	definitions.push(driver.escapeId(opts.id) + " INT(11) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY");
 
 	for (k in opts.properties) {
 		switch (opts.properties[k].type) {
diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index be1f494a..4efbe5c4 100644
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -23,7 +23,7 @@ exports.sync = function (driver, opts, cb) {
 	var definitions = [];
 	var k, i, pending, tmp;
 
-	definitions.push(driver.escapeId(opts.id) + " SERIAL");
+	definitions.push(driver.escapeId(opts.id) + " SERIAL PRIMARY KEY");
 
 	for (k in opts.properties) {
 		switch (opts.properties[k].type) {

From d43463758f55e55b7f7d51f3709b0e499158a793 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 13 Feb 2013 00:08:22 +0000
Subject: [PATCH 0087/1246] Bumps version to 2.0.0-alpha10

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index bc07bc9a..72208046 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "postgres",
     "sqlite"
   ],
-  "version": "2.0.0-alpha9",
+  "version": "2.0.0-alpha10",
   "license": "MIT",
   "repository": {
     "url": "http://dresende.github.com/node-orm2"
@@ -37,7 +37,7 @@
   "devDependencies": {
     "utest": "0.0.6",
     "urun": "0.0.6",
-    "mysql": "2.0.0-alpha5",
+    "mysql": "2.0.0-alpha6",
     "pg": "0.8.7",
     "sqlite3": "2.1.5"
   },

From 9d540adfe54bffaf417d2be0400b4b04cc13b19d Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 13 Feb 2013 12:07:03 +0000
Subject: [PATCH 0088/1246] Changes Readme install version to alpha10

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index ed066216..beab1956 100644
--- a/Readme.md
+++ b/Readme.md
@@ -5,7 +5,7 @@
 ## Install
 
 ```sh
-npm install orm@2.0.0-alpha9
+npm install orm@2.0.0-alpha10
 ```
 
 Despite the alpha tag, this is the recommended version for new applications.

From de7baea54fe2c1039c90d89a2a710048da8b58c1 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 14 Feb 2013 22:24:53 +0000
Subject: [PATCH 0089/1246] Extracts debug option (if exists) from query to
 pass it to ORM and not to driver

---
 lib/ORM.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index c783cb6a..fba10e17 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -57,8 +57,19 @@ exports.connect = function (opts, cb) {
 
 	try {
 		var Driver = require("./Drivers/DML/" + proto).Driver;
+		var debug = (opts.query && Boolean(opts.query.debug));
+
+		if (debug) {
+			delete opts.query.debug;
+			if (opts.href) {
+				opts.href = opts.href.replace(/debug=[^\&]+&?/, '');
+			}
+			if (opts.search) {
+				opts.search = opts.search.replace(/debug=[^\&]+&?/, '');
+			}
+		}
 		var driver = new Driver(opts, null, {
-			debug: (opts.query && opts.query.debug == 'true')
+			debug: debug
 		});
 
 		driver.connect(function (err) {

From e73f93384ff3d515939e5c0306cb03694cf06aab Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 14 Feb 2013 22:30:21 +0000
Subject: [PATCH 0090/1246] Moves previous code to remove orm option to a
 separate function

Allowing to extract other options if needed
---
 lib/ORM.js | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index fba10e17..81536602 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -57,17 +57,7 @@ exports.connect = function (opts, cb) {
 
 	try {
 		var Driver = require("./Drivers/DML/" + proto).Driver;
-		var debug = (opts.query && Boolean(opts.query.debug));
-
-		if (debug) {
-			delete opts.query.debug;
-			if (opts.href) {
-				opts.href = opts.href.replace(/debug=[^\&]+&?/, '');
-			}
-			if (opts.search) {
-				opts.search = opts.search.replace(/debug=[^\&]+&?/, '');
-			}
-		}
+		var debug = Boolean(extractOption(opts, "debug"));
 		var driver = new Driver(opts, null, {
 			debug: debug
 		});
@@ -160,3 +150,20 @@ ORM.prototype.sync = function (cb) {
 
 	return this;
 };
+
+function extractOption(opts, key) {
+	if (!opts.query.hasOwnProperty(key)) {
+		return null;
+	}
+
+	var opt = opts.query[key];
+
+	delete opts.query[key];
+	if (opts.href) {
+		opts.href = opts.href.replace(new RegExp(key + "=[^&]+&?"), "");
+	}
+	if (opts.search) {
+		opts.search = opts.search.replace(new RegExp(key + "=[^&]+&?"), "");
+	}
+	return opt;
+}

From 3d831649aca6ba98bb6f010d2e962fdeb8cdcabe Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 14 Feb 2013 22:31:57 +0000
Subject: [PATCH 0091/1246] Extracts another orm option: pool

This option is then passed to drivers to enable connection pooling if
supported
---
 lib/ORM.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index 81536602..693d53af 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -57,9 +57,11 @@ exports.connect = function (opts, cb) {
 
 	try {
 		var Driver = require("./Drivers/DML/" + proto).Driver;
-		var debug = Boolean(extractOption(opts, "debug"));
+		var debug  = Boolean(extractOption(opts, "debug"));
+		var pool   = Boolean(extractOption(opts, "pool"));
 		var driver = new Driver(opts, null, {
-			debug: debug
+			debug : debug,
+			pool  : pool
 		});
 
 		driver.connect(function (err) {

From 7a2634e09688e58b77eea69bfe7e731da5444994 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 14 Feb 2013 23:02:28 +0000
Subject: [PATCH 0092/1246] Adds pool to mysql using native Pool

This is a test feature, can't actually test using unit tests because
tests create temporary tables so are not available across connections
from pool
---
 lib/Drivers/DDL/mysql.js | 26 +++++++++++++
 lib/Drivers/DML/mysql.js | 81 +++++++++++++++++++++++++++++++++-------
 2 files changed, 94 insertions(+), 13 deletions(-)

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index b384c62d..2cb8d89e 100644
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -8,6 +8,19 @@ exports.drop = function (driver, opts, cb) {
 	}
 
 	pending = queries.length;
+
+	if (driver.opts.pool) {
+		return driver.db.pool.getConnection(function (err, db) {
+			for (i = 0; i < queries.length; i++) {
+				db.query(queries[i], function (err) {
+					if (--pending === 0) {
+						return cb(err);
+					}
+				});
+			}
+		});
+	}
+
 	for (i = 0; i < queries.length; i++) {
 		driver.db.query(queries[i], function (err) {
 			if (--pending === 0) {
@@ -88,6 +101,19 @@ exports.sync = function (driver, opts, cb) {
 	}
 
 	pending = queries.length;
+
+	if (driver.opts.pool) {
+		return driver.db.pool.getConnection(function (err, db) {
+			for (i = 0; i < queries.length; i++) {
+				db.query(queries[i], function (err) {
+					if (--pending === 0) {
+						return cb(err);
+					}
+				});
+			}
+		});
+	}
+
 	for (i = 0; i < queries.length; i++) {
 		driver.db.query(queries[i], function (err) {
 			if (--pending === 0) {
diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 76672156..0a09adf4 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -10,7 +10,11 @@ function Driver(config, connection, opts) {
 		// force UTC if not defined, UTC is always better..
 		this.config.timezone = "Z";
 	}
+
 	this.db = (connection ? connection : mysql.createConnection(config.href || config));
+	if (this.opts.pool) {
+		this.db.pool = (connection ? connection : mysql.createPool(config.href || config));
+	}
 
 	var escapes = {
 		escape   : this.db.escape.bind(this.db),
@@ -39,10 +43,21 @@ Driver.prototype.on = function (ev, cb) {
 };
 
 Driver.prototype.connect = function (cb) {
+	if (this.opts.pool) {
+		return this.db.pool.getConnection(function (err, con) {
+			if (!err) {
+				con.end();
+			}
+			return cb(err);
+		});
+	}
 	this.db.connect(cb);
 };
 
 Driver.prototype.close = function (cb) {
+	if (this.opts.pool) {
+		return cb();
+	}
 	this.db.end(cb);
 };
 
@@ -73,7 +88,11 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 		this.QuerySelect.where(k, conditions[k]);
 	}
 
-	this.db.query(this.QuerySelect.build(), cb);
+	if (this.opts.pool) {
+		this.poolQuery(this.QuerySelect.build(), cb);
+	} else {
+		this.db.query(this.QuerySelect.build(), cb);
+	}
 	if (this.opts.debug) {
 		require("../../Debug").sql('mysql', this.QuerySelect.build());
 	}
@@ -88,7 +107,11 @@ Driver.prototype.count = function (table, conditions, cb) {
 		this.QuerySelect.where(k, conditions[k]);
 	}
 
-	this.db.query(this.QuerySelect.build(), cb);
+	if (this.opts.pool) {
+		this.poolQuery(this.QuerySelect.build(), cb);
+	} else {
+		this.db.query(this.QuerySelect.build(), cb);
+	}
 	if (this.opts.debug) {
 		require("../../Debug").sql('mysql', this.QuerySelect.build());
 	}
@@ -102,17 +125,22 @@ Driver.prototype.insert = function (table, data, cb) {
 		this.QueryInsert.set(k, data[k]);
 	}
 
+	if (this.opts.pool) {
+		this.poolQuery(this.QueryInsert.build(), function (err, info) {
+			if (err) return cb(err);
+
+			return cb(null, { id: info.insertId });
+		});
+	} else {
+		this.db.query(this.QueryInsert.build(), function (err, info) {
+			if (err) return cb(err);
+
+			return cb(null, { id: info.insertId });
+		});
+	}
 	if (this.opts.debug) {
 		require("../../Debug").sql('mysql', this.QueryInsert.build());
 	}
-	this.db.query(this.QueryInsert.build(), function (err, info) {
-		if (err) {
-			return cb(err);
-		}
-		return cb(null, {
-			id: info.insertId
-		});
-	});
 };
 
 Driver.prototype.update = function (table, changes, conditions, cb) {
@@ -126,10 +154,14 @@ Driver.prototype.update = function (table, changes, conditions, cb) {
 		this.QueryUpdate.set(k, changes[k]);
 	}
 
+	if (this.opts.pool) {
+		this.poolQuery(this.QueryUpdate.build(), cb);
+	} else {
+		this.db.query(this.QueryUpdate.build(), cb);
+	}
 	if (this.opts.debug) {
 		require("../../Debug").sql('mysql', this.QueryUpdate.build());
 	}
-	this.db.query(this.QueryUpdate.build(), cb);
 };
 
 Driver.prototype.remove = function (table, conditions, cb) {
@@ -140,18 +172,41 @@ Driver.prototype.remove = function (table, conditions, cb) {
 		this.QueryRemove.where(k, conditions[k]);
 	}
 
+	if (this.opts.pool) {
+		this.poolQuery(this.QueryRemove.build(), cb);
+	} else {
+		this.db.query(this.QueryRemove.build(), cb);
+	}
 	if (this.opts.debug) {
 		require("../../Debug").sql('mysql', this.QueryRemove.build());
 	}
-	this.db.query(this.QueryRemove.build(), cb);
 };
 
 Driver.prototype.clear = function (table, cb) {
 	var query = "TRUNCATE TABLE " + this.escapeId(table);
+
+	if (this.opts.pool) {
+		this.poolQuery(query, cb);
+	} else {
+		this.db.query(query, cb);
+	}
 	if (this.opts.debug) {
 		require("../../Debug").sql('mysql', query);
 	}
-	this.db.query(query, cb);
+};
+
+Driver.prototype.poolQuery = function (query, cb) {
+	this.db.pool.getConnection(function (err, con) {
+		if (err) {
+			return cb(err);
+		}
+
+		con.query(query, function (err, data) {
+			con.end();
+
+			return cb(err, data);
+		});
+	});
 };
 
 Driver.prototype.valueToProperty = function (value, property) {

From 0cb55287ff586a3f977831f395e8b08def29c3de Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sat, 16 Feb 2013 23:48:13 +0000
Subject: [PATCH 0093/1246] Adds support for non rational properties (integer)

This allows people to set properties as integers instead of floats
---
 lib/Drivers/DDL/mysql.js          | 6 +++++-
 lib/Drivers/DDL/postgres.js       | 6 +++++-
 lib/Drivers/DDL/postgresaxomic.js | 6 +++++-
 lib/Drivers/DDL/sqlite.js         | 9 ++++++++-
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index 2cb8d89e..ee469907 100644
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -43,7 +43,11 @@ exports.sync = function (driver, opts, cb) {
 				definitions.push(driver.escapeId(k) + " VARCHAR(" + Math.min(Math.max(parseInt(opts.properties[k].size, 10) || 255, 1), 65535) + ")");
 				break;
 			case "number":
-				definitions.push(driver.escapeId(k) + " FLOAT");
+				if (opts.properties[k].rational === false) {
+					definitions.push(driver.escapeId(k) + " INTEGER");
+				} else {
+					definitions.push(driver.escapeId(k) + " FLOAT");
+				}
 				if (opts.properties[k].unsigned === true) {
 					definitions[definitions.length - 1] += " UNSIGNED";
 				}
diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index 4efbe5c4..16b7d347 100644
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -31,7 +31,11 @@ exports.sync = function (driver, opts, cb) {
 				definitions.push(driver.escapeId(k) + " VARCHAR(" + Math.min(Math.max(parseInt(opts.properties[k].size, 10) || 255, 1), 10485760) + ")");
 				break;
 			case "number":
-				definitions.push(driver.escapeId(k) + " REAL");
+				if (opts.properties[k].rational === false) {
+					definitions.push(driver.escapeId(k) + " NUMERIC(0)");
+				} else {
+					definitions.push(driver.escapeId(k) + " REAL");
+				}
 				break;
 			case "boolean":
 				definitions.push(driver.escapeId(k) + " BOOLEAN NOT NULL");
diff --git a/lib/Drivers/DDL/postgresaxomic.js b/lib/Drivers/DDL/postgresaxomic.js
index be1f494a..f53d1e1b 100644
--- a/lib/Drivers/DDL/postgresaxomic.js
+++ b/lib/Drivers/DDL/postgresaxomic.js
@@ -31,7 +31,11 @@ exports.sync = function (driver, opts, cb) {
 				definitions.push(driver.escapeId(k) + " VARCHAR(" + Math.min(Math.max(parseInt(opts.properties[k].size, 10) || 255, 1), 10485760) + ")");
 				break;
 			case "number":
-				definitions.push(driver.escapeId(k) + " REAL");
+				if (opts.properties[k].rational === false) {
+					definitions.push(driver.escapeId(k) + " NUMERIC(0)");
+				} else {
+					definitions.push(driver.escapeId(k) + " REAL");
+				}
 				break;
 			case "boolean":
 				definitions.push(driver.escapeId(k) + " BOOLEAN NOT NULL");
diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index 0db67699..601141c9 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -30,7 +30,14 @@ exports.sync = function (driver, opts, cb) {
 				definitions.push(driver.escapeId(k) + " TEXT");
 				break;
 			case "number":
-				definitions.push(driver.escapeId(k) + " REAL");
+				if (opts.properties[k].rational === false) {
+					definitions.push(driver.escapeId(k) + " INTEGER");
+				} else {
+					definitions.push(driver.escapeId(k) + " REAL");
+				}
+				if (opts.properties[k].unsigned === true) {
+					definitions[definitions.length - 1] += " UNSIGNED";
+				}
 				break;
 			case "boolean":
 				definitions.push(driver.escapeId(k) + " INTEGER UNSIGNED NOT NULL");

From 101f799c2d1d4f2779ca49ef962d2e669ff79b70 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sat, 16 Feb 2013 23:50:28 +0000
Subject: [PATCH 0094/1246] Adds chaininstance, still not complete

---
 lib/ChainFind.js     |  4 ++++
 lib/ChainInstance.js | 48 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 lib/ChainInstance.js

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 9664ccae..b0ec7a3b 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -1,4 +1,5 @@
 var Singleton       = require("./Singleton");
+var ChainInstance   = require("./ChainInstance");
 
 module.exports = ChainFind;
 
@@ -67,6 +68,9 @@ function ChainFind(opts) {
 				return cb(err, items.length > 0 ? items[0] : null);
 			});
 		},
+		each: function () {
+			return new ChainInstance(this);
+		},
 		run: function (cb) {
 			opts.driver.find(opts.only, opts.table, opts.conditions, {
 				limit  : opts.limit,
diff --git a/lib/ChainInstance.js b/lib/ChainInstance.js
new file mode 100644
index 00000000..acdcc0c8
--- /dev/null
+++ b/lib/ChainInstance.js
@@ -0,0 +1,48 @@
+module.exports = ChainInstance;
+
+function ChainInstance(chain) {
+	var instances = null;
+	var loading   = false;
+	var queue     = [];
+
+	var load = function () {
+		loading = true;
+		console.log("loading..");
+		chain.run(function (err, items) {
+			instances = items;
+
+			console.log("loaded");
+			return next();
+		});
+	};
+	var promise = function(hwd, next) {
+		return function () {
+			if (!loading) {
+				load();
+			}
+
+			queue.push({ hwd: hwd, args: arguments });
+
+			return calls;
+		};
+	};
+	var next = function () {
+		if (queue.length === 0) return;
+
+		var item = queue.shift();
+
+		item.hwd.apply(calls, item.args);
+	};
+	var calls = {
+		map: promise(function (cb) {
+			for (var i = 0; i < instances.length; i++) {
+				cb(instances[i]);
+			}
+			return next();
+		}),
+		save: promise(function () {
+			console.log("save!?");
+		})
+	};
+	return calls;
+}

From df0db53313258028cdcf6ba4157896424fdb00f2 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sat, 16 Feb 2013 23:55:36 +0000
Subject: [PATCH 0095/1246] Adds support for LONGBLOB on mysql driver (#34)

It seems postgres and sqlite have only one blob/binary type
---
 lib/Drivers/DDL/mysql.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index ee469907..3ce47650 100644
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -63,7 +63,11 @@ exports.sync = function (driver, opts, cb) {
 				}
 				break;
 			case "binary":
-				definitions.push(driver.escapeId(k) + " BLOB");
+				if (opts.properties[k].big === true) {
+					definitions.push(driver.escapeId(k) + " LONGBLOB");
+				} else {
+					definitions.push(driver.escapeId(k) + " BLOB");
+				}
 				break;
 			case "enum":
 				definitions.push(driver.escapeId(k) + " ENUM (" +

From 60ff7bb16fd83d33be5ce57efeb383515bf389ec Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sun, 17 Feb 2013 14:45:04 +0000
Subject: [PATCH 0096/1246] Adds tests for chaining instance methods

(Almost) full example:

```js
Model.find(...).each().filter(function (inst1, inst2) {
  // ...
}).sort(function (inst1, inst2) {
  // ...
}).count(function (count) {
  // count instances
}).save(function (err) {
  // ...
}).get(function (instances) {
  // ...
});
```

These methods behave exactly as the native Array methods.
---
 lib/ChainInstance.js                          | 53 ++++++++++++++++---
 .../test-find-chain-instance-count.js         | 24 +++++++++
 .../test-find-chain-instance-filter.js        | 28 ++++++++++
 .../test-find-chain-instance-get.js           | 28 ++++++++++
 .../test-find-chain-instance-sort.js          | 28 ++++++++++
 5 files changed, 153 insertions(+), 8 deletions(-)
 create mode 100644 test/integration/test-find-chain-instance-count.js
 create mode 100644 test/integration/test-find-chain-instance-filter.js
 create mode 100644 test/integration/test-find-chain-instance-get.js
 create mode 100644 test/integration/test-find-chain-instance-sort.js

diff --git a/lib/ChainInstance.js b/lib/ChainInstance.js
index acdcc0c8..8c072b46 100644
--- a/lib/ChainInstance.js
+++ b/lib/ChainInstance.js
@@ -7,11 +7,9 @@ function ChainInstance(chain) {
 
 	var load = function () {
 		loading = true;
-		console.log("loading..");
 		chain.run(function (err, items) {
 			instances = items;
 
-			console.log("loaded");
 			return next();
 		});
 	};
@@ -34,14 +32,53 @@ function ChainInstance(chain) {
 		item.hwd.apply(calls, item.args);
 	};
 	var calls = {
-		map: promise(function (cb) {
-			for (var i = 0; i < instances.length; i++) {
-				cb(instances[i]);
-			}
+		filter: promise(function (cb) {
+			instances = instances.filter(cb);
+
+			return next();
+		}),
+		forEach: promise(function (cb) {
+			instances.forEach(cb);
+
 			return next();
 		}),
-		save: promise(function () {
-			console.log("save!?");
+		sort: promise(function (cb) {
+			instances.sort(cb);
+
+			return next();
+		}),
+		count: promise(function (cb) {
+			cb(instances.length);
+
+			return next();
+		}),
+		get: promise(function (cb) {
+			cb(instances);
+
+			return next();
+		}),
+		save: promise(function (cb) {
+			var saveNext = function (i) {
+				if (i >= instances.length) {
+					if (typeof cb == "function") {
+						cb();
+					}
+					return next();
+				}
+
+				return instances[i].save(function (err) {
+					if (err) {
+						if (typeof cb == "function") {
+							cb(err);
+						}
+						return next();
+					}
+
+					return saveNext(i + 1);
+				});
+			};
+
+			return saveNext(0);
 		})
 	};
 	return calls;
diff --git a/test/integration/test-find-chain-instance-count.js b/test/integration/test-find-chain-instance-count.js
new file mode 100644
index 00000000..0b571435
--- /dev/null
+++ b/test/integration/test-find-chain-instance-count.js
@@ -0,0 +1,24 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_find_chain_instance_count', db.driver.db, function () {
+		common.insertModelData('test_find_chain_instance_count', db.driver.db, [
+			{ id : 1, name : 'test1' },
+			{ id : 2, name : 'test2' },
+			{ id : 3, name : 'test3' },
+			{ id : 4, name : 'test4' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_find_chain_instance_count', common.getModelProperties());
+
+			TestModel.find().each().filter(function (instance) {
+				return (instance.id > 2);
+			}).count(function (count) {
+				assert.equal(count, 2);
+				db.close();
+			});
+		});
+	});
+});
diff --git a/test/integration/test-find-chain-instance-filter.js b/test/integration/test-find-chain-instance-filter.js
new file mode 100644
index 00000000..01b32a8f
--- /dev/null
+++ b/test/integration/test-find-chain-instance-filter.js
@@ -0,0 +1,28 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_find_chain_instance_filter', db.driver.db, function () {
+		common.insertModelData('test_find_chain_instance_filter', db.driver.db, [
+			{ id : 1, name : 'test1' },
+			{ id : 2, name : 'test3' },
+			{ id : 3, name : 'test4' },
+			{ id : 4, name : 'test2' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_find_chain_instance_filter', common.getModelProperties());
+
+			TestModel.find().each().filter(function (instance) {
+				return instance.name.match(/test[24]/);
+			}).sort(function (inst1, inst2) {
+				return inst1.id < inst2.id;
+			}).get(function (instances) {
+				assert.equal(instances.length, 2);
+				assert.equal(instances[0].id, 4);
+				assert.equal(instances[1].id, 3);
+				db.close();
+			});
+		});
+	});
+});
diff --git a/test/integration/test-find-chain-instance-get.js b/test/integration/test-find-chain-instance-get.js
new file mode 100644
index 00000000..e479050a
--- /dev/null
+++ b/test/integration/test-find-chain-instance-get.js
@@ -0,0 +1,28 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_find_chain_instance_get', db.driver.db, function () {
+		common.insertModelData('test_find_chain_instance_get', db.driver.db, [
+			{ id : 1, name : 'test1' },
+			{ id : 2, name : 'test2' },
+			{ id : 3, name : 'test3' },
+			{ id : 4, name : 'test4' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_find_chain_instance_get', common.getModelProperties());
+
+			TestModel.find().each().forEach(function (instance) {
+				instance.name = instance.id;
+			}).get(function (instances) {
+				assert.equal(instances.length, 4);
+				assert.equal(instances[0].name, 1);
+				assert.equal(instances[1].name, 2);
+				assert.equal(instances[2].name, 3);
+				assert.equal(instances[3].name, 4);
+				db.close();
+			});
+		});
+	});
+});
diff --git a/test/integration/test-find-chain-instance-sort.js b/test/integration/test-find-chain-instance-sort.js
new file mode 100644
index 00000000..76c95a78
--- /dev/null
+++ b/test/integration/test-find-chain-instance-sort.js
@@ -0,0 +1,28 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_find_chain_instance_sort', db.driver.db, function () {
+		common.insertModelData('test_find_chain_instance_sort', db.driver.db, [
+			{ id : 1, name : 'test1' },
+			{ id : 2, name : 'test3' },
+			{ id : 3, name : 'test4' },
+			{ id : 4, name : 'test2' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_find_chain_instance_sort', common.getModelProperties());
+
+			TestModel.find().each().sort(function (inst1, inst2) {
+				return inst1.id < inst2.id;
+			}).get(function (instances) {
+				assert.equal(instances.length, 4);
+				assert.equal(instances[0].id, 4);
+				assert.equal(instances[1].id, 3);
+				assert.equal(instances[2].id, 2);
+				assert.equal(instances[3].id, 1);
+				db.close();
+			});
+		});
+	});
+});

From c748f3e15480ee51606d91feb78273fa095bf065 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 18 Feb 2013 16:35:15 +0000
Subject: [PATCH 0097/1246] Changes sqlite driver to export .escape() in the
 driver

---
 lib/Drivers/DML/sqlite.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 5fa86718..da6e7dc7 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -15,7 +15,7 @@ function Driver(config, connection, opts) {
 	}
 
 	var escapes = {
-		escape   : escape,
+		escape   : this.escape.bind(this),
 		escapeId : this.escapeId.bind(this)
 	};
 
@@ -171,12 +171,12 @@ Driver.prototype.escapeId = function (id) {
 	return '`' + id.replace(/\`/g, '``').replace(/\./g, '`.`') + '`';
 };
 
-function escape(value) {
+Driver.prototype.escape = function (value) {
 	if (Array.isArray(value)) {
 		if (value.length === 1 && Array.isArray(value[0])) {
-			return "(" + value[0].map(escape) + ")";
+			return "(" + value[0].map(this.escape) + ")";
 		}
-		return "(" + value.map(escape) + ")";
+		return "(" + value.map(this.escape) + ")";
 	}
 	switch (typeof value) {
 		case "number":
@@ -184,4 +184,4 @@ function escape(value) {
 	}
 
 	return "'" + value.replace(/\'/g, "''") + "'";
-}
+};

From 24f1d4c76664862f6bc09745aae39135ab8c91f7 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 18 Feb 2013 16:35:54 +0000
Subject: [PATCH 0098/1246] Adds defaultValue option to model properties (#36)

---
 lib/Drivers/DDL/mysql.js          | 3 +++
 lib/Drivers/DDL/postgres.js       | 3 +++
 lib/Drivers/DDL/postgresaxomic.js | 3 +++
 lib/Drivers/DDL/sqlite.js         | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index 3ce47650..ab7891a2 100644
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -76,6 +76,9 @@ exports.sync = function (driver, opts, cb) {
 			default:
 				throw new Error("Unknown property type: '" + opts.properties[k].type + "'");
 		}
+		if (opts.properties[k].hasOwnProperty("defaultValue")) {
+			definitions[definitions.length - 1] += " DEFAULT " + driver.db.escape(opts.properties[k].defaultValue);
+		}
 	}
 
 	for (i = 0; i < opts.one_associations.length; i++) {
diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index 16b7d347..e1836ef9 100644
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -61,6 +61,9 @@ exports.sync = function (driver, opts, cb) {
 			default:
 				throw new Error("Unknown property type: '" + opts.properties[k].type + "'");
 		}
+		if (opts.properties[k].hasOwnProperty("defaultValue")) {
+			definitions[definitions.length - 1] += " DEFAULT " + driver.escape(opts.properties[k].defaultValue);
+		}
 	}
 
 	for (i = 0; i < opts.one_associations.length; i++) {
diff --git a/lib/Drivers/DDL/postgresaxomic.js b/lib/Drivers/DDL/postgresaxomic.js
index f53d1e1b..05628c97 100644
--- a/lib/Drivers/DDL/postgresaxomic.js
+++ b/lib/Drivers/DDL/postgresaxomic.js
@@ -61,6 +61,9 @@ exports.sync = function (driver, opts, cb) {
 			default:
 				throw new Error("Unknown property type: '" + opts.properties[k].type + "'");
 		}
+		if (opts.properties[k].hasOwnProperty("defaultValue")) {
+			definitions[definitions.length - 1] += " DEFAULT " + driver.escape(opts.properties[k].defaultValue);
+		}
 	}
 
 	for (i = 0; i < opts.one_associations.length; i++) {
diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index 601141c9..541dfe3b 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -54,6 +54,9 @@ exports.sync = function (driver, opts, cb) {
 			default:
 				throw new Error("Unknown property type: '" + opts.properties[k].type + "'");
 		}
+		if (opts.properties[k].hasOwnProperty("defaultValue")) {
+			definitions[definitions.length - 1] += " DEFAULT " + driver.escape(opts.properties[k].defaultValue);
+		}
 	}
 
 	for (i = 0; i < opts.one_associations.length; i++) {

From 65d6cba9c900853bca8adea77d7d7acd51ace156 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 18 Feb 2013 23:52:37 +0000
Subject: [PATCH 0099/1246] Changes mysql driver to support hasMany association
 extra properties (#35)

---
 lib/Drivers/DDL/mysql.js | 106 ++++++++++++++++++++++-----------------
 1 file changed, 60 insertions(+), 46 deletions(-)

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index ab7891a2..67f1510d 100644
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -38,47 +38,7 @@ exports.sync = function (driver, opts, cb) {
 	definitions.push(driver.escapeId(opts.id) + " INT(11) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY");
 
 	for (k in opts.properties) {
-		switch (opts.properties[k].type) {
-			case "text":
-				definitions.push(driver.escapeId(k) + " VARCHAR(" + Math.min(Math.max(parseInt(opts.properties[k].size, 10) || 255, 1), 65535) + ")");
-				break;
-			case "number":
-				if (opts.properties[k].rational === false) {
-					definitions.push(driver.escapeId(k) + " INTEGER");
-				} else {
-					definitions.push(driver.escapeId(k) + " FLOAT");
-				}
-				if (opts.properties[k].unsigned === true) {
-					definitions[definitions.length - 1] += " UNSIGNED";
-				}
-				break;
-			case "boolean":
-				definitions.push(driver.escapeId(k) + " BOOLEAN NOT NULL");
-				break;
-			case "date":
-				if (opts.properties[k].time === false) {
-					definitions.push(driver.escapeId(k) + " DATE");
-				} else {
-					definitions.push(driver.escapeId(k) + " DATETIME");
-				}
-				break;
-			case "binary":
-				if (opts.properties[k].big === true) {
-					definitions.push(driver.escapeId(k) + " LONGBLOB");
-				} else {
-					definitions.push(driver.escapeId(k) + " BLOB");
-				}
-				break;
-			case "enum":
-				definitions.push(driver.escapeId(k) + " ENUM (" +
-				                 opts.properties[k].values.map(driver.db.escape.bind(driver.db)) + ")");
-				break;
-			default:
-				throw new Error("Unknown property type: '" + opts.properties[k].type + "'");
-		}
-		if (opts.properties[k].hasOwnProperty("defaultValue")) {
-			definitions[definitions.length - 1] += " DEFAULT " + driver.db.escape(opts.properties[k].defaultValue);
-		}
+		definitions.push(buildColumnDefinition(driver, k, opts.properties[k]));
 	}
 
 	for (i = 0; i < opts.one_associations.length; i++) {
@@ -101,13 +61,19 @@ exports.sync = function (driver, opts, cb) {
 	);
 
 	for (i = 0; i < opts.many_associations.length; i++) {
+		definitions = [];
+
+		definitions.push(driver.escapeId(opts.many_associations[i].mergeId) + " INT(11) UNSIGNED NOT NULL");
+		definitions.push(driver.escapeId(opts.many_associations[i].mergeAssocId) + " INT(11) UNSIGNED NOT NULL");
+
+		for (k in opts.many_associations[i].props) {
+			definitions.push(buildColumnDefinition(driver, k, opts.many_associations[i].props[k]));
+		}
+
+		definitions.push("INDEX (" + driver.escapeId(opts.many_associations[i].mergeId) + ", " + driver.escapeId(opts.many_associations[i].mergeAssocId) + ")");
 		queries.push(
 			"CREATE TABLE IF NOT EXISTS " + driver.escapeId(opts.many_associations[i].mergeTable) +
-			" (" +
-			driver.escapeId(opts.many_associations[i].mergeId) + " INT(11) UNSIGNED NOT NULL, " +
-			driver.escapeId(opts.many_associations[i].mergeAssocId) + " INT(11) UNSIGNED NOT NULL, " +
-			"INDEX (" + driver.escapeId(opts.many_associations[i].mergeId) + ", " + driver.escapeId(opts.many_associations[i].mergeAssocId) + ")" +
-			")"
+			" (" + definitions.join(", ") + ")"
 		);
 	}
 
@@ -133,3 +99,51 @@ exports.sync = function (driver, opts, cb) {
 		});
 	}
 };
+
+function buildColumnDefinition(driver, name, prop) {
+	var def;
+
+	switch (prop.type) {
+		case "text":
+			def = driver.escapeId(name) + " VARCHAR(" + Math.min(Math.max(parseInt(prop.size, 10) || 255, 1), 65535) + ")";
+			break;
+		case "number":
+			if (prop.rational === false) {
+				def = driver.escapeId(name) + " INTEGER";
+			} else {
+				def = driver.escapeId(name) + " FLOAT";
+			}
+			if (prop.unsigned === true) {
+				def += " UNSIGNED";
+			}
+			break;
+		case "boolean":
+			def = driver.escapeId(name) + " BOOLEAN NOT NULL";
+			break;
+		case "date":
+			if (prop.time === false) {
+				def = driver.escapeId(name) + " DATE";
+			} else {
+				def = driver.escapeId(name) + " DATETIME";
+			}
+			break;
+		case "binary":
+			if (prop.big === true) {
+				def = driver.escapeId(name) + " LONGBLOB";
+			} else {
+				def = driver.escapeId(name) + " BLOB";
+			}
+			break;
+		case "enum":
+			def = driver.escapeId(name) + " ENUM (" +
+			       prop.values.map(driver.db.escape.bind(driver.db)) +
+			")";
+			break;
+		default:
+			throw new Error("Unknown property type: '" + prop.type + "'");
+	}
+	if (prop.hasOwnProperty("defaultValue")) {
+		def += " DEFAULT " + driver.db.escape(prop.defaultValue);
+	}
+	return def;
+}

From d815914971296ac0e6e36a99042c691da6e89695 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 19 Feb 2013 00:07:44 +0000
Subject: [PATCH 0100/1246] Updates other drivers to also create hasMany extra
 properties on Model.sync()

---
 lib/Drivers/DDL/postgres.js       |  98 +++++++++++++++++------------
 lib/Drivers/DDL/postgresaxomic.js | 100 +++++++++++++++++-------------
 lib/Drivers/DDL/sqlite.js         |  85 ++++++++++++++-----------
 3 files changed, 164 insertions(+), 119 deletions(-)

diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index e1836ef9..c85b8d68 100644
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -26,43 +26,13 @@ exports.sync = function (driver, opts, cb) {
 	definitions.push(driver.escapeId(opts.id) + " SERIAL PRIMARY KEY");
 
 	for (k in opts.properties) {
-		switch (opts.properties[k].type) {
-			case "text":
-				definitions.push(driver.escapeId(k) + " VARCHAR(" + Math.min(Math.max(parseInt(opts.properties[k].size, 10) || 255, 1), 10485760) + ")");
-				break;
-			case "number":
-				if (opts.properties[k].rational === false) {
-					definitions.push(driver.escapeId(k) + " NUMERIC(0)");
-				} else {
-					definitions.push(driver.escapeId(k) + " REAL");
-				}
-				break;
-			case "boolean":
-				definitions.push(driver.escapeId(k) + " BOOLEAN NOT NULL");
-				break;
-			case "date":
-				if (opts.properties[k].time === false) {
-					definitions.push(driver.escapeId(k) + " DATE");
-				} else {
-					definitions.push(driver.escapeId(k) + " TIMESTAMP WITHOUT TIME ZONE"); // hmm... I'm not sure..
-				}
-				break;
-			case "binary":
-				definitions.push(driver.escapeId(k) + " BYTEA");
-				break;
-			case "enum":
-				tmp = driver.escapeId("enum_" + opts.table + "_" + k);
-				subqueries.push(
-					"CREATE TYPE " + tmp + " AS ENUM (" +
-					opts.properties[k].values.map(driver.escape.bind(driver.db)) + ")"
-				);
-				definitions.push(driver.escapeId(k) + " " + tmp);
-				break;
-			default:
-				throw new Error("Unknown property type: '" + opts.properties[k].type + "'");
-		}
-		if (opts.properties[k].hasOwnProperty("defaultValue")) {
-			definitions[definitions.length - 1] += " DEFAULT " + driver.escape(opts.properties[k].defaultValue);
+		definitions.push(buildColumnDefinition(driver, opts.table, k, opts.properties[k]));
+
+		if (opts.properties[k].type == "enum") {
+			subqueries.push(
+				"CREATE TYPE " + tmp + " AS ENUM (" +
+				opts.properties[k].values.map(driver.escape.bind(driver)) + ")"
+			);
 		}
 	}
 
@@ -94,13 +64,20 @@ exports.sync = function (driver, opts, cb) {
 	}
 
 	for (i = 0; i < opts.many_associations.length; i++) {
+		definitions = [];
+
+		definitions.push(driver.escapeId(opts.many_associations[i].mergeId) + " INTEGER NOT NULL");
+		definitions.push(driver.escapeId(opts.many_associations[i].mergeAssocId) + " INTEGER NOT NULL");
+
+		for (k in opts.many_associations[i].props) {
+			definitions.push(buildColumnDefinition(driver, opts.many_associations[i].mergeTable,
+			                                       k, opts.many_associations[i].props[k]));
+		}
+
 		tables.push({
 			name       : opts.many_associations[i].mergeTable,
 			query      : "CREATE TABLE IF NOT EXISTS " + driver.escapeId(opts.many_associations[i].mergeTable) +
-			             " (" +
-			             driver.escapeId(opts.many_associations[i].mergeId) + " INTEGER NOT NULL, " +
-			             driver.escapeId(opts.many_associations[i].mergeAssocId) + " INTEGER NOT NULL" +
-			             ")",
+			             " (" + definitions.join(", ") + ")",
 			subqueries : []
 		});
 		tables[tables.length - 1].subqueries.push(
@@ -141,3 +118,42 @@ function createTableSchema(driver, table, cb) {
 		}
 	});
 }
+
+function buildColumnDefinition(driver, table, name, prop) {
+	var def;
+
+	switch (prop.type) {
+		case "text":
+			def = driver.escapeId(name) + " VARCHAR(" + Math.min(Math.max(parseInt(prop.size, 10) || 255, 1), 65535) + ")";
+			break;
+		case "number":
+			if (prop.rational === false) {
+				def = driver.escapeId(name) + " NUMERIC(0)";
+			} else {
+				def = driver.escapeId(name) + " REAL";
+			}
+			break;
+		case "boolean":
+			def = driver.escapeId(name) + " BOOLEAN NOT NULL";
+			break;
+		case "date":
+			if (prop.time === false) {
+				def = driver.escapeId(name) + " DATE";
+			} else {
+				def = driver.escapeId(name) + " TIMESTAMP WITHOUT TIME ZONE";
+			}
+			break;
+		case "binary":
+			def = driver.escapeId(name) + " BYTEA";
+			break;
+		case "enum":
+			def = driver.escapeId(name) + " " + driver.escapeId("enum_" + table + "_" + name);
+			break;
+		default:
+			throw new Error("Unknown property type: '" + prop.type + "'");
+	}
+	if (prop.hasOwnProperty("defaultValue")) {
+		def += " DEFAULT " + driver.db.escape(prop.defaultValue);
+	}
+	return def;
+}
diff --git a/lib/Drivers/DDL/postgresaxomic.js b/lib/Drivers/DDL/postgresaxomic.js
index 05628c97..c85b8d68 100644
--- a/lib/Drivers/DDL/postgresaxomic.js
+++ b/lib/Drivers/DDL/postgresaxomic.js
@@ -23,46 +23,16 @@ exports.sync = function (driver, opts, cb) {
 	var definitions = [];
 	var k, i, pending, tmp;
 
-	definitions.push(driver.escapeId(opts.id) + " SERIAL");
+	definitions.push(driver.escapeId(opts.id) + " SERIAL PRIMARY KEY");
 
 	for (k in opts.properties) {
-		switch (opts.properties[k].type) {
-			case "text":
-				definitions.push(driver.escapeId(k) + " VARCHAR(" + Math.min(Math.max(parseInt(opts.properties[k].size, 10) || 255, 1), 10485760) + ")");
-				break;
-			case "number":
-				if (opts.properties[k].rational === false) {
-					definitions.push(driver.escapeId(k) + " NUMERIC(0)");
-				} else {
-					definitions.push(driver.escapeId(k) + " REAL");
-				}
-				break;
-			case "boolean":
-				definitions.push(driver.escapeId(k) + " BOOLEAN NOT NULL");
-				break;
-			case "date":
-				if (opts.properties[k].time === false) {
-					definitions.push(driver.escapeId(k) + " DATE");
-				} else {
-					definitions.push(driver.escapeId(k) + " TIMESTAMP WITHOUT TIME ZONE"); // hmm... I'm not sure..
-				}
-				break;
-			case "binary":
-				definitions.push(driver.escapeId(k) + " BYTEA");
-				break;
-			case "enum":
-				tmp = driver.escapeId("enum_" + opts.table + "_" + k);
-				subqueries.push(
-					"CREATE TYPE " + tmp + " AS ENUM (" +
-					opts.properties[k].values.map(driver.escape.bind(driver.db)) + ")"
-				);
-				definitions.push(driver.escapeId(k) + " " + tmp);
-				break;
-			default:
-				throw new Error("Unknown property type: '" + opts.properties[k].type + "'");
-		}
-		if (opts.properties[k].hasOwnProperty("defaultValue")) {
-			definitions[definitions.length - 1] += " DEFAULT " + driver.escape(opts.properties[k].defaultValue);
+		definitions.push(buildColumnDefinition(driver, opts.table, k, opts.properties[k]));
+
+		if (opts.properties[k].type == "enum") {
+			subqueries.push(
+				"CREATE TYPE " + tmp + " AS ENUM (" +
+				opts.properties[k].values.map(driver.escape.bind(driver)) + ")"
+			);
 		}
 	}
 
@@ -94,13 +64,20 @@ exports.sync = function (driver, opts, cb) {
 	}
 
 	for (i = 0; i < opts.many_associations.length; i++) {
+		definitions = [];
+
+		definitions.push(driver.escapeId(opts.many_associations[i].mergeId) + " INTEGER NOT NULL");
+		definitions.push(driver.escapeId(opts.many_associations[i].mergeAssocId) + " INTEGER NOT NULL");
+
+		for (k in opts.many_associations[i].props) {
+			definitions.push(buildColumnDefinition(driver, opts.many_associations[i].mergeTable,
+			                                       k, opts.many_associations[i].props[k]));
+		}
+
 		tables.push({
 			name       : opts.many_associations[i].mergeTable,
 			query      : "CREATE TABLE IF NOT EXISTS " + driver.escapeId(opts.many_associations[i].mergeTable) +
-			             " (" +
-			             driver.escapeId(opts.many_associations[i].mergeId) + " INTEGER NOT NULL, " +
-			             driver.escapeId(opts.many_associations[i].mergeAssocId) + " INTEGER NOT NULL" +
-			             ")",
+			             " (" + definitions.join(", ") + ")",
 			subqueries : []
 		});
 		tables[tables.length - 1].subqueries.push(
@@ -141,3 +118,42 @@ function createTableSchema(driver, table, cb) {
 		}
 	});
 }
+
+function buildColumnDefinition(driver, table, name, prop) {
+	var def;
+
+	switch (prop.type) {
+		case "text":
+			def = driver.escapeId(name) + " VARCHAR(" + Math.min(Math.max(parseInt(prop.size, 10) || 255, 1), 65535) + ")";
+			break;
+		case "number":
+			if (prop.rational === false) {
+				def = driver.escapeId(name) + " NUMERIC(0)";
+			} else {
+				def = driver.escapeId(name) + " REAL";
+			}
+			break;
+		case "boolean":
+			def = driver.escapeId(name) + " BOOLEAN NOT NULL";
+			break;
+		case "date":
+			if (prop.time === false) {
+				def = driver.escapeId(name) + " DATE";
+			} else {
+				def = driver.escapeId(name) + " TIMESTAMP WITHOUT TIME ZONE";
+			}
+			break;
+		case "binary":
+			def = driver.escapeId(name) + " BYTEA";
+			break;
+		case "enum":
+			def = driver.escapeId(name) + " " + driver.escapeId("enum_" + table + "_" + name);
+			break;
+		default:
+			throw new Error("Unknown property type: '" + prop.type + "'");
+	}
+	if (prop.hasOwnProperty("defaultValue")) {
+		def += " DEFAULT " + driver.db.escape(prop.defaultValue);
+	}
+	return def;
+}
diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index 541dfe3b..f19c54d8 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -25,38 +25,7 @@ exports.sync = function (driver, opts, cb) {
 	definitions.push(driver.escapeId(opts.id) + " INTEGER PRIMARY KEY AUTOINCREMENT");
 
 	for (k in opts.properties) {
-		switch (opts.properties[k].type) {
-			case "text":
-				definitions.push(driver.escapeId(k) + " TEXT");
-				break;
-			case "number":
-				if (opts.properties[k].rational === false) {
-					definitions.push(driver.escapeId(k) + " INTEGER");
-				} else {
-					definitions.push(driver.escapeId(k) + " REAL");
-				}
-				if (opts.properties[k].unsigned === true) {
-					definitions[definitions.length - 1] += " UNSIGNED";
-				}
-				break;
-			case "boolean":
-				definitions.push(driver.escapeId(k) + " INTEGER UNSIGNED NOT NULL");
-				break;
-			case "date":
-				definitions.push(driver.escapeId(k) + " DATETIME");
-				break;
-			case "binary":
-				definitions.push(driver.escapeId(k) + " BLOB");
-				break;
-			case "enum":
-				definitions.push(driver.escapeId(k) + " INTEGER");
-				break;
-			default:
-				throw new Error("Unknown property type: '" + opts.properties[k].type + "'");
-		}
-		if (opts.properties[k].hasOwnProperty("defaultValue")) {
-			definitions[definitions.length - 1] += " DEFAULT " + driver.escape(opts.properties[k].defaultValue);
-		}
+		definitions.push(buildColumnDefinition(driver, k, opts.properties[k]));
 	}
 
 	for (i = 0; i < opts.one_associations.length; i++) {
@@ -86,12 +55,18 @@ exports.sync = function (driver, opts, cb) {
 	}
 
 	for (i = 0; i < opts.many_associations.length; i++) {
+		definitions = [];
+
+		definitions.push(driver.escapeId(opts.many_associations[i].mergeId) + " INTEGER UNSIGNED NOT NULL");
+		definitions.push(driver.escapeId(opts.many_associations[i].mergeAssocId) + " INTEGER UNSIGNED NOT NULL");
+
+		for (k in opts.many_associations[i].props) {
+			definitions.push(buildColumnDefinition(driver, k, opts.many_associations[i].props[k]));
+		}
+
 		queries.push(
 			"CREATE TABLE IF NOT EXISTS " + driver.escapeId(opts.many_associations[i].mergeTable) +
-			" (" +
-			driver.escapeId(opts.many_associations[i].mergeId) + " INTEGER UNSIGNED NOT NULL, " +
-			driver.escapeId(opts.many_associations[i].mergeAssocId) + " INTEGER UNSIGNED NOT NULL" +
-			")"
+			" (" + definitions.join(", ") + ")"
 		);
 		queries.push(
 			"CREATE INDEX IF NOT EXISTS " + driver.escapeId(opts.many_associations[i].mergeTable) +
@@ -110,3 +85,41 @@ exports.sync = function (driver, opts, cb) {
 		});
 	}
 };
+
+function buildColumnDefinition(driver, name, prop) {
+	var def;
+
+	switch (prop.type) {
+		case "text":
+			def = driver.escapeId(name) + " TEXT";
+			break;
+		case "number":
+			if (prop.rational === false) {
+				def = driver.escapeId(name) + " INTEGER";
+			} else {
+				def = driver.escapeId(name) + " REAL";
+			}
+			if (prop.unsigned === true) {
+				def += " UNSIGNED";
+			}
+			break;
+		case "boolean":
+			def = driver.escapeId(name) + " INTEGER UNSIGNED NOT NULL";
+			break;
+		case "date":
+			def = driver.escapeId(name) + " DATETIME";
+			break;
+		case "binary":
+			def = driver.escapeId(name) + " BLOB";
+			break;
+		case "enum":
+			def = driver.escapeId(name) + " INTEGER";
+			break;
+		default:
+			throw new Error("Unknown property type: '" + prop.type + "'");
+	}
+	if (prop.hasOwnProperty("defaultValue")) {
+		def += " DEFAULT " + driver.db.escape(prop.defaultValue);
+	}
+	return def;
+}

From e144c0c4e74562b52d80c3341c93ab3eefc78901 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 19 Feb 2013 00:17:42 +0000
Subject: [PATCH 0101/1246] Tries to fix association queries using fixed
 Instance.id instead of Model id property name (#41)

---
 lib/Associations/Many.js | 12 ++++++------
 lib/Associations/One.js  |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 29591ced..65471253 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -87,12 +87,12 @@ function extendInstance(Instance, Driver, association, opts, cb) {
 			options.extra = association.props;
 			options.extra_info = {
 				table: association.mergeTable,
-				id: Instance.id,
+				id: Instance[association.model.id],
 				id_prop: association.mergeId,
 				assoc_prop: association.mergeAssocId
 			};
 
-			conditions[association.mergeTable + "." + association.mergeId] = Instance.id;
+			conditions[association.mergeTable + "." + association.mergeId] = Instance[association.model.id];
 			conditions[association.mergeTable + "." + association.mergeAssocId] = [];
 
 			for (var i = 0; i < Instances.length; i++) {
@@ -141,7 +141,7 @@ function extendInstance(Instance, Driver, association, opts, cb) {
 			options.extra = association.props;
 			options.extra_info = {
 				table: association.mergeTable,
-				id: Instance.id,
+				id: Instance[association.model.id],
 				id_prop: association.mergeId,
 				assoc_prop: association.mergeAssocId
 			};
@@ -149,7 +149,7 @@ function extendInstance(Instance, Driver, association, opts, cb) {
 			if (conditions === null) {
 				conditions = {};
 			}
-			conditions[association.mergeTable + "." + association.mergeId] = Instance.id;
+			conditions[association.mergeTable + "." + association.mergeId] = Instance[association.model.id];
 
 			if (cb === null) {
 				return association.model.find(conditions, limit, options);
@@ -181,7 +181,7 @@ function extendInstance(Instance, Driver, association, opts, cb) {
 			var cb = Associations.pop();
 			var conditions = {};
 			var associationIds = [];
-			conditions[association.mergeId] = Instance.id;
+			conditions[association.mergeId] = Instance[association.model.id];
 
 			if (Associations.length === 0) {
 				Driver.remove(association.mergeTable, conditions, cb);
@@ -240,7 +240,7 @@ function extendInstance(Instance, Driver, association, opts, cb) {
 					}
 
 					var data = {};
-					data[association.mergeId] = Instance.id;
+					data[association.mergeId] = Instance[association.model.id];
 					data[association.mergeAssocId] = Association.id;
 
 					for (var k in opts) {
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index 9d544f7d..fa1df2b2 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -83,9 +83,9 @@ function extendInstance(Instance, Driver, association, opts, cb) {
 			}
 
 			if (association.reversed) {
-				if (Instance.id) {
+				if (Instance[association.model.id]) {
 					var conditions = {};
-					conditions[association.field] = Instance.id;
+					conditions[association.field] = Instance[association.model.id];
 					association.model.find(conditions, opts, cb);
 				} else {
 					cb(null);

From 449fecb057a5a4c99af49d4a5d300f20de0721ef Mon Sep 17 00:00:00 2001
From: Zachary Berry <zachberry@gmail.com>
Date: Tue, 19 Feb 2013 21:20:05 -0500
Subject: [PATCH 0102/1246] using process.cwd() to require modules relative to
 project directory

---
 lib/ORM.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index 693d53af..4a7f4204 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -123,7 +123,7 @@ ORM.prototype.close = function (cb) {
 };
 ORM.prototype.load = function (file, cb) {
 	try {
-		require(file)(this, cb);
+		require(process.cwd() + '/' + file)(this, cb);
 	} catch (ex) {
 		return cb(ex);
 	}

From c74fd953a6a2acb3347ca780e52542e35c0c71df Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 20 Feb 2013 12:26:38 +0000
Subject: [PATCH 0103/1246] Changes orm.load() to support absolute paths

---
 lib/ORM.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index 4a7f4204..94a4b511 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -1,5 +1,6 @@
 var util          = require("util");
 var events        = require("events");
+var path          = require("path");
 
 var Model         = require("./Model").Model;
 var DriverAliases = require("./Drivers/aliases");
@@ -123,7 +124,7 @@ ORM.prototype.close = function (cb) {
 };
 ORM.prototype.load = function (file, cb) {
 	try {
-		require(process.cwd() + '/' + file)(this, cb);
+		require((file[0] != path.sep ? process.cwd() + "/" : "") + file)(this, cb);
 	} catch (ex) {
 		return cb(ex);
 	}

From 73fe7fc082273bca58abb1d7a8a71dda4b672982 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 20 Feb 2013 20:07:31 +0000
Subject: [PATCH 0104/1246] Adds possibility to send callback right to .each()

This avoids doing Model.find(...).each().forEach(...) and allows people
to do Model.find(...).each(...)
---
 lib/ChainFind.js     | 4 ++--
 lib/ChainInstance.js | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index b0ec7a3b..e723495b 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -68,8 +68,8 @@ function ChainFind(opts) {
 				return cb(err, items.length > 0 ? items[0] : null);
 			});
 		},
-		each: function () {
-			return new ChainInstance(this);
+		each: function (cb) {
+			return new ChainInstance(this, cb);
 		},
 		run: function (cb) {
 			opts.driver.find(opts.only, opts.table, opts.conditions, {
diff --git a/lib/ChainInstance.js b/lib/ChainInstance.js
index 8c072b46..3713699c 100644
--- a/lib/ChainInstance.js
+++ b/lib/ChainInstance.js
@@ -1,6 +1,6 @@
 module.exports = ChainInstance;
 
-function ChainInstance(chain) {
+function ChainInstance(chain, cb) {
 	var instances = null;
 	var loading   = false;
 	var queue     = [];
@@ -81,5 +81,9 @@ function ChainInstance(chain) {
 			return saveNext(0);
 		})
 	};
+
+	if (typeof cb == "function") {
+		return calls.forEach(cb);
+	}
 	return calls;
 }

From 2a84a146d00c7a68fdb4ed0cacf06b263fb72a32 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 20 Feb 2013 20:07:42 +0000
Subject: [PATCH 0105/1246] Adds documentation about hasOne reverse option

---
 Readme.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/Readme.md b/Readme.md
index beab1956..12b57162 100644
--- a/Readme.md
+++ b/Readme.md
@@ -377,3 +377,27 @@ Person.hasMany("friends", {
     rate : Number
 });
 ```
+
+For `hasOne` associations you can make calls to the associated Model by using the `reverse` option. For example,
+if you have an association from ModelA to ModelB, you can create an accessor in ModelB to get instances from ModelA.
+Confusin? Look at the next example.
+
+```js
+var Pet = db.define('pet', {
+	name : String
+});
+var Person = db.define('person', {
+	name : String
+});
+Pet.hasOne("owner", Person, {
+	reverse : "pets"
+});
+
+Person(4).getPets(function (err, pets) {
+	// although the association was made on Pet,
+	// Person will have an accessor (getPets)
+	//
+	// In this example, ORM will fetch all pets
+	// whose owner_id = 4
+});
+```

From 90ba924461bee996d9bf5f6050044d3d559e8dc5 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 20 Feb 2013 20:17:50 +0000
Subject: [PATCH 0106/1246] Adds documentation about chaining some common Array
 methods

---
 Readme.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/Readme.md b/Readme.md
index 12b57162..42f8912d 100644
--- a/Readme.md
+++ b/Readme.md
@@ -265,6 +265,32 @@ Person.find({ surname: "Doe" }).remove(function (err) {
 });
 ```
 
+You can also make modifications to your instances using common Array traversal methods and save everything
+in the end.
+
+```js
+Person.find({ surname: "Doe" }).each(function (person) {
+	person.surname = "Dean";
+}).save(function (err) {
+	// done!
+});
+
+Person.find({ surname: "Doe" }).each().filter(function (person) {
+	return person.age >= 18;
+}).sort(function (person1, person2) {
+	return person1.age < person2.age;
+}).get(function (people) {
+	// get all people with at least 18 years, sorted by age
+});
+```
+
+Of course you could do this directly on `.find()`, but for some more complicated tasks this can be very usefull.
+
+`Model.find()` does not return an Array so you can't just chain directly. To start chaining you have to call
+`.each()` (with an optional callback if you want to traverse the list). You can then use the common functions
+`.filter()`, `.sort()` and `.forEach()` more than once. In the end (or during the process..) you can call
+`.count()` if you just want to know how many items there are or call `.get()` to retrieve the list.
+
 #### Conditions
 
 Conditions are defined as an object where every key is a property (table column). All keys are supposed

From 216907ae3e045cf03fbe20ac673457a31f4a6604 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 20 Feb 2013 20:19:26 +0000
Subject: [PATCH 0107/1246] Adds more documentation about chaining, adds
 .save()

---
 Readme.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Readme.md b/Readme.md
index 42f8912d..0529af8d 100644
--- a/Readme.md
+++ b/Readme.md
@@ -288,8 +288,12 @@ Of course you could do this directly on `.find()`, but for some more complicated
 
 `Model.find()` does not return an Array so you can't just chain directly. To start chaining you have to call
 `.each()` (with an optional callback if you want to traverse the list). You can then use the common functions
-`.filter()`, `.sort()` and `.forEach()` more than once. In the end (or during the process..) you can call
-`.count()` if you just want to know how many items there are or call `.get()` to retrieve the list.
+`.filter()`, `.sort()` and `.forEach()` more than once.
+
+In the end (or during the process..) you can call:
+- `.count()` if you just want to know how many items there are;
+- `.get()` to retrieve the list;
+- `.save()` to save all item changes.
 
 #### Conditions
 

From ac9f26601dc0c10c78a183344985173dcdac6d87 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 20 Feb 2013 20:37:36 +0000
Subject: [PATCH 0108/1246] Adds line separation before adding instance
 properties

---
 lib/Instance.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Instance.js b/lib/Instance.js
index ab6efeec..c5e9766e 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -231,6 +231,7 @@ function Instance(opts) {
 	if (!opts.data.hasOwnProperty(opts.id)) {
 		addInstanceProperty(opts.id);
 	}
+
 	for (var k in opts.data) {
 		if (!opts.data.hasOwnProperty(k)) continue;
 		if (!opts.properties.hasOwnProperty(k) && k != opts.id && opts.association_properties.indexOf(k) == -1) {

From 1295b0b71b770f8fe93fe9d9a7031202a427836e Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 20 Feb 2013 20:37:52 +0000
Subject: [PATCH 0109/1246] Adds test for Model.find().each(cb)

---
 .../test-find-chain-instance-each.js          | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 test/integration/test-find-chain-instance-each.js

diff --git a/test/integration/test-find-chain-instance-each.js b/test/integration/test-find-chain-instance-each.js
new file mode 100644
index 00000000..b641acc7
--- /dev/null
+++ b/test/integration/test-find-chain-instance-each.js
@@ -0,0 +1,28 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_find_chain_instance_each', db.driver.db, function () {
+		common.insertModelData('test_find_chain_instance_each', db.driver.db, [
+			{ id : 1, name : 'test1' },
+			{ id : 2, name : 'test2' },
+			{ id : 3, name : 'test3' },
+			{ id : 4, name : 'test4' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_find_chain_instance_each', common.getModelProperties());
+
+			TestModel.find().each(function (instance) {
+				instance.name = instance.id;
+			}).get(function (instances) {
+				assert.equal(instances.length, 4);
+				assert.equal(instances[0].name, 1);
+				assert.equal(instances[1].name, 2);
+				assert.equal(instances[2].name, 3);
+				assert.equal(instances[3].name, 4);
+				db.close();
+			});
+		});
+	});
+});

From a8056e6e239aee966e60834613331a11705f8da3 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 20 Feb 2013 20:38:17 +0000
Subject: [PATCH 0110/1246] Adds test for Model.hasOne(..., { reverse: "..." })

---
 .../test-association-hasone-reverse.js        | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 test/integration/test-association-hasone-reverse.js

diff --git a/test/integration/test-association-hasone-reverse.js b/test/integration/test-association-hasone-reverse.js
new file mode 100644
index 00000000..96f2c316
--- /dev/null
+++ b/test/integration/test-association-hasone-reverse.js
@@ -0,0 +1,24 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModel2Table('test_association_hasone_reverse', db.driver.db, function () {
+			common.insertModel2Data('test_association_hasone_reverse', db.driver.db, [
+				{ id : 1, name : 'test1', assoc: 2 },
+				{ id : 2, name : 'test2', assoc: 0 }
+			], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_association_hasone_reverse', common.getModelProperties());
+			TestModel.hasOne("assoc", TestModel, { reverse: "reverseassoc" });
+
+			TestModel(2).getReverseassoc(function (err, Tests) {
+				assert.equal(err, null);
+				assert.equal(Array.isArray(Tests), true);
+				assert.equal(typeof Tests[0], "object");
+				assert.equal(Tests[0].id, 1);
+				db.close();
+			});
+		});
+	});
+});

From 1304e7b9621d0eda87e9370f9edec164154394a6 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 20 Feb 2013 20:48:26 +0000
Subject: [PATCH 0111/1246] Changes associations to just change the first
 letter of the association name to lowercase, everything else stays as the
 user defines

Adds a simple test to this name letter case
---
 lib/Associations/Many.js                      |  7 ++++--
 lib/Associations/One.js                       |  2 +-
 .../test-association-name-lettercase.js       | 25 +++++++++++++++++++
 3 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 test/integration/test-association-name-lettercase.js

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 65471253..f62ddf8e 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -30,8 +30,7 @@ exports.prepare = function (Model, associations) {
 			props = {};
 		}
 
-		var assocName = opts.name || name[0].toUpperCase() +
-		                             name.substr(1, name.length).toLowerCase();
+		var assocName = opts.name || ucfirst(name);
 
 		associations.push({
 			name           : name,
@@ -280,3 +279,7 @@ function extendInstance(Instance, Driver, association, opts, cb) {
 		return cb();
 	});
 }
+
+function ucfirst(text) {
+	return text[0].toUpperCase() + text.substr(1);
+}
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index fa1df2b2..f987bc0f 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -148,5 +148,5 @@ function extendInstance(Instance, Driver, association, opts, cb) {
 }
 
 function ucfirst(text) {
-	return text[0].toUpperCase() + text.substr(1).toLowerCase();
+	return text[0].toUpperCase() + text.substr(1);
 }
diff --git a/test/integration/test-association-name-lettercase.js b/test/integration/test-association-name-lettercase.js
new file mode 100644
index 00000000..8af83071
--- /dev/null
+++ b/test/integration/test-association-name-lettercase.js
@@ -0,0 +1,25 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModel2Table('test_association_name_lettercase', db.driver.db, function () {
+		common.insertModel2Data('test_association_name_lettercase', db.driver.db, [
+			{ id : 1, name : 'test1', assoc: 0 }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_association_name_lettercase', common.getModelProperties());
+			TestModel.hasOne("myLetterCase");
+
+			TestModel.get(1, function (err, Test1) {
+				assert.equal(err, null);
+
+				assert.equal(typeof Test1.getMyLetterCase, "function");
+				assert.equal(typeof Test1.setMyLetterCase, "function");
+				assert.equal(typeof Test1.hasMyLetterCase, "function");
+
+				db.close();
+			});
+		});
+	});
+});

From 72564ff4b6082ebd2923317b9f1dd83000b270c8 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 20 Feb 2013 20:58:12 +0000
Subject: [PATCH 0112/1246] Adds initial code for hasMany reversed associations
 (#31)

---
 lib/Associations/Many.js | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index f62ddf8e..75cb2413 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -31,8 +31,7 @@ exports.prepare = function (Model, associations) {
 		}
 
 		var assocName = opts.name || ucfirst(name);
-
-		associations.push({
+		var association = {
 			name           : name,
 			model          : OtherModel || Model,
 			props          : props,
@@ -48,7 +47,20 @@ exports.prepare = function (Model, associations) {
 			hasAccessor    : opts.hasAccessor || ("has" + assocName),
 			delAccessor    : opts.delAccessor || ("remove" + assocName),
 			addAccessor    : opts.addAccessor || ("add" + assocName)
-		});
+		};
+		associations.push(association);
+
+		if (opts.reverse) {
+			OtherModel.hasMany(opts.reverse, Model, association.props, {
+				reversed       : true,
+				mergeTable     : association.mergeTable,
+				mergeId        : association.mergeAssocId,
+				mergeAssocId   : association.mergeId,
+				field          : association.field,
+				autoFetch      : association.autoFetch,
+				autoFetchLimit : association.autoFetchLimit
+			});
+		}
 		return this;
 	};
 };

From c7b1bf8e5885ec2fdb91a60ffc3425ae02b638b9 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 20 Feb 2013 22:47:23 +0000
Subject: [PATCH 0113/1246] Adds db.serial() to make several queries (finds) at
 a time (look at the test in this commit)

---
 lib/ORM.js                           | 29 ++++++++++++++++++++++++
 test/integration/test-find-serial.js | 33 ++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 test/integration/test-find-serial.js

diff --git a/lib/ORM.js b/lib/ORM.js
index 94a4b511..acd10de6 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -153,6 +153,35 @@ ORM.prototype.sync = function (cb) {
 
 	return this;
 };
+ORM.prototype.serial = function () {
+	var chains = Array.prototype.slice.apply(arguments);
+
+	return {
+		get: function (cb) {
+			var params = [];
+			var getNext = function () {
+				if (params.length === chains.length) {
+					params.unshift(null);
+					return cb.apply(null, params);
+				}
+
+				chains[params.length].run(function (err, instances) {
+					if (err) {
+						params.unshift(err);
+						return cb.apply(null, params);
+					}
+
+					params.push(instances);
+					return getNext();
+				});
+			};
+
+			getNext();
+
+			return this;
+		}
+	};
+};
 
 function extractOption(opts, key) {
 	if (!opts.query.hasOwnProperty(key)) {
diff --git a/test/integration/test-find-serial.js b/test/integration/test-find-serial.js
new file mode 100644
index 00000000..0248cf3e
--- /dev/null
+++ b/test/integration/test-find-serial.js
@@ -0,0 +1,33 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_find_serial1', db.driver.db, function () {
+		common.insertModelData('test_find_serial1', db.driver.db, [
+			{ id : 1, name : 'test1' },
+			{ id : 2, name : 'test2' }
+		], function () {
+			common.createModelTable('test_find_serial2', db.driver.db, function () {
+				common.insertModelData('test_find_serial2', db.driver.db, [
+					{ id : 1, name : 'test1' },
+					{ id : 2, name : 'test2' },
+					{ id : 3, name : 'test3' },
+					{ id : 4, name : 'test4' }
+				], function () {
+					var TestModel1 = db.define('test_find_serial1', common.getModelProperties());
+					var TestModel2 = db.define('test_find_serial2', common.getModelProperties());
+
+					db.serial(
+						TestModel1.find(),
+						TestModel2.find({ name: 'test2' })
+					).get(function (err, tests1, tests2) {
+						assert.equal(err, null);
+						assert.equal(tests1.length, 2);
+						assert.equal(tests2.length, 1);
+						db.close();
+					});
+				});
+			});
+		});
+	});
+});

From 30a8f581a678dfa22ad8b657ec049b0cbd224839 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 20 Feb 2013 23:09:15 +0000
Subject: [PATCH 0114/1246] 2.0.0

---
 Readme.md    | 2 +-
 package.json | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Readme.md b/Readme.md
index 0529af8d..46344926 100644
--- a/Readme.md
+++ b/Readme.md
@@ -5,7 +5,7 @@
 ## Install
 
 ```sh
-npm install orm@2.0.0-alpha10
+npm install orm@2.0.0
 ```
 
 Despite the alpha tag, this is the recommended version for new applications.
diff --git a/package.json b/package.json
index 72208046..8e621d46 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "postgres",
     "sqlite"
   ],
-  "version": "2.0.0-alpha10",
+  "version": "2.0.0",
   "license": "MIT",
   "repository": {
     "url": "http://dresende.github.com/node-orm2"
@@ -37,7 +37,7 @@
   "devDependencies": {
     "utest": "0.0.6",
     "urun": "0.0.6",
-    "mysql": "2.0.0-alpha6",
+    "mysql": "2.0.0-alpha7",
     "pg": "0.8.7",
     "sqlite3": "2.1.5"
   },

From b8784def6340ff3b820103d37fee7242a0b9884a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 20 Feb 2013 23:25:45 +0000
Subject: [PATCH 0115/1246] Removes version from installation command from
 Readme

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 46344926..0ac24d63 100644
--- a/Readme.md
+++ b/Readme.md
@@ -5,7 +5,7 @@
 ## Install
 
 ```sh
-npm install orm@2.0.0
+npm install orm
 ```
 
 Despite the alpha tag, this is the recommended version for new applications.

From 23e2eec7552486f5dfd785ef0f0b803093a16ec1 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Feb 2013 10:33:36 +0000
Subject: [PATCH 0116/1246] Adds documentation about singleton and cache option

---
 Readme.md | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 0ac24d63..804b8155 100644
--- a/Readme.md
+++ b/Readme.md
@@ -232,7 +232,7 @@ Person.exists({ surname: "Doe" }, function (err, exists) {
 });
 ```
 
-#### Available options
+### Available options
 
 - `offset`: discards the first `N` elements
 - `limit`: although it can be passed as a direct argument, you can use it here if you prefer
@@ -319,6 +319,21 @@ a few examples to describe it:
 { col1: orm.between(123, 456) } // `col1` BETWEEN 123 AND 456
 ```
 
+### Singleton
+
+Each model instances is cached, so if you fetch the same record using 2 or more different queries, you will
+get the same object. If you have other systems that can change your database (or you're developing and need
+to make some manual changes) you should remove this feature by disabling cache. You do this when you're
+defining each Model.
+
+```js
+var Person = db.define('person', {
+	name    : String
+}, {
+	cache   : false
+});
+```
+
 ## Associations
 
 An association is a relation between one or more tables.

From 50e997436aed69d436483615cb46844597350279 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Feb 2013 10:49:29 +0000
Subject: [PATCH 0117/1246] Changes singleton to prepare to support cache
 timeout, adds test for no cache

---
 lib/Singleton.js                              |  8 +++++--
 .../integration/test-get-singleton-nocache.js | 23 +++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 test/integration/test-get-singleton-nocache.js

diff --git a/lib/Singleton.js b/lib/Singleton.js
index 43fde585..3489c3d6 100644
--- a/lib/Singleton.js
+++ b/lib/Singleton.js
@@ -5,10 +5,14 @@ exports.get = function (key, opts, createCb, returnCb) {
 		return createCb(returnCb);
 	}
 	if (map.hasOwnProperty(key)) {
-		return returnCb(map[key]);
+		return returnCb(map[key].o);
 	}
 
 	createCb(function (value) {
-		return returnCb(map[key] = value);
+		map[key] = {
+			o : value, // object
+			t : null   // timeout
+		};
+		return returnCb(map[key].o);
 	});
 };
diff --git a/test/integration/test-get-singleton-nocache.js b/test/integration/test-get-singleton-nocache.js
new file mode 100644
index 00000000..cded83a3
--- /dev/null
+++ b/test/integration/test-get-singleton-nocache.js
@@ -0,0 +1,23 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_get_singleton_nocache', db.driver.db, function () {
+		common.insertModelData('test_get_singleton_nocache', db.driver.db, [
+			{ id : 1, name : 'test' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_get_singleton_nocache', common.getModelProperties(), { cache: false });
+
+			TestModel.get(1, function (err, Instance1) {
+				assert.equal(err, null);
+				TestModel.get(1, function (err, Instance2) {
+					assert.equal(err, null);
+					assert.notStrictEqual(Instance1, Instance2);
+					db.close();
+				});
+			});
+		});
+	});
+});

From 337f63641bc3c84c1a18be5fd733bc8915847bcb Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Feb 2013 10:53:50 +0000
Subject: [PATCH 0118/1246] Changes singleton to support cache value as a
 number (timeout in seconds)

---
 lib/Singleton.js                              | 12 ++++---
 .../test-get-singleton-somecache.js           | 31 +++++++++++++++++++
 2 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 test/integration/test-get-singleton-somecache.js

diff --git a/lib/Singleton.js b/lib/Singleton.js
index 3489c3d6..08a72182 100644
--- a/lib/Singleton.js
+++ b/lib/Singleton.js
@@ -5,13 +5,17 @@ exports.get = function (key, opts, createCb, returnCb) {
 		return createCb(returnCb);
 	}
 	if (map.hasOwnProperty(key)) {
-		return returnCb(map[key].o);
+		if (map[key].t !== null && map[key].t <= Date.now()) {
+			delete map[key];
+		} else {
+			return returnCb(map[key].o);
+		}
 	}
 
 	createCb(function (value) {
-		map[key] = {
-			o : value, // object
-			t : null   // timeout
+		map[key] = { // object , timeout
+			o : value,
+			t : (opts && typeof opts.cache == "number" ? Date.now() + (opts.cache * 1000) : null)
 		};
 		return returnCb(map[key].o);
 	});
diff --git a/test/integration/test-get-singleton-somecache.js b/test/integration/test-get-singleton-somecache.js
new file mode 100644
index 00000000..1335a176
--- /dev/null
+++ b/test/integration/test-get-singleton-somecache.js
@@ -0,0 +1,31 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_get_singleton_somecache', db.driver.db, function () {
+		common.insertModelData('test_get_singleton_somecache', db.driver.db, [
+			{ id : 1, name : 'test' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_get_singleton_somecache', common.getModelProperties(), { cache: 0.5 });
+
+			TestModel.get(1, function (err, Instance1) {
+				assert.equal(err, null);
+
+				TestModel.get(1, function (err, Instance2) {
+					assert.equal(err, null);
+					assert.strictEqual(Instance1, Instance2);
+				});
+
+				setTimeout(function () {
+					TestModel.get(1, function (err, Instance3) {
+						assert.equal(err, null);
+						assert.notStrictEqual(Instance1, Instance3);
+						db.close();
+					});
+				}, 1000);
+			});
+		});
+	});
+});

From c96d08b1725cfc12b896e3973e2e7ef3bd145d5a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Feb 2013 11:07:47 +0000
Subject: [PATCH 0119/1246] Updates documentation about singleton cache timeout

---
 Readme.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Readme.md b/Readme.md
index 804b8155..ca109e0b 100644
--- a/Readme.md
+++ b/Readme.md
@@ -334,6 +334,9 @@ var Person = db.define('person', {
 });
 ```
 
+If you want singletons but want cache to expire after a period of time, you can pass a number instead of a
+boolean. The number will be considered the cache timeout in seconds (you can use floating point).
+
 ## Associations
 
 An association is a relation between one or more tables.

From 1bc4ca2d139526d72bec974b16d4a0a7035b1d95 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Feb 2013 11:21:46 +0000
Subject: [PATCH 0120/1246] Adds more documentation about associations

---
 Readme.md | 48 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/Readme.md b/Readme.md
index ca109e0b..9a153619 100644
--- a/Readme.md
+++ b/Readme.md
@@ -341,7 +341,18 @@ boolean. The number will be considered the cache timeout in seconds (you can use
 
 An association is a relation between one or more tables.
 
-## hasOne vs. hasMany Associations
+## hasOne vs. hasMany
+
+Since this topic brings some confusion to many people including myself, here's a list of the possibilities
+supported by both types of association.
+
+- `hasOne` : it's a **Many-to-One** relationship. A.hasOne(B) means A will have one (or none) of B, but B can be
+  associated with many A;
+- `hasMany`: it's a **One-to-Many** relationship. A.hasMany(B) means A will have none, one or more of B. Actually
+  B will be associated with possibly many A but you don't have how to find it easily (see next);
+- `hasMany` + reverse: it's a **Many-to-Many** relationship. A.hasMany(B, { reverse: A }) means A can have none or
+  many B and also B can have none or many A. Accessors will be created in both models so you can manage them from
+  both sides.
 
 If you have a relation of 1 to 0 or 1 to 1, you should use `hasOne` association. This assumes a column in the model that has the id of the other end of the relation.
 
@@ -363,6 +374,14 @@ Animal.get(123, function (err, Foo) {
 });
 ```
 
+If you prefer to use another name for the field (owner_id) you can change this parameter in the settings.
+
+```js
+db.settings.set("properties.association_key", "id_{name}"); // {name} will be replaced by 'owner' in this case
+```
+
+**Note: This has to be done prior to the association creation.**
+
 For relations of 1 to many you have to use `hasMany` associations. This assumes another table that has 2 columns, one for each table in the association.
 
 ```js
@@ -426,9 +445,9 @@ Person.hasMany("friends", {
 });
 ```
 
-For `hasOne` associations you can make calls to the associated Model by using the `reverse` option. For example,
-if you have an association from ModelA to ModelB, you can create an accessor in ModelB to get instances from ModelA.
-Confusin? Look at the next example.
+Associations can make calls to the associated Model by using the `reverse` option. For example, if you have an
+association from ModelA to ModelB, you can create an accessor in ModelB to get instances from ModelA.
+Confusing? Look at the next example.
 
 ```js
 var Pet = db.define('pet', {
@@ -449,3 +468,24 @@ Person(4).getPets(function (err, pets) {
 	// whose owner_id = 4
 });
 ```
+
+This makes even more sense when having `hasMany` associations since you can manage the Many-to-Many associations
+from both sides.
+
+
+```js
+var Pet = db.define('pet', {
+	name : String
+});
+var Person = db.define('person', {
+	name : String
+});
+Person.hasMany("pets", Person, {
+    bought  : Date
+}, {
+	reverse : "owners"
+});
+
+Person(1).getPets(...);
+Pet(2).getOwners(...);
+```

From 5801d630f1e2cd39bfae2c4e256796ad02abf3ff Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Feb 2013 17:16:42 +0000
Subject: [PATCH 0121/1246] Fixes bug when escaping boolean values in postgres

---
 lib/Drivers/DML/postgres.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 61af11ea..ca3ccd55 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -186,6 +186,8 @@ Driver.prototype.escape = function (value) {
 	switch (typeof value) {
 		case "number":
 			return value;
+		case "boolean":
+			return value ? "true" : "false";
 	}
 
 	return "'" + value.replace(/\'/g, "''") + "'";

From 76593c22fb262ba9b8dbeddb482a9c0b7ad9afa1 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Feb 2013 17:17:30 +0000
Subject: [PATCH 0122/1246] Fixes bug on Model.sync (postgres) when property
 has default value (using wrong path to escape method)

---
 lib/Drivers/DDL/postgres.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index c85b8d68..b4ad9250 100644
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -153,7 +153,7 @@ function buildColumnDefinition(driver, table, name, prop) {
 			throw new Error("Unknown property type: '" + prop.type + "'");
 	}
 	if (prop.hasOwnProperty("defaultValue")) {
-		def += " DEFAULT " + driver.db.escape(prop.defaultValue);
+		def += " DEFAULT " + driver.escape(prop.defaultValue);
 	}
 	return def;
 }

From f88d0ba9ada84a28eed2d409dd54d1094e26ac23 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Feb 2013 17:23:12 +0000
Subject: [PATCH 0123/1246] Fixes DDL drivers creating duplicated field in
 reversed hasOne associations

---
 lib/Drivers/DDL/mysql.js          | 2 ++
 lib/Drivers/DDL/postgres.js       | 2 ++
 lib/Drivers/DDL/postgresaxomic.js | 2 ++
 lib/Drivers/DDL/sqlite.js         | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index 67f1510d..cdf5c688 100644
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -42,6 +42,7 @@ exports.sync = function (driver, opts, cb) {
 	}
 
 	for (i = 0; i < opts.one_associations.length; i++) {
+		if (opts.one_associations[i].reversed) continue;
 		definitions.push(driver.escapeId(opts.one_associations[i].field) + " INT(11) UNSIGNED NOT NULL");
 	}
 
@@ -52,6 +53,7 @@ exports.sync = function (driver, opts, cb) {
 		}
 	}
 	for (i = 0; i < opts.one_associations.length; i++) {
+		if (opts.one_associations[i].reversed) continue;
 		definitions.push("INDEX (" + driver.escapeId(opts.one_associations[i].field) + ")");
 	}
 
diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index b4ad9250..1ed841d6 100644
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -37,6 +37,7 @@ exports.sync = function (driver, opts, cb) {
 	}
 
 	for (i = 0; i < opts.one_associations.length; i++) {
+		if (opts.one_associations[i].reversed) continue;
 		definitions.push(driver.escapeId(opts.one_associations[i].field) + " INTEGER NOT NULL");
 	}
 	for (k in opts.properties) {
@@ -57,6 +58,7 @@ exports.sync = function (driver, opts, cb) {
 	);
 
 	for (i = 0; i < opts.one_associations.length; i++) {
+		if (opts.one_associations[i].reversed) continue;
 		tables[tables.length - 1].subqueries.push(
 			"CREATE INDEX ON " + driver.escapeId(opts.table) +
 			" (" + driver.escapeId(opts.one_associations[i].field) + ")"
diff --git a/lib/Drivers/DDL/postgresaxomic.js b/lib/Drivers/DDL/postgresaxomic.js
index c85b8d68..d0ed0d1b 100644
--- a/lib/Drivers/DDL/postgresaxomic.js
+++ b/lib/Drivers/DDL/postgresaxomic.js
@@ -37,6 +37,7 @@ exports.sync = function (driver, opts, cb) {
 	}
 
 	for (i = 0; i < opts.one_associations.length; i++) {
+		if (opts.one_associations[i].reversed) continue;
 		definitions.push(driver.escapeId(opts.one_associations[i].field) + " INTEGER NOT NULL");
 	}
 	for (k in opts.properties) {
@@ -57,6 +58,7 @@ exports.sync = function (driver, opts, cb) {
 	);
 
 	for (i = 0; i < opts.one_associations.length; i++) {
+		if (opts.one_associations[i].reversed) continue;
 		tables[tables.length - 1].subqueries.push(
 			"CREATE INDEX ON " + driver.escapeId(opts.table) +
 			" (" + driver.escapeId(opts.one_associations[i].field) + ")"
diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index f19c54d8..4ae0f05d 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -29,6 +29,7 @@ exports.sync = function (driver, opts, cb) {
 	}
 
 	for (i = 0; i < opts.one_associations.length; i++) {
+		if (opts.one_associations[i].reversed) continue;
 		definitions.push(driver.escapeId(opts.one_associations[i].field) + " INTEGER UNSIGNED NOT NULL");
 	}
 
@@ -47,6 +48,7 @@ exports.sync = function (driver, opts, cb) {
 	}
 
 	for (i = 0; i < opts.one_associations.length; i++) {
+		if (opts.one_associations[i].reversed) continue;
 		queries.push(
 			"CREATE INDEX IF NOT EXISTS " + driver.escapeId(opts.table + "_" + opts.one_associations[i].field) +
 			" ON " + driver.escapeId(opts.table) +

From 62b67e15df9108b860c2c2ce9b721b23b0a8d82a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Feb 2013 17:26:30 +0000
Subject: [PATCH 0124/1246] Changes Model instanciation to extend association
 properties

---
 lib/Model.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/Model.js b/lib/Model.js
index 579aa308..eea0502c 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -17,11 +17,12 @@ function Model(opts) {
 	var model_fields = null;
 
 	var model = function (data) {
+		var instance;
 		if (typeof data == "number") {
 			var data2 = {};
 			data2[opts.id] = data;
 
-			var instance = new Instance({
+			instance = new Instance({
 				id                     : opts.id,
 				data                   : data2,
 				autoSave               : false,
@@ -50,7 +51,7 @@ function Model(opts) {
 		} else if (typeof data == "undefined") {
 			data = {};
 		}
-		return new Instance({
+		instance = new Instance({
 			id                     : opts.id,
 			is_new                 : !data.hasOwnProperty(opts.id),
 			data                   : data,
@@ -64,6 +65,16 @@ function Model(opts) {
 			validations            : opts.validations,
 			association_properties : association_properties
 		});
+		OneAssociation.extend(instance, opts.driver, one_associations, {
+			autoFetch      : false
+		}, function () {
+			ManyAssociation.extend(instance, opts.driver, many_associations, {
+				autoFetch      : false
+			}, function () {
+				// ..
+			});
+		});
+		return instance;
 	};
 
 	for (var k in opts.properties) {

From de86054715613d6b64eda181cf282ab865fadbfb Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Feb 2013 17:27:53 +0000
Subject: [PATCH 0125/1246] Adds tests for Amazon Redshift

Redshift is based on Postgres driver. The only difference for now is
that it can't use RETURNING keyword syntax and so it has to do a second
query after INSERT to retrieve the last insert id.
---
 lib/Drivers/DML/redshift.js | 37 +++++++++++++++++++++++++++++++++++++
 test/common.js              | 13 +++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 lib/Drivers/DML/redshift.js

diff --git a/lib/Drivers/DML/redshift.js b/lib/Drivers/DML/redshift.js
new file mode 100644
index 00000000..28a119b8
--- /dev/null
+++ b/lib/Drivers/DML/redshift.js
@@ -0,0 +1,37 @@
+var util     = require("util");
+var postgres = require("./postgres");
+
+exports.Driver = Driver;
+
+function Driver(config, connection, opts) {
+	postgres.Driver.call(this, config, connection, opts);
+}
+
+util.inherits(Driver, postgres.Driver);
+
+Driver.prototype.insert = function (table, data, cb) {
+	this.QueryInsert
+		.clear()
+		.table(table);
+	for (var k in data) {
+		this.QueryInsert.set(k, data[k]);
+	}
+	if (this.opts.debug) {
+		require("../../Debug").sql('postgres', this.QueryInsert.build());
+	}
+	this.db.query(this.QueryInsert.build(), function (err, result) {
+		if (err) {
+			return cb(err);
+		}
+
+		this.db.query("SELECT LASTVAL() AS id", function (err, result) {
+			if (err) {
+				return cb(err);
+			}
+
+			return cb(null, {
+				id: result.rows[0].id || null
+			});
+		});
+	}.bind(this));
+};
diff --git a/test/common.js b/test/common.js
index ae9295c0..afc2719a 100644
--- a/test/common.js
+++ b/test/common.js
@@ -24,6 +24,7 @@ common.getConnectionString = function () {
 			case 'mysql':
 				return 'mysql://root@localhost/orm_test';
 			case 'postgres':
+			case 'redshift':
 				return 'postgres://postgres@localhost/orm_test';
 			case 'sqlite':
 				return 'sqlite://';
@@ -46,6 +47,12 @@ common.getConnectionString = function () {
 				       (config.password ? ':' + config.password : '') +
 				       '@' + (config.host || 'localhost') +
 				       '/' + (config.database || 'orm_test');
+			case 'redshift':
+				return 'redshift://' +
+				       (config.user || 'postgres') +
+				       (config.password ? ':' + config.password : '') +
+				       '@' + (config.host || 'localhost') +
+				       '/' + (config.database || 'orm_test');
 			case 'sqlite':
 				return 'sqlite://' + (config.pathname || "");
 			default:
@@ -64,6 +71,7 @@ common.getModelProperties = function () {
 common.createModelTable = function (table, db, cb) {
 	switch (this.protocol()) {
 		case "postgres":
+		case "redshift":
 			db.query("CREATE TEMPORARY TABLE " + table + " (id SERIAL PRIMARY KEY, name VARCHAR(100) NOT NULL)", cb);
 			break;
 		case "sqlite":
@@ -80,6 +88,7 @@ common.createModelTable = function (table, db, cb) {
 common.createModel2Table = function (table, db, cb) {
 	switch (this.protocol()) {
 		case "postgres":
+		case "redshift":
 			db.query("CREATE TEMPORARY TABLE " + table + " (id SERIAL PRIMARY KEY, name VARCHAR(100) NOT NULL, assoc_id BIGINT NOT NULL)", cb);
 			break;
 		case "sqlite":
@@ -96,6 +105,7 @@ common.createModel2Table = function (table, db, cb) {
 common.createModelAssocTable = function (table, assoc, db, cb) {
 	switch (this.protocol()) {
 		case "postgres":
+		case "redshift":
 			db.query("CREATE TEMPORARY TABLE " + table + "_" + assoc + " (" + table + "_id BIGINT NOT NULL, " + assoc + "_id BIGINT NOT NULL, extra_field BIGINT)", cb);
 			break;
 		case "sqlite":
@@ -114,6 +124,7 @@ common.insertModelData = function (table, db, data, cb) {
 
 	switch (this.protocol()) {
 		case "postgres":
+		case "redshift":
 		case "mysql":
 			query = [];
 
@@ -143,6 +154,7 @@ common.insertModel2Data = function (table, db, data, cb) {
 
 	switch (this.protocol()) {
 		case "postgres":
+		case "redshift":
 		case "mysql":
 			query = [];
 
@@ -172,6 +184,7 @@ common.insertModelAssocData = function (table, db, data, cb) {
 
 	switch (this.protocol()) {
 		case "postgres":
+		case "redshift":
 		case "mysql":
 			query = [];
 

From eb06e62d4728b14de4818235eab188f1f818deb7 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Feb 2013 17:29:07 +0000
Subject: [PATCH 0126/1246] Changes Makefile to include Redshift driver test

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 32e5c7e6..5d3ef632 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 test:
 	ORM_PROTOCOL=mysql node test/run
 	ORM_PROTOCOL=postgres node test/run
+	ORM_PROTOCOL=redshift node test/run
 	ORM_PROTOCOL=sqlite node test/run
 
 .PHONY: test

From 262b2849b14782145d566f7c1433452458966037 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Feb 2013 17:40:36 +0000
Subject: [PATCH 0127/1246] Fixes "bug" in Redshift. Sometimes INSERT id is not
 necessary (hasMany 3rd tables)

---
 lib/Drivers/DML/redshift.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/Drivers/DML/redshift.js b/lib/Drivers/DML/redshift.js
index 28a119b8..53c7f46d 100644
--- a/lib/Drivers/DML/redshift.js
+++ b/lib/Drivers/DML/redshift.js
@@ -25,12 +25,8 @@ Driver.prototype.insert = function (table, data, cb) {
 		}
 
 		this.db.query("SELECT LASTVAL() AS id", function (err, result) {
-			if (err) {
-				return cb(err);
-			}
-
 			return cb(null, {
-				id: result.rows[0].id || null
+				id: !err && result.rows[0].id || null
 			});
 		});
 	}.bind(this));

From 076728ef25e39a29cf080b1bef5b53395b2d4205 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Feb 2013 17:43:39 +0000
Subject: [PATCH 0128/1246] Adds mention to Amazon Redshift

---
 Readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Readme.md b/Readme.md
index 9a153619..20f26630 100644
--- a/Readme.md
+++ b/Readme.md
@@ -14,6 +14,7 @@ Despite the alpha tag, this is the recommended version for new applications.
 
 - MySQL
 - PostgreSQL
+- Amazon Redshift
 - SQLite
 
 ## Features

From d2fe2c8324cc2d206d957908ed05af92ba3e7d9c Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Feb 2013 17:43:55 +0000
Subject: [PATCH 0129/1246] 2.0.1

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8e621d46..78f4eff1 100644
--- a/package.json
+++ b/package.json
@@ -8,9 +8,10 @@
     "database",
     "mysql",
     "postgres",
+    "redshift",
     "sqlite"
   ],
-  "version": "2.0.0",
+  "version": "2.0.1",
   "license": "MIT",
   "repository": {
     "url": "http://dresende.github.com/node-orm2"

From a2e636847cb7b2a69916f6c9227dd45cecaf10a0 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Feb 2013 17:45:57 +0000
Subject: [PATCH 0130/1246] Changes Readme to remove mention to alpha tag, adds
 current stable version

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 20f26630..8ca33316 100644
--- a/Readme.md
+++ b/Readme.md
@@ -8,7 +8,7 @@
 npm install orm
 ```
 
-Despite the alpha tag, this is the recommended version for new applications.
+Current stable version: **2.0.1**
 
 ## DBMS Support
 

From 59adae5825e87df2058f65c79b76339129a11d36 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Feb 2013 17:50:36 +0000
Subject: [PATCH 0131/1246] Adds first Changelog

---
 Changelog.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 Changelog.md

diff --git a/Changelog.md b/Changelog.md
new file mode 100644
index 00000000..8af3051e
--- /dev/null
+++ b/Changelog.md
@@ -0,0 +1,12 @@
+### v2.0.1 - 21 Feb 2013
+
+- Changes singleton to support cache value as a number (timeout in seconds)
+- Fixes bug when escaping boolean values in postgres
+- Fixes bug on Model.sync (postgres) when property has default value (using wrong path to escape method)
+- Fixes DDL drivers creating duplicated field in reversed hasOne associations
+- Changes Model instanciation to extend association properties
+- Adds support to Amazon Redshift based on PostgreSQL driver
+
+### v2.0.0 - 21 Feb 2013
+
+- Initial release

From 22765ae889e5169efe22f1dccac67983157ac424 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Feb 2013 19:30:18 +0000
Subject: [PATCH 0132/1246] Forces hasMany association changes to check for
 instance saved (to ensure the instance has an id property)

---
 lib/Associations/Many.js | 106 ++++++++++++++++++++++++---------------
 1 file changed, 65 insertions(+), 41 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 75cb2413..fe93006d 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -192,27 +192,38 @@ function extendInstance(Instance, Driver, association, opts, cb) {
 			var cb = Associations.pop();
 			var conditions = {};
 			var associationIds = [];
-			conditions[association.mergeId] = Instance[association.model.id];
-
-			if (Associations.length === 0) {
-				Driver.remove(association.mergeTable, conditions, cb);
-				return this;
-			}
+			var run = function () {
+				if (Associations.length === 0) {
+					return Driver.remove(association.mergeTable, conditions, cb);
+				}
 
+				for (var i = 0; i < Associations.length; i++) {
+					if (Associations[i].id) {
+						associationIds.push(Associations[i].id);
+					}
+				}
 
-			for (var i = 0; i < Associations.length; i++) {
-				if (Associations[i].id) {
-					associationIds.push(Associations[i].id);
+				if (associationIds.length === 0) {
+					return cb(null);
 				}
-			}
 
-			if (associationIds.length === 0) {
-				return cb(null);
-			}
+				conditions[association.mergeAssocId] = associationIds;
+
+				Driver.remove(association.mergeTable, conditions, cb);
+			};
+			conditions[association.mergeId] = Instance[association.model.id];
 
-			conditions[association.mergeAssocId] = associationIds;
+			if (this.saved()) {
+				run();
+			} else {
+				this.save(function (err) {
+					if (err) {
+						return cb(err);
+					}
 
-			Driver.remove(association.mergeTable, conditions, cb);
+					return run();
+				});
+			}
 			return this;
 		},
 		enumerable: false
@@ -222,6 +233,39 @@ function extendInstance(Instance, Driver, association, opts, cb) {
 			var Associations = [];
 			var opts = {};
 			var cb;
+			var run = function () {
+				var saveNextAssociation = function () {
+					if (Associations.length === 0) {
+						return cb();
+					}
+
+					var Association = Associations.pop();
+
+					Association.save(function (err) {
+						if (err) {
+							return cb(err);
+						}
+
+						var data = {};
+						data[association.mergeId] = Instance[association.model.id];
+						data[association.mergeAssocId] = Association.id;
+
+						for (var k in opts) {
+							data[k] = opts[k];
+						}
+
+						Driver.insert(association.mergeTable, data, function (err) {
+							if (err) {
+								return cb(err);
+							}
+
+							return saveNextAssociation();
+						});
+					});
+				};
+
+				return saveNextAssociation();
+			};
 
 			for (var i = 0; i < arguments.length; i++) {
 				switch (typeof arguments[i]) {
@@ -238,37 +282,17 @@ function extendInstance(Instance, Driver, association, opts, cb) {
 				}
 			}
 
-			var saveNextAssociation = function () {
-				if (Associations.length === 0) {
-					return cb();
-				}
-
-				var Association = Associations.pop();
-
-				Association.save(function (err) {
+			if (this.saved()) {
+				run();
+			} else {
+				this.save(function (err) {
 					if (err) {
 						return cb(err);
 					}
 
-					var data = {};
-					data[association.mergeId] = Instance[association.model.id];
-					data[association.mergeAssocId] = Association.id;
-
-					for (var k in opts) {
-						data[k] = opts[k];
-					}
-
-					Driver.insert(association.mergeTable, data, function (err) {
-						if (err) {
-							return cb(err);
-						}
-
-						return saveNextAssociation();
-					});
+					return run();
 				});
-			};
-
-			saveNextAssociation();
+			}
 
 			return this;
 		},

From 55140c6aefaf842ef0a035b7a2eba8de5d72dd85 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Feb 2013 19:57:20 +0000
Subject: [PATCH 0133/1246] Fixes some bugs when not using "id" as instance id
 property

---
 lib/Associations/Many.js | 21 +++++++++++----------
 lib/Associations/One.js  | 10 +++++-----
 lib/Model.js             | 16 ++++++++--------
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index fe93006d..5e6d19ba 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -65,7 +65,7 @@ exports.prepare = function (Model, associations) {
 	};
 };
 
-exports.extend = function (Instance, Driver, associations, opts, cb) {
+exports.extend = function (Model, Instance, Driver, associations, opts, cb) {
 	if (associations.length === 0) {
 		return cb();
 	}
@@ -80,11 +80,11 @@ exports.extend = function (Instance, Driver, associations, opts, cb) {
 	};
 
 	for (var i = 0; i < associations.length; i++) {
-		extendInstance(Instance, Driver, associations[i], opts, extendDone);
+		extendInstance(Model, Instance, Driver, associations[i], opts, extendDone);
 	}
 };
 
-function extendInstance(Instance, Driver, association, opts, cb) {
+function extendInstance(Model, Instance, Driver, association, opts, cb) {
 	Object.defineProperty(Instance, association.hasAccessor, {
 		value: function () {
 			var Instances = Array.prototype.slice.apply(arguments);
@@ -98,16 +98,16 @@ function extendInstance(Instance, Driver, association, opts, cb) {
 			options.extra = association.props;
 			options.extra_info = {
 				table: association.mergeTable,
-				id: Instance[association.model.id],
+				id: Instance[Model.id],
 				id_prop: association.mergeId,
 				assoc_prop: association.mergeAssocId
 			};
 
-			conditions[association.mergeTable + "." + association.mergeId] = Instance[association.model.id];
+			conditions[association.mergeTable + "." + association.mergeId] = Instance[Model.id];
 			conditions[association.mergeTable + "." + association.mergeAssocId] = [];
 
 			for (var i = 0; i < Instances.length; i++) {
-				conditions[association.mergeTable + "." + association.mergeAssocId].push(Instances[i].id);
+				conditions[association.mergeTable + "." + association.mergeAssocId].push(Instances[i][association.model.id]);
 			}
 
 			association.model.find(conditions, options, function (err, instances) {
@@ -152,7 +152,7 @@ function extendInstance(Instance, Driver, association, opts, cb) {
 			options.extra = association.props;
 			options.extra_info = {
 				table: association.mergeTable,
-				id: Instance[association.model.id],
+				id: Instance[Model.id],
 				id_prop: association.mergeId,
 				assoc_prop: association.mergeAssocId
 			};
@@ -160,11 +160,12 @@ function extendInstance(Instance, Driver, association, opts, cb) {
 			if (conditions === null) {
 				conditions = {};
 			}
-			conditions[association.mergeTable + "." + association.mergeId] = Instance[association.model.id];
+			conditions[association.mergeTable + "." + association.mergeId] = Instance[Model.id];
 
 			if (cb === null) {
 				return association.model.find(conditions, limit, options);
 			}
+			console.log(conditions);
 			association.model.find(conditions, limit, options, cb);
 			return this;
 		},
@@ -211,7 +212,7 @@ function extendInstance(Instance, Driver, association, opts, cb) {
 
 				Driver.remove(association.mergeTable, conditions, cb);
 			};
-			conditions[association.mergeId] = Instance[association.model.id];
+			conditions[association.mergeId] = Instance[Model.id];
 
 			if (this.saved()) {
 				run();
@@ -247,7 +248,7 @@ function extendInstance(Instance, Driver, association, opts, cb) {
 						}
 
 						var data = {};
-						data[association.mergeId] = Instance[association.model.id];
+						data[association.mergeId] = Instance[Model.id];
 						data[association.mergeAssocId] = Association.id;
 
 						for (var k in opts) {
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index f987bc0f..48094267 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -36,7 +36,7 @@ exports.prepare = function (Model, associations, association_properties) {
 	};
 };
 
-exports.extend = function (Instance, Driver, associations, opts, cb) {
+exports.extend = function (Model, Instance, Driver, associations, opts, cb) {
 	if (associations.length === 0) {
 		return cb();
 	}
@@ -51,11 +51,11 @@ exports.extend = function (Instance, Driver, associations, opts, cb) {
 	};
 
 	for (var i = 0; i < associations.length; i++) {
-		extendInstance(Instance, Driver, associations[i], opts, extendDone);
+		extendInstance(Model, Instance, Driver, associations[i], opts, extendDone);
 	}
 };
 
-function extendInstance(Instance, Driver, association, opts, cb) {
+function extendInstance(Model, Instance, Driver, association, opts, cb) {
 	Object.defineProperty(Instance, association.hasAccessor, {
 		value: function (opts, cb) {
 			if (typeof opts == "function") {
@@ -83,9 +83,9 @@ function extendInstance(Instance, Driver, association, opts, cb) {
 			}
 
 			if (association.reversed) {
-				if (Instance[association.model.id]) {
+				if (Instance[Model.id]) {
 					var conditions = {};
-					conditions[association.field] = Instance[association.model.id];
+					conditions[association.field] = Instance[Model.id];
 					association.model.find(conditions, opts, cb);
 				} else {
 					cb(null);
diff --git a/lib/Model.js b/lib/Model.js
index eea0502c..282e9db2 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -38,10 +38,10 @@ function Model(opts) {
 			if (model_fields !== null) {
 				LazyLoad.extend(instance, model, opts.properties);
 			}
-			OneAssociation.extend(instance, opts.driver, one_associations, {
+			OneAssociation.extend(model, instance, opts.driver, one_associations, {
 				autoFetch      : false
 			}, function () {
-				ManyAssociation.extend(instance, opts.driver, many_associations, {
+				ManyAssociation.extend(model, instance, opts.driver, many_associations, {
 					autoFetch      : false
 				}, function () {
 					// ..
@@ -65,10 +65,10 @@ function Model(opts) {
 			validations            : opts.validations,
 			association_properties : association_properties
 		});
-		OneAssociation.extend(instance, opts.driver, one_associations, {
+		OneAssociation.extend(model, instance, opts.driver, one_associations, {
 			autoFetch      : false
 		}, function () {
-			ManyAssociation.extend(instance, opts.driver, many_associations, {
+			ManyAssociation.extend(model, instance, opts.driver, many_associations, {
 				autoFetch      : false
 			}, function () {
 				// ..
@@ -169,11 +169,11 @@ function Model(opts) {
 				if (model_fields !== null) {
 					LazyLoad.extend(instance, model, opts.properties);
 				}
-				OneAssociation.extend(instance, opts.driver, one_associations, {
+				OneAssociation.extend(model, instance, opts.driver, one_associations, {
 					autoFetch      : (options.autoFetchLimit === 0 ? false : opts.autoFetch),
 					autoFetchLimit : options.autoFetchLimit || opts.autoFetchLimit
 				}, function () {
-					ManyAssociation.extend(instance, opts.driver, many_associations, {
+					ManyAssociation.extend(model, instance, opts.driver, many_associations, {
 						autoFetch      : (options.autoFetchLimit === 0 ? false : opts.autoFetch),
 						autoFetchLimit : options.autoFetchLimit || opts.autoFetchLimit
 					}, function () {
@@ -263,11 +263,11 @@ function Model(opts) {
 					if (model_fields !== null) {
 						LazyLoad.extend(instance, model, opts.properties);
 					}
-					OneAssociation.extend(instance, opts.driver, one_associations, {
+					OneAssociation.extend(model, instance, opts.driver, one_associations, {
 						autoFetch      : (options.autoFetchLimit === 0 ? false : opts.autoFetch),
 						autoFetchLimit : options.autoFetchLimit
 					}, function () {
-						ManyAssociation.extend(instance, opts.driver, many_associations, {
+						ManyAssociation.extend(model, instance, opts.driver, many_associations, {
 							autoFetch      : (options.autoFetchLimit === 0 ? false : opts.autoFetch),
 							autoFetchLimit : options.autoFetchLimit
 						}, function () {

From 8ef21248adb98a7f9481857fb5f6d56213ff9498 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Feb 2013 20:03:41 +0000
Subject: [PATCH 0134/1246] Adds documentation about advanced options like
 properties.primary_key

---
 Readme.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/Readme.md b/Readme.md
index 8ca33316..376c04f2 100644
--- a/Readme.md
+++ b/Readme.md
@@ -170,6 +170,30 @@ Person.drop(function (err) {
 });
 ```
 
+## Advanced Options
+
+Using [Settings](#settings) or directly on Model definition you can tweak some options.
+For example, each Model instance has a unique ID in the database. This table column is
+by default "id" but you can change it.
+
+```js
+var Person = db.define("person", {
+	name : String
+}, {
+	id   : "person_id"
+});
+
+// or just do it globally..
+db.settings.set("properties.primary_key", "UID");
+
+// ..and then define your Models
+var Pet = db.define("pet", {
+	name : String
+});
+```
+
+`Pet` model will have 2 columns, an `UID` and a `name`.
+
 ## Finding Items
 
 ### Model.get(id, [ options ], cb)

From 07fd440688a85359a384c7237926bf157bc3b325 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Feb 2013 20:07:28 +0000
Subject: [PATCH 0135/1246] Adds default setting instance.cache = true so
 people can tweak it globally

---
 lib/ORM.js      | 2 +-
 lib/Settings.js | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index acd10de6..340a8a6d 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -106,7 +106,7 @@ ORM.prototype.define = function (name, properties, opts) {
 		driver         : this.driver,
 		table          : opts.table || opts.collection || name,
 		properties     : properties,
-		cache          : opts.cache,
+		cache          : opts.hasOwnProperty("cache") ? opts.cache : this.settings.get("instance.cache"),
 		id             : opts.id || this.settings.get("properties.primary_key"),
 		autoSave       : opts.autoSave || false,
 		autoFetch      : opts.autoFetch || false,
diff --git a/lib/Settings.js b/lib/Settings.js
index ad28454a..bc7772c4 100644
--- a/lib/Settings.js
+++ b/lib/Settings.js
@@ -2,6 +2,9 @@ var default_settings = {
 	properties : {
 		primary_key     : "id",
 		association_key : "{name}_id"
+	},
+	instance   : {
+		cache           : true
 	}
 };
 

From 5fa666540f000ec241c4346c8993b24683014f0c Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Feb 2013 20:13:25 +0000
Subject: [PATCH 0136/1246] Adds autoFetch and autoSave options to default
 settings

---
 lib/ORM.js      | 6 +++---
 lib/Settings.js | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index 340a8a6d..5751ca8c 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -108,9 +108,9 @@ ORM.prototype.define = function (name, properties, opts) {
 		properties     : properties,
 		cache          : opts.hasOwnProperty("cache") ? opts.cache : this.settings.get("instance.cache"),
 		id             : opts.id || this.settings.get("properties.primary_key"),
-		autoSave       : opts.autoSave || false,
-		autoFetch      : opts.autoFetch || false,
-		autoFetchLimit : opts.autoFetchLimit,
+		autoSave       : opts.hasOwnProperty("autoSave") ? opts.autoSave : this.settings.get("instance.autoSave"),
+		autoFetch      : opts.hasOwnProperty("autoFetch") ? opts.autoFetch : this.settings.get("instance.autoFetch"),
+		autoFetchLimit : opts.autoFetchLimit || this.settings.get("instance.autoFetchLimit"),
 		hooks          : opts.hooks || {},
 		methods        : opts.methods || {},
 		validations    : opts.validations || {}
diff --git a/lib/Settings.js b/lib/Settings.js
index bc7772c4..6e13a96d 100644
--- a/lib/Settings.js
+++ b/lib/Settings.js
@@ -4,7 +4,10 @@ var default_settings = {
 		association_key : "{name}_id"
 	},
 	instance   : {
-		cache           : true
+		cache           : true,
+		autoSave        : false,
+		autoFetch       : false,
+		autoFetchLimit  : 1
 	}
 };
 

From c47db010dd462a966e43aea3a7f6e28606d0ceee Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Feb 2013 20:13:41 +0000
Subject: [PATCH 0137/1246] Adds more information about Model options to
 documentation

---
 Readme.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 376c04f2..cdc40395 100644
--- a/Readme.md
+++ b/Readme.md
@@ -192,7 +192,15 @@ var Pet = db.define("pet", {
 });
 ```
 
-`Pet` model will have 2 columns, an `UID` and a `name`.
+**Pet** model will have 2 columns, an `UID` and a `name`.
+
+Other options:
+
+- `cache` : (default: `true`) Set it to `false` to disable Instance cache (Singletons) or set a timeout value (in seconds)
+- `autoSave` : (default: `false`) Set it to `true` to save an Instance right after changing any property
+- `autoFetch` : (default: `false`) Set it to `true` to fetch associations when fetching an instance from the database
+- `autoFetchLimit` : (default: 1) If `autoFetch` is enabled this ensures defines how many hoops (associations of associations)
+  you want it to automatically fetch.
 
 ## Finding Items
 

From bf6679a649758ffa7b1b6c94a6831d637d0771af Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Feb 2013 20:19:29 +0000
Subject: [PATCH 0138/1246] Adds more documentation about Hooks, fixes Model
 options list ending

---
 Readme.md | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/Readme.md b/Readme.md
index cdc40395..df4479a7 100644
--- a/Readme.md
+++ b/Readme.md
@@ -196,12 +196,25 @@ var Pet = db.define("pet", {
 
 Other options:
 
-- `cache` : (default: `true`) Set it to `false` to disable Instance cache (Singletons) or set a timeout value (in seconds)
-- `autoSave` : (default: `false`) Set it to `true` to save an Instance right after changing any property
-- `autoFetch` : (default: `false`) Set it to `true` to fetch associations when fetching an instance from the database
+- `cache` : (default: `true`) Set it to `false` to disable Instance cache (Singletons) or set a timeout value (in seconds);
+- `autoSave` : (default: `false`) Set it to `true` to save an Instance right after changing any property;
+- `autoFetch` : (default: `false`) Set it to `true` to fetch associations when fetching an instance from the database;
 - `autoFetchLimit` : (default: 1) If `autoFetch` is enabled this ensures defines how many hoops (associations of associations)
   you want it to automatically fetch.
 
+## Hooks
+
+If you want to listen for a type of event than occurs in instances of a Model, you can attach a function that
+will be called when that event happens. There are some events possible:
+
+- `afterLoad` : (no parameters) Right after loading and preparing an instance to be used;
+- `beforeSave` : (no parameters) Right before trying to save;
+- `afterSave` : (bool success) Right after saving;
+- `beforeCreate` : (no parameters) Right before trying to save a new instance;
+- `beforeRemove` : (no parameters) Right before trying to remove an instance.
+
+All hook function are called with `this` as the instance so you can access anything you want related to it.
+
 ## Finding Items
 
 ### Model.get(id, [ options ], cb)

From 29a2dae8a54f40eede791bdc875e50c81f811955 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Feb 2013 20:20:24 +0000
Subject: [PATCH 0139/1246] Fixes autoFetchLimit documentation markdown from 1
 to `1`

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index df4479a7..a13b4743 100644
--- a/Readme.md
+++ b/Readme.md
@@ -199,7 +199,7 @@ Other options:
 - `cache` : (default: `true`) Set it to `false` to disable Instance cache (Singletons) or set a timeout value (in seconds);
 - `autoSave` : (default: `false`) Set it to `true` to save an Instance right after changing any property;
 - `autoFetch` : (default: `false`) Set it to `true` to fetch associations when fetching an instance from the database;
-- `autoFetchLimit` : (default: 1) If `autoFetch` is enabled this ensures defines how many hoops (associations of associations)
+- `autoFetchLimit` : (default: `1`) If `autoFetch` is enabled this ensures defines how many hoops (associations of associations)
   you want it to automatically fetch.
 
 ## Hooks

From 67070f0388aca4f36f2ba6275ba9944c38688cc6 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Feb 2013 20:21:13 +0000
Subject: [PATCH 0140/1246] Removes typo from autoFetchLimit documentation

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index a13b4743..5b69e711 100644
--- a/Readme.md
+++ b/Readme.md
@@ -199,7 +199,7 @@ Other options:
 - `cache` : (default: `true`) Set it to `false` to disable Instance cache (Singletons) or set a timeout value (in seconds);
 - `autoSave` : (default: `false`) Set it to `true` to save an Instance right after changing any property;
 - `autoFetch` : (default: `false`) Set it to `true` to fetch associations when fetching an instance from the database;
-- `autoFetchLimit` : (default: `1`) If `autoFetch` is enabled this ensures defines how many hoops (associations of associations)
+- `autoFetchLimit` : (default: `1`) If `autoFetch` is enabled this defines how many hoops (associations of associations)
   you want it to automatically fetch.
 
 ## Hooks

From 89255b00f8ac47ba06c0cfd29d36b9aa3cfb5fc9 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Feb 2013 20:25:22 +0000
Subject: [PATCH 0141/1246] 2.0.2

---
 Changelog.md | 8 ++++++++
 Readme.md    | 2 +-
 package.json | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 8af3051e..9359d13e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,11 @@
+### v2.0.2 - 21 Feb 2013
+
+- Forces hasMany association changes to check for instance saved (to ensure the instance has an id property)
+- Fixes some bugs when not using "id" as instance id property
+- Adds default setting instance.cache = true so people can tweak it globally
+- Adds autoFetch and autoSave options to default settings
+- Adds more documentation about Hooks, fixes Model options list ending
+
 ### v2.0.1 - 21 Feb 2013
 
 - Changes singleton to support cache value as a number (timeout in seconds)
diff --git a/Readme.md b/Readme.md
index 5b69e711..2d588691 100644
--- a/Readme.md
+++ b/Readme.md
@@ -8,7 +8,7 @@
 npm install orm
 ```
 
-Current stable version: **2.0.1**
+Current stable version: **2.0.2**
 
 ## DBMS Support
 
diff --git a/package.json b/package.json
index 78f4eff1..c92ced73 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "redshift",
     "sqlite"
   ],
-  "version": "2.0.1",
+  "version": "2.0.2",
   "license": "MIT",
   "repository": {
     "url": "http://dresende.github.com/node-orm2"

From a141cdba3cc1b988e38f8b79712b915608123ec9 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Feb 2013 20:39:28 +0000
Subject: [PATCH 0142/1246] Adds link from Model options to Singletons section
 in documentation

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 2d588691..7dd9a398 100644
--- a/Readme.md
+++ b/Readme.md
@@ -196,7 +196,7 @@ var Pet = db.define("pet", {
 
 Other options:
 
-- `cache` : (default: `true`) Set it to `false` to disable Instance cache (Singletons) or set a timeout value (in seconds);
+- `cache` : (default: `true`) Set it to `false` to disable Instance cache ([Singletons](#singletons)) or set a timeout value (in seconds);
 - `autoSave` : (default: `false`) Set it to `true` to save an Instance right after changing any property;
 - `autoFetch` : (default: `false`) Set it to `true` to fetch associations when fetching an instance from the database;
 - `autoFetchLimit` : (default: `1`) If `autoFetch` is enabled this defines how many hoops (associations of associations)

From 30ab1eb47d931d473595a94f600e50259cf03853 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Feb 2013 20:40:46 +0000
Subject: [PATCH 0143/1246] Fixes previous commit having a wrong link to
 Singleton

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 7dd9a398..243cf3e7 100644
--- a/Readme.md
+++ b/Readme.md
@@ -196,7 +196,7 @@ var Pet = db.define("pet", {
 
 Other options:
 
-- `cache` : (default: `true`) Set it to `false` to disable Instance cache ([Singletons](#singletons)) or set a timeout value (in seconds);
+- `cache` : (default: `true`) Set it to `false` to disable Instance cache ([Singletons](#singleton)) or set a timeout value (in seconds);
 - `autoSave` : (default: `false`) Set it to `true` to save an Instance right after changing any property;
 - `autoFetch` : (default: `false`) Set it to `true` to fetch associations when fetching an instance from the database;
 - `autoFetchLimit` : (default: `1`) If `autoFetch` is enabled this defines how many hoops (associations of associations)

From a95417d2e651fd05a29f2a13dca403937cba168b Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 22 Feb 2013 14:06:51 +0000
Subject: [PATCH 0144/1246] Fixes typo in validators first comment

---
 lib/Validators.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Validators.js b/lib/Validators.js
index 35a1fb4a..36564b5b 100644
--- a/lib/Validators.js
+++ b/lib/Validators.js
@@ -1,5 +1,5 @@
 /**
- * This is a supposed to be a list of common validators
+ * This is supposed to be a list of common validators
  * that can be reused instead of creating new ones.
  **/
 var validators = {};

From baae4a7444bc1dce31236f1b6ad41236fef33a5c Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 22 Feb 2013 14:08:42 +0000
Subject: [PATCH 0145/1246] Fixes unique validator not using Model id property
 name (was using hard coded "id")

---
 lib/Validators.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Validators.js b/lib/Validators.js
index 36564b5b..6d5241bd 100644
--- a/lib/Validators.js
+++ b/lib/Validators.js
@@ -97,7 +97,7 @@ validators.unique = function (msg) {
 			if (!records || records.length === 0) {
 				return next();
 			}
-			if (records.length == 1 && records[0].id === data.id) {
+			if (records.length == 1 && records[0][Model.id] === data[Model.id]) {
 				return next();
 			}
 			return next(msg || 'not-unique');

From 3980f9cee3688dff4bad85a9cc3f6dcfa0544776 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 22 Feb 2013 15:19:13 +0000
Subject: [PATCH 0146/1246] Moves creating instance code to a single function
 in Model

---
 lib/Model.js | 155 +++++++++++++++------------------------------------
 1 file changed, 46 insertions(+), 109 deletions(-)

diff --git a/lib/Model.js b/lib/Model.js
index 282e9db2..971b8603 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -16,46 +16,17 @@ function Model(opts) {
 	var association_properties = [];
 	var model_fields = null;
 
-	var model = function (data) {
-		var instance;
-		if (typeof data == "number") {
-			var data2 = {};
-			data2[opts.id] = data;
-
-			instance = new Instance({
-				id                     : opts.id,
-				data                   : data2,
-				autoSave               : false,
-				model                  : model,
-				driver                 : opts.driver,
-				table                  : opts.table,
-				properties             : opts.properties,
-				hooks                  : opts.hooks,
-				methods                : opts.methods,
-				validations            : opts.validations,
-				association_properties : association_properties
-			});
-			if (model_fields !== null) {
-				LazyLoad.extend(instance, model, opts.properties);
-			}
-			OneAssociation.extend(model, instance, opts.driver, one_associations, {
-				autoFetch      : false
-			}, function () {
-				ManyAssociation.extend(model, instance, opts.driver, many_associations, {
-					autoFetch      : false
-				}, function () {
-					// ..
-				});
-			});
-			return instance;
-		} else if (typeof data == "undefined") {
-			data = {};
+	var createInstance = function (data, inst_opts, cb) {
+		if (!inst_opts) {
+			inst_opts = {};
 		}
-		instance = new Instance({
+		var instance = new Instance({
 			id                     : opts.id,
-			is_new                 : !data.hasOwnProperty(opts.id),
+			is_new                 : inst_opts.is_new || false,
 			data                   : data,
-			autoSave               : opts.autoSave,
+			autoSave               : inst_opts.autoSave || false,
+			extra                  : inst_opts.extra,
+			extra_info             : inst_opts.extra_info,
 			model                  : model,
 			driver                 : opts.driver,
 			table                  : opts.table,
@@ -65,18 +36,39 @@ function Model(opts) {
 			validations            : opts.validations,
 			association_properties : association_properties
 		});
+		if (model_fields !== null) {
+			LazyLoad.extend(instance, model, opts.properties);
+		}
 		OneAssociation.extend(model, instance, opts.driver, one_associations, {
-			autoFetch      : false
+			autoFetch      : inst_opts.autoFetch || false,
+			autoFetchLimit : inst_opts.autoFetchLimit
 		}, function () {
 			ManyAssociation.extend(model, instance, opts.driver, many_associations, {
-				autoFetch      : false
+				autoFetch      : inst_opts.autoFetch || false,
+				autoFetchLimit : inst_opts.autoFetchLimit
 			}, function () {
-				// ..
+				if (typeof cb == "function") {
+					return cb(instance);
+				}
 			});
 		});
 		return instance;
 	};
 
+	var model = function (data) {
+		var instance;
+		if (typeof data == "number") {
+			var data2 = {};
+			data2[opts.id] = data;
+
+			return createInstance(data2);
+		} else if (typeof data == "undefined") {
+			data = {};
+		}
+
+		return createInstance(data, { is_new: !data.hasOwnProperty(opts.id), autoSave: opts.autoSave });
+	};
+
 	for (var k in opts.properties) {
 		if (opts.properties[k].lazyload === true) {
 			model_fields = [ opts.id ];
@@ -153,33 +145,11 @@ function Model(opts) {
 				return cb(new Error("Not found"));
 			}
 			Singleton.get(opts.table + "/" + id, { cache: options.cache }, function (cb) {
-				var instance = new Instance({
-					id                     : opts.id,
-					data                   : data[0],
-					model                  : model,
-					autoSave               : opts.autoSave,
-					driver                 : opts.driver,
-					table                  : opts.table,
-					properties             : opts.properties,
-					hooks                  : opts.hooks,
-					methods                : opts.methods,
-					validations            : opts.validations,
-					association_properties : association_properties
-				});
-				if (model_fields !== null) {
-					LazyLoad.extend(instance, model, opts.properties);
-				}
-				OneAssociation.extend(model, instance, opts.driver, one_associations, {
+				return createInstance(data[0], {
+					autoSave       : opts.autoSave,
 					autoFetch      : (options.autoFetchLimit === 0 ? false : opts.autoFetch),
 					autoFetchLimit : options.autoFetchLimit || opts.autoFetchLimit
-				}, function () {
-					ManyAssociation.extend(model, instance, opts.driver, many_associations, {
-						autoFetch      : (options.autoFetchLimit === 0 ? false : opts.autoFetch),
-						autoFetchLimit : options.autoFetchLimit || opts.autoFetchLimit
-					}, function () {
-						return cb(instance);
-					});
-				});
+				}, cb);
 			}, function (instance) {
 				return cb(null, instance);
 			});
@@ -245,35 +215,13 @@ function Model(opts) {
 				Singleton.get(opts.table + (merge ? "+" + merge.from.table : "") + "/" + data[opts.id],
 				              { cache: options.cache },
 				function (cb) {
-					var instance = new Instance({
-						id                     : opts.id,
-						data                   : data,
-						extra                  : options.extra,
-						extra_info             : options.extra_info,
-						model                  : model,
-						autoSave               : opts.autoSave,
-						driver                 : opts.driver,
-						table                  : opts.table,
-						properties             : opts.properties,
-						hooks                  : opts.hooks,
-						methods                : opts.methods,
-						validations            : opts.validations,
-						association_properties : association_properties
-					});
-					if (model_fields !== null) {
-						LazyLoad.extend(instance, model, opts.properties);
-					}
-					OneAssociation.extend(model, instance, opts.driver, one_associations, {
+					return createInstance(data, {
+						autoSave       : opts.autoSave,
 						autoFetch      : (options.autoFetchLimit === 0 ? false : opts.autoFetch),
-						autoFetchLimit : options.autoFetchLimit
-					}, function () {
-						ManyAssociation.extend(model, instance, opts.driver, many_associations, {
-							autoFetch      : (options.autoFetchLimit === 0 ? false : opts.autoFetch),
-							autoFetchLimit : options.autoFetchLimit
-						}, function () {
-							return cb(instance);
-						});
-					});
+						autoFetchLimit : options.autoFetchLimit,
+						extra          : options.extra,
+						extra_info     : options.extra_info
+					}, cb);
 				}, function (instance) {
 					return cb(null, instance);
 				});
@@ -341,23 +289,12 @@ function Model(opts) {
 			if (idx >= Instances.length) {
 				return cb(null, Instances);
 			}
-			Instances[idx] = new Instance({
-				id                     : opts.id,
-				is_new                 : true,
-				data                   : Instances[idx],
-				model                  : model,
-				autoSave               : opts.autoSave,
-				driver                 : opts.driver,
-				table                  : opts.table,
-				properties             : opts.properties,
-				hooks                  : opts.hooks,
-				methods                : opts.methods,
-				validations            : opts.validations,
-				association_properties : association_properties
+
+			Instances[idx] = createInstance(Instances[idx], {
+				is_new    : true,
+				autoSave  : opts.autoSave,
+				autoFetch : false
 			});
-			if (model_fields !== null) {
-				LazyLoad.extend(Instances[idx], model, opts.properties);
-			}
 			Instances[idx].save(function (err) {
 				if (err) {
 					err.index = idx;

From 9c53262b0959195fc4298233cf453e089a399318 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 22 Feb 2013 15:20:25 +0000
Subject: [PATCH 0147/1246] Creates default option for instance.cascadeRemove
 (true)

When removing an instance, associations with it should be removed if
this option is enabled
---
 lib/Settings.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Settings.js b/lib/Settings.js
index 6e13a96d..98186976 100644
--- a/lib/Settings.js
+++ b/lib/Settings.js
@@ -7,7 +7,8 @@ var default_settings = {
 		cache           : true,
 		autoSave        : false,
 		autoFetch       : false,
-		autoFetchLimit  : 1
+		autoFetchLimit  : 1,
+		cascadeRemove   : true
 	}
 };
 

From 625ef58ba86fe84035230fb1fb8408e8e424052f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 22 Feb 2013 15:52:22 +0000
Subject: [PATCH 0148/1246] Makes Instances trigger beforeRemove event

---
 lib/Instance.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Instance.js b/lib/Instance.js
index c5e9766e..b80c79d7 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -152,7 +152,9 @@ function Instance(opts) {
 		var conditions = {};
 		conditions[opts.id] = opts.data[opts.id];
 
+		emitEvent("beforeRemove", instance);
 		Hook.trigger(instance, opts.hooks.beforeRemove);
+
 		opts.driver.remove(opts.table, conditions, function (err, data) {
 			emitEvent("remove", err, instance);
 

From b6f560b91b03a5efb28eab7df1d19317d5f2cb11 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 22 Feb 2013 15:52:57 +0000
Subject: [PATCH 0149/1246] Moves cascadeRemove to association extending code,
 not needed in instances

---
 lib/Model.js | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/lib/Model.js b/lib/Model.js
index 971b8603..ec12a879 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -41,11 +41,13 @@ function Model(opts) {
 		}
 		OneAssociation.extend(model, instance, opts.driver, one_associations, {
 			autoFetch      : inst_opts.autoFetch || false,
-			autoFetchLimit : inst_opts.autoFetchLimit
+			autoFetchLimit : inst_opts.autoFetchLimit,
+			cascadeRemove  : inst_opts.cascadeRemove
 		}, function () {
 			ManyAssociation.extend(model, instance, opts.driver, many_associations, {
 				autoFetch      : inst_opts.autoFetch || false,
-				autoFetchLimit : inst_opts.autoFetchLimit
+				autoFetchLimit : inst_opts.autoFetchLimit,
+				cascadeRemove  : inst_opts.cascadeRemove
 			}, function () {
 				if (typeof cb == "function") {
 					return cb(instance);
@@ -66,7 +68,11 @@ function Model(opts) {
 			data = {};
 		}
 
-		return createInstance(data, { is_new: !data.hasOwnProperty(opts.id), autoSave: opts.autoSave });
+		return createInstance(data, {
+			is_new        : !data.hasOwnProperty(opts.id),
+			autoSave      : opts.autoSave,
+			cascadeRemove : opts.cascadeRemove
+		});
 	};
 
 	for (var k in opts.properties) {
@@ -148,7 +154,8 @@ function Model(opts) {
 				return createInstance(data[0], {
 					autoSave       : opts.autoSave,
 					autoFetch      : (options.autoFetchLimit === 0 ? false : opts.autoFetch),
-					autoFetchLimit : options.autoFetchLimit || opts.autoFetchLimit
+					autoFetchLimit : options.autoFetchLimit || opts.autoFetchLimit,
+					cascadeRemove  : options.cascadeRemove || opts.cascadeRemove
 				}, cb);
 			}, function (instance) {
 				return cb(null, instance);
@@ -218,7 +225,8 @@ function Model(opts) {
 					return createInstance(data, {
 						autoSave       : opts.autoSave,
 						autoFetch      : (options.autoFetchLimit === 0 ? false : opts.autoFetch),
-						autoFetchLimit : options.autoFetchLimit,
+						autoFetchLimit : options.autoFetchLimit || opts.autoFetchLimit,
+						cascadeRemove  : options.cascadeRemove || opts.cascadeRemove,
 						extra          : options.extra,
 						extra_info     : options.extra_info
 					}, cb);

From 339f83dab39c139c5106ec0aed4e6748c7e326df Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 22 Feb 2013 15:53:15 +0000
Subject: [PATCH 0150/1246] Passes cascadeRemove default setting to model
 definition if not set

---
 lib/ORM.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/ORM.js b/lib/ORM.js
index 5751ca8c..8fe70d5c 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -111,6 +111,7 @@ ORM.prototype.define = function (name, properties, opts) {
 		autoSave       : opts.hasOwnProperty("autoSave") ? opts.autoSave : this.settings.get("instance.autoSave"),
 		autoFetch      : opts.hasOwnProperty("autoFetch") ? opts.autoFetch : this.settings.get("instance.autoFetch"),
 		autoFetchLimit : opts.autoFetchLimit || this.settings.get("instance.autoFetchLimit"),
+		cascadeRemove  : opts.hasOwnProperty("cascadeRemove") ? opts.cascadeRemove : this.settings.get("instance.cascadeRemove"),
 		hooks          : opts.hooks || {},
 		methods        : opts.methods || {},
 		validations    : opts.validations || {}

From 1e88c51b1820b7d630013671f8ea02464be684a7 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 22 Feb 2013 15:53:46 +0000
Subject: [PATCH 0151/1246] Changes hasMany associations to be able to make
 some call without callback

---
 lib/Associations/Many.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 5e6d19ba..5231b7ef 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -174,7 +174,7 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 	Object.defineProperty(Instance, association.setAccessor, {
 		value: function () {
 			var Instances = Array.prototype.slice.apply(arguments);
-			var cb = Instances.pop();
+			var cb = (typeof Instances[Instances.length - 1] == "function" ? Instances.pop() : noOperation);
 
 			Instance[association.delAccessor](function (err) {
 				if (err) {
@@ -190,7 +190,7 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 	Object.defineProperty(Instance, association.delAccessor, {
 		value: function () {
 			var Associations = Array.prototype.slice.apply(arguments);
-			var cb = Associations.pop();
+			var cb = (typeof Associations[Associations.length - 1] == "function" ? Associations.pop() : noOperation);
 			var conditions = {};
 			var associationIds = [];
 			var run = function () {
@@ -233,7 +233,7 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 		value: function () {
 			var Associations = [];
 			var opts = {};
-			var cb;
+			var cb = noOperation;
 			var run = function () {
 				var saveNextAssociation = function () {
 					if (Associations.length === 0) {
@@ -320,3 +320,6 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 function ucfirst(text) {
 	return text[0].toUpperCase() + text.substr(1);
 }
+
+function noOperation() {
+}

From 562a7ff3af895663ed6884580ef5c4f2e15d38d5 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 22 Feb 2013 15:54:27 +0000
Subject: [PATCH 0152/1246] Changes hasMany associations to check for
 cascadeRemove and bind to beforeRemove event to trigger delAcessor before
 removing

---
 lib/Associations/Many.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 5231b7ef..b2d099a4 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -85,6 +85,12 @@ exports.extend = function (Model, Instance, Driver, associations, opts, cb) {
 };
 
 function extendInstance(Model, Instance, Driver, association, opts, cb) {
+	if (Model.settings.get("instance.cascadeRemove")) {
+		Instance.on("beforeRemove", function () {
+			Instance[association.delAccessor]();
+		});
+	}
+
 	Object.defineProperty(Instance, association.hasAccessor, {
 		value: function () {
 			var Instances = Array.prototype.slice.apply(arguments);

From b3e63259d3126041719c117f364bea260f459464 Mon Sep 17 00:00:00 2001
From: Zachary Berry <zachberry@gmail.com>
Date: Fri, 22 Feb 2013 21:32:21 -0500
Subject: [PATCH 0153/1246] Fixes an issue where hasMany association properties
 were not being checked

---
 lib/Associations/Many.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index b2d099a4..6c89ea28 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -1,6 +1,7 @@
 var InstanceConstructor = require("../Instance").Instance;
 var Singleton           = require("../Singleton");
 var Settings            = require("../Settings");
+var Property            = require("../Property");
 
 exports.prepare = function (Model, associations) {
 	Model.hasMany = function () {
@@ -28,6 +29,10 @@ exports.prepare = function (Model, associations) {
 		}
 		if (props === null) {
 			props = {};
+		} else {
+			for (var k in props) {
+				props[k] = Property.check(props[k]);
+			}
 		}
 
 		var assocName = opts.name || ucfirst(name);

From 5cb1b5112fcefc0cf31d50c0463e710a99a65bf2 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sat, 23 Feb 2013 15:53:06 +0000
Subject: [PATCH 0154/1246] Removes console.log from hasMany get accessor

---
 lib/Associations/Many.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 6c89ea28..80f4ce25 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -176,7 +176,7 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 			if (cb === null) {
 				return association.model.find(conditions, limit, options);
 			}
-			console.log(conditions);
+
 			association.model.find(conditions, limit, options, cb);
 			return this;
 		},

From 08d53da0281edbaaffd5d182c979ede8193f54f0 Mon Sep 17 00:00:00 2001
From: Rob Britton <rob@robbritton.com>
Date: Sat, 23 Feb 2013 14:16:38 -0500
Subject: [PATCH 0155/1246] Added boolean support for sqlite.

---
 lib/Drivers/DML/sqlite.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index da6e7dc7..94ee22cf 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -181,6 +181,8 @@ Driver.prototype.escape = function (value) {
 	switch (typeof value) {
 		case "number":
 			return value;
+		case "boolean":
+			return value ? 1 : 0;
 	}
 
 	return "'" + value.replace(/\'/g, "''") + "'";

From d96a7b44bba64f6edd3b564e2d7f3587e3e91991 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 25 Feb 2013 10:28:49 +1100
Subject: [PATCH 0156/1246] Fix postgresql integer columns

---
 lib/Drivers/DDL/postgres.js       | 2 +-
 lib/Drivers/DDL/postgresaxomic.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index 1ed841d6..e36a5737 100644
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -130,7 +130,7 @@ function buildColumnDefinition(driver, table, name, prop) {
 			break;
 		case "number":
 			if (prop.rational === false) {
-				def = driver.escapeId(name) + " NUMERIC(0)";
+				def = driver.escapeId(name) + " INTEGER";
 			} else {
 				def = driver.escapeId(name) + " REAL";
 			}
diff --git a/lib/Drivers/DDL/postgresaxomic.js b/lib/Drivers/DDL/postgresaxomic.js
index d0ed0d1b..3f959ebc 100644
--- a/lib/Drivers/DDL/postgresaxomic.js
+++ b/lib/Drivers/DDL/postgresaxomic.js
@@ -130,7 +130,7 @@ function buildColumnDefinition(driver, table, name, prop) {
 			break;
 		case "number":
 			if (prop.rational === false) {
-				def = driver.escapeId(name) + " NUMERIC(0)";
+				def = driver.escapeId(name) + " INTEGER";
 			} else {
 				def = driver.escapeId(name) + " REAL";
 			}

From 9f5bcd870422108f7ff3e18a89de48ac41d1317d Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 25 Feb 2013 17:44:14 +0000
Subject: [PATCH 0157/1246] Fixes #51 (not sure why it was like this before..)

---
 lib/Model.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/Model.js b/lib/Model.js
index ec12a879..bd4e4238 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -179,10 +179,8 @@ function Model(opts) {
 					limit = arguments[i];
 					break;
 				case "object":
-					if (Array.isArray(arguments[i])) {
-						if (order.length > 0) {
-							order = arguments[i];
-						}
+					if (Array.isArray(arguments[i]) && arguments[i].length) {
+						order = arguments[i];
 					} else {
 						if (conditions === null) {
 							conditions = arguments[i];

From 95197cc1d6c087ba068975eb7e8eaafdb7cf1af8 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 25 Feb 2013 17:46:23 +0000
Subject: [PATCH 0158/1246] Changes previous fix to behave like before

This way, if arg is Array it will never go into conditions, even if the
Array is empty
---
 lib/Model.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/Model.js b/lib/Model.js
index bd4e4238..80361b22 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -179,8 +179,10 @@ function Model(opts) {
 					limit = arguments[i];
 					break;
 				case "object":
-					if (Array.isArray(arguments[i]) && arguments[i].length) {
-						order = arguments[i];
+					if (Array.isArray(arguments[i])) {
+						if (arguments[i].length > 0) {
+							order = arguments[i];
+						}
 					} else {
 						if (conditions === null) {
 							conditions = arguments[i];

From 3bbc7578af64734b11f3f7d137fc60718f34f340 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 25 Feb 2013 21:50:09 +0000
Subject: [PATCH 0159/1246] Adds test for Instance.getAssociation(conditions,
 cb)

---
 .../test-association-hasmany-extra-find.js    | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 test/integration/test-association-hasmany-extra-find.js

diff --git a/test/integration/test-association-hasmany-extra-find.js b/test/integration/test-association-hasmany-extra-find.js
new file mode 100644
index 00000000..f0fc9d9c
--- /dev/null
+++ b/test/integration/test-association-hasmany-extra-find.js
@@ -0,0 +1,41 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_association_hasmany_extra', db.driver.db, function () {
+		common.createModelAssocTable('test_association_hasmany_extra', 'assocs', db.driver.db, function () {
+			common.insertModelData('test_association_hasmany_extra', db.driver.db, [
+				{ id : 1, name : 'test1' },
+				{ id : 2, name : 'test2' },
+				{ id : 3, name : 'test3' }
+			], function (err) {
+				if (err) throw err;
+
+				common.insertModelAssocData('test_association_hasmany_extra_assocs', db.driver.db, [
+					[ 1, 2, 4 ],
+					[ 1, 3, 5 ]
+				], function (err) {
+					if (err) throw err;
+
+					var TestModel = db.define('test_association_hasmany_extra', common.getModelProperties());
+					TestModel.hasMany("assocs", {
+						extra_field: Number
+					});
+
+					TestModel.get(1, function (err, Test1) {
+						assert.equal(err, null);
+
+						Test1.getAssocs({ extra_field: 5}, function (err, Tests) {
+							assert.equal(err, null);
+							assert.equal(Array.isArray(Tests), true);
+							assert.equal(Tests.length, 1);
+							assert.equal(Tests[0].name, 'test3');
+							assert.equal(Tests[0].extra.extra_field, 5);
+							db.close();
+						});
+					});
+				});
+			});
+		});
+	});
+});

From b9882481288f5a713da0c65a6e6b135c2722442e Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 26 Feb 2013 00:26:08 +0000
Subject: [PATCH 0160/1246] 2.0.3

---
 Changelog.md | 11 +++++++++++
 Readme.md    |  2 +-
 package.json |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 9359d13e..9b617394 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,14 @@
+### v2.0.3 - 26 Feb 2013
+
+- Fixes postgresql integer columns (#52)
+- Adds boolean support for sqlite (#50)
+- Fixes an issue where hasMany association properties were not being checked (#49)
+- Changes hasMany associations to be able to make some call without callback
+- Makes Instances trigger beforeRemove event
+- Creates default option for instance.cascadeRemove (true)
+- Fixes unique validator not using Model id property name (was using hard coded "id")
+- Updated documentation
+
 ### v2.0.2 - 21 Feb 2013
 
 - Forces hasMany association changes to check for instance saved (to ensure the instance has an id property)
diff --git a/Readme.md b/Readme.md
index 243cf3e7..3fadf4cc 100644
--- a/Readme.md
+++ b/Readme.md
@@ -8,7 +8,7 @@
 npm install orm
 ```
 
-Current stable version: **2.0.2**
+Current stable version: **2.0.3**
 
 ## DBMS Support
 
diff --git a/package.json b/package.json
index c92ced73..499894ed 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "redshift",
     "sqlite"
   ],
-  "version": "2.0.2",
+  "version": "2.0.3",
   "license": "MIT",
   "repository": {
     "url": "http://dresende.github.com/node-orm2"

From 84a2277d1f0339b652cb8736c9345cea429ae6fe Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 26 Feb 2013 18:43:04 +0000
Subject: [PATCH 0161/1246] Adds LIKE operator

---
 lib/sql/Select.js                        |  7 +++++++
 lib/sql/Tools.js                         |  3 +++
 test/integration/test-find-where-like.js | 24 ++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 100644 test/integration/test-find-where-like.js

diff --git a/lib/sql/Select.js b/lib/sql/Select.js
index ed5a365b..279e9e29 100644
--- a/lib/sql/Select.js
+++ b/lib/sql/Select.js
@@ -139,6 +139,13 @@ Builder.prototype.build = function () {
 						this.escape(this.opts.where[i].value.to)
 					].join(" "));
 					break;
+				case "like":
+					lst.push([
+						this.escapeId(this.opts.where[i].field),
+						"LIKE",
+						this.escape(this.opts.where[i].value.expr)
+					].join(" "));
+					break;
 				case "eq":
 				case "ne":
 				case "gt":
diff --git a/lib/sql/Tools.js b/lib/sql/Tools.js
index 80ebb93a..9d47ec95 100644
--- a/lib/sql/Tools.js
+++ b/lib/sql/Tools.js
@@ -1,6 +1,9 @@
 exports.between = function (a, b) {
 	return createSpecialObject({ from: a, to: b }, 'between');
 };
+exports.like = function (expr) {
+	return createSpecialObject({ expr: expr }, 'like');
+};
 
 exports.eq = function (v) {
 	return createSpecialObject({ val: v }, 'eq');
diff --git a/test/integration/test-find-where-like.js b/test/integration/test-find-where-like.js
new file mode 100644
index 00000000..3de019c2
--- /dev/null
+++ b/test/integration/test-find-where-like.js
@@ -0,0 +1,24 @@
+var common     = require('../common');
+var assert     = require('assert');
+var tableName  = 'test_find_where';
+
+common.createConnection(function (err, db) {
+	common.createModelTable(tableName, db.driver.db, function () {
+		common.insertModelData(tableName, db.driver.db, [
+			{ id : 1, name : 'test1' },
+			{ id : 2, name : 'test2' },
+			{ id : 3, name : 'test' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define(tableName, common.getModelProperties());
+
+			TestModel.find({ name: common.ORM.like("test_") }, function (err, Instances) {
+				assert.equal(err, null);
+				assert.equal(Array.isArray(Instances), true);
+				assert.equal(Instances.length, 2);
+				db.close();
+			});
+		});
+	});
+});

From 33523e9122cd42015bc12b23d963934e7c7984e9 Mon Sep 17 00:00:00 2001
From: Nicholas Faiz <nicholas.faiz@gmail.com>
Date: Fri, 1 Mar 2013 12:09:24 +1100
Subject: [PATCH 0162/1246] clearer English use in documentation

---
 Readme.md | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/Readme.md b/Readme.md
index 3fadf4cc..7af89d67 100644
--- a/Readme.md
+++ b/Readme.md
@@ -28,7 +28,7 @@ Current stable version: **2.0.3**
 
 This is a node.js object relational mapping module.
 
-Here is an example on how to use it:
+An example:
 
 ```js
 var orm = require("orm");
@@ -71,7 +71,7 @@ orm.connect("mysql://username:password@host/database", function (err, db) {
 
 ## Settings
 
-You have a global settings object and one for each connection.
+Settings are used to store key value pairs. A settings object is stored on the global orm object and on each database connection.
 
 ```js
 var orm = require("orm");
@@ -89,15 +89,13 @@ orm.connect("....", function (err, db) {
 
 ## Models
 
-A Model is a structure binded to one or more tables, depending on the associations. The model name is assumed to be the table name. After defining a model you can use it to manipulate the table.
+A Model is an abstraction over one or more database tables. Models support associations (more below). The name of the model is assumed to match the table name. 
 
-After defining a Model you can get a specific element or find one or more based on some conditions.
+Models support behaviours for accessing and manipulating table data.
 
 ## Defining Models
 
-To define a model, you use the reference to the database connection and call `define`. The function will define a Model
-and will return it to you. You can get it later by it's id directly from the database connection so you don't actually
-need to store a reference to it.
+Call `define` on the database connection to setup a model. The name of the table and model is used as an identifier for the model on the database connection, so you can easily access the model later using the connection.
 
 ```js
 var Person = db.define('person', {        // 'person' will be the table in the database as well as the model id
@@ -111,8 +109,9 @@ var Person = db.define('person', {        // 'person' will be the table in the d
 
 ## Loading Models
 
-If you prefer to have your models defined in separated files, you can define them in a function inside a module and
-export the function has the entire module. You can have cascading loads.
+Models can be in separate modules. Simply ensure that the module holding the models uses module.exports to publish a function that accepts the database connection, then load your models however you like.
+
+Note - using this technique you can have cascading loads.
 
 ```js
 // your main file (after connecting)
@@ -147,11 +146,9 @@ module.exports = function (db, cb) {
 };
 ```
 
-## Synching Models
+## Synchronizing Models
 
-If you don't have the tables on the database you have to call the `.sync()` on every Model. This will just create the
-tables necessary for your Model. If you have more than one Model you can call `.sync()` directly on the database
-connection to syncronize all Models.
+Models can create their underlying tables in the database. You may call Model.sync() on each Model to create the underlying table or you can call db.sync() at a connection level to create all tables for all models.
 
 ```js
 // db.sync() can also be used
@@ -172,7 +169,8 @@ Person.drop(function (err) {
 
 ## Advanced Options
 
-Using [Settings](#settings) or directly on Model definition you can tweak some options.
+ORM2 allows you some advanced tweaks on your Model definitions. You can configure these via settings or in the call to `define` when you setup the Model.
+
 For example, each Model instance has a unique ID in the database. This table column is
 by default "id" but you can change it.
 
@@ -205,7 +203,9 @@ Other options:
 ## Hooks
 
 If you want to listen for a type of event than occurs in instances of a Model, you can attach a function that
-will be called when that event happens. There are some events possible:
+will be called when that event happens. 
+
+Currently the following events are supported:
 
 - `afterLoad` : (no parameters) Right after loading and preparing an instance to be used;
 - `beforeSave` : (no parameters) Right before trying to save;
@@ -260,7 +260,7 @@ Person.find({ surname: "Doe" }, { offset: 2 }, function (err, people) {
 ### Model.count([ conditions, ] cb)
 
 If you just want to count the number of items that match a condition you can just use `.count()` instead of finding all
-of them and counting. This will actually tell the database server to do a count, the count is not done in javascript.
+of them and counting. This will actually tell the database server to do a count (it won't be done in the node process itself).
 
 ```js
 Person.count({ surname: "Doe" }, function (err, count) {
@@ -286,7 +286,7 @@ Person.exists({ surname: "Doe" }, function (err, exists) {
 
 #### Chaining
 
-If you prefer another less complicated syntax you can chain `.find()` by not giving a callback parameter.
+If you prefer less complicated syntax you can chain `.find()` by not giving a callback parameter.
 
 ```js
 Person.find({ surname: "Doe" }).limit(3).offset(2).only("name", "surname").run(function (err, people) {
@@ -365,12 +365,12 @@ a few examples to describe it:
 { col1: orm.between(123, 456) } // `col1` BETWEEN 123 AND 456
 ```
 
-### Singleton
+### Caching
 
-Each model instances is cached, so if you fetch the same record using 2 or more different queries, you will
+Model instances are cached. If multiple different queries will result in the same result, you will
 get the same object. If you have other systems that can change your database (or you're developing and need
-to make some manual changes) you should remove this feature by disabling cache. You do this when you're
-defining each Model.
+to make some manual changes) you should remove this feature by disabling cache. This can be done when you're
+defining the Model.
 
 ```js
 var Person = db.define('person', {
@@ -380,7 +380,7 @@ var Person = db.define('person', {
 });
 ```
 
-If you want singletons but want cache to expire after a period of time, you can pass a number instead of a
+The cache can be configured to expire after a period of time by passing in a number instead of a
 boolean. The number will be considered the cache timeout in seconds (you can use floating point).
 
 ## Associations
@@ -428,7 +428,7 @@ db.settings.set("properties.association_key", "id_{name}"); // {name} will be re
 
 **Note: This has to be done prior to the association creation.**
 
-For relations of 1 to many you have to use `hasMany` associations. This assumes another table that has 2 columns, one for each table in the association.
+For relations of 1 to many you have to use `hasMany` associations. This assumes the existence of a separate join table that has 2 columns, each referencing the table in the association. Ideally, these would be foreign key relationships in your database.
 
 ```js
 var Person = db.define('person', {

From 2c2bc5bdf089fb37e22fb0e54baf5e455ee7a147 Mon Sep 17 00:00:00 2001
From: Nicholas Faiz <nicholas.faiz@gmail.com>
Date: Fri, 1 Mar 2013 12:11:58 +1100
Subject: [PATCH 0163/1246] change singleton to caching and integrity

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 7af89d67..b9f95ea1 100644
--- a/Readme.md
+++ b/Readme.md
@@ -22,7 +22,7 @@ Current stable version: **2.0.3**
 - Create Models, sync, drop, bulk create, get, find, remove, count
 - Create Model associations, find, check, create and remove
 - Define custom validations (several builtin validations, check instance properties before saving)
-- Instance singleton (table rows fetched twice are the same object, changes to one change all)
+- Model instance caching and integrity (table rows fetched twice are the same object, changes to one change all)
 
 ## Introduction
 

From 4b85c161b2ec0e3971fec5262f24aa588e410b0a Mon Sep 17 00:00:00 2001
From: Nicholas Faiz <nicholas.faiz@gmail.com>
Date: Fri, 1 Mar 2013 12:12:55 +1100
Subject: [PATCH 0164/1246] change singleton to caching and integrity

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index b9f95ea1..5d02ea7a 100644
--- a/Readme.md
+++ b/Readme.md
@@ -365,7 +365,7 @@ a few examples to describe it:
 { col1: orm.between(123, 456) } // `col1` BETWEEN 123 AND 456
 ```
 
-### Caching
+### Caching & Integrity
 
 Model instances are cached. If multiple different queries will result in the same result, you will
 get the same object. If you have other systems that can change your database (or you're developing and need

From 47565d66c37d0c665a2191c78ffc3bac43fd5388 Mon Sep 17 00:00:00 2001
From: Aleksandr Palamar <void995@gmail.com>
Date: Sun, 3 Mar 2013 12:56:18 +0200
Subject: [PATCH 0165/1246] Added "Creating Items" to the README.md

---
 Readme.md | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/Readme.md b/Readme.md
index 5d02ea7a..d53b00b6 100644
--- a/Readme.md
+++ b/Readme.md
@@ -383,6 +383,31 @@ var Person = db.define('person', {
 The cache can be configured to expire after a period of time by passing in a number instead of a
 boolean. The number will be considered the cache timeout in seconds (you can use floating point).
 
+## Creating Items
+
+### Model.create(items, cb)
+
+To insert new elements to the database use `Model.create`.
+
+```js
+Person.create([
+	{
+		name: "John",
+		surname: "Doe",
+		age: 25,
+		male: true
+	},
+	{
+		name: "Liza",
+		surname: "Kollan",
+		age: 19,
+		male: false
+	}
+], function (err) {
+	// called only if something goes wrong when creating new instances
+});
+```
+
 ## Associations
 
 An association is a relation between one or more tables.

From 95d8218b1912e3e510326c1a8f13f6d81359336b Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 4 Mar 2013 16:42:02 +1100
Subject: [PATCH 0166/1246] make counter (i) non global

---
 lib/Drivers/DDL/mysql.js          | 2 +-
 lib/Drivers/DDL/postgres.js       | 2 +-
 lib/Drivers/DDL/postgresaxomic.js | 2 +-
 lib/Drivers/DDL/sqlite.js         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index cdf5c688..27403861 100644
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -1,5 +1,5 @@
 exports.drop = function (driver, opts, cb) {
-	var queries = [], pending;
+	var i, queries = [], pending;
 
 	queries.push("DROP TABLE IF EXISTS " + driver.escapeId(opts.table));
 
diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index e36a5737..86eb7791 100644
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -1,5 +1,5 @@
 exports.drop = function (driver, opts, cb) {
-	var queries = [], pending;
+	var i, queries = [], pending;
 
 	queries.push("DROP TABLE IF EXISTS " + driver.escapeId(opts.table));
 
diff --git a/lib/Drivers/DDL/postgresaxomic.js b/lib/Drivers/DDL/postgresaxomic.js
index 3f959ebc..48f19519 100644
--- a/lib/Drivers/DDL/postgresaxomic.js
+++ b/lib/Drivers/DDL/postgresaxomic.js
@@ -1,5 +1,5 @@
 exports.drop = function (driver, opts, cb) {
-	var queries = [], pending;
+	var i, queries = [], pending;
 
 	queries.push("DROP TABLE IF EXISTS " + driver.escapeId(opts.table));
 
diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index 4ae0f05d..8190ba42 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -1,5 +1,5 @@
 exports.drop = function (driver, opts, cb) {
-	var queries = [], pending;
+	var i, queries = [], pending;
 
 	queries.push("DROP TABLE IF EXISTS " + driver.escapeId(opts.table));
 

From a570fec01ffaab86c5086450a34d61fbe96c9deb Mon Sep 17 00:00:00 2001
From: Aleksandr Palamar <void995@gmail.com>
Date: Mon, 4 Mar 2013 10:46:14 +0200
Subject: [PATCH 0167/1246] Some corrections in the "Creating Items"

---
 Readme.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Readme.md b/Readme.md
index d53b00b6..7c97ac97 100644
--- a/Readme.md
+++ b/Readme.md
@@ -403,8 +403,9 @@ Person.create([
 		age: 19,
 		male: false
 	}
-], function (err) {
-	// called only if something goes wrong when creating new instances
+], function (err, items) {
+	// err - description of the error or null
+	// items - array of inserted items
 });
 ```
 

From f67a789b1080e23f9a1bed9ccfa5d6214d009051 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 4 Mar 2013 10:07:34 +0000
Subject: [PATCH 0168/1246] Support Model.find({ prop: null }) (closes #59)

These uses sql syntax "prop IS NULL"
---
 lib/sql/Select.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/sql/Select.js b/lib/sql/Select.js
index 279e9e29..563788d9 100644
--- a/lib/sql/Select.js
+++ b/lib/sql/Select.js
@@ -127,6 +127,13 @@ Builder.prototype.build = function () {
 	// where
 	lst = [];
 	for (i = 0; i < this.opts.where.length; i++) {
+		if (this.opts.where[i].value === null) {
+			lst.push([
+				this.escapeId(this.opts.where[i].field),
+				"IS NULL"
+			].join(" "));
+			continue;
+		}
 		if (typeof this.opts.where[i].value.orm_special_object == "function") {
 			var op = this.opts.where[i].value.orm_special_object();
 			switch (op) {

From ab55c361036feb5463624b26dfaa72f9e139e1fc Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 4 Mar 2013 10:27:48 +0000
Subject: [PATCH 0169/1246] Uses Error.stack to know where db.load was called
 from and pushes cwd from it

Otherwise it reverts to process.cwd. It also appends "index" to path if
path is a folder.
---
 lib/ORM.js | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index 8fe70d5c..e0cc1630 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -124,8 +124,29 @@ ORM.prototype.close = function (cb) {
 	return this;
 };
 ORM.prototype.load = function (file, cb) {
+	var cwd = process.cwd();
+
+	try {
+		throw new Error();
+	} catch (err) {
+		var tmp = err.stack.split(/\r?\n/)[2], m;
+
+		if (m = tmp.match(/^\s*at\s+(.+):\d+:\d+$/)) {
+			cwd = path.dirname(m[1]);
+		} else if (m = tmp.match(/^\s*at\s+module\.exports\s+\((.+?)\)/)) {
+			cwd = path.dirname(m[1]);
+		}
+	}
+
+	if (file[0] != path.sep) {
+		file = cwd + "/" + file;
+	}
+	if (file.substr(-1) == path.sep) {
+		file += "index";
+	}
+
 	try {
-		require((file[0] != path.sep ? process.cwd() + "/" : "") + file)(this, cb);
+		require(file)(this, cb);
 	} catch (ex) {
 		return cb(ex);
 	}

From c48abfbfaed201850379d407e6186db1d2e6a638 Mon Sep 17 00:00:00 2001
From: Void-995 <void995@gmail.com>
Date: Mon, 4 Mar 2013 19:24:32 +0200
Subject: [PATCH 0170/1246] Added "afterCreate" hook.

---
 Readme.md       | 1 +
 lib/Instance.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Readme.md b/Readme.md
index 7c97ac97..0f631799 100644
--- a/Readme.md
+++ b/Readme.md
@@ -211,6 +211,7 @@ Currently the following events are supported:
 - `beforeSave` : (no parameters) Right before trying to save;
 - `afterSave` : (bool success) Right after saving;
 - `beforeCreate` : (no parameters) Right before trying to save a new instance;
+- `afterCreate` : (bool success) Right after saving a new instance;
 - `beforeRemove` : (no parameters) Right before trying to remove an instance.
 
 All hook function are called with `this` as the instance so you can access anything you want related to it.
diff --git a/lib/Instance.js b/lib/Instance.js
index b80c79d7..9a44e0e0 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -96,6 +96,7 @@ function Instance(opts) {
 						opts.is_new = false;
 					}
 					emitEvent("save", err, instance);
+					Hook.trigger(instance, opts.hooks.afterCreate, !err);
 					Hook.trigger(instance, opts.hooks.afterSave, !err);
 					if (typeof cb == "function") {
 						if (err) {

From d0dc1ea8ac287062656b76345ae5bcfc7d3cfe7f Mon Sep 17 00:00:00 2001
From: Void-995 <void995@gmail.com>
Date: Mon, 4 Mar 2013 19:27:28 +0200
Subject: [PATCH 0171/1246] Added "afterRemove" hook.

---
 Readme.md       | 1 +
 lib/Instance.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Readme.md b/Readme.md
index 0f631799..89c634d8 100644
--- a/Readme.md
+++ b/Readme.md
@@ -213,6 +213,7 @@ Currently the following events are supported:
 - `beforeCreate` : (no parameters) Right before trying to save a new instance;
 - `afterCreate` : (bool success) Right after saving a new instance;
 - `beforeRemove` : (no parameters) Right before trying to remove an instance.
+- `afterRemove` : (bool success) Right after removing an instance;
 
 All hook function are called with `this` as the instance so you can access anything you want related to it.
 
diff --git a/lib/Instance.js b/lib/Instance.js
index 9a44e0e0..b39d42ed 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -158,6 +158,7 @@ function Instance(opts) {
 
 		opts.driver.remove(opts.table, conditions, function (err, data) {
 			emitEvent("remove", err, instance);
+			Hook.trigger(instance, opts.hooks.afterRemove, !err);
 
 			if (typeof cb == "function") {
 				cb(err, instance);

From a5d655ef28755c7e2c18d89aa80e1ace4a058b77 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 4 Mar 2013 19:46:34 +0000
Subject: [PATCH 0172/1246] Passes ID property name to driver.insert() to be
 able to fetch the last ID (if necessary) (#55)

---
 lib/Drivers/DML/mysql.js          | 2 +-
 lib/Drivers/DML/postgres.js       | 4 ++--
 lib/Drivers/DML/postgresaxomic.js | 4 ++--
 lib/Drivers/DML/redshift.js       | 2 +-
 lib/Drivers/DML/sqlite.js         | 2 +-
 lib/Instance.js                   | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 0a09adf4..290f985d 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -117,7 +117,7 @@ Driver.prototype.count = function (table, conditions, cb) {
 	}
 };
 
-Driver.prototype.insert = function (table, data, cb) {
+Driver.prototype.insert = function (table, data, id_prop, cb) {
 	this.QueryInsert
 		.clear()
 		.table(table);
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index ca3ccd55..1fd188dd 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -86,7 +86,7 @@ Driver.prototype.count = function (table, conditions, cb) {
 	this.db.query(this.QuerySelect.build(), handleQuery(cb));
 };
 
-Driver.prototype.insert = function (table, data, cb) {
+Driver.prototype.insert = function (table, data, id_prop, cb) {
 	this.QueryInsert
 		.clear()
 		.table(table);
@@ -101,7 +101,7 @@ Driver.prototype.insert = function (table, data, cb) {
 			return cb(err);
 		}
 		return cb(null, {
-			id: result.rows[0].id || null
+			id: result.rows[0][id_prop] || null
 		});
 	});
 };
diff --git a/lib/Drivers/DML/postgresaxomic.js b/lib/Drivers/DML/postgresaxomic.js
index 4a6a4e17..c7dbcadf 100644
--- a/lib/Drivers/DML/postgresaxomic.js
+++ b/lib/Drivers/DML/postgresaxomic.js
@@ -89,7 +89,7 @@ Driver.prototype.count = function (table, conditions, cb) {
 	}
 	this.hijackQuery(this.QuerySelect.build(), handleQuery(cb));
 };
-Driver.prototype.insert = function (table, data, cb) {
+Driver.prototype.insert = function (table, data, id_prop, cb) {
 	this.QueryInsert
 		.clear()
 		.table(table);
@@ -104,7 +104,7 @@ Driver.prototype.insert = function (table, data, cb) {
 			return cb(err);
 		}
 		return cb(null, {
-			id: result.rows[0].id || null
+			id: result.rows[0][id_prop] || null
 		});
 	});
 };
diff --git a/lib/Drivers/DML/redshift.js b/lib/Drivers/DML/redshift.js
index 53c7f46d..d721f90a 100644
--- a/lib/Drivers/DML/redshift.js
+++ b/lib/Drivers/DML/redshift.js
@@ -9,7 +9,7 @@ function Driver(config, connection, opts) {
 
 util.inherits(Driver, postgres.Driver);
 
-Driver.prototype.insert = function (table, data, cb) {
+Driver.prototype.insert = function (table, data, id_prop, cb) {
 	this.QueryInsert
 		.clear()
 		.table(table);
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 94ee22cf..f47ed49d 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -97,7 +97,7 @@ Driver.prototype.count = function (table, conditions, cb) {
 	this.db.all(this.QuerySelect.build(), cb);
 };
 
-Driver.prototype.insert = function (table, data, cb) {
+Driver.prototype.insert = function (table, data, id_prop, cb) {
 	this.QueryInsert
 		.clear()
 		.table(table);
diff --git a/lib/Instance.js b/lib/Instance.js
index b80c79d7..b8a31a79 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -89,7 +89,7 @@ function Instance(opts) {
 
 			if (opts.is_new || !data.hasOwnProperty(opts.id)) {
 				Hook.trigger(instance, opts.hooks.beforeCreate);
-				opts.driver.insert(opts.table, data, function (err, info) {
+				opts.driver.insert(opts.table, data, opts.id, function (err, info) {
 					if (!err) {
 						opts.changes.length = 0;
 						opts.data[opts.id] = info.id;

From dbc493d5d48eeffa2631d6cc45878d6eb5ebd737 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 4 Mar 2013 19:49:21 +0000
Subject: [PATCH 0173/1246] Updates hasMany associations 3rd table insert to
 new driver.insert() prototype

---
 lib/Associations/Many.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 80f4ce25..9af913e7 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -266,7 +266,7 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 							data[k] = opts[k];
 						}
 
-						Driver.insert(association.mergeTable, data, function (err) {
+						Driver.insert(association.mergeTable, data, null, function (err) {
 							if (err) {
 								return cb(err);
 							}

From c49a3d7c24bebd92c30c539779e0298dbe308e37 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 4 Mar 2013 19:57:21 +0000
Subject: [PATCH 0174/1246] Changes db.load to avoid throwing and just create
 the error

Duh..
---
 lib/ORM.js | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index e0cc1630..a92d5018 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -125,17 +125,13 @@ ORM.prototype.close = function (cb) {
 };
 ORM.prototype.load = function (file, cb) {
 	var cwd = process.cwd();
+	var err = new Error();
+	var tmp = err.stack.split(/\r?\n/)[2], m;
 
-	try {
-		throw new Error();
-	} catch (err) {
-		var tmp = err.stack.split(/\r?\n/)[2], m;
-
-		if (m = tmp.match(/^\s*at\s+(.+):\d+:\d+$/)) {
-			cwd = path.dirname(m[1]);
-		} else if (m = tmp.match(/^\s*at\s+module\.exports\s+\((.+?)\)/)) {
-			cwd = path.dirname(m[1]);
-		}
+	if (m = tmp.match(/^\s*at\s+(.+):\d+:\d+$/)) {
+		cwd = path.dirname(m[1]);
+	} else if (m = tmp.match(/^\s*at\s+module\.exports\s+\((.+?)\)/)) {
+		cwd = path.dirname(m[1]);
 	}
 
 	if (file[0] != path.sep) {

From af2f6402be16269ea054603e1fd92817f44da179 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 4 Mar 2013 20:11:35 +0000
Subject: [PATCH 0175/1246] Adds db.ping() (#57)

---
 lib/Drivers/DML/mysql.js          |  5 +++++
 lib/Drivers/DML/postgres.js       |  7 +++++++
 lib/Drivers/DML/postgresaxomic.js |  8 ++++++++
 lib/Drivers/DML/sqlite.js         |  5 +++++
 lib/ORM.js                        |  5 +++++
 test/integration/test-ping.js     | 10 ++++++++++
 6 files changed, 40 insertions(+)
 create mode 100644 test/integration/test-ping.js

diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 290f985d..9f5a0403 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -35,6 +35,11 @@ Driver.prototype.drop = function (opts, cb) {
 	return require("../DDL/mysql").drop(this, opts, cb);
 };
 
+Driver.prototype.ping = function (cb) {
+	this.db.ping(cb);
+	return this;
+};
+
 Driver.prototype.on = function (ev, cb) {
 	if (ev == "error") {
 		this.db.on("error", cb);
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 1fd188dd..11d6fe88 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -26,6 +26,13 @@ Driver.prototype.drop = function (opts, cb) {
 	return require("../DDL/postgres").drop(this, opts, cb);
 };
 
+Driver.prototype.ping = function (cb) {
+	this.db.query("SELECT * FROM pg_stat_activity LIMIT 1", function () {
+		return cb();
+	});
+	return this;
+};
+
 Driver.prototype.on = function (ev, cb) {
 	if (ev == "error") {
 		this.db.on("error", cb);
diff --git a/lib/Drivers/DML/postgresaxomic.js b/lib/Drivers/DML/postgresaxomic.js
index c7dbcadf..828e70e4 100644
--- a/lib/Drivers/DML/postgresaxomic.js
+++ b/lib/Drivers/DML/postgresaxomic.js
@@ -25,6 +25,14 @@ Driver.prototype.sync = function (opts, cb) {
 Driver.prototype.drop = function (opts, cb) {
 	return require("../DDL/postgres").drop(this, opts, cb);
 };
+
+Driver.prototype.ping = function (cb) {
+	this.db.query("SELECT * FROM pg_stat_activity LIMIT 1", function () {
+		return cb();
+	});
+	return this;
+};
+
 Driver.prototype.connect = function (cb) {
 	//console.log("connect called");
 	cb(null);
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index f47ed49d..3cff0fd3 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -33,6 +33,11 @@ Driver.prototype.drop = function (opts, cb) {
 	return require("../DDL/sqlite").drop(this, opts, cb);
 };
 
+Driver.prototype.ping = function (cb) {
+	process.nextTick(cb);
+	return this;
+};
+
 Driver.prototype.on = function (ev, cb) {
 	if (ev == "error") {
 		this.db.on("error", cb);
diff --git a/lib/ORM.js b/lib/ORM.js
index 8fe70d5c..3aae621b 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -118,6 +118,11 @@ ORM.prototype.define = function (name, properties, opts) {
 	});
 	return this.models[name];
 };
+ORM.prototype.ping = function (cb) {
+	this.driver.ping(cb);
+
+	return this;
+};
 ORM.prototype.close = function (cb) {
 	this.driver.close(cb);
 
diff --git a/test/integration/test-ping.js b/test/integration/test-ping.js
new file mode 100644
index 00000000..7fe6d3dc
--- /dev/null
+++ b/test/integration/test-ping.js
@@ -0,0 +1,10 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	db.ping(function (err) {
+		assert.equal(err, null);
+
+		db.close();
+	});
+});

From 7791934a7bb8dbcd250b652e47f35681fe370ea5 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 4 Mar 2013 20:13:40 +0000
Subject: [PATCH 0176/1246] Adds test for afterRemove hook

---
 test/integration/test-hook-after-remove.js | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 test/integration/test-hook-after-remove.js

diff --git a/test/integration/test-hook-after-remove.js b/test/integration/test-hook-after-remove.js
new file mode 100644
index 00000000..3cb8577c
--- /dev/null
+++ b/test/integration/test-hook-after-remove.js
@@ -0,0 +1,29 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_hook_after_remove', db.driver.db, function () {
+		common.insertModelData('test_hook_after_remove', db.driver.db, [
+			{ id : 1, name : 'test' }
+		], function (err) {
+			var afterRemove = false;
+			var TestModel = db.define('test_hook_after_remove', common.getModelProperties(), {
+				hooks: {
+					afterRemove: function () {
+						afterRemove = true;
+					}
+				}
+			});
+
+			TestModel.get(1, function (err, Instance) {
+				assert.equal(err, null);
+				Instance.remove(function (err) {
+					assert.equal(err, null);
+					assert.equal(afterRemove, true);
+
+					db.close();
+				});
+			});
+		});
+	});
+});

From 0723188cb0d958829104e81655a807702556bf18 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 4 Mar 2013 20:13:48 +0000
Subject: [PATCH 0177/1246] Adds test for afterCreate hook

---
 test/integration/test-hook-after-create.js | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 test/integration/test-hook-after-create.js

diff --git a/test/integration/test-hook-after-create.js b/test/integration/test-hook-after-create.js
new file mode 100644
index 00000000..3c419d96
--- /dev/null
+++ b/test/integration/test-hook-after-create.js
@@ -0,0 +1,24 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_hook_after_create', db.driver.db, function () {
+		var afterCreate = false;
+		var TestModel = db.define('test_hook_after_create', common.getModelProperties(), {
+			hooks: {
+				afterCreate: function () {
+					afterCreate = true;
+				}
+			}
+		});
+
+		var Test = new TestModel({ name: "afterCreate" });
+		Test.save(function (err) {
+			assert.equal(err, null);
+
+			db.close(function () {
+				assert.equal(afterCreate, true);
+			});
+		});
+	});
+});

From 9297815f997f82af2ab894ce3fd67e5e51382c1f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 4 Mar 2013 20:35:25 +0000
Subject: [PATCH 0178/1246] Fixes hasOne reversed associations not having
 setAccessor, fixes bug using wrong ID prop instead of the one defined in
 Model (#55)

---
 lib/Associations/One.js | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index 48094267..aa6ce1cf 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -102,23 +102,35 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 		},
 		enumerable: false
 	});
-	if (!association.reversed) {
-		Object.defineProperty(Instance, association.setAccessor, {
-			value: function (OtherInstance, cb) {
+	Object.defineProperty(Instance, association.setAccessor, {
+		value: function (OtherInstance, cb) {
+			if (association.reversed) {
+				Instance.save(function (err) {
+					if (err) {
+						return cb(err);
+					}
+
+					OtherInstance[association.field] = Instance[Model.id];
+
+					return OtherInstance.save(cb);
+				});
+			} else {
 				OtherInstance.save(function (err) {
 					if (err) {
 						return cb(err);
 					}
 
-					Instance[association.field] = OtherInstance.id;
+					Instance[association.field] = OtherInstance[association.model.id];
 
 					return Instance.save(cb);
 				});
+			}
 
-				return this;
-			},
-			enumerable: false
-		});
+			return this;
+		},
+		enumerable: false
+	});
+	if (association.reversed) {
 		Object.defineProperty(Instance, association.delAccessor, {
 			value: function (cb) {
 				Instance[association.field] = 0;

From d838876db305bf5c7e7be55a4cc290b4c81902d8 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 4 Mar 2013 20:36:14 +0000
Subject: [PATCH 0179/1246] Fixes previous wrongly changing if condition

---
 lib/Associations/One.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index aa6ce1cf..6d34d91c 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -130,7 +130,7 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 		},
 		enumerable: false
 	});
-	if (association.reversed) {
+	if (!association.reversed) {
 		Object.defineProperty(Instance, association.delAccessor, {
 			value: function (cb) {
 				Instance[association.field] = 0;

From 742212caef8a01b776dd6d553efc8f14d22be3ba Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 4 Mar 2013 20:56:31 +0000
Subject: [PATCH 0180/1246] Adds possibility to add order to hasMany
 getAccessor (#58)

---
 lib/Associations/Many.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 9af913e7..445bed86 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -136,6 +136,7 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 			var conditions = null;
 			var options = {};
 			var limit;
+			var order = null;
 			var cb = null;
 
 			for (var i = 0; i < arguments.length; i++) {
@@ -147,7 +148,12 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 						if (conditions === null) {
 							conditions = arguments[i];
 						} else {
-							options = arguments[i];
+							if (Array.isArray(arguments[i])) {
+								order = arguments[i];
+								order[0] = association.model.table + "." + order[0];
+							} else {
+								options = arguments[i];
+							}
 						}
 						break;
 					case "number":
@@ -167,6 +173,9 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 				id_prop: association.mergeId,
 				assoc_prop: association.mergeAssocId
 			};
+			if (order !== null) {
+				options.order = order;
+			}
 
 			if (conditions === null) {
 				conditions = {};

From 70034d79d36749335845b3f31201b9d9ae296264 Mon Sep 17 00:00:00 2001
From: unknown <kodytek@kody.teplice.ipossoft.cz>
Date: Mon, 4 Mar 2013 23:22:55 +0100
Subject: [PATCH 0181/1246] Adds posibility to define order array in options
 argument of Model.find method regards addition of order to hasMany
 getAccessor

---
 lib/Model.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/Model.js b/lib/Model.js
index 80361b22..c57757e1 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -191,6 +191,10 @@ function Model(opts) {
 							if (options.hasOwnProperty("__merge")) {
 								merge = options.__merge;
 								delete options.__merge;
+							} 
+							if (options.hasOwnProperty("order")) {
+								order = options.order;
+								delete options.order;
 							}
 						}
 					}

From 739e50cc684f57802513d9afd4a48be030b6cd02 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 5 Mar 2013 20:20:46 +0000
Subject: [PATCH 0182/1246] Changes postgres driver to support ssl flag and
 pass it to pg driver

---
 lib/Drivers/DML/postgres.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 11d6fe88..1d48649e 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -5,7 +5,14 @@ exports.Driver = Driver;
 function Driver(config, connection, opts) {
 	this.config = config || {};
 	this.opts   = opts || {};
-	this.db = (connection ? connection : new postgres.Client(config.href || config));
+	if (connection) {
+		this.db = connection;
+	} else if (config.query && config.query.ssl) {
+		config.ssl = true;
+		this.db = new postgres.Client(config);
+	} else {
+		this.db = new postgres.Client(config.href || config);
+	}
 
 	var escapes = {
 		escape   : this.escape.bind(this),

From 5835c882b32e8a8394136dac3032ce0ae04dd136 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 5 Mar 2013 20:26:56 +0000
Subject: [PATCH 0183/1246] Moves hook beforeSave to before checking
 validations (#66)

---
 lib/Instance.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 57d00a21..5331819b 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -61,6 +61,8 @@ function Instance(opts) {
 			return saveInstanceExtra(cb);
 		}
 
+		Hook.trigger(instance, opts.hooks.beforeSave);
+
 		handleValidations(function (err) {
 			if (err) {
 				emitEvent("save", err, instance);
@@ -71,8 +73,6 @@ function Instance(opts) {
 				return;
 			}
 
-			Hook.trigger(instance, opts.hooks.beforeSave);
-
 			var data = {};
 			for (var k in opts.data) {
 				if (!opts.data.hasOwnProperty(k)) continue;

From 040dbf0244335c160e8a19dfbb88697002654ebb Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 6 Mar 2013 01:10:37 +0000
Subject: [PATCH 0184/1246] Fixes error in hasMany reverse example

---
 Readme.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Readme.md b/Readme.md
index 89c634d8..29307689 100644
--- a/Readme.md
+++ b/Readme.md
@@ -89,7 +89,7 @@ orm.connect("....", function (err, db) {
 
 ## Models
 
-A Model is an abstraction over one or more database tables. Models support associations (more below). The name of the model is assumed to match the table name. 
+A Model is an abstraction over one or more database tables. Models support associations (more below). The name of the model is assumed to match the table name.
 
 Models support behaviours for accessing and manipulating table data.
 
@@ -203,7 +203,7 @@ Other options:
 ## Hooks
 
 If you want to listen for a type of event than occurs in instances of a Model, you can attach a function that
-will be called when that event happens. 
+will be called when that event happens.
 
 Currently the following events are supported:
 
@@ -554,7 +554,7 @@ var Pet = db.define('pet', {
 var Person = db.define('person', {
 	name : String
 });
-Person.hasMany("pets", Person, {
+Person.hasMany("pets", Pet, {
     bought  : Date
 }, {
 	reverse : "owners"

From e0cc1f30dbbd207c795d7913d514a656a35f27ef Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 6 Mar 2013 13:02:22 +0000
Subject: [PATCH 0185/1246] Adds test for db.load()

---
 test/integration/models/model.js     |  5 +++++
 test/integration/models/sub/index.js |  7 +++++++
 test/integration/test-load.js        | 13 +++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 test/integration/models/model.js
 create mode 100644 test/integration/models/sub/index.js
 create mode 100644 test/integration/test-load.js

diff --git a/test/integration/models/model.js b/test/integration/models/model.js
new file mode 100644
index 00000000..c3d84878
--- /dev/null
+++ b/test/integration/models/model.js
@@ -0,0 +1,5 @@
+module.exports = function (db, cb) {
+	setTimeout(function () {
+		return cb();
+	}, 500);
+};
diff --git a/test/integration/models/sub/index.js b/test/integration/models/sub/index.js
new file mode 100644
index 00000000..98c753fb
--- /dev/null
+++ b/test/integration/models/sub/index.js
@@ -0,0 +1,7 @@
+module.exports = function (db, cb) {
+	db.load("../model", function (err) {
+		setTimeout(function () {
+			return cb();
+		}, 500);
+	});
+};
diff --git a/test/integration/test-load.js b/test/integration/test-load.js
new file mode 100644
index 00000000..9aa8a8d1
--- /dev/null
+++ b/test/integration/test-load.js
@@ -0,0 +1,13 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	// should load:
+	//
+	// models/sub/index
+	// models/model (called from models/sub/index)
+	db.load("./models/sub/", function (err) {
+		assert.equal(err, null);
+		db.close();
+	});
+});

From cf6c629d1946590bacb43154582dc3e642957b10 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 7 Mar 2013 19:35:56 +0000
Subject: [PATCH 0186/1246] 2.0.4

---
 Changelog.md | 15 +++++++++++++++
 Readme.md    |  2 +-
 package.json |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 9b617394..e4fb524c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,18 @@
+### v2.0.4 - 7 Mar 2013
+
+- Changes db.load() to behave like builtin require()
+- Moves hook beforeSave to before checking validations (#66)
+- Changes postgres driver to support ssl flag and pass it to pg driver
+- Adds possibility to add order to hasMany getAccessor (#58)
+- Fixes hasOne reversed associations not having setAccessor
+- Adds db.ping() (#57)
+- Changes db.load to avoid throwing and just create the error
+- Added "afterRemove" hook
+- Added "afterCreate" hook
+- Support Model.find({ prop: null }) (closes #59)
+- Adds LIKE operator
+- Many bug fixes
+
 ### v2.0.3 - 26 Feb 2013
 
 - Fixes postgresql integer columns (#52)
diff --git a/Readme.md b/Readme.md
index 29307689..451abc2b 100644
--- a/Readme.md
+++ b/Readme.md
@@ -8,7 +8,7 @@
 npm install orm
 ```
 
-Current stable version: **2.0.3**
+Current stable version: **2.0.4**
 
 ## DBMS Support
 
diff --git a/package.json b/package.json
index 499894ed..51005fd8 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "redshift",
     "sqlite"
   ],
-  "version": "2.0.3",
+  "version": "2.0.4",
   "license": "MIT",
   "repository": {
     "url": "http://dresende.github.com/node-orm2"

From fe083719cdb4a37db3750bce5a6ef10f6ee89a5b Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 7 Mar 2013 22:57:17 +0000
Subject: [PATCH 0187/1246] Uses sql-query for SQL query building, removes
 unnecessary files, fixes some tests

---
 lib/Associations/Many.js                      |  22 +-
 lib/Drivers/DDL/mysql.js                      |  42 ++--
 lib/Drivers/DDL/postgres.js                   |  48 ++--
 lib/Drivers/DDL/postgresaxomic.js             | 161 -------------
 lib/Drivers/DDL/sqlite.js                     |  48 ++--
 lib/Drivers/DML/mysql.js                      | 139 +++++------
 lib/Drivers/DML/postgres.js                   | 141 ++++-------
 lib/Drivers/DML/postgresaxomic.js             | 152 +++++-------
 lib/Drivers/DML/redshift.js                   |  15 +-
 lib/Drivers/DML/sqlite.js                     | 139 ++++-------
 lib/ORM.js                                    |  28 ++-
 lib/sql/Insert.js                             |  51 ----
 lib/sql/Remove.js                             |  66 ------
 lib/sql/Select.js                             | 220 ------------------
 lib/sql/Tools.js                              |  35 ---
 lib/sql/Update.js                             |  81 -------
 package.json                                  |   3 +
 .../test-association-hasmany-add.js           |   9 +-
 .../test-association-hasmany-set-multiple.js  |   9 +-
 19 files changed, 335 insertions(+), 1074 deletions(-)
 delete mode 100644 lib/Drivers/DDL/postgresaxomic.js
 delete mode 100644 lib/sql/Insert.js
 delete mode 100644 lib/sql/Remove.js
 delete mode 100644 lib/sql/Select.js
 delete mode 100644 lib/sql/Tools.js
 delete mode 100644 lib/sql/Update.js

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 445bed86..e63254d3 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -104,7 +104,8 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 
 			options.__merge = {
 				from: { table: association.mergeTable, field: association.mergeAssocId },
-				to: { table: association.model.table, field: association.model.id }
+				to: { table: association.model.table, field: association.model.id },
+				where: [ association.mergeTable, {} ]
 			};
 			options.extra = association.props;
 			options.extra_info = {
@@ -114,11 +115,14 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 				assoc_prop: association.mergeAssocId
 			};
 
-			conditions[association.mergeTable + "." + association.mergeId] = Instance[Model.id];
-			conditions[association.mergeTable + "." + association.mergeAssocId] = [];
+			options.__merge.where[1][association.mergeId] = Instance[Model.id];
 
-			for (var i = 0; i < Instances.length; i++) {
-				conditions[association.mergeTable + "." + association.mergeAssocId].push(Instances[i][association.model.id]);
+			if (Instances.length) {
+				options.__merge.where[1][association.mergeAssocId] = [];
+
+				for (var i = 0; i < Instances.length; i++) {
+					options.__merge.where[1][association.mergeAssocId].push(Instances[i][association.model.id]);
+				}
 			}
 
 			association.model.find(conditions, options, function (err, instances) {
@@ -163,8 +167,9 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 			}
 
 			options.__merge = {
-				from: { table: association.mergeTable, field: association.mergeAssocId },
-				to: { table: association.model.table, field: association.model.id }
+				from  : { table: association.mergeTable, field: association.mergeAssocId },
+				to    : { table: association.model.table, field: association.model.id },
+				where : [ association.mergeTable, {} ]
 			};
 			options.extra = association.props;
 			options.extra_info = {
@@ -180,7 +185,8 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 			if (conditions === null) {
 				conditions = {};
 			}
-			conditions[association.mergeTable + "." + association.mergeId] = Instance[Model.id];
+
+			options.__merge.where[1][association.mergeId] = Instance[Model.id];
 
 			if (cb === null) {
 				return association.model.find(conditions, limit, options);
diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index 27403861..464526d2 100644
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -1,10 +1,10 @@
 exports.drop = function (driver, opts, cb) {
 	var i, queries = [], pending;
 
-	queries.push("DROP TABLE IF EXISTS " + driver.escapeId(opts.table));
+	queries.push("DROP TABLE IF EXISTS " + driver.query.escapeId(opts.table));
 
 	for (i = 0; i < opts.many_associations.length; i++) {
-		queries.push("DROP TABLE IF EXISTS " + driver.escapeId(opts.many_associations[i].mergeTable));
+		queries.push("DROP TABLE IF EXISTS " + driver.query.escapeId(opts.many_associations[i].mergeTable));
 	}
 
 	pending = queries.length;
@@ -35,7 +35,7 @@ exports.sync = function (driver, opts, cb) {
 	var definitions = [];
 	var k, i, pending;
 
-	definitions.push(driver.escapeId(opts.id) + " INT(11) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY");
+	definitions.push(driver.query.escapeId(opts.id) + " INT(11) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY");
 
 	for (k in opts.properties) {
 		definitions.push(buildColumnDefinition(driver, k, opts.properties[k]));
@@ -43,38 +43,38 @@ exports.sync = function (driver, opts, cb) {
 
 	for (i = 0; i < opts.one_associations.length; i++) {
 		if (opts.one_associations[i].reversed) continue;
-		definitions.push(driver.escapeId(opts.one_associations[i].field) + " INT(11) UNSIGNED NOT NULL");
+		definitions.push(driver.query.escapeId(opts.one_associations[i].field) + " INT(11) UNSIGNED NOT NULL");
 	}
 
-	definitions.push("INDEX (" + driver.escapeId(opts.id) + ")");
+	definitions.push("INDEX (" + driver.query.escapeId(opts.id) + ")");
 	for (k in opts.properties) {
 		if (opts.properties[k].unique === true) {
-			definitions.push("UNIQUE KEY " + driver.escapeId(k) + " (" + driver.escapeId(k) + ")");
+			definitions.push("UNIQUE KEY " + driver.query.escapeId(k) + " (" + driver.query.escapeId(k) + ")");
 		}
 	}
 	for (i = 0; i < opts.one_associations.length; i++) {
 		if (opts.one_associations[i].reversed) continue;
-		definitions.push("INDEX (" + driver.escapeId(opts.one_associations[i].field) + ")");
+		definitions.push("INDEX (" + driver.query.escapeId(opts.one_associations[i].field) + ")");
 	}
 
 	queries.push(
-		"CREATE TABLE IF NOT EXISTS " + driver.escapeId(opts.table) +
+		"CREATE TABLE IF NOT EXISTS " + driver.query.escapeId(opts.table) +
 		" (" + definitions.join(", ") + ")"
 	);
 
 	for (i = 0; i < opts.many_associations.length; i++) {
 		definitions = [];
 
-		definitions.push(driver.escapeId(opts.many_associations[i].mergeId) + " INT(11) UNSIGNED NOT NULL");
-		definitions.push(driver.escapeId(opts.many_associations[i].mergeAssocId) + " INT(11) UNSIGNED NOT NULL");
+		definitions.push(driver.query.escapeId(opts.many_associations[i].mergeId) + " INT(11) UNSIGNED NOT NULL");
+		definitions.push(driver.query.escapeId(opts.many_associations[i].mergeAssocId) + " INT(11) UNSIGNED NOT NULL");
 
 		for (k in opts.many_associations[i].props) {
 			definitions.push(buildColumnDefinition(driver, k, opts.many_associations[i].props[k]));
 		}
 
-		definitions.push("INDEX (" + driver.escapeId(opts.many_associations[i].mergeId) + ", " + driver.escapeId(opts.many_associations[i].mergeAssocId) + ")");
+		definitions.push("INDEX (" + driver.query.escapeId(opts.many_associations[i].mergeId) + ", " + driver.query.escapeId(opts.many_associations[i].mergeAssocId) + ")");
 		queries.push(
-			"CREATE TABLE IF NOT EXISTS " + driver.escapeId(opts.many_associations[i].mergeTable) +
+			"CREATE TABLE IF NOT EXISTS " + driver.query.escapeId(opts.many_associations[i].mergeTable) +
 			" (" + definitions.join(", ") + ")"
 		);
 	}
@@ -107,37 +107,37 @@ function buildColumnDefinition(driver, name, prop) {
 
 	switch (prop.type) {
 		case "text":
-			def = driver.escapeId(name) + " VARCHAR(" + Math.min(Math.max(parseInt(prop.size, 10) || 255, 1), 65535) + ")";
+			def = driver.query.escapeId(name) + " VARCHAR(" + Math.min(Math.max(parseInt(prop.size, 10) || 255, 1), 65535) + ")";
 			break;
 		case "number":
 			if (prop.rational === false) {
-				def = driver.escapeId(name) + " INTEGER";
+				def = driver.query.escapeId(name) + " INTEGER";
 			} else {
-				def = driver.escapeId(name) + " FLOAT";
+				def = driver.query.escapeId(name) + " FLOAT";
 			}
 			if (prop.unsigned === true) {
 				def += " UNSIGNED";
 			}
 			break;
 		case "boolean":
-			def = driver.escapeId(name) + " BOOLEAN NOT NULL";
+			def = driver.query.escapeId(name) + " BOOLEAN NOT NULL";
 			break;
 		case "date":
 			if (prop.time === false) {
-				def = driver.escapeId(name) + " DATE";
+				def = driver.query.escapeId(name) + " DATE";
 			} else {
-				def = driver.escapeId(name) + " DATETIME";
+				def = driver.query.escapeId(name) + " DATETIME";
 			}
 			break;
 		case "binary":
 			if (prop.big === true) {
-				def = driver.escapeId(name) + " LONGBLOB";
+				def = driver.query.escapeId(name) + " LONGBLOB";
 			} else {
-				def = driver.escapeId(name) + " BLOB";
+				def = driver.query.escapeId(name) + " BLOB";
 			}
 			break;
 		case "enum":
-			def = driver.escapeId(name) + " ENUM (" +
+			def = driver.query.escapeId(name) + " ENUM (" +
 			       prop.values.map(driver.db.escape.bind(driver.db)) +
 			")";
 			break;
diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index 86eb7791..d49993d6 100644
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -1,10 +1,10 @@
 exports.drop = function (driver, opts, cb) {
 	var i, queries = [], pending;
 
-	queries.push("DROP TABLE IF EXISTS " + driver.escapeId(opts.table));
+	queries.push("DROP TABLE IF EXISTS " + driver.query.escapeId(opts.table));
 
 	for (i = 0; i < opts.many_associations.length; i++) {
-		queries.push("DROP TABLE IF EXISTS " + driver.escapeId(opts.many_associations[i].mergeTable));
+		queries.push("DROP TABLE IF EXISTS " + driver.query.escapeId(opts.many_associations[i].mergeTable));
 	}
 
 	pending = queries.length;
@@ -23,7 +23,7 @@ exports.sync = function (driver, opts, cb) {
 	var definitions = [];
 	var k, i, pending, tmp;
 
-	definitions.push(driver.escapeId(opts.id) + " SERIAL PRIMARY KEY");
+	definitions.push(driver.query.escapeId(opts.id) + " SERIAL PRIMARY KEY");
 
 	for (k in opts.properties) {
 		definitions.push(buildColumnDefinition(driver, opts.table, k, opts.properties[k]));
@@ -38,38 +38,38 @@ exports.sync = function (driver, opts, cb) {
 
 	for (i = 0; i < opts.one_associations.length; i++) {
 		if (opts.one_associations[i].reversed) continue;
-		definitions.push(driver.escapeId(opts.one_associations[i].field) + " INTEGER NOT NULL");
+		definitions.push(driver.query.escapeId(opts.one_associations[i].field) + " INTEGER NOT NULL");
 	}
 	for (k in opts.properties) {
 		if (opts.properties[k].unique === true) {
-			definitions.push("UNIQUE (" + driver.escapeId(k) + ")");
+			definitions.push("UNIQUE (" + driver.query.escapeId(k) + ")");
 		}
 	}
 
 	tables.push({
 		name       : opts.table,
-		query      : "CREATE TABLE " + driver.escapeId(opts.table) +
+		query      : "CREATE TABLE " + driver.query.escapeId(opts.table) +
 		             " (" + definitions.join(", ") + ")",
 		subqueries : subqueries
 	});
 	tables[tables.length - 1].subqueries.push(
-		"CREATE INDEX ON " + driver.escapeId(opts.table) +
-		" (" + driver.escapeId(opts.id) + ")"
+		"CREATE INDEX ON " + driver.query.escapeId(opts.table) +
+		" (" + driver.query.escapeId(opts.id) + ")"
 	);
 
 	for (i = 0; i < opts.one_associations.length; i++) {
 		if (opts.one_associations[i].reversed) continue;
 		tables[tables.length - 1].subqueries.push(
-			"CREATE INDEX ON " + driver.escapeId(opts.table) +
-			" (" + driver.escapeId(opts.one_associations[i].field) + ")"
+			"CREATE INDEX ON " + driver.query.escapeId(opts.table) +
+			" (" + driver.query.escapeId(opts.one_associations[i].field) + ")"
 		);
 	}
 
 	for (i = 0; i < opts.many_associations.length; i++) {
 		definitions = [];
 
-		definitions.push(driver.escapeId(opts.many_associations[i].mergeId) + " INTEGER NOT NULL");
-		definitions.push(driver.escapeId(opts.many_associations[i].mergeAssocId) + " INTEGER NOT NULL");
+		definitions.push(driver.query.escapeId(opts.many_associations[i].mergeId) + " INTEGER NOT NULL");
+		definitions.push(driver.query.escapeId(opts.many_associations[i].mergeAssocId) + " INTEGER NOT NULL");
 
 		for (k in opts.many_associations[i].props) {
 			definitions.push(buildColumnDefinition(driver, opts.many_associations[i].mergeTable,
@@ -78,15 +78,15 @@ exports.sync = function (driver, opts, cb) {
 
 		tables.push({
 			name       : opts.many_associations[i].mergeTable,
-			query      : "CREATE TABLE IF NOT EXISTS " + driver.escapeId(opts.many_associations[i].mergeTable) +
+			query      : "CREATE TABLE IF NOT EXISTS " + driver.query.escapeId(opts.many_associations[i].mergeTable) +
 			             " (" + definitions.join(", ") + ")",
 			subqueries : []
 		});
 		tables[tables.length - 1].subqueries.push(
-			"CREATE INDEX ON " + driver.escapeId(opts.many_associations[i].mergeTable) +
+			"CREATE INDEX ON " + driver.query.escapeId(opts.many_associations[i].mergeTable) +
 			" (" +
-			driver.escapeId(opts.many_associations[i].mergeId) + ", " +
-			driver.escapeId(opts.many_associations[i].mergeAssocId) +
+			driver.query.escapeId(opts.many_associations[i].mergeId) + ", " +
+			driver.query.escapeId(opts.many_associations[i].mergeAssocId) +
 			")"
 		);
 	}
@@ -126,30 +126,30 @@ function buildColumnDefinition(driver, table, name, prop) {
 
 	switch (prop.type) {
 		case "text":
-			def = driver.escapeId(name) + " VARCHAR(" + Math.min(Math.max(parseInt(prop.size, 10) || 255, 1), 65535) + ")";
+			def = driver.query.escapeId(name) + " VARCHAR(" + Math.min(Math.max(parseInt(prop.size, 10) || 255, 1), 65535) + ")";
 			break;
 		case "number":
 			if (prop.rational === false) {
-				def = driver.escapeId(name) + " INTEGER";
+				def = driver.query.escapeId(name) + " INTEGER";
 			} else {
-				def = driver.escapeId(name) + " REAL";
+				def = driver.query.escapeId(name) + " REAL";
 			}
 			break;
 		case "boolean":
-			def = driver.escapeId(name) + " BOOLEAN NOT NULL";
+			def = driver.query.escapeId(name) + " BOOLEAN NOT NULL";
 			break;
 		case "date":
 			if (prop.time === false) {
-				def = driver.escapeId(name) + " DATE";
+				def = driver.query.escapeId(name) + " DATE";
 			} else {
-				def = driver.escapeId(name) + " TIMESTAMP WITHOUT TIME ZONE";
+				def = driver.query.escapeId(name) + " TIMESTAMP WITHOUT TIME ZONE";
 			}
 			break;
 		case "binary":
-			def = driver.escapeId(name) + " BYTEA";
+			def = driver.query.escapeId(name) + " BYTEA";
 			break;
 		case "enum":
-			def = driver.escapeId(name) + " " + driver.escapeId("enum_" + table + "_" + name);
+			def = driver.query.escapeId(name) + " " + driver.query.escapeId("enum_" + table + "_" + name);
 			break;
 		default:
 			throw new Error("Unknown property type: '" + prop.type + "'");
diff --git a/lib/Drivers/DDL/postgresaxomic.js b/lib/Drivers/DDL/postgresaxomic.js
deleted file mode 100644
index 48f19519..00000000
--- a/lib/Drivers/DDL/postgresaxomic.js
+++ /dev/null
@@ -1,161 +0,0 @@
-exports.drop = function (driver, opts, cb) {
-	var i, queries = [], pending;
-
-	queries.push("DROP TABLE IF EXISTS " + driver.escapeId(opts.table));
-
-	for (i = 0; i < opts.many_associations.length; i++) {
-		queries.push("DROP TABLE IF EXISTS " + driver.escapeId(opts.many_associations[i].mergeTable));
-	}
-
-	pending = queries.length;
-	for (i = 0; i < queries.length; i++) {
-		driver.db.query(queries[i], function (err) {
-			if (--pending === 0) {
-				return cb(err);
-			}
-		});
-	}
-};
-
-exports.sync = function (driver, opts, cb) {
-	var tables = [];
-	var subqueries = [];
-	var definitions = [];
-	var k, i, pending, tmp;
-
-	definitions.push(driver.escapeId(opts.id) + " SERIAL PRIMARY KEY");
-
-	for (k in opts.properties) {
-		definitions.push(buildColumnDefinition(driver, opts.table, k, opts.properties[k]));
-
-		if (opts.properties[k].type == "enum") {
-			subqueries.push(
-				"CREATE TYPE " + tmp + " AS ENUM (" +
-				opts.properties[k].values.map(driver.escape.bind(driver)) + ")"
-			);
-		}
-	}
-
-	for (i = 0; i < opts.one_associations.length; i++) {
-		if (opts.one_associations[i].reversed) continue;
-		definitions.push(driver.escapeId(opts.one_associations[i].field) + " INTEGER NOT NULL");
-	}
-	for (k in opts.properties) {
-		if (opts.properties[k].unique === true) {
-			definitions.push("UNIQUE (" + driver.escapeId(k) + ")");
-		}
-	}
-
-	tables.push({
-		name       : opts.table,
-		query      : "CREATE TABLE " + driver.escapeId(opts.table) +
-		             " (" + definitions.join(", ") + ")",
-		subqueries : subqueries
-	});
-	tables[tables.length - 1].subqueries.push(
-		"CREATE INDEX ON " + driver.escapeId(opts.table) +
-		" (" + driver.escapeId(opts.id) + ")"
-	);
-
-	for (i = 0; i < opts.one_associations.length; i++) {
-		if (opts.one_associations[i].reversed) continue;
-		tables[tables.length - 1].subqueries.push(
-			"CREATE INDEX ON " + driver.escapeId(opts.table) +
-			" (" + driver.escapeId(opts.one_associations[i].field) + ")"
-		);
-	}
-
-	for (i = 0; i < opts.many_associations.length; i++) {
-		definitions = [];
-
-		definitions.push(driver.escapeId(opts.many_associations[i].mergeId) + " INTEGER NOT NULL");
-		definitions.push(driver.escapeId(opts.many_associations[i].mergeAssocId) + " INTEGER NOT NULL");
-
-		for (k in opts.many_associations[i].props) {
-			definitions.push(buildColumnDefinition(driver, opts.many_associations[i].mergeTable,
-			                                       k, opts.many_associations[i].props[k]));
-		}
-
-		tables.push({
-			name       : opts.many_associations[i].mergeTable,
-			query      : "CREATE TABLE IF NOT EXISTS " + driver.escapeId(opts.many_associations[i].mergeTable) +
-			             " (" + definitions.join(", ") + ")",
-			subqueries : []
-		});
-		tables[tables.length - 1].subqueries.push(
-			"CREATE INDEX ON " + driver.escapeId(opts.many_associations[i].mergeTable) +
-			" (" +
-			driver.escapeId(opts.many_associations[i].mergeId) + ", " +
-			driver.escapeId(opts.many_associations[i].mergeAssocId) +
-			")"
-		);
-	}
-
-	pending = tables.length;
-	for (i = 0; i < tables.length; i++) {
-		createTableSchema(driver, tables[i], function (err) {
-			if (--pending === 0) {
-				// this will bring trouble in the future...
-				// some errors are not avoided (like ENUM types already defined, etc..)
-				return cb(err);
-			}
-		});
-	}
-};
-
-function createTableSchema(driver, table, cb) {
-	driver.db.query(table.query, function (err) {
-		if (err || table.subqueries.length === 0) {
-			return cb();
-		}
-
-		var pending = table.subqueries.length;
-
-		for (var i = 0; i < table.subqueries.length; i++) {
-			driver.db.query(table.subqueries[i], function (err) {
-				if (--pending === 0) {
-					return cb();
-				}
-			});
-		}
-	});
-}
-
-function buildColumnDefinition(driver, table, name, prop) {
-	var def;
-
-	switch (prop.type) {
-		case "text":
-			def = driver.escapeId(name) + " VARCHAR(" + Math.min(Math.max(parseInt(prop.size, 10) || 255, 1), 65535) + ")";
-			break;
-		case "number":
-			if (prop.rational === false) {
-				def = driver.escapeId(name) + " INTEGER";
-			} else {
-				def = driver.escapeId(name) + " REAL";
-			}
-			break;
-		case "boolean":
-			def = driver.escapeId(name) + " BOOLEAN NOT NULL";
-			break;
-		case "date":
-			if (prop.time === false) {
-				def = driver.escapeId(name) + " DATE";
-			} else {
-				def = driver.escapeId(name) + " TIMESTAMP WITHOUT TIME ZONE";
-			}
-			break;
-		case "binary":
-			def = driver.escapeId(name) + " BYTEA";
-			break;
-		case "enum":
-			def = driver.escapeId(name) + " " + driver.escapeId("enum_" + table + "_" + name);
-			break;
-		default:
-			throw new Error("Unknown property type: '" + prop.type + "'");
-	}
-	if (prop.hasOwnProperty("defaultValue")) {
-		def += " DEFAULT " + driver.db.escape(prop.defaultValue);
-	}
-	return def;
-}
diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index 8190ba42..73234f42 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -1,10 +1,10 @@
 exports.drop = function (driver, opts, cb) {
 	var i, queries = [], pending;
 
-	queries.push("DROP TABLE IF EXISTS " + driver.escapeId(opts.table));
+	queries.push("DROP TABLE IF EXISTS " + driver.query.escapeId(opts.table));
 
 	for (i = 0; i < opts.many_associations.length; i++) {
-		queries.push("DROP TABLE IF EXISTS " + driver.escapeId(opts.many_associations[i].mergeTable));
+		queries.push("DROP TABLE IF EXISTS " + driver.query.escapeId(opts.many_associations[i].mergeTable));
 	}
 
 	pending = queries.length;
@@ -22,7 +22,7 @@ exports.sync = function (driver, opts, cb) {
 	var definitions = [];
 	var k, i, pending;
 
-	definitions.push(driver.escapeId(opts.id) + " INTEGER PRIMARY KEY AUTOINCREMENT");
+	definitions.push(driver.query.escapeId(opts.id) + " INTEGER PRIMARY KEY AUTOINCREMENT");
 
 	for (k in opts.properties) {
 		definitions.push(buildColumnDefinition(driver, k, opts.properties[k]));
@@ -30,19 +30,19 @@ exports.sync = function (driver, opts, cb) {
 
 	for (i = 0; i < opts.one_associations.length; i++) {
 		if (opts.one_associations[i].reversed) continue;
-		definitions.push(driver.escapeId(opts.one_associations[i].field) + " INTEGER UNSIGNED NOT NULL");
+		definitions.push(driver.query.escapeId(opts.one_associations[i].field) + " INTEGER UNSIGNED NOT NULL");
 	}
 
 	queries.push(
-		"CREATE TABLE IF NOT EXISTS " + driver.escapeId(opts.table) +
+		"CREATE TABLE IF NOT EXISTS " + driver.query.escapeId(opts.table) +
 		" (" + definitions.join(", ") + ")"
 	);
 	for (k in opts.properties) {
 		if (opts.properties[k].unique === true) {
 			queries.push(
-				"CREATE UNIQUE INDEX IF NOT EXISTS " + driver.escapeId(k) +
-				" ON " + driver.escapeId(opts.table) +
-				" (" + driver.escapeId(k) + ")"
+				"CREATE UNIQUE INDEX IF NOT EXISTS " + driver.query.escapeId(k) +
+				" ON " + driver.query.escapeId(opts.table) +
+				" (" + driver.query.escapeId(k) + ")"
 			);
 		}
 	}
@@ -50,30 +50,30 @@ exports.sync = function (driver, opts, cb) {
 	for (i = 0; i < opts.one_associations.length; i++) {
 		if (opts.one_associations[i].reversed) continue;
 		queries.push(
-			"CREATE INDEX IF NOT EXISTS " + driver.escapeId(opts.table + "_" + opts.one_associations[i].field) +
-			" ON " + driver.escapeId(opts.table) +
-			" (" + driver.escapeId(opts.one_associations[i].field) + ")"
+			"CREATE INDEX IF NOT EXISTS " + driver.query.escapeId(opts.table + "_" + opts.one_associations[i].field) +
+			" ON " + driver.query.escapeId(opts.table) +
+			" (" + driver.query.escapeId(opts.one_associations[i].field) + ")"
 		);
 	}
 
 	for (i = 0; i < opts.many_associations.length; i++) {
 		definitions = [];
 
-		definitions.push(driver.escapeId(opts.many_associations[i].mergeId) + " INTEGER UNSIGNED NOT NULL");
-		definitions.push(driver.escapeId(opts.many_associations[i].mergeAssocId) + " INTEGER UNSIGNED NOT NULL");
+		definitions.push(driver.query.escapeId(opts.many_associations[i].mergeId) + " INTEGER UNSIGNED NOT NULL");
+		definitions.push(driver.query.escapeId(opts.many_associations[i].mergeAssocId) + " INTEGER UNSIGNED NOT NULL");
 
 		for (k in opts.many_associations[i].props) {
 			definitions.push(buildColumnDefinition(driver, k, opts.many_associations[i].props[k]));
 		}
 
 		queries.push(
-			"CREATE TABLE IF NOT EXISTS " + driver.escapeId(opts.many_associations[i].mergeTable) +
+			"CREATE TABLE IF NOT EXISTS " + driver.query.escapeId(opts.many_associations[i].mergeTable) +
 			" (" + definitions.join(", ") + ")"
 		);
 		queries.push(
-			"CREATE INDEX IF NOT EXISTS " + driver.escapeId(opts.many_associations[i].mergeTable) +
-			" ON " + driver.escapeId(opts.table) +
-			" (" + driver.escapeId(opts.many_associations[i].mergeId) + ", " + driver.escapeId(opts.many_associations[i].mergeAssocId) + ")"
+			"CREATE INDEX IF NOT EXISTS " + driver.query.escapeId(opts.many_associations[i].mergeTable) +
+			" ON " + driver.query.escapeId(opts.table) +
+			" (" + driver.query.escapeId(opts.many_associations[i].mergeId) + ", " + driver.query.escapeId(opts.many_associations[i].mergeAssocId) + ")"
 		);
 	}
 
@@ -93,29 +93,29 @@ function buildColumnDefinition(driver, name, prop) {
 
 	switch (prop.type) {
 		case "text":
-			def = driver.escapeId(name) + " TEXT";
+			def = driver.query.escapeId(name) + " TEXT";
 			break;
 		case "number":
 			if (prop.rational === false) {
-				def = driver.escapeId(name) + " INTEGER";
+				def = driver.query.escapeId(name) + " INTEGER";
 			} else {
-				def = driver.escapeId(name) + " REAL";
+				def = driver.query.escapeId(name) + " REAL";
 			}
 			if (prop.unsigned === true) {
 				def += " UNSIGNED";
 			}
 			break;
 		case "boolean":
-			def = driver.escapeId(name) + " INTEGER UNSIGNED NOT NULL";
+			def = driver.query.escapeId(name) + " INTEGER UNSIGNED NOT NULL";
 			break;
 		case "date":
-			def = driver.escapeId(name) + " DATETIME";
+			def = driver.query.escapeId(name) + " DATETIME";
 			break;
 		case "binary":
-			def = driver.escapeId(name) + " BLOB";
+			def = driver.query.escapeId(name) + " BLOB";
 			break;
 		case "enum":
-			def = driver.escapeId(name) + " INTEGER";
+			def = driver.query.escapeId(name) + " INTEGER";
 			break;
 		default:
 			throw new Error("Unknown property type: '" + prop.type + "'");
diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 9f5a0403..f1061a4e 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -1,10 +1,12 @@
-var mysql       = require("mysql");
+var mysql = require("mysql");
+var Query = require("sql-query").Query;
 
 exports.Driver = Driver;
 
 function Driver(config, connection, opts) {
 	this.config = config || {};
 	this.opts   = opts || {};
+	this.query  = new Query("mysql");
 
 	if (!this.config.timezone) {
 		// force UTC if not defined, UTC is always better..
@@ -15,16 +17,6 @@ function Driver(config, connection, opts) {
 	if (this.opts.pool) {
 		this.db.pool = (connection ? connection : mysql.createPool(config.href || config));
 	}
-
-	var escapes = {
-		escape   : this.db.escape.bind(this.db),
-		escapeId : this.escapeId.bind(this)
-	};
-
-	this.QuerySelect = new (require("../../sql/Select"))(escapes);
-	this.QueryInsert = new (require("../../sql/Insert"))(escapes);
-	this.QueryUpdate = new (require("../../sql/Update"))(escapes);
-	this.QueryRemove = new (require("../../sql/Remove"))(escapes);
 }
 
 Driver.prototype.sync = function (opts, cb) {
@@ -67,136 +59,127 @@ Driver.prototype.close = function (cb) {
 };
 
 Driver.prototype.find = function (fields, table, conditions, opts, cb) {
-	this.QuerySelect
-		.clear()
-		.fields(fields)
-		.table(table);
-	if (opts.fields) {
-		this.QuerySelect.fields(opts.fields);
-	}
-	if (opts.merge) {
-		this.QuerySelect.merge(opts.merge.from, opts.merge.to);
-	}
+	var q = this.query.select()
+	                  .from(table).select(fields);
+
 	if (opts.offset) {
-		this.QuerySelect.offset(opts.offset);
+		q.offset(opts.offset);
 	}
 	if (typeof opts.limit == "number") {
-		this.QuerySelect.limit(opts.limit);
+		q.limit(opts.limit);
 	} else if (opts.offset) {
 		// OFFSET cannot be used without LIMIT so we use the biggest BIGINT number possible
-		this.QuerySelect.limit('18446744073709551615');
+		q.limit('18446744073709551615');
 	}
 	if (opts.order) {
-		this.QuerySelect.order(opts.order[0], opts.order[1]);
+		q.order(opts.order[0], opts.order[1]);
 	}
-	for (var k in conditions) {
-		this.QuerySelect.where(k, conditions[k]);
+
+	if (opts.merge) {
+		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
+		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
+			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions).build();
+		} else {
+			q = q.where(conditions).build();
+		}
+	} else {
+		q = q.where(conditions).build();
 	}
 
 	if (this.opts.pool) {
-		this.poolQuery(this.QuerySelect.build(), cb);
+		this.poolQuery(q, cb);
 	} else {
-		this.db.query(this.QuerySelect.build(), cb);
+		this.db.query(q, cb);
 	}
 	if (this.opts.debug) {
-		require("../../Debug").sql('mysql', this.QuerySelect.build());
+		require("../../Debug").sql('mysql', q);
 	}
 };
 
 Driver.prototype.count = function (table, conditions, cb) {
-	this.QuerySelect
-		.clear()
-		.count()
-		.table(table);
-	for (var k in conditions) {
-		this.QuerySelect.where(k, conditions[k]);
-	}
+	var q = this.query.select()
+	                  .from(table)
+	                  .count(null, 'c')
+	                  .where(conditions)
+	                  .build();
 
 	if (this.opts.pool) {
-		this.poolQuery(this.QuerySelect.build(), cb);
+		this.poolQuery(q, cb);
 	} else {
-		this.db.query(this.QuerySelect.build(), cb);
+		this.db.query(q, cb);
 	}
 	if (this.opts.debug) {
-		require("../../Debug").sql('mysql', this.QuerySelect.build());
+		require("../../Debug").sql('mysql', q);
 	}
 };
 
 Driver.prototype.insert = function (table, data, id_prop, cb) {
-	this.QueryInsert
-		.clear()
-		.table(table);
-	for (var k in data) {
-		this.QueryInsert.set(k, data[k]);
-	}
+	var q = this.query.insert()
+	                  .into(table)
+	                  .set(data)
+	                  .build();
 
 	if (this.opts.pool) {
-		this.poolQuery(this.QueryInsert.build(), function (err, info) {
+		this.poolQuery(q, function (err, info) {
 			if (err) return cb(err);
 
 			return cb(null, { id: info.insertId });
 		});
 	} else {
-		this.db.query(this.QueryInsert.build(), function (err, info) {
+		this.db.query(q, function (err, info) {
 			if (err) return cb(err);
 
 			return cb(null, { id: info.insertId });
 		});
 	}
 	if (this.opts.debug) {
-		require("../../Debug").sql('mysql', this.QueryInsert.build());
+		require("../../Debug").sql('mysql', q);
 	}
 };
 
 Driver.prototype.update = function (table, changes, conditions, cb) {
-	this.QueryUpdate
-		.clear()
-		.table(table);
-	for (var k in conditions) {
-		this.QueryUpdate.where(k, conditions[k]);
-	}
-	for (k in changes) {
-		this.QueryUpdate.set(k, changes[k]);
-	}
+	var q = this.query.update()
+	                  .into(table)
+	                  .set(changes)
+	                  .where(conditions)
+	                  .build();
 
 	if (this.opts.pool) {
-		this.poolQuery(this.QueryUpdate.build(), cb);
+		this.poolQuery(q, cb);
 	} else {
-		this.db.query(this.QueryUpdate.build(), cb);
+		this.db.query(q, cb);
 	}
 	if (this.opts.debug) {
-		require("../../Debug").sql('mysql', this.QueryUpdate.build());
+		require("../../Debug").sql('mysql', q);
 	}
 };
 
 Driver.prototype.remove = function (table, conditions, cb) {
-	this.QueryRemove
-		.clear()
-		.table(table);
-	for (var k in conditions) {
-		this.QueryRemove.where(k, conditions[k]);
-	}
+	var q = this.query.remove()
+	                  .from(table)
+	                  .where(conditions)
+	                  .build();
 
 	if (this.opts.pool) {
-		this.poolQuery(this.QueryRemove.build(), cb);
+		this.poolQuery(q, cb);
 	} else {
-		this.db.query(this.QueryRemove.build(), cb);
+		this.db.query(q, cb);
 	}
 	if (this.opts.debug) {
-		require("../../Debug").sql('mysql', this.QueryRemove.build());
+		require("../../Debug").sql('mysql', q);
 	}
 };
 
 Driver.prototype.clear = function (table, cb) {
-	var query = "TRUNCATE TABLE " + this.escapeId(table);
+	var q = "TRUNCATE TABLE " + this.query.escapeId(table);
 
 	if (this.opts.pool) {
-		this.poolQuery(query, cb);
+		this.poolQuery(q, cb);
 	} else {
-		this.db.query(query, cb);
+		this.db.query(q, cb);
 	}
 	if (this.opts.debug) {
-		require("../../Debug").sql('mysql', query);
+		require("../../Debug").sql('mysql', q);
 	}
 };
 
@@ -240,11 +223,3 @@ Driver.prototype.propertyToValue = function (value, property) {
 			return value;
 	}
 };
-
-Driver.prototype.escapeId = function (id) {
-	var m = id.match(/^(.+)\.\*$/);
-	if (m) {
-		return '`' + m[1].replace(/\`/g, '``') + '`.*';
-	}
-	return '`' + id.replace(/\`/g, '``').replace(/\./g, '`.`') + '`';
-};
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 1d48649e..fe48a3eb 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -1,10 +1,13 @@
-var postgres       = require("pg");
+var postgres = require("pg");
+var Query    = require("sql-query").Query;
 
 exports.Driver = Driver;
 
 function Driver(config, connection, opts) {
 	this.config = config || {};
 	this.opts   = opts || {};
+	this.query  = new Query("postgresql");
+
 	if (connection) {
 		this.db = connection;
 	} else if (config.query && config.query.ssl) {
@@ -13,16 +16,6 @@ function Driver(config, connection, opts) {
 	} else {
 		this.db = new postgres.Client(config.href || config);
 	}
-
-	var escapes = {
-		escape   : this.escape.bind(this),
-		escapeId : this.escapeId.bind(this)
-	};
-
-	this.QuerySelect = new (require("../../sql/Select"))(escapes);
-	this.QueryInsert = new (require("../../sql/Insert"))(escapes);
-	this.QueryUpdate = new (require("../../sql/Update"))(escapes);
-	this.QueryRemove = new (require("../../sql/Remove"))(escapes);
 }
 
 Driver.prototype.sync = function (opts, cb) {
@@ -56,61 +49,59 @@ Driver.prototype.close = function (cb) {
 };
 
 Driver.prototype.find = function (fields, table, conditions, opts, cb) {
-	this.QuerySelect
-		.clear()
-		.fields(fields)
-		.table(table);
-	if (opts.fields) {
-		this.QuerySelect.fields(opts.fields);
-	}
-	if (opts.merge) {
-		this.QuerySelect.merge(opts.merge.from, opts.merge.to);
-	}
+	var q = this.query.select()
+	                  .from(table).select(fields);
+
 	if (opts.offset) {
-		this.QuerySelect.offset(opts.offset);
+		q.offset(opts.offset);
 	}
 	if (typeof opts.limit == "number") {
-		this.QuerySelect.limit(opts.limit);
+		q.limit(opts.limit);
 	}
 	if (opts.order) {
-		this.QuerySelect.order(opts.order[0], opts.order[1]);
+		q.order(opts.order[0], opts.order[1]);
 	}
-	for (var k in conditions) {
-		this.QuerySelect.where(k, conditions[k]);
+
+	if (opts.merge) {
+		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
+		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
+			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions).build();
+		} else {
+			q = q.where(conditions).build();
+		}
+	} else {
+		q = q.where(conditions).build();
 	}
 
 	if (this.opts.debug) {
-		require("../../Debug").sql('postgres', this.QuerySelect.build());
+		require("../../Debug").sql('postgres', q);
 	}
-	this.db.query(this.QuerySelect.build(), handleQuery(cb));
+	this.db.query(q, handleQuery(cb));
 };
 
 Driver.prototype.count = function (table, conditions, cb) {
-	this.QuerySelect
-		.clear()
-		.count()
-		.table(table);
-	for (var k in conditions) {
-		this.QuerySelect.where(k, conditions[k]);
-	}
+	var q = this.query.select()
+	                  .from(table)
+	                  .count(null, 'c')
+	                  .where(conditions)
+	                  .build();
 
 	if (this.opts.debug) {
-		require("../../Debug").sql('postgres', this.QuerySelect.build());
+		require("../../Debug").sql('postgres', q);
 	}
-	this.db.query(this.QuerySelect.build(), handleQuery(cb));
+	this.db.query(q, handleQuery(cb));
 };
 
 Driver.prototype.insert = function (table, data, id_prop, cb) {
-	this.QueryInsert
-		.clear()
-		.table(table);
-	for (var k in data) {
-		this.QueryInsert.set(k, data[k]);
-	}
+	var q = this.query.insert()
+	                  .into(table)
+	                  .set(data)
+	                  .build();
+
 	if (this.opts.debug) {
-		require("../../Debug").sql('postgres', this.QueryInsert.build());
+		require("../../Debug").sql('postgres', q);
 	}
-	this.db.query(this.QueryInsert.build() + " RETURNING *", function (err, result) {
+	this.db.query(q + " RETURNING *", function (err, result) {
 		if (err) {
 			return cb(err);
 		}
@@ -121,37 +112,32 @@ Driver.prototype.insert = function (table, data, id_prop, cb) {
 };
 
 Driver.prototype.update = function (table, changes, conditions, cb) {
-	this.QueryUpdate
-		.clear()
-		.table(table);
-	for (var k in conditions) {
-		this.QueryUpdate.where(k, conditions[k]);
-	}
-	for (k in changes) {
-		this.QueryUpdate.set(k, changes[k]);
-	}
+	var q = this.query.update()
+	                  .into(table)
+	                  .set(changes)
+	                  .where(conditions)
+	                  .build();
+
 	if (this.opts.debug) {
-		require("../../Debug").sql('postgres', this.QueryUpdate.build());
+		require("../../Debug").sql('postgres', q);
 	}
-	this.db.query(this.QueryUpdate.build(), handleQuery(cb));
+	this.db.query(q, handleQuery(cb));
 };
 
 Driver.prototype.remove = function (table, conditions, cb) {
-	this.QueryRemove
-		.clear()
-		.table(table);
-	for (var k in conditions) {
-		this.QueryRemove.where(k, conditions[k]);
-	}
+	var q = this.query.remove()
+	                  .from(table)
+	                  .where(conditions)
+	                  .build();
 
 	if (this.opts.debug) {
-		require("../../Debug").sql('postgres', this.QueryRemove.build());
+		require("../../Debug").sql('postgres', q);
 	}
-	this.db.query(this.QueryRemove.build(), handleQuery(cb));
+	this.db.query(q, handleQuery(cb));
 };
 
 Driver.prototype.clear = function (table, cb) {
-	var query = "TRUNCATE TABLE " + this.escapeId(table);
+	var query = "TRUNCATE TABLE " + this.query.escapeId(table);
 
 	if (this.opts.debug) {
 		require("../../Debug").sql('postgres', query);
@@ -182,31 +168,6 @@ Driver.prototype.propertyToValue = function (value, property) {
 	}
 };
 
-Driver.prototype.escapeId = function (id) {
-	var m = id.match(/^(.+)\.\*$/);
-	if (m) {
-		return '"' + m[1].replace(/\"/g, '""') + '".*';
-	}
-	return '"' + id.replace(/\"/g, '""').replace(/\./g, '"."') + '"';
-};
-
-Driver.prototype.escape = function (value) {
-	if (Array.isArray(value)) {
-		if (value.length === 1 && Array.isArray(value[0])) {
-			return "(" + value[0].map(this.escape.bind(this)) + ")";
-		}
-		return "(" + value.map(this.escape.bind(this)) + ")";
-	}
-	switch (typeof value) {
-		case "number":
-			return value;
-		case "boolean":
-			return value ? "true" : "false";
-	}
-
-	return "'" + value.replace(/\'/g, "''") + "'";
-};
-
 function handleQuery(cb) {
 	return function (err, result) {
 		if (err) {
diff --git a/lib/Drivers/DML/postgresaxomic.js b/lib/Drivers/DML/postgresaxomic.js
index 828e70e4..5578c068 100644
--- a/lib/Drivers/DML/postgresaxomic.js
+++ b/lib/Drivers/DML/postgresaxomic.js
@@ -1,22 +1,15 @@
-var postgres       = require("pg"),
-	connectionString = '';
+var postgres         = require("pg");
+var Query            = require("sql-query").Query;
+var connectionString = "";
 
 exports.Driver = Driver;
 
 function Driver(config, connection, opts) {
-	this.connectionString = "postgresql"+config.href.substring(14);
-	this.config = config || {};
-	this.opts   = opts || {};
-	this.db = postgres;
-	var escapes = {
-		escape   : this.escape.bind(this),
-		escapeId : this.escapeId.bind(this)
-	};
-
-	this.QuerySelect = new (require("../../sql/Select"))(escapes);
-	this.QueryInsert = new (require("../../sql/Insert"))(escapes);
-	this.QueryUpdate = new (require("../../sql/Update"))(escapes);
-	this.QueryRemove = new (require("../../sql/Remove"))(escapes);
+	this.connectionString = "postgresql" + config.href.substring(14);
+	this.config           = config || {};
+	this.opts             = opts || {};
+	this.db               = postgres;
+	this.query            = new Query("postgresql");
 }
 Driver.prototype.sync = function (opts, cb) {
 	return require("../DDL/postgres").sync(this, opts, cb);
@@ -55,59 +48,57 @@ Driver.prototype.on = function (ev, cb) {
 };
 
 Driver.prototype.find = function (fields, table, conditions, opts, cb) {
-	this.QuerySelect
-		.clear()
-		.fields(fields)
-		.table(table);
-	if (opts.fields) {
-		this.QuerySelect.fields(opts.fields);
-	}
-	if (opts.merge) {
-		this.QuerySelect.merge(opts.merge.from, opts.merge.to);
-	}
+	var q = this.query.select()
+	                  .from(table).select(fields);
+
 	if (opts.offset) {
-		this.QuerySelect.offset(opts.offset);
+		q.offset(opts.offset);
 	}
 	if (typeof opts.limit == "number") {
-		this.QuerySelect.limit(opts.limit);
+		q.limit(opts.limit);
 	}
 	if (opts.order) {
-		this.QuerySelect.order(opts.order[0], opts.order[1]);
+		q.order(opts.order[0], opts.order[1]);
 	}
-	for (var k in conditions) {
-		this.QuerySelect.where(k, conditions[k]);
+
+	if (opts.merge) {
+		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
+		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
+			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions).build();
+		} else {
+			q = q.where(conditions).build();
+		}
+	} else {
+		q = q.where(conditions).build();
 	}
 
 	if (this.opts.debug) {
-		require("../Debug").sql('postgres', this.QuerySelect.build());
+		require("../Debug").sql('postgres', q);
 	}
-	this.hijackQuery(this.QuerySelect.build(), handleQuery(cb));
+	this.hijackQuery(q, handleQuery(cb));
 };
 Driver.prototype.count = function (table, conditions, cb) {
-	this.QuerySelect
-		.clear()
-		.count()
-		.table(table);
-	for (var k in conditions) {
-		this.QuerySelect.where(k, conditions[k]);
-	}
+	var q = this.query.select()
+	                  .from(table)
+	                  .count(null, 'c')
+	                  .where(conditions)
+	                  .build();
 
 	if (this.opts.debug) {
-		require("../../Debug").sql('postgres', this.QuerySelect.build());
+		require("../../Debug").sql('postgres', q);
 	}
-	this.hijackQuery(this.QuerySelect.build(), handleQuery(cb));
+	this.hijackQuery(q, handleQuery(cb));
 };
 Driver.prototype.insert = function (table, data, id_prop, cb) {
-	this.QueryInsert
-		.clear()
-		.table(table);
-	for (var k in data) {
-		this.QueryInsert.set(k, data[k]);
-	}
+	var q = this.query.insert()
+	                  .into(table)
+	                  .set(data)
+	                  .build();
+
 	if (this.opts.debug) {
-		require("../../Debug").sql('postgres', this.QueryInsert.build());
+		require("../../Debug").sql('postgres', q);
 	}
-	this.hijackQuery(this.QueryInsert.build() + " RETURNING *", function (err, result) {
+	this.hijackQuery(q + " RETURNING *", function (err, result) {
 		if (err) {
 			return cb(err);
 		}
@@ -118,37 +109,32 @@ Driver.prototype.insert = function (table, data, id_prop, cb) {
 };
 
 Driver.prototype.update = function (table, changes, conditions, cb) {
-	this.QueryUpdate
-		.clear()
-		.table(table);
-	for (var k in conditions) {
-		this.QueryUpdate.where(k, conditions[k]);
-	}
-	for (k in changes) {
-		this.QueryUpdate.set(k, changes[k]);
-	}
+	var q = this.query.update()
+	                  .into(table)
+	                  .set(changes)
+	                  .where(conditions)
+	                  .build();
+
 	if (this.opts.debug) {
-		require("../../Debug").sql('postgres', this.QueryUpdate.build());
+		require("../../Debug").sql('postgres', q);
 	}
-	this.hijackQuery(this.QueryUpdate.build(), handleQuery(cb));
+	this.hijackQuery(q, handleQuery(cb));
 };
 
 Driver.prototype.remove = function (table, conditions, cb) {
-	this.QueryRemove
-		.clear()
-		.table(table);
-	for (var k in conditions) {
-		this.QueryRemove.where(k, conditions[k]);
-	}
+	var q = this.query.remove()
+	                  .from(table)
+	                  .where(conditions)
+	                  .build();
 
 	if (this.opts.debug) {
-		require("../../Debug").sql('postgres', this.QueryRemove.build());
+		require("../../Debug").sql('postgres', q);
 	}
-	this.hijackQuery(this.QueryRemove.build(), handleQuery(cb));
+	this.hijackQuery(q, handleQuery(cb));
 };
 
 Driver.prototype.clear = function (table, cb) {
-	var query = "TRUNCATE TABLE " + escapeId(table);
+	var query = "TRUNCATE TABLE " + this.query.escapeId(table);
 
 	if (this.opts.debug) {
 		require("../../Debug").sql('postgres', query);
@@ -190,34 +176,6 @@ Driver.prototype.hijackQuery = function (receievedQuery, cb) {
   })
 }
 
-Driver.prototype.escapeId = function (id) {
-	var m = id.match(/^(.+)\.\*$/);
-	if (m) {
-		return '"' + m[1].replace(/\"/g, '""') + '".*';
-	}
-	return '"' + id.replace(/\"/g, '""').replace(/\./g, '"."') + '"';
-};
-
-Driver.prototype.escape = function (value) {
-	if (Array.isArray(value)) {
-		if (value.length === 1 && Array.isArray(value[0])) {
-			return "(" + value[0].map(this.escape.bind(this)) + ")";
-		}
-		return "(" + value.map(this.escape.bind(this)) + ")";
-	}
-	switch (typeof value) {
-		case "number":
-			return value;
-	}
-
-
-	if(!value) {
-		return value
-	} else {
-		return "'" + value.replace(/\'/g, "''") + "'";
-	}
-};
-
 function handleQuery(cb) {
 	return function (err, result) {
 		if (err) {
diff --git a/lib/Drivers/DML/redshift.js b/lib/Drivers/DML/redshift.js
index d721f90a..285fdf3d 100644
--- a/lib/Drivers/DML/redshift.js
+++ b/lib/Drivers/DML/redshift.js
@@ -10,16 +10,15 @@ function Driver(config, connection, opts) {
 util.inherits(Driver, postgres.Driver);
 
 Driver.prototype.insert = function (table, data, id_prop, cb) {
-	this.QueryInsert
-		.clear()
-		.table(table);
-	for (var k in data) {
-		this.QueryInsert.set(k, data[k]);
-	}
+	var q = this.query.insert()
+	                  .into(table)
+	                  .set(data)
+	                  .build();
+
 	if (this.opts.debug) {
-		require("../../Debug").sql('postgres', this.QueryInsert.build());
+		require("../../Debug").sql('postgres', q);
 	}
-	this.db.query(this.QueryInsert.build(), function (err, result) {
+	this.db.query(q, function (err, result) {
 		if (err) {
 			return cb(err);
 		}
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 3cff0fd3..c7fa2043 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -1,10 +1,13 @@
 var sqlite3 = require("sqlite3");
+var Query   = require("sql-query").Query;
 
 exports.Driver = Driver;
 
 function Driver(config, connection, opts) {
 	this.config = config || {};
 	this.opts   = opts || {};
+	this.query  = new Query("sqlite");
+
 	if (connection) {
 		this.db = connection;
 	} else {
@@ -13,16 +16,6 @@ function Driver(config, connection, opts) {
 		// it's the drive letter and add ":"
 		this.db = new sqlite3.Database(((config.host ? config.host + ":" : "") + (config.pathname || "")) || ':memory:');
 	}
-
-	var escapes = {
-		escape   : this.escape.bind(this),
-		escapeId : this.escapeId.bind(this)
-	};
-
-	this.QuerySelect = new (require("../../sql/Select"))(escapes);
-	this.QueryInsert = new (require("../../sql/Insert"))(escapes);
-	this.QueryUpdate = new (require("../../sql/Update"))(escapes);
-	this.QueryRemove = new (require("../../sql/Remove"))(escapes);
 }
 
 Driver.prototype.sync = function (opts, cb) {
@@ -55,65 +48,62 @@ Driver.prototype.close = function (cb) {
 };
 
 Driver.prototype.find = function (fields, table, conditions, opts, cb) {
-	this.QuerySelect
-		.clear()
-		.fields(fields)
-		.table(table);
-	if (opts.fields) {
-		this.QuerySelect.fields(opts.fields);
-	}
-	if (opts.merge) {
-		this.QuerySelect.merge(opts.merge.from, opts.merge.to);
-	}
+	var q = this.query.select()
+	                  .from(table).select(fields);
+
 	if (opts.offset) {
-		this.QuerySelect.offset(opts.offset);
+		q.offset(opts.offset);
 	}
 	if (typeof opts.limit == "number") {
-		this.QuerySelect.limit(opts.limit);
+		q.limit(opts.limit);
 	} else if (opts.offset) {
 		// OFFSET cannot be used without LIMIT so we use the biggest INTEGER number possible
-		this.QuerySelect.limit('9223372036854775807');
+		q.limit('9223372036854775807');
 	}
 	if (opts.order) {
-		this.QuerySelect.order(opts.order[0], opts.order[1]);
+		q.order(opts.order[0], opts.order[1]);
 	}
-	for (var k in conditions) {
-		this.QuerySelect.where(k, conditions[k]);
+
+	if (opts.merge) {
+		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
+		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
+			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions).build();
+		} else {
+			q = q.where(conditions).build();
+		}
+	} else {
+		q = q.where(conditions).build();
 	}
 
 	if (this.opts.debug) {
-		require("../../Debug").sql('sqlite', this.QuerySelect.build());
+		require("../../Debug").sql('sqlite', q);
 	}
-	this.db.all(this.QuerySelect.build(), cb);
+	this.db.all(q, cb);
 };
 
 Driver.prototype.count = function (table, conditions, cb) {
-	this.QuerySelect
-		.clear()
-		.count()
-		.table(table);
-	for (var k in conditions) {
-		this.QuerySelect.where(k, conditions[k]);
-	}
+	var q = this.query.select()
+	                  .from(table)
+	                  .count(null, 'c')
+	                  .where(conditions)
+	                  .build();
 
 	if (this.opts.debug) {
-		require("../../Debug").sql('sqlite', this.QuerySelect.build());
+		require("../../Debug").sql('sqlite', q);
 	}
-	this.db.all(this.QuerySelect.build(), cb);
+	this.db.all(q, cb);
 };
 
 Driver.prototype.insert = function (table, data, id_prop, cb) {
-	this.QueryInsert
-		.clear()
-		.table(table);
-	for (var k in data) {
-		this.QueryInsert.set(k, data[k]);
-	}
+	var q = this.query.insert()
+	                  .into(table)
+	                  .set(data)
+	                  .build();
 
 	if (this.opts.debug) {
-		require("../../Debug").sql('sqlite', this.QueryInsert.build());
+		require("../../Debug").sql('sqlite', q);
 	}
-	this.db.all(this.QueryInsert.build(), function (err, info) {
+	this.db.all(q, function (err, info) {
 		if (err) {
 			return cb(err);
 		}
@@ -129,66 +119,35 @@ Driver.prototype.insert = function (table, data, id_prop, cb) {
 };
 
 Driver.prototype.update = function (table, changes, conditions, cb) {
-	this.QueryUpdate
-		.clear()
-		.table(table);
-	for (var k in conditions) {
-		this.QueryUpdate.where(k, conditions[k]);
-	}
-	for (k in changes) {
-		this.QueryUpdate.set(k, changes[k]);
-	}
+	var q = this.query.update()
+	                  .into(table)
+	                  .set(changes)
+	                  .where(conditions)
+	                  .build();
 
 	if (this.opts.debug) {
-		require("../../Debug").sql('sqlite', this.QueryUpdate.build());
+		require("../../Debug").sql('sqlite', q);
 	}
-	this.db.all(this.QueryUpdate.build(), cb);
+	this.db.all(q, cb);
 };
 
 Driver.prototype.remove = function (table, conditions, cb) {
-	this.QueryRemove
-		.clear()
-		.table(table);
-	for (var k in conditions) {
-		this.QueryRemove.where(k, conditions[k]);
-	}
+	var q = this.query.remove()
+	                  .from(table)
+	                  .where(conditions)
+	                  .build();
 
 	if (this.opts.debug) {
-		require("../../Debug").sql('sqlite', this.QueryRemove.build());
+		require("../../Debug").sql('sqlite', q);
 	}
-	this.db.all(this.QueryRemove.build(), cb);
+	this.db.all(q, cb);
 };
 
 Driver.prototype.clear = function (table, cb) {
-	var query = "DELETE FROM " + this.escapeId(table);
+	var query = "DELETE FROM " + this.query.escapeId(table);
 
 	if (this.opts.debug) {
 		require("../../Debug").sql('sqlite', query);
 	}
 	this.db.all(query, cb);
 };
-
-Driver.prototype.escapeId = function (id) {
-	var m = id.match(/^(.+)\.\*$/);
-	if (m) {
-		return '`' + m[1].replace(/\`/g, '``') + '`.*';
-	}
-	return '`' + id.replace(/\`/g, '``').replace(/\./g, '`.`') + '`';
-};
-
-Driver.prototype.escape = function (value) {
-	if (Array.isArray(value)) {
-		if (value.length === 1 && Array.isArray(value[0])) {
-			return "(" + value[0].map(this.escape) + ")";
-		}
-		return "(" + value.map(this.escape) + ")";
-	}
-	switch (typeof value) {
-		case "number":
-			return value;
-		case "boolean":
-			return value ? 1 : 0;
-	}
-
-	return "'" + value.replace(/\'/g, "''") + "'";
-};
diff --git a/lib/ORM.js b/lib/ORM.js
index 12a2f764..98fee7fe 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -1,19 +1,19 @@
-var util          = require("util");
-var events        = require("events");
-var path          = require("path");
+var util           = require("util");
+var events         = require("events");
+var path           = require("path");
+var Query          = require("sql-query");
 
-var Model         = require("./Model").Model;
-var DriverAliases = require("./Drivers/aliases");
-var Validators    = require("./Validators");
-var Property      = require("./Property");
-var SqlTools      = require("./sql/Tools");
-var Settings      = require("./Settings");
+var Model          = require("./Model").Model;
+var DriverAliases  = require("./Drivers/aliases");
+var Validators     = require("./Validators");
+var Property       = require("./Property");
+var Settings       = require("./Settings");
 
 exports.validators = Validators;
 exports.settings   = new Settings.Container(Settings.defaults());
 
-for (var tool in SqlTools) {
-	exports[tool] = SqlTools[tool];
+for (var k in Query.Comparators) {
+	exports[Query.Comparators[k]] = Query[Query.Comparators[k]];
 }
 
 exports.use = function (connection, proto, opts, cb) {
@@ -78,12 +78,16 @@ exports.connect = function (opts, cb) {
 };
 
 function ORM(driver, settings) {
-	this.tools      = SqlTools;
 	this.validators = Validators;
 	this.settings   = settings;
 	this.driver     = driver;
+	this.tools      = {};
 	this.models     = {};
 
+	for (var k in Query.Comparators) {
+		this.tools[Query.Comparators[k]] = Query[Query.Comparators[k]];
+	}
+
 	events.EventEmitter.call(this);
 
 	driver.on("error", function (err) {
diff --git a/lib/sql/Insert.js b/lib/sql/Insert.js
deleted file mode 100644
index 2b708cec..00000000
--- a/lib/sql/Insert.js
+++ /dev/null
@@ -1,51 +0,0 @@
-module.exports = Builder;
-
-function Builder(opts) {
-	this.escapeId = opts.escapeId;
-	this.escape   = opts.escape;
-	this.clear();
-}
-
-Builder.prototype.clear = function () {
-	this.opts = {
-		set   : []
-	};
-
-	return this;
-};
-
-Builder.prototype.table = function (table) {
-	this.opts.table = table;
-
-	return this;
-};
-
-Builder.prototype.set = function (field, value) {
-	this.opts.set.push({
-		field : field,
-		value : value
-	});
-
-	return this;
-};
-
-Builder.prototype.build = function () {
-	var i, lst;
-	var query = "INSERT INTO " + this.escapeId(this.opts.table);
-
-	// keys
-	lst = [];
-	for (i = 0; i < this.opts.set.length; i++) {
-		lst.push(this.escapeId(this.opts.set[i].field));
-	}
-	query += " (" + lst.join(", ") + ")";
-
-	// values
-	lst = [];
-	for (i = 0; i < this.opts.set.length; i++) {
-		lst.push(this.escape(this.opts.set[i].value));
-	}
-	query += " VALUES (" + lst.join(", ") + ")";
-
-	return query;
-};
diff --git a/lib/sql/Remove.js b/lib/sql/Remove.js
deleted file mode 100644
index b02b1f0f..00000000
--- a/lib/sql/Remove.js
+++ /dev/null
@@ -1,66 +0,0 @@
-module.exports = Builder;
-
-function Builder(opts) {
-	this.escapeId = opts.escapeId;
-	this.escape   = opts.escape;
-	this.clear();
-}
-
-Builder.prototype.clear = function () {
-	this.opts = {
-		where : []
-	};
-
-	return this;
-};
-
-Builder.prototype.table = function (table) {
-	this.opts.table = table;
-
-	return this;
-};
-
-Builder.prototype.where = function (field, value, comparison) {
-	this.opts.where.push({
-		field : field,
-		value : value,
-		comp  : comparison || (Array.isArray(value) ? "IN" : "=")
-	});
-
-	return this;
-};
-
-Builder.prototype.limit = function (limit) {
-	if (typeof limit == "number") {
-		this.opts.limit = limit;
-	} else {
-		delete this.opts.limit;
-	}
-
-	return this;
-};
-
-Builder.prototype.build = function () {
-	var i, lst;
-	var query = "DELETE FROM " + this.escapeId(this.opts.table);
-
-	// where
-	lst = [];
-	for (i = 0; i < this.opts.where.length; i++) {
-		lst.push([
-			this.escapeId(this.opts.where[i].field),
-			this.opts.where[i].comp,
-			this.escape((this.opts.where[i].comp == "IN") ? [ this.opts.where[i].value ] : this.opts.where[i].value)
-		].join(" "));
-	}
-	if (lst.length > 0) {
-		query += " WHERE " + lst.join(" AND ");
-	}
-
-	// limit
-	if (this.opts.hasOwnProperty("limit")) {
-		query += " LIMIT " + this.opts.limit;
-	}
-
-	return query;
-};
diff --git a/lib/sql/Select.js b/lib/sql/Select.js
deleted file mode 100644
index 563788d9..00000000
--- a/lib/sql/Select.js
+++ /dev/null
@@ -1,220 +0,0 @@
-module.exports = Builder;
-
-function Builder(opts) {
-	this.escapeId = opts.escapeId;
-	this.escape   = opts.escape;
-	this.clear();
-}
-
-Builder.prototype.clear = function () {
-	this.opts = {
-		table : [],
-		merge : [],
-		where : [],
-		order : []
-	};
-
-	return this;
-};
-
-Builder.prototype.count = function () {
-	this.opts.count = true;
-
-	return this;
-};
-
-Builder.prototype.fields = function (fields) {
-	this.opts.fields = fields;
-
-	return this;
-};
-
-Builder.prototype.table = function (table) {
-	this.opts.table.push(table);
-
-	return this;
-};
-
-Builder.prototype.where = function (field, value, comparison) {
-	// stand by for now..
-	// if (!Array.isArray(value) && typeof(value) === 'object') {
-	// 	comparison = value.op || value.operator || value.comp || value.comparison;
-	// 	value = value.value;
-	// }
-	this.opts.where.push({
-		field : field,
-		value : value,
-		comp  : comparison || (Array.isArray(value) ? "IN" : "=")
-	});
-
-	return this;
-};
-
-Builder.prototype.order = function (field, order) {
-	this.opts.order.push({
-		field : field,
-		order : order || "A"
-	});
-
-	return this;
-};
-
-Builder.prototype.merge = function (from, to) {
-	this.opts.merge.push({
-		from : from,
-		to   : to
-	});
-
-	return this;
-};
-
-Builder.prototype.limit = function (limit) {
-	// allow numbers but also strings (big numbers..)
-	if (typeof limit == "number" || (limit && limit.length)) {
-		this.opts.limit = limit;
-	} else {
-		delete this.opts.limit;
-	}
-
-	return this;
-};
-
-Builder.prototype.offset = function (offset) {
-	if (typeof offset == "number") {
-		this.opts.offset = offset;
-	} else {
-		delete this.opts.offset;
-	}
-
-	return this;
-};
-
-Builder.prototype.build = function () {
-	var i, lst;
-	var query = "SELECT ";
-
-	if (this.opts.count) {
-		query += "COUNT(*) AS c";
-	} else if (Array.isArray(this.opts.fields)) {
-		query += this.opts.fields.map(this.escapeId).join(", ");
-	} else if (this.opts.fields) {
-		query += this.escapeId(this.opts.fields);
-	} else {
-		query += "*";
-	}
-
-	query += " FROM ";
-
-	// tables
-	lst = [];
-	for (i = 0; i < this.opts.table.length; i++) {
-		if (Array.isArray(this.opts.table[i])) {
-			lst.push(this.opts.table[i].map(this.escapeId).join(" JOIN "));
-		} else {
-			lst.push(this.escapeId(this.opts.table[i]));
-		}
-	}
-	query += lst.join(", ");
-
-	if (this.opts.merge) {
-		for (i = 0; i < this.opts.merge.length; i++) {
-			query += " LEFT JOIN " + this.escapeId(this.opts.merge[i].from.table) +
-			         " ON " + this.escapeId(this.opts.merge[i].from.table + "." + this.opts.merge[i].from.field) + " = " +
-			         this.escapeId(this.opts.merge[i].to.table + "." + this.opts.merge[i].to.field);
-		}
-	}
-
-	// where
-	lst = [];
-	for (i = 0; i < this.opts.where.length; i++) {
-		if (this.opts.where[i].value === null) {
-			lst.push([
-				this.escapeId(this.opts.where[i].field),
-				"IS NULL"
-			].join(" "));
-			continue;
-		}
-		if (typeof this.opts.where[i].value.orm_special_object == "function") {
-			var op = this.opts.where[i].value.orm_special_object();
-			switch (op) {
-				case "between":
-					lst.push([
-						this.escapeId(this.opts.where[i].field),
-						"BETWEEN",
-						this.escape(this.opts.where[i].value.from),
-						"AND",
-						this.escape(this.opts.where[i].value.to)
-					].join(" "));
-					break;
-				case "like":
-					lst.push([
-						this.escapeId(this.opts.where[i].field),
-						"LIKE",
-						this.escape(this.opts.where[i].value.expr)
-					].join(" "));
-					break;
-				case "eq":
-				case "ne":
-				case "gt":
-				case "gte":
-				case "lt":
-				case "lte":
-					switch (op) {
-						case "eq"  : op = "=";  break;
-						case "ne"  : op = "<>";  break;
-						case "gt"  : op = ">";  break;
-						case "gte" : op = ">="; break;
-						case "lt"  : op = "<";  break;
-						case "lte" : op = "<="; break;
-					}
-					lst.push([
-						this.escapeId(this.opts.where[i].field),
-						op,
-						this.escape(this.opts.where[i].value.val)
-					].join(" "));
-					break;
-			}
-			continue;
-		}
-		lst.push([
-			this.escapeId(this.opts.where[i].field),
-			this.opts.where[i].comp,
-			this.escape((this.opts.where[i].comp == "IN") ? [ this.opts.where[i].value ] : this.opts.where[i].value)
-		].join(" "));
-	}
-
-	if (lst.length > 0) {
-		query += " WHERE " + lst.join(" AND ");
-	}
-
-	// order
-	if (this.opts.hasOwnProperty("order")) {
-		if (Array.isArray(this.opts.order)) {
-			lst = [];
-
-			for (i = 0; i < this.opts.order.length; i++) {
-				lst.push(this.escapeId(this.opts.order[i].field) +
-				         (this.opts.order[i].order.toLowerCase() == "z" ? " DESC" : " ASC"));
-			}
-
-			if (lst.length > 0) {
-				query += " ORDER BY " + lst.join(", ");
-			}
-		} else {
-			query += " ORDER BY " + this.escapeId(this.opts.order);
-		}
-	}
-
-	// limit
-	if (this.opts.hasOwnProperty("limit")) {
-		if (this.opts.hasOwnProperty("offset")) {
-			query += " LIMIT " + this.opts.limit + " OFFSET " + this.opts.offset;
-		} else {
-			query += " LIMIT " + this.opts.limit;
-		}
-	} else if (this.opts.hasOwnProperty("offset")) {
-		query += " OFFSET " + this.opts.offset;
-	}
-
-	return query;
-};
diff --git a/lib/sql/Tools.js b/lib/sql/Tools.js
deleted file mode 100644
index 9d47ec95..00000000
--- a/lib/sql/Tools.js
+++ /dev/null
@@ -1,35 +0,0 @@
-exports.between = function (a, b) {
-	return createSpecialObject({ from: a, to: b }, 'between');
-};
-exports.like = function (expr) {
-	return createSpecialObject({ expr: expr }, 'like');
-};
-
-exports.eq = function (v) {
-	return createSpecialObject({ val: v }, 'eq');
-};
-exports.ne = function (v) {
-	return createSpecialObject({ val: v }, 'ne');
-};
-exports.gt = function (v) {
-	return createSpecialObject({ val: v }, 'gt');
-};
-exports.gte = function (v) {
-	return createSpecialObject({ val: v }, 'gte');
-};
-exports.lt = function (v) {
-	return createSpecialObject({ val: v }, 'lt');
-};
-exports.lte = function (v) {
-	return createSpecialObject({ val: v }, 'lte');
-};
-
-function createSpecialObject(obj, tag) {
-	Object.defineProperty(obj, "orm_special_object", {
-		configurable : false,
-		enumerable   : false,
-		value        : function () { return tag; }
-	});
-
-	return obj;
-}
diff --git a/lib/sql/Update.js b/lib/sql/Update.js
deleted file mode 100644
index 61fa03d9..00000000
--- a/lib/sql/Update.js
+++ /dev/null
@@ -1,81 +0,0 @@
-module.exports = Builder;
-
-function Builder(opts) {
-	this.escapeId = opts.escapeId;
-	this.escape   = opts.escape;
-	this.clear();
-}
-
-Builder.prototype.clear = function () {
-	this.opts = {
-		set   : [],
-		where : []
-	};
-
-	return this;
-};
-
-Builder.prototype.table = function (table) {
-	this.opts.table = table;
-
-	return this;
-};
-
-Builder.prototype.set = function (field, value) {
-	this.opts.set.push({
-		field : field,
-		value : value
-	});
-
-	return this;
-};
-
-Builder.prototype.where = function (field, value, comparison) {
-	this.opts.where.push({
-		field : field,
-		value : value,
-		comp  : comparison || "="
-	});
-
-	return this;
-};
-
-Builder.prototype.limit = function (limit) {
-	if (typeof limit == "number") {
-		this.opts.limit = limit;
-	} else {
-		delete this.opts.limit;
-	}
-
-	return this;
-};
-
-Builder.prototype.build = function () {
-	var i, lst;
-	var query = "UPDATE " + this.escapeId(this.opts.table);
-
-	// set
-	lst = [];
-	for (i = 0; i < this.opts.set.length; i++) {
-		lst.push([ this.escapeId(this.opts.set[i].field), this.escape(this.opts.set[i].value) ].join(" = "));
-	}
-	if (lst.length > 0) {
-		query += " SET " + lst.join(", ");
-	}
-
-	// where
-	lst = [];
-	for (i = 0; i < this.opts.where.length; i++) {
-		lst.push([ this.escapeId(this.opts.where[i].field), this.opts.where[i].comp, this.escape(this.opts.where[i].value) ].join(" "));
-	}
-	if (lst.length > 0) {
-		query += " WHERE " + lst.join(" AND ");
-	}
-
-	// limit
-	if (this.opts.hasOwnProperty("limit")) {
-		query += " LIMIT " + this.opts.limit;
-	}
-
-	return query;
-};
diff --git a/package.json b/package.json
index 51005fd8..21011029 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,9 @@
     "node": "*"
   },
   "analyse": false,
+  "dependencies": {
+    "sql-query": "0.0.7"
+  },
   "devDependencies": {
     "utest": "0.0.6",
     "urun": "0.0.6",
diff --git a/test/integration/test-association-hasmany-add.js b/test/integration/test-association-hasmany-add.js
index c205aed0..6fff80fc 100644
--- a/test/integration/test-association-hasmany-add.js
+++ b/test/integration/test-association-hasmany-add.js
@@ -26,8 +26,13 @@ common.createConnection(function (err, db) {
 									assert.equal(err, null);
 									assert.equal(Array.isArray(Tests), true);
 									assert.equal(Tests.length, 2);
-									assert.equal(Tests[0].name, Test2.name);
-									assert.equal(Tests[1].name, Test3.name);
+									if (Tests[0].id == Test2.id) {
+										assert.equal(Tests[0].name, Test2.name);
+										assert.equal(Tests[1].name, Test3.name);
+									} else {
+										assert.equal(Tests[0].name, Test3.name);
+										assert.equal(Tests[1].name, Test2.name);
+									}
 									db.close();
 								});
 							});
diff --git a/test/integration/test-association-hasmany-set-multiple.js b/test/integration/test-association-hasmany-set-multiple.js
index 2a7174a4..f1df2f7f 100644
--- a/test/integration/test-association-hasmany-set-multiple.js
+++ b/test/integration/test-association-hasmany-set-multiple.js
@@ -26,8 +26,13 @@ common.createConnection(function (err, db) {
 									assert.equal(err, null);
 									assert.equal(Array.isArray(Tests), true);
 									assert.equal(Tests.length, 2);
-									assert.equal(Tests[0].name, Test2.name);
-									assert.equal(Tests[1].name, Test3.name);
+									if (Tests[0].id == Test2.id) {
+										assert.equal(Tests[0].name, Test2.name);
+										assert.equal(Tests[1].name, Test3.name);
+									} else {
+										assert.equal(Tests[0].name, Test3.name);
+										assert.equal(Tests[1].name, Test2.name);
+									}
 									db.close();
 								});
 							});

From ea4a9c7f818bd088d95d80d5f51a0ca797eaf9c9 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sat, 9 Mar 2013 01:11:08 +0000
Subject: [PATCH 0188/1246] Moves beforeCreate to near beforeSave so people
 change change instance just like beforeSave (#69)

---
 lib/Instance.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 5331819b..b6d22d83 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -61,6 +61,7 @@ function Instance(opts) {
 			return saveInstanceExtra(cb);
 		}
 
+		Hook.trigger(instance, opts.hooks.beforeCreate);
 		Hook.trigger(instance, opts.hooks.beforeSave);
 
 		handleValidations(function (err) {
@@ -88,7 +89,6 @@ function Instance(opts) {
 			}
 
 			if (opts.is_new || !data.hasOwnProperty(opts.id)) {
-				Hook.trigger(instance, opts.hooks.beforeCreate);
 				opts.driver.insert(opts.table, data, opts.id, function (err, info) {
 					if (!err) {
 						opts.changes.length = 0;

From 6ae390aa347778f57f311f331cfd546cefca3d7e Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sun, 10 Mar 2013 22:59:35 +0000
Subject: [PATCH 0189/1246] Updates sql-query dependency to 0.0.8 to fix
 hasMany.getAccessor order argument (#70)

---
 lib/Associations/Many.js | 2 +-
 package.json             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index e63254d3..7c2eb6d9 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -154,7 +154,7 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 						} else {
 							if (Array.isArray(arguments[i])) {
 								order = arguments[i];
-								order[0] = association.model.table + "." + order[0];
+								order[0] = [ association.model.table, order[0] ];
 							} else {
 								options = arguments[i];
 							}
diff --git a/package.json b/package.json
index 21011029..c0b00480 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
   },
   "analyse": false,
   "dependencies": {
-    "sql-query": "0.0.7"
+    "sql-query": "0.0.8"
   },
   "devDependencies": {
     "utest": "0.0.6",

From 77641a85f26f0878a57aac41e6b2ec8737ee59a8 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 11 Mar 2013 19:19:54 +0000
Subject: [PATCH 0190/1246] Fixes bug when creating Models without all data
 (#69)

Getters/setters for properties would not be correctly defined
---
 lib/Instance.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/Instance.js b/lib/Instance.js
index b6d22d83..41970e42 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -236,6 +236,12 @@ function Instance(opts) {
 		addInstanceProperty(opts.id);
 	}
 
+	for (var k in opts.properties) {
+		if (opts.properties.hasOwnProperty(k) && !opts.data.hasOwnProperty(k) && k != opts.id) {
+			opts.data[k] = null;
+		}
+	}
+
 	for (var k in opts.data) {
 		if (!opts.data.hasOwnProperty(k)) continue;
 		if (!opts.properties.hasOwnProperty(k) && k != opts.id && opts.association_properties.indexOf(k) == -1) {

From 049e7479e1a150d3caf5f0803355d58e8877a50f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 11 Mar 2013 19:50:13 +0000
Subject: [PATCH 0191/1246] Changes drivers.count() to be able to pass options
 (related to #68)

This is required when using the countAccessor from hasMany associations
to be able to JOIN tables
---
 lib/ChainFind.js                  |  2 +-
 lib/Drivers/DML/mysql.js          | 17 +++++++++++++----
 lib/Drivers/DML/postgres.js       | 17 +++++++++++++----
 lib/Drivers/DML/postgresaxomic.js | 17 +++++++++++++----
 lib/Drivers/DML/sqlite.js         | 17 +++++++++++++----
 lib/Model.js                      |  6 +++---
 6 files changed, 56 insertions(+), 20 deletions(-)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index e723495b..f1242203 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -29,7 +29,7 @@ function ChainFind(opts) {
 			return this;
 		},
 		count: function (cb) {
-			opts.driver.count(opts.table, opts.conditions, function (err, data) {
+			opts.driver.count(opts.table, opts.conditions, opts, function (err, data) {
 				if (err || data.length === 0) {
 					return cb(err);
 				}
diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index f1061a4e..9baba8a9 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -96,12 +96,21 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	}
 };
 
-Driver.prototype.count = function (table, conditions, cb) {
+Driver.prototype.count = function (table, conditions, opts, cb) {
 	var q = this.query.select()
 	                  .from(table)
-	                  .count(null, 'c')
-	                  .where(conditions)
-	                  .build();
+	                  .count(opts.id, 'c');
+
+	if (opts.merge) {
+		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
+		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
+			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions).build();
+		} else {
+			q = q.where(conditions).build();
+		}
+	} else {
+		q = q.where(conditions).build();
+	}
 
 	if (this.opts.pool) {
 		this.poolQuery(q, cb);
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index fe48a3eb..efd6a25a 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -79,12 +79,21 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	this.db.query(q, handleQuery(cb));
 };
 
-Driver.prototype.count = function (table, conditions, cb) {
+Driver.prototype.count = function (table, conditions, opts, cb) {
 	var q = this.query.select()
 	                  .from(table)
-	                  .count(null, 'c')
-	                  .where(conditions)
-	                  .build();
+	                  .count(opts.id, 'c');
+
+	if (opts.merge) {
+		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
+		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
+			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions).build();
+		} else {
+			q = q.where(conditions).build();
+		}
+	} else {
+		q = q.where(conditions).build();
+	}
 
 	if (this.opts.debug) {
 		require("../../Debug").sql('postgres', q);
diff --git a/lib/Drivers/DML/postgresaxomic.js b/lib/Drivers/DML/postgresaxomic.js
index 5578c068..0759ac74 100644
--- a/lib/Drivers/DML/postgresaxomic.js
+++ b/lib/Drivers/DML/postgresaxomic.js
@@ -77,12 +77,21 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	}
 	this.hijackQuery(q, handleQuery(cb));
 };
-Driver.prototype.count = function (table, conditions, cb) {
+Driver.prototype.count = function (table, conditions, opts, cb) {
 	var q = this.query.select()
 	                  .from(table)
-	                  .count(null, 'c')
-	                  .where(conditions)
-	                  .build();
+	                  .count(opts.id, 'c');
+
+	if (opts.merge) {
+		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
+		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
+			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions).build();
+		} else {
+			q = q.where(conditions).build();
+		}
+	} else {
+		q = q.where(conditions).build();
+	}
 
 	if (this.opts.debug) {
 		require("../../Debug").sql('postgres', q);
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index c7fa2043..1b865101 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -81,12 +81,21 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	this.db.all(q, cb);
 };
 
-Driver.prototype.count = function (table, conditions, cb) {
+Driver.prototype.count = function (table, conditions, opts, cb) {
 	var q = this.query.select()
 	                  .from(table)
-	                  .count(null, 'c')
-	                  .where(conditions)
-	                  .build();
+	                  .count(opts.id, 'c');
+
+	if (opts.merge) {
+		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
+		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
+			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions).build();
+		} else {
+			q = q.where(conditions).build();
+		}
+	} else {
+		q = q.where(conditions).build();
+	}
 
 	if (this.opts.debug) {
 		require("../../Debug").sql('sqlite', q);
diff --git a/lib/Model.js b/lib/Model.js
index c57757e1..5a15e05e 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -191,7 +191,7 @@ function Model(opts) {
 							if (options.hasOwnProperty("__merge")) {
 								merge = options.__merge;
 								delete options.__merge;
-							} 
+							}
 							if (options.hasOwnProperty("order")) {
 								order = options.order;
 								delete options.order;
@@ -267,7 +267,7 @@ function Model(opts) {
 			throw new Error("Missing Model.count() callback");
 		}
 
-		opts.driver.count(opts.table, conditions, function (err, data) {
+		opts.driver.count(opts.table, conditions, {}, function (err, data) {
 			if (err || data.length === 0) {
 				return cb(err);
 			}
@@ -284,7 +284,7 @@ function Model(opts) {
 		var conditions = {};
 		conditions[opts.id] = id;
 
-		opts.driver.count(opts.table, conditions, function (err, data) {
+		opts.driver.count(opts.table, conditions, {}, function (err, data) {
 			if (err || data.length === 0) {
 				return cb(err);
 			}

From 4343184616feed78157f5e3520e702bb88988a99 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 11 Mar 2013 20:05:28 +0000
Subject: [PATCH 0192/1246] Fixes previous commit not using latest sql-query
 version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c0b00480..996abf48 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
   },
   "analyse": false,
   "dependencies": {
-    "sql-query": "0.0.8"
+    "sql-query": "0.0.9"
   },
   "devDependencies": {
     "utest": "0.0.6",

From a3952de1babbeb5d6e2b2aa122e2359381702eba Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 11 Mar 2013 20:44:35 +0000
Subject: [PATCH 0193/1246] Changes test-association-hasmany-get don't depend
 on the order of the 2 returned instances

---
 test/integration/test-association-hasmany-get.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/integration/test-association-hasmany-get.js b/test/integration/test-association-hasmany-get.js
index c16fee3d..25f43f28 100644
--- a/test/integration/test-association-hasmany-get.js
+++ b/test/integration/test-association-hasmany-get.js
@@ -27,8 +27,13 @@ common.createConnection(function (err, db) {
 							assert.equal(err, null);
 							assert.equal(Array.isArray(Tests), true);
 							assert.equal(Tests.length, 2);
-							assert.equal(Tests[0].name, 'test2');
-							assert.equal(Tests[1].name, 'test3');
+							if (Tests[0].id == 2) {
+								assert.equal(Tests[0].name, 'test2');
+								assert.equal(Tests[1].name, 'test3');
+							} else {
+								assert.equal(Tests[0].name, 'test3');
+								assert.equal(Tests[1].name, 'test2');
+							}
 							db.close();
 						});
 					});

From bb0ba400eb45a2e292a056bcee0200fda6f39e71 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 12 Mar 2013 00:27:56 +0000
Subject: [PATCH 0194/1246] Adds initial middleware for Express

It's not black magic, just a simple helper
---
 Readme.md      | 37 +++++++++++++++++++++++++++++++++++++
 lib/Express.js | 31 +++++++++++++++++++++++++++++++
 lib/ORM.js     |  2 ++
 3 files changed, 70 insertions(+)
 create mode 100644 lib/Express.js

diff --git a/Readme.md b/Readme.md
index 451abc2b..93f5b350 100644
--- a/Readme.md
+++ b/Readme.md
@@ -69,6 +69,43 @@ orm.connect("mysql://username:password@host/database", function (err, db) {
 });
 ```
 
+## Express
+
+If you're using Express, you might want to use the simple middleware to integrate more easily.
+
+```js
+var express = require('express');
+var orm = require('orm');
+var app = express();
+
+app.use(orm.express("mysql://username:password@host/database", {
+	define: function (db) {
+		db.define("person", { ... });
+	}
+}));
+app.listen(80);
+
+app.get("/", function (req, res) {
+	// access db using req.db
+	req.db.models.person.find(...);
+});
+```
+
+If you prefer, you can have direct access to the models you define.
+
+```js
+// ...
+app.use(orm.express("mysql://username:password@host/database", {
+	define: function (db, models) {
+		models.Person = db.define("person", { ... });
+	}
+}));
+// ...
+app.get("/", function (req, res) {
+	req.db.Person.find(...);
+});
+```
+
 ## Settings
 
 Settings are used to store key value pairs. A settings object is stored on the global orm object and on each database connection.
diff --git a/lib/Express.js b/lib/Express.js
new file mode 100644
index 00000000..4fe5031d
--- /dev/null
+++ b/lib/Express.js
@@ -0,0 +1,31 @@
+var orm = require("./ORM");
+
+module.exports = function (uri, opts) {
+	var _db = null;
+	var _models = {};
+
+	opts = opts || {};
+
+	orm.connect(uri, function (err, db) {
+		if (err) {
+			if (typeof opts.error == "function") {
+				opts.error(err);
+			}
+			return;
+		}
+
+		_db = db;
+		if (typeof opts.define == "function") {
+			opts.define(db, _models);
+			if (Object.keys(_models).length > 0) {
+				_db = _models;
+			}
+		}
+	});
+
+	return function ORM(req, res, next) {
+		req.db = _db;
+
+		return next();
+	};
+};
diff --git a/lib/ORM.js b/lib/ORM.js
index 98fee7fe..c797dd36 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -16,6 +16,8 @@ for (var k in Query.Comparators) {
 	exports[Query.Comparators[k]] = Query[Query.Comparators[k]];
 }
 
+exports.express = require("./Express");
+
 exports.use = function (connection, proto, opts, cb) {
 	if (DriverAliases[proto]) {
 		proto = DriverAliases[proto];

From f0236bb773ff42ec699e0841ce90d517ff87738a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 12 Mar 2013 00:36:08 +0000
Subject: [PATCH 0195/1246] Changes Express middleware to be asynchronous when
 defining models

---
 Readme.md      | 4 +++-
 lib/Express.js | 9 +++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Readme.md b/Readme.md
index 93f5b350..8bdd2c9e 100644
--- a/Readme.md
+++ b/Readme.md
@@ -96,8 +96,10 @@ If you prefer, you can have direct access to the models you define.
 ```js
 // ...
 app.use(orm.express("mysql://username:password@host/database", {
-	define: function (db, models) {
+	define: function (db, models, next) {
 		models.Person = db.define("person", { ... });
+
+		return next();
 	}
 }));
 // ...
diff --git a/lib/Express.js b/lib/Express.js
index 4fe5031d..f3812d5f 100644
--- a/lib/Express.js
+++ b/lib/Express.js
@@ -16,10 +16,11 @@ module.exports = function (uri, opts) {
 
 		_db = db;
 		if (typeof opts.define == "function") {
-			opts.define(db, _models);
-			if (Object.keys(_models).length > 0) {
-				_db = _models;
-			}
+			opts.define(db, _models, function () {
+				if (Object.keys(_models).length > 0) {
+					_db = _models;
+				}
+			});
 		}
 	});
 

From c099e4c5c517dd2a4b5caa24d9927cca9ab52257 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 12 Mar 2013 00:38:26 +0000
Subject: [PATCH 0196/1246] Changes test-association-hasmany-extra to not
 depend on the order of the fetched rows

---
 test/integration/test-association-hasmany-extra.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/test/integration/test-association-hasmany-extra.js b/test/integration/test-association-hasmany-extra.js
index ab35ee69..f59ac027 100644
--- a/test/integration/test-association-hasmany-extra.js
+++ b/test/integration/test-association-hasmany-extra.js
@@ -29,10 +29,13 @@ common.createConnection(function (err, db) {
 							assert.equal(err, null);
 							assert.equal(Array.isArray(Tests), true);
 							assert.equal(Tests.length, 2);
-							assert.equal(Tests[0].name, 'test2');
-							assert.equal(Tests[0].extra.extra_field, 4);
-							assert.equal(Tests[1].name, 'test3');
-							assert.equal(Tests[1].extra.extra_field, 5);
+							if (Tests[0].id == 2) {
+								assert.equal(Tests[0].extra.extra_field, 4);
+								assert.equal(Tests[1].extra.extra_field, 5);
+							} else {
+								assert.equal(Tests[0].extra.extra_field, 5);
+								assert.equal(Tests[1].extra.extra_field, 4);
+							}
 							db.close();
 						});
 					});

From 9bd14a271d15ed0ec84045ff055f463d95ecab0b Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 12 Mar 2013 15:52:13 +0000
Subject: [PATCH 0197/1246] Changes postgres DDL to create ENUM types before
 table (#71)

---
 lib/Drivers/DDL/postgres.js | 49 ++++++++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index d49993d6..5fda362c 100644
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -20,8 +20,9 @@ exports.drop = function (driver, opts, cb) {
 exports.sync = function (driver, opts, cb) {
 	var tables = [];
 	var subqueries = [];
+	var typequeries = [];
 	var definitions = [];
-	var k, i, pending, tmp;
+	var k, i, pending;
 
 	definitions.push(driver.query.escapeId(opts.id) + " SERIAL PRIMARY KEY");
 
@@ -29,9 +30,9 @@ exports.sync = function (driver, opts, cb) {
 		definitions.push(buildColumnDefinition(driver, opts.table, k, opts.properties[k]));
 
 		if (opts.properties[k].type == "enum") {
-			subqueries.push(
-				"CREATE TYPE " + tmp + " AS ENUM (" +
-				opts.properties[k].values.map(driver.escape.bind(driver)) + ")"
+			typequeries.push(
+				"CREATE TYPE " + driver.query.escapeId("enum_" + opts.table + "_" + k) + " AS ENUM (" +
+				opts.properties[k].values.map(driver.query.escapeVal.bind(driver)) + ")"
 			);
 		}
 	}
@@ -50,6 +51,7 @@ exports.sync = function (driver, opts, cb) {
 		name       : opts.table,
 		query      : "CREATE TABLE " + driver.query.escapeId(opts.table) +
 		             " (" + definitions.join(", ") + ")",
+		typequeries: typequeries,
 		subqueries : subqueries
 	});
 	tables[tables.length - 1].subqueries.push(
@@ -67,6 +69,7 @@ exports.sync = function (driver, opts, cb) {
 
 	for (i = 0; i < opts.many_associations.length; i++) {
 		definitions = [];
+		typequeries = [];
 
 		definitions.push(driver.query.escapeId(opts.many_associations[i].mergeId) + " INTEGER NOT NULL");
 		definitions.push(driver.query.escapeId(opts.many_associations[i].mergeAssocId) + " INTEGER NOT NULL");
@@ -74,12 +77,19 @@ exports.sync = function (driver, opts, cb) {
 		for (k in opts.many_associations[i].props) {
 			definitions.push(buildColumnDefinition(driver, opts.many_associations[i].mergeTable,
 			                                       k, opts.many_associations[i].props[k]));
+			if (opts.many_associations[i].props[k].type == "enum") {
+				typequeries.push(
+					"CREATE TYPE " + driver.query.escapeId("enum_" + opts.many_associations[i].mergeTable + "_" + k) + " AS ENUM (" +
+					opts.many_associations[i].props[k].values.map(driver.query.escapeVal.bind(driver)) + ")"
+				);
+			}
 		}
 
 		tables.push({
 			name       : opts.many_associations[i].mergeTable,
 			query      : "CREATE TABLE IF NOT EXISTS " + driver.query.escapeId(opts.many_associations[i].mergeTable) +
 			             " (" + definitions.join(", ") + ")",
+			typequeries: typequeries,
 			subqueries : []
 		});
 		tables[tables.length - 1].subqueries.push(
@@ -92,6 +102,7 @@ exports.sync = function (driver, opts, cb) {
 	}
 
 	pending = tables.length;
+
 	for (i = 0; i < tables.length; i++) {
 		createTableSchema(driver, tables[i], function (err) {
 			if (--pending === 0) {
@@ -104,21 +115,31 @@ exports.sync = function (driver, opts, cb) {
 };
 
 function createTableSchema(driver, table, cb) {
-	driver.db.query(table.query, function (err) {
-		if (err || table.subqueries.length === 0) {
-			return cb();
-		}
+	var pending = table.typequeries.length;
 
-		var pending = table.subqueries.length;
+	for (var i = 0; i < table.typequeries.length; i++) {
+		driver.db.query(table.typequeries[i], function (err) {
+			if (--pending > 0) {
+				return;
+			}
 
-		for (var i = 0; i < table.subqueries.length; i++) {
-			driver.db.query(table.subqueries[i], function (err) {
-				if (--pending === 0) {
+			driver.db.query(table.query, function (err) {
+				if (err || table.subqueries.length === 0) {
 					return cb();
 				}
+
+				var pending = table.subqueries.length;
+
+				for (var i = 0; i < table.subqueries.length; i++) {
+					driver.db.query(table.subqueries[i], function (err) {
+						if (--pending === 0) {
+							return cb();
+						}
+					});
+				}
 			});
-		}
-	});
+		});
+	}
 }
 
 function buildColumnDefinition(driver, table, name, prop) {

From b282b70ed4098e099268097874c61c6edd2548ae Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 12 Mar 2013 15:58:37 +0000
Subject: [PATCH 0198/1246] Fixes previous commit not triggering table creation
 if no types are defined

---
 lib/Drivers/DDL/postgres.js | 41 +++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index 5fda362c..7015a27c 100644
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -116,28 +116,33 @@ exports.sync = function (driver, opts, cb) {
 
 function createTableSchema(driver, table, cb) {
 	var pending = table.typequeries.length;
+	var createTable = function () {
+		driver.db.query(table.query, function (err) {
+			if (err || table.subqueries.length === 0) {
+				return cb();
+			}
+
+			var pending = table.subqueries.length;
+
+			for (var i = 0; i < table.subqueries.length; i++) {
+				driver.db.query(table.subqueries[i], function (err) {
+					if (--pending === 0) {
+						return cb();
+					}
+				});
+			}
+		});
+	};
+
+	if (pending === 0) {
+		return createTable();
+	}
 
 	for (var i = 0; i < table.typequeries.length; i++) {
 		driver.db.query(table.typequeries[i], function (err) {
-			if (--pending > 0) {
-				return;
+			if (--pending === 0) {
+				return createTable();
 			}
-
-			driver.db.query(table.query, function (err) {
-				if (err || table.subqueries.length === 0) {
-					return cb();
-				}
-
-				var pending = table.subqueries.length;
-
-				for (var i = 0; i < table.subqueries.length; i++) {
-					driver.db.query(table.subqueries[i], function (err) {
-						if (--pending === 0) {
-							return cb();
-						}
-					});
-				}
-			});
 		});
 	}
 }

From 4a65577605a0b2e8ac022347a4145dcd3871c85c Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 12 Mar 2013 18:47:47 +0000
Subject: [PATCH 0199/1246] Changes Express middleware to only be included if
 used

---
 lib/ORM.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index c797dd36..b980cb9f 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -16,7 +16,9 @@ for (var k in Query.Comparators) {
 	exports[Query.Comparators[k]] = Query[Query.Comparators[k]];
 }
 
-exports.express = require("./Express");
+exports.express = function () {
+	return require("./Express").apply(this, arguments);
+};
 
 exports.use = function (connection, proto, opts, cb) {
 	if (DriverAliases[proto]) {

From 71a5388a8ae64ef7a8f90dce77826b85dd811246 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 12 Mar 2013 18:50:00 +0000
Subject: [PATCH 0200/1246] Added a note about asynchronously loading models
 when using Express

---
 Readme.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Readme.md b/Readme.md
index 8bdd2c9e..a2cb1eb2 100644
--- a/Readme.md
+++ b/Readme.md
@@ -108,6 +108,8 @@ app.get("/", function (req, res) {
 });
 ```
 
+This also allows you to asynchronously load the models.
+
 ## Settings
 
 Settings are used to store key value pairs. A settings object is stored on the global orm object and on each database connection.

From 68f92dd371ff0c29faa7b69fcdd12edfeaf3b0c6 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 12 Mar 2013 19:19:35 +0000
Subject: [PATCH 0201/1246] Changes hasOne.getAccessor to be able to fetch
 instance before association (if needed)

This happens when people do Model(n).getAssoc() instead of Model.get(n,
function (err, inst) { inst.getAssoc(); }).
---
 lib/Associations/One.js                       |  9 ++++++-
 .../test-get-association-hasone.js            | 24 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 test/integration/test-get-association-hasone.js

diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index 6d34d91c..b48fb8d3 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -91,7 +91,14 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 					cb(null);
 				}
 			} else {
-				if (Instance[association.field]) {
+				if (!Instance.hasOwnProperty(association.field)) {
+					association.model.get(Instance[Model.id], function (err, instance) {
+						if (err || !instance[association.field]) {
+							return cb(null);
+						}
+						association.model.get(instance[association.field], opts, cb);
+					});
+				} else if (Instance[association.field]) {
 					association.model.get(Instance[association.field], opts, cb);
 				} else {
 					cb(null);
diff --git a/test/integration/test-get-association-hasone.js b/test/integration/test-get-association-hasone.js
new file mode 100644
index 00000000..99b72387
--- /dev/null
+++ b/test/integration/test-get-association-hasone.js
@@ -0,0 +1,24 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModel2Table('test_get_association_hasone', db.driver.db, function () {
+			common.insertModel2Data('test_get_association_hasone', db.driver.db, [
+				{ id : 1, name : 'test1', assoc: 2 },
+				{ id : 2, name : 'test2', assoc: 0 }
+			], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_get_association_hasone', common.getModelProperties());
+			TestModel.hasOne("assoc");
+
+			TestModel(1).getAssoc(function (err, Test2) {
+				console.log(err, Test2);
+				assert.equal(err, null);
+				assert.equal(typeof Test2, "object");
+				assert.equal(Test2.id, 2);
+				db.close();
+			});
+		});
+	});
+});

From 38760c6f71ecfa476a6c8a0236ca1f9f82cbf142 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 13 Mar 2013 10:07:00 +0000
Subject: [PATCH 0202/1246] Changes undefined instance properties
 initialization to undefined instead of null (#69)

---
 lib/Instance.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 41970e42..1ac89d2b 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -238,7 +238,7 @@ function Instance(opts) {
 
 	for (var k in opts.properties) {
 		if (opts.properties.hasOwnProperty(k) && !opts.data.hasOwnProperty(k) && k != opts.id) {
-			opts.data[k] = null;
+			opts.data[k] = undefined;
 		}
 	}
 

From 409c75e214de7e5898d43383f50fbce3fcdd6de0 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 13 Mar 2013 12:08:56 +0000
Subject: [PATCH 0203/1246] Adds support for Object property type in DDL
 drivers (#72)

---
 lib/Drivers/DDL/mysql.js    | 1 +
 lib/Drivers/DDL/postgres.js | 1 +
 lib/Drivers/DDL/sqlite.js   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index 464526d2..7319969d 100644
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -130,6 +130,7 @@ function buildColumnDefinition(driver, name, prop) {
 			}
 			break;
 		case "binary":
+		case "object":
 			if (prop.big === true) {
 				def = driver.query.escapeId(name) + " LONGBLOB";
 			} else {
diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index 7015a27c..be7f460a 100644
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -172,6 +172,7 @@ function buildColumnDefinition(driver, table, name, prop) {
 			}
 			break;
 		case "binary":
+		case "object":
 			def = driver.query.escapeId(name) + " BYTEA";
 			break;
 		case "enum":
diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index 73234f42..faa72978 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -112,6 +112,7 @@ function buildColumnDefinition(driver, name, prop) {
 			def = driver.query.escapeId(name) + " DATETIME";
 			break;
 		case "binary":
+		case "object":
 			def = driver.query.escapeId(name) + " BLOB";
 			break;
 		case "enum":

From 1d41bcd29046f9c7ca85acd52056cf27d3d02ff6 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 13 Mar 2013 12:17:21 +0000
Subject: [PATCH 0204/1246] Fixes bug where beforeCreate hook is always called
 regardless if the instance is already on database (#69)

---
 lib/Instance.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 1ac89d2b..a3c316e7 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -61,7 +61,9 @@ function Instance(opts) {
 			return saveInstanceExtra(cb);
 		}
 
-		Hook.trigger(instance, opts.hooks.beforeCreate);
+		if (opts.is_new || !opts.data.hasOwnProperty(opts.id)) {
+			Hook.trigger(instance, opts.hooks.beforeCreate);
+		}
 		Hook.trigger(instance, opts.hooks.beforeSave);
 
 		handleValidations(function (err) {

From 1885533fb800234f77c27b791fc2f529128066ee Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 13 Mar 2013 12:22:50 +0000
Subject: [PATCH 0205/1246] Adds valueToProperty and propertyToValue to sqlite
 driver (#72)

---
 lib/Drivers/DML/sqlite.js | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 1b865101..a57fdb94 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -160,3 +160,30 @@ Driver.prototype.clear = function (table, cb) {
 	}
 	this.db.all(query, cb);
 };
+
+Driver.prototype.valueToProperty = function (value, property) {
+	switch (property.type) {
+		case "boolean":
+			return !!value;
+		case "object":
+			try {
+				return JSON.parse(value);
+			} catch (e) {
+				return null;
+			}
+			break;
+		default:
+			return value;
+	}
+};
+
+Driver.prototype.propertyToValue = function (value, property) {
+	switch (property.type) {
+		case "boolean":
+			return (value) ? 1 : 0;
+		case "object":
+			return JSON.stringify(value);
+		default:
+			return value;
+	}
+};

From f3f3c27acb65e73dd2bf79f4e94e063daeb325f6 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 13 Mar 2013 12:23:31 +0000
Subject: [PATCH 0206/1246] Fixes issue when saving instances using
 valueToProperty instead of propertyToValue (#72)

Not sure how nobody steped into this
---
 lib/Instance.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index a3c316e7..4b92b241 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -82,8 +82,8 @@ function Instance(opts) {
 
 				if (opts.properties[k]) {
 					data[k] = Property.validate(opts.data[k], opts.properties[k]);
-					if (opts.driver.valueToProperty) {
-						data[k] = opts.driver.valueToProperty(data[k], opts.properties[k]);
+					if (opts.driver.propertyToValue) {
+						data[k] = opts.driver.propertyToValue(data[k], opts.properties[k]);
 					}
 				} else {
 					data[k] = opts.data[k];
@@ -175,8 +175,8 @@ function Instance(opts) {
 
 		if (opts.properties[key]) {
 			changes[key] = Property.validate(changes[key], opts.properties[key]);
-			 if (opts.driver.valueToProperty) {
-				changes[key] = opts.driver.valueToProperty(changes[key], opts.properties[key]);
+			 if (opts.driver.propertyToValue) {
+				changes[key] = opts.driver.propertyToValue(changes[key], opts.properties[key]);
 			}
 		}
 

From d64ee77cee6107b1e86c6fa904b92b55e668e5f9 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 13 Mar 2013 12:27:41 +0000
Subject: [PATCH 0207/1246] 2.0.5

---
 Changelog.md | 11 +++++++++++
 Readme.md    |  2 +-
 package.json |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index e4fb524c..d0a11e10 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,14 @@
+### v2.0.5 - 13 Mar 2013
+
+- Uses sql-query for SQL query building
+- Adds initial middleware for Express
+- Moves beforeCreate to near beforeSave so people can change instance just like beforeSave (#69)
+- Fixes bug when creating Models without all data (#69)
+- Changes drivers.count() to be able to pass options (related to #68)
+- Changes postgres DDL to create ENUM types before table (#71)
+- Changes hasOne.getAccessor to be able to fetch instance before association (if needed)
+- Adds support for Object property type in DDL drivers (#72)
+
 ### v2.0.4 - 7 Mar 2013
 
 - Changes db.load() to behave like builtin require()
diff --git a/Readme.md b/Readme.md
index a2cb1eb2..257fec23 100644
--- a/Readme.md
+++ b/Readme.md
@@ -8,7 +8,7 @@
 npm install orm
 ```
 
-Current stable version: **2.0.4**
+Current stable version: **2.0.5**
 
 ## DBMS Support
 
diff --git a/package.json b/package.json
index 996abf48..1d7c9702 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "redshift",
     "sqlite"
   ],
-  "version": "2.0.4",
+  "version": "2.0.5",
   "license": "MIT",
   "repository": {
     "url": "http://dresende.github.com/node-orm2"

From 240c9adb614308559dbe228c79263a3a93dd04c9 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 14 Mar 2013 15:35:13 +0000
Subject: [PATCH 0208/1246] Changes orm.connect to check connection url/opts to
 avoid throwing some errors about missing protocol or database (#75)

Added a test with 3 possible error cases
---
 lib/ORM.js                              | 22 ++++++++++++++++++++--
 test/integration/test-connect-errors.js | 13 +++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 test/integration/test-connect-errors.js

diff --git a/lib/ORM.js b/lib/ORM.js
index b980cb9f..da7fdac2 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -45,14 +45,32 @@ exports.connect = function (opts, cb) {
 	var url = require("url");
 
 	if (typeof opts == "string") {
+		if (opts.replace(/\s+/, "").length === 0) {
+			return cb(new Error("CONNECTION_URL_EMPTY"));
+		}
 		opts = url.parse(opts, true);
 	}
+	if (!opts.database) {
+		if (!opts.pathname) {
+			return cb(new Error("CONNECTION_URL_NO_DATABASE"));
+		}
+		opts.database = opts.pathname.substr(1);
+	}
+	if (!opts.protocol) {
+		return cb(new Error("CONNECTION_URL_NO_PROTOCOL"));
+	}
+	if (!opts.host) {
+		opts.host = opts.hostname = "localhost";
+	}
 	if (opts.auth) {
 		opts.user = opts.auth.split(":")[0];
 		opts.password = opts.auth.split(":")[1];
 	}
-	if (!opts.database) {
-		opts.database = (opts.pathname ? opts.pathname.substr(1) : '');
+	if (!opts.hasOwnProperty("user")) {
+		opts.user = "root";
+	}
+	if (!opts.hasOwnProperty("password")) {
+		opts.password = "";
 	}
 
 	var proto  = opts.protocol.replace(/:$/, '');
diff --git a/test/integration/test-connect-errors.js b/test/integration/test-connect-errors.js
new file mode 100644
index 00000000..e858066f
--- /dev/null
+++ b/test/integration/test-connect-errors.js
@@ -0,0 +1,13 @@
+var common      = require('../common');
+var assert      = require('assert');
+
+addTest("",         "CONNECTION_URL_EMPTY");
+addTest("whatever", "CONNECTION_URL_NO_PROTOCOL");
+addTest("mysql://", "CONNECTION_URL_NO_DATABASE");
+
+function addTest(uri, error_msg) {
+	common.ORM.connect(uri, function (err) {
+		assert.equal(err instanceof Error, true);
+		assert.equal(err.message, error_msg);
+	});
+}

From 077c628734fe9d9bbab16b0072ffb292852b42f8 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 14 Mar 2013 15:37:53 +0000
Subject: [PATCH 0209/1246] Fixes typo in sqlite3 driver

---
 lib/Drivers/DML/sqlite.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index a57fdb94..a3915a77 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -12,7 +12,7 @@ function Driver(config, connection, opts) {
 		this.db = connection;
 	} else {
 		// on Windows, paths have a drive letter which is parsed by
-		// url.parse() has the hostname. If host is defined, assume
+		// url.parse() as the hostname. If host is defined, assume
 		// it's the drive letter and add ":"
 		this.db = new sqlite3.Database(((config.host ? config.host + ":" : "") + (config.pathname || "")) || ':memory:');
 	}

From bfa5d9813eb0afe45fcdb554b0c0f1e54d403930 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 14 Mar 2013 15:41:06 +0000
Subject: [PATCH 0210/1246] Changes previous commit ignoring
 CONNECTION_URL_NO_DATABASE for now because of sqlite (#75)

---
 lib/ORM.js                              | 8 ++++----
 test/integration/test-connect-errors.js | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index da7fdac2..62fad407 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -51,10 +51,10 @@ exports.connect = function (opts, cb) {
 		opts = url.parse(opts, true);
 	}
 	if (!opts.database) {
-		if (!opts.pathname) {
-			return cb(new Error("CONNECTION_URL_NO_DATABASE"));
-		}
-		opts.database = opts.pathname.substr(1);
+		// if (!opts.pathname) {
+		// 	return cb(new Error("CONNECTION_URL_NO_DATABASE"));
+		// }
+		opts.database = (opts.pathname ? opts.pathname.substr(1) : "");
 	}
 	if (!opts.protocol) {
 		return cb(new Error("CONNECTION_URL_NO_PROTOCOL"));
diff --git a/test/integration/test-connect-errors.js b/test/integration/test-connect-errors.js
index e858066f..66f76294 100644
--- a/test/integration/test-connect-errors.js
+++ b/test/integration/test-connect-errors.js
@@ -3,7 +3,8 @@ var assert      = require('assert');
 
 addTest("",         "CONNECTION_URL_EMPTY");
 addTest("whatever", "CONNECTION_URL_NO_PROTOCOL");
-addTest("mysql://", "CONNECTION_URL_NO_DATABASE");
+// sqlite can be like this so this error is avoided for now
+// addTest("mysql://", "CONNECTION_URL_NO_DATABASE");
 
 function addTest(uri, error_msg) {
 	common.ORM.connect(uri, function (err) {

From 5744ba29d9375de905d23baf2295d5ebc065fa20 Mon Sep 17 00:00:00 2001
From: Mark Roberts <markandrusroberts@gmail.com>
Date: Thu, 14 Mar 2013 12:34:52 -0500
Subject: [PATCH 0211/1246] Adds test for Issue #69

---
 ...test-hook-before-create-define-property.js | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 test/integration/test-hook-before-create-define-property.js

diff --git a/test/integration/test-hook-before-create-define-property.js b/test/integration/test-hook-before-create-define-property.js
new file mode 100644
index 00000000..d175812b
--- /dev/null
+++ b/test/integration/test-hook-before-create-define-property.js
@@ -0,0 +1,26 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_hook_before_create_define_property', db.driver.db, function () {
+		var name = "Name was undefined";
+		var TestModel = db.define('test_hook_before_create_define_property', common.getModelProperties(), {
+			hooks: {
+				beforeCreate: function () {
+					if (!this.name) {
+						this.name = name;
+					}
+				}
+			}
+		});
+
+		var Test = new TestModel();
+		Test.save(function (err) {
+			assert.equal(err, null);
+			
+			db.close(function () {
+				assert.equal(Test.name, name);
+			});
+		});
+	});
+});

From a6c7a06c57561c585a13b8fd9fb245ffb8f5b71a Mon Sep 17 00:00:00 2001
From: Mark Roberts <markandrusroberts@gmail.com>
Date: Thu, 14 Mar 2013 12:55:07 -0500
Subject: [PATCH 0212/1246] Updates test for Pull Request #77

---
 test/integration/test-hook-before-create-define-property.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/test/integration/test-hook-before-create-define-property.js b/test/integration/test-hook-before-create-define-property.js
index d175812b..6812c46d 100644
--- a/test/integration/test-hook-before-create-define-property.js
+++ b/test/integration/test-hook-before-create-define-property.js
@@ -17,10 +17,8 @@ common.createConnection(function (err, db) {
 		var Test = new TestModel();
 		Test.save(function (err) {
 			assert.equal(err, null);
-			
-			db.close(function () {
-				assert.equal(Test.name, name);
-			});
+			assert.equal(Test.name, name);
+			db.close();
 		});
 	});
 });

From c60d8e2a5b7ac344c2faadc738a54d895ee1aaae Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 14 Mar 2013 20:10:35 +0000
Subject: [PATCH 0213/1246] Hardens some validators againt null/undefined,
 changes match validator to avoid compiling regex everytime it's called
 (related to #74)

---
 lib/Validators.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/Validators.js b/lib/Validators.js
index 6d5241bd..a3f31aff 100644
--- a/lib/Validators.js
+++ b/lib/Validators.js
@@ -13,6 +13,7 @@ validators.rangeNumber = function (min, max, msg) {
 	return function (n, next) {
 		if (min === undefined && n <= max) return next();
 		if (max === undefined && n >= min) return next();
+		if (n === undefined || n === null) return next('undefined');
 		if (n >= min && n <= max) return next();
 		return next(msg || 'out-of-range-number');
 	};
@@ -25,7 +26,7 @@ validators.rangeNumber = function (min, max, msg) {
  **/
 validators.rangeLength = function (min, max, msg) {
 	return function (v, next) {
-		if (v === undefined) return next('undefined');
+		if (v === undefined || v === null) return next('undefined');
 		if (min === undefined && v.length <= max) return next();
 		if (max === undefined && v.length >= min) return next();
 		if (v.length >= min && v.length <= max) return next();
@@ -119,10 +120,10 @@ validators.patterns = {};
  * as 1st argument.
  **/
 validators.patterns.match = function (pattern, modifiers, msg) {
+	if (typeof pattern == "string") {
+		pattern = new RegExp(pattern, modifiers);
+	}
 	return function (v, next) {
-		if (typeof pattern == "string") {
-			pattern = new RegExp(pattern, modifiers);
-		}
 		if (typeof v == "string" && v.match(pattern)) return next();
 		return next(msg || 'no-pattern-match');
 	};

From 7de1cf53ebfd388048899e4222efa944fcdf11f6 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 14 Mar 2013 20:12:06 +0000
Subject: [PATCH 0214/1246] Fixes a regression when host is not defined and
 defaults to 'localhost' and makes sqlite not use memory db and instead
 creates 'localhost:' db in pwd()

---
 lib/ORM.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index 62fad407..9701d559 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -59,9 +59,9 @@ exports.connect = function (opts, cb) {
 	if (!opts.protocol) {
 		return cb(new Error("CONNECTION_URL_NO_PROTOCOL"));
 	}
-	if (!opts.host) {
-		opts.host = opts.hostname = "localhost";
-	}
+	// if (!opts.host) {
+	// 	opts.host = opts.hostname = "localhost";
+	// }
 	if (opts.auth) {
 		opts.user = opts.auth.split(":")[0];
 		opts.password = opts.auth.split(":")[1];

From 9fb90324834921b66c50903fcbe2ee006052b04c Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 14 Mar 2013 20:14:56 +0000
Subject: [PATCH 0215/1246] Changes back default instance properties to null
 instead of undefined

Previous validations commit should be able to handle this just fine.

As pointed out by @dxg, when data is saved and late fetched, values can
be null, not undefined, so it makes more sense to have them defaulted
to null for consistency.
---
 lib/Instance.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 4b92b241..a66f1add 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -240,11 +240,11 @@ function Instance(opts) {
 
 	for (var k in opts.properties) {
 		if (opts.properties.hasOwnProperty(k) && !opts.data.hasOwnProperty(k) && k != opts.id) {
-			opts.data[k] = undefined;
+			opts.data[k] = null;
 		}
 	}
 
-	for (var k in opts.data) {
+	for (k in opts.data) {
 		if (!opts.data.hasOwnProperty(k)) continue;
 		if (!opts.properties.hasOwnProperty(k) && k != opts.id && opts.association_properties.indexOf(k) == -1) {
 			if (!opts.extra.hasOwnProperty(k)) continue;

From 513f995418b76caeb93f417de4f48578c17d7b23 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 14 Mar 2013 20:39:18 +0000
Subject: [PATCH 0216/1246] Fixes wrong whitespace character (damn osx
 option+space!)

---
 lib/Associations/Many.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 7c2eb6d9..a46762c7 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -154,7 +154,7 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 						} else {
 							if (Array.isArray(arguments[i])) {
 								order = arguments[i];
-								order[0] = [ association.model.table, order[0] ];
+								order[0] = [ association.model.table, order[0] ];
 							} else {
 								options = arguments[i];
 							}

From ff2cda65772893786f32a262d51a95e4238db6c9 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 14 Mar 2013 20:51:29 +0000
Subject: [PATCH 0217/1246] Changes Express middleware to be able to have more
 than one connection (#76)

There are 2 changes that break backwards compliance:

1. req.db can be: a) null b) db connection c) array of db connections
2. req.models will be filled with the models defined on each connection
---
 lib/Express.js | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/lib/Express.js b/lib/Express.js
index f3812d5f..82091a31 100644
--- a/lib/Express.js
+++ b/lib/Express.js
@@ -1,31 +1,35 @@
-var orm = require("./ORM");
+var orm     = require("./ORM");
+var _models = {};
+var _db     = null;
 
 module.exports = function (uri, opts) {
-	var _db = null;
-	var _models = {};
-
 	opts = opts || {};
 
 	orm.connect(uri, function (err, db) {
 		if (err) {
 			if (typeof opts.error == "function") {
 				opts.error(err);
+			} else {
+				throw err;
 			}
 			return;
 		}
 
-		_db = db;
+		if (Array.isArray(_db)) {
+			_db.push(db);
+		} else if (_db !== null) {
+			_db = [ _db, db ];
+		} else {
+			_db = db;
+		}
 		if (typeof opts.define == "function") {
-			opts.define(db, _models, function () {
-				if (Object.keys(_models).length > 0) {
-					_db = _models;
-				}
-			});
+			opts.define(db, _models);
 		}
 	});
 
 	return function ORM(req, res, next) {
-		req.db = _db;
+		req.models = _models;
+		req.db     = _db;
 
 		return next();
 	};

From f29ed7359af59bf40568b71e0c6fa37d8d65a85f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 14 Mar 2013 20:57:11 +0000
Subject: [PATCH 0218/1246] Changes express middleware returned function to
 avoid assigned req.db and req.models more than once (#76)

---
 lib/Express.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/Express.js b/lib/Express.js
index 82091a31..0d36e226 100644
--- a/lib/Express.js
+++ b/lib/Express.js
@@ -28,6 +28,10 @@ module.exports = function (uri, opts) {
 	});
 
 	return function ORM(req, res, next) {
+		if (req.hasOwnProperty("models")) {
+			return next();
+		}
+
 		req.models = _models;
 		req.db     = _db;
 

From 9e4e71fb9b5b1d08524d29f947e78423eeb96fb1 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 15 Mar 2013 11:10:23 +0000
Subject: [PATCH 0219/1246] Removes unnecessary require() in
 Associations/Many.js

---
 lib/Associations/Many.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index a46762c7..4d5bf45d 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -1,5 +1,4 @@
 var InstanceConstructor = require("../Instance").Instance;
-var Singleton           = require("../Singleton");
 var Settings            = require("../Settings");
 var Property            = require("../Property");
 

From 0916416bacbf81921c49904b454253ba4c6fc56f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 15 Mar 2013 11:11:02 +0000
Subject: [PATCH 0220/1246] Changes Singleton to avoid cache if save_check
 option is enabled and cached instance is not saved (#78)

---
 lib/Singleton.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/Singleton.js b/lib/Singleton.js
index 08a72182..ec30c234 100644
--- a/lib/Singleton.js
+++ b/lib/Singleton.js
@@ -5,9 +5,12 @@ exports.get = function (key, opts, createCb, returnCb) {
 		return createCb(returnCb);
 	}
 	if (map.hasOwnProperty(key)) {
-		if (map[key].t !== null && map[key].t <= Date.now()) {
+		if (opts && opts.save_check && typeof map[key].o.saved == "function" && !map[key].o.saved()) {
+			// if not saved, don't return it, fetch original from db
+			return createCb(returnCb);
+		} else if (map[key].t !== null && map[key].t <= Date.now()) {
 			delete map[key];
-		} else {
+		} else  {
 			return returnCb(map[key].o);
 		}
 	}

From fe4a9e93dc922432f3328daa4391ef4070f89e4a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 15 Mar 2013 11:11:24 +0000
Subject: [PATCH 0221/1246] Adds default setting instance.cacheSaveCheck = true
 (#78)

---
 lib/Settings.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Settings.js b/lib/Settings.js
index 98186976..45e46897 100644
--- a/lib/Settings.js
+++ b/lib/Settings.js
@@ -5,6 +5,7 @@ var default_settings = {
 	},
 	instance   : {
 		cache           : true,
+		cacheSaveCheck  : true,
 		autoSave        : false,
 		autoFetch       : false,
 		autoFetchLimit  : 1,

From 0ab0d2450724ba7dbc136e645330634df536193a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 15 Mar 2013 11:11:48 +0000
Subject: [PATCH 0222/1246] Changes Model to pass instance.cacheSaveCheck
 setting to Singleton (#78)

---
 lib/Model.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/Model.js b/lib/Model.js
index 5a15e05e..bac0a3fe 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -150,7 +150,10 @@ function Model(opts) {
 			if (data.length === 0) {
 				return cb(new Error("Not found"));
 			}
-			Singleton.get(opts.table + "/" + id, { cache: options.cache }, function (cb) {
+			Singleton.get(opts.table + "/" + id, {
+				cache      : options.cache,
+				save_check : opts.settings.get("instance.cacheSaveCheck")
+			}, function (cb) {
 				return createInstance(data[0], {
 					autoSave       : opts.autoSave,
 					autoFetch      : (options.autoFetchLimit === 0 ? false : opts.autoFetch),
@@ -223,9 +226,10 @@ function Model(opts) {
 			merge      : merge,
 			offset     : options.offset,
 			newInstance: function (data, cb) {
-				Singleton.get(opts.table + (merge ? "+" + merge.from.table : "") + "/" + data[opts.id],
-				              { cache: options.cache },
-				function (cb) {
+				Singleton.get(opts.table + (merge ? "+" + merge.from.table : "") + "/" + data[opts.id], {
+					cache      : options.cache,
+					save_check : opts.settings.get("instance.cacheSaveCheck")
+				}, function (cb) {
 					return createInstance(data, {
 						autoSave       : opts.autoSave,
 						autoFetch      : (options.autoFetchLimit === 0 ? false : opts.autoFetch),

From 473a6f4ec38a101b4ab756bf09b600609f6662ff Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 15 Mar 2013 11:12:14 +0000
Subject: [PATCH 0223/1246] Fixes test-get-cache test for new behaviour (#78)

---
 test/integration/test-get-cache.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/test-get-cache.js b/test/integration/test-get-cache.js
index be18aad4..bbb0e169 100644
--- a/test/integration/test-get-cache.js
+++ b/test/integration/test-get-cache.js
@@ -23,7 +23,7 @@ common.createConnection(function (err, db) {
 					assert.equal(err, null);
 					assert.equal(typeof Instance2, "object");
 					assert.equal(Instance2.id, 1);
-					assert.equal(Instance2.name, 'test1');
+					assert.equal(Instance2.name, 'test'); // not saved
 					db.close();
 				});
 			});

From c5786406c63c750dfe475aa72f0cb03b60839182 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 15 Mar 2013 11:12:38 +0000
Subject: [PATCH 0224/1246] Adds test for cached Model.get() with
 instance.cacheSaveCheck disabled (#78)

---
 .../test-get-cache-no-save-check.js           | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 test/integration/test-get-cache-no-save-check.js

diff --git a/test/integration/test-get-cache-no-save-check.js b/test/integration/test-get-cache-no-save-check.js
new file mode 100644
index 00000000..31ae194d
--- /dev/null
+++ b/test/integration/test-get-cache-no-save-check.js
@@ -0,0 +1,34 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_get_cache', db.driver.db, function () {
+		common.insertModelData('test_get_cache', db.driver.db, [
+			{ id : 1, name : 'test' }
+		], function (err) {
+			if (err) throw err;
+
+			db.settings.set("instance.cacheSaveCheck", false);
+
+			var TestModel = db.define('test_get_cache', common.getModelProperties());
+
+			// this is the default, it's just here in case default changes..
+			TestModel.get(1, { cache: true }, function (err, Instance1) {
+				assert.equal(err, null);
+				assert.equal(typeof Instance1, "object");
+				assert.equal(Instance1.id, 1);
+				assert.equal(Instance1.name, 'test');
+
+				Instance1.name = 'test1';
+
+				TestModel.get(1, { cache: true }, function (err, Instance2) {
+					assert.equal(err, null);
+					assert.equal(typeof Instance2, "object");
+					assert.equal(Instance2.id, 1);
+					assert.equal(Instance2.name, 'test1'); // no save check
+					db.close();
+				});
+			});
+		});
+	});
+});

From ab6bb4aca89e05b408e431dc387cb5abb875c3f9 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sun, 17 Mar 2013 23:15:27 +0000
Subject: [PATCH 0225/1246] Changes sql-query dependency to 0.0.10

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1d7c9702..716b3a8c 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
   },
   "analyse": false,
   "dependencies": {
-    "sql-query": "0.0.9"
+    "sql-query": "0.0.10"
   },
   "devDependencies": {
     "utest": "0.0.6",

From c2e4ad143cd1824f5051aebdb18508f0a8b39002 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 19 Mar 2013 16:04:03 +0000
Subject: [PATCH 0226/1246] Updates sql-query dependency to 0.0.11

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 716b3a8c..9870c34c 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
   },
   "analyse": false,
   "dependencies": {
-    "sql-query": "0.0.10"
+    "sql-query": "0.0.11"
   },
   "devDependencies": {
     "utest": "0.0.6",

From 760d931eed0e9beb83ec4e470b3427d5199c7564 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 19 Mar 2013 16:04:22 +0000
Subject: [PATCH 0227/1246] Adds Model.aggregate()

---
 lib/AggregateFunctions.js | 68 +++++++++++++++++++++++++++++++++++++++
 lib/Model.js              |  7 ++++
 2 files changed, 75 insertions(+)
 create mode 100644 lib/AggregateFunctions.js

diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
new file mode 100644
index 00000000..0ff8b166
--- /dev/null
+++ b/lib/AggregateFunctions.js
@@ -0,0 +1,68 @@
+module.exports = AggregateFunctions;
+
+function AggregateFunctions(opts) {
+	if (typeof opts.driver.getQuery != "function") {
+		throw new Error("This driver does not support aggregate functions");
+	}
+
+	var aggregates = [ [] ];
+	var appendFunction = function (fun) {
+		return function () {
+			var args = (arguments.length && Array.isArray(arguments[0]) ? arguments[0] : Array.prototype.slice.apply(arguments));
+
+			if (args.length > 0) {
+				aggregates[aggregates.length - 1].push({ f: fun, a: args });
+				aggregates.push([]);
+			} else {
+				aggregates[aggregates.length - 1].push({ f: fun });
+			}
+
+			return proto;
+		};
+	};
+	var proto = {
+		avg   : appendFunction("avg"),
+		min   : appendFunction("min"),
+		max   : appendFunction("max"),
+		sum   : appendFunction("sum"),
+		count : appendFunction("count"),
+		get   : function (cb) {
+			if (typeof cb != "function") {
+				throw new Error("You must pass a callback to Model.aggregate().get()");
+			}
+			if (aggregates[aggregates.length - 1].length === 0) {
+				aggregates.length -= 1;
+			}
+			if (aggregates.length === 0) {
+				throw new Error("Missing aggregate functions");
+			}
+
+			var query = opts.driver.getQuery().select().from(opts.table);
+
+			for (var i = 0; i < aggregates.length; i++) {
+				for (var j = 0; j < aggregates[i].length; j++) {
+					query[aggregates[i][j].f](aggregates[i][j].a);
+				}
+			}
+
+			opts.driver.execQuery(query.build(), function (err, data) {
+				if (err) {
+					return cb(err);
+				}
+
+				var items = [];
+				for (var k in data[0]) {
+					if (!data[0].hasOwnProperty(k)) continue;
+
+					items.push(data[0][k]);
+				}
+
+				items.unshift(null);
+
+				return cb.apply(null, items);
+			});
+		}
+	};
+
+	return proto;
+}
diff --git a/lib/Model.js b/lib/Model.js
index bac0a3fe..60a3e101 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -280,6 +280,13 @@ function Model(opts) {
 		return this;
 	};
 
+	model.aggregate = function () {
+		return new require("./AggregateFunctions")({
+			table      : opts.table,
+			driver     : opts.driver
+		});
+	};
+
 	model.exists = function (id, cb) {
 		if (typeof cb != "function") {
 			throw new Error("Missing Model.exists() callback");

From f11e1cf8e333eeda04495d382531c83133c5a74f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 19 Mar 2013 16:04:40 +0000
Subject: [PATCH 0228/1246] Adds necessary support for Model.aggregate() to all
 drivers

---
 lib/Drivers/DML/mysql.js          | 12 ++++++++++++
 lib/Drivers/DML/postgres.js       |  8 ++++++++
 lib/Drivers/DML/postgresaxomic.js |  8 ++++++++
 lib/Drivers/DML/sqlite.js         |  8 ++++++++
 4 files changed, 36 insertions(+)

diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 9baba8a9..a8aea2f3 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -58,6 +58,18 @@ Driver.prototype.close = function (cb) {
 	this.db.end(cb);
 };
 
+Driver.prototype.getQuery = function () {
+	return this.query;
+};
+
+Driver.prototype.execQuery = function (query, cb) {
+	if (this.opts.pool) {
+		this.poolQuery(query, cb);
+	} else {
+		this.db.query(query, cb);
+	}
+};
+
 Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	var q = this.query.select()
 	                  .from(table).select(fields);
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index efd6a25a..993496c1 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -48,6 +48,14 @@ Driver.prototype.close = function (cb) {
 	this.db.end(cb);
 };
 
+Driver.prototype.getQuery = function () {
+	return this.query;
+};
+
+Driver.prototype.execQuery = function (query, cb) {
+	this.db.query(query, handleQuery(cb));
+};
+
 Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	var q = this.query.select()
 	                  .from(table).select(fields);
diff --git a/lib/Drivers/DML/postgresaxomic.js b/lib/Drivers/DML/postgresaxomic.js
index 0759ac74..c378f3ac 100644
--- a/lib/Drivers/DML/postgresaxomic.js
+++ b/lib/Drivers/DML/postgresaxomic.js
@@ -47,6 +47,14 @@ Driver.prototype.on = function (ev, cb) {
 	return this;
 };
 
+Driver.prototype.getQuery = function () {
+	return this.query;
+};
+
+Driver.prototype.execQuery = function (query, cb) {
+	this.hijackQuery(query, handleQuery(cb));
+};
+
 Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	var q = this.query.select()
 	                  .from(table).select(fields);
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index a3915a77..8eeae2b9 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -47,6 +47,14 @@ Driver.prototype.close = function (cb) {
 	if (typeof cb == "function") process.nextTick(cb);
 };
 
+Driver.prototype.getQuery = function () {
+	return this.query;
+};
+
+Driver.prototype.execQuery = function (query, cb) {
+	this.db.all(query, cb);
+};
+
 Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	var q = this.query.select()
 	                  .from(table).select(fields);

From 771b909e1816ca63418857ee668c8954e47807e1 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 19 Mar 2013 16:05:04 +0000
Subject: [PATCH 0229/1246] Adds test for Model.aggregate()

---
 test/integration/test-aggregate.js | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 test/integration/test-aggregate.js

diff --git a/test/integration/test-aggregate.js b/test/integration/test-aggregate.js
new file mode 100644
index 00000000..1a16fefa
--- /dev/null
+++ b/test/integration/test-aggregate.js
@@ -0,0 +1,26 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_count', db.driver.db, function () {
+		common.insertModelData('test_count', db.driver.db, [
+			{ id : 1, name : 'test1' },
+			{ id : 2, name : 'test2' },
+			{ id : 3, name : 'test3' },
+			{ id : 4, name : 'test4' },
+			{ id : 5, name : 'test5' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_count', common.getModelProperties());
+
+			TestModel.aggregate().count('id').min('id').max('id').get(function (err, count, min, max) {
+				assert.equal(err, null);
+				assert.equal(count, 5);
+				assert.equal(min, 1);
+				assert.equal(max, 5);
+				db.close();
+			});
+		});
+	});
+});

From 0ed2debeb91e78d8abbde7146c9b82d74a41920c Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 19 Mar 2013 16:08:32 +0000
Subject: [PATCH 0230/1246] Updates Readme to show an example of aggregating
 functions

---
 Readme.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Readme.md b/Readme.md
index 257fec23..41e7ffac 100644
--- a/Readme.md
+++ b/Readme.md
@@ -321,6 +321,17 @@ Person.exists({ surname: "Doe" }, function (err, exists) {
 });
 ```
 
+### Aggregating Functions
+
+If you need to get some aggregated values from a Model, you can use `Model.aggregate()`. Here's an example to better
+illustrate:
+
+```js
+Person.aggregate().min("age").max("age").get(function (err, min, max) {
+	console.log("The youngest guy has %d years, while the oldest is %d", min, max);
+});
+```
+
 ### Available options
 
 - `offset`: discards the first `N` elements

From 0e93d119aee54e35524b817987082df3c81e9c50 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 19 Mar 2013 16:14:14 +0000
Subject: [PATCH 0231/1246] Adds optional support for conditions in aggregating
 functions

Updates Readme with example, changes test to use a condition
---
 Readme.md                          | 12 ++++++++++--
 lib/AggregateFunctions.js          |  2 ++
 lib/Model.js                       |  5 +++--
 test/integration/test-aggregate.js |  6 +++---
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/Readme.md b/Readme.md
index 41e7ffac..d44013fb 100644
--- a/Readme.md
+++ b/Readme.md
@@ -327,11 +327,19 @@ If you need to get some aggregated values from a Model, you can use `Model.aggre
 illustrate:
 
 ```js
-Person.aggregate().min("age").max("age").get(function (err, min, max) {
-	console.log("The youngest guy has %d years, while the oldest is %d", min, max);
+Person.aggregate({ surname: "Doe" }).min("age").max("age").get(function (err, min, max) {
+	console.log("The youngest Doe guy has %d years, while the oldest is %d", min, max);
 });
 ```
 
+Possible aggregating functions:
+
+- `min`
+- `max`
+- `avg`
+- `sum`
+- `count` (there's a shortcut to this - `Model.count`)
+
 ### Available options
 
 - `offset`: discards the first `N` elements
diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index 0ff8b166..1cb3e69a 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -45,6 +45,8 @@ function AggregateFunctions(opts) {
 				}
 			}
 
+			query.where(opts.conditions);
+
 			opts.driver.execQuery(query.build(), function (err, data) {
 				if (err) {
 					return cb(err);
diff --git a/lib/Model.js b/lib/Model.js
index 60a3e101..f3c3379d 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -280,10 +280,11 @@ function Model(opts) {
 		return this;
 	};
 
-	model.aggregate = function () {
+	model.aggregate = function (conditions) {
 		return new require("./AggregateFunctions")({
 			table      : opts.table,
-			driver     : opts.driver
+			driver     : opts.driver,
+			conditions : conditions || {}
 		});
 	};
 
diff --git a/test/integration/test-aggregate.js b/test/integration/test-aggregate.js
index 1a16fefa..b8f05d4b 100644
--- a/test/integration/test-aggregate.js
+++ b/test/integration/test-aggregate.js
@@ -14,10 +14,10 @@ common.createConnection(function (err, db) {
 
 			var TestModel = db.define('test_count', common.getModelProperties());
 
-			TestModel.aggregate().count('id').min('id').max('id').get(function (err, count, min, max) {
+			TestModel.aggregate({ id: common.ORM.gt(2) }).count('id').min('id').max('id').get(function (err, count, min, max) {
 				assert.equal(err, null);
-				assert.equal(count, 5);
-				assert.equal(min, 1);
+				assert.equal(count, 3);
+				assert.equal(min, 3);
 				assert.equal(max, 5);
 				db.close();
 			});

From 5c5c8c2f1b1afa2e301f50cafb2fe98dddb76752 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 19 Mar 2013 16:27:08 +0000
Subject: [PATCH 0232/1246] Adds small note about caching and unsaved cache
 items

---
 Readme.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Readme.md b/Readme.md
index d44013fb..3e5e14f4 100644
--- a/Readme.md
+++ b/Readme.md
@@ -445,6 +445,9 @@ var Person = db.define('person', {
 The cache can be configured to expire after a period of time by passing in a number instead of a
 boolean. The number will be considered the cache timeout in seconds (you can use floating point).
 
+**Note**: One exception about Caching is that it won't be used if an instance is not saved. For example, if
+you fetch a Person and then change it, while it doesn't get saved it won't be passed from Cache.
+
 ## Creating Items
 
 ### Model.create(items, cb)

From 864051883b90bf3ec5b0055bd4046f8ac4161a19 Mon Sep 17 00:00:00 2001
From: Arek W <arek@locomote.com.au>
Date: Wed, 20 Mar 2013 12:55:41 +1100
Subject: [PATCH 0233/1246] Adds 'required' option to hasOne associations

---
 Readme.md                                     |  5 ++
 lib/Associations/One.js                       |  1 +
 lib/Drivers/DDL/mysql.js                      |  5 +-
 lib/Drivers/DDL/postgres.js                   |  6 ++-
 lib/Drivers/DDL/sqlite.js                     |  5 +-
 .../test-association-hasone-required.js       | 49 +++++++++++++++++++
 6 files changed, 68 insertions(+), 3 deletions(-)
 create mode 100644 test/integration/test-association-hasone-required.js

diff --git a/Readme.md b/Readme.md
index 3e5e14f4..234a3e7b 100644
--- a/Readme.md
+++ b/Readme.md
@@ -511,6 +511,11 @@ Animal.get(123, function (err, Foo) {
 });
 ```
 
+Wild animals don't have owners, so you can represent this with:
+```js
+Animal.hasOne("owner", Person, { required: false });
+```
+
 If you prefer to use another name for the field (owner_id) you can change this parameter in the settings.
 
 ```js
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index b48fb8d3..df17e187 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -16,6 +16,7 @@ exports.prepare = function (Model, associations, association_properties) {
 			autoFetch      : opts.autoFetch || false,
 			autoFetchLimit : opts.autoFetchLimit || 2,
 			field          : opts.field || Model.settings.get("properties.association_key").replace("{name}", name),
+			required       : 'required' in opts ? opts.required : true,
 			getAccessor    : opts.getAccessor || ("get" + assocName),
 			setAccessor    : opts.setAccessor || ("set" + assocName),
 			hasAccessor    : opts.hasAccessor || ("has" + assocName),
diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index 7319969d..03a926d1 100644
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -43,7 +43,10 @@ exports.sync = function (driver, opts, cb) {
 
 	for (i = 0; i < opts.one_associations.length; i++) {
 		if (opts.one_associations[i].reversed) continue;
-		definitions.push(driver.query.escapeId(opts.one_associations[i].field) + " INT(11) UNSIGNED NOT NULL");
+		definitions.push(
+			driver.query.escapeId(opts.one_associations[i].field) + " INT(11) UNSIGNED" +
+			(opts.one_associations[i].required ? ' NOT NULL' : '')
+		);
 	}
 
 	definitions.push("INDEX (" + driver.query.escapeId(opts.id) + ")");
diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index be7f460a..705e4b3d 100644
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -39,8 +39,12 @@ exports.sync = function (driver, opts, cb) {
 
 	for (i = 0; i < opts.one_associations.length; i++) {
 		if (opts.one_associations[i].reversed) continue;
-		definitions.push(driver.query.escapeId(opts.one_associations[i].field) + " INTEGER NOT NULL");
+		definitions.push(
+			driver.query.escapeId(opts.one_associations[i].field) + " INTEGER" +
+			(opts.one_associations[i].required ? ' NOT NULL' : '')
+		);
 	}
+
 	for (k in opts.properties) {
 		if (opts.properties[k].unique === true) {
 			definitions.push("UNIQUE (" + driver.query.escapeId(k) + ")");
diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index faa72978..06afcecc 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -30,7 +30,10 @@ exports.sync = function (driver, opts, cb) {
 
 	for (i = 0; i < opts.one_associations.length; i++) {
 		if (opts.one_associations[i].reversed) continue;
-		definitions.push(driver.query.escapeId(opts.one_associations[i].field) + " INTEGER UNSIGNED NOT NULL");
+		definitions.push(
+			driver.query.escapeId(opts.one_associations[i].field) + " INTEGER UNSIGNED" +
+			(opts.one_associations[i].required ? ' NOT NULL' : '')
+		);
 	}
 
 	queries.push(
diff --git a/test/integration/test-association-hasone-required.js b/test/integration/test-association-hasone-required.js
new file mode 100644
index 00000000..485aec2a
--- /dev/null
+++ b/test/integration/test-association-hasone-required.js
@@ -0,0 +1,49 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+  var testRequired = function(required, done) {
+    var Person = db.define('test_association_hasone_required_owner',  common.getModelProperties());
+    var Animal = db.define('test_association_hasone_required_animal', common.getModelProperties());
+    Animal.hasOne('owner', Person, { required: required });
+
+    if (!db.driver.sync) return;
+
+    var test = function(cb) {
+      Person.sync(function (err) {
+        assert(!err);
+        Animal.sync(function (err) {
+          assert(!err);
+
+          var john = new Person({name: 'John'});
+          john.save(function(err) {
+            assert(!err);
+
+            var emu = new Animal({name: 'emu'});
+            emu.save(function(err) {
+              // When required is true, there should be an error.
+              // When required is false, there should be no errors.
+              assert.equal(!!err, required);
+
+              cb();
+            });
+          });
+        });
+      });
+    }
+
+    Person.drop(function (err) {
+      Animal.drop(function (err) {
+        test(function() {
+          done();
+        });
+      });
+    });
+  }
+
+  testRequired(false, function() {
+    testRequired(true, function() {
+      db.close();
+    });
+  });
+});

From a671e10c9783d9aa7ac80d9ee0d720e1a1449c1a Mon Sep 17 00:00:00 2001
From: Arek W <arek@locomote.com.au>
Date: Wed, 20 Mar 2013 13:19:23 +1100
Subject: [PATCH 0234/1246] Stop mysql auto-inserting 0 into owner_id field

---
 test/integration/test-association-hasone-required.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/test-association-hasone-required.js b/test/integration/test-association-hasone-required.js
index 485aec2a..9d5f4bc5 100644
--- a/test/integration/test-association-hasone-required.js
+++ b/test/integration/test-association-hasone-required.js
@@ -19,7 +19,7 @@ common.createConnection(function (err, db) {
           john.save(function(err) {
             assert(!err);
 
-            var emu = new Animal({name: 'emu'});
+            var emu = new Animal({name: 'emu', owner_id: null});
             emu.save(function(err) {
               // When required is true, there should be an error.
               // When required is false, there should be no errors.

From d1d35bf7a9b0d951b8b3ee242d11e4474850b143 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 21 Mar 2013 11:29:47 +1100
Subject: [PATCH 0235/1246] Make required false by default

---
 lib/Associations/One.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index df17e187..6004e2bf 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -16,7 +16,7 @@ exports.prepare = function (Model, associations, association_properties) {
 			autoFetch      : opts.autoFetch || false,
 			autoFetchLimit : opts.autoFetchLimit || 2,
 			field          : opts.field || Model.settings.get("properties.association_key").replace("{name}", name),
-			required       : 'required' in opts ? opts.required : true,
+			required       : opts.required || false,
 			getAccessor    : opts.getAccessor || ("get" + assocName),
 			setAccessor    : opts.setAccessor || ("set" + assocName),
 			hasAccessor    : opts.hasAccessor || ("has" + assocName),

From 779143997f325d6db5ec87156ff77eede65acbdc Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 21 Mar 2013 11:39:57 +1100
Subject: [PATCH 0236/1246] Reflect default hasOne required value change.

---
 Readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Readme.md b/Readme.md
index 234a3e7b..2ea64775 100644
--- a/Readme.md
+++ b/Readme.md
@@ -511,9 +511,9 @@ Animal.get(123, function (err, Foo) {
 });
 ```
 
-Wild animals don't have owners, so you can represent this with:
+You can mark the `owner_id` field as required in the database by specifying the `required` option:
 ```js
-Animal.hasOne("owner", Person, { required: false });
+Animal.hasOne("owner", Person, { required: true });
 ```
 
 If you prefer to use another name for the field (owner_id) you can change this parameter in the settings.

From 347b65f75d285c652f5b1180846ef46ee043af2e Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Mar 2013 23:48:23 +0000
Subject: [PATCH 0237/1246] Reindents package.json, adds hat as new dependency
 for driver uid generation (#86)

---
 package.json | 57 ++++++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 9870c34c..08708a4b 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
-  "author": "Diogo Resende <dresende@thinkdigital.pt>",
-  "name": "orm",
-  "description": "NodeJS Object-relational mapping",
-  "keywords": [
+  "author"      : "Diogo Resende <dresende@thinkdigital.pt>",
+  "name"        : "orm",
+  "description" : "NodeJS Object-relational mapping",
+  "keywords"    : [
     "orm",
     "odm",
     "database",
@@ -11,39 +11,40 @@
     "redshift",
     "sqlite"
   ],
-  "version": "2.0.5",
-  "license": "MIT",
-  "repository": {
-    "url": "http://dresende.github.com/node-orm2"
+  "version"     : "2.0.5",
+  "license"     : "MIT",
+  "repository"  : {
+    "url"            : "http://dresende.github.com/node-orm2"
   },
-  "scripts": {
-    "test": "make"
+  "scripts"     : {
+    "test"           : "make"
   },
   "contributors": [
-    { "name": "Bramus Van Damme", "email": "bramus@bram.us" },
-    { "name": "Lorien Gamaroff", "email": "lorien@gamaroff.org" },
-    { "name": "preslavrachev" },
-    { "name": "Chris Cowan", "email": "me@chriscowan.us" },
-    { "name": "Paul Dixon", "email": "paul.dixon@mintbridge.co.uk" },
-    { "name": "David Kosub" }
+    { "name" : "Bramus Van Damme", "email" : "bramus@bram.us" },
+    { "name" : "Lorien Gamaroff",  "email" : "lorien@gamaroff.org" },
+    { "name" : "preslavrachev" },
+    { "name" : "Chris Cowan",      "email" : "me@chriscowan.us" },
+    { "name" : "Paul Dixon",       "email" : "paul.dixon@mintbridge.co.uk" },
+    { "name" : "David Kosub" }
   ],
-  "main": "./lib/ORM",
-  "scripts": {
-    "test": "make test"
+  "main"        : "./lib/ORM",
+  "scripts"     : {
+    "test"           : "make test"
   },
-  "engines": {
-    "node": "*"
+  "engines"     : {
+    "node"           : "*"
   },
-  "analyse": false,
+  "analyse"     : false,
   "dependencies": {
-    "sql-query": "0.0.11"
+    "sql-query"      : "0.0.11",
+    "hat"            : "0.0.3"
   },
   "devDependencies": {
-    "utest": "0.0.6",
-    "urun": "0.0.6",
-    "mysql": "2.0.0-alpha7",
-    "pg": "0.8.7",
-    "sqlite3": "2.1.5"
+    "utest"     : "0.0.6",
+    "urun"      : "0.0.6",
+    "mysql"     : "2.0.0-alpha7",
+    "pg"        : "0.8.7",
+    "sqlite3"   : "2.1.5"
   },
   "optionalDependencies": {}
 }

From 45917431b7de4dee9403ead128ef06b96e624285 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Mar 2013 23:48:46 +0000
Subject: [PATCH 0238/1246] Generates an uid for every driver instance (#86)

---
 lib/ORM.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/ORM.js b/lib/ORM.js
index 9701d559..2638c73e 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -1,6 +1,7 @@
 var util           = require("util");
 var events         = require("events");
 var path           = require("path");
+var hat            = require("hat");
 var Query          = require("sql-query");
 
 var Model          = require("./Model").Model;
@@ -103,6 +104,7 @@ function ORM(driver, settings) {
 	this.validators = Validators;
 	this.settings   = settings;
 	this.driver     = driver;
+	this.driver.uid = hat();
 	this.tools      = {};
 	this.models     = {};
 

From 366225f07cb8fea3809487e0b38bcf3fa491d621 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Mar 2013 23:49:49 +0000
Subject: [PATCH 0239/1246] Changes singleton uid creation to use driver uid
 (#86)

---
 lib/Model.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Model.js b/lib/Model.js
index f3c3379d..cac2e1d6 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -150,7 +150,7 @@ function Model(opts) {
 			if (data.length === 0) {
 				return cb(new Error("Not found"));
 			}
-			Singleton.get(opts.table + "/" + id, {
+			Singleton.get(opts.driver.uid + "/" + opts.table + "/" + id, {
 				cache      : options.cache,
 				save_check : opts.settings.get("instance.cacheSaveCheck")
 			}, function (cb) {
@@ -226,7 +226,7 @@ function Model(opts) {
 			merge      : merge,
 			offset     : options.offset,
 			newInstance: function (data, cb) {
-				Singleton.get(opts.table + (merge ? "+" + merge.from.table : "") + "/" + data[opts.id], {
+				Singleton.get(opts.driver.uid + "/" + opts.table + (merge ? "+" + merge.from.table : "") + "/" + data[opts.id], {
 					cache      : options.cache,
 					save_check : opts.settings.get("instance.cacheSaveCheck")
 				}, function (cb) {

From 04c812b3ca9d0ce87fc1597ea88a17395129c392 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 21 Mar 2013 23:59:33 +0000
Subject: [PATCH 0240/1246] Changes db.load to avoid lint errors on condition
 assignment

---
 lib/ORM.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index 2638c73e..9ad73901 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -161,9 +161,9 @@ ORM.prototype.load = function (file, cb) {
 	var err = new Error();
 	var tmp = err.stack.split(/\r?\n/)[2], m;
 
-	if (m = tmp.match(/^\s*at\s+(.+):\d+:\d+$/)) {
+	if ((m = tmp.match(/^\s*at\s+(.+):\d+:\d+$/)) !== null) {
 		cwd = path.dirname(m[1]);
-	} else if (m = tmp.match(/^\s*at\s+module\.exports\s+\((.+?)\)/)) {
+	} else if ((m = tmp.match(/^\s*at\s+module\.exports\s+\((.+?)\)/)) !== null) {
 		cwd = path.dirname(m[1]);
 	}
 

From 2e45fd0cc28a752997ff828457bdace6d56e31d0 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 22 Mar 2013 10:37:22 +0000
Subject: [PATCH 0241/1246] Changes Readme orm.express example and adds a note
 about multiple connections

---
 Readme.md | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/Readme.md b/Readme.md
index 2ea64775..ec7a8639 100644
--- a/Readme.md
+++ b/Readme.md
@@ -87,28 +87,13 @@ app.listen(80);
 
 app.get("/", function (req, res) {
 	// access db using req.db
-	req.db.models.person.find(...);
+	req.models.person.find(...);
 });
 ```
 
-If you prefer, you can have direct access to the models you define.
-
-```js
-// ...
-app.use(orm.express("mysql://username:password@host/database", {
-	define: function (db, models, next) {
-		models.Person = db.define("person", { ... });
-
-		return next();
-	}
-}));
-// ...
-app.get("/", function (req, res) {
-	req.db.Person.find(...);
-});
-```
-
-This also allows you to asynchronously load the models.
+You can call `orm.express` more than once to have multiple database connections. Models defined across connections
+will be joined together in `req.models`. **Don't forget to use it before `app.use(app.router)`, preferably right after your
+assets public folder(s).**
 
 ## Settings
 

From dbe879017713e2451ddad0824f94ad162a058fbb Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 22 Mar 2013 10:45:56 +0000
Subject: [PATCH 0242/1246] Changes Model.drop and Model.sync to be resistive
 to no callback

---
 lib/Model.js                           |  6 ++++++
 test/integration/test-drop-no-throw.js | 21 +++++++++++++++++++++
 test/integration/test-sync-no-throw.js | 14 ++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 test/integration/test-drop-no-throw.js
 create mode 100644 test/integration/test-sync-no-throw.js

diff --git a/lib/Model.js b/lib/Model.js
index cac2e1d6..cae6591a 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -93,6 +93,9 @@ function Model(opts) {
 	model.settings = opts.settings;
 
 	model.drop = function (cb) {
+		if (arguments.length === 0) {
+			cb = function () {};
+		}
 		if (typeof opts.driver.drop == "function") {
 			opts.driver.drop({
 				id                : opts.id,
@@ -109,6 +112,9 @@ function Model(opts) {
 	};
 
 	model.sync = function (cb) {
+		if (arguments.length === 0) {
+			cb = function () {};
+		}
 		if (typeof opts.driver.sync == "function") {
 			opts.driver.sync({
 				id                : opts.id,
diff --git a/test/integration/test-drop-no-throw.js b/test/integration/test-drop-no-throw.js
new file mode 100644
index 00000000..15f6a676
--- /dev/null
+++ b/test/integration/test-drop-no-throw.js
@@ -0,0 +1,21 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	var TestModel = db.define('test_drop', common.getModelProperties());
+
+	TestModel.sync(function (err) {
+		if (err !== null) {
+			// not supported by all drivers
+			return db.close();
+		}
+
+		assert.doesNotThrow(function () {
+			TestModel.drop();
+		});
+
+		setTimeout(function () {
+			db.close();
+		}, 500);
+	});
+});
diff --git a/test/integration/test-sync-no-throw.js b/test/integration/test-sync-no-throw.js
new file mode 100644
index 00000000..3342e356
--- /dev/null
+++ b/test/integration/test-sync-no-throw.js
@@ -0,0 +1,14 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	var TestModel = db.define('test_sync', common.getModelProperties());
+
+	assert.doesNotThrow(function () {
+		TestModel.sync();
+	});
+
+	setTimeout(function () {
+		db.close();
+	}, 500);
+});

From 56e7814ae5127902888f3aa649d9fcd2b7b76ea0 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 22 Mar 2013 10:47:28 +0000
Subject: [PATCH 0243/1246] Changes ORM.sync() to also be resistant to no
 callback

---
 lib/ORM.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/ORM.js b/lib/ORM.js
index 9ad73901..6db12474 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -200,6 +200,10 @@ ORM.prototype.sync = function (cb) {
 		});
 	}.bind(this);
 
+	if (arguments.length === 0) {
+		cb = function () {};
+	}
+
 	syncNext();
 
 	return this;

From c29ab68d61d44df2f7f5e30a090e592d9e0052db Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 22 Mar 2013 10:49:56 +0000
Subject: [PATCH 0244/1246] Fixes Readme Express example

---
 Readme.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Readme.md b/Readme.md
index ec7a8639..35ae8452 100644
--- a/Readme.md
+++ b/Readme.md
@@ -79,14 +79,14 @@ var orm = require('orm');
 var app = express();
 
 app.use(orm.express("mysql://username:password@host/database", {
-	define: function (db) {
-		db.define("person", { ... });
+	define: function (db, models) {
+		models.person = db.define("person", { ... });
 	}
 }));
 app.listen(80);
 
 app.get("/", function (req, res) {
-	// access db using req.db
+	// req.models is a reference to models used above in define()
 	req.models.person.find(...);
 });
 ```

From eefe1b7054efa91f78ea2b81aa21a8bd1c38ecbc Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 22 Mar 2013 11:42:50 +0000
Subject: [PATCH 0245/1246] 2.0.6

---
 Changelog.md | 14 ++++++++++++++
 Readme.md    |  2 +-
 package.json |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index d0a11e10..e5811c46 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,17 @@
+### v2.0.6 - 22 Mar 2013
+
+- Changes orm.connect to check connection url/opts to avoid throwing some errors about missing protocol or database (#75)
+- Hardens some validators againt null/undefined, changes match validator to avoid compiling regex everytime it's called
+- Changes back default instance properties to null instead of undefined
+- Changes Express middleware to be able to have more than one connection (#76)
+- Changes Singleton to avoid cache if save_check option is enabled and cached instance is not saved (#78)
+- Adds Model.aggregate()
+- Adds 'required' option to hasOne associations
+- Changes singleton uid creation to use driver uid (#86)
+- Changes Model.drop and Model.sync to be resistive to no callback
+- Changes ORM.sync() to also be resistant to no callback
+- Many bug fixes
+
 ### v2.0.5 - 13 Mar 2013
 
 - Uses sql-query for SQL query building
diff --git a/Readme.md b/Readme.md
index 35ae8452..4ab0edb7 100644
--- a/Readme.md
+++ b/Readme.md
@@ -8,7 +8,7 @@
 npm install orm
 ```
 
-Current stable version: **2.0.5**
+Current stable version: **2.0.6**
 
 ## DBMS Support
 
diff --git a/package.json b/package.json
index 08708a4b..b3b51a03 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "redshift",
     "sqlite"
   ],
-  "version"     : "2.0.5",
+  "version"     : "2.0.6",
   "license"     : "MIT",
   "repository"  : {
     "url"            : "http://dresende.github.com/node-orm2"

From 277048a96f42f7b3aed9ead34075bf205bd3e91f Mon Sep 17 00:00:00 2001
From: Jan Nikolas Jansen <jansen@ventech.de>
Date: Fri, 22 Mar 2013 15:27:35 +0100
Subject: [PATCH 0246/1246] Fixed SQLite driver writing to console when it
 should not

---
 lib/Drivers/DDL/sqlite.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index 06afcecc..36931241 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -83,7 +83,7 @@ exports.sync = function (driver, opts, cb) {
 	pending = queries.length;
 	for (i = 0; i < queries.length; i++) {
 		driver.db.all(queries[i], function (err) {
-			console.log(err);
+			if(err) console.log(err);
 			if (--pending === 0) {
 				return cb(err);
 			}

From 72198e5ad5fa242c2e8584265995d8da091b1d86 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 25 Mar 2013 19:48:20 +0000
Subject: [PATCH 0247/1246] Adds fury.io npm package version badge

---
 Readme.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Readme.md b/Readme.md
index 4ab0edb7..e972f152 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,6 +1,6 @@
 ## Object Relational Mapping
 
-[![Build Status](https://secure.travis-ci.org/dresende/node-orm2.png)](http://travis-ci.org/dresende/node-orm2)
+[![Build Status](https://secure.travis-ci.org/dresende/node-orm2.png)](http://travis-ci.org/dresende/node-orm2) [![](https://badge.fury.io/js/orm.png)](https://npmjs.org/package/orm)
 
 ## Install
 
@@ -8,8 +8,6 @@
 npm install orm
 ```
 
-Current stable version: **2.0.6**
-
 ## DBMS Support
 
 - MySQL

From bf80407d851ae70b9add585cb335b4b0f56710ea Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 26 Mar 2013 17:43:51 +0000
Subject: [PATCH 0248/1246] Moves Model.find() limit to options, adds test for
 it (#93)

It's still available has it was, the move is internal
---
 lib/Associations/Many.js                      | 13 +++++------
 lib/Model.js                                  |  5 ++---
 .../integration/test-find-limit-in-options.js | 22 +++++++++++++++++++
 3 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 test/integration/test-find-limit-in-options.js

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 4d5bf45d..c4f7315e 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -136,11 +136,10 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 	});
 	Object.defineProperty(Instance, association.getAccessor, {
 		value: function () {
+			var options    = {};
 			var conditions = null;
-			var options = {};
-			var limit;
-			var order = null;
-			var cb = null;
+			var order      = null;
+			var cb         = null;
 
 			for (var i = 0; i < arguments.length; i++) {
 				switch (typeof arguments[i]) {
@@ -160,7 +159,7 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 						}
 						break;
 					case "number":
-						limit = arguments[i];
+						options.limit = arguments[i];
 						break;
 				}
 			}
@@ -188,10 +187,10 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 			options.__merge.where[1][association.mergeId] = Instance[Model.id];
 
 			if (cb === null) {
-				return association.model.find(conditions, limit, options);
+				return association.model.find(conditions, options);
 			}
 
-			association.model.find(conditions, limit, options, cb);
+			association.model.find(conditions, options, cb);
 			return this;
 		},
 		enumerable: false
diff --git a/lib/Model.js b/lib/Model.js
index cae6591a..8e2fe370 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -178,14 +178,13 @@ function Model(opts) {
 		var options    = {};
 		var conditions = null;
 		var cb         = null;
-		var limit      = null;
 		var order      = null;
 		var merge      = null;
 
 		for (var i = 0; i < arguments.length; i++) {
 			switch (typeof arguments[i]) {
 				case "number":
-					limit = arguments[i];
+					options.limit = arguments[i];
 					break;
 				case "object":
 					if (Array.isArray(arguments[i])) {
@@ -227,7 +226,7 @@ function Model(opts) {
 			table      : opts.table,
 			driver     : opts.driver,
 			conditions : conditions,
-			limit      : limit,
+			limit      : options.limit,
 			order      : order,
 			merge      : merge,
 			offset     : options.offset,
diff --git a/test/integration/test-find-limit-in-options.js b/test/integration/test-find-limit-in-options.js
new file mode 100644
index 00000000..8afbd482
--- /dev/null
+++ b/test/integration/test-find-limit-in-options.js
@@ -0,0 +1,22 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_find_limit', db.driver.db, function () {
+		common.insertModelData('test_find_limit', db.driver.db, [
+			{ id : 1, name : 'test1' },
+			{ id : 2, name : 'test2' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_find_limit', common.getModelProperties());
+
+			TestModel.find({}, { limit: 1 }, function (err, Instances) {
+				assert.equal(err, null);
+				assert.equal(Array.isArray(Instances), true);
+				assert.equal(Instances.length, 1);
+				db.close();
+			});
+		});
+	});
+});

From cedfc59eea4d04b3684ad0fc85ce67e5d0cb192c Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 26 Mar 2013 17:53:13 +0000
Subject: [PATCH 0249/1246] Changes Express middleware to wait for connections
 (errored or not) before processing requests (#92)

---
 lib/Express.js | 39 +++++++++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/lib/Express.js b/lib/Express.js
index 0d36e226..b7575fb4 100644
--- a/lib/Express.js
+++ b/lib/Express.js
@@ -1,18 +1,25 @@
-var orm     = require("./ORM");
-var _models = {};
-var _db     = null;
+var orm      = require("./ORM");
+var _models  = {};
+var _db      = null;
+var _pending = 0;
+var _queue   = [];
 
 module.exports = function (uri, opts) {
 	opts = opts || {};
 
+	_pending += 1;
+
 	orm.connect(uri, function (err, db) {
+		_pending -= 1;
+
 		if (err) {
 			if (typeof opts.error == "function") {
 				opts.error(err);
 			} else {
 				throw err;
 			}
-			return;
+
+			return checkRequestQueue();
 		}
 
 		if (Array.isArray(_db)) {
@@ -25,16 +32,32 @@ module.exports = function (uri, opts) {
 		if (typeof opts.define == "function") {
 			opts.define(db, _models);
 		}
+
+		return checkRequestQueue();
 	});
 
 	return function ORM(req, res, next) {
-		if (req.hasOwnProperty("models")) {
-			return next();
+		if (!req.hasOwnProperty("models")) {
+			req.models = _models;
+			req.db     = _db;
 		}
 
-		req.models = _models;
-		req.db     = _db;
+		if (_pending > 0) {
+			_queue.push(next);
+			return;
+		}
 
 		return next();
 	};
 };
+
+function checkRequestQueue() {
+	if (_pending > 0) return;
+	if (_queue.length === 0) return;
+
+	for (var i = 0; i < _queue.length; i++) {
+		_queue[i]();
+	}
+
+	_queue.length = 0;
+}

From 6beae85374b8fd3f29ec0aaa88a490f2031ddca7 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 28 Mar 2013 11:44:55 +0000
Subject: [PATCH 0250/1246] Avoids loosing previously set limit (if set) on
 Model.fin() (#93)

---
 lib/Model.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/Model.js b/lib/Model.js
index 8e2fe370..e9fbee30 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -195,7 +195,11 @@ function Model(opts) {
 						if (conditions === null) {
 							conditions = arguments[i];
 						} else {
+							if (options.hasOwnProperty("limit")) {
+								arguments[i].limit = options.limit;
+							}
 							options = arguments[i];
+
 							if (options.hasOwnProperty("__merge")) {
 								merge = options.__merge;
 								delete options.__merge;

From 0e066dad252156dc51a3b8beb319d20bd9ff9f53 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Apr 2013 00:06:34 +0100
Subject: [PATCH 0251/1246] Fixes hasMany getAccessor when using an Array as
 only argument (specific properties)

---
 lib/Associations/Many.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index c4f7315e..4236580d 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -147,12 +147,12 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 						cb = arguments[i];
 						break;
 					case "object":
-						if (conditions === null) {
-							conditions = arguments[i];
+						if (Array.isArray(arguments[i])) {
+							order = arguments[i];
+							order[0] = [ association.model.table, order[0] ];
 						} else {
-							if (Array.isArray(arguments[i])) {
-								order = arguments[i];
-								order[0] = [ association.model.table, order[0] ];
+							if (conditions === null) {
+								conditions = arguments[i];
 							} else {
 								options = arguments[i];
 							}

From 4acea52fa7b08da8054f6530738d37e2230590f5 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Apr 2013 00:08:17 +0100
Subject: [PATCH 0252/1246] Adds ChainFind .last() (similar to .first())

---
 lib/ChainFind.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index f1242203..6e040b87 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -68,6 +68,11 @@ function ChainFind(opts) {
 				return cb(err, items.length > 0 ? items[0] : null);
 			});
 		},
+		last: function (cb) {
+			return this.run(function (err, items) {
+				return cb(err, items.length > 0 ? items[items.length - 1] : null);
+			});
+		},
 		each: function (cb) {
 			return new ChainInstance(this, cb);
 		},

From 1542db2294fe79c0bd58ca3851d59ae37bc7acaf Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Apr 2013 00:11:27 +0100
Subject: [PATCH 0253/1246] Adds tests for ChainFind .first() and .last()

---
 test/integration/test-find-chain-first.js | 22 ++++++++++++++++++++++
 test/integration/test-find-chain-last.js  | 22 ++++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 test/integration/test-find-chain-first.js
 create mode 100644 test/integration/test-find-chain-last.js

diff --git a/test/integration/test-find-chain-first.js b/test/integration/test-find-chain-first.js
new file mode 100644
index 00000000..2f9f0d04
--- /dev/null
+++ b/test/integration/test-find-chain-first.js
@@ -0,0 +1,22 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_find_first', db.driver.db, function () {
+		common.insertModelData('test_find_first', db.driver.db, [
+			{ id : 1, name : 'test2' },
+			{ id : 2, name : 'test1' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_find_first', common.getModelProperties());
+
+			TestModel.find().order("name").first(function (err, Instance) {
+				assert.equal(err, null);
+				assert.equal(Instance.id, 2);
+				assert.equal(Instance.name, "test1");
+				db.close();
+			});
+		});
+	});
+});
diff --git a/test/integration/test-find-chain-last.js b/test/integration/test-find-chain-last.js
new file mode 100644
index 00000000..8df8332a
--- /dev/null
+++ b/test/integration/test-find-chain-last.js
@@ -0,0 +1,22 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_find_last', db.driver.db, function () {
+		common.insertModelData('test_find_last', db.driver.db, [
+			{ id : 1, name : 'test2' },
+			{ id : 2, name : 'test1' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_find_last', common.getModelProperties());
+
+			TestModel.find().order("name").last(function (err, Instance) {
+				assert.equal(err, null);
+				assert.equal(Instance.id, 1);
+				assert.equal(Instance.name, "test2");
+				db.close();
+			});
+		});
+	});
+});

From d94709ac57ee537927efb32063c3f1fe9e62f89b Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Apr 2013 00:24:43 +0100
Subject: [PATCH 0254/1246] Fixes hasMany acessor names to correctly convert
 prop_name to PropName (underscores)

---
 lib/Associations/Many.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 4236580d..bf15e71e 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -342,7 +342,9 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 }
 
 function ucfirst(text) {
-	return text[0].toUpperCase() + text.substr(1);
+	return text[0].toUpperCase() + text.substr(1).replace(/_([a-z])/, function (m, l) {
+		return l.toUpperCase();
+	});
 }
 
 function noOperation() {

From 343569dc1e9c3238c95d5b97fbcccfa1fcef5649 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Apr 2013 01:19:30 +0100
Subject: [PATCH 0255/1246] Updates sql-query dependency to 0.0.12

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b3b51a03..73fb10a6 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
   },
   "analyse"     : false,
   "dependencies": {
-    "sql-query"      : "0.0.11",
+    "sql-query"      : "0.0.12",
     "hat"            : "0.0.3"
   },
   "devDependencies": {

From e9dcec64f83dc005d221c41fe4bb35b54ab2854f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Apr 2013 01:20:26 +0100
Subject: [PATCH 0256/1246] Passes hasMany associations to ChainFind

---
 lib/Model.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/Model.js b/lib/Model.js
index e9fbee30..8facea42 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -225,16 +225,17 @@ function Model(opts) {
 		}
 
 		var chain = new ChainFind({
-			only       : options.only || model_fields,
-			id         : opts.id,
-			table      : opts.table,
-			driver     : opts.driver,
-			conditions : conditions,
-			limit      : options.limit,
-			order      : order,
-			merge      : merge,
-			offset     : options.offset,
-			newInstance: function (data, cb) {
+			only         : options.only || model_fields,
+			id           : opts.id,
+			table        : opts.table,
+			driver       : opts.driver,
+			conditions   : conditions,
+			associations : many_associations,
+			limit        : options.limit,
+			order        : order,
+			merge        : merge,
+			offset       : options.offset,
+			newInstance  : function (data, cb) {
 				Singleton.get(opts.driver.uid + "/" + opts.table + (merge ? "+" + merge.from.table : "") + "/" + data[opts.id], {
 					cache      : options.cache,
 					save_check : opts.settings.get("instance.cacheSaveCheck")

From d371e07ad9241459a0c10fd3d1652f35772734f0 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Apr 2013 01:23:55 +0100
Subject: [PATCH 0257/1246] Adds hasMany hasAcessor conditional to ChainFind
 (#94)

---
 lib/ChainFind.js                  | 30 ++++++++++++++++++++++++++++--
 lib/Drivers/DML/mysql.js          | 14 +++++++++++---
 lib/Drivers/DML/postgres.js       | 14 +++++++++++---
 lib/Drivers/DML/postgresaxomic.js | 14 +++++++++++---
 lib/Drivers/DML/sqlite.js         | 14 +++++++++++---
 5 files changed, 72 insertions(+), 14 deletions(-)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 6e040b87..7121922f 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -4,7 +4,7 @@ var ChainInstance   = require("./ChainInstance");
 module.exports = ChainFind;
 
 function ChainFind(opts) {
-	return {
+	var chain = {
 		only: function () {
 			if (arguments.length && Array.isArray(arguments[0])) {
 				opts.only = arguments[0];
@@ -81,7 +81,8 @@ function ChainFind(opts) {
 				limit  : opts.limit,
 				order  : opts.order,
 				merge  : opts.merge,
-				offset : opts.offset
+				offset : opts.offset,
+				exists : opts.exists
 			}, function (err, data) {
 				if (err) {
 					return cb(err);
@@ -106,4 +107,29 @@ function ChainFind(opts) {
 			return this;
 		}
 	};
+	if (opts.associations) {
+		for (var i = 0; i < opts.associations.length; i++) {
+			addChainMethod(chain, opts.associations[i], opts);
+		}
+	}
+	return chain;
+}
+
+function addChainMethod(chain, association, opts) {
+	chain[association.hasAccessor] = function (value) {
+		if (!opts.exists) {
+			opts.exists = [];
+		}
+		var conditions = {};
+
+		conditions[association.mergeAssocId] = value;
+
+		opts.exists.push({
+			table      : association.mergeTable,
+			link       : [ association.mergeId, association.model.id ],
+			conditions : conditions
+		});
+
+		return chain;
+	};
 }
diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index a8aea2f3..2fa616b4 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -90,14 +90,22 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	if (opts.merge) {
 		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
 		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
-			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions).build();
+			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions);
 		} else {
-			q = q.where(conditions).build();
+			q = q.where(conditions);
 		}
 	} else {
-		q = q.where(conditions).build();
+		q = q.where(conditions);
 	}
 
+	if (opts.exists) {
+		for (var k in opts.exists) {
+			q.whereExists(opts.exists[k].table, table, opts.exists[k].link, opts.exists[k].conditions);
+		}
+	}
+
+	q = q.build();
+
 	if (this.opts.pool) {
 		this.poolQuery(q, cb);
 	} else {
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 993496c1..d3f79c2f 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -73,14 +73,22 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	if (opts.merge) {
 		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
 		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
-			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions).build();
+			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions);
 		} else {
-			q = q.where(conditions).build();
+			q = q.where(conditions);
 		}
 	} else {
-		q = q.where(conditions).build();
+		q = q.where(conditions);
 	}
 
+	if (opts.exists) {
+		for (var k in opts.exists) {
+			q.whereExists(opts.exists[k].table, table, opts.exists[k].link, opts.exists[k].conditions);
+		}
+	}
+
+	q = q.build();
+
 	if (this.opts.debug) {
 		require("../../Debug").sql('postgres', q);
 	}
diff --git a/lib/Drivers/DML/postgresaxomic.js b/lib/Drivers/DML/postgresaxomic.js
index c378f3ac..6b6595a5 100644
--- a/lib/Drivers/DML/postgresaxomic.js
+++ b/lib/Drivers/DML/postgresaxomic.js
@@ -72,14 +72,22 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	if (opts.merge) {
 		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
 		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
-			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions).build();
+			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions);
 		} else {
-			q = q.where(conditions).build();
+			q = q.where(conditions);
 		}
 	} else {
-		q = q.where(conditions).build();
+		q = q.where(conditions);
 	}
 
+	if (opts.exists) {
+		for (var k in opts.exists) {
+			q.whereExists(opts.exists[k].table, table, opts.exists[k].link, opts.exists[k].conditions);
+		}
+	}
+
+	q = q.build();
+
 	if (this.opts.debug) {
 		require("../Debug").sql('postgres', q);
 	}
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 8eeae2b9..9fdf2449 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -75,14 +75,22 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	if (opts.merge) {
 		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
 		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
-			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions).build();
+			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions);
 		} else {
-			q = q.where(conditions).build();
+			q = q.where(conditions);
 		}
 	} else {
-		q = q.where(conditions).build();
+		q = q.where(conditions);
 	}
 
+	if (opts.exists) {
+		for (var k in opts.exists) {
+			q.whereExists(opts.exists[k].table, table, opts.exists[k].link, opts.exists[k].conditions);
+		}
+	}
+
+	q = q.build();
+
 	if (this.opts.debug) {
 		require("../../Debug").sql('sqlite', q);
 	}

From 481a9841ad9d9d685e35da885893cc879b02fc89 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Apr 2013 11:57:46 +0100
Subject: [PATCH 0258/1246] Adds support for hasMany hasAccessor conditional to
 ChainFind.count() (#94)

---
 lib/Drivers/DML/mysql.js          | 14 +++++++++++---
 lib/Drivers/DML/postgres.js       | 14 +++++++++++---
 lib/Drivers/DML/postgresaxomic.js | 14 +++++++++++---
 lib/Drivers/DML/sqlite.js         | 14 +++++++++++---
 4 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 2fa616b4..56236f5d 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -124,14 +124,22 @@ Driver.prototype.count = function (table, conditions, opts, cb) {
 	if (opts.merge) {
 		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
 		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
-			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions).build();
+			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions);
 		} else {
-			q = q.where(conditions).build();
+			q = q.where(conditions);
 		}
 	} else {
-		q = q.where(conditions).build();
+		q = q.where(conditions);
 	}
 
+	if (opts.exists) {
+		for (var k in opts.exists) {
+			q.whereExists(opts.exists[k].table, table, opts.exists[k].link, opts.exists[k].conditions);
+		}
+	}
+
+	q = q.build();
+
 	if (this.opts.pool) {
 		this.poolQuery(q, cb);
 	} else {
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index d3f79c2f..88b2548a 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -103,14 +103,22 @@ Driver.prototype.count = function (table, conditions, opts, cb) {
 	if (opts.merge) {
 		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
 		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
-			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions).build();
+			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions);
 		} else {
-			q = q.where(conditions).build();
+			q = q.where(conditions);
 		}
 	} else {
-		q = q.where(conditions).build();
+		q = q.where(conditions);
 	}
 
+	if (opts.exists) {
+		for (var k in opts.exists) {
+			q.whereExists(opts.exists[k].table, table, opts.exists[k].link, opts.exists[k].conditions);
+		}
+	}
+
+	q = q.build();
+
 	if (this.opts.debug) {
 		require("../../Debug").sql('postgres', q);
 	}
diff --git a/lib/Drivers/DML/postgresaxomic.js b/lib/Drivers/DML/postgresaxomic.js
index 6b6595a5..4ea3a9dd 100644
--- a/lib/Drivers/DML/postgresaxomic.js
+++ b/lib/Drivers/DML/postgresaxomic.js
@@ -101,14 +101,22 @@ Driver.prototype.count = function (table, conditions, opts, cb) {
 	if (opts.merge) {
 		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
 		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
-			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions).build();
+			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions);
 		} else {
-			q = q.where(conditions).build();
+			q = q.where(conditions);
 		}
 	} else {
-		q = q.where(conditions).build();
+		q = q.where(conditions);
 	}
 
+	if (opts.exists) {
+		for (var k in opts.exists) {
+			q.whereExists(opts.exists[k].table, table, opts.exists[k].link, opts.exists[k].conditions);
+		}
+	}
+
+	q = q.build();
+
 	if (this.opts.debug) {
 		require("../../Debug").sql('postgres', q);
 	}
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 9fdf2449..00657a36 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -105,14 +105,22 @@ Driver.prototype.count = function (table, conditions, opts, cb) {
 	if (opts.merge) {
 		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
 		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
-			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions).build();
+			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions);
 		} else {
-			q = q.where(conditions).build();
+			q = q.where(conditions);
 		}
 	} else {
-		q = q.where(conditions).build();
+		q = q.where(conditions);
 	}
 
+	if (opts.exists) {
+		for (var k in opts.exists) {
+			q.whereExists(opts.exists[k].table, table, opts.exists[k].link, opts.exists[k].conditions);
+		}
+	}
+
+	q = q.build();
+
 	if (this.opts.debug) {
 		require("../../Debug").sql('sqlite', q);
 	}

From 658c6af736364e421dbf8a3e7b29ed90b23b813b Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Apr 2013 11:58:59 +0100
Subject: [PATCH 0259/1246] Adds hasMany hasAccessor conditional to
 ChainFind.remove() (#94)

---
 lib/ChainFind.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 7121922f..41c6479a 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -42,7 +42,8 @@ function ChainFind(opts) {
 				limit  : opts.limit,
 				order  : opts.order,
 				merge  : opts.merge,
-				offset : opts.offset
+				offset : opts.offset,
+				exists : opts.exists
 			}, function (err, data) {
 				if (err) {
 					return cb(err);

From a0a1f00783a95bb1087b379e7b5b5c02baec65c9 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Apr 2013 12:08:56 +0100
Subject: [PATCH 0260/1246] 2.0.7

---
 Changelog.md | 10 ++++++++++
 package.json |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index e5811c46..2d35a2f8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,13 @@
+### v2.0.7 - 3 Apr 2013
+
+- Fixed SQLite driver writing to console when it should not
+- Changes Express middleware to wait for connections (errored or not) before processing requests (#92)
+- Avoids loosing previously set limit (if set) on Model.fin() (#93)
+- Fixes hasMany getAccessor when using an Array as only argument (specific properties)
+- Adds ChainFind .last() (similar to .first())
+- Fixes hasMany acessor names to correctly convert prop_name to PropName (underscores)
+- Adds hasMany hasAcessor conditional to ChainFind (#94)
+
 ### v2.0.6 - 22 Mar 2013
 
 - Changes orm.connect to check connection url/opts to avoid throwing some errors about missing protocol or database (#75)
diff --git a/package.json b/package.json
index 73fb10a6..170e1cdd 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "redshift",
     "sqlite"
   ],
-  "version"     : "2.0.6",
+  "version"     : "2.0.7",
   "license"     : "MIT",
   "repository"  : {
     "url"            : "http://dresende.github.com/node-orm2"

From 81742c358ccb9f75af72454e0075a71ec218a8de Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Apr 2013 12:23:23 +0100
Subject: [PATCH 0261/1246] Adds more aggregate functions: abs, ceil, floor,
 round

SQLite does not support ceil and floor
---
 lib/AggregateFunctions.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index 1cb3e69a..0cef9959 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -21,9 +21,15 @@ function AggregateFunctions(opts) {
 		};
 	};
 	var proto = {
+		abs   : appendFunction("abs"),
+		ceil  : appendFunction("ceil"),  // not supported in sqlite
+		floor : appendFunction("floor"), // not supported in sqlite
+		round : appendFunction("round"),
+
 		avg   : appendFunction("avg"),
 		min   : appendFunction("min"),
 		max   : appendFunction("max"),
+
 		sum   : appendFunction("sum"),
 		count : appendFunction("count"),
 		get   : function (cb) {

From 61a1074e8710c92896f7e6ec69470fae599286de Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Apr 2013 12:50:18 +0100
Subject: [PATCH 0262/1246] Updates sql-query dependency to 0.0.13

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 170e1cdd..321d8a62 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
   },
   "analyse"     : false,
   "dependencies": {
-    "sql-query"      : "0.0.12",
+    "sql-query"      : "0.0.13",
     "hat"            : "0.0.3"
   },
   "devDependencies": {

From 4b4d7503668a73ee4264cd96e140e0112aa8ed04 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Apr 2013 12:52:12 +0100
Subject: [PATCH 0263/1246] Fixes test table name for test-aggregate

---
 test/integration/test-aggregate.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/integration/test-aggregate.js b/test/integration/test-aggregate.js
index b8f05d4b..0957e430 100644
--- a/test/integration/test-aggregate.js
+++ b/test/integration/test-aggregate.js
@@ -2,8 +2,8 @@ var common     = require('../common');
 var assert     = require('assert');
 
 common.createConnection(function (err, db) {
-	common.createModelTable('test_count', db.driver.db, function () {
-		common.insertModelData('test_count', db.driver.db, [
+	common.createModelTable('test_aggregate', db.driver.db, function () {
+		common.insertModelData('test_aggregate', db.driver.db, [
 			{ id : 1, name : 'test1' },
 			{ id : 2, name : 'test2' },
 			{ id : 3, name : 'test3' },
@@ -12,7 +12,7 @@ common.createConnection(function (err, db) {
 		], function (err) {
 			if (err) throw err;
 
-			var TestModel = db.define('test_count', common.getModelProperties());
+			var TestModel = db.define('test_aggregate', common.getModelProperties());
 
 			TestModel.aggregate({ id: common.ORM.gt(2) }).count('id').min('id').max('id').get(function (err, count, min, max) {
 				assert.equal(err, null);

From 1bc22a2b567611217802233b5b007aed97a37a86 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Apr 2013 12:58:34 +0100
Subject: [PATCH 0264/1246] Moves aggregate functions list to each driver

This enables some drivers to support more functions than others (like
for example - SQLite doesn't support ceil() or floor() but others do).
---
 lib/AggregateFunctions.js         | 18 +++++++-----------
 lib/Drivers/DML/mysql.js          |  4 ++++
 lib/Drivers/DML/postgres.js       |  4 ++++
 lib/Drivers/DML/postgresaxomic.js |  4 ++++
 lib/Drivers/DML/sqlite.js         |  4 ++++
 5 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index 0cef9959..d4d003b6 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -4,6 +4,9 @@ function AggregateFunctions(opts) {
 	if (typeof opts.driver.getQuery != "function") {
 		throw new Error("This driver does not support aggregate functions");
 	}
+	if (!Array.isArray(opts.driver.aggregate_functions)) {
+		throw new Error("This driver does not support aggregate functions");
+	}
 
 	var aggregates = [ [] ];
 	var appendFunction = function (fun) {
@@ -21,17 +24,6 @@ function AggregateFunctions(opts) {
 		};
 	};
 	var proto = {
-		abs   : appendFunction("abs"),
-		ceil  : appendFunction("ceil"),  // not supported in sqlite
-		floor : appendFunction("floor"), // not supported in sqlite
-		round : appendFunction("round"),
-
-		avg   : appendFunction("avg"),
-		min   : appendFunction("min"),
-		max   : appendFunction("max"),
-
-		sum   : appendFunction("sum"),
-		count : appendFunction("count"),
 		get   : function (cb) {
 			if (typeof cb != "function") {
 				throw new Error("You must pass a callback to Model.aggregate().get()");
@@ -72,5 +64,9 @@ function AggregateFunctions(opts) {
 		}
 	};
 
+	for (var i = 0; i < opts.driver.aggregate_functions.length; i++) {
+		proto[opts.driver.aggregate_functions[i].toLowerCase()] = appendFunction(opts.driver.aggregate_functions[i].toLowerCase());
+	}
+
 	return proto;
 }
diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 56236f5d..0da3fb84 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -17,6 +17,10 @@ function Driver(config, connection, opts) {
 	if (this.opts.pool) {
 		this.db.pool = (connection ? connection : mysql.createPool(config.href || config));
 	}
+
+	this.aggregate_functions = [ "ABS", "CEIL", "FLOOR", "ROUND",
+	                             "AVG", "MIN", "MAX",
+	                             "SUM", "COUNT" ];
 }
 
 Driver.prototype.sync = function (opts, cb) {
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 88b2548a..a847fd63 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -16,6 +16,10 @@ function Driver(config, connection, opts) {
 	} else {
 		this.db = new postgres.Client(config.href || config);
 	}
+
+	this.aggregate_functions = [ "ABS", "CEIL", "FLOOR", "ROUND",
+	                             "AVG", "MIN", "MAX",
+	                             "SUM", "COUNT" ];
 }
 
 Driver.prototype.sync = function (opts, cb) {
diff --git a/lib/Drivers/DML/postgresaxomic.js b/lib/Drivers/DML/postgresaxomic.js
index 4ea3a9dd..352e57f4 100644
--- a/lib/Drivers/DML/postgresaxomic.js
+++ b/lib/Drivers/DML/postgresaxomic.js
@@ -10,6 +10,10 @@ function Driver(config, connection, opts) {
 	this.opts             = opts || {};
 	this.db               = postgres;
 	this.query            = new Query("postgresql");
+
+	this.aggregate_functions = [ "ABS", "CEIL", "FLOOR", "ROUND",
+	                             "AVG", "MIN", "MAX",
+	                             "SUM", "COUNT" ];
 }
 Driver.prototype.sync = function (opts, cb) {
 	return require("../DDL/postgres").sync(this, opts, cb);
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 00657a36..481e11d1 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -16,6 +16,10 @@ function Driver(config, connection, opts) {
 		// it's the drive letter and add ":"
 		this.db = new sqlite3.Database(((config.host ? config.host + ":" : "") + (config.pathname || "")) || ':memory:');
 	}
+
+	this.aggregate_functions = [ "ABS", "ROUND",
+	                             "AVG", "MIN", "MAX",
+	                             "SUM", "COUNT" ];
 }
 
 Driver.prototype.sync = function (opts, cb) {

From 0cd38eb3c4cf550cf30aba61ac266d229d17345a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Apr 2013 13:16:12 +0100
Subject: [PATCH 0265/1246] Updates sql-query dependency to 0.0.14

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 321d8a62..596b77c2 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
   },
   "analyse"     : false,
   "dependencies": {
-    "sql-query"      : "0.0.13",
+    "sql-query"      : "0.0.14",
     "hat"            : "0.0.3"
   },
   "devDependencies": {

From d7d610b739a146965305a3537896a9b3cb188eea Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Apr 2013 13:17:25 +0100
Subject: [PATCH 0266/1246] Adds more aggregate functions to the several
 drivers

Supports alias to be able to have similar functions with the same name
across drivers
---
 lib/AggregateFunctions.js         | 10 +++++++++-
 lib/Drivers/DML/mysql.js          |  3 +++
 lib/Drivers/DML/postgres.js       |  3 +++
 lib/Drivers/DML/postgresaxomic.js |  3 +++
 lib/Drivers/DML/sqlite.js         |  1 +
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index d4d003b6..6b955c56 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -65,8 +65,16 @@ function AggregateFunctions(opts) {
 	};
 
 	for (var i = 0; i < opts.driver.aggregate_functions.length; i++) {
-		proto[opts.driver.aggregate_functions[i].toLowerCase()] = appendFunction(opts.driver.aggregate_functions[i].toLowerCase());
+		addAggregate(proto, opts.driver.aggregate_functions[i], appendFunction);
 	}
 
 	return proto;
 }
+
+function addAggregate(proto, fun, builder) {
+	if (Array.isArray(fun)) {
+		proto[fun[0].toLowerCase()] = builder((fun[1] || fun[0]).toLowerCase());
+	} else {
+		proto[fun.toLowerCase()] = builder(fun.toLowerCase());
+	}
+}
diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 0da3fb84..1f45f302 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -20,6 +20,9 @@ function Driver(config, connection, opts) {
 
 	this.aggregate_functions = [ "ABS", "CEIL", "FLOOR", "ROUND",
 	                             "AVG", "MIN", "MAX",
+	                             "LOG", "LOG2", "LOG10", "EXP", "POWER",
+	                             "ACOS", "ASIN", "ATAN", "COS", "SIN", "TAN",
+	                             "CONV", [ "RANDOM", "RAND" ], "RADIANS", "DEGREES",
 	                             "SUM", "COUNT" ];
 }
 
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index a847fd63..98565957 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -19,6 +19,9 @@ function Driver(config, connection, opts) {
 
 	this.aggregate_functions = [ "ABS", "CEIL", "FLOOR", "ROUND",
 	                             "AVG", "MIN", "MAX",
+	                             "LOG", "EXP", "POWER",
+	                             "ACOS", "ASIN", "ATAN", "COS", "SIN", "TAN",
+	                             "RANDOM", "RADIANS", "DEGREES",
 	                             "SUM", "COUNT" ];
 }
 
diff --git a/lib/Drivers/DML/postgresaxomic.js b/lib/Drivers/DML/postgresaxomic.js
index 352e57f4..ab01d370 100644
--- a/lib/Drivers/DML/postgresaxomic.js
+++ b/lib/Drivers/DML/postgresaxomic.js
@@ -13,6 +13,9 @@ function Driver(config, connection, opts) {
 
 	this.aggregate_functions = [ "ABS", "CEIL", "FLOOR", "ROUND",
 	                             "AVG", "MIN", "MAX",
+	                             "LOG", "EXP", "POWER",
+	                             "ACOS", "ASIN", "ATAN", "COS", "SIN", "TAN",
+	                             "RANDOM", "RADIANS", "DEGREES",
 	                             "SUM", "COUNT" ];
 }
 Driver.prototype.sync = function (opts, cb) {
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 481e11d1..387fd47c 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -19,6 +19,7 @@ function Driver(config, connection, opts) {
 
 	this.aggregate_functions = [ "ABS", "ROUND",
 	                             "AVG", "MIN", "MAX",
+	                             "RANDOM",
 	                             "SUM", "COUNT" ];
 }
 

From 63197ebf32a741868b63dd283fb4e42ae0000fe3 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 5 Apr 2013 19:50:49 +0100
Subject: [PATCH 0267/1246] Upgrades sql-query dependency to 0.0.15 (#95)

This adds support for more complex queries using and, or, not, not_and
and not_or keys.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 596b77c2..72b07ad9 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
   },
   "analyse"     : false,
   "dependencies": {
-    "sql-query"      : "0.0.14",
+    "sql-query"      : "0.0.15",
     "hat"            : "0.0.3"
   },
   "devDependencies": {

From b9bd75c5ec476e780c8ab0c47c42d90e19370757 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 5 Apr 2013 23:38:23 +0100
Subject: [PATCH 0268/1246] Changes repository url to new github.io domain

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 72b07ad9..33b00143 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
   "version"     : "2.0.7",
   "license"     : "MIT",
   "repository"  : {
-    "url"            : "http://dresende.github.com/node-orm2"
+    "url"            : "http://dresende.github.io/node-orm2"
   },
   "scripts"     : {
     "test"           : "make"

From b979c913282e3680688170ea392d81cd289efafe Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 5 Apr 2013 23:49:10 +0100
Subject: [PATCH 0269/1246] Adds possibility to use "-property" to indicate a
 descending order in Model.find()

This avoids passing an Array like [ "property", "Z" ] to indicate ORDER
BY property DESC. This new way adds possibility to pass a String like
"-property" to indicate the same.
---
 lib/Model.js                                  |  6 ++++-
 test/integration/test-find-order-asc-array.js | 24 +++++++++++++++++++
 .../integration/test-find-order-desc-array.js | 24 +++++++++++++++++++
 test/integration/test-find-order-desc.js      | 24 +++++++++++++++++++
 4 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 test/integration/test-find-order-asc-array.js
 create mode 100644 test/integration/test-find-order-desc-array.js
 create mode 100644 test/integration/test-find-order-desc.js

diff --git a/lib/Model.js b/lib/Model.js
index 8facea42..b5fe5906 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -215,7 +215,11 @@ function Model(opts) {
 					cb = arguments[i];
 					break;
 				case "string":
-					order = [ arguments[i] ];
+					if (arguments[i][0] == "-") {
+						order = [ arguments[i].substr(1), "Z" ];
+					} else {
+						order = [ arguments[i] ];
+					}
 					break;
 			}
 		}
diff --git a/test/integration/test-find-order-asc-array.js b/test/integration/test-find-order-asc-array.js
new file mode 100644
index 00000000..af4231c9
--- /dev/null
+++ b/test/integration/test-find-order-asc-array.js
@@ -0,0 +1,24 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_find_order', db.driver.db, function () {
+		common.insertModelData('test_find_order', db.driver.db, [
+			{ id : 1, name : 'test2' },
+			{ id : 2, name : 'test1' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_find_order', common.getModelProperties());
+
+			TestModel.find([ "name" ], function (err, Instances) {
+				assert.equal(err, null);
+				assert.equal(Array.isArray(Instances), true);
+				assert.equal(Instances.length, 2);
+				assert.equal(Instances[0].id, 2);
+				assert.equal(Instances[1].id, 1);
+				db.close();
+			});
+		});
+	});
+});
diff --git a/test/integration/test-find-order-desc-array.js b/test/integration/test-find-order-desc-array.js
new file mode 100644
index 00000000..5570009f
--- /dev/null
+++ b/test/integration/test-find-order-desc-array.js
@@ -0,0 +1,24 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_find_order', db.driver.db, function () {
+		common.insertModelData('test_find_order', db.driver.db, [
+			{ id : 1, name : 'test1' },
+			{ id : 2, name : 'test2' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_find_order', common.getModelProperties());
+
+			TestModel.find([ "name", "Z" ], function (err, Instances) {
+				assert.equal(err, null);
+				assert.equal(Array.isArray(Instances), true);
+				assert.equal(Instances.length, 2);
+				assert.equal(Instances[0].id, 2);
+				assert.equal(Instances[1].id, 1);
+				db.close();
+			});
+		});
+	});
+});
diff --git a/test/integration/test-find-order-desc.js b/test/integration/test-find-order-desc.js
new file mode 100644
index 00000000..27c74160
--- /dev/null
+++ b/test/integration/test-find-order-desc.js
@@ -0,0 +1,24 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_find_order', db.driver.db, function () {
+		common.insertModelData('test_find_order', db.driver.db, [
+			{ id : 1, name : 'test1' },
+			{ id : 2, name : 'test2' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_find_order', common.getModelProperties());
+
+			TestModel.find("-name", function (err, Instances) {
+				assert.equal(err, null);
+				assert.equal(Array.isArray(Instances), true);
+				assert.equal(Instances.length, 2);
+				assert.equal(Instances[0].id, 2);
+				assert.equal(Instances[1].id, 1);
+				db.close();
+			});
+		});
+	});
+});

From 92ff3f200ca6bd5f6d922a43e254ca2a0a432543 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sun, 7 Apr 2013 15:50:22 +0100
Subject: [PATCH 0270/1246] Adds setting instance.breakSaveOnErrors (default:
 true)

When set to false, using .save() will not return on first error.
Instead it will collect all validations and then return an Array of
errors.
---
 lib/Instance.js | 10 +++++++---
 lib/Settings.js | 13 +++++++------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index a66f1add..e471c256 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -24,7 +24,7 @@ function Instance(opts) {
 		});
 	};
 	var handleValidations = function (cb) {
-		var pending = [];
+		var pending = [], errors = [];
 		for (var k in opts.validations) {
 			if (Array.isArray(opts.validations[k])) {
 				for (var i = 0; i < opts.validations[k].length; i++) {
@@ -36,7 +36,7 @@ function Instance(opts) {
 		}
 		var checkNextValidation = function () {
 			if (pending.length === 0) {
-				return cb(null);
+				return cb(errors.length ? errors : null);
 			}
 
 			var validation = pending.shift();
@@ -48,7 +48,11 @@ function Instance(opts) {
 					err.value = instance[validation[0]];
 					err.msg = msg;
 
-					return cb(err);
+					if (opts.model.settings.get("instance.breakSaveOnErrors")) {
+						return cb(err);
+					}
+
+					errors.push(err);
 				}
 
 				return checkNextValidation();
diff --git a/lib/Settings.js b/lib/Settings.js
index 45e46897..19a845bf 100644
--- a/lib/Settings.js
+++ b/lib/Settings.js
@@ -4,12 +4,13 @@ var default_settings = {
 		association_key : "{name}_id"
 	},
 	instance   : {
-		cache           : true,
-		cacheSaveCheck  : true,
-		autoSave        : false,
-		autoFetch       : false,
-		autoFetchLimit  : 1,
-		cascadeRemove   : true
+		cache             : true,
+		cacheSaveCheck    : true,
+		autoSave          : false,
+		autoFetch         : false,
+		autoFetchLimit    : 1,
+		cascadeRemove     : true,
+		breakSaveOnErrors : true
 	}
 };
 

From 2233fa8a9380ac3496fb75854058b1f3cda91bdf Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sun, 7 Apr 2013 15:53:48 +0100
Subject: [PATCH 0271/1246] Changes error variable names to avoid confusion

---
 lib/Instance.js | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index e471c256..f0941cfd 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -73,7 +73,7 @@ function Instance(opts) {
 		handleValidations(function (err) {
 			if (err) {
 				emitEvent("save", err, instance);
-				Hook.trigger(instance, opts.hooks.afterSave, !err);
+				Hook.trigger(instance, opts.hooks.afterSave, err === null);
 				if (typeof cb == "function") {
 					cb(err, instance);
 				}
@@ -95,18 +95,18 @@ function Instance(opts) {
 			}
 
 			if (opts.is_new || !data.hasOwnProperty(opts.id)) {
-				opts.driver.insert(opts.table, data, opts.id, function (err, info) {
-					if (!err) {
+				opts.driver.insert(opts.table, data, opts.id, function (save_err, info) {
+					if (!save_err) {
 						opts.changes.length = 0;
 						opts.data[opts.id] = info.id;
 						opts.is_new = false;
 					}
-					emitEvent("save", err, instance);
-					Hook.trigger(instance, opts.hooks.afterCreate, !err);
-					Hook.trigger(instance, opts.hooks.afterSave, !err);
+					emitEvent("save", save_err, instance);
+					Hook.trigger(instance, opts.hooks.afterCreate, !save_err);
+					Hook.trigger(instance, opts.hooks.afterSave, !save_err);
 					if (typeof cb == "function") {
-						if (err) {
-							return cb(err, instance);
+						if (save_err) {
+							return cb(save_err, instance);
 						}
 						return saveInstanceExtra(cb);
 					}
@@ -117,15 +117,15 @@ function Instance(opts) {
 					changes[opts.changes[i]] = data[opts.changes[i]];
 				}
 				conditions[opts.id] = data[opts.id];
-				opts.driver.update(opts.table, changes, conditions, function (err) {
-					if (!err) {
+				opts.driver.update(opts.table, changes, conditions, function (save_err) {
+					if (!save_err) {
 						opts.changes.length = 0;
 					}
-					emitEvent("save", err, instance);
-					Hook.trigger(instance, opts.hooks.afterSave, !err);
+					emitEvent("save", save_err, instance);
+					Hook.trigger(instance, opts.hooks.afterSave, !save_err);
 					if (typeof cb == "function") {
-						if (err) {
-							return cb(err, instance);
+						if (save_err) {
+							return cb(save_err, instance);
 						}
 						return saveInstanceExtra(cb);
 					}

From 1825c6853f5b483f0d2b6f518d5bd32c5fb64871 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sun, 7 Apr 2013 22:43:06 +0100
Subject: [PATCH 0272/1246] Changes hasMany.setAccessor to support passing an
 array of instances (#97)

This adds support for instance.setAssociation([ Assoc1, ... ], cb) as
well as instance.setAssociation(Assoc1, ..., cb);
---
 lib/Associations/Many.js                      | 11 ++++-
 .../test-association-hasmany-set-array.js     | 40 +++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 test/integration/test-association-hasmany-set-array.js

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index bf15e71e..93793887 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -198,7 +198,16 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 	Object.defineProperty(Instance, association.setAccessor, {
 		value: function () {
 			var Instances = Array.prototype.slice.apply(arguments);
-			var cb = (typeof Instances[Instances.length - 1] == "function" ? Instances.pop() : noOperation);
+			var cb        = (Instances.length &&
+			                 typeof Instances[Instances.length - 1] == "function" ? Instances.pop() : noOperation);
+
+			if (Instances.length === 0) {
+				throw new Error("No associations defined");
+			}
+
+			if (Array.isArray(Instances[0])) {
+				Instances = Instances[0];
+			}
 
 			Instance[association.delAccessor](function (err) {
 				if (err) {
diff --git a/test/integration/test-association-hasmany-set-array.js b/test/integration/test-association-hasmany-set-array.js
new file mode 100644
index 00000000..10ee51fe
--- /dev/null
+++ b/test/integration/test-association-hasmany-set-array.js
@@ -0,0 +1,40 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_association_hasmany_set_array', db.driver.db, function () {
+		common.createModelAssocTable('test_association_hasmany_set_array', 'assocs', db.driver.db, function () {
+			common.insertModelData('test_association_hasmany_set_array', db.driver.db, [
+				{ id : 1, name : 'test1' },
+				{ id : 2, name : 'test2' },
+				{ id : 3, name : 'test3' }
+			], function (err) {
+				if (err) throw err;
+
+				common.insertModelAssocData('test_association_hasmany_set_array_assocs', db.driver.db, [
+					[ 1, 2 ]
+				], function (err) {
+					var TestModel = db.define('test_association_hasmany_set_array', common.getModelProperties());
+					TestModel.hasMany("assocs");
+
+					TestModel.get(1, function (err, Test1) {
+						assert.equal(err, null);
+						TestModel.get(2, function (err, Test2) {
+							assert.equal(err, null);
+							Test1.setAssocs([ Test2 ], function (err) {
+								assert.equal(err, null);
+								Test1.getAssocs(function (err, Tests) {
+									assert.equal(err, null);
+									assert.equal(Array.isArray(Tests), true);
+									assert.equal(Tests.length, 1);
+									assert.equal(Tests[0].name, Test2.name);
+									db.close();
+								});
+							});
+						});
+					});
+				});
+			});
+		});
+	});
+});

From c19876517563da385423d1e493d8ea5aee3848d3 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sun, 7 Apr 2013 22:50:14 +0100
Subject: [PATCH 0273/1246] Adds support for indexes on properties that are no
 associations (#98)

Just set index: true on the properties you want.

```js
db.define("person", {
    name: { type: "string", index: true }
});
```
---
 lib/Drivers/DDL/mysql.js    | 2 ++
 lib/Drivers/DDL/postgres.js | 2 ++
 lib/Drivers/DDL/sqlite.js   | 6 ++++++
 3 files changed, 10 insertions(+)

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index 03a926d1..2e8e3a07 100644
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -53,6 +53,8 @@ exports.sync = function (driver, opts, cb) {
 	for (k in opts.properties) {
 		if (opts.properties[k].unique === true) {
 			definitions.push("UNIQUE KEY " + driver.query.escapeId(k) + " (" + driver.query.escapeId(k) + ")");
+		} else if (opts.properties[k].index) {
+			definitions.push("INDEX " + driver.query.escapeId(k) + " (" + driver.query.escapeId(k) + ")");
 		}
 	}
 	for (i = 0; i < opts.one_associations.length; i++) {
diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index 705e4b3d..8e612d41 100644
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -48,6 +48,8 @@ exports.sync = function (driver, opts, cb) {
 	for (k in opts.properties) {
 		if (opts.properties[k].unique === true) {
 			definitions.push("UNIQUE (" + driver.query.escapeId(k) + ")");
+		} else if (opts.properties[k].index) {
+			definitions.push("INDEX (" + driver.query.escapeId(k) + ")");
 		}
 	}
 
diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index 36931241..44244256 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -47,6 +47,12 @@ exports.sync = function (driver, opts, cb) {
 				" ON " + driver.query.escapeId(opts.table) +
 				" (" + driver.query.escapeId(k) + ")"
 			);
+		} else if (opts.properties[k].index) {
+			queries.push(
+				"CREATE INDEX IF NOT EXISTS " + driver.query.escapeId(k) +
+				" ON " + driver.query.escapeId(opts.table) +
+				" (" + driver.query.escapeId(k) + ")"
+			);
 		}
 	}
 

From d5c5070880d991a4399349afa0e4a89b03a1786e Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sun, 7 Apr 2013 23:28:03 +0100
Subject: [PATCH 0274/1246] Adds a new option to add multi-column indexes to
 models (#98)

Example:

```js
db.define("person", {
    name: String,
    surname: String
}, {
    indexes: [ "name,surname", ... ]
});
```
---
 lib/Drivers/DDL/mysql.js    |  7 ++++++-
 lib/Drivers/DDL/postgres.js |  9 +++++++++
 lib/Drivers/DDL/sqlite.js   | 10 ++++++++++
 lib/Model.js                |  1 +
 lib/ORM.js                  |  1 +
 5 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index 2e8e3a07..baba16c2 100644
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -54,13 +54,18 @@ exports.sync = function (driver, opts, cb) {
 		if (opts.properties[k].unique === true) {
 			definitions.push("UNIQUE KEY " + driver.query.escapeId(k) + " (" + driver.query.escapeId(k) + ")");
 		} else if (opts.properties[k].index) {
-			definitions.push("INDEX " + driver.query.escapeId(k) + " (" + driver.query.escapeId(k) + ")");
+			definitions.push("INDEX (" + driver.query.escapeId(k) + ")");
 		}
 	}
 	for (i = 0; i < opts.one_associations.length; i++) {
 		if (opts.one_associations[i].reversed) continue;
 		definitions.push("INDEX (" + driver.query.escapeId(opts.one_associations[i].field) + ")");
 	}
+	for (i = 0; i < opts.indexes.length; i++) {
+		definitions.push("INDEX (" + opts.indexes[i].split(/[,;]+/).map(function (el) {
+			return driver.query.escapeId(el);
+		}).join(", ") + ")");
+	}
 
 	queries.push(
 		"CREATE TABLE IF NOT EXISTS " + driver.query.escapeId(opts.table) +
diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index 8e612d41..6216ed9c 100644
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -73,6 +73,15 @@ exports.sync = function (driver, opts, cb) {
 		);
 	}
 
+	for (i = 0; i < opts.indexes.length; i++) {
+		tables[tables.length - 1].subqueries.push(
+			"CREATE INDEX ON " + driver.query.escapeId(opts.table) +
+			" (" + opts.indexes[i].split(/[,;]+/).map(function (el) {
+				return driver.query.escapeId(el);
+			}).join(", ") + ")"
+		);
+	}
+
 	for (i = 0; i < opts.many_associations.length; i++) {
 		definitions = [];
 		typequeries = [];
diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index 44244256..7f5ca55f 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -65,6 +65,16 @@ exports.sync = function (driver, opts, cb) {
 		);
 	}
 
+	for (i = 0; i < opts.indexes.length; i++) {
+		queries.push(
+			"CREATE INDEX IF NOT EXISTS " + driver.query.escapeId(opts.table + "_index" + i) +
+			" ON " + driver.query.escapeId(opts.table) +
+			" (" + opts.indexes[i].split(/[,;]+/).map(function (el) {
+				return driver.query.escapeId(el);
+			}).join(", ") + ")"
+		);
+	}
+
 	for (i = 0; i < opts.many_associations.length; i++) {
 		definitions = [];
 
diff --git a/lib/Model.js b/lib/Model.js
index b5fe5906..49d7c6f6 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -120,6 +120,7 @@ function Model(opts) {
 				id                : opts.id,
 				table             : opts.table,
 				properties        : opts.properties,
+				indexes           : opts.indexes || [],
 				one_associations  : one_associations,
 				many_associations : many_associations
 			}, cb);
diff --git a/lib/ORM.js b/lib/ORM.js
index 6db12474..0e709b3d 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -134,6 +134,7 @@ ORM.prototype.define = function (name, properties, opts) {
 		driver         : this.driver,
 		table          : opts.table || opts.collection || name,
 		properties     : properties,
+		indexes        : opts.indexes || [],
 		cache          : opts.hasOwnProperty("cache") ? opts.cache : this.settings.get("instance.cache"),
 		id             : opts.id || this.settings.get("properties.primary_key"),
 		autoSave       : opts.hasOwnProperty("autoSave") ? opts.autoSave : this.settings.get("instance.autoSave"),

From d8fff8c6e9c17aaf3303233d2cb81764cf38befe Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 8 Apr 2013 14:13:34 +0100
Subject: [PATCH 0275/1246] Changes setting name from
 instance.breakSaveOnErrors to instance. returnAllErrors (#96)

---
 lib/Instance.js |  2 +-
 lib/Settings.js | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index f0941cfd..fc0e2f1c 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -48,7 +48,7 @@ function Instance(opts) {
 					err.value = instance[validation[0]];
 					err.msg = msg;
 
-					if (opts.model.settings.get("instance.breakSaveOnErrors")) {
+					if (opts.model.settings.get("instance.returnAllErrors")) {
 						return cb(err);
 					}
 
diff --git a/lib/Settings.js b/lib/Settings.js
index 19a845bf..2c8f7a77 100644
--- a/lib/Settings.js
+++ b/lib/Settings.js
@@ -4,13 +4,13 @@ var default_settings = {
 		association_key : "{name}_id"
 	},
 	instance   : {
-		cache             : true,
-		cacheSaveCheck    : true,
-		autoSave          : false,
-		autoFetch         : false,
-		autoFetchLimit    : 1,
-		cascadeRemove     : true,
-		breakSaveOnErrors : true
+		cache           : true,
+		cacheSaveCheck  : true,
+		autoSave        : false,
+		autoFetch       : false,
+		autoFetchLimit  : 1,
+		cascadeRemove   : true,
+		returnAllErrors : true
 	}
 };
 

From 8247ce8ff7cc7809c911bff3901b10a5f9ba1cd1 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 8 Apr 2013 14:18:42 +0100
Subject: [PATCH 0276/1246] Adds type: "validation" to instance.save()
 validation errors

---
 lib/Instance.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index fc0e2f1c..6e094da3 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -43,10 +43,12 @@ function Instance(opts) {
 
 			validation[1](instance[validation[0]], function (msg) {
 				if (msg) {
-					var err = new Error(msg);
+					var err   = new Error(msg);
+
 					err.field = validation[0];
 					err.value = instance[validation[0]];
-					err.msg = msg;
+					err.msg   = msg;
+					err.type  = "validation";
 
 					if (opts.model.settings.get("instance.returnAllErrors")) {
 						return cb(err);

From 7e6aaf027bde1d90fd1f706b95ed68625916fbad Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 8 Apr 2013 14:20:00 +0100
Subject: [PATCH 0277/1246] Changes test to check for `type: "validation"` on
 validation errors

---
 test/integration/test-predefined-validation.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/integration/test-predefined-validation.js b/test/integration/test-predefined-validation.js
index 69eadc19..fe165ca7 100644
--- a/test/integration/test-predefined-validation.js
+++ b/test/integration/test-predefined-validation.js
@@ -15,6 +15,7 @@ common.createConnection(function (err, db) {
 			assert.equal(err.field, "name");
 			assert.equal(err.value, "test-predefined-validation");
 			assert.equal(err.msg, "out-of-range-length");
+			assert.equal(err.type, "validation");
 
 			db.close();
 		});

From 91ea451d1d514efd0d02aa08010ff4eafd66434c Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 8 Apr 2013 14:42:52 +0100
Subject: [PATCH 0278/1246] Adds `groupBy` to aggregate functions

---
 lib/AggregateFunctions.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index 6b955c56..30045877 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -9,6 +9,8 @@ function AggregateFunctions(opts) {
 	}
 
 	var aggregates = [ [] ];
+	var group_by   = null;
+
 	var appendFunction = function (fun) {
 		return function () {
 			var args = (arguments.length && Array.isArray(arguments[0]) ? arguments[0] : Array.prototype.slice.apply(arguments));
@@ -24,7 +26,11 @@ function AggregateFunctions(opts) {
 		};
 	};
 	var proto = {
-		get   : function (cb) {
+		groupBy: function () {
+			group_by = Array.prototype.slice.apply(arguments);
+			return this;
+		},
+		get: function (cb) {
 			if (typeof cb != "function") {
 				throw new Error("You must pass a callback to Model.aggregate().get()");
 			}
@@ -45,6 +51,10 @@ function AggregateFunctions(opts) {
 
 			query.where(opts.conditions);
 
+			if (group_by !== null) {
+				query.groupBy.apply(query, group_by);
+			}
+
 			opts.driver.execQuery(query.build(), function (err, data) {
 				if (err) {
 					return cb(err);

From 1aa58e772f8106faff1d1ab6175f599927cb56b6 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 8 Apr 2013 14:47:51 +0100
Subject: [PATCH 0279/1246] Fixes column names when using groupBy (and returns
 all rows)

---
 lib/AggregateFunctions.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index 30045877..9c27a6f1 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -45,7 +45,7 @@ function AggregateFunctions(opts) {
 
 			for (var i = 0; i < aggregates.length; i++) {
 				for (var j = 0; j < aggregates[i].length; j++) {
-					query[aggregates[i][j].f](aggregates[i][j].a);
+					query[aggregates[i][j].f](aggregates[i][j].a, 'aggregate' + i);
 				}
 			}
 
@@ -55,16 +55,21 @@ function AggregateFunctions(opts) {
 				query.groupBy.apply(query, group_by);
 			}
 
+			console.log(query.build());
+
 			opts.driver.execQuery(query.build(), function (err, data) {
 				if (err) {
 					return cb(err);
 				}
 
+				if (group_by !== null) {
+					return cb(null, data);
+				}
+
 				var items = [];
-				for (var k in data[0]) {
-					if (!data[0].hasOwnProperty(k)) continue;
 
-					items.push(data[0][k]);
+				for (var i = 0; i < aggregates.length; i++) {
+					items.push(data[0]['aggregate' + i] || null);
 				}
 
 				items.unshift(null);

From a4cf481464675664799942a7d0291e1dfdf4b6b8 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 8 Apr 2013 15:10:08 +0100
Subject: [PATCH 0280/1246] Updates sql-query dependency to 0.0.16 (#99)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 33b00143..1809eadb 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
   },
   "analyse"     : false,
   "dependencies": {
-    "sql-query"      : "0.0.15",
+    "sql-query"      : "0.0.16",
     "hat"            : "0.0.3"
   },
   "devDependencies": {

From 8bf7240e0d14674a8e748a75150c40f69612dd10 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 8 Apr 2013 15:14:55 +0100
Subject: [PATCH 0281/1246] Adds groupBy to aggregate methods (#99)

---
 lib/AggregateFunctions.js                  | 15 ++++++++----
 lib/Model.js                               | 18 ++++++++++++--
 test/integration/test-aggregate-groupby.js | 28 ++++++++++++++++++++++
 3 files changed, 54 insertions(+), 7 deletions(-)
 create mode 100644 test/integration/test-aggregate-groupby.js

diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index 9c27a6f1..a1a51f23 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -41,11 +41,12 @@ function AggregateFunctions(opts) {
 				throw new Error("Missing aggregate functions");
 			}
 
-			var query = opts.driver.getQuery().select().from(opts.table);
+			var query = opts.driver.getQuery().select().from(opts.table).select(opts.properties);
 
 			for (var i = 0; i < aggregates.length; i++) {
 				for (var j = 0; j < aggregates[i].length; j++) {
-					query[aggregates[i][j].f](aggregates[i][j].a, 'aggregate' + i);
+					aggregates[i][j].alias = aggregateAlias(aggregates[i][j].f, aggregates[i][j].a);
+					query[aggregates[i][j].f](aggregates[i][j].a, aggregates[i][j].alias);
 				}
 			}
 
@@ -55,8 +56,6 @@ function AggregateFunctions(opts) {
 				query.groupBy.apply(query, group_by);
 			}
 
-			console.log(query.build());
-
 			opts.driver.execQuery(query.build(), function (err, data) {
 				if (err) {
 					return cb(err);
@@ -69,7 +68,9 @@ function AggregateFunctions(opts) {
 				var items = [];
 
 				for (var i = 0; i < aggregates.length; i++) {
-					items.push(data[0]['aggregate' + i] || null);
+					for (var j = 0; j < aggregates[i].length; j++) {
+						items.push(data[0][aggregates[i][j].alias] || null);
+					}
 				}
 
 				items.unshift(null);
@@ -93,3 +94,7 @@ function addAggregate(proto, fun, builder) {
 		proto[fun.toLowerCase()] = builder(fun.toLowerCase());
 	}
 }
+
+function aggregateAlias(fun, fields) {
+	return fun + (fields && fields.length ? "_" + fields.join("_") : "");
+}
diff --git a/lib/Model.js b/lib/Model.js
index 49d7c6f6..d216491a 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -295,11 +295,25 @@ function Model(opts) {
 		return this;
 	};
 
-	model.aggregate = function (conditions) {
+	model.aggregate = function () {
+		var conditions = {};
+		var properties = [];
+
+		for (var i = 0; i < arguments.length; i++) {
+			if (typeof arguments[i] == "object") {
+				if (Array.isArray(arguments[i])) {
+					properties = arguments[i];
+				} else {
+					conditions = arguments[i];
+				}
+			}
+		}
+
 		return new require("./AggregateFunctions")({
 			table      : opts.table,
 			driver     : opts.driver,
-			conditions : conditions || {}
+			conditions : conditions,
+			properties : properties
 		});
 	};
 
diff --git a/test/integration/test-aggregate-groupby.js b/test/integration/test-aggregate-groupby.js
new file mode 100644
index 00000000..a9db2f42
--- /dev/null
+++ b/test/integration/test-aggregate-groupby.js
@@ -0,0 +1,28 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_aggregate_groupby', db.driver.db, function () {
+		common.insertModelData('test_aggregate_groupby', db.driver.db, [
+			{ id : 2, name : 'test1' },
+			{ id : 3, name : 'test1' },
+			{ id : 4, name : 'test1' },
+			{ id : 5, name : 'test2' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_aggregate_groupby', common.getModelProperties());
+
+			TestModel.aggregate().avg('id').count().groupBy('name').get(function (err, rows) {
+				assert.equal(err, null);
+				assert.equal(Array.isArray(rows), true);
+				assert.equal(rows.length, 2);
+				assert.equal(rows[0].avg_id, 3);
+				assert.equal(rows[0].count, 3);
+				assert.equal(rows[1].avg_id, 5);
+				assert.equal(rows[1].count, 1);
+				db.close();
+			});
+		});
+	});
+});

From 4095749a4b87bf09cdc78d764809cae254547ec0 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 8 Apr 2013 15:28:12 +0100
Subject: [PATCH 0282/1246] Updates sql-query dependency to 0.0.17 (fixes
 previous version not supporting correctly postgresql) (#99)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1809eadb..8eb419b9 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
   },
   "analyse"     : false,
   "dependencies": {
-    "sql-query"      : "0.0.16",
+    "sql-query"      : "0.0.17",
     "hat"            : "0.0.3"
   },
   "devDependencies": {

From 9a9d7622cc605a7cc27452da7bb8d032bc887a53 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 8 Apr 2013 15:28:32 +0100
Subject: [PATCH 0283/1246] Updates test-aggregate-groupby to be row order
 independent

---
 test/integration/test-aggregate-groupby.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/test/integration/test-aggregate-groupby.js b/test/integration/test-aggregate-groupby.js
index a9db2f42..79eee3e3 100644
--- a/test/integration/test-aggregate-groupby.js
+++ b/test/integration/test-aggregate-groupby.js
@@ -17,10 +17,17 @@ common.createConnection(function (err, db) {
 				assert.equal(err, null);
 				assert.equal(Array.isArray(rows), true);
 				assert.equal(rows.length, 2);
-				assert.equal(rows[0].avg_id, 3);
-				assert.equal(rows[0].count, 3);
-				assert.equal(rows[1].avg_id, 5);
-				assert.equal(rows[1].count, 1);
+				if (rows[0].avg_id == 3) {
+					assert.equal(rows[0].avg_id, 3);
+					assert.equal(rows[0].count, 3);
+					assert.equal(rows[1].avg_id, 5);
+					assert.equal(rows[1].count, 1);
+				} else {
+					assert.equal(rows[0].avg_id, 5);
+					assert.equal(rows[0].count, 1);
+					assert.equal(rows[1].avg_id, 3);
+					assert.equal(rows[1].count, 3);
+				}
 				db.close();
 			});
 		});

From 611fca8f02ea3ce956db6d7b1ef9cacfa2790c0d Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 8 Apr 2013 19:13:47 +0100
Subject: [PATCH 0284/1246] Removes index on postgresql primary keys

---
 lib/Drivers/DDL/postgres.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index 6216ed9c..1803c0a1 100644
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -60,10 +60,6 @@ exports.sync = function (driver, opts, cb) {
 		typequeries: typequeries,
 		subqueries : subqueries
 	});
-	tables[tables.length - 1].subqueries.push(
-		"CREATE INDEX ON " + driver.query.escapeId(opts.table) +
-		" (" + driver.query.escapeId(opts.id) + ")"
-	);
 
 	for (i = 0; i < opts.one_associations.length; i++) {
 		if (opts.one_associations[i].reversed) continue;

From 87d6389bff78f8c21b1b2f23fbb0e68da2b9c8fc Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 8 Apr 2013 20:22:21 +0100
Subject: [PATCH 0285/1246] Fixes property defaultValue not being set if
 property is null (closes #104)

Added a test for this and fixed another one.
---
 lib/Instance.js                               |  7 +++++++
 test/common.js                                |  2 +-
 test/integration/test-create-defaultvalue.js  | 20 +++++++++++++++++++
 ...test-hook-before-create-define-property.js |  4 +---
 4 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 test/integration/test-create-defaultvalue.js

diff --git a/lib/Instance.js b/lib/Instance.js
index 6e094da3..9024b3e2 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -67,6 +67,13 @@ function Instance(opts) {
 			return saveInstanceExtra(cb);
 		}
 
+		for (var k in opts.properties) {
+			if (!opts.properties.hasOwnProperty(k)) continue;
+			if (opts.data[k] == null && opts.properties[k].hasOwnProperty("defaultValue")) {
+				opts.data[k] = opts.properties[k].defaultValue;
+			}
+		}
+
 		if (opts.is_new || !opts.data.hasOwnProperty(opts.id)) {
 			Hook.trigger(instance, opts.hooks.beforeCreate);
 		}
diff --git a/test/common.js b/test/common.js
index afc2719a..31edd0c5 100644
--- a/test/common.js
+++ b/test/common.js
@@ -64,7 +64,7 @@ common.getConnectionString = function () {
 
 common.getModelProperties = function () {
 	return {
-		name: String
+		name: { type: "text", defaultValue: "test_default_value" }
 	};
 };
 
diff --git a/test/integration/test-create-defaultvalue.js b/test/integration/test-create-defaultvalue.js
new file mode 100644
index 00000000..8e92346a
--- /dev/null
+++ b/test/integration/test-create-defaultvalue.js
@@ -0,0 +1,20 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_create_defaultvalue', db.driver.db, function () {
+		var TestModel = db.define('test_create_defaultvalue', common.getModelProperties());
+
+		TestModel.create([
+			{ name: null }
+		], function (err) {
+			TestModel.find(function (err, items) {
+				assert.equal(err, null);
+				assert.equal(Array.isArray(items), true);
+				assert.equal(items.length, 1);
+				assert.equal(items[0].name, "test_default_value");
+				db.close();
+			});
+		});
+	});
+});
diff --git a/test/integration/test-hook-before-create-define-property.js b/test/integration/test-hook-before-create-define-property.js
index 6812c46d..c791e2a5 100644
--- a/test/integration/test-hook-before-create-define-property.js
+++ b/test/integration/test-hook-before-create-define-property.js
@@ -7,9 +7,7 @@ common.createConnection(function (err, db) {
 		var TestModel = db.define('test_hook_before_create_define_property', common.getModelProperties(), {
 			hooks: {
 				beforeCreate: function () {
-					if (!this.name) {
-						this.name = name;
-					}
+					this.name = name;
 				}
 			}
 		});

From 63fbc3a18e0b131c13c425f07040f2c5bfb6b66d Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 8 Apr 2013 20:29:38 +0100
Subject: [PATCH 0286/1246] Fixes bug detected on previous commit about drivers
 using wrong escape methods (#104)

---
 lib/Drivers/DDL/mysql.js    | 4 ++--
 lib/Drivers/DDL/postgres.js | 2 +-
 lib/Drivers/DDL/sqlite.js   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index baba16c2..25928465 100644
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -149,14 +149,14 @@ function buildColumnDefinition(driver, name, prop) {
 			break;
 		case "enum":
 			def = driver.query.escapeId(name) + " ENUM (" +
-			       prop.values.map(driver.db.escape.bind(driver.db)) +
+			       prop.values.map(driver.query.escapeVal.bind(driver.query)) +
 			")";
 			break;
 		default:
 			throw new Error("Unknown property type: '" + prop.type + "'");
 	}
 	if (prop.hasOwnProperty("defaultValue")) {
-		def += " DEFAULT " + driver.db.escape(prop.defaultValue);
+		def += " DEFAULT " + driver.query.escapeVal(prop.defaultValue);
 	}
 	return def;
 }
diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index 1803c0a1..b98c234e 100644
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -193,7 +193,7 @@ function buildColumnDefinition(driver, table, name, prop) {
 			throw new Error("Unknown property type: '" + prop.type + "'");
 	}
 	if (prop.hasOwnProperty("defaultValue")) {
-		def += " DEFAULT " + driver.escape(prop.defaultValue);
+		def += " DEFAULT " + driver.query.escapeVal(prop.defaultValue);
 	}
 	return def;
 }
diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index 7f5ca55f..8a05a04c 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -141,7 +141,7 @@ function buildColumnDefinition(driver, name, prop) {
 			throw new Error("Unknown property type: '" + prop.type + "'");
 	}
 	if (prop.hasOwnProperty("defaultValue")) {
-		def += " DEFAULT " + driver.db.escape(prop.defaultValue);
+		def += " DEFAULT " + driver.query.escapeVal(prop.defaultValue);
 	}
 	return def;
 }

From 7160fb4a0cd29329a62d39c1ba5f58ff4dc4cdad Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 8 Apr 2013 23:39:49 +0100
Subject: [PATCH 0287/1246] 2.0.8

#97, #98, #99, #104, ..
---
 Changelog.md | 12 ++++++++++++
 Readme.md    |  2 +-
 package.json |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 2d35a2f8..96e4814c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,15 @@
+### v2.0.8 - 8 Apr 2013
+
+- Adds more aggregate functions to the several drivers
+- Adds groupBy to aggregate methods (#99)
+- Adds possibility to use "-property" to indicate a descending order in Model.find()
+- Adds setting instance.returnAllErrors (default: true)
+- Changes hasMany.setAccessor to support passing an array of instances (#97)
+- Fixes property defaultValue not being set if property is null (closes #104)
+- Adds support for indexes on properties that are no associations (#98)
+- Adds a new option to add multi-column indexes to models (#98)
+- Bug fixes
+
 ### v2.0.7 - 3 Apr 2013
 
 - Fixed SQLite driver writing to console when it should not
diff --git a/Readme.md b/Readme.md
index e972f152..94f2353e 100644
--- a/Readme.md
+++ b/Readme.md
@@ -17,7 +17,7 @@ npm install orm
 
 ## Features
 
-- Create Models, sync, drop, bulk create, get, find, remove, count
+- Create Models, sync, drop, bulk create, get, find, remove, count, aggregated functions
 - Create Model associations, find, check, create and remove
 - Define custom validations (several builtin validations, check instance properties before saving)
 - Model instance caching and integrity (table rows fetched twice are the same object, changes to one change all)
diff --git a/package.json b/package.json
index 8eb419b9..8444194d 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "redshift",
     "sqlite"
   ],
-  "version"     : "2.0.7",
+  "version"     : "2.0.8",
   "license"     : "MIT",
   "repository"  : {
     "url"            : "http://dresende.github.io/node-orm2"

From a7b33f003c495d523456cc91ae81635e7bb26313 Mon Sep 17 00:00:00 2001
From: Arek W <arek@locomote.com.au>
Date: Wed, 10 Apr 2013 08:41:44 +1000
Subject: [PATCH 0288/1246] Correct 'returnAllErrors' setting behaviour

---
 lib/Instance.js | 2 +-
 lib/Settings.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 9024b3e2..e0f8d6d5 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -50,7 +50,7 @@ function Instance(opts) {
 					err.msg   = msg;
 					err.type  = "validation";
 
-					if (opts.model.settings.get("instance.returnAllErrors")) {
+					if (!opts.model.settings.get("instance.returnAllErrors")) {
 						return cb(err);
 					}
 
diff --git a/lib/Settings.js b/lib/Settings.js
index 2c8f7a77..c3f69ee9 100644
--- a/lib/Settings.js
+++ b/lib/Settings.js
@@ -10,7 +10,7 @@ var default_settings = {
 		autoFetch       : false,
 		autoFetchLimit  : 1,
 		cascadeRemove   : true,
-		returnAllErrors : true
+		returnAllErrors : false
 	}
 };
 

From 84645c8acea35aa305d3f0cc3fe9d6b42662f07a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 10 Apr 2013 18:25:08 +0100
Subject: [PATCH 0289/1246] Adds default settings properties.not_null = false
 (#110)

---
 lib/Associations/Many.js                |  2 +-
 lib/Drivers/DDL/mysql.js                |  5 ++++-
 lib/Drivers/DDL/postgres.js             |  5 ++++-
 lib/Drivers/DDL/sqlite.js               |  5 ++++-
 lib/ORM.js                              |  2 +-
 lib/Property.js                         |  6 +++++-
 lib/Settings.js                         |  3 ++-
 test/integration/test-property-types.js | 21 +++++++++++----------
 8 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 93793887..2f6f9e69 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -30,7 +30,7 @@ exports.prepare = function (Model, associations) {
 			props = {};
 		} else {
 			for (var k in props) {
-				props[k] = Property.check(props[k]);
+				props[k] = Property.check(props[k], Model.settings);
 			}
 		}
 
diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index 25928465..091b4c02 100644
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -130,7 +130,7 @@ function buildColumnDefinition(driver, name, prop) {
 			}
 			break;
 		case "boolean":
-			def = driver.query.escapeId(name) + " BOOLEAN NOT NULL";
+			def = driver.query.escapeId(name) + " BOOLEAN";
 			break;
 		case "date":
 			if (prop.time === false) {
@@ -155,6 +155,9 @@ function buildColumnDefinition(driver, name, prop) {
 		default:
 			throw new Error("Unknown property type: '" + prop.type + "'");
 	}
+	if (prop.notnull === true) {
+		def += " NOT NULL";
+	}
 	if (prop.hasOwnProperty("defaultValue")) {
 		def += " DEFAULT " + driver.query.escapeVal(prop.defaultValue);
 	}
diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index b98c234e..b0f054e5 100644
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -173,7 +173,7 @@ function buildColumnDefinition(driver, table, name, prop) {
 			}
 			break;
 		case "boolean":
-			def = driver.query.escapeId(name) + " BOOLEAN NOT NULL";
+			def = driver.query.escapeId(name) + " BOOLEAN";
 			break;
 		case "date":
 			if (prop.time === false) {
@@ -192,6 +192,9 @@ function buildColumnDefinition(driver, table, name, prop) {
 		default:
 			throw new Error("Unknown property type: '" + prop.type + "'");
 	}
+	if (prop.notnull === true) {
+		def += " NOT NULL";
+	}
 	if (prop.hasOwnProperty("defaultValue")) {
 		def += " DEFAULT " + driver.query.escapeVal(prop.defaultValue);
 	}
diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index 8a05a04c..d2d01e69 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -125,7 +125,7 @@ function buildColumnDefinition(driver, name, prop) {
 			}
 			break;
 		case "boolean":
-			def = driver.query.escapeId(name) + " INTEGER UNSIGNED NOT NULL";
+			def = driver.query.escapeId(name) + " INTEGER UNSIGNED";
 			break;
 		case "date":
 			def = driver.query.escapeId(name) + " DATETIME";
@@ -140,6 +140,9 @@ function buildColumnDefinition(driver, name, prop) {
 		default:
 			throw new Error("Unknown property type: '" + prop.type + "'");
 	}
+	if (prop.notnull === true) {
+		def += " NOT NULL";
+	}
 	if (prop.hasOwnProperty("defaultValue")) {
 		def += " DEFAULT " + driver.query.escapeVal(prop.defaultValue);
 	}
diff --git a/lib/ORM.js b/lib/ORM.js
index 0e709b3d..a2fa5a31 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -126,7 +126,7 @@ ORM.prototype.define = function (name, properties, opts) {
 	opts       = opts || {};
 
 	for (var k in properties) {
-		properties[k] = Property.check(properties[k]);
+		properties[k] = Property.check(properties[k], this.settings);
 	}
 
 	this.models[name] = new Model({
diff --git a/lib/Property.js b/lib/Property.js
index 7f9ab696..c79fe260 100644
--- a/lib/Property.js
+++ b/lib/Property.js
@@ -1,4 +1,4 @@
-exports.check = function (prop) {
+exports.check = function (prop, Settings) {
 	if (typeof prop == "function") {
 		switch (prop.name) {
 			case "String":
@@ -32,6 +32,10 @@ exports.check = function (prop) {
 		throw new Error("Unknown property type: " + prop.type);
 	}
 
+	if (!prop.hasOwnProperty("notnull") && Settings.get("properties.not_null")) {
+		prop.notnull = true;
+	}
+
 	return prop;
 };
 
diff --git a/lib/Settings.js b/lib/Settings.js
index c3f69ee9..a960015b 100644
--- a/lib/Settings.js
+++ b/lib/Settings.js
@@ -1,7 +1,8 @@
 var default_settings = {
 	properties : {
 		primary_key     : "id",
-		association_key : "{name}_id"
+		association_key : "{name}_id",
+		not_null        : false
 	},
 	instance   : {
 		cache           : true,
diff --git a/test/integration/test-property-types.js b/test/integration/test-property-types.js
index 1da95911..159e01e6 100644
--- a/test/integration/test-property-types.js
+++ b/test/integration/test-property-types.js
@@ -1,15 +1,16 @@
 var common     = require('../common');
 var assert     = require('assert');
 var Property   = require('../../lib/Property');
+var Settings   = common.ORM.settings;
 
-assert.equal(Property.check(String).type, "text");
-assert.equal(Property.check(Number).type, "number");
-assert.equal(Property.check(Boolean).type, "boolean");
-assert.equal(Property.check(Date).type, "date");
-assert.equal(Property.check(Object).type, "object");
-assert.equal(Property.check(Buffer).type, "binary");
-assert.equal(Property.check([ 'a', 'b' ]).type, "enum");
-assert.deepEqual(Property.check([ 'a', 'b' ]).values, [ 'a', 'b' ]);
+assert.equal(Property.check(String, Settings).type, "text");
+assert.equal(Property.check(Number, Settings).type, "number");
+assert.equal(Property.check(Boolean, Settings).type, "boolean");
+assert.equal(Property.check(Date, Settings).type, "date");
+assert.equal(Property.check(Object, Settings).type, "object");
+assert.equal(Property.check(Buffer, Settings).type, "binary");
+assert.equal(Property.check([ 'a', 'b' ], Settings).type, "enum");
+assert.deepEqual(Property.check([ 'a', 'b' ], Settings).values, [ 'a', 'b' ]);
 
 assert.equal({ type: "text" }.type, "text");
 assert.equal({ type: "number" }.type, "number");
@@ -19,5 +20,5 @@ assert.equal({ type: "enum" }.type, "enum");
 assert.equal({ type: "object" }.type, "object");
 assert.equal({ type: "binary" }.type, "binary");
 
-assert.throws(function () { Property.check({ type: "buffer" }); });
-assert.throws(function () { Property.check({ type: "unknown" }); });
+assert.throws(function () { Property.check({ type: "buffer" }, Settings); });
+assert.throws(function () { Property.check({ type: "unknown" }, Settings); });

From 9a74103db4bdcd19082304b5f2d952da7366d2f4 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 10 Apr 2013 18:36:17 +0100
Subject: [PATCH 0290/1246] Changes instance.save() to support an hash of
 changes before saving (#111)

---
 lib/Instance.js | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index e0f8d6d5..ed604d58 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -295,8 +295,26 @@ function Instance(opts) {
 		enumerable: false
 	});
 	Object.defineProperty(instance, "save", {
-		value: function (cb) {
-			saveInstance(cb);
+		value: function () {
+			if (arguments.length === 0) {
+				saveInstance();
+			} else {
+				switch (typeof arguments[0]) {
+					case "object":
+						for (var k in arguments[0]) {
+							if (arguments[0].hasOwnProperty(k)) {
+								this[k] = arguments[0][k];
+							}
+						}
+						saveInstance(arguments[1]);
+						break;
+					case "function":
+						saveInstance(arguments[0]);
+						break;
+					default:
+						throw new Error("Unknown parameter type '" + (typeof arguments[0]) + "' in Instance.save()");
+				}
+			}
 
 			return this;
 		},

From 5b46f8249d4fc47d40e8c7e44ad26e64b9eefdfb Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 10 Apr 2013 18:47:16 +0100
Subject: [PATCH 0291/1246] Updates Readme with a new section about updating
 instances

---
 Readme.md | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/Readme.md b/Readme.md
index 94f2353e..2976dd4a 100644
--- a/Readme.md
+++ b/Readme.md
@@ -457,6 +457,42 @@ Person.create([
 });
 ```
 
+### Updating items (called Instances)
+
+Every item returned has the properties that were defined to the Model and also a couple of methods you can
+use to change each item.
+
+```js
+Person.get(1, function (err, John) {
+	John.name = "Joe";
+	John.surname = "Doe";
+	John.save(function (err) {
+		console.log("saved!");
+	});
+});
+```
+
+Updating and then saving an instance can be done in a single call:
+
+```js
+Person.get(1, function (err, John) {
+	John.save({ name: "Joe", surname: "Doe" }, function (err) {
+		console.log("saved!");
+	});
+});
+```
+
+If you want to remove an instance, just do:
+
+```js
+// you could do this without even fetching it, look at Chaining section above
+Person.get(1, function (err, John) {
+	John.remove(function (err) {
+		console.log("removed!");
+	});
+});
+```
+
 ## Associations
 
 An association is a relation between one or more tables.

From e9bb3e8000a6279428f0d5ecc761e41089dbcec1 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 10 Apr 2013 22:55:13 +0100
Subject: [PATCH 0292/1246] Adds setting connection.reconnect (default=false)
 to auto-reconnect (only mysql for now) (#112)

---
 lib/Drivers/DML/mysql.js | 16 ++++++++++++----
 lib/ORM.js               | 20 ++++++++++++++++++--
 lib/Settings.js          |  3 +++
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 1f45f302..134a47a3 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -13,10 +13,7 @@ function Driver(config, connection, opts) {
 		this.config.timezone = "Z";
 	}
 
-	this.db = (connection ? connection : mysql.createConnection(config.href || config));
-	if (this.opts.pool) {
-		this.db.pool = (connection ? connection : mysql.createPool(config.href || config));
-	}
+	this.reconnect(null, connection);
 
 	this.aggregate_functions = [ "ABS", "CEIL", "FLOOR", "ROUND",
 	                             "AVG", "MIN", "MAX",
@@ -42,6 +39,7 @@ Driver.prototype.ping = function (cb) {
 Driver.prototype.on = function (ev, cb) {
 	if (ev == "error") {
 		this.db.on("error", cb);
+		this.db.on("unhandledError", cb);
 	}
 	return this;
 };
@@ -58,6 +56,16 @@ Driver.prototype.connect = function (cb) {
 	this.db.connect(cb);
 };
 
+Driver.prototype.reconnect = function (cb, connection) {
+	this.db = (connection ? connection : mysql.createConnection(this.config.href || this.config));
+	if (this.opts.pool) {
+		this.db.pool = (connection ? connection : mysql.createPool(this.config.href || this.config));
+	}
+	if (typeof cb == "function") {
+		this.connect(cb);
+	}
+};
+
 Driver.prototype.close = function (cb) {
 	if (this.opts.pool) {
 		return cb();
diff --git a/lib/ORM.js b/lib/ORM.js
index a2fa5a31..e561c41d 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -114,9 +114,25 @@ function ORM(driver, settings) {
 
 	events.EventEmitter.call(this);
 
-	driver.on("error", function (err) {
+	var onError = function (err) {
+		if (this.settings.get("connection.reconnect")) {
+			if (typeof this.driver.reconnect == "undefined") {
+				return this.emit("error", new Error("Connection lost - driver does not support reconnection"));
+			}
+			this.driver.reconnect(function () {
+				this.driver.on("error", onError);
+			}.bind(this));
+
+			if (this.listeners("error").length === 0) {
+				// since user want auto reconnect,
+				// don't emit without listeners or it will throw
+				return;
+			}
+		}
 		this.emit("error", err);
-	}.bind(this));
+	}.bind(this);
+
+	driver.on("error", onError);
 }
 
 util.inherits(ORM, events.EventEmitter);
diff --git a/lib/Settings.js b/lib/Settings.js
index a960015b..f371f51f 100644
--- a/lib/Settings.js
+++ b/lib/Settings.js
@@ -12,6 +12,9 @@ var default_settings = {
 		autoFetchLimit  : 1,
 		cascadeRemove   : true,
 		returnAllErrors : false
+	},
+	connection : {
+		reconnect       : true
 	}
 };
 

From 50f79d3c368556c784e8daec615e1c696a3404b6 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 11 Apr 2013 19:34:19 +1000
Subject: [PATCH 0293/1246] Rename notnull to required

---
 lib/Drivers/DDL/mysql.js    | 2 +-
 lib/Drivers/DDL/postgres.js | 2 +-
 lib/Drivers/DDL/sqlite.js   | 2 +-
 lib/Property.js             | 4 ++--
 lib/Settings.js             | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index 091b4c02..a597c94c 100644
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -155,7 +155,7 @@ function buildColumnDefinition(driver, name, prop) {
 		default:
 			throw new Error("Unknown property type: '" + prop.type + "'");
 	}
-	if (prop.notnull === true) {
+	if (prop.required === true) {
 		def += " NOT NULL";
 	}
 	if (prop.hasOwnProperty("defaultValue")) {
diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index b0f054e5..65ff9f78 100644
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -192,7 +192,7 @@ function buildColumnDefinition(driver, table, name, prop) {
 		default:
 			throw new Error("Unknown property type: '" + prop.type + "'");
 	}
-	if (prop.notnull === true) {
+	if (prop.required === true) {
 		def += " NOT NULL";
 	}
 	if (prop.hasOwnProperty("defaultValue")) {
diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index d2d01e69..cda58d00 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -140,7 +140,7 @@ function buildColumnDefinition(driver, name, prop) {
 		default:
 			throw new Error("Unknown property type: '" + prop.type + "'");
 	}
-	if (prop.notnull === true) {
+	if (prop.required === true) {
 		def += " NOT NULL";
 	}
 	if (prop.hasOwnProperty("defaultValue")) {
diff --git a/lib/Property.js b/lib/Property.js
index c79fe260..d1893e72 100644
--- a/lib/Property.js
+++ b/lib/Property.js
@@ -32,8 +32,8 @@ exports.check = function (prop, Settings) {
 		throw new Error("Unknown property type: " + prop.type);
 	}
 
-	if (!prop.hasOwnProperty("notnull") && Settings.get("properties.not_null")) {
-		prop.notnull = true;
+	if (!prop.hasOwnProperty("required") && Settings.get("properties.required")) {
+		prop.required = true;
 	}
 
 	return prop;
diff --git a/lib/Settings.js b/lib/Settings.js
index f371f51f..0ec407e4 100644
--- a/lib/Settings.js
+++ b/lib/Settings.js
@@ -2,7 +2,7 @@ var default_settings = {
 	properties : {
 		primary_key     : "id",
 		association_key : "{name}_id",
-		not_null        : false
+		required        : false
 	},
 	instance   : {
 		cache           : true,

From 513d344f1b8ad777b3898b28c6ea8c9988df1180 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 11 Apr 2013 22:06:19 +1000
Subject: [PATCH 0294/1246] Add some property documentation

---
 Readme.md | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/Readme.md b/Readme.md
index 2976dd4a..2a062488 100644
--- a/Readme.md
+++ b/Readme.md
@@ -131,6 +131,35 @@ var Person = db.define('person', {        // 'person' will be the table in the d
 });
 ```
 
+### Properties
+
+#### Types
+
+Available native object types are:
+
+`String, Number, Boolean, Date, Object, Buffer`
+
+If defining properties using the latter object syntax, the types are:
+
+`text, number, boolean, date, enum, object, binary`
+
+#### Options
+
+##### [all types]
+* `required`: true marks the column as `NOT NULL`, false (default)
+* `defaultValue`: sets the default value for the field
+
+##### string
+* `size`: max length of the string
+
+##### number
+* `rational`: true (default) creates a FLOAT/REAL, false an INTEGER
+
+##### date
+* `time`: true (default) creates a DATETIME/TIMESTAMP, false a DATE
+
+Note that these may vary accross drivers.
+
 ## Loading Models
 
 Models can be in separate modules. Simply ensure that the module holding the models uses module.exports to publish a function that accepts the database connection, then load your models however you like.

From 84a2c3695cc747ea9d198db85236eb5c939595c5 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 11 Apr 2013 14:14:44 +0100
Subject: [PATCH 0295/1246] Adds possibility of order to aggregate method
 (#114)

---
 lib/AggregateFunctions.js                     |  8 ++++++
 .../test-aggregate-groupby-orderby.js         | 28 +++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 test/integration/test-aggregate-groupby-orderby.js

diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index a1a51f23..6ad1a409 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -30,6 +30,10 @@ function AggregateFunctions(opts) {
 			group_by = Array.prototype.slice.apply(arguments);
 			return this;
 		},
+		order: function (property, order) {
+			opts.order = [ property, order ];
+			return this;
+		},
 		get: function (cb) {
 			if (typeof cb != "function") {
 				throw new Error("You must pass a callback to Model.aggregate().get()");
@@ -56,6 +60,10 @@ function AggregateFunctions(opts) {
 				query.groupBy.apply(query, group_by);
 			}
 
+			if (opts.order) {
+				query.order.apply(query, opts.order);
+			}
+
 			opts.driver.execQuery(query.build(), function (err, data) {
 				if (err) {
 					return cb(err);
diff --git a/test/integration/test-aggregate-groupby-orderby.js b/test/integration/test-aggregate-groupby-orderby.js
new file mode 100644
index 00000000..421641f3
--- /dev/null
+++ b/test/integration/test-aggregate-groupby-orderby.js
@@ -0,0 +1,28 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_aggregate_groupby_orderby', db.driver.db, function () {
+		common.insertModelData('test_aggregate_groupby_orderby', db.driver.db, [
+			{ id : 2, name : 'test1' },
+			{ id : 3, name : 'test1' },
+			{ id : 4, name : 'test1' },
+			{ id : 5, name : 'test2' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_aggregate_groupby_orderby', common.getModelProperties());
+
+			TestModel.aggregate().avg('id').count().groupBy('name').order('name', 'Z').get(function (err, rows) {
+				assert.equal(err, null);
+				assert.equal(Array.isArray(rows), true);
+				assert.equal(rows.length, 2);
+				assert.equal(rows[0].avg_id, 5);
+				assert.equal(rows[0].count, 1);
+				assert.equal(rows[1].avg_id, 3);
+				assert.equal(rows[1].count, 3);
+				db.close();
+			});
+		});
+	});
+});

From caf7868e6aba62565fe855d253a07fd7373641d3 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 11 Apr 2013 14:19:39 +0100
Subject: [PATCH 0296/1246] Adds .select() aggregate function to support
 additional properties to be selected (#114)

This was already supported but this way people can point them later
---
 lib/AggregateFunctions.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index 6ad1a409..79ef376d 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -34,6 +34,15 @@ function AggregateFunctions(opts) {
 			opts.order = [ property, order ];
 			return this;
 		},
+		select: function () {
+			if (arguments.length === 0) {
+				throw new Error("When using append you must at least define one property");
+			}
+			opts.properties = opts.properties.concat(Array.isArray(arguments[0]) ?
+			                                                 arguments[0] :
+			                                                 Array.prototype.slice.apply(arguments));
+			return this;
+		},
 		get: function (cb) {
 			if (typeof cb != "function") {
 				throw new Error("You must pass a callback to Model.aggregate().get()");

From 42bb9ac91d19ea6bdae7d3dd2f4e84291a3f5e6b Mon Sep 17 00:00:00 2001
From: huangyingjie <huangyingjie@meituan.com>
Date: Thu, 11 Apr 2013 22:13:51 +0800
Subject: [PATCH 0297/1246] update readme

---
 Readme.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Readme.md b/Readme.md
index 2a062488..5f1e8da4 100644
--- a/Readme.md
+++ b/Readme.md
@@ -343,6 +343,13 @@ Person.aggregate({ surname: "Doe" }).min("age").max("age").get(function (err, mi
 	console.log("The youngest Doe guy has %d years, while the oldest is %d", min, max);
 });
 ```
+Here's an example to illustrate how to use groupby:
+```js
+//The same as "select avg(weight), age from person where country='someCountry' group by age;"
+Person.aggregate(["age"], { country: "someCountry" }).avg("weight").groupBy("age").get(function (err, stats) {
+    // stats is an Array, each item should have 'age' and 'avg_weight'
+});
+```
 
 Possible aggregating functions:
 

From 188f05f645b6db2135bed31f9a485780f0faf5d4 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 12 Apr 2013 01:00:50 +0100
Subject: [PATCH 0298/1246] Changes model.find() queries to specify columns
 instead of selecting all from db (#106)

---
 lib/Associations/One.js                         |  3 ++-
 lib/Drivers/DML/mysql.js                        |  2 +-
 lib/Drivers/DML/postgres.js                     |  2 +-
 lib/Drivers/DML/postgresaxomic.js               |  2 +-
 lib/Drivers/DML/sqlite.js                       |  2 +-
 lib/Model.js                                    | 17 ++++++-----------
 .../test-association-name-lettercase.js         |  2 +-
 7 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index 6004e2bf..799d3900 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -1,6 +1,6 @@
 var Settings = require("../Settings");
 
-exports.prepare = function (Model, associations, association_properties) {
+exports.prepare = function (Model, associations, association_properties, model_fields) {
 	Model.hasOne = function (name, OtherModel, opts) {
 		if (typeof OtherModel == "object" && !OtherModel.table) {
 			opts = OtherModel;
@@ -24,6 +24,7 @@ exports.prepare = function (Model, associations, association_properties) {
 		};
 		associations.push(association);
 		association_properties.push(association.field);
+		model_fields.push(association.field);
 
 		if (opts.reverse) {
 			OtherModel.hasOne(opts.reverse, Model, {
diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 134a47a3..ed300039 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -103,7 +103,7 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	}
 
 	if (opts.merge) {
-		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
+		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field).select(opts.merge.select);
 		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
 			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions);
 		} else {
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 98565957..067a9bdc 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -78,7 +78,7 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	}
 
 	if (opts.merge) {
-		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
+		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field).select(opts.merge.select);
 		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
 			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions);
 		} else {
diff --git a/lib/Drivers/DML/postgresaxomic.js b/lib/Drivers/DML/postgresaxomic.js
index ab01d370..4a7a983a 100644
--- a/lib/Drivers/DML/postgresaxomic.js
+++ b/lib/Drivers/DML/postgresaxomic.js
@@ -77,7 +77,7 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	}
 
 	if (opts.merge) {
-		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
+		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field).select(opts.merge.select);
 		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
 			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions);
 		} else {
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 387fd47c..ab76794f 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -78,7 +78,7 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	}
 
 	if (opts.merge) {
-		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
+		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field).select(opts.merge.select);
 		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
 			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions);
 		} else {
diff --git a/lib/Model.js b/lib/Model.js
index d216491a..e7657dca 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -9,12 +9,12 @@ exports.Model = Model;
 
 function Model(opts) {
 	opts = opts || {};
-	opts.id = opts.id;
+	// opts.id = opts.id;
 
 	var one_associations = [];
 	var many_associations = [];
 	var association_properties = [];
-	var model_fields = null;
+	var model_fields = [ opts.id ];
 
 	var createInstance = function (data, inst_opts, cb) {
 		if (!inst_opts) {
@@ -76,18 +76,12 @@ function Model(opts) {
 	};
 
 	for (var k in opts.properties) {
-		if (opts.properties[k].lazyload === true) {
-			model_fields = [ opts.id ];
-			for (k in opts.properties) {
-				if (opts.properties[k].lazyload !== true) {
-					model_fields.push(k);
-				}
-			}
-			break;
+		if (opts.properties[k].lazyload !== true) {
+			model_fields.push(k);
 		}
 	}
 
-	OneAssociation.prepare(model, one_associations, association_properties);
+	OneAssociation.prepare(model, one_associations, association_properties, model_fields);
 	ManyAssociation.prepare(model, many_associations);
 
 	model.settings = opts.settings;
@@ -203,6 +197,7 @@ function Model(opts) {
 
 							if (options.hasOwnProperty("__merge")) {
 								merge = options.__merge;
+								merge.select = Object.keys(options.extra);
 								delete options.__merge;
 							}
 							if (options.hasOwnProperty("order")) {
diff --git a/test/integration/test-association-name-lettercase.js b/test/integration/test-association-name-lettercase.js
index 8af83071..147b8d33 100644
--- a/test/integration/test-association-name-lettercase.js
+++ b/test/integration/test-association-name-lettercase.js
@@ -9,7 +9,7 @@ common.createConnection(function (err, db) {
 			if (err) throw err;
 
 			var TestModel = db.define('test_association_name_lettercase', common.getModelProperties());
-			TestModel.hasOne("myLetterCase");
+			TestModel.hasOne("myLetterCase", { field: "assoc_id" });
 
 			TestModel.get(1, function (err, Test1) {
 				assert.equal(err, null);

From 4c7b9e96ba9a9f48d257f5014c1aa53bbec3c787 Mon Sep 17 00:00:00 2001
From: huangyingjie <huangyingjie@meituan.com>
Date: Fri, 12 Apr 2013 13:07:34 +0800
Subject: [PATCH 0299/1246] update readme

---
 Readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Readme.md b/Readme.md
index 5f1e8da4..4d624569 100644
--- a/Readme.md
+++ b/Readme.md
@@ -444,6 +444,7 @@ a few examples to describe it:
 { col1: orm.lt(123) } // `col1` < 123
 { col1: orm.lte(123) } // `col1` <= 123
 { col1: orm.between(123, 456) } // `col1` BETWEEN 123 AND 456
+{ col1: orm.like(12 + "%") } // `col1` like '12%'
 ```
 
 ### Caching & Integrity

From 5ccba6d0eeb9d064591fe07997a68ddec2e26a65 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sun, 14 Apr 2013 21:38:57 +0100
Subject: [PATCH 0300/1246] Changes hasMany.addAccessor to support arrays of
 instances (#97)

---
 lib/Associations/Many.js                         | 4 +++-
 test/integration/test-association-hasmany-add.js | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 2f6f9e69..7f34fd2e 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -307,7 +307,9 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 						cb = arguments[i];
 						break;
 					case "object":
-						if (arguments[i].isInstance) {
+						if (Array.isArray(arguments[i])) {
+							Associations = Associations.concat(arguments[i]);
+						} else if (arguments[i].isInstance) {
 							Associations.push(arguments[i]);
 						} else {
 							opts = arguments[i];
diff --git a/test/integration/test-association-hasmany-add.js b/test/integration/test-association-hasmany-add.js
index 6fff80fc..590a1a97 100644
--- a/test/integration/test-association-hasmany-add.js
+++ b/test/integration/test-association-hasmany-add.js
@@ -2,16 +2,16 @@ var common     = require('../common');
 var assert     = require('assert');
 
 common.createConnection(function (err, db) {
-	common.createModelTable('test_association_hasmany_set_multiple', db.driver.db, function () {
-		common.createModelAssocTable('test_association_hasmany_set_multiple', 'assocs', db.driver.db, function () {
-			common.insertModelData('test_association_hasmany_set_multiple', db.driver.db, [
+	common.createModelTable('test_association_hasmany_add', db.driver.db, function () {
+		common.createModelAssocTable('test_association_hasmany_add', 'assocs', db.driver.db, function () {
+			common.insertModelData('test_association_hasmany_add', db.driver.db, [
 				{ id : 1, name : 'test1' },
 				{ id : 2, name : 'test2' },
 				{ id : 3, name : 'test3' }
 			], function (err) {
 				if (err) throw err;
 
-				var TestModel = db.define('test_association_hasmany_set_multiple', common.getModelProperties());
+				var TestModel = db.define('test_association_hasmany_add', common.getModelProperties());
 				TestModel.hasMany("assocs");
 
 				TestModel.get(1, function (err, Test1) {

From 2796fa3e55018f33caf1695d70d825c430b74298 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sun, 14 Apr 2013 21:39:19 +0100
Subject: [PATCH 0301/1246] Adds test for hasMany.addAcessor array of
 associations

---
 .../test-association-hasmany-add-array.js     | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 test/integration/test-association-hasmany-add-array.js

diff --git a/test/integration/test-association-hasmany-add-array.js b/test/integration/test-association-hasmany-add-array.js
new file mode 100644
index 00000000..92d721dc
--- /dev/null
+++ b/test/integration/test-association-hasmany-add-array.js
@@ -0,0 +1,45 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_association_hasmany_add_array', db.driver.db, function () {
+		common.createModelAssocTable('test_association_hasmany_add_array', 'assocs', db.driver.db, function () {
+			common.insertModelData('test_association_hasmany_add_array', db.driver.db, [
+				{ id : 1, name : 'test1' },
+				{ id : 2, name : 'test2' },
+				{ id : 3, name : 'test3' }
+			], function (err) {
+				if (err) throw err;
+
+				var TestModel = db.define('test_association_hasmany_add_array', common.getModelProperties());
+				TestModel.hasMany("assocs");
+
+				TestModel.get(1, function (err, Test1) {
+					assert.equal(err, null);
+					TestModel.get(2, function (err, Test2) {
+						assert.equal(err, null);
+						TestModel.get(3, function (err, Test3) {
+							assert.equal(err, null);
+							Test1.addAssocs(Test2, [ Test3 ], function (err) {
+								assert.equal(err, null);
+								Test1.getAssocs(function (err, Tests) {
+									assert.equal(err, null);
+									assert.equal(Array.isArray(Tests), true);
+									assert.equal(Tests.length, 2);
+									if (Tests[0].id == Test2.id) {
+										assert.equal(Tests[0].name, Test2.name);
+										assert.equal(Tests[1].name, Test3.name);
+									} else {
+										assert.equal(Tests[0].name, Test3.name);
+										assert.equal(Tests[1].name, Test2.name);
+									}
+									db.close();
+								});
+							});
+						});
+					});
+				});
+			});
+		});
+	});
+});

From e66bfa48e078c3b21d1fea8298c2009a9f8b630a Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 15 Apr 2013 20:19:32 +1000
Subject: [PATCH 0302/1246] hasOne reverse model should not have association
 field

---
 lib/Associations/One.js                       |  4 +-
 .../test-association-hasone-reverse.js        | 45 +++++++++++++------
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index 799d3900..97cee85f 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -24,7 +24,9 @@ exports.prepare = function (Model, associations, association_properties, model_f
 		};
 		associations.push(association);
 		association_properties.push(association.field);
-		model_fields.push(association.field);
+		if(!opts.reversed) {
+			model_fields.push(association.field);
+		}
 
 		if (opts.reverse) {
 			OtherModel.hasOne(opts.reverse, Model, {
diff --git a/test/integration/test-association-hasone-reverse.js b/test/integration/test-association-hasone-reverse.js
index 96f2c316..ee90b68f 100644
--- a/test/integration/test-association-hasone-reverse.js
+++ b/test/integration/test-association-hasone-reverse.js
@@ -2,22 +2,39 @@ var common     = require('../common');
 var assert     = require('assert');
 
 common.createConnection(function (err, db) {
-	common.createModel2Table('test_association_hasone_reverse', db.driver.db, function () {
-			common.insertModel2Data('test_association_hasone_reverse', db.driver.db, [
-				{ id : 1, name : 'test1', assoc: 2 },
-				{ id : 2, name : 'test2', assoc: 0 }
-			], function (err) {
-			if (err) throw err;
+	common.createModelTable('test_association_hasone_reverse_parent', db.driver.db, function() {
+		common.createModel2Table('test_association_hasone_reverse_child', db.driver.db, function () {
+			common.insertModelData('test_association_hasone_reverse_parent', db.driver.db, [
+					{ id : 1, name : 'parent 1' },
+					{ id : 2, name : 'parent 2' }
+				], function (err) {
+				if (err) throw err;
+				common.insertModel2Data('test_association_hasone_reverse_child', db.driver.db, [
+						{ id : 1, name : 'child 1', assoc: 2 },
+						{ id : 2, name : 'child 2', assoc: 1 }
+					], function (err) {
+					if (err) throw err;
 
-			var TestModel = db.define('test_association_hasone_reverse', common.getModelProperties());
-			TestModel.hasOne("assoc", TestModel, { reverse: "reverseassoc" });
+					var TestModelParent = db.define('test_association_hasone_reverse_parent', common.getModelProperties());
+					var TestModelChild  = db.define('test_association_hasone_reverse_child',  common.getModelProperties());
+					TestModelChild.hasOne("assoc", TestModelParent, { reverse: "reverseassoc" });
 
-			TestModel(2).getReverseassoc(function (err, Tests) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Tests), true);
-				assert.equal(typeof Tests[0], "object");
-				assert.equal(Tests[0].id, 1);
-				db.close();
+					TestModelParent(2).getReverseassoc(function (err, children) {
+						assert.equal(err, null);
+						assert.equal(Array.isArray(children), true);
+						assert.equal(typeof children[0], "object");
+						assert.equal(children[0].id, 1);
+
+						// Make sure the association field hasn't been erroneously added to the reverse association model.
+						TestModelParent.find({}, function (err, parents) {
+							assert.equal(err, null);
+							assert.equal(parents[0].hasOwnProperty('name'), true);
+							assert.equal(parents[0].hasOwnProperty('assoc_id'), false);
+
+							db.close();
+						});
+					});
+				});
 			});
 		});
 	});

From 792279b7bf154ecf03aebc5f91c7d146e6f8a128 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 15 Apr 2013 22:25:43 +0100
Subject: [PATCH 0303/1246] Adds support for descending ordering using
 "-property" (#115)

---
 lib/ChainFind.js                  |  5 +++-
 lib/Drivers/DML/mysql.js          |  4 ++-
 lib/Drivers/DML/postgres.js       |  4 ++-
 lib/Drivers/DML/postgresaxomic.js |  4 ++-
 lib/Drivers/DML/sqlite.js         |  4 ++-
 lib/Model.js                      |  5 ++++
 lib/Utilities.js                  | 46 +++++++++++++++++++++++++++++++
 7 files changed, 67 insertions(+), 5 deletions(-)
 create mode 100644 lib/Utilities.js

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 41c6479a..f682df37 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -25,7 +25,10 @@ function ChainFind(opts) {
 			return this;
 		},
 		order: function (property, order) {
-			opts.order = [ property, order ];
+			if (!Array.isArray(opts.order)) {
+				opts.order = [];
+			}
+			opts.order.push([ property, (order && order.toUpperCase() == "Z" ? "Z" : "A") ]);
 			return this;
 		},
 		count: function (cb) {
diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index ed300039..ecc8843e 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -99,7 +99,9 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 		q.limit('18446744073709551615');
 	}
 	if (opts.order) {
-		q.order(opts.order[0], opts.order[1]);
+		for (var i = 0; i < opts.order.length; i++) {
+			q.order(opts.order[i][0], opts.order[i][1]);
+		}
 	}
 
 	if (opts.merge) {
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 067a9bdc..f9a485d7 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -74,7 +74,9 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 		q.limit(opts.limit);
 	}
 	if (opts.order) {
-		q.order(opts.order[0], opts.order[1]);
+		for (var i = 0; i < opts.order.length; i++) {
+			q.order(opts.order[i][0], opts.order[i][1]);
+		}
 	}
 
 	if (opts.merge) {
diff --git a/lib/Drivers/DML/postgresaxomic.js b/lib/Drivers/DML/postgresaxomic.js
index 4a7a983a..97ed16db 100644
--- a/lib/Drivers/DML/postgresaxomic.js
+++ b/lib/Drivers/DML/postgresaxomic.js
@@ -73,7 +73,9 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 		q.limit(opts.limit);
 	}
 	if (opts.order) {
-		q.order(opts.order[0], opts.order[1]);
+		for (var i = 0; i < opts.order.length; i++) {
+			q.order(opts.order[i][0], opts.order[i][1]);
+		}
 	}
 
 	if (opts.merge) {
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index ab76794f..e1ef7b9b 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -74,7 +74,9 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 		q.limit('9223372036854775807');
 	}
 	if (opts.order) {
-		q.order(opts.order[0], opts.order[1]);
+		for (var i = 0; i < opts.order.length; i++) {
+			q.order(opts.order[i][0], opts.order[i][1]);
+		}
 	}
 
 	if (opts.merge) {
diff --git a/lib/Model.js b/lib/Model.js
index e7657dca..99a6bd39 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -4,6 +4,7 @@ var OneAssociation  = require("./Associations/One");
 var ManyAssociation = require("./Associations/Many");
 var ChainFind       = require("./ChainFind");
 var LazyLoad        = require("./LazyLoad");
+var Utilities       = require("./Utilities");
 
 exports.Model = Model;
 
@@ -224,6 +225,10 @@ function Model(opts) {
 			options.cache = opts.cache;
 		}
 
+		if (order) {
+			order = Utilities.standardizeOrder(order);
+		}
+
 		var chain = new ChainFind({
 			only         : options.only || model_fields,
 			id           : opts.id,
diff --git a/lib/Utilities.js b/lib/Utilities.js
new file mode 100644
index 00000000..a5afe76a
--- /dev/null
+++ b/lib/Utilities.js
@@ -0,0 +1,46 @@
+/**
+ * Order should be a String (with the property name assumed ascending)
+ * or an Array or property String names.
+ *
+ * Examples:
+ *
+ * 1. 'property1' (ORDER BY property1 ASC)
+ * 2. '-property1' (ORDER BY property1 DESC)
+ * 3. [ 'property1' ] (ORDER BY property1 ASC)
+ * 4. [ '-property1' ] (ORDER BY property1 DESC)
+ * 5. [ 'property1', 'A' ] (ORDER BY property1 ASC)
+ * 6. [ 'property1', 'Z' ] (ORDER BY property1 DESC)
+ * 7. [ '-property1', 'A' ] (ORDER BY property1 ASC)
+ * 8. [ 'property1', 'property2' ] (ORDER BY property1 ASC, property2 ASC)
+ * 9. [ 'property1', '-property2' ] (ORDER BY property1 ASC, property2 DESC)
+ * ...
+ */
+
+exports.standardizeOrder = function (order) {
+	if (typeof order == "string") {
+		if (order[0] == "-") {
+			return [ [ order.substr(1), "Z" ] ];
+		}
+		return [ [ order, "A" ] ];
+	}
+
+	var new_order = [], minus;
+
+	for (var i = 0; i < order.length; i++) {
+		minus = (order[i][0] == "-");
+
+		if (i < order.length - 1 && [ "A", "Z" ].indexOf(order[i + 1].toUpperCase()) >= 0) {
+			new_order.push([
+				(minus ? order[i].substr(1) : order[i]),
+				order[i + 1]
+			]);
+			i += 1;
+		} else if (minus) {
+			new_order.push([ order[i].substr(1), "Z" ]);
+		} else {
+			new_order.push([ order[i], "A" ]);
+		}
+	}
+
+	return new_order;
+};

From 748bb0388ffb155beca1aeff99e056b9afc4934d Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 15 Apr 2013 22:26:04 +0100
Subject: [PATCH 0304/1246] Fixes some find order test table names

---
 test/integration/test-find-order-asc-array.js  | 6 +++---
 test/integration/test-find-order-desc-array.js | 6 +++---
 test/integration/test-find-order-desc.js       | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/integration/test-find-order-asc-array.js b/test/integration/test-find-order-asc-array.js
index af4231c9..59274223 100644
--- a/test/integration/test-find-order-asc-array.js
+++ b/test/integration/test-find-order-asc-array.js
@@ -2,14 +2,14 @@ var common     = require('../common');
 var assert     = require('assert');
 
 common.createConnection(function (err, db) {
-	common.createModelTable('test_find_order', db.driver.db, function () {
-		common.insertModelData('test_find_order', db.driver.db, [
+	common.createModelTable('test_find_order_asc_array', db.driver.db, function () {
+		common.insertModelData('test_find_order_asc_array', db.driver.db, [
 			{ id : 1, name : 'test2' },
 			{ id : 2, name : 'test1' }
 		], function (err) {
 			if (err) throw err;
 
-			var TestModel = db.define('test_find_order', common.getModelProperties());
+			var TestModel = db.define('test_find_order_asc_array', common.getModelProperties());
 
 			TestModel.find([ "name" ], function (err, Instances) {
 				assert.equal(err, null);
diff --git a/test/integration/test-find-order-desc-array.js b/test/integration/test-find-order-desc-array.js
index 5570009f..48796d08 100644
--- a/test/integration/test-find-order-desc-array.js
+++ b/test/integration/test-find-order-desc-array.js
@@ -2,14 +2,14 @@ var common     = require('../common');
 var assert     = require('assert');
 
 common.createConnection(function (err, db) {
-	common.createModelTable('test_find_order', db.driver.db, function () {
-		common.insertModelData('test_find_order', db.driver.db, [
+	common.createModelTable('test_find_order_desc_array', db.driver.db, function () {
+		common.insertModelData('test_find_order_desc_array', db.driver.db, [
 			{ id : 1, name : 'test1' },
 			{ id : 2, name : 'test2' }
 		], function (err) {
 			if (err) throw err;
 
-			var TestModel = db.define('test_find_order', common.getModelProperties());
+			var TestModel = db.define('test_find_order_desc_array', common.getModelProperties());
 
 			TestModel.find([ "name", "Z" ], function (err, Instances) {
 				assert.equal(err, null);
diff --git a/test/integration/test-find-order-desc.js b/test/integration/test-find-order-desc.js
index 27c74160..4fb3cbc3 100644
--- a/test/integration/test-find-order-desc.js
+++ b/test/integration/test-find-order-desc.js
@@ -2,14 +2,14 @@ var common     = require('../common');
 var assert     = require('assert');
 
 common.createConnection(function (err, db) {
-	common.createModelTable('test_find_order', db.driver.db, function () {
-		common.insertModelData('test_find_order', db.driver.db, [
+	common.createModelTable('test_find_order_desc', db.driver.db, function () {
+		common.insertModelData('test_find_order_desc', db.driver.db, [
 			{ id : 1, name : 'test1' },
 			{ id : 2, name : 'test2' }
 		], function (err) {
 			if (err) throw err;
 
-			var TestModel = db.define('test_find_order', common.getModelProperties());
+			var TestModel = db.define('test_find_order_desc', common.getModelProperties());
 
 			TestModel.find("-name", function (err, Instances) {
 				assert.equal(err, null);

From b0e9927f2965f5fa8187e2106f197d05f392d03d Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 15 Apr 2013 22:26:25 +0100
Subject: [PATCH 0305/1246] Adds test for find order desc using [ "-property" ]

---
 .../test-find-order-desc-array-minus.js       | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 test/integration/test-find-order-desc-array-minus.js

diff --git a/test/integration/test-find-order-desc-array-minus.js b/test/integration/test-find-order-desc-array-minus.js
new file mode 100644
index 00000000..ea01f022
--- /dev/null
+++ b/test/integration/test-find-order-desc-array-minus.js
@@ -0,0 +1,24 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_find_order_desc_array_minus', db.driver.db, function () {
+		common.insertModelData('test_find_order_desc_array_minus', db.driver.db, [
+			{ id : 1, name : 'test1' },
+			{ id : 2, name : 'test2' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_find_order_desc_array_minus', common.getModelProperties());
+
+			TestModel.find([ "-name" ], function (err, Instances) {
+				assert.equal(err, null);
+				assert.equal(Array.isArray(Instances), true);
+				assert.equal(Instances.length, 2);
+				assert.equal(Instances[0].id, 2);
+				assert.equal(Instances[1].id, 1);
+				db.close();
+			});
+		});
+	});
+});

From 611d664bca0c94bc6945d242cd3639cfb848ddd2 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 15 Apr 2013 22:29:33 +0100
Subject: [PATCH 0306/1246] Adds more tests to find order using array and minus

---
 ...st-find-order-multiple-array-desc-minus.js | 24 +++++++++++++++++++
 .../test-find-order-multiple-array-desc.js    | 24 +++++++++++++++++++
 .../test-find-order-multiple-array.js         | 24 +++++++++++++++++++
 3 files changed, 72 insertions(+)
 create mode 100644 test/integration/test-find-order-multiple-array-desc-minus.js
 create mode 100644 test/integration/test-find-order-multiple-array-desc.js
 create mode 100644 test/integration/test-find-order-multiple-array.js

diff --git a/test/integration/test-find-order-multiple-array-desc-minus.js b/test/integration/test-find-order-multiple-array-desc-minus.js
new file mode 100644
index 00000000..21b5b636
--- /dev/null
+++ b/test/integration/test-find-order-multiple-array-desc-minus.js
@@ -0,0 +1,24 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_find_order_desc_array_minus', db.driver.db, function () {
+		common.insertModelData('test_find_order_desc_array_minus', db.driver.db, [
+			{ id : 1, name : 'test' },
+			{ id : 2, name : 'test' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_find_order_desc_array_minus', common.getModelProperties());
+
+			TestModel.find([ "name", "-id" ], function (err, Instances) {
+				assert.equal(err, null);
+				assert.equal(Array.isArray(Instances), true);
+				assert.equal(Instances.length, 2);
+				assert.equal(Instances[0].id, 2);
+				assert.equal(Instances[1].id, 1);
+				db.close();
+			});
+		});
+	});
+});
diff --git a/test/integration/test-find-order-multiple-array-desc.js b/test/integration/test-find-order-multiple-array-desc.js
new file mode 100644
index 00000000..19884237
--- /dev/null
+++ b/test/integration/test-find-order-multiple-array-desc.js
@@ -0,0 +1,24 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_find_order_desc_array_minus', db.driver.db, function () {
+		common.insertModelData('test_find_order_desc_array_minus', db.driver.db, [
+			{ id : 1, name : 'test' },
+			{ id : 2, name : 'test' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_find_order_desc_array_minus', common.getModelProperties());
+
+			TestModel.find([ "name", "id", "Z" ], function (err, Instances) {
+				assert.equal(err, null);
+				assert.equal(Array.isArray(Instances), true);
+				assert.equal(Instances.length, 2);
+				assert.equal(Instances[0].id, 2);
+				assert.equal(Instances[1].id, 1);
+				db.close();
+			});
+		});
+	});
+});
diff --git a/test/integration/test-find-order-multiple-array.js b/test/integration/test-find-order-multiple-array.js
new file mode 100644
index 00000000..9106655e
--- /dev/null
+++ b/test/integration/test-find-order-multiple-array.js
@@ -0,0 +1,24 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_find_order_desc_array_minus', db.driver.db, function () {
+		common.insertModelData('test_find_order_desc_array_minus', db.driver.db, [
+			{ id : 1, name : 'test' },
+			{ id : 2, name : 'test' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_find_order_desc_array_minus', common.getModelProperties());
+
+			TestModel.find([ "name", "id", "A" ], function (err, Instances) {
+				assert.equal(err, null);
+				assert.equal(Array.isArray(Instances), true);
+				assert.equal(Instances.length, 2);
+				assert.equal(Instances[0].id, 1);
+				assert.equal(Instances[1].id, 2);
+				db.close();
+			});
+		});
+	});
+});

From 8c6da5bcf5ade28ecc874288f4723d9d3f00cd8d Mon Sep 17 00:00:00 2001
From: Arek W <arek@locomote.com.au>
Date: Tue, 16 Apr 2013 15:18:50 +1000
Subject: [PATCH 0307/1246] Add pool support to postgres driver

---
 lib/Drivers/DDL/postgres.js |   8 +--
 lib/Drivers/DML/postgres.js | 126 ++++++++++++++++++++++++------------
 package.json                |   2 +-
 3 files changed, 89 insertions(+), 47 deletions(-)

diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index 65ff9f78..416b9313 100644
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -9,7 +9,7 @@ exports.drop = function (driver, opts, cb) {
 
 	pending = queries.length;
 	for (i = 0; i < queries.length; i++) {
-		driver.db.query(queries[i], function (err) {
+		driver.execQuery(queries[i], function (err) {
 			if (--pending === 0) {
 				return cb(err);
 			}
@@ -128,7 +128,7 @@ exports.sync = function (driver, opts, cb) {
 function createTableSchema(driver, table, cb) {
 	var pending = table.typequeries.length;
 	var createTable = function () {
-		driver.db.query(table.query, function (err) {
+		driver.execQuery(table.query, function (err) {
 			if (err || table.subqueries.length === 0) {
 				return cb();
 			}
@@ -136,7 +136,7 @@ function createTableSchema(driver, table, cb) {
 			var pending = table.subqueries.length;
 
 			for (var i = 0; i < table.subqueries.length; i++) {
-				driver.db.query(table.subqueries[i], function (err) {
+				driver.execQuery(table.subqueries[i], function (err) {
 					if (--pending === 0) {
 						return cb();
 					}
@@ -150,7 +150,7 @@ function createTableSchema(driver, table, cb) {
 	}
 
 	for (var i = 0; i < table.typequeries.length; i++) {
-		driver.db.query(table.typequeries[i], function (err) {
+		driver.execQuery(table.typequeries[i], function (err) {
 			if (--pending === 0) {
 				return createTable();
 			}
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index f9a485d7..261b9963 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -1,20 +1,34 @@
-var postgres = require("pg");
-var Query    = require("sql-query").Query;
+var pg    = require("pg");
+var Query = require("sql-query").Query;
 
 exports.Driver = Driver;
 
 function Driver(config, connection, opts) {
+	var functions = switchableFunctions.client;
 	this.config = config || {};
 	this.opts   = opts || {};
 	this.query  = new Query("postgresql");
 
 	if (connection) {
 		this.db = connection;
-	} else if (config.query && config.query.ssl) {
-		config.ssl = true;
-		this.db = new postgres.Client(config);
 	} else {
-		this.db = new postgres.Client(config.href || config);
+		if (config.query && config.query.ssl) {
+			config.ssl = true;
+			this.config = config;
+		} else {
+			this.config = config.href || config;
+		}
+
+		if (opts.pool) {
+			functions = switchableFunctions.pool;
+			this.db = pg;
+		} else {
+			this.db = new pg.Client(this.config);
+		}
+	}
+
+	for (var name in functions) {
+		this.constructor.prototype[name] = functions[name];
 	}
 
 	this.aggregate_functions = [ "ABS", "CEIL", "FLOOR", "ROUND",
@@ -25,6 +39,59 @@ function Driver(config, connection, opts) {
 	                             "SUM", "COUNT" ];
 }
 
+var switchableFunctions = {
+	pool: {
+		connect: function (cb) {
+			this.db.connect(this.config, function (err, client, done) {
+				if(!err) done()
+				cb(err);
+			});
+		},
+		execQuery: function (query, cb) {
+			this.db.connect(this.config, function (err, client, done) {
+				if (err) return cb(err);
+
+				client.query(query, function (err, result) {
+					done();
+
+					if(err) {
+						cb(err);
+					} else {
+						cb(null, result.rows);
+					}
+				});
+			});
+			return this;
+		},
+		on: function(ev, cb) {
+			// Because `pg` is the same for all instances of this driver
+			// we can't keep adding listeners since they are never removed.
+			return this;
+		}
+	},
+	client: {
+		connect: function (cb) {
+			this.db.connect(cb);
+		},
+		execQuery: function (query, cb) {
+			this.db.query(query, function(err, result) {
+				if(err) {
+					cb(err);
+				} else {
+					cb(null, result.rows);
+				}
+			});
+			return this;
+		},
+		on: function(ev, cb) {
+			if (ev == "error") {
+				this.db.on("error", cb);
+			}
+			return this;
+		}
+	}
+}
+
 Driver.prototype.sync = function (opts, cb) {
 	return require("../DDL/postgres").sync(this, opts, cb);
 };
@@ -34,23 +101,12 @@ Driver.prototype.drop = function (opts, cb) {
 };
 
 Driver.prototype.ping = function (cb) {
-	this.db.query("SELECT * FROM pg_stat_activity LIMIT 1", function () {
+	this.execQuery("SELECT * FROM pg_stat_activity LIMIT 1", function () {
 		return cb();
 	});
 	return this;
 };
 
-Driver.prototype.on = function (ev, cb) {
-	if (ev == "error") {
-		this.db.on("error", cb);
-	}
-	return this;
-};
-
-Driver.prototype.connect = function (cb) {
-	this.db.connect(cb);
-};
-
 Driver.prototype.close = function (cb) {
 	this.db.end(cb);
 };
@@ -59,10 +115,6 @@ Driver.prototype.getQuery = function () {
 	return this.query;
 };
 
-Driver.prototype.execQuery = function (query, cb) {
-	this.db.query(query, handleQuery(cb));
-};
-
 Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	var q = this.query.select()
 	                  .from(table).select(fields);
@@ -101,7 +153,7 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	if (this.opts.debug) {
 		require("../../Debug").sql('postgres', q);
 	}
-	this.db.query(q, handleQuery(cb));
+	this.execQuery(q, cb);
 };
 
 Driver.prototype.count = function (table, conditions, opts, cb) {
@@ -131,7 +183,7 @@ Driver.prototype.count = function (table, conditions, opts, cb) {
 	if (this.opts.debug) {
 		require("../../Debug").sql('postgres', q);
 	}
-	this.db.query(q, handleQuery(cb));
+	this.execQuery(q, cb);
 };
 
 Driver.prototype.insert = function (table, data, id_prop, cb) {
@@ -143,13 +195,12 @@ Driver.prototype.insert = function (table, data, id_prop, cb) {
 	if (this.opts.debug) {
 		require("../../Debug").sql('postgres', q);
 	}
-	this.db.query(q + " RETURNING *", function (err, result) {
+	this.execQuery(q + " RETURNING *", function (err, results) {
 		if (err) {
 			return cb(err);
 		}
-		return cb(null, {
-			id: result.rows[0][id_prop] || null
-		});
+
+		cb(null, { id: results[0][id_prop] || null });
 	});
 };
 
@@ -163,7 +214,7 @@ Driver.prototype.update = function (table, changes, conditions, cb) {
 	if (this.opts.debug) {
 		require("../../Debug").sql('postgres', q);
 	}
-	this.db.query(q, handleQuery(cb));
+	this.execQuery(q, cb);
 };
 
 Driver.prototype.remove = function (table, conditions, cb) {
@@ -175,16 +226,16 @@ Driver.prototype.remove = function (table, conditions, cb) {
 	if (this.opts.debug) {
 		require("../../Debug").sql('postgres', q);
 	}
-	this.db.query(q, handleQuery(cb));
+	this.execQuery(q, cb);
 };
 
 Driver.prototype.clear = function (table, cb) {
-	var query = "TRUNCATE TABLE " + this.query.escapeId(table);
+	var q = "TRUNCATE TABLE " + this.query.escapeId(table);
 
 	if (this.opts.debug) {
-		require("../../Debug").sql('postgres', query);
+		require("../../Debug").sql('postgres', q);
 	}
-	this.db.query(query, handleQuery(cb));
+	this.execQuery(q, cb);
 };
 
 Driver.prototype.valueToProperty = function (value, property) {
@@ -209,12 +260,3 @@ Driver.prototype.propertyToValue = function (value, property) {
 			return value;
 	}
 };
-
-function handleQuery(cb) {
-	return function (err, result) {
-		if (err) {
-			return cb(err);
-		}
-		return cb(null, result.rows);
-	};
-}
diff --git a/package.json b/package.json
index 8444194d..01e9c9fd 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "utest"     : "0.0.6",
     "urun"      : "0.0.6",
     "mysql"     : "2.0.0-alpha7",
-    "pg"        : "0.8.7",
+    "pg"        : "1.0.0",
     "sqlite3"   : "2.1.5"
   },
   "optionalDependencies": {}

From cfb43445c5718aec8d8117b2bc877a41d57d94ae Mon Sep 17 00:00:00 2001
From: Arek W <arek@locomote.com.au>
Date: Tue, 16 Apr 2013 16:01:33 +1000
Subject: [PATCH 0308/1246] Remove postgres axomic driver

---
 lib/Drivers/DML/postgresaxomic.js | 232 ------------------------------
 lib/Drivers/aliases.js            |   3 +-
 2 files changed, 1 insertion(+), 234 deletions(-)
 delete mode 100644 lib/Drivers/DML/postgresaxomic.js

diff --git a/lib/Drivers/DML/postgresaxomic.js b/lib/Drivers/DML/postgresaxomic.js
deleted file mode 100644
index 97ed16db..00000000
--- a/lib/Drivers/DML/postgresaxomic.js
+++ /dev/null
@@ -1,232 +0,0 @@
-var postgres         = require("pg");
-var Query            = require("sql-query").Query;
-var connectionString = "";
-
-exports.Driver = Driver;
-
-function Driver(config, connection, opts) {
-	this.connectionString = "postgresql" + config.href.substring(14);
-	this.config           = config || {};
-	this.opts             = opts || {};
-	this.db               = postgres;
-	this.query            = new Query("postgresql");
-
-	this.aggregate_functions = [ "ABS", "CEIL", "FLOOR", "ROUND",
-	                             "AVG", "MIN", "MAX",
-	                             "LOG", "EXP", "POWER",
-	                             "ACOS", "ASIN", "ATAN", "COS", "SIN", "TAN",
-	                             "RANDOM", "RADIANS", "DEGREES",
-	                             "SUM", "COUNT" ];
-}
-Driver.prototype.sync = function (opts, cb) {
-	return require("../DDL/postgres").sync(this, opts, cb);
-};
-
-Driver.prototype.drop = function (opts, cb) {
-	return require("../DDL/postgres").drop(this, opts, cb);
-};
-
-Driver.prototype.ping = function (cb) {
-	this.db.query("SELECT * FROM pg_stat_activity LIMIT 1", function () {
-		return cb();
-	});
-	return this;
-};
-
-Driver.prototype.connect = function (cb) {
-	//console.log("connect called");
-	cb(null);
-	//this.db.connect(cb);
-};
-
-Driver.prototype.close = function (cb) {
-	//console.log("end called");
-	cb(null);
-	//
-	//this.db.end(cb);
-};
-Driver.prototype.on = function (ev, cb) {
-	//console.log("Driver.on called");
-	//console.log(ev);
-	if (ev == "error") {
-//		this.db.on("error", cb);
-	}
-	return this;
-};
-
-Driver.prototype.getQuery = function () {
-	return this.query;
-};
-
-Driver.prototype.execQuery = function (query, cb) {
-	this.hijackQuery(query, handleQuery(cb));
-};
-
-Driver.prototype.find = function (fields, table, conditions, opts, cb) {
-	var q = this.query.select()
-	                  .from(table).select(fields);
-
-	if (opts.offset) {
-		q.offset(opts.offset);
-	}
-	if (typeof opts.limit == "number") {
-		q.limit(opts.limit);
-	}
-	if (opts.order) {
-		for (var i = 0; i < opts.order.length; i++) {
-			q.order(opts.order[i][0], opts.order[i][1]);
-		}
-	}
-
-	if (opts.merge) {
-		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field).select(opts.merge.select);
-		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
-			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions);
-		} else {
-			q = q.where(conditions);
-		}
-	} else {
-		q = q.where(conditions);
-	}
-
-	if (opts.exists) {
-		for (var k in opts.exists) {
-			q.whereExists(opts.exists[k].table, table, opts.exists[k].link, opts.exists[k].conditions);
-		}
-	}
-
-	q = q.build();
-
-	if (this.opts.debug) {
-		require("../Debug").sql('postgres', q);
-	}
-	this.hijackQuery(q, handleQuery(cb));
-};
-Driver.prototype.count = function (table, conditions, opts, cb) {
-	var q = this.query.select()
-	                  .from(table)
-	                  .count(opts.id, 'c');
-
-	if (opts.merge) {
-		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
-		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
-			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions);
-		} else {
-			q = q.where(conditions);
-		}
-	} else {
-		q = q.where(conditions);
-	}
-
-	if (opts.exists) {
-		for (var k in opts.exists) {
-			q.whereExists(opts.exists[k].table, table, opts.exists[k].link, opts.exists[k].conditions);
-		}
-	}
-
-	q = q.build();
-
-	if (this.opts.debug) {
-		require("../../Debug").sql('postgres', q);
-	}
-	this.hijackQuery(q, handleQuery(cb));
-};
-Driver.prototype.insert = function (table, data, id_prop, cb) {
-	var q = this.query.insert()
-	                  .into(table)
-	                  .set(data)
-	                  .build();
-
-	if (this.opts.debug) {
-		require("../../Debug").sql('postgres', q);
-	}
-	this.hijackQuery(q + " RETURNING *", function (err, result) {
-		if (err) {
-			return cb(err);
-		}
-		return cb(null, {
-			id: result.rows[0][id_prop] || null
-		});
-	});
-};
-
-Driver.prototype.update = function (table, changes, conditions, cb) {
-	var q = this.query.update()
-	                  .into(table)
-	                  .set(changes)
-	                  .where(conditions)
-	                  .build();
-
-	if (this.opts.debug) {
-		require("../../Debug").sql('postgres', q);
-	}
-	this.hijackQuery(q, handleQuery(cb));
-};
-
-Driver.prototype.remove = function (table, conditions, cb) {
-	var q = this.query.remove()
-	                  .from(table)
-	                  .where(conditions)
-	                  .build();
-
-	if (this.opts.debug) {
-		require("../../Debug").sql('postgres', q);
-	}
-	this.hijackQuery(q, handleQuery(cb));
-};
-
-Driver.prototype.clear = function (table, cb) {
-	var query = "TRUNCATE TABLE " + this.query.escapeId(table);
-
-	if (this.opts.debug) {
-		require("../../Debug").sql('postgres', query);
-	}
-	this.hijackQuery(query, handleQuery(cb));
-};
-
-Driver.prototype.valueToProperty = function (value, property) {
-	switch (property.type) {
-		case "object":
-			try {
-				return JSON.parse(value);
-			} catch (e) {
-				return null;
-			}
-			break;
-		default:
-			return value;
-	}
-};
-
-Driver.prototype.propertyToValue = function (value, property) {
-	switch (property.type) {
-		case "object":
-			return JSON.stringify(value);
-		default:
-			return value;
-	}
-};
-
-Driver.prototype.hijackQuery = function (receievedQuery, cb) {
-
-  this.db.connect(this.connectionString, function(err, client) {
-	  if(err){
-		  console.log("Error from PostgresAxomic");
-		  console.log(err);
-	  }
-	client.query(receievedQuery, cb);
-  })
-}
-
-function handleQuery(cb) {
-	return function (err, result) {
-		if (err) {
-			return cb(err);
-		}
-		return cb(null, result.rows);
-	};
-}
-
-
-
-
diff --git a/lib/Drivers/aliases.js b/lib/Drivers/aliases.js
index f9cf881f..bf8c9f5e 100644
--- a/lib/Drivers/aliases.js
+++ b/lib/Drivers/aliases.js
@@ -1,5 +1,4 @@
 module.exports = {
 	postgresql : "postgres",
-	pg         : "postgres",
-	postgresaxomic: "postgresaxomic"
+	pg         : "postgres"
 };

From 91bd41399bf979a733bf7c8691d2991b07c3a63a Mon Sep 17 00:00:00 2001
From: Arek W <arek@locomote.com.au>
Date: Tue, 16 Apr 2013 16:15:54 +1000
Subject: [PATCH 0309/1246] Update redshift driver to use new postgres driver

---
 lib/Drivers/DML/redshift.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Drivers/DML/redshift.js b/lib/Drivers/DML/redshift.js
index 285fdf3d..0ce00f13 100644
--- a/lib/Drivers/DML/redshift.js
+++ b/lib/Drivers/DML/redshift.js
@@ -18,14 +18,14 @@ Driver.prototype.insert = function (table, data, id_prop, cb) {
 	if (this.opts.debug) {
 		require("../../Debug").sql('postgres', q);
 	}
-	this.db.query(q, function (err, result) {
+	this.execQuery(q, function (err, result) {
 		if (err) {
 			return cb(err);
 		}
 
-		this.db.query("SELECT LASTVAL() AS id", function (err, result) {
+		this.execQuery("SELECT LASTVAL() AS id", function (err, results) {
 			return cb(null, {
-				id: !err && result.rows[0].id || null
+				id: !err && results[0].id || null
 			});
 		});
 	}.bind(this));

From db7f920a8368581b7183410b329d5d137a7d9229 Mon Sep 17 00:00:00 2001
From: Arek W <arek@locomote.com.au>
Date: Tue, 16 Apr 2013 16:46:53 +1000
Subject: [PATCH 0310/1246] Add connection section to readme

---
 Readme.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/Readme.md b/Readme.md
index 4d624569..13605c77 100644
--- a/Readme.md
+++ b/Readme.md
@@ -111,6 +111,32 @@ orm.connect("....", function (err, db) {
 });
 ```
 
+## Connecting
+
+You can pass in connection options either as a string:
+```js
+var orm = require("orm");
+
+orm.connect("mysql://username:password@host/database?pool=true", function (err, db) {...}
+```
+or as an object:
+```js
+var connOpts = {
+  database: "dbname",
+  protocol: "[mysql|postgresql|redshift|sqlite]",
+  host:     "127.0.0.1",
+  port:     3306         // optional, defaults to database default
+  password: "drowssap",
+  query: {
+    pool:  true|false    // optional, false by default
+    debug: true|false    // optional, false by default
+  }
+};
+orm.connect(connOpts, function (err, db) {...}
+```
+`pool` is only supported by mysql & postgres.
+
+
 ## Models
 
 A Model is an abstraction over one or more database tables. Models support associations (more below). The name of the model is assumed to match the table name.

From 859ee4e148fcc6393723aa5ec8dcf51aee987d44 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 16 Apr 2013 18:08:11 +0100
Subject: [PATCH 0311/1246] Updates sql-query dependency to 0.0.18 (adds
 DISTINCT function)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 01e9c9fd..c5251e02 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
   },
   "analyse"     : false,
   "dependencies": {
-    "sql-query"      : "0.0.17",
+    "sql-query"      : "0.0.18",
     "hat"            : "0.0.3"
   },
   "devDependencies": {

From c4a55dcaa242221c771bdd70d58b2c38f1c29fef Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 16 Apr 2013 18:15:02 +0100
Subject: [PATCH 0312/1246] Moves generation of aggregation function alias to
 builder

---
 lib/AggregateFunctions.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index 79ef376d..bedadf69 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -16,10 +16,10 @@ function AggregateFunctions(opts) {
 			var args = (arguments.length && Array.isArray(arguments[0]) ? arguments[0] : Array.prototype.slice.apply(arguments));
 
 			if (args.length > 0) {
-				aggregates[aggregates.length - 1].push({ f: fun, a: args });
+				aggregates[aggregates.length - 1].push({ f: fun, a: args, alias: aggregateAlias(fun, args) });
 				aggregates.push([]);
 			} else {
-				aggregates[aggregates.length - 1].push({ f: fun });
+				aggregates[aggregates.length - 1].push({ f: fun, alias: aggregateAlias(fun, args) });
 			}
 
 			return proto;
@@ -58,7 +58,6 @@ function AggregateFunctions(opts) {
 
 			for (var i = 0; i < aggregates.length; i++) {
 				for (var j = 0; j < aggregates[i].length; j++) {
-					aggregates[i][j].alias = aggregateAlias(aggregates[i][j].f, aggregates[i][j].a);
 					query[aggregates[i][j].f](aggregates[i][j].a, aggregates[i][j].alias);
 				}
 			}

From 60f58d8dceb187704b6daebd78972f21da387d56 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 16 Apr 2013 18:23:14 +0100
Subject: [PATCH 0313/1246] Adds aggregate .as() to define alias to previous
 function (#123)

Usually, when using .avg('age'), ORM will define an alias called
avg_age to the returned value. If you want to change this do
.avg('age').as('my_age').
---
 lib/AggregateFunctions.js                | 11 +++++++++++
 test/integration/test-aggregate-alias.js | 24 ++++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 test/integration/test-aggregate-alias.js

diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index bedadf69..b5c8ab96 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -43,6 +43,17 @@ function AggregateFunctions(opts) {
 			                                                 Array.prototype.slice.apply(arguments));
 			return this;
 		},
+		as: function (alias) {
+			if (aggregates.length === 0) {
+				throw new Error("No aggregate function defined yet");
+			}
+
+			var len = aggregates.length;
+
+			aggregates[len - 2][aggregates[len - 2].length - 1].alias = alias;
+
+			return this;
+		},
 		get: function (cb) {
 			if (typeof cb != "function") {
 				throw new Error("You must pass a callback to Model.aggregate().get()");
diff --git a/test/integration/test-aggregate-alias.js b/test/integration/test-aggregate-alias.js
new file mode 100644
index 00000000..c7ecae68
--- /dev/null
+++ b/test/integration/test-aggregate-alias.js
@@ -0,0 +1,24 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_aggregate', db.driver.db, function () {
+		common.insertModelData('test_aggregate', db.driver.db, [
+			{ id : 1, name : 'test1' },
+			{ id : 2, name : 'test2' },
+			{ id : 3, name : 'test3' },
+			{ id : 4, name : 'test4' },
+			{ id : 5, name : 'test5' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_aggregate', common.getModelProperties());
+
+			TestModel.aggregate({ id: common.ORM.gt(2) }).count('id').as('alias').get(function (err, alias) {
+				assert.equal(err, null);
+				assert.equal(alias, 3);
+				db.close();
+			});
+		});
+	});
+});

From a9915e3c770493328bee550f96e1bf9337c2495e Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 16 Apr 2013 18:24:04 +0100
Subject: [PATCH 0314/1246] Adds DISTINCT function to all drivers (#123)

---
 lib/Drivers/DML/mysql.js    | 3 ++-
 lib/Drivers/DML/postgres.js | 3 ++-
 lib/Drivers/DML/sqlite.js   | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index ecc8843e..2827e454 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -20,7 +20,8 @@ function Driver(config, connection, opts) {
 	                             "LOG", "LOG2", "LOG10", "EXP", "POWER",
 	                             "ACOS", "ASIN", "ATAN", "COS", "SIN", "TAN",
 	                             "CONV", [ "RANDOM", "RAND" ], "RADIANS", "DEGREES",
-	                             "SUM", "COUNT" ];
+	                             "SUM", "COUNT",
+	                             "DISTINCT" ];
 }
 
 Driver.prototype.sync = function (opts, cb) {
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 261b9963..6891d3d5 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -36,7 +36,8 @@ function Driver(config, connection, opts) {
 	                             "LOG", "EXP", "POWER",
 	                             "ACOS", "ASIN", "ATAN", "COS", "SIN", "TAN",
 	                             "RANDOM", "RADIANS", "DEGREES",
-	                             "SUM", "COUNT" ];
+	                             "SUM", "COUNT",
+	                             "DISTINCT" ];
 }
 
 var switchableFunctions = {
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index e1ef7b9b..585eb9a8 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -20,7 +20,8 @@ function Driver(config, connection, opts) {
 	this.aggregate_functions = [ "ABS", "ROUND",
 	                             "AVG", "MIN", "MAX",
 	                             "RANDOM",
-	                             "SUM", "COUNT" ];
+	                             "SUM", "COUNT",
+	                             "DISTINCT" ];
 }
 
 Driver.prototype.sync = function (opts, cb) {

From d147bb0e35a46c01d783b32f5a8569cbc1d7e88a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 17 Apr 2013 11:04:05 +0100
Subject: [PATCH 0315/1246] Adds exception for .distinct() to behave a little
 different from other aggregate functions (#123)

---
 lib/AggregateFunctions.js                   | 21 +++++++++++++----
 test/integration/test-aggregate-distinct.js | 25 +++++++++++++++++++++
 2 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 test/integration/test-aggregate-distinct.js

diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index b5c8ab96..d022b414 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -8,8 +8,9 @@ function AggregateFunctions(opts) {
 		throw new Error("This driver does not support aggregate functions");
 	}
 
-	var aggregates = [ [] ];
-	var group_by   = null;
+	var aggregates    = [ [] ];
+	var group_by      = null;
+	var used_distinct = false;
 
 	var appendFunction = function (fun) {
 		return function () {
@@ -22,6 +23,10 @@ function AggregateFunctions(opts) {
 				aggregates[aggregates.length - 1].push({ f: fun, alias: aggregateAlias(fun, args) });
 			}
 
+			if (fun == "distinct") {
+				used_distinct = true;
+			}
+
 			return proto;
 		};
 	};
@@ -92,9 +97,17 @@ function AggregateFunctions(opts) {
 					return cb(null, data);
 				}
 
-				var items = [];
+				var items = [], i;
+
+				if (used_distinct && aggregates.length == 1) {
+					for (i = 0; i < data.length; i++) {
+						items.push(data[i][Object.keys(data[i]).pop()]);
+					}
+
+					return cb(null, items);
+				}
 
-				for (var i = 0; i < aggregates.length; i++) {
+				for (i = 0; i < aggregates.length; i++) {
 					for (var j = 0; j < aggregates[i].length; j++) {
 						items.push(data[0][aggregates[i][j].alias] || null);
 					}
diff --git a/test/integration/test-aggregate-distinct.js b/test/integration/test-aggregate-distinct.js
new file mode 100644
index 00000000..6cf5808b
--- /dev/null
+++ b/test/integration/test-aggregate-distinct.js
@@ -0,0 +1,25 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_aggregate_distinct', db.driver.db, function () {
+		common.insertModelData('test_aggregate_distinct', db.driver.db, [
+			{ id : 1, name : 'test1' },
+			{ id : 2, name : 'test1' },
+			{ id : 3, name : 'test2' },
+			{ id : 4, name : 'test2' },
+			{ id : 5, name : 'test2' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_aggregate_distinct', common.getModelProperties());
+
+			TestModel.aggregate().distinct('name').get(function (err, names) {
+				assert.equal(err, null);
+				assert.equal(Array.isArray(names), true);
+				assert.equal(names.length, 2);
+				db.close();
+			});
+		});
+	});
+});

From ce5a233121023dab53aff3cf262c7c36808d3cfa Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 18 Apr 2013 00:19:42 +0100
Subject: [PATCH 0316/1246] Updates sql-query dependency to 0.0.19 (#94)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c5251e02..17c58881 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
   },
   "analyse"     : false,
   "dependencies": {
-    "sql-query"      : "0.0.18",
+    "sql-query"      : "0.0.19",
     "hat"            : "0.0.3"
   },
   "devDependencies": {

From ec972066f08147e1908ccad20952e44a3264dc6e Mon Sep 17 00:00:00 2001
From: Arek W <arek@locomote.com.au>
Date: Thu, 18 Apr 2013 13:16:29 +1000
Subject: [PATCH 0317/1246] Add validate model to instances

---
 lib/Instance.js                     |  6 ++++++
 test/integration/test-validation.js | 10 +++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index ed604d58..170c2036 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -338,6 +338,12 @@ function Instance(opts) {
 		value: true,
 		enumerable: false
 	});
+	Object.defineProperty(instance, "validate", {
+    value: function (cb) {
+      handleValidations(cb);
+    },
+    enumerable: false
+  });
 
 	if (!opts.data.hasOwnProperty(opts.id)) {
 		opts.changes = Object.keys(opts.data);
diff --git a/test/integration/test-validation.js b/test/integration/test-validation.js
index b171a09e..76d6d98f 100644
--- a/test/integration/test-validation.js
+++ b/test/integration/test-validation.js
@@ -18,7 +18,15 @@ common.createConnection(function (err, db) {
 			assert.equal(err.value, "test-validation");
 			assert.equal(err.msg, "force-validation-fail");
 
-			db.close();
+			Test = new TestModel({ name: "test-validation" });
+			Test.validate(function (err) {
+				assert.equal(typeof err, "object");
+				assert.equal(err.field, "name");
+				assert.equal(err.value, "test-validation");
+				assert.equal(err.msg, "force-validation-fail");
+
+				db.close();
+			});
 		});
 	});
 });

From 5cee6f93a1937b55051d967f76837370ae9772c0 Mon Sep 17 00:00:00 2001
From: Arek W <arek@locomote.com.au>
Date: Thu, 18 Apr 2013 13:53:40 +1000
Subject: [PATCH 0318/1246] Add tests for 'instance.returnAllErrors' setting

---
 .../test-validation-return-all-errors.js      | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 test/integration/test-validation-return-all-errors.js

diff --git a/test/integration/test-validation-return-all-errors.js b/test/integration/test-validation-return-all-errors.js
new file mode 100644
index 00000000..61f129a3
--- /dev/null
+++ b/test/integration/test-validation-return-all-errors.js
@@ -0,0 +1,34 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+  db.settings.set('instance.returnAllErrors', true);
+  common.createModelTable('test_validation_all_errors', db.driver.db, function () {
+    var TestModel = db.define('test_validation_all_errors', common.getModelProperties(), {
+      validations: {
+        name: [
+          function (name, next) {
+            return next('force-fail');
+          },
+          function (name, next) {
+            return next('force-fail-2');
+          }
+        ]
+      }
+    });
+
+    var Test = new TestModel({ name: "test-validation" });
+    Test.save(function (err) {
+      assert(Array.isArray(err));
+      assert.deepEqual( err.map(function(e) { return e.msg; } ), ['force-fail','force-fail-2'] );
+
+      Test = new TestModel({ name: "test-validation" });
+      Test.validate(function (err) {
+        assert(Array.isArray(err));
+        assert.deepEqual( err.map(function(e) { return e.msg; } ), ['force-fail','force-fail-2'] );
+
+        db.close();
+      });
+    });
+  });
+});

From 1f2ad592294d9c364193ad5d3a657085676e81fa Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 18 Apr 2013 10:00:53 +0100
Subject: [PATCH 0319/1246] Fixes test-association-hasmany-remove to handle
 rows out of order (#129)

---
 test/integration/test-association-hasmany-remove.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/integration/test-association-hasmany-remove.js b/test/integration/test-association-hasmany-remove.js
index 02e6f3d8..1b6a36f6 100644
--- a/test/integration/test-association-hasmany-remove.js
+++ b/test/integration/test-association-hasmany-remove.js
@@ -26,8 +26,13 @@ common.createConnection(function (err, db) {
 							assert.equal(err, null);
 							assert.equal(Array.isArray(Tests), true);
 							assert.equal(Tests.length, 2);
-							assert.equal(Tests[0].name, 'test2');
-							assert.equal(Tests[1].name, 'test3');
+							if (Tests[0].id == 2) {
+								assert.equal(Tests[0].name, 'test2');
+								assert.equal(Tests[1].name, 'test3');
+							} else {
+								assert.equal(Tests[0].name, 'test3');
+								assert.equal(Tests[1].name, 'test2');
+							}
 
 							Test1.removeAssocs(function (err) {
 								assert.equal(err, null);

From 1d18b52650513f3f1f068f38ecc352ce216a48bf Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 18 Apr 2013 11:25:02 +0100
Subject: [PATCH 0320/1246] 2.0.9

---
 Changelog.md | 21 +++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 96e4814c..beb6dbe2 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,24 @@
+### v2.0.9 - 18 Apr 2013
+
+- Correct 'returnAllErrors' setting behaviour
+- Adds default settings properties.required = false (#110)
+- Changes instance.save() to support an hash of changes before saving (#111)
+- Adds setting connection.reconnect (default=false) to auto-reconnect (only mysql for now) (#112)
+- Adds possibility of .order() to aggregate method (#114)
+- Adds .select() aggregate function to support additional properties to be selected (#114)
+- Adds .as() aggregate function to define alias to previous function (#123)
+- Adds .distinct() aggregate function to all drivers (#123)
+- Changes model.find() queries to specify columns instead of selecting * from tables (#106)
+- Changes hasMany.addAccessor to support arrays of instances (#97)
+- Adds support for descending ordering using "-property" (#115)
+- Adds pool support to postgres driver
+- Removes postgres axomic driver
+- Updates redshift driver to use new postgres driver
+- Adds .validate() model to instances
+- Adds more tests
+- Some documentation updates
+- Some bug fixes
+
 ### v2.0.8 - 8 Apr 2013
 
 - Adds more aggregate functions to the several drivers
diff --git a/package.json b/package.json
index 17c58881..58258698 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "redshift",
     "sqlite"
   ],
-  "version"     : "2.0.8",
+  "version"     : "2.0.9",
   "license"     : "MIT",
   "repository"  : {
     "url"            : "http://dresende.github.io/node-orm2"

From 8949a9d047fe6fddb519f35a1427e8b9e927472f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 18 Apr 2013 11:34:06 +0100
Subject: [PATCH 0321/1246] Updates package.json to have both homepage and
 repository

---
 package.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 58258698..6950df37 100644
--- a/package.json
+++ b/package.json
@@ -13,9 +13,8 @@
   ],
   "version"     : "2.0.9",
   "license"     : "MIT",
-  "repository"  : {
-    "url"            : "http://dresende.github.io/node-orm2"
-  },
+  "homepage"    : "http://dresende.github.io/node-orm2",
+  "repository"  : "http://github.com/dresende/node-orm2.git",
   "scripts"     : {
     "test"           : "make"
   },

From 233c7907dfbf823c4d4181f7289594d75a0d0cd8 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 18 Apr 2013 14:52:30 +0100
Subject: [PATCH 0322/1246] Adds initial plugin architecture - .use() (#121)

Check test "test-db-use" for an example. There's still some more things
to add to plugins to make them really usefull.
---
 lib/ORM.js                      | 25 +++++++++++++++++++++++++
 test/integration/test-db-use.js | 31 +++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 test/integration/test-db-use.js

diff --git a/lib/ORM.js b/lib/ORM.js
index e561c41d..3e4f47a9 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -107,6 +107,7 @@ function ORM(driver, settings) {
 	this.driver.uid = hat();
 	this.tools      = {};
 	this.models     = {};
+	this.plugins    = [];
 
 	for (var k in Query.Comparators) {
 		this.tools[Query.Comparators[k]] = Query[Query.Comparators[k]];
@@ -137,6 +138,23 @@ function ORM(driver, settings) {
 
 util.inherits(ORM, events.EventEmitter);
 
+ORM.prototype.use = function (plugin_const, opts) {
+	if (typeof plugin_const == "string") {
+		plugin_const = require(plugin_const);
+	}
+
+	var plugin = new plugin_const(this, opts || {});
+
+	if (typeof plugin.define == "function") {
+		for (var k in this.models) {
+			plugin.define(this.models[k]);
+		}
+	}
+
+	this.plugins.push(plugin);
+
+	return this;
+};
 ORM.prototype.define = function (name, properties, opts) {
 	properties = properties || {};
 	opts       = opts || {};
@@ -161,6 +179,13 @@ ORM.prototype.define = function (name, properties, opts) {
 		methods        : opts.methods || {},
 		validations    : opts.validations || {}
 	});
+
+	for (var i = 0; i < this.plugins.length; i++) {
+		if (typeof this.plugins[i].define == "function") {
+			this.plugins[i].define(this.models[name], this);
+		}
+	}
+
 	return this.models[name];
 };
 ORM.prototype.ping = function (cb) {
diff --git a/test/integration/test-db-use.js b/test/integration/test-db-use.js
new file mode 100644
index 00000000..d85a19ff
--- /dev/null
+++ b/test/integration/test-db-use.js
@@ -0,0 +1,31 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	assert.equal(err, null);
+
+	// initialize plugin
+	db.use(MyPlugin, { option: true });
+
+	var calledDefine = false;
+	var MyModel = db.define("my_model", { // db.define should call plugin.define method
+		property: String
+	});
+
+	assert.equal(calledDefine, true);
+
+	db.close();
+
+	function MyPlugin(DB, opts) {
+		assert.strictEqual(db, DB);
+		assert.deepEqual(opts, { option: true });
+
+		return {
+			define: function (Model) {
+				assert.equal(typeof Model, "function");
+				assert.equal(typeof Model.id, "string");
+				calledDefine = true;
+			}
+		};
+	}
+});

From db8fe1464b2cea7adb5d2865d431272c18938b14 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 18 Apr 2013 14:52:42 +0100
Subject: [PATCH 0323/1246] Updates test-connect to check for db.use() method

---
 test/integration/test-connect.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/integration/test-connect.js b/test/integration/test-connect.js
index 48053e4b..38f9b16f 100644
--- a/test/integration/test-connect.js
+++ b/test/integration/test-connect.js
@@ -4,6 +4,7 @@ var assert     = require('assert');
 common.createConnection(function (err, db) {
 	assert.equal(err, null);
 	assert.equal(typeof db, "object");
+	assert.equal(typeof db.use, "function");
 	assert.equal(typeof db.define, "function");
 	assert.equal(typeof db.close, "function");
 	assert.equal(typeof db.models, "object");

From 8480cada16cd2e9cf412711b66e5a69f2877da6e Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 18 Apr 2013 15:01:26 +0100
Subject: [PATCH 0324/1246] Fixes bug about connection config object not having
 query key (fixes #130)

---
 lib/ORM.js                              |  2 +-
 test/integration/test-connect-object.js | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 test/integration/test-connect-object.js

diff --git a/lib/ORM.js b/lib/ORM.js
index 3e4f47a9..16bac8f9 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -281,7 +281,7 @@ ORM.prototype.serial = function () {
 };
 
 function extractOption(opts, key) {
-	if (!opts.query.hasOwnProperty(key)) {
+	if (!opts.query || !opts.query.hasOwnProperty(key)) {
 		return null;
 	}
 
diff --git a/test/integration/test-connect-object.js b/test/integration/test-connect-object.js
new file mode 100644
index 00000000..aa0cb76a
--- /dev/null
+++ b/test/integration/test-connect-object.js
@@ -0,0 +1,14 @@
+var common      = require('../common');
+var assert      = require('assert');
+var config      = require("../config")[common.protocol()];
+
+config.protocol = common.protocol();
+
+delete config.query; // force a connection without this key
+
+common.ORM.connect(config, function (err, db) {
+	assert.equal(err, null);
+	assert.equal(typeof db, "object");
+
+	db.close();
+});

From 14b50445be8555affef2dfc54aaa0e9c9f109e5f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 18 Apr 2013 20:17:23 +0100
Subject: [PATCH 0325/1246] Fixes test-connect-object for Travis CI

---
 test/common.js                          | 18 ++++++++++++++++++
 test/integration/test-connect-object.js |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/test/common.js b/test/common.js
index 31edd0c5..0dfc57c7 100644
--- a/test/common.js
+++ b/test/common.js
@@ -16,6 +16,24 @@ common.createConnection = function(cb) {
 	ORM.connect(this.getConnectionString(), cb);
 };
 
+common.getConfig = function () {
+	if (common.isTravis()) {
+		switch (this.protocol()) {
+			case 'mysql':
+				return { user: "root", host: "localhost", database: "orm_test" };
+			case 'postgres':
+			case 'redshift':
+				return { user: "postgres", host: "localhost", database: "orm_test" };
+			case 'sqlite':
+				return {};
+			default:
+				throw new Error("Unknown protocol");
+		}
+	} else {
+		return require("./config")[this.protocol()];
+	}
+};
+
 common.getConnectionString = function () {
 	var url;
 
diff --git a/test/integration/test-connect-object.js b/test/integration/test-connect-object.js
index aa0cb76a..4299546a 100644
--- a/test/integration/test-connect-object.js
+++ b/test/integration/test-connect-object.js
@@ -1,6 +1,6 @@
 var common      = require('../common');
 var assert      = require('assert');
-var config      = require("../config")[common.protocol()];
+var config      = common.getConfig();
 
 config.protocol = common.protocol();
 

From bf4602aec9cea1f581ef436a2cc9aaf0a54b3ae6 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 19 Apr 2013 10:18:05 +0100
Subject: [PATCH 0326/1246] Changes ChainFind.run() to ChainFind.get()

Leaves a deprecated warning on ChainFind.run()
---
 lib/ChainFind.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index f682df37..ef740196 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -81,6 +81,10 @@ function ChainFind(opts) {
 			return new ChainInstance(this, cb);
 		},
 		run: function (cb) {
+			process.stderr.write("node-orm: ChainFind.run() is deprecated, use ChainFind.get() instead\n");
+			return this.get(cb);
+		},
+		get: function (cb) {
 			opts.driver.find(opts.only, opts.table, opts.conditions, {
 				limit  : opts.limit,
 				order  : opts.order,

From 9deaa26dc53b87c185464d153a63bb825b408f76 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 19 Apr 2013 19:34:59 +0100
Subject: [PATCH 0327/1246] Adds support for chaining and rechaining with
 ChainFind

---
 lib/ChainFind.js                      | 16 ++++++++++++-
 lib/Model.js                          |  2 +-
 test/integration/test-find-rechain.js | 34 +++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 test/integration/test-find-rechain.js

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index f682df37..67546306 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -3,8 +3,14 @@ var ChainInstance   = require("./ChainInstance");
 
 module.exports = ChainFind;
 
-function ChainFind(opts) {
+function ChainFind(Model, opts) {
 	var chain = {
+		find: function (conditions) {
+			for (var k in conditions) {
+				opts.conditions[k] = conditions[k];
+			}
+			return this;
+		},
 		only: function () {
 			if (arguments.length && Array.isArray(arguments[0])) {
 				opts.only = arguments[0];
@@ -116,6 +122,14 @@ function ChainFind(opts) {
 			addChainMethod(chain, opts.associations[i], opts);
 		}
 	}
+	for (var k in Model) {
+		if ([ "hasOne", "hasMany",
+		      "drop", "sync", "get", "find", "count", "clear", "create",
+		      "exists", "settings", "aggregate" ].indexOf(k) >= 0) continue;
+		if (typeof Model[k] != "function") continue;
+
+		chain[k] = Model[k];
+	}
 	return chain;
 }
 
diff --git a/lib/Model.js b/lib/Model.js
index 99a6bd39..08bc5632 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -229,7 +229,7 @@ function Model(opts) {
 			order = Utilities.standardizeOrder(order);
 		}
 
-		var chain = new ChainFind({
+		var chain = new ChainFind(model, {
 			only         : options.only || model_fields,
 			id           : opts.id,
 			table        : opts.table,
diff --git a/test/integration/test-find-rechain.js b/test/integration/test-find-rechain.js
new file mode 100644
index 00000000..5fafa132
--- /dev/null
+++ b/test/integration/test-find-rechain.js
@@ -0,0 +1,34 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_find_rechain', db.driver.db, function () {
+		common.insertModelData('test_find_rechain', db.driver.db, [
+			{ id : 1, name : 'test1' },
+			{ id : 2, name : 'test2' },
+			{ id : 3, name : 'test1' },
+			{ id : 4, name : 'test2' },
+			{ id : 5, name : 'test1' },
+			{ id : 6, name : 'test2' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_find_rechain', common.getModelProperties());
+
+			TestModel.aboveId3 = function () {
+				return this.find({ id : db.tools.gt(3) });
+			};
+			TestModel.onlyTest1 = function () {
+				return this.find({ name : 'test1' });
+			};
+
+			TestModel.aboveId3().onlyTest1().run(function (err, Instances) {
+				assert.equal(err, null);
+				assert.equal(Array.isArray(Instances), true);
+				assert.equal(Instances[0].id, 5);
+				assert.equal(Instances[0].name, 'test1');
+				db.close();
+			});
+		});
+	});
+});

From 969c2b14b1ca8fd14527c8fc5a4106362f9b43d4 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 19 Apr 2013 20:01:29 +0100
Subject: [PATCH 0328/1246] Fixes autoFetch option not being considered in
 Model.find() (#120)

---
 lib/Model.js                                  |  2 +-
 ...test-association-hasmany-find-autofetch.js | 43 +++++++++++++++++++
 .../test-association-hasone-find-autofetch.js | 26 +++++++++++
 3 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 test/integration/test-association-hasmany-find-autofetch.js
 create mode 100644 test/integration/test-association-hasone-find-autofetch.js

diff --git a/lib/Model.js b/lib/Model.js
index 99a6bd39..4dcf82e7 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -247,7 +247,7 @@ function Model(opts) {
 				}, function (cb) {
 					return createInstance(data, {
 						autoSave       : opts.autoSave,
-						autoFetch      : (options.autoFetchLimit === 0 ? false : opts.autoFetch),
+						autoFetch      : (options.autoFetchLimit === 0 ? false : (options.autoFetch || opts.autoFetch)),
 						autoFetchLimit : options.autoFetchLimit || opts.autoFetchLimit,
 						cascadeRemove  : options.cascadeRemove || opts.cascadeRemove,
 						extra          : options.extra,
diff --git a/test/integration/test-association-hasmany-find-autofetch.js b/test/integration/test-association-hasmany-find-autofetch.js
new file mode 100644
index 00000000..8d91c8ca
--- /dev/null
+++ b/test/integration/test-association-hasmany-find-autofetch.js
@@ -0,0 +1,43 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_association_hasmany_find_autofetch', db.driver.db, function () {
+		common.createModelAssocTable('test_association_hasmany_find_autofetch', 'assocs', db.driver.db, function () {
+			common.insertModelData('test_association_hasmany_find_autofetch', db.driver.db, [
+				{ id : 1, name : 'test1' },
+				{ id : 2, name : 'test2' },
+				{ id : 3, name : 'test3' },
+				{ id : 4, name : 'test4' },
+				{ id : 5, name : 'test5' }
+			], function (err) {
+				if (err) throw err;
+
+				var TestModel = db.define('test_association_hasmany_find_autofetch', common.getModelProperties());
+				TestModel.hasMany("assocs");
+
+				TestModel.find(function (err, Tests) {
+					assert.equal(err, null);
+
+					var Test = Tests.splice(0, 1)[0];
+					var total_assocs = Tests.length;
+
+					Test.setAssocs(Tests, function (err) {
+						assert.equal(err, null);
+
+						TestModel.find({ id: Test.id }, { autoFetch: true, cache: false }, function (err, Tests1) {
+							assert.equal(err, null);
+							assert.equal(Array.isArray(Tests1), true);
+							assert.equal(Tests1.length, 1);
+							assert.equal(Tests1[0].id, Test.id);
+							assert.equal(Tests1[0].id, Test.id);
+							assert.equal(Array.isArray(Tests1[0].assocs), true);
+							assert.equal(Tests1[0].assocs.length, total_assocs);
+							db.close();
+						});
+					});
+				});
+			});
+		});
+	});
+});
diff --git a/test/integration/test-association-hasone-find-autofetch.js b/test/integration/test-association-hasone-find-autofetch.js
new file mode 100644
index 00000000..fefa8296
--- /dev/null
+++ b/test/integration/test-association-hasone-find-autofetch.js
@@ -0,0 +1,26 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModel2Table('test_association_hasone_find_autofetch', db.driver.db, function () {
+		common.insertModel2Data('test_association_hasone_find_autofetch', db.driver.db, [
+			{ id : 1, name : 'test1', assoc: 2 },
+			{ id : 2, name : 'test2', assoc: 0 }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_association_hasone_find_autofetch', common.getModelProperties());
+			TestModel.hasOne("assoc");
+
+			TestModel.find({ id: 1 }, { autoFetch: true }, function (err, Tests) {
+				assert.equal(err, null);
+				assert.equal(Array.isArray(Tests), true);
+				assert.equal(Tests.length, 1);
+				assert.equal(Tests[0].assoc_id, 2);
+				assert.equal(typeof Tests[0].assoc, "object");
+				assert.equal(Tests[0].assoc.id, 2);
+				db.close();
+			});
+		});
+	});
+});

From dcb5e150edbbc0d34c946d2ff861f31b227ed4b9 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sat, 20 Apr 2013 19:08:12 +0100
Subject: [PATCH 0329/1246] Changes ChainFind.get to ChainFind.all, removes
 deprecation warning for now

---
 lib/ChainFind.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index ef740196..a92791af 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -81,10 +81,9 @@ function ChainFind(opts) {
 			return new ChainInstance(this, cb);
 		},
 		run: function (cb) {
-			process.stderr.write("node-orm: ChainFind.run() is deprecated, use ChainFind.get() instead\n");
-			return this.get(cb);
+			return this.all(cb);
 		},
-		get: function (cb) {
+		all: function (cb) {
 			opts.driver.find(opts.only, opts.table, opts.conditions, {
 				limit  : opts.limit,
 				order  : opts.order,

From 93fcdb494d0429feb80488c2f88c0d1f530a65cb Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sat, 20 Apr 2013 19:11:56 +0100
Subject: [PATCH 0330/1246] Creates Model.all() as alias to Model.find(), adds
 simple example

---
 lib/Model.js                 |  2 ++
 test/integration/test-all.js | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 test/integration/test-all.js

diff --git a/lib/Model.js b/lib/Model.js
index 99a6bd39..aa53daee 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -267,6 +267,8 @@ function Model(opts) {
 		return this;
 	};
 
+	model.all = model.find;
+
 	model.count = function () {
 		var conditions = null;
 		var cb         = null;
diff --git a/test/integration/test-all.js b/test/integration/test-all.js
new file mode 100644
index 00000000..add02b45
--- /dev/null
+++ b/test/integration/test-all.js
@@ -0,0 +1,26 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_all', db.driver.db, function () {
+		common.insertModelData('test_all', db.driver.db, [
+			{ id : 1, name : 'test2' },
+			{ id : 2, name : 'test2' },
+			{ id : 3, name : 'test1' },
+			{ id : 4, name : 'test1' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_all', common.getModelProperties());
+
+			// just to see if Model.all() is passing everything to Model.find()
+			TestModel.all({ name: 'test1' }, 1, 'id', function (err, Instances) {
+				assert.equal(err, null);
+				assert.equal(Array.isArray(Instances), true);
+				assert.equal(Instances.length, 1);
+				assert.equal(Instances[0].id, 3);
+				db.close();
+			});
+		});
+	});
+});

From 95a715b03a28b7a6ec9805d6ad9a7cebb7e0a480 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sat, 20 Apr 2013 19:27:42 +0100
Subject: [PATCH 0331/1246] Adds Model.all() to list of not linked ChainFind
 methods

---
 lib/ChainFind.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index c511e956..1f25f4f0 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -127,7 +127,7 @@ function ChainFind(Model, opts) {
 	}
 	for (var k in Model) {
 		if ([ "hasOne", "hasMany",
-		      "drop", "sync", "get", "find", "count", "clear", "create",
+		      "drop", "sync", "get", "find", "all", "count", "clear", "create",
 		      "exists", "settings", "aggregate" ].indexOf(k) >= 0) continue;
 		if (typeof Model[k] != "function") continue;
 

From 5ec509813607c9db50bc59cf172988d888712a18 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sun, 21 Apr 2013 13:02:33 +0100
Subject: [PATCH 0332/1246] Fixes some test table names (ChainFind tests)

---
 test/integration/test-find-chain-first.js      | 6 +++---
 test/integration/test-find-chain-last.js       | 6 +++---
 test/integration/test-find-chain-offset.js     | 6 +++---
 test/integration/test-find-chain-only.js       | 6 +++---
 test/integration/test-find-chain-order-desc.js | 6 +++---
 test/integration/test-find-chain-order.js      | 6 +++---
 test/integration/test-find-chain.js            | 6 +++---
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/test/integration/test-find-chain-first.js b/test/integration/test-find-chain-first.js
index 2f9f0d04..b24b74b3 100644
--- a/test/integration/test-find-chain-first.js
+++ b/test/integration/test-find-chain-first.js
@@ -2,14 +2,14 @@ var common     = require('../common');
 var assert     = require('assert');
 
 common.createConnection(function (err, db) {
-	common.createModelTable('test_find_first', db.driver.db, function () {
-		common.insertModelData('test_find_first', db.driver.db, [
+	common.createModelTable('test_find_chain_first', db.driver.db, function () {
+		common.insertModelData('test_find_chain_first', db.driver.db, [
 			{ id : 1, name : 'test2' },
 			{ id : 2, name : 'test1' }
 		], function (err) {
 			if (err) throw err;
 
-			var TestModel = db.define('test_find_first', common.getModelProperties());
+			var TestModel = db.define('test_find_chain_first', common.getModelProperties());
 
 			TestModel.find().order("name").first(function (err, Instance) {
 				assert.equal(err, null);
diff --git a/test/integration/test-find-chain-last.js b/test/integration/test-find-chain-last.js
index 8df8332a..eef5fe9f 100644
--- a/test/integration/test-find-chain-last.js
+++ b/test/integration/test-find-chain-last.js
@@ -2,14 +2,14 @@ var common     = require('../common');
 var assert     = require('assert');
 
 common.createConnection(function (err, db) {
-	common.createModelTable('test_find_last', db.driver.db, function () {
-		common.insertModelData('test_find_last', db.driver.db, [
+	common.createModelTable('test_find_chain_last', db.driver.db, function () {
+		common.insertModelData('test_find_chain_last', db.driver.db, [
 			{ id : 1, name : 'test2' },
 			{ id : 2, name : 'test1' }
 		], function (err) {
 			if (err) throw err;
 
-			var TestModel = db.define('test_find_last', common.getModelProperties());
+			var TestModel = db.define('test_find_chain_last', common.getModelProperties());
 
 			TestModel.find().order("name").last(function (err, Instance) {
 				assert.equal(err, null);
diff --git a/test/integration/test-find-chain-offset.js b/test/integration/test-find-chain-offset.js
index 4cf5f2bf..6c83ecaa 100644
--- a/test/integration/test-find-chain-offset.js
+++ b/test/integration/test-find-chain-offset.js
@@ -2,15 +2,15 @@ var common     = require('../common');
 var assert     = require('assert');
 
 common.createConnection(function (err, db) {
-	common.createModelTable('test_find_offset', db.driver.db, function () {
-		common.insertModelData('test_find_offset', db.driver.db, [
+	common.createModelTable('test_find_chain_offset', db.driver.db, function () {
+		common.insertModelData('test_find_chain_offset', db.driver.db, [
 			{ id : 1, name : 'test1' },
 			{ id : 2, name : 'test2' },
 			{ id : 3, name : 'test3' }
 		], function (err) {
 			if (err) throw err;
 
-			var TestModel = db.define('test_find_offset', common.getModelProperties());
+			var TestModel = db.define('test_find_chain_offset', common.getModelProperties());
 
 			TestModel.find().offset(2).run(function (err, Instances) {
 				assert.equal(err, null);
diff --git a/test/integration/test-find-chain-only.js b/test/integration/test-find-chain-only.js
index fcadc73b..4b64f393 100644
--- a/test/integration/test-find-chain-only.js
+++ b/test/integration/test-find-chain-only.js
@@ -2,14 +2,14 @@ var common     = require('../common');
 var assert     = require('assert');
 
 common.createConnection(function (err, db) {
-	common.createModelTable('test_find_only', db.driver.db, function () {
-		common.insertModelData('test_find_only', db.driver.db, [
+	common.createModelTable('test_find_chain_only', db.driver.db, function () {
+		common.insertModelData('test_find_chain_only', db.driver.db, [
 			{ id : 1, name : 'test2' },
 			{ id : 2, name : 'test1' }
 		], function (err) {
 			if (err) throw err;
 
-			var TestModel = db.define('test_find_only', common.getModelProperties());
+			var TestModel = db.define('test_find_chain_only', common.getModelProperties());
 
 			TestModel.find().only("name").run(function (err, Instances) {
 				assert.equal(err, null);
diff --git a/test/integration/test-find-chain-order-desc.js b/test/integration/test-find-chain-order-desc.js
index 86a4afd2..6d51de24 100644
--- a/test/integration/test-find-chain-order-desc.js
+++ b/test/integration/test-find-chain-order-desc.js
@@ -2,14 +2,14 @@ var common     = require('../common');
 var assert     = require('assert');
 
 common.createConnection(function (err, db) {
-	common.createModelTable('test_find_order', db.driver.db, function () {
-		common.insertModelData('test_find_order', db.driver.db, [
+	common.createModelTable('test_find_chain_order_desc', db.driver.db, function () {
+		common.insertModelData('test_find_chain_order_desc', db.driver.db, [
 			{ id : 1, name : 'test2' },
 			{ id : 2, name : 'test1' }
 		], function (err) {
 			if (err) throw err;
 
-			var TestModel = db.define('test_find_order', common.getModelProperties());
+			var TestModel = db.define('test_find_chain_order_desc', common.getModelProperties());
 
 			TestModel.find().order("name", "Z").run(function (err, Instances) {
 				assert.equal(err, null);
diff --git a/test/integration/test-find-chain-order.js b/test/integration/test-find-chain-order.js
index 1040dca5..fe94b9d3 100644
--- a/test/integration/test-find-chain-order.js
+++ b/test/integration/test-find-chain-order.js
@@ -2,14 +2,14 @@ var common     = require('../common');
 var assert     = require('assert');
 
 common.createConnection(function (err, db) {
-	common.createModelTable('test_find_order', db.driver.db, function () {
-		common.insertModelData('test_find_order', db.driver.db, [
+	common.createModelTable('test_find_chain_order', db.driver.db, function () {
+		common.insertModelData('test_find_chain_order', db.driver.db, [
 			{ id : 1, name : 'test2' },
 			{ id : 2, name : 'test1' }
 		], function (err) {
 			if (err) throw err;
 
-			var TestModel = db.define('test_find_order', common.getModelProperties());
+			var TestModel = db.define('test_find_chain_order', common.getModelProperties());
 
 			TestModel.find().order("name").run(function (err, Instances) {
 				assert.equal(err, null);
diff --git a/test/integration/test-find-chain.js b/test/integration/test-find-chain.js
index 51d5183b..28af3e8b 100644
--- a/test/integration/test-find-chain.js
+++ b/test/integration/test-find-chain.js
@@ -2,14 +2,14 @@ var common     = require('../common');
 var assert     = require('assert');
 
 common.createConnection(function (err, db) {
-	common.createModelTable('test_find', db.driver.db, function () {
-		common.insertModelData('test_find', db.driver.db, [
+	common.createModelTable('test_find_chain', db.driver.db, function () {
+		common.insertModelData('test_find_chain', db.driver.db, [
 			{ id : 1, name : 'test1' },
 			{ id : 2, name : 'test2' }
 		], function (err) {
 			if (err) throw err;
 
-			var TestModel = db.define('test_find', common.getModelProperties());
+			var TestModel = db.define('test_find_chain', common.getModelProperties());
 
 			TestModel.find().run(function (err, Instances) {
 				assert.equal(err, null);

From e53571bd875bdcb3be0331c7f79632af2b90ffda Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 22 Apr 2013 09:58:28 +0100
Subject: [PATCH 0333/1246] Updates and fixes some typos in connection options
 in Readme.md

---
 Readme.md | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/Readme.md b/Readme.md
index 13605c77..2dffaa86 100644
--- a/Readme.md
+++ b/Readme.md
@@ -114,25 +114,29 @@ orm.connect("....", function (err, db) {
 ## Connecting
 
 You can pass in connection options either as a string:
+
 ```js
 var orm = require("orm");
 
 orm.connect("mysql://username:password@host/database?pool=true", function (err, db) {...}
 ```
-or as an object:
-```js
-var connOpts = {
-  database: "dbname",
-  protocol: "[mysql|postgresql|redshift|sqlite]",
-  host:     "127.0.0.1",
-  port:     3306         // optional, defaults to database default
-  password: "drowssap",
-  query: {
-    pool:  true|false    // optional, false by default
-    debug: true|false    // optional, false by default
+
+Or as an object:
+
+```js
+var opts = {
+  database : "dbname",
+  protocol : "[mysql|postgres|redshift|sqlite]",
+  host     :     "127.0.0.1",
+  port     :     3306,         // optional, defaults to database default
+  username : "..",
+  password : "..",
+  query    : {
+    pool  :  true|false    // optional, false by default
+    debug : true|false    // optional, false by default
   }
 };
-orm.connect(connOpts, function (err, db) {...}
+orm.connect(opts, function (err, db) {...}
 ```
 `pool` is only supported by mysql & postgres.
 

From d4f2e0d9614cc04ef71cee06ca35c86b8bc48452 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 22 Apr 2013 09:59:48 +0100
Subject: [PATCH 0334/1246] Removes whitespace from connection options in
 Readme.md

---
 Readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Readme.md b/Readme.md
index 2dffaa86..1c0bcd17 100644
--- a/Readme.md
+++ b/Readme.md
@@ -127,8 +127,8 @@ Or as an object:
 var opts = {
   database : "dbname",
   protocol : "[mysql|postgres|redshift|sqlite]",
-  host     :     "127.0.0.1",
-  port     :     3306,         // optional, defaults to database default
+  host     : "127.0.0.1",
+  port     : 3306,         // optional, defaults to database default
   username : "..",
   password : "..",
   query    : {

From 4acef8f2d21ff972b8e9de1f021a56da4d04bd44 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 22 Apr 2013 14:26:06 +0100
Subject: [PATCH 0335/1246] Updates DB.define() and Model.get() to support
 tables with multiple primary keys (#135)

---
 lib/Model.js | 42 +++++++++++++++++++++++++++---------------
 lib/ORM.js   |  1 +
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/lib/Model.js b/lib/Model.js
index 37531009..3a94e646 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -10,12 +10,21 @@ exports.Model = Model;
 
 function Model(opts) {
 	opts = opts || {};
-	// opts.id = opts.id;
+
+	if (!Array.isArray(opts.keys) || opts.keys.length < 2) {
+		opts.keys = [ opts.id ];
+	} else {
+		opts.id = null;
+	}
 
 	var one_associations = [];
 	var many_associations = [];
 	var association_properties = [];
-	var model_fields = [ opts.id ];
+	var model_fields = [];
+
+	for (var i = 0; i < opts.keys.length; i++) {
+		model_fields.push(opts.keys[i]);
+	}
 
 	var createInstance = function (data, inst_opts, cb) {
 		if (!inst_opts) {
@@ -126,23 +135,26 @@ function Model(opts) {
 		return cb(new Error("Driver does not support Model.sync()"));
 	};
 
-	model.get = function (id, options, cb) {
+	model.get = function () {
 		var conditions = {};
-		conditions[opts.id] = id;
-
-		if (typeof options == "function") {
-			cb = options;
-			options = {};
-		} else {
-			options = options || {};
-		}
+		var options    = {};
+		var ids        = Array.prototype.slice.apply(arguments);
+		var cb         = ids.pop();
 
 		if (typeof cb != "function") {
 			throw new Error("Missing Model.get() callback");
 		}
 
-		if (!options.hasOwnProperty("cache")) {
-			options.cache = opts.cache;
+		if (typeof ids[ids.length - 1] == "object") {
+			options = ids.pop();
+		}
+
+		if (ids.length != opts.keys.length) {
+			throw new Error("Model.get() IDs number missmatch (" + opts.keys.length + " needed, " + ids.length + " passed)");
+		}
+
+		for (var i = 0; i < opts.keys.length; i++) {
+			conditions[opts.keys[i]] = ids[i];
 		}
 
 		opts.driver.find(model_fields, opts.table, conditions, { limit: 1 }, function (err, data) {
@@ -152,8 +164,8 @@ function Model(opts) {
 			if (data.length === 0) {
 				return cb(new Error("Not found"));
 			}
-			Singleton.get(opts.driver.uid + "/" + opts.table + "/" + id, {
-				cache      : options.cache,
+			Singleton.get(opts.driver.uid + "/" + opts.table + "/" + ids.join("."), {
+				cache      : options.cache || opts.cache,
 				save_check : opts.settings.get("instance.cacheSaveCheck")
 			}, function (cb) {
 				return createInstance(data[0], {
diff --git a/lib/ORM.js b/lib/ORM.js
index 16bac8f9..b1fb1458 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -171,6 +171,7 @@ ORM.prototype.define = function (name, properties, opts) {
 		indexes        : opts.indexes || [],
 		cache          : opts.hasOwnProperty("cache") ? opts.cache : this.settings.get("instance.cache"),
 		id             : opts.id || this.settings.get("properties.primary_key"),
+		keys           : opts.keys,
 		autoSave       : opts.hasOwnProperty("autoSave") ? opts.autoSave : this.settings.get("instance.autoSave"),
 		autoFetch      : opts.hasOwnProperty("autoFetch") ? opts.autoFetch : this.settings.get("instance.autoFetch"),
 		autoFetchLimit : opts.autoFetchLimit || this.settings.get("instance.autoFetchLimit"),

From 9944972d0bd47ef68ce15a4bf330754249280bb3 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 22 Apr 2013 14:27:08 +0100
Subject: [PATCH 0336/1246] Adds support for Model.get([ key1, key2, .. ])
 instead of Model.get(key1, key2, ..) (#135)

---
 lib/Model.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/Model.js b/lib/Model.js
index 3a94e646..ff0108a8 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -149,6 +149,10 @@ function Model(opts) {
 			options = ids.pop();
 		}
 
+		if (ids.length == 1 && Array.isArray(ids[0])) {
+			ids = ids[0];
+		}
+
 		if (ids.length != opts.keys.length) {
 			throw new Error("Model.get() IDs number missmatch (" + opts.keys.length + " needed, " + ids.length + " passed)");
 		}

From d217e18a5e95d672e80bdf1c24e93ded344019dd Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 22 Apr 2013 14:29:54 +0100
Subject: [PATCH 0337/1246] Fixes indentation on Instance.validate()

---
 lib/Instance.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 170c2036..538bb98d 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -339,11 +339,11 @@ function Instance(opts) {
 		enumerable: false
 	});
 	Object.defineProperty(instance, "validate", {
-    value: function (cb) {
-      handleValidations(cb);
-    },
-    enumerable: false
-  });
+		value: function (cb) {
+			handleValidations(cb);
+		},
+		enumerable: false
+	});
 
 	if (!opts.data.hasOwnProperty(opts.id)) {
 		opts.changes = Object.keys(opts.data);

From d2af34aa49e590c6a3b52cd3544611e7ed72be16 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 22 Apr 2013 14:30:41 +0100
Subject: [PATCH 0338/1246] Passes model keys to instances on creation

---
 lib/Model.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Model.js b/lib/Model.js
index ff0108a8..53680754 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -32,6 +32,7 @@ function Model(opts) {
 		}
 		var instance = new Instance({
 			id                     : opts.id,
+			keys                   : opts.keys,
 			is_new                 : inst_opts.is_new || false,
 			data                   : data,
 			autoSave               : inst_opts.autoSave || false,

From 1369c184a22adbacb9bbd0d8ddd8199dae6b041b Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 22 Apr 2013 14:35:12 +0100
Subject: [PATCH 0339/1246] Updates instance.save() to check for multiple keys

---
 lib/Instance.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 538bb98d..ec19ba79 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -103,7 +103,7 @@ function Instance(opts) {
 				}
 			}
 
-			if (opts.is_new || !data.hasOwnProperty(opts.id)) {
+			if (opts.is_new) {
 				opts.driver.insert(opts.table, data, opts.id, function (save_err, info) {
 					if (!save_err) {
 						opts.changes.length = 0;
@@ -125,7 +125,9 @@ function Instance(opts) {
 				for (var i = 0; i < opts.changes.length; i++) {
 					changes[opts.changes[i]] = data[opts.changes[i]];
 				}
-				conditions[opts.id] = data[opts.id];
+				for (i = 0; i < opts.keys.length; i++) {
+					conditions[opts.keys[i]] = data[opts.keys[i]];
+				}
 				opts.driver.update(opts.table, changes, conditions, function (save_err) {
 					if (!save_err) {
 						opts.changes.length = 0;
@@ -345,8 +347,11 @@ function Instance(opts) {
 		enumerable: false
 	});
 
-	if (!opts.data.hasOwnProperty(opts.id)) {
-		opts.changes = Object.keys(opts.data);
+	for (var i = 0; i < opts.keys.length; i++) {
+		if (!opts.data.hasOwnProperty(opts.keys[i])) {
+			opts.changes = Object.keys(opts.data);
+			break;
+		}
 	}
 
 	Hook.trigger(instance, opts.hooks.afterLoad);

From 54d15dcee89a65c6e26c63bcb675f487288d38cd Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 22 Apr 2013 14:36:52 +0100
Subject: [PATCH 0340/1246] Updates instance.remove() to check for multiple
 keys

---
 lib/Instance.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index ec19ba79..c56e5a6b 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -164,11 +164,14 @@ function Instance(opts) {
 		});
 	};
 	var removeInstance = function (cb) {
-		if (!opts.data.hasOwnProperty(opts.id)) {
+		if (opts.is_new) {
 			return cb(null);
 		}
+
 		var conditions = {};
-		conditions[opts.id] = opts.data[opts.id];
+		for (var i = 0; i < opts.keys.length; i++) {
+			conditions[opts.keys[i]] = opts.data[opts.keys[i]];
+		}
 
 		emitEvent("beforeRemove", instance);
 		Hook.trigger(instance, opts.hooks.beforeRemove);

From 2c57863d7e6b2577ebf8d428239c7c9cd9225a55 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 22 Apr 2013 14:37:25 +0100
Subject: [PATCH 0341/1246] Changes instance autoSave to check for multiple
 keys

---
 lib/Instance.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index c56e5a6b..2289772e 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -198,7 +198,9 @@ function Instance(opts) {
 			}
 		}
 
-		conditions[opts.id] = opts.data[opts.id];
+		for (var i = 0; i < opts.keys.length; i++) {
+			conditions[opts.keys[i]] = opts.data[opts.keys[i]];
+		}
 
 		Hook.trigger(instance, opts.hooks.beforeSave);
 

From b34958e4dd6b4eaaf765c4df29573a0507d4d477 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 22 Apr 2013 14:38:39 +0100
Subject: [PATCH 0342/1246] Changes instance initialization to add the multiple
 keys as properties instead of id

---
 lib/Instance.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 2289772e..d890ae7c 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -254,8 +254,10 @@ function Instance(opts) {
 		});
 	};
 
-	if (!opts.data.hasOwnProperty(opts.id)) {
-		addInstanceProperty(opts.id);
+	for (var i = 0; i < opts.keys.length; i++) {
+		if (!opts.data.hasOwnProperty(opts.keys[i])) {
+			addInstanceProperty(opts.keys[i]);
+		}
 	}
 
 	for (var k in opts.properties) {

From 03eeaa225b74ea0d9383ed8dc250cd7a53c574c5 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 22 Apr 2013 14:40:52 +0100
Subject: [PATCH 0343/1246] Updates a few more parts of instance to avoid
 looking at opts.id and look at opts.keys

---
 lib/Instance.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index d890ae7c..5d3d64dd 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -74,7 +74,7 @@ function Instance(opts) {
 			}
 		}
 
-		if (opts.is_new || !opts.data.hasOwnProperty(opts.id)) {
+		if (opts.is_new) {
 			Hook.trigger(instance, opts.hooks.beforeCreate);
 		}
 		Hook.trigger(instance, opts.hooks.beforeSave);
@@ -218,7 +218,7 @@ function Instance(opts) {
 				return opts.data[key];
 			},
 			set: function (val) {
-				if (key == opts.id && opts.data.hasOwnProperty(key)) {
+				if (opts.keys.indexOf(key) >= 0 && opts.data.hasOwnProperty(key)) {
 					throw new Error("Cannot change ID");
 				}
 
@@ -261,14 +261,14 @@ function Instance(opts) {
 	}
 
 	for (var k in opts.properties) {
-		if (opts.properties.hasOwnProperty(k) && !opts.data.hasOwnProperty(k) && k != opts.id) {
+		if (opts.properties.hasOwnProperty(k) && !opts.data.hasOwnProperty(k) && opts.keys.indexOf(k) == -1) {
 			opts.data[k] = null;
 		}
 	}
 
 	for (k in opts.data) {
 		if (!opts.data.hasOwnProperty(k)) continue;
-		if (!opts.properties.hasOwnProperty(k) && k != opts.id && opts.association_properties.indexOf(k) == -1) {
+		if (!opts.properties.hasOwnProperty(k) && opts.keys.indexOf(k) == -1 && opts.association_properties.indexOf(k) == -1) {
 			if (!opts.extra.hasOwnProperty(k)) continue;
 
 			if (opts.driver.valueToProperty) {

From a08e5cbc0fc38a8fdfae52edf142032668dd012c Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 22 Apr 2013 14:50:37 +0100
Subject: [PATCH 0344/1246] Lints postgres driver

---
 lib/Drivers/DML/postgres.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 6891d3d5..c54ffd95 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -44,7 +44,7 @@ var switchableFunctions = {
 	pool: {
 		connect: function (cb) {
 			this.db.connect(this.config, function (err, client, done) {
-				if(!err) done()
+				if (!err) done();
 				cb(err);
 			});
 		},
@@ -55,7 +55,7 @@ var switchableFunctions = {
 				client.query(query, function (err, result) {
 					done();
 
-					if(err) {
+					if (err) {
 						cb(err);
 					} else {
 						cb(null, result.rows);
@@ -91,7 +91,7 @@ var switchableFunctions = {
 			return this;
 		}
 	}
-}
+};
 
 Driver.prototype.sync = function (opts, cb) {
 	return require("../DDL/postgres").sync(this, opts, cb);

From 8517c023549bd8204485b14b94da8b1834373087 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 22 Apr 2013 14:52:03 +0100
Subject: [PATCH 0345/1246] Updates instance to pass keys to driver.insert()
 instead of id

Redshift and SQLite are missing
---
 lib/Drivers/DML/mysql.js    | 27 +++++++++++++++++++++++++--
 lib/Drivers/DML/postgres.js |  8 +++++++-
 lib/Instance.js             |  6 ++++--
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 2827e454..fbea7bc7 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -178,13 +178,35 @@ Driver.prototype.insert = function (table, data, id_prop, cb) {
 		this.poolQuery(q, function (err, info) {
 			if (err) return cb(err);
 
-			return cb(null, { id: info.insertId });
+			var ids = {};
+
+			if (id_prop !== null) {
+				if (id_prop.length == 1 && info.hasOwnProperty("insertId")) {
+					ids[id_prop[0]] = info.insertId;
+				} else {
+					for (var i = 0; i < id_prop.length; i++) {
+						ids[id_prop[i]] = data[id_prop[i]];
+					}
+				}
+			}
+			return cb(null, ids);
 		});
 	} else {
 		this.db.query(q, function (err, info) {
 			if (err) return cb(err);
 
-			return cb(null, { id: info.insertId });
+			var ids = {};
+
+			if (id_prop !== null) {
+				if (id_prop.length == 1 && info.hasOwnProperty("insertId")) {
+					ids[id_prop[0]] = info.insertId;
+				} else {
+					for (var i = 0; i < id_prop.length; i++) {
+						ids[id_prop[i]] = data[id_prop[i]];
+					}
+				}
+			}
+			return cb(null, ids);
 		});
 	}
 	if (this.opts.debug) {
@@ -202,6 +224,7 @@ Driver.prototype.update = function (table, changes, conditions, cb) {
 	if (this.opts.pool) {
 		this.poolQuery(q, cb);
 	} else {
+		console.log("UPDATE", q);
 		this.db.query(q, cb);
 	}
 	if (this.opts.debug) {
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index c54ffd95..29657bf7 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -201,7 +201,13 @@ Driver.prototype.insert = function (table, data, id_prop, cb) {
 			return cb(err);
 		}
 
-		cb(null, { id: results[0][id_prop] || null });
+		var ids = {};
+
+		for (var i = 0; i < id_prop.length; i++) {
+			ids[id_prop[i]] = resuls[0][id_prop[i]] || null;
+		}
+
+		return cb(null, ids);
 	});
 };
 
diff --git a/lib/Instance.js b/lib/Instance.js
index 5d3d64dd..714dfa48 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -104,10 +104,12 @@ function Instance(opts) {
 			}
 
 			if (opts.is_new) {
-				opts.driver.insert(opts.table, data, opts.id, function (save_err, info) {
+				opts.driver.insert(opts.table, data, opts.keys, function (save_err, info) {
 					if (!save_err) {
 						opts.changes.length = 0;
-						opts.data[opts.id] = info.id;
+						for (var i = 0; i < opts.keys.length; i++) {
+							opts.data[opts.keys[i]] = info[opts.keys[i]];
+						}
 						opts.is_new = false;
 					}
 					emitEvent("save", save_err, instance);

From d21b51e495f042b355e52171487c895b667d10e2 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 23 Apr 2013 14:57:13 +0200
Subject: [PATCH 0346/1246] Updates Readme Travic badge to show build status
 for master branch

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 1c0bcd17..a4bd550b 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,6 +1,6 @@
 ## Object Relational Mapping
 
-[![Build Status](https://secure.travis-ci.org/dresende/node-orm2.png)](http://travis-ci.org/dresende/node-orm2) [![](https://badge.fury.io/js/orm.png)](https://npmjs.org/package/orm)
+[![Build Status](https://secure.travis-ci.org/dresende/node-orm2.png?branch=master)](http://travis-ci.org/dresende/node-orm2) [![](https://badge.fury.io/js/orm.png)](https://npmjs.org/package/orm)
 
 ## Install
 

From 3ab6df2e0d3aace033284125730fc0552ac659c8 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 23 Apr 2013 14:03:26 +0100
Subject: [PATCH 0347/1246] Fixes typo in postgres driver variable name,
 changes code to look for id_prop = null

---
 lib/Drivers/DML/postgres.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 29657bf7..7c84ae7d 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -203,8 +203,10 @@ Driver.prototype.insert = function (table, data, id_prop, cb) {
 
 		var ids = {};
 
-		for (var i = 0; i < id_prop.length; i++) {
-			ids[id_prop[i]] = resuls[0][id_prop[i]] || null;
+		if (id_prop !== null) {
+			for (var i = 0; i < id_prop.length; i++) {
+				ids[id_prop[i]] = results[0][id_prop[i]] || null;
+			}
 		}
 
 		return cb(null, ids);

From 93ccefb75b9e666db52079b19fa0a58615f4466b Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 23 Apr 2013 14:03:42 +0100
Subject: [PATCH 0348/1246] Updates redshift driver to try to support multiple
 keys

---
 lib/Drivers/DML/redshift.js | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/lib/Drivers/DML/redshift.js b/lib/Drivers/DML/redshift.js
index 0ce00f13..76616d93 100644
--- a/lib/Drivers/DML/redshift.js
+++ b/lib/Drivers/DML/redshift.js
@@ -23,10 +23,24 @@ Driver.prototype.insert = function (table, data, id_prop, cb) {
 			return cb(err);
 		}
 
-		this.execQuery("SELECT LASTVAL() AS id", function (err, results) {
-			return cb(null, {
-				id: !err && results[0].id || null
+		if (id_prop === null) {
+			return cb(null);
+		}
+
+		if (id_prop.length == 1) {
+			return this.execQuery("SELECT LASTVAL() AS id", function (err, results) {
+				return cb(null, {
+					id: !err && results[0].id || null
+				});
 			});
-		});
+		}
+
+		var ids = {};
+
+		for (var i = 0; i < id_prop.length; i++) {
+			ids[id_prop[i]] = data[id_prop[i]] || null;
+		}
+
+		return cb(null, ids);
 	}.bind(this));
 };

From 1c24a58f2ad092227e8536e14b0e0e6cd95e7f23 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 23 Apr 2013 19:09:05 +0100
Subject: [PATCH 0349/1246] Removes console.log from mysql driver update method

---
 lib/Drivers/DML/mysql.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index fbea7bc7..c0aca38d 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -224,7 +224,6 @@ Driver.prototype.update = function (table, changes, conditions, cb) {
 	if (this.opts.pool) {
 		this.poolQuery(q, cb);
 	} else {
-		console.log("UPDATE", q);
 		this.db.query(q, cb);
 	}
 	if (this.opts.debug) {

From faf59a0012ef0b6b1cda117fec60a1ee3ab1d69f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 23 Apr 2013 19:10:15 +0100
Subject: [PATCH 0350/1246] Adds first test for multi key model

---
 test/common.js                         | 56 ++++++++++++++++++++++++++
 test/integration/test-multikey-base.js | 56 ++++++++++++++++++++++++++
 2 files changed, 112 insertions(+)
 create mode 100644 test/integration/test-multikey-base.js

diff --git a/test/common.js b/test/common.js
index 0dfc57c7..106f291d 100644
--- a/test/common.js
+++ b/test/common.js
@@ -120,6 +120,23 @@ common.createModel2Table = function (table, db, cb) {
 	}
 };
 
+common.createKeysModelTable = function (table, db, keys, cb) {
+	switch (this.protocol()) {
+		case "postgres":
+		case "redshift":
+			db.query("CREATE TEMPORARY TABLE " + table + " (" + keys.join(" BIGINT NOT NULL, ") + " BIGINT NOT NULL, name VARCHAR(100) NOT NULL, PRIMARY KEY (" + keys.join(", ") + "))", cb);
+			break;
+		case "sqlite":
+			db.run("DROP TABLE IF EXISTS " + table, function () {
+				db.run("CREATE TEMPORARY TABLE " + table + " (" + keys.join(" BIGINT NOT NULL, ") + " BIGINT NOT NULL, name VARCHAR(100) NOT NULL, PRIMARY KEY (" + keys.join(", ") + "))", cb);
+			});
+			break;
+		default:
+			db.query("CREATE TEMPORARY TABLE " + table + " (" + keys.join(" BIGINT NOT NULL, ") + " BIGINT NOT NULL, name VARCHAR(100) NOT NULL, PRIMARY KEY (" + keys.join(", ") + "))", cb);
+			break;
+	}
+};
+
 common.createModelAssocTable = function (table, assoc, db, cb) {
 	switch (this.protocol()) {
 		case "postgres":
@@ -197,6 +214,45 @@ common.insertModel2Data = function (table, db, data, cb) {
 	}
 };
 
+common.insertKeysModelData = function (table, db, data, cb) {
+	var query = [], i, k, keys, vals, pending;
+
+	for (i = 0; i < data.length; i++) {
+		keys = [];
+		vals = [];
+
+		for (k in data[i]) {
+			keys.push(k);
+			vals.push(data[i][k]);
+		}
+
+		query.push("INSERT INTO " + table + " (" + keys.join(", ") + ") VALUES ('" + vals.join("', '") + "')");
+	}
+
+	pending = query.length;
+
+	for (i = 0; i < query.length; i++) {
+		switch (this.protocol()) {
+			case "postgres":
+			case "redshift":
+			case "mysql":
+				db.query(query[i], function () {
+					if (--pending === 0) {
+						return cb();
+					}
+				});
+				break;
+			case "sqlite":
+				db.run(query[i], function () {
+					if (--pending === 0) {
+						return cb();
+					}
+				});
+				break;
+		}
+	}
+};
+
 common.insertModelAssocData = function (table, db, data, cb) {
 	var query = [], i;
 
diff --git a/test/integration/test-multikey-base.js b/test/integration/test-multikey-base.js
new file mode 100644
index 00000000..f04e3651
--- /dev/null
+++ b/test/integration/test-multikey-base.js
@@ -0,0 +1,56 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createKeysModelTable('test_multikey_find', db.driver.db, [ 'id1', 'id2', 'id3' ], function () {
+		common.insertKeysModelData('test_multikey_find', db.driver.db, [
+			{ id1 : 1, id2 : 1, id3: 1, name : 'test111' },
+			{ id1 : 1, id2 : 2, id3: 3, name : 'test123' },
+			{ id1 : 2, id2 : 3, id3: 1, name : 'test231' },
+			{ id1 : 3, id2 : 1, id3: 2, name : 'test312' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_multikey_find', common.getModelProperties(), {
+				keys  : [ 'id1', 'id2', 'id3' ],
+				cache : false
+			});
+
+			TestModel.get(1, 2, 3, function (err, item) {
+				assert.equal(err, null);
+				assert.equal(item.name, 'test123');
+
+				item.name = 'tested';
+
+				assert.throws(function () {
+					item.id2 = 5;
+				}, /cannot change id/i);
+
+				item.save(function (err) {
+					assert.equal(err, null);
+
+					TestModel.get(1, 2, 3, function (err, item_copy1) {
+						assert.equal(err, null);
+						assert.equal(item_copy1.name, 'tested');
+
+						item_copy1.remove(function () {
+							assert.equal(err, null);
+
+							TestModel.get(1, 2, 3, function (err, item_copy2) {
+								assert.notEqual(err, null);
+								assert.equal(err.message, "Not found");
+
+								TestModel.find().count(function (err, count) {
+									assert.equal(err, null);
+									assert.equal(count, 3);
+
+									db.close();
+								});
+							});
+						});
+					});
+				});
+			});
+		});
+	});
+});

From cafcfc8af3aeaf3457afc5bc06add59d7bbdb2c8 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 23 Apr 2013 19:26:30 +0100
Subject: [PATCH 0351/1246] Updates Model.sync() to use keys instead of id on
 all drivers

---
 lib/Drivers/DDL/mysql.js    | 20 ++++++++++++++++++--
 lib/Drivers/DDL/postgres.js | 17 ++++++++++++++++-
 lib/Drivers/DDL/sqlite.js   | 17 ++++++++++++++++-
 lib/Model.js                |  1 +
 4 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index a597c94c..62fa86b6 100644
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -34,8 +34,21 @@ exports.sync = function (driver, opts, cb) {
 	var queries = [];
 	var definitions = [];
 	var k, i, pending;
+	var primary_keys = opts.keys.map(function (k) { return driver.query.escapeId(k); });
+	var keys = [];
 
-	definitions.push(driver.query.escapeId(opts.id) + " INT(11) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY");
+	for (i = 0; i < opts.keys.length; i++) {
+		if (opts.properties.hasOwnProperty(opts.keys[i])) continue;
+
+		keys.push(driver.query.escapeId(opts.keys[i]));
+	}
+
+	for (i = 0; i < keys.length; i++) {
+		definitions.push(keys[i] + " INT(11) UNSIGNED NOT NULL");
+	}
+	if (opts.keys.length == 1) {
+		definitions[definitions.length - 1] += " AUTO_INCREMENT";
+	}
 
 	for (k in opts.properties) {
 		definitions.push(buildColumnDefinition(driver, k, opts.properties[k]));
@@ -49,7 +62,6 @@ exports.sync = function (driver, opts, cb) {
 		);
 	}
 
-	definitions.push("INDEX (" + driver.query.escapeId(opts.id) + ")");
 	for (k in opts.properties) {
 		if (opts.properties[k].unique === true) {
 			definitions.push("UNIQUE KEY " + driver.query.escapeId(k) + " (" + driver.query.escapeId(k) + ")");
@@ -67,10 +79,14 @@ exports.sync = function (driver, opts, cb) {
 		}).join(", ") + ")");
 	}
 
+	definitions.push("PRIMARY KEY (" + primary_keys.join(", ") + ")");
+
 	queries.push(
 		"CREATE TABLE IF NOT EXISTS " + driver.query.escapeId(opts.table) +
 		" (" + definitions.join(", ") + ")"
 	);
+	console.log("CREATE TABLE IF NOT EXISTS " + driver.query.escapeId(opts.table) +
+		" (" + definitions.join(", ") + ")");
 
 	for (i = 0; i < opts.many_associations.length; i++) {
 		definitions = [];
diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index 416b9313..1e8f1c4b 100644
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -23,8 +23,21 @@ exports.sync = function (driver, opts, cb) {
 	var typequeries = [];
 	var definitions = [];
 	var k, i, pending;
+	var primary_keys = opts.keys.map(function (k) { return driver.query.escapeId(k); });
+	var keys = [];
 
-	definitions.push(driver.query.escapeId(opts.id) + " SERIAL PRIMARY KEY");
+	for (i = 0; i < opts.keys.length; i++) {
+		if (opts.properties.hasOwnProperty(opts.keys[i])) continue;
+
+		keys.push(driver.query.escapeId(opts.keys[i]));
+	}
+
+	for (i = 0; i < keys.length; i++) {
+		definitions.push(keys[i] + " INTEGER NOT NULL");
+	}
+	if (opts.keys.length == 1) {
+		definitions[definitions.length - 1] = keys[0] + " SERIAL";
+	}
 
 	for (k in opts.properties) {
 		definitions.push(buildColumnDefinition(driver, opts.table, k, opts.properties[k]));
@@ -53,6 +66,8 @@ exports.sync = function (driver, opts, cb) {
 		}
 	}
 
+	definitions.push("PRIMARY KEY (" + primary_keys.join(", ") + ")");
+
 	tables.push({
 		name       : opts.table,
 		query      : "CREATE TABLE " + driver.query.escapeId(opts.table) +
diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index cda58d00..07d50e62 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -21,8 +21,21 @@ exports.sync = function (driver, opts, cb) {
 	var queries = [];
 	var definitions = [];
 	var k, i, pending;
+	var primary_keys = opts.keys.map(function (k) { return driver.query.escapeId(k); });
+	var keys = [];
 
-	definitions.push(driver.query.escapeId(opts.id) + " INTEGER PRIMARY KEY AUTOINCREMENT");
+	for (i = 0; i < opts.keys.length; i++) {
+		if (opts.properties.hasOwnProperty(opts.keys[i])) continue;
+
+		keys.push(driver.query.escapeId(opts.keys[i]));
+	}
+
+	for (i = 0; i < keys.length; i++) {
+		definitions.push(keys[i] + " INTEGER UNSIGNED NOT NULL");
+	}
+	if (opts.keys.length == 1) {
+		definitions[definitions.length - 1] += " AUTOINCREMENT";
+	}
 
 	for (k in opts.properties) {
 		definitions.push(buildColumnDefinition(driver, k, opts.properties[k]));
@@ -36,6 +49,8 @@ exports.sync = function (driver, opts, cb) {
 		);
 	}
 
+	definitions.push("PRIMARY KEY (" + primary_keys.join(", ") + ")");
+
 	queries.push(
 		"CREATE TABLE IF NOT EXISTS " + driver.query.escapeId(opts.table) +
 		" (" + definitions.join(", ") + ")"
diff --git a/lib/Model.js b/lib/Model.js
index 53680754..f26836d0 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -123,6 +123,7 @@ function Model(opts) {
 		if (typeof opts.driver.sync == "function") {
 			opts.driver.sync({
 				id                : opts.id,
+				keys              : opts.keys,
 				table             : opts.table,
 				properties        : opts.properties,
 				indexes           : opts.indexes || [],

From 0cf2ab124beeeb923823ac33216eb204e8cc5fad Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 23 Apr 2013 19:30:59 +0100
Subject: [PATCH 0352/1246] Fixes sqlite DDL when using one primary key

---
 lib/Drivers/DDL/sqlite.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index 07d50e62..d89a721a 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -34,7 +34,7 @@ exports.sync = function (driver, opts, cb) {
 		definitions.push(keys[i] + " INTEGER UNSIGNED NOT NULL");
 	}
 	if (opts.keys.length == 1) {
-		definitions[definitions.length - 1] += " AUTOINCREMENT";
+		definitions[definitions.length - 1] = keys[0] + " INTEGER PRIMARY KEY AUTOINCREMENT";
 	}
 
 	for (k in opts.properties) {
@@ -49,7 +49,9 @@ exports.sync = function (driver, opts, cb) {
 		);
 	}
 
-	definitions.push("PRIMARY KEY (" + primary_keys.join(", ") + ")");
+	if (keys.length > 1) {
+		definitions.push("PRIMARY KEY (" + primary_keys.join(", ") + ")");
+	}
 
 	queries.push(
 		"CREATE TABLE IF NOT EXISTS " + driver.query.escapeId(opts.table) +

From f4c649d5c393ace369bd11952871f0874cf40cd3 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 23 Apr 2013 19:37:10 +0100
Subject: [PATCH 0353/1246] Removes console.log from mysql DDL

---
 lib/Drivers/DDL/mysql.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index 62fa86b6..335c5de0 100644
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -85,8 +85,6 @@ exports.sync = function (driver, opts, cb) {
 		"CREATE TABLE IF NOT EXISTS " + driver.query.escapeId(opts.table) +
 		" (" + definitions.join(", ") + ")"
 	);
-	console.log("CREATE TABLE IF NOT EXISTS " + driver.query.escapeId(opts.table) +
-		" (" + definitions.join(", ") + ")");
 
 	for (i = 0; i < opts.many_associations.length; i++) {
 		definitions = [];

From ebf7123b616bf58f5bdb09b664b4b1a94d579fa9 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 23 Apr 2013 19:41:46 +0100
Subject: [PATCH 0354/1246] Changes ChainFind.count() to avoid passing opts, no
 need

---
 lib/ChainFind.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 1f25f4f0..aa4b926d 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -38,7 +38,7 @@ function ChainFind(Model, opts) {
 			return this;
 		},
 		count: function (cb) {
-			opts.driver.count(opts.table, opts.conditions, opts, function (err, data) {
+			opts.driver.count(opts.table, opts.conditions, {}, function (err, data) {
 				if (err || data.length === 0) {
 					return cb(err);
 				}

From 240faa58b1ae8285747061575e3a8ce943d89ff0 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 23 Apr 2013 19:45:47 +0100
Subject: [PATCH 0355/1246] Updates Model.exists() for multikey

---
 lib/Model.js                           |  9 +++++++--
 test/integration/test-multikey-base.js | 11 ++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/lib/Model.js b/lib/Model.js
index f26836d0..4c539ded 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -337,13 +337,18 @@ function Model(opts) {
 		});
 	};
 
-	model.exists = function (id, cb) {
+	model.exists = function () {
+		var ids = Array.prototype.slice.apply(arguments);
+		var cb  = ids.pop();
+
 		if (typeof cb != "function") {
 			throw new Error("Missing Model.exists() callback");
 		}
 
 		var conditions = {};
-		conditions[opts.id] = id;
+		for (var i = 0; i < opts.keys.length; i++) {
+			conditions[opts.keys[i]] = ids[i];
+		}
 
 		opts.driver.count(opts.table, conditions, {}, function (err, data) {
 			if (err || data.length === 0) {
diff --git a/test/integration/test-multikey-base.js b/test/integration/test-multikey-base.js
index f04e3651..62037331 100644
--- a/test/integration/test-multikey-base.js
+++ b/test/integration/test-multikey-base.js
@@ -40,11 +40,16 @@ common.createConnection(function (err, db) {
 								assert.notEqual(err, null);
 								assert.equal(err.message, "Not found");
 
-								TestModel.find().count(function (err, count) {
+								TestModel.exists(1, 2, 3, function (err, exists) {
 									assert.equal(err, null);
-									assert.equal(count, 3);
+									assert.equal(exists, false);
 
-									db.close();
+									TestModel.find().count(function (err, count) {
+										assert.equal(err, null);
+										assert.equal(count, 3);
+
+										db.close();
+									});
 								});
 							});
 						});

From 3af4d145daaa9998ed787eafe0352c1972dfa093 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 23 Apr 2013 19:46:33 +0100
Subject: [PATCH 0356/1246] Stops passing opts.id to driver.sync() in
 Model.sync()

Shouldn't be needed anymore
---
 lib/Model.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/Model.js b/lib/Model.js
index 4c539ded..d806283d 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -122,7 +122,6 @@ function Model(opts) {
 		}
 		if (typeof opts.driver.sync == "function") {
 			opts.driver.sync({
-				id                : opts.id,
 				keys              : opts.keys,
 				table             : opts.table,
 				properties        : opts.properties,

From 5396b670b17e8362b39fbd4314c5c8ad8de0e25e Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 23 Apr 2013 19:48:55 +0100
Subject: [PATCH 0357/1246] Stops passing opts.id to driver.drop() in
 Model.drop()

---
 lib/Model.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/Model.js b/lib/Model.js
index d806283d..4f5d92c3 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -103,7 +103,6 @@ function Model(opts) {
 		}
 		if (typeof opts.driver.drop == "function") {
 			opts.driver.drop({
-				id                : opts.id,
 				table             : opts.table,
 				properties        : opts.properties,
 				one_associations  : one_associations,

From 165fb3d400a2e50284392be1c6315f0779be4872 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 23 Apr 2013 23:38:47 +0100
Subject: [PATCH 0358/1246] Updates drivers .count() to avoid using opts.id

---
 lib/Drivers/DML/mysql.js    | 2 +-
 lib/Drivers/DML/postgres.js | 2 +-
 lib/Drivers/DML/sqlite.js   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index c0aca38d..53a71c7a 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -137,7 +137,7 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 Driver.prototype.count = function (table, conditions, opts, cb) {
 	var q = this.query.select()
 	                  .from(table)
-	                  .count(opts.id, 'c');
+	                  .count(null, 'c');
 
 	if (opts.merge) {
 		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 7c84ae7d..1f512379 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -160,7 +160,7 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 Driver.prototype.count = function (table, conditions, opts, cb) {
 	var q = this.query.select()
 	                  .from(table)
-	                  .count(opts.id, 'c');
+	                  .count(null, 'c');
 
 	if (opts.merge) {
 		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 585eb9a8..21de515d 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -108,7 +108,7 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 Driver.prototype.count = function (table, conditions, opts, cb) {
 	var q = this.query.select()
 	                  .from(table)
-	                  .count(opts.id, 'c');
+	                  .count(null, 'c');
 
 	if (opts.merge) {
 		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);

From 39e774c3a3581a7c86c6f5a8cbaed310d22af6d1 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 24 Apr 2013 11:35:22 +0100
Subject: [PATCH 0359/1246] Adds Model.keys() to get list of model keys (like
 Model.id)

---
 lib/Model.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/Model.js b/lib/Model.js
index 4f5d92c3..50f804af 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -421,6 +421,10 @@ function Model(opts) {
 		value: opts.id,
 		enumerable: false
 	});
+	Object.defineProperty(model, "keys", {
+		value: opts.keys,
+		enumerable: false
+	});
 
 	return model;
 }

From c47fed106b2b0f1f144d78c3fea3bba65661d795 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 24 Apr 2013 11:38:31 +0100
Subject: [PATCH 0360/1246] Moves associations preparation to the end of model
 construction

---
 lib/Model.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Model.js b/lib/Model.js
index 50f804af..8d1fd9d8 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -92,9 +92,6 @@ function Model(opts) {
 		}
 	}
 
-	OneAssociation.prepare(model, one_associations, association_properties, model_fields);
-	ManyAssociation.prepare(model, many_associations);
-
 	model.settings = opts.settings;
 
 	model.drop = function (cb) {
@@ -426,5 +423,8 @@ function Model(opts) {
 		enumerable: false
 	});
 
+	OneAssociation.prepare(model, one_associations, association_properties, model_fields);
+	ManyAssociation.prepare(model, many_associations);
+
 	return model;
 }

From fba9012c7a5157dd594812687bbd6d7e69bd2cbf Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 24 Apr 2013 11:39:33 +0100
Subject: [PATCH 0361/1246] Fixes test-multikey-base table

---
 test/integration/test-multikey-base.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/integration/test-multikey-base.js b/test/integration/test-multikey-base.js
index 62037331..433b5c15 100644
--- a/test/integration/test-multikey-base.js
+++ b/test/integration/test-multikey-base.js
@@ -2,8 +2,8 @@ var common     = require('../common');
 var assert     = require('assert');
 
 common.createConnection(function (err, db) {
-	common.createKeysModelTable('test_multikey_find', db.driver.db, [ 'id1', 'id2', 'id3' ], function () {
-		common.insertKeysModelData('test_multikey_find', db.driver.db, [
+	common.createKeysModelTable('test_multikey_base', db.driver.db, [ 'id1', 'id2', 'id3' ], function () {
+		common.insertKeysModelData('test_multikey_base', db.driver.db, [
 			{ id1 : 1, id2 : 1, id3: 1, name : 'test111' },
 			{ id1 : 1, id2 : 2, id3: 3, name : 'test123' },
 			{ id1 : 2, id2 : 3, id3: 1, name : 'test231' },
@@ -11,7 +11,7 @@ common.createConnection(function (err, db) {
 		], function (err) {
 			if (err) throw err;
 
-			var TestModel = db.define('test_multikey_find', common.getModelProperties(), {
+			var TestModel = db.define('test_multikey_base', common.getModelProperties(), {
 				keys  : [ 'id1', 'id2', 'id3' ],
 				cache : false
 			});

From 0aad4810e31463f511da3ec94c01c97a065f8367 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 24 Apr 2013 11:42:04 +0100
Subject: [PATCH 0362/1246] Throws on Model.hasMany() when is used on a Model
 with multiple keys

---
 lib/Associations/Many.js                      |  7 +++++
 .../test-multikey-hasmany-throw.js            | 26 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 test/integration/test-multikey-hasmany-throw.js

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 7f34fd2e..5bc2a9de 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -3,6 +3,13 @@ var Settings            = require("../Settings");
 var Property            = require("../Property");
 
 exports.prepare = function (Model, associations) {
+	if (Model.keys.length > 1) {
+		Model.hasMany = function () {
+			throw new Error("Model.hasMany() does not support multiple keys models");
+		};
+		return;
+	}
+
 	Model.hasMany = function () {
 		var name;
 		var OtherModel = Model;
diff --git a/test/integration/test-multikey-hasmany-throw.js b/test/integration/test-multikey-hasmany-throw.js
new file mode 100644
index 00000000..ff78c705
--- /dev/null
+++ b/test/integration/test-multikey-hasmany-throw.js
@@ -0,0 +1,26 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createKeysModelTable('test_multikey_find', db.driver.db, [ 'id1', 'id2', 'id3' ], function () {
+		common.insertKeysModelData('test_multikey_find', db.driver.db, [
+			{ id1 : 1, id2 : 1, id3: 1, name : 'test111' },
+			{ id1 : 1, id2 : 2, id3: 3, name : 'test123' },
+			{ id1 : 2, id2 : 3, id3: 1, name : 'test231' },
+			{ id1 : 3, id2 : 1, id3: 2, name : 'test312' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_multikey_find', common.getModelProperties(), {
+				keys  : [ 'id1', 'id2', 'id3' ],
+				cache : false
+			});
+
+			assert.throws(function () {
+				TestModel.hasMany("whatever");
+			}, /support/); // "does not support"
+
+			db.close();
+		});
+	});
+});

From f3a8fdc795db4c3873a525ddc1dabb12349b8cb1 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 24 Apr 2013 11:58:36 +0100
Subject: [PATCH 0363/1246] Reduces the size of mysql driver by using
 .execQuery() when possible

---
 lib/Drivers/DML/mysql.js | 77 ++++++++++------------------------------
 1 file changed, 19 insertions(+), 58 deletions(-)

diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 53a71c7a..0c93f9be 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -124,11 +124,7 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 
 	q = q.build();
 
-	if (this.opts.pool) {
-		this.poolQuery(q, cb);
-	} else {
-		this.db.query(q, cb);
-	}
+	this.execQuery(q, cb);
 	if (this.opts.debug) {
 		require("../../Debug").sql('mysql', q);
 	}
@@ -158,11 +154,7 @@ Driver.prototype.count = function (table, conditions, opts, cb) {
 
 	q = q.build();
 
-	if (this.opts.pool) {
-		this.poolQuery(q, cb);
-	} else {
-		this.db.query(q, cb);
-	}
+	this.execQuery(q, cb);
 	if (this.opts.debug) {
 		require("../../Debug").sql('mysql', q);
 	}
@@ -174,41 +166,22 @@ Driver.prototype.insert = function (table, data, id_prop, cb) {
 	                  .set(data)
 	                  .build();
 
-	if (this.opts.pool) {
-		this.poolQuery(q, function (err, info) {
-			if (err) return cb(err);
-
-			var ids = {};
-
-			if (id_prop !== null) {
-				if (id_prop.length == 1 && info.hasOwnProperty("insertId")) {
-					ids[id_prop[0]] = info.insertId;
-				} else {
-					for (var i = 0; i < id_prop.length; i++) {
-						ids[id_prop[i]] = data[id_prop[i]];
-					}
-				}
-			}
-			return cb(null, ids);
-		});
-	} else {
-		this.db.query(q, function (err, info) {
-			if (err) return cb(err);
-
-			var ids = {};
-
-			if (id_prop !== null) {
-				if (id_prop.length == 1 && info.hasOwnProperty("insertId")) {
-					ids[id_prop[0]] = info.insertId;
-				} else {
-					for (var i = 0; i < id_prop.length; i++) {
-						ids[id_prop[i]] = data[id_prop[i]];
-					}
+	this.execQuery(q, function (err, info) {
+		if (err) return cb(err);
+
+		var ids = {};
+
+		if (id_prop !== null) {
+			if (id_prop.length == 1 && info.hasOwnProperty("insertId")) {
+				ids[id_prop[0]] = info.insertId;
+			} else {
+				for (var i = 0; i < id_prop.length; i++) {
+					ids[id_prop[i]] = data[id_prop[i]];
 				}
 			}
-			return cb(null, ids);
-		});
-	}
+		}
+		return cb(null, ids);
+	});
 	if (this.opts.debug) {
 		require("../../Debug").sql('mysql', q);
 	}
@@ -221,11 +194,7 @@ Driver.prototype.update = function (table, changes, conditions, cb) {
 	                  .where(conditions)
 	                  .build();
 
-	if (this.opts.pool) {
-		this.poolQuery(q, cb);
-	} else {
-		this.db.query(q, cb);
-	}
+	this.execQuery(q, cb);
 	if (this.opts.debug) {
 		require("../../Debug").sql('mysql', q);
 	}
@@ -237,11 +206,7 @@ Driver.prototype.remove = function (table, conditions, cb) {
 	                  .where(conditions)
 	                  .build();
 
-	if (this.opts.pool) {
-		this.poolQuery(q, cb);
-	} else {
-		this.db.query(q, cb);
-	}
+	this.execQuery(q, cb);
 	if (this.opts.debug) {
 		require("../../Debug").sql('mysql', q);
 	}
@@ -250,11 +215,7 @@ Driver.prototype.remove = function (table, conditions, cb) {
 Driver.prototype.clear = function (table, cb) {
 	var q = "TRUNCATE TABLE " + this.query.escapeId(table);
 
-	if (this.opts.pool) {
-		this.poolQuery(q, cb);
-	} else {
-		this.db.query(q, cb);
-	}
+	this.execQuery(q, cb);
 	if (this.opts.debug) {
 		require("../../Debug").sql('mysql', q);
 	}

From f1a937cfd1f127fac438301b2f2903229a45e22d Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 24 Apr 2013 12:02:14 +0100
Subject: [PATCH 0364/1246] Reduces mysql driver even more by moving debug to
 .execQuery()

---
 lib/Drivers/DML/mysql.js | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 0c93f9be..0667fe2b 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -84,6 +84,9 @@ Driver.prototype.execQuery = function (query, cb) {
 	} else {
 		this.db.query(query, cb);
 	}
+	if (this.opts.debug) {
+		require("../../Debug").sql('mysql', query);
+	}
 };
 
 Driver.prototype.find = function (fields, table, conditions, opts, cb) {
@@ -125,9 +128,6 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	q = q.build();
 
 	this.execQuery(q, cb);
-	if (this.opts.debug) {
-		require("../../Debug").sql('mysql', q);
-	}
 };
 
 Driver.prototype.count = function (table, conditions, opts, cb) {
@@ -155,9 +155,6 @@ Driver.prototype.count = function (table, conditions, opts, cb) {
 	q = q.build();
 
 	this.execQuery(q, cb);
-	if (this.opts.debug) {
-		require("../../Debug").sql('mysql', q);
-	}
 };
 
 Driver.prototype.insert = function (table, data, id_prop, cb) {
@@ -182,9 +179,6 @@ Driver.prototype.insert = function (table, data, id_prop, cb) {
 		}
 		return cb(null, ids);
 	});
-	if (this.opts.debug) {
-		require("../../Debug").sql('mysql', q);
-	}
 };
 
 Driver.prototype.update = function (table, changes, conditions, cb) {
@@ -195,9 +189,6 @@ Driver.prototype.update = function (table, changes, conditions, cb) {
 	                  .build();
 
 	this.execQuery(q, cb);
-	if (this.opts.debug) {
-		require("../../Debug").sql('mysql', q);
-	}
 };
 
 Driver.prototype.remove = function (table, conditions, cb) {
@@ -207,18 +198,12 @@ Driver.prototype.remove = function (table, conditions, cb) {
 	                  .build();
 
 	this.execQuery(q, cb);
-	if (this.opts.debug) {
-		require("../../Debug").sql('mysql', q);
-	}
 };
 
 Driver.prototype.clear = function (table, cb) {
 	var q = "TRUNCATE TABLE " + this.query.escapeId(table);
 
 	this.execQuery(q, cb);
-	if (this.opts.debug) {
-		require("../../Debug").sql('mysql', q);
-	}
 };
 
 Driver.prototype.poolQuery = function (query, cb) {

From f8cfebb669d85577585a5042629a6f292b07c190 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 24 Apr 2013 12:21:39 +0100
Subject: [PATCH 0365/1246] Adds support for -property on ChainFind.order()

---
 lib/ChainFind.js                              |  6 ++++-
 .../test-find-chain-order-minus.js            | 24 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 test/integration/test-find-chain-order-minus.js

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index aa4b926d..d789009b 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -34,7 +34,11 @@ function ChainFind(Model, opts) {
 			if (!Array.isArray(opts.order)) {
 				opts.order = [];
 			}
-			opts.order.push([ property, (order && order.toUpperCase() == "Z" ? "Z" : "A") ]);
+			if (property[0] == "-") {
+				opts.order.push([ property.substr(1), "Z" ]);
+			} else {
+				opts.order.push([ property, (order && order.toUpperCase() == "Z" ? "Z" : "A") ]);
+			}
 			return this;
 		},
 		count: function (cb) {
diff --git a/test/integration/test-find-chain-order-minus.js b/test/integration/test-find-chain-order-minus.js
new file mode 100644
index 00000000..54802ea9
--- /dev/null
+++ b/test/integration/test-find-chain-order-minus.js
@@ -0,0 +1,24 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_find_chain_order_minus', db.driver.db, function () {
+		common.insertModelData('test_find_chain_order_minus', db.driver.db, [
+			{ id : 1, name : 'test2' },
+			{ id : 2, name : 'test1' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_find_chain_order_minus', common.getModelProperties());
+
+			TestModel.find().order("-name").run(function (err, Instances) {
+				assert.equal(err, null);
+				assert.equal(Array.isArray(Instances), true);
+				assert.equal(Instances.length, 2);
+				assert.equal(Instances[0].id, 1);
+				assert.equal(Instances[1].id, 2);
+				db.close();
+			});
+		});
+	});
+});

From 5eb9abf2b1bca534a4538404c02b853b4ad2ad0e Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 24 Apr 2013 12:24:01 +0100
Subject: [PATCH 0366/1246] Adds ChainFind.where() as a link to
 ChainFind.find()

---
 lib/ChainFind.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index d789009b..3f60b69c 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -6,6 +6,9 @@ module.exports = ChainFind;
 function ChainFind(Model, opts) {
 	var chain = {
 		find: function (conditions) {
+			if (!opts.conditions) {
+				opts.conditions = {};
+			}
 			for (var k in conditions) {
 				opts.conditions[k] = conditions[k];
 			}
@@ -124,6 +127,8 @@ function ChainFind(Model, opts) {
 			return this;
 		}
 	};
+	chain.where = chain.find;
+
 	if (opts.associations) {
 		for (var i = 0; i < opts.associations.length; i++) {
 			addChainMethod(chain, opts.associations[i], opts);

From 84fe19fab37a27797e2421c528a52056c2d9af45 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 24 Apr 2013 22:58:45 +0100
Subject: [PATCH 0367/1246] Adds Model.properties to access the object with
 properties definition

---
 lib/Model.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/Model.js b/lib/Model.js
index 8d1fd9d8..e1c09870 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -422,6 +422,10 @@ function Model(opts) {
 		value: opts.keys,
 		enumerable: false
 	});
+	Object.defineProperty(model, "properties", {
+		value: opts.properties,
+		enumerable: false
+	});
 
 	OneAssociation.prepare(model, one_associations, association_properties, model_fields);
 	ManyAssociation.prepare(model, many_associations);

From 522ec5c41cfa22dfe4c8f15c4def9ee6b215fc54 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 24 Apr 2013 22:59:22 +0100
Subject: [PATCH 0368/1246] Updates sql query dependency to 0.0.21

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6950df37..80957fb1 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
   },
   "analyse"     : false,
   "dependencies": {
-    "sql-query"      : "0.0.19",
+    "sql-query"      : "0.0.21",
     "hat"            : "0.0.3"
   },
   "devDependencies": {

From 0c6d03e35c570862df7ec2e3602ce7dbcec00ce0 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 24 Apr 2013 23:28:53 +0100
Subject: [PATCH 0369/1246] Adds plugins reference to Readme and links to first
 plugin

---
 Readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Readme.md b/Readme.md
index a4bd550b..a3da4208 100644
--- a/Readme.md
+++ b/Readme.md
@@ -21,6 +21,7 @@ npm install orm
 - Create Model associations, find, check, create and remove
 - Define custom validations (several builtin validations, check instance properties before saving)
 - Model instance caching and integrity (table rows fetched twice are the same object, changes to one change all)
+- Plugins: [MySQL FTS](http://github.com/dresende/node-orm-mysql-fts)
 
 ## Introduction
 

From 4d7e64b427397501f6de9b9dd6397d8a5652d888 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 25 Apr 2013 15:30:25 +0100
Subject: [PATCH 0370/1246] 2.0.10

---
 Changelog.md | 15 +++++++++++++++
 package.json |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index beb6dbe2..531c702d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,18 @@
+### v2.0.10 - 25 Apr 2013
+
+- Adds ChainFind.where() as a link to ChainFind.find()
+- Adds support for -property on ChainFind.order()
+- Reduces the size of mysql driver
+- Adds initial support for multi primary key models
+- Updates DB.define() and Model.get() to support tables with multiple primary keys (#135)
+- Creates Model.all() as alias to Model.find(), adds simple example
+- Fixes autoFetch option not being considered in Model.find() (#120)
+- Adds support for chaining and rechaining with ChainFind
+- Fixes bug about connection config object not having query key (fixes #130)
+- Adds initial plugin architecture - .use() (#121)
+- Fixes some bugs
+- Adds more tests
+
 ### v2.0.9 - 18 Apr 2013
 
 - Correct 'returnAllErrors' setting behaviour
diff --git a/package.json b/package.json
index 80957fb1..24c89c68 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "redshift",
     "sqlite"
   ],
-  "version"     : "2.0.9",
+  "version"     : "2.0.10",
   "license"     : "MIT",
   "homepage"    : "http://dresende.github.io/node-orm2",
   "repository"  : "http://github.com/dresende/node-orm2.git",

From 4f88226d65da7ca5243c51fa6f8537d5fcac8f7f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 25 Apr 2013 23:54:57 +0100
Subject: [PATCH 0371/1246] Changes orm.connect() to return an eventemitter

People can avoid passing a callback and just listen for connect(err,
db) event.
---
 lib/ORM.js | 44 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index b1fb1458..61dfe2b1 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -1,6 +1,7 @@
 var util           = require("util");
 var events         = require("events");
 var path           = require("path");
+var url            = require("url");
 var hat            = require("hat");
 var Query          = require("sql-query");
 
@@ -43,11 +44,12 @@ exports.use = function (connection, proto, opts, cb) {
 };
 
 exports.connect = function (opts, cb) {
-	var url = require("url");
-
+	if (arguments.length === 0 || !opts) {
+		return ORM_Error(new Error("CONNECTION_URL_EMPTY"), cb);
+	}
 	if (typeof opts == "string") {
 		if (opts.replace(/\s+/, "").length === 0) {
-			return cb(new Error("CONNECTION_URL_EMPTY"));
+			return ORM_Error(new Error("CONNECTION_URL_EMPTY"), cb);
 		}
 		opts = url.parse(opts, true);
 	}
@@ -58,7 +60,7 @@ exports.connect = function (opts, cb) {
 		opts.database = (opts.pathname ? opts.pathname.substr(1) : "");
 	}
 	if (!opts.protocol) {
-		return cb(new Error("CONNECTION_URL_NO_PROTOCOL"));
+		return ORM_Error(new Error("CONNECTION_URL_NO_PROTOCOL"), cb);
 	}
 	// if (!opts.host) {
 	// 	opts.host = opts.hostname = "localhost";
@@ -75,6 +77,7 @@ exports.connect = function (opts, cb) {
 	}
 
 	var proto  = opts.protocol.replace(/:$/, '');
+	var db;
 	if (DriverAliases[proto]) {
 		proto = DriverAliases[proto];
 	}
@@ -88,16 +91,27 @@ exports.connect = function (opts, cb) {
 			pool  : pool
 		});
 
+		db = new ORM(driver, new Settings.Container(exports.settings.get('*')));
+
 		driver.connect(function (err) {
-			if (err) {
-				return cb(err);
+			if (typeof cb == "function") {
+				if (err) {
+					return cb(err);
+				} else {
+					return cb(null, db);
+				}
 			}
 
-			return cb(null, new ORM(driver, new Settings.Container(exports.settings.get('*'))));
+			db.emit("connect", err, !err ? db : null);
 		});
 	} catch (ex) {
-		return cb(ex);
+		if (ex.code == "MODULE_NOT_FOUND") {
+			return ORM_Error(new Error("CONNECTION_PROTOCOL_NOT_SUPPORTED"), cb);
+		}
+		return ORM_Error(ex, cb);
 	}
+
+	return db;
 };
 
 function ORM(driver, settings) {
@@ -281,6 +295,20 @@ ORM.prototype.serial = function () {
 	};
 };
 
+function ORM_Error(err, cb) {
+	var Emitter = new events.EventEmitter();
+
+	if (typeof cb == "function") {
+		cb(err);
+	}
+
+	process.nextTick(function () {
+		Emitter.emit("connect", err);
+	});
+
+	return Emitter;
+}
+
 function extractOption(opts, key) {
 	if (!opts.query || !opts.query.hasOwnProperty(key)) {
 		return null;

From 36f26fe263388d2f69c26135e532f14742d1f5c2 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 25 Apr 2013 23:58:05 +0100
Subject: [PATCH 0372/1246] Adds test for orm.connect() "connect" event

---
 test/integration/test-connect-event.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 test/integration/test-connect-event.js

diff --git a/test/integration/test-connect-event.js b/test/integration/test-connect-event.js
new file mode 100644
index 00000000..96b997bf
--- /dev/null
+++ b/test/integration/test-connect-event.js
@@ -0,0 +1,13 @@
+var common      = require('../common');
+var assert      = require('assert');
+var config      = common.getConfig();
+
+config.protocol = common.protocol();
+
+var db = common.ORM.connect(config);
+db.on("connect", function (err, db) {
+	assert.equal(err, null);
+	assert.equal(typeof db, "object");
+
+	db.close();
+});

From 614ecc162b393859e1d7ff154a9ceec1e62b8b7e Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 26 Apr 2013 00:01:44 +0100
Subject: [PATCH 0373/1246] Updates Readme to show how to use orm.connect()
 without callback

---
 Readme.md | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/Readme.md b/Readme.md
index a3da4208..4cfca41c 100644
--- a/Readme.md
+++ b/Readme.md
@@ -119,9 +119,13 @@ You can pass in connection options either as a string:
 ```js
 var orm = require("orm");
 
-orm.connect("mysql://username:password@host/database?pool=true", function (err, db) {...}
+orm.connect("mysql://username:password@host/database?pool=true", function (err, db) {
+	// ...
+});
 ```
 
+**Note:** `pool` is only supported by mysql & postgres.
+
 Or as an object:
 
 ```js
@@ -137,10 +141,21 @@ var opts = {
     debug : true|false    // optional, false by default
   }
 };
-orm.connect(opts, function (err, db) {...}
+orm.connect(opts, function (err, db) {
+	// ...
+});
 ```
-`pool` is only supported by mysql & postgres.
 
+You can also avoid passing a callback and just listen for the connect event:
+
+```js
+var orm = require("orm");
+var db  = orm.connect("mysql://username:password@host/database");
+
+db.on("connect", function (err, db) {
+	// ...
+});
+```
 
 ## Models
 

From 894f57b91596a316e677715421c6c38f6bc6144e Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 26 Apr 2013 00:03:18 +0100
Subject: [PATCH 0374/1246] Realigns Readme connection examples

---
 Readme.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Readme.md b/Readme.md
index 4cfca41c..8ebf74f1 100644
--- a/Readme.md
+++ b/Readme.md
@@ -104,8 +104,8 @@ var orm = require("orm");
 orm.settings.set("some.deep.value", 123);
 
 orm.connect("....", function (err, db) {
-    // db.settings is a snapshot of the settings at the moment
-    // of orm.connect(). changes to it don't affect orm.settings
+	// db.settings is a snapshot of the settings at the moment
+	// of orm.connect(). changes to it don't affect orm.settings
 
 	console.log(db.settings.get("some.deep.value")); // 123
 	console.log(db.settings.get("some.deep"));       // { value: 123 }
@@ -137,8 +137,8 @@ var opts = {
   username : "..",
   password : "..",
   query    : {
-    pool  :  true|false    // optional, false by default
-    debug : true|false    // optional, false by default
+    pool     : true|false    // optional, false by default
+    debug    : true|false    // optional, false by default
   }
 };
 orm.connect(opts, function (err, db) {

From 14abf630c5c96215a4875a08f840c53875c6e26d Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sat, 27 Apr 2013 14:46:42 +0100
Subject: [PATCH 0375/1246] Adds some ORM methods to ORM Error

This will avoid code throwing when trying to do for example db.define()
before checking if connection was successfull and passing invalid
configuration options
---
 lib/ORM.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/ORM.js b/lib/ORM.js
index 61dfe2b1..2ffc6e32 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -298,6 +298,8 @@ ORM.prototype.serial = function () {
 function ORM_Error(err, cb) {
 	var Emitter = new events.EventEmitter();
 
+	Emitter.use = Emitter.define = Emitter.sync = Emitter.load = function () {};
+
 	if (typeof cb == "function") {
 		cb(err);
 	}

From 079fe7fbdbc167b574951bc618c7e0d3972b9e16 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 2 May 2013 14:07:29 +0100
Subject: [PATCH 0376/1246] Adds missing semicolons to
 test-association-hasone-required (pass jshint)

---
 test/integration/test-association-hasone-required.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integration/test-association-hasone-required.js b/test/integration/test-association-hasone-required.js
index 9d5f4bc5..6c99e7a0 100644
--- a/test/integration/test-association-hasone-required.js
+++ b/test/integration/test-association-hasone-required.js
@@ -30,7 +30,7 @@ common.createConnection(function (err, db) {
           });
         });
       });
-    }
+    };
 
     Person.drop(function (err) {
       Animal.drop(function (err) {
@@ -39,7 +39,7 @@ common.createConnection(function (err, db) {
         });
       });
     });
-  }
+  };
 
   testRequired(false, function() {
     testRequired(true, function() {

From 19492db1722f1d9c4e28b4973814ba3e7e3e185c Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 2 May 2013 14:14:56 +0100
Subject: [PATCH 0377/1246] Avoids saving an instance if a property is null and
 is marked as required (#142)

---
 lib/Instance.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/Instance.js b/lib/Instance.js
index 714dfa48..610a4441 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -71,6 +71,16 @@ function Instance(opts) {
 			if (!opts.properties.hasOwnProperty(k)) continue;
 			if (opts.data[k] == null && opts.properties[k].hasOwnProperty("defaultValue")) {
 				opts.data[k] = opts.properties[k].defaultValue;
+			} else if (opts.properties[k].required && opts.data[k] == null) {
+				var err = new Error("required");
+				err.field = k;
+				err.value = opts.data[k];
+
+				Hook.trigger(instance, opts.hooks.afterSave, false);
+				if (typeof cb == "function") {
+					cb(err, instance);
+				}
+				return;
 			}
 		}
 

From d17bb012dd52eff27f590d3addcc2ec72d00414a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 2 May 2013 14:18:38 +0100
Subject: [PATCH 0378/1246] Avoids passing property validations if property is
 null and is not required (#142)

---
 lib/Instance.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/Instance.js b/lib/Instance.js
index 610a4441..8c50a532 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -26,6 +26,9 @@ function Instance(opts) {
 	var handleValidations = function (cb) {
 		var pending = [], errors = [];
 		for (var k in opts.validations) {
+			if (!opts.properties[k].required && instance[k] == null) {
+				continue; // avoid validating if property is not required and is "empty"
+			}
 			if (Array.isArray(opts.validations[k])) {
 				for (var i = 0; i < opts.validations[k].length; i++) {
 					pending.push([ k, opts.validations[k][i] ]);

From ddf1f644fc6b6bc6436c4b3a42a9f0a34000ce06 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 2 May 2013 14:23:16 +0100
Subject: [PATCH 0379/1246] Adds simple test-validation-none-if-not-required

---
 .../test-validation-none-if-not-required.js   | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 test/integration/test-validation-none-if-not-required.js

diff --git a/test/integration/test-validation-none-if-not-required.js b/test/integration/test-validation-none-if-not-required.js
new file mode 100644
index 00000000..856c2692
--- /dev/null
+++ b/test/integration/test-validation-none-if-not-required.js
@@ -0,0 +1,26 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_validation_none_if_not_required', db.driver.db, function () {
+		var calledValidation = false;
+		var TestModel = db.define('test_validation_none_if_not_required', {
+			name : { type: "text", required: false }
+		}, {
+			validations: {
+				name: function (name, next) {
+					calledValidation = true;
+					return next();
+				}
+			}
+		});
+
+		var Test = new TestModel();
+		Test.save(function (err) {
+			// it doesn't matter the error..
+			assert.equal(calledValidation, false);
+
+			db.close();
+		});
+	});
+});

From ce5b0f1f405fc94914b1b9a155cba91914f46702 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 2 May 2013 22:42:14 +0100
Subject: [PATCH 0380/1246] Fixes documentation where user should be used
 instead of username in connection options (closes #145)

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 8ebf74f1..8a9fc89c 100644
--- a/Readme.md
+++ b/Readme.md
@@ -134,7 +134,7 @@ var opts = {
   protocol : "[mysql|postgres|redshift|sqlite]",
   host     : "127.0.0.1",
   port     : 3306,         // optional, defaults to database default
-  username : "..",
+  user     : "..",
   password : "..",
   query    : {
     pool     : true|false    // optional, false by default

From 15e63eb9046ba11f8b63f49f59e253253086702b Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 2 May 2013 22:49:28 +0100
Subject: [PATCH 0381/1246] sql-query@0.0.22 - Adds postgresql schema support

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 24c89c68..5e1782df 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
   },
   "analyse"     : false,
   "dependencies": {
-    "sql-query"      : "0.0.21",
+    "sql-query"      : "0.0.22",
     "hat"            : "0.0.3"
   },
   "devDependencies": {

From 7983efd5e7ad4fa9a5989bd902c5fdbcded00d08 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 3 May 2013 22:37:34 +0100
Subject: [PATCH 0382/1246] Fixes autoFetchLimit and cascadeRemove options not
 being used when set to 0 or false (fixes #144)

---
 lib/Model.js | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/lib/Model.js b/lib/Model.js
index e1c09870..3b1ac948 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -158,6 +158,13 @@ function Model(opts) {
 			conditions[opts.keys[i]] = ids[i];
 		}
 
+		if (!options.hasOwnProperty("autoFetchLimit")) {
+			options.autoFetchLimit = opts.autoFetchLimit;
+		}
+		if (!options.hasOwnProperty("cascadeRemove")) {
+			options.cascadeRemove = opts.cascadeRemove;
+		}
+
 		opts.driver.find(model_fields, opts.table, conditions, { limit: 1 }, function (err, data) {
 			if (err) {
 				return cb(err);
@@ -172,8 +179,8 @@ function Model(opts) {
 				return createInstance(data[0], {
 					autoSave       : opts.autoSave,
 					autoFetch      : (options.autoFetchLimit === 0 ? false : opts.autoFetch),
-					autoFetchLimit : options.autoFetchLimit || opts.autoFetchLimit,
-					cascadeRemove  : options.cascadeRemove || opts.cascadeRemove
+					autoFetchLimit : options.autoFetchLimit,
+					cascadeRemove  : options.cascadeRemove
 				}, cb);
 			}, function (instance) {
 				return cb(null, instance);
@@ -237,6 +244,12 @@ function Model(opts) {
 		if (!options.hasOwnProperty("cache")) {
 			options.cache = opts.cache;
 		}
+		if (!options.hasOwnProperty("autoFetchLimit")) {
+			options.autoFetchLimit = opts.autoFetchLimit;
+		}
+		if (!options.hasOwnProperty("cascadeRemove")) {
+			options.cascadeRemove = opts.cascadeRemove;
+		}
 
 		if (order) {
 			order = Utilities.standardizeOrder(order);
@@ -261,8 +274,8 @@ function Model(opts) {
 					return createInstance(data, {
 						autoSave       : opts.autoSave,
 						autoFetch      : (options.autoFetchLimit === 0 ? false : (options.autoFetch || opts.autoFetch)),
-						autoFetchLimit : options.autoFetchLimit || opts.autoFetchLimit,
-						cascadeRemove  : options.cascadeRemove || opts.cascadeRemove,
+						autoFetchLimit : options.autoFetchLimit,
+						cascadeRemove  : options.cascadeRemove,
 						extra          : options.extra,
 						extra_info     : options.extra_info
 					}, cb);

From 7c9b1bb540d45d325e214b2a022242f96f906350 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 3 May 2013 22:44:37 +0100
Subject: [PATCH 0383/1246] 2.0.11

---
 Changelog.md | 9 +++++++++
 package.json | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 531c702d..2dd25586 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,12 @@
+### v2.0.11 - 3 May 2013
+
+- Changes orm.connect() to return an EventEmitter
+- Avoids saving an instance if a property is null and is marked as required (#142)
+- Avoids passing property validations if property is null and is not required (#142)
+- Fixes documentation where user should be used instead of username in connection options (closes #145)
+- Adds postgresql schema support
+- Fixes autoFetchLimit and cascadeRemove options not being used when set to 0 or false (fixes #144)
+
 ### v2.0.10 - 25 Apr 2013
 
 - Adds ChainFind.where() as a link to ChainFind.find()
diff --git a/package.json b/package.json
index 5e1782df..8e62af4f 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "redshift",
     "sqlite"
   ],
-  "version"     : "2.0.10",
+  "version"     : "2.0.11",
   "license"     : "MIT",
   "homepage"    : "http://dresende.github.io/node-orm2",
   "repository"  : "http://github.com/dresende/node-orm2.git",

From bdcd343d3a1ffaa6244f8956ad47e60910a17476 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sat, 4 May 2013 10:45:04 +0100
Subject: [PATCH 0384/1246] Adds orm-paging plugin to Readme

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 8a9fc89c..82f22874 100644
--- a/Readme.md
+++ b/Readme.md
@@ -21,7 +21,7 @@ npm install orm
 - Create Model associations, find, check, create and remove
 - Define custom validations (several builtin validations, check instance properties before saving)
 - Model instance caching and integrity (table rows fetched twice are the same object, changes to one change all)
-- Plugins: [MySQL FTS](http://github.com/dresende/node-orm-mysql-fts)
+- Plugins: [MySQL FTS](http://github.com/dresende/node-orm-mysql-fts) , [Pagination](http://github.com/dresende/node-orm-paging)
 
 ## Introduction
 

From 1c9e1ba7b211611c789cac53b799ac65dd2fcfa2 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sun, 5 May 2013 22:13:37 +0100
Subject: [PATCH 0385/1246] Adds Model.one() as an alias for
 Model.all().limit(1) (#148)

---
 lib/Model.js                            |  7 +++++++
 test/integration/test-one-conditions.js | 24 ++++++++++++++++++++++++
 test/integration/test-one-order.js      | 25 +++++++++++++++++++++++++
 test/integration/test-one.js            | 22 ++++++++++++++++++++++
 4 files changed, 78 insertions(+)
 create mode 100644 test/integration/test-one-conditions.js
 create mode 100644 test/integration/test-one-order.js
 create mode 100644 test/integration/test-one.js

diff --git a/lib/Model.js b/lib/Model.js
index 3b1ac948..fe1e7869 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -295,6 +295,13 @@ function Model(opts) {
 
 	model.all = model.find;
 
+	model.one = function () {
+		var args = Array.prototype.slice.apply(arguments);
+		args.push(1);
+
+		return this.find.apply(this, args);
+	};
+
 	model.count = function () {
 		var conditions = null;
 		var cb         = null;
diff --git a/test/integration/test-one-conditions.js b/test/integration/test-one-conditions.js
new file mode 100644
index 00000000..2a07528d
--- /dev/null
+++ b/test/integration/test-one-conditions.js
@@ -0,0 +1,24 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_one_conditions', db.driver.db, function () {
+		common.insertModelData('test_one_conditions', db.driver.db, [
+			{ id : 1, name : 'test1' },
+			{ id : 2, name : 'test1' },
+			{ id : 3, name : 'test1' },
+			{ id : 4, name : 'test1' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_one_conditions', common.getModelProperties());
+
+			TestModel.one({ name: 'test1' }, function (err, Instances) {
+				assert.equal(err, null);
+				assert.equal(Array.isArray(Instances), true);
+				assert.equal(Instances.length, 1);
+				db.close();
+			});
+		});
+	});
+});
diff --git a/test/integration/test-one-order.js b/test/integration/test-one-order.js
new file mode 100644
index 00000000..5cd0251f
--- /dev/null
+++ b/test/integration/test-one-order.js
@@ -0,0 +1,25 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_one_order', db.driver.db, function () {
+		common.insertModelData('test_one_order', db.driver.db, [
+			{ id : 1, name : 'test1' },
+			{ id : 2, name : 'test2' },
+			{ id : 3, name : 'test3' },
+			{ id : 4, name : 'test4' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_one_order', common.getModelProperties());
+
+			TestModel.one("-name", function (err, Instances) {
+				assert.equal(err, null);
+				assert.equal(Array.isArray(Instances), true);
+				assert.equal(Instances.length, 1);
+				assert.equal(Instances[0].id, 4);
+				db.close();
+			});
+		});
+	});
+});
diff --git a/test/integration/test-one.js b/test/integration/test-one.js
new file mode 100644
index 00000000..df554ad4
--- /dev/null
+++ b/test/integration/test-one.js
@@ -0,0 +1,22 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_one', db.driver.db, function () {
+		common.insertModelData('test_one', db.driver.db, [
+			{ id : 1, name : 'test1' },
+			{ id : 2, name : 'test2' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_one', common.getModelProperties());
+
+			TestModel.one(function (err, Instances) {
+				assert.equal(err, null);
+				assert.equal(Array.isArray(Instances), true);
+				assert.equal(Instances.length, 1);
+				db.close();
+			});
+		});
+	});
+});

From ba74d8506a564df5ee7c92a79d9e84476d440102 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 6 May 2013 10:37:56 +0100
Subject: [PATCH 0386/1246] Changes Model.one() to return only one instance (or
 null) instead of an Array (#148)

---
 lib/Model.js                            | 21 +++++++++++++++++++++
 test/integration/test-one-conditions.js |  5 ++---
 test/integration/test-one-order.js      |  7 +++----
 test/integration/test-one.js            |  6 +++---
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/lib/Model.js b/lib/Model.js
index fe1e7869..28c0b1e5 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -297,7 +297,28 @@ function Model(opts) {
 
 	model.one = function () {
 		var args = Array.prototype.slice.apply(arguments);
+		var cb   = null;
+
+		// extract callback
+		for (var i = 0; i < args.length; i++) {
+			if (typeof args[i] == "function") {
+				cb = args.splice(i, 1)[0];
+				break;
+			}
+		}
+
+		if (cb === null) {
+			throw new Error("Model.one() called without callback");
+		}
+
+		// add limit 1
 		args.push(1);
+		args.push(function (err, results) {
+			if (err) {
+				return cb(err);
+			}
+			return cb(null, results.length ? results[0] : null);
+		});
 
 		return this.find.apply(this, args);
 	};
diff --git a/test/integration/test-one-conditions.js b/test/integration/test-one-conditions.js
index 2a07528d..4ff83f40 100644
--- a/test/integration/test-one-conditions.js
+++ b/test/integration/test-one-conditions.js
@@ -13,10 +13,9 @@ common.createConnection(function (err, db) {
 
 			var TestModel = db.define('test_one_conditions', common.getModelProperties());
 
-			TestModel.one({ name: 'test1' }, function (err, Instances) {
+			TestModel.one({ name: 'test2' }, function (err, Instance) {
 				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances.length, 1);
+				assert.equal(Instance, null);
 				db.close();
 			});
 		});
diff --git a/test/integration/test-one-order.js b/test/integration/test-one-order.js
index 5cd0251f..24a48120 100644
--- a/test/integration/test-one-order.js
+++ b/test/integration/test-one-order.js
@@ -13,11 +13,10 @@ common.createConnection(function (err, db) {
 
 			var TestModel = db.define('test_one_order', common.getModelProperties());
 
-			TestModel.one("-name", function (err, Instances) {
+			TestModel.one("-name", function (err, Instance) {
 				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances.length, 1);
-				assert.equal(Instances[0].id, 4);
+				assert.equal(!Array.isArray(Instance), true);
+				assert.equal(Instance.id, 4);
 				db.close();
 			});
 		});
diff --git a/test/integration/test-one.js b/test/integration/test-one.js
index df554ad4..3656d347 100644
--- a/test/integration/test-one.js
+++ b/test/integration/test-one.js
@@ -11,10 +11,10 @@ common.createConnection(function (err, db) {
 
 			var TestModel = db.define('test_one', common.getModelProperties());
 
-			TestModel.one(function (err, Instances) {
+			TestModel.one(function (err, Instance) {
 				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances.length, 1);
+				assert.equal(!Array.isArray(Instance), true);
+				assert.equal(typeof Instance.id, "number");
 				db.close();
 			});
 		});

From a40bc38026b75e964ab8152391cfa24f046872a0 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 7 May 2013 19:48:14 +0100
Subject: [PATCH 0387/1246] Adds "Validations" section to Readme

---
 Readme.md | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 61 insertions(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 82f22874..80f5b601 100644
--- a/Readme.md
+++ b/Readme.md
@@ -540,7 +540,7 @@ Person.create([
 });
 ```
 
-### Updating items (called Instances)
+## Updating Items
 
 Every item returned has the properties that were defined to the Model and also a couple of methods you can
 use to change each item.
@@ -576,6 +576,66 @@ Person.get(1, function (err, John) {
 });
 ```
 
+## Validations
+
+You can define validations for every property of a Model. You can have one or more validations for each property.
+You can also use the predefined validations or create your own.
+
+```js
+var Person = db.define("person", {
+	name : String,
+	age  : Number
+}, {
+	validations : {
+		name : orm.validators.rangeLength(1, undefined, "missing"), // "missing" is a name given to this validation, instead of default
+		age  : [ orm.validators.rangeNumber(0, 10), orm.validators.insideList([ 1, 3, 5, 7, 9 ]) ]
+	}
+});
+```
+
+The code above defines that the `name` length must be between 1 and undefined (undefined means any) and `age`
+must be a number between 0 and 10 (inclusive) but also one of the listed values. The example might not make sense
+but you get the point.
+
+When saving an item, if it fails to validate any of the defined validations you'll get an `error` object with the property
+name and validation error description. This description should help you identify what happened.
+
+```js
+var John = new Person({
+	name : "",
+	age : 20
+});
+John.save(function (err) {
+	// err.field = "name" , err.value = "" , err.msg = "missing"
+});
+```
+
+The validation stops after the first validation error. If you want it to validate every property and return all validation
+errors, you can change this behavior on global or local settings:
+
+```js
+var orm = require("orm");
+
+orm.settings.set("instance.returnAllErrors", true); // global or..
+
+orm.connect("....", function (err, db) {
+	db.settings.set("instance.returnAllErrors", true); // .. local
+
+	// ...
+
+	var John = new Person({
+		name : "",
+		age : 15
+	});
+	John.save(function (err) {
+		assert(Array.isArray(err));
+		// err[0].field = "name" , err[0].value = "" , err[0].msg = "missing"
+		// err[0].field = "age"  , err[0].value = 15 , err[0].msg = "out-of-range-number"
+		// err[0].field = "age"  , err[0].value = 15 , err[0].msg = "outside-list"
+	});
+});
+```
+
 ## Associations
 
 An association is a relation between one or more tables.

From 78397e639d6cfbd4e6ed49c0f5245372de8eb8d5 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 7 May 2013 19:50:57 +0100
Subject: [PATCH 0388/1246] Fixes last example of Validations section

---
 Readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Readme.md b/Readme.md
index 80f5b601..9f36d0cd 100644
--- a/Readme.md
+++ b/Readme.md
@@ -630,8 +630,8 @@ orm.connect("....", function (err, db) {
 	John.save(function (err) {
 		assert(Array.isArray(err));
 		// err[0].field = "name" , err[0].value = "" , err[0].msg = "missing"
-		// err[0].field = "age"  , err[0].value = 15 , err[0].msg = "out-of-range-number"
-		// err[0].field = "age"  , err[0].value = 15 , err[0].msg = "outside-list"
+		// err[1].field = "age"  , err[1].value = 15 , err[1].msg = "out-of-range-number"
+		// err[2].field = "age"  , err[2].value = 15 , err[2].msg = "outside-list"
 	});
 });
 ```

From dc021d1380c33a3eb3a55bfb12ea9aa5e7d8cc14 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 7 May 2013 20:00:35 +0100
Subject: [PATCH 0389/1246] Updates readme links to plugins

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 9f36d0cd..f348857f 100644
--- a/Readme.md
+++ b/Readme.md
@@ -21,7 +21,7 @@ npm install orm
 - Create Model associations, find, check, create and remove
 - Define custom validations (several builtin validations, check instance properties before saving)
 - Model instance caching and integrity (table rows fetched twice are the same object, changes to one change all)
-- Plugins: [MySQL FTS](http://github.com/dresende/node-orm-mysql-fts) , [Pagination](http://github.com/dresende/node-orm-paging)
+- Plugins: [MySQL FTS](http://dresende.github.io/node-orm-mysql-fts) , [Pagination](http://dresende.github.io/node-orm-paging)
 
 ## Introduction
 

From e08d29c32b2d14c63f863da9525daef3b09acf75 Mon Sep 17 00:00:00 2001
From: Eric Schoffstall <contra@maricopa.edu>
Date: Fri, 10 May 2013 16:46:51 -0600
Subject: [PATCH 0390/1246] expose attributes

---
 lib/ChainFind.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 3f60b69c..b8261169 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -142,6 +142,8 @@ function ChainFind(Model, opts) {
 
 		chain[k] = Model[k];
 	}
+	chain.model = Model;
+        chain.opts = opts;
 	return chain;
 }
 

From 71e1caacb9bd4ef07e35e69da652a44d54e4726c Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 13 May 2013 20:52:20 +1100
Subject: [PATCH 0391/1246] Document model & instance methods

closes #154
---
 Readme.md | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/Readme.md b/Readme.md
index f348857f..627298ad 100644
--- a/Readme.md
+++ b/Readme.md
@@ -206,6 +206,44 @@ If defining properties using the latter object syntax, the types are:
 
 Note that these may vary accross drivers.
 
+### Instance Methods
+
+Are passed in during model definition.
+
+```js
+var Person = db.define('person', {
+    name    : String,
+    surname : String
+}, {
+    methods: {
+        fullName: function () {
+            return this.name + ' ' + this.surname;
+        }
+    }
+});
+
+Person.get(4, function(err, person) {
+    console.log( person.fullName() );
+})
+```
+
+### Model Methods
+
+Are defined directly on the model.
+
+```js
+var Person = db.define('person', {
+    name    : String,
+    height  : { type: 'number', rational: false }
+});
+Person.tallerThan = function(height, callback) {
+    this.find({ height: orm.gt(height) }, callback);
+};
+
+Person.tallerThan( 192, function(err, tallPeople) { ... } );
+```
+
+
 ## Loading Models
 
 Models can be in separate modules. Simply ensure that the module holding the models uses module.exports to publish a function that accepts the database connection, then load your models however you like.

From 1683e159830528c1cf9408320dcf464c1de66235 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 14 May 2013 23:09:29 +1000
Subject: [PATCH 0392/1246] Describe how to add driver dependencies

closes #156
---
 Readme.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Readme.md b/Readme.md
index 627298ad..56787f83 100644
--- a/Readme.md
+++ b/Readme.md
@@ -114,6 +114,16 @@ orm.connect("....", function (err, db) {
 
 ## Connecting
 
+First, add the correct driver to your `package.json`:
+
+For **mysql** add: `"mysql" : "2.0.0-alpha7"`
+
+For **postgres/redshift** add: `"pg": "~1.0.0",`
+
+For **sqlite** add: `"sqlite3" : "2.1.5"`
+
+### Options
+
 You can pass in connection options either as a string:
 
 ```js

From 54f272fb60edee9a101c7f04176d5fdb29521af8 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 15 May 2013 19:53:09 +1000
Subject: [PATCH 0393/1246] Better describe how to disable cache. Tablerize.
 closes #161

---
 Readme.md | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/Readme.md b/Readme.md
index 56787f83..fbdec888 100644
--- a/Readme.md
+++ b/Readme.md
@@ -116,11 +116,11 @@ orm.connect("....", function (err, db) {
 
 First, add the correct driver to your `package.json`:
 
-For **mysql** add: `"mysql" : "2.0.0-alpha7"`
-
-For **postgres/redshift** add: `"pg": "~1.0.0",`
-
-For **sqlite** add: `"sqlite3" : "2.1.5"`
+ driver                | dependency
+:----------------------|:---------------------------
+ mysql                 | `"mysql" : "2.0.0-alpha7"`
+ postgres<br/>redshift | `"pg": "~1.0.0",`
+ sqlite                | `"sqlite3" : "2.1.5"`
 
 ### Options
 
@@ -191,13 +191,13 @@ var Person = db.define('person', {        // 'person' will be the table in the d
 
 #### Types
 
-Available native object types are:
-
-`String, Number, Boolean, Date, Object, Buffer`
-
-If defining properties using the latter object syntax, the types are:
 
-`text, number, boolean, date, enum, object, binary`
+ Native   | String     | Native   | String
+ :--------|:-----------|:---------|:---------
+ String   | 'text'     | Date     | 'date '
+ Number   | 'number'   | Object   | 'object'
+ Boolean  | 'boolean'  | Buffer   | 'binary'
+          |            |  ---     | 'enum'
 
 #### Options
 
@@ -555,6 +555,12 @@ var Person = db.define('person', {
 	cache   : false
 });
 ```
+and also globally:
+```js
+orm.connect('...', function(err, db) {
+  db.settings.set('instance.cache', false);
+});
+```
 
 The cache can be configured to expire after a period of time by passing in a number instead of a
 boolean. The number will be considered the cache timeout in seconds (you can use floating point).

From 63d8b7325804a6924b8b5d565acc5cc32d2dc59d Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 15 May 2013 21:00:20 +1000
Subject: [PATCH 0394/1246] Allow passing a single object to Model.create.
 Addresses #159

---
 lib/Model.js                    | 18 +++++-----
 package.json                    |  3 +-
 test/integration/test-create.js | 58 +++++++++++++++++++++++++++------
 3 files changed, 60 insertions(+), 19 deletions(-)

diff --git a/lib/Model.js b/lib/Model.js
index 28c0b1e5..5110667c 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -398,10 +398,10 @@ function Model(opts) {
 	model.create = function () {
 		var Instances = [];
 		var options = {};
-		var cb = null, idx = 0;
+		var cb = null, idx = 0, single = false;
 		var createNext = function () {
 			if (idx >= Instances.length) {
-				return cb(null, Instances);
+				return cb(null, single ? Instances[0] : Instances);
 			}
 
 			Instances[idx] = createInstance(Instances[idx], {
@@ -423,14 +423,16 @@ function Model(opts) {
 		};
 
 		for (var i = 0; i < arguments.length; i++) {
-			if (Array.isArray(arguments[i])) {
-				Instances = Instances.concat(arguments[i]);
-				continue;
-			}
-
 			switch (typeof arguments[i]) {
 				case "object":
-					options = arguments[i];
+					if ( !single && Array.isArray(arguments[i]) ) {
+						Instances = Instances.concat(arguments[i]);
+					} else if (i == 0) {
+						single = true;
+						Instances.push(arguments[i]);
+					} else {
+						options = arguments[i];
+					}
 					break;
 				case "function":
 					cb = arguments[i];
diff --git a/package.json b/package.json
index 8e62af4f..54b1b6f0 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,8 @@
     "urun"      : "0.0.6",
     "mysql"     : "2.0.0-alpha7",
     "pg"        : "1.0.0",
-    "sqlite3"   : "2.1.5"
+    "sqlite3"   : "2.1.5",
+    "async"     : "*"
   },
   "optionalDependencies": {}
 }
diff --git a/test/integration/test-create.js b/test/integration/test-create.js
index 00478f33..e51ee0d8 100644
--- a/test/integration/test-create.js
+++ b/test/integration/test-create.js
@@ -1,20 +1,58 @@
 var common     = require('../common');
 var assert     = require('assert');
+var async      = require('async');
 
 common.createConnection(function (err, db) {
 	common.createModelTable('test_create', db.driver.db, function () {
 		var TestModel = db.define('test_create', common.getModelProperties());
 
-		TestModel.create([
-			{ name: 'test1' },
-			{ name: 'test2' },
-			{ name: 'test3' }
-		], function (err) {
-			TestModel.count(function (err, count) {
-				assert.equal(err, null);
-				assert.equal(count, 3);
-				db.close();
-			});
+		async.series([
+			// Test that items are actually created
+			function (done) {
+				TestModel.create([
+					{ name: 'test1' },
+					{ name: 'test2' },
+					{ name: 'test3' }
+				], function (err) {
+					TestModel.count(function (err, count) {
+						assert.equal(err, null);
+						assert.equal(count, 3);
+						done();
+					});
+				});
+			},
+			function (done) {
+				TestModel.create({ name: 'test4' }, function (err) {
+					TestModel.count(function (err, count) {
+						assert.equal(err, null);
+						assert.equal(count, 4);
+						done();
+					});
+				});
+			},
+			// Test callback arguments
+			function (done) {
+				TestModel.create([
+					{ name: 'test5' },
+					{ name: 'test6' }
+				], function (err, items) {
+					assert.equal(err, null);
+					assert.equal(Array.isArray(items), true);
+					assert.equal(items.length, 2);
+					done();
+				});
+			},
+			function (done) {
+				TestModel.create({ name: 'test7' }, function (err, item) {
+					assert.equal(err, null);
+					assert.equal(Array.isArray(item), false);
+					assert.equal(item.name, 'test7');
+					assert.equal(item.hasOwnProperty('id'), true);
+					done();
+				});
+			}
+		], function complete() {
+			db.close();
 		});
 	});
 });

From e98bb18a9f7001e6b7836311f1e7dbd268bf030c Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 21 May 2013 19:55:31 +1000
Subject: [PATCH 0395/1246] Rename opts to options

---
 lib/ChainFind.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index b8261169..55bb45ce 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -142,8 +142,9 @@ function ChainFind(Model, opts) {
 
 		chain[k] = Model[k];
 	}
-	chain.model = Model;
-        chain.opts = opts;
+	chain.model   = Model;
+	chain.options = opts;
+
 	return chain;
 }
 

From 36c418aa47bbc5736b57c9e2ee24a09d3b2c6d2a Mon Sep 17 00:00:00 2001
From: OpenSourceAnonymous <chris.lee@qrhook.com>
Date: Tue, 21 May 2013 15:53:44 -0300
Subject: [PATCH 0396/1246] Added a needed comma in the Readme

Added a needed comma in the Readme
---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index fbdec888..0f67a152 100644
--- a/Readme.md
+++ b/Readme.md
@@ -147,7 +147,7 @@ var opts = {
   user     : "..",
   password : "..",
   query    : {
-    pool     : true|false    // optional, false by default
+    pool     : true|false,    // optional, false by default
     debug    : true|false    // optional, false by default
   }
 };

From 1ba7d6ff1a0cff4e8302b915ef53745f92edc42b Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 22 May 2013 00:13:41 +0100
Subject: [PATCH 0397/1246] Removes whitespace to align code comments

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 0f67a152..1b05b328 100644
--- a/Readme.md
+++ b/Readme.md
@@ -147,7 +147,7 @@ var opts = {
   user     : "..",
   password : "..",
   query    : {
-    pool     : true|false,    // optional, false by default
+    pool     : true|false,   // optional, false by default
     debug    : true|false    // optional, false by default
   }
 };

From 0bf13e36843842c2502074be247d91b5f7255d39 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 22 May 2013 21:14:01 +1000
Subject: [PATCH 0398/1246] Update association docs. closes #173

---
 Readme.md | 376 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 203 insertions(+), 173 deletions(-)

diff --git a/Readme.md b/Readme.md
index 1b05b328..bb931373 100644
--- a/Readme.md
+++ b/Readme.md
@@ -33,38 +33,38 @@ An example:
 var orm = require("orm");
 
 orm.connect("mysql://username:password@host/database", function (err, db) {
-	if (err) throw err;
-
-	var Person = db.define("person", {
-		name      : String,
-		surname   : String,
-		age       : Number,
-		male      : Boolean,
-		continent : [ "Europe", "America", "Asia", "Africa", "Australia", "Antartica" ], // ENUM type
-		photo     : Buffer, // BLOB/BINARY
-		data      : Object // JSON encoded
-	}, {
-		methods: {
-			fullName: function () {
-				return this.name + ' ' + this.surname;
-			}
-		},
-		validations: {
-			age: orm.validators.rangeNumber(18, undefined, "under-age")
-		}
-	});
-
-	Person.find({ surname: "Doe" }, function (err, people) {
-		// SQL: "SELECT * FROM person WHERE surname = 'Doe'"
-
-		console.log("People found: %d", people.length);
-		console.log("First person: %s, age %d", people[0].fullName(), people[0].age);
-
-		people[0].age = 16;
-		people[0].save(function (err) {
-			// err.msg = "under-age";
-		});
-	});
+  if (err) throw err;
+
+  var Person = db.define("person", {
+    name      : String,
+    surname   : String,
+    age       : Number,
+    male      : Boolean,
+    continent : [ "Europe", "America", "Asia", "Africa", "Australia", "Antartica" ], // ENUM type
+    photo     : Buffer, // BLOB/BINARY
+    data      : Object // JSON encoded
+  }, {
+    methods: {
+      fullName: function () {
+        return this.name + ' ' + this.surname;
+      }
+    },
+    validations: {
+      age: orm.validators.rangeNumber(18, undefined, "under-age")
+    }
+  });
+
+  Person.find({ surname: "Doe" }, function (err, people) {
+    // SQL: "SELECT * FROM person WHERE surname = 'Doe'"
+
+    console.log("People found: %d", people.length);
+    console.log("First person: %s, age %d", people[0].fullName(), people[0].age);
+
+    people[0].age = 16;
+    people[0].save(function (err) {
+      // err.msg = "under-age";
+    });
+  });
 });
 ```
 
@@ -78,15 +78,15 @@ var orm = require('orm');
 var app = express();
 
 app.use(orm.express("mysql://username:password@host/database", {
-	define: function (db, models) {
-		models.person = db.define("person", { ... });
-	}
+  define: function (db, models) {
+    models.person = db.define("person", { ... });
+  }
 }));
 app.listen(80);
 
 app.get("/", function (req, res) {
-	// req.models is a reference to models used above in define()
-	req.models.person.find(...);
+  // req.models is a reference to models used above in define()
+  req.models.person.find(...);
 });
 ```
 
@@ -104,11 +104,11 @@ var orm = require("orm");
 orm.settings.set("some.deep.value", 123);
 
 orm.connect("....", function (err, db) {
-	// db.settings is a snapshot of the settings at the moment
-	// of orm.connect(). changes to it don't affect orm.settings
+  // db.settings is a snapshot of the settings at the moment
+  // of orm.connect(). changes to it don't affect orm.settings
 
-	console.log(db.settings.get("some.deep.value")); // 123
-	console.log(db.settings.get("some.deep"));       // { value: 123 }
+  console.log(db.settings.get("some.deep.value")); // 123
+  console.log(db.settings.get("some.deep"));       // { value: 123 }
 });
 ```
 
@@ -130,7 +130,7 @@ You can pass in connection options either as a string:
 var orm = require("orm");
 
 orm.connect("mysql://username:password@host/database?pool=true", function (err, db) {
-	// ...
+  // ...
 });
 ```
 
@@ -152,7 +152,7 @@ var opts = {
   }
 };
 orm.connect(opts, function (err, db) {
-	// ...
+  // ...
 });
 ```
 
@@ -163,7 +163,7 @@ var orm = require("orm");
 var db  = orm.connect("mysql://username:password@host/database");
 
 db.on("connect", function (err, db) {
-	// ...
+  // ...
 });
 ```
 
@@ -179,11 +179,11 @@ Call `define` on the database connection to setup a model. The name of the table
 
 ```js
 var Person = db.define('person', {        // 'person' will be the table in the database as well as the model id
-	// properties
-	name    : String,                     // you can use native objects to define the property type
-	surname : { type: "text", size: 50 }  // or you can be specific and define aditional options
+  // properties
+  name    : String,                     // you can use native objects to define the property type
+  surname : { type: "text", size: 50 }  // or you can be specific and define aditional options
 }, {
-	// options (optional)
+  // options (optional)
 });
 ```
 
@@ -300,7 +300,7 @@ Models can create their underlying tables in the database. You may call Model.sy
 ```js
 // db.sync() can also be used
 Person.sync(function (err) {
-	!err && console.log("done!");
+  !err && console.log("done!");
 });
 ```
 
@@ -310,7 +310,7 @@ If you want to drop a Model and remove all tables you can use the `.drop()` meth
 
 ```js
 Person.drop(function (err) {
-	!err && console.log("person model no longer exists!");
+  !err && console.log("person model no longer exists!");
 });
 ```
 
@@ -323,9 +323,9 @@ by default "id" but you can change it.
 
 ```js
 var Person = db.define("person", {
-	name : String
+  name : String
 }, {
-	id   : "person_id"
+  id   : "person_id"
 });
 
 // or just do it globally..
@@ -333,7 +333,7 @@ db.settings.set("properties.primary_key", "UID");
 
 // ..and then define your Models
 var Pet = db.define("pet", {
-	name : String
+  name : String
 });
 ```
 
@@ -372,7 +372,7 @@ To get a specific element from the database use `Model.get`.
 
 ```js
 Person.get(123, function (err, person) {
-	// finds person with id = 123
+  // finds person with id = 123
 });
 ```
 
@@ -382,7 +382,7 @@ Finding one or more elements has more options, each one can be given in no speci
 
 ```js
 Person.find({ name: "John", surname: "Doe" }, 3, function (err, people) {
-	// finds people with name='John' AND surname='Doe' and returns the first 3
+  // finds people with name='John' AND surname='Doe' and returns the first 3
 });
 ```
 
@@ -390,11 +390,11 @@ If you need to sort the results because you're limiting or just because you want
 
 ```js
 Person.find({ surname: "Doe" }, "name", function (err, people) {
-	// finds people with surname='Doe' and returns sorted by name ascending
+  // finds people with surname='Doe' and returns sorted by name ascending
 });
 Person.find({ surname: "Doe" }, [ "name", "Z" ], function (err, people) {
-	// finds people with surname='Doe' and returns sorted by name descending
-	// ('Z' means DESC; 'A' means ASC - default)
+  // finds people with surname='Doe' and returns sorted by name descending
+  // ('Z' means DESC; 'A' means ASC - default)
 });
 ```
 
@@ -402,7 +402,7 @@ There are more options that you can pass to find something. These options are pa
 
 ```js
 Person.find({ surname: "Doe" }, { offset: 2 }, function (err, people) {
-	// finds people with surname='Doe', skips the first 2 and returns the others
+  // finds people with surname='Doe', skips the first 2 and returns the others
 });
 ```
 
@@ -413,7 +413,7 @@ of them and counting. This will actually tell the database server to do a count
 
 ```js
 Person.count({ surname: "Doe" }, function (err, count) {
-	console.log("We have %d Does in our db", count);
+  console.log("We have %d Does in our db", count);
 });
 ```
 
@@ -423,7 +423,7 @@ Similar to `.count()`, this method just checks if the count is greater than zero
 
 ```js
 Person.exists({ surname: "Doe" }, function (err, exists) {
-	console.log("We %s Does in our db", exists ? "have" : "don't have");
+  console.log("We %s Does in our db", exists ? "have" : "don't have");
 });
 ```
 
@@ -434,7 +434,7 @@ illustrate:
 
 ```js
 Person.aggregate({ surname: "Doe" }).min("age").max("age").get(function (err, min, max) {
-	console.log("The youngest Doe guy has %d years, while the oldest is %d", min, max);
+  console.log("The youngest Doe guy has %d years, while the oldest is %d", min, max);
 });
 ```
 Here's an example to illustrate how to use groupby:
@@ -491,17 +491,17 @@ in the end.
 
 ```js
 Person.find({ surname: "Doe" }).each(function (person) {
-	person.surname = "Dean";
+  person.surname = "Dean";
 }).save(function (err) {
-	// done!
+  // done!
 });
 
 Person.find({ surname: "Doe" }).each().filter(function (person) {
-	return person.age >= 18;
+  return person.age >= 18;
 }).sort(function (person1, person2) {
-	return person1.age < person2.age;
+  return person1.age < person2.age;
 }).get(function (people) {
-	// get all people with at least 18 years, sorted by age
+  // get all people with at least 18 years, sorted by age
 });
 ```
 
@@ -550,9 +550,9 @@ defining the Model.
 
 ```js
 var Person = db.define('person', {
-	name    : String
+  name    : String
 }, {
-	cache   : false
+  cache   : false
 });
 ```
 and also globally:
@@ -576,21 +576,21 @@ To insert new elements to the database use `Model.create`.
 
 ```js
 Person.create([
-	{
-		name: "John",
-		surname: "Doe",
-		age: 25,
-		male: true
-	},
-	{
-		name: "Liza",
-		surname: "Kollan",
-		age: 19,
-		male: false
-	}
+  {
+    name: "John",
+    surname: "Doe",
+    age: 25,
+    male: true
+  },
+  {
+    name: "Liza",
+    surname: "Kollan",
+    age: 19,
+    male: false
+  }
 ], function (err, items) {
-	// err - description of the error or null
-	// items - array of inserted items
+  // err - description of the error or null
+  // items - array of inserted items
 });
 ```
 
@@ -601,11 +601,11 @@ use to change each item.
 
 ```js
 Person.get(1, function (err, John) {
-	John.name = "Joe";
-	John.surname = "Doe";
-	John.save(function (err) {
-		console.log("saved!");
-	});
+  John.name = "Joe";
+  John.surname = "Doe";
+  John.save(function (err) {
+    console.log("saved!");
+  });
 });
 ```
 
@@ -613,9 +613,9 @@ Updating and then saving an instance can be done in a single call:
 
 ```js
 Person.get(1, function (err, John) {
-	John.save({ name: "Joe", surname: "Doe" }, function (err) {
-		console.log("saved!");
-	});
+  John.save({ name: "Joe", surname: "Doe" }, function (err) {
+    console.log("saved!");
+  });
 });
 ```
 
@@ -624,9 +624,9 @@ If you want to remove an instance, just do:
 ```js
 // you could do this without even fetching it, look at Chaining section above
 Person.get(1, function (err, John) {
-	John.remove(function (err) {
-		console.log("removed!");
-	});
+  John.remove(function (err) {
+    console.log("removed!");
+  });
 });
 ```
 
@@ -637,13 +637,13 @@ You can also use the predefined validations or create your own.
 
 ```js
 var Person = db.define("person", {
-	name : String,
-	age  : Number
+  name : String,
+  age  : Number
 }, {
-	validations : {
-		name : orm.validators.rangeLength(1, undefined, "missing"), // "missing" is a name given to this validation, instead of default
-		age  : [ orm.validators.rangeNumber(0, 10), orm.validators.insideList([ 1, 3, 5, 7, 9 ]) ]
-	}
+  validations : {
+    name : orm.validators.rangeLength(1, undefined, "missing"), // "missing" is a name given to this validation, instead of default
+    age  : [ orm.validators.rangeNumber(0, 10), orm.validators.insideList([ 1, 3, 5, 7, 9 ]) ]
+  }
 });
 ```
 
@@ -656,11 +656,11 @@ name and validation error description. This description should help you identify
 
 ```js
 var John = new Person({
-	name : "",
-	age : 20
+  name : "",
+  age : 20
 });
 John.save(function (err) {
-	// err.field = "name" , err.value = "" , err.msg = "missing"
+  // err.field = "name" , err.value = "" , err.msg = "missing"
 });
 ```
 
@@ -673,20 +673,20 @@ var orm = require("orm");
 orm.settings.set("instance.returnAllErrors", true); // global or..
 
 orm.connect("....", function (err, db) {
-	db.settings.set("instance.returnAllErrors", true); // .. local
+  db.settings.set("instance.returnAllErrors", true); // .. local
 
-	// ...
+  // ...
 
-	var John = new Person({
-		name : "",
-		age : 15
-	});
-	John.save(function (err) {
-		assert(Array.isArray(err));
-		// err[0].field = "name" , err[0].value = "" , err[0].msg = "missing"
-		// err[1].field = "age"  , err[1].value = 15 , err[1].msg = "out-of-range-number"
-		// err[2].field = "age"  , err[2].value = 15 , err[2].msg = "outside-list"
-	});
+  var John = new Person({
+    name : "",
+    age : 15
+  });
+  John.save(function (err) {
+    assert(Array.isArray(err));
+    // err[0].field = "name" , err[0].value = "" , err[0].msg = "missing"
+    // err[1].field = "age"  , err[1].value = 15 , err[1].msg = "out-of-range-number"
+    // err[2].field = "age"  , err[2].value = 15 , err[2].msg = "outside-list"
+  });
 });
 ```
 
@@ -694,36 +694,81 @@ orm.connect("....", function (err, db) {
 
 An association is a relation between one or more tables.
 
-## hasOne vs. hasMany
+### hasOne
+Is a **many to one** relationship. It's the same as **belongs to.**<br/>
+Eg: `Animal.hasOne('owner', Person)`.<br/>
+Animal can only have one owner, but Person can have many animals.<br/>
+Animal will have the `owner_id` property automatically added.
+
+The following functions will become available:
+```js
+animal.getOwner(function..)         // Gets owner
+animal.setOwner(person, function..) // Sets owner_id
+animal.hasOwner(function..)         // Checks if owner exists
+animal.removeOwner()                // Sets owner_id to 0
+```
+
+**Reverse access**
+```js
+Animal.hasOne('owner', Person, {reverse: 'pets'})
+```
+will add the following:
+```js
+person.getPets(function..)
+person.setPets(cat, function..)
+```
+
 
-Since this topic brings some confusion to many people including myself, here's a list of the possibilities
-supported by both types of association.
+### hasMany
+Is a **many to many** relationship (includes join table).<br/>
+Eg: `Patient.hasMany('doctors', Doctor, { why: String }, { reverse: 'patients' })`.<br/>
+Patient can have many different doctors. Each doctor can have many different patients.
 
-- `hasOne` : it's a **Many-to-One** relationship. A.hasOne(B) means A will have one (or none) of B, but B can be
-  associated with many A;
-- `hasMany`: it's a **One-to-Many** relationship. A.hasMany(B) means A will have none, one or more of B. Actually
-  B will be associated with possibly many A but you don't have how to find it easily (see next);
-- `hasMany` + reverse: it's a **Many-to-Many** relationship. A.hasMany(B, { reverse: A }) means A can have none or
-  many B and also B can have none or many A. Accessors will be created in both models so you can manage them from
-  both sides.
+This will create a join table `patient_doctors` when you call `Patient.sync()`:
 
-If you have a relation of 1 to 0 or 1 to 1, you should use `hasOne` association. This assumes a column in the model that has the id of the other end of the relation.
+ column name | type
+ :-----------|:--------
+ patient_id  | Integer
+ doctor_id   | Integer
+ why         | varchar(255)
+
+The following functions will be available:
+```js
+patient.getDoctors(function..)           // List of doctors
+patient.addDoctors(docs, function...)    // Adds entries to join table
+patient.setDoctors(docs, function...)    // Removes existing entries in join table, adds new ones
+patient.hasDoctors(docs, function...)    // Checks if patient is associated to specified doctors
+patient.removeDoctors(docs, function...) // Removes specified doctors from join table
+
+doctor.getPatients(function..)
+etc...
+```
+
+To associate a doctor to a patient:
+```js
+patient.addDoctor(surgeon, {why: "remove appendix"}, function(err) { ... } )
+```
+which will add `{patient_id: 4, doctor_id: 6, why: "remove appendix"}` to the join table.
+
+### Examples & options
+
+If you have a relation of 1 to n, you should use `hasOne` (belongs to) association.
 
 ```js
 var Person = db.define('person', {
-	name : String
+    name : String
 });
 var Animal = db.define('animal', {
-	name : String
+    name : String
 });
-Animal.hasOne("owner", Person); // assumes column 'owner_id' in 'animal' table
+Animal.hasOne("owner", Person); // creates column 'owner_id' in 'animal' table
 
 // get animal with id = 123
-Animal.get(123, function (err, Foo) {
-	// Foo is the animal model instance, if found
-	Foo.getOwner(function (err, John) {
-		// if Foo animal has really an owner, John points to it
-	});
+Animal.get(123, function (err, animal) {
+    // animal is the animal model instance, if found
+    Foo.getOwner(function (err, person) {
+        // if animal has really an owner, person points to it
+    });
 });
 ```
 
@@ -738,46 +783,32 @@ If you prefer to use another name for the field (owner_id) you can change this p
 db.settings.set("properties.association_key", "id_{name}"); // {name} will be replaced by 'owner' in this case
 ```
 
-**Note: This has to be done prior to the association creation.**
+**Note: This has to be done before the association is specified.**
 
-For relations of 1 to many you have to use `hasMany` associations. This assumes the existence of a separate join table that has 2 columns, each referencing the table in the association. Ideally, these would be foreign key relationships in your database.
+The `hasMany` associations can have additional properties in the association table.
 
 ```js
 var Person = db.define('person', {
-	name : String
-});
-Person.hasMany("friends"); // omitting the other Model, it will assume self model
-
-Person.get(123, function (err, John) {
-	John.getFriends(function (err, friends) {
-		// assumes table person_friends with columns person_id and friends_id
-	});
-});
-```
-
-The `hasMany` associations can have additional properties that are assumed to be in the association table.
-
-```js
-var Person = db.define('person', {
-	name : String
+    name : String
 });
 Person.hasMany("friends", {
     rate : Number
 });
 
 Person.get(123, function (err, John) {
-	John.getFriends(function (err, friends) {
-		// assumes rate is another column on table person_friends
-		// you can access it by going to friends[N].extra.rate
-	});
+    John.getFriends(function (err, friends) {
+        // assumes rate is another column on table person_friends
+        // you can access it by going to friends[N].extra.rate
+    });
 });
 ```
 
-If you prefer you can activate `autoFetch`. This way associations are automatically fetched when you get or find instances of a model.
+If you prefer you can activate `autoFetch`.
+This way associations are automatically fetched when you get or find instances of a model.
 
 ```js
 var Person = db.define('person', {
-	name : String
+  name : String
 });
 Person.hasMany("friends", {
     rate : Number
@@ -794,7 +825,7 @@ You can also define this option globally instead of a per association basis.
 
 ```js
 var Person = db.define('person', {
-	name : String
+    name : String
 }, {
     autoFetch : true
 });
@@ -809,39 +840,38 @@ Confusing? Look at the next example.
 
 ```js
 var Pet = db.define('pet', {
-	name : String
+    name : String
 });
 var Person = db.define('person', {
-	name : String
+    name : String
 });
 Pet.hasOne("owner", Person, {
-	reverse : "pets"
+    reverse : "pets"
 });
 
 Person(4).getPets(function (err, pets) {
-	// although the association was made on Pet,
-	// Person will have an accessor (getPets)
-	//
-	// In this example, ORM will fetch all pets
-	// whose owner_id = 4
+    // although the association was made on Pet,
+    // Person will have an accessor (getPets)
+    //
+    // In this example, ORM will fetch all pets
+    // whose owner_id = 4
 });
 ```
 
-This makes even more sense when having `hasMany` associations since you can manage the Many-to-Many associations
-from both sides.
-
+This makes even more sense when having `hasMany` associations since you can manage the *many to many*
+associations from both sides.
 
 ```js
 var Pet = db.define('pet', {
-	name : String
+    name : String
 });
 var Person = db.define('person', {
-	name : String
+    name : String
 });
 Person.hasMany("pets", Pet, {
     bought  : Date
 }, {
-	reverse : "owners"
+    reverse : "owners"
 });
 
 Person(1).getPets(...);

From ea3e93d894b89855114a7cb653c1c25510dc1631 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 22 May 2013 22:32:29 +1100
Subject: [PATCH 0399/1246] Bring back tabs

It seems github converts tabs to 4 spaces when rendering markdown.
My previous commit reduced tabs to two spaces. Anyways, tabs are back.
---
 Readme.md | 230 +++++++++++++++++++++++++++---------------------------
 1 file changed, 115 insertions(+), 115 deletions(-)

diff --git a/Readme.md b/Readme.md
index bb931373..75489a42 100644
--- a/Readme.md
+++ b/Readme.md
@@ -35,36 +35,36 @@ var orm = require("orm");
 orm.connect("mysql://username:password@host/database", function (err, db) {
   if (err) throw err;
 
-  var Person = db.define("person", {
-    name      : String,
-    surname   : String,
-    age       : Number,
-    male      : Boolean,
-    continent : [ "Europe", "America", "Asia", "Africa", "Australia", "Antartica" ], // ENUM type
-    photo     : Buffer, // BLOB/BINARY
-    data      : Object // JSON encoded
-  }, {
-    methods: {
-      fullName: function () {
-        return this.name + ' ' + this.surname;
-      }
-    },
-    validations: {
-      age: orm.validators.rangeNumber(18, undefined, "under-age")
-    }
-  });
-
-  Person.find({ surname: "Doe" }, function (err, people) {
-    // SQL: "SELECT * FROM person WHERE surname = 'Doe'"
-
-    console.log("People found: %d", people.length);
-    console.log("First person: %s, age %d", people[0].fullName(), people[0].age);
-
-    people[0].age = 16;
-    people[0].save(function (err) {
-      // err.msg = "under-age";
-    });
-  });
+	var Person = db.define("person", {
+		name      : String,
+		surname   : String,
+		age       : Number,
+		male      : Boolean,
+		continent : [ "Europe", "America", "Asia", "Africa", "Australia", "Antartica" ], // ENUM type
+		photo     : Buffer, // BLOB/BINARY
+		data      : Object // JSON encoded
+	}, {
+		methods: {
+			fullName: function () {
+				return this.name + ' ' + this.surname;
+			}
+		},
+		validations: {
+			age: orm.validators.rangeNumber(18, undefined, "under-age")
+		}
+	});
+
+	Person.find({ surname: "Doe" }, function (err, people) {
+		// SQL: "SELECT * FROM person WHERE surname = 'Doe'"
+
+		console.log("People found: %d", people.length);
+		console.log("First person: %s, age %d", people[0].fullName(), people[0].age);
+
+		people[0].age = 16;
+		people[0].save(function (err) {
+			// err.msg = "under-age";
+		});
+	});
 });
 ```
 
@@ -78,15 +78,15 @@ var orm = require('orm');
 var app = express();
 
 app.use(orm.express("mysql://username:password@host/database", {
-  define: function (db, models) {
-    models.person = db.define("person", { ... });
-  }
+	define: function (db, models) {
+		models.person = db.define("person", { ... });
+	}
 }));
 app.listen(80);
 
 app.get("/", function (req, res) {
-  // req.models is a reference to models used above in define()
-  req.models.person.find(...);
+	// req.models is a reference to models used above in define()
+	req.models.person.find(...);
 });
 ```
 
@@ -104,11 +104,11 @@ var orm = require("orm");
 orm.settings.set("some.deep.value", 123);
 
 orm.connect("....", function (err, db) {
-  // db.settings is a snapshot of the settings at the moment
-  // of orm.connect(). changes to it don't affect orm.settings
+	// db.settings is a snapshot of the settings at the moment
+	// of orm.connect(). changes to it don't affect orm.settings
 
-  console.log(db.settings.get("some.deep.value")); // 123
-  console.log(db.settings.get("some.deep"));       // { value: 123 }
+	console.log(db.settings.get("some.deep.value")); // 123
+	console.log(db.settings.get("some.deep"));       // { value: 123 }
 });
 ```
 
@@ -130,7 +130,7 @@ You can pass in connection options either as a string:
 var orm = require("orm");
 
 orm.connect("mysql://username:password@host/database?pool=true", function (err, db) {
-  // ...
+	// ...
 });
 ```
 
@@ -152,7 +152,7 @@ var opts = {
   }
 };
 orm.connect(opts, function (err, db) {
-  // ...
+	// ...
 });
 ```
 
@@ -163,7 +163,7 @@ var orm = require("orm");
 var db  = orm.connect("mysql://username:password@host/database");
 
 db.on("connect", function (err, db) {
-  // ...
+	// ...
 });
 ```
 
@@ -179,11 +179,11 @@ Call `define` on the database connection to setup a model. The name of the table
 
 ```js
 var Person = db.define('person', {        // 'person' will be the table in the database as well as the model id
-  // properties
-  name    : String,                     // you can use native objects to define the property type
-  surname : { type: "text", size: 50 }  // or you can be specific and define aditional options
+	// properties
+	name    : String,                     // you can use native objects to define the property type
+	surname : { type: "text", size: 50 }  // or you can be specific and define aditional options
 }, {
-  // options (optional)
+	// options (optional)
 });
 ```
 
@@ -300,7 +300,7 @@ Models can create their underlying tables in the database. You may call Model.sy
 ```js
 // db.sync() can also be used
 Person.sync(function (err) {
-  !err && console.log("done!");
+	!err && console.log("done!");
 });
 ```
 
@@ -310,7 +310,7 @@ If you want to drop a Model and remove all tables you can use the `.drop()` meth
 
 ```js
 Person.drop(function (err) {
-  !err && console.log("person model no longer exists!");
+	!err && console.log("person model no longer exists!");
 });
 ```
 
@@ -323,9 +323,9 @@ by default "id" but you can change it.
 
 ```js
 var Person = db.define("person", {
-  name : String
+	name : String
 }, {
-  id   : "person_id"
+	id   : "person_id"
 });
 
 // or just do it globally..
@@ -333,7 +333,7 @@ db.settings.set("properties.primary_key", "UID");
 
 // ..and then define your Models
 var Pet = db.define("pet", {
-  name : String
+	name : String
 });
 ```
 
@@ -372,7 +372,7 @@ To get a specific element from the database use `Model.get`.
 
 ```js
 Person.get(123, function (err, person) {
-  // finds person with id = 123
+	// finds person with id = 123
 });
 ```
 
@@ -382,7 +382,7 @@ Finding one or more elements has more options, each one can be given in no speci
 
 ```js
 Person.find({ name: "John", surname: "Doe" }, 3, function (err, people) {
-  // finds people with name='John' AND surname='Doe' and returns the first 3
+	// finds people with name='John' AND surname='Doe' and returns the first 3
 });
 ```
 
@@ -390,11 +390,11 @@ If you need to sort the results because you're limiting or just because you want
 
 ```js
 Person.find({ surname: "Doe" }, "name", function (err, people) {
-  // finds people with surname='Doe' and returns sorted by name ascending
+	// finds people with surname='Doe' and returns sorted by name ascending
 });
 Person.find({ surname: "Doe" }, [ "name", "Z" ], function (err, people) {
-  // finds people with surname='Doe' and returns sorted by name descending
-  // ('Z' means DESC; 'A' means ASC - default)
+	// finds people with surname='Doe' and returns sorted by name descending
+	// ('Z' means DESC; 'A' means ASC - default)
 });
 ```
 
@@ -402,7 +402,7 @@ There are more options that you can pass to find something. These options are pa
 
 ```js
 Person.find({ surname: "Doe" }, { offset: 2 }, function (err, people) {
-  // finds people with surname='Doe', skips the first 2 and returns the others
+	// finds people with surname='Doe', skips the first 2 and returns the others
 });
 ```
 
@@ -413,7 +413,7 @@ of them and counting. This will actually tell the database server to do a count
 
 ```js
 Person.count({ surname: "Doe" }, function (err, count) {
-  console.log("We have %d Does in our db", count);
+	console.log("We have %d Does in our db", count);
 });
 ```
 
@@ -423,7 +423,7 @@ Similar to `.count()`, this method just checks if the count is greater than zero
 
 ```js
 Person.exists({ surname: "Doe" }, function (err, exists) {
-  console.log("We %s Does in our db", exists ? "have" : "don't have");
+	console.log("We %s Does in our db", exists ? "have" : "don't have");
 });
 ```
 
@@ -434,7 +434,7 @@ illustrate:
 
 ```js
 Person.aggregate({ surname: "Doe" }).min("age").max("age").get(function (err, min, max) {
-  console.log("The youngest Doe guy has %d years, while the oldest is %d", min, max);
+	console.log("The youngest Doe guy has %d years, while the oldest is %d", min, max);
 });
 ```
 Here's an example to illustrate how to use groupby:
@@ -491,17 +491,17 @@ in the end.
 
 ```js
 Person.find({ surname: "Doe" }).each(function (person) {
-  person.surname = "Dean";
+	person.surname = "Dean";
 }).save(function (err) {
-  // done!
+	// done!
 });
 
 Person.find({ surname: "Doe" }).each().filter(function (person) {
-  return person.age >= 18;
+	return person.age >= 18;
 }).sort(function (person1, person2) {
-  return person1.age < person2.age;
+	return person1.age < person2.age;
 }).get(function (people) {
-  // get all people with at least 18 years, sorted by age
+	// get all people with at least 18 years, sorted by age
 });
 ```
 
@@ -550,9 +550,9 @@ defining the Model.
 
 ```js
 var Person = db.define('person', {
-  name    : String
+	name    : String
 }, {
-  cache   : false
+	cache   : false
 });
 ```
 and also globally:
@@ -576,21 +576,21 @@ To insert new elements to the database use `Model.create`.
 
 ```js
 Person.create([
-  {
-    name: "John",
-    surname: "Doe",
-    age: 25,
-    male: true
-  },
-  {
-    name: "Liza",
-    surname: "Kollan",
-    age: 19,
-    male: false
-  }
+	{
+		name: "John",
+		surname: "Doe",
+		age: 25,
+		male: true
+	},
+	{
+		name: "Liza",
+		surname: "Kollan",
+		age: 19,
+		male: false
+	}
 ], function (err, items) {
-  // err - description of the error or null
-  // items - array of inserted items
+	// err - description of the error or null
+	// items - array of inserted items
 });
 ```
 
@@ -601,11 +601,11 @@ use to change each item.
 
 ```js
 Person.get(1, function (err, John) {
-  John.name = "Joe";
-  John.surname = "Doe";
-  John.save(function (err) {
-    console.log("saved!");
-  });
+	John.name = "Joe";
+	John.surname = "Doe";
+	John.save(function (err) {
+		console.log("saved!");
+	});
 });
 ```
 
@@ -613,9 +613,9 @@ Updating and then saving an instance can be done in a single call:
 
 ```js
 Person.get(1, function (err, John) {
-  John.save({ name: "Joe", surname: "Doe" }, function (err) {
-    console.log("saved!");
-  });
+	John.save({ name: "Joe", surname: "Doe" }, function (err) {
+		console.log("saved!");
+	});
 });
 ```
 
@@ -624,9 +624,9 @@ If you want to remove an instance, just do:
 ```js
 // you could do this without even fetching it, look at Chaining section above
 Person.get(1, function (err, John) {
-  John.remove(function (err) {
-    console.log("removed!");
-  });
+	John.remove(function (err) {
+		console.log("removed!");
+	});
 });
 ```
 
@@ -637,13 +637,13 @@ You can also use the predefined validations or create your own.
 
 ```js
 var Person = db.define("person", {
-  name : String,
-  age  : Number
+	name : String,
+	age  : Number
 }, {
-  validations : {
-    name : orm.validators.rangeLength(1, undefined, "missing"), // "missing" is a name given to this validation, instead of default
-    age  : [ orm.validators.rangeNumber(0, 10), orm.validators.insideList([ 1, 3, 5, 7, 9 ]) ]
-  }
+	validations : {
+		name : orm.validators.rangeLength(1, undefined, "missing"), // "missing" is a name given to this validation, instead of default
+		age  : [ orm.validators.rangeNumber(0, 10), orm.validators.insideList([ 1, 3, 5, 7, 9 ]) ]
+	}
 });
 ```
 
@@ -656,11 +656,11 @@ name and validation error description. This description should help you identify
 
 ```js
 var John = new Person({
-  name : "",
-  age : 20
+	name : "",
+	age : 20
 });
 John.save(function (err) {
-  // err.field = "name" , err.value = "" , err.msg = "missing"
+	// err.field = "name" , err.value = "" , err.msg = "missing"
 });
 ```
 
@@ -673,20 +673,20 @@ var orm = require("orm");
 orm.settings.set("instance.returnAllErrors", true); // global or..
 
 orm.connect("....", function (err, db) {
-  db.settings.set("instance.returnAllErrors", true); // .. local
-
-  // ...
-
-  var John = new Person({
-    name : "",
-    age : 15
-  });
-  John.save(function (err) {
-    assert(Array.isArray(err));
-    // err[0].field = "name" , err[0].value = "" , err[0].msg = "missing"
-    // err[1].field = "age"  , err[1].value = 15 , err[1].msg = "out-of-range-number"
-    // err[2].field = "age"  , err[2].value = 15 , err[2].msg = "outside-list"
-  });
+	db.settings.set("instance.returnAllErrors", true); // .. local
+
+	// ...
+
+	var John = new Person({
+		name : "",
+		age : 15
+	});
+	John.save(function (err) {
+		assert(Array.isArray(err));
+		// err[0].field = "name" , err[0].value = "" , err[0].msg = "missing"
+		// err[1].field = "age"  , err[1].value = 15 , err[1].msg = "out-of-range-number"
+		// err[2].field = "age"  , err[2].value = 15 , err[2].msg = "outside-list"
+	});
 });
 ```
 

From a5b0b2c08dd392026ccaafe82d012ca80daa1f76 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 24 May 2013 18:58:55 +0100
Subject: [PATCH 0400/1246] Adds AggregateFunctions.limit() and changes Readme
 to avoid confusion (#172)

---
 Readme.md                                | 19 +++++++++++------
 lib/AggregateFunctions.js                | 11 ++++++++++
 test/integration/test-aggregate-limit.js | 27 ++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 7 deletions(-)
 create mode 100644 test/integration/test-aggregate-limit.js

diff --git a/Readme.md b/Readme.md
index 75489a42..8b5c9165 100644
--- a/Readme.md
+++ b/Readme.md
@@ -437,7 +437,11 @@ Person.aggregate({ surname: "Doe" }).min("age").max("age").get(function (err, mi
 	console.log("The youngest Doe guy has %d years, while the oldest is %d", min, max);
 });
 ```
-Here's an example to illustrate how to use groupby:
+
+An `Array` of properties can be passed to select only a few properties. An `Object` is also accepted to define conditions.
+
+Here's an example to illustrate how to use `.groupBy()`:
+
 ```js
 //The same as "select avg(weight), age from person where country='someCountry' group by age;"
 Person.aggregate(["age"], { country: "someCountry" }).avg("weight").groupBy("age").get(function (err, stats) {
@@ -445,7 +449,12 @@ Person.aggregate(["age"], { country: "someCountry" }).avg("weight").groupBy("age
 });
 ```
 
-Possible aggregating functions:
+### Base `.aggregate()` methods
+
+- `.limit()`: you can pass a number as a limit, or two numbers as offset and limit respectively
+- `.order()`: same as `Model.find().order()`
+
+### Additional `.aggregate()` methods
 
 - `min`
 - `max`
@@ -453,11 +462,7 @@ Possible aggregating functions:
 - `sum`
 - `count` (there's a shortcut to this - `Model.count`)
 
-### Available options
-
-- `offset`: discards the first `N` elements
-- `limit`: although it can be passed as a direct argument, you can use it here if you prefer
-- `only`: if you don't want all properties, you can give an array with the list of properties you want
+There are more aggregate functions depending on the driver (Math functions for example).
 
 #### Chaining
 
diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index d022b414..90ef336a 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -35,6 +35,14 @@ function AggregateFunctions(opts) {
 			group_by = Array.prototype.slice.apply(arguments);
 			return this;
 		},
+		limit: function (offset, limit) {
+			if (typeof limit == "number") {
+				opts.limit = [ offset, limit ];
+			} else {
+				opts.limit = [ 0, offset ]; // offset = limit
+			}
+			return this;
+		},
 		order: function (property, order) {
 			opts.order = [ property, order ];
 			return this;
@@ -87,6 +95,9 @@ function AggregateFunctions(opts) {
 			if (opts.order) {
 				query.order.apply(query, opts.order);
 			}
+			if (opts.limit) {
+				query.offset(opts.limit[0]).limit(opts.limit[1]);
+			}
 
 			opts.driver.execQuery(query.build(), function (err, data) {
 				if (err) {
diff --git a/test/integration/test-aggregate-limit.js b/test/integration/test-aggregate-limit.js
new file mode 100644
index 00000000..7ac6bd7b
--- /dev/null
+++ b/test/integration/test-aggregate-limit.js
@@ -0,0 +1,27 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_aggregate_limit', db.driver.db, function () {
+		common.insertModelData('test_aggregate_limit', db.driver.db, [
+			{ id : 1, name : 'test1' },
+			{ id : 2, name : 'test1' },
+			{ id : 3, name : 'test2' },
+			{ id : 4, name : 'test2' },
+			{ id : 5, name : 'test2' },
+			{ id : 6, name : 'test3' },
+			{ id : 7, name : 'test3' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_aggregate_limit', common.getModelProperties());
+
+			TestModel.aggregate().distinct('name').limit(1).get(function (err, names) {
+				assert.equal(err, null);
+				assert.equal(Array.isArray(names), true);
+				assert.equal(names.length, 1);
+				db.close();
+			});
+		});
+	});
+});

From 2176230c877109870c031e0494be6a388169eeab Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 24 May 2013 19:11:43 +0100
Subject: [PATCH 0401/1246] Passes driver name (mysql, pg, ..) to ORM and Model
 constructor

---
 lib/ORM.js | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index 2ffc6e32..38f1ab01 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -37,7 +37,7 @@ exports.use = function (connection, proto, opts, cb) {
 			debug: (opts.query && opts.query.debug == 'true')
 		});
 
-		return cb(null, new ORM(driver, new Settings.Container(exports.settings.get('*'))));
+		return cb(null, new ORM(proto, driver, new Settings.Container(exports.settings.get('*'))));
 	} catch (ex) {
 		return cb(ex);
 	}
@@ -91,7 +91,7 @@ exports.connect = function (opts, cb) {
 			pool  : pool
 		});
 
-		db = new ORM(driver, new Settings.Container(exports.settings.get('*')));
+		db = new ORM(proto, driver, new Settings.Container(exports.settings.get('*')));
 
 		driver.connect(function (err) {
 			if (typeof cb == "function") {
@@ -114,14 +114,15 @@ exports.connect = function (opts, cb) {
 	return db;
 };
 
-function ORM(driver, settings) {
-	this.validators = Validators;
-	this.settings   = settings;
-	this.driver     = driver;
-	this.driver.uid = hat();
-	this.tools      = {};
-	this.models     = {};
-	this.plugins    = [];
+function ORM(driver_name, driver, settings) {
+	this.validators  = Validators;
+	this.settings    = settings;
+	this.driver_name = driver_name;
+	this.driver      = driver;
+	this.driver.uid  = hat();
+	this.tools       = {};
+	this.models      = {};
+	this.plugins     = [];
 
 	for (var k in Query.Comparators) {
 		this.tools[Query.Comparators[k]] = Query[Query.Comparators[k]];
@@ -179,6 +180,7 @@ ORM.prototype.define = function (name, properties, opts) {
 
 	this.models[name] = new Model({
 		settings       : this.settings,
+		driver_name    : this.driver_name,
 		driver         : this.driver,
 		table          : opts.table || opts.collection || name,
 		properties     : properties,

From 26adad335b9d7f542046c2fe8dd3e2111db5b646 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 24 May 2013 19:12:06 +0100
Subject: [PATCH 0402/1246] Passes driver name (mysql, pg, ..) to
 AggregateFunctions constructor

---
 lib/Model.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/Model.js b/lib/Model.js
index 5110667c..a45feabd 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -366,10 +366,11 @@ function Model(opts) {
 		}
 
 		return new require("./AggregateFunctions")({
-			table      : opts.table,
-			driver     : opts.driver,
-			conditions : conditions,
-			properties : properties
+			table       : opts.table,
+			driver_name : opts.driver_name,
+			driver      : opts.driver,
+			conditions  : conditions,
+			properties  : properties
 		});
 	};
 

From 380292c4ab16769db64924f0f416c9544367529a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 24 May 2013 19:13:26 +0100
Subject: [PATCH 0403/1246] Checks for driver debug flag and prints debug line
 in AggregateFunctions (#171)

---
 lib/AggregateFunctions.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index 90ef336a..1896aa73 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -99,6 +99,10 @@ function AggregateFunctions(opts) {
 				query.offset(opts.limit[0]).limit(opts.limit[1]);
 			}
 
+			if (opts.driver.opts && opts.driver.opts.debug) {
+				require(".Debug").sql(opts.driver_name, query.build());
+			}
+
 			opts.driver.execQuery(query.build(), function (err, data) {
 				if (err) {
 					return cb(err);

From 26aae34274242c1ca7fe9e0a6228e3ea35d9afda Mon Sep 17 00:00:00 2001
From: Joseph GIlley <joe.gilley@gmail.com>
Date: Sat, 25 May 2013 16:07:22 -0400
Subject: [PATCH 0404/1246] Changed sqlite3 from v 2.1.5 to 2.1.7 to
 successfully compile

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 54b1b6f0..3ab73440 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "urun"      : "0.0.6",
     "mysql"     : "2.0.0-alpha7",
     "pg"        : "1.0.0",
-    "sqlite3"   : "2.1.5",
+    "sqlite3"   : "2.1.*",
     "async"     : "*"
   },
   "optionalDependencies": {}

From 85d8f43f5805df553adaeb09eafe2fc1673bb3a9 Mon Sep 17 00:00:00 2001
From: Joseph GIlley <joe.gilley@gmail.com>
Date: Sat, 25 May 2013 16:13:04 -0400
Subject: [PATCH 0405/1246] Actually 2.1.7 instead of 2.1.x

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3ab73440..1f20775c 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "urun"      : "0.0.6",
     "mysql"     : "2.0.0-alpha7",
     "pg"        : "1.0.0",
-    "sqlite3"   : "2.1.*",
+    "sqlite3"   : "2.1.7",
     "async"     : "*"
   },
   "optionalDependencies": {}

From 22a8d567fc4ead3e5e29819cd6f55008f8c96a51 Mon Sep 17 00:00:00 2001
From: Joseph GIlley <joe.gilley@gmail.com>
Date: Sat, 25 May 2013 16:15:40 -0400
Subject: [PATCH 0406/1246] Added Hook 'beforeValidation' prior to _all_
 validations

`beforeValidation` will now be called before the `required` check and before `beforeCreate` and `beforeSave`.  Also the Readme.md file was updated to reflect this addition.
---
 Readme.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 8b5c9165..3da33ef4 100644
--- a/Readme.md
+++ b/Readme.md
@@ -359,8 +359,9 @@ Currently the following events are supported:
 - `afterSave` : (bool success) Right after saving;
 - `beforeCreate` : (no parameters) Right before trying to save a new instance;
 - `afterCreate` : (bool success) Right after saving a new instance;
-- `beforeRemove` : (no parameters) Right before trying to remove an instance.
+- `beforeRemove` : (no parameters) Right before trying to remove an instance;
 - `afterRemove` : (bool success) Right after removing an instance;
+- `beforeValidation` : (no parameters) Before all validations and prior to `beforeCreate` and `beforeSave`;
 
 All hook function are called with `this` as the instance so you can access anything you want related to it.
 

From 74f4c4fae371b78f2ad732fa87109c2c9898fa95 Mon Sep 17 00:00:00 2001
From: Joseph GIlley <joe.gilley@gmail.com>
Date: Sat, 25 May 2013 16:15:40 -0400
Subject: [PATCH 0407/1246] Added Hook 'beforeValidation' prior to _all_
 validations

`beforeValidation` will now be called before the `required` check and before `beforeCreate` and `beforeSave`.  Also the Readme.md file was updated to reflect this addition.
---
 lib/Instance.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Instance.js b/lib/Instance.js
index 8c50a532..f5e0d23d 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -70,6 +70,8 @@ function Instance(opts) {
 			return saveInstanceExtra(cb);
 		}
 
+		Hook.trigger(instance, opts.hooks.beforeValidation);
+
 		for (var k in opts.properties) {
 			if (!opts.properties.hasOwnProperty(k)) continue;
 			if (opts.data[k] == null && opts.properties[k].hasOwnProperty("defaultValue")) {

From 542863c53351d331835e36b2fd7d2ceacf187330 Mon Sep 17 00:00:00 2001
From: Joseph GIlley <joe.gilley@gmail.com>
Date: Sun, 26 May 2013 14:18:17 -0400
Subject: [PATCH 0408/1246] Fixed a bug when calling save() on an Instance

Previously, if you called save() on an Instance without passing a callback argument **and** made no changes to the extra variables in that Instance, in the saveInstanceExtra function it assumed the presence of a callback and would throw an error.
---
 lib/Instance.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index f5e0d23d..71bb7737 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -163,7 +163,8 @@ function Instance(opts) {
 	};
 	var saveInstanceExtra = function (cb) {
 		if (opts.extrachanges.length === 0) {
-			return cb(null, instance);
+			if (cb) return cb(null, instance);
+			else return;
 		}
 
 		var data = {};

From 6c3e2e39b2cd2c1fb9deafcf7c2b47fcc3f03fb7 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 27 May 2013 19:09:13 +0100
Subject: [PATCH 0409/1246] Adds test for beforeValidation hook

---
 .../test-hook-before-validation.js            | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 test/integration/test-hook-before-validation.js

diff --git a/test/integration/test-hook-before-validation.js b/test/integration/test-hook-before-validation.js
new file mode 100644
index 00000000..9b577a68
--- /dev/null
+++ b/test/integration/test-hook-before-validation.js
@@ -0,0 +1,24 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_hook_before_validation', db.driver.db, function () {
+		var beforeValidation = false;
+		var TestModel = db.define('test_hook_before_validation', common.getModelProperties(), {
+			hooks: {
+				beforeValidation: function () {
+					beforeValidation = true;
+				}
+			}
+		});
+
+		var Test = new TestModel({ name: "beforeValidation" });
+		Test.save(function (err) {
+			assert.equal(err, null);
+
+			db.close(function () {
+				assert.equal(beforeValidation, true);
+			});
+		});
+	});
+});

From 3dddc5c82727ed1275cda8a9f904379e154e25db Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 27 May 2013 23:07:11 +0100
Subject: [PATCH 0410/1246] sql-query@0.0.23

Fixes postgres Date escaping
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1f20775c..751cefb5 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
   },
   "analyse"     : false,
   "dependencies": {
-    "sql-query"      : "0.0.22",
+    "sql-query"      : "0.0.23",
     "hat"            : "0.0.3"
   },
   "devDependencies": {

From 27b1e03b50c833848591d27cde748bb4e36d1902 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 28 May 2013 10:55:13 +0100
Subject: [PATCH 0411/1246] Updates Readme driver dependency versions

---
 Readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Readme.md b/Readme.md
index 3da33ef4..a75222b0 100644
--- a/Readme.md
+++ b/Readme.md
@@ -119,8 +119,8 @@ First, add the correct driver to your `package.json`:
  driver                | dependency
 :----------------------|:---------------------------
  mysql                 | `"mysql" : "2.0.0-alpha7"`
- postgres<br/>redshift | `"pg": "~1.0.0",`
- sqlite                | `"sqlite3" : "2.1.5"`
+ postgres<br/>redshift | `"pg": "~1.0.0"`
+ sqlite                | `"sqlite3" : "2.1.7"`
 
 ### Options
 

From 47e5084d584e519517a46ee6550a0e39775ddc14 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 28 May 2013 16:21:35 +0100
Subject: [PATCH 0412/1246] Avoids JSON parsing values when they are already
 objects (and not string buffers) (#168)

---
 lib/Drivers/DML/mysql.js    | 3 +++
 lib/Drivers/DML/postgres.js | 3 +++
 lib/Drivers/DML/sqlite.js   | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 0667fe2b..974a0bb3 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -225,6 +225,9 @@ Driver.prototype.valueToProperty = function (value, property) {
 		case "boolean":
 			return !!value;
 		case "object":
+			if (typeof value == "object" && !Buffer.isBuffer(value)) {
+				return value;
+			}
 			try {
 				return JSON.parse(value);
 			} catch (e) {
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 1f512379..23221a66 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -250,6 +250,9 @@ Driver.prototype.clear = function (table, cb) {
 Driver.prototype.valueToProperty = function (value, property) {
 	switch (property.type) {
 		case "object":
+			if (typeof value == "object" && !Buffer.isBuffer(value)) {
+				return value;
+			}
 			try {
 				return JSON.parse(value);
 			} catch (e) {
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 21de515d..93456d27 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -198,6 +198,9 @@ Driver.prototype.valueToProperty = function (value, property) {
 		case "boolean":
 			return !!value;
 		case "object":
+			if (typeof value == "object" && !Buffer.isBuffer(value)) {
+				return value;
+			}
 			try {
 				return JSON.parse(value);
 			} catch (e) {

From c043d80842e935019e9d16e3013849937ca77210 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 28 May 2013 22:04:56 +0100
Subject: [PATCH 0413/1246] Adds Hooks.wait to later on use it for async hooks
 (#167)

For now, the only hook that accepts async is beforeRemove. This is an
implementation test and will propagate to others if it fits.
---
 lib/Hook.js                                   | 19 +++++++++++
 lib/Instance.js                               | 28 ++++++++++-----
 .../test-hook-before-remove-wait.js           | 34 +++++++++++++++++++
 3 files changed, 72 insertions(+), 9 deletions(-)
 create mode 100644 test/integration/test-hook-before-remove-wait.js

diff --git a/lib/Hook.js b/lib/Hook.js
index 71eb030f..17e49075 100644
--- a/lib/Hook.js
+++ b/lib/Hook.js
@@ -7,3 +7,22 @@ exports.trigger = function () {
 		cb.apply(self, args);
 	}
 };
+
+exports.wait = function () {
+	var args = Array.prototype.slice.apply(arguments);
+	var self = args.shift();
+	var cb   = args.shift();
+	var next = args.shift();
+
+	args.push(next);
+
+	if (typeof cb == "function") {
+		cb.apply(self, args);
+
+		if (cb.length < args.length) {
+			return next();
+		}
+	} else {
+		return next();
+	}
+};
diff --git a/lib/Instance.js b/lib/Instance.js
index 71bb7737..2ed86214 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -191,18 +191,28 @@ function Instance(opts) {
 			conditions[opts.keys[i]] = opts.data[opts.keys[i]];
 		}
 
-		emitEvent("beforeRemove", instance);
-		Hook.trigger(instance, opts.hooks.beforeRemove);
+		Hook.wait(instance, opts.hooks.beforeRemove, function (err) {
+			if (err) {
+				emitEvent("remove", err, instance);
+				if (typeof cb == "function") {
+					cb(err, instance);
+				}
+				return;
+			}
 
-		opts.driver.remove(opts.table, conditions, function (err, data) {
-			emitEvent("remove", err, instance);
-			Hook.trigger(instance, opts.hooks.afterRemove, !err);
+			emitEvent("beforeRemove", instance);
 
-			if (typeof cb == "function") {
-				cb(err, instance);
-			}
+			opts.driver.remove(opts.table, conditions, function (err, data) {
+				Hook.trigger(instance, opts.hooks.afterRemove, !err);
+
+				emitEvent("remove", err, instance);
+
+				if (typeof cb == "function") {
+					cb(err, instance);
+				}
 
-			instance = undefined;
+				instance = undefined;
+			});
 		});
 	};
 	var saveInstanceProperty = function (key, value) {
diff --git a/test/integration/test-hook-before-remove-wait.js b/test/integration/test-hook-before-remove-wait.js
new file mode 100644
index 00000000..2c874208
--- /dev/null
+++ b/test/integration/test-hook-before-remove-wait.js
@@ -0,0 +1,34 @@
+var common     = require('../common');
+var assert     = require('assert');
+var util       = require('util');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_hook_before_remove_halt', db.driver.db, function () {
+		common.insertModelData('test_hook_before_remove_halt', db.driver.db, [
+			{ id : 1, name : 'test' }
+		], function (err) {
+			var beforeRemove = false;
+			var TestModel = db.define('test_hook_before_remove_halt', common.getModelProperties(), {
+				hooks: {
+					beforeRemove: function (next) {
+						beforeRemove = true;
+						setTimeout(function () {
+							return next(new Error("Remove denied"));
+						}, 1000);
+					}
+				}
+			});
+
+			TestModel.get(1, function (err, Instance) {
+				assert.equal(err, null);
+				Instance.remove(function (err) {
+					assert.equal(beforeRemove, true);
+					assert.equal(util.isError(err), true);
+					assert.equal(err.message, "Remove denied");
+
+					db.close();
+				});
+			});
+		});
+	});
+});

From e70cdc58a29fb54c86f70fa9b153ce030581108c Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 28 May 2013 23:43:44 +0100
Subject: [PATCH 0414/1246] Changes beforeCreate, beforeSave and
 beforeValidation to use Hooks.wait() (#167)

---
 lib/Instance.js                               | 86 +++++++++++++------
 .../test-hook-before-create-wait.js           | 28 ++++++
 .../integration/test-hook-before-save-wait.js | 28 ++++++
 .../test-hook-before-validation-wait.js       | 28 ++++++
 4 files changed, 144 insertions(+), 26 deletions(-)
 create mode 100644 test/integration/test-hook-before-create-wait.js
 create mode 100644 test/integration/test-hook-before-save-wait.js
 create mode 100644 test/integration/test-hook-before-validation-wait.js

diff --git a/lib/Instance.js b/lib/Instance.js
index 2ed86214..ef049d38 100644
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -70,30 +70,58 @@ function Instance(opts) {
 			return saveInstanceExtra(cb);
 		}
 
-		Hook.trigger(instance, opts.hooks.beforeValidation);
+		var saveError = function (err) {
+			emitEvent("save", err, instance);
+			Hook.trigger(instance, opts.hooks.afterSave, false);
+			if (typeof cb == "function") {
+				cb(err, instance);
+			}
+		};
 
-		for (var k in opts.properties) {
-			if (!opts.properties.hasOwnProperty(k)) continue;
-			if (opts.data[k] == null && opts.properties[k].hasOwnProperty("defaultValue")) {
-				opts.data[k] = opts.properties[k].defaultValue;
-			} else if (opts.properties[k].required && opts.data[k] == null) {
-				var err = new Error("required");
-				err.field = k;
-				err.value = opts.data[k];
+		Hook.wait(instance, opts.hooks.beforeValidation, function (err) {
+			if (err) {
+				return saveError(err);
+			}
 
-				Hook.trigger(instance, opts.hooks.afterSave, false);
-				if (typeof cb == "function") {
-					cb(err, instance);
+			for (var k in opts.properties) {
+				if (!opts.properties.hasOwnProperty(k)) continue;
+				if (opts.data[k] == null && opts.properties[k].hasOwnProperty("defaultValue")) {
+					opts.data[k] = opts.properties[k].defaultValue;
+				} else if (opts.properties[k].required && opts.data[k] == null) {
+					var requireErr = new Error("required");
+					requireErr.field = k;
+					requireErr.value = opts.data[k];
+
+					Hook.trigger(instance, opts.hooks.afterSave, false);
+					if (typeof cb == "function") {
+						cb(requireErr, instance);
+					}
+					return;
 				}
-				return;
 			}
-		}
-
-		if (opts.is_new) {
-			Hook.trigger(instance, opts.hooks.beforeCreate);
-		}
-		Hook.trigger(instance, opts.hooks.beforeSave);
 
+			if (opts.is_new) {
+				return Hook.wait(instance, opts.hooks.beforeCreate, function (err) {
+					if (err) {
+						return saveError(err);
+					}
+					Hook.wait(instance, opts.hooks.beforeSave, function (err) {
+						if (err) {
+							return saveError(err);
+						}
+						return saveInstanceNext(cb);
+					});
+				});
+			}
+			Hook.wait(instance, opts.hooks.beforeSave, function (err) {
+				if (err) {
+					return saveError(err);
+				}
+				return saveInstanceNext(cb);
+			});
+		});
+	};
+	var saveInstanceNext = function (cb) {
 		handleValidations(function (err) {
 			if (err) {
 				emitEvent("save", err, instance);
@@ -230,14 +258,20 @@ function Instance(opts) {
 			conditions[opts.keys[i]] = opts.data[opts.keys[i]];
 		}
 
-		Hook.trigger(instance, opts.hooks.beforeSave);
-
-		opts.driver.update(opts.table, changes, conditions, function (err) {
-			if (!err) {
-				opts.data[key] = value;
+		Hook.wait(instance, opts.hooks.beforeSave, function (err) {
+			if (err) {
+				Hook.trigger(instance, opts.hooks.afterSave, false);
+				emitEvent("save", err, instance);
+				return;
 			}
-			Hook.trigger(instance, opts.hooks.afterSave, !err);
-			emitEvent("save", err, instance);
+
+			opts.driver.update(opts.table, changes, conditions, function (err) {
+				if (!err) {
+					opts.data[key] = value;
+				}
+				Hook.trigger(instance, opts.hooks.afterSave, !err);
+				emitEvent("save", err, instance);
+			});
 		});
 	};
 	var addInstanceProperty = function (key) {
diff --git a/test/integration/test-hook-before-create-wait.js b/test/integration/test-hook-before-create-wait.js
new file mode 100644
index 00000000..542d7eca
--- /dev/null
+++ b/test/integration/test-hook-before-create-wait.js
@@ -0,0 +1,28 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_hook_before_create_wait', db.driver.db, function () {
+		var beforeCreate = false;
+		var TestModel = db.define('test_hook_before_create_wait', common.getModelProperties(), {
+			hooks: {
+				beforeCreate: function (next) {
+					return setTimeout(function () {
+						beforeCreate = true;
+
+						return next();
+					}, 1000);
+				}
+			}
+		});
+
+		var Test = new TestModel({ name: "beforeCreate" });
+		Test.save(function (err) {
+			assert.equal(err, null);
+
+			db.close(function () {
+				assert.equal(beforeCreate, true);
+			});
+		});
+	});
+});
diff --git a/test/integration/test-hook-before-save-wait.js b/test/integration/test-hook-before-save-wait.js
new file mode 100644
index 00000000..f21fb4dc
--- /dev/null
+++ b/test/integration/test-hook-before-save-wait.js
@@ -0,0 +1,28 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_hook_before_save_wait', db.driver.db, function () {
+		var calledBefore = false;
+		var TestModel = db.define('test_hook_before_save_wait', common.getModelProperties(), {
+			hooks: {
+				beforeSave: function (next) {
+					return setTimeout(function () {
+						calledBefore = true;
+
+						return next();
+					}, 1000);
+				}
+			}
+		});
+
+		var Test = new TestModel({ name: "beforeSave" });
+		Test.save(function (err) {
+			assert.equal(err, null);
+
+			db.close(function () {
+				assert.equal(calledBefore, true);
+			});
+		});
+	});
+});
diff --git a/test/integration/test-hook-before-validation-wait.js b/test/integration/test-hook-before-validation-wait.js
new file mode 100644
index 00000000..cb71f7f7
--- /dev/null
+++ b/test/integration/test-hook-before-validation-wait.js
@@ -0,0 +1,28 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_hook_before_validation_wait', db.driver.db, function () {
+		var beforeValidation = false;
+		var TestModel = db.define('test_hook_before_validation_wait', common.getModelProperties(), {
+			hooks: {
+				beforeValidation: function (next) {
+					beforeValidation = true;
+
+					setTimeout(function () {
+						return next(new Error("Validation failed"));
+					}, 1000);
+				}
+			}
+		});
+
+		var Test = new TestModel({ name: "beforeValidation" });
+		Test.save(function (err) {
+			assert.equal(err.message, "Validation failed");
+
+			db.close(function () {
+				assert.equal(beforeValidation, true);
+			});
+		});
+	});
+});

From da3f23c8bf0b1c8daba93db01fa1387b6c9a2e97 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 28 May 2013 23:44:07 +0100
Subject: [PATCH 0415/1246] Updates Readme to explain async before* hooks
 (#167)

---
 Readme.md | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index a75222b0..722e6539 100644
--- a/Readme.md
+++ b/Readme.md
@@ -357,7 +357,7 @@ Currently the following events are supported:
 - `afterLoad` : (no parameters) Right after loading and preparing an instance to be used;
 - `beforeSave` : (no parameters) Right before trying to save;
 - `afterSave` : (bool success) Right after saving;
-- `beforeCreate` : (no parameters) Right before trying to save a new instance;
+- `beforeCreate` : (no parameters) Right before trying to save a new instance (prior to `beforeSave`);
 - `afterCreate` : (bool success) Right after saving a new instance;
 - `beforeRemove` : (no parameters) Right before trying to remove an instance;
 - `afterRemove` : (bool success) Right after removing an instance;
@@ -365,6 +365,28 @@ Currently the following events are supported:
 
 All hook function are called with `this` as the instance so you can access anything you want related to it.
 
+For all `before*` hooks, you can add an additional parameter to the hook function. This parameter will be a function that
+must be called to tell if the hook allows the execution to continue or to break. You might be familiar with this workflow
+already from Express. Here's an example:
+
+```js
+var Person = db.define("person", {
+	name    : String,
+	surname : String
+}, {
+	hooks: {
+		beforeCreate: function (next) {
+			if (this.surname == "Doe") {
+				return next(new Error("No Does allowed"));
+			}
+			return next();
+		}
+	}
+});
+```
+
+This workflow allows you to make asynchronous work before calling `next`.
+
 ## Finding Items
 
 ### Model.get(id, [ options ], cb)

From 59cbf943fe0c52059b871ca86b8d878e4fa67153 Mon Sep 17 00:00:00 2001
From: Edward Kline <esk525@gmail.com>
Date: Tue, 14 May 2013 14:13:41 +0000
Subject: [PATCH 0416/1246] Added support for non-autoincrement key fields;
 check db driver info exists before applying it to data

---
 lib/Instance.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 lib/Instance.js

diff --git a/lib/Instance.js b/lib/Instance.js
old mode 100644
new mode 100755
index ef049d38..85dd2519
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -151,7 +151,9 @@ function Instance(opts) {
 					if (!save_err) {
 						opts.changes.length = 0;
 						for (var i = 0; i < opts.keys.length; i++) {
-							opts.data[opts.keys[i]] = info[opts.keys[i]];
+							if ( typeof info[opts.keys[i]] !== 'undefined') {
+								opts.data[opts.keys[i]] = info[opts.keys[i]];
+							}
 						}
 						opts.is_new = false;
 					}

From cdc73ae0de3a2b3021fe86e038c1430e27504231 Mon Sep 17 00:00:00 2001
From: Edward Kline <esk525@gmail.com>
Date: Tue, 14 May 2013 14:26:53 +0000
Subject: [PATCH 0417/1246] Add driver support for specifying int length via
 size or length property

---
 lib/Drivers/DDL/mysql.js    | 5 +++++
 lib/Drivers/DDL/postgres.js | 5 +++++
 2 files changed, 10 insertions(+)
 mode change 100644 => 100755 lib/Drivers/DDL/mysql.js
 mode change 100644 => 100755 lib/Drivers/DDL/postgres.js

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
old mode 100644
new mode 100755
index 335c5de0..32041c65
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -136,6 +136,11 @@ function buildColumnDefinition(driver, name, prop) {
 		case "number":
 			if (prop.rational === false) {
 				def = driver.query.escapeId(name) + " INTEGER";
+				if (typeof prop.size !== 'undefined') {
+					def += '('+ driver.query.escapeVal(prop.size) +')';
+				} else if (typeof prop.length != 'undefined') {
+					def += '('+ driver.query.escapeVal(prop.length) +')';
+				}
 			} else {
 				def = driver.query.escapeId(name) + " FLOAT";
 			}
diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
old mode 100644
new mode 100755
index 1e8f1c4b..a6ed1446
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -183,6 +183,11 @@ function buildColumnDefinition(driver, table, name, prop) {
 		case "number":
 			if (prop.rational === false) {
 				def = driver.query.escapeId(name) + " INTEGER";
+				if (typeof prop.size !== 'undefined') {
+					def += '('+ driver.query.escapeVal(prop.size) +')';
+				} else if (typeof prop.length != 'undefined') {
+					def += '('+ driver.query.escapeVal(prop.length) +')';
+				}
 			} else {
 				def = driver.query.escapeId(name) + " REAL";
 			}

From 4582433a8c9b6a953881fb16877e94fd32a51614 Mon Sep 17 00:00:00 2001
From: Edward Kline <esk525@gmail.com>
Date: Tue, 14 May 2013 15:14:07 +0000
Subject: [PATCH 0418/1246] Updated Model Options

---
 Readme.md | 2 ++
 1 file changed, 2 insertions(+)
 mode change 100644 => 100755 Readme.md

diff --git a/Readme.md b/Readme.md
old mode 100644
new mode 100755
index 722e6539..243b8b31
--- a/Readme.md
+++ b/Readme.md
@@ -210,6 +210,8 @@ var Person = db.define('person', {        // 'person' will be the table in the d
 
 ##### number
 * `rational`: true (default) creates a FLOAT/REAL, false an INTEGER
+* `size` or `length`: length property for INTEGER
+* `unsigned`: true to make INTEGER unsigned, default is false
 
 ##### date
 * `time`: true (default) creates a DATETIME/TIMESTAMP, false a DATE

From 9c63b063079f30737e599c57c2a1078bde2d9605 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 21 May 2013 20:36:31 +1000
Subject: [PATCH 0419/1246] Report postgres createTable errors

---
 lib/Drivers/DDL/postgres.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index a6ed1446..5a92af4d 100755
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -145,7 +145,7 @@ function createTableSchema(driver, table, cb) {
 	var createTable = function () {
 		driver.execQuery(table.query, function (err) {
 			if (err || table.subqueries.length === 0) {
-				return cb();
+				return cb(err);
 			}
 
 			var pending = table.subqueries.length;

From fcd28dd95b27def7c740d2986d73b6fe5009826c Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 21 May 2013 22:10:04 +1000
Subject: [PATCH 0420/1246] Support specifying size of number columns

---
 lib/Drivers/DDL/mysql.js    | 14 +++++++-------
 lib/Drivers/DDL/postgres.js | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index 32041c65..6a3a8d08 100755
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -126,6 +126,11 @@ exports.sync = function (driver, opts, cb) {
 	}
 };
 
+var colTypes = {
+	integer:  { 2: 'SMALLINT', 4: 'INTEGER', 8: 'BIGINT' },
+	floating: {                4: 'FLOAT',   8: 'DOUBLE' }
+};
+
 function buildColumnDefinition(driver, name, prop) {
 	var def;
 
@@ -135,14 +140,9 @@ function buildColumnDefinition(driver, name, prop) {
 			break;
 		case "number":
 			if (prop.rational === false) {
-				def = driver.query.escapeId(name) + " INTEGER";
-				if (typeof prop.size !== 'undefined') {
-					def += '('+ driver.query.escapeVal(prop.size) +')';
-				} else if (typeof prop.length != 'undefined') {
-					def += '('+ driver.query.escapeVal(prop.length) +')';
-				}
+				def = driver.query.escapeId(name) + " " + colTypes.integer[prop.size || 4];
 			} else {
-				def = driver.query.escapeId(name) + " FLOAT";
+				def = driver.query.escapeId(name) + " " + colTypes.floating[prop.size || 4];
 			}
 			if (prop.unsigned === true) {
 				def += " UNSIGNED";
diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index 5a92af4d..8b8ba947 100755
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -173,6 +173,11 @@ function createTableSchema(driver, table, cb) {
 	}
 }
 
+var colTypes = {
+	integer:  { 2: 'SMALLINT', 4: 'INTEGER', 8: 'BIGINT' },
+	floating: {                4: 'REAL',    8: 'DOUBLE' }
+};
+
 function buildColumnDefinition(driver, table, name, prop) {
 	var def;
 
@@ -182,14 +187,9 @@ function buildColumnDefinition(driver, table, name, prop) {
 			break;
 		case "number":
 			if (prop.rational === false) {
-				def = driver.query.escapeId(name) + " INTEGER";
-				if (typeof prop.size !== 'undefined') {
-					def += '('+ driver.query.escapeVal(prop.size) +')';
-				} else if (typeof prop.length != 'undefined') {
-					def += '('+ driver.query.escapeVal(prop.length) +')';
-				}
+				def = driver.query.escapeId(name) + " " + colTypes.integer[prop.size || 4];
 			} else {
-				def = driver.query.escapeId(name) + " REAL";
+				def = driver.query.escapeId(name) + " " + colTypes.floating[prop.size || 4];
 			}
 			break;
 		case "boolean":

From e26a6f02fc889571447f1b07a5bf9e9b0767b200 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 21 May 2013 22:10:24 +1000
Subject: [PATCH 0421/1246] SQLite does not support unsigned

---
 lib/Drivers/DDL/sqlite.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index d89a721a..9af033c7 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -137,9 +137,6 @@ function buildColumnDefinition(driver, name, prop) {
 			} else {
 				def = driver.query.escapeId(name) + " REAL";
 			}
-			if (prop.unsigned === true) {
-				def += " UNSIGNED";
-			}
 			break;
 		case "boolean":
 			def = driver.query.escapeId(name) + " INTEGER UNSIGNED";

From fefddda7b2cd2fcc0c5664b460a8a177456bcc59 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 21 May 2013 22:14:30 +1000
Subject: [PATCH 0422/1246] Update readme

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 243b8b31..b118aa9f 100755
--- a/Readme.md
+++ b/Readme.md
@@ -210,7 +210,7 @@ var Person = db.define('person', {        // 'person' will be the table in the d
 
 ##### number
 * `rational`: true (default) creates a FLOAT/REAL, false an INTEGER
-* `size` or `length`: length property for INTEGER
+* `size`: byte size of number, default is 4. Note that 8 byte numbers [have limitations](http://stackoverflow.com/questions/307179/what-is-javascripts-max-int-whats-the-highest-integer-value-a-number-can-go-t)
 * `unsigned`: true to make INTEGER unsigned, default is false
 
 ##### date

From 19b5daa47f4b5e57deff1979f539092a1cca03b3 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 23 May 2013 22:54:21 +1000
Subject: [PATCH 0423/1246] Add tests for number size param

---
 lib/Drivers/DDL/postgres.js          |   2 +-
 test/integration/test-number-size.js | 117 +++++++++++++++++++++++++++
 2 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 test/integration/test-number-size.js

diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index 8b8ba947..4078ee17 100755
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -175,7 +175,7 @@ function createTableSchema(driver, table, cb) {
 
 var colTypes = {
 	integer:  { 2: 'SMALLINT', 4: 'INTEGER', 8: 'BIGINT' },
-	floating: {                4: 'REAL',    8: 'DOUBLE' }
+	floating: {                4: 'REAL',    8: 'DOUBLE PRECISION' }
 };
 
 function buildColumnDefinition(driver, table, name, prop) {
diff --git a/test/integration/test-number-size.js b/test/integration/test-number-size.js
new file mode 100644
index 00000000..eff24e5d
--- /dev/null
+++ b/test/integration/test-number-size.js
@@ -0,0 +1,117 @@
+var common = require('../common');
+var assert = require('assert');
+var async  = require('async');
+
+
+function round(num, points) {
+  var m = Math.pow(10, points);
+
+  return Math.round(num * m) / m;
+}
+
+common.createConnection(function (err, db) {
+  if (err) throw err;
+
+  var Model = db.define('test-number-size', {
+    int2: { type: 'number', size: 2, rational: false },
+    int4: { type: 'number', size: 4, rational: false },
+    int8: { type: 'number', size: 8, rational: false },
+    float4: { type: 'number', size: 4 },
+    float8: { type: 'number', size: 8 }
+  });
+
+  var data = {
+    int2: 32700, int4: 2147483000, int8: 2251799813685248,
+    float4: 1 * Math.pow(10, 36),
+    float8: 1 * Math.pow(10, 306)
+  }
+
+  var protocol = common.protocol().toLowerCase();
+  var mysql    = protocol == 'mysql';
+  var postgres = protocol == 'postgres';
+
+  async.series([
+    function(cb) {
+      Model.drop(function (err) {
+        if (err) throw err;
+        Model.sync(function (err) {
+          if (err) throw err;
+          cb();
+        });
+      });
+    },
+    function(cb) {
+      // It should be able to store near MAX sized values for each field
+      Model.create(data, function (err, item) {
+        if (err) throw err;
+
+        Model.get(item.id, function (err, item) {
+          if (err) throw err;
+
+          // Round because different systems store floats in different
+          // ways, thereby introducing small errors.
+          assert.equal(round(item.int2   / data.int2,   3), 1);
+          assert.equal(round(item.int4   / data.int4,   3), 1);
+          assert.equal(round(item.int8   / data.int8,   3), 1);
+          assert.equal(round(item.float4 / data.float4, 3), 1);
+          assert.equal(round(item.float8 / data.float8, 3), 1);
+        });
+
+        cb();
+      });
+    },
+    function(cb) {
+      // It should not be able to store values which are too large in int2
+      Model.create({ int2: data.int4 }, function (err, item) {
+        // Postgres throws an error if it detects potential data loss,
+        // ie. if it detects an overflow.
+        // Mysql truncates the value, and acts like nothing happened.
+        if (postgres) {
+          assert(err);
+          cb();
+        } else if (mysql) {
+          Model.get(item.id, function (err, item) {
+            if (err) throw err;
+
+            assert.notEqual(item.int2, data.int4)
+            cb();
+          });
+        }
+      });
+    },
+    function(cb) {
+      // It should not be able to store values which are too large in int4
+      Model.create({ int4: data.int8 }, function (err, item) {
+        if (postgres) {
+          assert(err);
+          cb();
+        } else if (mysql) {
+          Model.get(item.id, function (err, item) {
+            if (err) throw err;
+
+            assert.notEqual(item.int4, data.int8)
+            cb();
+          });
+        }
+      });
+    },
+    function(cb) {
+      // It should not be able to store values which are too large in float4
+      Model.create({ float4: data.float8 }, function (err, item) {
+        if (postgres) {
+          assert(err);
+          cb();
+        } else if (mysql) {
+          Model.get(item.id, function (err, item) {
+            if (err) throw err;
+
+            assert.notEqual(item.float4, data.float8)
+            cb();
+          });
+        }
+      });
+    }
+  ], function () {
+    db.close();
+  });
+});

From 06d7c7fd3da8735c87a49e584afd6a38b3e03c73 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 23 May 2013 23:07:36 +1000
Subject: [PATCH 0424/1246] Only run test on mysql & postgres like systems

---
 test/integration/test-number-size.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/integration/test-number-size.js b/test/integration/test-number-size.js
index eff24e5d..eb6a9c45 100644
--- a/test/integration/test-number-size.js
+++ b/test/integration/test-number-size.js
@@ -13,9 +13,9 @@ common.createConnection(function (err, db) {
   if (err) throw err;
 
   var Model = db.define('test-number-size', {
-    int2: { type: 'number', size: 2, rational: false },
-    int4: { type: 'number', size: 4, rational: false },
-    int8: { type: 'number', size: 8, rational: false },
+    int2:   { type: 'number', size: 2, rational: false },
+    int4:   { type: 'number', size: 4, rational: false },
+    int8:   { type: 'number', size: 8, rational: false },
     float4: { type: 'number', size: 4 },
     float8: { type: 'number', size: 8 }
   });
@@ -28,7 +28,13 @@ common.createConnection(function (err, db) {
 
   var protocol = common.protocol().toLowerCase();
   var mysql    = protocol == 'mysql';
-  var postgres = protocol == 'postgres';
+  var postgres = protocol == 'postgres' || protocol == 'redshift';
+
+  // Sqlite doesn't support specifying sizes
+  if(!(postgres || mysql)) {
+    db.close();
+    return;
+  }
 
   async.series([
     function(cb) {

From 33594c34e712432c90775c018fa1aa24f345c86e Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Sun, 26 May 2013 11:02:52 +1000
Subject: [PATCH 0425/1246] Improve number-size tests

---
 test/integration/test-number-size.js | 36 +++++++++++++++-------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/test/integration/test-number-size.js b/test/integration/test-number-size.js
index eb6a9c45..6ba79650 100644
--- a/test/integration/test-number-size.js
+++ b/test/integration/test-number-size.js
@@ -9,6 +9,12 @@ function round(num, points) {
   return Math.round(num * m) / m;
 }
 
+// Round because different systems store floats in different
+// ways, thereby introducing small errors.
+function fuzzyEql(num1, num2) {
+  return round(num1 / num2, 3) == 1;
+}
+
 common.createConnection(function (err, db) {
   if (err) throw err;
 
@@ -46,28 +52,26 @@ common.createConnection(function (err, db) {
         });
       });
     },
+    // It should be able to store near MAX sized values for each field
     function(cb) {
-      // It should be able to store near MAX sized values for each field
       Model.create(data, function (err, item) {
         if (err) throw err;
 
         Model.get(item.id, function (err, item) {
           if (err) throw err;
 
-          // Round because different systems store floats in different
-          // ways, thereby introducing small errors.
-          assert.equal(round(item.int2   / data.int2,   3), 1);
-          assert.equal(round(item.int4   / data.int4,   3), 1);
-          assert.equal(round(item.int8   / data.int8,   3), 1);
-          assert.equal(round(item.float4 / data.float4, 3), 1);
-          assert.equal(round(item.float8 / data.float8, 3), 1);
-        });
+          assert(fuzzyEql(item.int2,   data.int2));
+          assert(fuzzyEql(item.int4,   data.int4));
+          assert(fuzzyEql(item.int8,   data.int8));
+          assert(fuzzyEql(item.float4, data.float4));
+          assert(fuzzyEql(item.float8, data.float8));
 
-        cb();
+          cb();
+        });
       });
     },
+    // It should not be able to store values which are too large in int2
     function(cb) {
-      // It should not be able to store values which are too large in int2
       Model.create({ int2: data.int4 }, function (err, item) {
         // Postgres throws an error if it detects potential data loss,
         // ie. if it detects an overflow.
@@ -79,14 +83,14 @@ common.createConnection(function (err, db) {
           Model.get(item.id, function (err, item) {
             if (err) throw err;
 
-            assert.notEqual(item.int2, data.int4)
+            assert(!fuzzyEql(item.int2, data.int4));
             cb();
           });
         }
       });
     },
+    // It should not be able to store values which are too large in int4
     function(cb) {
-      // It should not be able to store values which are too large in int4
       Model.create({ int4: data.int8 }, function (err, item) {
         if (postgres) {
           assert(err);
@@ -95,14 +99,14 @@ common.createConnection(function (err, db) {
           Model.get(item.id, function (err, item) {
             if (err) throw err;
 
-            assert.notEqual(item.int4, data.int8)
+            assert(!fuzzyEql(item.int4, data.int8));
             cb();
           });
         }
       });
     },
+    // It should not be able to store values which are too large in float4
     function(cb) {
-      // It should not be able to store values which are too large in float4
       Model.create({ float4: data.float8 }, function (err, item) {
         if (postgres) {
           assert(err);
@@ -111,7 +115,7 @@ common.createConnection(function (err, db) {
           Model.get(item.id, function (err, item) {
             if (err) throw err;
 
-            assert.notEqual(item.float4, data.float8)
+            assert(!fuzzyEql(item.float4, data.float8));
             cb();
           });
         }

From e8cb116deb991a732b93e52f4d16d143943baec2 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 29 May 2013 18:56:53 +1000
Subject: [PATCH 0426/1246] Revert non-autoincrement key fields change, since I
 cannot recreate the bug

---
 lib/Instance.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 85dd2519..ef049d38 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -151,9 +151,7 @@ function Instance(opts) {
 					if (!save_err) {
 						opts.changes.length = 0;
 						for (var i = 0; i < opts.keys.length; i++) {
-							if ( typeof info[opts.keys[i]] !== 'undefined') {
-								opts.data[opts.keys[i]] = info[opts.keys[i]];
-							}
+							opts.data[opts.keys[i]] = info[opts.keys[i]];
 						}
 						opts.is_new = false;
 					}

From 824b435ad3239ec211ea4188f12d6cfc65bf6905 Mon Sep 17 00:00:00 2001
From: Stephan Hoyer <ste.hoyer@gmail.com>
Date: Wed, 29 May 2013 20:08:01 +0200
Subject: [PATCH 0427/1246] Add Test for reverse association with another
 association

---
 test/common.js                                | 47 +++++++++++++++++
 .../test-association-hasone-reverse-updown.js | 51 +++++++++++++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 test/integration/test-association-hasone-reverse-updown.js

diff --git a/test/common.js b/test/common.js
index 106f291d..c60297e8 100644
--- a/test/common.js
+++ b/test/common.js
@@ -120,6 +120,23 @@ common.createModel2Table = function (table, db, cb) {
 	}
 };
 
+common.createModelAssocUpDownTable = function (table, db, cb) {
+	switch (this.protocol()) {
+		case "postgres":
+		case "redshift":
+			db.query("CREATE TEMPORARY TABLE " + table + " (id SERIAL PRIMARY KEY, name VARCHAR(100) NOT NULL, assocup_id BIGINT NOT NULL, assocdown_id BIGINT NOT NULL)", cb);
+			break;
+		case "sqlite":
+			db.run("DROP TABLE IF EXISTS " + table, function () {
+				db.run("CREATE TEMPORARY TABLE " + table + " (id SERIAL PRIMARY KEY, name VARCHAR(100) NOT NULL, assocup_id BIGINT NOT NULL, assocdown_id BIGINT NOT NULL)", cb);
+			});
+			break;
+		default:
+			db.query("CREATE TEMPORARY TABLE " + table + " (id BIGINT NOT NULL PRIMARY KEY AUTO_INCREMENT, name VARCHAR(100) NOT NULL, assocup_id BIGINT NOT NULL, assocdown_id BIGINT NOT NULL)", cb);
+			break;
+	}
+};
+
 common.createKeysModelTable = function (table, db, keys, cb) {
 	switch (this.protocol()) {
 		case "postgres":
@@ -214,6 +231,36 @@ common.insertModel2Data = function (table, db, data, cb) {
 	}
 };
 
+common.insertModelAssocUpDownData = function (table, db, data, cb) {
+	var query = [], i;
+
+	switch (this.protocol()) {
+		case "postgres":
+		case "redshift":
+		case "mysql":
+			query = [];
+
+			for (i = 0; i < data.length; i++) {
+				query.push(data[i].id + ", '" + data[i].name + "', " + data[i].assocup + "', " + data[i].assocdown);
+			}
+
+			db.query("INSERT INTO " + table + " VALUES (" + query.join("), (") + ")", cb);
+			break;
+		case "sqlite":
+			var pending = data.length;
+			for (i = 0; i < data.length; i++) {
+				db.run("INSERT INTO " + table + " VALUES (" + data[i].id + ", '" + data[i].name + "', " + data[i].assocup + ", " + data[i].assocdown + ")", function () {
+					pending -= 1;
+
+					if (pending === 0) {
+						return cb();
+					}
+				});
+			}
+			break;
+	}
+};
+
 common.insertKeysModelData = function (table, db, data, cb) {
 	var query = [], i, k, keys, vals, pending;
 
diff --git a/test/integration/test-association-hasone-reverse-updown.js b/test/integration/test-association-hasone-reverse-updown.js
new file mode 100644
index 00000000..08388048
--- /dev/null
+++ b/test/integration/test-association-hasone-reverse-updown.js
@@ -0,0 +1,51 @@
+var common		 = require('../common');
+var assert		 = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_association_hasone_reverse_updown_up', db.driver.db, function() {
+		common.createModelAssocUpDownTable('test_association_hasone_reverse_updown', db.driver.db, function () {
+			common.createModelTable('test_association_hasone_reverse_updown_down', db.driver.db, function () {
+				common.insertModelData('test_association_hasone_reverse_updown_up', db.driver.db, [
+					{ id : 1, name : 'parent 1' },
+					{ id : 2, name : 'parent 2' }
+					], function (err) {
+						if (err) throw err;
+						common.insertModelData('test_association_hasone_reverse_updown_down', db.driver.db, [
+							{ id : 1, name : 'grandchild 1' }
+							], function (err) {
+								if (err) throw err;
+								common.insertModelAssocUpDownData('test_association_hasone_reverse_updown', db.driver.db, [
+									{ id : 1, name : 'child 1', assocup: 2, assocdown: 1 },
+									{ id : 2, name : 'child 2', assocup: 1, assocdown: 1 }
+									], function (err) {
+										if (err) throw err;
+
+										var TestModelParent = db.define('test_association_hasone_reverse_updown_up', common.getModelProperties());
+										var TestModelChild	= db.define('test_association_hasone_reverse_updown',	common.getModelProperties());
+										var TestModelGrandChild	= db.define('test_association_hasone_reverse_updown_down',	common.getModelProperties());
+										TestModelChild.hasOne("assocup", TestModelParent, { reverse: "reverseassoc" });
+										TestModelChild.hasOne("assocdown", TestModelGrandChild, { autoFetch: true });
+
+										TestModelParent(2).getReverseassoc(function (err, children) {
+											assert.equal(err, null);
+											assert.equal(Array.isArray(children), true);
+											assert.equal(typeof children[0], "object");
+											assert.equal(children[0].id, 1);
+											assert.equal(typeof children[0].assocdown, "object");
+
+											// Make sure the association field hasn't been erroneously added to the reverse association model.
+											TestModelParent.find({}, function (err, parents) {
+												assert.equal(err, null);
+												assert.equal(parents[0].hasOwnProperty('name'), true);
+												assert.equal(parents[0].hasOwnProperty('assoc_id'), false);
+
+												db.close();
+											});
+										});
+									});
+							});
+					});
+			});
+		});
+	});
+});

From 98d79969ef2c0b50142077cdd3613e1bc491dd9d Mon Sep 17 00:00:00 2001
From: Stephan Hoyer <ste.hoyer@gmail.com>
Date: Wed, 29 May 2013 20:18:23 +0200
Subject: [PATCH 0428/1246] Change test so that it fails to show wrong
 behaviour

---
 .../test-association-hasone-reverse-updown.js     | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/test/integration/test-association-hasone-reverse-updown.js b/test/integration/test-association-hasone-reverse-updown.js
index 08388048..a356d594 100644
--- a/test/integration/test-association-hasone-reverse-updown.js
+++ b/test/integration/test-association-hasone-reverse-updown.js
@@ -23,15 +23,18 @@ common.createConnection(function (err, db) {
 										var TestModelParent = db.define('test_association_hasone_reverse_updown_up', common.getModelProperties());
 										var TestModelChild	= db.define('test_association_hasone_reverse_updown',	common.getModelProperties());
 										var TestModelGrandChild	= db.define('test_association_hasone_reverse_updown_down',	common.getModelProperties());
-										TestModelChild.hasOne("assocup", TestModelParent, { reverse: "reverseassoc" });
+										TestModelChild.hasOne("assocup", TestModelParent, {
+                      autoFetch: true, 
+                      reverse: "reverseassoc" 
+                    });
 										TestModelChild.hasOne("assocdown", TestModelGrandChild, { autoFetch: true });
 
-										TestModelParent(2).getReverseassoc(function (err, children) {
+										TestModelParent.get(2, function (err, par) {
 											assert.equal(err, null);
-											assert.equal(Array.isArray(children), true);
-											assert.equal(typeof children[0], "object");
-											assert.equal(children[0].id, 1);
-											assert.equal(typeof children[0].assocdown, "object");
+											assert.equal(Array.isArray(par.reverseassoc), true);
+											assert.equal(typeof par.reverseassoc[0], "object");
+											assert.equal(par.reverseassoc[0].id, 1);
+											assert.equal(typeof par.reverseassoc[0].assocdown, "object");
 
 											// Make sure the association field hasn't been erroneously added to the reverse association model.
 											TestModelParent.find({}, function (err, parents) {

From 796e2237a9b01298f52760884cd34d5ecd0e909f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 29 May 2013 19:23:28 +0100
Subject: [PATCH 0429/1246] Changes use of Singleton.get by Model.find to use
 opts.keys instead of opts.id (#150)

For multiple primary key tables, it's necessary to use all keys,
otherwise caching will break stuff..
---
 lib/Model.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/Model.js b/lib/Model.js
index a45feabd..07dce680 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -267,7 +267,12 @@ function Model(opts) {
 			merge        : merge,
 			offset       : options.offset,
 			newInstance  : function (data, cb) {
-				Singleton.get(opts.driver.uid + "/" + opts.table + (merge ? "+" + merge.from.table : "") + "/" + data[opts.id], {
+				var uid = opts.driver.uid + "/" + opts.table + (merge ? "+" + merge.from.table : "");
+				for (var i = 0; i < opts.keys.length; i++) {
+					uid += "/" + data[opts.keys[i]];
+				}
+
+				Singleton.get(uid, {
 					cache      : options.cache,
 					save_check : opts.settings.get("instance.cacheSaveCheck")
 				}, function (cb) {

From 3bce9802d126080529216c6f4d66e081ae6002a8 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 29 May 2013 19:24:54 +0100
Subject: [PATCH 0430/1246] Changes Model.get use of Singleton.get to create
 the UID similar to Model.find (#150)

---
 lib/Model.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Model.js b/lib/Model.js
index 07dce680..78e68c66 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -172,7 +172,7 @@ function Model(opts) {
 			if (data.length === 0) {
 				return cb(new Error("Not found"));
 			}
-			Singleton.get(opts.driver.uid + "/" + opts.table + "/" + ids.join("."), {
+			Singleton.get(opts.driver.uid + "/" + opts.table + "/" + ids.join("/"), {
 				cache      : options.cache || opts.cache,
 				save_check : opts.settings.get("instance.cacheSaveCheck")
 			}, function (cb) {

From e2a0cfc7e5e59114be876e94b416fe5215f0ecbb Mon Sep 17 00:00:00 2001
From: Stephan Hoyer <ste.hoyer@gmail.com>
Date: Wed, 29 May 2013 20:50:57 +0200
Subject: [PATCH 0431/1246] Change configuration of test model so the test
 passes again

---
 test/integration/test-association-hasone-reverse-updown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/test-association-hasone-reverse-updown.js b/test/integration/test-association-hasone-reverse-updown.js
index a356d594..a6bd52d9 100644
--- a/test/integration/test-association-hasone-reverse-updown.js
+++ b/test/integration/test-association-hasone-reverse-updown.js
@@ -20,7 +20,7 @@ common.createConnection(function (err, db) {
 									], function (err) {
 										if (err) throw err;
 
-										var TestModelParent = db.define('test_association_hasone_reverse_updown_up', common.getModelProperties());
+										var TestModelParent = db.define('test_association_hasone_reverse_updown_up', common.getModelProperties(), { autoFetchLimit: 2 });
 										var TestModelChild	= db.define('test_association_hasone_reverse_updown',	common.getModelProperties());
 										var TestModelGrandChild	= db.define('test_association_hasone_reverse_updown_down',	common.getModelProperties());
 										TestModelChild.hasOne("assocup", TestModelParent, {

From 896847e09ecb2db5b5ee6395b64b0cc1a7412fce Mon Sep 17 00:00:00 2001
From: Stephan Hoyer <ste.hoyer@gmail.com>
Date: Wed, 29 May 2013 21:41:10 +0200
Subject: [PATCH 0432/1246] Fix typo

---
 test/common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/common.js b/test/common.js
index c60297e8..bb3eefce 100644
--- a/test/common.js
+++ b/test/common.js
@@ -241,7 +241,7 @@ common.insertModelAssocUpDownData = function (table, db, data, cb) {
 			query = [];
 
 			for (i = 0; i < data.length; i++) {
-				query.push(data[i].id + ", '" + data[i].name + "', " + data[i].assocup + "', " + data[i].assocdown);
+				query.push(data[i].id + ", '" + data[i].name + "', " + data[i].assocup + ", " + data[i].assocdown);
 			}
 
 			db.query("INSERT INTO " + table + " VALUES (" + query.join("), (") + ")", cb);

From c2a7167157a973129fd2501942aa0e5cd921459a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 30 May 2013 17:47:20 +0100
Subject: [PATCH 0433/1246] Fixes passing unknown properties to new instances
 (fixes #178)

---
 lib/Model.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/Model.js b/lib/Model.js
index 78e68c66..cd6f8805 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -30,6 +30,14 @@ function Model(opts) {
 		if (!inst_opts) {
 			inst_opts = {};
 		}
+
+		for (var k in data) {
+			if (k != "extra_field" && !opts.properties.hasOwnProperty(k) && opts.keys.indexOf(k) == -1
+			&& association_properties.indexOf(k) == -1) {
+				delete data[k];
+			}
+		}
+
 		var instance = new Instance({
 			id                     : opts.id,
 			keys                   : opts.keys,

From 876498110d971e1fdec003adeaf2f9fed6a476d3 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 30 May 2013 18:15:07 +0100
Subject: [PATCH 0434/1246] 2.0.12

---
 Changelog.md | 17 +++++++++++++++++
 package.json |  6 ++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 2dd25586..6e282367 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,20 @@
+### v2.0.12 - 30 May 2013
+
+- New plugin: orm-paging
+- Adds Model.one() as an alias for Model.all().limit(1) (#148)
+- Changes Model.one() to return only one instance (or null) instead of an Array (#148)
+- Allow passing a single object to Model.create() (#159)
+- Fixes passing unknown properties to new instances (fixes #178)
+- Adds AggregateFunctions.limit() (#172)
+- Checks for driver debug flag and prints debug lines in AggregateFunctions (#171)
+- Added Hook 'beforeValidation' prior to _all_ validations
+- Avoids JSON parsing values when they are already objects (and not string buffers) (#168)
+- Changes beforeRemove, beforeCreate, beforeSave and beforeValidation to use Hooks.wait() (sync or async hooks) (#167)
+- Support specifying size of number columns
+- Many more bug fixes
+- More tests added
+- Many documentation improvements
+
 ### v2.0.11 - 3 May 2013
 
 - Changes orm.connect() to return an EventEmitter
diff --git a/package.json b/package.json
index 751cefb5..6af86a87 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "redshift",
     "sqlite"
   ],
-  "version"     : "2.0.11",
+  "version"     : "2.0.12",
   "license"     : "MIT",
   "homepage"    : "http://dresende.github.io/node-orm2",
   "repository"  : "http://github.com/dresende/node-orm2.git",
@@ -24,7 +24,9 @@
     { "name" : "preslavrachev" },
     { "name" : "Chris Cowan",      "email" : "me@chriscowan.us" },
     { "name" : "Paul Dixon",       "email" : "paul.dixon@mintbridge.co.uk" },
-    { "name" : "David Kosub" }
+    { "name" : "David Kosub" },
+    { "name" : "Arek W" },
+    { "name" : "Joseph Gilley",    "email" : "joe.gilley@gmail.com" }
   ],
   "main"        : "./lib/ORM",
   "scripts"     : {

From 145719f3c495e37d38ce99b3c43136b6ee3e8fd9 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 31 May 2013 10:22:45 +0100
Subject: [PATCH 0435/1246] Avoids throwing when calling db.close() without a
 callback and using pool in mysql (fixes #180)

---
 lib/Drivers/DML/mysql.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 974a0bb3..a7e6dc32 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -69,7 +69,8 @@ Driver.prototype.reconnect = function (cb, connection) {
 
 Driver.prototype.close = function (cb) {
 	if (this.opts.pool) {
-		return cb();
+		if (typeof cb == "function") cb();
+		return;
 	}
 	this.db.end(cb);
 };

From 6085fac626a9fcc6c2425dfc03e28fc15fab0715 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 31 May 2013 23:24:07 +0100
Subject: [PATCH 0436/1246] Adds initial code to support passing associations
 when creating new instances (#162)

There are more stuff to do but at least creating new instances should
be more easy for users.
---
 lib/Instance.js | 145 ++++++++++++++++++++++++++++++++++--------------
 lib/Model.js    |  25 ++++++++-
 2 files changed, 127 insertions(+), 43 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index ef049d38..7b17a79b 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -65,22 +65,21 @@ function Instance(opts) {
 		};
 		return checkNextValidation();
 	};
+	var saveError = function (cb, err) {
+		emitEvent("save", err, instance);
+		Hook.trigger(instance, opts.hooks.afterSave, false);
+		if (typeof cb == "function") {
+			cb(err, instance);
+		}
+	};
 	var saveInstance = function (cb) {
 		if (!opts.is_new && opts.changes.length === 0) {
 			return saveInstanceExtra(cb);
 		}
 
-		var saveError = function (err) {
-			emitEvent("save", err, instance);
-			Hook.trigger(instance, opts.hooks.afterSave, false);
-			if (typeof cb == "function") {
-				cb(err, instance);
-			}
-		};
-
 		Hook.wait(instance, opts.hooks.beforeValidation, function (err) {
 			if (err) {
-				return saveError(err);
+				return saveError(cb, err);
 			}
 
 			for (var k in opts.properties) {
@@ -103,11 +102,11 @@ function Instance(opts) {
 			if (opts.is_new) {
 				return Hook.wait(instance, opts.hooks.beforeCreate, function (err) {
 					if (err) {
-						return saveError(err);
+						return saveError(cb, err);
 					}
 					Hook.wait(instance, opts.hooks.beforeSave, function (err) {
 						if (err) {
-							return saveError(err);
+							return saveError(cb, err);
 						}
 						return saveInstanceNext(cb);
 					});
@@ -115,7 +114,7 @@ function Instance(opts) {
 			}
 			Hook.wait(instance, opts.hooks.beforeSave, function (err) {
 				if (err) {
-					return saveError(err);
+					return saveError(cb, err);
 				}
 				return saveInstanceNext(cb);
 			});
@@ -124,12 +123,7 @@ function Instance(opts) {
 	var saveInstanceNext = function (cb) {
 		handleValidations(function (err) {
 			if (err) {
-				emitEvent("save", err, instance);
-				Hook.trigger(instance, opts.hooks.afterSave, err === null);
-				if (typeof cb == "function") {
-					cb(err, instance);
-				}
-				return;
+				return saveError(cb, err);
 			}
 
 			var data = {};
@@ -148,22 +142,27 @@ function Instance(opts) {
 
 			if (opts.is_new) {
 				opts.driver.insert(opts.table, data, opts.keys, function (save_err, info) {
-					if (!save_err) {
-						opts.changes.length = 0;
-						for (var i = 0; i < opts.keys.length; i++) {
-							opts.data[opts.keys[i]] = info[opts.keys[i]];
-						}
-						opts.is_new = false;
+					if (save_err) {
+						return saveError(cb, save_err);
 					}
-					emitEvent("save", save_err, instance);
-					Hook.trigger(instance, opts.hooks.afterCreate, !save_err);
-					Hook.trigger(instance, opts.hooks.afterSave, !save_err);
-					if (typeof cb == "function") {
-						if (save_err) {
-							return cb(save_err, instance);
-						}
-						return saveInstanceExtra(cb);
+
+					opts.changes.length = 0;
+					for (var i = 0; i < opts.keys.length; i++) {
+						opts.data[opts.keys[i]] = info[opts.keys[i]];
 					}
+					opts.is_new = false;
+
+					saveAssociations(function (err) {
+						emitEvent("save", err, instance);
+						Hook.trigger(instance, opts.hooks.afterCreate, !err);
+						Hook.trigger(instance, opts.hooks.afterSave, !err);
+						if (typeof cb == "function") {
+							if (err) {
+								return cb(err, instance);
+							}
+							return saveInstanceExtra(cb);
+						}
+					});
 				});
 			} else {
 				var changes = {}, conditions = {};
@@ -174,21 +173,73 @@ function Instance(opts) {
 					conditions[opts.keys[i]] = data[opts.keys[i]];
 				}
 				opts.driver.update(opts.table, changes, conditions, function (save_err) {
-					if (!save_err) {
-						opts.changes.length = 0;
+					if (save_err) {
+						return saveError(cb, save_err);
 					}
-					emitEvent("save", save_err, instance);
-					Hook.trigger(instance, opts.hooks.afterSave, !save_err);
-					if (typeof cb == "function") {
-						if (save_err) {
-							return cb(save_err, instance);
+
+					opts.changes.length = 0;
+
+					saveAssociations(function (err) {
+						emitEvent("save", err, instance);
+						Hook.trigger(instance, opts.hooks.afterSave, !err);
+						if (typeof cb == "function") {
+							if (err) {
+								return cb(err, instance);
+							}
+							return saveInstanceExtra(cb);
 						}
-						return saveInstanceExtra(cb);
-					}
+					});
 				});
 			}
 		});
 	};
+	var saveAssociations = function (cb) {
+		var pending = 0, errored = false, i, j;
+
+		for (i = 0; i < opts.one_associations.length; i++) {
+			if (!instance.hasOwnProperty(opts.one_associations[i].name)) continue;
+
+			if (instance[opts.one_associations[i].name].isInstance) {
+				pending += 1;
+
+				instance[opts.one_associations[i].setAccessor](instance[opts.one_associations[i].name], function (err) {
+					if (err) {
+						if (errored) return;
+
+						errored = true;
+						return cb(err);
+					}
+
+					if (--pending === 0) {
+						return cb();
+					}
+				});
+			}
+		}
+
+		for (i = 0; i < opts.many_associations.length; i++) {
+			if (!instance.hasOwnProperty(opts.many_associations[i].name)) continue;
+
+			pending += 1;
+
+			instance[opts.many_associations[i].setAccessor](instance[opts.many_associations[i].name], function (err) {
+				if (err) {
+					if (errored) return;
+
+					errored = true;
+					return cb(err);
+				}
+
+				if (--pending === 0) {
+					return cb();
+				}
+			});
+		}
+
+		if (pending === 0) {
+			return cb();
+		}
+	};
 	var saveInstanceExtra = function (cb) {
 		if (opts.extrachanges.length === 0) {
 			if (cb) return cb(null, instance);
@@ -422,6 +473,18 @@ function Instance(opts) {
 			break;
 		}
 	}
+	for (i = 0; i < opts.one_associations.length; i++) {
+		if (opts.data.hasOwnProperty(opts.one_associations[i].name)) {
+			instance[opts.one_associations[i].name] = opts.data[opts.one_associations[i].name];
+			delete opts.data[opts.one_associations[i].name];
+		}
+	}
+	for (i = 0; i < opts.many_associations.length; i++) {
+		if (opts.data.hasOwnProperty(opts.many_associations[i].name)) {
+			instance[opts.many_associations[i].name] = opts.data[opts.many_associations[i].name];
+			delete opts.data[opts.many_associations[i].name];
+		}
+	}
 
 	Hook.trigger(instance, opts.hooks.afterLoad);
 
diff --git a/lib/Model.js b/lib/Model.js
index cd6f8805..5347be62 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -31,10 +31,29 @@ function Model(opts) {
 			inst_opts = {};
 		}
 
-		for (var k in data) {
+		var found_assoc = false, i, k;
+
+		for (k in data) {
 			if (k != "extra_field" && !opts.properties.hasOwnProperty(k) && opts.keys.indexOf(k) == -1
 			&& association_properties.indexOf(k) == -1) {
-				delete data[k];
+				found_assoc = false;
+				for (i = 0; i < one_associations.length; i++) {
+					if (one_associations[i].name == k) {
+						found_assoc = true;
+						break;
+					}
+				}
+				if (!found_assoc) {
+					for (i = 0; i < many_associations.length; i++) {
+						if (many_associations[i].name == k) {
+							found_assoc = true;
+							break;
+						}
+					}
+				}
+				if (!found_assoc) {
+					delete data[k];
+				}
 			}
 		}
 
@@ -53,6 +72,8 @@ function Model(opts) {
 			hooks                  : opts.hooks,
 			methods                : opts.methods,
 			validations            : opts.validations,
+			one_associations       : one_associations,
+			many_associations      : many_associations,
 			association_properties : association_properties
 		});
 		if (model_fields !== null) {

From d7ac106083866e34e30ca6cdf50b46c9919daaa5 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 3 Jun 2013 12:14:41 +0100
Subject: [PATCH 0437/1246] sql-query@0.0.26

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6af86a87..90feea6c 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
   },
   "analyse"     : false,
   "dependencies": {
-    "sql-query"      : "0.0.23",
+    "sql-query"      : "0.0.26",
     "hat"            : "0.0.3"
   },
   "devDependencies": {

From 2c21233461d5b8ad586e99eac3f1077f4e0d8dbc Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 3 Jun 2013 14:42:35 +0100
Subject: [PATCH 0438/1246] Fix test-exists table name

---
 test/integration/test-exists.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/integration/test-exists.js b/test/integration/test-exists.js
index 9d8509a6..c8442d9d 100644
--- a/test/integration/test-exists.js
+++ b/test/integration/test-exists.js
@@ -2,8 +2,8 @@ var common     = require('../common');
 var assert     = require('assert');
 
 common.createConnection(function (err, db) {
-	common.createModelTable('test_count', db.driver.db, function () {
-		common.insertModelData('test_count', db.driver.db, [
+	common.createModelTable('test_exists', db.driver.db, function () {
+		common.insertModelData('test_exists', db.driver.db, [
 			{ id : 1, name : 'test1' },
 			{ id : 2, name : 'test2' },
 			{ id : 3, name : 'test3' },
@@ -12,7 +12,7 @@ common.createConnection(function (err, db) {
 		], function (err) {
 			if (err) throw err;
 
-			var TestModel = db.define('test_count', common.getModelProperties());
+			var TestModel = db.define('test_exists', common.getModelProperties());
 			var tests = 3;
 
 			TestModel.exists(4, function (err, exists) {

From f0d75af8d3eca9ccd7eb40eb7ce51a6df0fabf32 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 3 Jun 2013 14:44:14 +0100
Subject: [PATCH 0439/1246] Changes Model.exists() to allow array or object
 passing

For multiple column primary key tables, it allows to pass [ id1, id2,
.. ] instead of each id as a parameter. If passing an object as first
parameter, it uses it as conditions and ignores everything else (any
other ids passed).
---
 lib/Model.js                           | 17 +++++++++---
 test/integration/test-exists-array.js  | 36 ++++++++++++++++++++++++++
 test/integration/test-exists-object.js | 36 ++++++++++++++++++++++++++
 3 files changed, 86 insertions(+), 3 deletions(-)
 create mode 100644 test/integration/test-exists-array.js
 create mode 100644 test/integration/test-exists-object.js

diff --git a/lib/Model.js b/lib/Model.js
index 5347be62..80afd319 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -416,9 +416,20 @@ function Model(opts) {
 			throw new Error("Missing Model.exists() callback");
 		}
 
-		var conditions = {};
-		for (var i = 0; i < opts.keys.length; i++) {
-			conditions[opts.keys[i]] = ids[i];
+		var conditions = {}, i;
+
+		if (ids.length === 1 && typeof ids[0] == "object") {
+			if (Array.isArray(ids[0])) {
+				for (i = 0; i < opts.keys.length; i++) {
+					conditions[opts.keys[i]] = ids[0][i];
+				}
+			} else {
+				conditions = ids[0];
+			}
+		} else {
+			for (i = 0; i < opts.keys.length; i++) {
+				conditions[opts.keys[i]] = ids[i];
+			}
 		}
 
 		opts.driver.count(opts.table, conditions, {}, function (err, data) {
diff --git a/test/integration/test-exists-array.js b/test/integration/test-exists-array.js
new file mode 100644
index 00000000..f8c1d8ad
--- /dev/null
+++ b/test/integration/test-exists-array.js
@@ -0,0 +1,36 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_exists_array', db.driver.db, function () {
+		common.insertModelData('test_exists_array', db.driver.db, [
+			{ id : 1, name : 'test1' },
+			{ id : 2, name : 'test2' },
+			{ id : 3, name : 'test3' },
+			{ id : 4, name : 'test4' },
+			{ id : 5, name : 'test5' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_exists_array', common.getModelProperties());
+			var tests = 2;
+
+			TestModel.exists([ 4 ], function (err, exists) {
+				assert.equal(err, null);
+				assert.equal(exists, true);
+
+				if (--tests === 0) {
+					db.close();
+				}
+			});
+			TestModel.exists([ 6 ], function (err, exists) {
+				assert.equal(err, null);
+				assert.equal(exists, false);
+
+				if (--tests === 0) {
+					db.close();
+				}
+			});
+		});
+	});
+});
diff --git a/test/integration/test-exists-object.js b/test/integration/test-exists-object.js
new file mode 100644
index 00000000..f47685c9
--- /dev/null
+++ b/test/integration/test-exists-object.js
@@ -0,0 +1,36 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_exists_object', db.driver.db, function () {
+		common.insertModelData('test_exists_object', db.driver.db, [
+			{ id : 1, name : 'test1' },
+			{ id : 2, name : 'test2' },
+			{ id : 3, name : 'test3' },
+			{ id : 4, name : 'test4' },
+			{ id : 5, name : 'test5' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_exists_object', common.getModelProperties());
+			var tests = 2;
+
+			TestModel.exists({ id: 4 }, function (err, exists) {
+				assert.equal(err, null);
+				assert.equal(exists, true);
+
+				if (--tests === 0) {
+					db.close();
+				}
+			});
+			TestModel.exists({ id: 6 }, function (err, exists) {
+				assert.equal(err, null);
+				assert.equal(exists, false);
+
+				if (--tests === 0) {
+					db.close();
+				}
+			});
+		});
+	});
+});

From a9383e6f1ab273816b148d4d8110e11cf8d7ce55 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 4 Jun 2013 19:38:14 +0100
Subject: [PATCH 0440/1246] Allows passing an object instead of an instance as
 an hasOne asssociation

---
 lib/Instance.js | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 7b17a79b..dab0208e 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -156,11 +156,9 @@ function Instance(opts) {
 						emitEvent("save", err, instance);
 						Hook.trigger(instance, opts.hooks.afterCreate, !err);
 						Hook.trigger(instance, opts.hooks.afterSave, !err);
-						if (typeof cb == "function") {
-							if (err) {
-								return cb(err, instance);
-							}
-							return saveInstanceExtra(cb);
+
+						if (!err) {
+							saveInstanceExtra(cb);
 						}
 					});
 				});
@@ -172,6 +170,7 @@ function Instance(opts) {
 				for (i = 0; i < opts.keys.length; i++) {
 					conditions[opts.keys[i]] = data[opts.keys[i]];
 				}
+
 				opts.driver.update(opts.table, changes, conditions, function (save_err) {
 					if (save_err) {
 						return saveError(cb, save_err);
@@ -182,11 +181,9 @@ function Instance(opts) {
 					saveAssociations(function (err) {
 						emitEvent("save", err, instance);
 						Hook.trigger(instance, opts.hooks.afterSave, !err);
-						if (typeof cb == "function") {
-							if (err) {
-								return cb(err, instance);
-							}
-							return saveInstanceExtra(cb);
+
+						if (!err) {
+							saveInstanceExtra(cb);
 						}
 					});
 				});
@@ -257,7 +254,7 @@ function Instance(opts) {
 		conditions[opts.extra_info.assoc_prop] = opts.data[opts.id];
 
 		opts.driver.update(opts.extra_info.table, data, conditions, function (err) {
-			return cb(err, instance);
+			if (cb)	return cb(err, instance);
 		});
 	};
 	var removeInstance = function (cb) {
@@ -475,7 +472,13 @@ function Instance(opts) {
 	}
 	for (i = 0; i < opts.one_associations.length; i++) {
 		if (opts.data.hasOwnProperty(opts.one_associations[i].name)) {
-			instance[opts.one_associations[i].name] = opts.data[opts.one_associations[i].name];
+			if (typeof opts.data[opts.one_associations[i].name] == "object") {
+				if (opts.data[opts.one_associations[i].name].isInstance) {
+					instance[opts.one_associations[i].name] = opts.data[opts.one_associations[i].name];
+				} else {
+					instance[opts.one_associations[i].name] = new opts.one_associations[i].model(opts.data[opts.one_associations[i].name]);
+				}
+			}
 			delete opts.data[opts.one_associations[i].name];
 		}
 	}

From 86e27556113a0419200d31b92581e83abfd5d752 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 4 Jun 2013 19:38:31 +0100
Subject: [PATCH 0441/1246] Adds missing whitespace in execQuery

---
 lib/Drivers/DML/postgres.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 23221a66..3245b6f1 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -76,7 +76,7 @@ var switchableFunctions = {
 		},
 		execQuery: function (query, cb) {
 			this.db.query(query, function(err, result) {
-				if(err) {
+				if (err) {
 					cb(err);
 				} else {
 					cb(null, result.rows);

From 6a84018dad07e669629d52685c696f441d6e4027 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 4 Jun 2013 19:38:42 +0100
Subject: [PATCH 0442/1246] Adds test-save

---
 test/integration/test-save.js | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 test/integration/test-save.js

diff --git a/test/integration/test-save.js b/test/integration/test-save.js
new file mode 100644
index 00000000..231441a4
--- /dev/null
+++ b/test/integration/test-save.js
@@ -0,0 +1,24 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_save', db.driver.db, function () {
+		var TestModel = db.define('test_save', common.getModelProperties());
+
+		var test1 = new TestModel({
+			name: "test"
+		});
+
+		test1.save(function (err) {
+			assert.equal(err, null);
+
+			TestModel.get(test1.id, function (err, test2) {
+				assert.equal(err, null);
+				assert.equal(test1.id, test2.id);
+				assert.equal(test1.name, test2.name);
+
+				db.close();
+			});
+		});
+	});
+});

From 026b9f291429b81907c409174318a75d89ae6a11 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 4 Jun 2013 19:39:14 +0100
Subject: [PATCH 0443/1246] Adds save test for when an hasOne association is
 passed directly

---
 .../test-save-hasone-association.js           | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 test/integration/test-save-hasone-association.js

diff --git a/test/integration/test-save-hasone-association.js b/test/integration/test-save-hasone-association.js
new file mode 100644
index 00000000..afbc6014
--- /dev/null
+++ b/test/integration/test-save-hasone-association.js
@@ -0,0 +1,30 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	var TestModel = db.define('test_save_hasone_association', common.getModelProperties());
+	TestModel.hasOne("assoc");
+
+	TestModel.drop(function (err) {
+		assert.equal(err, null);
+
+		TestModel.sync(function (err) {
+			assert.equal(err, null);
+
+			var test2 = new TestModel({
+				name: "test2"
+			});
+			var test1 = new TestModel({
+				name : "test1",
+				assoc: test2
+			});
+
+			test1.save(function (err) {
+				assert.equal(err, null);
+				assert.equal(test2.saved(), true);
+
+				db.close();
+			});
+		});
+	});
+});

From 78dd4efc643dc55e8f69275c16fa67803b697158 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 4 Jun 2013 19:39:20 +0100
Subject: [PATCH 0444/1246] Adds save test for when an hasOne association is
 passed as an object

---
 .../test-save-hasone-association-new.js       | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 test/integration/test-save-hasone-association-new.js

diff --git a/test/integration/test-save-hasone-association-new.js b/test/integration/test-save-hasone-association-new.js
new file mode 100644
index 00000000..419b5810
--- /dev/null
+++ b/test/integration/test-save-hasone-association-new.js
@@ -0,0 +1,29 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	var TestModel = db.define('test_save_hasone_association_new', common.getModelProperties());
+	TestModel.hasOne("assoc", TestModel, { required: false });
+
+	TestModel.drop(function (err) {
+		assert.equal(err, null);
+
+		TestModel.sync(function (err) {
+			assert.equal(err, null);
+
+			var test1 = new TestModel({
+				name : "test1",
+				assoc: {
+					name: "test2"
+				}
+			});
+
+			test1.save(function (err) {
+				assert.equal(err, null);
+				assert.equal(test1.assoc.saved(), true);
+
+				db.close();
+			});
+		});
+	});
+});

From 5b3ffbc123d4808a78c72c085b8ca20e0c384964 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 4 Jun 2013 21:45:34 +0100
Subject: [PATCH 0445/1246] Adds notice about node.js 0.10.x support

---
 Readme.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Readme.md b/Readme.md
index b118aa9f..b98ec8b7 100755
--- a/Readme.md
+++ b/Readme.md
@@ -8,6 +8,12 @@
 npm install orm
 ```
 
+## Node.js Version Support
+
+Tests are done using [Travis CI](https://travis-ci.org/) for node versions 0.4.x, 0.6.x and 0.8.x. Because of full driver support,
+node 0.10.x is not tested yet due to the sqlite driver. If you don't use this driver, it should work just fine in latest versions, but
+you've been warned. Use at your own risk.
+
 ## DBMS Support
 
 - MySQL

From aa2a5e9d212ceb499a8e6c178571fd0944e8316f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 5 Jun 2013 10:09:56 +0100
Subject: [PATCH 0446/1246] Fixes bug introduced in 2.0.12 forcing extra
 properties being ignored (fixes #183)

---
 lib/Model.js | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/lib/Model.js b/lib/Model.js
index 80afd319..fbbd5b87 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -34,26 +34,29 @@ function Model(opts) {
 		var found_assoc = false, i, k;
 
 		for (k in data) {
-			if (k != "extra_field" && !opts.properties.hasOwnProperty(k) && opts.keys.indexOf(k) == -1
-			&& association_properties.indexOf(k) == -1) {
-				found_assoc = false;
-				for (i = 0; i < one_associations.length; i++) {
-					if (one_associations[i].name == k) {
+			if (k == "extra_field") continue;
+			if (opts.properties.hasOwnProperty(k)) continue;
+			if (inst_opts.extra && inst_opts.extra.hasOwnProperty(k)) continue;
+			if (opts.keys.indexOf(k) >= 0) continue;
+			if (association_properties.indexOf(k) >= 0) continue;
+
+			found_assoc = false;
+			for (i = 0; i < one_associations.length; i++) {
+				if (one_associations[i].name == k) {
+					found_assoc = true;
+					break;
+				}
+			}
+			if (!found_assoc) {
+				for (i = 0; i < many_associations.length; i++) {
+					if (many_associations[i].name == k) {
 						found_assoc = true;
 						break;
 					}
 				}
-				if (!found_assoc) {
-					for (i = 0; i < many_associations.length; i++) {
-						if (many_associations[i].name == k) {
-							found_assoc = true;
-							break;
-						}
-					}
-				}
-				if (!found_assoc) {
-					delete data[k];
-				}
+			}
+			if (!found_assoc) {
+				delete data[k];
 			}
 		}
 

From 62d5bcb8f51c7edc84022ab0112b3a9e60e36c0d Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 5 Jun 2013 10:39:09 +0100
Subject: [PATCH 0447/1246] 2.0.13

---
 Changelog.md | 8 ++++++++
 package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 6e282367..c79a4684 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,11 @@
+### v2.0.13 - 5 June 2013
+
+- Avoids throwing when calling db.close() without a callback and using pool in mysql (fixes #180)
+- Adds initial code to support passing associations when creating new instances (#162)
+- Changes Model.exists() to allow array or object passing
+- Allows passing an object instead of an instance as an hasOne asssociation
+- Fixes bug introduced in 2.0.12 forcing extra properties being ignored (fixes #183)
+
 ### v2.0.12 - 30 May 2013
 
 - New plugin: orm-paging
diff --git a/package.json b/package.json
index 90feea6c..96280042 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "redshift",
     "sqlite"
   ],
-  "version"     : "2.0.12",
+  "version"     : "2.0.13",
   "license"     : "MIT",
   "homepage"    : "http://dresende.github.io/node-orm2",
   "repository"  : "http://github.com/dresende/node-orm2.git",

From b4325ac8d86942b4202ed5ba9db02ed05f59e7bc Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 6 Jun 2013 17:21:51 +1000
Subject: [PATCH 0448/1246] Fix hasOne bug where saving a new instance with
 autoFetch true fails

---
 lib/Instance.js                               |  9 +++---
 test/common.js                                | 19 ++++++++++++
 .../test-association-hasone-autofetch.js      | 29 +++++++++++++++++++
 3 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 test/integration/test-association-hasone-autofetch.js

diff --git a/lib/Instance.js b/lib/Instance.js
index dab0208e..a687b19f 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -191,15 +191,16 @@ function Instance(opts) {
 		});
 	};
 	var saveAssociations = function (cb) {
-		var pending = 0, errored = false, i, j;
+		var pending = 0, errored = false, i, j, name;
 
 		for (i = 0; i < opts.one_associations.length; i++) {
-			if (!instance.hasOwnProperty(opts.one_associations[i].name)) continue;
+			name = opts.one_associations[i].name;
+			if (!instance.hasOwnProperty(name)) continue;
 
-			if (instance[opts.one_associations[i].name].isInstance) {
+			if (instance[name] && instance[name].isInstance) {
 				pending += 1;
 
-				instance[opts.one_associations[i].setAccessor](instance[opts.one_associations[i].name], function (err) {
+				instance[opts.one_associations[i].setAccessor](instance[name], function (err) {
 					if (err) {
 						if (errored) return;
 
diff --git a/test/common.js b/test/common.js
index bb3eefce..f18ce8ef 100644
--- a/test/common.js
+++ b/test/common.js
@@ -1,5 +1,6 @@
 var common = exports;
 var path   = require('path');
+var async  = require('async');
 var ORM    = require('../');
 
 common.ORM = ORM;
@@ -335,3 +336,21 @@ common.insertModelAssocData = function (table, db, data, cb) {
 			break;
 	}
 };
+
+common.dropSync = function (models, done) {
+	if (!Array.isArray(models)) {
+		models = [models];
+	}
+
+	async.eachSeries(models, function(item, cb) {
+		item.drop(function(err) {
+			if (err) throw err
+			item.sync(function(err) {
+				if (err) throw err
+				cb();
+			});
+		});
+	}, function() {
+		done();
+	});
+};
diff --git a/test/integration/test-association-hasone-autofetch.js b/test/integration/test-association-hasone-autofetch.js
new file mode 100644
index 00000000..5dc52a0e
--- /dev/null
+++ b/test/integration/test-association-hasone-autofetch.js
@@ -0,0 +1,29 @@
+var async  = require('async');
+var common = require('../common');
+var assert = require('assert');
+var ORM    = require('../../');
+
+common.createConnection(function (err, db) {
+  if (!db.driver.sync) return;
+
+  var Person = db.define('test_association_hasone_validate_owner',  common.getModelProperties());
+  var Animal = db.define('test_association_hasone_validate_animal', common.getModelProperties());
+  Animal.hasOne('owner', Person, { required: false, autoFetch: true });
+
+  async.series([
+    // setup
+    function(done) {
+      common.dropSync([Person, Animal], done);
+    },
+    // Should save as expected with autoFetch enabled [regression test]
+    function(done) {
+      var emu = new Animal({name: 'emu'});
+      emu.save(function(err) {
+        assert(!err);
+        done();
+      });
+    }
+  ], function() {
+    db.close();
+  });
+});

From afb00bd3362776401ca18aa2ec12b90f57c3aa78 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 5 Jun 2013 16:51:50 +1000
Subject: [PATCH 0449/1246] Add test case

---
 .../test-association-hasone-validate.js       | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 test/integration/test-association-hasone-validate.js

diff --git a/test/integration/test-association-hasone-validate.js b/test/integration/test-association-hasone-validate.js
new file mode 100644
index 00000000..61f55f11
--- /dev/null
+++ b/test/integration/test-association-hasone-validate.js
@@ -0,0 +1,42 @@
+var async  = require('async');
+var common = require('../common');
+var assert = require('assert');
+var ORM    = require('../../');
+
+common.createConnection(function (err, db) {
+  if (!db.driver.sync) return;
+
+  var Person = db.define('test_association_hasone_validate_owner',  common.getModelProperties());
+  var Animal = db.define('test_association_hasone_validate_animal',
+    common.getModelProperties(),
+    {
+      validations: {
+        owner_id: ORM.validators.unique()
+      }
+    }
+  );
+  Animal.hasOne('owner', Person, { required: true });
+
+  async.series([
+    // setup
+    function(done) {
+      common.dropSync([Person, Animal], done);
+    },
+    // Should be able to validate association properties
+    function(done) {
+      var john = new Person({name: 'John'});
+
+      john.save(function(err) {
+        assert(!err);
+
+        var emu = new Animal({name: 'emu', owner_id: null});
+        emu.save(function(err) {
+          // Should not raise any errors inside ORM
+          cb();
+        });
+      });
+    }
+  ], function() {
+    db.close();
+  });
+});

From c904f9c12dc989504f64d970478b86c017200698 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 6 Jun 2013 10:35:30 +1000
Subject: [PATCH 0450/1246] Fix test case

---
 test/integration/test-association-hasone-validate.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/integration/test-association-hasone-validate.js b/test/integration/test-association-hasone-validate.js
index 61f55f11..64403000 100644
--- a/test/integration/test-association-hasone-validate.js
+++ b/test/integration/test-association-hasone-validate.js
@@ -29,10 +29,12 @@ common.createConnection(function (err, db) {
       john.save(function(err) {
         assert(!err);
 
-        var emu = new Animal({name: 'emu', owner_id: null});
+        var emu = new Animal({name: 'emu', owner_id: john.id});
         emu.save(function(err) {
           // Should not raise any errors inside ORM
-          cb();
+
+          assert(!err);
+          done();
         });
       });
     }

From 065e5f360d094f4286a057433b2867eff929ce18 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 6 Jun 2013 11:45:47 +1000
Subject: [PATCH 0451/1246] Fixes issue #187

---
 lib/Instance.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index a687b19f..b1438622 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -24,9 +24,20 @@ function Instance(opts) {
 		});
 	};
 	var handleValidations = function (cb) {
-		var pending = [], errors = [];
+		var pending = [], errors = [], required;
+
 		for (var k in opts.validations) {
-			if (!opts.properties[k].required && instance[k] == null) {
+			if (opts.properties[k]) {
+				required = opts.properties[k].required;
+			} else {
+				for (var i = 0; i < opts.one_associations.length; i++) {
+					if (opts.one_associations[i].field == k) {
+						required = opts.one_associations[i].required;
+						break;
+					}
+				}
+			}
+			if(!required && instance[k] == null) {
 				continue; // avoid validating if property is not required and is "empty"
 			}
 			if (Array.isArray(opts.validations[k])) {

From 87025816c2a8f2ec79bffbe08a4820f792811a1f Mon Sep 17 00:00:00 2001
From: Edward Kline <esk525@gmail.com>
Date: Mon, 3 Jun 2013 14:14:53 +0000
Subject: [PATCH 0452/1246] Added test for non-autoincrement keys

---
 test/integration/test-key-nonincrement.js | 35 +++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100755 test/integration/test-key-nonincrement.js

diff --git a/test/integration/test-key-nonincrement.js b/test/integration/test-key-nonincrement.js
new file mode 100755
index 00000000..bcce959f
--- /dev/null
+++ b/test/integration/test-key-nonincrement.js
@@ -0,0 +1,35 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+
+	//define model with non-autoincrement primary key
+	var Contact = db.define('test-key-nonincrement', {
+		poc: { title:"POC", type: 'text', size: 65, required: true},
+		first_name: { type: 'text', size: 32, required: true},
+		last_name: { type: 'text', size: 32, required: true}
+	}, {
+		id: 'poc'
+	});
+
+	//sync the model to create the table if necessary
+	Contact.sync( function(err) {
+		if (err) {
+			console.error(err);
+			db.close();
+		} else {
+
+			//if sync is good, insert a record
+			var data = [{ poc: 'Edward Kline', first_name: 'Edward', last_name: 'Kline' }];
+
+
+			Contact.create( data, function(err, items) {
+				if (err) throw err;
+
+				console.log(items[0].poc, items[0].first_name, items[0].last_name);
+				assert(items[0].poc, 'Edward Kline');
+			});
+
+		}
+	});
+});
\ No newline at end of file

From 6ced3832389ec4ee0b56bf19caa68dfbb14eec91 Mon Sep 17 00:00:00 2001
From: Edward Kline <esk525@gmail.com>
Date: Mon, 3 Jun 2013 15:08:25 +0000
Subject: [PATCH 0453/1246] Added fix to mysql Adapter so that non-autoinc keys
 are not overwritten if the mysql adapater returns 0 for the insertId property
 of the info parameter; added a db.close call to the related test to properly
 close the connection if the test succeeds.

---
 lib/Drivers/DML/mysql.js                  | 6 +++++-
 test/integration/test-key-nonincrement.js | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 lib/Drivers/DML/mysql.js

diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
old mode 100644
new mode 100755
index a7e6dc32..413bea05
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -171,7 +171,11 @@ Driver.prototype.insert = function (table, data, id_prop, cb) {
 
 		if (id_prop !== null) {
 			if (id_prop.length == 1 && info.hasOwnProperty("insertId")) {
-				ids[id_prop[0]] = info.insertId;
+				if ( info.insertId !== 0 ) {
+					ids[id_prop[0]] = info.insertId;
+				} else {
+					ids[id_prop[0]] = data[id_prop[0]];
+				}
 			} else {
 				for (var i = 0; i < id_prop.length; i++) {
 					ids[id_prop[i]] = data[id_prop[i]];
diff --git a/test/integration/test-key-nonincrement.js b/test/integration/test-key-nonincrement.js
index bcce959f..7f8b391a 100755
--- a/test/integration/test-key-nonincrement.js
+++ b/test/integration/test-key-nonincrement.js
@@ -28,6 +28,7 @@ common.createConnection(function (err, db) {
 
 				console.log(items[0].poc, items[0].first_name, items[0].last_name);
 				assert(items[0].poc, 'Edward Kline');
+				db.close();
 			});
 
 		}

From 34a4b4e4f4d1b0aee9906d2cd4c38fcb7659f5b2 Mon Sep 17 00:00:00 2001
From: Edward Kline <esk525@gmail.com>
Date: Tue, 4 Jun 2013 13:56:49 +0000
Subject: [PATCH 0454/1246] Adding test and fix for mysql driver for
 non-autoincrement key

---
 lib/Drivers/DML/mysql.js                  | 8 ++------
 test/integration/test-key-nonincrement.js | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 413bea05..05df15e6 100755
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -170,12 +170,8 @@ Driver.prototype.insert = function (table, data, id_prop, cb) {
 		var ids = {};
 
 		if (id_prop !== null) {
-			if (id_prop.length == 1 && info.hasOwnProperty("insertId")) {
-				if ( info.insertId !== 0 ) {
-					ids[id_prop[0]] = info.insertId;
-				} else {
-					ids[id_prop[0]] = data[id_prop[0]];
-				}
+			if (id_prop.length == 1 && info.hasOwnProperty("insertId") && info.insertId !== 0 ) {
+				ids[id_prop[0]] = info.insertId;
 			} else {
 				for (var i = 0; i < id_prop.length; i++) {
 					ids[id_prop[i]] = data[id_prop[i]];
diff --git a/test/integration/test-key-nonincrement.js b/test/integration/test-key-nonincrement.js
index 7f8b391a..79ada907 100755
--- a/test/integration/test-key-nonincrement.js
+++ b/test/integration/test-key-nonincrement.js
@@ -20,15 +20,11 @@ common.createConnection(function (err, db) {
 		} else {
 
 			//if sync is good, insert a record
-			var data = [{ poc: 'Edward Kline', first_name: 'Edward', last_name: 'Kline' }];
-
+			var data = [{ poc: 'John Doe', first_name: 'John', last_name: 'Doe' }];
 
 			Contact.create( data, function(err, items) {
 				if (err) throw err;
-
-				console.log(items[0].poc, items[0].first_name, items[0].last_name);
-				assert(items[0].poc, 'Edward Kline');
-				db.close();
+				assert(items[0].poc, 'John Doe');
 			});
 
 		}

From aee2ae297a5e7ece50ac5f3010808f64b90d244d Mon Sep 17 00:00:00 2001
From: Edward Kline <esk525@gmail.com>
Date: Tue, 4 Jun 2013 16:45:48 +0000
Subject: [PATCH 0455/1246] Update test-key-nonincrement.js

---
 test/integration/test-key-nonincrement.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/integration/test-key-nonincrement.js b/test/integration/test-key-nonincrement.js
index 79ada907..9e09a0fc 100755
--- a/test/integration/test-key-nonincrement.js
+++ b/test/integration/test-key-nonincrement.js
@@ -25,8 +25,9 @@ common.createConnection(function (err, db) {
 			Contact.create( data, function(err, items) {
 				if (err) throw err;
 				assert(items[0].poc, 'John Doe');
+				db.close();
 			});
 
 		}
 	});
-});
\ No newline at end of file
+});

From aaaceb7805d1ce6b69798af5d184beb0d5bba23a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 6 Jun 2013 11:10:42 +0100
Subject: [PATCH 0456/1246] Tries to use insert data when returned info from
 driver does not exist

---
 lib/Instance.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index a687b19f..57cd2a31 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -148,7 +148,7 @@ function Instance(opts) {
 
 					opts.changes.length = 0;
 					for (var i = 0; i < opts.keys.length; i++) {
-						opts.data[opts.keys[i]] = info[opts.keys[i]];
+						opts.data[opts.keys[i]] = info.hasOwnProperty(opts.keys[i]) ? info[opts.keys[i]] : data[opts.keys[i]];
 					}
 					opts.is_new = false;
 

From cee0b6ee76379467acd9b8cbee73451438e839e2 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 6 Jun 2013 11:11:49 +0100
Subject: [PATCH 0457/1246] Lints test-key-nonincrement

.drop() + .sync() is always needed. When using common to create the
tables, they are temporary, but when using .sync() they're not and so
can keep garbage from test to test
---
 test/integration/test-key-nonincrement.js | 25 ++++++++++++-----------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/test/integration/test-key-nonincrement.js b/test/integration/test-key-nonincrement.js
index 9e09a0fc..abb0bfe4 100755
--- a/test/integration/test-key-nonincrement.js
+++ b/test/integration/test-key-nonincrement.js
@@ -2,32 +2,33 @@ var common     = require('../common');
 var assert     = require('assert');
 
 common.createConnection(function (err, db) {
+	assert.equal(err, null);
 
 	//define model with non-autoincrement primary key
 	var Contact = db.define('test-key-nonincrement', {
-		poc: { title:"POC", type: 'text', size: 65, required: true},
+		poc: { title: "POC", type: 'text', size: 65, required: true},
 		first_name: { type: 'text', size: 32, required: true},
 		last_name: { type: 'text', size: 32, required: true}
 	}, {
 		id: 'poc'
 	});
 
-	//sync the model to create the table if necessary
-	Contact.sync( function(err) {
-		if (err) {
-			console.error(err);
-			db.close();
-		} else {
+	// drop & sync the model (remove all data)
+	Contact.drop(function (err) {
+		assert.equal(err, null);
+
+		Contact.sync(function (err) {
+			assert.equal(err, null);
 
 			//if sync is good, insert a record
 			var data = [{ poc: 'John Doe', first_name: 'John', last_name: 'Doe' }];
 
-			Contact.create( data, function(err, items) {
-				if (err) throw err;
-				assert(items[0].poc, 'John Doe');
+			Contact.create(data, function (err, items) {
+				assert.equal(err, null);
+				assert.equal(items[0].poc, 'John Doe');
+
 				db.close();
 			});
-
-		}
+		});
 	});
 });

From 26df85f9f2ce3ed4d4a4eb95012611c504eb1f87 Mon Sep 17 00:00:00 2001
From: Alex Gaman <agaman@gmail.com>
Date: Fri, 7 Jun 2013 15:49:59 -0300
Subject: [PATCH 0458/1246] Allow db.load() to work outside of module.exports

---
 lib/ORM.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/ORM.js b/lib/ORM.js
index 38f1ab01..00e8800e 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -224,6 +224,8 @@ ORM.prototype.load = function (file, cb) {
 		cwd = path.dirname(m[1]);
 	} else if ((m = tmp.match(/^\s*at\s+module\.exports\s+\((.+?)\)/)) !== null) {
 		cwd = path.dirname(m[1]);
+	} else if ((m = tmp.match(/^\s*at\s+.+\s+\((.+):\d+:\d+\)$/)) !== null) {
+		cwd = path.dirname(m[1]);
 	}
 
 	if (file[0] != path.sep) {

From b90ca027f79a97ff0e721848fccee903831f5b2e Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 11 Jun 2013 19:57:23 +0100
Subject: [PATCH 0459/1246] Adds .findByX(...) to .hasOne("X", ...)

---
 lib/Associations/One.js                       | 30 ++++++++++++++++
 .../test-association-hasone-findby.js         | 35 +++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 test/integration/test-association-hasone-findby.js

diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index 97cee85f..72031325 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -36,6 +36,36 @@ exports.prepare = function (Model, associations, association_properties, model_f
 				autoFetchLimit : association.autoFetchLimit
 			});
 		}
+
+		Model["findBy" + assocName] = function () {
+			var cb = null, conditions = null, options = {};
+
+			for (var i = 0; i < arguments.length; i++) {
+				switch (typeof arguments[i]) {
+					case "function":
+						cb = arguments[i];
+						break;
+					case "object":
+						if (conditions === null) {
+							conditions = arguments[i];
+						} else {
+							options = arguments[i];
+						}
+						break;
+				}
+			}
+
+			options.__merge = {
+				from: { table: association.model.table, field: association.model.id },
+				to: { table: Model.table, field: association.field },
+				where: [ association.model.table, conditions ]
+			};
+
+			options.extra = [];
+
+			return Model.find({}, options, cb);
+		};
+
 		return this;
 	};
 };
diff --git a/test/integration/test-association-hasone-findby.js b/test/integration/test-association-hasone-findby.js
new file mode 100644
index 00000000..912e4ada
--- /dev/null
+++ b/test/integration/test-association-hasone-findby.js
@@ -0,0 +1,35 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+// yes, this test is confusing, it's because .findBy*() currently only works on different tables,
+// you cannot have a relationship to the same table (because of sql-query table alias restriction)
+common.createConnection(function (err, db) {
+	common.createModel2Table('test_association_hasone_findby', db.driver.db, function () {
+		common.insertModel2Data('test_association_hasone_findby', db.driver.db, [
+			{ id : 1, name : 'test1', assoc: 3 },
+			{ id : 2, name : 'test2', assoc: 0 }
+		], function (err) {
+			common.createModelTable('test_association_hasone_findby2', db.driver.db, function () {
+				common.insertModelData('test_association_hasone_findby2', db.driver.db, [
+					{ id : 3, name : 'test3' },
+					{ id : 4, name : 'test4' }
+				], function (err) {
+					if (err) throw err;
+
+					var TestModel2 = db.define('test_association_hasone_findby2', common.getModelProperties());
+					var TestModel = db.define('test_association_hasone_findby', common.getModelProperties());
+					TestModel.hasOne("assoc", TestModel2);
+
+					TestModel.findByAssoc({ name: "test3" }, function (err, Tests) {
+						assert.equal(err, null);
+						assert.equal(Array.isArray(Tests), true);
+						assert.equal(Tests.length, 1);
+						assert.equal(typeof Tests[0], "object");
+						assert.equal(Tests[0].id, 1);
+						db.close();
+					});
+				});
+			});
+		});
+	});
+});

From dac51fe3c5e074ccb877250e3e8493c664271060 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 12 Jun 2013 00:04:54 +0100
Subject: [PATCH 0460/1246] Adds possibility to add a callback to
 ChainFind.find() (#190)

---
 lib/ChainFind.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 55bb45ce..53faafbb 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -5,13 +5,16 @@ module.exports = ChainFind;
 
 function ChainFind(Model, opts) {
 	var chain = {
-		find: function (conditions) {
+		find: function (conditions, cb) {
 			if (!opts.conditions) {
 				opts.conditions = {};
 			}
 			for (var k in conditions) {
 				opts.conditions[k] = conditions[k];
 			}
+			if (typeof cb == "function") {
+				return this.all(cb);
+			}
 			return this;
 		},
 		only: function () {

From 1937f46c1387f197172d1a674ed2fb38c112e26d Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 12 Jun 2013 00:05:32 +0100
Subject: [PATCH 0461/1246] Forces .findByX() to have conditions and passes
 callback to Model.find() only if defined (#190)

---
 lib/Associations/One.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index 72031325..84278c17 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -55,15 +55,21 @@ exports.prepare = function (Model, associations, association_properties, model_f
 				}
 			}
 
+			if (conditions === null) {
+				throw new Error(".findBy" + assocName + "() is missing a conditions object");
+			}
+
 			options.__merge = {
 				from: { table: association.model.table, field: association.model.id },
 				to: { table: Model.table, field: association.field },
 				where: [ association.model.table, conditions ]
 			};
-
 			options.extra = [];
 
-			return Model.find({}, options, cb);
+			if (typeof cb == "function") {
+				return Model.find({}, options, cb);
+			}
+			return Model.find({}, options);
 		};
 
 		return this;

From 3f7f974cd6c0cc16326a6b260c4e06db10a9e05f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 12 Jun 2013 00:05:55 +0100
Subject: [PATCH 0462/1246] Changes Model.find() to check if cb is really a
 function (and not just "not null")

---
 lib/Model.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Model.js b/lib/Model.js
index fbbd5b87..3451806d 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -321,7 +321,8 @@ function Model(opts) {
 				});
 			}
 		});
-		if (cb === null) {
+
+		if (typeof cb != "function") {
 			return chain;
 		}
 

From 7f2bba3cd6d51aa50bc5c31a9e7b33f0c101cb27 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 12 Jun 2013 00:06:25 +0100
Subject: [PATCH 0463/1246] Passes original table to possible conditions in
 merge queries (JOINs) (#190)

---
 lib/Drivers/DML/mysql.js    | 4 ++--
 lib/Drivers/DML/postgres.js | 4 ++--
 lib/Drivers/DML/sqlite.js   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 05df15e6..b5dcfac7 100755
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -112,9 +112,9 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	if (opts.merge) {
 		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field).select(opts.merge.select);
 		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
-			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions);
+			q = q.where(opts.merge.where[0], opts.merge.where[1], table, conditions);
 		} else {
-			q = q.where(conditions);
+			q = q.where(table, conditions);
 		}
 	} else {
 		q = q.where(conditions);
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 3245b6f1..2ace7fed 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -135,9 +135,9 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	if (opts.merge) {
 		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field).select(opts.merge.select);
 		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
-			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions);
+			q = q.where(opts.merge.where[0], opts.merge.where[1], table, conditions);
 		} else {
-			q = q.where(conditions);
+			q = q.where(table, conditions);
 		}
 	} else {
 		q = q.where(conditions);
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 93456d27..cbcd3a09 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -83,9 +83,9 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	if (opts.merge) {
 		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field).select(opts.merge.select);
 		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
-			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions);
+			q = q.where(opts.merge.where[0], opts.merge.where[1], table, conditions);
 		} else {
-			q = q.where(conditions);
+			q = q.where(table, conditions);
 		}
 	} else {
 		q = q.where(conditions);

From bb99f497b30e7510dee4403275b28b8977e92b6e Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 12 Jun 2013 00:07:09 +0100
Subject: [PATCH 0464/1246] Improves test-association-hasone-findby to test
 ChainFind.find()

---
 test/integration/test-association-hasone-findby.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/test-association-hasone-findby.js b/test/integration/test-association-hasone-findby.js
index 912e4ada..c93b2baa 100644
--- a/test/integration/test-association-hasone-findby.js
+++ b/test/integration/test-association-hasone-findby.js
@@ -20,7 +20,7 @@ common.createConnection(function (err, db) {
 					var TestModel = db.define('test_association_hasone_findby', common.getModelProperties());
 					TestModel.hasOne("assoc", TestModel2);
 
-					TestModel.findByAssoc({ name: "test3" }, function (err, Tests) {
+					TestModel.findByAssoc({ name: "test3" }).find({ name: "test1" }, function (err, Tests) {
 						assert.equal(err, null);
 						assert.equal(Array.isArray(Tests), true);
 						assert.equal(Tests.length, 1);

From 805a3415bfbb45cff00d047bd8f9e14ead4dcb51 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 12 Jun 2013 00:14:10 +0100
Subject: [PATCH 0465/1246] Fixes previous change to use table in conditions.
 This needs to be passed by .find()

---
 lib/Associations/One.js     | 3 ++-
 lib/Drivers/DML/mysql.js    | 4 ++--
 lib/Drivers/DML/postgres.js | 4 ++--
 lib/Drivers/DML/sqlite.js   | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index 84278c17..ad63ff5e 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -62,7 +62,8 @@ exports.prepare = function (Model, associations, association_properties, model_f
 			options.__merge = {
 				from: { table: association.model.table, field: association.model.id },
 				to: { table: Model.table, field: association.field },
-				where: [ association.model.table, conditions ]
+				where: [ association.model.table, conditions ],
+				table: Model.table
 			};
 			options.extra = [];
 
diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index b5dcfac7..0dedad1d 100755
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -112,9 +112,9 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	if (opts.merge) {
 		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field).select(opts.merge.select);
 		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
-			q = q.where(opts.merge.where[0], opts.merge.where[1], table, conditions);
+			q = q.where(opts.merge.where[0], opts.merge.where[1], opts.merge.table || null, conditions);
 		} else {
-			q = q.where(table, conditions);
+			q = q.where(opts.merge.table || null, conditions);
 		}
 	} else {
 		q = q.where(conditions);
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 2ace7fed..30f86d51 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -135,9 +135,9 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	if (opts.merge) {
 		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field).select(opts.merge.select);
 		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
-			q = q.where(opts.merge.where[0], opts.merge.where[1], table, conditions);
+			q = q.where(opts.merge.where[0], opts.merge.where[1], opts.merge.table || null, conditions);
 		} else {
-			q = q.where(table, conditions);
+			q = q.where(opts.merge.table || null, conditions);
 		}
 	} else {
 		q = q.where(conditions);
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index cbcd3a09..c5635d0a 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -83,9 +83,9 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	if (opts.merge) {
 		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field).select(opts.merge.select);
 		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
-			q = q.where(opts.merge.where[0], opts.merge.where[1], table, conditions);
+			q = q.where(opts.merge.where[0], opts.merge.where[1], opts.merge.table || null, conditions);
 		} else {
-			q = q.where(table, conditions);
+			q = q.where(opts.merge.table || null, conditions);
 		}
 	} else {
 		q = q.where(conditions);

From 410c2a54013bbada05697c37e68c0cb06503b21a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 12 Jun 2013 00:22:35 +0100
Subject: [PATCH 0466/1246] Changes db.load() to return value from loaded and
 invoked function (#194)

---
 lib/ORM.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index 00e8800e..9257ff6d 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -236,7 +236,7 @@ ORM.prototype.load = function (file, cb) {
 	}
 
 	try {
-		require(file)(this, cb);
+		return require(file)(this, cb);
 	} catch (ex) {
 		return cb(ex);
 	}

From 0dd26658aa99c626af91d0678abf2a756c895da6 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 12 Jun 2013 00:33:40 +0100
Subject: [PATCH 0467/1246] Fixes some hasMany association usage of
 Association.id to check for real id property name (#197)

---
 lib/Associations/Many.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 5bc2a9de..4a412f2e 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -239,8 +239,8 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 				}
 
 				for (var i = 0; i < Associations.length; i++) {
-					if (Associations[i].id) {
-						associationIds.push(Associations[i].id);
+					if (Associations[i][association.model.id]) {
+						associationIds.push(Associations[i][association.model.id]);
 					}
 				}
 
@@ -289,7 +289,7 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 
 						var data = {};
 						data[association.mergeId] = Instance[Model.id];
-						data[association.mergeAssocId] = Association.id;
+						data[association.mergeAssocId] = Association[association.model.id];
 
 						for (var k in opts) {
 							data[k] = opts[k];

From 594f63e050746309195ae84a33809ee4f6fffa6e Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 12 Jun 2013 16:13:24 +1000
Subject: [PATCH 0468/1246] Fix required property model.save only threw a
 single error with returnAllErrors=true. Add some mocha tests and refactor
 some validation tests.

---
 lib/Associations/Many.js                      |   2 +-
 lib/Instance.js                               |  20 +--
 lib/Model.js                                  |  27 ++-
 lib/ORM.js                                    |   5 -
 lib/Property.js                               |   2 +-
 lib/Validators.js                             |  12 ++
 package.json                                  |  15 +-
 .../integration/test-predefined-validation.js |  23 ---
 test/integration/test-property-types.js       |  20 +--
 .../test-validation-none-if-not-required.js   |  26 ---
 .../test-validation-return-all-errors.js      |  34 ----
 test/integration2/validation.js               | 162 ++++++++++++++++++
 test/mocha.opts                               |   1 +
 test/support/spec_helper.js                   |  27 +++
 14 files changed, 249 insertions(+), 127 deletions(-)
 delete mode 100644 test/integration/test-predefined-validation.js
 delete mode 100644 test/integration/test-validation-none-if-not-required.js
 delete mode 100644 test/integration/test-validation-return-all-errors.js
 create mode 100644 test/integration2/validation.js
 create mode 100644 test/mocha.opts
 create mode 100644 test/support/spec_helper.js

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 4a412f2e..8eb1bf85 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -37,7 +37,7 @@ exports.prepare = function (Model, associations) {
 			props = {};
 		} else {
 			for (var k in props) {
-				props[k] = Property.check(props[k], Model.settings);
+				props[k] = Property.standardize(props[k], Model.settings);
 			}
 		}
 
diff --git a/lib/Instance.js b/lib/Instance.js
index 31dbab30..10af2cfc 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -37,15 +37,11 @@ function Instance(opts) {
 					}
 				}
 			}
-			if(!required && instance[k] == null) {
+			if (!required && instance[k] == null) {
 				continue; // avoid validating if property is not required and is "empty"
 			}
-			if (Array.isArray(opts.validations[k])) {
-				for (var i = 0; i < opts.validations[k].length; i++) {
-					pending.push([ k, opts.validations[k][i] ]);
-				}
-			} else {
-				pending.push([ k, opts.validations[k] ]);
+			for (var i = 0; i < opts.validations[k].length; i++) {
+				pending.push([ k, opts.validations[k][i] ]);
 			}
 		}
 		var checkNextValidation = function () {
@@ -97,16 +93,6 @@ function Instance(opts) {
 				if (!opts.properties.hasOwnProperty(k)) continue;
 				if (opts.data[k] == null && opts.properties[k].hasOwnProperty("defaultValue")) {
 					opts.data[k] = opts.properties[k].defaultValue;
-				} else if (opts.properties[k].required && opts.data[k] == null) {
-					var requireErr = new Error("required");
-					requireErr.field = k;
-					requireErr.value = opts.data[k];
-
-					Hook.trigger(instance, opts.hooks.afterSave, false);
-					if (typeof cb == "function") {
-						cb(requireErr, instance);
-					}
-					return;
 				}
 			}
 
diff --git a/lib/Model.js b/lib/Model.js
index 3451806d..b1c2cf23 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -1,10 +1,12 @@
-var Instance        = require("./Instance").Instance;
-var Singleton       = require("./Singleton");
-var OneAssociation  = require("./Associations/One");
-var ManyAssociation = require("./Associations/Many");
 var ChainFind       = require("./ChainFind");
+var Instance        = require("./Instance").Instance;
 var LazyLoad        = require("./LazyLoad");
+var ManyAssociation = require("./Associations/Many");
+var OneAssociation  = require("./Associations/One");
+var Property        = require("./Property");
+var Singleton       = require("./Singleton");
 var Utilities       = require("./Utilities");
+var Validators      = require("./Validators");
 
 exports.Model = Model;
 
@@ -118,10 +120,27 @@ function Model(opts) {
 		});
 	};
 
+	// Standardize validations
+	for (var k in opts.validations) {
+		if (typeof opts.validations[k] == 'function') {
+			opts.validations[k] = [opts.validations[k]]
+		}
+	}
+
 	for (var k in opts.properties) {
+		opts.properties[k] = Property.standardize(opts.properties[k], opts.settings);
+
 		if (opts.properties[k].lazyload !== true) {
 			model_fields.push(k);
 		}
+		if (opts.properties[k].required) {
+			// Prepend `required` validation
+			if(opts.validations.hasOwnProperty(k)) {
+				opts.validations[k].splice(0, 0, Validators.required());
+			} else {
+				opts.validations[k] = [Validators.required()];
+			}
+		}
 	}
 
 	model.settings = opts.settings;
diff --git a/lib/ORM.js b/lib/ORM.js
index 9257ff6d..a68ba2ca 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -8,7 +8,6 @@ var Query          = require("sql-query");
 var Model          = require("./Model").Model;
 var DriverAliases  = require("./Drivers/aliases");
 var Validators     = require("./Validators");
-var Property       = require("./Property");
 var Settings       = require("./Settings");
 
 exports.validators = Validators;
@@ -174,10 +173,6 @@ ORM.prototype.define = function (name, properties, opts) {
 	properties = properties || {};
 	opts       = opts || {};
 
-	for (var k in properties) {
-		properties[k] = Property.check(properties[k], this.settings);
-	}
-
 	this.models[name] = new Model({
 		settings       : this.settings,
 		driver_name    : this.driver_name,
diff --git a/lib/Property.js b/lib/Property.js
index d1893e72..4d1403f8 100644
--- a/lib/Property.js
+++ b/lib/Property.js
@@ -1,4 +1,4 @@
-exports.check = function (prop, Settings) {
+exports.standardize = function (prop, Settings) {
 	if (typeof prop == "function") {
 		switch (prop.name) {
 			case "String":
diff --git a/lib/Validators.js b/lib/Validators.js
index a3f31aff..08083a0e 100644
--- a/lib/Validators.js
+++ b/lib/Validators.js
@@ -4,6 +4,18 @@
  **/
 var validators = {};
 
+
+/**
+ * Make sure the property isn't `NULL` or `undefined`.
+ * Note: 0 and '' will be considered valid.
+ **/
+validators.required = function (msg) {
+	return function (v, next) {
+		if(v === null || v === undefined) return next(msg || 'required')
+		else return next();
+	};
+};
+
 /**
  * Check if a number is between a minimum and
  * a maximum number. One of this constraints
diff --git a/package.json b/package.json
index 96280042..b5db6d28 100644
--- a/package.json
+++ b/package.json
@@ -41,12 +41,15 @@
     "hat"            : "0.0.3"
   },
   "devDependencies": {
-    "utest"     : "0.0.6",
-    "urun"      : "0.0.6",
-    "mysql"     : "2.0.0-alpha7",
-    "pg"        : "1.0.0",
-    "sqlite3"   : "2.1.7",
-    "async"     : "*"
+    "utest"   : "0.0.6",
+    "urun"    : "0.0.6",
+    "mysql"   : "2.0.0-alpha7",
+    "pg"      : "1.0.0",
+    "sqlite3" : "2.1.7",
+    "async"   : "*",
+    "mocha"   : "1.10.0",
+    "should"  : "1.2.2",
+    "lodash"  : "1.3.0"
   },
   "optionalDependencies": {}
 }
diff --git a/test/integration/test-predefined-validation.js b/test/integration/test-predefined-validation.js
deleted file mode 100644
index fe165ca7..00000000
--- a/test/integration/test-predefined-validation.js
+++ /dev/null
@@ -1,23 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_predefined_validation', db.driver.db, function () {
-		var TestModel = db.define('test_predefined_validation', common.getModelProperties(), {
-			validations: {
-				name: db.validators.rangeLength(2, 3)
-			}
-		});
-
-		var Test = new TestModel({ name: "test-predefined-validation" });
-		Test.save(function (err) {
-			assert.equal(typeof err, "object");
-			assert.equal(err.field, "name");
-			assert.equal(err.value, "test-predefined-validation");
-			assert.equal(err.msg, "out-of-range-length");
-			assert.equal(err.type, "validation");
-
-			db.close();
-		});
-	});
-});
diff --git a/test/integration/test-property-types.js b/test/integration/test-property-types.js
index 159e01e6..be2a523e 100644
--- a/test/integration/test-property-types.js
+++ b/test/integration/test-property-types.js
@@ -3,14 +3,14 @@ var assert     = require('assert');
 var Property   = require('../../lib/Property');
 var Settings   = common.ORM.settings;
 
-assert.equal(Property.check(String, Settings).type, "text");
-assert.equal(Property.check(Number, Settings).type, "number");
-assert.equal(Property.check(Boolean, Settings).type, "boolean");
-assert.equal(Property.check(Date, Settings).type, "date");
-assert.equal(Property.check(Object, Settings).type, "object");
-assert.equal(Property.check(Buffer, Settings).type, "binary");
-assert.equal(Property.check([ 'a', 'b' ], Settings).type, "enum");
-assert.deepEqual(Property.check([ 'a', 'b' ], Settings).values, [ 'a', 'b' ]);
+assert.equal(Property.standardize(String, Settings).type, "text");
+assert.equal(Property.standardize(Number, Settings).type, "number");
+assert.equal(Property.standardize(Boolean, Settings).type, "boolean");
+assert.equal(Property.standardize(Date, Settings).type, "date");
+assert.equal(Property.standardize(Object, Settings).type, "object");
+assert.equal(Property.standardize(Buffer, Settings).type, "binary");
+assert.equal(Property.standardize([ 'a', 'b' ], Settings).type, "enum");
+assert.deepEqual(Property.standardize([ 'a', 'b' ], Settings).values, [ 'a', 'b' ]);
 
 assert.equal({ type: "text" }.type, "text");
 assert.equal({ type: "number" }.type, "number");
@@ -20,5 +20,5 @@ assert.equal({ type: "enum" }.type, "enum");
 assert.equal({ type: "object" }.type, "object");
 assert.equal({ type: "binary" }.type, "binary");
 
-assert.throws(function () { Property.check({ type: "buffer" }, Settings); });
-assert.throws(function () { Property.check({ type: "unknown" }, Settings); });
+assert.throws(function () { Property.standardize({ type: "buffer" }, Settings); });
+assert.throws(function () { Property.standardize({ type: "unknown" }, Settings); });
diff --git a/test/integration/test-validation-none-if-not-required.js b/test/integration/test-validation-none-if-not-required.js
deleted file mode 100644
index 856c2692..00000000
--- a/test/integration/test-validation-none-if-not-required.js
+++ /dev/null
@@ -1,26 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_validation_none_if_not_required', db.driver.db, function () {
-		var calledValidation = false;
-		var TestModel = db.define('test_validation_none_if_not_required', {
-			name : { type: "text", required: false }
-		}, {
-			validations: {
-				name: function (name, next) {
-					calledValidation = true;
-					return next();
-				}
-			}
-		});
-
-		var Test = new TestModel();
-		Test.save(function (err) {
-			// it doesn't matter the error..
-			assert.equal(calledValidation, false);
-
-			db.close();
-		});
-	});
-});
diff --git a/test/integration/test-validation-return-all-errors.js b/test/integration/test-validation-return-all-errors.js
deleted file mode 100644
index 61f129a3..00000000
--- a/test/integration/test-validation-return-all-errors.js
+++ /dev/null
@@ -1,34 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-  db.settings.set('instance.returnAllErrors', true);
-  common.createModelTable('test_validation_all_errors', db.driver.db, function () {
-    var TestModel = db.define('test_validation_all_errors', common.getModelProperties(), {
-      validations: {
-        name: [
-          function (name, next) {
-            return next('force-fail');
-          },
-          function (name, next) {
-            return next('force-fail-2');
-          }
-        ]
-      }
-    });
-
-    var Test = new TestModel({ name: "test-validation" });
-    Test.save(function (err) {
-      assert(Array.isArray(err));
-      assert.deepEqual( err.map(function(e) { return e.msg; } ), ['force-fail','force-fail-2'] );
-
-      Test = new TestModel({ name: "test-validation" });
-      Test.validate(function (err) {
-        assert(Array.isArray(err));
-        assert.deepEqual( err.map(function(e) { return e.msg; } ), ['force-fail','force-fail-2'] );
-
-        db.close();
-      });
-    });
-  });
-});
diff --git a/test/integration2/validation.js b/test/integration2/validation.js
new file mode 100644
index 00000000..3343db42
--- /dev/null
+++ b/test/integration2/validation.js
@@ -0,0 +1,162 @@
+var _        = require('lodash');
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var ORM      = require('../../');
+
+describe("Validations", function() {
+  var db = null;
+  var Person = null;
+
+  var setup = function(returnAll, required) {
+    return function(done) {
+      db.settings.set('properties.required',      required);
+      db.settings.set('instance.returnAllErrors', returnAll);
+
+      Person = db.define("tvae", {
+        name:   { type: 'text'   },
+        height: { type: 'number' }
+      }, {
+        validations: {
+          name:   ORM.validators.rangeLength(3, 30),
+          height: ORM.validators.rangeNumber(0.1, 3.0)
+        }
+      });
+
+      helper.dropSync(Person, done);
+    }
+  }
+
+  before(function(done) {
+    helper.connect(function(connection) {
+      db = connection;
+      done();
+    });
+  });
+
+  describe("predefined", function() {
+    before(setup(false, false));
+
+    it("should work", function(done) {
+      var john = new Person({name: 'fdhdjendfjkdfhshdfhakdfjajhfdjhbfgk'});
+      john.save(function(err) {
+        should.equal(typeof err, "object");
+        should.equal(err.field,  'name');
+        should.equal(err.value,  'fdhdjendfjkdfhshdfhakdfjajhfdjhbfgk');
+        should.equal(err.msg,    'out-of-range-length');
+        should.equal(err.type,   'validation');
+        should.equal(john.id,     null);
+        done();
+      });
+    });
+  });
+
+  describe("instance.returnAllErrors=false", function() {
+    describe("properties.required=false", function() {
+      before(setup(false, false));
+
+      it("should save when properties are null", function(done) {
+        var john = new Person();
+        john.save(function(err) {
+          should.equal(err, null);
+          john.id.should.be.a('number');
+          done();
+        });
+      });
+
+      it("shouldn't save when a property is invalid", function(done) {
+        var john = new Person({height: 4});
+        john.save(function(err) {
+          should.notEqual(err, null);
+          should.equal(err.field, 'height');
+          should.equal(err.value, 4);
+          should.equal(err.msg, 'out-of-range-number');
+          should.equal(err.type, 'validation');
+          should.equal(john.id, null);
+          done();
+        });
+      });
+    });
+
+    describe("properties.required=true", function() {
+      before(setup(false, true));
+
+      it("should not save when properties are null", function(done) {
+        var john = new Person();
+        john.save(function(err) {
+          should.notEqual(err, null);
+          should.equal(john.id, null);
+          done();
+        });
+      });
+
+      it("should return a required error when the first property is blank", function(done) {
+        var john = new Person({height: 4});
+        john.save(function(err) {
+          should.notEqual(err, null);
+          should.equal(err.field, 'name');
+          should.equal(err.value, null);
+          should.equal(err.msg, 'required');
+          should.equal(err.type, 'validation');
+          should.equal(john.id, null);
+          done();
+        });
+      });
+    });
+  });
+
+  describe("instance.returnAllErrors=true", function() {
+    describe("properties.required=false", function() {
+      before(setup(true, false));
+
+      it("should return all errors when a property is invalid", function(done) {
+        var john = new Person({name: 'n', height: 4});
+        john.save(function(err) {
+          should.notEqual(err, null);
+          should(Array.isArray(err));
+          should.equal(err.length, 2);
+
+          should.deepEqual(err[0], _.extend(new Error(),{
+            field: 'name', value: 'n', msg: 'out-of-range-length'
+          }));
+
+          should.deepEqual(err[1], _.extend(new Error(),{
+            field: 'height', value: '4', msg: 'out-of-range-number'
+          }));
+
+          should.equal(john.id, null);
+          done();
+        });
+      });
+    });
+
+    describe("properties.required=true", function() {
+      before(setup(true, true));
+
+      it("should return required and user specified validation errors", function(done) {
+        var john = new Person({height: 4});
+        john.save(function(err) {
+          should.notEqual(err, null);
+          should(Array.isArray(err));
+          should.equal(err.length, 3);
+
+          // `type` is a non enumerable undocumented property of `Error` in V8.
+          should.deepEqual(err[0], _.extend(new Error(),{
+            field: 'name', value: null, msg: 'required'
+          }));
+
+          should.deepEqual(err[1], _.extend(new Error(),{
+            field: 'name', value: null, msg: 'undefined'
+          }));
+
+          should.deepEqual(err[2], _.extend(new Error(),{
+            field: 'height', value: '4', msg: 'out-of-range-number'
+          }));
+
+          should.equal(john.id, null);
+          done();
+        });
+      });
+    });
+  });
+
+});
diff --git a/test/mocha.opts b/test/mocha.opts
new file mode 100644
index 00000000..d9a95e80
--- /dev/null
+++ b/test/mocha.opts
@@ -0,0 +1 @@
+--reporter nyan
diff --git a/test/support/spec_helper.js b/test/support/spec_helper.js
new file mode 100644
index 00000000..53f1a988
--- /dev/null
+++ b/test/support/spec_helper.js
@@ -0,0 +1,27 @@
+var common = require('../common');
+var async  = require('async');
+
+module.exports.connect = function(cb) {
+  common.createConnection(function(err, conn) {
+    if (err) throw err;
+    cb(conn);
+  });
+};
+
+module.exports.dropSync = function (models, done) {
+  if (!Array.isArray(models)) {
+    models = [models];
+  }
+
+  async.eachSeries(models, function(item, cb) {
+    item.drop(function(err) {
+      if (err) throw err
+      item.sync(function(err) {
+        if (err) throw err
+        cb();
+      });
+    });
+  }, function() {
+    done();
+  });
+};

From 2a34e025b9ae81cbd1d0e9cda690376aa251bddf Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 12 Jun 2013 19:24:18 +1000
Subject: [PATCH 0469/1246] Rename standardize to normalize. Hook up both test
 sets

---
 lib/Associations/Many.js                |  2 +-
 lib/Model.js                            |  2 +-
 lib/Property.js                         |  2 +-
 package.json                            |  2 +-
 test/integration/test-property-types.js | 20 ++++++-------
 test/run.js                             | 38 +++++++++++++++++++++----
 6 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 8eb1bf85..7ee65670 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -37,7 +37,7 @@ exports.prepare = function (Model, associations) {
 			props = {};
 		} else {
 			for (var k in props) {
-				props[k] = Property.standardize(props[k], Model.settings);
+				props[k] = Property.normalize(props[k], Model.settings);
 			}
 		}
 
diff --git a/lib/Model.js b/lib/Model.js
index b1c2cf23..17cefd0c 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -128,7 +128,7 @@ function Model(opts) {
 	}
 
 	for (var k in opts.properties) {
-		opts.properties[k] = Property.standardize(opts.properties[k], opts.settings);
+		opts.properties[k] = Property.normalize(opts.properties[k], opts.settings);
 
 		if (opts.properties[k].lazyload !== true) {
 			model_fields.push(k);
diff --git a/lib/Property.js b/lib/Property.js
index 4d1403f8..6c164f1f 100644
--- a/lib/Property.js
+++ b/lib/Property.js
@@ -1,4 +1,4 @@
-exports.standardize = function (prop, Settings) {
+exports.normalize = function (prop, Settings) {
 	if (typeof prop == "function") {
 		switch (prop.name) {
 			case "String":
diff --git a/package.json b/package.json
index b5db6d28..32a45d86 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "async"   : "*",
     "mocha"   : "1.10.0",
     "should"  : "1.2.2",
-    "lodash"  : "1.3.0"
+    "lodash"  : "1.2.1"
   },
   "optionalDependencies": {}
 }
diff --git a/test/integration/test-property-types.js b/test/integration/test-property-types.js
index be2a523e..560a118a 100644
--- a/test/integration/test-property-types.js
+++ b/test/integration/test-property-types.js
@@ -3,14 +3,14 @@ var assert     = require('assert');
 var Property   = require('../../lib/Property');
 var Settings   = common.ORM.settings;
 
-assert.equal(Property.standardize(String, Settings).type, "text");
-assert.equal(Property.standardize(Number, Settings).type, "number");
-assert.equal(Property.standardize(Boolean, Settings).type, "boolean");
-assert.equal(Property.standardize(Date, Settings).type, "date");
-assert.equal(Property.standardize(Object, Settings).type, "object");
-assert.equal(Property.standardize(Buffer, Settings).type, "binary");
-assert.equal(Property.standardize([ 'a', 'b' ], Settings).type, "enum");
-assert.deepEqual(Property.standardize([ 'a', 'b' ], Settings).values, [ 'a', 'b' ]);
+assert.equal(Property.normalize(String, Settings).type, "text");
+assert.equal(Property.normalize(Number, Settings).type, "number");
+assert.equal(Property.normalize(Boolean, Settings).type, "boolean");
+assert.equal(Property.normalize(Date, Settings).type, "date");
+assert.equal(Property.normalize(Object, Settings).type, "object");
+assert.equal(Property.normalize(Buffer, Settings).type, "binary");
+assert.equal(Property.normalize([ 'a', 'b' ], Settings).type, "enum");
+assert.deepEqual(Property.normalize([ 'a', 'b' ], Settings).values, [ 'a', 'b' ]);
 
 assert.equal({ type: "text" }.type, "text");
 assert.equal({ type: "number" }.type, "number");
@@ -20,5 +20,5 @@ assert.equal({ type: "enum" }.type, "enum");
 assert.equal({ type: "object" }.type, "object");
 assert.equal({ type: "binary" }.type, "binary");
 
-assert.throws(function () { Property.standardize({ type: "buffer" }, Settings); });
-assert.throws(function () { Property.standardize({ type: "unknown" }, Settings); });
+assert.throws(function () { Property.normalize({ type: "buffer" }, Settings); });
+assert.throws(function () { Property.normalize({ type: "unknown" }, Settings); });
diff --git a/test/run.js b/test/run.js
index a72ec088..91731c13 100644
--- a/test/run.js
+++ b/test/run.js
@@ -1,10 +1,38 @@
+var Mocha = require('mocha'),
+    fs = require('fs'),
+    path = require('path'),
+    mocha = null,
+    location = null;
 var options = {};
 
-if (process.env.FILTER) {
-  options.include = new RegExp(process.env.FILTER + '.*\\.js$');
+function runClassicTests() {
+  // Classical tests
+  if (process.env.FILTER) {
+    options.include = new RegExp(process.env.FILTER + '.*\\.js$');
+  }
+
+  process.stdout.write("\033[1;34m[i] \033[0;34mTesting \033[1;34m" + process.env.ORM_PROTOCOL + "\033[0m\n");
+  process.stdout.write("\033[1;34m[i] \033[0;34mURI: \033[1;34m" + require('./common').getConnectionString() + "\033[0m\n");
+
+  require('urun')(__dirname, options);
 }
 
-process.stdout.write("\033[1;34m[i] \033[0;34mTesting \033[1;34m" + process.env.ORM_PROTOCOL + "\033[0m\n");
-process.stdout.write("\033[1;34m[i] \033[0;34mURI: \033[1;34m" + require('./common').getConnectionString() + "\033[0m\n");
+location = path.normalize(path.join(__dirname, 'integration2'));
+mocha    = new Mocha({reporter: 'nyan'});
+
+fs.readdirSync(location).filter(function(file){
+  return file.substr(-3) === '.js';
+}).forEach(function(file){
+  mocha.addFile(
+    path.join(location, file)
+  );
+});
+
+mocha.run(function(failures){
+  if (failures > 0) {
+    process.exit(failures);
+  } else {
+    runClassicTests();
+  }
+});
 
-require('urun')(__dirname, options);

From f67024dc8aa0cf80db9f66d87b27b44458700ba3 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 12 Jun 2013 19:47:36 +1000
Subject: [PATCH 0470/1246] Move validation unique test to mocha

---
 .../test-predefined-validation-unique.js      | 27 -------------------
 test/integration2/validation.js               | 25 +++++++++++++++++
 2 files changed, 25 insertions(+), 27 deletions(-)
 delete mode 100644 test/integration/test-predefined-validation-unique.js

diff --git a/test/integration/test-predefined-validation-unique.js b/test/integration/test-predefined-validation-unique.js
deleted file mode 100644
index 440ea1df..00000000
--- a/test/integration/test-predefined-validation-unique.js
+++ /dev/null
@@ -1,27 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_predefined_validation_unique', db.driver.db, function () {
-		var TestModel = db.define('test_predefined_validation_unique', common.getModelProperties(), {
-			validations: {
-				name: db.validators.unique()
-			}
-		});
-
-		var Test1 = new TestModel({ name: "test-predefined-validation-unique" });
-		Test1.save(function (err) {
-			assert.equal(err, null);
-
-			var Test2 = new TestModel({ name: "test-predefined-validation-unique" });
-			Test2.save(function (err) {
-				assert.equal(typeof err, "object");
-				assert.equal(err.field, "name");
-				assert.equal(err.value, "test-predefined-validation-unique");
-				assert.equal(err.msg, "not-unique");
-
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration2/validation.js b/test/integration2/validation.js
index 3343db42..3de85f91 100644
--- a/test/integration2/validation.js
+++ b/test/integration2/validation.js
@@ -1,6 +1,7 @@
 var _        = require('lodash');
 var should   = require('should');
 var helper   = require('../support/spec_helper');
+var async    = require('async');
 var ORM      = require('../../');
 
 describe("Validations", function() {
@@ -33,6 +34,8 @@ describe("Validations", function() {
     });
   });
 
+  after(function() { db.close() });
+
   describe("predefined", function() {
     before(setup(false, false));
 
@@ -48,6 +51,28 @@ describe("Validations", function() {
         done();
       });
     });
+
+    it("unique validator should work", function(done) {
+      var Product = db.define("tvae_unique", { name: String }, {
+        validations: { name: ORM.validators.unique() }
+      });
+      var create = function (cb) {
+        var p = new Product({name: 'broom'});
+        p.save(cb);
+      }
+
+      helper.dropSync(Product, function() {
+        create(function(err) {
+          should.equal(err, null);
+          create(function(err) {
+            should.deepEqual(err, _.extend(new Error(),{
+              field: 'name', value: 'broom', msg: 'not-unique'
+            }));
+            done();
+          });
+        });
+      });
+    });
   });
 
   describe("instance.returnAllErrors=false", function() {

From e91c52b6f502be2d6d83392fd99a00cb1cc248ab Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 12 Jun 2013 20:05:26 +1000
Subject: [PATCH 0471/1246] Minor test runner cleanup

---
 test/run.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/run.js b/test/run.js
index 91731c13..e5c38ab6 100644
--- a/test/run.js
+++ b/test/run.js
@@ -6,11 +6,9 @@ var Mocha = require('mocha'),
 var options = {};
 
 function runClassicTests() {
-  // Classical tests
   if (process.env.FILTER) {
     options.include = new RegExp(process.env.FILTER + '.*\\.js$');
   }
-
   process.stdout.write("\033[1;34m[i] \033[0;34mTesting \033[1;34m" + process.env.ORM_PROTOCOL + "\033[0m\n");
   process.stdout.write("\033[1;34m[i] \033[0;34mURI: \033[1;34m" + require('./common').getConnectionString() + "\033[0m\n");
 

From 79e6f15244f72c9d1fff640abca317342623d300 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 12 Jun 2013 12:10:04 +0100
Subject: [PATCH 0472/1246] Adds test for change in commit dac51fe

---
 test/integration/test-find-chain-find-cb.js | 22 +++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 test/integration/test-find-chain-find-cb.js

diff --git a/test/integration/test-find-chain-find-cb.js b/test/integration/test-find-chain-find-cb.js
new file mode 100644
index 00000000..983a8500
--- /dev/null
+++ b/test/integration/test-find-chain-find-cb.js
@@ -0,0 +1,22 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_find_chain_find_cb', db.driver.db, function () {
+		common.insertModelData('test_find_chain_find_cb', db.driver.db, [
+			{ id : 1, name : 'test2' },
+			{ id : 2, name : 'test1' }
+		], function (err) {
+			if (err) throw err;
+
+			var TestModel = db.define('test_find_chain_find_cb', common.getModelProperties());
+
+			TestModel.find().order("name").find({}, function (err, Instances) {
+				assert.equal(err, null);
+				assert.equal(Array.isArray(Instances), true);
+				assert.equal(Instances.length, 2);
+				db.close();
+			});
+		});
+	});
+});

From e0cc6720c848588ad2065ac568273a6e0227a047 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 12 Jun 2013 15:03:50 +0100
Subject: [PATCH 0473/1246] Converts indentation to tabs, lints first mocha
 tests

---
 test/integration2/validation.js | 374 +++++++++++++++++---------------
 1 file changed, 195 insertions(+), 179 deletions(-)

diff --git a/test/integration2/validation.js b/test/integration2/validation.js
index 3de85f91..e1aa6269 100644
--- a/test/integration2/validation.js
+++ b/test/integration2/validation.js
@@ -5,183 +5,199 @@ var async    = require('async');
 var ORM      = require('../../');
 
 describe("Validations", function() {
-  var db = null;
-  var Person = null;
-
-  var setup = function(returnAll, required) {
-    return function(done) {
-      db.settings.set('properties.required',      required);
-      db.settings.set('instance.returnAllErrors', returnAll);
-
-      Person = db.define("tvae", {
-        name:   { type: 'text'   },
-        height: { type: 'number' }
-      }, {
-        validations: {
-          name:   ORM.validators.rangeLength(3, 30),
-          height: ORM.validators.rangeNumber(0.1, 3.0)
-        }
-      });
-
-      helper.dropSync(Person, done);
-    }
-  }
-
-  before(function(done) {
-    helper.connect(function(connection) {
-      db = connection;
-      done();
-    });
-  });
-
-  after(function() { db.close() });
-
-  describe("predefined", function() {
-    before(setup(false, false));
-
-    it("should work", function(done) {
-      var john = new Person({name: 'fdhdjendfjkdfhshdfhakdfjajhfdjhbfgk'});
-      john.save(function(err) {
-        should.equal(typeof err, "object");
-        should.equal(err.field,  'name');
-        should.equal(err.value,  'fdhdjendfjkdfhshdfhakdfjajhfdjhbfgk');
-        should.equal(err.msg,    'out-of-range-length');
-        should.equal(err.type,   'validation');
-        should.equal(john.id,     null);
-        done();
-      });
-    });
-
-    it("unique validator should work", function(done) {
-      var Product = db.define("tvae_unique", { name: String }, {
-        validations: { name: ORM.validators.unique() }
-      });
-      var create = function (cb) {
-        var p = new Product({name: 'broom'});
-        p.save(cb);
-      }
-
-      helper.dropSync(Product, function() {
-        create(function(err) {
-          should.equal(err, null);
-          create(function(err) {
-            should.deepEqual(err, _.extend(new Error(),{
-              field: 'name', value: 'broom', msg: 'not-unique'
-            }));
-            done();
-          });
-        });
-      });
-    });
-  });
-
-  describe("instance.returnAllErrors=false", function() {
-    describe("properties.required=false", function() {
-      before(setup(false, false));
-
-      it("should save when properties are null", function(done) {
-        var john = new Person();
-        john.save(function(err) {
-          should.equal(err, null);
-          john.id.should.be.a('number');
-          done();
-        });
-      });
-
-      it("shouldn't save when a property is invalid", function(done) {
-        var john = new Person({height: 4});
-        john.save(function(err) {
-          should.notEqual(err, null);
-          should.equal(err.field, 'height');
-          should.equal(err.value, 4);
-          should.equal(err.msg, 'out-of-range-number');
-          should.equal(err.type, 'validation');
-          should.equal(john.id, null);
-          done();
-        });
-      });
-    });
-
-    describe("properties.required=true", function() {
-      before(setup(false, true));
-
-      it("should not save when properties are null", function(done) {
-        var john = new Person();
-        john.save(function(err) {
-          should.notEqual(err, null);
-          should.equal(john.id, null);
-          done();
-        });
-      });
-
-      it("should return a required error when the first property is blank", function(done) {
-        var john = new Person({height: 4});
-        john.save(function(err) {
-          should.notEqual(err, null);
-          should.equal(err.field, 'name');
-          should.equal(err.value, null);
-          should.equal(err.msg, 'required');
-          should.equal(err.type, 'validation');
-          should.equal(john.id, null);
-          done();
-        });
-      });
-    });
-  });
-
-  describe("instance.returnAllErrors=true", function() {
-    describe("properties.required=false", function() {
-      before(setup(true, false));
-
-      it("should return all errors when a property is invalid", function(done) {
-        var john = new Person({name: 'n', height: 4});
-        john.save(function(err) {
-          should.notEqual(err, null);
-          should(Array.isArray(err));
-          should.equal(err.length, 2);
-
-          should.deepEqual(err[0], _.extend(new Error(),{
-            field: 'name', value: 'n', msg: 'out-of-range-length'
-          }));
-
-          should.deepEqual(err[1], _.extend(new Error(),{
-            field: 'height', value: '4', msg: 'out-of-range-number'
-          }));
-
-          should.equal(john.id, null);
-          done();
-        });
-      });
-    });
-
-    describe("properties.required=true", function() {
-      before(setup(true, true));
-
-      it("should return required and user specified validation errors", function(done) {
-        var john = new Person({height: 4});
-        john.save(function(err) {
-          should.notEqual(err, null);
-          should(Array.isArray(err));
-          should.equal(err.length, 3);
-
-          // `type` is a non enumerable undocumented property of `Error` in V8.
-          should.deepEqual(err[0], _.extend(new Error(),{
-            field: 'name', value: null, msg: 'required'
-          }));
-
-          should.deepEqual(err[1], _.extend(new Error(),{
-            field: 'name', value: null, msg: 'undefined'
-          }));
-
-          should.deepEqual(err[2], _.extend(new Error(),{
-            field: 'height', value: '4', msg: 'out-of-range-number'
-          }));
-
-          should.equal(john.id, null);
-          done();
-        });
-      });
-    });
-  });
-
+	var db = null;
+	var Person = null;
+
+	var setup = function (returnAll, required) {
+		return function (done) {
+			db.settings.set('properties.required',      required);
+			db.settings.set('instance.returnAllErrors', returnAll);
+
+			Person = db.define("person", {
+				name:   { type: 'text'   },
+				height: { type: 'number' }
+			}, {
+				validations: {
+					name:   ORM.validators.rangeLength(3, 30),
+					height: ORM.validators.rangeNumber(0.1, 3.0)
+				}
+			});
+
+			return helper.dropSync(Person, done);
+		};
+	};
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+			done();
+		});
+	});
+
+	after(function () {
+		db.close();
+	});
+
+	describe("predefined", function () {
+		before(setup(false, false));
+
+		it("should work", function(done) {
+			var john = new Person({name: 'fdhdjendfjkdfhshdfhakdfjajhfdjhbfgk'});
+
+			john.save(function (err) {
+				should.equal(typeof err, "object");
+				should.equal(err.field,  'name');
+				should.equal(err.value,  'fdhdjendfjkdfhshdfhakdfjajhfdjhbfgk');
+				should.equal(err.msg,    'out-of-range-length');
+				should.equal(err.type,   'validation');
+				should.equal(john.id,     null);
+
+				return done();
+			});
+		});
+
+		it("unique validator should work", function(done) {
+			var Product = db.define("person_unique", { name: String }, {
+				validations: { name: ORM.validators.unique() }
+			});
+			var create = function (cb) {
+				var p = new Product({ name: 'broom' });
+
+				return p.save(cb);
+			};
+
+			helper.dropSync(Product, function() {
+				create(function (err) {
+					should.equal(err, null);
+					create(function (err) {
+						should.deepEqual(err, _.extend(new Error(),{
+							field: 'name', value: 'broom', msg: 'not-unique'
+						}));
+						return done();
+					});
+				});
+			});
+		});
+	});
+
+	describe("instance.returnAllErrors = false", function() {
+		describe("properties.required = false", function() {
+			before(setup(false, false));
+
+			it("should save when properties are null", function(done) {
+				var john = new Person();
+
+				john.save(function (err) {
+					should.equal(err, null);
+					john.id.should.be.a('number');
+
+					return done();
+				});
+			});
+
+			it("shouldn't save when a property is invalid", function(done) {
+				var john = new Person({ height: 4 });
+
+				john.save(function (err) {
+					should.notEqual(err, null);
+					should.equal(err.field, 'height');
+					should.equal(err.value, 4);
+					should.equal(err.msg, 'out-of-range-number');
+					should.equal(err.type, 'validation');
+					should.equal(john.id, null);
+
+					return done();
+				});
+			});
+		});
+
+		describe("properties.required = true", function() {
+			before(setup(false, true));
+
+			it("should not save when properties are null", function(done) {
+				var john = new Person();
+
+				john.save(function (err) {
+					should.notEqual(err, null);
+					should.equal(john.id, null);
+
+					return done();
+				});
+			});
+
+			it("should return a required error when the first property is blank", function(done) {
+				var john = new Person({ height: 4 });
+
+				john.save(function (err) {
+					should.notEqual(err, null);
+					should.equal(err.field, 'name');
+					should.equal(err.value, null);
+					should.equal(err.msg, 'required');
+					should.equal(err.type, 'validation');
+					should.equal(john.id, null);
+
+					return done();
+				});
+			});
+		});
+	});
+
+	describe("instance.returnAllErrors = true", function() {
+		describe("properties.required = false", function() {
+			before(setup(true, false));
+
+			it("should return all errors when a property is invalid", function(done) {
+				var john = new Person({ name: 'n', height: 4 });
+
+				john.save(function (err) {
+					should.notEqual(err, null);
+					should(Array.isArray(err));
+					should.equal(err.length, 2);
+
+					should.deepEqual(err[0], _.extend(new Error(),{
+						field: 'name', value: 'n', msg: 'out-of-range-length'
+					}));
+
+					should.deepEqual(err[1], _.extend(new Error(),{
+						field: 'height', value: '4', msg: 'out-of-range-number'
+					}));
+
+					should.equal(john.id, null);
+
+					return done();
+				});
+			});
+		});
+
+		describe("properties.required = true", function() {
+			before(setup(true, true));
+
+			it("should return required and user specified validation errors", function(done) {
+				var john = new Person({ height: 4 });
+
+				john.save(function (err) {
+					should.notEqual(err, null);
+					should(Array.isArray(err));
+					should.equal(err.length, 3);
+
+					// `type` is a non enumerable undocumented property of `Error` in V8.
+					should.deepEqual(err[0], _.extend(new Error(),{
+						field: 'name', value: null, msg: 'required'
+					}));
+
+					should.deepEqual(err[1], _.extend(new Error(),{
+						field: 'name', value: null, msg: 'undefined'
+					}));
+
+					should.deepEqual(err[2], _.extend(new Error(),{
+						field: 'height', value: '4', msg: 'out-of-range-number'
+					}));
+
+					should.equal(john.id, null);
+
+					return done();
+				});
+			});
+		});
+	});
 });

From d092e39329bf55b18bc9adae2518a46d4b5aaabe Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 12 Jun 2013 15:48:34 +0100
Subject: [PATCH 0474/1246] Adds new tests for settings, deprecates previous
 ones

---
 .../{ => deprecated}/test-settings.js         |  2 +-
 test/integration2/settings.js                 | 96 +++++++++++++++++++
 2 files changed, 97 insertions(+), 1 deletion(-)
 rename test/integration/{ => deprecated}/test-settings.js (96%)
 create mode 100644 test/integration2/settings.js

diff --git a/test/integration/test-settings.js b/test/integration/deprecated/test-settings.js
similarity index 96%
rename from test/integration/test-settings.js
rename to test/integration/deprecated/test-settings.js
index fb349c05..3bcc1680 100644
--- a/test/integration/test-settings.js
+++ b/test/integration/deprecated/test-settings.js
@@ -1,4 +1,4 @@
-var common     = require('../common');
+var common     = require('../../common');
 var assert     = require('assert');
 
 common.ORM.settings.set("some.sub.object", 123.45);
diff --git a/test/integration2/settings.js b/test/integration2/settings.js
new file mode 100644
index 00000000..2517ed25
--- /dev/null
+++ b/test/integration2/settings.js
@@ -0,0 +1,96 @@
+var _        = require('lodash');
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var async    = require('async');
+var ORM      = require('../../');
+
+describe("Settings", function () {
+	var testFunction = function testFunction() {
+		return "test";
+	};
+
+	describe("some.sub.object = 123.45", function () {
+		before(function (done) {
+			ORM.settings.set("some.sub.object", 123.45);
+			return done();
+		});
+
+		it("should be 123.45", function (done) {
+			ORM.settings.get("some.sub.object").should.equal(123.45);
+
+			return done();
+		});
+	});
+
+	describe("some....object = testFunction", function () {
+		before(function (done) {
+			ORM.settings.set("some....object", testFunction);
+			return done();
+		});
+
+		it("should be testFunction", function (done) {
+			ORM.settings.get("some....object").should.equal(testFunction);
+
+			return done();
+		});
+	});
+
+	describe("not setting some.unknown.object", function () {
+		it("should be undefined", function (done) {
+			should.equal(ORM.settings.get("some.unknown.object"), undefined);
+
+			return done();
+		});
+	});
+
+	describe("unsetting some.sub.object", function () {
+		before(function (done) {
+			ORM.settings.unset("some.sub.object");
+			return done();
+		});
+
+		it("should be undefined", function (done) {
+			should.equal(ORM.settings.get("some.sub.object"), undefined);
+
+			return done();
+		});
+	});
+
+	describe("unsetting some....object", function () {
+		before(function (done) {
+			ORM.settings.unset("some....object");
+			return done();
+		});
+
+		it("should be undefined", function (done) {
+			should.equal(ORM.settings.get("some....object"), undefined);
+
+			return done();
+		});
+	});
+
+	describe("unsetting some.*", function () {
+		before(function (done) {
+			ORM.settings.unset("some.*");
+			return done();
+		});
+
+		it("should return undefined for any 'some' sub-element", function (done) {
+			should.equal(ORM.settings.get("some.other.stuff"), undefined);
+
+			return done();
+		});
+		it("should return an empty object for some.*", function (done) {
+			ORM.settings.get("some.*").should.be.a("object");
+			Object.keys(ORM.settings.get("some.*")).should.have.lengthOf(0);
+
+			return done();
+		});
+		it("should return an empty object for some", function (done) {
+			ORM.settings.get("some").should.be.a("object");
+			Object.keys(ORM.settings.get("some")).should.have.lengthOf(0);
+
+			return done();
+		});
+	});
+});

From 11c99aa516043bfca4a8a2c36874d4d014eb87d5 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 12 Jun 2013 16:18:00 +0100
Subject: [PATCH 0475/1246] Removes unused required elements from settings
 tests

---
 test/integration2/settings.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/integration2/settings.js b/test/integration2/settings.js
index 2517ed25..1f57b99b 100644
--- a/test/integration2/settings.js
+++ b/test/integration2/settings.js
@@ -1,7 +1,5 @@
 var _        = require('lodash');
 var should   = require('should');
-var helper   = require('../support/spec_helper');
-var async    = require('async');
 var ORM      = require('../../');
 
 describe("Settings", function () {

From 558058e9e976685426b21880dc8de2cb600078f1 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 12 Jun 2013 16:19:27 +0100
Subject: [PATCH 0476/1246] Adds predefined validators tests, deprecated old
 ones

---
 .../{ => deprecated}/test-validators.js       |   0
 test/integration2/predefined-validators.js    | 172 ++++++++++++++++++
 2 files changed, 172 insertions(+)
 rename test/integration/{ => deprecated}/test-validators.js (100%)
 create mode 100644 test/integration2/predefined-validators.js

diff --git a/test/integration/test-validators.js b/test/integration/deprecated/test-validators.js
similarity index 100%
rename from test/integration/test-validators.js
rename to test/integration/deprecated/test-validators.js
diff --git a/test/integration2/predefined-validators.js b/test/integration2/predefined-validators.js
new file mode 100644
index 00000000..39e8965c
--- /dev/null
+++ b/test/integration2/predefined-validators.js
@@ -0,0 +1,172 @@
+var should     = require('should');
+var validators = require('../../').validators;
+var undef      = undefined;
+
+function checkValidation(done, expected) {
+	return function (returned) {
+		should.equal(returned, returned);
+
+		return done();
+	};
+}
+
+describe("Predefined Validators", function () {
+	describe("rangeNumber(0, 10)", function () {
+		it("should pass 5", function (done) {
+			validators.rangeNumber(0, 10)(5, checkValidation(done));
+		});
+		it("should not pass -5 width 'out-of-range-number'", function (done) {
+			validators.rangeNumber(0, 10)(-5, checkValidation(done, 'out-of-range-number'));
+		});
+	});
+	describe("rangeNumber(undef, 10)", function () {
+		it("should pass -5", function (done) {
+			validators.rangeNumber(undef, 10)(-5, checkValidation(done));
+		});
+		it("should not pass 15 width 'out-of-range-number'", function (done) {
+			validators.rangeNumber(undef, 10)(15, checkValidation(done, 'out-of-range-number'));
+		});
+	});
+	describe("rangeNumber(-10, undef)", function () {
+		it("should pass -5", function (done) {
+			validators.rangeNumber(-10, undef)(-5, checkValidation(done));
+		});
+	});
+	describe("rangeNumber(0, undef)", function () {
+		it("should pass -5", function (done) {
+			validators.rangeNumber(0, undef)(-5, checkValidation(done));
+		});
+		it("should not pass -5 width 'out-of-range-number'", function (done) {
+			validators.rangeNumber(0, undef)(-5, checkValidation(done, 'out-of-range-number'));
+		});
+		describe("if custom-error is defined", function () {
+			it("should not pass -5 width 'custom-error'", function (done) {
+				validators.rangeNumber(0, undef, 'custom-error')(-5, checkValidation(done, 'custom-error'));
+			});
+		});
+	});
+
+
+	describe("rangeLength(0, 10)", function () {
+		it("should pass 'test'", function (done) {
+			validators.rangeLength(0, 10)('test', checkValidation(done));
+		});
+	});
+	describe("rangeLength(undef, 10)", function () {
+		it("should pass 'test'", function (done) {
+			validators.rangeLength(undef, 10)('test', checkValidation(done));
+		});
+	});
+	describe("rangeLength(0, undef)", function () {
+		it("should pass 'test'", function (done) {
+			validators.rangeLength(0, undef)('test', checkValidation(done));
+		});
+		it("should not pass undefined width 'undefined'", function (done) {
+			validators.rangeLength(0, undef)(undef, checkValidation(done, 'undefined'));
+		});
+	});
+	describe("rangeLength(4, undef)", function () {
+		it("should pass 'test'", function (done) {
+			validators.rangeLength(4, undef)('test', checkValidation(done));
+		});
+	});
+	describe("rangeLength(0, 3)", function () {
+		it("should not pass 'test' width 'out-of-range-length'", function (done) {
+			validators.rangeLength(0, 3)('test', checkValidation(done, 'out-of-range-length'));
+		});
+	});
+	describe("rangeLength(5, undef)", function () {
+		it("should not pass 'test' width 'out-of-range-length'", function (done) {
+			validators.rangeLength(5, undef)('test', checkValidation(done, 'out-of-range-length'));
+		});
+	});
+	describe("rangeLength(undef, 3)", function () {
+		it("should not pass 'test' width 'out-of-range-length'", function (done) {
+			validators.rangeLength(undef, 3)('test', checkValidation(done, 'out-of-range-length'));
+		});
+		describe("if custom-error is defined", function () {
+			it("should not pass 'test' width 'custom-error'", function (done) {
+				validators.rangeLength(undef, 3, 'custom-error')('test', checkValidation(done, 'custom-error'));
+			});
+		});
+	});
+
+
+	describe("insideList([ 1, 2, 3 ])", function () {
+		it("should pass 1", function (done) {
+			validators.insideList([ 1, 2, 3 ])(1, checkValidation(done));
+		});
+		it("should pass 2", function (done) {
+			validators.insideList([ 1, 2, 3 ])(2, checkValidation(done));
+		});
+		it("should pass 3", function (done) {
+			validators.insideList([ 1, 2, 3 ])(3, checkValidation(done));
+		});
+		it("should not pass 4 width 'outside-list'", function (done) {
+			validators.insideList([ 1, 2, 3 ])(4, checkValidation(done, 'outside-list'));
+		});
+		it("should not pass '1' width 'outside-list'", function (done) {
+			validators.insideList([ 1, 2, 3 ])('1', checkValidation(done, 'outside-list'));
+		});
+		it("should not pass '' width 'outside-list'", function (done) {
+			validators.insideList([ 1, 2, 3 ])('', checkValidation(done, 'outside-list'));
+		});
+		it("should not pass [] width 'outside-list'", function (done) {
+			validators.insideList([ 1, 2, 3 ])([], checkValidation(done, 'outside-list'));
+		});
+		describe("if custom-error is defined", function () {
+			it("should not pass [] width 'custom-error'", function (done) {
+				validators.insideList([ 1, 2, 3 ], 'custom-error')([], checkValidation(done, 'custom-error'));
+			});
+		});
+	});
+
+
+	describe("outsideList([ 1, 2, 3 ])", function () {
+		it("should pass 4", function (done) {
+			validators.outsideList([ 1, 2, 3 ])(4, checkValidation(done));
+		});
+		it("should pass -2", function (done) {
+			validators.outsideList([ 1, 2, 3 ])(-2, checkValidation(done));
+		});
+		it("should pass ''", function (done) {
+			validators.outsideList([ 1, 2, 3 ])('', checkValidation(done));
+		});
+		it("should pass null", function (done) {
+			validators.outsideList([ 1, 2, 3 ])(null, checkValidation(done));
+		});
+		it("should pass '2'", function (done) {
+			validators.outsideList([ 1, 2, 3 ])('2', checkValidation(done));
+		});
+		it("should not pass 2 width 'inside-list'", function (done) {
+			validators.outsideList([ 1, 2, 3 ])(2, checkValidation(done, 'inside-list'));
+		});
+		describe("if custom-error is defined", function () {
+			it("should not pass 2 width 'custom-error'", function (done) {
+				validators.outsideList([ 1, 2, 3 ], 'custom-error')(2, checkValidation(done, 'custom-error'));
+			});
+		});
+	});
+
+	describe("notEmptyString()", function () {
+		it("should pass 'a'", function (done) {
+			validators.notEmptyString()('a', checkValidation(done));
+		});
+		it("should not pass '' with 'empty-string'", function (done) {
+			validators.notEmptyString()('', checkValidation(done, 'empty-string'));
+		});
+		describe("if custom-error is defined", function () {
+			it("should not pass '' with 'custom-error'", function (done) {
+				validators.notEmptyString('custom-error')('', checkValidation(done, 'custom-error'));
+			});
+		});
+		it("should not pass undef with 'undefined'", function (done) {
+			validators.notEmptyString()(undef, checkValidation(done, 'undefined'));
+		});
+		describe("if custom-error is defined", function () {
+			it("should not pass '' with 'custom-error'", function (done) {
+				validators.notEmptyString('custom-error')('', checkValidation(done, 'custom-error'));
+			});
+		});
+	});
+});

From 72f3d186ae33d87897e0a91210f756e4951a662f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 12 Jun 2013 16:22:29 +0100
Subject: [PATCH 0477/1246] Fixes deprecated test. For now it needs to keep
 working. We need to some way avoid de 'deprecated folder'

---
 test/integration/deprecated/test-validators.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integration/deprecated/test-validators.js b/test/integration/deprecated/test-validators.js
index f90e8fee..12c64678 100644
--- a/test/integration/deprecated/test-validators.js
+++ b/test/integration/deprecated/test-validators.js
@@ -1,6 +1,6 @@
-var common     = require('../common');
+var common     = require('../../common');
 var assert     = require('assert');
-var Validation = require('../../lib/Validators');
+var Validation = require('../../../lib/Validators');
 var _; // undefined
 
 Validation.rangeNumber(0, 10)(5, checkValidation());

From 28bd6550728c48e9ed15325984211551367d4719 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 12 Jun 2013 16:26:52 +0100
Subject: [PATCH 0478/1246] Changes old test framework to avoid deprecated/
 folder, changes deprecated folder required paths to previous ones

---
 test/integration/deprecated/test-settings.js   | 2 +-
 test/integration/deprecated/test-validators.js | 4 ++--
 test/run.js                                    | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/test/integration/deprecated/test-settings.js b/test/integration/deprecated/test-settings.js
index 3bcc1680..fb349c05 100644
--- a/test/integration/deprecated/test-settings.js
+++ b/test/integration/deprecated/test-settings.js
@@ -1,4 +1,4 @@
-var common     = require('../../common');
+var common     = require('../common');
 var assert     = require('assert');
 
 common.ORM.settings.set("some.sub.object", 123.45);
diff --git a/test/integration/deprecated/test-validators.js b/test/integration/deprecated/test-validators.js
index 12c64678..f90e8fee 100644
--- a/test/integration/deprecated/test-validators.js
+++ b/test/integration/deprecated/test-validators.js
@@ -1,6 +1,6 @@
-var common     = require('../../common');
+var common     = require('../common');
 var assert     = require('assert');
-var Validation = require('../../../lib/Validators');
+var Validation = require('../../lib/Validators');
 var _; // undefined
 
 Validation.rangeNumber(0, 10)(5, checkValidation());
diff --git a/test/run.js b/test/run.js
index e5c38ab6..796d412f 100644
--- a/test/run.js
+++ b/test/run.js
@@ -3,11 +3,13 @@ var Mocha = require('mocha'),
     path = require('path'),
     mocha = null,
     location = null;
-var options = {};
+var options = {
+  include: new RegExp("integration\\/test\\-.*\\.js$")
+};
 
 function runClassicTests() {
   if (process.env.FILTER) {
-    options.include = new RegExp(process.env.FILTER + '.*\\.js$');
+    options.include = new RegExp("integration\\/test\\-.*" + process.env.FILTER + '.*\\.js$');
   }
   process.stdout.write("\033[1;34m[i] \033[0;34mTesting \033[1;34m" + process.env.ORM_PROTOCOL + "\033[0m\n");
   process.stdout.write("\033[1;34m[i] \033[0;34mURI: \033[1;34m" + require('./common').getConnectionString() + "\033[0m\n");

From b3965a38efde9ae6b133eb003bea9b86997788bd Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 12 Jun 2013 16:29:38 +0100
Subject: [PATCH 0479/1246] Fix typo in predefined validators test
 (s/width/with/g)

---
 test/integration2/predefined-validators.js | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/test/integration2/predefined-validators.js b/test/integration2/predefined-validators.js
index 39e8965c..a24d2bf2 100644
--- a/test/integration2/predefined-validators.js
+++ b/test/integration2/predefined-validators.js
@@ -15,7 +15,7 @@ describe("Predefined Validators", function () {
 		it("should pass 5", function (done) {
 			validators.rangeNumber(0, 10)(5, checkValidation(done));
 		});
-		it("should not pass -5 width 'out-of-range-number'", function (done) {
+		it("should not pass -5 with 'out-of-range-number'", function (done) {
 			validators.rangeNumber(0, 10)(-5, checkValidation(done, 'out-of-range-number'));
 		});
 	});
@@ -23,7 +23,7 @@ describe("Predefined Validators", function () {
 		it("should pass -5", function (done) {
 			validators.rangeNumber(undef, 10)(-5, checkValidation(done));
 		});
-		it("should not pass 15 width 'out-of-range-number'", function (done) {
+		it("should not pass 15 with 'out-of-range-number'", function (done) {
 			validators.rangeNumber(undef, 10)(15, checkValidation(done, 'out-of-range-number'));
 		});
 	});
@@ -36,11 +36,11 @@ describe("Predefined Validators", function () {
 		it("should pass -5", function (done) {
 			validators.rangeNumber(0, undef)(-5, checkValidation(done));
 		});
-		it("should not pass -5 width 'out-of-range-number'", function (done) {
+		it("should not pass -5 with 'out-of-range-number'", function (done) {
 			validators.rangeNumber(0, undef)(-5, checkValidation(done, 'out-of-range-number'));
 		});
 		describe("if custom-error is defined", function () {
-			it("should not pass -5 width 'custom-error'", function (done) {
+			it("should not pass -5 with 'custom-error'", function (done) {
 				validators.rangeNumber(0, undef, 'custom-error')(-5, checkValidation(done, 'custom-error'));
 			});
 		});
@@ -61,7 +61,7 @@ describe("Predefined Validators", function () {
 		it("should pass 'test'", function (done) {
 			validators.rangeLength(0, undef)('test', checkValidation(done));
 		});
-		it("should not pass undefined width 'undefined'", function (done) {
+		it("should not pass undefined with 'undefined'", function (done) {
 			validators.rangeLength(0, undef)(undef, checkValidation(done, 'undefined'));
 		});
 	});
@@ -71,21 +71,21 @@ describe("Predefined Validators", function () {
 		});
 	});
 	describe("rangeLength(0, 3)", function () {
-		it("should not pass 'test' width 'out-of-range-length'", function (done) {
+		it("should not pass 'test' with 'out-of-range-length'", function (done) {
 			validators.rangeLength(0, 3)('test', checkValidation(done, 'out-of-range-length'));
 		});
 	});
 	describe("rangeLength(5, undef)", function () {
-		it("should not pass 'test' width 'out-of-range-length'", function (done) {
+		it("should not pass 'test' with 'out-of-range-length'", function (done) {
 			validators.rangeLength(5, undef)('test', checkValidation(done, 'out-of-range-length'));
 		});
 	});
 	describe("rangeLength(undef, 3)", function () {
-		it("should not pass 'test' width 'out-of-range-length'", function (done) {
+		it("should not pass 'test' with 'out-of-range-length'", function (done) {
 			validators.rangeLength(undef, 3)('test', checkValidation(done, 'out-of-range-length'));
 		});
 		describe("if custom-error is defined", function () {
-			it("should not pass 'test' width 'custom-error'", function (done) {
+			it("should not pass 'test' with 'custom-error'", function (done) {
 				validators.rangeLength(undef, 3, 'custom-error')('test', checkValidation(done, 'custom-error'));
 			});
 		});
@@ -102,20 +102,20 @@ describe("Predefined Validators", function () {
 		it("should pass 3", function (done) {
 			validators.insideList([ 1, 2, 3 ])(3, checkValidation(done));
 		});
-		it("should not pass 4 width 'outside-list'", function (done) {
+		it("should not pass 4 with 'outside-list'", function (done) {
 			validators.insideList([ 1, 2, 3 ])(4, checkValidation(done, 'outside-list'));
 		});
-		it("should not pass '1' width 'outside-list'", function (done) {
+		it("should not pass '1' with 'outside-list'", function (done) {
 			validators.insideList([ 1, 2, 3 ])('1', checkValidation(done, 'outside-list'));
 		});
-		it("should not pass '' width 'outside-list'", function (done) {
+		it("should not pass '' with 'outside-list'", function (done) {
 			validators.insideList([ 1, 2, 3 ])('', checkValidation(done, 'outside-list'));
 		});
-		it("should not pass [] width 'outside-list'", function (done) {
+		it("should not pass [] with 'outside-list'", function (done) {
 			validators.insideList([ 1, 2, 3 ])([], checkValidation(done, 'outside-list'));
 		});
 		describe("if custom-error is defined", function () {
-			it("should not pass [] width 'custom-error'", function (done) {
+			it("should not pass [] with 'custom-error'", function (done) {
 				validators.insideList([ 1, 2, 3 ], 'custom-error')([], checkValidation(done, 'custom-error'));
 			});
 		});
@@ -138,11 +138,11 @@ describe("Predefined Validators", function () {
 		it("should pass '2'", function (done) {
 			validators.outsideList([ 1, 2, 3 ])('2', checkValidation(done));
 		});
-		it("should not pass 2 width 'inside-list'", function (done) {
+		it("should not pass 2 with 'inside-list'", function (done) {
 			validators.outsideList([ 1, 2, 3 ])(2, checkValidation(done, 'inside-list'));
 		});
 		describe("if custom-error is defined", function () {
-			it("should not pass 2 width 'custom-error'", function (done) {
+			it("should not pass 2 with 'custom-error'", function (done) {
 				validators.outsideList([ 1, 2, 3 ], 'custom-error')(2, checkValidation(done, 'custom-error'));
 			});
 		});

From 16cd6bf911d291ef26559d4a615dafd4d7964ea7 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 12 Jun 2013 16:34:42 +0100
Subject: [PATCH 0480/1246] Updates test/run to show which tests are from mocha
 and which tests are from urun

---
 test/run.js | 71 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 40 insertions(+), 31 deletions(-)

diff --git a/test/run.js b/test/run.js
index 796d412f..b9608506 100644
--- a/test/run.js
+++ b/test/run.js
@@ -1,38 +1,47 @@
-var Mocha = require('mocha'),
-    fs = require('fs'),
-    path = require('path'),
-    mocha = null,
-    location = null;
-var options = {
-  include: new RegExp("integration\\/test\\-.*\\.js$")
-};
+var Mocha    = require('mocha');
+var fs       = require('fs');
+var path     = require('path');
+var location = path.normalize(path.join(__dirname, "integration2"));
+var mocha    = new Mocha({
+	reporter: "progress"
+});
+
+runTests();
 
 function runClassicTests() {
-  if (process.env.FILTER) {
-    options.include = new RegExp("integration\\/test\\-.*" + process.env.FILTER + '.*\\.js$');
-  }
-  process.stdout.write("\033[1;34m[i] \033[0;34mTesting \033[1;34m" + process.env.ORM_PROTOCOL + "\033[0m\n");
-  process.stdout.write("\033[1;34m[i] \033[0;34mURI: \033[1;34m" + require('./common').getConnectionString() + "\033[0m\n");
+	var options  = {
+		include  : new RegExp("integration\\/test\\-.*\\.js$")
+	};
 
-  require('urun')(__dirname, options);
-}
+	if (process.env.FILTER) {
+		options.include = new RegExp("integration\\/test\\-.*" + process.env.FILTER + '.*\\.js$');
+	}
 
-location = path.normalize(path.join(__dirname, 'integration2'));
-mocha    = new Mocha({reporter: 'nyan'});
+	process.stdout.write("\033[1;34m[i] \033[0;34mFramework \033[1;34murun\033[0m\n");
+	process.stdout.write("\033[1;34m[i] \033[0;34mTesting \033[1;34m" + process.env.ORM_PROTOCOL + "\033[0m\n");
+	process.stdout.write("\033[1;34m[i] \033[0;34mURI: \033[1;34m" + require('./common').getConnectionString() + "\033[0m\n");
 
-fs.readdirSync(location).filter(function(file){
-  return file.substr(-3) === '.js';
-}).forEach(function(file){
-  mocha.addFile(
-    path.join(location, file)
-  );
-});
+	require('urun')(__dirname, options);
+}
 
-mocha.run(function(failures){
-  if (failures > 0) {
-    process.exit(failures);
-  } else {
-    runClassicTests();
-  }
-});
+function runTests() {
+	fs.readdirSync(location).filter(function(file){
+		return file.substr(-3) === '.js';
+	}).forEach(function(file){
+		mocha.addFile(
+			path.join(location, file)
+		);
+	});
 
+	process.stdout.write("\033[1;34m[i] \033[0;34mFramework \033[1;34mmocha\033[0m\n");
+	process.stdout.write("\033[1;34m[i] \033[0;34mTesting \033[1;34m" + process.env.ORM_PROTOCOL + "\033[0m\n");
+	process.stdout.write("\033[1;34m[i] \033[0;34mURI: \033[1;34m" + require('./common').getConnectionString() + "\033[0m\n");
+
+	mocha.run(function (failures) {
+		if (failures > 0) {
+			process.exit(failures);
+		} else {
+			runClassicTests();
+		}
+	});
+}

From f97a70cc8c56c2e93c29b82842b43968d3bfd58c Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 12 Jun 2013 17:50:46 +0100
Subject: [PATCH 0481/1246] Creates Singleton.clear() to clear cache, exports
 singleton in orm

---
 lib/ORM.js       | 2 ++
 lib/Singleton.js | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/lib/ORM.js b/lib/ORM.js
index a68ba2ca..5a9226d2 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -9,8 +9,10 @@ var Model          = require("./Model").Model;
 var DriverAliases  = require("./Drivers/aliases");
 var Validators     = require("./Validators");
 var Settings       = require("./Settings");
+var Singleton      = require("./Singleton");
 
 exports.validators = Validators;
+exports.singleton  = Singleton;
 exports.settings   = new Settings.Container(Settings.defaults());
 
 for (var k in Query.Comparators) {
diff --git a/lib/Singleton.js b/lib/Singleton.js
index ec30c234..59bbf879 100644
--- a/lib/Singleton.js
+++ b/lib/Singleton.js
@@ -1,5 +1,9 @@
 var map = {};
 
+exports.clear = function () {
+	map = {};
+};
+
 exports.get = function (key, opts, createCb, returnCb) {
 	if (opts && opts.cache === false) {
 		return createCb(returnCb);

From 8deeadb035791b5337c7704bc2a4e6dc7399d991 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 12 Jun 2013 17:51:12 +0100
Subject: [PATCH 0482/1246] Fixes Model.get() when passing cache: false and
 model has cache: true

---
 lib/Model.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Model.js b/lib/Model.js
index 17cefd0c..56bef213 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -224,7 +224,7 @@ function Model(opts) {
 				return cb(new Error("Not found"));
 			}
 			Singleton.get(opts.driver.uid + "/" + opts.table + "/" + ids.join("/"), {
-				cache      : options.cache || opts.cache,
+				cache      : (options.hasOwnProperty("cache") ? options.cache : opts.cache),
 				save_check : opts.settings.get("instance.cacheSaveCheck")
 			}, function (cb) {
 				return createInstance(data[0], {

From 932276dfc9708f14008040c7c661471adab5ccc0 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 12 Jun 2013 17:56:27 +0100
Subject: [PATCH 0483/1246] Creates initial mocha Model.get() tests, deprecates
 a few

---
 .../{ => deprecated}/test-get-cache.js        |   0
 .../{ => deprecated}/test-get-method.js       |   0
 .../{ => deprecated}/test-get-opts.js         |   0
 .../test-get-singleton-nocache.js             |   0
 .../{ => deprecated}/test-get-singleton.js    |   0
 test/integration/{ => deprecated}/test-get.js |   0
 test/integration2/model-get.js                | 170 ++++++++++++++++++
 7 files changed, 170 insertions(+)
 rename test/integration/{ => deprecated}/test-get-cache.js (100%)
 rename test/integration/{ => deprecated}/test-get-method.js (100%)
 rename test/integration/{ => deprecated}/test-get-opts.js (100%)
 rename test/integration/{ => deprecated}/test-get-singleton-nocache.js (100%)
 rename test/integration/{ => deprecated}/test-get-singleton.js (100%)
 rename test/integration/{ => deprecated}/test-get.js (100%)
 create mode 100644 test/integration2/model-get.js

diff --git a/test/integration/test-get-cache.js b/test/integration/deprecated/test-get-cache.js
similarity index 100%
rename from test/integration/test-get-cache.js
rename to test/integration/deprecated/test-get-cache.js
diff --git a/test/integration/test-get-method.js b/test/integration/deprecated/test-get-method.js
similarity index 100%
rename from test/integration/test-get-method.js
rename to test/integration/deprecated/test-get-method.js
diff --git a/test/integration/test-get-opts.js b/test/integration/deprecated/test-get-opts.js
similarity index 100%
rename from test/integration/test-get-opts.js
rename to test/integration/deprecated/test-get-opts.js
diff --git a/test/integration/test-get-singleton-nocache.js b/test/integration/deprecated/test-get-singleton-nocache.js
similarity index 100%
rename from test/integration/test-get-singleton-nocache.js
rename to test/integration/deprecated/test-get-singleton-nocache.js
diff --git a/test/integration/test-get-singleton.js b/test/integration/deprecated/test-get-singleton.js
similarity index 100%
rename from test/integration/test-get-singleton.js
rename to test/integration/deprecated/test-get-singleton.js
diff --git a/test/integration/test-get.js b/test/integration/deprecated/test-get.js
similarity index 100%
rename from test/integration/test-get.js
rename to test/integration/deprecated/test-get.js
diff --git a/test/integration2/model-get.js b/test/integration2/model-get.js
new file mode 100644
index 00000000..413c6c7e
--- /dev/null
+++ b/test/integration2/model-get.js
@@ -0,0 +1,170 @@
+var _        = require('lodash');
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var async    = require('async');
+var ORM      = require('../../');
+
+describe("Model.get()", function() {
+	var db = null;
+	var Person = null;
+
+	var setup = function (cache) {
+		return function (done) {
+			Person = db.define("person", {
+				name   : String
+			}, {
+				cache  : cache,
+				methods: {
+					UID: function () {
+						return this.id;
+					}
+				}
+			});
+
+			ORM.singleton.clear(); // clear cache
+
+			return helper.dropSync(Person, function () {
+				Person.create([{
+					name: "John Doe"
+				}, {
+					name: "Jane Doe"
+				}], done);
+			});
+		};
+	};
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			return done();
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	describe("with cache", function () {
+		before(setup(true));
+
+		it("should return item with id 1", function (done) {
+			Person.get(1, function (err, John) {
+				should.equal(err, null);
+
+				John.should.be.a("object");
+				John.should.have.property("id", 1);
+				John.should.have.property("name", "John Doe");
+
+				return done();
+			});
+		});
+
+		it("should have an UID method", function (done) {
+			Person.get(1, function (err, John) {
+				should.equal(err, null);
+
+				John.UID.should.be.a("function");
+				John.UID().should.equal(John.id);
+
+				return done();
+			});
+		});
+
+		describe("changing name and getting id 1 again", function () {
+			it("should return the original object with unchanged name", function (done) {
+				Person.get(1, function (err, John1) {
+					should.equal(err, null);
+
+					John1.name = "James";
+
+					Person.get(1, function (err, John2) {
+						should.equal(err, null);
+
+						John1.id.should.equal(John2.id);
+						John2.name.should.equal("John Doe");
+
+						return done();
+					});
+				});
+			});
+		});
+	});
+
+	describe("with no cache", function () {
+		before(setup(false));
+
+		describe("fetching several times", function () {
+			it("should return different objects", function (done) {
+				Person.get(1, function (err, John1) {
+					should.equal(err, null);
+					Person.get(1, function (err, John2) {
+						should.equal(err, null);
+
+						John1.id.should.equal(John2.id);
+						John1.should.not.equal(John2);
+
+						return done();
+					});
+				});
+			});
+		});
+	});
+
+	describe("with cache = 0.5 secs", function () {
+		before(setup(0.5));
+
+		describe("fetching again after 0.2 secs", function () {
+			it("should return same objects", function (done) {
+				Person.get(1, function (err, John1) {
+					should.equal(err, null);
+
+					setTimeout(function () {
+						Person.get(1, function (err, John2) {
+							should.equal(err, null);
+
+							John1.id.should.equal(John2.id);
+							John1.should.equal(John2);
+
+							return done();
+						});
+					}, 200);
+				});
+			});
+		});
+
+		describe("fetching again after 0.7 secs", function () {
+			it("should return different objects", function (done) {
+				Person.get(1, function (err, John1) {
+					should.equal(err, null);
+
+					setTimeout(function () {
+						Person.get(1, function (err, John2) {
+							should.equal(err, null);
+
+							John1.should.not.equal(John2);
+
+							return done();
+						});
+					}, 700);
+				});
+			});
+		});
+	});
+
+	describe("with empty object as options", function () {
+		before(setup());
+
+		it("should return item with id 1 like previously", function (done) {
+			Person.get(1, {}, function (err, John) {
+				should.equal(err, null);
+
+				John.should.be.a("object");
+				John.should.have.property("id", 1);
+				John.should.have.property("name", "John Doe")
+
+				return done();
+			});
+		});
+	});
+});

From 1a99955c6deef715d5090df362a4e0ad1e07e496 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 12 Jun 2013 21:25:38 +0100
Subject: [PATCH 0484/1246] Adds more use cases to Model.get test, deprecates a
 few more tests

---
 .../test-get-cache-no-save-check.js           |  0
 .../test-get-model-no-cache.js                |  0
 .../{ => deprecated}/test-get-no-cache.js     |  0
 .../test-get-singleton-somecache.js           |  0
 test/integration2/model-get.js                | 23 +++++++++++++++++++
 5 files changed, 23 insertions(+)
 rename test/integration/{ => deprecated}/test-get-cache-no-save-check.js (100%)
 rename test/integration/{ => deprecated}/test-get-model-no-cache.js (100%)
 rename test/integration/{ => deprecated}/test-get-no-cache.js (100%)
 rename test/integration/{ => deprecated}/test-get-singleton-somecache.js (100%)

diff --git a/test/integration/test-get-cache-no-save-check.js b/test/integration/deprecated/test-get-cache-no-save-check.js
similarity index 100%
rename from test/integration/test-get-cache-no-save-check.js
rename to test/integration/deprecated/test-get-cache-no-save-check.js
diff --git a/test/integration/test-get-model-no-cache.js b/test/integration/deprecated/test-get-model-no-cache.js
similarity index 100%
rename from test/integration/test-get-model-no-cache.js
rename to test/integration/deprecated/test-get-model-no-cache.js
diff --git a/test/integration/test-get-no-cache.js b/test/integration/deprecated/test-get-no-cache.js
similarity index 100%
rename from test/integration/test-get-no-cache.js
rename to test/integration/deprecated/test-get-no-cache.js
diff --git a/test/integration/test-get-singleton-somecache.js b/test/integration/deprecated/test-get-singleton-somecache.js
similarity index 100%
rename from test/integration/test-get-singleton-somecache.js
rename to test/integration/deprecated/test-get-singleton-somecache.js
diff --git a/test/integration2/model-get.js b/test/integration2/model-get.js
index 413c6c7e..94158696 100644
--- a/test/integration2/model-get.js
+++ b/test/integration2/model-get.js
@@ -89,6 +89,29 @@ describe("Model.get()", function() {
 				});
 			});
 		});
+
+		describe("changing instance.cacheSaveCheck = false", function () {
+			before(function (done) {
+				Person.settings.set("instance.cacheSaveCheck", false);
+
+				it("should return the same object with the changed name", function (done) {
+					Person.get(1, function (err, John1) {
+						should.equal(err, null);
+
+						John1.name = "James";
+
+						Person.get(1, function (err, John2) {
+							should.equal(err, null);
+
+							John1.id.should.equal(John2.id);
+							John2.name.should.equal("James");
+
+							return done();
+						});
+					});
+				});
+			});
+		});
 	});
 
 	describe("with no cache", function () {

From 432ac6b13e0b2f39179f2fc2f4e2629a5b149c48 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 12 Jun 2013 22:13:58 +0100
Subject: [PATCH 0485/1246] Adds hook tests, deprecates old ones

---
 .../test-hook-after-create.js                 |   0
 .../{ => deprecated}/test-hook-after-load.js  |   0
 .../test-hook-after-remove.js                 |   0
 .../{ => deprecated}/test-hook-after-save.js  |   0
 ...test-hook-before-create-define-property.js |   0
 .../test-hook-before-create-wait.js           |   0
 .../test-hook-before-create.js                |   0
 .../test-hook-before-remove-wait.js           |   0
 .../test-hook-before-remove.js                |   0
 .../test-hook-before-save-wait.js             |   0
 .../{ => deprecated}/test-hook-before-save.js |   0
 .../test-hook-before-validation-wait.js       |   0
 .../test-hook-before-validation.js            |   0
 test/integration2/hook.js                     | 313 ++++++++++++++++++
 14 files changed, 313 insertions(+)
 rename test/integration/{ => deprecated}/test-hook-after-create.js (100%)
 rename test/integration/{ => deprecated}/test-hook-after-load.js (100%)
 rename test/integration/{ => deprecated}/test-hook-after-remove.js (100%)
 rename test/integration/{ => deprecated}/test-hook-after-save.js (100%)
 rename test/integration/{ => deprecated}/test-hook-before-create-define-property.js (100%)
 rename test/integration/{ => deprecated}/test-hook-before-create-wait.js (100%)
 rename test/integration/{ => deprecated}/test-hook-before-create.js (100%)
 rename test/integration/{ => deprecated}/test-hook-before-remove-wait.js (100%)
 rename test/integration/{ => deprecated}/test-hook-before-remove.js (100%)
 rename test/integration/{ => deprecated}/test-hook-before-save-wait.js (100%)
 rename test/integration/{ => deprecated}/test-hook-before-save.js (100%)
 rename test/integration/{ => deprecated}/test-hook-before-validation-wait.js (100%)
 rename test/integration/{ => deprecated}/test-hook-before-validation.js (100%)
 create mode 100644 test/integration2/hook.js

diff --git a/test/integration/test-hook-after-create.js b/test/integration/deprecated/test-hook-after-create.js
similarity index 100%
rename from test/integration/test-hook-after-create.js
rename to test/integration/deprecated/test-hook-after-create.js
diff --git a/test/integration/test-hook-after-load.js b/test/integration/deprecated/test-hook-after-load.js
similarity index 100%
rename from test/integration/test-hook-after-load.js
rename to test/integration/deprecated/test-hook-after-load.js
diff --git a/test/integration/test-hook-after-remove.js b/test/integration/deprecated/test-hook-after-remove.js
similarity index 100%
rename from test/integration/test-hook-after-remove.js
rename to test/integration/deprecated/test-hook-after-remove.js
diff --git a/test/integration/test-hook-after-save.js b/test/integration/deprecated/test-hook-after-save.js
similarity index 100%
rename from test/integration/test-hook-after-save.js
rename to test/integration/deprecated/test-hook-after-save.js
diff --git a/test/integration/test-hook-before-create-define-property.js b/test/integration/deprecated/test-hook-before-create-define-property.js
similarity index 100%
rename from test/integration/test-hook-before-create-define-property.js
rename to test/integration/deprecated/test-hook-before-create-define-property.js
diff --git a/test/integration/test-hook-before-create-wait.js b/test/integration/deprecated/test-hook-before-create-wait.js
similarity index 100%
rename from test/integration/test-hook-before-create-wait.js
rename to test/integration/deprecated/test-hook-before-create-wait.js
diff --git a/test/integration/test-hook-before-create.js b/test/integration/deprecated/test-hook-before-create.js
similarity index 100%
rename from test/integration/test-hook-before-create.js
rename to test/integration/deprecated/test-hook-before-create.js
diff --git a/test/integration/test-hook-before-remove-wait.js b/test/integration/deprecated/test-hook-before-remove-wait.js
similarity index 100%
rename from test/integration/test-hook-before-remove-wait.js
rename to test/integration/deprecated/test-hook-before-remove-wait.js
diff --git a/test/integration/test-hook-before-remove.js b/test/integration/deprecated/test-hook-before-remove.js
similarity index 100%
rename from test/integration/test-hook-before-remove.js
rename to test/integration/deprecated/test-hook-before-remove.js
diff --git a/test/integration/test-hook-before-save-wait.js b/test/integration/deprecated/test-hook-before-save-wait.js
similarity index 100%
rename from test/integration/test-hook-before-save-wait.js
rename to test/integration/deprecated/test-hook-before-save-wait.js
diff --git a/test/integration/test-hook-before-save.js b/test/integration/deprecated/test-hook-before-save.js
similarity index 100%
rename from test/integration/test-hook-before-save.js
rename to test/integration/deprecated/test-hook-before-save.js
diff --git a/test/integration/test-hook-before-validation-wait.js b/test/integration/deprecated/test-hook-before-validation-wait.js
similarity index 100%
rename from test/integration/test-hook-before-validation-wait.js
rename to test/integration/deprecated/test-hook-before-validation-wait.js
diff --git a/test/integration/test-hook-before-validation.js b/test/integration/deprecated/test-hook-before-validation.js
similarity index 100%
rename from test/integration/test-hook-before-validation.js
rename to test/integration/deprecated/test-hook-before-validation.js
diff --git a/test/integration2/hook.js b/test/integration2/hook.js
new file mode 100644
index 00000000..e92fce2c
--- /dev/null
+++ b/test/integration2/hook.js
@@ -0,0 +1,313 @@
+var _        = require('lodash');
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var async    = require('async');
+var ORM      = require('../../');
+
+describe("Hook", function() {
+	var db = null;
+	var Person = null;
+
+	var triggeredHooks = {};
+
+	var checkHook = function (hook) {
+		triggeredHooks[hook] = false;
+
+		return function () {
+			triggeredHooks[hook] = Date.now();
+		};
+	};
+
+	var setup = function (hooks) {
+		if (typeof hooks == "undefined") {
+			hooks = {
+				afterCreate      : checkHook("afterCreate"),
+				beforeCreate     : checkHook("beforeCreate"),
+				afterSave        : checkHook("afterSave"),
+				beforeSave       : checkHook("beforeSave"),
+				beforeValidation : checkHook("beforeValidation"),
+				beforeRemove     : checkHook("beforeRemove"),
+				afterRemove      : checkHook("afterRemove")
+			};
+		}
+
+		return function (done) {
+			Person = db.define("person", {
+				name   : String
+			}, {
+				hooks  : hooks
+			});
+
+			return helper.dropSync(Person, done);
+		};
+	};
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			return done();
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	describe("beforeCreate", function () {
+		before(setup());
+
+		it("should trigger before creating instance", function (done) {
+			Person.create([{ name: "John Doe" }], function () {
+				triggeredHooks.afterCreate.should.be.a("number");
+				triggeredHooks.beforeCreate.should.be.a("number");
+				triggeredHooks.beforeCreate.should.not.be.above(triggeredHooks.afterCreate);
+
+				return done();
+			});
+		});
+
+		describe("when setting properties", function () {
+			before(setup({
+				beforeCreate : function () {
+					this.name = "Jane Doe";
+				}
+			}));
+
+			it("should not be discarded", function (done) {
+				Person.create([{ }], function (err, items) {
+					should.equal(err, null);
+
+					items.should.be.a("object");
+					items.should.have.property("length", 1);
+					items[0].name.should.equal("Jane Doe");
+
+					return done();
+				});
+			});
+		});
+
+		describe("if hook method has 1 argument", function () {
+			var beforeCreate = false;
+
+			before(setup({
+				beforeCreate : function (next) {
+					setTimeout(function () {
+						beforeCreate = true;
+
+						return next();
+					}.bind(this), 200);
+				}
+			}));
+
+			it("should wait for hook to finish", function (done) {
+				this.timeout(500);
+
+				Person.create([{ name: "John Doe" }], function () {
+					beforeCreate.should.be.true;
+
+					return done();
+				});
+
+			});
+		});
+	});
+
+	describe("afterCreate", function () {
+		before(setup());
+
+		it("should trigger after creating instance", function (done) {
+			Person.create([{ name: "John Doe" }], function () {
+				triggeredHooks.afterCreate.should.be.a("number");
+				triggeredHooks.beforeCreate.should.be.a("number");
+				triggeredHooks.afterCreate.should.not.be.below(triggeredHooks.beforeCreate);
+
+				return done();
+			});
+		});
+	});
+
+	describe("beforeSave", function () {
+		before(setup());
+
+		it("should trigger before saving an instance", function (done) {
+			Person.create([{ name: "John Doe" }], function () {
+				triggeredHooks.afterSave.should.be.a("number");
+				triggeredHooks.beforeSave.should.be.a("number");
+				triggeredHooks.beforeSave.should.not.be.above(triggeredHooks.afterSave);
+
+				return done();
+			});
+		});
+
+		describe("if hook method has 1 argument", function () {
+			var beforeSave = false;
+
+			before(setup({
+				beforeSave : function (next) {
+					setTimeout(function () {
+						beforeSave = true;
+
+						return next();
+					}.bind(this), 200);
+				}
+			}));
+
+			it("should wait for hook to finish", function (done) {
+				this.timeout(500);
+
+				Person.create([{ name: "John Doe" }], function () {
+					beforeSave.should.be.true;
+
+					return done();
+				});
+
+			});
+		});
+	});
+
+	describe("afterSave", function () {
+		before(setup());
+
+		it("should trigger after saving an instance", function (done) {
+			Person.create([{ name: "John Doe" }], function () {
+				triggeredHooks.afterSave.should.be.a("number");
+				triggeredHooks.beforeSave.should.be.a("number");
+				triggeredHooks.afterSave.should.not.be.below(triggeredHooks.beforeSave);
+
+				return done();
+			});
+		});
+	});
+
+	describe("beforeValidation", function () {
+		before(setup());
+
+		it("should trigger before instance validation", function (done) {
+			Person.create([{ name: "John Doe" }], function () {
+				triggeredHooks.beforeValidation.should.be.a("number");
+				triggeredHooks.beforeCreate.should.be.a("number");
+				triggeredHooks.beforeSave.should.be.a("number");
+				triggeredHooks.beforeValidation.should.not.be.above(triggeredHooks.beforeCreate);
+				triggeredHooks.beforeValidation.should.not.be.above(triggeredHooks.beforeSave);
+
+				return done();
+			});
+		});
+
+		describe("if hook method has 1 argument", function () {
+			var beforeValidation = false;
+
+			before(setup({
+				beforeValidation : function (next) {
+					setTimeout(function () {
+						beforeValidation = true;
+
+						if (!this.name) return next("Name is missing");
+
+						return next();
+					}.bind(this), 200);
+				}
+			}));
+
+			it("should wait for hook to finish", function (done) {
+				this.timeout(500);
+
+				Person.create([{ name: "John Doe" }], function () {
+					beforeValidation.should.be.true;
+
+					return done();
+				});
+			});
+
+			it("should trigger error if hook passes an error", function (done) {
+				this.timeout(500);
+
+				Person.create([{ name: "" }], function (err) {
+					beforeValidation.should.be.true;
+
+					err.should.equal("Name is missing");
+
+					return done();
+				});
+			});
+		});
+	});
+
+	describe("afterLoad", function () {
+		var afterLoad = false;
+
+		before(setup({
+			afterLoad: function () {
+				afterLoad = true;
+			}
+		}));
+
+		it("should trigger when defining a model", function (done) {
+			var John = new Person({ name: "John" });
+
+			afterLoad.should.be.true;
+
+			return done();
+		});
+	});
+
+	describe("beforeRemove", function () {
+		before(setup());
+
+		it("should trigger before removing an instance", function (done) {
+			Person.create([{ name: "John Doe" }], function (err, items) {
+				items[0].remove(function () {
+					triggeredHooks.afterRemove.should.be.a("number");
+					triggeredHooks.beforeRemove.should.be.a("number");
+					triggeredHooks.beforeRemove.should.not.be.above(triggeredHooks.afterRemove);
+
+					return done();
+				});
+			});
+		});
+
+		describe("if hook method has 1 argument", function () {
+			var beforeRemove = false;
+
+			before(setup({
+				beforeRemove : function (next) {
+					setTimeout(function () {
+						beforeRemove = true;
+
+						return next();
+					}.bind(this), 200);
+				}
+			}));
+
+			it("should wait for hook to finish", function (done) {
+				this.timeout(500);
+
+				Person.create([{ name: "John Doe" }], function (err, items) {
+					items[0].remove(function () {
+						beforeRemove.should.be.true;
+
+						return done();
+					});
+				});
+
+			});
+		});
+	});
+
+	describe("afterRemove", function () {
+		before(setup());
+
+		it("should trigger after removing an instance", function (done) {
+			Person.create([{ name: "John Doe" }], function (err, items) {
+				items[0].remove(function () {
+					triggeredHooks.afterRemove.should.be.a("number");
+					triggeredHooks.beforeRemove.should.be.a("number");
+					triggeredHooks.afterRemove.should.not.be.below(triggeredHooks.beforeRemove);
+
+					return done();
+				});
+			});
+		});
+	});
+});

From bfbcecfe175ebcb49390235fb2841d0db4ad8494 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 12 Jun 2013 22:21:25 +0100
Subject: [PATCH 0486/1246] Deprecates test-many-validations-for-same-property
 since it's already checked in new ones

---
 .../{ => deprecated}/test-many-validations-for-same-property.js   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/integration/{ => deprecated}/test-many-validations-for-same-property.js (100%)

diff --git a/test/integration/test-many-validations-for-same-property.js b/test/integration/deprecated/test-many-validations-for-same-property.js
similarity index 100%
rename from test/integration/test-many-validations-for-same-property.js
rename to test/integration/deprecated/test-many-validations-for-same-property.js

From b57b4f7b7c5fda6b1ef34c49f431b868ec9f4253 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 13 Jun 2013 00:08:59 +0100
Subject: [PATCH 0487/1246] Adds new test for Model.aggregate(), deprecates old
 ones

---
 .../{ => deprecated}/test-aggregate-alias.js  |   0
 .../test-aggregate-distinct.js                |   0
 .../test-aggregate-groupby-orderby.js         |   0
 .../test-aggregate-groupby.js                 |   0
 .../{ => deprecated}/test-aggregate-limit.js  |   0
 .../{ => deprecated}/test-aggregate.js        |   0
 test/integration2/model-aggregate.js          | 122 ++++++++++++++++++
 7 files changed, 122 insertions(+)
 rename test/integration/{ => deprecated}/test-aggregate-alias.js (100%)
 rename test/integration/{ => deprecated}/test-aggregate-distinct.js (100%)
 rename test/integration/{ => deprecated}/test-aggregate-groupby-orderby.js (100%)
 rename test/integration/{ => deprecated}/test-aggregate-groupby.js (100%)
 rename test/integration/{ => deprecated}/test-aggregate-limit.js (100%)
 rename test/integration/{ => deprecated}/test-aggregate.js (100%)
 create mode 100644 test/integration2/model-aggregate.js

diff --git a/test/integration/test-aggregate-alias.js b/test/integration/deprecated/test-aggregate-alias.js
similarity index 100%
rename from test/integration/test-aggregate-alias.js
rename to test/integration/deprecated/test-aggregate-alias.js
diff --git a/test/integration/test-aggregate-distinct.js b/test/integration/deprecated/test-aggregate-distinct.js
similarity index 100%
rename from test/integration/test-aggregate-distinct.js
rename to test/integration/deprecated/test-aggregate-distinct.js
diff --git a/test/integration/test-aggregate-groupby-orderby.js b/test/integration/deprecated/test-aggregate-groupby-orderby.js
similarity index 100%
rename from test/integration/test-aggregate-groupby-orderby.js
rename to test/integration/deprecated/test-aggregate-groupby-orderby.js
diff --git a/test/integration/test-aggregate-groupby.js b/test/integration/deprecated/test-aggregate-groupby.js
similarity index 100%
rename from test/integration/test-aggregate-groupby.js
rename to test/integration/deprecated/test-aggregate-groupby.js
diff --git a/test/integration/test-aggregate-limit.js b/test/integration/deprecated/test-aggregate-limit.js
similarity index 100%
rename from test/integration/test-aggregate-limit.js
rename to test/integration/deprecated/test-aggregate-limit.js
diff --git a/test/integration/test-aggregate.js b/test/integration/deprecated/test-aggregate.js
similarity index 100%
rename from test/integration/test-aggregate.js
rename to test/integration/deprecated/test-aggregate.js
diff --git a/test/integration2/model-aggregate.js b/test/integration2/model-aggregate.js
new file mode 100644
index 00000000..2dee890e
--- /dev/null
+++ b/test/integration2/model-aggregate.js
@@ -0,0 +1,122 @@
+var _        = require('lodash');
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var async    = require('async');
+var ORM      = require('../../');
+
+describe("Model.aggregate()", function() {
+	var db = null;
+	var Person = null;
+
+	var setup = function () {
+		return function (done) {
+			Person = db.define("person", {
+				name   : String
+			});
+
+			return helper.dropSync(Person, function () {
+				Person.create([{
+					id  : 1,
+					name: "John Doe"
+				}, {
+					id  : 2,
+					name: "Jane Doe"
+				}, {
+					id  : 3,
+					name: "John Doe"
+				}], done);
+			});
+		};
+	};
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			return done();
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	describe("with multiple methods", function () {
+		before(setup());
+
+		it("should return value for everyone of them", function (done) {
+			Person.aggregate().count('id').min('id').max('id').get(function (err, count, min, max) {
+				should.equal(err, null);
+
+				count.should.equal(3);
+				min.should.equal(1);
+				max.should.equal(3);
+
+				return done();
+			});
+		});
+	});
+
+	describe("with distinct()", function () {
+		before(setup());
+
+		it("should return a list of distinct properties", function (done) {
+			Person.aggregate().distinct('name').get(function (err, names) {
+				should.equal(err, null);
+
+				names.should.be.a("object");
+				names.should.have.property("length", 2);
+
+				return done();
+			});
+		});
+
+		describe("with limit(1)", function () {
+			it("should return only one value", function (done) {
+				Person.aggregate().distinct('name').limit(1).get(function (err, names) {
+					should.equal(err, null);
+
+					names.should.be.a("object");
+					names.should.have.property("length", 1);
+
+					return done();
+				});
+			});
+		});
+	});
+
+	describe("with groupBy()", function () {
+		before(setup());
+
+		it("should return items grouped by property", function (done) {
+			Person.aggregate().count().groupBy('name').get(function (err, rows) {
+				should.equal(err, null);
+
+				rows.should.be.a("object");
+				rows.should.have.property("length", 2);
+
+				(rows[0].count + rows[1].count).should.equal(3); // 1 + 2
+
+				return done();
+			});
+		});
+
+		describe("with order()", function () {
+			before(setup());
+
+			it("should order items", function (done) {
+				Person.aggregate().count().groupBy('name').order('count', 'Z').get(function (err, rows) {
+					should.equal(err, null);
+
+					rows.should.be.a("object");
+					rows.should.have.property("length", 2);
+
+					rows[0].count.should.equal(2);
+					rows[1].count.should.equal(1);
+
+					return done();
+				});
+			});
+		});
+	});
+});

From 79574e96e309ce94afcd7a8d96622e2e2d5847d4 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 13 Jun 2013 00:13:06 +0100
Subject: [PATCH 0488/1246] Adds new test for Model.count(), deprecates old one

---
 .../{ => deprecated}/test-count.js            |  0
 test/integration2/model-count.js              | 71 +++++++++++++++++++
 2 files changed, 71 insertions(+)
 rename test/integration/{ => deprecated}/test-count.js (100%)
 create mode 100644 test/integration2/model-count.js

diff --git a/test/integration/test-count.js b/test/integration/deprecated/test-count.js
similarity index 100%
rename from test/integration/test-count.js
rename to test/integration/deprecated/test-count.js
diff --git a/test/integration2/model-count.js b/test/integration2/model-count.js
new file mode 100644
index 00000000..4ddcda68
--- /dev/null
+++ b/test/integration2/model-count.js
@@ -0,0 +1,71 @@
+var _        = require('lodash');
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var async    = require('async');
+var ORM      = require('../../');
+
+describe("Model.count()", function() {
+	var db = null;
+	var Person = null;
+
+	var setup = function () {
+		return function (done) {
+			Person = db.define("person", {
+				name   : String
+			});
+
+			return helper.dropSync(Person, function () {
+				Person.create([{
+					id  : 1,
+					name: "John Doe"
+				}, {
+					id  : 2,
+					name: "Jane Doe"
+				}, {
+					id  : 3,
+					name: "John Doe"
+				}], done);
+			});
+		};
+	};
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			return done();
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	describe("without conditions", function () {
+		before(setup());
+
+		it("should return all items in model", function (done) {
+			Person.count(function (err, count) {
+				should.equal(err, null);
+
+				count.should.equal(3);
+
+				return done();
+			});
+		});
+	});
+
+	describe("with conditions", function () {
+		before(setup());
+
+		it("should return only matching items", function (done) {
+			Person.count({ name: "John Doe" }, function (err, count) {
+				should.equal(err, null);
+
+				count.should.equal(2);
+
+				return done();
+			});
+		});
+	});
+});

From 25717572bc635e57e78786b9b612744da944c4c9 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 13 Jun 2013 00:17:32 +0100
Subject: [PATCH 0489/1246] Adds new test for Model.one(), deprecates old ones

---
 .../{ => deprecated}/test-one-conditions.js   |  0
 .../{ => deprecated}/test-one-order.js        |  0
 test/integration/{ => deprecated}/test-one.js |  0
 test/integration2/model-one.js                | 98 +++++++++++++++++++
 4 files changed, 98 insertions(+)
 rename test/integration/{ => deprecated}/test-one-conditions.js (100%)
 rename test/integration/{ => deprecated}/test-one-order.js (100%)
 rename test/integration/{ => deprecated}/test-one.js (100%)
 create mode 100644 test/integration2/model-one.js

diff --git a/test/integration/test-one-conditions.js b/test/integration/deprecated/test-one-conditions.js
similarity index 100%
rename from test/integration/test-one-conditions.js
rename to test/integration/deprecated/test-one-conditions.js
diff --git a/test/integration/test-one-order.js b/test/integration/deprecated/test-one-order.js
similarity index 100%
rename from test/integration/test-one-order.js
rename to test/integration/deprecated/test-one-order.js
diff --git a/test/integration/test-one.js b/test/integration/deprecated/test-one.js
similarity index 100%
rename from test/integration/test-one.js
rename to test/integration/deprecated/test-one.js
diff --git a/test/integration2/model-one.js b/test/integration2/model-one.js
new file mode 100644
index 00000000..2c20f20c
--- /dev/null
+++ b/test/integration2/model-one.js
@@ -0,0 +1,98 @@
+var _        = require('lodash');
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var async    = require('async');
+var ORM      = require('../../');
+
+describe("Model.one()", function() {
+	var db = null;
+	var Person = null;
+
+	var setup = function () {
+		return function (done) {
+			Person = db.define("person", {
+				name   : String
+			});
+
+			return helper.dropSync(Person, function () {
+				Person.create([{
+					id  : 1,
+					name: "Jeremy Doe"
+				}, {
+					id  : 2,
+					name: "John Doe"
+				}, {
+					id  : 3,
+					name: "Jane Doe"
+				}], done);
+			});
+		};
+	};
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			return done();
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	describe("without arguments", function () {
+		before(setup());
+
+		it("should return first item in model", function (done) {
+			Person.one(function (err, person) {
+				should.equal(err, null);
+
+				person.name.should.equal("Jeremy Doe");
+
+				return done();
+			});
+		});
+	});
+
+	describe("with order", function () {
+		before(setup());
+
+		it("should return first item in model based on order", function (done) {
+			Person.one("-name", function (err, person) {
+				should.equal(err, null);
+
+				person.name.should.equal("John Doe");
+
+				return done();
+			});
+		});
+	});
+
+	describe("with conditions", function () {
+		before(setup());
+
+		it("should return first item in model based on conditions", function (done) {
+			Person.one({ name: "Jane Doe" }, function (err, person) {
+				should.equal(err, null);
+
+				person.name.should.equal("Jane Doe");
+
+				return done();
+			});
+		});
+
+		describe("if no match", function () {
+			before(setup());
+
+			it("should return null", function (done) {
+				Person.one({ name: "Jack Doe" }, function (err, person) {
+					should.equal(err, null);
+					should.equal(person, null);
+
+					return done();
+				});
+			});
+		});
+	});
+});

From b7befc1aa8a4dcdd783cdd411ad06bc11751d40b Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 13 Jun 2013 00:24:36 +0100
Subject: [PATCH 0490/1246] Adds new test for Model.exists(), deprecates old
 ones

---
 .../{ => deprecated}/test-exists-array.js     |   0
 .../{ => deprecated}/test-exists-object.js    |   0
 .../{ => deprecated}/test-exists.js           |   0
 test/integration2/model-exists.js             | 115 ++++++++++++++++++
 4 files changed, 115 insertions(+)
 rename test/integration/{ => deprecated}/test-exists-array.js (100%)
 rename test/integration/{ => deprecated}/test-exists-object.js (100%)
 rename test/integration/{ => deprecated}/test-exists.js (100%)
 create mode 100644 test/integration2/model-exists.js

diff --git a/test/integration/test-exists-array.js b/test/integration/deprecated/test-exists-array.js
similarity index 100%
rename from test/integration/test-exists-array.js
rename to test/integration/deprecated/test-exists-array.js
diff --git a/test/integration/test-exists-object.js b/test/integration/deprecated/test-exists-object.js
similarity index 100%
rename from test/integration/test-exists-object.js
rename to test/integration/deprecated/test-exists-object.js
diff --git a/test/integration/test-exists.js b/test/integration/deprecated/test-exists.js
similarity index 100%
rename from test/integration/test-exists.js
rename to test/integration/deprecated/test-exists.js
diff --git a/test/integration2/model-exists.js b/test/integration2/model-exists.js
new file mode 100644
index 00000000..fe08a2e4
--- /dev/null
+++ b/test/integration2/model-exists.js
@@ -0,0 +1,115 @@
+var _        = require('lodash');
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var async    = require('async');
+var ORM      = require('../../');
+
+describe("Model.exists()", function() {
+	var db = null;
+	var Person = null;
+
+	var setup = function () {
+		return function (done) {
+			Person = db.define("person", {
+				name   : String
+			});
+
+			return helper.dropSync(Person, function () {
+				Person.create([{
+					id  : 1,
+					name: "Jeremy Doe"
+				}, {
+					id  : 2,
+					name: "John Doe"
+				}, {
+					id  : 3,
+					name: "Jane Doe"
+				}], done);
+			});
+		};
+	};
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			return done();
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	describe("with an id", function () {
+		before(setup());
+
+		it("should return true if found", function (done) {
+			Person.exists(2, function (err, exists) {
+				should.equal(err, null);
+
+				exists.should.be.true;
+
+				return done();
+			});
+		});
+
+		it("should return false if not found", function (done) {
+			Person.exists(4, function (err, exists) {
+				should.equal(err, null);
+
+				exists.should.be.false;
+
+				return done();
+			});
+		});
+	});
+
+	describe("with a list of ids", function () {
+		before(setup());
+
+		it("should return true if found", function (done) {
+			Person.exists([ 2 ], function (err, exists) {
+				should.equal(err, null);
+
+				exists.should.be.true;
+
+				return done();
+			});
+		});
+
+		it("should return false if not found", function (done) {
+			Person.exists([ 4 ], function (err, exists) {
+				should.equal(err, null);
+
+				exists.should.be.false;
+
+				return done();
+			});
+		});
+	});
+
+	describe("with a conditions object", function () {
+		before(setup());
+
+		it("should return true if found", function (done) {
+			Person.exists({ name: "John Doe" }, function (err, exists) {
+				should.equal(err, null);
+
+				exists.should.be.true;
+
+				return done();
+			});
+		});
+
+		it("should return false if not found", function (done) {
+			Person.exists({ name: "Jack Doe" }, function (err, exists) {
+				should.equal(err, null);
+
+				exists.should.be.false;
+
+				return done();
+			});
+		});
+	});
+});

From add9ef47a1e46b314a5c8b2563d27a37fce17ade Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 13 Jun 2013 14:50:59 +0100
Subject: [PATCH 0491/1246] Adds new test for Model.save(), deprecates old ones

---
 .../test-save-hasone-association-new.js       |   0
 .../test-save-hasone-association.js           |   0
 .../integration/{ => deprecated}/test-save.js |   0
 test/integration2/model-save.js               | 127 ++++++++++++++++++
 4 files changed, 127 insertions(+)
 rename test/integration/{ => deprecated}/test-save-hasone-association-new.js (100%)
 rename test/integration/{ => deprecated}/test-save-hasone-association.js (100%)
 rename test/integration/{ => deprecated}/test-save.js (100%)
 create mode 100644 test/integration2/model-save.js

diff --git a/test/integration/test-save-hasone-association-new.js b/test/integration/deprecated/test-save-hasone-association-new.js
similarity index 100%
rename from test/integration/test-save-hasone-association-new.js
rename to test/integration/deprecated/test-save-hasone-association-new.js
diff --git a/test/integration/test-save-hasone-association.js b/test/integration/deprecated/test-save-hasone-association.js
similarity index 100%
rename from test/integration/test-save-hasone-association.js
rename to test/integration/deprecated/test-save-hasone-association.js
diff --git a/test/integration/test-save.js b/test/integration/deprecated/test-save.js
similarity index 100%
rename from test/integration/test-save.js
rename to test/integration/deprecated/test-save.js
diff --git a/test/integration2/model-save.js b/test/integration2/model-save.js
new file mode 100644
index 00000000..935edd38
--- /dev/null
+++ b/test/integration2/model-save.js
@@ -0,0 +1,127 @@
+var _        = require('lodash');
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var async    = require('async');
+var ORM      = require('../../');
+
+describe("Model.save()", function() {
+	var db = null;
+	var Person = null;
+
+	var setup = function () {
+		return function (done) {
+			Person = db.define("person", {
+				name   : String
+			});
+			Person.hasOne("parent");
+
+			return helper.dropSync(Person, done);
+		};
+	};
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			return done();
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	describe("with callback", function () {
+		before(setup());
+
+		it("should save item and return id", function (done) {
+			var John = new Person({
+				name: "John"
+			});
+			John.save(function (err) {
+				should.equal(err, null);
+				John.id.should.be.a("number");
+
+				Person.get(John.id, function (err, JohnCopy) {
+					should.equal(err, null);
+
+					JohnCopy.id.should.equal(John.id);
+					JohnCopy.name.should.equal(John.name);
+
+					return done();
+				});
+			});
+		});
+	});
+
+	describe("with properties object", function () {
+		before(setup());
+
+		it("should update properties, save item and return id", function (done) {
+			var John = new Person({
+				name: "Jane"
+			});
+			John.save({ name: "John" }, function (err) {
+				should.equal(err, null);
+				John.id.should.be.a("number");
+				John.name.should.equal("John");
+
+				Person.get(John.id, function (err, JohnCopy) {
+					should.equal(err, null);
+
+					JohnCopy.id.should.equal(John.id);
+					JohnCopy.name.should.equal(John.name);
+
+					return done();
+				});
+			});
+		});
+	});
+
+	describe("if passed an association instance", function () {
+		before(setup());
+
+		it("should save association first and then save item and return id", function (done) {
+			var Jane = new Person({
+				name  : "Jane"
+			});
+			var John = new Person({
+				name  : "John",
+				parent: Jane
+			});
+			John.save(function (err) {
+				should.equal(err, null);
+				John.saved().should.be.true;
+				Jane.saved().should.be.true;
+
+				John.id.should.be.a("number");
+				Jane.id.should.be.a("number");
+
+				return done();
+			});
+		});
+	});
+
+	describe("if passed an association object", function () {
+		before(setup());
+
+		it("should save association first and then save item and return id", function (done) {
+			var John = new Person({
+				name  : "John",
+				parent: {
+					name  : "Jane"
+				}
+			});
+			John.save(function (err) {
+				should.equal(err, null);
+				John.saved().should.be.true;
+				John.parent.saved().should.be.true;
+
+				John.id.should.be.a("number");
+				John.parent.id.should.be.a("number");
+
+				return done();
+			});
+		});
+	});
+});

From ba61317e897b104d74639d43caa2ffb2a086b220 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 13 Jun 2013 15:08:59 +0100
Subject: [PATCH 0492/1246] Changes default timeout on hook test suite to 30
 secs

This should avoid Travis being slow and trigger default 2 sec timeout
---
 test/integration2/hook.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/integration2/hook.js b/test/integration2/hook.js
index e92fce2c..8b2087b3 100644
--- a/test/integration2/hook.js
+++ b/test/integration2/hook.js
@@ -54,6 +54,10 @@ describe("Hook", function() {
 		return db.close();
 	});
 
+	// there are a lot of timeouts in this suite and Travis or other test runners can
+	// have hickups that could force this suite to timeout to the default value (2 secs)
+	this.timeout(30000);
+
 	describe("beforeCreate", function () {
 		before(setup());
 

From 4e7e206ec5137d79b5090e48e726be338bb5526f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 13 Jun 2013 18:06:26 +0100
Subject: [PATCH 0493/1246] Adds lib-cov folder to .gitignore (code coverage)

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index b913b627..d07200e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 .DS_Store
 node_modules
 test/config.js
+lib-cov/

From a27bd1c20b5a881236641628514d8d7f63405b56 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 13 Jun 2013 18:07:01 +0100
Subject: [PATCH 0494/1246] Adds test/coverage.html to .gitignore (code
 coverage report)

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index d07200e7..45e9fb92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 .DS_Store
 node_modules
 test/config.js
+test/coverage.html
 lib-cov/

From a332c64cb9d45638e68f485159c65293437e8881 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 13 Jun 2013 18:09:23 +0100
Subject: [PATCH 0495/1246] Adds initial bash script to test and generate code
 coverage report

---
 test/coverage.sh                   | 18 ++++++++++++++++++
 test/support/coverage-package.json |  4 ++++
 2 files changed, 22 insertions(+)
 create mode 100755 test/coverage.sh
 create mode 100644 test/support/coverage-package.json

diff --git a/test/coverage.sh b/test/coverage.sh
new file mode 100755
index 00000000..0e83fe27
--- /dev/null
+++ b/test/coverage.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+echo "Instrumenting library..."
+rm -rf ../lib-cov
+jscoverage ../lib ../lib-cov
+
+echo "Backing up package.json..."
+mv ../package.json support/
+
+echo "Switching to coverage package.json..."
+cp support/coverage-package.json ../package.json
+
+echo "Checking coverage..."
+mocha -R html-cov integration2/ > coverage.html
+
+echo "Switching back to previous package.json"
+mv support/package.json ..
+
+echo "Open coverage.html"
diff --git a/test/support/coverage-package.json b/test/support/coverage-package.json
new file mode 100644
index 00000000..144f40dc
--- /dev/null
+++ b/test/support/coverage-package.json
@@ -0,0 +1,4 @@
+{
+  "name"        : "orm",
+  "main"        : "./lib-cov/ORM"
+}

From 548140038501a89fd74ac00377170939954678fb Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 13 Jun 2013 18:34:52 +0100
Subject: [PATCH 0496/1246] Adds some more tests to Model.aggregate() (throw
 tests)

---
 test/integration2/model-aggregate.js | 49 +++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/test/integration2/model-aggregate.js b/test/integration2/model-aggregate.js
index 2dee890e..f3d9f496 100644
--- a/test/integration2/model-aggregate.js
+++ b/test/integration2/model-aggregate.js
@@ -57,6 +57,38 @@ describe("Model.aggregate()", function() {
 		});
 	});
 
+	describe("with select() without arguments", function () {
+		before(setup());
+
+		it("should throw", function (done) {
+			Person.aggregate().select.should.throw();
+
+			return done();
+		});
+	});
+
+	describe("with get() without callback", function () {
+		before(setup());
+
+		it("should throw", function (done) {
+			Person.aggregate().count('id').get.should.throw();
+
+			return done();
+		});
+	});
+
+	describe("with get() without aggregates", function () {
+		before(setup());
+
+		it("should throw", function (done) {
+			(function () {
+				Person.aggregate().get(function () {});
+			}).should.throw();
+
+			return done();
+		});
+	});
+
 	describe("with distinct()", function () {
 		before(setup());
 
@@ -73,11 +105,26 @@ describe("Model.aggregate()", function() {
 
 		describe("with limit(1)", function () {
 			it("should return only one value", function (done) {
-				Person.aggregate().distinct('name').limit(1).get(function (err, names) {
+				Person.aggregate().distinct('name').limit(1).order("name").get(function (err, names) {
+					should.equal(err, null);
+
+					names.should.be.a("object");
+					names.should.have.property("length", 1);
+					names[0].should.equal("Jane Doe");
+
+					return done();
+				});
+			});
+		});
+
+		describe("with limit(1, 1)", function () {
+			it("should return only one value", function (done) {
+				Person.aggregate().distinct('name').limit(1, 1).order("name").get(function (err, names) {
 					should.equal(err, null);
 
 					names.should.be.a("object");
 					names.should.have.property("length", 1);
+					names[0].should.equal("John Doe");
 
 					return done();
 				});

From 863419888f8c6de17b5b88c8b1804c5b0f359736 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 13 Jun 2013 18:41:59 +0100
Subject: [PATCH 0497/1246] Moved test/coverage.sh to Makefile

---
 Makefile         | 10 ++++++++++
 test/coverage.sh | 18 ------------------
 2 files changed, 10 insertions(+), 18 deletions(-)
 delete mode 100755 test/coverage.sh

diff --git a/Makefile b/Makefile
index 5d3ef632..2fb511e4 100644
--- a/Makefile
+++ b/Makefile
@@ -4,4 +4,14 @@ test:
 	ORM_PROTOCOL=redshift node test/run
 	ORM_PROTOCOL=sqlite node test/run
 
+coverage: cov
+
+cov:
+	rm -rf lib-cov
+	jscoverage lib lib-cov
+	mv package.json test/support/
+	cp test/support/coverage-package.json package.json
+	ORM_PROTOCOL=mysql mocha -R html-cov test/integration2/ > test/coverage.html
+	mv test/support/package.json .
+
 .PHONY: test
diff --git a/test/coverage.sh b/test/coverage.sh
deleted file mode 100755
index 0e83fe27..00000000
--- a/test/coverage.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-echo "Instrumenting library..."
-rm -rf ../lib-cov
-jscoverage ../lib ../lib-cov
-
-echo "Backing up package.json..."
-mv ../package.json support/
-
-echo "Switching to coverage package.json..."
-cp support/coverage-package.json ../package.json
-
-echo "Checking coverage..."
-mocha -R html-cov integration2/ > coverage.html
-
-echo "Switching back to previous package.json"
-mv support/package.json ..
-
-echo "Open coverage.html"

From f9f34733df4ec36ee719a912a2870d6e72a322b3 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 13 Jun 2013 18:56:27 +0100
Subject: [PATCH 0498/1246] Adds test for Model.save() without callback

---
 test/integration2/model-save.js | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/test/integration2/model-save.js b/test/integration2/model-save.js
index 935edd38..beb4c7ab 100644
--- a/test/integration2/model-save.js
+++ b/test/integration2/model-save.js
@@ -54,6 +54,30 @@ describe("Model.save()", function() {
 		});
 	});
 
+	describe("without callback", function () {
+		before(setup());
+
+		it("should still save item and return id", function (done) {
+			var John = new Person({
+				name: "John"
+			});
+			John.save();
+			John.on("save", function (err) {
+				should.equal(err, null);
+				John.id.should.be.a("number");
+
+				Person.get(John.id, function (err, JohnCopy) {
+					should.equal(err, null);
+
+					JohnCopy.id.should.equal(John.id);
+					JohnCopy.name.should.equal(John.name);
+
+					return done();
+				});
+			});
+		});
+	});
+
 	describe("with properties object", function () {
 		before(setup());
 

From 1728a7561d058ad688bce950a4f919339ba7e8b4 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 13 Jun 2013 18:57:22 +0100
Subject: [PATCH 0499/1246] Adds test for Instance.on() at least for save event

---
 test/integration2/event.js | 83 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 test/integration2/event.js

diff --git a/test/integration2/event.js b/test/integration2/event.js
new file mode 100644
index 00000000..fe9244c4
--- /dev/null
+++ b/test/integration2/event.js
@@ -0,0 +1,83 @@
+var _        = require('lodash');
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var async    = require('async');
+var ORM      = require('../../');
+
+describe("Event", function() {
+	var db = null;
+	var Person = null;
+
+	var triggeredHooks = {};
+
+	var checkHook = function (hook) {
+		triggeredHooks[hook] = false;
+
+		return function () {
+			triggeredHooks[hook] = Date.now();
+		};
+	};
+
+	var setup = function (hooks) {
+		return function (done) {
+			Person = db.define("person", {
+				name   : { type: "text", required: true }
+			});
+
+			return helper.dropSync(Person, done);
+		};
+	};
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			return done();
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	describe("save", function () {
+		before(setup());
+
+		it("should trigger when saving an instance", function (done) {
+			var triggered = false;
+			var John = new Person({
+				name : "John Doe"
+			});
+			John.on("save", function () {
+				triggered = true;
+			});
+
+			triggered.should.be.false;
+
+			John.save(function () {
+				triggered.should.be.true;
+
+				return done();
+			});
+		});
+
+		it("should trigger when saving an instance even if it fails", function (done) {
+			var triggered = false;
+			var John = new Person();
+			John.on("save", function (err) {
+				triggered = true;
+
+				err.should.be.a("object");
+				err.msg.should.equal("required");
+			});
+
+			triggered.should.be.false;
+
+			John.save(function () {
+				triggered.should.be.true;
+
+				return done();
+			});
+		});
+	});
+});

From 77ac81c26670bfa4a174befac9258f1a3fa63fc1 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 13 Jun 2013 19:19:35 +0100
Subject: [PATCH 0500/1246] Fixes ipv4 predefined validator match string (it
 was not matching correctly!)

---
 lib/Validators.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/Validators.js b/lib/Validators.js
index 08083a0e..70f163d1 100644
--- a/lib/Validators.js
+++ b/lib/Validators.js
@@ -161,8 +161,9 @@ validators.patterns.email = function (msg) {
  * Check if it's a valid IPv4 address.
  **/
 validators.patterns.ipv4 = function (msg) {
-	var part = "(1[0-9]{,2}|2[0-4][0-9]|25[0-4])";
-	return validators.patterns.match("^" + [ part, part, part, part ].join("\\.") + "$", "", msg);
+	var p1 = "([1-9]|1[0-9][0-9]?|2[0-4][0-9]|25[0-4])";
+	var p2 = "([0-9]|1[0-9][0-9]?|2[0-4][0-9]|25[0-4])";
+	return validators.patterns.match("^" + [ p1, p2, p2, p1 ].join("\\.") + "$", "", msg);
 };
 
 module.exports = validators;

From 4827357b0f7303b0b7b2bbb40976115cc99e1de6 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 13 Jun 2013 19:20:01 +0100
Subject: [PATCH 0501/1246] Adds more predefined validators tests for regexp
 matches

---
 test/integration2/predefined-validators.js | 72 +++++++++++++++++++++-
 1 file changed, 69 insertions(+), 3 deletions(-)

diff --git a/test/integration2/predefined-validators.js b/test/integration2/predefined-validators.js
index a24d2bf2..7b5a6e83 100644
--- a/test/integration2/predefined-validators.js
+++ b/test/integration2/predefined-validators.js
@@ -4,7 +4,7 @@ var undef      = undefined;
 
 function checkValidation(done, expected) {
 	return function (returned) {
-		should.equal(returned, returned);
+		should.equal(returned, expected);
 
 		return done();
 	};
@@ -33,8 +33,8 @@ describe("Predefined Validators", function () {
 		});
 	});
 	describe("rangeNumber(0, undef)", function () {
-		it("should pass -5", function (done) {
-			validators.rangeNumber(0, undef)(-5, checkValidation(done));
+		it("should pass 5", function (done) {
+			validators.rangeNumber(0, undef)(5, checkValidation(done));
 		});
 		it("should not pass -5 with 'out-of-range-number'", function (done) {
 			validators.rangeNumber(0, undef)(-5, checkValidation(done, 'out-of-range-number'));
@@ -148,6 +148,7 @@ describe("Predefined Validators", function () {
 		});
 	});
 
+
 	describe("notEmptyString()", function () {
 		it("should pass 'a'", function (done) {
 			validators.notEmptyString()('a', checkValidation(done));
@@ -169,4 +170,69 @@ describe("Predefined Validators", function () {
 			});
 		});
 	});
+
+
+	describe("patterns.hexString()", function () {
+		it("should pass 'ABCDEF0123456789'", function (done) {
+			validators.patterns.hexString()('ABCDEF0123456789', checkValidation(done));
+		});
+		it("should pass 'abcdef0123456789'", function (done) {
+			validators.patterns.hexString()('abcdef0123456789', checkValidation(done));
+		});
+		it("should not pass 'af830g'", function (done) {
+			validators.patterns.hexString()('af830g', checkValidation(done, 'no-pattern-match'));
+		});
+		it("should not pass ''", function (done) {
+			validators.patterns.hexString()('', checkValidation(done, 'no-pattern-match'));
+		});
+	});
+
+
+	describe("patterns.email()", function () {
+		// Source: http://en.wikipedia.org/wiki/Email_address
+		//
+		it("should pass 'niceandsimple@example.com'", function (done) {
+			validators.patterns.email()('niceandsimple@example.com', checkValidation(done));
+		});
+		it("should pass 'Very.Common@example.com'", function (done) {
+			validators.patterns.email()('Very.Common@example.com', checkValidation(done));
+		});
+		it("should pass 'disposable.style.email.with+symbol@example.com'", function (done) {
+			validators.patterns.email()('disposable.style.email.with+symbol@example.com', checkValidation(done));
+		});
+		it("should not pass 'Abc.example.com'", function (done) {
+			validators.patterns.email()('Abc.example.com', checkValidation(done, 'no-pattern-match'));
+		});
+		it("should not pass 'A@b@c@example.com'", function (done) {
+			validators.patterns.email()('A@b@c@example.com', checkValidation(done, 'no-pattern-match'));
+		});
+		it("should not pass 'not\\allowed@example.com'", function (done) {
+			validators.patterns.email()('not\\allowed@example.com', checkValidation(done, 'no-pattern-match'));
+		});
+		it("should not pass 'abc@example'", function (done) {
+			validators.patterns.email()('abc@example', checkValidation(done, 'no-pattern-match'));
+		});
+	});
+
+
+	describe("patterns.ipv4()", function () {
+		it("should pass '1.2.3.4'", function (done) {
+			validators.patterns.ipv4()('1.2.3.4', checkValidation(done));
+		});
+		it("should pass '1.0.0.1'", function (done) {
+			validators.patterns.ipv4()('1.0.0.1', checkValidation(done));
+		});
+		it("should pass '1.10.100.254'", function (done) {
+			validators.patterns.ipv4()('1.10.100.254', checkValidation(done));
+		});
+		it("should not pass '1.10.100.255'", function (done) {
+			validators.patterns.ipv4()('1.10.100.255', checkValidation(done, 'no-pattern-match'));
+		});
+		it("should not pass '1.10.100.0'", function (done) {
+			validators.patterns.ipv4()('1.10.100.0', checkValidation(done, 'no-pattern-match'));
+		});
+		it("should not pass '0.1.2.3'", function (done) {
+			validators.patterns.ipv4()('0.1.2.3', checkValidation(done, 'no-pattern-match'));
+		});
+	});
 });

From cb1e8f0979eb80c9d86d1e3e2ab9ed3475d76be6 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 13 Jun 2013 22:50:03 +0100
Subject: [PATCH 0502/1246] Adds tests for validators.equalToProperty

---
 test/integration2/predefined-validators.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/test/integration2/predefined-validators.js b/test/integration2/predefined-validators.js
index 7b5a6e83..66a74e2a 100644
--- a/test/integration2/predefined-validators.js
+++ b/test/integration2/predefined-validators.js
@@ -172,6 +172,19 @@ describe("Predefined Validators", function () {
 	});
 
 
+	describe("equalToProperty('name')", function () {
+		it("should pass if equal", function (done) {
+			validators.equalToProperty('name')('John Doe', checkValidation(done), { name: "John Doe" });
+		});
+		it("should not pass if not equal", function (done) {
+			validators.equalToProperty('name')('John Doe', checkValidation(done, 'not-equal-to-property'), { name: "John" });
+		});
+		it("should not pass even if equal to other property", function (done) {
+			validators.equalToProperty('name')('John Doe', checkValidation(done, 'not-equal-to-property'), { surname: "John Doe" });
+		});
+	});
+
+
 	describe("patterns.hexString()", function () {
 		it("should pass 'ABCDEF0123456789'", function (done) {
 			validators.patterns.hexString()('ABCDEF0123456789', checkValidation(done));

From bf025fafffb863ba70acca64d908059c250ea124 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 13 Jun 2013 22:59:22 +0100
Subject: [PATCH 0503/1246] Updates Model.save() test to check for defaultValue

---
 test/integration2/model-save.js | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/test/integration2/model-save.js b/test/integration2/model-save.js
index beb4c7ab..7e60339d 100644
--- a/test/integration2/model-save.js
+++ b/test/integration2/model-save.js
@@ -8,10 +8,10 @@ describe("Model.save()", function() {
 	var db = null;
 	var Person = null;
 
-	var setup = function () {
+	var setup = function (nameDefinition) {
 		return function (done) {
 			Person = db.define("person", {
-				name   : String
+				name   : nameDefinition || String
 			});
 			Person.hasOne("parent");
 
@@ -31,6 +31,21 @@ describe("Model.save()", function() {
 		return db.close();
 	});
 
+	describe("if properties have default values", function () {
+		before(setup({ type: "text", defaultValue: "John" }));
+
+		it("should use it if not defined", function (done) {
+			var John = new Person();
+
+			John.save(function (err) {
+				should.equal(err, null);
+				John.name.should.equal("John");
+
+				return done();
+			});
+		});
+	});
+
 	describe("with callback", function () {
 		before(setup());
 

From 097e6f39be3456fc14acd49fd29a32dfd99da9f3 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 13 Jun 2013 23:03:37 +0100
Subject: [PATCH 0504/1246] Updates events test to check for err.msg instead of
 assuming it's defined

---
 test/integration2/event.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/integration2/event.js b/test/integration2/event.js
index fe9244c4..e7745a5b 100644
--- a/test/integration2/event.js
+++ b/test/integration2/event.js
@@ -48,6 +48,7 @@ describe("Event", function() {
 			var John = new Person({
 				name : "John Doe"
 			});
+
 			John.on("save", function () {
 				triggered = true;
 			});
@@ -64,11 +65,12 @@ describe("Event", function() {
 		it("should trigger when saving an instance even if it fails", function (done) {
 			var triggered = false;
 			var John = new Person();
+
 			John.on("save", function (err) {
 				triggered = true;
 
 				err.should.be.a("object");
-				err.msg.should.equal("required");
+				err.should.have.property("msg", "required");
 			});
 
 			triggered.should.be.false;

From 1e2a6074e5c47593e2bede7cffd65ad295eef518 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 14 Jun 2013 01:49:02 +0100
Subject: [PATCH 0505/1246] Updates Readme to support node 0.10.x, based on
 sqlite3@2.1.9

---
 .travis.yml |  1 +
 Readme.md   | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f25c2ef6..01ced59c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ node_js:
   - 0.4
   - 0.6
   - 0.8
+  - 0.10
 before_script:
   - mysql -e 'create database orm_test;'
   - psql -c 'create database orm_test;' -U postgres
diff --git a/Readme.md b/Readme.md
index b98ec8b7..c469392b 100755
--- a/Readme.md
+++ b/Readme.md
@@ -10,9 +10,12 @@ npm install orm
 
 ## Node.js Version Support
 
-Tests are done using [Travis CI](https://travis-ci.org/) for node versions 0.4.x, 0.6.x and 0.8.x. Because of full driver support,
-node 0.10.x is not tested yet due to the sqlite driver. If you don't use this driver, it should work just fine in latest versions, but
-you've been warned. Use at your own risk.
+Tests are done using [Travis CI](https://travis-ci.org/) for node versions 0.4.x, 0.6.x, 0.8.x and 0.10.x. If you want you can run
+tests locally.
+
+```sh
+make
+```
 
 ## DBMS Support
 
@@ -126,7 +129,7 @@ First, add the correct driver to your `package.json`:
 :----------------------|:---------------------------
  mysql                 | `"mysql" : "2.0.0-alpha7"`
  postgres<br/>redshift | `"pg": "~1.0.0"`
- sqlite                | `"sqlite3" : "2.1.7"`
+ sqlite                | `"sqlite3" : "2.1.9"`
 
 ### Options
 

From 903bdd90d4d17e3871c6dbc1466fbc38ec1700dd Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sat, 15 Jun 2013 11:31:16 +0100
Subject: [PATCH 0506/1246] sql-query@0.0.27

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 32a45d86..88af6fb1 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
   },
   "analyse"     : false,
   "dependencies": {
-    "sql-query"      : "0.0.26",
+    "sql-query"      : "0.0.27",
     "hat"            : "0.0.3"
   },
   "devDependencies": {

From fe431a8a8ce9c14ec4665c064873e4f545ccf54a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sat, 15 Jun 2013 11:38:14 +0100
Subject: [PATCH 0507/1246] Forces instance.returnAllErrors to be false in this
 tests

---
 test/integration2/event.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/integration2/event.js b/test/integration2/event.js
index e7745a5b..c841a358 100644
--- a/test/integration2/event.js
+++ b/test/integration2/event.js
@@ -23,6 +23,7 @@ describe("Event", function() {
 			Person = db.define("person", {
 				name   : { type: "text", required: true }
 			});
+			Person.settings.set("instance.returnAllErrors", false);
 
 			return helper.dropSync(Person, done);
 		};

From db5480d05836cb4d529e66c860cd33921f20630a Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Sun, 16 Jun 2013 15:41:38 +1000
Subject: [PATCH 0508/1246] db.settings should not reference the global
 defalt_settings object. See fe431a8

---
 lib/Settings.js                               |   3 +-
 package.json                                  |  14 +-
 .../test-settings-properties-primary-key.js   |   2 +-
 test/integration2/event.js                    |   1 -
 test/integration2/settings.js                 | 162 +++++++++++-------
 test/mocha.opts                               |   2 +-
 6 files changed, 115 insertions(+), 69 deletions(-)

diff --git a/lib/Settings.js b/lib/Settings.js
index 0ec407e4..b889907b 100644
--- a/lib/Settings.js
+++ b/lib/Settings.js
@@ -1,3 +1,4 @@
+var _ = require('lodash');
 var default_settings = {
 	properties : {
 		primary_key     : "id",
@@ -33,7 +34,7 @@ function Settings(settings) {
 			return this;
 		},
 		get: function (key, def) {
-			return get(key, def, settings);
+			return _.cloneDeep(get(key, def, settings));
 		},
 		unset: function () {
 			for (var i = 0; i < arguments.length; i++) {
diff --git a/package.json b/package.json
index 88af6fb1..ec6b9fa1 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
   "homepage"    : "http://dresende.github.io/node-orm2",
   "repository"  : "http://github.com/dresende/node-orm2.git",
   "scripts"     : {
-    "test"           : "make"
+    "test"      : "make"
   },
   "contributors": [
     { "name" : "Bramus Van Damme", "email" : "bramus@bram.us" },
@@ -30,15 +30,16 @@
   ],
   "main"        : "./lib/ORM",
   "scripts"     : {
-    "test"           : "make test"
+    "test"      : "make test"
   },
   "engines"     : {
-    "node"           : "*"
+    "node"      : "*"
   },
   "analyse"     : false,
   "dependencies": {
-    "sql-query"      : "0.0.27",
-    "hat"            : "0.0.3"
+    "sql-query" : "0.0.27",
+    "hat"       : "0.0.3",
+    "lodash"    : "1.3.1"
   },
   "devDependencies": {
     "utest"   : "0.0.6",
@@ -48,8 +49,7 @@
     "sqlite3" : "2.1.7",
     "async"   : "*",
     "mocha"   : "1.10.0",
-    "should"  : "1.2.2",
-    "lodash"  : "1.2.1"
+    "should"  : "1.2.2"
   },
   "optionalDependencies": {}
 }
diff --git a/test/integration/test-settings-properties-primary-key.js b/test/integration/test-settings-properties-primary-key.js
index 074b7535..071d7063 100644
--- a/test/integration/test-settings-properties-primary-key.js
+++ b/test/integration/test-settings-properties-primary-key.js
@@ -12,7 +12,7 @@ common.createConnection(function (err, db) {
 		], function (err) {
 			if (err) throw err;
 
-			common.ORM.settings.set('properties.primary_key', 'name');
+			db.settings.set('properties.primary_key', 'name');
 
 			var properties = common.getModelProperties();
 			// since "id" is no longer primary key and instances ignore non model properties,
diff --git a/test/integration2/event.js b/test/integration2/event.js
index c841a358..e7745a5b 100644
--- a/test/integration2/event.js
+++ b/test/integration2/event.js
@@ -23,7 +23,6 @@ describe("Event", function() {
 			Person = db.define("person", {
 				name   : { type: "text", required: true }
 			});
-			Person.settings.set("instance.returnAllErrors", false);
 
 			return helper.dropSync(Person, done);
 		};
diff --git a/test/integration2/settings.js b/test/integration2/settings.js
index 1f57b99b..eb864e18 100644
--- a/test/integration2/settings.js
+++ b/test/integration2/settings.js
@@ -1,94 +1,140 @@
 var _        = require('lodash');
 var should   = require('should');
+var helper   = require('../support/spec_helper');
 var ORM      = require('../../');
+var Settings = require("../../lib/Settings");
 
 describe("Settings", function () {
-	var testFunction = function testFunction() {
-		return "test";
-	};
-
-	describe("some.sub.object = 123.45", function () {
-		before(function (done) {
-			ORM.settings.set("some.sub.object", 123.45);
-			return done();
+	describe("changed on connection instance", function() {
+		it("should not change global defaults", function (done) {
+			var setting = 'instance.returnAllErrors';
+			var defaultValue = ORM.settings.get(setting);
+
+			helper.connect(function (db) {
+				db.settings.set(setting, !defaultValue);
+				db.close();
+
+				helper.connect(function (db) {
+					db.settings.get(setting).should.equal(defaultValue);
+					db.close();
+					done();
+				});
+			});
 		});
+	});
 
-		it("should be 123.45", function (done) {
-			ORM.settings.get("some.sub.object").should.equal(123.45);
+	describe("#get", function () {
+		var settings, returned;
 
-			return done();
+		beforeEach(function () {
+			settings = new Settings.Container({ a: [1,2] });
+			returned = null;
 		});
-	});
 
-	describe("some....object = testFunction", function () {
-		before(function (done) {
-			ORM.settings.set("some....object", testFunction);
-			return done();
+		it("should clone everything it returns", function () {
+			returned = settings.get('*');
+			returned.a = 123;
+
+			settings.get('a').should.eql([1,2]);
 		});
 
-		it("should be testFunction", function (done) {
-			ORM.settings.get("some....object").should.equal(testFunction);
+		it("should deep clone everything it returns", function () {
+			returned = settings.get('*');
+			returned.a.push(3);
 
-			return done();
+			settings.get('a').should.eql([1,2]);
 		});
 	});
 
-	describe("not setting some.unknown.object", function () {
-		it("should be undefined", function (done) {
-			should.equal(ORM.settings.get("some.unknown.object"), undefined);
+	describe("manipulating:", function () {
+		var testFunction = function testFunction() {
+			return "test";
+		};
+		var settings = new Settings.Container({});
 
-			return done();
-		});
-	});
+		describe("some.sub.object = 123.45", function () {
+			before(function (done) {
+				settings.set("some.sub.object", 123.45);
+				return done();
+			});
+
+			it("should be 123.45", function (done) {
+				settings.get("some.sub.object").should.equal(123.45);
 
-	describe("unsetting some.sub.object", function () {
-		before(function (done) {
-			ORM.settings.unset("some.sub.object");
-			return done();
+				return done();
+			});
 		});
 
-		it("should be undefined", function (done) {
-			should.equal(ORM.settings.get("some.sub.object"), undefined);
+		describe("some....object = testFunction", function () {
+			before(function (done) {
+				settings.set("some....object", testFunction);
+				return done();
+			});
 
-			return done();
-		});
-	});
+			it("should be testFunction", function (done) {
+				settings.get("some....object").should.equal(testFunction);
 
-	describe("unsetting some....object", function () {
-		before(function (done) {
-			ORM.settings.unset("some....object");
-			return done();
+				return done();
+			});
 		});
 
-		it("should be undefined", function (done) {
-			should.equal(ORM.settings.get("some....object"), undefined);
+		describe("not setting some.unknown.object", function () {
+			it("should be undefined", function (done) {
+				should.equal(settings.get("some.unknown.object"), undefined);
 
-			return done();
+				return done();
+			});
 		});
-	});
 
-	describe("unsetting some.*", function () {
-		before(function (done) {
-			ORM.settings.unset("some.*");
-			return done();
-		});
+		describe("unsetting some.sub.object", function () {
+			before(function (done) {
+				settings.unset("some.sub.object");
+				return done();
+			});
 
-		it("should return undefined for any 'some' sub-element", function (done) {
-			should.equal(ORM.settings.get("some.other.stuff"), undefined);
+			it("should be undefined", function (done) {
+				should.equal(settings.get("some.sub.object"), undefined);
 
-			return done();
+				return done();
+			});
 		});
-		it("should return an empty object for some.*", function (done) {
-			ORM.settings.get("some.*").should.be.a("object");
-			Object.keys(ORM.settings.get("some.*")).should.have.lengthOf(0);
 
-			return done();
+		describe("unsetting some....object", function () {
+			before(function (done) {
+				settings.unset("some....object");
+				return done();
+			});
+
+			it("should be undefined", function (done) {
+				should.equal(settings.get("some....object"), undefined);
+
+				return done();
+			});
 		});
-		it("should return an empty object for some", function (done) {
-			ORM.settings.get("some").should.be.a("object");
-			Object.keys(ORM.settings.get("some")).should.have.lengthOf(0);
 
-			return done();
+		describe("unsetting some.*", function () {
+			before(function (done) {
+				settings.unset("some.*");
+				return done();
+			});
+
+			it("should return undefined for any 'some' sub-element", function (done) {
+				should.equal(settings.get("some.other.stuff"), undefined);
+
+				return done();
+			});
+			it("should return an empty object for some.*", function (done) {
+				settings.get("some.*").should.be.a("object");
+				Object.keys(settings.get("some.*")).should.have.lengthOf(0);
+
+				return done();
+			});
+			it("should return an empty object for some", function (done) {
+				settings.get("some").should.be.a("object");
+				Object.keys(settings.get("some")).should.have.lengthOf(0);
+
+				return done();
+			});
 		});
 	});
 });
diff --git a/test/mocha.opts b/test/mocha.opts
index d9a95e80..5ada47be 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1 +1 @@
---reporter nyan
+--reporter spec

From 2b6bf0399a8caef0703e47f2ead6106f74534156 Mon Sep 17 00:00:00 2001
From: Ashutosh Das <dew32672@hotmail.com>
Date: Sun, 16 Jun 2013 22:21:32 +0600
Subject: [PATCH 0509/1246] Update .gitignore

add text editors backup file..........
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 45e9fb92..292e7d58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ node_modules
 test/config.js
 test/coverage.html
 lib-cov/
+*~

From 2b569b0915700fd216ae0edb3583518e5f5a18b2 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 17 Jun 2013 13:02:51 +0100
Subject: [PATCH 0510/1246] Adds tests for Property.js, deprecates previous one

---
 .../{ => deprecated}/test-property-types.js   |  0
 test/integration2/property.js                 | 78 +++++++++++++++++++
 2 files changed, 78 insertions(+)
 rename test/integration/{ => deprecated}/test-property-types.js (100%)
 create mode 100644 test/integration2/property.js

diff --git a/test/integration/test-property-types.js b/test/integration/deprecated/test-property-types.js
similarity index 100%
rename from test/integration/test-property-types.js
rename to test/integration/deprecated/test-property-types.js
diff --git a/test/integration2/property.js b/test/integration2/property.js
new file mode 100644
index 00000000..afaebfc9
--- /dev/null
+++ b/test/integration2/property.js
@@ -0,0 +1,78 @@
+var _        = require('lodash');
+var should   = require('should');
+var Property = require("../../lib/Property");
+var Settings = require("../../lib/Settings");
+
+var settings = new Settings.Container({});
+
+describe("Property", function () {
+	describe("passing String", function() {
+		it("should return type: 'text'", function (done) {
+			Property.normalize(String, settings).type.should.equal("text");
+
+			return done();
+		});
+	});
+	describe("passing Number", function() {
+		it("should return type: 'number'", function (done) {
+			Property.normalize(Number, settings).type.should.equal("number");
+
+			return done();
+		});
+	});
+	describe("passing Boolean", function() {
+		it("should return type: 'boolean'", function (done) {
+			Property.normalize(Boolean, settings).type.should.equal("boolean");
+
+			return done();
+		});
+	});
+	describe("passing Date", function() {
+		it("should return type: 'date'", function (done) {
+			Property.normalize(Date, settings).type.should.equal("date");
+
+			return done();
+		});
+	});
+	describe("passing Object", function() {
+		it("should return type: 'object'", function (done) {
+			Property.normalize(Object, settings).type.should.equal("object");
+
+			return done();
+		});
+	});
+	describe("passing Buffer", function() {
+		it("should return type: 'binary'", function (done) {
+			Property.normalize(Buffer, settings).type.should.equal("binary");
+
+			return done();
+		});
+	});
+	describe("passing an Array of items", function() {
+		it("should return type: 'enum' with list of items", function (done) {
+			var prop = Property.normalize([ 1, 2, 3 ], settings);
+
+			prop.type.should.equal("enum");
+			prop.values.should.have.property("length", 3);
+
+			return done();
+		});
+	});
+	describe("passing a string type", function() {
+		it("should return type: <type>", function (done) {
+			Property.normalize("text", settings).type.should.equal("text");
+
+			return done();
+		});
+
+		describe("if not valid", function () {
+			it("should throw", function (done) {
+				(function () {
+					Property.normalize("string", settings);
+				}).should.throw();
+
+				return done();
+			});
+		});
+	});
+});

From 801f2d1efc49ad35c11571595dc9fad9f94783aa Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 17 Jun 2013 13:09:43 +0100
Subject: [PATCH 0511/1246] Exports Settings and Property constructors to ORM
 and changes new tests to use them

To be able to test code coverage, paths have to be avoided (lib/) so
tests should include ORM - "../.." (because package.json is changed
during test coverage) and then access anything using it.
---
 lib/ORM.js                    |  2 ++
 test/integration2/property.js | 24 +++++++++++-------------
 test/integration2/settings.js |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index 5a9226d2..8acc648e 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -14,6 +14,8 @@ var Singleton      = require("./Singleton");
 exports.validators = Validators;
 exports.singleton  = Singleton;
 exports.settings   = new Settings.Container(Settings.defaults());
+exports.Settings   = Settings;
+exports.Property   = require("./Property");
 
 for (var k in Query.Comparators) {
 	exports[Query.Comparators[k]] = Query[Query.Comparators[k]];
diff --git a/test/integration2/property.js b/test/integration2/property.js
index afaebfc9..69eeb435 100644
--- a/test/integration2/property.js
+++ b/test/integration2/property.js
@@ -1,56 +1,54 @@
 var _        = require('lodash');
 var should   = require('should');
-var Property = require("../../lib/Property");
-var Settings = require("../../lib/Settings");
-
-var settings = new Settings.Container({});
+var ORM      = require("../..");
+var Property = ORM.Property;
 
 describe("Property", function () {
 	describe("passing String", function() {
 		it("should return type: 'text'", function (done) {
-			Property.normalize(String, settings).type.should.equal("text");
+			Property.normalize(String, ORM.settings).type.should.equal("text");
 
 			return done();
 		});
 	});
 	describe("passing Number", function() {
 		it("should return type: 'number'", function (done) {
-			Property.normalize(Number, settings).type.should.equal("number");
+			Property.normalize(Number, ORM.settings).type.should.equal("number");
 
 			return done();
 		});
 	});
 	describe("passing Boolean", function() {
 		it("should return type: 'boolean'", function (done) {
-			Property.normalize(Boolean, settings).type.should.equal("boolean");
+			Property.normalize(Boolean, ORM.settings).type.should.equal("boolean");
 
 			return done();
 		});
 	});
 	describe("passing Date", function() {
 		it("should return type: 'date'", function (done) {
-			Property.normalize(Date, settings).type.should.equal("date");
+			Property.normalize(Date, ORM.settings).type.should.equal("date");
 
 			return done();
 		});
 	});
 	describe("passing Object", function() {
 		it("should return type: 'object'", function (done) {
-			Property.normalize(Object, settings).type.should.equal("object");
+			Property.normalize(Object, ORM.settings).type.should.equal("object");
 
 			return done();
 		});
 	});
 	describe("passing Buffer", function() {
 		it("should return type: 'binary'", function (done) {
-			Property.normalize(Buffer, settings).type.should.equal("binary");
+			Property.normalize(Buffer, ORM.settings).type.should.equal("binary");
 
 			return done();
 		});
 	});
 	describe("passing an Array of items", function() {
 		it("should return type: 'enum' with list of items", function (done) {
-			var prop = Property.normalize([ 1, 2, 3 ], settings);
+			var prop = Property.normalize([ 1, 2, 3 ], ORM.settings);
 
 			prop.type.should.equal("enum");
 			prop.values.should.have.property("length", 3);
@@ -60,7 +58,7 @@ describe("Property", function () {
 	});
 	describe("passing a string type", function() {
 		it("should return type: <type>", function (done) {
-			Property.normalize("text", settings).type.should.equal("text");
+			Property.normalize("text", ORM.settings).type.should.equal("text");
 
 			return done();
 		});
@@ -68,7 +66,7 @@ describe("Property", function () {
 		describe("if not valid", function () {
 			it("should throw", function (done) {
 				(function () {
-					Property.normalize("string", settings);
+					Property.normalize("string", ORM.settings);
 				}).should.throw();
 
 				return done();
diff --git a/test/integration2/settings.js b/test/integration2/settings.js
index eb864e18..372df23d 100644
--- a/test/integration2/settings.js
+++ b/test/integration2/settings.js
@@ -2,7 +2,7 @@ var _        = require('lodash');
 var should   = require('should');
 var helper   = require('../support/spec_helper');
 var ORM      = require('../../');
-var Settings = require("../../lib/Settings");
+var Settings = ORM.Settings;
 
 describe("Settings", function () {
 	describe("changed on connection instance", function() {

From 9ec271edad466a12c104bcaa1478f685cf0983f3 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 17 Jun 2013 15:07:51 +0100
Subject: [PATCH 0512/1246] Updates predefined validators test to test unique()

---
 test/integration2/predefined-validators.js | 68 ++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/test/integration2/predefined-validators.js b/test/integration2/predefined-validators.js
index 66a74e2a..a8a6cfab 100644
--- a/test/integration2/predefined-validators.js
+++ b/test/integration2/predefined-validators.js
@@ -1,4 +1,5 @@
 var should     = require('should');
+var helper     = require('../support/spec_helper');
 var validators = require('../../').validators;
 var undef      = undefined;
 
@@ -185,6 +186,73 @@ describe("Predefined Validators", function () {
 	});
 
 
+	describe("unique()", function () {
+		var db = null;
+		var Person = null;
+
+		var setup = function () {
+			return function (done) {
+				Person = db.define("person", {
+					name    : String,
+					surname : String
+				}, {
+					validations: {
+						surname: validators.unique()
+					}
+				});
+
+				Person.settings.set("instance.returnAllErrors", false);
+
+				return helper.dropSync(Person, function () {
+					Person.create([{
+						name    : "John",
+						surname : "Doe"
+					}], done);
+				});
+			};
+		};
+
+		before(function (done) {
+			helper.connect(function (connection) {
+				db = connection;
+
+				return setup()(done);
+			});
+		});
+
+		after(function () {
+			return db.close();
+		});
+
+		it("should not pass if more elements with that property exist", function (done) {
+			var janeDoe = new Person({
+				name    : "Jane",
+				surname : "Doe" // <-- in table already!
+			});
+			janeDoe.save(function (err) {
+				err.should.be.a("object");
+				err.should.have.property("field", "surname");
+				err.should.have.property("value", "Doe");
+				err.should.have.property("msg", "not-unique");
+
+				return done();
+			});
+		});
+
+		it("should pass if no more elements with that property exist", function (done) {
+			var janeDoe = new Person({
+				name    : "Jane",
+				surname : "Dean" // <-- not in table
+			});
+			janeDoe.save(function (err) {
+				should.equal(err, null);
+
+				return done();
+			});
+		});
+	});
+
+
 	describe("patterns.hexString()", function () {
 		it("should pass 'ABCDEF0123456789'", function (done) {
 			validators.patterns.hexString()('ABCDEF0123456789', checkValidation(done));

From c9e2adcb27fb56f6567eb9e1bf8048040b5e231c Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 17 Jun 2013 15:12:22 +0100
Subject: [PATCH 0513/1246] Adds one more test for predefined validators to
 check if no errors occur when resaving

---
 test/integration2/predefined-validators.js | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/test/integration2/predefined-validators.js b/test/integration2/predefined-validators.js
index a8a6cfab..19555134 100644
--- a/test/integration2/predefined-validators.js
+++ b/test/integration2/predefined-validators.js
@@ -240,16 +240,31 @@ describe("Predefined Validators", function () {
 		});
 
 		it("should pass if no more elements with that property exist", function (done) {
-			var janeDoe = new Person({
+			var janeDean = new Person({
 				name    : "Jane",
 				surname : "Dean" // <-- not in table
 			});
-			janeDoe.save(function (err) {
+			janeDean.save(function (err) {
 				should.equal(err, null);
 
 				return done();
 			});
 		});
+
+		it("should pass if resaving the same instance", function (done) {
+			Person.find({ name: "John", surname: "Doe" }, function (err, Johns) {
+				should.equal(err, null);
+				Johns.should.have.property("length", 1);
+
+				Johns[0].surname = "Doe"; // forcing resave
+
+				Johns[0].save(function (err) {
+					should.equal(err, null);
+
+					return done();
+				});
+			});
+		});
 	});
 
 

From bfe38461fa63e9f74cde5b676821f2ca3de53b1b Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 17 Jun 2013 17:46:59 +0100
Subject: [PATCH 0514/1246] Adds tests for Model.find() chaining, deprecates
 old ones

---
 .../{ => deprecated}/test-find-chain-count.js |   0
 .../test-find-chain-find-cb.js                |   0
 .../{ => deprecated}/test-find-chain-first.js |   0
 .../{ => deprecated}/test-find-chain-last.js  |   0
 .../{ => deprecated}/test-find-chain-limit.js |   0
 .../test-find-chain-offset.js                 |   0
 .../{ => deprecated}/test-find-chain-only.js  |   0
 .../test-find-chain-order-desc.js             |   0
 .../test-find-chain-order-minus.js            |   0
 .../{ => deprecated}/test-find-chain-order.js |   0
 .../test-find-chain-remove.js                 |   0
 .../{ => deprecated}/test-find-chain.js       |   0
 test/integration2/chain-model-find.js         | 319 ++++++++++++++++++
 13 files changed, 319 insertions(+)
 rename test/integration/{ => deprecated}/test-find-chain-count.js (100%)
 rename test/integration/{ => deprecated}/test-find-chain-find-cb.js (100%)
 rename test/integration/{ => deprecated}/test-find-chain-first.js (100%)
 rename test/integration/{ => deprecated}/test-find-chain-last.js (100%)
 rename test/integration/{ => deprecated}/test-find-chain-limit.js (100%)
 rename test/integration/{ => deprecated}/test-find-chain-offset.js (100%)
 rename test/integration/{ => deprecated}/test-find-chain-only.js (100%)
 rename test/integration/{ => deprecated}/test-find-chain-order-desc.js (100%)
 rename test/integration/{ => deprecated}/test-find-chain-order-minus.js (100%)
 rename test/integration/{ => deprecated}/test-find-chain-order.js (100%)
 rename test/integration/{ => deprecated}/test-find-chain-remove.js (100%)
 rename test/integration/{ => deprecated}/test-find-chain.js (100%)
 create mode 100644 test/integration2/chain-model-find.js

diff --git a/test/integration/test-find-chain-count.js b/test/integration/deprecated/test-find-chain-count.js
similarity index 100%
rename from test/integration/test-find-chain-count.js
rename to test/integration/deprecated/test-find-chain-count.js
diff --git a/test/integration/test-find-chain-find-cb.js b/test/integration/deprecated/test-find-chain-find-cb.js
similarity index 100%
rename from test/integration/test-find-chain-find-cb.js
rename to test/integration/deprecated/test-find-chain-find-cb.js
diff --git a/test/integration/test-find-chain-first.js b/test/integration/deprecated/test-find-chain-first.js
similarity index 100%
rename from test/integration/test-find-chain-first.js
rename to test/integration/deprecated/test-find-chain-first.js
diff --git a/test/integration/test-find-chain-last.js b/test/integration/deprecated/test-find-chain-last.js
similarity index 100%
rename from test/integration/test-find-chain-last.js
rename to test/integration/deprecated/test-find-chain-last.js
diff --git a/test/integration/test-find-chain-limit.js b/test/integration/deprecated/test-find-chain-limit.js
similarity index 100%
rename from test/integration/test-find-chain-limit.js
rename to test/integration/deprecated/test-find-chain-limit.js
diff --git a/test/integration/test-find-chain-offset.js b/test/integration/deprecated/test-find-chain-offset.js
similarity index 100%
rename from test/integration/test-find-chain-offset.js
rename to test/integration/deprecated/test-find-chain-offset.js
diff --git a/test/integration/test-find-chain-only.js b/test/integration/deprecated/test-find-chain-only.js
similarity index 100%
rename from test/integration/test-find-chain-only.js
rename to test/integration/deprecated/test-find-chain-only.js
diff --git a/test/integration/test-find-chain-order-desc.js b/test/integration/deprecated/test-find-chain-order-desc.js
similarity index 100%
rename from test/integration/test-find-chain-order-desc.js
rename to test/integration/deprecated/test-find-chain-order-desc.js
diff --git a/test/integration/test-find-chain-order-minus.js b/test/integration/deprecated/test-find-chain-order-minus.js
similarity index 100%
rename from test/integration/test-find-chain-order-minus.js
rename to test/integration/deprecated/test-find-chain-order-minus.js
diff --git a/test/integration/test-find-chain-order.js b/test/integration/deprecated/test-find-chain-order.js
similarity index 100%
rename from test/integration/test-find-chain-order.js
rename to test/integration/deprecated/test-find-chain-order.js
diff --git a/test/integration/test-find-chain-remove.js b/test/integration/deprecated/test-find-chain-remove.js
similarity index 100%
rename from test/integration/test-find-chain-remove.js
rename to test/integration/deprecated/test-find-chain-remove.js
diff --git a/test/integration/test-find-chain.js b/test/integration/deprecated/test-find-chain.js
similarity index 100%
rename from test/integration/test-find-chain.js
rename to test/integration/deprecated/test-find-chain.js
diff --git a/test/integration2/chain-model-find.js b/test/integration2/chain-model-find.js
new file mode 100644
index 00000000..82f71ced
--- /dev/null
+++ b/test/integration2/chain-model-find.js
@@ -0,0 +1,319 @@
+var _        = require('lodash');
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var async    = require('async');
+var ORM      = require('../../');
+
+describe("Model.find() chaining", function() {
+	var db = null;
+	var Person = null;
+
+	var setup = function () {
+		return function (done) {
+			Person = db.define("person", {
+				name    : String,
+				surname : String,
+				age     : Number
+			}, {
+				cache : false
+			});
+
+			ORM.singleton.clear(); // clear cache
+
+			return helper.dropSync(Person, function () {
+				Person.create([{
+					name    : "John",
+					surname : "Doe",
+					age     : 18
+				}, {
+					name    : "Jane",
+					surname : "Doe",
+					age     : 20
+				}, {
+					name    : "Jane",
+					surname : "Dean",
+					age     : 18
+				}], done);
+			});
+		};
+	};
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			return done();
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	describe(".limit(N)", function () {
+		before(setup());
+
+		it("should limit results to N items", function (done) {
+			Person.find().limit(2).run(function (err, instances) {
+				should.equal(err, null);
+				instances.should.have.property("length", 2);
+
+				return done();
+			});
+		});
+	});
+
+	describe(".skip(N)", function () {
+		before(setup());
+
+		it("should skip the first N results", function (done) {
+			Person.find().skip(2).order("age").run(function (err, instances) {
+				should.equal(err, null);
+				instances.should.have.property("length", 1);
+				instances[0].age.should.equal(20);
+
+				return done();
+			});
+		});
+	});
+
+	describe(".offset(N)", function () {
+		before(setup());
+
+		it("should skip the first N results", function (done) {
+			Person.find().offset(2).order("age").run(function (err, instances) {
+				should.equal(err, null);
+				instances.should.have.property("length", 1);
+				instances[0].age.should.equal(20);
+
+				return done();
+			});
+		});
+	});
+
+	describe(".order('property')", function () {
+		before(setup());
+
+		it("should order by that property ascending", function (done) {
+			Person.find().order("age").run(function (err, instances) {
+				should.equal(err, null);
+				instances.should.have.property("length", 3);
+				instances[0].age.should.equal(18);
+				instances[2].age.should.equal(20);
+
+				return done();
+			});
+		});
+	});
+
+	describe(".order('-property')", function () {
+		before(setup());
+
+		it("should order by that property descending", function (done) {
+			Person.find().order("-age").run(function (err, instances) {
+				should.equal(err, null);
+				instances.should.have.property("length", 3);
+				instances[0].age.should.equal(20);
+				instances[2].age.should.equal(18);
+
+				return done();
+			});
+		});
+	});
+
+	describe(".order('property', 'Z')", function () {
+		before(setup());
+
+		it("should order by that property descending", function (done) {
+			Person.find().order("age", "Z").run(function (err, instances) {
+				should.equal(err, null);
+				instances.should.have.property("length", 3);
+				instances[0].age.should.equal(20);
+				instances[2].age.should.equal(18);
+
+				return done();
+			});
+		});
+	});
+
+	describe(".only('property', ...)", function () {
+		before(setup());
+
+		it("should return only those properties, others null", function (done) {
+			Person.find().only("age", "surname").order("-age").run(function (err, instances) {
+				should.equal(err, null);
+				instances.should.have.property("length", 3);
+				instances[0].should.have.property("age");
+				instances[0].should.have.property("surname", "Doe");
+				instances[0].should.have.property("name", null);
+
+				return done();
+			});
+		});
+	});
+
+	describe(".only('property1', ...)", function () {
+		before(setup());
+
+		it("should return only those properties, others null", function (done) {
+			Person.find().only([ "age", "surname" ]).order("-age").run(function (err, instances) {
+				should.equal(err, null);
+				instances.should.have.property("length", 3);
+				instances[0].should.have.property("age");
+				instances[0].should.have.property("surname", "Doe");
+				instances[0].should.have.property("name", null);
+
+				return done();
+			});
+		});
+	});
+
+	describe(".count()", function () {
+		before(setup());
+
+		it("should return only the total number of results", function (done) {
+			Person.find().count(function (err, count) {
+				should.equal(err, null);
+				count.should.equal(3);
+
+				return done();
+			});
+		});
+	});
+
+	describe(".first()", function () {
+		before(setup());
+
+		it("should return only the first element", function (done) {
+			Person.find().order("-age").first(function (err, JaneDoe) {
+				should.equal(err, null);
+
+				JaneDoe.name.should.equal("Jane");
+				JaneDoe.surname.should.equal("Doe");
+				JaneDoe.age.should.equal(20);
+
+				return done();
+			});
+		});
+
+		it("should return null if not found", function (done) {
+			Person.find({ name: "Jack" }).first(function (err, Jack) {
+				should.equal(err, null);
+				should.equal(Jack, null);
+
+				return done();
+			});
+		});
+	});
+
+	describe(".last()", function () {
+		before(setup());
+
+		it("should return only the last element", function (done) {
+			Person.find().order("age").last(function (err, JaneDoe) {
+				should.equal(err, null);
+
+				JaneDoe.name.should.equal("Jane");
+				JaneDoe.surname.should.equal("Doe");
+				JaneDoe.age.should.equal(20);
+
+				return done();
+			});
+		});
+
+		it("should return null if not found", function (done) {
+			Person.find({ name: "Jack" }).last(function (err, Jack) {
+				should.equal(err, null);
+				should.equal(Jack, null);
+
+				return done();
+			});
+		});
+	});
+
+	describe(".find()", function () {
+		before(setup());
+
+		it("should not change find if no arguments", function (done) {
+			Person.find().find().count(function (err, count) {
+				should.equal(err, null);
+				count.should.equal(3);
+
+				return done();
+			});
+		});
+
+		it("should restrict conditions if passed", function (done) {
+			Person.find().find({ age: 18 }).count(function (err, count) {
+				should.equal(err, null);
+				count.should.equal(2);
+
+				return done();
+			});
+		});
+
+		it("should restrict conditions if passed and also be chainable", function (done) {
+			Person.find().find({ age: 18 }).find({ name: "Jane" }).count(function (err, count) {
+				should.equal(err, null);
+				count.should.equal(1);
+
+				return done();
+			});
+		});
+
+		it("should return results if passed a callback as second argument", function (done) {
+			Person.find().find({ age: 18 }, function (err, instances) {
+				should.equal(err, null);
+				instances.should.have.property("length", 2);
+
+				return done();
+			});
+		});
+	});
+
+	describe(".each()", function () {
+		before(setup());
+
+		it("should return a ChainInstance", function (done) {
+			var chain = Person.find().each();
+
+			chain.filter.should.be.a("function");
+			chain.sort.should.be.a("function");
+			chain.count.should.be.a("function");
+
+			return done();
+		});
+	});
+
+	describe(".remove()", function () {
+		before(setup());
+
+		it("should have no problems if no results found", function (done) {
+			Person.find({ age: 22 }).remove(function (err) {
+				should.equal(err, null);
+
+				Person.find().count(function (err, count) {
+					should.equal(err, null);
+
+					count.should.equal(3);
+
+					return done();
+				});
+			});
+		});
+
+		it("should remove results and give feedback", function (done) {
+			Person.find({ age: 20 }).remove(function (err) {
+				should.equal(err, null);
+
+				Person.find().count(function (err, count) {
+					should.equal(err, null);
+
+					count.should.equal(2);
+
+					return done();
+				});
+			});
+		});
+	});
+});

From eb14541eb048c7a26a62abd9ce451a4aaa7a10b9 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 17 Jun 2013 17:56:23 +0100
Subject: [PATCH 0515/1246] Forces test to pass on postgres for now by casting
 value to Number

---
 test/integration2/chain-model-find.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/integration2/chain-model-find.js b/test/integration2/chain-model-find.js
index 82f71ced..8e1dd821 100644
--- a/test/integration2/chain-model-find.js
+++ b/test/integration2/chain-model-find.js
@@ -70,7 +70,7 @@ describe("Model.find() chaining", function() {
 			Person.find().skip(2).order("age").run(function (err, instances) {
 				should.equal(err, null);
 				instances.should.have.property("length", 1);
-				instances[0].age.should.equal(20);
+				Number(instances[0].age).should.equal(20);
 
 				return done();
 			});
@@ -84,7 +84,7 @@ describe("Model.find() chaining", function() {
 			Person.find().offset(2).order("age").run(function (err, instances) {
 				should.equal(err, null);
 				instances.should.have.property("length", 1);
-				instances[0].age.should.equal(20);
+				Number(instances[0].age).should.equal(20);
 
 				return done();
 			});
@@ -98,8 +98,8 @@ describe("Model.find() chaining", function() {
 			Person.find().order("age").run(function (err, instances) {
 				should.equal(err, null);
 				instances.should.have.property("length", 3);
-				instances[0].age.should.equal(18);
-				instances[2].age.should.equal(20);
+				Number(instances[0].age).should.equal(18);
+				Number(instances[2].age).should.equal(20);
 
 				return done();
 			});
@@ -113,8 +113,8 @@ describe("Model.find() chaining", function() {
 			Person.find().order("-age").run(function (err, instances) {
 				should.equal(err, null);
 				instances.should.have.property("length", 3);
-				instances[0].age.should.equal(20);
-				instances[2].age.should.equal(18);
+				Number(instances[0].age).should.equal(20);
+				Number(instances[2].age).should.equal(18);
 
 				return done();
 			});
@@ -128,8 +128,8 @@ describe("Model.find() chaining", function() {
 			Person.find().order("age", "Z").run(function (err, instances) {
 				should.equal(err, null);
 				instances.should.have.property("length", 3);
-				instances[0].age.should.equal(20);
-				instances[2].age.should.equal(18);
+				Number(instances[0].age).should.equal(20);
+				Number(instances[2].age).should.equal(18);
 
 				return done();
 			});
@@ -190,7 +190,7 @@ describe("Model.find() chaining", function() {
 
 				JaneDoe.name.should.equal("Jane");
 				JaneDoe.surname.should.equal("Doe");
-				JaneDoe.age.should.equal(20);
+				Number(JaneDoe.age).should.equal(20);
 
 				return done();
 			});
@@ -215,7 +215,7 @@ describe("Model.find() chaining", function() {
 
 				JaneDoe.name.should.equal("Jane");
 				JaneDoe.surname.should.equal("Doe");
-				JaneDoe.age.should.equal(20);
+				Number(JaneDoe.age).should.equal(20);
 
 				return done();
 			});

From cc994b4e9bf6ca46310ae2e5de89684dfb8cc164 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 17 Jun 2013 18:34:10 +0100
Subject: [PATCH 0516/1246] Adds test for Model.get() without callback

---
 test/integration2/model-get.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/test/integration2/model-get.js b/test/integration2/model-get.js
index 94158696..7e9688ee 100644
--- a/test/integration2/model-get.js
+++ b/test/integration2/model-get.js
@@ -190,4 +190,16 @@ describe("Model.get()", function() {
 			});
 		});
 	});
+
+	describe("without callback", function () {
+		before(setup(true));
+
+		it("should throw", function (done) {
+			(function () {
+				Person.get(1);
+			}).should.throw();
+
+			return done();
+		});
+	});
 });

From 8f1e8d0fe7933ccdab202e973af41881ebbfa0cb Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 13 Jun 2013 17:21:50 +1000
Subject: [PATCH 0517/1246] Add failing hasone tests

---
 test/integration2/association-hasone.js | 77 +++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 test/integration2/association-hasone.js

diff --git a/test/integration2/association-hasone.js b/test/integration2/association-hasone.js
new file mode 100644
index 00000000..f60e5ebb
--- /dev/null
+++ b/test/integration2/association-hasone.js
@@ -0,0 +1,77 @@
+var _				= require('lodash');
+var should	 = require('should');
+var helper	 = require('../support/spec_helper');
+var async		= require('async');
+var ORM			= require('../../');
+
+describe("hasOne", function() {
+	var db   = null;
+	var Tree = null;
+	var Leaf = null;
+
+	var setup = function (opts) {
+		opts = opts || {};
+		return function (done) {
+			Tree = db.define("tree", { type: String });
+			Leaf = db.define("leaf", { size: Number });
+			Leaf.hasOne('tree', Tree, { field: 'treeId', autoFetch: !!opts.autoFetch });
+
+			return helper.dropSync([Tree, Leaf], done);
+		};
+	};
+
+	before(function(done) {
+		helper.connect(function (connection) {
+			db = connection;
+			done();
+		});
+	});
+
+	var afArr = [false, true];
+	for(var i = 0; i < afArr.length; i++) {
+		describe("with autofetch = " + afArr[i], function() {
+			before(setup({autoFetch: afArr[i]}));
+
+			describe("associating by parent id", function() {
+				var tree = null;
+
+				before(function(done) {
+					Tree.create({type: "cyprus"},  function(err, item) {
+						if (err) throw err;
+						tree = item;
+						return done();
+					});
+				});
+
+				it("should work when calling Instance.save", function(done) {
+					console.log("before new");
+					leaf = new Leaf({size: 4.6, treeId: tree.id});
+					console.log("after new", leaf.tree);
+					leaf.save(function(err, leaf) {
+						if (err) throw err;
+
+						return done();
+					});
+				});
+
+				it("should work when calling Instance.save after initially setting parentId to null", function(done) {
+					leaf = new Leaf({size: 4.6, treeId: null});
+					leaf.treeId = tree.id;
+					leaf.save(function(err, leaf) {
+						if (err) throw err;
+
+						return done();
+					});
+				});
+
+				it("should work when calling Model.create", function(done) {
+					Leaf.create({size: 4.6, treeId: tree.id}, function(err, leaf) {
+						if (err) throw err;
+
+						return done();
+					});
+				});
+			});
+		});
+	};
+});

From b8918aeaca351683206d8f2e4b63e6746f522e80 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Fri, 14 Jun 2013 16:54:11 +1000
Subject: [PATCH 0518/1246] WIP: Fix hasOne infinite loop & migrate tests to
 mocha

---
 lib/Associations/One.js                       |  19 +-
 lib/Instance.js                               |  23 +-
 .../test-association-hasone-autofetch.js      |   0
 .../test-association-hasone-find-autofetch.js |   0
 .../test-association-hasone-get.js            |   0
 .../test-association-hasone-has.js            |   0
 .../test-association-hasone-remove.js         |   0
 .../test-association-hasone-set.js            |   0
 .../test-association-hasone-validate.js       |   0
 test/integration2/association-hasone.js       | 217 +++++++++++++++---
 10 files changed, 218 insertions(+), 41 deletions(-)
 rename test/integration/{ => deprecated}/test-association-hasone-autofetch.js (100%)
 rename test/integration/{ => deprecated}/test-association-hasone-find-autofetch.js (100%)
 rename test/integration/{ => deprecated}/test-association-hasone-get.js (100%)
 rename test/integration/{ => deprecated}/test-association-hasone-has.js (100%)
 rename test/integration/{ => deprecated}/test-association-hasone-remove.js (100%)
 rename test/integration/{ => deprecated}/test-association-hasone-set.js (100%)
 rename test/integration/{ => deprecated}/test-association-hasone-validate.js (100%)

diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index ad63ff5e..1c117ef6 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -181,7 +181,7 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 	if (!association.reversed) {
 		Object.defineProperty(Instance, association.delAccessor, {
 			value: function (cb) {
-				Instance[association.field] = 0;
+				Instance[association.field] = null;
 				Instance.save(cb);
 
 				return this;
@@ -198,13 +198,18 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 		return cb();
 	}
 
-	Instance[association.getAccessor]({ autoFetchLimit: opts.autoFetchLimit - 1 }, function (err, Assoc) {
-		if (!err) {
-			Instance[association.name] = Assoc;
-		}
+	// When we have a new non persisted instance for which the association field (eg owner_id)
+	// is set, we don't want to auto fetch anything, since `new Model(owner_id: 12)` takes no
+	// callback, and hence this lookup would complete at an arbitrary point in the future.
+	if(Instance.isPersisted()) {
+		Instance[association.getAccessor]({ autoFetchLimit: opts.autoFetchLimit - 1 }, function (err, Assoc) {
+			if (!err) {
+				Instance[association.name] = Assoc;
+			}
 
-		return cb();
-	});
+			return cb();
+		});
+	}
 }
 
 function ucfirst(text) {
diff --git a/lib/Instance.js b/lib/Instance.js
index 10af2cfc..e4c8ef52 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -455,6 +455,12 @@ function Instance(opts) {
 		value: true,
 		enumerable: false
 	});
+	Object.defineProperty(instance, "isPersisted", {
+		value: function() {
+			return !opts.is_new;
+		},
+		enumerable: false
+	});
 	Object.defineProperty(instance, "validate", {
 		value: function (cb) {
 			handleValidations(cb);
@@ -469,15 +475,20 @@ function Instance(opts) {
 		}
 	}
 	for (i = 0; i < opts.one_associations.length; i++) {
-		if (opts.data.hasOwnProperty(opts.one_associations[i].name)) {
-			if (typeof opts.data[opts.one_associations[i].name] == "object") {
-				if (opts.data[opts.one_associations[i].name].isInstance) {
-					instance[opts.one_associations[i].name] = opts.data[opts.one_associations[i].name];
+		var asc = opts.one_associations[i]
+
+		if (!opts.data.hasOwnProperty(asc.field)) {
+			addInstanceProperty(asc.field);
+		}
+		if (opts.data.hasOwnProperty(asc.name)) {
+			if (typeof opts.data[asc.name] == "object") {
+				if (opts.data[asc.name].isInstance) {
+					instance[asc.name] = opts.data[asc.name];
 				} else {
-					instance[opts.one_associations[i].name] = new opts.one_associations[i].model(opts.data[opts.one_associations[i].name]);
+					instance[asc.name] = new opts.one_associations[i].model(opts.data[asc.name]);
 				}
 			}
-			delete opts.data[opts.one_associations[i].name];
+			delete opts.data[asc.name];
 		}
 	}
 	for (i = 0; i < opts.many_associations.length; i++) {
diff --git a/test/integration/test-association-hasone-autofetch.js b/test/integration/deprecated/test-association-hasone-autofetch.js
similarity index 100%
rename from test/integration/test-association-hasone-autofetch.js
rename to test/integration/deprecated/test-association-hasone-autofetch.js
diff --git a/test/integration/test-association-hasone-find-autofetch.js b/test/integration/deprecated/test-association-hasone-find-autofetch.js
similarity index 100%
rename from test/integration/test-association-hasone-find-autofetch.js
rename to test/integration/deprecated/test-association-hasone-find-autofetch.js
diff --git a/test/integration/test-association-hasone-get.js b/test/integration/deprecated/test-association-hasone-get.js
similarity index 100%
rename from test/integration/test-association-hasone-get.js
rename to test/integration/deprecated/test-association-hasone-get.js
diff --git a/test/integration/test-association-hasone-has.js b/test/integration/deprecated/test-association-hasone-has.js
similarity index 100%
rename from test/integration/test-association-hasone-has.js
rename to test/integration/deprecated/test-association-hasone-has.js
diff --git a/test/integration/test-association-hasone-remove.js b/test/integration/deprecated/test-association-hasone-remove.js
similarity index 100%
rename from test/integration/test-association-hasone-remove.js
rename to test/integration/deprecated/test-association-hasone-remove.js
diff --git a/test/integration/test-association-hasone-set.js b/test/integration/deprecated/test-association-hasone-set.js
similarity index 100%
rename from test/integration/test-association-hasone-set.js
rename to test/integration/deprecated/test-association-hasone-set.js
diff --git a/test/integration/test-association-hasone-validate.js b/test/integration/deprecated/test-association-hasone-validate.js
similarity index 100%
rename from test/integration/test-association-hasone-validate.js
rename to test/integration/deprecated/test-association-hasone-validate.js
diff --git a/test/integration2/association-hasone.js b/test/integration2/association-hasone.js
index f60e5ebb..2c8dc80b 100644
--- a/test/integration2/association-hasone.js
+++ b/test/integration2/association-hasone.js
@@ -5,18 +5,41 @@ var async		= require('async');
 var ORM			= require('../../');
 
 describe("hasOne", function() {
-	var db   = null;
-	var Tree = null;
-	var Leaf = null;
+	var db    = null;
+	var Tree  = null;
+	var Stalk = null;
+	var Leaf  = null;
 
 	var setup = function (opts) {
 		opts = opts || {};
 		return function (done) {
-			Tree = db.define("tree", { type: String });
-			Leaf = db.define("leaf", { size: Number });
-			Leaf.hasOne('tree', Tree, { field: 'treeId', autoFetch: !!opts.autoFetch });
+			db.settings.set('instance.cache', false);
+			db.settings.set('instance.returnAllErrors', true);
+			Tree  = db.define("tree",   { type:   { type: 'text' } });
+			Stalk = db.define("stalk",  { length: { type: 'number', rational: false } });
+			Leaf  = db.define("leaf", {
+				size: { type: 'number', rational: false }
+			}, {
+				validations: opts.validations
+			});
+			Leaf.hasOne('tree',  Tree,  { field: 'treeId', autoFetch: !!opts.autoFetch });
+			Leaf.hasOne('stalk', Stalk, { field: 'stalkId' });
 
-			return helper.dropSync([Tree, Leaf], done);
+			return helper.dropSync([Tree, Stalk, Leaf], function() {
+				Tree.create({ type: 'pine' }, function (err, tree) {
+					should.not.exist(err);
+					Leaf.create({ size: 14 }, function (err, leaf) {
+						should.not.exist(err);
+						leaf.setTree(tree, function () {
+							Stalk.create({ length: 20 }, function (err, stalk) {
+								should.not.exist(err);
+								should.exist(stalk);
+								done();
+							});
+						});
+					});
+				});
+			});
 		};
 	};
 
@@ -27,51 +50,189 @@ describe("hasOne", function() {
 		});
 	});
 
-	var afArr = [false, true];
-	for(var i = 0; i < afArr.length; i++) {
-		describe("with autofetch = " + afArr[i], function() {
-			before(setup({autoFetch: afArr[i]}));
+	describe("accessors", function () {
+		before(setup());
+
+		it("get should get the association", function (done) {
+			Leaf.one({ size: 14 }, function (err, leaf) {
+				should.not.exist(err);
+				should.exist(leaf);
+				leaf.getTree(function (err, tree) {
+					should.not.exist(err);
+					should.exist(tree);
+					return done();
+				});
+			});
+		});
+
+		it("has should indicate if there is an association present", function (done) {
+			Leaf.one({ size: 14 }, function (err, leaf) {
+				should.not.exist(err);
+				should.exist(leaf);
+
+				leaf.hasTree(function (err, has) {
+					should.not.exist(err);
+					should.equal(has, true);
+
+					leaf.hasStalk(function (err, has) {
+						should.not.exist(err);
+						should.equal(has, false);
+						return done();
+					});
+				});
+			});
+		});
+
+		it("set should associate another instance", function (done) {
+			Stalk.one({ length: 20 }, function (err, stalk) {
+				should.not.exist(err);
+				should.exist(stalk);
+				Leaf.one({ size: 14 }, function (err, leaf) {
+					should.not.exist(err);
+					should.exist(leaf);
+					should.not.exist(leaf.stalkId);
+					leaf.setStalk(stalk, function (err) {
+						should.not.exist(err);
+						Leaf.one({ size: 14 }, function (err, leaf) {
+							should.not.exist(err);
+							should.equal(leaf.stalkId, stalk.id);
+							done();
+						});
+					});
+				});
+			});
+		});
+
+		it("remove should unassociation another instance", function (done) {
+			Stalk.one({ length: 20 }, function (err, stalk) {
+				should.not.exist(err);
+				should.exist(stalk);
+				Leaf.one({ size: 14 }, function (err, leaf) {
+					should.not.exist(err);
+					should.exist(leaf);
+					should.exist(leaf.stalkId);
+					leaf.removeStalk(function (err) {
+						should.not.exist(err);
+						Leaf.one({ size: 14 }, function (err, leaf) {
+							should.not.exist(err);
+							should.equal(leaf.stalkId, null)
+							done();
+						});
+					});
+				});
+			});
+		});
+	});
+
+	[false, true].forEach(function (af) {
+		describe("with autofetch = " + af, function () {
+			before(setup({autoFetch: af}));
+
+			describe("autofetching", function() {
+				it((af ? "should" : "shouldn't") + " be done", function (done) {
+					Leaf.one({}, function (err, leaf) {
+						should.not.exist(err);
+						should.equal(typeof leaf.tree, af ? 'object' : 'undefined');
 
-			describe("associating by parent id", function() {
+						return done();
+					});
+				});
+			});
+
+			describe("associating by parent id", function () {
 				var tree = null;
 
 				before(function(done) {
-					Tree.create({type: "cyprus"},  function(err, item) {
-						if (err) throw err;
+					Tree.create({type: "cyprus"},  function (err, item) {
+						should.not.exist(err);
 						tree = item;
+
 						return done();
 					});
 				});
 
-				it("should work when calling Instance.save", function(done) {
-					console.log("before new");
-					leaf = new Leaf({size: 4.6, treeId: tree.id});
-					console.log("after new", leaf.tree);
+				it("should work when calling Instance.save", function (done) {
+					leaf = new Leaf({size: 4, treeId: tree.id});
 					leaf.save(function(err, leaf) {
-						if (err) throw err;
+						should.not.exist(err);
 
-						return done();
+						Leaf.get(leaf.id, function(err, fetchedLeaf) {
+							should.not.exist(err);
+							should.exist(fetchedLeaf);
+							should.equal(fetchedLeaf.treeId, leaf.treeId);
+
+							return done();
+						});
 					});
 				});
 
 				it("should work when calling Instance.save after initially setting parentId to null", function(done) {
-					leaf = new Leaf({size: 4.6, treeId: null});
+					leaf = new Leaf({size: 4, treeId: null});
 					leaf.treeId = tree.id;
 					leaf.save(function(err, leaf) {
-						if (err) throw err;
+						should.not.exist(err);
 
-						return done();
+						Leaf.get(leaf.id, function(err, fetchedLeaf) {
+							should.not.exist(err);
+							should.exist(fetchedLeaf);
+							should.equal(fetchedLeaf.treeId, leaf.treeId);
+
+							return done();
+						});
 					});
 				});
 
-				it("should work when calling Model.create", function(done) {
-					Leaf.create({size: 4.6, treeId: tree.id}, function(err, leaf) {
-						if (err) throw err;
+				it("should work when specifying parentId in the save call", function (done) {
+					leaf = new Leaf({size: 4});
+					leaf.save({ treeId: tree.id }, function(err, leaf) {
+						should.not.exist(err);
 
-						return done();
+						should.exist(leaf.treeId);
+
+						Leaf.get(leaf.id, function(err, fetchedLeaf) {
+							should.not.exist(err);
+							should.exist(fetchedLeaf);
+							should.equal(fetchedLeaf.treeId, leaf.treeId);
+
+							return done();
+						});
+					});
+				});
+
+				it("should work when calling Model.create", function (done) {
+					Leaf.create({size: 4, treeId: tree.id}, function (err, leaf) {
+						should.not.exist(err);
+
+						Leaf.get(leaf.id, function(err, fetchedLeaf) {
+							should.not.exist(err);
+
+							should.exist(fetchedLeaf);
+							should.equal(fetchedLeaf.treeId, leaf.treeId);
+
+							return done();
+						});
 					});
 				});
 			});
 		});
-	};
+	});
+
+	describe("validations", function () {
+		before(setup({validations: { stalkId: ORM.validators.rangeNumber(undefined, 50) }}));
+
+		it("should allow validating parentId", function (done) {
+			Leaf.one({ size: 14 }, function (err, leaf) {
+				should.not.exist(err);
+				should.exist(leaf);
+
+				leaf.save({ stalkId: 51	}, function( err, item ) {
+					should(Array.isArray(err));
+					should.equal(err.length, 1);
+					should.equal(err[0].msg, 'out-of-range-number');
+
+					done();
+				});
+			});
+		});
+	});
 });

From 3e78e1e1f7a82b9de7dac3fdd5ea0ea0b5558551 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 17 Jun 2013 17:09:50 +1000
Subject: [PATCH 0519/1246] Fix hasOne infinite loop

---
 lib/Associations/One.js |  7 ++--
 lib/Instance.js         | 92 +++++++++++++++++++++++++----------------
 2 files changed, 61 insertions(+), 38 deletions(-)

diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index 1c117ef6..2f40d7e8 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -160,17 +160,17 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 
 					OtherInstance[association.field] = Instance[Model.id];
 
-					return OtherInstance.save(cb);
+					return OtherInstance.save({}, { saveAssociations: false }, cb);
 				});
 			} else {
-				OtherInstance.save(function (err) {
+				OtherInstance.save({}, { saveAssociations: false }, function (err) {
 					if (err) {
 						return cb(err);
 					}
 
 					Instance[association.field] = OtherInstance[association.model.id];
 
-					return Instance.save(cb);
+					return Instance.save({}, { saveAssociations: false }, cb);
 				});
 			}
 
@@ -201,6 +201,7 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 	// When we have a new non persisted instance for which the association field (eg owner_id)
 	// is set, we don't want to auto fetch anything, since `new Model(owner_id: 12)` takes no
 	// callback, and hence this lookup would complete at an arbitrary point in the future.
+	// The associated entity should probably be fetched when the instance is persisted.
 	if(Instance.isPersisted()) {
 		Instance[association.getAccessor]({ autoFetchLimit: opts.autoFetchLimit - 1 }, function (err, Assoc) {
 			if (!err) {
diff --git a/lib/Instance.js b/lib/Instance.js
index e4c8ef52..d67f7de3 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -79,7 +79,7 @@ function Instance(opts) {
 			cb(err, instance);
 		}
 	};
-	var saveInstance = function (cb) {
+	var saveInstance = function (cb, saveOptions) {
 		if (!opts.is_new && opts.changes.length === 0) {
 			return saveInstanceExtra(cb);
 		}
@@ -105,7 +105,7 @@ function Instance(opts) {
 						if (err) {
 							return saveError(cb, err);
 						}
-						return saveInstanceNext(cb);
+						return saveInstanceNext(cb, saveOptions);
 					});
 				});
 			}
@@ -113,11 +113,24 @@ function Instance(opts) {
 				if (err) {
 					return saveError(cb, err);
 				}
-				return saveInstanceNext(cb);
+				return saveInstanceNext(cb, saveOptions);
 			});
 		});
 	};
-	var saveInstanceNext = function (cb) {
+
+	var afterSave = function (cb, create, err) {
+		emitEvent("save", err, instance);
+		if(create) {
+			Hook.trigger(instance, opts.hooks.afterCreate, !err);
+		}
+		Hook.trigger(instance, opts.hooks.afterSave, !err);
+
+		if (!err) {
+			saveInstanceExtra(cb);
+		}
+	};
+
+	var saveInstanceNext = function (cb, saveOptions) {
 		handleValidations(function (err) {
 			if (err) {
 				return saveError(cb, err);
@@ -137,6 +150,8 @@ function Instance(opts) {
 				}
 			}
 
+			var next = afterSave.bind(this, cb, opts.is_new);
+
 			if (opts.is_new) {
 				opts.driver.insert(opts.table, data, opts.keys, function (save_err, info) {
 					if (save_err) {
@@ -149,15 +164,11 @@ function Instance(opts) {
 					}
 					opts.is_new = false;
 
-					saveAssociations(function (err) {
-						emitEvent("save", err, instance);
-						Hook.trigger(instance, opts.hooks.afterCreate, !err);
-						Hook.trigger(instance, opts.hooks.afterSave, !err);
-
-						if (!err) {
-							saveInstanceExtra(cb);
-						}
-					});
+					if(saveOptions.saveAssociations === false) {
+						next();
+					} else {
+						saveAssociations(next);
+					}
 				});
 			} else {
 				var changes = {}, conditions = {};
@@ -175,14 +186,11 @@ function Instance(opts) {
 
 					opts.changes.length = 0;
 
-					saveAssociations(function (err) {
-						emitEvent("save", err, instance);
-						Hook.trigger(instance, opts.hooks.afterSave, !err);
-
-						if (!err) {
-							saveInstanceExtra(cb);
-						}
-					});
+					if(saveOptions.saveAssociations === false) {
+						next();
+					} else {
+						saveAssociations(next);
+					}
 				});
 			}
 		});
@@ -192,6 +200,7 @@ function Instance(opts) {
 
 		for (i = 0; i < opts.one_associations.length; i++) {
 			name = opts.one_associations[i].name;
+
 			if (!instance.hasOwnProperty(name)) continue;
 
 			if (instance[name] && instance[name].isInstance) {
@@ -413,26 +422,39 @@ function Instance(opts) {
 	});
 	Object.defineProperty(instance, "save", {
 		value: function () {
-			if (arguments.length === 0) {
-				saveInstance();
-			} else {
-				switch (typeof arguments[0]) {
-					case "object":
-						for (var k in arguments[0]) {
-							if (arguments[0].hasOwnProperty(k)) {
-								this[k] = arguments[0][k];
-							}
+			var arg = null, objCount = 0;
+			var data = {}, saveOptions = {}, callback = null;
+
+			while(arguments.length > 0) {
+				arg = Array.prototype.shift.call(arguments);
+				switch(typeof arg) {
+					case 'object':
+						switch(objCount) {
+							case 0:
+								data = arg;
+								break;
+							case 1:
+								saveOptions = arg;
+								break;
 						}
-						saveInstance(arguments[1]);
+						objCount++;
 						break;
-					case "function":
-						saveInstance(arguments[0]);
+					case 'function':
+						callback = arg;
 						break;
 					default:
-						throw new Error("Unknown parameter type '" + (typeof arguments[0]) + "' in Instance.save()");
+						throw new Error("Unknown parameter type '" + (typeof arg) + "' in Instance.save()");
 				}
 			}
 
+			for (var k in data) {
+				if (data.hasOwnProperty(k)) {
+					this[k] = data[k];
+				}
+			}
+
+			saveInstance(callback, saveOptions);
+
 			return this;
 		},
 		enumerable: false
@@ -477,7 +499,7 @@ function Instance(opts) {
 	for (i = 0; i < opts.one_associations.length; i++) {
 		var asc = opts.one_associations[i]
 
-		if (!opts.data.hasOwnProperty(asc.field)) {
+		if (!asc.reversed && !opts.data.hasOwnProperty(asc.field)) {
 			addInstanceProperty(asc.field);
 		}
 		if (opts.data.hasOwnProperty(asc.name)) {

From 29e8f8616d600ee4f68795b7b18d504958d193fa Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 18 Jun 2013 12:41:37 +1000
Subject: [PATCH 0520/1246] Fix shell model hasOne bug

---
 lib/Associations/One.js                        |  4 ++--
 lib/Instance.js                                |  8 +++++++-
 lib/Model.js                                   |  3 ++-
 .../test-get-association-hasone.js             |  1 -
 test/integration2/association-hasone.js        | 18 +++++++++++++++++-
 5 files changed, 28 insertions(+), 6 deletions(-)
 rename test/integration/{ => deprecated}/test-get-association-hasone.js (96%)

diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index 2f40d7e8..c05dfaf5 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -132,8 +132,8 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 					cb(null);
 				}
 			} else {
-				if (!Instance.hasOwnProperty(association.field)) {
-					association.model.get(Instance[Model.id], function (err, instance) {
+				if (Instance.isShell()) {
+					Model.get(Instance[Model.id], function (err, instance) {
 						if (err || !instance[association.field]) {
 							return cb(null);
 						}
diff --git a/lib/Instance.js b/lib/Instance.js
index d67f7de3..9e20c61c 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -478,11 +478,17 @@ function Instance(opts) {
 		enumerable: false
 	});
 	Object.defineProperty(instance, "isPersisted", {
-		value: function() {
+		value: function () {
 			return !opts.is_new;
 		},
 		enumerable: false
 	});
+	Object.defineProperty(instance, "isShell", {
+		value: function () {
+			return opts.isShell;
+		},
+		enumerable: false
+	});
 	Object.defineProperty(instance, "validate", {
 		value: function (cb) {
 			handleValidations(cb);
diff --git a/lib/Model.js b/lib/Model.js
index 56bef213..02f703ee 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -66,6 +66,7 @@ function Model(opts) {
 			id                     : opts.id,
 			keys                   : opts.keys,
 			is_new                 : inst_opts.is_new || false,
+			isShell                : inst_opts.isShell || false,
 			data                   : data,
 			autoSave               : inst_opts.autoSave || false,
 			extra                  : inst_opts.extra,
@@ -108,7 +109,7 @@ function Model(opts) {
 			var data2 = {};
 			data2[opts.id] = data;
 
-			return createInstance(data2);
+			return createInstance(data2, { isShell: true });
 		} else if (typeof data == "undefined") {
 			data = {};
 		}
diff --git a/test/integration/test-get-association-hasone.js b/test/integration/deprecated/test-get-association-hasone.js
similarity index 96%
rename from test/integration/test-get-association-hasone.js
rename to test/integration/deprecated/test-get-association-hasone.js
index 99b72387..260a6378 100644
--- a/test/integration/test-get-association-hasone.js
+++ b/test/integration/deprecated/test-get-association-hasone.js
@@ -13,7 +13,6 @@ common.createConnection(function (err, db) {
 			TestModel.hasOne("assoc");
 
 			TestModel(1).getAssoc(function (err, Test2) {
-				console.log(err, Test2);
 				assert.equal(err, null);
 				assert.equal(typeof Test2, "object");
 				assert.equal(Test2.id, 2);
diff --git a/test/integration2/association-hasone.js b/test/integration2/association-hasone.js
index 2c8dc80b..f4d38874 100644
--- a/test/integration2/association-hasone.js
+++ b/test/integration2/association-hasone.js
@@ -9,6 +9,9 @@ describe("hasOne", function() {
 	var Tree  = null;
 	var Stalk = null;
 	var Leaf  = null;
+	var leafId = null;
+	var treeId = null;
+	var stalkId = null;
 
 	var setup = function (opts) {
 		opts = opts || {};
@@ -28,12 +31,16 @@ describe("hasOne", function() {
 			return helper.dropSync([Tree, Stalk, Leaf], function() {
 				Tree.create({ type: 'pine' }, function (err, tree) {
 					should.not.exist(err);
+					treeId = tree.id;
 					Leaf.create({ size: 14 }, function (err, leaf) {
 						should.not.exist(err);
-						leaf.setTree(tree, function () {
+						leafId = leaf.id;
+						leaf.setTree(tree, function (err) {
+							should.not.exist(err);
 							Stalk.create({ length: 20 }, function (err, stalk) {
 								should.not.exist(err);
 								should.exist(stalk);
+								stalkId = stalk.id;
 								done();
 							});
 						});
@@ -65,6 +72,15 @@ describe("hasOne", function() {
 			});
 		});
 
+		it("get should get the association with a shell model", function (done) {
+			Leaf(leafId).getTree(function (err, tree) {
+				should.not.exist(err);
+				should.exist(tree);
+				should.equal(tree.id, treeId);
+				done();
+			});
+		});
+
 		it("has should indicate if there is an association present", function (done) {
 			Leaf.one({ size: 14 }, function (err, leaf) {
 				should.not.exist(err);

From a46b0282ebbd92ad95211e7c0474d66fe429cbb4 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 18 Jun 2013 12:43:54 +1000
Subject: [PATCH 0521/1246] Only mark model as dirty if a property has _really_
 changed

---
 lib/Instance.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Instance.js b/lib/Instance.js
index 9e20c61c..cfcaa9d7 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -339,6 +339,7 @@ function Instance(opts) {
 					throw new Error("Cannot change ID");
 				}
 
+				if (opts.data[key] === val) return;
 				opts.data[key] = val;
 
 				if (opts.autoSave) {

From 4a7986e8ba015dbbdd81031fe26336446c00ab14 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 18 Jun 2013 15:06:04 +0100
Subject: [PATCH 0522/1246] Deprecates generic test-validation in favour of new
 ones

---
 test/integration/{ => deprecated}/test-validation.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/integration/{ => deprecated}/test-validation.js (100%)

diff --git a/test/integration/test-validation.js b/test/integration/deprecated/test-validation.js
similarity index 100%
rename from test/integration/test-validation.js
rename to test/integration/deprecated/test-validation.js

From b8829d7fb14688af6676c1da973baeb1b888c867 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 18 Jun 2013 15:23:14 +0100
Subject: [PATCH 0523/1246] Updates new hook tests to check error triggering

---
 test/integration2/hook.js | 66 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/test/integration2/hook.js b/test/integration2/hook.js
index 8b2087b3..cd536222 100644
--- a/test/integration2/hook.js
+++ b/test/integration2/hook.js
@@ -38,6 +38,8 @@ describe("Hook", function() {
 				hooks  : hooks
 			});
 
+			Person.settings.set("instance.returnAllErrors", false);
+
 			return helper.dropSync(Person, done);
 		};
 	};
@@ -112,7 +114,27 @@ describe("Hook", function() {
 
 					return done();
 				});
+			});
+
+			describe("if hook triggers error", function () {
+				before(setup({
+					beforeCreate : function (next) {
+						setTimeout(function () {
+							return next(new Error('beforeCreate-error'));
+						}, 200);
+					}
+				}));
+
+				it("should trigger error", function (done) {
+					this.timeout(500);
+
+					Person.create([{ name: "John Doe" }], function (err) {
+						err.should.be.a("object");
+						err.message.should.equal("beforeCreate-error");
 
+						return done();
+					});
+				});
 			});
 		});
 	});
@@ -167,6 +189,27 @@ describe("Hook", function() {
 				});
 
 			});
+
+			describe("if hook triggers error", function () {
+				before(setup({
+					beforeSave : function (next) {
+						setTimeout(function () {
+							return next(new Error('beforeSave-error'));
+						}, 200);
+					}
+				}));
+
+				it("should trigger error", function (done) {
+					this.timeout(500);
+
+					Person.create([{ name: "John Doe" }], function (err) {
+						err.should.be.a("object");
+						err.message.should.equal("beforeSave-error");
+
+						return done();
+					});
+				});
+			});
 		});
 	});
 
@@ -296,6 +339,29 @@ describe("Hook", function() {
 				});
 
 			});
+
+			describe("if hook triggers error", function () {
+				before(setup({
+					beforeRemove : function (next) {
+						setTimeout(function () {
+							return next(new Error('beforeRemove-error'));
+						}, 200);
+					}
+				}));
+
+				it("should trigger error", function (done) {
+					this.timeout(500);
+
+					Person.create([{ name: "John Doe" }], function (err, items) {
+						items[0].remove(function (err) {
+							err.should.be.a("object");
+							err.message.should.equal("beforeRemove-error");
+
+							return done();
+						});
+					});
+				});
+			});
 		});
 	});
 

From ffe0ba208c57455857166dcc7f590e922f05d817 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 18 Jun 2013 15:23:53 +0100
Subject: [PATCH 0524/1246] Updates model-save tests to check if .save() throws
 with unknown argument type

---
 test/integration2/model-save.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/test/integration2/model-save.js b/test/integration2/model-save.js
index 7e60339d..c8d20480 100644
--- a/test/integration2/model-save.js
+++ b/test/integration2/model-save.js
@@ -117,6 +117,21 @@ describe("Model.save()", function() {
 		});
 	});
 
+	describe("with unknown argument type", function () {
+		before(setup());
+
+		it("should should throw", function (done) {
+			var John = new Person({
+				name: "Jane"
+			});
+			(function () {
+				John.save("will-fail");
+			}).should.throw();
+
+			return done();
+		});
+	});
+
 	describe("if passed an association instance", function () {
 		before(setup());
 

From aa012cb6c254af0da71a25816e3d0f456cf43027 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 18 Jun 2013 15:35:52 +0100
Subject: [PATCH 0525/1246] Fixes bug when passing an array (object) of ids but
 no options object

---
 lib/Model.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Model.js b/lib/Model.js
index 02f703ee..3b539e5c 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -194,7 +194,7 @@ function Model(opts) {
 			throw new Error("Missing Model.get() callback");
 		}
 
-		if (typeof ids[ids.length - 1] == "object") {
+		if (typeof ids[ids.length - 1] == "object" && !Array.isArray(ids[ids.length - 1])) {
 			options = ids.pop();
 		}
 

From 1fec04c914a1272a7831ad43770078fc29df434a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 18 Jun 2013 15:38:33 +0100
Subject: [PATCH 0526/1246] Adds a few more use cases to Model.get() test

---
 test/integration2/model-get.js | 43 +++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/test/integration2/model-get.js b/test/integration2/model-get.js
index 7e9688ee..96e2f50c 100644
--- a/test/integration2/model-get.js
+++ b/test/integration2/model-get.js
@@ -184,7 +184,7 @@ describe("Model.get()", function() {
 
 				John.should.be.a("object");
 				John.should.have.property("id", 1);
-				John.should.have.property("name", "John Doe")
+				John.should.have.property("name", "John Doe");
 
 				return done();
 			});
@@ -202,4 +202,45 @@ describe("Model.get()", function() {
 			return done();
 		});
 	});
+
+	describe("when not found", function () {
+		before(setup(true));
+
+		it("should return an error", function (done) {
+			Person.get(999, function (err) {
+				err.should.be.a("object");
+				err.message.should.equal("Not found");
+
+				return done();
+			});
+		});
+	});
+
+	describe("if passed an Array with ids", function () {
+		before(setup(true));
+
+		it("should accept and try to fetch", function (done) {
+			Person.get([ 1 ], function (err, John) {
+				should.equal(err, null);
+
+				John.should.be.a("object");
+				John.should.have.property("id", 1);
+				John.should.have.property("name", "John Doe");
+
+				return done();
+			});
+		});
+	});
+
+	describe("if passed a wrong number of ids", function () {
+		before(setup(true));
+
+		it("should throw", function (done) {
+			(function () {
+				Person.get(1, 2, function () {});
+			}).should.throw();
+
+			return done();
+		});
+	});
 });

From 8f9bed41492f67fd970bc761989718084cb2175b Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 18 Jun 2013 15:47:49 +0100
Subject: [PATCH 0527/1246] Adds Model.clear test, deprecates old one

---
 .../{ => deprecated}/test-clear.js            |  0
 test/integration2/model-clear.js              | 72 +++++++++++++++++++
 2 files changed, 72 insertions(+)
 rename test/integration/{ => deprecated}/test-clear.js (100%)
 create mode 100644 test/integration2/model-clear.js

diff --git a/test/integration/test-clear.js b/test/integration/deprecated/test-clear.js
similarity index 100%
rename from test/integration/test-clear.js
rename to test/integration/deprecated/test-clear.js
diff --git a/test/integration2/model-clear.js b/test/integration2/model-clear.js
new file mode 100644
index 00000000..8da36afc
--- /dev/null
+++ b/test/integration2/model-clear.js
@@ -0,0 +1,72 @@
+var _        = require('lodash');
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var async    = require('async');
+var ORM      = require('../../');
+
+describe("Model.clear()", function() {
+	var db = null;
+	var Person = null;
+
+	var setup = function () {
+		return function (done) {
+			Person = db.define("person", {
+				name   : String
+			});
+
+			ORM.singleton.clear();
+
+			return helper.dropSync(Person, function () {
+				Person.create([{
+					name: "John Doe"
+				}, {
+					name: "Jane Doe"
+				}], done);
+			});
+		};
+	};
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			return done();
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	describe("with callback", function () {
+		before(setup());
+
+		it("should call when done", function (done) {
+			Person.clear(function (err) {
+				should.equal(err, null);
+
+				Person.find().count(function (err, count) {
+					count.should.equal(0);
+
+					return done();
+				});
+			});
+		});
+	});
+
+	describe("without callback", function () {
+		before(setup());
+
+		it("should still remove", function (done) {
+			Person.clear();
+
+			setTimeout(function () {
+				Person.find().count(function (err, count) {
+					count.should.equal(0);
+
+					return done();
+				});
+			}, 200);
+		});
+	});
+});

From ac55c7c65e995850fa1d657b9cc87707a38cf1ec Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 18 Jun 2013 15:48:05 +0100
Subject: [PATCH 0528/1246] Updates some test suites to test methods without
 callback

---
 test/integration2/model-count.js  | 10 ++++++++++
 test/integration2/model-exists.js | 10 ++++++++++
 test/integration2/model-one.js    | 10 ++++++++++
 3 files changed, 30 insertions(+)

diff --git a/test/integration2/model-count.js b/test/integration2/model-count.js
index 4ddcda68..81d3efdb 100644
--- a/test/integration2/model-count.js
+++ b/test/integration2/model-count.js
@@ -41,6 +41,16 @@ describe("Model.count()", function() {
 		return db.close();
 	});
 
+	describe("without callback", function () {
+		before(setup());
+
+		it("should throw", function (done) {
+			Person.count.should.throw();
+
+			return done();
+		});
+	});
+
 	describe("without conditions", function () {
 		before(setup());
 
diff --git a/test/integration2/model-exists.js b/test/integration2/model-exists.js
index fe08a2e4..f3222efa 100644
--- a/test/integration2/model-exists.js
+++ b/test/integration2/model-exists.js
@@ -41,6 +41,16 @@ describe("Model.exists()", function() {
 		return db.close();
 	});
 
+	describe("without callback", function () {
+		before(setup());
+
+		it("should throw", function (done) {
+			Person.exists.should.throw();
+
+			return done();
+		});
+	});
+
 	describe("with an id", function () {
 		before(setup());
 
diff --git a/test/integration2/model-one.js b/test/integration2/model-one.js
index 2c20f20c..b4feb00d 100644
--- a/test/integration2/model-one.js
+++ b/test/integration2/model-one.js
@@ -55,6 +55,16 @@ describe("Model.one()", function() {
 		});
 	});
 
+	describe("without callback", function () {
+		before(setup());
+
+		it("should throw", function (done) {
+			Person.one.should.throw();
+
+			return done();
+		});
+	});
+
 	describe("with order", function () {
 		before(setup());
 

From ae50751284be6200e0ee89c4832010c360c11e9b Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 18 Jun 2013 21:12:51 +0100
Subject: [PATCH 0529/1246] Adds autoSave test to model save tests

---
 .../{ => deprecated}/test-auto-save.js        |  0
 test/integration2/model-save.js               | 24 +++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 rename test/integration/{ => deprecated}/test-auto-save.js (100%)

diff --git a/test/integration/test-auto-save.js b/test/integration/deprecated/test-auto-save.js
similarity index 100%
rename from test/integration/test-auto-save.js
rename to test/integration/deprecated/test-auto-save.js
diff --git a/test/integration2/model-save.js b/test/integration2/model-save.js
index c8d20480..11025d4c 100644
--- a/test/integration2/model-save.js
+++ b/test/integration2/model-save.js
@@ -8,11 +8,12 @@ describe("Model.save()", function() {
 	var db = null;
 	var Person = null;
 
-	var setup = function (nameDefinition) {
+	var setup = function (nameDefinition, opts) {
 		return function (done) {
 			Person = db.define("person", {
 				name   : nameDefinition || String
-			});
+			}, opts || {});
+
 			Person.hasOne("parent");
 
 			return helper.dropSync(Person, done);
@@ -178,4 +179,23 @@ describe("Model.save()", function() {
 			});
 		});
 	});
+
+	describe("if autoSave is on", function () {
+		before(setup(null, { autoSave: true }));
+
+		it("should save the instance as soon as a property is changed", function (done) {
+			var John = new Person({
+				name : "Jhon"
+			});
+			John.save(function (err) {
+				should.equal(err, null);
+
+				John.on("save", function () {
+					return done();
+				});
+
+				John.name = "John";
+			});
+		});
+	});
 });

From f636ef52e8bc05b9c883f338fd9aed9cec542e12 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 18 Jun 2013 21:36:37 +0100
Subject: [PATCH 0530/1246] Adds tests for orm exports

orm.connect() is detailed for now, others can be added later on
---
 .../{ => deprecated}/test-connect-errors.js   |   0
 .../{ => deprecated}/test-connect-event.js    |   0
 .../{ => deprecated}/test-connect-object.js   |   0
 .../{ => deprecated}/test-connect.js          |   0
 test/integration2/orm-exports.js              | 167 ++++++++++++++++++
 5 files changed, 167 insertions(+)
 rename test/integration/{ => deprecated}/test-connect-errors.js (100%)
 rename test/integration/{ => deprecated}/test-connect-event.js (100%)
 rename test/integration/{ => deprecated}/test-connect-object.js (100%)
 rename test/integration/{ => deprecated}/test-connect.js (100%)
 create mode 100644 test/integration2/orm-exports.js

diff --git a/test/integration/test-connect-errors.js b/test/integration/deprecated/test-connect-errors.js
similarity index 100%
rename from test/integration/test-connect-errors.js
rename to test/integration/deprecated/test-connect-errors.js
diff --git a/test/integration/test-connect-event.js b/test/integration/deprecated/test-connect-event.js
similarity index 100%
rename from test/integration/test-connect-event.js
rename to test/integration/deprecated/test-connect-event.js
diff --git a/test/integration/test-connect-object.js b/test/integration/deprecated/test-connect-object.js
similarity index 100%
rename from test/integration/test-connect-object.js
rename to test/integration/deprecated/test-connect-object.js
diff --git a/test/integration/test-connect.js b/test/integration/deprecated/test-connect.js
similarity index 100%
rename from test/integration/test-connect.js
rename to test/integration/deprecated/test-connect.js
diff --git a/test/integration2/orm-exports.js b/test/integration2/orm-exports.js
new file mode 100644
index 00000000..af90bbdf
--- /dev/null
+++ b/test/integration2/orm-exports.js
@@ -0,0 +1,167 @@
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var ORM      = require('../../');
+
+describe("ORM", function() {
+	var db = null;
+	var Person = null;
+
+	var setup = function (cache) {
+		return function (done) {
+			Person = db.define("person", {
+				name   : String
+			}, {
+				cache  : cache,
+				methods: {
+					UID: function () {
+						return this.id;
+					}
+				}
+			});
+
+			ORM.singleton.clear(); // clear cache
+
+			return helper.dropSync(Person, function () {
+				Person.create([{
+					name: "John Doe"
+				}, {
+					name: "Jane Doe"
+				}], done);
+			});
+		};
+	};
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			return done();
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	describe("when loaded", function () {
+		before(setup(true));
+
+		it("should expose .express(), .use() and .connect()", function (done) {
+			ORM.express.should.a("function");
+			ORM.use.should.a("function");
+			ORM.connect.should.a("function");
+
+			return done();
+		});
+
+		it("should expose default settings container", function (done) {
+			ORM.settings.should.a("object");
+			ORM.settings.get.should.a("function");
+			ORM.settings.set.should.a("function");
+			ORM.settings.unset.should.a("function");
+
+			return done();
+		});
+
+		it("should expose generic Settings constructor", function (done) {
+			ORM.Settings.should.a("object");
+			ORM.Settings.Container.should.a("function");
+
+			return done();
+		});
+
+		it("should expose singleton manager", function (done) {
+			ORM.singleton.should.a("object");
+			ORM.singleton.clear.should.a("function");
+
+			return done();
+		});
+
+		it("should expose predefined validators", function (done) {
+			ORM.validators.should.a("object");
+			ORM.validators.rangeNumber.should.a("function");
+			ORM.validators.rangeLength.should.a("function");
+
+			return done();
+		});
+	});
+});
+
+describe("ORM.connect()", function () {
+	it("should expose .use(), .define(), .sync() and .load()", function (done) {
+		var db = ORM.connect();
+
+		db.use.should.a("function");
+		db.define.should.a("function");
+		db.sync.should.a("function");
+		db.load.should.a("function");
+
+		return done();
+	});
+
+	it("should emit an error if no url is passed", function (done) {
+		var db = ORM.connect();
+
+		db.on("connect", function (err) {
+			err.message.should.equal("CONNECTION_URL_EMPTY");
+
+			return done();
+		});
+	});
+
+	it("should emit an error if empty url is passed", function (done) {
+		var db = ORM.connect("");
+
+		db.on("connect", function (err) {
+			err.message.should.equal("CONNECTION_URL_EMPTY");
+
+			return done();
+		});
+	});
+
+	it("should emit an error if no protocol is passed", function (done) {
+		var db = ORM.connect("user@db");
+
+		db.on("connect", function (err) {
+			err.message.should.equal("CONNECTION_URL_NO_PROTOCOL");
+
+			return done();
+		});
+	});
+
+	it("should emit an error if unknown protocol is passed", function (done) {
+		var db = ORM.connect("unknown://db");
+
+		db.on("connect", function (err) {
+			err.message.should.equal("CONNECTION_PROTOCOL_NOT_SUPPORTED");
+
+			return done();
+		});
+	});
+
+	describe("if callback is passed", function (done) {
+		it("should return an error if empty url is passed", function (done) {
+			ORM.connect("", function (err) {
+				err.message.should.equal("CONNECTION_URL_EMPTY");
+
+				return done();
+			});
+		});
+
+		it("should return an error if no protocol is passed", function (done) {
+			ORM.connect("user@db", function (err) {
+				err.message.should.equal("CONNECTION_URL_NO_PROTOCOL");
+
+				return done();
+			});
+		});
+
+		it("should return an error if unknown protocol is passed", function (done) {
+			ORM.connect("unknown://db", function (err) {
+				err.message.should.equal("CONNECTION_PROTOCOL_NOT_SUPPORTED");
+
+				return done();
+			});
+		});
+	});
+});

From 76f87a83eee6b19b7332987a2d8180e07f47c4db Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 19 Jun 2013 23:27:17 +0100
Subject: [PATCH 0531/1246] Removes unnecessary require() from some test files

---
 test/integration2/chain-model-find.js | 2 --
 test/integration2/event.js            | 2 --
 test/integration2/model-aggregate.js  | 2 --
 test/integration2/model-clear.js      | 2 --
 test/integration2/model-count.js      | 2 --
 test/integration2/model-exists.js     | 2 --
 test/integration2/model-get.js        | 2 --
 test/integration2/model-one.js        | 2 --
 test/integration2/model-save.js       | 2 --
 test/integration2/property.js         | 1 -
 test/integration2/settings.js         | 1 -
 11 files changed, 20 deletions(-)

diff --git a/test/integration2/chain-model-find.js b/test/integration2/chain-model-find.js
index 8e1dd821..46ee3c5e 100644
--- a/test/integration2/chain-model-find.js
+++ b/test/integration2/chain-model-find.js
@@ -1,7 +1,5 @@
-var _        = require('lodash');
 var should   = require('should');
 var helper   = require('../support/spec_helper');
-var async    = require('async');
 var ORM      = require('../../');
 
 describe("Model.find() chaining", function() {
diff --git a/test/integration2/event.js b/test/integration2/event.js
index e7745a5b..8ade7b5f 100644
--- a/test/integration2/event.js
+++ b/test/integration2/event.js
@@ -1,7 +1,5 @@
-var _        = require('lodash');
 var should   = require('should');
 var helper   = require('../support/spec_helper');
-var async    = require('async');
 var ORM      = require('../../');
 
 describe("Event", function() {
diff --git a/test/integration2/model-aggregate.js b/test/integration2/model-aggregate.js
index f3d9f496..eb17d6e1 100644
--- a/test/integration2/model-aggregate.js
+++ b/test/integration2/model-aggregate.js
@@ -1,7 +1,5 @@
-var _        = require('lodash');
 var should   = require('should');
 var helper   = require('../support/spec_helper');
-var async    = require('async');
 var ORM      = require('../../');
 
 describe("Model.aggregate()", function() {
diff --git a/test/integration2/model-clear.js b/test/integration2/model-clear.js
index 8da36afc..b2acff98 100644
--- a/test/integration2/model-clear.js
+++ b/test/integration2/model-clear.js
@@ -1,7 +1,5 @@
-var _        = require('lodash');
 var should   = require('should');
 var helper   = require('../support/spec_helper');
-var async    = require('async');
 var ORM      = require('../../');
 
 describe("Model.clear()", function() {
diff --git a/test/integration2/model-count.js b/test/integration2/model-count.js
index 81d3efdb..61a509a1 100644
--- a/test/integration2/model-count.js
+++ b/test/integration2/model-count.js
@@ -1,7 +1,5 @@
-var _        = require('lodash');
 var should   = require('should');
 var helper   = require('../support/spec_helper');
-var async    = require('async');
 var ORM      = require('../../');
 
 describe("Model.count()", function() {
diff --git a/test/integration2/model-exists.js b/test/integration2/model-exists.js
index f3222efa..e05f7f0a 100644
--- a/test/integration2/model-exists.js
+++ b/test/integration2/model-exists.js
@@ -1,7 +1,5 @@
-var _        = require('lodash');
 var should   = require('should');
 var helper   = require('../support/spec_helper');
-var async    = require('async');
 var ORM      = require('../../');
 
 describe("Model.exists()", function() {
diff --git a/test/integration2/model-get.js b/test/integration2/model-get.js
index 96e2f50c..d95e4912 100644
--- a/test/integration2/model-get.js
+++ b/test/integration2/model-get.js
@@ -1,7 +1,5 @@
-var _        = require('lodash');
 var should   = require('should');
 var helper   = require('../support/spec_helper');
-var async    = require('async');
 var ORM      = require('../../');
 
 describe("Model.get()", function() {
diff --git a/test/integration2/model-one.js b/test/integration2/model-one.js
index b4feb00d..b2bbcaa3 100644
--- a/test/integration2/model-one.js
+++ b/test/integration2/model-one.js
@@ -1,7 +1,5 @@
-var _        = require('lodash');
 var should   = require('should');
 var helper   = require('../support/spec_helper');
-var async    = require('async');
 var ORM      = require('../../');
 
 describe("Model.one()", function() {
diff --git a/test/integration2/model-save.js b/test/integration2/model-save.js
index 11025d4c..d2d370da 100644
--- a/test/integration2/model-save.js
+++ b/test/integration2/model-save.js
@@ -1,7 +1,5 @@
-var _        = require('lodash');
 var should   = require('should');
 var helper   = require('../support/spec_helper');
-var async    = require('async');
 var ORM      = require('../../');
 
 describe("Model.save()", function() {
diff --git a/test/integration2/property.js b/test/integration2/property.js
index 69eeb435..ecd24085 100644
--- a/test/integration2/property.js
+++ b/test/integration2/property.js
@@ -1,4 +1,3 @@
-var _        = require('lodash');
 var should   = require('should');
 var ORM      = require("../..");
 var Property = ORM.Property;
diff --git a/test/integration2/settings.js b/test/integration2/settings.js
index 372df23d..4e16b357 100644
--- a/test/integration2/settings.js
+++ b/test/integration2/settings.js
@@ -1,4 +1,3 @@
-var _        = require('lodash');
 var should   = require('should');
 var helper   = require('../support/spec_helper');
 var ORM      = require('../../');

From 63e98e79aa5657d3c98d5d60554665fa612374d8 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 19 Jun 2013 23:29:02 +0100
Subject: [PATCH 0532/1246] Adds model.namePrefix setting (#203)

When set, is the prefix for subsequent db.define() table names (if no
table or collection is passed in options)
---
 lib/ORM.js              |  2 +-
 test/integration2/db.js | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 test/integration2/db.js

diff --git a/lib/ORM.js b/lib/ORM.js
index 8acc648e..1335c678 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -181,7 +181,7 @@ ORM.prototype.define = function (name, properties, opts) {
 		settings       : this.settings,
 		driver_name    : this.driver_name,
 		driver         : this.driver,
-		table          : opts.table || opts.collection || name,
+		table          : opts.table || opts.collection || ((this.settings.get("model.namePrefix") || "") + name),
 		properties     : properties,
 		indexes        : opts.indexes || [],
 		cache          : opts.hasOwnProperty("cache") ? opts.cache : this.settings.get("instance.cache"),
diff --git a/test/integration2/db.js b/test/integration2/db.js
new file mode 100644
index 00000000..3e313d69
--- /dev/null
+++ b/test/integration2/db.js
@@ -0,0 +1,31 @@
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var ORM      = require('../../');
+
+describe("db.define()", function() {
+	var db = null;
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			return done();
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	it("should use setting model.namePrefix as table prefix if defined", function (done) {
+		db.settings.set("model.namePrefix", "orm_");
+
+		var Person = db.define("person", {
+			name: String
+		});
+
+		Person.table.should.equal("orm_person");
+
+		return done();
+	});
+});

From 45d0317ea87ef5ce1df0d94ea31f103993c0670a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 20 Jun 2013 16:49:56 +0100
Subject: [PATCH 0533/1246] sql-query@0.0.28 (#204)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ec6b9fa1..d51b3aa3 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
   },
   "analyse"     : false,
   "dependencies": {
-    "sql-query" : "0.0.27",
+    "sql-query" : "0.0.28",
     "hat"       : "0.0.3",
     "lodash"    : "1.3.1"
   },

From 84505c2d68b254acb93d61481cfc5418b98541ed Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 20 Jun 2013 17:17:19 +0100
Subject: [PATCH 0534/1246] Fix orm when running on node v0.6 (at least) and
 module not found error has no code property

This should fix the last tests failing in Travis
---
 lib/ORM.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index 1335c678..fe56638b 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -108,7 +108,7 @@ exports.connect = function (opts, cb) {
 			db.emit("connect", err, !err ? db : null);
 		});
 	} catch (ex) {
-		if (ex.code == "MODULE_NOT_FOUND") {
+		if (ex.code == "MODULE_NOT_FOUND" || ex.message.indexOf('find module')) {
 			return ORM_Error(new Error("CONNECTION_PROTOCOL_NOT_SUPPORTED"), cb);
 		}
 		return ORM_Error(ex, cb);

From d9b2adf8c9c3137c6925bcaaf194bfd78fe4a500 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 20 Jun 2013 17:28:51 +0100
Subject: [PATCH 0535/1246] Adds test for orm.connect("   ")

---
 test/integration2/orm-exports.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/test/integration2/orm-exports.js b/test/integration2/orm-exports.js
index af90bbdf..0308835d 100644
--- a/test/integration2/orm-exports.js
+++ b/test/integration2/orm-exports.js
@@ -119,6 +119,16 @@ describe("ORM.connect()", function () {
 		});
 	});
 
+	it("should emit an error if empty url (with only spaces) is passed", function (done) {
+		var db = ORM.connect("   ");
+
+		db.on("connect", function (err) {
+			err.message.should.equal("CONNECTION_URL_EMPTY");
+
+			return done();
+		});
+	});
+
 	it("should emit an error if no protocol is passed", function (done) {
 		var db = ORM.connect("user@db");
 

From 1290c2ec651f056c94ec59a8a479b78b6a43042d Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 20 Jun 2013 22:06:10 +0100
Subject: [PATCH 0536/1246] Adds more tests to ORM.js

---
 test/integration/{ => deprecated}/test-use.js |   0
 test/integration2/orm-exports.js              | 119 +++++++++++++-----
 2 files changed, 91 insertions(+), 28 deletions(-)
 rename test/integration/{ => deprecated}/test-use.js (100%)

diff --git a/test/integration/test-use.js b/test/integration/deprecated/test-use.js
similarity index 100%
rename from test/integration/test-use.js
rename to test/integration/deprecated/test-use.js
diff --git a/test/integration2/orm-exports.js b/test/integration2/orm-exports.js
index 0308835d..6a1bd271 100644
--- a/test/integration2/orm-exports.js
+++ b/test/integration2/orm-exports.js
@@ -1,35 +1,12 @@
+var sqlite   = require('sqlite3');
+var pg       = require('pg');
 var should   = require('should');
 var helper   = require('../support/spec_helper');
+var common   = require('../common');
 var ORM      = require('../../');
 
 describe("ORM", function() {
 	var db = null;
-	var Person = null;
-
-	var setup = function (cache) {
-		return function (done) {
-			Person = db.define("person", {
-				name   : String
-			}, {
-				cache  : cache,
-				methods: {
-					UID: function () {
-						return this.id;
-					}
-				}
-			});
-
-			ORM.singleton.clear(); // clear cache
-
-			return helper.dropSync(Person, function () {
-				Person.create([{
-					name: "John Doe"
-				}, {
-					name: "Jane Doe"
-				}], done);
-			});
-		};
-	};
 
 	before(function (done) {
 		helper.connect(function (connection) {
@@ -44,8 +21,6 @@ describe("ORM", function() {
 	});
 
 	describe("when loaded", function () {
-		before(setup(true));
-
 		it("should expose .express(), .use() and .connect()", function (done) {
 			ORM.express.should.a("function");
 			ORM.use.should.a("function");
@@ -109,6 +84,17 @@ describe("ORM.connect()", function () {
 		});
 	});
 
+	it("should allow protocol alias", function (done) {
+		var db = ORM.connect("pg://unknowndb");
+
+		db.on("connect", function (err) {
+			should.exist(err);
+			err.message.should.not.equal("CONNECTION_PROTOCOL_NOT_SUPPORTED");
+
+			return done();
+		});
+	});
+
 	it("should emit an error if empty url is passed", function (done) {
 		var db = ORM.connect("");
 
@@ -149,6 +135,51 @@ describe("ORM.connect()", function () {
 		});
 	});
 
+	it("should emit an error if cannot connect", function (done) {
+		var db = ORM.connect("mysql://fakeuser:nopassword@127.0.0.1/unknowndb");
+
+		db.on("connect", function (err) {
+			should.exist(err);
+			err.message.should.not.equal("CONNECTION_PROTOCOL_NOT_SUPPORTED");
+			err.message.should.not.equal("CONNECTION_URL_NO_PROTOCOL");
+			err.message.should.not.equal("CONNECTION_URL_EMPTY");
+
+			return done();
+		});
+	});
+
+	it("should emit no error if ok", function (done) {
+		var db = ORM.connect(common.getConnectionString());
+
+		db.on("connect", function (err) {
+			should.not.exist(err);
+
+			return done();
+		});
+	});
+
+	describe("if no connection error", function () {
+		var db = null;
+
+		before(function (done) {
+			helper.connect(function (connection) {
+				db = connection;
+
+				return done();
+			});
+		});
+
+		after(function () {
+			return db.close();
+		});
+
+		it("should be able to ping the server", function (done) {
+			db.ping(function () {
+				return done();
+			});
+		});
+	});
+
 	describe("if callback is passed", function (done) {
 		it("should return an error if empty url is passed", function (done) {
 			ORM.connect("", function (err) {
@@ -175,3 +206,35 @@ describe("ORM.connect()", function () {
 		});
 	});
 });
+
+describe("ORM.use()", function () {
+	it("should be able to use an established connection", function (done) {
+		var db = new sqlite.Database(':memory:');
+
+		ORM.use(db, "sqlite", function (err) {
+			should.equal(err, null);
+
+			return done();
+		});
+	});
+
+	it("should be accept protocol alias", function (done) {
+		var db = new pg.Client();
+
+		ORM.use(db, "pg", function (err) {
+			should.equal(err, null);
+
+			return done();
+		});
+	});
+
+	it("should return an error in callback if protocol not supported", function (done) {
+		var db = new pg.Client();
+
+		ORM.use(db, "unknowndriver", function (err) {
+			should.exist(err);
+
+			return done();
+		});
+	});
+});

From b9bde4271f7891c7b2e55dcb3103aa3541e05a77 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 20 Jun 2013 23:04:17 +0100
Subject: [PATCH 0537/1246] Adds initial tests for Model.find(), deprecates old
 ones

---
 .../test-find-limit-in-options.js             |   0
 .../{ => deprecated}/test-find-limit.js       |   0
 .../test-find-order-asc-array.js              |   0
 .../test-find-order-desc-array-minus.js       |   0
 .../test-find-order-desc-array.js             |   0
 .../{ => deprecated}/test-find-order-desc.js  |   0
 ...st-find-order-multiple-array-desc-minus.js |   0
 .../test-find-order-multiple-array-desc.js    |   0
 .../test-find-order-multiple-array.js         |   0
 .../{ => deprecated}/test-find-order.js       |   0
 .../{ => deprecated}/test-find-where.js       |   0
 .../integration/{ => deprecated}/test-find.js |   0
 test/integration2/model-find.js               | 251 ++++++++++++++++++
 13 files changed, 251 insertions(+)
 rename test/integration/{ => deprecated}/test-find-limit-in-options.js (100%)
 rename test/integration/{ => deprecated}/test-find-limit.js (100%)
 rename test/integration/{ => deprecated}/test-find-order-asc-array.js (100%)
 rename test/integration/{ => deprecated}/test-find-order-desc-array-minus.js (100%)
 rename test/integration/{ => deprecated}/test-find-order-desc-array.js (100%)
 rename test/integration/{ => deprecated}/test-find-order-desc.js (100%)
 rename test/integration/{ => deprecated}/test-find-order-multiple-array-desc-minus.js (100%)
 rename test/integration/{ => deprecated}/test-find-order-multiple-array-desc.js (100%)
 rename test/integration/{ => deprecated}/test-find-order-multiple-array.js (100%)
 rename test/integration/{ => deprecated}/test-find-order.js (100%)
 rename test/integration/{ => deprecated}/test-find-where.js (100%)
 rename test/integration/{ => deprecated}/test-find.js (100%)
 create mode 100644 test/integration2/model-find.js

diff --git a/test/integration/test-find-limit-in-options.js b/test/integration/deprecated/test-find-limit-in-options.js
similarity index 100%
rename from test/integration/test-find-limit-in-options.js
rename to test/integration/deprecated/test-find-limit-in-options.js
diff --git a/test/integration/test-find-limit.js b/test/integration/deprecated/test-find-limit.js
similarity index 100%
rename from test/integration/test-find-limit.js
rename to test/integration/deprecated/test-find-limit.js
diff --git a/test/integration/test-find-order-asc-array.js b/test/integration/deprecated/test-find-order-asc-array.js
similarity index 100%
rename from test/integration/test-find-order-asc-array.js
rename to test/integration/deprecated/test-find-order-asc-array.js
diff --git a/test/integration/test-find-order-desc-array-minus.js b/test/integration/deprecated/test-find-order-desc-array-minus.js
similarity index 100%
rename from test/integration/test-find-order-desc-array-minus.js
rename to test/integration/deprecated/test-find-order-desc-array-minus.js
diff --git a/test/integration/test-find-order-desc-array.js b/test/integration/deprecated/test-find-order-desc-array.js
similarity index 100%
rename from test/integration/test-find-order-desc-array.js
rename to test/integration/deprecated/test-find-order-desc-array.js
diff --git a/test/integration/test-find-order-desc.js b/test/integration/deprecated/test-find-order-desc.js
similarity index 100%
rename from test/integration/test-find-order-desc.js
rename to test/integration/deprecated/test-find-order-desc.js
diff --git a/test/integration/test-find-order-multiple-array-desc-minus.js b/test/integration/deprecated/test-find-order-multiple-array-desc-minus.js
similarity index 100%
rename from test/integration/test-find-order-multiple-array-desc-minus.js
rename to test/integration/deprecated/test-find-order-multiple-array-desc-minus.js
diff --git a/test/integration/test-find-order-multiple-array-desc.js b/test/integration/deprecated/test-find-order-multiple-array-desc.js
similarity index 100%
rename from test/integration/test-find-order-multiple-array-desc.js
rename to test/integration/deprecated/test-find-order-multiple-array-desc.js
diff --git a/test/integration/test-find-order-multiple-array.js b/test/integration/deprecated/test-find-order-multiple-array.js
similarity index 100%
rename from test/integration/test-find-order-multiple-array.js
rename to test/integration/deprecated/test-find-order-multiple-array.js
diff --git a/test/integration/test-find-order.js b/test/integration/deprecated/test-find-order.js
similarity index 100%
rename from test/integration/test-find-order.js
rename to test/integration/deprecated/test-find-order.js
diff --git a/test/integration/test-find-where.js b/test/integration/deprecated/test-find-where.js
similarity index 100%
rename from test/integration/test-find-where.js
rename to test/integration/deprecated/test-find-where.js
diff --git a/test/integration/test-find.js b/test/integration/deprecated/test-find.js
similarity index 100%
rename from test/integration/test-find.js
rename to test/integration/deprecated/test-find.js
diff --git a/test/integration2/model-find.js b/test/integration2/model-find.js
new file mode 100644
index 00000000..7d2a79f6
--- /dev/null
+++ b/test/integration2/model-find.js
@@ -0,0 +1,251 @@
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var ORM      = require('../../');
+
+describe("Model.find()", function() {
+	var db = null;
+	var Person = null;
+
+	var setup = function () {
+		return function (done) {
+			Person = db.define("person", {
+				name    : String,
+				surname : String,
+				age     : Number,
+				male    : Boolean
+			});
+
+			return helper.dropSync(Person, function () {
+				Person.create([{
+					name    : "John",
+					surname : "Doe",
+					age     : 18,
+					male    : true
+				}, {
+					name    : "Jane",
+					surname : "Doe",
+					age     : 16,
+					male    : false
+				}, {
+					name    : "Jeremy",
+					surname : "Dean",
+					age     : 18,
+					male    : true
+				}, {
+					name    : "Jack",
+					surname : "Dean",
+					age     : 20,
+					male    : true
+				}, {
+					name    : "Jasmine",
+					surname : "Doe",
+					age     : 20,
+					male    : false
+				}], done);
+			});
+		};
+	};
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			return done();
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	describe("without arguments", function () {
+		before(setup());
+
+		it("should return all items", function (done) {
+			Person.find(function (err, people) {
+				should.not.exist(err);
+				people.should.be.a("object");
+				people.should.have.property("length", 5);
+
+				return done();
+			});
+		});
+	});
+
+	describe("with a number as argument", function () {
+		before(setup());
+
+		it("should use it as limit", function (done) {
+			Person.find(2, function (err, people) {
+				should.not.exist(err);
+				people.should.be.a("object");
+				people.should.have.property("length", 2);
+
+				return done();
+			});
+		});
+	});
+
+	describe("with a string argument", function () {
+		before(setup());
+
+		it("should use it as property ascending order", function (done) {
+			Person.find("age", function (err, people) {
+				should.not.exist(err);
+				people.should.be.a("object");
+				people.should.have.property("length", 5);
+				people[0].age.should.equal(16);
+				people[4].age.should.equal(20);
+
+				return done();
+			});
+		});
+
+		it("should use it as property descending order if starting with '-'", function (done) {
+			Person.find("-age", function (err, people) {
+				should.not.exist(err);
+				people.should.be.a("object");
+				people.should.have.property("length", 5);
+				people[0].age.should.equal(20);
+				people[4].age.should.equal(16);
+
+				return done();
+			});
+		});
+	});
+
+	describe("with an Array as argument", function () {
+		before(setup());
+
+		it("should use it as property ascending order", function (done) {
+			Person.find([ "age" ], function (err, people) {
+				should.not.exist(err);
+				people.should.be.a("object");
+				people.should.have.property("length", 5);
+				people[0].age.should.equal(16);
+				people[4].age.should.equal(20);
+
+				return done();
+			});
+		});
+
+		it("should use it as property descending order if starting with '-'", function (done) {
+			Person.find([ "-age" ], function (err, people) {
+				should.not.exist(err);
+				people.should.be.a("object");
+				people.should.have.property("length", 5);
+				people[0].age.should.equal(20);
+				people[4].age.should.equal(16);
+
+				return done();
+			});
+		});
+
+		it("should use it as property descending order if element is 'Z'", function (done) {
+			Person.find([ "age", "Z" ], function (err, people) {
+				should.not.exist(err);
+				people.should.be.a("object");
+				people.should.have.property("length", 5);
+				people[0].age.should.equal(20);
+				people[4].age.should.equal(16);
+
+				return done();
+			});
+		});
+
+		it("should accept multiple ordering", function (done) {
+			Person.find([ "age", "name", "Z" ], function (err, people) {
+				should.not.exist(err);
+				people.should.be.a("object");
+				people.should.have.property("length", 5);
+				people[0].age.should.equal(16);
+				people[4].age.should.equal(20);
+
+				return done();
+			});
+		});
+
+		it("should accept multiple ordering using '-' instead of 'Z'", function (done) {
+			Person.find([ "age", "-name" ], function (err, people) {
+				should.not.exist(err);
+				people.should.be.a("object");
+				people.should.have.property("length", 5);
+				people[0].age.should.equal(16);
+				people[4].age.should.equal(20);
+
+				return done();
+			});
+		});
+	});
+
+	describe("with an Object as argument", function () {
+		before(setup());
+
+		it("should use it as conditions", function (done) {
+			Person.find({ age: 16 }, function (err, people) {
+				should.not.exist(err);
+				people.should.be.a("object");
+				people.should.have.property("length", 1);
+				people[0].age.should.equal(16);
+
+				return done();
+			});
+		});
+
+		describe("with another Object as argument", function () {
+			before(setup());
+
+			it("should use it as options", function (done) {
+				Person.find({ age: 18 }, 1, { cache: false }, function (err, people) {
+					should.not.exist(err);
+					people.should.be.a("object");
+					people.should.have.property("length", 1);
+					people[0].age.should.equal(18);
+
+					return done();
+				});
+			});
+
+			describe("if a limit is passed", function () {
+				before(setup());
+
+				it("should use it", function (done) {
+					Person.find({ age: 18 }, { limit: 1 }, function (err, people) {
+						should.not.exist(err);
+						people.should.be.a("object");
+						people.should.have.property("length", 1);
+						people[0].age.should.equal(18);
+
+						return done();
+					});
+				});
+			});
+
+			describe("if an order is passed", function () {
+				before(setup());
+
+				it("should use it", function (done) {
+					Person.find({ surname: "Doe" }, { order: "age" }, function (err, people) {
+						should.not.exist(err);
+						people.should.be.a("object");
+						people.should.have.property("length", 3);
+						people[0].age.should.equal(16);
+
+						return done();
+					});
+				});
+
+				it("should use it and ignore previously defined order", function (done) {
+					Person.find({ surname: "Doe" }, "-age", { order: "age" }, function (err, people) {
+						should.not.exist(err);
+						people.should.be.a("object");
+						people.should.have.property("length", 3);
+						people[0].age.should.equal(16);
+
+						return done();
+					});
+				});
+			});
+		});
+	});
+});

From d0c4993117de2472b30b205a511e4058cab897eb Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 20 Jun 2013 23:06:59 +0100
Subject: [PATCH 0538/1246] Deprecates test-ping

---
 test/integration/{ => deprecated}/test-ping.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/integration/{ => deprecated}/test-ping.js (100%)

diff --git a/test/integration/test-ping.js b/test/integration/deprecated/test-ping.js
similarity index 100%
rename from test/integration/test-ping.js
rename to test/integration/deprecated/test-ping.js

From 27dcf55e68239b2dfcb0a732616d21ef49959d9f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 20 Jun 2013 23:09:34 +0100
Subject: [PATCH 0539/1246] Forces Model.find() tests to cast value to Number

This should come as number already, but type testing should be in a
separate test suite
---
 test/integration2/model-find.js | 38 ++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/test/integration2/model-find.js b/test/integration2/model-find.js
index 7d2a79f6..abcb2d4a 100644
--- a/test/integration2/model-find.js
+++ b/test/integration2/model-find.js
@@ -94,8 +94,8 @@ describe("Model.find()", function() {
 				should.not.exist(err);
 				people.should.be.a("object");
 				people.should.have.property("length", 5);
-				people[0].age.should.equal(16);
-				people[4].age.should.equal(20);
+				Number(people[0].age).should.equal(16);
+				Number(people[4].age).should.equal(20);
 
 				return done();
 			});
@@ -106,8 +106,8 @@ describe("Model.find()", function() {
 				should.not.exist(err);
 				people.should.be.a("object");
 				people.should.have.property("length", 5);
-				people[0].age.should.equal(20);
-				people[4].age.should.equal(16);
+				Number(people[0].age).should.equal(20);
+				Number(people[4].age).should.equal(16);
 
 				return done();
 			});
@@ -122,8 +122,8 @@ describe("Model.find()", function() {
 				should.not.exist(err);
 				people.should.be.a("object");
 				people.should.have.property("length", 5);
-				people[0].age.should.equal(16);
-				people[4].age.should.equal(20);
+				Number(people[0].age).should.equal(16);
+				Number(people[4].age).should.equal(20);
 
 				return done();
 			});
@@ -134,8 +134,8 @@ describe("Model.find()", function() {
 				should.not.exist(err);
 				people.should.be.a("object");
 				people.should.have.property("length", 5);
-				people[0].age.should.equal(20);
-				people[4].age.should.equal(16);
+				Number(people[0].age).should.equal(20);
+				Number(people[4].age).should.equal(16);
 
 				return done();
 			});
@@ -146,8 +146,8 @@ describe("Model.find()", function() {
 				should.not.exist(err);
 				people.should.be.a("object");
 				people.should.have.property("length", 5);
-				people[0].age.should.equal(20);
-				people[4].age.should.equal(16);
+				Number(people[0].age).should.equal(20);
+				Number(people[4].age).should.equal(16);
 
 				return done();
 			});
@@ -158,8 +158,8 @@ describe("Model.find()", function() {
 				should.not.exist(err);
 				people.should.be.a("object");
 				people.should.have.property("length", 5);
-				people[0].age.should.equal(16);
-				people[4].age.should.equal(20);
+				Number(people[0].age).should.equal(16);
+				Number(people[4].age).should.equal(20);
 
 				return done();
 			});
@@ -170,8 +170,8 @@ describe("Model.find()", function() {
 				should.not.exist(err);
 				people.should.be.a("object");
 				people.should.have.property("length", 5);
-				people[0].age.should.equal(16);
-				people[4].age.should.equal(20);
+				Number(people[0].age).should.equal(16);
+				Number(people[4].age).should.equal(20);
 
 				return done();
 			});
@@ -186,7 +186,7 @@ describe("Model.find()", function() {
 				should.not.exist(err);
 				people.should.be.a("object");
 				people.should.have.property("length", 1);
-				people[0].age.should.equal(16);
+				Number(people[0].age).should.equal(16);
 
 				return done();
 			});
@@ -200,7 +200,7 @@ describe("Model.find()", function() {
 					should.not.exist(err);
 					people.should.be.a("object");
 					people.should.have.property("length", 1);
-					people[0].age.should.equal(18);
+					Number(people[0].age).should.equal(18);
 
 					return done();
 				});
@@ -214,7 +214,7 @@ describe("Model.find()", function() {
 						should.not.exist(err);
 						people.should.be.a("object");
 						people.should.have.property("length", 1);
-						people[0].age.should.equal(18);
+						Number(people[0].age).should.equal(18);
 
 						return done();
 					});
@@ -229,7 +229,7 @@ describe("Model.find()", function() {
 						should.not.exist(err);
 						people.should.be.a("object");
 						people.should.have.property("length", 3);
-						people[0].age.should.equal(16);
+						Number(people[0].age).should.equal(16);
 
 						return done();
 					});
@@ -240,7 +240,7 @@ describe("Model.find()", function() {
 						should.not.exist(err);
 						people.should.be.a("object");
 						people.should.have.property("length", 3);
-						people[0].age.should.equal(16);
+						Number(people[0].age).should.equal(16);
 
 						return done();
 					});

From 1468c8e59f9b4370e70d103f2a00e3cb512d83b9 Mon Sep 17 00:00:00 2001
From: Stephan Hoyer <ste.hoyer@gmail.com>
Date: Fri, 21 Jun 2013 10:16:32 +0200
Subject: [PATCH 0540/1246] Fix wrong import of debug output for aggregate
 functions

---
 lib/AggregateFunctions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index 1896aa73..551fd0f8 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -100,7 +100,7 @@ function AggregateFunctions(opts) {
 			}
 
 			if (opts.driver.opts && opts.driver.opts.debug) {
-				require(".Debug").sql(opts.driver_name, query.build());
+				require("./Debug").sql(opts.driver_name, query.build());
 			}
 
 			opts.driver.execQuery(query.build(), function (err, data) {

From c7b1ae8e2dc59fda508e8a56171042ace9aac8d7 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 21 Jun 2013 22:54:13 +0100
Subject: [PATCH 0541/1246] Adds more tests to Model.find(), deprecates old
 ones

---
 .../{ => deprecated}/test-find-offset.js      |  0
 .../{ => deprecated}/test-find-rechain.js     |  0
 .../{ => deprecated}/test-find-where-like.js  |  0
 test/integration2/model-find.js               | 50 +++++++++++++++++++
 4 files changed, 50 insertions(+)
 rename test/integration/{ => deprecated}/test-find-offset.js (100%)
 rename test/integration/{ => deprecated}/test-find-rechain.js (100%)
 rename test/integration/{ => deprecated}/test-find-where-like.js (100%)

diff --git a/test/integration/test-find-offset.js b/test/integration/deprecated/test-find-offset.js
similarity index 100%
rename from test/integration/test-find-offset.js
rename to test/integration/deprecated/test-find-offset.js
diff --git a/test/integration/test-find-rechain.js b/test/integration/deprecated/test-find-rechain.js
similarity index 100%
rename from test/integration/test-find-rechain.js
rename to test/integration/deprecated/test-find-rechain.js
diff --git a/test/integration/test-find-where-like.js b/test/integration/deprecated/test-find-where-like.js
similarity index 100%
rename from test/integration/test-find-where-like.js
rename to test/integration/deprecated/test-find-where-like.js
diff --git a/test/integration2/model-find.js b/test/integration2/model-find.js
index abcb2d4a..b7df3617 100644
--- a/test/integration2/model-find.js
+++ b/test/integration2/model-find.js
@@ -192,6 +192,18 @@ describe("Model.find()", function() {
 			});
 		});
 
+		it("should accept comparison objects", function (done) {
+			Person.find({ age: ORM.gt(18) }, function (err, people) {
+				should.not.exist(err);
+				people.should.be.a("object");
+				people.should.have.property("length", 2);
+				Number(people[0].age).should.equal(20);
+				Number(people[1].age).should.equal(20);
+
+				return done();
+			});
+		});
+
 		describe("with another Object as argument", function () {
 			before(setup());
 
@@ -221,6 +233,21 @@ describe("Model.find()", function() {
 				});
 			});
 
+			describe("if an offset is passed", function () {
+				before(setup());
+
+				it("should use it", function (done) {
+					Person.find({}, { offset: 1 }, "age", function (err, people) {
+						should.not.exist(err);
+						people.should.be.a("object");
+						people.should.have.property("length");
+						Number(people[0].age).should.equal(18);
+
+						return done();
+					});
+				});
+			});
+
 			describe("if an order is passed", function () {
 				before(setup());
 
@@ -248,4 +275,27 @@ describe("Model.find()", function() {
 			});
 		});
 	});
+
+	describe("if defined static methods", function () {
+		before(setup());
+
+		it("should be rechainable", function (done) {
+			Person.over18 = function () {
+				return this.find({ age: ORM.gt(18) });
+			};
+			Person.family = function (family) {
+				return this.find({ surname: family });
+			};
+
+			Person.over18().family("Doe").run(function (err, people) {
+				should.not.exist(err);
+				people.should.be.a("object");
+				people.should.have.property("length", 1);
+				people[0].name.should.equal("Jasmine");
+				people[0].surname.should.equal("Doe");
+
+				return done();
+			});
+		});
+	});
 });

From 001c565538f36b95ccb075ccb22252481dc884c4 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 21 Jun 2013 22:59:41 +0100
Subject: [PATCH 0542/1246] Updates hook tests to test beforeSave hook when
 creating and when saving an already existent instance

---
 test/integration2/hook.js | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/test/integration2/hook.js b/test/integration2/hook.js
index cd536222..ef19d41d 100644
--- a/test/integration2/hook.js
+++ b/test/integration2/hook.js
@@ -193,22 +193,41 @@ describe("Hook", function() {
 			describe("if hook triggers error", function () {
 				before(setup({
 					beforeSave : function (next) {
+						if (this.name == "John Doe") {
+							return next();
+						}
 						setTimeout(function () {
 							return next(new Error('beforeSave-error'));
 						}, 200);
 					}
 				}));
 
-				it("should trigger error", function (done) {
+				it("should trigger error when creating", function (done) {
 					this.timeout(500);
 
-					Person.create([{ name: "John Doe" }], function (err) {
+					Person.create([{ name: "Jane Doe" }], function (err) {
 						err.should.be.a("object");
 						err.message.should.equal("beforeSave-error");
 
 						return done();
 					});
 				});
+
+				it("should trigger error when saving", function (done) {
+					this.timeout(500);
+
+					Person.create([{ name: "John Doe" }], function (err, John) {
+						should.equal(err, null);
+
+						John[0].name = "Jane Doe";
+						John[0].save(function (err) {
+							err.should.be.a("object");
+							err.message.should.equal("beforeSave-error");
+
+							return done();
+						});
+					});
+				});
 			});
 		});
 	});

From 80a3cf708debb59734cef4bd0db9775a79abdba8 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 21 Jun 2013 23:27:53 +0100
Subject: [PATCH 0543/1246] Adds a space between "if" and "(err)" in sqlite
 create table

---
 lib/Drivers/DDL/sqlite.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index 9af033c7..e9e984ee 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -116,7 +116,7 @@ exports.sync = function (driver, opts, cb) {
 	pending = queries.length;
 	for (i = 0; i < queries.length; i++) {
 		driver.db.all(queries[i], function (err) {
-			if(err) console.log(err);
+			if (err) console.log(err);
 			if (--pending === 0) {
 				return cb(err);
 			}

From 27ba69dbcae2b77b9906110d43b35ab237edca6e Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 21 Jun 2013 23:28:04 +0100
Subject: [PATCH 0544/1246] sqlite3@2.1.10

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d51b3aa3..934bc094 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "urun"    : "0.0.6",
     "mysql"   : "2.0.0-alpha7",
     "pg"      : "1.0.0",
-    "sqlite3" : "2.1.7",
+    "sqlite3" : "2.1.10",
     "async"   : "*",
     "mocha"   : "1.10.0",
     "should"  : "1.2.2"

From c42ebe332094f4e1c3ced07281e57c9d00833288 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 21 Jun 2013 23:28:27 +0100
Subject: [PATCH 0545/1246] Forces Model.find() offset test to check for length
 value

---
 test/integration2/model-find.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration2/model-find.js b/test/integration2/model-find.js
index b7df3617..020e92cd 100644
--- a/test/integration2/model-find.js
+++ b/test/integration2/model-find.js
@@ -240,7 +240,7 @@ describe("Model.find()", function() {
 					Person.find({}, { offset: 1 }, "age", function (err, people) {
 						should.not.exist(err);
 						people.should.be.a("object");
-						people.should.have.property("length");
+						people.should.have.property("length", 4);
 						Number(people[0].age).should.equal(18);
 
 						return done();

From c93d5b4b024007c9626811de3a0e9083dfcc9558 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 21 Jun 2013 23:28:52 +0100
Subject: [PATCH 0546/1246] Converts indentation from 2 spaces to tabs in
 test/support/spec_helper.js

---
 test/support/spec_helper.js | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/test/support/spec_helper.js b/test/support/spec_helper.js
index 53f1a988..9204cb8f 100644
--- a/test/support/spec_helper.js
+++ b/test/support/spec_helper.js
@@ -2,26 +2,26 @@ var common = require('../common');
 var async  = require('async');
 
 module.exports.connect = function(cb) {
-  common.createConnection(function(err, conn) {
-    if (err) throw err;
-    cb(conn);
-  });
+	common.createConnection(function (err, conn) {
+		if (err) throw err;
+		cb(conn);
+	});
 };
 
 module.exports.dropSync = function (models, done) {
-  if (!Array.isArray(models)) {
-    models = [models];
-  }
+	if (!Array.isArray(models)) {
+		models = [models];
+	}
 
-  async.eachSeries(models, function(item, cb) {
-    item.drop(function(err) {
-      if (err) throw err
-      item.sync(function(err) {
-        if (err) throw err
-        cb();
-      });
-    });
-  }, function() {
-    done();
-  });
+	async.eachSeries(models, function (item, cb) {
+		item.drop(function (err) {
+			if (err) throw err
+
+			item.sync(function (err) {
+				if (err) throw err
+
+				return cb();
+			});
+		});
+	}, done);
 };

From 5ba9aa6728d8b1434bc87b14f1a897362edd9308 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 21 Jun 2013 23:46:59 +0100
Subject: [PATCH 0547/1246] Adds dependency status badge to Readme

---
 Readme.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index c469392b..923cf33a 100755
--- a/Readme.md
+++ b/Readme.md
@@ -1,6 +1,8 @@
 ## Object Relational Mapping
 
-[![Build Status](https://secure.travis-ci.org/dresende/node-orm2.png?branch=master)](http://travis-ci.org/dresende/node-orm2) [![](https://badge.fury.io/js/orm.png)](https://npmjs.org/package/orm)
+[![Build Status](https://secure.travis-ci.org/dresende/node-orm2.png?branch=master)](http://travis-ci.org/dresende/node-orm2)
+[![](https://badge.fury.io/js/orm.png)](https://npmjs.org/package/orm)
+[![](https://gemnasium.com/dresende/node-orm2.png)](https://gemnasium.com/dresende/node-orm2)
 
 ## Install
 

From 5d6941b4a1ea0cd8bbe82fa432331069cda3b440 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 21 Jun 2013 23:53:40 +0100
Subject: [PATCH 0548/1246] Adds transaction plugin to Readme

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 923cf33a..7af24a42 100755
--- a/Readme.md
+++ b/Readme.md
@@ -32,7 +32,7 @@ make
 - Create Model associations, find, check, create and remove
 - Define custom validations (several builtin validations, check instance properties before saving)
 - Model instance caching and integrity (table rows fetched twice are the same object, changes to one change all)
-- Plugins: [MySQL FTS](http://dresende.github.io/node-orm-mysql-fts) , [Pagination](http://dresende.github.io/node-orm-paging)
+- Plugins: [MySQL FTS](http://dresende.github.io/node-orm-mysql-fts) , [Pagination](http://dresende.github.io/node-orm-paging) , [Transaction](http://dresende.github.io/node-orm-transaction)
 
 ## Introduction
 

From 7d064e437452a370874aac082c9fb2deaecfcb2d Mon Sep 17 00:00:00 2001
From: Alyssa Ravasio <alyssaravasio@dhcp138.int.hackbrightacademy.com>
Date: Mon, 24 Jun 2013 15:23:19 -0700
Subject: [PATCH 0549/1246] describe pool

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 7af24a42..50b5a8eb 100755
--- a/Readme.md
+++ b/Readme.md
@@ -145,7 +145,7 @@ orm.connect("mysql://username:password@host/database?pool=true", function (err,
 });
 ```
 
-**Note:** `pool` is only supported by mysql & postgres.
+**Note:** `pool` is only supported by mysql & postgres. When 'pool' is set to true, your database connections are cached so that connections can be reused, optimizing performance. 
 
 Or as an object:
 

From 3bbfca3e98bb90803bbdf5c06eec2d126f389a6d Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 27 Jun 2013 14:19:48 +0100
Subject: [PATCH 0550/1246] sqlite3@2.1.7

Downgrade is because of a possible bug posted here:

https://github.com/developmentseed/node-sqlite3/issues/157
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 934bc094..d51b3aa3 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "urun"    : "0.0.6",
     "mysql"   : "2.0.0-alpha7",
     "pg"      : "1.0.0",
-    "sqlite3" : "2.1.10",
+    "sqlite3" : "2.1.7",
     "async"   : "*",
     "mocha"   : "1.10.0",
     "should"  : "1.2.2"

From 7efe5e8f2d4719beba81d50cca6e32b939fb43a6 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 27 Jun 2013 14:21:49 +0100
Subject: [PATCH 0551/1246] Changes Readme.md sqlite3 version and adds warning.

---
 Readme.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Readme.md b/Readme.md
index 50b5a8eb..6b7dcc9a 100755
--- a/Readme.md
+++ b/Readme.md
@@ -131,7 +131,9 @@ First, add the correct driver to your `package.json`:
 :----------------------|:---------------------------
  mysql                 | `"mysql" : "2.0.0-alpha7"`
  postgres<br/>redshift | `"pg": "~1.0.0"`
- sqlite                | `"sqlite3" : "2.1.9"`
+ sqlite                | `"sqlite3" : "2.1.7"`
+
+These are the versions tested. Use others (older or newer) at your own risk.
 
 ### Options
 
@@ -145,7 +147,7 @@ orm.connect("mysql://username:password@host/database?pool=true", function (err,
 });
 ```
 
-**Note:** `pool` is only supported by mysql & postgres. When 'pool' is set to true, your database connections are cached so that connections can be reused, optimizing performance. 
+**Note:** `pool` is only supported by mysql & postgres. When 'pool' is set to true, your database connections are cached so that connections can be reused, optimizing performance.
 
 Or as an object:
 

From 6623b484f1ca70ee49f14664af54acae4f45a40b Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 27 Jun 2013 14:39:32 +0100
Subject: [PATCH 0552/1246] Changes Model.aggregate() to support multiple
 orders when calling .order() (#207)

---
 lib/AggregateFunctions.js            | 21 ++++++++++++++-------
 test/integration2/model-aggregate.js |  2 +-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index 551fd0f8..4280a9dc 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -1,3 +1,5 @@
+var Utilities = require("./Utilities");
+
 module.exports = AggregateFunctions;
 
 function AggregateFunctions(opts) {
@@ -43,8 +45,8 @@ function AggregateFunctions(opts) {
 			}
 			return this;
 		},
-		order: function (property, order) {
-			opts.order = [ property, order ];
+		order: function () {
+			opts.order = Utilities.standardizeOrder(Array.prototype.slice.apply(arguments));
 			return this;
 		},
 		select: function () {
@@ -79,9 +81,10 @@ function AggregateFunctions(opts) {
 			}
 
 			var query = opts.driver.getQuery().select().from(opts.table).select(opts.properties);
+			var i, j;
 
-			for (var i = 0; i < aggregates.length; i++) {
-				for (var j = 0; j < aggregates[i].length; j++) {
+			for (i = 0; i < aggregates.length; i++) {
+				for (j = 0; j < aggregates[i].length; j++) {
 					query[aggregates[i][j].f](aggregates[i][j].a, aggregates[i][j].alias);
 				}
 			}
@@ -93,17 +96,21 @@ function AggregateFunctions(opts) {
 			}
 
 			if (opts.order) {
-				query.order.apply(query, opts.order);
+				for (i = 0; i < opts.order.length; i++) {
+					query.order(opts.order[i][0], opts.order[i][1]);
+				}
 			}
 			if (opts.limit) {
 				query.offset(opts.limit[0]).limit(opts.limit[1]);
 			}
 
+			query = query.build();
+
 			if (opts.driver.opts && opts.driver.opts.debug) {
-				require("./Debug").sql(opts.driver_name, query.build());
+				require("./Debug").sql(opts.driver_name, query);
 			}
 
-			opts.driver.execQuery(query.build(), function (err, data) {
+			opts.driver.execQuery(query, function (err, data) {
 				if (err) {
 					return cb(err);
 				}
diff --git a/test/integration2/model-aggregate.js b/test/integration2/model-aggregate.js
index eb17d6e1..22fa85eb 100644
--- a/test/integration2/model-aggregate.js
+++ b/test/integration2/model-aggregate.js
@@ -150,7 +150,7 @@ describe("Model.aggregate()", function() {
 			before(setup());
 
 			it("should order items", function (done) {
-				Person.aggregate().count().groupBy('name').order('count', 'Z').get(function (err, rows) {
+				Person.aggregate().count().groupBy('name').order('-count').get(function (err, rows) {
 					should.equal(err, null);
 
 					rows.should.be.a("object");

From 3d1e7de61da38135f70b5f2ee0c06757cf8fceac Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 27 Jun 2013 14:52:11 +0100
Subject: [PATCH 0553/1246] Adds initial ErrorCodes file

---
 lib/ErrorCodes.js | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 lib/ErrorCodes.js

diff --git a/lib/ErrorCodes.js b/lib/ErrorCodes.js
new file mode 100644
index 00000000..117f080f
--- /dev/null
+++ b/lib/ErrorCodes.js
@@ -0,0 +1,21 @@
+exports.QUERY_ERROR      = 1;
+exports.NOT_FOUND        = 2;
+exports.NO_SUPPORT       = 3;
+exports.MISSING_CALLBACK = 4;
+exports.PARAM_MISSMATCH  = 5;
+
+Object.defineProperty(exports, "generateError", {
+	value: function (code, message, extra) {
+		var err = new Error(message);
+		err.code = code;
+
+		if (extra) {
+			for (var k in extra) {
+				err[k] = extra[k];
+			}
+		}
+
+		return err;
+	},
+	enumerable : false
+});

From 9f2cde7dc15c8c60d8e62cbb640c6d615e513a0c Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 27 Jun 2013 14:53:16 +0100
Subject: [PATCH 0554/1246] Exports ErrorCodes in ORM

---
 lib/ORM.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/ORM.js b/lib/ORM.js
index fe56638b..99d6a1b0 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -10,12 +10,14 @@ var DriverAliases  = require("./Drivers/aliases");
 var Validators     = require("./Validators");
 var Settings       = require("./Settings");
 var Singleton      = require("./Singleton");
+var ErrorCodes     = require("./ErrorCodes");
 
 exports.validators = Validators;
 exports.singleton  = Singleton;
 exports.settings   = new Settings.Container(Settings.defaults());
 exports.Settings   = Settings;
 exports.Property   = require("./Property");
+exports.ErrorCodes = ErrorCodes;
 
 for (var k in Query.Comparators) {
 	exports[Query.Comparators[k]] = Query[Query.Comparators[k]];

From c94866fa105e5e10ddb2d8ef71828fb921ddae83 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 27 Jun 2013 14:53:45 +0100
Subject: [PATCH 0555/1246] Changes many errors to use the ErrorCodes generator
 (#206)

---
 lib/Associations/Many.js |  5 +++--
 lib/Associations/One.js  |  2 +-
 lib/Model.js             | 19 ++++++++++---------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 7ee65670..3c7e19ef 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -1,11 +1,12 @@
 var InstanceConstructor = require("../Instance").Instance;
 var Settings            = require("../Settings");
 var Property            = require("../Property");
+var ErrorCodes          = require("../ErrorCodes");
 
 exports.prepare = function (Model, associations) {
 	if (Model.keys.length > 1) {
 		Model.hasMany = function () {
-			throw new Error("Model.hasMany() does not support multiple keys models");
+			throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Model.hasMany() does not support multiple keys models");
 		};
 		return;
 	}
@@ -209,7 +210,7 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 			                 typeof Instances[Instances.length - 1] == "function" ? Instances.pop() : noOperation);
 
 			if (Instances.length === 0) {
-				throw new Error("No associations defined");
+				throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "No associations defined");
 			}
 
 			if (Array.isArray(Instances[0])) {
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index c05dfaf5..9eb71744 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -56,7 +56,7 @@ exports.prepare = function (Model, associations, association_properties, model_f
 			}
 
 			if (conditions === null) {
-				throw new Error(".findBy" + assocName + "() is missing a conditions object");
+				throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, ".findBy(" + assocName + ") is missing a conditions object");
 			}
 
 			options.__merge = {
diff --git a/lib/Model.js b/lib/Model.js
index 3b539e5c..c495918b 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -7,6 +7,7 @@ var Property        = require("./Property");
 var Singleton       = require("./Singleton");
 var Utilities       = require("./Utilities");
 var Validators      = require("./Validators");
+var ErrorCodes      = require("./ErrorCodes");
 
 exports.Model = Model;
 
@@ -161,7 +162,7 @@ function Model(opts) {
 			return this;
 		}
 
-		return cb(new Error("Driver does not support Model.drop()"));
+		return cb(ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Driver does not support Model.drop()"));
 	};
 
 	model.sync = function (cb) {
@@ -181,7 +182,7 @@ function Model(opts) {
 			return this;
 		}
 
-		return cb(new Error("Driver does not support Model.sync()"));
+		return cb(ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Driver does not support Model.sync()"));
 	};
 
 	model.get = function () {
@@ -191,7 +192,7 @@ function Model(opts) {
 		var cb         = ids.pop();
 
 		if (typeof cb != "function") {
-			throw new Error("Missing Model.get() callback");
+			throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.get() callback");
 		}
 
 		if (typeof ids[ids.length - 1] == "object" && !Array.isArray(ids[ids.length - 1])) {
@@ -203,7 +204,7 @@ function Model(opts) {
 		}
 
 		if (ids.length != opts.keys.length) {
-			throw new Error("Model.get() IDs number missmatch (" + opts.keys.length + " needed, " + ids.length + " passed)");
+			throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "Model.get() IDs number missmatch (" + opts.keys.length + " needed, " + ids.length + " passed)");
 		}
 
 		for (var i = 0; i < opts.keys.length; i++) {
@@ -219,10 +220,10 @@ function Model(opts) {
 
 		opts.driver.find(model_fields, opts.table, conditions, { limit: 1 }, function (err, data) {
 			if (err) {
-				return cb(err);
+				return cb(ErrorCodes.generateError(ErrorCodes.QUERY_ERROR, err.message, { originalCode: err.code }));
 			}
 			if (data.length === 0) {
-				return cb(new Error("Not found"));
+				return cb(ErrorCodes.generateError(ErrorCodes.NOT_FOUND, "Not found"));
 			}
 			Singleton.get(opts.driver.uid + "/" + opts.table + "/" + ids.join("/"), {
 				cache      : (options.hasOwnProperty("cache") ? options.cache : opts.cache),
@@ -366,7 +367,7 @@ function Model(opts) {
 		}
 
 		if (cb === null) {
-			throw new Error("Model.one() called without callback");
+			throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.one() callback");
 		}
 
 		// add limit 1
@@ -397,7 +398,7 @@ function Model(opts) {
 		}
 
 		if (typeof cb != "function") {
-			throw new Error("Missing Model.count() callback");
+			throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.count() callback");
 		}
 
 		opts.driver.count(opts.table, conditions, {}, function (err, data) {
@@ -437,7 +438,7 @@ function Model(opts) {
 		var cb  = ids.pop();
 
 		if (typeof cb != "function") {
-			throw new Error("Missing Model.exists() callback");
+			throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.exists() callback");
 		}
 
 		var conditions = {}, i;

From 3313e367d3beead4cf34fbe8dc2d5a96ad5c9dc6 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 27 Jun 2013 15:05:02 +0100
Subject: [PATCH 0556/1246] Changes more errors to use the new ErrorCodes
 generator (#206)

---
 lib/AggregateFunctions.js | 12 ++++++------
 lib/ErrorCodes.js         |  2 ++
 lib/ORM.js                | 10 +++++-----
 lib/Property.js           |  1 +
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index 4280a9dc..8cd5a41e 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -4,10 +4,10 @@ module.exports = AggregateFunctions;
 
 function AggregateFunctions(opts) {
 	if (typeof opts.driver.getQuery != "function") {
-		throw new Error("This driver does not support aggregate functions");
+		throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "This driver does not support aggregate functions");
 	}
 	if (!Array.isArray(opts.driver.aggregate_functions)) {
-		throw new Error("This driver does not support aggregate functions");
+		throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "This driver does not support aggregate functions");
 	}
 
 	var aggregates    = [ [] ];
@@ -51,7 +51,7 @@ function AggregateFunctions(opts) {
 		},
 		select: function () {
 			if (arguments.length === 0) {
-				throw new Error("When using append you must at least define one property");
+				throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "When using append you must at least define one property");
 			}
 			opts.properties = opts.properties.concat(Array.isArray(arguments[0]) ?
 			                                                 arguments[0] :
@@ -60,7 +60,7 @@ function AggregateFunctions(opts) {
 		},
 		as: function (alias) {
 			if (aggregates.length === 0) {
-				throw new Error("No aggregate function defined yet");
+				throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "No aggregate functions defined yet");
 			}
 
 			var len = aggregates.length;
@@ -71,13 +71,13 @@ function AggregateFunctions(opts) {
 		},
 		get: function (cb) {
 			if (typeof cb != "function") {
-				throw new Error("You must pass a callback to Model.aggregate().get()");
+				throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "You must pass a callback to Model.aggregate().get()");
 			}
 			if (aggregates[aggregates.length - 1].length === 0) {
 				aggregates.length -= 1;
 			}
 			if (aggregates.length === 0) {
-				throw new Error("Missing aggregate functions");
+				throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "Missing aggregate functions");
 			}
 
 			var query = opts.driver.getQuery().select().from(opts.table).select(opts.properties);
diff --git a/lib/ErrorCodes.js b/lib/ErrorCodes.js
index 117f080f..dfec6fbf 100644
--- a/lib/ErrorCodes.js
+++ b/lib/ErrorCodes.js
@@ -4,6 +4,8 @@ exports.NO_SUPPORT       = 3;
 exports.MISSING_CALLBACK = 4;
 exports.PARAM_MISSMATCH  = 5;
 
+exports.CONNECTION_LOST  = 10;
+
 Object.defineProperty(exports, "generateError", {
 	value: function (code, message, extra) {
 		var err = new Error(message);
diff --git a/lib/ORM.js b/lib/ORM.js
index 99d6a1b0..915d60bc 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -50,11 +50,11 @@ exports.use = function (connection, proto, opts, cb) {
 
 exports.connect = function (opts, cb) {
 	if (arguments.length === 0 || !opts) {
-		return ORM_Error(new Error("CONNECTION_URL_EMPTY"), cb);
+		return ORM_Error(ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "CONNECTION_URL_EMPTY"), cb);
 	}
 	if (typeof opts == "string") {
 		if (opts.replace(/\s+/, "").length === 0) {
-			return ORM_Error(new Error("CONNECTION_URL_EMPTY"), cb);
+			return ORM_Error(ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "CONNECTION_URL_EMPTY"), cb);
 		}
 		opts = url.parse(opts, true);
 	}
@@ -65,7 +65,7 @@ exports.connect = function (opts, cb) {
 		opts.database = (opts.pathname ? opts.pathname.substr(1) : "");
 	}
 	if (!opts.protocol) {
-		return ORM_Error(new Error("CONNECTION_URL_NO_PROTOCOL"), cb);
+		return ORM_Error(ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "CONNECTION_URL_NO_PROTOCOL"), cb);
 	}
 	// if (!opts.host) {
 	// 	opts.host = opts.hostname = "localhost";
@@ -111,7 +111,7 @@ exports.connect = function (opts, cb) {
 		});
 	} catch (ex) {
 		if (ex.code == "MODULE_NOT_FOUND" || ex.message.indexOf('find module')) {
-			return ORM_Error(new Error("CONNECTION_PROTOCOL_NOT_SUPPORTED"), cb);
+			return ORM_Error(ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "CONNECTION_PROTOCOL_NOT_SUPPORTED"), cb);
 		}
 		return ORM_Error(ex, cb);
 	}
@@ -138,7 +138,7 @@ function ORM(driver_name, driver, settings) {
 	var onError = function (err) {
 		if (this.settings.get("connection.reconnect")) {
 			if (typeof this.driver.reconnect == "undefined") {
-				return this.emit("error", new Error("Connection lost - driver does not support reconnection"));
+				return this.emit("error", ErrorCodes.generateError(ErrorCodes.CONNECTION_LOST, "Connection lost - driver does not support reconnection"));
 			}
 			this.driver.reconnect(function () {
 				this.driver.on("error", onError);
diff --git a/lib/Property.js b/lib/Property.js
index 6c164f1f..f05e6d75 100644
--- a/lib/Property.js
+++ b/lib/Property.js
@@ -30,6 +30,7 @@ exports.normalize = function (prop, Settings) {
 
 	if ([ "text", "number", "boolean", "date", "enum", "object", "binary" ].indexOf(prop.type) == -1) {
 		throw new Error("Unknown property type: " + prop.type);
+		throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Unknown property type: " + prop.type);
 	}
 
 	if (!prop.hasOwnProperty("required") && Settings.get("properties.required")) {

From f0bea6c6ee5ee3adf0e34af00adb55c56f0f529a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 27 Jun 2013 15:06:07 +0100
Subject: [PATCH 0557/1246] Removes console.log(err) in sqlite DDL

---
 lib/Drivers/DDL/sqlite.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index e9e984ee..d0c1ae94 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -116,7 +116,7 @@ exports.sync = function (driver, opts, cb) {
 	pending = queries.length;
 	for (i = 0; i < queries.length; i++) {
 		driver.db.all(queries[i], function (err) {
-			if (err) console.log(err);
+			// if (err) console.log(err);
 			if (--pending === 0) {
 				return cb(err);
 			}

From fcedc3f31316586722d6cdb2f3e52cf704df0e0f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 27 Jun 2013 15:17:50 +0100
Subject: [PATCH 0558/1246] 2.0.14

---
 Changelog.md | 26 ++++++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index c79a4684..14cca6b6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,29 @@
+### v2.0.14 - 27 June 2013
+
+- Changes many errors to use the ErrorCodes generator (#206)
+- Changes Model.aggregate() to support multiple orders when calling .order() (#207)
+- Changes Readme.md sqlite3 version and adds warning.
+- Fix wrong import of debug output for aggregate functions
+- Fix orm when running on node v0.6 (at least) and module not found error has no code property
+- Adds model.namePrefix setting (#203)
+- Fixes bug when passing an array (object) of ids but no options object
+- Only mark model as dirty if a property has _really_ changed
+- Fix hasOne infinite loop
+- WIP: Fix hasOne infinite loop & migrate tests to mocha
+- Fixes ipv4 predefined validator match string (it was not matching correctly!)
+- Fixes Model.get() when passing cache: false and model has cache: true
+- Creates Singleton.clear() to clear cache, exports singleton in orm
+- Fix required property model.save only threw a single error with returnAllErrors = true
+- Fixes some hasMany association usage of Association.id to check for real id property name (#197)
+- Changes db.load() to return value from loaded and invoked function (#194)
+- Adds possibility to add a callback to ChainFind.find() (#190)
+- Adds .findByX(...) to .hasOne("X", ...)
+- Allow db.load() to work outside of module.exports
+- Fix mysql driver for non-autoincrement key
+- Test framework moving to mocha, not complete yet
+- Adds `make cov` to make for a test coverage
+- Many other bug fixes
+
 ### v2.0.13 - 5 June 2013
 
 - Avoids throwing when calling db.close() without a callback and using pool in mysql (fixes #180)
diff --git a/package.json b/package.json
index d51b3aa3..4029e90f 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "redshift",
     "sqlite"
   ],
-  "version"     : "2.0.13",
+  "version"     : "2.0.14",
   "license"     : "MIT",
   "homepage"    : "http://dresende.github.io/node-orm2",
   "repository"  : "http://github.com/dresende/node-orm2.git",

From 70f778a791c811d25bdae68370bded3c21220837 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 27 Jun 2013 19:22:16 +0100
Subject: [PATCH 0559/1246] sql-query@0.0.29

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4029e90f..cb6fd477 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
   },
   "analyse"     : false,
   "dependencies": {
-    "sql-query" : "0.0.28",
+    "sql-query" : "0.0.29",
     "hat"       : "0.0.3",
     "lodash"    : "1.3.1"
   },

From 5447c6881c85389396479c71b17f63ce40ac1623 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 28 Jun 2013 22:46:15 +0100
Subject: [PATCH 0560/1246] Adds Contributing.md

---
 Contributing.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 Contributing.md

diff --git a/Contributing.md b/Contributing.md
new file mode 100644
index 00000000..6e722d23
--- /dev/null
+++ b/Contributing.md
@@ -0,0 +1,12 @@
+## Contributing
+
+### Issues
+
+Try to be the most specific possible. Give node version, database driver and orm version. Give an example,
+that will help other people to try and replicate your problem.
+
+### Pull Requests
+
+They are always welcome, but they must pass all the tests. If adding a new feature, don't forget about adding
+it to documentation (Readme.md) and add tests for it. If you need help preparing a local clone for testing
+just ask and we'll help you.

From b264b83a9ed160e1c9c2b071f379b682ee64d0ea Mon Sep 17 00:00:00 2001
From: Pelle Johnsen <pelle.johnsen@gmail.com>
Date: Mon, 1 Jul 2013 18:38:39 +0800
Subject: [PATCH 0561/1246] Handle django string formatted sqlite datetime

---
 lib/Drivers/DML/sqlite.js | 49 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index c5635d0a..11200dff 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -207,6 +207,13 @@ Driver.prototype.valueToProperty = function (value, property) {
 				return null;
 			}
 			break;
+		case "date":
+			if (typeof value === 'string') {
+				if (value.indexOf('Z', value.length - 1) === -1) {
+					return new Date(value + 'Z');
+				}
+			}
+			return new Date(value);
 		default:
 			return value;
 	}
@@ -218,6 +225,48 @@ Driver.prototype.propertyToValue = function (value, property) {
 			return (value) ? 1 : 0;
 		case "object":
 			return JSON.stringify(value);
+		case "date":
+			if (this.config.query.strdates) {
+				if (value instanceof Date) {
+					var year = value.getUTCFullYear();
+					var month = value.getUTCMonth() + 1;
+					if (month < 10) {
+						month = '0' + month;
+					}
+					var date = value.getUTCDate();
+					if (date < 10) {
+						date = '0' + date;
+					}
+					var strdate = year + '-' + month + '-' + date;
+					if (property.time === false) {
+						return strdate;
+					}
+
+					var hours = value.getUTCHours();
+					if (hours < 10) {
+						hours = '0' + hours;
+					}
+					var minutes = value.getUTCMinutes();
+					if (minutes < 10) {
+						minutes = '0' + minutes;
+					}
+					var seconds = value.getUTCSeconds();
+					if (seconds < 10) {
+						seconds = '0' + seconds;
+					}
+					var millis = value.getUTCMilliseconds();
+					if (millis < 10) {
+						millis = '0' + millis;
+					}
+					if (millis < 100) {
+						millis = '0' + millis;
+					}
+					strdate += ' ' + hours + ':' + minutes + ':' + seconds + '.' + millis + '000';
+					return  strdate; 
+				}
+
+			}
+			return value;
 		default:
 			return value;
 	}

From 7626c4a3ee900b43e8d91d1eadba079994ec2db5 Mon Sep 17 00:00:00 2001
From: Pelle Johnsen <pelle.johnsen@gmail.com>
Date: Tue, 2 Jul 2013 10:44:22 +0800
Subject: [PATCH 0562/1246] Add doc for strdates

---
 Readme.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 6b7dcc9a..8827b730 100755
--- a/Readme.md
+++ b/Readme.md
@@ -149,6 +149,8 @@ orm.connect("mysql://username:password@host/database?pool=true", function (err,
 
 **Note:** `pool` is only supported by mysql & postgres. When 'pool' is set to true, your database connections are cached so that connections can be reused, optimizing performance.
 
+**Note:** `strdates` is only supported by sqlite. When true, date fields are saved as strings, compatible with django
+
 Or as an object:
 
 ```js
@@ -161,7 +163,8 @@ var opts = {
   password : "..",
   query    : {
     pool     : true|false,   // optional, false by default
-    debug    : true|false    // optional, false by default
+    debug    : true|false,   // optional, false by default
+    strdates : true|false    // optional, false by default
   }
 };
 orm.connect(opts, function (err, db) {

From acf536aec16116a1a821c3f2e1e6c65c094540ba Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 2 Jul 2013 19:41:46 +0100
Subject: [PATCH 0563/1246] Changes hasMany.getAccessor to support order as
 string (closes #196)

Supports "-" prefix as descending order.
---
 lib/Associations/Many.js                      |  7 ++++
 ...est-association-hasmany-get-order-array.js | 39 +++++++++++++++++++
 .../test-association-hasmany-get-order.js     | 39 +++++++++++++++++++
 3 files changed, 85 insertions(+)
 create mode 100644 test/integration/test-association-hasmany-get-order-array.js
 create mode 100644 test/integration/test-association-hasmany-get-order.js

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 3c7e19ef..69f268e3 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -166,6 +166,13 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 							}
 						}
 						break;
+					case "string":
+						if (arguments[i][0] == "-") {
+							order = [ [ association.model.table, arguments[i].substr(1) ], "Z" ];
+						} else {
+							order = [ [ association.model.table, arguments[i] ] ];
+						}
+						break;
 					case "number":
 						options.limit = arguments[i];
 						break;
diff --git a/test/integration/test-association-hasmany-get-order-array.js b/test/integration/test-association-hasmany-get-order-array.js
new file mode 100644
index 00000000..39cc18c9
--- /dev/null
+++ b/test/integration/test-association-hasmany-get-order-array.js
@@ -0,0 +1,39 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_association_hasmany_get_order_array', db.driver.db, function () {
+		common.createModelAssocTable('test_association_hasmany_get_order_array', 'assocs', db.driver.db, function () {
+			common.insertModelData('test_association_hasmany_get_order_array', db.driver.db, [
+				{ id : 1, name : 'test1' },
+				{ id : 2, name : 'test2' },
+				{ id : 3, name : 'test3' }
+			], function (err) {
+				if (err) throw err;
+
+				common.insertModelAssocData('test_association_hasmany_get_order_array_assocs', db.driver.db, [
+					[ 1, 2 ],
+					[ 1, 3 ]
+				], function (err) {
+					if (err) throw err;
+
+					var TestModel = db.define('test_association_hasmany_get_order_array', common.getModelProperties());
+					TestModel.hasMany("assocs");
+
+					TestModel.get(1, function (err, Test1) {
+						assert.equal(err, null);
+
+						Test1.getAssocs([ "name" ], function (err, Tests) {
+							assert.equal(err, null);
+							assert.equal(Array.isArray(Tests), true);
+							assert.equal(Tests.length, 2);
+							assert.equal(Tests[0].name, 'test2');
+							assert.equal(Tests[1].name, 'test3');
+							db.close();
+						});
+					});
+				});
+			});
+		});
+	});
+});
diff --git a/test/integration/test-association-hasmany-get-order.js b/test/integration/test-association-hasmany-get-order.js
new file mode 100644
index 00000000..e7cca686
--- /dev/null
+++ b/test/integration/test-association-hasmany-get-order.js
@@ -0,0 +1,39 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_association_hasmany_get_order', db.driver.db, function () {
+		common.createModelAssocTable('test_association_hasmany_get_order', 'assocs', db.driver.db, function () {
+			common.insertModelData('test_association_hasmany_get_order', db.driver.db, [
+				{ id : 1, name : 'test1' },
+				{ id : 2, name : 'test2' },
+				{ id : 3, name : 'test3' }
+			], function (err) {
+				if (err) throw err;
+
+				common.insertModelAssocData('test_association_hasmany_get_order_assocs', db.driver.db, [
+					[ 1, 2 ],
+					[ 1, 3 ]
+				], function (err) {
+					if (err) throw err;
+
+					var TestModel = db.define('test_association_hasmany_get_order', common.getModelProperties());
+					TestModel.hasMany("assocs");
+
+					TestModel.get(1, function (err, Test1) {
+						assert.equal(err, null);
+
+						Test1.getAssocs("-name", function (err, Tests) {
+							assert.equal(err, null);
+							assert.equal(Array.isArray(Tests), true);
+							assert.equal(Tests.length, 2);
+							assert.equal(Tests[0].name, 'test3');
+							assert.equal(Tests[1].name, 'test2');
+							db.close();
+						});
+					});
+				});
+			});
+		});
+	});
+});

From c48c3aac7b197b8b69afa5a083f34f9a63c03786 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 2 Jul 2013 19:50:39 +0100
Subject: [PATCH 0564/1246] Copies code from saveInstance to saveInstanceExtra
 (#215)

This should be replicate the same property validation behaviour.
---
 lib/Instance.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index cfcaa9d7..6c76f653 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -254,7 +254,16 @@ function Instance(opts) {
 		var conditions = {};
 
 		for (var i = 0; i < opts.extrachanges.length; i++) {
-			data[opts.extrachanges[i]] = opts.data[opts.extrachanges[i]];
+			if (!opts.data.hasOwnProperty(opts.extrachanges[i])) continue;
+
+			if (opts.extra[opts.extrachanges[i]]) {
+				data[opts.extrachanges[i]] = Property.validate(opts.data[opts.extrachanges[i]], opts.extra[opts.extrachanges[i]]);
+				if (opts.driver.propertyToValue) {
+					data[opts.extrachanges[i]] = opts.driver.propertyToValue(data[opts.extrachanges[i]], opts.properties[opts.extrachanges[i]]);
+				}
+			} else {
+				data[opts.extrachanges[i]] = opts.data[opts.extrachanges[i]];
+			}
 		}
 
 		conditions[opts.extra_info.id_prop] = opts.extra_info.id;

From fa324220f9980572bddb91df692dfc54982ec713 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 3 Jul 2013 12:21:28 +1000
Subject: [PATCH 0565/1246] Place save-related hooks closer to the actioning
 code. Fix hook tests; Date.now() produced identical timestamps. Change
 parameters of Instance.validate callback. Add some Instance tests.

---
 lib/Instance.js               | 200 +++++++++++++++++-----------------
 test/integration2/hook.js     |  21 +++-
 test/integration2/instance.js | 127 +++++++++++++++++++++
 3 files changed, 245 insertions(+), 103 deletions(-)
 create mode 100644 test/integration2/instance.js

diff --git a/lib/Instance.js b/lib/Instance.js
index 6c76f653..e8e55be8 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -26,51 +26,64 @@ function Instance(opts) {
 	var handleValidations = function (cb) {
 		var pending = [], errors = [], required;
 
-		for (var k in opts.validations) {
-			if (opts.properties[k]) {
-				required = opts.properties[k].required;
-			} else {
-				for (var i = 0; i < opts.one_associations.length; i++) {
-					if (opts.one_associations[i].field == k) {
-						required = opts.one_associations[i].required;
-						break;
-					}
-				}
-			}
-			if (!required && instance[k] == null) {
-				continue; // avoid validating if property is not required and is "empty"
+		Hook.wait(instance, opts.hooks.beforeValidation, function (err) {
+			if (err) {
+				return saveError(cb, err);
 			}
-			for (var i = 0; i < opts.validations[k].length; i++) {
-				pending.push([ k, opts.validations[k][i] ]);
+
+			for (var k in opts.properties) {
+				if (!opts.properties.hasOwnProperty(k)) continue;
+				if (opts.data[k] == null && opts.properties[k].hasOwnProperty("defaultValue")) {
+					opts.data[k] = opts.properties[k].defaultValue;
+				}
 			}
-		}
-		var checkNextValidation = function () {
-			if (pending.length === 0) {
-				return cb(errors.length ? errors : null);
+
+			for (var k in opts.validations) {
+				if (opts.properties[k]) {
+					required = opts.properties[k].required;
+				} else {
+					for (var i = 0; i < opts.one_associations.length; i++) {
+						if (opts.one_associations[i].field == k) {
+							required = opts.one_associations[i].required;
+							break;
+						}
+					}
+				}
+				if (!required && instance[k] == null) {
+					continue; // avoid validating if property is not required and is "empty"
+				}
+				for (var i = 0; i < opts.validations[k].length; i++) {
+					pending.push([ k, opts.validations[k][i] ]);
+				}
 			}
+			var checkNextValidation = function () {
+				if (pending.length === 0) {
+					return cb(errors.length ? errors : null);
+				}
 
-			var validation = pending.shift();
+				var validation = pending.shift();
 
-			validation[1](instance[validation[0]], function (msg) {
-				if (msg) {
-					var err   = new Error(msg);
+				validation[1](instance[validation[0]], function (msg) {
+					if (msg) {
+						var err   = new Error(msg);
 
-					err.field = validation[0];
-					err.value = instance[validation[0]];
-					err.msg   = msg;
-					err.type  = "validation";
+						err.field = validation[0];
+						err.value = instance[validation[0]];
+						err.msg   = msg;
+						err.type  = "validation";
 
-					if (!opts.model.settings.get("instance.returnAllErrors")) {
-						return cb(err);
-					}
+						if (!opts.model.settings.get("instance.returnAllErrors")) {
+							return cb(err);
+						}
 
-					errors.push(err);
-				}
+						errors.push(err);
+					}
 
-				return checkNextValidation();
-			}, instance, opts.model, validation[0]);
-		};
-		return checkNextValidation();
+					return checkNextValidation();
+				}, instance, opts.model, validation[0]);
+			};
+			return checkNextValidation();
+		});
 	};
 	var saveError = function (cb, err) {
 		emitEvent("save", err, instance);
@@ -84,40 +97,32 @@ function Instance(opts) {
 			return saveInstanceExtra(cb);
 		}
 
-		Hook.wait(instance, opts.hooks.beforeValidation, function (err) {
+		handleValidations(function (err) {
 			if (err) {
 				return saveError(cb, err);
 			}
 
-			for (var k in opts.properties) {
-				if (!opts.properties.hasOwnProperty(k)) continue;
-				if (opts.data[k] == null && opts.properties[k].hasOwnProperty("defaultValue")) {
-					opts.data[k] = opts.properties[k].defaultValue;
+			var data = {};
+			for (var k in opts.data) {
+				if (!opts.data.hasOwnProperty(k)) continue;
+
+				if (opts.properties[k]) {
+					data[k] = Property.validate(opts.data[k], opts.properties[k]);
+					if (opts.driver.propertyToValue) {
+						data[k] = opts.driver.propertyToValue(data[k], opts.properties[k]);
+					}
+				} else {
+					data[k] = opts.data[k];
 				}
 			}
 
 			if (opts.is_new) {
-				return Hook.wait(instance, opts.hooks.beforeCreate, function (err) {
-					if (err) {
-						return saveError(cb, err);
-					}
-					Hook.wait(instance, opts.hooks.beforeSave, function (err) {
-						if (err) {
-							return saveError(cb, err);
-						}
-						return saveInstanceNext(cb, saveOptions);
-					});
-				});
+				return saveNew(cb, saveOptions, data);
+			} else {
+				return savePersisted(cb, saveOptions, data);
 			}
-			Hook.wait(instance, opts.hooks.beforeSave, function (err) {
-				if (err) {
-					return saveError(cb, err);
-				}
-				return saveInstanceNext(cb, saveOptions);
-			});
 		});
 	};
-
 	var afterSave = function (cb, create, err) {
 		emitEvent("save", err, instance);
 		if(create) {
@@ -129,30 +134,18 @@ function Instance(opts) {
 			saveInstanceExtra(cb);
 		}
 	};
+	var saveNew = function (cb, saveOptions, data) {
+		var next = afterSave.bind(this, cb, true);
 
-	var saveInstanceNext = function (cb, saveOptions) {
-		handleValidations(function (err) {
+		Hook.wait(instance, opts.hooks.beforeCreate, function (err) {
 			if (err) {
 				return saveError(cb, err);
 			}
-
-			var data = {};
-			for (var k in opts.data) {
-				if (!opts.data.hasOwnProperty(k)) continue;
-
-				if (opts.properties[k]) {
-					data[k] = Property.validate(opts.data[k], opts.properties[k]);
-					if (opts.driver.propertyToValue) {
-						data[k] = opts.driver.propertyToValue(data[k], opts.properties[k]);
-					}
-				} else {
-					data[k] = opts.data[k];
+			Hook.wait(instance, opts.hooks.beforeSave, function (err) {
+				if (err) {
+					return saveError(cb, err);
 				}
-			}
 
-			var next = afterSave.bind(this, cb, opts.is_new);
-
-			if (opts.is_new) {
 				opts.driver.insert(opts.table, data, opts.keys, function (save_err, info) {
 					if (save_err) {
 						return saveError(cb, save_err);
@@ -170,29 +163,38 @@ function Instance(opts) {
 						saveAssociations(next);
 					}
 				});
-			} else {
-				var changes = {}, conditions = {};
-				for (var i = 0; i < opts.changes.length; i++) {
-					changes[opts.changes[i]] = data[opts.changes[i]];
-				}
-				for (i = 0; i < opts.keys.length; i++) {
-					conditions[opts.keys[i]] = data[opts.keys[i]];
-				}
-
-				opts.driver.update(opts.table, changes, conditions, function (save_err) {
-					if (save_err) {
-						return saveError(cb, save_err);
-					}
+			});
+		});
+	};
+	var savePersisted = function (cb, saveOptions, data) {
+		var next = afterSave.bind(this, cb, false);
 
-					opts.changes.length = 0;
+		Hook.wait(instance, opts.hooks.beforeSave, function (err) {
+			if (err) {
+				return saveError(cb, err);
+			}
 
-					if(saveOptions.saveAssociations === false) {
-						next();
-					} else {
-						saveAssociations(next);
-					}
-				});
+			var changes = {}, conditions = {};
+			for (var i = 0; i < opts.changes.length; i++) {
+				changes[opts.changes[i]] = data[opts.changes[i]];
 			}
+			for (i = 0; i < opts.keys.length; i++) {
+				conditions[opts.keys[i]] = data[opts.keys[i]];
+			}
+
+			opts.driver.update(opts.table, changes, conditions, function (save_err) {
+				if (save_err) {
+					return saveError(cb, save_err);
+				}
+
+				opts.changes.length = 0;
+
+				if(saveOptions.saveAssociations === false) {
+					next();
+				} else {
+					saveAssociations(next);
+				}
+			});
 		});
 	};
 	var saveAssociations = function (cb) {
@@ -501,7 +503,9 @@ function Instance(opts) {
 	});
 	Object.defineProperty(instance, "validate", {
 		value: function (cb) {
-			handleValidations(cb);
+			handleValidations(function (errors) {
+				cb(null, errors || false);
+			});
 		},
 		enumerable: false
 	});
diff --git a/test/integration2/hook.js b/test/integration2/hook.js
index ef19d41d..610483f1 100644
--- a/test/integration2/hook.js
+++ b/test/integration2/hook.js
@@ -14,7 +14,7 @@ describe("Hook", function() {
 		triggeredHooks[hook] = false;
 
 		return function () {
-			triggeredHooks[hook] = Date.now();
+			triggeredHooks[hook] = parseFloat(process.hrtime().join('.'));
 		};
 	};
 
@@ -263,6 +263,7 @@ describe("Hook", function() {
 
 		describe("if hook method has 1 argument", function () {
 			var beforeValidation = false;
+			this.timeout(500);
 
 			before(setup({
 				beforeValidation : function (next) {
@@ -276,9 +277,11 @@ describe("Hook", function() {
 				}
 			}));
 
-			it("should wait for hook to finish", function (done) {
-				this.timeout(500);
+			beforeEach(function () {
+				beforeValidation = false;
+			});
 
+			it("should wait for hook to finish", function (done) {
 				Person.create([{ name: "John Doe" }], function () {
 					beforeValidation.should.be.true;
 
@@ -287,8 +290,6 @@ describe("Hook", function() {
 			});
 
 			it("should trigger error if hook passes an error", function (done) {
-				this.timeout(500);
-
 				Person.create([{ name: "" }], function (err) {
 					beforeValidation.should.be.true;
 
@@ -297,6 +298,16 @@ describe("Hook", function() {
 					return done();
 				});
 			});
+
+			it("should trigger when calling #validate", function (done) {
+				var person = new Person();
+
+				person.validate(function (err, validationErrors) {
+					beforeValidation.should.be.true;
+
+					return done();
+				});
+			});
 		});
 	});
 
diff --git a/test/integration2/instance.js b/test/integration2/instance.js
new file mode 100644
index 00000000..8e3e569e
--- /dev/null
+++ b/test/integration2/instance.js
@@ -0,0 +1,127 @@
+var should	 = require('should');
+var helper	 = require('../support/spec_helper');
+var ORM			= require('../../');
+
+describe("Model instance", function() {
+	var db = null;
+	var Person = null;
+
+	var setup = function () {
+		return function (done) {
+			db.settings.set('instance.returnAllErrors', true);
+
+			Person = db.define("person", {
+				name : String,
+				age  : { type: 'number', rational: false, required: false }
+			}, {
+				validations: {
+					age: ORM.validators.rangeNumber(0, 150)
+				}
+			});
+
+			return helper.dropSync(Person, function () {
+				Person.create([{
+					id	: 1,
+					name: "Jeremy Doe"
+				}, {
+					id	: 2,
+					name: "John Doe"
+				}, {
+					id	: 3,
+					name: "Jane Doe"
+				}], done);
+			});
+		};
+	};
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			setup()(function (err) {
+				return done();
+			});
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	describe("#isInstance", function () {
+		it("should always return true for instances", function (done) {
+			should.equal((new Person).isInstance, true);
+			should.equal((Person(4)).isInstance, true);
+			Person.get(2, function (err, item) {
+				should.not.exist(err);
+				should.equal(item.isInstance, true);
+				return done();
+			});
+		});
+
+		it("should be false for all other objects", function () {
+			should.notEqual({}.isInstance, true);
+			should.notEqual([].isInstance, true);
+		});
+	});
+
+	describe("#isPersisted", function () {
+		it("should return true for persisted instances", function (done) {
+			Person.get(2, function (err, item) {
+				should.not.exist(err);
+				should.equal(item.isPersisted(), true);
+				return done();
+			});
+		});
+
+		it("should return true for shell instances", function () {
+			should.equal(Person(4).isPersisted(), true);
+		});
+
+		it("should return false for new instances", function () {
+			should.equal((new Person).isPersisted(), false);
+		});
+	});
+
+	describe("#isShell", function () {
+		it("should return true for shell models", function () {
+			should.equal(Person(4).isShell(), true);
+		});
+
+		it("should return false for new models", function () {
+			should.equal((new Person).isShell(), false);
+		});
+
+		it("should return false for existing models", function (done) {
+			Person.get(2, function (err, item) {
+				should.not.exist(err);
+				should.equal(item.isShell(), false);
+				return done();
+			});
+		});
+	});
+
+	describe("#validate", function () {
+		it("should return validation errors if invalid", function (done) {
+			var person = new Person({ age: -1 });
+
+			person.validate(function (err, validationErrors) {
+				should.not.exist(err);
+				should.equal(Array.isArray(validationErrors), true);
+
+				return done();
+			});
+		});
+
+		it("should return false if valid", function (done) {
+			var person = new Person({ name: 'Janette' });
+
+			person.validate(function (err, validationErrors) {
+				should.not.exist(err);
+				should.equal(validationErrors, false);
+
+				return done();
+			});
+		});
+	});
+});

From ca6b9ffc8c1a8b1ac72face40525e41b2bdc9f3e Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 3 Jul 2013 13:10:21 +1000
Subject: [PATCH 0566/1246] Node 0.6 support

---
 test/integration2/hook.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/test/integration2/hook.js b/test/integration2/hook.js
index 610483f1..03155b05 100644
--- a/test/integration2/hook.js
+++ b/test/integration2/hook.js
@@ -7,14 +7,20 @@ var ORM      = require('../../');
 describe("Hook", function() {
 	var db = null;
 	var Person = null;
-
 	var triggeredHooks = {};
+	var getTimestamp; // Calling it 'getTime' causes strangeness.
+
+	if (process.hrtime) {
+		getTimestamp = function () { return parseFloat(process.hrtime().join('.')); };
+	} else {
+		getTimestamp = function () { return Date.now(); };
+	}
 
 	var checkHook = function (hook) {
 		triggeredHooks[hook] = false;
 
 		return function () {
-			triggeredHooks[hook] = parseFloat(process.hrtime().join('.'));
+			triggeredHooks[hook] = getTimestamp();
 		};
 	};
 

From 56ce9fb753207268e2a1418c412488d7e53e2a93 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 3 Jul 2013 13:11:29 +1000
Subject: [PATCH 0567/1246] Travis doesn't support nodejs 0.4

---
 .travis.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 01ced59c..2ea563e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,8 @@
 language: node_js
 node_js:
-  - 0.4
-  - 0.6
-  - 0.8
-  - 0.10
+  - '0.6'
+  - '0.8'
+  - '0.10'
 before_script:
   - mysql -e 'create database orm_test;'
   - psql -c 'create database orm_test;' -U postgres

From 235209ba00e4449e5f573c79ba910d2c025b858b Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Jul 2013 11:54:53 +0100
Subject: [PATCH 0568/1246] Fixes previous copy from saveInstance to
 saveInstanceExtra (#215)

---
 lib/Instance.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 6c76f653..6853de71 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -259,7 +259,7 @@ function Instance(opts) {
 			if (opts.extra[opts.extrachanges[i]]) {
 				data[opts.extrachanges[i]] = Property.validate(opts.data[opts.extrachanges[i]], opts.extra[opts.extrachanges[i]]);
 				if (opts.driver.propertyToValue) {
-					data[opts.extrachanges[i]] = opts.driver.propertyToValue(data[opts.extrachanges[i]], opts.properties[opts.extrachanges[i]]);
+					data[opts.extrachanges[i]] = opts.driver.propertyToValue(data[opts.extrachanges[i]], opts.extra[opts.extrachanges[i]]);
 				}
 			} else {
 				data[opts.extrachanges[i]] = opts.data[opts.extrachanges[i]];

From 23850f9c54cd8219f7a243e0dfbc7bc0907a8948 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Jul 2013 11:55:11 +0100
Subject: [PATCH 0569/1246] Adds db.drop() - similar to db.sync()

---
 lib/ORM.js | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/lib/ORM.js b/lib/ORM.js
index 915d60bc..6b3b76a9 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -270,6 +270,34 @@ ORM.prototype.sync = function (cb) {
 
 	return this;
 };
+ORM.prototype.drop = function (cb) {
+	var modelIds = Object.keys(this.models);
+	var dropNext = function () {
+		if (modelIds.length === 0) {
+			return cb();
+		}
+
+		var modelId = modelIds.shift();
+
+		this.models[modelId].drop(function (err) {
+			if (err) {
+				err.model = modelId;
+
+				return cb(err);
+			}
+
+			return dropNext();
+		});
+	}.bind(this);
+
+	if (arguments.length === 0) {
+		cb = function () {};
+	}
+
+	dropNext();
+
+	return this;
+};
 ORM.prototype.serial = function () {
 	var chains = Array.prototype.slice.apply(arguments);
 

From 2dfbc451b15ae60edd05ee3c3b7402c4032fb41a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Jul 2013 15:50:34 +0100
Subject: [PATCH 0570/1246] Adds ErrorCodes.NOT_DEFINED

---
 lib/ErrorCodes.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/ErrorCodes.js b/lib/ErrorCodes.js
index dfec6fbf..a96781a3 100644
--- a/lib/ErrorCodes.js
+++ b/lib/ErrorCodes.js
@@ -1,8 +1,9 @@
 exports.QUERY_ERROR      = 1;
 exports.NOT_FOUND        = 2;
-exports.NO_SUPPORT       = 3;
-exports.MISSING_CALLBACK = 4;
-exports.PARAM_MISSMATCH  = 5;
+exports.NOT_DEFINED      = 3;
+exports.NO_SUPPORT       = 4;
+exports.MISSING_CALLBACK = 5;
+exports.PARAM_MISSMATCH  = 6;
 
 exports.CONNECTION_LOST  = 10;
 

From 5d1e9084ad9946c21234a7a10d494fb45b869a64 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Jul 2013 15:51:08 +0100
Subject: [PATCH 0571/1246] Avoids redefining properties in instances

This happens for models without id property and with one or more keys.
This is kind of a workaround for now.
---
 lib/Instance.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Instance.js b/lib/Instance.js
index 6853de71..669a4250 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -339,6 +339,8 @@ function Instance(opts) {
 		});
 	};
 	var addInstanceProperty = function (key) {
+		if (instance.hasOwnProperty(key)) return;
+
 		Object.defineProperty(instance, key, {
 			get: function () {
 				return opts.data[key];

From 53523e418cd2f39de99230830c06e307a2cf6abe Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Jul 2013 15:51:29 +0100
Subject: [PATCH 0572/1246] Passes orm connection to every defined model

---
 lib/ORM.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/ORM.js b/lib/ORM.js
index 6b3b76a9..d757cdb4 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -180,6 +180,7 @@ ORM.prototype.define = function (name, properties, opts) {
 	opts       = opts || {};
 
 	this.models[name] = new Model({
+		db             : this,
 		settings       : this.settings,
 		driver_name    : this.driver_name,
 		driver         : this.driver,

From 065fb56fb9db1a3b16df35aa1619498be5fc8895 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Jul 2013 15:52:31 +0100
Subject: [PATCH 0573/1246] Adds initial Model.extendsTo(name, properties[,
 opts])

This was an initial copy from Model.hasOne.
.has*, .get* and .set* should be correctly working now
---
 lib/Associations/Extend.js | 113 +++++++++++++++++++++++++++++++++++++
 lib/Model.js               |  57 +++++++++++--------
 2 files changed, 147 insertions(+), 23 deletions(-)
 create mode 100644 lib/Associations/Extend.js

diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
new file mode 100644
index 00000000..07886f99
--- /dev/null
+++ b/lib/Associations/Extend.js
@@ -0,0 +1,113 @@
+var Settings = require("../Settings");
+
+exports.prepare = function (db, Model, associations, association_properties, model_fields) {
+	Model.extendsTo = function (name, properties, opts) {
+		opts = opts || {};
+
+		var assocName = opts.name || ucfirst(name);
+		var association = {
+			name           : name,
+			reversed       : opts.reversed,
+			autoFetch      : opts.autoFetch || false,
+			autoFetchLimit : opts.autoFetchLimit || 2,
+			field          : opts.field || Model.settings.get("properties.association_key").replace("{name}", Model.table),
+			getAccessor    : opts.getAccessor || ("get" + assocName),
+			setAccessor    : opts.setAccessor || ("set" + assocName),
+			hasAccessor    : opts.hasAccessor || ("has" + assocName),
+			delAccessor    : opts.delAccessor || ("remove" + assocName)
+		};
+
+		association.model = db.define(Model.table + "_" + name, properties, {
+			id   : null,
+			keys : [ association.field ]
+		});
+		association.model.hasOne(Model.table, Model);
+
+		associations.push(association);
+
+		return association.model;
+	};
+};
+
+exports.extend = function (Model, Instance, Driver, associations, opts, cb) {
+	if (associations.length === 0) {
+		return cb();
+	}
+
+	var pending = associations.length;
+	var extendDone = function extendDone() {
+		pending -= 1;
+
+		if (pending === 0) {
+			return cb();
+		}
+	};
+
+	for (var i = 0; i < associations.length; i++) {
+		extendInstance(Model, Instance, Driver, associations[i], opts, extendDone);
+	}
+};
+
+function extendInstance(Model, Instance, Driver, association, opts, cb) {
+	Object.defineProperty(Instance, association.hasAccessor, {
+		value : function (cb) {
+			if (!Instance[Model.id]) {
+				cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension"));
+			} else {
+				association.model.get(Instance[Model.id], function (err, extension) {
+					return cb(err, !err && extension ? true : false);
+				});
+			}
+			return this;
+		},
+		enumerable : false
+	});
+	Object.defineProperty(Instance, association.getAccessor, {
+		value : function (cb) {
+			if (!Instance[Model.id]) {
+				cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension"));
+			} else {
+				association.model.get(Instance[Model.id], cb);
+			}
+			return this;
+		},
+		enumerable : false
+	});
+	Object.defineProperty(Instance, association.setAccessor, {
+		value : function (Extension, cb) {
+			Instance.save(function (err) {
+				if (err) {
+					return cb(err);
+				}
+
+				var conditions = {};
+				conditions[association.field] = Instance[Model.id];
+
+				association.model.find(conditions, function (err, extensions) {
+					if (err) {
+						return cb(err);
+					}
+
+					var pending = extensions.length;
+
+					for (var i = 0; i < extensions.length; i++) {
+						extensions[i].remove(function () {
+							if (--pending === 0) {
+								Extension[association.field] = Instance[Model.id];
+								Extension.save(cb);
+							}
+						});
+					}
+				});
+			});
+			return this;
+		},
+		enumerable : false
+	});
+
+	return cb();
+}
+
+function ucfirst(text) {
+	return text[0].toUpperCase() + text.substr(1);
+}
diff --git a/lib/Model.js b/lib/Model.js
index c495918b..76a59229 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -1,29 +1,31 @@
-var ChainFind       = require("./ChainFind");
-var Instance        = require("./Instance").Instance;
-var LazyLoad        = require("./LazyLoad");
-var ManyAssociation = require("./Associations/Many");
-var OneAssociation  = require("./Associations/One");
-var Property        = require("./Property");
-var Singleton       = require("./Singleton");
-var Utilities       = require("./Utilities");
-var Validators      = require("./Validators");
-var ErrorCodes      = require("./ErrorCodes");
+var ChainFind         = require("./ChainFind");
+var Instance          = require("./Instance").Instance;
+var LazyLoad          = require("./LazyLoad");
+var ManyAssociation   = require("./Associations/Many");
+var OneAssociation    = require("./Associations/One");
+var ExtendAssociation = require("./Associations/Extend");
+var Property          = require("./Property");
+var Singleton         = require("./Singleton");
+var Utilities         = require("./Utilities");
+var Validators        = require("./Validators");
+var ErrorCodes        = require("./ErrorCodes");
 
 exports.Model = Model;
 
 function Model(opts) {
 	opts = opts || {};
 
-	if (!Array.isArray(opts.keys) || opts.keys.length < 2) {
+	if (!Array.isArray(opts.keys) || !opts.keys.length) {
 		opts.keys = [ opts.id ];
 	} else {
 		opts.id = null;
 	}
 
-	var one_associations = [];
-	var many_associations = [];
+	var one_associations       = [];
+	var many_associations      = [];
+	var extend_associations    = [];
 	var association_properties = [];
-	var model_fields = [];
+	var model_fields           = [];
 
 	for (var i = 0; i < opts.keys.length; i++) {
 		model_fields.push(opts.keys[i]);
@@ -81,6 +83,7 @@ function Model(opts) {
 			validations            : opts.validations,
 			one_associations       : one_associations,
 			many_associations      : many_associations,
+			extend_associations    : extend_associations,
 			association_properties : association_properties
 		});
 		if (model_fields !== null) {
@@ -96,9 +99,15 @@ function Model(opts) {
 				autoFetchLimit : inst_opts.autoFetchLimit,
 				cascadeRemove  : inst_opts.cascadeRemove
 			}, function () {
-				if (typeof cb == "function") {
-					return cb(instance);
-				}
+				ExtendAssociation.extend(model, instance, opts.driver, extend_associations, {
+					autoFetch      : inst_opts.autoFetch || false,
+					autoFetchLimit : inst_opts.autoFetchLimit,
+					cascadeRemove  : inst_opts.cascadeRemove
+				}, function () {
+					if (typeof cb == "function") {
+						return cb(instance);
+					}
+				});
 			});
 		});
 		return instance;
@@ -171,12 +180,13 @@ function Model(opts) {
 		}
 		if (typeof opts.driver.sync == "function") {
 			opts.driver.sync({
-				keys              : opts.keys,
-				table             : opts.table,
-				properties        : opts.properties,
-				indexes           : opts.indexes || [],
-				one_associations  : one_associations,
-				many_associations : many_associations
+				keys                : opts.keys,
+				table               : opts.table,
+				properties          : opts.properties,
+				indexes             : opts.indexes || [],
+				one_associations    : one_associations,
+				many_associations   : many_associations,
+				extend_associations : extend_associations
 			}, cb);
 
 			return this;
@@ -543,6 +553,7 @@ function Model(opts) {
 
 	OneAssociation.prepare(model, one_associations, association_properties, model_fields);
 	ManyAssociation.prepare(model, many_associations);
+	ExtendAssociation.prepare(opts.db, model, extend_associations);
 
 	return model;
 }

From a0c8e86843d525072dc1074f5f711ff580b64640 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Jul 2013 15:58:41 +0100
Subject: [PATCH 0574/1246] Adds extendsTo.delAccessor, changes setAccessor to
 take advantage of the delAccessor

---
 lib/Associations/Extend.js | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index 07886f99..4765e474 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -1,4 +1,5 @@
-var Settings = require("../Settings");
+var ErrorCodes = require("../ErrorCodes");
+var Settings   = require("../Settings");
 
 exports.prepare = function (db, Model, associations, association_properties, model_fields) {
 	Model.extendsTo = function (name, properties, opts) {
@@ -80,6 +81,24 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 					return cb(err);
 				}
 
+				Instance[association.delAccessor](function (err) {
+					if (err) {
+						return cb(err);
+					}
+
+					Extension[association.field] = Instance[Model.id];
+					Extension.save(cb);
+				});
+			});
+			return this;
+		},
+		enumerable : false
+	});
+	Object.defineProperty(Instance, association.delAccessor, {
+		value : function (cb) {
+			if (!Instance[Model.id]) {
+				cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension"));
+			} else {
 				var conditions = {};
 				conditions[association.field] = Instance[Model.id];
 
@@ -93,13 +112,12 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 					for (var i = 0; i < extensions.length; i++) {
 						extensions[i].remove(function () {
 							if (--pending === 0) {
-								Extension[association.field] = Instance[Model.id];
-								Extension.save(cb);
+								return cb();
 							}
 						});
 					}
 				});
-			});
+			}
 			return this;
 		},
 		enumerable : false

From 7a9b766aca48ee98fdb8f34e92335c3e3ea78485 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Jul 2013 16:11:32 +0100
Subject: [PATCH 0575/1246] Lints some missing empty lines to Readme.md, adds
 initial extendsTo documentation

---
 Readme.md | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 8827b730..4e046833 100755
--- a/Readme.md
+++ b/Readme.md
@@ -601,7 +601,9 @@ var Person = db.define('person', {
 	cache   : false
 });
 ```
+
 and also globally:
+
 ```js
 orm.connect('...', function(err, db) {
   db.settings.set('instance.cache', false);
@@ -741,6 +743,7 @@ orm.connect("....", function (err, db) {
 An association is a relation between one or more tables.
 
 ### hasOne
+
 Is a **many to one** relationship. It's the same as **belongs to.**<br/>
 Eg: `Animal.hasOne('owner', Person)`.<br/>
 Animal can only have one owner, but Person can have many animals.<br/>
@@ -755,17 +758,20 @@ animal.removeOwner()                // Sets owner_id to 0
 ```
 
 **Reverse access**
+
 ```js
 Animal.hasOne('owner', Person, {reverse: 'pets'})
 ```
+
 will add the following:
+
 ```js
 person.getPets(function..)
 person.setPets(cat, function..)
 ```
 
-
 ### hasMany
+
 Is a **many to many** relationship (includes join table).<br/>
 Eg: `Patient.hasMany('doctors', Doctor, { why: String }, { reverse: 'patients' })`.<br/>
 Patient can have many different doctors. Each doctor can have many different patients.
@@ -779,6 +785,7 @@ This will create a join table `patient_doctors` when you call `Patient.sync()`:
  why         | varchar(255)
 
 The following functions will be available:
+
 ```js
 patient.getDoctors(function..)           // List of doctors
 patient.addDoctors(docs, function...)    // Adds entries to join table
@@ -791,11 +798,32 @@ etc...
 ```
 
 To associate a doctor to a patient:
+
 ```js
 patient.addDoctor(surgeon, {why: "remove appendix"}, function(err) { ... } )
 ```
+
 which will add `{patient_id: 4, doctor_id: 6, why: "remove appendix"}` to the join table.
 
+### extendsTo
+
+If you want to split maybe optional properties into different tables or collections. Every extension will be in a new table,
+where the unique identifier of each row is the main model instance id. For example:
+
+```js
+var Person = db.define("person", {
+    name : String
+});
+var PersonAddress = Person.extendsTo("address", {
+    street : String,
+    number : Number
+});
+```
+
+This will create a table `person` with columns `id` and `name`. The extension will create a table `person_address` with
+columns `person_id`, `street` and `number`. The methods available in the `Person` model are similar to an `hasOne`
+association. In this example you would be able to call `.getAddress(cb)`, `.setAddress(Address, cb)`, ..
+
 ### Examples & options
 
 If you have a relation of 1 to n, you should use `hasOne` (belongs to) association.

From 0b6155da3e378a5a6d594b0ed95f7d927e9f84ed Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Jul 2013 16:50:51 +0100
Subject: [PATCH 0576/1246] Passes 'extension' information to hasOne
 associations

An extension model has a hasOne association to the initial model, but
there's actually no association (avoids duplicating column
association_id)
---
 lib/Associations/One.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index 9eb71744..98038807 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -12,7 +12,8 @@ exports.prepare = function (Model, associations, association_properties, model_f
 		var association = {
 			name           : name,
 			model          : OtherModel || Model,
-			reversed       : opts.reversed,
+			reversed       : opts.reversed || false,
+			extension      : opts.extension || false,
 			autoFetch      : opts.autoFetch || false,
 			autoFetchLimit : opts.autoFetchLimit || 2,
 			field          : opts.field || Model.settings.get("properties.association_key").replace("{name}", name),

From d50480c3043de03f85a80a93cb11a67405108c4e Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Jul 2013 16:52:21 +0100
Subject: [PATCH 0577/1246] Uses extension option to know when a model is an
 extension

Also in this commit:
- passes singleton uid to instance
- previous addInstanceProperty workaround is now deprecated
- exposes singleton uid in instance
---
 lib/Instance.js | 10 ++++++++--
 lib/Model.js    | 11 +++++++++--
 lib/ORM.js      |  1 +
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 669a4250..254eaba0 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -339,7 +339,7 @@ function Instance(opts) {
 		});
 	};
 	var addInstanceProperty = function (key) {
-		if (instance.hasOwnProperty(key)) return;
+		// if (instance.hasOwnProperty(key)) return;
 
 		Object.defineProperty(instance, key, {
 			get: function () {
@@ -507,6 +507,12 @@ function Instance(opts) {
 		},
 		enumerable: false
 	});
+	Object.defineProperty(instance, "__singleton_uid", {
+		value: function (cb) {
+			return opts.uid;
+		},
+		enumerable: false
+	});
 
 	for (var i = 0; i < opts.keys.length; i++) {
 		if (!opts.data.hasOwnProperty(opts.keys[i])) {
@@ -517,7 +523,7 @@ function Instance(opts) {
 	for (i = 0; i < opts.one_associations.length; i++) {
 		var asc = opts.one_associations[i]
 
-		if (!asc.reversed && !opts.data.hasOwnProperty(asc.field)) {
+		if (!asc.reversed && !asc.extension && !opts.data.hasOwnProperty(asc.field)) {
 			addInstanceProperty(asc.field);
 		}
 		if (opts.data.hasOwnProperty(asc.name)) {
diff --git a/lib/Model.js b/lib/Model.js
index 76a59229..b6756dba 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -15,7 +15,7 @@ exports.Model = Model;
 function Model(opts) {
 	opts = opts || {};
 
-	if (!Array.isArray(opts.keys) || !opts.keys.length) {
+	if ((!Array.isArray(opts.keys) || opts.keys.length < 2) && !opts.extension) {
 		opts.keys = [ opts.id ];
 	} else {
 		opts.id = null;
@@ -66,6 +66,7 @@ function Model(opts) {
 		}
 
 		var instance = new Instance({
+			uid                    : inst_opts.uid, // singleton unique id
 			id                     : opts.id,
 			keys                   : opts.keys,
 			is_new                 : inst_opts.is_new || false,
@@ -180,6 +181,7 @@ function Model(opts) {
 		}
 		if (typeof opts.driver.sync == "function") {
 			opts.driver.sync({
+				extension           : opts.extension,
 				keys                : opts.keys,
 				table               : opts.table,
 				properties          : opts.properties,
@@ -235,11 +237,15 @@ function Model(opts) {
 			if (data.length === 0) {
 				return cb(ErrorCodes.generateError(ErrorCodes.NOT_FOUND, "Not found"));
 			}
-			Singleton.get(opts.driver.uid + "/" + opts.table + "/" + ids.join("/"), {
+
+			var uid = opts.driver.uid + "/" + opts.table + "/" + ids.join("/");
+
+			Singleton.get(uid, {
 				cache      : (options.hasOwnProperty("cache") ? options.cache : opts.cache),
 				save_check : opts.settings.get("instance.cacheSaveCheck")
 			}, function (cb) {
 				return createInstance(data[0], {
+					uid            : uid,
 					autoSave       : opts.autoSave,
 					autoFetch      : (options.autoFetchLimit === 0 ? false : opts.autoFetch),
 					autoFetchLimit : options.autoFetchLimit,
@@ -340,6 +346,7 @@ function Model(opts) {
 					save_check : opts.settings.get("instance.cacheSaveCheck")
 				}, function (cb) {
 					return createInstance(data, {
+						uid            : uid,
 						autoSave       : opts.autoSave,
 						autoFetch      : (options.autoFetchLimit === 0 ? false : (options.autoFetch || opts.autoFetch)),
 						autoFetchLimit : options.autoFetchLimit,
diff --git a/lib/ORM.js b/lib/ORM.js
index d757cdb4..cf1bf68a 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -186,6 +186,7 @@ ORM.prototype.define = function (name, properties, opts) {
 		driver         : this.driver,
 		table          : opts.table || opts.collection || ((this.settings.get("model.namePrefix") || "") + name),
 		properties     : properties,
+		extension      : opts.extension || false,
 		indexes        : opts.indexes || [],
 		cache          : opts.hasOwnProperty("cache") ? opts.cache : this.settings.get("instance.cache"),
 		id             : opts.id || this.settings.get("properties.primary_key"),

From d7146dd024eca2ab0232bf8f340430a01f0c59be Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Jul 2013 16:52:53 +0100
Subject: [PATCH 0578/1246] Updates Model.extendsTo to clear singleton cache
 when removing an extension (because of readding)

---
 lib/Associations/Extend.js | 13 ++++++++++---
 lib/Singleton.js           |  9 +++++++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index 4765e474..d8e4e378 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -1,5 +1,6 @@
 var ErrorCodes = require("../ErrorCodes");
 var Settings   = require("../Settings");
+var Singleton  = require("../Singleton");
 
 exports.prepare = function (db, Model, associations, association_properties, model_fields) {
 	Model.extendsTo = function (name, properties, opts) {
@@ -19,10 +20,11 @@ exports.prepare = function (db, Model, associations, association_properties, mod
 		};
 
 		association.model = db.define(Model.table + "_" + name, properties, {
-			id   : null,
-			keys : [ association.field ]
+			id        : null,
+			keys      : [ association.field ],
+			extension : true
 		});
-		association.model.hasOne(Model.table, Model);
+		association.model.hasOne(Model.table, Model, { extension: true });
 
 		associations.push(association);
 
@@ -110,12 +112,17 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 					var pending = extensions.length;
 
 					for (var i = 0; i < extensions.length; i++) {
+						Singleton.clear(extensions[i].__singleton_uid());
 						extensions[i].remove(function () {
 							if (--pending === 0) {
 								return cb();
 							}
 						});
 					}
+
+					if (pending === 0) {
+						return cb();
+					}
 				});
 			}
 			return this;
diff --git a/lib/Singleton.js b/lib/Singleton.js
index 59bbf879..e754483c 100644
--- a/lib/Singleton.js
+++ b/lib/Singleton.js
@@ -1,7 +1,12 @@
 var map = {};
 
-exports.clear = function () {
-	map = {};
+exports.clear = function (key) {
+	if (typeof key == "string") {
+		delete map[key];
+	} else {
+		map = {};
+	}
+	return this;
 };
 
 exports.get = function (key, opts, createCb, returnCb) {

From af37341e1e98fcfa2b375eae796818aa1b328de5 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Jul 2013 16:53:13 +0100
Subject: [PATCH 0579/1246] Updates drivers DDL to support extension tables

---
 lib/Drivers/DDL/mysql.js    | 4 +++-
 lib/Drivers/DDL/postgres.js | 4 +++-
 lib/Drivers/DDL/sqlite.js   | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index 6a3a8d08..8ad94218 100755
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -46,7 +46,7 @@ exports.sync = function (driver, opts, cb) {
 	for (i = 0; i < keys.length; i++) {
 		definitions.push(keys[i] + " INT(11) UNSIGNED NOT NULL");
 	}
-	if (opts.keys.length == 1) {
+	if (opts.keys.length == 1 && !opts.extension) {
 		definitions[definitions.length - 1] += " AUTO_INCREMENT";
 	}
 
@@ -55,6 +55,7 @@ exports.sync = function (driver, opts, cb) {
 	}
 
 	for (i = 0; i < opts.one_associations.length; i++) {
+		if (opts.one_associations[i].extension) continue;
 		if (opts.one_associations[i].reversed) continue;
 		definitions.push(
 			driver.query.escapeId(opts.one_associations[i].field) + " INT(11) UNSIGNED" +
@@ -70,6 +71,7 @@ exports.sync = function (driver, opts, cb) {
 		}
 	}
 	for (i = 0; i < opts.one_associations.length; i++) {
+		if (opts.one_associations[i].extension) continue;
 		if (opts.one_associations[i].reversed) continue;
 		definitions.push("INDEX (" + driver.query.escapeId(opts.one_associations[i].field) + ")");
 	}
diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index 4078ee17..6e41e282 100755
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -35,7 +35,7 @@ exports.sync = function (driver, opts, cb) {
 	for (i = 0; i < keys.length; i++) {
 		definitions.push(keys[i] + " INTEGER NOT NULL");
 	}
-	if (opts.keys.length == 1) {
+	if (opts.keys.length == 1 && !opts.extension) {
 		definitions[definitions.length - 1] = keys[0] + " SERIAL";
 	}
 
@@ -51,6 +51,7 @@ exports.sync = function (driver, opts, cb) {
 	}
 
 	for (i = 0; i < opts.one_associations.length; i++) {
+		if (opts.one_associations[i].extension) continue;
 		if (opts.one_associations[i].reversed) continue;
 		definitions.push(
 			driver.query.escapeId(opts.one_associations[i].field) + " INTEGER" +
@@ -77,6 +78,7 @@ exports.sync = function (driver, opts, cb) {
 	});
 
 	for (i = 0; i < opts.one_associations.length; i++) {
+		if (opts.one_associations[i].extension) continue;
 		if (opts.one_associations[i].reversed) continue;
 		tables[tables.length - 1].subqueries.push(
 			"CREATE INDEX ON " + driver.query.escapeId(opts.table) +
diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index d0c1ae94..dd6c4046 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -33,7 +33,7 @@ exports.sync = function (driver, opts, cb) {
 	for (i = 0; i < keys.length; i++) {
 		definitions.push(keys[i] + " INTEGER UNSIGNED NOT NULL");
 	}
-	if (opts.keys.length == 1) {
+	if (opts.keys.length == 1 && !opts.extension) {
 		definitions[definitions.length - 1] = keys[0] + " INTEGER PRIMARY KEY AUTOINCREMENT";
 	}
 
@@ -42,6 +42,7 @@ exports.sync = function (driver, opts, cb) {
 	}
 
 	for (i = 0; i < opts.one_associations.length; i++) {
+		if (opts.one_associations[i].extension) continue;
 		if (opts.one_associations[i].reversed) continue;
 		definitions.push(
 			driver.query.escapeId(opts.one_associations[i].field) + " INTEGER UNSIGNED" +
@@ -74,6 +75,7 @@ exports.sync = function (driver, opts, cb) {
 	}
 
 	for (i = 0; i < opts.one_associations.length; i++) {
+		if (opts.one_associations[i].extension) continue;
 		if (opts.one_associations[i].reversed) continue;
 		queries.push(
 			"CREATE INDEX IF NOT EXISTS " + driver.query.escapeId(opts.table + "_" + opts.one_associations[i].field) +

From ac90d07002aa12b3c4ad31041e78ba2bea99f099 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Jul 2013 16:54:10 +0100
Subject: [PATCH 0580/1246] Adds initial Model.extendsTo tests

---
 test/integration2/association-extend.js | 147 ++++++++++++++++++++++++
 1 file changed, 147 insertions(+)
 create mode 100644 test/integration2/association-extend.js

diff --git a/test/integration2/association-extend.js b/test/integration2/association-extend.js
new file mode 100644
index 00000000..6330e3cd
--- /dev/null
+++ b/test/integration2/association-extend.js
@@ -0,0 +1,147 @@
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var ORM      = require('../../');
+
+describe("Model.extendsTo()", function() {
+	var db = null;
+	var Person = null;
+	var PersonAddress = null;
+
+	var setup = function () {
+		return function (done) {
+			Person = db.define("person", {
+				name   : String
+			});
+			PersonAddress = Person.extendsTo("address", {
+				street : String,
+				number : Number
+			});
+
+			ORM.singleton.clear();
+
+			return helper.dropSync([ Person, PersonAddress ], function () {
+				Person.create({
+					name: "John Doe"
+				}, function (err, person) {
+					return person.setAddress(new PersonAddress({
+						street : "Liberty",
+						number : 123
+					}), done);
+				});
+			});
+		};
+	};
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			return done();
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	describe("when calling getAccessor", function () {
+		before(setup());
+
+		it("should return extension if found", function (done) {
+			Person.get(1, function (err, John) {
+				should.equal(err, null);
+
+				John.getAddress(function (err, Address) {
+					should.equal(err, null);
+					Address.should.be.a("object");
+					Address.should.have.property("street", "Liberty");
+
+					return done();
+				});
+			});
+		});
+
+		it("should return error if not found", function (done) {
+			Person.get(1, function (err, John) {
+				should.equal(err, null);
+
+				John.removeAddress(function () {
+					John.getAddress(function (err, Address) {
+						err.should.be.a("object");
+						err.should.have.property("code", ORM.ErrorCodes.NOT_FOUND);
+
+						return done();
+					});
+				});
+			});
+		});
+	});
+
+	describe("when calling setAccessor", function () {
+		before(setup());
+
+		it("should remove any previous extension", function (done) {
+			Person.get(1, function (err, John) {
+				should.equal(err, null);
+
+				PersonAddress.find({ number: 123 }).count(function (err, c) {
+					should.equal(err, null);
+					c.should.equal(1);
+
+					var addr = new PersonAddress({
+						street : "4th Ave",
+						number : 4
+					});
+
+					John.setAddress(addr, function (err) {
+						should.equal(err, null);
+
+						John.getAddress(function (err, Address) {
+							should.equal(err, null);
+							Address.should.be.a("object");
+							Address.should.have.property("street", addr.street);
+
+							PersonAddress.find({ number: 123 }).count(function (err, c) {
+								should.equal(err, null);
+								c.should.equal(0);
+
+								return done();
+							});
+						});
+					});
+				});
+			});
+		});
+	});
+
+	describe("when calling delAccessor", function () {
+		before(setup());
+
+		it("should remove any extension", function (done) {
+			Person.get(1, function (err, John) {
+				should.equal(err, null);
+
+				PersonAddress.find({ number: 123 }).count(function (err, c) {
+					should.equal(err, null);
+					c.should.equal(1);
+
+					var addr = new PersonAddress({
+						street : "4th Ave",
+						number : 4
+					});
+
+					John.removeAddress(function (err) {
+						should.equal(err, null);
+
+						PersonAddress.find({ number: 123 }).count(function (err, c) {
+							should.equal(err, null);
+							c.should.equal(0);
+
+							return done();
+						});
+					});
+				});
+			});
+		});
+	});
+});

From 3385c154ec52eb0133ad9ee266d999a6d897e338 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Jul 2013 18:45:14 +0100
Subject: [PATCH 0581/1246] Adds more tests to Model.extendsTo

Improves code coverage on Association/Extend.js
---
 test/integration2/association-extend.js | 68 +++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/test/integration2/association-extend.js b/test/integration2/association-extend.js
index 6330e3cd..16dbb306 100644
--- a/test/integration2/association-extend.js
+++ b/test/integration2/association-extend.js
@@ -44,6 +44,50 @@ describe("Model.extendsTo()", function() {
 		return db.close();
 	});
 
+	describe("when calling hasAccessor", function () {
+		before(setup());
+
+		it("should return true if found", function (done) {
+			Person.get(1, function (err, John) {
+				should.equal(err, null);
+
+				John.hasAddress(function (err, hasAddress) {
+					should.equal(err, null);
+					hasAddress.should.equal(true);
+
+					return done();
+				});
+			});
+		});
+
+		it("should return false if not found", function (done) {
+			Person.get(1, function (err, John) {
+				should.equal(err, null);
+
+				John.removeAddress(function () {
+					John.hasAddress(function (err, hasAddress) {
+						err.should.be.a("object");
+						hasAddress.should.equal(false);
+
+						return done();
+					});
+				});
+			});
+		});
+
+		it("should return error if instance not with an ID", function (done) {
+			var Jane = new Person({
+				name: "Jane"
+			});
+			Jane.hasAddress(function (err, hasAddress) {
+				err.should.be.a("object");
+				err.should.have.property("code", ORM.ErrorCodes.NOT_DEFINED);
+
+				return done();
+			});
+		});
+	});
+
 	describe("when calling getAccessor", function () {
 		before(setup());
 
@@ -75,6 +119,18 @@ describe("Model.extendsTo()", function() {
 				});
 			});
 		});
+
+		it("should return error if instance not with an ID", function (done) {
+			var Jane = new Person({
+				name: "Jane"
+			});
+			Jane.getAddress(function (err, Address) {
+				err.should.be.a("object");
+				err.should.have.property("code", ORM.ErrorCodes.NOT_DEFINED);
+
+				return done();
+			});
+		});
 	});
 
 	describe("when calling setAccessor", function () {
@@ -143,5 +199,17 @@ describe("Model.extendsTo()", function() {
 				});
 			});
 		});
+
+		it("should return error if instance not with an ID", function (done) {
+			var Jane = new Person({
+				name: "Jane"
+			});
+			Jane.removeAddress(function (err) {
+				err.should.be.a("object");
+				err.should.have.property("code", ORM.ErrorCodes.NOT_DEFINED);
+
+				return done();
+			});
+		});
 	});
 });

From 96ae4301f395a9f3716a05696a202b5a72ff883d Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Jul 2013 18:56:00 +0100
Subject: [PATCH 0582/1246] Adds note to Model.extendTo documentation

---
 Readme.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Readme.md b/Readme.md
index 4e046833..4866b1ff 100755
--- a/Readme.md
+++ b/Readme.md
@@ -824,6 +824,10 @@ This will create a table `person` with columns `id` and `name`. The extension wi
 columns `person_id`, `street` and `number`. The methods available in the `Person` model are similar to an `hasOne`
 association. In this example you would be able to call `.getAddress(cb)`, `.setAddress(Address, cb)`, ..
 
+**Note:** you don't have to save the result from `Person.extendsTo`. It returns an extended model. You can use it to query
+directly this extended table (and even find the related model) but that's up to you. If you only want to access it using the
+original model you can just discard the return.
+
 ### Examples & options
 
 If you have a relation of 1 to n, you should use `hasOne` (belongs to) association.

From f54b0c95246add92c61fbd0338282029c41a4c72 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Jul 2013 19:52:28 +0100
Subject: [PATCH 0583/1246] Adds some more Model.hasOne tests

---
 test/integration2/association-hasone.js | 58 +++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/test/integration2/association-hasone.js b/test/integration2/association-hasone.js
index f4d38874..ff278c1d 100644
--- a/test/integration2/association-hasone.js
+++ b/test/integration2/association-hasone.js
@@ -251,4 +251,62 @@ describe("hasOne", function() {
 			});
 		});
 	});
+
+	describe("if not passing another Model", function () {
+		it("should use same model", function (done) {
+			db.settings.set('instance.cache', false);
+			db.settings.set('instance.returnAllErrors', true);
+
+			var Person = db.define("person", {
+				name : String
+			});
+			Person.hasOne("parent", {
+				autoFetch : true
+			});
+
+			helper.dropSync(Person, function () {
+				var child = new Person({
+					name : "Child"
+				});
+				child.setParent(new Person({ name: "Parent" }), function (err) {
+					should.equal(err, null);
+
+					return done();
+				});
+			});
+		});
+	});
+
+	describe("findBy()", function () {
+		before(setup());
+
+		it("should throw if no conditions passed", function (done) {
+			(function () {
+				Leaf.findByTree(function () {});
+			}).should.throw();
+
+			return done();
+		});
+
+		it("should lookup in Model based on associated model properties", function (done) {
+			Leaf.findByTree({
+				type: "pine"
+			}, function (err, leafs) {
+				should.equal(err, null);
+				should(Array.isArray(leafs));
+				should(leafs.length == 1);
+
+				return done();
+			});
+		});
+
+		it("should return a ChainFind if no callback passed", function (done) {
+			var ChainFind = Leaf.findByTree({
+				type: "pine"
+			});
+			ChainFind.run.should.be.a("function");
+
+			return done();
+		});
+	});
 });

From dd8ca766e5c9f65f90a2f189eb1bb574a6148987 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Jul 2013 23:16:48 +0100
Subject: [PATCH 0584/1246] sql-query@0.1.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cb6fd477..73c5c49b 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
   },
   "analyse"     : false,
   "dependencies": {
-    "sql-query" : "0.0.29",
+    "sql-query" : "0.1.0",
     "hat"       : "0.0.3",
     "lodash"    : "1.3.1"
   },

From dd0f8328a0c28e266e279cd28a1b9ba528d251b3 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Jul 2013 23:17:01 +0100
Subject: [PATCH 0585/1246] Adds tests for lazyload properties

---
 test/integration2/property-lazyload.js | 135 +++++++++++++++++++++++++
 1 file changed, 135 insertions(+)
 create mode 100644 test/integration2/property-lazyload.js

diff --git a/test/integration2/property-lazyload.js b/test/integration2/property-lazyload.js
new file mode 100644
index 00000000..a1ec6014
--- /dev/null
+++ b/test/integration2/property-lazyload.js
@@ -0,0 +1,135 @@
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var ORM      = require('../../');
+
+describe("LazyLoad properties", function() {
+	var db = null;
+	var Person = null;
+	var PersonPhoto = new Buffer(1024); // fake photo
+	var OtherPersonPhoto = new Buffer(1024); // other fake photo
+
+	var setup = function () {
+		return function (done) {
+			Person = db.define("person", {
+				name   : String,
+				photo  : { type: "binary", lazyload: true }
+			});
+
+			ORM.singleton.clear();
+
+			return helper.dropSync(Person, function () {
+				Person.create({
+					name  : "John Doe",
+					photo : PersonPhoto
+				}, done);
+			});
+		};
+	};
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			return done();
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	describe("when defined", function () {
+		before(setup());
+
+		it("should not be available when fetching an instance", function (done) {
+			Person.get(1, function (err, John) {
+				should.equal(err, null);
+
+				John.should.be.a("object");
+				John.should.have.property("id", 1);
+				John.should.have.property("name", "John Doe");
+				John.should.have.property("photo", null);
+
+				return done();
+			});
+		});
+
+		it("should have apropriate accessors", function (done) {
+			Person.get(1, function (err, John) {
+				should.equal(err, null);
+
+				John.should.be.a("object");
+				John.getPhoto.should.be.a("function");
+				John.setPhoto.should.be.a("function");
+				John.removePhoto.should.be.a("function");
+
+				return done();
+			});
+		});
+
+		it("getAccessor should return property", function (done) {
+			Person.get(1, function (err, John) {
+				should.equal(err, null);
+
+				John.should.be.a("object");
+
+				John.getPhoto(function (err, photo) {
+					should.equal(err, null);
+					photo.toString().should.equal(PersonPhoto.toString());
+
+					return done();
+				});
+			});
+		});
+
+		it("setAccessor should change property", function (done) {
+			Person.get(1, function (err, John) {
+				should.equal(err, null);
+
+				John.should.be.a("object");
+
+				John.setPhoto(OtherPersonPhoto, function (err) {
+					should.equal(err, null);
+
+					Person.get(1, function (err, John) {
+						should.equal(err, null);
+
+						John.should.be.a("object");
+
+						John.getPhoto(function (err, photo) {
+							should.equal(err, null);
+							photo.toString().should.equal(OtherPersonPhoto.toString());
+
+							return done();
+						});
+					});
+				});
+			});
+		});
+
+		it("removeAccessor should change property", function (done) {
+			Person.get(1, function (err, John) {
+				should.equal(err, null);
+
+				John.should.be.a("object");
+
+				John.removePhoto(function (err) {
+					should.equal(err, null);
+
+					Person.get(1, function (err, John) {
+						should.equal(err, null);
+
+						John.should.be.a("object");
+
+						John.getPhoto(function (err, photo) {
+							should.equal(err, null);
+							should.equal(photo, null);
+
+							return done();
+						});
+					});
+				});
+			});
+		});
+	});
+});

From 41bd971e2f7f38886d16992efa11b96ef7f42292 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Jul 2013 23:25:19 +0100
Subject: [PATCH 0586/1246] sql-query@0.1.1

Fixes sqlite binary data escaping (buffers)
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 73c5c49b..cb21e1af 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
   },
   "analyse"     : false,
   "dependencies": {
-    "sql-query" : "0.1.0",
+    "sql-query" : "0.1.1",
     "hat"       : "0.0.3",
     "lodash"    : "1.3.1"
   },

From acc87446d580a499c6636ce62ef1f0973d7bc848 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 3 Jul 2013 23:29:36 +0100
Subject: [PATCH 0587/1246] Removes old Property.js throw error in favour of
 new one

---
 lib/Property.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/Property.js b/lib/Property.js
index f05e6d75..da4156f9 100644
--- a/lib/Property.js
+++ b/lib/Property.js
@@ -29,7 +29,6 @@ exports.normalize = function (prop, Settings) {
 	}
 
 	if ([ "text", "number", "boolean", "date", "enum", "object", "binary" ].indexOf(prop.type) == -1) {
-		throw new Error("Unknown property type: " + prop.type);
 		throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Unknown property type: " + prop.type);
 	}
 

From f7ccb63e2ecbd29f2032f749c9164247761bfb60 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 00:13:40 +0100
Subject: [PATCH 0588/1246] Lints and adds some spaces for better reading

---
 lib/Model.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Model.js b/lib/Model.js
index b6756dba..39d97069 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -135,11 +135,11 @@ function Model(opts) {
 	// Standardize validations
 	for (var k in opts.validations) {
 		if (typeof opts.validations[k] == 'function') {
-			opts.validations[k] = [opts.validations[k]]
+			opts.validations[k] = [ opts.validations[k] ];
 		}
 	}
 
-	for (var k in opts.properties) {
+	for (k in opts.properties) {
 		opts.properties[k] = Property.normalize(opts.properties[k], opts.settings);
 
 		if (opts.properties[k].lazyload !== true) {

From 14747a548df1e42d718e9a962d4c51ea28e23d76 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 00:14:38 +0100
Subject: [PATCH 0589/1246] Exposes Model.properties

---
 lib/Model.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Model.js b/lib/Model.js
index 39d97069..31f14339 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -155,7 +155,8 @@ function Model(opts) {
 		}
 	}
 
-	model.settings = opts.settings;
+	model.properties = opts.properties;
+	model.settings   = opts.settings;
 
 	model.drop = function (cb) {
 		if (arguments.length === 0) {

From 52611e5240bfc1b8091627938ed85370db5fdd2a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 00:20:07 +0100
Subject: [PATCH 0590/1246] Passes Model to Instance directly, changes Instance
 to use Model.properties instead of opts.properties

---
 lib/Instance.js | 40 ++++++++++++++++++++--------------------
 lib/Model.js    |  4 +---
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 254eaba0..c0b7688f 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -3,7 +3,7 @@ var Hook     = require("./Hook");
 
 exports.Instance = Instance;
 
-function Instance(opts) {
+function Instance(Model, opts) {
 	opts = opts || {};
 	opts.data = opts.data || {};
 	opts.extra = opts.extra || {};
@@ -27,8 +27,8 @@ function Instance(opts) {
 		var pending = [], errors = [], required;
 
 		for (var k in opts.validations) {
-			if (opts.properties[k]) {
-				required = opts.properties[k].required;
+			if (Model.properties[k]) {
+				required = Model.properties[k].required;
 			} else {
 				for (var i = 0; i < opts.one_associations.length; i++) {
 					if (opts.one_associations[i].field == k) {
@@ -60,7 +60,7 @@ function Instance(opts) {
 					err.msg   = msg;
 					err.type  = "validation";
 
-					if (!opts.model.settings.get("instance.returnAllErrors")) {
+					if (!Model.settings.get("instance.returnAllErrors")) {
 						return cb(err);
 					}
 
@@ -68,7 +68,7 @@ function Instance(opts) {
 				}
 
 				return checkNextValidation();
-			}, instance, opts.model, validation[0]);
+			}, instance, Model, validation[0]);
 		};
 		return checkNextValidation();
 	};
@@ -89,10 +89,10 @@ function Instance(opts) {
 				return saveError(cb, err);
 			}
 
-			for (var k in opts.properties) {
-				if (!opts.properties.hasOwnProperty(k)) continue;
-				if (opts.data[k] == null && opts.properties[k].hasOwnProperty("defaultValue")) {
-					opts.data[k] = opts.properties[k].defaultValue;
+			for (var k in Model.properties) {
+				if (!Model.properties.hasOwnProperty(k)) continue;
+				if (opts.data[k] == null && Model.properties[k].hasOwnProperty("defaultValue")) {
+					opts.data[k] = Model.properties[k].defaultValue;
 				}
 			}
 
@@ -140,10 +140,10 @@ function Instance(opts) {
 			for (var k in opts.data) {
 				if (!opts.data.hasOwnProperty(k)) continue;
 
-				if (opts.properties[k]) {
-					data[k] = Property.validate(opts.data[k], opts.properties[k]);
+				if (Model.properties[k]) {
+					data[k] = Property.validate(opts.data[k], Model.properties[k]);
 					if (opts.driver.propertyToValue) {
-						data[k] = opts.driver.propertyToValue(data[k], opts.properties[k]);
+						data[k] = opts.driver.propertyToValue(data[k], Model.properties[k]);
 					}
 				} else {
 					data[k] = opts.data[k];
@@ -311,10 +311,10 @@ function Instance(opts) {
 		var changes = {}, conditions = {};
 		changes[key] = value;
 
-		if (opts.properties[key]) {
-			changes[key] = Property.validate(changes[key], opts.properties[key]);
+		if (Model.properties[key]) {
+			changes[key] = Property.validate(changes[key], Model.properties[key]);
 			 if (opts.driver.propertyToValue) {
-				changes[key] = opts.driver.propertyToValue(changes[key], opts.properties[key]);
+				changes[key] = opts.driver.propertyToValue(changes[key], Model.properties[key]);
 			}
 		}
 
@@ -389,15 +389,15 @@ function Instance(opts) {
 		}
 	}
 
-	for (var k in opts.properties) {
-		if (opts.properties.hasOwnProperty(k) && !opts.data.hasOwnProperty(k) && opts.keys.indexOf(k) == -1) {
+	for (var k in Model.properties) {
+		if (Model.properties.hasOwnProperty(k) && !opts.data.hasOwnProperty(k) && opts.keys.indexOf(k) == -1) {
 			opts.data[k] = null;
 		}
 	}
 
 	for (k in opts.data) {
 		if (!opts.data.hasOwnProperty(k)) continue;
-		if (!opts.properties.hasOwnProperty(k) && opts.keys.indexOf(k) == -1 && opts.association_properties.indexOf(k) == -1) {
+		if (!Model.properties.hasOwnProperty(k) && opts.keys.indexOf(k) == -1 && opts.association_properties.indexOf(k) == -1) {
 			if (!opts.extra.hasOwnProperty(k)) continue;
 
 			if (opts.driver.valueToProperty) {
@@ -407,8 +407,8 @@ function Instance(opts) {
 			continue;
 		}
 
-		if (opts.properties[k] && opts.driver.valueToProperty) {
-			opts.data[k] = opts.driver.valueToProperty(opts.data[k], opts.properties[k]);
+		if (Model.properties[k] && opts.driver.valueToProperty) {
+			opts.data[k] = opts.driver.valueToProperty(opts.data[k], Model.properties[k]);
 		}
 
 		addInstanceProperty(k);
diff --git a/lib/Model.js b/lib/Model.js
index 31f14339..960ed863 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -65,7 +65,7 @@ function Model(opts) {
 			}
 		}
 
-		var instance = new Instance({
+		var instance = new Instance(model, {
 			uid                    : inst_opts.uid, // singleton unique id
 			id                     : opts.id,
 			keys                   : opts.keys,
@@ -75,10 +75,8 @@ function Model(opts) {
 			autoSave               : inst_opts.autoSave || false,
 			extra                  : inst_opts.extra,
 			extra_info             : inst_opts.extra_info,
-			model                  : model,
 			driver                 : opts.driver,
 			table                  : opts.table,
-			properties             : opts.properties,
 			hooks                  : opts.hooks,
 			methods                : opts.methods,
 			validations            : opts.validations,

From 3c6f1d934f29dae9a09aa925fdf7caf5218c4430 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 00:28:33 +0100
Subject: [PATCH 0591/1246] Merges conflits

---
 .travis.yml                   |   7 +-
 lib/Instance.js               | 200 +++++++++++++++++-----------------
 test/integration2/hook.js     |  29 ++++-
 test/integration2/instance.js | 127 +++++++++++++++++++++
 4 files changed, 255 insertions(+), 108 deletions(-)
 create mode 100644 test/integration2/instance.js

diff --git a/.travis.yml b/.travis.yml
index 01ced59c..2ea563e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,8 @@
 language: node_js
 node_js:
-  - 0.4
-  - 0.6
-  - 0.8
-  - 0.10
+  - '0.6'
+  - '0.8'
+  - '0.10'
 before_script:
   - mysql -e 'create database orm_test;'
   - psql -c 'create database orm_test;' -U postgres
diff --git a/lib/Instance.js b/lib/Instance.js
index c0b7688f..d310279c 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -26,51 +26,64 @@ function Instance(Model, opts) {
 	var handleValidations = function (cb) {
 		var pending = [], errors = [], required;
 
-		for (var k in opts.validations) {
-			if (Model.properties[k]) {
-				required = Model.properties[k].required;
-			} else {
-				for (var i = 0; i < opts.one_associations.length; i++) {
-					if (opts.one_associations[i].field == k) {
-						required = opts.one_associations[i].required;
-						break;
-					}
-				}
-			}
-			if (!required && instance[k] == null) {
-				continue; // avoid validating if property is not required and is "empty"
+		Hook.wait(instance, opts.hooks.beforeValidation, function (err) {
+			if (err) {
+				return saveError(cb, err);
 			}
-			for (var i = 0; i < opts.validations[k].length; i++) {
-				pending.push([ k, opts.validations[k][i] ]);
+
+			for (var k in Model.properties) {
+				if (!Model.properties.hasOwnProperty(k)) continue;
+				if (opts.data[k] == null && Model.properties[k].hasOwnProperty("defaultValue")) {
+					opts.data[k] = Model.properties[k].defaultValue;
+				}
 			}
-		}
-		var checkNextValidation = function () {
-			if (pending.length === 0) {
-				return cb(errors.length ? errors : null);
+
+			for (var k in opts.validations) {
+				if (Model.properties[k]) {
+					required = Model.properties[k].required;
+				} else {
+					for (var i = 0; i < opts.one_associations.length; i++) {
+						if (opts.one_associations[i].field == k) {
+							required = opts.one_associations[i].required;
+							break;
+						}
+					}
+				}
+				if (!required && instance[k] == null) {
+					continue; // avoid validating if property is not required and is "empty"
+				}
+				for (var i = 0; i < opts.validations[k].length; i++) {
+					pending.push([ k, opts.validations[k][i] ]);
+				}
 			}
+			var checkNextValidation = function () {
+				if (pending.length === 0) {
+					return cb(errors.length ? errors : null);
+				}
 
-			var validation = pending.shift();
+				var validation = pending.shift();
 
-			validation[1](instance[validation[0]], function (msg) {
-				if (msg) {
-					var err   = new Error(msg);
+				validation[1](instance[validation[0]], function (msg) {
+					if (msg) {
+						var err   = new Error(msg);
 
-					err.field = validation[0];
-					err.value = instance[validation[0]];
-					err.msg   = msg;
-					err.type  = "validation";
+						err.field = validation[0];
+						err.value = instance[validation[0]];
+						err.msg   = msg;
+						err.type  = "validation";
 
-					if (!Model.settings.get("instance.returnAllErrors")) {
-						return cb(err);
-					}
+						if (!Model.settings.get("instance.returnAllErrors")) {
+							return cb(err);
+						}
 
-					errors.push(err);
-				}
+						errors.push(err);
+					}
 
-				return checkNextValidation();
-			}, instance, Model, validation[0]);
-		};
-		return checkNextValidation();
+					return checkNextValidation();
+				}, instance, Model, validation[0]);
+			};
+			return checkNextValidation();
+		});
 	};
 	var saveError = function (cb, err) {
 		emitEvent("save", err, instance);
@@ -84,40 +97,32 @@ function Instance(Model, opts) {
 			return saveInstanceExtra(cb);
 		}
 
-		Hook.wait(instance, opts.hooks.beforeValidation, function (err) {
+		handleValidations(function (err) {
 			if (err) {
 				return saveError(cb, err);
 			}
 
-			for (var k in Model.properties) {
-				if (!Model.properties.hasOwnProperty(k)) continue;
-				if (opts.data[k] == null && Model.properties[k].hasOwnProperty("defaultValue")) {
-					opts.data[k] = Model.properties[k].defaultValue;
+			var data = {};
+			for (var k in opts.data) {
+				if (!opts.data.hasOwnProperty(k)) continue;
+
+				if (Model.properties[k]) {
+					data[k] = Property.validate(opts.data[k], Model.properties[k]);
+					if (opts.driver.propertyToValue) {
+						data[k] = opts.driver.propertyToValue(data[k], Model.properties[k]);
+					}
+				} else {
+					data[k] = opts.data[k];
 				}
 			}
 
 			if (opts.is_new) {
-				return Hook.wait(instance, opts.hooks.beforeCreate, function (err) {
-					if (err) {
-						return saveError(cb, err);
-					}
-					Hook.wait(instance, opts.hooks.beforeSave, function (err) {
-						if (err) {
-							return saveError(cb, err);
-						}
-						return saveInstanceNext(cb, saveOptions);
-					});
-				});
+				return saveNew(cb, saveOptions, data);
+			} else {
+				return savePersisted(cb, saveOptions, data);
 			}
-			Hook.wait(instance, opts.hooks.beforeSave, function (err) {
-				if (err) {
-					return saveError(cb, err);
-				}
-				return saveInstanceNext(cb, saveOptions);
-			});
 		});
 	};
-
 	var afterSave = function (cb, create, err) {
 		emitEvent("save", err, instance);
 		if(create) {
@@ -129,30 +134,18 @@ function Instance(Model, opts) {
 			saveInstanceExtra(cb);
 		}
 	};
+	var saveNew = function (cb, saveOptions, data) {
+		var next = afterSave.bind(this, cb, true);
 
-	var saveInstanceNext = function (cb, saveOptions) {
-		handleValidations(function (err) {
+		Hook.wait(instance, opts.hooks.beforeCreate, function (err) {
 			if (err) {
 				return saveError(cb, err);
 			}
-
-			var data = {};
-			for (var k in opts.data) {
-				if (!opts.data.hasOwnProperty(k)) continue;
-
-				if (Model.properties[k]) {
-					data[k] = Property.validate(opts.data[k], Model.properties[k]);
-					if (opts.driver.propertyToValue) {
-						data[k] = opts.driver.propertyToValue(data[k], Model.properties[k]);
-					}
-				} else {
-					data[k] = opts.data[k];
+			Hook.wait(instance, opts.hooks.beforeSave, function (err) {
+				if (err) {
+					return saveError(cb, err);
 				}
-			}
 
-			var next = afterSave.bind(this, cb, opts.is_new);
-
-			if (opts.is_new) {
 				opts.driver.insert(opts.table, data, opts.keys, function (save_err, info) {
 					if (save_err) {
 						return saveError(cb, save_err);
@@ -170,29 +163,38 @@ function Instance(Model, opts) {
 						saveAssociations(next);
 					}
 				});
-			} else {
-				var changes = {}, conditions = {};
-				for (var i = 0; i < opts.changes.length; i++) {
-					changes[opts.changes[i]] = data[opts.changes[i]];
-				}
-				for (i = 0; i < opts.keys.length; i++) {
-					conditions[opts.keys[i]] = data[opts.keys[i]];
-				}
-
-				opts.driver.update(opts.table, changes, conditions, function (save_err) {
-					if (save_err) {
-						return saveError(cb, save_err);
-					}
+			});
+		});
+	};
+	var savePersisted = function (cb, saveOptions, data) {
+		var next = afterSave.bind(this, cb, false);
 
-					opts.changes.length = 0;
+		Hook.wait(instance, opts.hooks.beforeSave, function (err) {
+			if (err) {
+				return saveError(cb, err);
+			}
 
-					if(saveOptions.saveAssociations === false) {
-						next();
-					} else {
-						saveAssociations(next);
-					}
-				});
+			var changes = {}, conditions = {};
+			for (var i = 0; i < opts.changes.length; i++) {
+				changes[opts.changes[i]] = data[opts.changes[i]];
 			}
+			for (i = 0; i < opts.keys.length; i++) {
+				conditions[opts.keys[i]] = data[opts.keys[i]];
+			}
+
+			opts.driver.update(opts.table, changes, conditions, function (save_err) {
+				if (save_err) {
+					return saveError(cb, save_err);
+				}
+
+				opts.changes.length = 0;
+
+				if(saveOptions.saveAssociations === false) {
+					next();
+				} else {
+					saveAssociations(next);
+				}
+			});
 		});
 	};
 	var saveAssociations = function (cb) {
@@ -503,7 +505,9 @@ function Instance(Model, opts) {
 	});
 	Object.defineProperty(instance, "validate", {
 		value: function (cb) {
-			handleValidations(cb);
+			handleValidations(function (errors) {
+				cb(null, errors || false);
+			});
 		},
 		enumerable: false
 	});
diff --git a/test/integration2/hook.js b/test/integration2/hook.js
index ef19d41d..03155b05 100644
--- a/test/integration2/hook.js
+++ b/test/integration2/hook.js
@@ -7,14 +7,20 @@ var ORM      = require('../../');
 describe("Hook", function() {
 	var db = null;
 	var Person = null;
-
 	var triggeredHooks = {};
+	var getTimestamp; // Calling it 'getTime' causes strangeness.
+
+	if (process.hrtime) {
+		getTimestamp = function () { return parseFloat(process.hrtime().join('.')); };
+	} else {
+		getTimestamp = function () { return Date.now(); };
+	}
 
 	var checkHook = function (hook) {
 		triggeredHooks[hook] = false;
 
 		return function () {
-			triggeredHooks[hook] = Date.now();
+			triggeredHooks[hook] = getTimestamp();
 		};
 	};
 
@@ -263,6 +269,7 @@ describe("Hook", function() {
 
 		describe("if hook method has 1 argument", function () {
 			var beforeValidation = false;
+			this.timeout(500);
 
 			before(setup({
 				beforeValidation : function (next) {
@@ -276,9 +283,11 @@ describe("Hook", function() {
 				}
 			}));
 
-			it("should wait for hook to finish", function (done) {
-				this.timeout(500);
+			beforeEach(function () {
+				beforeValidation = false;
+			});
 
+			it("should wait for hook to finish", function (done) {
 				Person.create([{ name: "John Doe" }], function () {
 					beforeValidation.should.be.true;
 
@@ -287,8 +296,6 @@ describe("Hook", function() {
 			});
 
 			it("should trigger error if hook passes an error", function (done) {
-				this.timeout(500);
-
 				Person.create([{ name: "" }], function (err) {
 					beforeValidation.should.be.true;
 
@@ -297,6 +304,16 @@ describe("Hook", function() {
 					return done();
 				});
 			});
+
+			it("should trigger when calling #validate", function (done) {
+				var person = new Person();
+
+				person.validate(function (err, validationErrors) {
+					beforeValidation.should.be.true;
+
+					return done();
+				});
+			});
 		});
 	});
 
diff --git a/test/integration2/instance.js b/test/integration2/instance.js
new file mode 100644
index 00000000..8e3e569e
--- /dev/null
+++ b/test/integration2/instance.js
@@ -0,0 +1,127 @@
+var should	 = require('should');
+var helper	 = require('../support/spec_helper');
+var ORM			= require('../../');
+
+describe("Model instance", function() {
+	var db = null;
+	var Person = null;
+
+	var setup = function () {
+		return function (done) {
+			db.settings.set('instance.returnAllErrors', true);
+
+			Person = db.define("person", {
+				name : String,
+				age  : { type: 'number', rational: false, required: false }
+			}, {
+				validations: {
+					age: ORM.validators.rangeNumber(0, 150)
+				}
+			});
+
+			return helper.dropSync(Person, function () {
+				Person.create([{
+					id	: 1,
+					name: "Jeremy Doe"
+				}, {
+					id	: 2,
+					name: "John Doe"
+				}, {
+					id	: 3,
+					name: "Jane Doe"
+				}], done);
+			});
+		};
+	};
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			setup()(function (err) {
+				return done();
+			});
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	describe("#isInstance", function () {
+		it("should always return true for instances", function (done) {
+			should.equal((new Person).isInstance, true);
+			should.equal((Person(4)).isInstance, true);
+			Person.get(2, function (err, item) {
+				should.not.exist(err);
+				should.equal(item.isInstance, true);
+				return done();
+			});
+		});
+
+		it("should be false for all other objects", function () {
+			should.notEqual({}.isInstance, true);
+			should.notEqual([].isInstance, true);
+		});
+	});
+
+	describe("#isPersisted", function () {
+		it("should return true for persisted instances", function (done) {
+			Person.get(2, function (err, item) {
+				should.not.exist(err);
+				should.equal(item.isPersisted(), true);
+				return done();
+			});
+		});
+
+		it("should return true for shell instances", function () {
+			should.equal(Person(4).isPersisted(), true);
+		});
+
+		it("should return false for new instances", function () {
+			should.equal((new Person).isPersisted(), false);
+		});
+	});
+
+	describe("#isShell", function () {
+		it("should return true for shell models", function () {
+			should.equal(Person(4).isShell(), true);
+		});
+
+		it("should return false for new models", function () {
+			should.equal((new Person).isShell(), false);
+		});
+
+		it("should return false for existing models", function (done) {
+			Person.get(2, function (err, item) {
+				should.not.exist(err);
+				should.equal(item.isShell(), false);
+				return done();
+			});
+		});
+	});
+
+	describe("#validate", function () {
+		it("should return validation errors if invalid", function (done) {
+			var person = new Person({ age: -1 });
+
+			person.validate(function (err, validationErrors) {
+				should.not.exist(err);
+				should.equal(Array.isArray(validationErrors), true);
+
+				return done();
+			});
+		});
+
+		it("should return false if valid", function (done) {
+			var person = new Person({ name: 'Janette' });
+
+			person.validate(function (err, validationErrors) {
+				should.not.exist(err);
+				should.equal(validationErrors, false);
+
+				return done();
+			});
+		});
+	});
+});

From 8b5ba97c518a2cecab4324575faf99026d65d3f5 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 01:03:51 +0100
Subject: [PATCH 0592/1246] Fixes passing json object instead of instances to
 Model.create() associations (#216)

Adds initial tests for Model.create(), deprecates old one
---
 lib/Instance.js                               |  76 ++++++------
 .../{ => deprecated}/test-create.js           |   0
 test/integration2/model-create.js             | 113 ++++++++++++++++++
 3 files changed, 152 insertions(+), 37 deletions(-)
 rename test/integration/{ => deprecated}/test-create.js (100%)
 create mode 100644 test/integration2/model-create.js

diff --git a/lib/Instance.js b/lib/Instance.js
index d310279c..471cd138 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -157,11 +157,11 @@ function Instance(Model, opts) {
 					}
 					opts.is_new = false;
 
-					if(saveOptions.saveAssociations === false) {
-						next();
-					} else {
-						saveAssociations(next);
+					if (saveOptions.saveAssociations === false) {
+						return next();
 					}
+
+					return saveAssociations(next);
 				});
 			});
 		});
@@ -189,46 +189,20 @@ function Instance(Model, opts) {
 
 				opts.changes.length = 0;
 
-				if(saveOptions.saveAssociations === false) {
-					next();
-				} else {
-					saveAssociations(next);
+				if (saveOptions.saveAssociations === false) {
+					return next();
 				}
+
+				return saveAssociations(next);
 			});
 		});
 	};
 	var saveAssociations = function (cb) {
-		var pending = 0, errored = false, i, j, name;
-
-		for (i = 0; i < opts.one_associations.length; i++) {
-			name = opts.one_associations[i].name;
-
-			if (!instance.hasOwnProperty(name)) continue;
-
-			if (instance[name] && instance[name].isInstance) {
-				pending += 1;
-
-				instance[opts.one_associations[i].setAccessor](instance[name], function (err) {
-					if (err) {
-						if (errored) return;
-
-						errored = true;
-						return cb(err);
-					}
-
-					if (--pending === 0) {
-						return cb();
-					}
-				});
-			}
-		}
-
-		for (i = 0; i < opts.many_associations.length; i++) {
-			if (!instance.hasOwnProperty(opts.many_associations[i].name)) continue;
-
+		var pending = 0, errored = false, i, j;
+		var saveAssociation = function (accessor, instances) {
 			pending += 1;
 
-			instance[opts.many_associations[i].setAccessor](instance[opts.many_associations[i].name], function (err) {
+			instance[accessor](instances, function (err) {
 				if (err) {
 					if (errored) return;
 
@@ -240,6 +214,34 @@ function Instance(Model, opts) {
 					return cb();
 				}
 			});
+		};
+
+		for (i = 0; i < opts.one_associations.length; i++) {
+			(function (assoc) {
+				if (!instance[assoc.name] || typeof instance[assoc.name] != "object") return;
+				if (!instance[assoc.name].isInstance) {
+					instance[assoc.name] = new assoc.model(instance[assoc.name]);
+				}
+
+				saveAssociation(assoc.setAccessor, instance[assoc.name]);
+			})(opts.one_associations[i]);
+		}
+
+		for (i = 0; i < opts.many_associations.length; i++) {
+			(function (assoc) {
+				if (!instance.hasOwnProperty(assoc.name)) return;
+				if (!Array.isArray(instance[assoc.name])) {
+					instance[assoc.name] = [ instance[assoc.name] ];
+				}
+
+				for (j = 0; j < instance[assoc.name].length; j++) {
+					if (!instance[assoc.name][j].isInstance) {
+						instance[assoc.name][j] = new assoc.model(instance[assoc.name][j]);
+					}
+				}
+
+				return saveAssociation(assoc.setAccessor, instance[assoc.name]);
+			})(opts.many_associations[i]);
 		}
 
 		if (pending === 0) {
diff --git a/test/integration/test-create.js b/test/integration/deprecated/test-create.js
similarity index 100%
rename from test/integration/test-create.js
rename to test/integration/deprecated/test-create.js
diff --git a/test/integration2/model-create.js b/test/integration2/model-create.js
new file mode 100644
index 00000000..b331dbfe
--- /dev/null
+++ b/test/integration2/model-create.js
@@ -0,0 +1,113 @@
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var ORM      = require('../../');
+
+describe("Model.create()", function() {
+	var db = null;
+	var Pet = null;
+	var Person = null;
+
+	var setup = function () {
+		return function (done) {
+			Person = db.define("person", {
+				name   : String
+			});
+			Pet = db.define("pet", {
+				name   : String
+			});
+			Person.hasMany("pets", Pet);
+
+			return helper.dropSync([ Person, Pet ], done);
+		};
+	};
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			return done();
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	describe("if passing an object", function () {
+		before(setup());
+
+		it("should accept it as the only item to create", function (done) {
+			Person.create({
+				name : "John Doe"
+			}, function (err, John) {
+				should.equal(err, null);
+				John.should.have.property("name", "John Doe");
+
+				return done();
+			});
+		});
+	});
+
+	describe("if passing an array", function () {
+		before(setup());
+
+		it("should accept it as a list of items to create", function (done) {
+			Person.create([{
+				name : "John Doe"
+			}, {
+				name : "Jane Doe"
+			}], function (err, people) {
+				should.equal(err, null);
+				should(Array.isArray(people));
+
+				people.should.have.property("length", 2);
+				people[0].should.have.property("name", "John Doe");
+				people[1].should.have.property("name", "Jane Doe");
+
+				return done();
+			});
+		});
+	});
+
+	describe("if element has an association", function () {
+		before(setup());
+
+		it("should also create it or save it", function (done) {
+			Person.create({
+				name : "John Doe",
+				pets : [ new Pet({ name: "Deco" }) ]
+			}, function (err, John) {
+				should.equal(err, null);
+
+				John.should.have.property("name", "John Doe");
+
+				should(Array.isArray(John.pets));
+
+				John.pets[0].should.have.property("name", "Deco");
+				John.pets[0].should.have.property("id");
+				John.pets[0].saved().should.be.true;
+
+				return done();
+			});
+		});
+
+		it("should also create it or save it even if it's an object and not an instance", function (done) {
+			Person.create({
+				name : "John Doe",
+				pets : [ { name: "Deco" } ]
+			}, function (err, John) {
+				should.equal(err, null);
+
+				John.should.have.property("name", "John Doe");
+
+				should(Array.isArray(John.pets));
+
+				John.pets[0].should.have.property("name", "Deco");
+				John.pets[0].should.have.property("id");
+				John.pets[0].saved().should.be.true;
+
+				return done();
+			});
+		});
+	});
+});

From 4d7cb6344cf44c7cc7c50fa19ba04432f99aaa6e Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 11:08:02 +0100
Subject: [PATCH 0593/1246] Fixes postgres driver not returning numbers for
 number columns

Rollbacks Model.find() test to avoid casting. Postgres probably does
this because of the number limitation in javascript, but for now we
will always cast it.
---
 lib/Drivers/DML/postgres.js     |  4 +++
 test/integration2/model-find.js | 44 ++++++++++++++++-----------------
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 30f86d51..726f2ace 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -259,6 +259,10 @@ Driver.prototype.valueToProperty = function (value, property) {
 				return null;
 			}
 			break;
+		case "number":
+			if (value !== null) {
+				return Number(value);
+			}
 		default:
 			return value;
 	}
diff --git a/test/integration2/model-find.js b/test/integration2/model-find.js
index 020e92cd..83924e2f 100644
--- a/test/integration2/model-find.js
+++ b/test/integration2/model-find.js
@@ -94,8 +94,8 @@ describe("Model.find()", function() {
 				should.not.exist(err);
 				people.should.be.a("object");
 				people.should.have.property("length", 5);
-				Number(people[0].age).should.equal(16);
-				Number(people[4].age).should.equal(20);
+				people[0].age.should.equal(16);
+				people[4].age.should.equal(20);
 
 				return done();
 			});
@@ -106,8 +106,8 @@ describe("Model.find()", function() {
 				should.not.exist(err);
 				people.should.be.a("object");
 				people.should.have.property("length", 5);
-				Number(people[0].age).should.equal(20);
-				Number(people[4].age).should.equal(16);
+				people[0].age.should.equal(20);
+				people[4].age.should.equal(16);
 
 				return done();
 			});
@@ -122,8 +122,8 @@ describe("Model.find()", function() {
 				should.not.exist(err);
 				people.should.be.a("object");
 				people.should.have.property("length", 5);
-				Number(people[0].age).should.equal(16);
-				Number(people[4].age).should.equal(20);
+				people[0].age.should.equal(16);
+				people[4].age.should.equal(20);
 
 				return done();
 			});
@@ -134,8 +134,8 @@ describe("Model.find()", function() {
 				should.not.exist(err);
 				people.should.be.a("object");
 				people.should.have.property("length", 5);
-				Number(people[0].age).should.equal(20);
-				Number(people[4].age).should.equal(16);
+				people[0].age.should.equal(20);
+				people[4].age.should.equal(16);
 
 				return done();
 			});
@@ -146,8 +146,8 @@ describe("Model.find()", function() {
 				should.not.exist(err);
 				people.should.be.a("object");
 				people.should.have.property("length", 5);
-				Number(people[0].age).should.equal(20);
-				Number(people[4].age).should.equal(16);
+				people[0].age.should.equal(20);
+				people[4].age.should.equal(16);
 
 				return done();
 			});
@@ -158,8 +158,8 @@ describe("Model.find()", function() {
 				should.not.exist(err);
 				people.should.be.a("object");
 				people.should.have.property("length", 5);
-				Number(people[0].age).should.equal(16);
-				Number(people[4].age).should.equal(20);
+				people[0].age.should.equal(16);
+				people[4].age.should.equal(20);
 
 				return done();
 			});
@@ -170,8 +170,8 @@ describe("Model.find()", function() {
 				should.not.exist(err);
 				people.should.be.a("object");
 				people.should.have.property("length", 5);
-				Number(people[0].age).should.equal(16);
-				Number(people[4].age).should.equal(20);
+				people[0].age.should.equal(16);
+				people[4].age.should.equal(20);
 
 				return done();
 			});
@@ -186,7 +186,7 @@ describe("Model.find()", function() {
 				should.not.exist(err);
 				people.should.be.a("object");
 				people.should.have.property("length", 1);
-				Number(people[0].age).should.equal(16);
+				people[0].age.should.equal(16);
 
 				return done();
 			});
@@ -197,8 +197,8 @@ describe("Model.find()", function() {
 				should.not.exist(err);
 				people.should.be.a("object");
 				people.should.have.property("length", 2);
-				Number(people[0].age).should.equal(20);
-				Number(people[1].age).should.equal(20);
+				people[0].age.should.equal(20);
+				people[1].age.should.equal(20);
 
 				return done();
 			});
@@ -212,7 +212,7 @@ describe("Model.find()", function() {
 					should.not.exist(err);
 					people.should.be.a("object");
 					people.should.have.property("length", 1);
-					Number(people[0].age).should.equal(18);
+					people[0].age.should.equal(18);
 
 					return done();
 				});
@@ -226,7 +226,7 @@ describe("Model.find()", function() {
 						should.not.exist(err);
 						people.should.be.a("object");
 						people.should.have.property("length", 1);
-						Number(people[0].age).should.equal(18);
+						people[0].age.should.equal(18);
 
 						return done();
 					});
@@ -241,7 +241,7 @@ describe("Model.find()", function() {
 						should.not.exist(err);
 						people.should.be.a("object");
 						people.should.have.property("length", 4);
-						Number(people[0].age).should.equal(18);
+						people[0].age.should.equal(18);
 
 						return done();
 					});
@@ -256,7 +256,7 @@ describe("Model.find()", function() {
 						should.not.exist(err);
 						people.should.be.a("object");
 						people.should.have.property("length", 3);
-						Number(people[0].age).should.equal(16);
+						people[0].age.should.equal(16);
 
 						return done();
 					});
@@ -267,7 +267,7 @@ describe("Model.find()", function() {
 						should.not.exist(err);
 						people.should.be.a("object");
 						people.should.have.property("length", 3);
-						Number(people[0].age).should.equal(16);
+						people[0].age.should.equal(16);
 
 						return done();
 					});

From 033551c5c123dccd1af3f9504438d3083d7a4737 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 11:19:24 +0100
Subject: [PATCH 0594/1246] Exposes Model methods to change hooks after model
 definition

Example:

```js
var Model = db.define("...", {
});
Model.beforeRemove(function (next) { // sets hook
    // ....
});
Model.beforeRemove(); // removes hook
```
---
 lib/Model.js              | 20 ++++++++++++++++++++
 test/integration2/hook.js | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/lib/Model.js b/lib/Model.js
index 960ed863..b0f74750 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -9,6 +9,12 @@ var Singleton         = require("./Singleton");
 var Utilities         = require("./Utilities");
 var Validators        = require("./Validators");
 var ErrorCodes        = require("./ErrorCodes");
+var AvailableHooks    = [
+	"beforeCreate", "afterCreate",
+	"beforeSave", "afterSave",
+	"beforeValidation",
+	"beforeRemove", "afterRemove"
+];
 
 exports.Model = Model;
 
@@ -31,6 +37,16 @@ function Model(opts) {
 		model_fields.push(opts.keys[i]);
 	}
 
+	var createHookHelper = function (hook) {
+		return function (cb) {
+			if (typeof cb != "function") {
+				delete opts.hooks[hook];
+			} else {
+				opts.hooks[hook] = cb;
+			}
+			return this;
+		};
+	};
 	var createInstance = function (data, inst_opts, cb) {
 		if (!inst_opts) {
 			inst_opts = {};
@@ -153,6 +169,10 @@ function Model(opts) {
 		}
 	}
 
+	for (k in AvailableHooks) {
+		model[AvailableHooks[k]] = createHookHelper(AvailableHooks[k]);
+	}
+
 	model.properties = opts.properties;
 	model.settings   = opts.settings;
 
diff --git a/test/integration2/hook.js b/test/integration2/hook.js
index 03155b05..6a72b7b1 100644
--- a/test/integration2/hook.js
+++ b/test/integration2/hook.js
@@ -66,6 +66,44 @@ describe("Hook", function() {
 	// have hickups that could force this suite to timeout to the default value (2 secs)
 	this.timeout(30000);
 
+	describe("after Model creation", function () {
+		before(setup({}));
+
+		it("can be changed", function (done) {
+			var triggered = false;
+
+			Person.afterCreate(function () {
+				triggered = true;
+			});
+			Person.create([{ name: "John Doe" }], function () {
+				triggered.should.be.true;
+
+				return done();
+			});
+		});
+
+		it("can be removed", function (done) {
+			var triggered = false;
+
+			Person.afterCreate(function () {
+				triggered = true;
+			});
+			Person.create([{ name: "John Doe" }], function () {
+				triggered.should.be.true;
+
+				triggered = false;
+
+				Person.afterCreate(); // clears hook
+
+				Person.create([{ name: "Jane Doe" }], function () {
+					triggered.should.be.false;
+
+					return done();
+				});
+			});
+		});
+	});
+
 	describe("beforeCreate", function () {
 		before(setup());
 

From 0a9acc10d01fdb6ba3f517c2d258b4540d940d64 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 11:23:19 +0100
Subject: [PATCH 0595/1246] Adds test for Model.all(), deprecates old one

---
 test/integration/{ => deprecated}/test-all.js |  0
 test/integration2/model-find.js               | 14 ++++++++++++++
 2 files changed, 14 insertions(+)
 rename test/integration/{ => deprecated}/test-all.js (100%)

diff --git a/test/integration/test-all.js b/test/integration/deprecated/test-all.js
similarity index 100%
rename from test/integration/test-all.js
rename to test/integration/deprecated/test-all.js
diff --git a/test/integration2/model-find.js b/test/integration2/model-find.js
index 83924e2f..98352987 100644
--- a/test/integration2/model-find.js
+++ b/test/integration2/model-find.js
@@ -298,4 +298,18 @@ describe("Model.find()", function() {
 			});
 		});
 	});
+
+	describe("when using Model.all()", function () {
+		it("should work exactly the same", function (done) {
+			Person.all({ surname: "Doe" }, "-age", 1, function (err, people) {
+				should.not.exist(err);
+				people.should.be.a("object");
+				people.should.have.property("length", 1);
+				people[0].name.should.equal("Jasmine");
+				people[0].surname.should.equal("Doe");
+
+				return done();
+			});
+		});
+	});
 });

From 6f71cbe7ba76b2d2f64334f1b4fcc26771b94102 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 11:26:40 +0100
Subject: [PATCH 0596/1246] Adds test for property defaultValue, deprecates old
 one

---
 .../{ => deprecated}/test-create-defaultvalue.js |  0
 test/integration2/model-create.js                | 16 +++++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 rename test/integration/{ => deprecated}/test-create-defaultvalue.js (100%)

diff --git a/test/integration/test-create-defaultvalue.js b/test/integration/deprecated/test-create-defaultvalue.js
similarity index 100%
rename from test/integration/test-create-defaultvalue.js
rename to test/integration/deprecated/test-create-defaultvalue.js
diff --git a/test/integration2/model-create.js b/test/integration2/model-create.js
index b331dbfe..544d8366 100644
--- a/test/integration2/model-create.js
+++ b/test/integration2/model-create.js
@@ -13,7 +13,7 @@ describe("Model.create()", function() {
 				name   : String
 			});
 			Pet = db.define("pet", {
-				name   : String
+				name   : { type: "text", defaultValue: "Mutt" }
 			});
 			Person.hasMany("pets", Pet);
 
@@ -110,4 +110,18 @@ describe("Model.create()", function() {
 			});
 		});
 	});
+
+	describe("when not passing a property", function () {
+		before(setup());
+
+		it("should use defaultValue if defined", function (done) {
+			Pet.create({}, function (err, Mutt) {
+				should.equal(err, null);
+
+				Mutt.should.have.property("name", "Mutt");
+
+				return done();
+			});
+		});
+	});
 });

From 43ef8699debd8cfb0488394f8be0774cea5b5766 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 11:35:01 +0100
Subject: [PATCH 0597/1246] Adds tests for ChainInstance, deprecates old ones

---
 .../test-find-chain-instance-count.js         |  0
 .../test-find-chain-instance-each.js          |  0
 .../test-find-chain-instance-filter.js        |  0
 .../test-find-chain-instance-get.js           |  0
 .../test-find-chain-instance-sort.js          |  0
 test/integration2/chain-model-find.js         | 45 +++++++++++++++++++
 6 files changed, 45 insertions(+)
 rename test/integration/{ => deprecated}/test-find-chain-instance-count.js (100%)
 rename test/integration/{ => deprecated}/test-find-chain-instance-each.js (100%)
 rename test/integration/{ => deprecated}/test-find-chain-instance-filter.js (100%)
 rename test/integration/{ => deprecated}/test-find-chain-instance-get.js (100%)
 rename test/integration/{ => deprecated}/test-find-chain-instance-sort.js (100%)

diff --git a/test/integration/test-find-chain-instance-count.js b/test/integration/deprecated/test-find-chain-instance-count.js
similarity index 100%
rename from test/integration/test-find-chain-instance-count.js
rename to test/integration/deprecated/test-find-chain-instance-count.js
diff --git a/test/integration/test-find-chain-instance-each.js b/test/integration/deprecated/test-find-chain-instance-each.js
similarity index 100%
rename from test/integration/test-find-chain-instance-each.js
rename to test/integration/deprecated/test-find-chain-instance-each.js
diff --git a/test/integration/test-find-chain-instance-filter.js b/test/integration/deprecated/test-find-chain-instance-filter.js
similarity index 100%
rename from test/integration/test-find-chain-instance-filter.js
rename to test/integration/deprecated/test-find-chain-instance-filter.js
diff --git a/test/integration/test-find-chain-instance-get.js b/test/integration/deprecated/test-find-chain-instance-get.js
similarity index 100%
rename from test/integration/test-find-chain-instance-get.js
rename to test/integration/deprecated/test-find-chain-instance-get.js
diff --git a/test/integration/test-find-chain-instance-sort.js b/test/integration/deprecated/test-find-chain-instance-sort.js
similarity index 100%
rename from test/integration/test-find-chain-instance-sort.js
rename to test/integration/deprecated/test-find-chain-instance-sort.js
diff --git a/test/integration2/chain-model-find.js b/test/integration2/chain-model-find.js
index 46ee3c5e..687df8b1 100644
--- a/test/integration2/chain-model-find.js
+++ b/test/integration2/chain-model-find.js
@@ -314,4 +314,49 @@ describe("Model.find() chaining", function() {
 			});
 		});
 	});
+
+	describe(".each()", function () {
+		before(setup());
+
+		it("should return a ChainFind", function (done) {
+			var chain = Person.find({ age: 22 }).each();
+
+			chain.should.be.a("object");
+			chain.filter.should.be.a("function");
+			chain.sort.should.be.a("function");
+			chain.count.should.be.a("function");
+			chain.get.should.be.a("function");
+			chain.save.should.be.a("function");
+
+			return done();
+		});
+
+		describe(".count()", function () {
+			it("should return the total filtered items", function (done) {
+				Person.find().each().filter(function (person) {
+					return (person.age > 18);
+				}).count(function (count) {
+					count.should.equal(1);
+
+					return done();
+				});
+			});
+		});
+
+		describe(".sort()", function () {
+			it("should return the items sorted using the sorted function", function (done) {
+				Person.find().each().sort(function (first, second) {
+					return (first.age < second.age);
+				}).get(function (people) {
+					should(Array.isArray(people));
+
+					people.length.should.equal(3);
+					people[0].age.should.equal(20);
+					people[2].age.should.equal(18);
+
+					return done();
+				});
+			});
+		});
+	});
 });

From 7b45032773cd47c496dd60fae73a5b107acde9a1 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 11:36:58 +0100
Subject: [PATCH 0598/1246] Updates ChainFind tests to avoid casting numbers

This was because of postgres driver, not needed anymore
---
 test/integration2/chain-model-find.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/integration2/chain-model-find.js b/test/integration2/chain-model-find.js
index 687df8b1..fdebd88b 100644
--- a/test/integration2/chain-model-find.js
+++ b/test/integration2/chain-model-find.js
@@ -68,7 +68,7 @@ describe("Model.find() chaining", function() {
 			Person.find().skip(2).order("age").run(function (err, instances) {
 				should.equal(err, null);
 				instances.should.have.property("length", 1);
-				Number(instances[0].age).should.equal(20);
+				instances[0].age.should.equal(20);
 
 				return done();
 			});
@@ -82,7 +82,7 @@ describe("Model.find() chaining", function() {
 			Person.find().offset(2).order("age").run(function (err, instances) {
 				should.equal(err, null);
 				instances.should.have.property("length", 1);
-				Number(instances[0].age).should.equal(20);
+				instances[0].age.should.equal(20);
 
 				return done();
 			});
@@ -96,8 +96,8 @@ describe("Model.find() chaining", function() {
 			Person.find().order("age").run(function (err, instances) {
 				should.equal(err, null);
 				instances.should.have.property("length", 3);
-				Number(instances[0].age).should.equal(18);
-				Number(instances[2].age).should.equal(20);
+				instances[0].age.should.equal(18);
+				instances[2].age.should.equal(20);
 
 				return done();
 			});
@@ -111,8 +111,8 @@ describe("Model.find() chaining", function() {
 			Person.find().order("-age").run(function (err, instances) {
 				should.equal(err, null);
 				instances.should.have.property("length", 3);
-				Number(instances[0].age).should.equal(20);
-				Number(instances[2].age).should.equal(18);
+				instances[0].age.should.equal(20);
+				instances[2].age.should.equal(18);
 
 				return done();
 			});
@@ -126,8 +126,8 @@ describe("Model.find() chaining", function() {
 			Person.find().order("age", "Z").run(function (err, instances) {
 				should.equal(err, null);
 				instances.should.have.property("length", 3);
-				Number(instances[0].age).should.equal(20);
-				Number(instances[2].age).should.equal(18);
+				instances[0].age.should.equal(20);
+				instances[2].age.should.equal(18);
 
 				return done();
 			});
@@ -188,7 +188,7 @@ describe("Model.find() chaining", function() {
 
 				JaneDoe.name.should.equal("Jane");
 				JaneDoe.surname.should.equal("Doe");
-				Number(JaneDoe.age).should.equal(20);
+				JaneDoe.age.should.equal(20);
 
 				return done();
 			});
@@ -213,7 +213,7 @@ describe("Model.find() chaining", function() {
 
 				JaneDoe.name.should.equal("Jane");
 				JaneDoe.surname.should.equal("Doe");
-				Number(JaneDoe.age).should.equal(20);
+				JaneDoe.age.should.equal(20);
 
 				return done();
 			});

From 598fd45919b9b9235e0866f5b46c7ae999ea33ca Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 12:01:31 +0100
Subject: [PATCH 0599/1246] sql-query@0.1.2

Fixes '(...) WHERE EXISTS (...)' queries not having table alias to
point to columns from different tables.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cb21e1af..255d5c3d 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
   },
   "analyse"     : false,
   "dependencies": {
-    "sql-query" : "0.1.1",
+    "sql-query" : "0.1.2",
     "hat"       : "0.0.3",
     "lodash"    : "1.3.1"
   },

From ed11855048eaa1d83c34b3be7ac06260c3b900cf Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 12:04:25 +0100
Subject: [PATCH 0600/1246] Adds test for hasMany.hasAccessor() in Model.find()
 chain

---
 test/integration2/chain-model-find.js | 31 +++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/test/integration2/chain-model-find.js b/test/integration2/chain-model-find.js
index fdebd88b..b47e425d 100644
--- a/test/integration2/chain-model-find.js
+++ b/test/integration2/chain-model-find.js
@@ -12,9 +12,8 @@ describe("Model.find() chaining", function() {
 				name    : String,
 				surname : String,
 				age     : Number
-			}, {
-				cache : false
 			});
+			Person.hasMany("parents");
 
 			ORM.singleton.clear(); // clear cache
 
@@ -358,5 +357,33 @@ describe("Model.find() chaining", function() {
 				});
 			});
 		});
+
+		describe(".hasAccessor() for hasOne associations", function () {
+			it("should be chainable", function (done) {
+				Person.find({ name: "John" }, function (err, John) {
+					should.equal(err, null);
+
+					var Justin = new Person({
+						name : "Justin",
+						age  : 45
+					});
+
+					John[0].setParents([ Justin ], function (err) {
+						should.equal(err, null);
+
+						Person.find().hasParents(Justin.id).all(function (err, people) {
+							should.equal(err, null);
+
+							should(Array.isArray(people));
+
+							people.length.should.equal(1);
+							people[0].name.should.equal("John");
+
+							return done();
+						});
+					});
+				});
+			});
+		});
 	});
 });

From 2de728358704e50631e5ec68bba0fe4090357509 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 12:10:08 +0100
Subject: [PATCH 0601/1246] Adds tests for ChainFind.each() and
 ChainFind.save()

---
 test/integration2/chain-model-find.js | 33 +++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/test/integration2/chain-model-find.js b/test/integration2/chain-model-find.js
index b47e425d..5a8fc988 100644
--- a/test/integration2/chain-model-find.js
+++ b/test/integration2/chain-model-find.js
@@ -358,6 +358,39 @@ describe("Model.find() chaining", function() {
 			});
 		});
 
+		describe(".save()", function () {
+			it("should save items after changes", function (done) {
+				Person.find({ surname: "Dean" }).each(function (person) {
+					person.should.not.equal(45);
+					person.age = 45;
+				}).save(function () {
+					Person.find({ surname: "Dean" }, function (err, people) {
+						should(Array.isArray(people));
+
+						people.length.should.equal(1);
+						people[0].age.should.equal(45);
+
+						return done();
+					});
+				});
+			});
+		});
+
+		describe("if passing a callback", function () {
+			it("should use it to .forEach()", function (done) {
+				Person.find({ surname: "Dean" }).each(function (person) {
+					person.fullName = person.name + " " + person.surname;
+				}).get(function (people) {
+					should(Array.isArray(people));
+
+					people.length.should.equal(1);
+					people[0].fullName = "Jane Dean";
+
+					return done();
+				});
+			});
+		});
+
 		describe(".hasAccessor() for hasOne associations", function () {
 			it("should be chainable", function (done) {
 				Person.find({ name: "John" }, function (err, John) {

From f7f6df3087152ec35f4607b4c9cfd256c434d5e8 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 12:30:53 +0100
Subject: [PATCH 0602/1246] Fixes Model.aggregate().as(), adds tests for it

---
 lib/AggregateFunctions.js            |  5 ++-
 test/integration2/model-aggregate.js | 60 ++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index 8cd5a41e..e3b5d940 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -1,4 +1,5 @@
-var Utilities = require("./Utilities");
+var ErrorCodes = require("./ErrorCodes");
+var Utilities  = require("./Utilities");
 
 module.exports = AggregateFunctions;
 
@@ -65,7 +66,7 @@ function AggregateFunctions(opts) {
 
 			var len = aggregates.length;
 
-			aggregates[len - 2][aggregates[len - 2].length - 1].alias = alias;
+			aggregates[len - 1][aggregates[len - 1].length - 1].alias = alias;
 
 			return this;
 		},
diff --git a/test/integration2/model-aggregate.js b/test/integration2/model-aggregate.js
index 22fa85eb..ac80297f 100644
--- a/test/integration2/model-aggregate.js
+++ b/test/integration2/model-aggregate.js
@@ -65,6 +65,40 @@ describe("Model.aggregate()", function() {
 		});
 	});
 
+	describe("with select() with arguments", function () {
+		before(setup());
+
+		it("should use them as properties if 1st argument is Array", function (done) {
+			Person.aggregate().select([ 'id' ]).count().groupBy('name').get(function (err, people) {
+				should.equal(err, null);
+
+				should(Array.isArray(people));
+				people.length.should.be.above(0);
+
+				people[0].should.be.a("object");
+				people[0].should.have.property("id");
+				people[0].should.not.have.property("name");
+
+				return done();
+			});
+		});
+
+		it("should use them as properties", function (done) {
+			Person.aggregate().select('id', 'name').count().groupBy('name').get(function (err, people) {
+				should.equal(err, null);
+
+				should(Array.isArray(people));
+				people.length.should.be.above(0);
+
+				people[0].should.be.a("object");
+				people[0].should.have.property("id");
+				people[0].should.have.property("name");
+
+				return done();
+			});
+		});
+	});
+
 	describe("with get() without callback", function () {
 		before(setup());
 
@@ -164,4 +198,30 @@ describe("Model.aggregate()", function() {
 			});
 		});
 	});
+
+	describe("using as()", function () {
+		before(setup());
+
+		it("should use as an alias", function (done) {
+			Person.aggregate().count().as('total').groupBy('name').get(function (err, people) {
+				should.equal(err, null);
+
+				should(Array.isArray(people));
+				people.length.should.be.above(0);
+
+				people[0].should.be.a("object");
+				people[0].should.have.property("total");
+
+				return done();
+			});
+		});
+
+		it("should throw if no aggregates defined", function (done) {
+			(function () {
+				Person.aggregate().as('total');
+			}).should.throw();
+
+			return done();
+		});
+	});
 });

From 9ede4027da28e41c68aab2df0b6397f8eabd643e Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 12:34:07 +0100
Subject: [PATCH 0603/1246] Fixes test typo in commit
 2de728358704e50631e5ec68bba0fe4090357509

---
 test/integration2/chain-model-find.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration2/chain-model-find.js b/test/integration2/chain-model-find.js
index 5a8fc988..a40a4e92 100644
--- a/test/integration2/chain-model-find.js
+++ b/test/integration2/chain-model-find.js
@@ -361,7 +361,7 @@ describe("Model.find() chaining", function() {
 		describe(".save()", function () {
 			it("should save items after changes", function (done) {
 				Person.find({ surname: "Dean" }).each(function (person) {
-					person.should.not.equal(45);
+					person.age.should.not.equal(45);
 					person.age = 45;
 				}).save(function () {
 					Person.find({ surname: "Dean" }, function (err, people) {

From b99dedc566aa97f5040d9ef2488f0f5708be7491 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 14:12:57 +0100
Subject: [PATCH 0604/1246] Fixes previously added aggregate tests to pass on
 postgres

Selected columns must be in an aggregate call or group by column.
---
 test/integration2/model-aggregate.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/integration2/model-aggregate.js b/test/integration2/model-aggregate.js
index ac80297f..989d2fca 100644
--- a/test/integration2/model-aggregate.js
+++ b/test/integration2/model-aggregate.js
@@ -69,7 +69,7 @@ describe("Model.aggregate()", function() {
 		before(setup());
 
 		it("should use them as properties if 1st argument is Array", function (done) {
-			Person.aggregate().select([ 'id' ]).count().groupBy('name').get(function (err, people) {
+			Person.aggregate().select([ 'id' ]).count('id').groupBy('id').get(function (err, people) {
 				should.equal(err, null);
 
 				should(Array.isArray(people));
@@ -84,7 +84,7 @@ describe("Model.aggregate()", function() {
 		});
 
 		it("should use them as properties", function (done) {
-			Person.aggregate().select('id', 'name').count().groupBy('name').get(function (err, people) {
+			Person.aggregate().select('id').count().groupBy('id').get(function (err, people) {
 				should.equal(err, null);
 
 				should(Array.isArray(people));
@@ -92,7 +92,7 @@ describe("Model.aggregate()", function() {
 
 				people[0].should.be.a("object");
 				people[0].should.have.property("id");
-				people[0].should.have.property("name");
+				people[0].should.not.have.property("name");
 
 				return done();
 			});

From c8bfa7abd5873387a7dc4b92571eed9d576b00a2 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 14:15:26 +0100
Subject: [PATCH 0605/1246] mocha@1.12.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 255d5c3d..05dae53c 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "pg"      : "1.0.0",
     "sqlite3" : "2.1.7",
     "async"   : "*",
-    "mocha"   : "1.10.0",
+    "mocha"   : "1.12.0",
     "should"  : "1.2.2"
   },
   "optionalDependencies": {}

From 36b1798807a0c80105899bd4bab06434865b9ad3 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 14:35:15 +0100
Subject: [PATCH 0606/1246] Adds ability to pass an Array to
 hasMany.hasAccessor and also not passing any instance to hasAccessor and have
 it check for any associated item

Example:

```js
Person.hasPets([ ..., ... ], cb); // now it's possible
Person.hasPets(cb); // check if there any associations at all
```
---
 lib/Associations/Many.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 69f268e3..1fb761b0 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -125,6 +125,9 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 			options.__merge.where[1][association.mergeId] = Instance[Model.id];
 
 			if (Instances.length) {
+				if (Array.isArray(Instances[0])) {
+					Instances = Instances[0];
+				}
 				options.__merge.where[1][association.mergeAssocId] = [];
 
 				for (var i = 0; i < Instances.length; i++) {
@@ -136,6 +139,9 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 				if (err) {
 					return cb(err);
 				}
+				if (!Instances.length) {
+					return cb(null, instances.length > 0);
+				}
 				return cb(null, instances.length == Instances.length);
 			});
 			return this;

From 70417b88ccf20db02e7eaf63b0121679fe40125f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 14:36:13 +0100
Subject: [PATCH 0607/1246] Adds initial tests for Model.hasMany()

---
 .../test-association-hasmany-has.js           |   0
 test/integration2/association-hasmany.js      | 130 ++++++++++++++++++
 2 files changed, 130 insertions(+)
 rename test/integration/{ => deprecated}/test-association-hasmany-has.js (100%)
 create mode 100644 test/integration2/association-hasmany.js

diff --git a/test/integration/test-association-hasmany-has.js b/test/integration/deprecated/test-association-hasmany-has.js
similarity index 100%
rename from test/integration/test-association-hasmany-has.js
rename to test/integration/deprecated/test-association-hasmany-has.js
diff --git a/test/integration2/association-hasmany.js b/test/integration2/association-hasmany.js
new file mode 100644
index 00000000..252bda6c
--- /dev/null
+++ b/test/integration2/association-hasmany.js
@@ -0,0 +1,130 @@
+var should = require('should');
+var helper = require('../support/spec_helper');
+var ORM    = require('../../');
+
+describe("hasMany", function() {
+	var db     = null;
+	var Person = null;
+	var Pet    = null;
+
+	var setup = function (opts) {
+		opts = opts || {};
+		return function (done) {
+			db.settings.set('instance.cache', false);
+
+			Person = db.define('person', {
+				name    : String,
+				surname : String,
+				age     : Number
+			});
+			Pet = db.define('pet', {
+				name    : String
+			});
+			Person.hasMany('pets', Pet);
+
+			return helper.dropSync([ Person, Pet ], function () {
+				/**
+				 * John --+---> Deco
+				 *        '---> Mutt <----- Jane
+				 *
+				 * Justin
+				 */
+				Person.create([{
+					name    : "John",
+					surname : "Doe",
+					age     : 20,
+					pets    : [{
+						name    : "Deco"
+					}, {
+						name    : "Mutt"
+					}]
+				}, {
+					name    : "Jane",
+					surname : "Doe",
+					age     : 16
+				}, {
+					name    : "Justin",
+					surname : "Dean",
+					age     : 18
+				}], function (err) {
+					Person.find({ name: "Jane" }, function (err, people) {
+						Pet.find({ name: "Mutt" }, function (err, pets) {
+							people[0].addPets(pets, done);
+						});
+					});
+				});
+			});
+		};
+	};
+
+	before(function(done) {
+		helper.connect(function (connection) {
+			db = connection;
+			done();
+		});
+	});
+
+	describe("hasAccessor", function () {
+		before(setup());
+
+		it("should return true if instance has associated item", function (done) {
+			Pet.find({ name: "Mutt" }, function (err, pets) {
+				should.equal(err, null);
+
+				Person.find({ name: "Jane" }, function (err, people) {
+					should.equal(err, null);
+
+					people[0].hasPets(pets[0], function (err, has_pets) {
+						should.equal(err, null);
+						has_pets.should.be.true;
+
+						return done();
+					});
+				});
+			});
+		});
+
+		it("should return true if not passing any instance and has associated items", function (done) {
+			Person.find({ name: "Jane" }, function (err, people) {
+				should.equal(err, null);
+
+				people[0].hasPets(function (err, has_pets) {
+					should.equal(err, null);
+					has_pets.should.be.true;
+
+					return done();
+				});
+			});
+		});
+
+		it("should return true if all passed instances are associated", function (done) {
+			Pet.find(function (err, pets) {
+				Person.find({ name: "John" }, function (err, people) {
+					should.equal(err, null);
+
+					people[0].hasPets(pets, function (err, has_pets) {
+						should.equal(err, null);
+						has_pets.should.be.true;
+
+						return done();
+					});
+				});
+			});
+		});
+
+		it("should return false if any passed instances are not associated", function (done) {
+			Pet.find(function (err, pets) {
+				Person.find({ name: "Jane" }, function (err, people) {
+					should.equal(err, null);
+
+					people[0].hasPets(pets, function (err, has_pets) {
+						should.equal(err, null);
+						has_pets.should.be.false;
+
+						return done();
+					});
+				});
+			});
+		});
+	});
+});

From c6e515b612b90920469001abd53992a3aa2fddcb Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 14:40:01 +0100
Subject: [PATCH 0608/1246] Adds Model.hasMany.delAccessor tests

---
 .../test-association-hasmany-remove.js        |  0
 test/integration2/association-hasmany.js      | 45 +++++++++++++++++++
 2 files changed, 45 insertions(+)
 rename test/integration/{ => deprecated}/test-association-hasmany-remove.js (100%)

diff --git a/test/integration/test-association-hasmany-remove.js b/test/integration/deprecated/test-association-hasmany-remove.js
similarity index 100%
rename from test/integration/test-association-hasmany-remove.js
rename to test/integration/deprecated/test-association-hasmany-remove.js
diff --git a/test/integration2/association-hasmany.js b/test/integration2/association-hasmany.js
index 252bda6c..bdcb9350 100644
--- a/test/integration2/association-hasmany.js
+++ b/test/integration2/association-hasmany.js
@@ -127,4 +127,49 @@ describe("hasMany", function() {
 			});
 		});
 	});
+
+	describe("delAccessor", function () {
+		before(setup());
+
+		it("should remove specific associations if passed", function (done) {
+			Pet.find({ name: "Mutt" }, function (err, pets) {
+				Person.find({ name: "John" }, function (err, people) {
+					should.equal(err, null);
+
+					people[0].removePets(pets[0], function (err) {
+						should.equal(err, null);
+
+						people[0].getPets(function (err, pets) {
+							should.equal(err, null);
+
+							should(Array.isArray(pets));
+							pets.length.should.equal(1);
+							pets[0].name.should.equal("Deco");
+
+							return done();
+						});
+					});
+				});
+			});
+		});
+
+		it("should remove all associations if none passed", function (done) {
+			Person.find({ name: "John" }, function (err, people) {
+				should.equal(err, null);
+
+				people[0].removePets(function (err) {
+					should.equal(err, null);
+
+					people[0].getPets(function (err, pets) {
+						should.equal(err, null);
+
+						should(Array.isArray(pets));
+						pets.length.should.equal(0);
+
+						return done();
+					});
+				});
+			});
+		});
+	});
 });

From abda0f097016357360647c82e79c08f82a0775fc Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 14:40:39 +0100
Subject: [PATCH 0609/1246] Deprecates old simple hasMany.getAccessor test

---
 test/integration/{ => deprecated}/test-association-hasmany-get.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/integration/{ => deprecated}/test-association-hasmany-get.js (100%)

diff --git a/test/integration/test-association-hasmany-get.js b/test/integration/deprecated/test-association-hasmany-get.js
similarity index 100%
rename from test/integration/test-association-hasmany-get.js
rename to test/integration/deprecated/test-association-hasmany-get.js

From f1d72916f017b93fc6333ac36b38dad636f44208 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 14:50:18 +0100
Subject: [PATCH 0610/1246] Adds tests for Model.hasMany.getAccessor

---
 .../test-association-hasmany-get-chain.js     |  0
 .../test-association-hasmany-get-filter.js    |  0
 .../test-association-hasmany-get-limit.js     |  0
 ...est-association-hasmany-get-order-array.js |  0
 .../test-association-hasmany-get-order.js     |  0
 test/integration2/association-hasmany.js      | 85 +++++++++++++++++++
 6 files changed, 85 insertions(+)
 rename test/integration/{ => deprecated}/test-association-hasmany-get-chain.js (100%)
 rename test/integration/{ => deprecated}/test-association-hasmany-get-filter.js (100%)
 rename test/integration/{ => deprecated}/test-association-hasmany-get-limit.js (100%)
 rename test/integration/{ => deprecated}/test-association-hasmany-get-order-array.js (100%)
 rename test/integration/{ => deprecated}/test-association-hasmany-get-order.js (100%)

diff --git a/test/integration/test-association-hasmany-get-chain.js b/test/integration/deprecated/test-association-hasmany-get-chain.js
similarity index 100%
rename from test/integration/test-association-hasmany-get-chain.js
rename to test/integration/deprecated/test-association-hasmany-get-chain.js
diff --git a/test/integration/test-association-hasmany-get-filter.js b/test/integration/deprecated/test-association-hasmany-get-filter.js
similarity index 100%
rename from test/integration/test-association-hasmany-get-filter.js
rename to test/integration/deprecated/test-association-hasmany-get-filter.js
diff --git a/test/integration/test-association-hasmany-get-limit.js b/test/integration/deprecated/test-association-hasmany-get-limit.js
similarity index 100%
rename from test/integration/test-association-hasmany-get-limit.js
rename to test/integration/deprecated/test-association-hasmany-get-limit.js
diff --git a/test/integration/test-association-hasmany-get-order-array.js b/test/integration/deprecated/test-association-hasmany-get-order-array.js
similarity index 100%
rename from test/integration/test-association-hasmany-get-order-array.js
rename to test/integration/deprecated/test-association-hasmany-get-order-array.js
diff --git a/test/integration/test-association-hasmany-get-order.js b/test/integration/deprecated/test-association-hasmany-get-order.js
similarity index 100%
rename from test/integration/test-association-hasmany-get-order.js
rename to test/integration/deprecated/test-association-hasmany-get-order.js
diff --git a/test/integration2/association-hasmany.js b/test/integration2/association-hasmany.js
index bdcb9350..a76aaf4a 100644
--- a/test/integration2/association-hasmany.js
+++ b/test/integration2/association-hasmany.js
@@ -64,6 +64,91 @@ describe("hasMany", function() {
 		});
 	});
 
+	describe("getAccessor", function () {
+		before(setup());
+
+		it("should allow to specify order as string", function (done) {
+			Person.find({ name: "John" }, function (err, people) {
+				should.equal(err, null);
+
+				people[0].getPets("-name", function (err, pets) {
+					should.equal(err, null);
+
+					should(Array.isArray(pets));
+					pets.length.should.equal(2);
+					pets[0].name.should.equal("Mutt");
+					pets[1].name.should.equal("Deco");
+
+					return done();
+				});
+			});
+		});
+
+		it("should allow to specify order as Array", function (done) {
+			Person.find({ name: "John" }, function (err, people) {
+				should.equal(err, null);
+
+				people[0].getPets([ "name", "Z" ], function (err, pets) {
+					should.equal(err, null);
+
+					should(Array.isArray(pets));
+					pets.length.should.equal(2);
+					pets[0].name.should.equal("Mutt");
+					pets[1].name.should.equal("Deco");
+
+					return done();
+				});
+			});
+		});
+
+		it("should allow to specify a limit", function (done) {
+			Person.find({ name: "John" }, function (err, people) {
+				should.equal(err, null);
+
+				people[0].getPets(1, function (err, pets) {
+					should.equal(err, null);
+
+					should(Array.isArray(pets));
+					pets.length.should.equal(1);
+
+					return done();
+				});
+			});
+		});
+
+		it("should allow to specify conditions", function (done) {
+			Person.find({ name: "John" }, function (err, people) {
+				should.equal(err, null);
+
+				people[0].getPets({ name: "Mutt" }, function (err, pets) {
+					should.equal(err, null);
+
+					should(Array.isArray(pets));
+					pets.length.should.equal(1);
+					pets[0].name.should.equal("Mutt");
+
+					return done();
+				});
+			});
+		});
+
+		it("should return a chain if no callback defined", function (done) {
+			Person.find({ name: "John" }, function (err, people) {
+				should.equal(err, null);
+
+				var chain = people[0].getPets({ name: "Mutt" });
+
+				chain.should.be.a("object");
+				chain.find.should.be.a("function");
+				chain.only.should.be.a("function");
+				chain.limit.should.be.a("function");
+				chain.order.should.be.a("function");
+
+				return done();
+			});
+		});
+	});
+
 	describe("hasAccessor", function () {
 		before(setup());
 

From 7bfd3e568159f9e4306dbac7a1b646dee43a2005 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 14:52:14 +0100
Subject: [PATCH 0611/1246] Deprecates useless tests (sync/drop)

These calls are used by almost all new tests, so there's no need to
test them.
---
 test/integration/{ => deprecated}/test-drop-no-throw.js | 0
 test/integration/{ => deprecated}/test-drop.js          | 0
 test/integration/{ => deprecated}/test-sync-no-throw.js | 0
 test/integration/{ => deprecated}/test-sync.js          | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename test/integration/{ => deprecated}/test-drop-no-throw.js (100%)
 rename test/integration/{ => deprecated}/test-drop.js (100%)
 rename test/integration/{ => deprecated}/test-sync-no-throw.js (100%)
 rename test/integration/{ => deprecated}/test-sync.js (100%)

diff --git a/test/integration/test-drop-no-throw.js b/test/integration/deprecated/test-drop-no-throw.js
similarity index 100%
rename from test/integration/test-drop-no-throw.js
rename to test/integration/deprecated/test-drop-no-throw.js
diff --git a/test/integration/test-drop.js b/test/integration/deprecated/test-drop.js
similarity index 100%
rename from test/integration/test-drop.js
rename to test/integration/deprecated/test-drop.js
diff --git a/test/integration/test-sync-no-throw.js b/test/integration/deprecated/test-sync-no-throw.js
similarity index 100%
rename from test/integration/test-sync-no-throw.js
rename to test/integration/deprecated/test-sync-no-throw.js
diff --git a/test/integration/test-sync.js b/test/integration/deprecated/test-sync.js
similarity index 100%
rename from test/integration/test-sync.js
rename to test/integration/deprecated/test-sync.js

From fa2c1f7fd2b427fe21e40080708114fbaf28ee94 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 17:53:48 +0100
Subject: [PATCH 0612/1246] Fixes bug introduced previously when accepting
 Model.hasMany.setAccessor to support Array

---
 lib/Associations/Many.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 1fb761b0..4b3cd429 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -2,6 +2,7 @@ var InstanceConstructor = require("../Instance").Instance;
 var Settings            = require("../Settings");
 var Property            = require("../Property");
 var ErrorCodes          = require("../ErrorCodes");
+var _                   = require("lodash");
 
 exports.prepare = function (Model, associations) {
 	if (Model.keys.length > 1) {
@@ -227,7 +228,10 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 			}
 
 			if (Array.isArray(Instances[0])) {
-				Instances = Instances[0];
+				// clone is used or else Instances will be just a reference
+				// to the array and the Instances.push(cb) a few lines ahead
+				// would actually change the user Array passed to the function
+				Instances = _.clone(Instances[0]);
 			}
 
 			Instance[association.delAccessor](function (err) {

From 450446cb6cbc970376ff5b8ce75cf2d5e958e3c8 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 17:54:42 +0100
Subject: [PATCH 0613/1246] Changes Model.hasMany.addAccessor to throw just
 like .setAccessor when no associations are passed

---
 lib/Associations/Many.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 4b3cd429..9cdb4a25 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -343,6 +343,10 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 				}
 			}
 
+			if (Associations.length === 0) {
+				throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "No associations defined");
+			}
+
 			if (this.saved()) {
 				run();
 			} else {

From a2bc4008eb54739c243aac477b8902328b2a0034 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 17:56:58 +0100
Subject: [PATCH 0614/1246] Adds tests for Model.hasMany.addAccessor and
 .setAccessor

---
 .../test-association-hasmany-add-array.js     |   0
 .../test-association-hasmany-add.js           |   0
 .../test-association-hasmany-set-array.js     |   0
 .../test-association-hasmany-set-multiple.js  |   0
 .../test-association-hasmany-set.js           |   0
 test/integration2/association-hasmany.js      | 198 ++++++++++++++++++
 6 files changed, 198 insertions(+)
 rename test/integration/{ => deprecated}/test-association-hasmany-add-array.js (100%)
 rename test/integration/{ => deprecated}/test-association-hasmany-add.js (100%)
 rename test/integration/{ => deprecated}/test-association-hasmany-set-array.js (100%)
 rename test/integration/{ => deprecated}/test-association-hasmany-set-multiple.js (100%)
 rename test/integration/{ => deprecated}/test-association-hasmany-set.js (100%)

diff --git a/test/integration/test-association-hasmany-add-array.js b/test/integration/deprecated/test-association-hasmany-add-array.js
similarity index 100%
rename from test/integration/test-association-hasmany-add-array.js
rename to test/integration/deprecated/test-association-hasmany-add-array.js
diff --git a/test/integration/test-association-hasmany-add.js b/test/integration/deprecated/test-association-hasmany-add.js
similarity index 100%
rename from test/integration/test-association-hasmany-add.js
rename to test/integration/deprecated/test-association-hasmany-add.js
diff --git a/test/integration/test-association-hasmany-set-array.js b/test/integration/deprecated/test-association-hasmany-set-array.js
similarity index 100%
rename from test/integration/test-association-hasmany-set-array.js
rename to test/integration/deprecated/test-association-hasmany-set-array.js
diff --git a/test/integration/test-association-hasmany-set-multiple.js b/test/integration/deprecated/test-association-hasmany-set-multiple.js
similarity index 100%
rename from test/integration/test-association-hasmany-set-multiple.js
rename to test/integration/deprecated/test-association-hasmany-set-multiple.js
diff --git a/test/integration/test-association-hasmany-set.js b/test/integration/deprecated/test-association-hasmany-set.js
similarity index 100%
rename from test/integration/test-association-hasmany-set.js
rename to test/integration/deprecated/test-association-hasmany-set.js
diff --git a/test/integration2/association-hasmany.js b/test/integration2/association-hasmany.js
index a76aaf4a..581b777c 100644
--- a/test/integration2/association-hasmany.js
+++ b/test/integration2/association-hasmany.js
@@ -257,4 +257,202 @@ describe("hasMany", function() {
 			});
 		});
 	});
+
+	describe("addAccessor", function () {
+		before(setup());
+
+		it("might add duplicates", function (done) {
+			Pet.find({ name: "Mutt" }, function (err, pets) {
+				Person.find({ name: "Jane" }, function (err, people) {
+					should.equal(err, null);
+
+					people[0].addPets(pets[0], function (err) {
+						should.equal(err, null);
+
+						people[0].getPets("name", function (err, pets) {
+							should.equal(err, null);
+
+							should(Array.isArray(pets));
+							pets.length.should.equal(2);
+							pets[0].name.should.equal("Mutt");
+							pets[1].name.should.equal("Mutt");
+
+							return done();
+						});
+					});
+				});
+			});
+		});
+	});
+
+	describe("addAccessor", function () {
+		before(setup());
+
+		it("should keep associations and add new ones", function (done) {
+			Pet.find({ name: "Deco" }, function (err, pets) {
+				Person.find({ name: "Jane" }, function (err, people) {
+					should.equal(err, null);
+
+					people[0].addPets(pets[0], function (err) {
+						should.equal(err, null);
+
+						people[0].getPets("name", function (err, pets) {
+							should.equal(err, null);
+
+							should(Array.isArray(pets));
+							pets.length.should.equal(2);
+							pets[0].name.should.equal("Deco");
+							pets[1].name.should.equal("Mutt");
+
+							return done();
+						});
+					});
+				});
+			});
+		});
+	});
+
+	describe("addAccessor", function () {
+		before(setup());
+
+		it("should accept several arguments as associations", function (done) {
+			Pet.find(function (err, pets) {
+				Person.find({ name: "Justin" }, function (err, people) {
+					should.equal(err, null);
+
+					people[0].addPets(pets[0], pets[1], function (err) {
+						should.equal(err, null);
+
+						people[0].getPets(function (err, pets) {
+							should.equal(err, null);
+
+							should(Array.isArray(pets));
+							pets.length.should.equal(2);
+
+							return done();
+						});
+					});
+				});
+			});
+		});
+	});
+
+	describe("addAccessor", function () {
+		before(setup());
+
+		it("should accept array as list of associations", function (done) {
+			Pet.find(function (err, pets) {
+				Person.find({ name: "Justin" }, function (err, people) {
+					should.equal(err, null);
+
+					people[0].addPets(pets, function (err) {
+						should.equal(err, null);
+
+						people[0].getPets(function (err, all_pets) {
+							should.equal(err, null);
+
+							should(Array.isArray(all_pets));
+							all_pets.length.should.equal(pets.length);
+
+							return done();
+						});
+					});
+				});
+			});
+		});
+	});
+
+	describe("setAccessor", function () {
+		before(setup());
+
+		it("clears current associations", function (done) {
+			Pet.find({ name: "Deco" }, function (err, pets) {
+				var Deco = pets[0];
+
+				Person.find({ name: "Jane" }, function (err, people) {
+					should.equal(err, null);
+
+					people[0].getPets(function (err, pets) {
+						should.equal(err, null);
+
+						should(Array.isArray(pets));
+						pets.length.should.equal(1);
+						pets[0].name.should.equal("Mutt");
+
+						people[0].setPets(Deco, function (err) {
+							should.equal(err, null);
+
+							people[0].getPets(function (err, pets) {
+								should.equal(err, null);
+
+								should(Array.isArray(pets));
+								pets.length.should.equal(1);
+								pets[0].name.should.equal(Deco.name);
+
+								return done();
+							});
+						});
+					});
+				});
+			});
+		});
+	});
+
+	describe("setAccessor", function () {
+		before(setup());
+
+		it("should accept several arguments as associations", function (done) {
+			Pet.find(function (err, pets) {
+				Person.find({ name: "Justin" }, function (err, people) {
+					should.equal(err, null);
+
+					people[0].setPets(pets[0], pets[1], function (err) {
+						should.equal(err, null);
+
+						people[0].getPets(function (err, pets) {
+							should.equal(err, null);
+
+							should(Array.isArray(pets));
+							pets.length.should.equal(2);
+
+							return done();
+						});
+					});
+				});
+			});
+		});
+
+		it("should accept an array of associations", function (done) {
+			Pet.find(function (err, pets) {
+				Person.find({ name: "Justin" }, function (err, people) {
+					should.equal(err, null);
+
+					people[0].setPets(pets, function (err) {
+						should.equal(err, null);
+
+						people[0].getPets(function (err, all_pets) {
+							should.equal(err, null);
+
+							should(Array.isArray(all_pets));
+							all_pets.length.should.equal(pets.length);
+
+							return done();
+						});
+					});
+				});
+			});
+		});
+
+		it("should throw if no items passed", function (done) {
+			Person.find(1, function (err, people) {
+				should.equal(err, null);
+
+				(function () {
+					people[0].addPets(function () {});
+				}).should.throw();
+
+				return done();
+			});
+		});
+	});
 });

From 43741027547e1b3777850eae9e938cb3d94f792e Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 18:04:56 +0100
Subject: [PATCH 0615/1246] Renames chain-model-find test to model-find-chain
 to be similar to other names

---
 test/integration2/{chain-model-find.js => model-find-chain.js} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/integration2/{chain-model-find.js => model-find-chain.js} (100%)

diff --git a/test/integration2/chain-model-find.js b/test/integration2/model-find-chain.js
similarity index 100%
rename from test/integration2/chain-model-find.js
rename to test/integration2/model-find-chain.js

From d1698ded8a92d2c5bd786b0336901f5ff5bec04f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 19:00:01 +0100
Subject: [PATCH 0616/1246] Deprecates Model.hasOne.findBy() test, already in
 new framework

---
 .../{ => deprecated}/test-association-hasone-findby.js            | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/integration/{ => deprecated}/test-association-hasone-findby.js (100%)

diff --git a/test/integration/test-association-hasone-findby.js b/test/integration/deprecated/test-association-hasone-findby.js
similarity index 100%
rename from test/integration/test-association-hasone-findby.js
rename to test/integration/deprecated/test-association-hasone-findby.js

From b2c80a51977843f16a481ce895adb489b9d9617c Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 19:02:21 +0100
Subject: [PATCH 0617/1246] Reindents Model.hasOne header declarations

---
 test/integration2/association-hasone.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/integration2/association-hasone.js b/test/integration2/association-hasone.js
index ff278c1d..e2a766b0 100644
--- a/test/integration2/association-hasone.js
+++ b/test/integration2/association-hasone.js
@@ -1,8 +1,8 @@
-var _				= require('lodash');
-var should	 = require('should');
-var helper	 = require('../support/spec_helper');
-var async		= require('async');
-var ORM			= require('../../');
+var ORM    = require('../../');
+var helper = require('../support/spec_helper');
+var should = require('should');
+var async  = require('async');
+var _      = require('lodash');
 
 describe("hasOne", function() {
 	var db    = null;

From 1293a2051fbbef97273f9dc2a52d7cad13d7d6a0 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 19:16:42 +0100
Subject: [PATCH 0618/1246] Adds tests for Model.hasOne required option

---
 .../test-association-hasone-required.js       |  0
 .../association-hasone-required.js            | 83 +++++++++++++++++++
 2 files changed, 83 insertions(+)
 rename test/integration/{ => deprecated}/test-association-hasone-required.js (100%)
 create mode 100644 test/integration2/association-hasone-required.js

diff --git a/test/integration/test-association-hasone-required.js b/test/integration/deprecated/test-association-hasone-required.js
similarity index 100%
rename from test/integration/test-association-hasone-required.js
rename to test/integration/deprecated/test-association-hasone-required.js
diff --git a/test/integration2/association-hasone-required.js b/test/integration2/association-hasone-required.js
new file mode 100644
index 00000000..80f01c33
--- /dev/null
+++ b/test/integration2/association-hasone-required.js
@@ -0,0 +1,83 @@
+var ORM    = require('../../');
+var helper = require('../support/spec_helper');
+var should = require('should');
+var async  = require('async');
+var _      = require('lodash');
+
+describe("hasOne", function() {
+	var db     = null;
+	var Person = null;
+
+	var setup = function (required) {
+		return function (done) {
+			db.settings.set('instance.cache', false);
+
+			Person = db.define('person', {
+				name     : String
+			});
+			Person.hasOne('parent', Person, {
+				required : required
+			});
+
+			return helper.dropSync(Person, done);
+		};
+	};
+
+	before(function(done) {
+		helper.connect(function (connection) {
+			db = connection;
+			done();
+		});
+	});
+
+	describe("required", function () {
+		before(setup(true));
+
+		it("should not accept empty association", function (done) {
+			var John = new Person({
+				name      : "John",
+				parent_id : null
+			});
+			John.save(function (err) {
+				should.exist(err);
+				return done();
+			});
+		});
+
+		it("should accept association", function (done) {
+			var John = new Person({
+				name      : "John",
+				parent_id : 1
+			});
+			John.save(function (err) {
+				should.not.exist(err);
+				return done();
+			});
+		});
+	});
+
+	describe("not required", function () {
+		before(setup(false));
+
+		it("should accept empty association", function (done) {
+			var John = new Person({
+				name : "John"
+			});
+			John.save(function (err) {
+				should.not.exist(err);
+				return done();
+			});
+		});
+
+		it("should accept null association", function (done) {
+			var John = new Person({
+				name      : "John",
+				parent_id : null
+			});
+			John.save(function (err) {
+				should.not.exist(err);
+				return done();
+			});
+		});
+	});
+});

From 431f1da2a4d8eee0365efcf54fdf11f4294968ce Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 19:23:06 +0100
Subject: [PATCH 0619/1246] Adds association name lettercase test to new
 framework

---
 .../test-association-name-lettercase.js       |  0
 test/integration2/association-hasone.js       | 30 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 rename test/integration/{ => deprecated}/test-association-name-lettercase.js (100%)

diff --git a/test/integration/test-association-name-lettercase.js b/test/integration/deprecated/test-association-name-lettercase.js
similarity index 100%
rename from test/integration/test-association-name-lettercase.js
rename to test/integration/deprecated/test-association-name-lettercase.js
diff --git a/test/integration2/association-hasone.js b/test/integration2/association-hasone.js
index e2a766b0..943a4a2f 100644
--- a/test/integration2/association-hasone.js
+++ b/test/integration2/association-hasone.js
@@ -277,6 +277,36 @@ describe("hasOne", function() {
 		});
 	});
 
+	describe("association name letter case", function () {
+		it("should be kept", function (done) {
+			db.settings.set('instance.cache', false);
+			db.settings.set('instance.returnAllErrors', true);
+
+			var Person = db.define("person", {
+				name : String
+			});
+			Person.hasOne("topParent", Person);
+
+			helper.dropSync(Person, function () {
+				Person.create({
+					name : "Child"
+				}, function (err) {
+					should.equal(err, null);
+
+					Person.get(1, function (err, person) {
+						should.equal(err, null);
+
+						person.setTopParent.should.be.a("function");
+						person.removeTopParent.should.be.a("function");
+						person.hasTopParent.should.be.a("function");
+
+						return done();
+					});
+				});
+			});
+		});
+	});
+
 	describe("findBy()", function () {
 		before(setup());
 

From ff2412741dea69b74074e7824d2cc6bb4696f993 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 19:37:23 +0100
Subject: [PATCH 0620/1246] Adds test for primary key property name change to
 new framework

---
 .../test-settings-properties-primary-key.js   |  0
 test/integration2/model-get.js                | 35 +++++++++++++++++++
 2 files changed, 35 insertions(+)
 rename test/integration/{ => deprecated}/test-settings-properties-primary-key.js (100%)

diff --git a/test/integration/test-settings-properties-primary-key.js b/test/integration/deprecated/test-settings-properties-primary-key.js
similarity index 100%
rename from test/integration/test-settings-properties-primary-key.js
rename to test/integration/deprecated/test-settings-properties-primary-key.js
diff --git a/test/integration2/model-get.js b/test/integration2/model-get.js
index d95e4912..12aa0013 100644
--- a/test/integration2/model-get.js
+++ b/test/integration2/model-get.js
@@ -241,4 +241,39 @@ describe("Model.get()", function() {
 			return done();
 		});
 	});
+
+	describe("if primary key name is changed", function () {
+		before(function (done) {
+			Person = db.define("person", {
+				name : String
+			});
+
+			ORM.singleton.clear();
+
+			return helper.dropSync(Person, function () {
+				Person.create([{
+					name : "John Doe"
+				}, {
+					name : "Jane Doe"
+				}], done);
+			});
+		});
+
+		it("should search by key name and not 'id'", function (done) {
+			db.settings.set('properties.primary_key', 'name');
+
+			var OtherPerson = db.define("person", {
+				id : Number
+			});
+
+			OtherPerson.get("Jane Doe", function (err, person) {
+				should.equal(err, null);
+
+				person.id.should.be.a("number");
+				person.name.should.equal("Jane Doe");
+
+				return done();
+			});
+		});
+	});
 });

From 78f04c184df8a5456f1cc66fae46374cfea0f886 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 21:44:43 +0100
Subject: [PATCH 0621/1246] Adds missing ErrorCodes dependency to
 lib/Property.js

---
 lib/Property.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Property.js b/lib/Property.js
index da4156f9..b894da1a 100644
--- a/lib/Property.js
+++ b/lib/Property.js
@@ -1,3 +1,5 @@
+var ErrorCodes = require("./ErrorCodes");
+
 exports.normalize = function (prop, Settings) {
 	if (typeof prop == "function") {
 		switch (prop.name) {

From d1b177ba3199c4e62fef3606b7d14487c417ab41 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 21:45:56 +0100
Subject: [PATCH 0622/1246] Fixes reversed hasOne association on the reversed
 model not being correctly saved (#216)

---
 lib/Instance.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/lib/Instance.js b/lib/Instance.js
index 471cd138..40528295 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -219,6 +219,19 @@ function Instance(Model, opts) {
 		for (i = 0; i < opts.one_associations.length; i++) {
 			(function (assoc) {
 				if (!instance[assoc.name] || typeof instance[assoc.name] != "object") return;
+				if (assoc.reversed) {
+					// reversed hasOne associations should behave like hasMany
+					if (!Array.isArray(instance[assoc.name])) {
+						instance[assoc.name] = [ instance[assoc.name] ];
+					}
+					for (var i = 0; i < instance[assoc.name].length; i++) {
+						if (!instance[assoc.name][i].isInstance) {
+							instance[assoc.name][i] = new assoc.model(instance[assoc.name][i]);
+						}
+						saveAssociation(assoc.setAccessor, instance[assoc.name][i]);
+					}
+					return;
+				}
 				if (!instance[assoc.name].isInstance) {
 					instance[assoc.name] = new assoc.model(instance[assoc.name]);
 				}

From 261f319e5d602429d91536f0880c0e8fc3629da2 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 4 Jul 2013 22:36:31 +0100
Subject: [PATCH 0623/1246] Refactored Model.hasOne() constructor to be able to
 mix parameters

The ideia is in the future you can avoid passing a name (using other
Models table name) or chaining the call and use define for example like
this:

```js
Person.hasOne(Dog).as("pet");
```
---
 lib/Associations/One.js | 75 ++++++++++++++++++++++++++---------------
 1 file changed, 47 insertions(+), 28 deletions(-)

diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index 98038807..ef9affd5 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -1,36 +1,55 @@
-var Settings = require("../Settings");
+var Settings  = require("../Settings");
+var Accessors = { "get": "get", "set": "set", "has": "has", "del": "remove" };
+var _         = require("lodash");
 
 exports.prepare = function (Model, associations, association_properties, model_fields) {
-	Model.hasOne = function (name, OtherModel, opts) {
-		if (typeof OtherModel == "object" && !OtherModel.table) {
-			opts = OtherModel;
-			OtherModel = null;
-		}
-		opts = opts || {};
-
-		var assocName = opts.name || ucfirst(name);
+	Model.hasOne = function () {
+		var assocName;
 		var association = {
-			name           : name,
-			model          : OtherModel || Model,
-			reversed       : opts.reversed || false,
-			extension      : opts.extension || false,
-			autoFetch      : opts.autoFetch || false,
-			autoFetchLimit : opts.autoFetchLimit || 2,
-			field          : opts.field || Model.settings.get("properties.association_key").replace("{name}", name),
-			required       : opts.required || false,
-			getAccessor    : opts.getAccessor || ("get" + assocName),
-			setAccessor    : opts.setAccessor || ("set" + assocName),
-			hasAccessor    : opts.hasAccessor || ("has" + assocName),
-			delAccessor    : opts.delAccessor || ("remove" + assocName)
+			name           : Model.table,
+			model          : Model,
+			reversed       : false,
+			extension      : false,
+			autoFetch      : false,
+			autoFetchLimit : 2,
+			required       : false
 		};
+
+		for (var i = 0; i < arguments.length; i++) {
+			switch (typeof arguments[i]) {
+				case "string":
+					association.name = arguments[i];
+					break;
+				case "function":
+					if (arguments[i].table) {
+						association.model = arguments[i];
+					}
+					break;
+				case "object":
+					association = _.extend(association, arguments[i]);
+					break;
+			}
+		}
+
+		assocName = ucfirst(association.name);
+
+		if (!association.hasOwnProperty("field")) {
+			association.field = Model.settings.get("properties.association_key").replace("{name}", association.name.toLowerCase());
+		}
+		for (var k in Accessors) {
+			if (!association.hasOwnProperty(k + "Accessor")) {
+				association[k + "Accessor"] = Accessors[k] + assocName;
+			}
+		}
+
 		associations.push(association);
 		association_properties.push(association.field);
-		if(!opts.reversed) {
+		if(!association.reversed) {
 			model_fields.push(association.field);
 		}
 
-		if (opts.reverse) {
-			OtherModel.hasOne(opts.reverse, Model, {
+		if (association.reverse) {
+			association.model.hasOne(association.reverse, Model, {
 				reversed       : true,
 				field          : association.field,
 				autoFetch      : association.autoFetch,
@@ -61,10 +80,10 @@ exports.prepare = function (Model, associations, association_properties, model_f
 			}
 
 			options.__merge = {
-				from: { table: association.model.table, field: association.model.id },
-				to: { table: Model.table, field: association.field },
-				where: [ association.model.table, conditions ],
-				table: Model.table
+				from  : { table: association.model.table, field: association.model.id },
+				to    : { table: Model.table, field: association.field },
+				where : [ association.model.table, conditions ],
+				table : Model.table
 			};
 			options.extra = [];
 

From cb9620c4a2b47314577d41b90518825769dd3654 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 5 Jul 2013 14:23:26 +0100
Subject: [PATCH 0624/1246] Adds 'ready' event to instances and uses it when
 creating instances

---
 lib/Instance.js | 4 ++++
 lib/Model.js    | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/lib/Instance.js b/lib/Instance.js
index 40528295..6e96f3a9 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -565,5 +565,9 @@ function Instance(Model, opts) {
 
 	Hook.trigger(instance, opts.hooks.afterLoad);
 
+	process.nextTick(function () {
+		emitEvent("ready");
+	});
+
 	return instance;
 }
diff --git a/lib/Model.js b/lib/Model.js
index b0f74750..dfe0b0fe 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -81,6 +81,7 @@ function Model(opts) {
 			}
 		}
 
+		var pending  = 2;
 		var instance = new Instance(model, {
 			uid                    : inst_opts.uid, // singleton unique id
 			id                     : opts.id,
@@ -101,6 +102,12 @@ function Model(opts) {
 			extend_associations    : extend_associations,
 			association_properties : association_properties
 		});
+		instance.on("ready", function () {
+			if (--pending > 0) return;
+			if (typeof cb == "function") {
+				return cb(instance);
+			}
+		});
 		if (model_fields !== null) {
 			LazyLoad.extend(instance, model, opts.properties);
 		}
@@ -119,6 +126,7 @@ function Model(opts) {
 					autoFetchLimit : inst_opts.autoFetchLimit,
 					cascadeRemove  : inst_opts.cascadeRemove
 				}, function () {
+					if (--pending > 0) return;
 					if (typeof cb == "function") {
 						return cb(instance);
 					}

From 6756bd68701337caace707bfc543aa8ce047e7d5 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 5 Jul 2013 14:35:04 +0100
Subject: [PATCH 0625/1246] Fixes problem with hasOne associations for none
 persisted instances and autoFetch active just blocking

---
 lib/Associations/One.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index ef9affd5..fe1bbf3e 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -222,7 +222,7 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 	// is set, we don't want to auto fetch anything, since `new Model(owner_id: 12)` takes no
 	// callback, and hence this lookup would complete at an arbitrary point in the future.
 	// The associated entity should probably be fetched when the instance is persisted.
-	if(Instance.isPersisted()) {
+	if (Instance.isPersisted()) {
 		Instance[association.getAccessor]({ autoFetchLimit: opts.autoFetchLimit - 1 }, function (err, Assoc) {
 			if (!err) {
 				Instance[association.name] = Assoc;
@@ -230,6 +230,8 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 
 			return cb();
 		});
+	} else {
+		return cb();
 	}
 }
 

From 04e54c0d898b6a0bdb6ab9b91663b9094425cb9f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 5 Jul 2013 14:35:58 +0100
Subject: [PATCH 0626/1246] Changes Model.create() to wait for createInstance
 callback instead of using the returned value

---
 lib/Model.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/Model.js b/lib/Model.js
index dfe0b0fe..e8d89f8c 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -523,17 +523,18 @@ function Model(opts) {
 				is_new    : true,
 				autoSave  : opts.autoSave,
 				autoFetch : false
-			});
-			Instances[idx].save(function (err) {
-				if (err) {
-					err.index = idx;
-					err.instance = Instances[idx];
+			}, function () {
+				Instances[idx].save(function (err) {
+					if (err) {
+						err.index = idx;
+						err.instance = Instances[idx];
 
-					return cb(err);
-				}
+						return cb(err);
+					}
 
-				idx += 1;
-				createNext();
+					idx += 1;
+					createNext();
+				});
 			});
 		};
 

From 04ee79f8293401adfb386d96649791e3a3e8d4ff Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 5 Jul 2013 14:36:41 +0100
Subject: [PATCH 0627/1246] Adds ability to have the afterLoad hook blocking
 (#219)

---
 lib/Instance.js           |  8 ++++----
 test/integration2/hook.js | 24 ++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 6e96f3a9..ecfa6740 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -563,10 +563,10 @@ function Instance(Model, opts) {
 		}
 	}
 
-	Hook.trigger(instance, opts.hooks.afterLoad);
-
-	process.nextTick(function () {
-		emitEvent("ready");
+	Hook.wait(instance, opts.hooks.afterLoad, function () {
+		process.nextTick(function () {
+			emitEvent("ready");
+		});
 	});
 
 	return instance;
diff --git a/test/integration2/hook.js b/test/integration2/hook.js
index 6a72b7b1..147b2569 100644
--- a/test/integration2/hook.js
+++ b/test/integration2/hook.js
@@ -371,6 +371,30 @@ describe("Hook", function() {
 
 			return done();
 		});
+
+		describe("if hook method has 1 argument", function () {
+			var afterLoad = false;
+
+			before(setup({
+				afterLoad : function (next) {
+					setTimeout(function () {
+						afterLoad = true;
+
+						return next();
+					}.bind(this), 200);
+				}
+			}));
+
+			it("should wait for hook to finish", function (done) {
+				this.timeout(500);
+
+				Person.create([{ name: "John Doe" }], function (err, items) {
+					afterLoad.should.be.true;
+
+					return done();
+				});
+			});
+		});
 	});
 
 	describe("beforeRemove", function () {

From d89afd589eb3b629e73a584a1e94d423c55020fa Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 5 Jul 2013 20:13:48 +0100
Subject: [PATCH 0628/1246] Adds predefined validator .password()

---
 lib/Validators.js                          | 24 ++++++++++++++++
 test/integration2/predefined-validators.js | 32 ++++++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/lib/Validators.js b/lib/Validators.js
index 70f163d1..5164a59f 100644
--- a/lib/Validators.js
+++ b/lib/Validators.js
@@ -118,6 +118,30 @@ validators.unique = function (msg) {
 	};
 };
 
+validators.password = function (checks, msg) {
+	if (!msg) {
+		msg    = checks;
+		checks = "luns6"; // (l)owercase, (u)ppercase, (n)umber, (s)pecial characters, (6) min length
+	}
+	if (!msg) {
+		msg    = "weak-password";
+	}
+	var m = checks.match(/([0-9]+)/);
+	var min_len = (m ? parseInt(m[1], 10) : null);
+
+	return function (v, next) {
+		if (!v) return next(msg);
+
+		if (checks.indexOf("l") >= 0 && !v.match(/[a-z]/)) return next(msg);
+		if (checks.indexOf("u") >= 0 && !v.match(/[A-Z]/)) return next(msg);
+		if (checks.indexOf("n") >= 0 && !v.match(/[0-9]/)) return next(msg);
+		if (checks.indexOf("s") >= 0 && !v.match(/[^a-zA-Z0-9]/)) return next(msg);
+		if (min_len !== null && min_len > v.length) return next(msg);
+
+		return next();
+	};
+};
+
 /**
  * Pattern validators are usually based on regular
  * expressions and solve more complicated validations
diff --git a/test/integration2/predefined-validators.js b/test/integration2/predefined-validators.js
index 19555134..8b3eed2f 100644
--- a/test/integration2/predefined-validators.js
+++ b/test/integration2/predefined-validators.js
@@ -268,6 +268,38 @@ describe("Predefined Validators", function () {
 	});
 
 
+	describe("password()", function () {
+		it("should pass 'Passw0r∂'", function (done) {
+			validators.password()('Passw0r∂', checkValidation(done));
+		});
+		it("should not pass 'password' with 'weak-password'", function (done) {
+			validators.password()('password', checkValidation(done, 'weak-password'));
+		});
+		it("should not pass 'Passw0rd' with 'weak-password'", function (done) {
+			validators.password()('Passw0rd', checkValidation(done, 'weak-password'));
+		});
+	});
+
+
+	describe("password('ln4', 'bad-pwd')", function () {
+		it("should pass 'Passw0r∂'", function (done) {
+			validators.password('ln4', 'bad-pwd')('Passw0r∂', checkValidation(done));
+		});
+		it("should pass 'Passw0rd'", function (done) {
+			validators.password('ln4', 'bad-pwd')('Passw0rd', checkValidation(done));
+		});
+		it("should not pass 'P12345' with 'bad-pwd'", function (done) {
+			validators.password('ln4', 'bad-pwd')('P12345', checkValidation(done, 'bad-pwd'));
+		});
+		it("should not pass 'password' with 'bad-pwd'", function (done) {
+			validators.password('ln4', 'bad-pwd')('password', checkValidation(done, 'bad-pwd'));
+		});
+		it("should not pass 'p12' with 'bad-pwd'", function (done) {
+			validators.password('ln4', 'bad-pwd')('p12', checkValidation(done, 'bad-pwd'));
+		});
+	});
+
+
 	describe("patterns.hexString()", function () {
 		it("should pass 'ABCDEF0123456789'", function (done) {
 			validators.patterns.hexString()('ABCDEF0123456789', checkValidation(done));

From 35d665720af1523364b64ebf4acb0b724ebd4730 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 5 Jul 2013 20:13:59 +0100
Subject: [PATCH 0629/1246] Adds Readme section for predefined validators

---
 Readme.md | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/Readme.md b/Readme.md
index 4866b1ff..148f7466 100755
--- a/Readme.md
+++ b/Readme.md
@@ -738,6 +738,69 @@ orm.connect("....", function (err, db) {
 });
 ```
 
+### Predefined Validations
+
+Predefined validations accept an optional last parameter `msg` that is the `Error.msg` if it's triggered.
+
+#### `required(msg)`
+
+Ensures property is not `null` or `undefined`. It does not trigger any error if property is `0` or empty string.
+
+#### `rangeNumber(min, max, msg)`
+
+Ensures a property is a number between `min` and `max`. Any of the parameters can be passed as `undefined`
+to exclude a minimum or maximum value.
+
+#### `rangeLength(min, max, msg)`
+
+Same as previous validator but for property length (strings).
+
+#### `insideList(list, msg)`
+
+Ensures a property value is inside a list of values.
+
+#### `outsideList(list, msg)`
+
+Ensures a property value is not inside a list of values.
+
+#### `equalToProperty(property, msg)`
+
+Ensures a property value is not the same as another property value in the instance. This validator is good for example for
+password and password repetition check.
+
+#### `notEmptyString(msg)`
+
+This is an alias for `rangeLength(1, undefined, 'empty-string')`.
+
+#### `unique(msg)`
+
+Ensures there's not another instance in your database already with that property value. This validator is good for example for
+unique identifiers.
+
+#### `password([ checks, ]msg)`
+
+Ensures the property value has some defined types of characters, usually wanted in a password. `checks` is optional and
+defaults to `"luns6"` which leans `l`owercase letters, `u`ppercase letters, `n`umbers, `s`pecial characters, with a minimum
+length of `6`.
+
+#### `patterns.match(pattern, modifiers, msg)`
+
+Ensures the property value passes the regular expression pattern (and regex modifiers).
+
+The next `patterns.*` are comodity alias to this one.
+
+#### `patterns.hexString(msg)`
+
+Ensures the property value is an hexadecimal string (uppercase or lowercase).
+
+#### `patterns.email(msg)`
+
+Ensures the property value is a valid e-mail (more or less).
+
+#### `patterns.ipv4(msg)`
+
+Ensures the property value is a valid IPv4 address. It does not accept masks (example: `0` as last number is not valid).
+
 ## Associations
 
 An association is a relation between one or more tables.

From fabb0f4652ee24d3c4b8378da87a48709d1a528f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 5 Jul 2013 22:53:10 +0100
Subject: [PATCH 0630/1246] Adds hook afterAutoFetch triggered after extending
 and auto fetching (if any) associations (#219)

---
 Readme.md                 |  1 +
 lib/Model.js              | 15 +++++++++-----
 test/integration2/hook.js | 42 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/Readme.md b/Readme.md
index 148f7466..9fa9ded8 100755
--- a/Readme.md
+++ b/Readme.md
@@ -373,6 +373,7 @@ will be called when that event happens.
 Currently the following events are supported:
 
 - `afterLoad` : (no parameters) Right after loading and preparing an instance to be used;
+- `afterAutoFetch` : (no parameters) Right after auto-fetching associations (if any), it will trigger regardless of having associations or not;
 - `beforeSave` : (no parameters) Right before trying to save;
 - `afterSave` : (bool success) Right after saving;
 - `beforeCreate` : (no parameters) Right before trying to save a new instance (prior to `beforeSave`);
diff --git a/lib/Model.js b/lib/Model.js
index e8d89f8c..5bb36da0 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -9,11 +9,14 @@ var Singleton         = require("./Singleton");
 var Utilities         = require("./Utilities");
 var Validators        = require("./Validators");
 var ErrorCodes        = require("./ErrorCodes");
+var Hook              = require("./Hook");
 var AvailableHooks    = [
 	"beforeCreate", "afterCreate",
 	"beforeSave", "afterSave",
 	"beforeValidation",
-	"beforeRemove", "afterRemove"
+	"beforeRemove", "afterRemove",
+	"afterLoad",
+	"afterAutoFetch"
 ];
 
 exports.Model = Model;
@@ -126,10 +129,12 @@ function Model(opts) {
 					autoFetchLimit : inst_opts.autoFetchLimit,
 					cascadeRemove  : inst_opts.cascadeRemove
 				}, function () {
-					if (--pending > 0) return;
-					if (typeof cb == "function") {
-						return cb(instance);
-					}
+					Hook.wait(instance, opts.hooks.afterAutoFetch, function (err) {
+						if (--pending > 0) return;
+						if (typeof cb == "function") {
+							return cb(instance);
+						}
+					});
 				});
 			});
 		});
diff --git a/test/integration2/hook.js b/test/integration2/hook.js
index 147b2569..cc31e813 100644
--- a/test/integration2/hook.js
+++ b/test/integration2/hook.js
@@ -397,6 +397,48 @@ describe("Hook", function() {
 		});
 	});
 
+	describe("afterAutoFetch", function () {
+		var afterAutoFetch = false;
+
+		before(setup({
+			afterAutoFetch: function () {
+				afterAutoFetch = true;
+			}
+		}));
+
+		it("should trigger when defining a model", function (done) {
+			var John = new Person({ name: "John" });
+
+			afterAutoFetch.should.be.true;
+
+			return done();
+		});
+
+		describe("if hook method has 1 argument", function () {
+			var afterAutoFetch = false;
+
+			before(setup({
+				afterAutoFetch : function (next) {
+					setTimeout(function () {
+						afterAutoFetch = true;
+
+						return next();
+					}.bind(this), 200);
+				}
+			}));
+
+			it("should wait for hook to finish", function (done) {
+				this.timeout(500);
+
+				Person.create([{ name: "John Doe" }], function (err, items) {
+					afterAutoFetch.should.be.true;
+
+					return done();
+				});
+			});
+		});
+	});
+
 	describe("beforeRemove", function () {
 		before(setup());
 

From 21de079d21902b501f60f470994536b82c9f0aa9 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 5 Jul 2013 23:59:30 +0100
Subject: [PATCH 0631/1246] Exports orm.Text to pass text strings to aggregate
 functions

This allows people to pass parameters as text instead of being
considered property names
---
 lib/ORM.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/ORM.js b/lib/ORM.js
index cf1bf68a..4c63d1b4 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -19,6 +19,7 @@ exports.Settings   = Settings;
 exports.Property   = require("./Property");
 exports.ErrorCodes = ErrorCodes;
 
+exports.Text = Query.Text;
 for (var k in Query.Comparators) {
 	exports[Query.Comparators[k]] = Query[Query.Comparators[k]];
 }

From 3a2b196f643f51363a62be821bd1f02c04652cdc Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sat, 6 Jul 2013 00:00:33 +0100
Subject: [PATCH 0632/1246] Fixes duplicated debug in mysql for aggregate
 functions, creates .call() in aggregates for generic functions (#204)

---
 lib/AggregateFunctions.js   | 20 +++++++++++++++-----
 lib/Drivers/DML/mysql.js    |  6 +++---
 lib/Drivers/DML/postgres.js |  8 +++++++-
 lib/Drivers/DML/sqlite.js   |  5 ++++-
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index e3b5d940..165aeebc 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -70,6 +70,20 @@ function AggregateFunctions(opts) {
 
 			return this;
 		},
+		call: function (fun, args) {
+			if (args.length > 0) {
+				aggregates[aggregates.length - 1].push({ f: fun, a: args, alias: aggregateAlias(fun, args) });
+				// aggregates.push([]);
+			} else {
+				aggregates[aggregates.length - 1].push({ f: fun, alias: aggregateAlias(fun, args) });
+			}
+
+			if (fun == "distinct") {
+				used_distinct = true;
+			}
+
+			return this;
+		},
 		get: function (cb) {
 			if (typeof cb != "function") {
 				throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "You must pass a callback to Model.aggregate().get()");
@@ -86,7 +100,7 @@ function AggregateFunctions(opts) {
 
 			for (i = 0; i < aggregates.length; i++) {
 				for (j = 0; j < aggregates[i].length; j++) {
-					query[aggregates[i][j].f](aggregates[i][j].a, aggregates[i][j].alias);
+					query.fun(aggregates[i][j].f, aggregates[i][j].a, aggregates[i][j].alias);
 				}
 			}
 
@@ -107,10 +121,6 @@ function AggregateFunctions(opts) {
 
 			query = query.build();
 
-			if (opts.driver.opts && opts.driver.opts.debug) {
-				require("./Debug").sql(opts.driver_name, query);
-			}
-
 			opts.driver.execQuery(query, function (err, data) {
 				if (err) {
 					return cb(err);
diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 0dedad1d..a565d7ae 100755
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -80,14 +80,14 @@ Driver.prototype.getQuery = function () {
 };
 
 Driver.prototype.execQuery = function (query, cb) {
+	if (this.opts.debug) {
+		require("../../Debug").sql('mysql', query);
+	}
 	if (this.opts.pool) {
 		this.poolQuery(query, cb);
 	} else {
 		this.db.query(query, cb);
 	}
-	if (this.opts.debug) {
-		require("../../Debug").sql('mysql', query);
-	}
 };
 
 Driver.prototype.find = function (fields, table, conditions, opts, cb) {
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 726f2ace..2312e98c 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -49,6 +49,9 @@ var switchableFunctions = {
 			});
 		},
 		execQuery: function (query, cb) {
+			if (this.opts.debug) {
+				require("../../Debug").sql('mysql', query);
+			}
 			this.db.connect(this.config, function (err, client, done) {
 				if (err) return cb(err);
 
@@ -75,7 +78,10 @@ var switchableFunctions = {
 			this.db.connect(cb);
 		},
 		execQuery: function (query, cb) {
-			this.db.query(query, function(err, result) {
+			if (this.opts.debug) {
+				require("../../Debug").sql('mysql', query);
+			}
+			this.db.query(query, function (err, result) {
 				if (err) {
 					cb(err);
 				} else {
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 11200dff..6e1c8bd6 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -58,6 +58,9 @@ Driver.prototype.getQuery = function () {
 };
 
 Driver.prototype.execQuery = function (query, cb) {
+	if (this.opts.debug) {
+		require("../../Debug").sql('mysql', query);
+	}
 	this.db.all(query, cb);
 };
 
@@ -262,7 +265,7 @@ Driver.prototype.propertyToValue = function (value, property) {
 						millis = '0' + millis;
 					}
 					strdate += ' ' + hours + ':' + minutes + ':' + seconds + '.' + millis + '000';
-					return  strdate; 
+					return  strdate;
 				}
 
 			}

From b1c71e607625ff60ede7194a7751a7e6cb844ac2 Mon Sep 17 00:00:00 2001
From: Brian Romanko <brian@bigbigbomb.com>
Date: Sat, 6 Jul 2013 10:17:09 -0700
Subject: [PATCH 0633/1246] Support for 'point' type as a property

---
 lib/Property.js               | 2 +-
 test/integration2/property.js | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/Property.js b/lib/Property.js
index b894da1a..31bed7c6 100644
--- a/lib/Property.js
+++ b/lib/Property.js
@@ -30,7 +30,7 @@ exports.normalize = function (prop, Settings) {
 		prop = { type: "enum", values: prop };
 	}
 
-	if ([ "text", "number", "boolean", "date", "enum", "object", "binary" ].indexOf(prop.type) == -1) {
+	if ([ "text", "number", "boolean", "date", "enum", "object", "binary", "point" ].indexOf(prop.type) == -1) {
 		throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Unknown property type: " + prop.type);
 	}
 
diff --git a/test/integration2/property.js b/test/integration2/property.js
index ecd24085..807afe83 100644
--- a/test/integration2/property.js
+++ b/test/integration2/property.js
@@ -61,6 +61,11 @@ describe("Property", function () {
 
 			return done();
 		});
+    it("should accept: 'point'", function(done) {
+      Property.normalize("point", ORM.settings).type.should.equal("point");
+      
+      return done();
+    });
 
 		describe("if not valid", function () {
 			it("should throw", function (done) {

From b78c515b64de49b862f3f6ce83410090aa626fb5 Mon Sep 17 00:00:00 2001
From: Brian Romanko <brian@bigbigbomb.com>
Date: Sat, 6 Jul 2013 11:29:17 -0700
Subject: [PATCH 0634/1246] DDL support for POINT types

---
 lib/Drivers/DDL/mysql.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index 8ad94218..19a42a8e 100755
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -172,6 +172,9 @@ function buildColumnDefinition(driver, name, prop) {
 			def = driver.query.escapeId(name) + " ENUM (" +
 			       prop.values.map(driver.query.escapeVal.bind(driver.query)) +
 			")";
+      break;
+    case "point":
+      def = driver.query.escapeId(name) + " POINT";
 			break;
 		default:
 			throw new Error("Unknown property type: '" + prop.type + "'");

From e8342bdb304451888bed58a5516005bccb68e2f7 Mon Sep 17 00:00:00 2001
From: Brian Romanko <brian@bigbigbomb.com>
Date: Sat, 6 Jul 2013 11:29:27 -0700
Subject: [PATCH 0635/1246] save support for point types

---
 lib/Drivers/DML/mysql.js        |  2 ++
 test/integration2/model-save.js | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index a565d7ae..ac2926e7 100755
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -246,6 +246,8 @@ Driver.prototype.propertyToValue = function (value, property) {
 			return (value) ? 1 : 0;
 		case "object":
 			return JSON.stringify(value);
+    case "point":
+      return function() { return 'POINT(' + value[0] + ', ' + value[1] + ')'; };
 		default:
 			return value;
 	}
diff --git a/test/integration2/model-save.js b/test/integration2/model-save.js
index d2d370da..fa0bc067 100644
--- a/test/integration2/model-save.js
+++ b/test/integration2/model-save.js
@@ -196,4 +196,23 @@ describe("Model.save()", function() {
 			});
 		});
 	});
+
+  describe("with a point property", function () {
+    before(setup({type: 'point'}, null));
+
+    it("should save the instance as a geospatial point", function (done) {
+      var John = new Person({
+        name: [51.5177, -0.0968]
+      });
+      John.save(function (err) {
+        should.equal(err, null);
+
+        John.name.should.be.an.instanceOf(Array);
+        John.name.should.have.length(2);
+        John.name[0].should.equal(51.5177);
+        John.name[1].should.equal(-0.0968);
+        return done();
+      });
+    });
+  });
 });

From c26b0ff37a98f52d5bf66e89eccef2f76bed2cdd Mon Sep 17 00:00:00 2001
From: Brian Romanko <brian@bigbigbomb.com>
Date: Sat, 6 Jul 2013 11:38:28 -0700
Subject: [PATCH 0636/1246] Adding a test to ensure that point properties are
 pulled from the database correctly

---
 lib/Drivers/DML/mysql.js        |  2 +-
 test/integration2/model-get.js  | 29 +++++++++++++++++++++++++++++
 test/integration2/model-save.js |  9 ++++-----
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index ac2926e7..dc87a5ca 100755
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -247,7 +247,7 @@ Driver.prototype.propertyToValue = function (value, property) {
 		case "object":
 			return JSON.stringify(value);
     case "point":
-      return function() { return 'POINT(' + value[0] + ', ' + value[1] + ')'; };
+      return function() { return 'POINT(' + value.x + ', ' + value.y + ')'; };
 		default:
 			return value;
 	}
diff --git a/test/integration2/model-get.js b/test/integration2/model-get.js
index 12aa0013..639e35ef 100644
--- a/test/integration2/model-get.js
+++ b/test/integration2/model-get.js
@@ -276,4 +276,33 @@ describe("Model.get()", function() {
 			});
 		});
 	});
+
+  describe("with a point property type", function() {
+    before(function (done) {
+      Person = db.define("person", {
+        name : String,
+        location: {type: 'point'}
+      });
+
+      ORM.singleton.clear();
+
+      return helper.dropSync(Person, function () {
+        Person.create([{
+          name : "John Doe",
+          location: {x: 51.5177, y: -0.0968}
+        }], done);
+      });
+    });
+
+    it("should deserialize the point to an array", function (done) {
+      Person.get("John Doe", function(err, person) {
+        should.equal(err, null);
+
+        person.location.should.be.an.instanceOf(Object);
+        person.location.should.have.property('x', 51.5177);
+        person.location.should.have.property('y', -0.0968);
+        return done();
+      });
+    });
+  });
 });
diff --git a/test/integration2/model-save.js b/test/integration2/model-save.js
index fa0bc067..dda795ce 100644
--- a/test/integration2/model-save.js
+++ b/test/integration2/model-save.js
@@ -202,15 +202,14 @@ describe("Model.save()", function() {
 
     it("should save the instance as a geospatial point", function (done) {
       var John = new Person({
-        name: [51.5177, -0.0968]
+        name: {x: 51.5177, y: -0.0968}
       });
       John.save(function (err) {
         should.equal(err, null);
 
-        John.name.should.be.an.instanceOf(Array);
-        John.name.should.have.length(2);
-        John.name[0].should.equal(51.5177);
-        John.name[1].should.equal(-0.0968);
+        John.name.should.be.an.instanceOf(Object);
+        John.name.should.have.property('x', 51.5177);
+        John.name.should.have.property('y', -0.0968);
         return done();
       });
     });

From e5dd381b2fe8f34a1393c06064be626faeb38c89 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sun, 7 Jul 2013 21:22:07 +0100
Subject: [PATCH 0637/1246] sql-query@0.1.3 (#221)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 05dae53c..fd46478a 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
   },
   "analyse"     : false,
   "dependencies": {
-    "sql-query" : "0.1.2",
+    "sql-query" : "0.1.3",
     "hat"       : "0.0.3",
     "lodash"    : "1.3.1"
   },

From 26d88a96cefef15ced9a0baffe69ad237035dc22 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 8 Jul 2013 01:11:34 +0100
Subject: [PATCH 0638/1246] Adds point support for all drivers (#221)

Changes unknown property type error to throw a well defined code
---
 lib/Drivers/DDL/mysql.js    | 12 ++++++++----
 lib/Drivers/DDL/postgres.js |  9 ++++++++-
 lib/Drivers/DDL/sqlite.js   |  6 +++++-
 lib/Drivers/DML/mysql.js    |  4 ++--
 lib/Drivers/DML/postgres.js | 12 ++++++++++++
 5 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index 19a42a8e..ada5322b 100755
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -1,3 +1,5 @@
+var ErrorCodes = require("../../ErrorCodes");
+
 exports.drop = function (driver, opts, cb) {
 	var i, queries = [], pending;
 
@@ -172,12 +174,14 @@ function buildColumnDefinition(driver, name, prop) {
 			def = driver.query.escapeId(name) + " ENUM (" +
 			       prop.values.map(driver.query.escapeVal.bind(driver.query)) +
 			")";
-      break;
-    case "point":
-      def = driver.query.escapeId(name) + " POINT";
+			break;
+		case "point":
+			def = driver.query.escapeId(name) + " POINT";
 			break;
 		default:
-			throw new Error("Unknown property type: '" + prop.type + "'");
+			throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Unknown property type: '" + prop.type + "'", {
+				property : prop
+			});
 	}
 	if (prop.required === true) {
 		def += " NOT NULL";
diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index 6e41e282..b87912a5 100755
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -1,3 +1,5 @@
+var ErrorCodes = require("../../ErrorCodes");
+
 exports.drop = function (driver, opts, cb) {
 	var i, queries = [], pending;
 
@@ -211,8 +213,13 @@ function buildColumnDefinition(driver, table, name, prop) {
 		case "enum":
 			def = driver.query.escapeId(name) + " " + driver.query.escapeId("enum_" + table + "_" + name);
 			break;
+		case "point":
+			def = driver.query.escapeId(name) + " POINT";
+			break;
 		default:
-			throw new Error("Unknown property type: '" + prop.type + "'");
+			throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Unknown property type: '" + prop.type + "'", {
+				property : prop
+			});
 	}
 	if (prop.required === true) {
 		def += " NOT NULL";
diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index dd6c4046..17d679d3 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -1,3 +1,5 @@
+var ErrorCodes = require("../../ErrorCodes");
+
 exports.drop = function (driver, opts, cb) {
 	var i, queries = [], pending;
 
@@ -154,7 +156,9 @@ function buildColumnDefinition(driver, name, prop) {
 			def = driver.query.escapeId(name) + " INTEGER";
 			break;
 		default:
-			throw new Error("Unknown property type: '" + prop.type + "'");
+			throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Unknown property type: '" + prop.type + "'", {
+				property : prop
+			});
 	}
 	if (prop.required === true) {
 		def += " NOT NULL";
diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index dc87a5ca..47f4eaee 100755
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -246,8 +246,8 @@ Driver.prototype.propertyToValue = function (value, property) {
 			return (value) ? 1 : 0;
 		case "object":
 			return JSON.stringify(value);
-    case "point":
-      return function() { return 'POINT(' + value.x + ', ' + value.y + ')'; };
+		case "point":
+			return function() { return 'POINT(' + value.x + ', ' + value.y + ')'; };
 		default:
 			return value;
 	}
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 2312e98c..d87ad721 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -265,6 +265,14 @@ Driver.prototype.valueToProperty = function (value, property) {
 				return null;
 			}
 			break;
+		case "point":
+			if (typeof value == "string") {
+				var m = value.match(/\((\-?[\d\.]+)[\s,]+(\-?[\d\.]+)\)/);
+				if (m) {
+					return { x : parseFloat(m[1], 10) , y : parseFloat(m[2], 10) };
+				}
+			}
+			return value;
 		case "number":
 			if (value !== null) {
 				return Number(value);
@@ -278,6 +286,10 @@ Driver.prototype.propertyToValue = function (value, property) {
 	switch (property.type) {
 		case "object":
 			return JSON.stringify(value);
+		case "point":
+			return function () {
+				return "POINT(" + value.x + ', ' + value.y + ")";
+			};
 		default:
 			return value;
 	}

From 17f6b7c6902ae23d4e2428a22f32a5111158b5e7 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 8 Jul 2013 01:12:11 +0100
Subject: [PATCH 0639/1246] Changes Model.sync() to catch throwed errors and
 pass them to the callback

---
 lib/Model.js | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/lib/Model.js b/lib/Model.js
index 5bb36da0..4bf9b55b 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -212,16 +212,20 @@ function Model(opts) {
 			cb = function () {};
 		}
 		if (typeof opts.driver.sync == "function") {
-			opts.driver.sync({
-				extension           : opts.extension,
-				keys                : opts.keys,
-				table               : opts.table,
-				properties          : opts.properties,
-				indexes             : opts.indexes || [],
-				one_associations    : one_associations,
-				many_associations   : many_associations,
-				extend_associations : extend_associations
-			}, cb);
+			try {
+				opts.driver.sync({
+					extension           : opts.extension,
+					keys                : opts.keys,
+					table               : opts.table,
+					properties          : opts.properties,
+					indexes             : opts.indexes || [],
+					one_associations    : one_associations,
+					many_associations   : many_associations,
+					extend_associations : extend_associations
+				}, cb);
+			} catch (e) {
+				return cb(e);
+			}
 
 			return this;
 		}

From 1df422a4a7a92e3743c8e49002e4589c94aac851 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 8 Jul 2013 01:12:37 +0100
Subject: [PATCH 0640/1246] Changes test spec_helper.dropSync to return any
 sync error to callback

---
 test/support/spec_helper.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/test/support/spec_helper.js b/test/support/spec_helper.js
index 9204cb8f..927d02f8 100644
--- a/test/support/spec_helper.js
+++ b/test/support/spec_helper.js
@@ -17,11 +17,7 @@ module.exports.dropSync = function (models, done) {
 		item.drop(function (err) {
 			if (err) throw err
 
-			item.sync(function (err) {
-				if (err) throw err
-
-				return cb();
-			});
+			item.sync(cb);
 		});
 	}, done);
 };

From a97197fcec71fb830dd0f71b127a2f309f597c2f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 8 Jul 2013 01:13:08 +0100
Subject: [PATCH 0641/1246] Updates tests for new point property to avoid
 drivers that don't support it (like sqlite) (#221)

---
 test/integration2/model-get.js  | 58 +++++++++++++++++----------------
 test/integration2/model-save.js | 38 +++++++++++----------
 2 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/test/integration2/model-get.js b/test/integration2/model-get.js
index 639e35ef..e07493a9 100644
--- a/test/integration2/model-get.js
+++ b/test/integration2/model-get.js
@@ -277,32 +277,34 @@ describe("Model.get()", function() {
 		});
 	});
 
-  describe("with a point property type", function() {
-    before(function (done) {
-      Person = db.define("person", {
-        name : String,
-        location: {type: 'point'}
-      });
-
-      ORM.singleton.clear();
-
-      return helper.dropSync(Person, function () {
-        Person.create([{
-          name : "John Doe",
-          location: {x: 51.5177, y: -0.0968}
-        }], done);
-      });
-    });
-
-    it("should deserialize the point to an array", function (done) {
-      Person.get("John Doe", function(err, person) {
-        should.equal(err, null);
-
-        person.location.should.be.an.instanceOf(Object);
-        person.location.should.have.property('x', 51.5177);
-        person.location.should.have.property('y', -0.0968);
-        return done();
-      });
-    });
-  });
+	describe("with a point property type", function() {
+		it("should deserialize the point to an array", function (done) {
+			db.settings.set('properties.primary_key', 'id');
+
+			Person = db.define("person", {
+				name     : String,
+				location : { type: "point" }
+			});
+
+			ORM.singleton.clear();
+
+			return helper.dropSync(Person, function (err) {
+				if (err) {
+					return done(); // not supported
+				}
+
+				Person.create({
+					name     : "John Doe",
+					location : { x : 51.5177, y : -0.0968 }
+				}, function (err, person) {
+					should.equal(err, null);
+
+					person.location.should.be.an.instanceOf(Object);
+					person.location.should.have.property('x', 51.5177);
+					person.location.should.have.property('y', -0.0968);
+					return done();
+				});
+			});
+		});
+	});
 });
diff --git a/test/integration2/model-save.js b/test/integration2/model-save.js
index dda795ce..73d72ff8 100644
--- a/test/integration2/model-save.js
+++ b/test/integration2/model-save.js
@@ -197,21 +197,25 @@ describe("Model.save()", function() {
 		});
 	});
 
-  describe("with a point property", function () {
-    before(setup({type: 'point'}, null));
-
-    it("should save the instance as a geospatial point", function (done) {
-      var John = new Person({
-        name: {x: 51.5177, y: -0.0968}
-      });
-      John.save(function (err) {
-        should.equal(err, null);
-
-        John.name.should.be.an.instanceOf(Object);
-        John.name.should.have.property('x', 51.5177);
-        John.name.should.have.property('y', -0.0968);
-        return done();
-      });
-    });
-  });
+	describe("with a point property", function () {
+		it("should save the instance as a geospatial point", function (done) {
+			setup({ type: "point" }, null)(function (err) {
+				if (err) {
+					return done(); // not supported
+				}
+
+				var John = new Person({
+					name: { x: 51.5177, y: -0.0968 }
+				});
+				John.save(function (err) {
+					should.equal(err, null);
+
+					John.name.should.be.an.instanceOf(Object);
+					John.name.should.have.property('x', 51.5177);
+					John.name.should.have.property('y', -0.0968);
+					return done();
+				});
+			});
+		});
+	});
 });

From a8e14b9c1e764a422ad5b86b50c05261aa9c6566 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 10 Jul 2013 19:58:36 +0100
Subject: [PATCH 0642/1246] Splits *Association.extend() into .extend() +
 .autoFetch() (#15)

This allows associations to extend instance methods immediately and
then autoFetch if needed.
---
 lib/Associations/Extend.js | 36 +++++++++++++++++++++++++++++++-----
 lib/Associations/Many.js   | 16 ++++++++++++----
 lib/Associations/One.js    | 16 ++++++++++++----
 lib/Model.js               | 27 ++++++++++++---------------
 4 files changed, 67 insertions(+), 28 deletions(-)

diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index d8e4e378..b3ae2073 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -32,13 +32,19 @@ exports.prepare = function (db, Model, associations, association_properties, mod
 	};
 };
 
-exports.extend = function (Model, Instance, Driver, associations, opts, cb) {
+exports.extend = function (Model, Instance, Driver, associations, opts) {
+	for (var i = 0; i < associations.length; i++) {
+		extendInstance(Model, Instance, Driver, associations[i], opts);
+	}
+};
+
+exports.autoFetch = function (Instance, associations, opts, cb) {
 	if (associations.length === 0) {
 		return cb();
 	}
 
 	var pending = associations.length;
-	var extendDone = function extendDone() {
+	var autoFetchDone = function autoFetchDone() {
 		pending -= 1;
 
 		if (pending === 0) {
@@ -47,11 +53,11 @@ exports.extend = function (Model, Instance, Driver, associations, opts, cb) {
 	};
 
 	for (var i = 0; i < associations.length; i++) {
-		extendInstance(Model, Instance, Driver, associations[i], opts, extendDone);
+		autoFetchInstance(Instance, associations[i], opts, autoFetchDone);
 	}
 };
 
-function extendInstance(Model, Instance, Driver, association, opts, cb) {
+function extendInstance(Model, Instance, Driver, association, opts) {
 	Object.defineProperty(Instance, association.hasAccessor, {
 		value : function (cb) {
 			if (!Instance[Model.id]) {
@@ -129,8 +135,28 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 		},
 		enumerable : false
 	});
+}
+
+function autoFetchInstance(Instance, association, opts, cb) {
+	if (!opts.hasOwnProperty("autoFetchLimit") || typeof opts.autoFetchLimit == "undefined") {
+		opts.autoFetchLimit = association.autoFetchLimit;
+	}
+
+	if (opts.autoFetchLimit === 0 || (!opts.autoFetch && !association.autoFetch)) {
+		return cb();
+	}
+
+	if (Instance.isPersisted()) {
+		Instance[association.getAccessor]({ autoFetchLimit: opts.autoFetchLimit - 1 }, function (err, Assoc) {
+			if (!err) {
+				Instance[association.name] = Assoc;
+			}
 
-	return cb();
+			return cb();
+		});
+	} else {
+		return cb();
+	}
 }
 
 function ucfirst(text) {
diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 9cdb4a25..228b7b98 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -78,13 +78,19 @@ exports.prepare = function (Model, associations) {
 	};
 };
 
-exports.extend = function (Model, Instance, Driver, associations, opts, cb) {
+exports.extend = function (Model, Instance, Driver, associations, opts) {
+	for (var i = 0; i < associations.length; i++) {
+		extendInstance(Model, Instance, Driver, associations[i], opts);
+	}
+};
+
+exports.autoFetch = function (Instance, associations, opts, cb) {
 	if (associations.length === 0) {
 		return cb();
 	}
 
 	var pending = associations.length;
-	var extendDone = function extendDone() {
+	var autoFetchDone = function autoFetchDone() {
 		pending -= 1;
 
 		if (pending === 0) {
@@ -93,11 +99,11 @@ exports.extend = function (Model, Instance, Driver, associations, opts, cb) {
 	};
 
 	for (var i = 0; i < associations.length; i++) {
-		extendInstance(Model, Instance, Driver, associations[i], opts, extendDone);
+		autoFetchInstance(Instance, associations[i], opts, autoFetchDone);
 	}
 };
 
-function extendInstance(Model, Instance, Driver, association, opts, cb) {
+function extendInstance(Model, Instance, Driver, association, opts) {
 	if (Model.settings.get("instance.cascadeRemove")) {
 		Instance.on("beforeRemove", function () {
 			Instance[association.delAccessor]();
@@ -363,7 +369,9 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 		},
 		enumerable: false
 	});
+}
 
+function autoFetchInstance(Instance, association, opts, cb) {
 	if (!opts.hasOwnProperty("autoFetchLimit") || typeof opts.autoFetchLimit == "undefined") {
 		opts.autoFetchLimit = association.autoFetchLimit;
 	}
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index fe1bbf3e..449c9403 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -97,13 +97,19 @@ exports.prepare = function (Model, associations, association_properties, model_f
 	};
 };
 
-exports.extend = function (Model, Instance, Driver, associations, opts, cb) {
+exports.extend = function (Model, Instance, Driver, associations, opts) {
+	for (var i = 0; i < associations.length; i++) {
+		extendInstance(Model, Instance, Driver, associations[i], opts);
+	}
+};
+
+exports.autoFetch = function (Instance, associations, opts, cb) {
 	if (associations.length === 0) {
 		return cb();
 	}
 
 	var pending = associations.length;
-	var extendDone = function extendDone() {
+	var autoFetchDone = function autoFetchDone() {
 		pending -= 1;
 
 		if (pending === 0) {
@@ -112,11 +118,11 @@ exports.extend = function (Model, Instance, Driver, associations, opts, cb) {
 	};
 
 	for (var i = 0; i < associations.length; i++) {
-		extendInstance(Model, Instance, Driver, associations[i], opts, extendDone);
+		autoFetchInstance(Instance, associations[i], opts, autoFetchDone);
 	}
 };
 
-function extendInstance(Model, Instance, Driver, association, opts, cb) {
+function extendInstance(Model, Instance, Driver, association, opts) {
 	Object.defineProperty(Instance, association.hasAccessor, {
 		value: function (opts, cb) {
 			if (typeof opts == "function") {
@@ -209,7 +215,9 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 			enumerable: false
 		});
 	}
+}
 
+function autoFetchInstance(Instance, association, opts, cb) {
 	if (!opts.hasOwnProperty("autoFetchLimit") || typeof opts.autoFetchLimit == "undefined") {
 		opts.autoFetchLimit = association.autoFetchLimit;
 	}
diff --git a/lib/Model.js b/lib/Model.js
index 4bf9b55b..16c380bc 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -84,6 +84,11 @@ function Model(opts) {
 			}
 		}
 
+		var assoc_opts = {
+			autoFetch      : inst_opts.autoFetch || false,
+			autoFetchLimit : inst_opts.autoFetchLimit,
+			cascadeRemove  : inst_opts.cascadeRemove
+		};
 		var pending  = 2;
 		var instance = new Instance(model, {
 			uid                    : inst_opts.uid, // singleton unique id
@@ -114,21 +119,13 @@ function Model(opts) {
 		if (model_fields !== null) {
 			LazyLoad.extend(instance, model, opts.properties);
 		}
-		OneAssociation.extend(model, instance, opts.driver, one_associations, {
-			autoFetch      : inst_opts.autoFetch || false,
-			autoFetchLimit : inst_opts.autoFetchLimit,
-			cascadeRemove  : inst_opts.cascadeRemove
-		}, function () {
-			ManyAssociation.extend(model, instance, opts.driver, many_associations, {
-				autoFetch      : inst_opts.autoFetch || false,
-				autoFetchLimit : inst_opts.autoFetchLimit,
-				cascadeRemove  : inst_opts.cascadeRemove
-			}, function () {
-				ExtendAssociation.extend(model, instance, opts.driver, extend_associations, {
-					autoFetch      : inst_opts.autoFetch || false,
-					autoFetchLimit : inst_opts.autoFetchLimit,
-					cascadeRemove  : inst_opts.cascadeRemove
-				}, function () {
+		OneAssociation.extend(model, instance, opts.driver, one_associations, assoc_opts);
+		ManyAssociation.extend(model, instance, opts.driver, many_associations, assoc_opts);
+		ExtendAssociation.extend(model, instance, opts.driver, extend_associations, assoc_opts);
+
+		OneAssociation.autoFetch(instance, one_associations, assoc_opts, function () {
+			ManyAssociation.autoFetch(instance, many_associations, assoc_opts, function () {
+				ExtendAssociation.autoFetch(instance, extend_associations, assoc_opts, function () {
 					Hook.wait(instance, opts.hooks.afterAutoFetch, function (err) {
 						if (--pending > 0) return;
 						if (typeof cb == "function") {

From 52972e3f5ad38a9e41d0c576edc60e29c8e09793 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 10 Jul 2013 20:07:40 +0100
Subject: [PATCH 0643/1246] 2.0.15

---
 Changelog.md | 27 +++++++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 14cca6b6..65daa013 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,30 @@
+### v2.0.15 - 10 Jul 2013
+
+- Support for 'point' type as a property (#221)
+- .call() in aggregates for generic functions (#204)
+- Adds hook afterAutoFetch triggered after extending and auto fetching (if any) associations (#219)
+- Adds predefined validator .password()
+- Adds ability to have the afterLoad hook blocking (#219)
+- Changes Model.create() to wait for createInstance callback instead of using the returned value
+- Fixes problem with hasOne associations for none persisted instances and autoFetch active just blocking
+- Refactored Model.hasOne() constructor to be able to mix parameters
+- Fixes reversed hasOne association on the reversed model not being correctly saved (#216)
+- Changes Model.hasMany.addAccessor to throw just like .setAccessor when no associations are passed
+- Adds ability to pass an Array to hasMany.hasAccessor and also not passing any instance to hasAccessor and have it check for any associated item
+- Exposes Model methods to change hooks after model definition
+- Fixes postgres driver not returning numbers for number columns
+- Fixes passing json object instead of instances to Model.create() associations (#216)
+- Passes Model to Instance directly, changes Instance to use Model.properties instead of opts.properties
+- Exposes Model.properties
+- Removes old Property.js throw error in favour of new one
+- Adds initial Model.extendsTo(name, properties[, opts])
+- Avoids redefining properties in instances
+- Adds ErrorCodes.NOT_DEFINED
+- Adds db.drop() - similar to db.sync()
+- Changes hasMany.getAccessor to support order as string (closes #196)
+- Handle django string formatted sqlite datetime
+- Many bug fixes
+
 ### v2.0.14 - 27 June 2013
 
 - Changes many errors to use the ErrorCodes generator (#206)
diff --git a/package.json b/package.json
index fd46478a..d505c80e 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "redshift",
     "sqlite"
   ],
-  "version"     : "2.0.14",
+  "version"     : "2.0.15",
   "license"     : "MIT",
   "homepage"    : "http://dresende.github.io/node-orm2",
   "repository"  : "http://github.com/dresende/node-orm2.git",

From 4d3926851e9fa98e1e99dcf6125c92f2a65cc0e7 Mon Sep 17 00:00:00 2001
From: Tiddo Langerak <tiddolangerak@gmail.com>
Date: Wed, 10 Jul 2013 22:01:14 +0200
Subject: [PATCH 0644/1246] Fixed a bug which caused optional foreign keys to
 throw an error.

lib/Instance.js uses 'typeof' to check if a variable is an object.
However, 'typeof null == "object"'. Therefore when opts.data[asc.name] == null
the condition on line 549 would evaluate to true and line 550 will throw an error.
This situation occurs at least when an optional FK is defined (postgres)
and it's value is null. Other situations might trigger this error as well.

This bugfix changes line 549 such that it uses 'instanceof' instead of 'typeof'.
---
 lib/Instance.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index ecfa6740..9779531e 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -546,7 +546,7 @@ function Instance(Model, opts) {
 			addInstanceProperty(asc.field);
 		}
 		if (opts.data.hasOwnProperty(asc.name)) {
-			if (typeof opts.data[asc.name] == "object") {
+			if (opts.data[asc.name] instanceof Object) {
 				if (opts.data[asc.name].isInstance) {
 					instance[asc.name] = opts.data[asc.name];
 				} else {

From 0168039a978541b10488dc96af6abece5ec645ee Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 10 Jul 2013 23:38:07 +0100
Subject: [PATCH 0645/1246] Moves db.load() test to new framework

---
 .../{ => deprecated}/models/model.js          |  0
 .../{ => deprecated}/models/sub/index.js      |  0
 .../integration/{ => deprecated}/test-load.js |  0
 test/integration2/db.js                       | 25 +++++++++++++++++++
 test/support/spec_load.js                     |  7 ++++++
 test/support/spec_load_second.js              |  9 +++++++
 6 files changed, 41 insertions(+)
 rename test/integration/{ => deprecated}/models/model.js (100%)
 rename test/integration/{ => deprecated}/models/sub/index.js (100%)
 rename test/integration/{ => deprecated}/test-load.js (100%)
 create mode 100644 test/support/spec_load.js
 create mode 100644 test/support/spec_load_second.js

diff --git a/test/integration/models/model.js b/test/integration/deprecated/models/model.js
similarity index 100%
rename from test/integration/models/model.js
rename to test/integration/deprecated/models/model.js
diff --git a/test/integration/models/sub/index.js b/test/integration/deprecated/models/sub/index.js
similarity index 100%
rename from test/integration/models/sub/index.js
rename to test/integration/deprecated/models/sub/index.js
diff --git a/test/integration/test-load.js b/test/integration/deprecated/test-load.js
similarity index 100%
rename from test/integration/test-load.js
rename to test/integration/deprecated/test-load.js
diff --git a/test/integration2/db.js b/test/integration2/db.js
index 3e313d69..a9250fd7 100644
--- a/test/integration2/db.js
+++ b/test/integration2/db.js
@@ -29,3 +29,28 @@ describe("db.define()", function() {
 		return done();
 	});
 });
+
+describe("db.load()", function () {
+	var db = null;
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			return done();
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	it("should require a file based on relative path", function (done) {
+		db.load("../support/spec_load", function () {
+			db.models.should.have.property("person");
+			db.models.should.have.property("pet");
+
+			return done();
+		});
+	});
+});
diff --git a/test/support/spec_load.js b/test/support/spec_load.js
new file mode 100644
index 00000000..7fd5c109
--- /dev/null
+++ b/test/support/spec_load.js
@@ -0,0 +1,7 @@
+module.exports = function (db, cb) {
+	db.define("person", {
+		name : String
+	});
+
+	return db.load("./spec_load_second", cb);
+};
diff --git a/test/support/spec_load_second.js b/test/support/spec_load_second.js
new file mode 100644
index 00000000..6f54edc8
--- /dev/null
+++ b/test/support/spec_load_second.js
@@ -0,0 +1,9 @@
+module.exports = function (db, cb) {
+	db.define("pet", {
+		name : String
+	});
+
+	setTimeout(function () {
+		return cb();
+	}, 200);
+};

From f24af26afe253c9239834d3a7f6d9b49da171aac Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 11 Jul 2013 00:00:07 +0100
Subject: [PATCH 0646/1246] Moves test-find-no-cache no new framework

---
 .../{ => deprecated}/test-find-no-cache.js    |  0
 test/integration2/model-find.js               | 24 +++++++++++++++++++
 2 files changed, 24 insertions(+)
 rename test/integration/{ => deprecated}/test-find-no-cache.js (100%)

diff --git a/test/integration/test-find-no-cache.js b/test/integration/deprecated/test-find-no-cache.js
similarity index 100%
rename from test/integration/test-find-no-cache.js
rename to test/integration/deprecated/test-find-no-cache.js
diff --git a/test/integration2/model-find.js b/test/integration2/model-find.js
index 98352987..e1f7bab2 100644
--- a/test/integration2/model-find.js
+++ b/test/integration2/model-find.js
@@ -299,6 +299,30 @@ describe("Model.find()", function() {
 		});
 	});
 
+	describe("with cache disabled", function () {
+		it("should not return singletons", function (done) {
+			Person.find({ name: "Jasmine" }, { cache: false }, function (err, people) {
+				should.not.exist(err);
+				people.should.be.a("object");
+				people.should.have.property("length", 1);
+				people[0].name.should.equal("Jasmine");
+				people[0].surname.should.equal("Doe");
+
+				people[0].surname = "Dux";
+
+				Person.find({ name: "Jasmine" }, { cache: false }, function (err, people) {
+					should.not.exist(err);
+					people.should.be.a("object");
+					people.should.have.property("length", 1);
+					people[0].name.should.equal("Jasmine");
+					people[0].surname.should.equal("Doe");
+
+					return done();
+				});
+			});
+		});
+	});
+
 	describe("when using Model.all()", function () {
 		it("should work exactly the same", function (done) {
 			Person.all({ surname: "Doe" }, "-age", 1, function (err, people) {

From 23f65ba14d6045995464078304fb3a81e15494dc Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 11 Jul 2013 00:08:50 +0100
Subject: [PATCH 0647/1246] Moves test-db-use to new framework

---
 .../{ => deprecated}/test-db-use.js           |  0
 test/integration2/db.js                       | 42 +++++++++++++++++++
 2 files changed, 42 insertions(+)
 rename test/integration/{ => deprecated}/test-db-use.js (100%)

diff --git a/test/integration/test-db-use.js b/test/integration/deprecated/test-db-use.js
similarity index 100%
rename from test/integration/test-db-use.js
rename to test/integration/deprecated/test-db-use.js
diff --git a/test/integration2/db.js b/test/integration2/db.js
index a9250fd7..03b56c6a 100644
--- a/test/integration2/db.js
+++ b/test/integration2/db.js
@@ -2,6 +2,48 @@ var should   = require('should');
 var helper   = require('../support/spec_helper');
 var ORM      = require('../../');
 
+describe("db.use()", function () {
+	var db = null;
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			return done();
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	it("should be able to register a plugin", function (done) {
+		var MyPlugin = function MyPlugin(DB, opts) {
+			db.should.equal(DB);
+			opts.should.eql({ option: true });
+
+			return {
+				define: function (Model) {
+					Model.should.be.a("function");
+					Model.id.should.be.a("string");
+					calledDefine = true;
+				}
+			};
+		};
+
+		db.use(MyPlugin, { option: true });
+
+		var calledDefine = false;
+		var MyModel = db.define("my_model", { // db.define should call plugin.define method
+			property: String
+		});
+
+		calledDefine.should.be.true;
+
+		return done();
+	});
+});
+
 describe("db.define()", function() {
 	var db = null;
 

From 2453f3d596cfdd25dca031552a65ea0d167b8add Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 11 Jul 2013 17:52:12 +0100
Subject: [PATCH 0648/1246] Moved Model.hasOne reversed test to new framework

---
 .../test-association-hasone-reverse-updown.js |  4 +-
 .../test-association-hasone-reverse.js        |  0
 .../association-hasone-reverse.js             | 83 +++++++++++++++++++
 3 files changed, 85 insertions(+), 2 deletions(-)
 rename test/integration/{ => deprecated}/test-association-hasone-reverse-updown.js (96%)
 rename test/integration/{ => deprecated}/test-association-hasone-reverse.js (100%)
 create mode 100644 test/integration2/association-hasone-reverse.js

diff --git a/test/integration/test-association-hasone-reverse-updown.js b/test/integration/deprecated/test-association-hasone-reverse-updown.js
similarity index 96%
rename from test/integration/test-association-hasone-reverse-updown.js
rename to test/integration/deprecated/test-association-hasone-reverse-updown.js
index a6bd52d9..14cebdd9 100644
--- a/test/integration/test-association-hasone-reverse-updown.js
+++ b/test/integration/deprecated/test-association-hasone-reverse-updown.js
@@ -24,8 +24,8 @@ common.createConnection(function (err, db) {
 										var TestModelChild	= db.define('test_association_hasone_reverse_updown',	common.getModelProperties());
 										var TestModelGrandChild	= db.define('test_association_hasone_reverse_updown_down',	common.getModelProperties());
 										TestModelChild.hasOne("assocup", TestModelParent, {
-                      autoFetch: true, 
-                      reverse: "reverseassoc" 
+                      autoFetch: true,
+                      reverse: "reverseassoc"
                     });
 										TestModelChild.hasOne("assocdown", TestModelGrandChild, { autoFetch: true });
 
diff --git a/test/integration/test-association-hasone-reverse.js b/test/integration/deprecated/test-association-hasone-reverse.js
similarity index 100%
rename from test/integration/test-association-hasone-reverse.js
rename to test/integration/deprecated/test-association-hasone-reverse.js
diff --git a/test/integration2/association-hasone-reverse.js b/test/integration2/association-hasone-reverse.js
new file mode 100644
index 00000000..20002330
--- /dev/null
+++ b/test/integration2/association-hasone-reverse.js
@@ -0,0 +1,83 @@
+var ORM    = require('../../');
+var helper = require('../support/spec_helper');
+var should = require('should');
+var async  = require('async');
+var _      = require('lodash');
+
+describe("hasOne", function() {
+	var db     = null;
+	var Person = null;
+
+	var setup = function () {
+		return function (done) {
+			Person = db.define('person', {
+				name     : String
+			});
+			Pet = db.define('pet', {
+				name     : String
+			});
+			Person.hasOne('pet', Pet, {
+				reverse : 'owner'
+			});
+
+			return helper.dropSync([ Person, Pet ], function () {
+				Person.create({
+					name : "John Doe"
+				}, function () {
+					Pet.create({
+						name : "Deco"
+					}, done);
+				});
+			});
+		};
+	};
+
+	before(function(done) {
+		helper.connect(function (connection) {
+			db = connection;
+			done();
+		});
+	});
+
+	describe("reverse", function () {
+		before(setup());
+
+		it("should create methods in both models", function (done) {
+			var person = Person(1);
+			var pet    = Pet(1);
+
+			person.getPet.should.be.a("function");
+			person.setPet.should.be.a("function");
+			person.removePet.should.be.a("function");
+			person.hasPet.should.be.a("function");
+
+			pet.getOwner.should.be.a("function");
+			pet.setOwner.should.be.a("function");
+			pet.hasOwner.should.be.a("function");
+
+			return done();
+		});
+
+		it("should be able to fetch model from reverse model", function (done) {
+			Person.find({ name: "John Doe" }).first(function (err, John) {
+				Pet.find({ name: "Deco" }).first(function (err, Deco) {
+					Deco.hasOwner(function (err, has_owner) {
+						should.not.exist(err);
+						has_owner.should.be.false;
+
+						Deco.setOwner(John, function (err) {
+							should.not.exist(err);
+
+							Deco.getOwner(function (err, JohnCopy) {
+								should.not.exist(err);
+								John.should.eql(JohnCopy);
+
+								return done();
+							});
+						});
+					});
+				});
+			});
+		});
+	});
+});

From 7ca26145b95603293d74efd0eb3f463e3a3270fb Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 11 Jul 2013 17:54:36 +0100
Subject: [PATCH 0649/1246] Fixes bug on previous test

hasOne.getAccessor on reverse models returns an array of instances
(since a reverse model can be associated with many instances from the
other model)
---
 test/integration2/association-hasone-reverse.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/integration2/association-hasone-reverse.js b/test/integration2/association-hasone-reverse.js
index 20002330..8d79159b 100644
--- a/test/integration2/association-hasone-reverse.js
+++ b/test/integration2/association-hasone-reverse.js
@@ -70,7 +70,8 @@ describe("hasOne", function() {
 
 							Deco.getOwner(function (err, JohnCopy) {
 								should.not.exist(err);
-								John.should.eql(JohnCopy);
+								should(Array.isArray(JohnCopy));
+								John.should.eql(JohnCopy[0]);
 
 								return done();
 							});

From e36224560b84545e7e24c2a8e37c3b3693cd76ff Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 11 Jul 2013 18:03:04 +0100
Subject: [PATCH 0650/1246] Moves db.serial() test to new framework

---
 .../{ => deprecated}/test-find-serial.js      |  0
 test/integration2/db.js                       | 49 +++++++++++++++++++
 2 files changed, 49 insertions(+)
 rename test/integration/{ => deprecated}/test-find-serial.js (100%)

diff --git a/test/integration/test-find-serial.js b/test/integration/deprecated/test-find-serial.js
similarity index 100%
rename from test/integration/test-find-serial.js
rename to test/integration/deprecated/test-find-serial.js
diff --git a/test/integration2/db.js b/test/integration2/db.js
index 03b56c6a..da735a56 100644
--- a/test/integration2/db.js
+++ b/test/integration2/db.js
@@ -96,3 +96,52 @@ describe("db.load()", function () {
 		});
 	});
 });
+
+describe("db.serial()", function () {
+	var db = null;
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			return done();
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	it("should be able to execute chains in serial", function (done) {
+		var Person = db.define("person", {
+			name    : String,
+			surname : String
+		});
+		helper.dropSync(Person, function () {
+			Person.create([
+				{ name : "John", surname : "Doe" },
+				{ name : "Jane", surname : "Doe" }
+			], function () {
+				db.serial(
+					Person.find({ surname : "Doe" }),
+					Person.find({ name    : "John" })
+				).get(function (err, DoeFamily, JohnDoe) {
+					should.equal(err, null);
+
+					should(Array.isArray(DoeFamily));
+					should(Array.isArray(JohnDoe));
+
+					DoeFamily.length.should.equal(2);
+					JohnDoe.length.should.equal(1);
+
+					DoeFamily[0].surname.should.equal("Doe");
+					DoeFamily[1].surname.should.equal("Doe");
+
+					JohnDoe[0].name.should.equal("John");
+
+					return done();
+				});
+			});
+		});
+	});
+});

From 4ffcd9b8ce030cbbb574b5653deb3be0e2b92fa7 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 11 Jul 2013 18:19:57 +0100
Subject: [PATCH 0651/1246] Moves multi-key model tests to new framework

---
 .../{ => deprecated}/test-key-nonincrement.js |   0
 .../{ => deprecated}/test-multikey-base.js    |   0
 .../test-multikey-hasmany-throw.js            |   0
 test/integration2/model-keys.js               | 114 ++++++++++++++++++
 4 files changed, 114 insertions(+)
 rename test/integration/{ => deprecated}/test-key-nonincrement.js (100%)
 rename test/integration/{ => deprecated}/test-multikey-base.js (100%)
 rename test/integration/{ => deprecated}/test-multikey-hasmany-throw.js (100%)
 create mode 100644 test/integration2/model-keys.js

diff --git a/test/integration/test-key-nonincrement.js b/test/integration/deprecated/test-key-nonincrement.js
similarity index 100%
rename from test/integration/test-key-nonincrement.js
rename to test/integration/deprecated/test-key-nonincrement.js
diff --git a/test/integration/test-multikey-base.js b/test/integration/deprecated/test-multikey-base.js
similarity index 100%
rename from test/integration/test-multikey-base.js
rename to test/integration/deprecated/test-multikey-base.js
diff --git a/test/integration/test-multikey-hasmany-throw.js b/test/integration/deprecated/test-multikey-hasmany-throw.js
similarity index 100%
rename from test/integration/test-multikey-hasmany-throw.js
rename to test/integration/deprecated/test-multikey-hasmany-throw.js
diff --git a/test/integration2/model-keys.js b/test/integration2/model-keys.js
new file mode 100644
index 00000000..06a4f0af
--- /dev/null
+++ b/test/integration2/model-keys.js
@@ -0,0 +1,114 @@
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var ORM      = require('../../');
+
+describe("Model keys option", function() {
+	var db = null;
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			return done();
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	describe("if model id is a property", function () {
+		var Person = null;
+
+		before(function (done) {
+			Person = db.define("person", {
+				uid     : String,
+				name    : String,
+				surname : String
+			}, {
+				id      : "uid"
+			});
+
+			return helper.dropSync(Person, done);
+		});
+
+		it("should not auto increment IDs", function (done) {
+			Person.create({
+				uid     : "john-doe",
+				name    : "John",
+				surname : "Doe"
+			}, function (err, JohnDoe) {
+				should.equal(err, null);
+
+				JohnDoe.uid.should.equal("john-doe");
+				JohnDoe.should.not.have.property("id");
+
+				return done();
+			});
+		});
+	});
+
+	describe("if model defines several keys", function () {
+		var DoorAccessHistory = null;
+
+		before(function (done) {
+			DoorAccessHistory = db.define("door_access_history", {
+				user   : String,
+				action : [ "in", "out" ]
+			}, {
+				keys   : [ "year", "month", "day" ]
+			});
+
+			return helper.dropSync(DoorAccessHistory, function () {
+				DoorAccessHistory.create([
+					{ year: 2013, month: 7, day : 11, user : "dresende", action : "in" },
+					{ year: 2013, month: 7, day : 12, user : "dresende", action : "out" }
+				], done);
+			});
+		});
+
+		it("should make possible to get instances based on all keys", function (done) {
+			DoorAccessHistory.get(2013, 7, 11, function (err, HistoryItem) {
+				should.equal(err, null);
+
+				HistoryItem.year.should.equal(2013);
+				HistoryItem.month.should.equal(7);
+				HistoryItem.day.should.equal(11);
+				HistoryItem.user.should.equal("dresende");
+				HistoryItem.action.should.equal("in");
+
+				return done();
+			})
+		});
+
+		it("should make possible to remove instances based on all keys", function (done) {
+			DoorAccessHistory.get(2013, 7, 12, function (err, HistoryItem) {
+				should.equal(err, null);
+
+				HistoryItem.remove(function (err) {
+					should.equal(err, null);
+
+					DoorAccessHistory.get(2013, 7, 12, function (err) {
+						err.should.have.property("code", ORM.ErrorCodes.NOT_FOUND);
+
+						DoorAccessHistory.exists(2013, 7, 12, function (err, exists) {
+							should.equal(err, null);
+
+							exists.should.be.false;
+
+							return done();
+						});
+					});
+				});
+			})
+		});
+
+		it("should throw if defining hasMany association", function (done) {
+			(function () {
+				DoorAccessHistory.hasMany("...");
+			}).should.throw();
+
+			return done();
+		});
+	});
+});

From 1075a106adb99ff59ef4828b0bcffc0cf9e6ba70 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 11 Jul 2013 18:21:29 +0100
Subject: [PATCH 0652/1246] Disabled usage of process.hrtime() in hook test

It seems the timing is failing somehow.. I noticed on Travis and now on
my machine under heavy load
---
 test/integration2/hook.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/test/integration2/hook.js b/test/integration2/hook.js
index cc31e813..248d5df8 100644
--- a/test/integration2/hook.js
+++ b/test/integration2/hook.js
@@ -10,11 +10,13 @@ describe("Hook", function() {
 	var triggeredHooks = {};
 	var getTimestamp; // Calling it 'getTime' causes strangeness.
 
-	if (process.hrtime) {
-		getTimestamp = function () { return parseFloat(process.hrtime().join('.')); };
-	} else {
-		getTimestamp = function () { return Date.now(); };
-	}
+	getTimestamp = function () { return Date.now(); };
+	// this next lines are failing...
+	// if (process.hrtime) {
+	// 	getTimestamp = function () { return parseFloat(process.hrtime().join('.')); };
+	// } else {
+	// 	getTimestamp = function () { return Date.now(); };
+	// }
 
 	var checkHook = function (hook) {
 		triggeredHooks[hook] = false;

From 3cdcc647b2b2ddc7daee00c0dbd02636e26133e0 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 11 Jul 2013 18:30:53 +0100
Subject: [PATCH 0653/1246] Moves test for single property hook to new
 framework

---
 .../test-hooks-for-single-property.js         |  0
 test/integration2/hook.js                     | 35 +++++++++++++++++++
 2 files changed, 35 insertions(+)
 rename test/integration/{ => deprecated}/test-hooks-for-single-property.js (100%)

diff --git a/test/integration/test-hooks-for-single-property.js b/test/integration/deprecated/test-hooks-for-single-property.js
similarity index 100%
rename from test/integration/test-hooks-for-single-property.js
rename to test/integration/deprecated/test-hooks-for-single-property.js
diff --git a/test/integration2/hook.js b/test/integration2/hook.js
index 248d5df8..c6fc9993 100644
--- a/test/integration2/hook.js
+++ b/test/integration2/hook.js
@@ -522,4 +522,39 @@ describe("Hook", function() {
 			});
 		});
 	});
+
+	describe("if model has autoSave", function () {
+		before(function (done) {
+			Person = db.define("person", {
+				name    : String,
+				surname : String
+			}, {
+				autoSave  : true,
+				hooks     : {
+					afterSave : checkHook("afterSave")
+				}
+			});
+
+			Person.settings.set("instance.returnAllErrors", false);
+
+			return helper.dropSync(Person, done);
+		});
+
+		it("should trigger for single property changes", function (done) {
+			Person.create({ name : "John", surname : "Doe" }, function (err, John) {
+				should.equal(err, null);
+
+				triggeredHooks.afterSave.should.be.a("number");
+				triggeredHooks.afterSave = false;
+
+				John.surname = "Dean";
+
+				setTimeout(function () {
+					triggeredHooks.afterSave.should.be.a("number");
+
+					return done();
+				}, 200);
+			});
+		});
+	});
 });

From 4a9eb650e8bc9bf53c04d4803f63bd63b53fa12f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 11 Jul 2013 18:35:03 +0100
Subject: [PATCH 0654/1246] Moves hasMany autoFetch test to new framework

---
 ...test-association-hasmany-find-autofetch.js |  0
 test/integration2/association-hasmany.js      | 20 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 rename test/integration/{ => deprecated}/test-association-hasmany-find-autofetch.js (100%)

diff --git a/test/integration/test-association-hasmany-find-autofetch.js b/test/integration/deprecated/test-association-hasmany-find-autofetch.js
similarity index 100%
rename from test/integration/test-association-hasmany-find-autofetch.js
rename to test/integration/deprecated/test-association-hasmany-find-autofetch.js
diff --git a/test/integration2/association-hasmany.js b/test/integration2/association-hasmany.js
index 581b777c..586e2ade 100644
--- a/test/integration2/association-hasmany.js
+++ b/test/integration2/association-hasmany.js
@@ -16,7 +16,7 @@ describe("hasMany", function() {
 				name    : String,
 				surname : String,
 				age     : Number
-			});
+			}, opts);
 			Pet = db.define('pet', {
 				name    : String
 			});
@@ -455,4 +455,22 @@ describe("hasMany", function() {
 			});
 		});
 	});
+
+	describe("with autoFetch turned on", function () {
+		before(setup({
+			autoFetch : true
+		}));
+
+		it("should fetch associations", function (done) {
+			Person.find({ name: "John" }).first(function (err, John) {
+				should.equal(err, null);
+
+				John.should.have.property("pets");
+				should(Array.isArray(John.pets));
+				John.pets.length.should.equal(2);
+
+				return done();
+			});
+		});
+	});
 });

From 289ec1af2c415a60a2ad48fed3f0d8679373c7cd Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 11 Jul 2013 18:46:03 +0100
Subject: [PATCH 0655/1246] Moves hasMany extra properties tests to new
 framework

---
 .../test-association-hasmany-add-extra.js     |  0
 .../test-association-hasmany-extra-find.js    |  0
 .../test-association-hasmany-extra.js         |  0
 .../integration2/association-hasmany-extra.js | 73 +++++++++++++++++++
 4 files changed, 73 insertions(+)
 rename test/integration/{ => deprecated}/test-association-hasmany-add-extra.js (100%)
 rename test/integration/{ => deprecated}/test-association-hasmany-extra-find.js (100%)
 rename test/integration/{ => deprecated}/test-association-hasmany-extra.js (100%)
 create mode 100644 test/integration2/association-hasmany-extra.js

diff --git a/test/integration/test-association-hasmany-add-extra.js b/test/integration/deprecated/test-association-hasmany-add-extra.js
similarity index 100%
rename from test/integration/test-association-hasmany-add-extra.js
rename to test/integration/deprecated/test-association-hasmany-add-extra.js
diff --git a/test/integration/test-association-hasmany-extra-find.js b/test/integration/deprecated/test-association-hasmany-extra-find.js
similarity index 100%
rename from test/integration/test-association-hasmany-extra-find.js
rename to test/integration/deprecated/test-association-hasmany-extra-find.js
diff --git a/test/integration/test-association-hasmany-extra.js b/test/integration/deprecated/test-association-hasmany-extra.js
similarity index 100%
rename from test/integration/test-association-hasmany-extra.js
rename to test/integration/deprecated/test-association-hasmany-extra.js
diff --git a/test/integration2/association-hasmany-extra.js b/test/integration2/association-hasmany-extra.js
new file mode 100644
index 00000000..ff038890
--- /dev/null
+++ b/test/integration2/association-hasmany-extra.js
@@ -0,0 +1,73 @@
+var should = require('should');
+var helper = require('../support/spec_helper');
+var ORM    = require('../../');
+
+describe("hasMany extra properties", function() {
+	var db     = null;
+	var Person = null;
+	var Pet    = null;
+
+	var setup = function (opts) {
+		opts = opts || {};
+		return function (done) {
+			db.settings.set('instance.cache', false);
+
+			Person = db.define('person', {
+				name    : String,
+			}, opts);
+			Pet = db.define('pet', {
+				name    : String
+			});
+			Person.hasMany('pets', Pet, {
+				since   : Date
+			});
+
+			return helper.dropSync([ Person, Pet ], done);
+		};
+	};
+
+	before(function(done) {
+		helper.connect(function (connection) {
+			db = connection;
+			done();
+		});
+	});
+
+	describe("if passed to addAccessor", function () {
+		before(setup());
+
+		it("should be added to association", function (done) {
+			Person.create([{
+				name    : "John"
+			}], function (err, people) {
+				Pet.create([{
+					name : "Deco"
+				}, {
+					name : "Mutt"
+				}], function (err, pets) {
+					people[0].addPets(pets, { since : new Date() }, function (err) {
+						should.equal(err, null);
+
+						Person.find({ name: "John" }, { autoFetch : true }).first(function (err, John) {
+							should.equal(err, null);
+
+							John.should.have.property("pets");
+							should(Array.isArray(pets));
+
+							John.pets.length.should.equal(2);
+
+							John.pets[0].should.have.property("id");
+							John.pets[0].should.have.property("name");
+							John.pets[0].should.have.property("extra");
+							John.pets[0].extra.should.be.a("object");
+							John.pets[0].extra.should.have.property("since");
+							should(John.pets[0].extra.since instanceof Date);
+
+							return done();
+						});
+					});
+				});
+			});
+		});
+	});
+});

From 7970ccd7c3d63dc9f18a397064a3c49c04c50289 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 11 Jul 2013 19:01:29 +0100
Subject: [PATCH 0656/1246] Moves number property size test to new framework

Last old test!
---
 .../{ => deprecated}/test-number-size.js      |   0
 test/integration2/property-number-size.js     | 131 ++++++++++++++++++
 2 files changed, 131 insertions(+)
 rename test/integration/{ => deprecated}/test-number-size.js (100%)
 create mode 100644 test/integration2/property-number-size.js

diff --git a/test/integration/test-number-size.js b/test/integration/deprecated/test-number-size.js
similarity index 100%
rename from test/integration/test-number-size.js
rename to test/integration/deprecated/test-number-size.js
diff --git a/test/integration2/property-number-size.js b/test/integration2/property-number-size.js
new file mode 100644
index 00000000..4b2258ee
--- /dev/null
+++ b/test/integration2/property-number-size.js
@@ -0,0 +1,131 @@
+var should   = require('should');
+var common   = require('../common');
+var helper   = require('../support/spec_helper');
+var ORM      = require('../../');
+var protocol = common.protocol().toLowerCase();
+
+// Round because different systems store floats in different
+// ways, thereby introducing small errors.
+function round(num, points) {
+  var m = Math.pow(10, points);
+
+  return Math.round(num * m) / m;
+}
+
+function fuzzyEql(num1, num2) {
+	return round(num1 / num2, 3) == 1;
+}
+
+if (protocol != "sqlite") {
+	describe("Number Properties", function() {
+		var db = null;
+		var NumberSize = null;
+		var NumberData = {
+			int2   : 32700,
+			int4   : 2147483000,
+			int8   : 2251799813685248,
+			float4 : 1 * Math.pow(10, 36),
+			float8 : 1 * Math.pow(10, 306)
+		};
+
+		var setup = function () {
+			return function (done) {
+				NumberSize = db.define("number_size", {
+					int2   : { type: 'number', size: 2, rational: false },
+					int4   : { type: 'number', size: 4, rational: false },
+					int8   : { type: 'number', size: 8, rational: false },
+					float4 : { type: 'number', size: 4 },
+					float8 : { type: 'number', size: 8 }
+				});
+
+				return helper.dropSync(NumberSize, function () {
+					NumberSize.create(NumberData, done);
+				});
+			};
+		};
+
+		before(function (done) {
+			helper.connect(function (connection) {
+				db = connection;
+
+				return done();
+			});
+		});
+
+		after(function () {
+			return db.close();
+		});
+
+		describe("when storing", function () {
+			before(setup());
+
+			it("should be able to store near MAX sized values for each field", function (done) {
+				NumberSize.one(function (err, Item) {
+					should.equal(err, null);
+
+					should(fuzzyEql(Item.int2,   NumberData.int2));
+					should(fuzzyEql(Item.int4,   NumberData.int4));
+					should(fuzzyEql(Item.int8,   NumberData.int8));
+					should(fuzzyEql(Item.float4, NumberData.float4));
+					should(fuzzyEql(Item.float8, NumberData.float8));
+
+					return done();
+				});
+			});
+
+			it("should not be able to store int2 values which are too large", function (done) {
+				NumberSize.create({ int2 : NumberData.int4 }, function (err, item) {
+					if (protocol == "mysql") {
+						should.equal(err, null);
+
+						return NumberSize.get(item.id, function (err, item) {
+							should(!fuzzyEql(item.int2, NumberData.int4));
+
+							return done();
+						});
+					} else {
+						err.should.be.a("object");
+					}
+
+					return done();
+				});
+			});
+
+			it("should not be able to store int4 values which are too large", function (done) {
+				NumberSize.create({ int4 : NumberData.int8 }, function (err, item) {
+					if (protocol == "mysql") {
+						should.equal(err, null);
+
+						return NumberSize.get(item.id, function (err, item) {
+							should(!fuzzyEql(item.int4, NumberData.int8));
+
+							return done();
+						});
+					} else {
+						err.should.be.a("object");
+					}
+
+					return done();
+				});
+			});
+
+			it("should not be able to store float4 values which are too large", function (done) {
+				NumberSize.create({ float4 : NumberData.float8 }, function (err, item) {
+					if (protocol == "mysql") {
+						should.equal(err, null);
+
+						return NumberSize.get(item.id, function (err, item) {
+							should(!fuzzyEql(item.float4, NumberData.float8));
+
+							return done();
+						});
+					} else {
+						err.should.be.a("object");
+					}
+
+					return done();
+				});
+			});
+		});
+	});
+}

From 26992bdf4ac8a92f26e7ade93c3a7ecbed4fc628 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 11 Jul 2013 19:05:10 +0100
Subject: [PATCH 0657/1246] Deprecates old folder, moves new tests to real
 folder, removes deprecated dev dependencies

---
 package.json                                  |  2 --
 .../deprecated/models/model.js                |  0
 .../deprecated/models/sub/index.js            |  0
 .../deprecated/test-aggregate-alias.js        |  0
 .../deprecated/test-aggregate-distinct.js     |  0
 .../test-aggregate-groupby-orderby.js         |  0
 .../deprecated/test-aggregate-groupby.js      |  0
 .../deprecated/test-aggregate-limit.js        |  0
 .../deprecated/test-aggregate.js              |  0
 .../deprecated/test-all.js                    |  0
 .../test-association-hasmany-add-array.js     |  0
 .../test-association-hasmany-add-extra.js     |  0
 .../test-association-hasmany-add.js           |  0
 .../test-association-hasmany-extra-find.js    |  0
 .../test-association-hasmany-extra.js         |  0
 ...test-association-hasmany-find-autofetch.js |  0
 .../test-association-hasmany-get-chain.js     |  0
 .../test-association-hasmany-get-filter.js    |  0
 .../test-association-hasmany-get-limit.js     |  0
 ...est-association-hasmany-get-order-array.js |  0
 .../test-association-hasmany-get-order.js     |  0
 .../test-association-hasmany-get.js           |  0
 .../test-association-hasmany-has.js           |  0
 .../test-association-hasmany-remove.js        |  0
 .../test-association-hasmany-set-array.js     |  0
 .../test-association-hasmany-set-multiple.js  |  0
 .../test-association-hasmany-set.js           |  0
 .../test-association-hasone-autofetch.js      |  0
 .../test-association-hasone-find-autofetch.js |  0
 .../test-association-hasone-findby.js         |  0
 .../deprecated/test-association-hasone-get.js |  0
 .../deprecated/test-association-hasone-has.js |  0
 .../test-association-hasone-remove.js         |  0
 .../test-association-hasone-required.js       |  0
 .../test-association-hasone-reverse-updown.js |  0
 .../test-association-hasone-reverse.js        |  0
 .../deprecated/test-association-hasone-set.js |  0
 .../test-association-hasone-validate.js       |  0
 .../test-association-name-lettercase.js       |  0
 .../deprecated/test-auto-save.js              |  0
 .../deprecated/test-clear.js                  |  0
 .../deprecated/test-connect-errors.js         |  0
 .../deprecated/test-connect-event.js          |  0
 .../deprecated/test-connect-object.js         |  0
 .../deprecated/test-connect.js                |  0
 .../deprecated/test-count.js                  |  0
 .../deprecated/test-create-defaultvalue.js    |  0
 .../deprecated/test-create.js                 |  0
 .../deprecated/test-db-use.js                 |  0
 .../deprecated/test-drop-no-throw.js          |  0
 .../deprecated/test-drop.js                   |  0
 .../deprecated/test-exists-array.js           |  0
 .../deprecated/test-exists-object.js          |  0
 .../deprecated/test-exists.js                 |  0
 .../deprecated/test-find-chain-count.js       |  0
 .../deprecated/test-find-chain-find-cb.js     |  0
 .../deprecated/test-find-chain-first.js       |  0
 .../test-find-chain-instance-count.js         |  0
 .../test-find-chain-instance-each.js          |  0
 .../test-find-chain-instance-filter.js        |  0
 .../test-find-chain-instance-get.js           |  0
 .../test-find-chain-instance-sort.js          |  0
 .../deprecated/test-find-chain-last.js        |  0
 .../deprecated/test-find-chain-limit.js       |  0
 .../deprecated/test-find-chain-offset.js      |  0
 .../deprecated/test-find-chain-only.js        |  0
 .../deprecated/test-find-chain-order-desc.js  |  0
 .../deprecated/test-find-chain-order-minus.js |  0
 .../deprecated/test-find-chain-order.js       |  0
 .../deprecated/test-find-chain-remove.js      |  0
 .../deprecated/test-find-chain.js             |  0
 .../deprecated/test-find-limit-in-options.js  |  0
 .../deprecated/test-find-limit.js             |  0
 .../deprecated/test-find-no-cache.js          |  0
 .../deprecated/test-find-offset.js            |  0
 .../deprecated/test-find-order-asc-array.js   |  0
 .../test-find-order-desc-array-minus.js       |  0
 .../deprecated/test-find-order-desc-array.js  |  0
 .../deprecated/test-find-order-desc.js        |  0
 ...st-find-order-multiple-array-desc-minus.js |  0
 .../test-find-order-multiple-array-desc.js    |  0
 .../test-find-order-multiple-array.js         |  0
 .../deprecated/test-find-order.js             |  0
 .../deprecated/test-find-rechain.js           |  0
 .../deprecated/test-find-serial.js            |  0
 .../deprecated/test-find-where-like.js        |  0
 .../deprecated/test-find-where.js             |  0
 .../deprecated/test-find.js                   |  0
 .../deprecated/test-get-association-hasone.js |  0
 .../test-get-cache-no-save-check.js           |  0
 .../deprecated/test-get-cache.js              |  0
 .../deprecated/test-get-method.js             |  0
 .../deprecated/test-get-model-no-cache.js     |  0
 .../deprecated/test-get-no-cache.js           |  0
 .../deprecated/test-get-opts.js               |  0
 .../deprecated/test-get-singleton-nocache.js  |  0
 .../test-get-singleton-somecache.js           |  0
 .../deprecated/test-get-singleton.js          |  0
 .../deprecated/test-get.js                    |  0
 .../deprecated/test-hook-after-create.js      |  0
 .../deprecated/test-hook-after-load.js        |  0
 .../deprecated/test-hook-after-remove.js      |  0
 .../deprecated/test-hook-after-save.js        |  0
 ...test-hook-before-create-define-property.js |  0
 .../test-hook-before-create-wait.js           |  0
 .../deprecated/test-hook-before-create.js     |  0
 .../test-hook-before-remove-wait.js           |  0
 .../deprecated/test-hook-before-remove.js     |  0
 .../deprecated/test-hook-before-save-wait.js  |  0
 .../deprecated/test-hook-before-save.js       |  0
 .../test-hook-before-validation-wait.js       |  0
 .../deprecated/test-hook-before-validation.js |  0
 .../test-hooks-for-single-property.js         |  0
 .../deprecated/test-key-nonincrement.js       |  0
 .../deprecated/test-load.js                   |  0
 ...test-many-validations-for-same-property.js |  0
 .../deprecated/test-multikey-base.js          |  0
 .../deprecated/test-multikey-hasmany-throw.js |  0
 .../deprecated/test-number-size.js            |  0
 .../deprecated/test-one-conditions.js         |  0
 .../deprecated/test-one-order.js              |  0
 .../deprecated/test-one.js                    |  0
 .../deprecated/test-ping.js                   |  0
 .../deprecated/test-property-types.js         |  0
 .../test-save-hasone-association-new.js       |  0
 .../test-save-hasone-association.js           |  0
 .../deprecated/test-save.js                   |  0
 .../test-settings-properties-primary-key.js   |  0
 .../deprecated/test-settings.js               |  0
 .../deprecated/test-sync-no-throw.js          |  0
 .../deprecated/test-sync.js                   |  0
 .../deprecated/test-use.js                    |  0
 .../deprecated/test-validation.js             |  0
 .../deprecated/test-validators.js             |  0
 .../association-extend.js                     |  0
 .../association-hasmany-extra.js              |  0
 .../association-hasmany.js                    |  0
 .../association-hasone-required.js            |  0
 .../association-hasone-reverse.js             |  0
 .../association-hasone.js                     |  0
 test/{integration2 => integration}/db.js      |  0
 test/{integration2 => integration}/event.js   |  0
 test/{integration2 => integration}/hook.js    |  0
 .../{integration2 => integration}/instance.js |  0
 .../model-aggregate.js                        |  0
 .../model-clear.js                            |  0
 .../model-count.js                            |  0
 .../model-create.js                           |  0
 .../model-exists.js                           |  0
 .../model-find-chain.js                       |  0
 .../model-find.js                             |  0
 .../model-get.js                              |  0
 .../model-keys.js                             |  0
 .../model-one.js                              |  0
 .../model-save.js                             |  0
 .../orm-exports.js                            |  0
 .../predefined-validators.js                  |  0
 .../property-lazyload.js                      |  0
 .../property-number-size.js                   |  0
 .../{integration2 => integration}/property.js |  0
 .../{integration2 => integration}/settings.js |  0
 .../validation.js                             |  0
 test/run.js                                   | 25 ++-----------------
 163 files changed, 2 insertions(+), 25 deletions(-)
 rename test/{integration => integration-old}/deprecated/models/model.js (100%)
 rename test/{integration => integration-old}/deprecated/models/sub/index.js (100%)
 rename test/{integration => integration-old}/deprecated/test-aggregate-alias.js (100%)
 rename test/{integration => integration-old}/deprecated/test-aggregate-distinct.js (100%)
 rename test/{integration => integration-old}/deprecated/test-aggregate-groupby-orderby.js (100%)
 rename test/{integration => integration-old}/deprecated/test-aggregate-groupby.js (100%)
 rename test/{integration => integration-old}/deprecated/test-aggregate-limit.js (100%)
 rename test/{integration => integration-old}/deprecated/test-aggregate.js (100%)
 rename test/{integration => integration-old}/deprecated/test-all.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-hasmany-add-array.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-hasmany-add-extra.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-hasmany-add.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-hasmany-extra-find.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-hasmany-extra.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-hasmany-find-autofetch.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-hasmany-get-chain.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-hasmany-get-filter.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-hasmany-get-limit.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-hasmany-get-order-array.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-hasmany-get-order.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-hasmany-get.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-hasmany-has.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-hasmany-remove.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-hasmany-set-array.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-hasmany-set-multiple.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-hasmany-set.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-hasone-autofetch.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-hasone-find-autofetch.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-hasone-findby.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-hasone-get.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-hasone-has.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-hasone-remove.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-hasone-required.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-hasone-reverse-updown.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-hasone-reverse.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-hasone-set.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-hasone-validate.js (100%)
 rename test/{integration => integration-old}/deprecated/test-association-name-lettercase.js (100%)
 rename test/{integration => integration-old}/deprecated/test-auto-save.js (100%)
 rename test/{integration => integration-old}/deprecated/test-clear.js (100%)
 rename test/{integration => integration-old}/deprecated/test-connect-errors.js (100%)
 rename test/{integration => integration-old}/deprecated/test-connect-event.js (100%)
 rename test/{integration => integration-old}/deprecated/test-connect-object.js (100%)
 rename test/{integration => integration-old}/deprecated/test-connect.js (100%)
 rename test/{integration => integration-old}/deprecated/test-count.js (100%)
 rename test/{integration => integration-old}/deprecated/test-create-defaultvalue.js (100%)
 rename test/{integration => integration-old}/deprecated/test-create.js (100%)
 rename test/{integration => integration-old}/deprecated/test-db-use.js (100%)
 rename test/{integration => integration-old}/deprecated/test-drop-no-throw.js (100%)
 rename test/{integration => integration-old}/deprecated/test-drop.js (100%)
 rename test/{integration => integration-old}/deprecated/test-exists-array.js (100%)
 rename test/{integration => integration-old}/deprecated/test-exists-object.js (100%)
 rename test/{integration => integration-old}/deprecated/test-exists.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-chain-count.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-chain-find-cb.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-chain-first.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-chain-instance-count.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-chain-instance-each.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-chain-instance-filter.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-chain-instance-get.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-chain-instance-sort.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-chain-last.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-chain-limit.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-chain-offset.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-chain-only.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-chain-order-desc.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-chain-order-minus.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-chain-order.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-chain-remove.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-chain.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-limit-in-options.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-limit.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-no-cache.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-offset.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-order-asc-array.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-order-desc-array-minus.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-order-desc-array.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-order-desc.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-order-multiple-array-desc-minus.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-order-multiple-array-desc.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-order-multiple-array.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-order.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-rechain.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-serial.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-where-like.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find-where.js (100%)
 rename test/{integration => integration-old}/deprecated/test-find.js (100%)
 rename test/{integration => integration-old}/deprecated/test-get-association-hasone.js (100%)
 rename test/{integration => integration-old}/deprecated/test-get-cache-no-save-check.js (100%)
 rename test/{integration => integration-old}/deprecated/test-get-cache.js (100%)
 rename test/{integration => integration-old}/deprecated/test-get-method.js (100%)
 rename test/{integration => integration-old}/deprecated/test-get-model-no-cache.js (100%)
 rename test/{integration => integration-old}/deprecated/test-get-no-cache.js (100%)
 rename test/{integration => integration-old}/deprecated/test-get-opts.js (100%)
 rename test/{integration => integration-old}/deprecated/test-get-singleton-nocache.js (100%)
 rename test/{integration => integration-old}/deprecated/test-get-singleton-somecache.js (100%)
 rename test/{integration => integration-old}/deprecated/test-get-singleton.js (100%)
 rename test/{integration => integration-old}/deprecated/test-get.js (100%)
 rename test/{integration => integration-old}/deprecated/test-hook-after-create.js (100%)
 rename test/{integration => integration-old}/deprecated/test-hook-after-load.js (100%)
 rename test/{integration => integration-old}/deprecated/test-hook-after-remove.js (100%)
 rename test/{integration => integration-old}/deprecated/test-hook-after-save.js (100%)
 rename test/{integration => integration-old}/deprecated/test-hook-before-create-define-property.js (100%)
 rename test/{integration => integration-old}/deprecated/test-hook-before-create-wait.js (100%)
 rename test/{integration => integration-old}/deprecated/test-hook-before-create.js (100%)
 rename test/{integration => integration-old}/deprecated/test-hook-before-remove-wait.js (100%)
 rename test/{integration => integration-old}/deprecated/test-hook-before-remove.js (100%)
 rename test/{integration => integration-old}/deprecated/test-hook-before-save-wait.js (100%)
 rename test/{integration => integration-old}/deprecated/test-hook-before-save.js (100%)
 rename test/{integration => integration-old}/deprecated/test-hook-before-validation-wait.js (100%)
 rename test/{integration => integration-old}/deprecated/test-hook-before-validation.js (100%)
 rename test/{integration => integration-old}/deprecated/test-hooks-for-single-property.js (100%)
 rename test/{integration => integration-old}/deprecated/test-key-nonincrement.js (100%)
 rename test/{integration => integration-old}/deprecated/test-load.js (100%)
 rename test/{integration => integration-old}/deprecated/test-many-validations-for-same-property.js (100%)
 rename test/{integration => integration-old}/deprecated/test-multikey-base.js (100%)
 rename test/{integration => integration-old}/deprecated/test-multikey-hasmany-throw.js (100%)
 rename test/{integration => integration-old}/deprecated/test-number-size.js (100%)
 rename test/{integration => integration-old}/deprecated/test-one-conditions.js (100%)
 rename test/{integration => integration-old}/deprecated/test-one-order.js (100%)
 rename test/{integration => integration-old}/deprecated/test-one.js (100%)
 rename test/{integration => integration-old}/deprecated/test-ping.js (100%)
 rename test/{integration => integration-old}/deprecated/test-property-types.js (100%)
 rename test/{integration => integration-old}/deprecated/test-save-hasone-association-new.js (100%)
 rename test/{integration => integration-old}/deprecated/test-save-hasone-association.js (100%)
 rename test/{integration => integration-old}/deprecated/test-save.js (100%)
 rename test/{integration => integration-old}/deprecated/test-settings-properties-primary-key.js (100%)
 rename test/{integration => integration-old}/deprecated/test-settings.js (100%)
 rename test/{integration => integration-old}/deprecated/test-sync-no-throw.js (100%)
 rename test/{integration => integration-old}/deprecated/test-sync.js (100%)
 rename test/{integration => integration-old}/deprecated/test-use.js (100%)
 rename test/{integration => integration-old}/deprecated/test-validation.js (100%)
 rename test/{integration => integration-old}/deprecated/test-validators.js (100%)
 rename test/{integration2 => integration}/association-extend.js (100%)
 rename test/{integration2 => integration}/association-hasmany-extra.js (100%)
 rename test/{integration2 => integration}/association-hasmany.js (100%)
 rename test/{integration2 => integration}/association-hasone-required.js (100%)
 rename test/{integration2 => integration}/association-hasone-reverse.js (100%)
 rename test/{integration2 => integration}/association-hasone.js (100%)
 rename test/{integration2 => integration}/db.js (100%)
 rename test/{integration2 => integration}/event.js (100%)
 rename test/{integration2 => integration}/hook.js (100%)
 rename test/{integration2 => integration}/instance.js (100%)
 rename test/{integration2 => integration}/model-aggregate.js (100%)
 rename test/{integration2 => integration}/model-clear.js (100%)
 rename test/{integration2 => integration}/model-count.js (100%)
 rename test/{integration2 => integration}/model-create.js (100%)
 rename test/{integration2 => integration}/model-exists.js (100%)
 rename test/{integration2 => integration}/model-find-chain.js (100%)
 rename test/{integration2 => integration}/model-find.js (100%)
 rename test/{integration2 => integration}/model-get.js (100%)
 rename test/{integration2 => integration}/model-keys.js (100%)
 rename test/{integration2 => integration}/model-one.js (100%)
 rename test/{integration2 => integration}/model-save.js (100%)
 rename test/{integration2 => integration}/orm-exports.js (100%)
 rename test/{integration2 => integration}/predefined-validators.js (100%)
 rename test/{integration2 => integration}/property-lazyload.js (100%)
 rename test/{integration2 => integration}/property-number-size.js (100%)
 rename test/{integration2 => integration}/property.js (100%)
 rename test/{integration2 => integration}/settings.js (100%)
 rename test/{integration2 => integration}/validation.js (100%)

diff --git a/package.json b/package.json
index d505c80e..0761c71f 100644
--- a/package.json
+++ b/package.json
@@ -42,8 +42,6 @@
     "lodash"    : "1.3.1"
   },
   "devDependencies": {
-    "utest"   : "0.0.6",
-    "urun"    : "0.0.6",
     "mysql"   : "2.0.0-alpha7",
     "pg"      : "1.0.0",
     "sqlite3" : "2.1.7",
diff --git a/test/integration/deprecated/models/model.js b/test/integration-old/deprecated/models/model.js
similarity index 100%
rename from test/integration/deprecated/models/model.js
rename to test/integration-old/deprecated/models/model.js
diff --git a/test/integration/deprecated/models/sub/index.js b/test/integration-old/deprecated/models/sub/index.js
similarity index 100%
rename from test/integration/deprecated/models/sub/index.js
rename to test/integration-old/deprecated/models/sub/index.js
diff --git a/test/integration/deprecated/test-aggregate-alias.js b/test/integration-old/deprecated/test-aggregate-alias.js
similarity index 100%
rename from test/integration/deprecated/test-aggregate-alias.js
rename to test/integration-old/deprecated/test-aggregate-alias.js
diff --git a/test/integration/deprecated/test-aggregate-distinct.js b/test/integration-old/deprecated/test-aggregate-distinct.js
similarity index 100%
rename from test/integration/deprecated/test-aggregate-distinct.js
rename to test/integration-old/deprecated/test-aggregate-distinct.js
diff --git a/test/integration/deprecated/test-aggregate-groupby-orderby.js b/test/integration-old/deprecated/test-aggregate-groupby-orderby.js
similarity index 100%
rename from test/integration/deprecated/test-aggregate-groupby-orderby.js
rename to test/integration-old/deprecated/test-aggregate-groupby-orderby.js
diff --git a/test/integration/deprecated/test-aggregate-groupby.js b/test/integration-old/deprecated/test-aggregate-groupby.js
similarity index 100%
rename from test/integration/deprecated/test-aggregate-groupby.js
rename to test/integration-old/deprecated/test-aggregate-groupby.js
diff --git a/test/integration/deprecated/test-aggregate-limit.js b/test/integration-old/deprecated/test-aggregate-limit.js
similarity index 100%
rename from test/integration/deprecated/test-aggregate-limit.js
rename to test/integration-old/deprecated/test-aggregate-limit.js
diff --git a/test/integration/deprecated/test-aggregate.js b/test/integration-old/deprecated/test-aggregate.js
similarity index 100%
rename from test/integration/deprecated/test-aggregate.js
rename to test/integration-old/deprecated/test-aggregate.js
diff --git a/test/integration/deprecated/test-all.js b/test/integration-old/deprecated/test-all.js
similarity index 100%
rename from test/integration/deprecated/test-all.js
rename to test/integration-old/deprecated/test-all.js
diff --git a/test/integration/deprecated/test-association-hasmany-add-array.js b/test/integration-old/deprecated/test-association-hasmany-add-array.js
similarity index 100%
rename from test/integration/deprecated/test-association-hasmany-add-array.js
rename to test/integration-old/deprecated/test-association-hasmany-add-array.js
diff --git a/test/integration/deprecated/test-association-hasmany-add-extra.js b/test/integration-old/deprecated/test-association-hasmany-add-extra.js
similarity index 100%
rename from test/integration/deprecated/test-association-hasmany-add-extra.js
rename to test/integration-old/deprecated/test-association-hasmany-add-extra.js
diff --git a/test/integration/deprecated/test-association-hasmany-add.js b/test/integration-old/deprecated/test-association-hasmany-add.js
similarity index 100%
rename from test/integration/deprecated/test-association-hasmany-add.js
rename to test/integration-old/deprecated/test-association-hasmany-add.js
diff --git a/test/integration/deprecated/test-association-hasmany-extra-find.js b/test/integration-old/deprecated/test-association-hasmany-extra-find.js
similarity index 100%
rename from test/integration/deprecated/test-association-hasmany-extra-find.js
rename to test/integration-old/deprecated/test-association-hasmany-extra-find.js
diff --git a/test/integration/deprecated/test-association-hasmany-extra.js b/test/integration-old/deprecated/test-association-hasmany-extra.js
similarity index 100%
rename from test/integration/deprecated/test-association-hasmany-extra.js
rename to test/integration-old/deprecated/test-association-hasmany-extra.js
diff --git a/test/integration/deprecated/test-association-hasmany-find-autofetch.js b/test/integration-old/deprecated/test-association-hasmany-find-autofetch.js
similarity index 100%
rename from test/integration/deprecated/test-association-hasmany-find-autofetch.js
rename to test/integration-old/deprecated/test-association-hasmany-find-autofetch.js
diff --git a/test/integration/deprecated/test-association-hasmany-get-chain.js b/test/integration-old/deprecated/test-association-hasmany-get-chain.js
similarity index 100%
rename from test/integration/deprecated/test-association-hasmany-get-chain.js
rename to test/integration-old/deprecated/test-association-hasmany-get-chain.js
diff --git a/test/integration/deprecated/test-association-hasmany-get-filter.js b/test/integration-old/deprecated/test-association-hasmany-get-filter.js
similarity index 100%
rename from test/integration/deprecated/test-association-hasmany-get-filter.js
rename to test/integration-old/deprecated/test-association-hasmany-get-filter.js
diff --git a/test/integration/deprecated/test-association-hasmany-get-limit.js b/test/integration-old/deprecated/test-association-hasmany-get-limit.js
similarity index 100%
rename from test/integration/deprecated/test-association-hasmany-get-limit.js
rename to test/integration-old/deprecated/test-association-hasmany-get-limit.js
diff --git a/test/integration/deprecated/test-association-hasmany-get-order-array.js b/test/integration-old/deprecated/test-association-hasmany-get-order-array.js
similarity index 100%
rename from test/integration/deprecated/test-association-hasmany-get-order-array.js
rename to test/integration-old/deprecated/test-association-hasmany-get-order-array.js
diff --git a/test/integration/deprecated/test-association-hasmany-get-order.js b/test/integration-old/deprecated/test-association-hasmany-get-order.js
similarity index 100%
rename from test/integration/deprecated/test-association-hasmany-get-order.js
rename to test/integration-old/deprecated/test-association-hasmany-get-order.js
diff --git a/test/integration/deprecated/test-association-hasmany-get.js b/test/integration-old/deprecated/test-association-hasmany-get.js
similarity index 100%
rename from test/integration/deprecated/test-association-hasmany-get.js
rename to test/integration-old/deprecated/test-association-hasmany-get.js
diff --git a/test/integration/deprecated/test-association-hasmany-has.js b/test/integration-old/deprecated/test-association-hasmany-has.js
similarity index 100%
rename from test/integration/deprecated/test-association-hasmany-has.js
rename to test/integration-old/deprecated/test-association-hasmany-has.js
diff --git a/test/integration/deprecated/test-association-hasmany-remove.js b/test/integration-old/deprecated/test-association-hasmany-remove.js
similarity index 100%
rename from test/integration/deprecated/test-association-hasmany-remove.js
rename to test/integration-old/deprecated/test-association-hasmany-remove.js
diff --git a/test/integration/deprecated/test-association-hasmany-set-array.js b/test/integration-old/deprecated/test-association-hasmany-set-array.js
similarity index 100%
rename from test/integration/deprecated/test-association-hasmany-set-array.js
rename to test/integration-old/deprecated/test-association-hasmany-set-array.js
diff --git a/test/integration/deprecated/test-association-hasmany-set-multiple.js b/test/integration-old/deprecated/test-association-hasmany-set-multiple.js
similarity index 100%
rename from test/integration/deprecated/test-association-hasmany-set-multiple.js
rename to test/integration-old/deprecated/test-association-hasmany-set-multiple.js
diff --git a/test/integration/deprecated/test-association-hasmany-set.js b/test/integration-old/deprecated/test-association-hasmany-set.js
similarity index 100%
rename from test/integration/deprecated/test-association-hasmany-set.js
rename to test/integration-old/deprecated/test-association-hasmany-set.js
diff --git a/test/integration/deprecated/test-association-hasone-autofetch.js b/test/integration-old/deprecated/test-association-hasone-autofetch.js
similarity index 100%
rename from test/integration/deprecated/test-association-hasone-autofetch.js
rename to test/integration-old/deprecated/test-association-hasone-autofetch.js
diff --git a/test/integration/deprecated/test-association-hasone-find-autofetch.js b/test/integration-old/deprecated/test-association-hasone-find-autofetch.js
similarity index 100%
rename from test/integration/deprecated/test-association-hasone-find-autofetch.js
rename to test/integration-old/deprecated/test-association-hasone-find-autofetch.js
diff --git a/test/integration/deprecated/test-association-hasone-findby.js b/test/integration-old/deprecated/test-association-hasone-findby.js
similarity index 100%
rename from test/integration/deprecated/test-association-hasone-findby.js
rename to test/integration-old/deprecated/test-association-hasone-findby.js
diff --git a/test/integration/deprecated/test-association-hasone-get.js b/test/integration-old/deprecated/test-association-hasone-get.js
similarity index 100%
rename from test/integration/deprecated/test-association-hasone-get.js
rename to test/integration-old/deprecated/test-association-hasone-get.js
diff --git a/test/integration/deprecated/test-association-hasone-has.js b/test/integration-old/deprecated/test-association-hasone-has.js
similarity index 100%
rename from test/integration/deprecated/test-association-hasone-has.js
rename to test/integration-old/deprecated/test-association-hasone-has.js
diff --git a/test/integration/deprecated/test-association-hasone-remove.js b/test/integration-old/deprecated/test-association-hasone-remove.js
similarity index 100%
rename from test/integration/deprecated/test-association-hasone-remove.js
rename to test/integration-old/deprecated/test-association-hasone-remove.js
diff --git a/test/integration/deprecated/test-association-hasone-required.js b/test/integration-old/deprecated/test-association-hasone-required.js
similarity index 100%
rename from test/integration/deprecated/test-association-hasone-required.js
rename to test/integration-old/deprecated/test-association-hasone-required.js
diff --git a/test/integration/deprecated/test-association-hasone-reverse-updown.js b/test/integration-old/deprecated/test-association-hasone-reverse-updown.js
similarity index 100%
rename from test/integration/deprecated/test-association-hasone-reverse-updown.js
rename to test/integration-old/deprecated/test-association-hasone-reverse-updown.js
diff --git a/test/integration/deprecated/test-association-hasone-reverse.js b/test/integration-old/deprecated/test-association-hasone-reverse.js
similarity index 100%
rename from test/integration/deprecated/test-association-hasone-reverse.js
rename to test/integration-old/deprecated/test-association-hasone-reverse.js
diff --git a/test/integration/deprecated/test-association-hasone-set.js b/test/integration-old/deprecated/test-association-hasone-set.js
similarity index 100%
rename from test/integration/deprecated/test-association-hasone-set.js
rename to test/integration-old/deprecated/test-association-hasone-set.js
diff --git a/test/integration/deprecated/test-association-hasone-validate.js b/test/integration-old/deprecated/test-association-hasone-validate.js
similarity index 100%
rename from test/integration/deprecated/test-association-hasone-validate.js
rename to test/integration-old/deprecated/test-association-hasone-validate.js
diff --git a/test/integration/deprecated/test-association-name-lettercase.js b/test/integration-old/deprecated/test-association-name-lettercase.js
similarity index 100%
rename from test/integration/deprecated/test-association-name-lettercase.js
rename to test/integration-old/deprecated/test-association-name-lettercase.js
diff --git a/test/integration/deprecated/test-auto-save.js b/test/integration-old/deprecated/test-auto-save.js
similarity index 100%
rename from test/integration/deprecated/test-auto-save.js
rename to test/integration-old/deprecated/test-auto-save.js
diff --git a/test/integration/deprecated/test-clear.js b/test/integration-old/deprecated/test-clear.js
similarity index 100%
rename from test/integration/deprecated/test-clear.js
rename to test/integration-old/deprecated/test-clear.js
diff --git a/test/integration/deprecated/test-connect-errors.js b/test/integration-old/deprecated/test-connect-errors.js
similarity index 100%
rename from test/integration/deprecated/test-connect-errors.js
rename to test/integration-old/deprecated/test-connect-errors.js
diff --git a/test/integration/deprecated/test-connect-event.js b/test/integration-old/deprecated/test-connect-event.js
similarity index 100%
rename from test/integration/deprecated/test-connect-event.js
rename to test/integration-old/deprecated/test-connect-event.js
diff --git a/test/integration/deprecated/test-connect-object.js b/test/integration-old/deprecated/test-connect-object.js
similarity index 100%
rename from test/integration/deprecated/test-connect-object.js
rename to test/integration-old/deprecated/test-connect-object.js
diff --git a/test/integration/deprecated/test-connect.js b/test/integration-old/deprecated/test-connect.js
similarity index 100%
rename from test/integration/deprecated/test-connect.js
rename to test/integration-old/deprecated/test-connect.js
diff --git a/test/integration/deprecated/test-count.js b/test/integration-old/deprecated/test-count.js
similarity index 100%
rename from test/integration/deprecated/test-count.js
rename to test/integration-old/deprecated/test-count.js
diff --git a/test/integration/deprecated/test-create-defaultvalue.js b/test/integration-old/deprecated/test-create-defaultvalue.js
similarity index 100%
rename from test/integration/deprecated/test-create-defaultvalue.js
rename to test/integration-old/deprecated/test-create-defaultvalue.js
diff --git a/test/integration/deprecated/test-create.js b/test/integration-old/deprecated/test-create.js
similarity index 100%
rename from test/integration/deprecated/test-create.js
rename to test/integration-old/deprecated/test-create.js
diff --git a/test/integration/deprecated/test-db-use.js b/test/integration-old/deprecated/test-db-use.js
similarity index 100%
rename from test/integration/deprecated/test-db-use.js
rename to test/integration-old/deprecated/test-db-use.js
diff --git a/test/integration/deprecated/test-drop-no-throw.js b/test/integration-old/deprecated/test-drop-no-throw.js
similarity index 100%
rename from test/integration/deprecated/test-drop-no-throw.js
rename to test/integration-old/deprecated/test-drop-no-throw.js
diff --git a/test/integration/deprecated/test-drop.js b/test/integration-old/deprecated/test-drop.js
similarity index 100%
rename from test/integration/deprecated/test-drop.js
rename to test/integration-old/deprecated/test-drop.js
diff --git a/test/integration/deprecated/test-exists-array.js b/test/integration-old/deprecated/test-exists-array.js
similarity index 100%
rename from test/integration/deprecated/test-exists-array.js
rename to test/integration-old/deprecated/test-exists-array.js
diff --git a/test/integration/deprecated/test-exists-object.js b/test/integration-old/deprecated/test-exists-object.js
similarity index 100%
rename from test/integration/deprecated/test-exists-object.js
rename to test/integration-old/deprecated/test-exists-object.js
diff --git a/test/integration/deprecated/test-exists.js b/test/integration-old/deprecated/test-exists.js
similarity index 100%
rename from test/integration/deprecated/test-exists.js
rename to test/integration-old/deprecated/test-exists.js
diff --git a/test/integration/deprecated/test-find-chain-count.js b/test/integration-old/deprecated/test-find-chain-count.js
similarity index 100%
rename from test/integration/deprecated/test-find-chain-count.js
rename to test/integration-old/deprecated/test-find-chain-count.js
diff --git a/test/integration/deprecated/test-find-chain-find-cb.js b/test/integration-old/deprecated/test-find-chain-find-cb.js
similarity index 100%
rename from test/integration/deprecated/test-find-chain-find-cb.js
rename to test/integration-old/deprecated/test-find-chain-find-cb.js
diff --git a/test/integration/deprecated/test-find-chain-first.js b/test/integration-old/deprecated/test-find-chain-first.js
similarity index 100%
rename from test/integration/deprecated/test-find-chain-first.js
rename to test/integration-old/deprecated/test-find-chain-first.js
diff --git a/test/integration/deprecated/test-find-chain-instance-count.js b/test/integration-old/deprecated/test-find-chain-instance-count.js
similarity index 100%
rename from test/integration/deprecated/test-find-chain-instance-count.js
rename to test/integration-old/deprecated/test-find-chain-instance-count.js
diff --git a/test/integration/deprecated/test-find-chain-instance-each.js b/test/integration-old/deprecated/test-find-chain-instance-each.js
similarity index 100%
rename from test/integration/deprecated/test-find-chain-instance-each.js
rename to test/integration-old/deprecated/test-find-chain-instance-each.js
diff --git a/test/integration/deprecated/test-find-chain-instance-filter.js b/test/integration-old/deprecated/test-find-chain-instance-filter.js
similarity index 100%
rename from test/integration/deprecated/test-find-chain-instance-filter.js
rename to test/integration-old/deprecated/test-find-chain-instance-filter.js
diff --git a/test/integration/deprecated/test-find-chain-instance-get.js b/test/integration-old/deprecated/test-find-chain-instance-get.js
similarity index 100%
rename from test/integration/deprecated/test-find-chain-instance-get.js
rename to test/integration-old/deprecated/test-find-chain-instance-get.js
diff --git a/test/integration/deprecated/test-find-chain-instance-sort.js b/test/integration-old/deprecated/test-find-chain-instance-sort.js
similarity index 100%
rename from test/integration/deprecated/test-find-chain-instance-sort.js
rename to test/integration-old/deprecated/test-find-chain-instance-sort.js
diff --git a/test/integration/deprecated/test-find-chain-last.js b/test/integration-old/deprecated/test-find-chain-last.js
similarity index 100%
rename from test/integration/deprecated/test-find-chain-last.js
rename to test/integration-old/deprecated/test-find-chain-last.js
diff --git a/test/integration/deprecated/test-find-chain-limit.js b/test/integration-old/deprecated/test-find-chain-limit.js
similarity index 100%
rename from test/integration/deprecated/test-find-chain-limit.js
rename to test/integration-old/deprecated/test-find-chain-limit.js
diff --git a/test/integration/deprecated/test-find-chain-offset.js b/test/integration-old/deprecated/test-find-chain-offset.js
similarity index 100%
rename from test/integration/deprecated/test-find-chain-offset.js
rename to test/integration-old/deprecated/test-find-chain-offset.js
diff --git a/test/integration/deprecated/test-find-chain-only.js b/test/integration-old/deprecated/test-find-chain-only.js
similarity index 100%
rename from test/integration/deprecated/test-find-chain-only.js
rename to test/integration-old/deprecated/test-find-chain-only.js
diff --git a/test/integration/deprecated/test-find-chain-order-desc.js b/test/integration-old/deprecated/test-find-chain-order-desc.js
similarity index 100%
rename from test/integration/deprecated/test-find-chain-order-desc.js
rename to test/integration-old/deprecated/test-find-chain-order-desc.js
diff --git a/test/integration/deprecated/test-find-chain-order-minus.js b/test/integration-old/deprecated/test-find-chain-order-minus.js
similarity index 100%
rename from test/integration/deprecated/test-find-chain-order-minus.js
rename to test/integration-old/deprecated/test-find-chain-order-minus.js
diff --git a/test/integration/deprecated/test-find-chain-order.js b/test/integration-old/deprecated/test-find-chain-order.js
similarity index 100%
rename from test/integration/deprecated/test-find-chain-order.js
rename to test/integration-old/deprecated/test-find-chain-order.js
diff --git a/test/integration/deprecated/test-find-chain-remove.js b/test/integration-old/deprecated/test-find-chain-remove.js
similarity index 100%
rename from test/integration/deprecated/test-find-chain-remove.js
rename to test/integration-old/deprecated/test-find-chain-remove.js
diff --git a/test/integration/deprecated/test-find-chain.js b/test/integration-old/deprecated/test-find-chain.js
similarity index 100%
rename from test/integration/deprecated/test-find-chain.js
rename to test/integration-old/deprecated/test-find-chain.js
diff --git a/test/integration/deprecated/test-find-limit-in-options.js b/test/integration-old/deprecated/test-find-limit-in-options.js
similarity index 100%
rename from test/integration/deprecated/test-find-limit-in-options.js
rename to test/integration-old/deprecated/test-find-limit-in-options.js
diff --git a/test/integration/deprecated/test-find-limit.js b/test/integration-old/deprecated/test-find-limit.js
similarity index 100%
rename from test/integration/deprecated/test-find-limit.js
rename to test/integration-old/deprecated/test-find-limit.js
diff --git a/test/integration/deprecated/test-find-no-cache.js b/test/integration-old/deprecated/test-find-no-cache.js
similarity index 100%
rename from test/integration/deprecated/test-find-no-cache.js
rename to test/integration-old/deprecated/test-find-no-cache.js
diff --git a/test/integration/deprecated/test-find-offset.js b/test/integration-old/deprecated/test-find-offset.js
similarity index 100%
rename from test/integration/deprecated/test-find-offset.js
rename to test/integration-old/deprecated/test-find-offset.js
diff --git a/test/integration/deprecated/test-find-order-asc-array.js b/test/integration-old/deprecated/test-find-order-asc-array.js
similarity index 100%
rename from test/integration/deprecated/test-find-order-asc-array.js
rename to test/integration-old/deprecated/test-find-order-asc-array.js
diff --git a/test/integration/deprecated/test-find-order-desc-array-minus.js b/test/integration-old/deprecated/test-find-order-desc-array-minus.js
similarity index 100%
rename from test/integration/deprecated/test-find-order-desc-array-minus.js
rename to test/integration-old/deprecated/test-find-order-desc-array-minus.js
diff --git a/test/integration/deprecated/test-find-order-desc-array.js b/test/integration-old/deprecated/test-find-order-desc-array.js
similarity index 100%
rename from test/integration/deprecated/test-find-order-desc-array.js
rename to test/integration-old/deprecated/test-find-order-desc-array.js
diff --git a/test/integration/deprecated/test-find-order-desc.js b/test/integration-old/deprecated/test-find-order-desc.js
similarity index 100%
rename from test/integration/deprecated/test-find-order-desc.js
rename to test/integration-old/deprecated/test-find-order-desc.js
diff --git a/test/integration/deprecated/test-find-order-multiple-array-desc-minus.js b/test/integration-old/deprecated/test-find-order-multiple-array-desc-minus.js
similarity index 100%
rename from test/integration/deprecated/test-find-order-multiple-array-desc-minus.js
rename to test/integration-old/deprecated/test-find-order-multiple-array-desc-minus.js
diff --git a/test/integration/deprecated/test-find-order-multiple-array-desc.js b/test/integration-old/deprecated/test-find-order-multiple-array-desc.js
similarity index 100%
rename from test/integration/deprecated/test-find-order-multiple-array-desc.js
rename to test/integration-old/deprecated/test-find-order-multiple-array-desc.js
diff --git a/test/integration/deprecated/test-find-order-multiple-array.js b/test/integration-old/deprecated/test-find-order-multiple-array.js
similarity index 100%
rename from test/integration/deprecated/test-find-order-multiple-array.js
rename to test/integration-old/deprecated/test-find-order-multiple-array.js
diff --git a/test/integration/deprecated/test-find-order.js b/test/integration-old/deprecated/test-find-order.js
similarity index 100%
rename from test/integration/deprecated/test-find-order.js
rename to test/integration-old/deprecated/test-find-order.js
diff --git a/test/integration/deprecated/test-find-rechain.js b/test/integration-old/deprecated/test-find-rechain.js
similarity index 100%
rename from test/integration/deprecated/test-find-rechain.js
rename to test/integration-old/deprecated/test-find-rechain.js
diff --git a/test/integration/deprecated/test-find-serial.js b/test/integration-old/deprecated/test-find-serial.js
similarity index 100%
rename from test/integration/deprecated/test-find-serial.js
rename to test/integration-old/deprecated/test-find-serial.js
diff --git a/test/integration/deprecated/test-find-where-like.js b/test/integration-old/deprecated/test-find-where-like.js
similarity index 100%
rename from test/integration/deprecated/test-find-where-like.js
rename to test/integration-old/deprecated/test-find-where-like.js
diff --git a/test/integration/deprecated/test-find-where.js b/test/integration-old/deprecated/test-find-where.js
similarity index 100%
rename from test/integration/deprecated/test-find-where.js
rename to test/integration-old/deprecated/test-find-where.js
diff --git a/test/integration/deprecated/test-find.js b/test/integration-old/deprecated/test-find.js
similarity index 100%
rename from test/integration/deprecated/test-find.js
rename to test/integration-old/deprecated/test-find.js
diff --git a/test/integration/deprecated/test-get-association-hasone.js b/test/integration-old/deprecated/test-get-association-hasone.js
similarity index 100%
rename from test/integration/deprecated/test-get-association-hasone.js
rename to test/integration-old/deprecated/test-get-association-hasone.js
diff --git a/test/integration/deprecated/test-get-cache-no-save-check.js b/test/integration-old/deprecated/test-get-cache-no-save-check.js
similarity index 100%
rename from test/integration/deprecated/test-get-cache-no-save-check.js
rename to test/integration-old/deprecated/test-get-cache-no-save-check.js
diff --git a/test/integration/deprecated/test-get-cache.js b/test/integration-old/deprecated/test-get-cache.js
similarity index 100%
rename from test/integration/deprecated/test-get-cache.js
rename to test/integration-old/deprecated/test-get-cache.js
diff --git a/test/integration/deprecated/test-get-method.js b/test/integration-old/deprecated/test-get-method.js
similarity index 100%
rename from test/integration/deprecated/test-get-method.js
rename to test/integration-old/deprecated/test-get-method.js
diff --git a/test/integration/deprecated/test-get-model-no-cache.js b/test/integration-old/deprecated/test-get-model-no-cache.js
similarity index 100%
rename from test/integration/deprecated/test-get-model-no-cache.js
rename to test/integration-old/deprecated/test-get-model-no-cache.js
diff --git a/test/integration/deprecated/test-get-no-cache.js b/test/integration-old/deprecated/test-get-no-cache.js
similarity index 100%
rename from test/integration/deprecated/test-get-no-cache.js
rename to test/integration-old/deprecated/test-get-no-cache.js
diff --git a/test/integration/deprecated/test-get-opts.js b/test/integration-old/deprecated/test-get-opts.js
similarity index 100%
rename from test/integration/deprecated/test-get-opts.js
rename to test/integration-old/deprecated/test-get-opts.js
diff --git a/test/integration/deprecated/test-get-singleton-nocache.js b/test/integration-old/deprecated/test-get-singleton-nocache.js
similarity index 100%
rename from test/integration/deprecated/test-get-singleton-nocache.js
rename to test/integration-old/deprecated/test-get-singleton-nocache.js
diff --git a/test/integration/deprecated/test-get-singleton-somecache.js b/test/integration-old/deprecated/test-get-singleton-somecache.js
similarity index 100%
rename from test/integration/deprecated/test-get-singleton-somecache.js
rename to test/integration-old/deprecated/test-get-singleton-somecache.js
diff --git a/test/integration/deprecated/test-get-singleton.js b/test/integration-old/deprecated/test-get-singleton.js
similarity index 100%
rename from test/integration/deprecated/test-get-singleton.js
rename to test/integration-old/deprecated/test-get-singleton.js
diff --git a/test/integration/deprecated/test-get.js b/test/integration-old/deprecated/test-get.js
similarity index 100%
rename from test/integration/deprecated/test-get.js
rename to test/integration-old/deprecated/test-get.js
diff --git a/test/integration/deprecated/test-hook-after-create.js b/test/integration-old/deprecated/test-hook-after-create.js
similarity index 100%
rename from test/integration/deprecated/test-hook-after-create.js
rename to test/integration-old/deprecated/test-hook-after-create.js
diff --git a/test/integration/deprecated/test-hook-after-load.js b/test/integration-old/deprecated/test-hook-after-load.js
similarity index 100%
rename from test/integration/deprecated/test-hook-after-load.js
rename to test/integration-old/deprecated/test-hook-after-load.js
diff --git a/test/integration/deprecated/test-hook-after-remove.js b/test/integration-old/deprecated/test-hook-after-remove.js
similarity index 100%
rename from test/integration/deprecated/test-hook-after-remove.js
rename to test/integration-old/deprecated/test-hook-after-remove.js
diff --git a/test/integration/deprecated/test-hook-after-save.js b/test/integration-old/deprecated/test-hook-after-save.js
similarity index 100%
rename from test/integration/deprecated/test-hook-after-save.js
rename to test/integration-old/deprecated/test-hook-after-save.js
diff --git a/test/integration/deprecated/test-hook-before-create-define-property.js b/test/integration-old/deprecated/test-hook-before-create-define-property.js
similarity index 100%
rename from test/integration/deprecated/test-hook-before-create-define-property.js
rename to test/integration-old/deprecated/test-hook-before-create-define-property.js
diff --git a/test/integration/deprecated/test-hook-before-create-wait.js b/test/integration-old/deprecated/test-hook-before-create-wait.js
similarity index 100%
rename from test/integration/deprecated/test-hook-before-create-wait.js
rename to test/integration-old/deprecated/test-hook-before-create-wait.js
diff --git a/test/integration/deprecated/test-hook-before-create.js b/test/integration-old/deprecated/test-hook-before-create.js
similarity index 100%
rename from test/integration/deprecated/test-hook-before-create.js
rename to test/integration-old/deprecated/test-hook-before-create.js
diff --git a/test/integration/deprecated/test-hook-before-remove-wait.js b/test/integration-old/deprecated/test-hook-before-remove-wait.js
similarity index 100%
rename from test/integration/deprecated/test-hook-before-remove-wait.js
rename to test/integration-old/deprecated/test-hook-before-remove-wait.js
diff --git a/test/integration/deprecated/test-hook-before-remove.js b/test/integration-old/deprecated/test-hook-before-remove.js
similarity index 100%
rename from test/integration/deprecated/test-hook-before-remove.js
rename to test/integration-old/deprecated/test-hook-before-remove.js
diff --git a/test/integration/deprecated/test-hook-before-save-wait.js b/test/integration-old/deprecated/test-hook-before-save-wait.js
similarity index 100%
rename from test/integration/deprecated/test-hook-before-save-wait.js
rename to test/integration-old/deprecated/test-hook-before-save-wait.js
diff --git a/test/integration/deprecated/test-hook-before-save.js b/test/integration-old/deprecated/test-hook-before-save.js
similarity index 100%
rename from test/integration/deprecated/test-hook-before-save.js
rename to test/integration-old/deprecated/test-hook-before-save.js
diff --git a/test/integration/deprecated/test-hook-before-validation-wait.js b/test/integration-old/deprecated/test-hook-before-validation-wait.js
similarity index 100%
rename from test/integration/deprecated/test-hook-before-validation-wait.js
rename to test/integration-old/deprecated/test-hook-before-validation-wait.js
diff --git a/test/integration/deprecated/test-hook-before-validation.js b/test/integration-old/deprecated/test-hook-before-validation.js
similarity index 100%
rename from test/integration/deprecated/test-hook-before-validation.js
rename to test/integration-old/deprecated/test-hook-before-validation.js
diff --git a/test/integration/deprecated/test-hooks-for-single-property.js b/test/integration-old/deprecated/test-hooks-for-single-property.js
similarity index 100%
rename from test/integration/deprecated/test-hooks-for-single-property.js
rename to test/integration-old/deprecated/test-hooks-for-single-property.js
diff --git a/test/integration/deprecated/test-key-nonincrement.js b/test/integration-old/deprecated/test-key-nonincrement.js
similarity index 100%
rename from test/integration/deprecated/test-key-nonincrement.js
rename to test/integration-old/deprecated/test-key-nonincrement.js
diff --git a/test/integration/deprecated/test-load.js b/test/integration-old/deprecated/test-load.js
similarity index 100%
rename from test/integration/deprecated/test-load.js
rename to test/integration-old/deprecated/test-load.js
diff --git a/test/integration/deprecated/test-many-validations-for-same-property.js b/test/integration-old/deprecated/test-many-validations-for-same-property.js
similarity index 100%
rename from test/integration/deprecated/test-many-validations-for-same-property.js
rename to test/integration-old/deprecated/test-many-validations-for-same-property.js
diff --git a/test/integration/deprecated/test-multikey-base.js b/test/integration-old/deprecated/test-multikey-base.js
similarity index 100%
rename from test/integration/deprecated/test-multikey-base.js
rename to test/integration-old/deprecated/test-multikey-base.js
diff --git a/test/integration/deprecated/test-multikey-hasmany-throw.js b/test/integration-old/deprecated/test-multikey-hasmany-throw.js
similarity index 100%
rename from test/integration/deprecated/test-multikey-hasmany-throw.js
rename to test/integration-old/deprecated/test-multikey-hasmany-throw.js
diff --git a/test/integration/deprecated/test-number-size.js b/test/integration-old/deprecated/test-number-size.js
similarity index 100%
rename from test/integration/deprecated/test-number-size.js
rename to test/integration-old/deprecated/test-number-size.js
diff --git a/test/integration/deprecated/test-one-conditions.js b/test/integration-old/deprecated/test-one-conditions.js
similarity index 100%
rename from test/integration/deprecated/test-one-conditions.js
rename to test/integration-old/deprecated/test-one-conditions.js
diff --git a/test/integration/deprecated/test-one-order.js b/test/integration-old/deprecated/test-one-order.js
similarity index 100%
rename from test/integration/deprecated/test-one-order.js
rename to test/integration-old/deprecated/test-one-order.js
diff --git a/test/integration/deprecated/test-one.js b/test/integration-old/deprecated/test-one.js
similarity index 100%
rename from test/integration/deprecated/test-one.js
rename to test/integration-old/deprecated/test-one.js
diff --git a/test/integration/deprecated/test-ping.js b/test/integration-old/deprecated/test-ping.js
similarity index 100%
rename from test/integration/deprecated/test-ping.js
rename to test/integration-old/deprecated/test-ping.js
diff --git a/test/integration/deprecated/test-property-types.js b/test/integration-old/deprecated/test-property-types.js
similarity index 100%
rename from test/integration/deprecated/test-property-types.js
rename to test/integration-old/deprecated/test-property-types.js
diff --git a/test/integration/deprecated/test-save-hasone-association-new.js b/test/integration-old/deprecated/test-save-hasone-association-new.js
similarity index 100%
rename from test/integration/deprecated/test-save-hasone-association-new.js
rename to test/integration-old/deprecated/test-save-hasone-association-new.js
diff --git a/test/integration/deprecated/test-save-hasone-association.js b/test/integration-old/deprecated/test-save-hasone-association.js
similarity index 100%
rename from test/integration/deprecated/test-save-hasone-association.js
rename to test/integration-old/deprecated/test-save-hasone-association.js
diff --git a/test/integration/deprecated/test-save.js b/test/integration-old/deprecated/test-save.js
similarity index 100%
rename from test/integration/deprecated/test-save.js
rename to test/integration-old/deprecated/test-save.js
diff --git a/test/integration/deprecated/test-settings-properties-primary-key.js b/test/integration-old/deprecated/test-settings-properties-primary-key.js
similarity index 100%
rename from test/integration/deprecated/test-settings-properties-primary-key.js
rename to test/integration-old/deprecated/test-settings-properties-primary-key.js
diff --git a/test/integration/deprecated/test-settings.js b/test/integration-old/deprecated/test-settings.js
similarity index 100%
rename from test/integration/deprecated/test-settings.js
rename to test/integration-old/deprecated/test-settings.js
diff --git a/test/integration/deprecated/test-sync-no-throw.js b/test/integration-old/deprecated/test-sync-no-throw.js
similarity index 100%
rename from test/integration/deprecated/test-sync-no-throw.js
rename to test/integration-old/deprecated/test-sync-no-throw.js
diff --git a/test/integration/deprecated/test-sync.js b/test/integration-old/deprecated/test-sync.js
similarity index 100%
rename from test/integration/deprecated/test-sync.js
rename to test/integration-old/deprecated/test-sync.js
diff --git a/test/integration/deprecated/test-use.js b/test/integration-old/deprecated/test-use.js
similarity index 100%
rename from test/integration/deprecated/test-use.js
rename to test/integration-old/deprecated/test-use.js
diff --git a/test/integration/deprecated/test-validation.js b/test/integration-old/deprecated/test-validation.js
similarity index 100%
rename from test/integration/deprecated/test-validation.js
rename to test/integration-old/deprecated/test-validation.js
diff --git a/test/integration/deprecated/test-validators.js b/test/integration-old/deprecated/test-validators.js
similarity index 100%
rename from test/integration/deprecated/test-validators.js
rename to test/integration-old/deprecated/test-validators.js
diff --git a/test/integration2/association-extend.js b/test/integration/association-extend.js
similarity index 100%
rename from test/integration2/association-extend.js
rename to test/integration/association-extend.js
diff --git a/test/integration2/association-hasmany-extra.js b/test/integration/association-hasmany-extra.js
similarity index 100%
rename from test/integration2/association-hasmany-extra.js
rename to test/integration/association-hasmany-extra.js
diff --git a/test/integration2/association-hasmany.js b/test/integration/association-hasmany.js
similarity index 100%
rename from test/integration2/association-hasmany.js
rename to test/integration/association-hasmany.js
diff --git a/test/integration2/association-hasone-required.js b/test/integration/association-hasone-required.js
similarity index 100%
rename from test/integration2/association-hasone-required.js
rename to test/integration/association-hasone-required.js
diff --git a/test/integration2/association-hasone-reverse.js b/test/integration/association-hasone-reverse.js
similarity index 100%
rename from test/integration2/association-hasone-reverse.js
rename to test/integration/association-hasone-reverse.js
diff --git a/test/integration2/association-hasone.js b/test/integration/association-hasone.js
similarity index 100%
rename from test/integration2/association-hasone.js
rename to test/integration/association-hasone.js
diff --git a/test/integration2/db.js b/test/integration/db.js
similarity index 100%
rename from test/integration2/db.js
rename to test/integration/db.js
diff --git a/test/integration2/event.js b/test/integration/event.js
similarity index 100%
rename from test/integration2/event.js
rename to test/integration/event.js
diff --git a/test/integration2/hook.js b/test/integration/hook.js
similarity index 100%
rename from test/integration2/hook.js
rename to test/integration/hook.js
diff --git a/test/integration2/instance.js b/test/integration/instance.js
similarity index 100%
rename from test/integration2/instance.js
rename to test/integration/instance.js
diff --git a/test/integration2/model-aggregate.js b/test/integration/model-aggregate.js
similarity index 100%
rename from test/integration2/model-aggregate.js
rename to test/integration/model-aggregate.js
diff --git a/test/integration2/model-clear.js b/test/integration/model-clear.js
similarity index 100%
rename from test/integration2/model-clear.js
rename to test/integration/model-clear.js
diff --git a/test/integration2/model-count.js b/test/integration/model-count.js
similarity index 100%
rename from test/integration2/model-count.js
rename to test/integration/model-count.js
diff --git a/test/integration2/model-create.js b/test/integration/model-create.js
similarity index 100%
rename from test/integration2/model-create.js
rename to test/integration/model-create.js
diff --git a/test/integration2/model-exists.js b/test/integration/model-exists.js
similarity index 100%
rename from test/integration2/model-exists.js
rename to test/integration/model-exists.js
diff --git a/test/integration2/model-find-chain.js b/test/integration/model-find-chain.js
similarity index 100%
rename from test/integration2/model-find-chain.js
rename to test/integration/model-find-chain.js
diff --git a/test/integration2/model-find.js b/test/integration/model-find.js
similarity index 100%
rename from test/integration2/model-find.js
rename to test/integration/model-find.js
diff --git a/test/integration2/model-get.js b/test/integration/model-get.js
similarity index 100%
rename from test/integration2/model-get.js
rename to test/integration/model-get.js
diff --git a/test/integration2/model-keys.js b/test/integration/model-keys.js
similarity index 100%
rename from test/integration2/model-keys.js
rename to test/integration/model-keys.js
diff --git a/test/integration2/model-one.js b/test/integration/model-one.js
similarity index 100%
rename from test/integration2/model-one.js
rename to test/integration/model-one.js
diff --git a/test/integration2/model-save.js b/test/integration/model-save.js
similarity index 100%
rename from test/integration2/model-save.js
rename to test/integration/model-save.js
diff --git a/test/integration2/orm-exports.js b/test/integration/orm-exports.js
similarity index 100%
rename from test/integration2/orm-exports.js
rename to test/integration/orm-exports.js
diff --git a/test/integration2/predefined-validators.js b/test/integration/predefined-validators.js
similarity index 100%
rename from test/integration2/predefined-validators.js
rename to test/integration/predefined-validators.js
diff --git a/test/integration2/property-lazyload.js b/test/integration/property-lazyload.js
similarity index 100%
rename from test/integration2/property-lazyload.js
rename to test/integration/property-lazyload.js
diff --git a/test/integration2/property-number-size.js b/test/integration/property-number-size.js
similarity index 100%
rename from test/integration2/property-number-size.js
rename to test/integration/property-number-size.js
diff --git a/test/integration2/property.js b/test/integration/property.js
similarity index 100%
rename from test/integration2/property.js
rename to test/integration/property.js
diff --git a/test/integration2/settings.js b/test/integration/settings.js
similarity index 100%
rename from test/integration2/settings.js
rename to test/integration/settings.js
diff --git a/test/integration2/validation.js b/test/integration/validation.js
similarity index 100%
rename from test/integration2/validation.js
rename to test/integration/validation.js
diff --git a/test/run.js b/test/run.js
index b9608506..0face329 100644
--- a/test/run.js
+++ b/test/run.js
@@ -1,29 +1,13 @@
 var Mocha    = require('mocha');
 var fs       = require('fs');
 var path     = require('path');
-var location = path.normalize(path.join(__dirname, "integration2"));
+var location = path.normalize(path.join(__dirname, "integration"));
 var mocha    = new Mocha({
 	reporter: "progress"
 });
 
 runTests();
 
-function runClassicTests() {
-	var options  = {
-		include  : new RegExp("integration\\/test\\-.*\\.js$")
-	};
-
-	if (process.env.FILTER) {
-		options.include = new RegExp("integration\\/test\\-.*" + process.env.FILTER + '.*\\.js$');
-	}
-
-	process.stdout.write("\033[1;34m[i] \033[0;34mFramework \033[1;34murun\033[0m\n");
-	process.stdout.write("\033[1;34m[i] \033[0;34mTesting \033[1;34m" + process.env.ORM_PROTOCOL + "\033[0m\n");
-	process.stdout.write("\033[1;34m[i] \033[0;34mURI: \033[1;34m" + require('./common').getConnectionString() + "\033[0m\n");
-
-	require('urun')(__dirname, options);
-}
-
 function runTests() {
 	fs.readdirSync(location).filter(function(file){
 		return file.substr(-3) === '.js';
@@ -33,15 +17,10 @@ function runTests() {
 		);
 	});
 
-	process.stdout.write("\033[1;34m[i] \033[0;34mFramework \033[1;34mmocha\033[0m\n");
 	process.stdout.write("\033[1;34m[i] \033[0;34mTesting \033[1;34m" + process.env.ORM_PROTOCOL + "\033[0m\n");
 	process.stdout.write("\033[1;34m[i] \033[0;34mURI: \033[1;34m" + require('./common').getConnectionString() + "\033[0m\n");
 
 	mocha.run(function (failures) {
-		if (failures > 0) {
-			process.exit(failures);
-		} else {
-			runClassicTests();
-		}
+		process.exit(failures);
 	});
 }

From 5b12394440d320ea982464271d58b148047428ef Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 11 Jul 2013 19:05:44 +0100
Subject: [PATCH 0658/1246] Removing old tests

---
 .../deprecated/models/model.js                |   5 -
 .../deprecated/models/sub/index.js            |   7 -
 .../deprecated/test-aggregate-alias.js        |  24 ----
 .../deprecated/test-aggregate-distinct.js     |  25 ----
 .../test-aggregate-groupby-orderby.js         |  28 ----
 .../deprecated/test-aggregate-groupby.js      |  35 -----
 .../deprecated/test-aggregate-limit.js        |  27 ----
 .../deprecated/test-aggregate.js              |  26 ----
 test/integration-old/deprecated/test-all.js   |  26 ----
 .../test-association-hasmany-add-array.js     |  45 -------
 .../test-association-hasmany-add-extra.js     |  39 ------
 .../test-association-hasmany-add.js           |  45 -------
 .../test-association-hasmany-extra-find.js    |  41 ------
 .../test-association-hasmany-extra.js         |  46 -------
 ...test-association-hasmany-find-autofetch.js |  43 ------
 .../test-association-hasmany-get-chain.js     |  41 ------
 .../test-association-hasmany-get-filter.js    |  38 ------
 .../test-association-hasmany-get-limit.js     |  37 -----
 ...est-association-hasmany-get-order-array.js |  39 ------
 .../test-association-hasmany-get-order.js     |  39 ------
 .../test-association-hasmany-get.js           |  44 ------
 .../test-association-hasmany-has.js           |  55 --------
 .../test-association-hasmany-remove.js        |  53 --------
 .../test-association-hasmany-set-array.js     |  40 ------
 .../test-association-hasmany-set-multiple.js  |  45 -------
 .../test-association-hasmany-set.js           |  40 ------
 .../test-association-hasone-autofetch.js      |  29 ----
 .../test-association-hasone-find-autofetch.js |  26 ----
 .../test-association-hasone-findby.js         |  35 -----
 .../deprecated/test-association-hasone-get.js |  26 ----
 .../deprecated/test-association-hasone-has.js |  29 ----
 .../test-association-hasone-remove.js         |  29 ----
 .../test-association-hasone-required.js       |  49 -------
 .../test-association-hasone-reverse-updown.js |  54 --------
 .../test-association-hasone-reverse.js        |  41 ------
 .../deprecated/test-association-hasone-set.js |  32 -----
 .../test-association-hasone-validate.js       |  44 ------
 .../test-association-name-lettercase.js       |  25 ----
 .../deprecated/test-auto-save.js              |  31 -----
 test/integration-old/deprecated/test-clear.js |  33 -----
 .../deprecated/test-connect-errors.js         |  14 --
 .../deprecated/test-connect-event.js          |  13 --
 .../deprecated/test-connect-object.js         |  14 --
 .../deprecated/test-connect.js                |  13 --
 test/integration-old/deprecated/test-count.js |  24 ----
 .../deprecated/test-create-defaultvalue.js    |  20 ---
 .../integration-old/deprecated/test-create.js |  58 --------
 .../integration-old/deprecated/test-db-use.js |  31 -----
 .../deprecated/test-drop-no-throw.js          |  21 ---
 test/integration-old/deprecated/test-drop.js  |  22 ---
 .../deprecated/test-exists-array.js           |  36 -----
 .../deprecated/test-exists-object.js          |  36 -----
 .../integration-old/deprecated/test-exists.js |  44 ------
 .../deprecated/test-find-chain-count.js       |  23 ----
 .../deprecated/test-find-chain-find-cb.js     |  22 ---
 .../deprecated/test-find-chain-first.js       |  22 ---
 .../test-find-chain-instance-count.js         |  24 ----
 .../test-find-chain-instance-each.js          |  28 ----
 .../test-find-chain-instance-filter.js        |  28 ----
 .../test-find-chain-instance-get.js           |  28 ----
 .../test-find-chain-instance-sort.js          |  28 ----
 .../deprecated/test-find-chain-last.js        |  22 ---
 .../deprecated/test-find-chain-limit.js       |  22 ---
 .../deprecated/test-find-chain-offset.js      |  24 ----
 .../deprecated/test-find-chain-only.js        |  26 ----
 .../deprecated/test-find-chain-order-desc.js  |  24 ----
 .../deprecated/test-find-chain-order-minus.js |  24 ----
 .../deprecated/test-find-chain-order.js       |  24 ----
 .../deprecated/test-find-chain-remove.js      |  27 ----
 .../deprecated/test-find-chain.js             |  25 ----
 .../deprecated/test-find-limit-in-options.js  |  22 ---
 .../deprecated/test-find-limit.js             |  22 ---
 .../deprecated/test-find-no-cache.js          |  35 -----
 .../deprecated/test-find-offset.js            |  24 ----
 .../deprecated/test-find-order-asc-array.js   |  24 ----
 .../test-find-order-desc-array-minus.js       |  24 ----
 .../deprecated/test-find-order-desc-array.js  |  24 ----
 .../deprecated/test-find-order-desc.js        |  24 ----
 ...st-find-order-multiple-array-desc-minus.js |  24 ----
 .../test-find-order-multiple-array-desc.js    |  24 ----
 .../test-find-order-multiple-array.js         |  24 ----
 .../deprecated/test-find-order.js             |  24 ----
 .../deprecated/test-find-rechain.js           |  34 -----
 .../deprecated/test-find-serial.js            |  33 -----
 .../deprecated/test-find-where-like.js        |  24 ----
 .../deprecated/test-find-where.js             |  24 ----
 test/integration-old/deprecated/test-find.js  |  25 ----
 .../deprecated/test-get-association-hasone.js |  23 ----
 .../test-get-cache-no-save-check.js           |  34 -----
 .../deprecated/test-get-cache.js              |  32 -----
 .../deprecated/test-get-method.js             |  27 ----
 .../deprecated/test-get-model-no-cache.js     |  31 -----
 .../deprecated/test-get-no-cache.js           |  31 -----
 .../deprecated/test-get-opts.js               |  22 ---
 .../deprecated/test-get-singleton-nocache.js  |  23 ----
 .../test-get-singleton-somecache.js           |  31 -----
 .../deprecated/test-get-singleton.js          |  23 ----
 test/integration-old/deprecated/test-get.js   |  22 ---
 .../deprecated/test-hook-after-create.js      |  24 ----
 .../deprecated/test-hook-after-load.js        |  19 ---
 .../deprecated/test-hook-after-remove.js      |  29 ----
 .../deprecated/test-hook-after-save.js        |  24 ----
 ...test-hook-before-create-define-property.js |  22 ---
 .../test-hook-before-create-wait.js           |  28 ----
 .../deprecated/test-hook-before-create.js     |  24 ----
 .../test-hook-before-remove-wait.js           |  34 -----
 .../deprecated/test-hook-before-remove.js     |  29 ----
 .../deprecated/test-hook-before-save-wait.js  |  28 ----
 .../deprecated/test-hook-before-save.js       |  24 ----
 .../test-hook-before-validation-wait.js       |  28 ----
 .../deprecated/test-hook-before-validation.js |  24 ----
 .../test-hooks-for-single-property.js         |  36 -----
 .../deprecated/test-key-nonincrement.js       |  34 -----
 test/integration-old/deprecated/test-load.js  |  13 --
 ...test-many-validations-for-same-property.js |  25 ----
 .../deprecated/test-multikey-base.js          |  61 ---------
 .../deprecated/test-multikey-hasmany-throw.js |  26 ----
 .../deprecated/test-number-size.js            | 127 ------------------
 .../deprecated/test-one-conditions.js         |  23 ----
 .../deprecated/test-one-order.js              |  24 ----
 test/integration-old/deprecated/test-one.js   |  22 ---
 test/integration-old/deprecated/test-ping.js  |  10 --
 .../deprecated/test-property-types.js         |  24 ----
 .../test-save-hasone-association-new.js       |  29 ----
 .../test-save-hasone-association.js           |  30 -----
 test/integration-old/deprecated/test-save.js  |  24 ----
 .../test-settings-properties-primary-key.js   |  33 -----
 .../deprecated/test-settings.js               |  31 -----
 .../deprecated/test-sync-no-throw.js          |  14 --
 test/integration-old/deprecated/test-sync.js  |  31 -----
 test/integration-old/deprecated/test-use.js   |  33 -----
 .../deprecated/test-validation.js             |  32 -----
 .../deprecated/test-validators.js             |  50 -------
 133 files changed, 3986 deletions(-)
 delete mode 100644 test/integration-old/deprecated/models/model.js
 delete mode 100644 test/integration-old/deprecated/models/sub/index.js
 delete mode 100644 test/integration-old/deprecated/test-aggregate-alias.js
 delete mode 100644 test/integration-old/deprecated/test-aggregate-distinct.js
 delete mode 100644 test/integration-old/deprecated/test-aggregate-groupby-orderby.js
 delete mode 100644 test/integration-old/deprecated/test-aggregate-groupby.js
 delete mode 100644 test/integration-old/deprecated/test-aggregate-limit.js
 delete mode 100644 test/integration-old/deprecated/test-aggregate.js
 delete mode 100644 test/integration-old/deprecated/test-all.js
 delete mode 100644 test/integration-old/deprecated/test-association-hasmany-add-array.js
 delete mode 100644 test/integration-old/deprecated/test-association-hasmany-add-extra.js
 delete mode 100644 test/integration-old/deprecated/test-association-hasmany-add.js
 delete mode 100644 test/integration-old/deprecated/test-association-hasmany-extra-find.js
 delete mode 100644 test/integration-old/deprecated/test-association-hasmany-extra.js
 delete mode 100644 test/integration-old/deprecated/test-association-hasmany-find-autofetch.js
 delete mode 100644 test/integration-old/deprecated/test-association-hasmany-get-chain.js
 delete mode 100644 test/integration-old/deprecated/test-association-hasmany-get-filter.js
 delete mode 100644 test/integration-old/deprecated/test-association-hasmany-get-limit.js
 delete mode 100644 test/integration-old/deprecated/test-association-hasmany-get-order-array.js
 delete mode 100644 test/integration-old/deprecated/test-association-hasmany-get-order.js
 delete mode 100644 test/integration-old/deprecated/test-association-hasmany-get.js
 delete mode 100644 test/integration-old/deprecated/test-association-hasmany-has.js
 delete mode 100644 test/integration-old/deprecated/test-association-hasmany-remove.js
 delete mode 100644 test/integration-old/deprecated/test-association-hasmany-set-array.js
 delete mode 100644 test/integration-old/deprecated/test-association-hasmany-set-multiple.js
 delete mode 100644 test/integration-old/deprecated/test-association-hasmany-set.js
 delete mode 100644 test/integration-old/deprecated/test-association-hasone-autofetch.js
 delete mode 100644 test/integration-old/deprecated/test-association-hasone-find-autofetch.js
 delete mode 100644 test/integration-old/deprecated/test-association-hasone-findby.js
 delete mode 100644 test/integration-old/deprecated/test-association-hasone-get.js
 delete mode 100644 test/integration-old/deprecated/test-association-hasone-has.js
 delete mode 100644 test/integration-old/deprecated/test-association-hasone-remove.js
 delete mode 100644 test/integration-old/deprecated/test-association-hasone-required.js
 delete mode 100644 test/integration-old/deprecated/test-association-hasone-reverse-updown.js
 delete mode 100644 test/integration-old/deprecated/test-association-hasone-reverse.js
 delete mode 100644 test/integration-old/deprecated/test-association-hasone-set.js
 delete mode 100644 test/integration-old/deprecated/test-association-hasone-validate.js
 delete mode 100644 test/integration-old/deprecated/test-association-name-lettercase.js
 delete mode 100644 test/integration-old/deprecated/test-auto-save.js
 delete mode 100644 test/integration-old/deprecated/test-clear.js
 delete mode 100644 test/integration-old/deprecated/test-connect-errors.js
 delete mode 100644 test/integration-old/deprecated/test-connect-event.js
 delete mode 100644 test/integration-old/deprecated/test-connect-object.js
 delete mode 100644 test/integration-old/deprecated/test-connect.js
 delete mode 100644 test/integration-old/deprecated/test-count.js
 delete mode 100644 test/integration-old/deprecated/test-create-defaultvalue.js
 delete mode 100644 test/integration-old/deprecated/test-create.js
 delete mode 100644 test/integration-old/deprecated/test-db-use.js
 delete mode 100644 test/integration-old/deprecated/test-drop-no-throw.js
 delete mode 100644 test/integration-old/deprecated/test-drop.js
 delete mode 100644 test/integration-old/deprecated/test-exists-array.js
 delete mode 100644 test/integration-old/deprecated/test-exists-object.js
 delete mode 100644 test/integration-old/deprecated/test-exists.js
 delete mode 100644 test/integration-old/deprecated/test-find-chain-count.js
 delete mode 100644 test/integration-old/deprecated/test-find-chain-find-cb.js
 delete mode 100644 test/integration-old/deprecated/test-find-chain-first.js
 delete mode 100644 test/integration-old/deprecated/test-find-chain-instance-count.js
 delete mode 100644 test/integration-old/deprecated/test-find-chain-instance-each.js
 delete mode 100644 test/integration-old/deprecated/test-find-chain-instance-filter.js
 delete mode 100644 test/integration-old/deprecated/test-find-chain-instance-get.js
 delete mode 100644 test/integration-old/deprecated/test-find-chain-instance-sort.js
 delete mode 100644 test/integration-old/deprecated/test-find-chain-last.js
 delete mode 100644 test/integration-old/deprecated/test-find-chain-limit.js
 delete mode 100644 test/integration-old/deprecated/test-find-chain-offset.js
 delete mode 100644 test/integration-old/deprecated/test-find-chain-only.js
 delete mode 100644 test/integration-old/deprecated/test-find-chain-order-desc.js
 delete mode 100644 test/integration-old/deprecated/test-find-chain-order-minus.js
 delete mode 100644 test/integration-old/deprecated/test-find-chain-order.js
 delete mode 100644 test/integration-old/deprecated/test-find-chain-remove.js
 delete mode 100644 test/integration-old/deprecated/test-find-chain.js
 delete mode 100644 test/integration-old/deprecated/test-find-limit-in-options.js
 delete mode 100644 test/integration-old/deprecated/test-find-limit.js
 delete mode 100644 test/integration-old/deprecated/test-find-no-cache.js
 delete mode 100644 test/integration-old/deprecated/test-find-offset.js
 delete mode 100644 test/integration-old/deprecated/test-find-order-asc-array.js
 delete mode 100644 test/integration-old/deprecated/test-find-order-desc-array-minus.js
 delete mode 100644 test/integration-old/deprecated/test-find-order-desc-array.js
 delete mode 100644 test/integration-old/deprecated/test-find-order-desc.js
 delete mode 100644 test/integration-old/deprecated/test-find-order-multiple-array-desc-minus.js
 delete mode 100644 test/integration-old/deprecated/test-find-order-multiple-array-desc.js
 delete mode 100644 test/integration-old/deprecated/test-find-order-multiple-array.js
 delete mode 100644 test/integration-old/deprecated/test-find-order.js
 delete mode 100644 test/integration-old/deprecated/test-find-rechain.js
 delete mode 100644 test/integration-old/deprecated/test-find-serial.js
 delete mode 100644 test/integration-old/deprecated/test-find-where-like.js
 delete mode 100644 test/integration-old/deprecated/test-find-where.js
 delete mode 100644 test/integration-old/deprecated/test-find.js
 delete mode 100644 test/integration-old/deprecated/test-get-association-hasone.js
 delete mode 100644 test/integration-old/deprecated/test-get-cache-no-save-check.js
 delete mode 100644 test/integration-old/deprecated/test-get-cache.js
 delete mode 100644 test/integration-old/deprecated/test-get-method.js
 delete mode 100644 test/integration-old/deprecated/test-get-model-no-cache.js
 delete mode 100644 test/integration-old/deprecated/test-get-no-cache.js
 delete mode 100644 test/integration-old/deprecated/test-get-opts.js
 delete mode 100644 test/integration-old/deprecated/test-get-singleton-nocache.js
 delete mode 100644 test/integration-old/deprecated/test-get-singleton-somecache.js
 delete mode 100644 test/integration-old/deprecated/test-get-singleton.js
 delete mode 100644 test/integration-old/deprecated/test-get.js
 delete mode 100644 test/integration-old/deprecated/test-hook-after-create.js
 delete mode 100644 test/integration-old/deprecated/test-hook-after-load.js
 delete mode 100644 test/integration-old/deprecated/test-hook-after-remove.js
 delete mode 100644 test/integration-old/deprecated/test-hook-after-save.js
 delete mode 100644 test/integration-old/deprecated/test-hook-before-create-define-property.js
 delete mode 100644 test/integration-old/deprecated/test-hook-before-create-wait.js
 delete mode 100644 test/integration-old/deprecated/test-hook-before-create.js
 delete mode 100644 test/integration-old/deprecated/test-hook-before-remove-wait.js
 delete mode 100644 test/integration-old/deprecated/test-hook-before-remove.js
 delete mode 100644 test/integration-old/deprecated/test-hook-before-save-wait.js
 delete mode 100644 test/integration-old/deprecated/test-hook-before-save.js
 delete mode 100644 test/integration-old/deprecated/test-hook-before-validation-wait.js
 delete mode 100644 test/integration-old/deprecated/test-hook-before-validation.js
 delete mode 100644 test/integration-old/deprecated/test-hooks-for-single-property.js
 delete mode 100755 test/integration-old/deprecated/test-key-nonincrement.js
 delete mode 100644 test/integration-old/deprecated/test-load.js
 delete mode 100644 test/integration-old/deprecated/test-many-validations-for-same-property.js
 delete mode 100644 test/integration-old/deprecated/test-multikey-base.js
 delete mode 100644 test/integration-old/deprecated/test-multikey-hasmany-throw.js
 delete mode 100644 test/integration-old/deprecated/test-number-size.js
 delete mode 100644 test/integration-old/deprecated/test-one-conditions.js
 delete mode 100644 test/integration-old/deprecated/test-one-order.js
 delete mode 100644 test/integration-old/deprecated/test-one.js
 delete mode 100644 test/integration-old/deprecated/test-ping.js
 delete mode 100644 test/integration-old/deprecated/test-property-types.js
 delete mode 100644 test/integration-old/deprecated/test-save-hasone-association-new.js
 delete mode 100644 test/integration-old/deprecated/test-save-hasone-association.js
 delete mode 100644 test/integration-old/deprecated/test-save.js
 delete mode 100644 test/integration-old/deprecated/test-settings-properties-primary-key.js
 delete mode 100644 test/integration-old/deprecated/test-settings.js
 delete mode 100644 test/integration-old/deprecated/test-sync-no-throw.js
 delete mode 100644 test/integration-old/deprecated/test-sync.js
 delete mode 100644 test/integration-old/deprecated/test-use.js
 delete mode 100644 test/integration-old/deprecated/test-validation.js
 delete mode 100644 test/integration-old/deprecated/test-validators.js

diff --git a/test/integration-old/deprecated/models/model.js b/test/integration-old/deprecated/models/model.js
deleted file mode 100644
index c3d84878..00000000
--- a/test/integration-old/deprecated/models/model.js
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = function (db, cb) {
-	setTimeout(function () {
-		return cb();
-	}, 500);
-};
diff --git a/test/integration-old/deprecated/models/sub/index.js b/test/integration-old/deprecated/models/sub/index.js
deleted file mode 100644
index 98c753fb..00000000
--- a/test/integration-old/deprecated/models/sub/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-module.exports = function (db, cb) {
-	db.load("../model", function (err) {
-		setTimeout(function () {
-			return cb();
-		}, 500);
-	});
-};
diff --git a/test/integration-old/deprecated/test-aggregate-alias.js b/test/integration-old/deprecated/test-aggregate-alias.js
deleted file mode 100644
index c7ecae68..00000000
--- a/test/integration-old/deprecated/test-aggregate-alias.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_aggregate', db.driver.db, function () {
-		common.insertModelData('test_aggregate', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' },
-			{ id : 3, name : 'test3' },
-			{ id : 4, name : 'test4' },
-			{ id : 5, name : 'test5' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_aggregate', common.getModelProperties());
-
-			TestModel.aggregate({ id: common.ORM.gt(2) }).count('id').as('alias').get(function (err, alias) {
-				assert.equal(err, null);
-				assert.equal(alias, 3);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-aggregate-distinct.js b/test/integration-old/deprecated/test-aggregate-distinct.js
deleted file mode 100644
index 6cf5808b..00000000
--- a/test/integration-old/deprecated/test-aggregate-distinct.js
+++ /dev/null
@@ -1,25 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_aggregate_distinct', db.driver.db, function () {
-		common.insertModelData('test_aggregate_distinct', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test1' },
-			{ id : 3, name : 'test2' },
-			{ id : 4, name : 'test2' },
-			{ id : 5, name : 'test2' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_aggregate_distinct', common.getModelProperties());
-
-			TestModel.aggregate().distinct('name').get(function (err, names) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(names), true);
-				assert.equal(names.length, 2);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-aggregate-groupby-orderby.js b/test/integration-old/deprecated/test-aggregate-groupby-orderby.js
deleted file mode 100644
index 421641f3..00000000
--- a/test/integration-old/deprecated/test-aggregate-groupby-orderby.js
+++ /dev/null
@@ -1,28 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_aggregate_groupby_orderby', db.driver.db, function () {
-		common.insertModelData('test_aggregate_groupby_orderby', db.driver.db, [
-			{ id : 2, name : 'test1' },
-			{ id : 3, name : 'test1' },
-			{ id : 4, name : 'test1' },
-			{ id : 5, name : 'test2' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_aggregate_groupby_orderby', common.getModelProperties());
-
-			TestModel.aggregate().avg('id').count().groupBy('name').order('name', 'Z').get(function (err, rows) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(rows), true);
-				assert.equal(rows.length, 2);
-				assert.equal(rows[0].avg_id, 5);
-				assert.equal(rows[0].count, 1);
-				assert.equal(rows[1].avg_id, 3);
-				assert.equal(rows[1].count, 3);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-aggregate-groupby.js b/test/integration-old/deprecated/test-aggregate-groupby.js
deleted file mode 100644
index 79eee3e3..00000000
--- a/test/integration-old/deprecated/test-aggregate-groupby.js
+++ /dev/null
@@ -1,35 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_aggregate_groupby', db.driver.db, function () {
-		common.insertModelData('test_aggregate_groupby', db.driver.db, [
-			{ id : 2, name : 'test1' },
-			{ id : 3, name : 'test1' },
-			{ id : 4, name : 'test1' },
-			{ id : 5, name : 'test2' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_aggregate_groupby', common.getModelProperties());
-
-			TestModel.aggregate().avg('id').count().groupBy('name').get(function (err, rows) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(rows), true);
-				assert.equal(rows.length, 2);
-				if (rows[0].avg_id == 3) {
-					assert.equal(rows[0].avg_id, 3);
-					assert.equal(rows[0].count, 3);
-					assert.equal(rows[1].avg_id, 5);
-					assert.equal(rows[1].count, 1);
-				} else {
-					assert.equal(rows[0].avg_id, 5);
-					assert.equal(rows[0].count, 1);
-					assert.equal(rows[1].avg_id, 3);
-					assert.equal(rows[1].count, 3);
-				}
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-aggregate-limit.js b/test/integration-old/deprecated/test-aggregate-limit.js
deleted file mode 100644
index 7ac6bd7b..00000000
--- a/test/integration-old/deprecated/test-aggregate-limit.js
+++ /dev/null
@@ -1,27 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_aggregate_limit', db.driver.db, function () {
-		common.insertModelData('test_aggregate_limit', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test1' },
-			{ id : 3, name : 'test2' },
-			{ id : 4, name : 'test2' },
-			{ id : 5, name : 'test2' },
-			{ id : 6, name : 'test3' },
-			{ id : 7, name : 'test3' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_aggregate_limit', common.getModelProperties());
-
-			TestModel.aggregate().distinct('name').limit(1).get(function (err, names) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(names), true);
-				assert.equal(names.length, 1);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-aggregate.js b/test/integration-old/deprecated/test-aggregate.js
deleted file mode 100644
index 0957e430..00000000
--- a/test/integration-old/deprecated/test-aggregate.js
+++ /dev/null
@@ -1,26 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_aggregate', db.driver.db, function () {
-		common.insertModelData('test_aggregate', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' },
-			{ id : 3, name : 'test3' },
-			{ id : 4, name : 'test4' },
-			{ id : 5, name : 'test5' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_aggregate', common.getModelProperties());
-
-			TestModel.aggregate({ id: common.ORM.gt(2) }).count('id').min('id').max('id').get(function (err, count, min, max) {
-				assert.equal(err, null);
-				assert.equal(count, 3);
-				assert.equal(min, 3);
-				assert.equal(max, 5);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-all.js b/test/integration-old/deprecated/test-all.js
deleted file mode 100644
index add02b45..00000000
--- a/test/integration-old/deprecated/test-all.js
+++ /dev/null
@@ -1,26 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_all', db.driver.db, function () {
-		common.insertModelData('test_all', db.driver.db, [
-			{ id : 1, name : 'test2' },
-			{ id : 2, name : 'test2' },
-			{ id : 3, name : 'test1' },
-			{ id : 4, name : 'test1' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_all', common.getModelProperties());
-
-			// just to see if Model.all() is passing everything to Model.find()
-			TestModel.all({ name: 'test1' }, 1, 'id', function (err, Instances) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances.length, 1);
-				assert.equal(Instances[0].id, 3);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-association-hasmany-add-array.js b/test/integration-old/deprecated/test-association-hasmany-add-array.js
deleted file mode 100644
index 92d721dc..00000000
--- a/test/integration-old/deprecated/test-association-hasmany-add-array.js
+++ /dev/null
@@ -1,45 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_association_hasmany_add_array', db.driver.db, function () {
-		common.createModelAssocTable('test_association_hasmany_add_array', 'assocs', db.driver.db, function () {
-			common.insertModelData('test_association_hasmany_add_array', db.driver.db, [
-				{ id : 1, name : 'test1' },
-				{ id : 2, name : 'test2' },
-				{ id : 3, name : 'test3' }
-			], function (err) {
-				if (err) throw err;
-
-				var TestModel = db.define('test_association_hasmany_add_array', common.getModelProperties());
-				TestModel.hasMany("assocs");
-
-				TestModel.get(1, function (err, Test1) {
-					assert.equal(err, null);
-					TestModel.get(2, function (err, Test2) {
-						assert.equal(err, null);
-						TestModel.get(3, function (err, Test3) {
-							assert.equal(err, null);
-							Test1.addAssocs(Test2, [ Test3 ], function (err) {
-								assert.equal(err, null);
-								Test1.getAssocs(function (err, Tests) {
-									assert.equal(err, null);
-									assert.equal(Array.isArray(Tests), true);
-									assert.equal(Tests.length, 2);
-									if (Tests[0].id == Test2.id) {
-										assert.equal(Tests[0].name, Test2.name);
-										assert.equal(Tests[1].name, Test3.name);
-									} else {
-										assert.equal(Tests[0].name, Test3.name);
-										assert.equal(Tests[1].name, Test2.name);
-									}
-									db.close();
-								});
-							});
-						});
-					});
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-association-hasmany-add-extra.js b/test/integration-old/deprecated/test-association-hasmany-add-extra.js
deleted file mode 100644
index b61e9780..00000000
--- a/test/integration-old/deprecated/test-association-hasmany-add-extra.js
+++ /dev/null
@@ -1,39 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_association_hasmany_add_extra', db.driver.db, function () {
-		common.createModelAssocTable('test_association_hasmany_add_extra', 'assocs', db.driver.db, function () {
-			common.insertModelData('test_association_hasmany_add_extra', db.driver.db, [
-				{ id : 1, name : 'test1' },
-				{ id : 2, name : 'test2' },
-				{ id : 3, name : 'test3' }
-			], function (err) {
-				if (err) throw err;
-
-				var TestModel = db.define('test_association_hasmany_add_extra', common.getModelProperties());
-				TestModel.hasMany("assocs", {
-					extra_field: Number
-				});
-
-				TestModel.get(1, function (err, Test1) {
-					assert.equal(err, null);
-					TestModel.get(2, function (err, Test2) {
-						assert.equal(err, null);
-						Test1.addAssocs(Test2, { extra_field: 99 }, function (err) {
-							assert.equal(err, null);
-							Test1.getAssocs(function (err, Tests) {
-								assert.equal(err, null);
-								assert.equal(Array.isArray(Tests), true);
-								assert.equal(Tests.length, 1);
-								assert.equal(Tests[0].name, Test2.name);
-								assert.equal(Tests[0].extra.extra_field, 99);
-								db.close();
-							});
-						});
-					});
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-association-hasmany-add.js b/test/integration-old/deprecated/test-association-hasmany-add.js
deleted file mode 100644
index 590a1a97..00000000
--- a/test/integration-old/deprecated/test-association-hasmany-add.js
+++ /dev/null
@@ -1,45 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_association_hasmany_add', db.driver.db, function () {
-		common.createModelAssocTable('test_association_hasmany_add', 'assocs', db.driver.db, function () {
-			common.insertModelData('test_association_hasmany_add', db.driver.db, [
-				{ id : 1, name : 'test1' },
-				{ id : 2, name : 'test2' },
-				{ id : 3, name : 'test3' }
-			], function (err) {
-				if (err) throw err;
-
-				var TestModel = db.define('test_association_hasmany_add', common.getModelProperties());
-				TestModel.hasMany("assocs");
-
-				TestModel.get(1, function (err, Test1) {
-					assert.equal(err, null);
-					TestModel.get(2, function (err, Test2) {
-						assert.equal(err, null);
-						TestModel.get(3, function (err, Test3) {
-							assert.equal(err, null);
-							Test1.addAssocs(Test2, Test3, function (err) {
-								assert.equal(err, null);
-								Test1.getAssocs(function (err, Tests) {
-									assert.equal(err, null);
-									assert.equal(Array.isArray(Tests), true);
-									assert.equal(Tests.length, 2);
-									if (Tests[0].id == Test2.id) {
-										assert.equal(Tests[0].name, Test2.name);
-										assert.equal(Tests[1].name, Test3.name);
-									} else {
-										assert.equal(Tests[0].name, Test3.name);
-										assert.equal(Tests[1].name, Test2.name);
-									}
-									db.close();
-								});
-							});
-						});
-					});
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-association-hasmany-extra-find.js b/test/integration-old/deprecated/test-association-hasmany-extra-find.js
deleted file mode 100644
index f0fc9d9c..00000000
--- a/test/integration-old/deprecated/test-association-hasmany-extra-find.js
+++ /dev/null
@@ -1,41 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_association_hasmany_extra', db.driver.db, function () {
-		common.createModelAssocTable('test_association_hasmany_extra', 'assocs', db.driver.db, function () {
-			common.insertModelData('test_association_hasmany_extra', db.driver.db, [
-				{ id : 1, name : 'test1' },
-				{ id : 2, name : 'test2' },
-				{ id : 3, name : 'test3' }
-			], function (err) {
-				if (err) throw err;
-
-				common.insertModelAssocData('test_association_hasmany_extra_assocs', db.driver.db, [
-					[ 1, 2, 4 ],
-					[ 1, 3, 5 ]
-				], function (err) {
-					if (err) throw err;
-
-					var TestModel = db.define('test_association_hasmany_extra', common.getModelProperties());
-					TestModel.hasMany("assocs", {
-						extra_field: Number
-					});
-
-					TestModel.get(1, function (err, Test1) {
-						assert.equal(err, null);
-
-						Test1.getAssocs({ extra_field: 5}, function (err, Tests) {
-							assert.equal(err, null);
-							assert.equal(Array.isArray(Tests), true);
-							assert.equal(Tests.length, 1);
-							assert.equal(Tests[0].name, 'test3');
-							assert.equal(Tests[0].extra.extra_field, 5);
-							db.close();
-						});
-					});
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-association-hasmany-extra.js b/test/integration-old/deprecated/test-association-hasmany-extra.js
deleted file mode 100644
index f59ac027..00000000
--- a/test/integration-old/deprecated/test-association-hasmany-extra.js
+++ /dev/null
@@ -1,46 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_association_hasmany_extra', db.driver.db, function () {
-		common.createModelAssocTable('test_association_hasmany_extra', 'assocs', db.driver.db, function () {
-			common.insertModelData('test_association_hasmany_extra', db.driver.db, [
-				{ id : 1, name : 'test1' },
-				{ id : 2, name : 'test2' },
-				{ id : 3, name : 'test3' }
-			], function (err) {
-				if (err) throw err;
-
-				common.insertModelAssocData('test_association_hasmany_extra_assocs', db.driver.db, [
-					[ 1, 2, 4 ],
-					[ 1, 3, 5 ]
-				], function (err) {
-					if (err) throw err;
-
-					var TestModel = db.define('test_association_hasmany_extra', common.getModelProperties());
-					TestModel.hasMany("assocs", {
-						extra_field: Number
-					});
-
-					TestModel.get(1, function (err, Test1) {
-						assert.equal(err, null);
-
-						Test1.getAssocs(function (err, Tests) {
-							assert.equal(err, null);
-							assert.equal(Array.isArray(Tests), true);
-							assert.equal(Tests.length, 2);
-							if (Tests[0].id == 2) {
-								assert.equal(Tests[0].extra.extra_field, 4);
-								assert.equal(Tests[1].extra.extra_field, 5);
-							} else {
-								assert.equal(Tests[0].extra.extra_field, 5);
-								assert.equal(Tests[1].extra.extra_field, 4);
-							}
-							db.close();
-						});
-					});
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-association-hasmany-find-autofetch.js b/test/integration-old/deprecated/test-association-hasmany-find-autofetch.js
deleted file mode 100644
index 8d91c8ca..00000000
--- a/test/integration-old/deprecated/test-association-hasmany-find-autofetch.js
+++ /dev/null
@@ -1,43 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_association_hasmany_find_autofetch', db.driver.db, function () {
-		common.createModelAssocTable('test_association_hasmany_find_autofetch', 'assocs', db.driver.db, function () {
-			common.insertModelData('test_association_hasmany_find_autofetch', db.driver.db, [
-				{ id : 1, name : 'test1' },
-				{ id : 2, name : 'test2' },
-				{ id : 3, name : 'test3' },
-				{ id : 4, name : 'test4' },
-				{ id : 5, name : 'test5' }
-			], function (err) {
-				if (err) throw err;
-
-				var TestModel = db.define('test_association_hasmany_find_autofetch', common.getModelProperties());
-				TestModel.hasMany("assocs");
-
-				TestModel.find(function (err, Tests) {
-					assert.equal(err, null);
-
-					var Test = Tests.splice(0, 1)[0];
-					var total_assocs = Tests.length;
-
-					Test.setAssocs(Tests, function (err) {
-						assert.equal(err, null);
-
-						TestModel.find({ id: Test.id }, { autoFetch: true, cache: false }, function (err, Tests1) {
-							assert.equal(err, null);
-							assert.equal(Array.isArray(Tests1), true);
-							assert.equal(Tests1.length, 1);
-							assert.equal(Tests1[0].id, Test.id);
-							assert.equal(Tests1[0].id, Test.id);
-							assert.equal(Array.isArray(Tests1[0].assocs), true);
-							assert.equal(Tests1[0].assocs.length, total_assocs);
-							db.close();
-						});
-					});
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-association-hasmany-get-chain.js b/test/integration-old/deprecated/test-association-hasmany-get-chain.js
deleted file mode 100644
index 4f45197e..00000000
--- a/test/integration-old/deprecated/test-association-hasmany-get-chain.js
+++ /dev/null
@@ -1,41 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_association_hasmany_get_chain', db.driver.db, function () {
-		common.createModelAssocTable('test_association_hasmany_get_chain', 'assocs', db.driver.db, function () {
-			common.insertModelData('test_association_hasmany_get_chain', db.driver.db, [
-				{ id : 1, name : 'test1' },
-				{ id : 2, name : 'test2' },
-				{ id : 3, name : 'test3' }
-			], function (err) {
-				if (err) throw err;
-
-				common.insertModelAssocData('test_association_hasmany_get_chain_assocs', db.driver.db, [
-					[ 1, 2 ],
-					[ 1, 3 ]
-				], function (err) {
-					if (err) throw err;
-
-					var TestModel = db.define('test_association_hasmany_get_chain', common.getModelProperties());
-					TestModel.hasMany("assocs");
-
-					TestModel.get(1, function (err, Test1) {
-						assert.equal(err, null);
-
-						Test1.getAssocs().only('name').run(function (err, Tests) {
-							assert.equal(err, null);
-							assert.equal(Array.isArray(Tests), true);
-							assert.equal(Tests.length, 2);
-							assert.equal(typeof Tests[0].name, "string");
-							assert.equal(typeof Tests[1].name, "string");
-							assert.equal(typeof Tests[0].id, "undefined");
-							assert.equal(typeof Tests[1].id, "undefined");
-							db.close();
-						});
-					});
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-association-hasmany-get-filter.js b/test/integration-old/deprecated/test-association-hasmany-get-filter.js
deleted file mode 100644
index 8843777b..00000000
--- a/test/integration-old/deprecated/test-association-hasmany-get-filter.js
+++ /dev/null
@@ -1,38 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_association_hasmany_get_filter', db.driver.db, function () {
-		common.createModelAssocTable('test_association_hasmany_get_filter', 'assocs', db.driver.db, function () {
-			common.insertModelData('test_association_hasmany_get_filter', db.driver.db, [
-				{ id : 1, name : 'test1' },
-				{ id : 2, name : 'test2' },
-				{ id : 3, name : 'test3' }
-			], function (err) {
-				if (err) throw err;
-
-				common.insertModelAssocData('test_association_hasmany_get_filter_assocs', db.driver.db, [
-					[ 1, 2 ],
-					[ 1, 3 ]
-				], function (err) {
-					if (err) throw err;
-
-					var TestModel = db.define('test_association_hasmany_get_filter', common.getModelProperties());
-					TestModel.hasMany("assocs");
-
-					TestModel.get(1, function (err, Test1) {
-						assert.equal(err, null);
-
-						Test1.getAssocs({ name: 'test3' }, function (err, Tests) {
-							assert.equal(err, null);
-							assert.equal(Array.isArray(Tests), true);
-							assert.equal(Tests.length, 1);
-							assert.equal(Tests[0].name, 'test3');
-							db.close();
-						});
-					});
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-association-hasmany-get-limit.js b/test/integration-old/deprecated/test-association-hasmany-get-limit.js
deleted file mode 100644
index 939ce988..00000000
--- a/test/integration-old/deprecated/test-association-hasmany-get-limit.js
+++ /dev/null
@@ -1,37 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_association_hasmany_get_limit', db.driver.db, function () {
-		common.createModelAssocTable('test_association_hasmany_get_limit', 'assocs', db.driver.db, function () {
-			common.insertModelData('test_association_hasmany_get_limit', db.driver.db, [
-				{ id : 1, name : 'test1' },
-				{ id : 2, name : 'test2' },
-				{ id : 3, name : 'test3' }
-			], function (err) {
-				if (err) throw err;
-
-				common.insertModelAssocData('test_association_hasmany_get_limit_assocs', db.driver.db, [
-					[ 1, 2 ],
-					[ 1, 3 ]
-				], function (err) {
-					if (err) throw err;
-
-					var TestModel = db.define('test_association_hasmany_get_limit', common.getModelProperties());
-					TestModel.hasMany("assocs");
-
-					TestModel.get(1, function (err, Test1) {
-						assert.equal(err, null);
-
-						Test1.getAssocs(1, function (err, Tests) {
-							assert.equal(err, null);
-							assert.equal(Array.isArray(Tests), true);
-							assert.equal(Tests.length, 1);
-							db.close();
-						});
-					});
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-association-hasmany-get-order-array.js b/test/integration-old/deprecated/test-association-hasmany-get-order-array.js
deleted file mode 100644
index 39cc18c9..00000000
--- a/test/integration-old/deprecated/test-association-hasmany-get-order-array.js
+++ /dev/null
@@ -1,39 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_association_hasmany_get_order_array', db.driver.db, function () {
-		common.createModelAssocTable('test_association_hasmany_get_order_array', 'assocs', db.driver.db, function () {
-			common.insertModelData('test_association_hasmany_get_order_array', db.driver.db, [
-				{ id : 1, name : 'test1' },
-				{ id : 2, name : 'test2' },
-				{ id : 3, name : 'test3' }
-			], function (err) {
-				if (err) throw err;
-
-				common.insertModelAssocData('test_association_hasmany_get_order_array_assocs', db.driver.db, [
-					[ 1, 2 ],
-					[ 1, 3 ]
-				], function (err) {
-					if (err) throw err;
-
-					var TestModel = db.define('test_association_hasmany_get_order_array', common.getModelProperties());
-					TestModel.hasMany("assocs");
-
-					TestModel.get(1, function (err, Test1) {
-						assert.equal(err, null);
-
-						Test1.getAssocs([ "name" ], function (err, Tests) {
-							assert.equal(err, null);
-							assert.equal(Array.isArray(Tests), true);
-							assert.equal(Tests.length, 2);
-							assert.equal(Tests[0].name, 'test2');
-							assert.equal(Tests[1].name, 'test3');
-							db.close();
-						});
-					});
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-association-hasmany-get-order.js b/test/integration-old/deprecated/test-association-hasmany-get-order.js
deleted file mode 100644
index e7cca686..00000000
--- a/test/integration-old/deprecated/test-association-hasmany-get-order.js
+++ /dev/null
@@ -1,39 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_association_hasmany_get_order', db.driver.db, function () {
-		common.createModelAssocTable('test_association_hasmany_get_order', 'assocs', db.driver.db, function () {
-			common.insertModelData('test_association_hasmany_get_order', db.driver.db, [
-				{ id : 1, name : 'test1' },
-				{ id : 2, name : 'test2' },
-				{ id : 3, name : 'test3' }
-			], function (err) {
-				if (err) throw err;
-
-				common.insertModelAssocData('test_association_hasmany_get_order_assocs', db.driver.db, [
-					[ 1, 2 ],
-					[ 1, 3 ]
-				], function (err) {
-					if (err) throw err;
-
-					var TestModel = db.define('test_association_hasmany_get_order', common.getModelProperties());
-					TestModel.hasMany("assocs");
-
-					TestModel.get(1, function (err, Test1) {
-						assert.equal(err, null);
-
-						Test1.getAssocs("-name", function (err, Tests) {
-							assert.equal(err, null);
-							assert.equal(Array.isArray(Tests), true);
-							assert.equal(Tests.length, 2);
-							assert.equal(Tests[0].name, 'test3');
-							assert.equal(Tests[1].name, 'test2');
-							db.close();
-						});
-					});
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-association-hasmany-get.js b/test/integration-old/deprecated/test-association-hasmany-get.js
deleted file mode 100644
index 25f43f28..00000000
--- a/test/integration-old/deprecated/test-association-hasmany-get.js
+++ /dev/null
@@ -1,44 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_association_hasmany_get', db.driver.db, function () {
-		common.createModelAssocTable('test_association_hasmany_get', 'assocs', db.driver.db, function () {
-			common.insertModelData('test_association_hasmany_get', db.driver.db, [
-				{ id : 1, name : 'test1' },
-				{ id : 2, name : 'test2' },
-				{ id : 3, name : 'test3' }
-			], function (err) {
-				if (err) throw err;
-
-				common.insertModelAssocData('test_association_hasmany_get_assocs', db.driver.db, [
-					[ 1, 2 ],
-					[ 1, 3 ]
-				], function (err) {
-					if (err) throw err;
-
-					var TestModel = db.define('test_association_hasmany_get', common.getModelProperties());
-					TestModel.hasMany("assocs");
-
-					TestModel.get(1, function (err, Test1) {
-						assert.equal(err, null);
-
-						Test1.getAssocs(function (err, Tests) {
-							assert.equal(err, null);
-							assert.equal(Array.isArray(Tests), true);
-							assert.equal(Tests.length, 2);
-							if (Tests[0].id == 2) {
-								assert.equal(Tests[0].name, 'test2');
-								assert.equal(Tests[1].name, 'test3');
-							} else {
-								assert.equal(Tests[0].name, 'test3');
-								assert.equal(Tests[1].name, 'test2');
-							}
-							db.close();
-						});
-					});
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-association-hasmany-has.js b/test/integration-old/deprecated/test-association-hasmany-has.js
deleted file mode 100644
index b1e5bdd0..00000000
--- a/test/integration-old/deprecated/test-association-hasmany-has.js
+++ /dev/null
@@ -1,55 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_association_hasmany_has', db.driver.db, function () {
-		common.createModelAssocTable('test_association_hasmany_has', 'assocs', db.driver.db, function () {
-			common.insertModelData('test_association_hasmany_has', db.driver.db, [
-				{ id : 1, name : 'test1' },
-				{ id : 2, name : 'test2' },
-				{ id : 3, name : 'test3' },
-				{ id : 4, name : 'test4' }
-			], function (err) {
-				if (err) throw err;
-
-				common.insertModelAssocData('test_association_hasmany_has_assocs', db.driver.db, [
-					[ 1, 2 ],
-					[ 1, 3 ]
-				], function (err) {
-					if (err) throw err;
-
-					var TestModel = db.define('test_association_hasmany_has', common.getModelProperties());
-					TestModel.hasMany("assocs");
-
-					TestModel.get(1, function (err, Test1) {
-						assert.equal(err, null);
-
-						TestModel.get(2, function (err, Test2) {
-							assert.equal(err, null);
-
-							TestModel.get(3, function (err, Test3) {
-								assert.equal(err, null);
-
-								TestModel.get(4, function (err, Test4) {
-									assert.equal(err, null);
-
-									Test1.hasAssocs(Test2, Test3, function (err, has23) {
-										assert.equal(err, null);
-										assert.equal(has23, true);
-
-										Test1.hasAssocs(Test2, Test4, function (err, has24) {
-											assert.equal(err, null);
-											assert.equal(has24, false);
-
-											db.close();
-										});
-									});
-								});
-							});
-						});
-					});
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-association-hasmany-remove.js b/test/integration-old/deprecated/test-association-hasmany-remove.js
deleted file mode 100644
index 1b6a36f6..00000000
--- a/test/integration-old/deprecated/test-association-hasmany-remove.js
+++ /dev/null
@@ -1,53 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_association_hasmany_remove', db.driver.db, function () {
-		common.createModelAssocTable('test_association_hasmany_remove', 'assocs', db.driver.db, function () {
-			common.insertModelData('test_association_hasmany_remove', db.driver.db, [
-				{ id : 1, name : 'test1' },
-				{ id : 2, name : 'test2' },
-				{ id : 3, name : 'test3' }
-			], function (err) {
-				if (err) throw err;
-
-				common.insertModelAssocData('test_association_hasmany_remove_assocs', db.driver.db, [
-					[ 1, 2 ],
-					[ 1, 3 ]
-				], function (err) {
-					if (err) throw err;
-
-					var TestModel = db.define('test_association_hasmany_remove', common.getModelProperties());
-					TestModel.hasMany("assocs");
-
-					TestModel.get(1, function (err, Test1) {
-						assert.equal(err, null);
-						Test1.getAssocs(function (err, Tests) {
-							assert.equal(err, null);
-							assert.equal(Array.isArray(Tests), true);
-							assert.equal(Tests.length, 2);
-							if (Tests[0].id == 2) {
-								assert.equal(Tests[0].name, 'test2');
-								assert.equal(Tests[1].name, 'test3');
-							} else {
-								assert.equal(Tests[0].name, 'test3');
-								assert.equal(Tests[1].name, 'test2');
-							}
-
-							Test1.removeAssocs(function (err) {
-								assert.equal(err, null);
-
-								Test1.getAssocs(function (err, Tests) {
-									assert.equal(err, null);
-									assert.equal(Array.isArray(Tests), true);
-									assert.equal(Tests.length, 0);
-									db.close();
-								});
-							});
-						});
-					});
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-association-hasmany-set-array.js b/test/integration-old/deprecated/test-association-hasmany-set-array.js
deleted file mode 100644
index 10ee51fe..00000000
--- a/test/integration-old/deprecated/test-association-hasmany-set-array.js
+++ /dev/null
@@ -1,40 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_association_hasmany_set_array', db.driver.db, function () {
-		common.createModelAssocTable('test_association_hasmany_set_array', 'assocs', db.driver.db, function () {
-			common.insertModelData('test_association_hasmany_set_array', db.driver.db, [
-				{ id : 1, name : 'test1' },
-				{ id : 2, name : 'test2' },
-				{ id : 3, name : 'test3' }
-			], function (err) {
-				if (err) throw err;
-
-				common.insertModelAssocData('test_association_hasmany_set_array_assocs', db.driver.db, [
-					[ 1, 2 ]
-				], function (err) {
-					var TestModel = db.define('test_association_hasmany_set_array', common.getModelProperties());
-					TestModel.hasMany("assocs");
-
-					TestModel.get(1, function (err, Test1) {
-						assert.equal(err, null);
-						TestModel.get(2, function (err, Test2) {
-							assert.equal(err, null);
-							Test1.setAssocs([ Test2 ], function (err) {
-								assert.equal(err, null);
-								Test1.getAssocs(function (err, Tests) {
-									assert.equal(err, null);
-									assert.equal(Array.isArray(Tests), true);
-									assert.equal(Tests.length, 1);
-									assert.equal(Tests[0].name, Test2.name);
-									db.close();
-								});
-							});
-						});
-					});
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-association-hasmany-set-multiple.js b/test/integration-old/deprecated/test-association-hasmany-set-multiple.js
deleted file mode 100644
index f1df2f7f..00000000
--- a/test/integration-old/deprecated/test-association-hasmany-set-multiple.js
+++ /dev/null
@@ -1,45 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_association_hasmany_set_multiple', db.driver.db, function () {
-		common.createModelAssocTable('test_association_hasmany_set_multiple', 'assocs', db.driver.db, function () {
-			common.insertModelData('test_association_hasmany_set_multiple', db.driver.db, [
-				{ id : 1, name : 'test1' },
-				{ id : 2, name : 'test2' },
-				{ id : 3, name : 'test3' }
-			], function (err) {
-				if (err) throw err;
-
-				var TestModel = db.define('test_association_hasmany_set_multiple', common.getModelProperties());
-				TestModel.hasMany("assocs");
-
-				TestModel.get(1, function (err, Test1) {
-					assert.equal(err, null);
-					TestModel.get(2, function (err, Test2) {
-						assert.equal(err, null);
-						TestModel.get(3, function (err, Test3) {
-							assert.equal(err, null);
-							Test1.setAssocs(Test2, Test3, function (err) {
-								assert.equal(err, null);
-								Test1.getAssocs(function (err, Tests) {
-									assert.equal(err, null);
-									assert.equal(Array.isArray(Tests), true);
-									assert.equal(Tests.length, 2);
-									if (Tests[0].id == Test2.id) {
-										assert.equal(Tests[0].name, Test2.name);
-										assert.equal(Tests[1].name, Test3.name);
-									} else {
-										assert.equal(Tests[0].name, Test3.name);
-										assert.equal(Tests[1].name, Test2.name);
-									}
-									db.close();
-								});
-							});
-						});
-					});
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-association-hasmany-set.js b/test/integration-old/deprecated/test-association-hasmany-set.js
deleted file mode 100644
index 5166a161..00000000
--- a/test/integration-old/deprecated/test-association-hasmany-set.js
+++ /dev/null
@@ -1,40 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_association_hasmany_set', db.driver.db, function () {
-		common.createModelAssocTable('test_association_hasmany_set', 'assocs', db.driver.db, function () {
-			common.insertModelData('test_association_hasmany_set', db.driver.db, [
-				{ id : 1, name : 'test1' },
-				{ id : 2, name : 'test2' },
-				{ id : 3, name : 'test3' }
-			], function (err) {
-				if (err) throw err;
-
-				common.insertModelAssocData('test_association_hasmany_set_assocs', db.driver.db, [
-					[ 1, 2 ]
-				], function (err) {
-					var TestModel = db.define('test_association_hasmany_set', common.getModelProperties());
-					TestModel.hasMany("assocs");
-
-					TestModel.get(1, function (err, Test1) {
-						assert.equal(err, null);
-						TestModel.get(2, function (err, Test2) {
-							assert.equal(err, null);
-							Test1.setAssocs(Test2, function (err) {
-								assert.equal(err, null);
-								Test1.getAssocs(function (err, Tests) {
-									assert.equal(err, null);
-									assert.equal(Array.isArray(Tests), true);
-									assert.equal(Tests.length, 1);
-									assert.equal(Tests[0].name, Test2.name);
-									db.close();
-								});
-							});
-						});
-					});
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-association-hasone-autofetch.js b/test/integration-old/deprecated/test-association-hasone-autofetch.js
deleted file mode 100644
index 5dc52a0e..00000000
--- a/test/integration-old/deprecated/test-association-hasone-autofetch.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var async  = require('async');
-var common = require('../common');
-var assert = require('assert');
-var ORM    = require('../../');
-
-common.createConnection(function (err, db) {
-  if (!db.driver.sync) return;
-
-  var Person = db.define('test_association_hasone_validate_owner',  common.getModelProperties());
-  var Animal = db.define('test_association_hasone_validate_animal', common.getModelProperties());
-  Animal.hasOne('owner', Person, { required: false, autoFetch: true });
-
-  async.series([
-    // setup
-    function(done) {
-      common.dropSync([Person, Animal], done);
-    },
-    // Should save as expected with autoFetch enabled [regression test]
-    function(done) {
-      var emu = new Animal({name: 'emu'});
-      emu.save(function(err) {
-        assert(!err);
-        done();
-      });
-    }
-  ], function() {
-    db.close();
-  });
-});
diff --git a/test/integration-old/deprecated/test-association-hasone-find-autofetch.js b/test/integration-old/deprecated/test-association-hasone-find-autofetch.js
deleted file mode 100644
index fefa8296..00000000
--- a/test/integration-old/deprecated/test-association-hasone-find-autofetch.js
+++ /dev/null
@@ -1,26 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModel2Table('test_association_hasone_find_autofetch', db.driver.db, function () {
-		common.insertModel2Data('test_association_hasone_find_autofetch', db.driver.db, [
-			{ id : 1, name : 'test1', assoc: 2 },
-			{ id : 2, name : 'test2', assoc: 0 }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_association_hasone_find_autofetch', common.getModelProperties());
-			TestModel.hasOne("assoc");
-
-			TestModel.find({ id: 1 }, { autoFetch: true }, function (err, Tests) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Tests), true);
-				assert.equal(Tests.length, 1);
-				assert.equal(Tests[0].assoc_id, 2);
-				assert.equal(typeof Tests[0].assoc, "object");
-				assert.equal(Tests[0].assoc.id, 2);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-association-hasone-findby.js b/test/integration-old/deprecated/test-association-hasone-findby.js
deleted file mode 100644
index c93b2baa..00000000
--- a/test/integration-old/deprecated/test-association-hasone-findby.js
+++ /dev/null
@@ -1,35 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-// yes, this test is confusing, it's because .findBy*() currently only works on different tables,
-// you cannot have a relationship to the same table (because of sql-query table alias restriction)
-common.createConnection(function (err, db) {
-	common.createModel2Table('test_association_hasone_findby', db.driver.db, function () {
-		common.insertModel2Data('test_association_hasone_findby', db.driver.db, [
-			{ id : 1, name : 'test1', assoc: 3 },
-			{ id : 2, name : 'test2', assoc: 0 }
-		], function (err) {
-			common.createModelTable('test_association_hasone_findby2', db.driver.db, function () {
-				common.insertModelData('test_association_hasone_findby2', db.driver.db, [
-					{ id : 3, name : 'test3' },
-					{ id : 4, name : 'test4' }
-				], function (err) {
-					if (err) throw err;
-
-					var TestModel2 = db.define('test_association_hasone_findby2', common.getModelProperties());
-					var TestModel = db.define('test_association_hasone_findby', common.getModelProperties());
-					TestModel.hasOne("assoc", TestModel2);
-
-					TestModel.findByAssoc({ name: "test3" }).find({ name: "test1" }, function (err, Tests) {
-						assert.equal(err, null);
-						assert.equal(Array.isArray(Tests), true);
-						assert.equal(Tests.length, 1);
-						assert.equal(typeof Tests[0], "object");
-						assert.equal(Tests[0].id, 1);
-						db.close();
-					});
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-association-hasone-get.js b/test/integration-old/deprecated/test-association-hasone-get.js
deleted file mode 100644
index 741e32de..00000000
--- a/test/integration-old/deprecated/test-association-hasone-get.js
+++ /dev/null
@@ -1,26 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModel2Table('test_association_hasone_get', db.driver.db, function () {
-			common.insertModel2Data('test_association_hasone_get', db.driver.db, [
-				{ id : 1, name : 'test1', assoc: 2 },
-				{ id : 2, name : 'test2', assoc: 0 }
-			], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_association_hasone_get', common.getModelProperties());
-			TestModel.hasOne("assoc");
-
-			TestModel.get(1, function (err, Test1) {
-				assert.equal(err, null);
-				Test1.getAssoc(function (err, Test2) {
-					assert.equal(err, null);
-					assert.equal(typeof Test2, "object");
-					assert.equal(Test2.id, 2);
-					db.close();
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-association-hasone-has.js b/test/integration-old/deprecated/test-association-hasone-has.js
deleted file mode 100644
index f6486dee..00000000
--- a/test/integration-old/deprecated/test-association-hasone-has.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModel2Table('test_association_hasone_has', db.driver.db, function () {
-			common.insertModel2Data('test_association_hasone_has', db.driver.db, [
-				{ id : 1, name : 'test1', assoc: 2 },
-				{ id : 2, name : 'test2', assoc: 0 }
-			], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_association_hasone_has', common.getModelProperties());
-			TestModel.hasOne("assoc");
-
-			TestModel.get(1, function (err, Test1) {
-				assert.equal(err, null);
-				TestModel.get(2, function (err, Test2) {
-					assert.equal(err, null);
-					Test1.hasAssoc(Test2, function (err, has) {
-						assert.equal(err, null);
-						assert.equal(has, true);
-
-						db.close();
-					});
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-association-hasone-remove.js b/test/integration-old/deprecated/test-association-hasone-remove.js
deleted file mode 100644
index 1f79bcad..00000000
--- a/test/integration-old/deprecated/test-association-hasone-remove.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModel2Table('test_association_hasone_remove', db.driver.db, function () {
-		common.insertModel2Data('test_association_hasone_remove', db.driver.db, [
-			{ id : 1, name : 'test1', assoc: 2 },
-			{ id : 2, name : 'test2', assoc: 0 }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_association_hasone_remove', common.getModelProperties());
-			TestModel.hasOne("assoc");
-
-			TestModel.get(1, function (err, Test1) {
-				assert.equal(err, null);
-				Test1.removeAssoc(function (err) {
-					assert.equal(err, null);
-
-					Test1.getAssoc(function (err, Test) {
-						assert.equal(err, null);
-						assert.equal(typeof Test, "undefined");
-						db.close();
-					});
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-association-hasone-required.js b/test/integration-old/deprecated/test-association-hasone-required.js
deleted file mode 100644
index 6c99e7a0..00000000
--- a/test/integration-old/deprecated/test-association-hasone-required.js
+++ /dev/null
@@ -1,49 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-  var testRequired = function(required, done) {
-    var Person = db.define('test_association_hasone_required_owner',  common.getModelProperties());
-    var Animal = db.define('test_association_hasone_required_animal', common.getModelProperties());
-    Animal.hasOne('owner', Person, { required: required });
-
-    if (!db.driver.sync) return;
-
-    var test = function(cb) {
-      Person.sync(function (err) {
-        assert(!err);
-        Animal.sync(function (err) {
-          assert(!err);
-
-          var john = new Person({name: 'John'});
-          john.save(function(err) {
-            assert(!err);
-
-            var emu = new Animal({name: 'emu', owner_id: null});
-            emu.save(function(err) {
-              // When required is true, there should be an error.
-              // When required is false, there should be no errors.
-              assert.equal(!!err, required);
-
-              cb();
-            });
-          });
-        });
-      });
-    };
-
-    Person.drop(function (err) {
-      Animal.drop(function (err) {
-        test(function() {
-          done();
-        });
-      });
-    });
-  };
-
-  testRequired(false, function() {
-    testRequired(true, function() {
-      db.close();
-    });
-  });
-});
diff --git a/test/integration-old/deprecated/test-association-hasone-reverse-updown.js b/test/integration-old/deprecated/test-association-hasone-reverse-updown.js
deleted file mode 100644
index 14cebdd9..00000000
--- a/test/integration-old/deprecated/test-association-hasone-reverse-updown.js
+++ /dev/null
@@ -1,54 +0,0 @@
-var common		 = require('../common');
-var assert		 = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_association_hasone_reverse_updown_up', db.driver.db, function() {
-		common.createModelAssocUpDownTable('test_association_hasone_reverse_updown', db.driver.db, function () {
-			common.createModelTable('test_association_hasone_reverse_updown_down', db.driver.db, function () {
-				common.insertModelData('test_association_hasone_reverse_updown_up', db.driver.db, [
-					{ id : 1, name : 'parent 1' },
-					{ id : 2, name : 'parent 2' }
-					], function (err) {
-						if (err) throw err;
-						common.insertModelData('test_association_hasone_reverse_updown_down', db.driver.db, [
-							{ id : 1, name : 'grandchild 1' }
-							], function (err) {
-								if (err) throw err;
-								common.insertModelAssocUpDownData('test_association_hasone_reverse_updown', db.driver.db, [
-									{ id : 1, name : 'child 1', assocup: 2, assocdown: 1 },
-									{ id : 2, name : 'child 2', assocup: 1, assocdown: 1 }
-									], function (err) {
-										if (err) throw err;
-
-										var TestModelParent = db.define('test_association_hasone_reverse_updown_up', common.getModelProperties(), { autoFetchLimit: 2 });
-										var TestModelChild	= db.define('test_association_hasone_reverse_updown',	common.getModelProperties());
-										var TestModelGrandChild	= db.define('test_association_hasone_reverse_updown_down',	common.getModelProperties());
-										TestModelChild.hasOne("assocup", TestModelParent, {
-                      autoFetch: true,
-                      reverse: "reverseassoc"
-                    });
-										TestModelChild.hasOne("assocdown", TestModelGrandChild, { autoFetch: true });
-
-										TestModelParent.get(2, function (err, par) {
-											assert.equal(err, null);
-											assert.equal(Array.isArray(par.reverseassoc), true);
-											assert.equal(typeof par.reverseassoc[0], "object");
-											assert.equal(par.reverseassoc[0].id, 1);
-											assert.equal(typeof par.reverseassoc[0].assocdown, "object");
-
-											// Make sure the association field hasn't been erroneously added to the reverse association model.
-											TestModelParent.find({}, function (err, parents) {
-												assert.equal(err, null);
-												assert.equal(parents[0].hasOwnProperty('name'), true);
-												assert.equal(parents[0].hasOwnProperty('assoc_id'), false);
-
-												db.close();
-											});
-										});
-									});
-							});
-					});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-association-hasone-reverse.js b/test/integration-old/deprecated/test-association-hasone-reverse.js
deleted file mode 100644
index ee90b68f..00000000
--- a/test/integration-old/deprecated/test-association-hasone-reverse.js
+++ /dev/null
@@ -1,41 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_association_hasone_reverse_parent', db.driver.db, function() {
-		common.createModel2Table('test_association_hasone_reverse_child', db.driver.db, function () {
-			common.insertModelData('test_association_hasone_reverse_parent', db.driver.db, [
-					{ id : 1, name : 'parent 1' },
-					{ id : 2, name : 'parent 2' }
-				], function (err) {
-				if (err) throw err;
-				common.insertModel2Data('test_association_hasone_reverse_child', db.driver.db, [
-						{ id : 1, name : 'child 1', assoc: 2 },
-						{ id : 2, name : 'child 2', assoc: 1 }
-					], function (err) {
-					if (err) throw err;
-
-					var TestModelParent = db.define('test_association_hasone_reverse_parent', common.getModelProperties());
-					var TestModelChild  = db.define('test_association_hasone_reverse_child',  common.getModelProperties());
-					TestModelChild.hasOne("assoc", TestModelParent, { reverse: "reverseassoc" });
-
-					TestModelParent(2).getReverseassoc(function (err, children) {
-						assert.equal(err, null);
-						assert.equal(Array.isArray(children), true);
-						assert.equal(typeof children[0], "object");
-						assert.equal(children[0].id, 1);
-
-						// Make sure the association field hasn't been erroneously added to the reverse association model.
-						TestModelParent.find({}, function (err, parents) {
-							assert.equal(err, null);
-							assert.equal(parents[0].hasOwnProperty('name'), true);
-							assert.equal(parents[0].hasOwnProperty('assoc_id'), false);
-
-							db.close();
-						});
-					});
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-association-hasone-set.js b/test/integration-old/deprecated/test-association-hasone-set.js
deleted file mode 100644
index 6de13b16..00000000
--- a/test/integration-old/deprecated/test-association-hasone-set.js
+++ /dev/null
@@ -1,32 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModel2Table('test_association_hasone_set', db.driver.db, function () {
-		common.insertModel2Data('test_association_hasone_set', db.driver.db, [
-			{ id : 1, name : 'test1', assoc: 0 },
-			{ id : 2, name : 'test2', assoc: 0 }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_association_hasone_set', common.getModelProperties());
-			TestModel.hasOne("assoc");
-
-			TestModel.get(1, function (err, Test1) {
-				assert.equal(err, null);
-				TestModel.get(2, function (err, Test2) {
-					assert.equal(err, null);
-					Test1.setAssoc(Test2, function (err) {
-						assert.equal(err, null);
-						Test1.getAssoc(function (err, Test2) {
-							assert.equal(err, null);
-							assert.equal(typeof Test2, "object");
-							assert.equal(Test2.id, 2);
-							db.close();
-						});
-					});
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-association-hasone-validate.js b/test/integration-old/deprecated/test-association-hasone-validate.js
deleted file mode 100644
index 64403000..00000000
--- a/test/integration-old/deprecated/test-association-hasone-validate.js
+++ /dev/null
@@ -1,44 +0,0 @@
-var async  = require('async');
-var common = require('../common');
-var assert = require('assert');
-var ORM    = require('../../');
-
-common.createConnection(function (err, db) {
-  if (!db.driver.sync) return;
-
-  var Person = db.define('test_association_hasone_validate_owner',  common.getModelProperties());
-  var Animal = db.define('test_association_hasone_validate_animal',
-    common.getModelProperties(),
-    {
-      validations: {
-        owner_id: ORM.validators.unique()
-      }
-    }
-  );
-  Animal.hasOne('owner', Person, { required: true });
-
-  async.series([
-    // setup
-    function(done) {
-      common.dropSync([Person, Animal], done);
-    },
-    // Should be able to validate association properties
-    function(done) {
-      var john = new Person({name: 'John'});
-
-      john.save(function(err) {
-        assert(!err);
-
-        var emu = new Animal({name: 'emu', owner_id: john.id});
-        emu.save(function(err) {
-          // Should not raise any errors inside ORM
-
-          assert(!err);
-          done();
-        });
-      });
-    }
-  ], function() {
-    db.close();
-  });
-});
diff --git a/test/integration-old/deprecated/test-association-name-lettercase.js b/test/integration-old/deprecated/test-association-name-lettercase.js
deleted file mode 100644
index 147b8d33..00000000
--- a/test/integration-old/deprecated/test-association-name-lettercase.js
+++ /dev/null
@@ -1,25 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModel2Table('test_association_name_lettercase', db.driver.db, function () {
-		common.insertModel2Data('test_association_name_lettercase', db.driver.db, [
-			{ id : 1, name : 'test1', assoc: 0 }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_association_name_lettercase', common.getModelProperties());
-			TestModel.hasOne("myLetterCase", { field: "assoc_id" });
-
-			TestModel.get(1, function (err, Test1) {
-				assert.equal(err, null);
-
-				assert.equal(typeof Test1.getMyLetterCase, "function");
-				assert.equal(typeof Test1.setMyLetterCase, "function");
-				assert.equal(typeof Test1.hasMyLetterCase, "function");
-
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-auto-save.js b/test/integration-old/deprecated/test-auto-save.js
deleted file mode 100644
index 8f3d37c2..00000000
--- a/test/integration-old/deprecated/test-auto-save.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_auto_save', db.driver.db, function () {
-		common.insertModelData('test_auto_save', db.driver.db, [
-			{ id : 1, name : 'test' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_auto_save', common.getModelProperties(), {
-				autoSave: true
-			});
-			var autoSaved = false;
-
-			TestModel.get(1, function (err, Test) {
-				Test.on("save", function () {
-					console.log("now saving!");
-					autoSaved = true;
-				});
-				Test.name = "auto-save test";
-
-				setTimeout(function () {
-					db.close(function () {
-						assert.equal(autoSaved, true, "event 'save' not triggered");
-					});
-				}, 1000);
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-clear.js b/test/integration-old/deprecated/test-clear.js
deleted file mode 100644
index 355287ad..00000000
--- a/test/integration-old/deprecated/test-clear.js
+++ /dev/null
@@ -1,33 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_clear', db.driver.db, function () {
-		common.insertModelData('test_clear', db.driver.db, [
-			{ id : 1, name : 'test' },
-			{ id : 2, name : 'test' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_clear', common.getModelProperties());
-
-			TestModel.find(function (err, Instances) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances.length, 2);
-
-				TestModel.clear(function (err) {
-					assert.equal(err, null);
-
-					TestModel.find(function (err, Instances) {
-						assert.equal(err, null);
-						assert.equal(Array.isArray(Instances), true);
-						assert.equal(Instances.length, 0);
-
-						db.close();
-					});
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-connect-errors.js b/test/integration-old/deprecated/test-connect-errors.js
deleted file mode 100644
index 66f76294..00000000
--- a/test/integration-old/deprecated/test-connect-errors.js
+++ /dev/null
@@ -1,14 +0,0 @@
-var common      = require('../common');
-var assert      = require('assert');
-
-addTest("",         "CONNECTION_URL_EMPTY");
-addTest("whatever", "CONNECTION_URL_NO_PROTOCOL");
-// sqlite can be like this so this error is avoided for now
-// addTest("mysql://", "CONNECTION_URL_NO_DATABASE");
-
-function addTest(uri, error_msg) {
-	common.ORM.connect(uri, function (err) {
-		assert.equal(err instanceof Error, true);
-		assert.equal(err.message, error_msg);
-	});
-}
diff --git a/test/integration-old/deprecated/test-connect-event.js b/test/integration-old/deprecated/test-connect-event.js
deleted file mode 100644
index 96b997bf..00000000
--- a/test/integration-old/deprecated/test-connect-event.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var common      = require('../common');
-var assert      = require('assert');
-var config      = common.getConfig();
-
-config.protocol = common.protocol();
-
-var db = common.ORM.connect(config);
-db.on("connect", function (err, db) {
-	assert.equal(err, null);
-	assert.equal(typeof db, "object");
-
-	db.close();
-});
diff --git a/test/integration-old/deprecated/test-connect-object.js b/test/integration-old/deprecated/test-connect-object.js
deleted file mode 100644
index 4299546a..00000000
--- a/test/integration-old/deprecated/test-connect-object.js
+++ /dev/null
@@ -1,14 +0,0 @@
-var common      = require('../common');
-var assert      = require('assert');
-var config      = common.getConfig();
-
-config.protocol = common.protocol();
-
-delete config.query; // force a connection without this key
-
-common.ORM.connect(config, function (err, db) {
-	assert.equal(err, null);
-	assert.equal(typeof db, "object");
-
-	db.close();
-});
diff --git a/test/integration-old/deprecated/test-connect.js b/test/integration-old/deprecated/test-connect.js
deleted file mode 100644
index 38f9b16f..00000000
--- a/test/integration-old/deprecated/test-connect.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	assert.equal(err, null);
-	assert.equal(typeof db, "object");
-	assert.equal(typeof db.use, "function");
-	assert.equal(typeof db.define, "function");
-	assert.equal(typeof db.close, "function");
-	assert.equal(typeof db.models, "object");
-
-	db.close();
-});
diff --git a/test/integration-old/deprecated/test-count.js b/test/integration-old/deprecated/test-count.js
deleted file mode 100644
index 51660375..00000000
--- a/test/integration-old/deprecated/test-count.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_count', db.driver.db, function () {
-		common.insertModelData('test_count', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' },
-			{ id : 3, name : 'test3' },
-			{ id : 4, name : 'test4' },
-			{ id : 5, name : 'test5' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_count', common.getModelProperties());
-
-			TestModel.count({ id: common.ORM.gt(2) }, function (err, count) {
-				assert.equal(err, null);
-				assert.equal(count, 3);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-create-defaultvalue.js b/test/integration-old/deprecated/test-create-defaultvalue.js
deleted file mode 100644
index 8e92346a..00000000
--- a/test/integration-old/deprecated/test-create-defaultvalue.js
+++ /dev/null
@@ -1,20 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_create_defaultvalue', db.driver.db, function () {
-		var TestModel = db.define('test_create_defaultvalue', common.getModelProperties());
-
-		TestModel.create([
-			{ name: null }
-		], function (err) {
-			TestModel.find(function (err, items) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(items), true);
-				assert.equal(items.length, 1);
-				assert.equal(items[0].name, "test_default_value");
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-create.js b/test/integration-old/deprecated/test-create.js
deleted file mode 100644
index e51ee0d8..00000000
--- a/test/integration-old/deprecated/test-create.js
+++ /dev/null
@@ -1,58 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-var async      = require('async');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_create', db.driver.db, function () {
-		var TestModel = db.define('test_create', common.getModelProperties());
-
-		async.series([
-			// Test that items are actually created
-			function (done) {
-				TestModel.create([
-					{ name: 'test1' },
-					{ name: 'test2' },
-					{ name: 'test3' }
-				], function (err) {
-					TestModel.count(function (err, count) {
-						assert.equal(err, null);
-						assert.equal(count, 3);
-						done();
-					});
-				});
-			},
-			function (done) {
-				TestModel.create({ name: 'test4' }, function (err) {
-					TestModel.count(function (err, count) {
-						assert.equal(err, null);
-						assert.equal(count, 4);
-						done();
-					});
-				});
-			},
-			// Test callback arguments
-			function (done) {
-				TestModel.create([
-					{ name: 'test5' },
-					{ name: 'test6' }
-				], function (err, items) {
-					assert.equal(err, null);
-					assert.equal(Array.isArray(items), true);
-					assert.equal(items.length, 2);
-					done();
-				});
-			},
-			function (done) {
-				TestModel.create({ name: 'test7' }, function (err, item) {
-					assert.equal(err, null);
-					assert.equal(Array.isArray(item), false);
-					assert.equal(item.name, 'test7');
-					assert.equal(item.hasOwnProperty('id'), true);
-					done();
-				});
-			}
-		], function complete() {
-			db.close();
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-db-use.js b/test/integration-old/deprecated/test-db-use.js
deleted file mode 100644
index d85a19ff..00000000
--- a/test/integration-old/deprecated/test-db-use.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	assert.equal(err, null);
-
-	// initialize plugin
-	db.use(MyPlugin, { option: true });
-
-	var calledDefine = false;
-	var MyModel = db.define("my_model", { // db.define should call plugin.define method
-		property: String
-	});
-
-	assert.equal(calledDefine, true);
-
-	db.close();
-
-	function MyPlugin(DB, opts) {
-		assert.strictEqual(db, DB);
-		assert.deepEqual(opts, { option: true });
-
-		return {
-			define: function (Model) {
-				assert.equal(typeof Model, "function");
-				assert.equal(typeof Model.id, "string");
-				calledDefine = true;
-			}
-		};
-	}
-});
diff --git a/test/integration-old/deprecated/test-drop-no-throw.js b/test/integration-old/deprecated/test-drop-no-throw.js
deleted file mode 100644
index 15f6a676..00000000
--- a/test/integration-old/deprecated/test-drop-no-throw.js
+++ /dev/null
@@ -1,21 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	var TestModel = db.define('test_drop', common.getModelProperties());
-
-	TestModel.sync(function (err) {
-		if (err !== null) {
-			// not supported by all drivers
-			return db.close();
-		}
-
-		assert.doesNotThrow(function () {
-			TestModel.drop();
-		});
-
-		setTimeout(function () {
-			db.close();
-		}, 500);
-	});
-});
diff --git a/test/integration-old/deprecated/test-drop.js b/test/integration-old/deprecated/test-drop.js
deleted file mode 100644
index 30b14d31..00000000
--- a/test/integration-old/deprecated/test-drop.js
+++ /dev/null
@@ -1,22 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	var TestModel = db.define('test_drop', common.getModelProperties());
-
-	TestModel.sync(function (err) {
-		if (err !== null) {
-			// not supported by all drivers
-			return db.close();
-		}
-
-		TestModel.drop(function (err) {
-			if (err !== null) {
-				// not supported by all drivers
-				return db.close();
-			}
-
-			db.close();
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-exists-array.js b/test/integration-old/deprecated/test-exists-array.js
deleted file mode 100644
index f8c1d8ad..00000000
--- a/test/integration-old/deprecated/test-exists-array.js
+++ /dev/null
@@ -1,36 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_exists_array', db.driver.db, function () {
-		common.insertModelData('test_exists_array', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' },
-			{ id : 3, name : 'test3' },
-			{ id : 4, name : 'test4' },
-			{ id : 5, name : 'test5' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_exists_array', common.getModelProperties());
-			var tests = 2;
-
-			TestModel.exists([ 4 ], function (err, exists) {
-				assert.equal(err, null);
-				assert.equal(exists, true);
-
-				if (--tests === 0) {
-					db.close();
-				}
-			});
-			TestModel.exists([ 6 ], function (err, exists) {
-				assert.equal(err, null);
-				assert.equal(exists, false);
-
-				if (--tests === 0) {
-					db.close();
-				}
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-exists-object.js b/test/integration-old/deprecated/test-exists-object.js
deleted file mode 100644
index f47685c9..00000000
--- a/test/integration-old/deprecated/test-exists-object.js
+++ /dev/null
@@ -1,36 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_exists_object', db.driver.db, function () {
-		common.insertModelData('test_exists_object', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' },
-			{ id : 3, name : 'test3' },
-			{ id : 4, name : 'test4' },
-			{ id : 5, name : 'test5' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_exists_object', common.getModelProperties());
-			var tests = 2;
-
-			TestModel.exists({ id: 4 }, function (err, exists) {
-				assert.equal(err, null);
-				assert.equal(exists, true);
-
-				if (--tests === 0) {
-					db.close();
-				}
-			});
-			TestModel.exists({ id: 6 }, function (err, exists) {
-				assert.equal(err, null);
-				assert.equal(exists, false);
-
-				if (--tests === 0) {
-					db.close();
-				}
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-exists.js b/test/integration-old/deprecated/test-exists.js
deleted file mode 100644
index c8442d9d..00000000
--- a/test/integration-old/deprecated/test-exists.js
+++ /dev/null
@@ -1,44 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_exists', db.driver.db, function () {
-		common.insertModelData('test_exists', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' },
-			{ id : 3, name : 'test3' },
-			{ id : 4, name : 'test4' },
-			{ id : 5, name : 'test5' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_exists', common.getModelProperties());
-			var tests = 3;
-
-			TestModel.exists(4, function (err, exists) {
-				assert.equal(err, null);
-				assert.equal(exists, true);
-
-				if (--tests === 0) {
-					db.close();
-				}
-			});
-			TestModel.exists(6, function (err, exists) {
-				assert.equal(err, null);
-				assert.equal(exists, false);
-
-				if (--tests === 0) {
-					db.close();
-				}
-			});
-			TestModel.exists(-2, function (err, exists) {
-				assert.equal(err, null);
-				assert.equal(exists, false);
-
-				if (--tests === 0) {
-					db.close();
-				}
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-chain-count.js b/test/integration-old/deprecated/test-find-chain-count.js
deleted file mode 100644
index 1fed67fe..00000000
--- a/test/integration-old/deprecated/test-find-chain-count.js
+++ /dev/null
@@ -1,23 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_chain_count', db.driver.db, function () {
-		common.insertModelData('test_find_chain_count', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' },
-			{ id : 3, name : 'test3' },
-			{ id : 4, name : 'test4' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_chain_count', common.getModelProperties());
-
-			TestModel.find().count(function (err, count) {
-				assert.equal(err, null);
-				assert.equal(count, 4);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-chain-find-cb.js b/test/integration-old/deprecated/test-find-chain-find-cb.js
deleted file mode 100644
index 983a8500..00000000
--- a/test/integration-old/deprecated/test-find-chain-find-cb.js
+++ /dev/null
@@ -1,22 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_chain_find_cb', db.driver.db, function () {
-		common.insertModelData('test_find_chain_find_cb', db.driver.db, [
-			{ id : 1, name : 'test2' },
-			{ id : 2, name : 'test1' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_chain_find_cb', common.getModelProperties());
-
-			TestModel.find().order("name").find({}, function (err, Instances) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances.length, 2);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-chain-first.js b/test/integration-old/deprecated/test-find-chain-first.js
deleted file mode 100644
index b24b74b3..00000000
--- a/test/integration-old/deprecated/test-find-chain-first.js
+++ /dev/null
@@ -1,22 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_chain_first', db.driver.db, function () {
-		common.insertModelData('test_find_chain_first', db.driver.db, [
-			{ id : 1, name : 'test2' },
-			{ id : 2, name : 'test1' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_chain_first', common.getModelProperties());
-
-			TestModel.find().order("name").first(function (err, Instance) {
-				assert.equal(err, null);
-				assert.equal(Instance.id, 2);
-				assert.equal(Instance.name, "test1");
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-chain-instance-count.js b/test/integration-old/deprecated/test-find-chain-instance-count.js
deleted file mode 100644
index 0b571435..00000000
--- a/test/integration-old/deprecated/test-find-chain-instance-count.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_chain_instance_count', db.driver.db, function () {
-		common.insertModelData('test_find_chain_instance_count', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' },
-			{ id : 3, name : 'test3' },
-			{ id : 4, name : 'test4' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_chain_instance_count', common.getModelProperties());
-
-			TestModel.find().each().filter(function (instance) {
-				return (instance.id > 2);
-			}).count(function (count) {
-				assert.equal(count, 2);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-chain-instance-each.js b/test/integration-old/deprecated/test-find-chain-instance-each.js
deleted file mode 100644
index b641acc7..00000000
--- a/test/integration-old/deprecated/test-find-chain-instance-each.js
+++ /dev/null
@@ -1,28 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_chain_instance_each', db.driver.db, function () {
-		common.insertModelData('test_find_chain_instance_each', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' },
-			{ id : 3, name : 'test3' },
-			{ id : 4, name : 'test4' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_chain_instance_each', common.getModelProperties());
-
-			TestModel.find().each(function (instance) {
-				instance.name = instance.id;
-			}).get(function (instances) {
-				assert.equal(instances.length, 4);
-				assert.equal(instances[0].name, 1);
-				assert.equal(instances[1].name, 2);
-				assert.equal(instances[2].name, 3);
-				assert.equal(instances[3].name, 4);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-chain-instance-filter.js b/test/integration-old/deprecated/test-find-chain-instance-filter.js
deleted file mode 100644
index 01b32a8f..00000000
--- a/test/integration-old/deprecated/test-find-chain-instance-filter.js
+++ /dev/null
@@ -1,28 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_chain_instance_filter', db.driver.db, function () {
-		common.insertModelData('test_find_chain_instance_filter', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test3' },
-			{ id : 3, name : 'test4' },
-			{ id : 4, name : 'test2' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_chain_instance_filter', common.getModelProperties());
-
-			TestModel.find().each().filter(function (instance) {
-				return instance.name.match(/test[24]/);
-			}).sort(function (inst1, inst2) {
-				return inst1.id < inst2.id;
-			}).get(function (instances) {
-				assert.equal(instances.length, 2);
-				assert.equal(instances[0].id, 4);
-				assert.equal(instances[1].id, 3);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-chain-instance-get.js b/test/integration-old/deprecated/test-find-chain-instance-get.js
deleted file mode 100644
index e479050a..00000000
--- a/test/integration-old/deprecated/test-find-chain-instance-get.js
+++ /dev/null
@@ -1,28 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_chain_instance_get', db.driver.db, function () {
-		common.insertModelData('test_find_chain_instance_get', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' },
-			{ id : 3, name : 'test3' },
-			{ id : 4, name : 'test4' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_chain_instance_get', common.getModelProperties());
-
-			TestModel.find().each().forEach(function (instance) {
-				instance.name = instance.id;
-			}).get(function (instances) {
-				assert.equal(instances.length, 4);
-				assert.equal(instances[0].name, 1);
-				assert.equal(instances[1].name, 2);
-				assert.equal(instances[2].name, 3);
-				assert.equal(instances[3].name, 4);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-chain-instance-sort.js b/test/integration-old/deprecated/test-find-chain-instance-sort.js
deleted file mode 100644
index 76c95a78..00000000
--- a/test/integration-old/deprecated/test-find-chain-instance-sort.js
+++ /dev/null
@@ -1,28 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_chain_instance_sort', db.driver.db, function () {
-		common.insertModelData('test_find_chain_instance_sort', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test3' },
-			{ id : 3, name : 'test4' },
-			{ id : 4, name : 'test2' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_chain_instance_sort', common.getModelProperties());
-
-			TestModel.find().each().sort(function (inst1, inst2) {
-				return inst1.id < inst2.id;
-			}).get(function (instances) {
-				assert.equal(instances.length, 4);
-				assert.equal(instances[0].id, 4);
-				assert.equal(instances[1].id, 3);
-				assert.equal(instances[2].id, 2);
-				assert.equal(instances[3].id, 1);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-chain-last.js b/test/integration-old/deprecated/test-find-chain-last.js
deleted file mode 100644
index eef5fe9f..00000000
--- a/test/integration-old/deprecated/test-find-chain-last.js
+++ /dev/null
@@ -1,22 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_chain_last', db.driver.db, function () {
-		common.insertModelData('test_find_chain_last', db.driver.db, [
-			{ id : 1, name : 'test2' },
-			{ id : 2, name : 'test1' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_chain_last', common.getModelProperties());
-
-			TestModel.find().order("name").last(function (err, Instance) {
-				assert.equal(err, null);
-				assert.equal(Instance.id, 1);
-				assert.equal(Instance.name, "test2");
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-chain-limit.js b/test/integration-old/deprecated/test-find-chain-limit.js
deleted file mode 100644
index 9a6eb9d6..00000000
--- a/test/integration-old/deprecated/test-find-chain-limit.js
+++ /dev/null
@@ -1,22 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_chain_limit', db.driver.db, function () {
-		common.insertModelData('test_find_chain_limit', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_chain_limit', common.getModelProperties());
-
-			TestModel.find().limit(1).run(function (err, Instances) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances.length, 1);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-chain-offset.js b/test/integration-old/deprecated/test-find-chain-offset.js
deleted file mode 100644
index 6c83ecaa..00000000
--- a/test/integration-old/deprecated/test-find-chain-offset.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_chain_offset', db.driver.db, function () {
-		common.insertModelData('test_find_chain_offset', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' },
-			{ id : 3, name : 'test3' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_chain_offset', common.getModelProperties());
-
-			TestModel.find().offset(2).run(function (err, Instances) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances.length, 1);
-				assert.equal(Instances[0].id, 3);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-chain-only.js b/test/integration-old/deprecated/test-find-chain-only.js
deleted file mode 100644
index 4b64f393..00000000
--- a/test/integration-old/deprecated/test-find-chain-only.js
+++ /dev/null
@@ -1,26 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_chain_only', db.driver.db, function () {
-		common.insertModelData('test_find_chain_only', db.driver.db, [
-			{ id : 1, name : 'test2' },
-			{ id : 2, name : 'test1' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_chain_only', common.getModelProperties());
-
-			TestModel.find().only("name").run(function (err, Instances) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances.length, 2);
-				assert.equal(typeof Instances[0].name, "string");
-				assert.equal(typeof Instances[1].name, "string");
-				assert.equal(typeof Instances[0].id, "undefined");
-				assert.equal(typeof Instances[1].id, "undefined");
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-chain-order-desc.js b/test/integration-old/deprecated/test-find-chain-order-desc.js
deleted file mode 100644
index 6d51de24..00000000
--- a/test/integration-old/deprecated/test-find-chain-order-desc.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_chain_order_desc', db.driver.db, function () {
-		common.insertModelData('test_find_chain_order_desc', db.driver.db, [
-			{ id : 1, name : 'test2' },
-			{ id : 2, name : 'test1' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_chain_order_desc', common.getModelProperties());
-
-			TestModel.find().order("name", "Z").run(function (err, Instances) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances.length, 2);
-				assert.equal(Instances[0].id, 1);
-				assert.equal(Instances[1].id, 2);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-chain-order-minus.js b/test/integration-old/deprecated/test-find-chain-order-minus.js
deleted file mode 100644
index 54802ea9..00000000
--- a/test/integration-old/deprecated/test-find-chain-order-minus.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_chain_order_minus', db.driver.db, function () {
-		common.insertModelData('test_find_chain_order_minus', db.driver.db, [
-			{ id : 1, name : 'test2' },
-			{ id : 2, name : 'test1' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_chain_order_minus', common.getModelProperties());
-
-			TestModel.find().order("-name").run(function (err, Instances) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances.length, 2);
-				assert.equal(Instances[0].id, 1);
-				assert.equal(Instances[1].id, 2);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-chain-order.js b/test/integration-old/deprecated/test-find-chain-order.js
deleted file mode 100644
index fe94b9d3..00000000
--- a/test/integration-old/deprecated/test-find-chain-order.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_chain_order', db.driver.db, function () {
-		common.insertModelData('test_find_chain_order', db.driver.db, [
-			{ id : 1, name : 'test2' },
-			{ id : 2, name : 'test1' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_chain_order', common.getModelProperties());
-
-			TestModel.find().order("name").run(function (err, Instances) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances.length, 2);
-				assert.equal(Instances[0].id, 2);
-				assert.equal(Instances[1].id, 1);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-chain-remove.js b/test/integration-old/deprecated/test-find-chain-remove.js
deleted file mode 100644
index 171299ef..00000000
--- a/test/integration-old/deprecated/test-find-chain-remove.js
+++ /dev/null
@@ -1,27 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_chain_remove', db.driver.db, function () {
-		common.insertModelData('test_find_chain_remove', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' },
-			{ id : 3, name : 'test3' },
-			{ id : 4, name : 'test4' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_chain_remove', common.getModelProperties());
-
-			TestModel.find({ name: [ 'test2', 'test3' ] }).remove(function (err) {
-				assert.equal(err, null);
-
-				TestModel.find().count(function (err, count) {
-					assert.equal(err, null);
-					assert.equal(count, 2);
-					db.close();
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-chain.js b/test/integration-old/deprecated/test-find-chain.js
deleted file mode 100644
index 28af3e8b..00000000
--- a/test/integration-old/deprecated/test-find-chain.js
+++ /dev/null
@@ -1,25 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_chain', db.driver.db, function () {
-		common.insertModelData('test_find_chain', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_chain', common.getModelProperties());
-
-			TestModel.find().run(function (err, Instances) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances[0].id, 1);
-				assert.equal(Instances[0].name, 'test1');
-				assert.equal(Instances[1].id, 2);
-				assert.equal(Instances[1].name, 'test2');
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-limit-in-options.js b/test/integration-old/deprecated/test-find-limit-in-options.js
deleted file mode 100644
index 8afbd482..00000000
--- a/test/integration-old/deprecated/test-find-limit-in-options.js
+++ /dev/null
@@ -1,22 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_limit', db.driver.db, function () {
-		common.insertModelData('test_find_limit', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_limit', common.getModelProperties());
-
-			TestModel.find({}, { limit: 1 }, function (err, Instances) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances.length, 1);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-limit.js b/test/integration-old/deprecated/test-find-limit.js
deleted file mode 100644
index c70cb009..00000000
--- a/test/integration-old/deprecated/test-find-limit.js
+++ /dev/null
@@ -1,22 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_limit', db.driver.db, function () {
-		common.insertModelData('test_find_limit', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_limit', common.getModelProperties());
-
-			TestModel.find(1, function (err, Instances) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances.length, 1);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-no-cache.js b/test/integration-old/deprecated/test-find-no-cache.js
deleted file mode 100644
index 128ec299..00000000
--- a/test/integration-old/deprecated/test-find-no-cache.js
+++ /dev/null
@@ -1,35 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_no_cache', db.driver.db, function () {
-		common.insertModelData('test_find_no_cache', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' },
-			{ id : 3, name : 'test3' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_no_cache', common.getModelProperties());
-
-			TestModel.find({ name: 'test3' }, { cache: false }, function (err, Instances) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances.length, 1);
-				assert.equal(Instances[0].id, 3);
-				assert.equal(Instances[0].name, 'test3');
-
-				Instances[0].name = 'test-no-cache';
-
-				TestModel.find({ name: 'test3' }, { cache: false }, function (err, Instances) {
-					assert.equal(err, null);
-					assert.equal(Array.isArray(Instances), true);
-					assert.equal(Instances.length, 1);
-					assert.equal(Instances[0].id, 3);
-					assert.equal(Instances[0].name, 'test3');
-					db.close();
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-offset.js b/test/integration-old/deprecated/test-find-offset.js
deleted file mode 100644
index b752e709..00000000
--- a/test/integration-old/deprecated/test-find-offset.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_offset', db.driver.db, function () {
-		common.insertModelData('test_find_offset', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' },
-			{ id : 3, name : 'test3' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_offset', common.getModelProperties());
-
-			TestModel.find({}, { offset: 2 }, function (err, Instances) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances.length, 1);
-				assert.equal(Instances[0].id, 3);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-order-asc-array.js b/test/integration-old/deprecated/test-find-order-asc-array.js
deleted file mode 100644
index 59274223..00000000
--- a/test/integration-old/deprecated/test-find-order-asc-array.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_order_asc_array', db.driver.db, function () {
-		common.insertModelData('test_find_order_asc_array', db.driver.db, [
-			{ id : 1, name : 'test2' },
-			{ id : 2, name : 'test1' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_order_asc_array', common.getModelProperties());
-
-			TestModel.find([ "name" ], function (err, Instances) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances.length, 2);
-				assert.equal(Instances[0].id, 2);
-				assert.equal(Instances[1].id, 1);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-order-desc-array-minus.js b/test/integration-old/deprecated/test-find-order-desc-array-minus.js
deleted file mode 100644
index ea01f022..00000000
--- a/test/integration-old/deprecated/test-find-order-desc-array-minus.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_order_desc_array_minus', db.driver.db, function () {
-		common.insertModelData('test_find_order_desc_array_minus', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_order_desc_array_minus', common.getModelProperties());
-
-			TestModel.find([ "-name" ], function (err, Instances) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances.length, 2);
-				assert.equal(Instances[0].id, 2);
-				assert.equal(Instances[1].id, 1);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-order-desc-array.js b/test/integration-old/deprecated/test-find-order-desc-array.js
deleted file mode 100644
index 48796d08..00000000
--- a/test/integration-old/deprecated/test-find-order-desc-array.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_order_desc_array', db.driver.db, function () {
-		common.insertModelData('test_find_order_desc_array', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_order_desc_array', common.getModelProperties());
-
-			TestModel.find([ "name", "Z" ], function (err, Instances) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances.length, 2);
-				assert.equal(Instances[0].id, 2);
-				assert.equal(Instances[1].id, 1);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-order-desc.js b/test/integration-old/deprecated/test-find-order-desc.js
deleted file mode 100644
index 4fb3cbc3..00000000
--- a/test/integration-old/deprecated/test-find-order-desc.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_order_desc', db.driver.db, function () {
-		common.insertModelData('test_find_order_desc', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_order_desc', common.getModelProperties());
-
-			TestModel.find("-name", function (err, Instances) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances.length, 2);
-				assert.equal(Instances[0].id, 2);
-				assert.equal(Instances[1].id, 1);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-order-multiple-array-desc-minus.js b/test/integration-old/deprecated/test-find-order-multiple-array-desc-minus.js
deleted file mode 100644
index 21b5b636..00000000
--- a/test/integration-old/deprecated/test-find-order-multiple-array-desc-minus.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_order_desc_array_minus', db.driver.db, function () {
-		common.insertModelData('test_find_order_desc_array_minus', db.driver.db, [
-			{ id : 1, name : 'test' },
-			{ id : 2, name : 'test' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_order_desc_array_minus', common.getModelProperties());
-
-			TestModel.find([ "name", "-id" ], function (err, Instances) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances.length, 2);
-				assert.equal(Instances[0].id, 2);
-				assert.equal(Instances[1].id, 1);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-order-multiple-array-desc.js b/test/integration-old/deprecated/test-find-order-multiple-array-desc.js
deleted file mode 100644
index 19884237..00000000
--- a/test/integration-old/deprecated/test-find-order-multiple-array-desc.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_order_desc_array_minus', db.driver.db, function () {
-		common.insertModelData('test_find_order_desc_array_minus', db.driver.db, [
-			{ id : 1, name : 'test' },
-			{ id : 2, name : 'test' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_order_desc_array_minus', common.getModelProperties());
-
-			TestModel.find([ "name", "id", "Z" ], function (err, Instances) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances.length, 2);
-				assert.equal(Instances[0].id, 2);
-				assert.equal(Instances[1].id, 1);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-order-multiple-array.js b/test/integration-old/deprecated/test-find-order-multiple-array.js
deleted file mode 100644
index 9106655e..00000000
--- a/test/integration-old/deprecated/test-find-order-multiple-array.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_order_desc_array_minus', db.driver.db, function () {
-		common.insertModelData('test_find_order_desc_array_minus', db.driver.db, [
-			{ id : 1, name : 'test' },
-			{ id : 2, name : 'test' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_order_desc_array_minus', common.getModelProperties());
-
-			TestModel.find([ "name", "id", "A" ], function (err, Instances) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances.length, 2);
-				assert.equal(Instances[0].id, 1);
-				assert.equal(Instances[1].id, 2);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-order.js b/test/integration-old/deprecated/test-find-order.js
deleted file mode 100644
index 67240760..00000000
--- a/test/integration-old/deprecated/test-find-order.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_order', db.driver.db, function () {
-		common.insertModelData('test_find_order', db.driver.db, [
-			{ id : 1, name : 'test2' },
-			{ id : 2, name : 'test1' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_order', common.getModelProperties());
-
-			TestModel.find("name", function (err, Instances) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances.length, 2);
-				assert.equal(Instances[0].id, 2);
-				assert.equal(Instances[1].id, 1);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-rechain.js b/test/integration-old/deprecated/test-find-rechain.js
deleted file mode 100644
index 5fafa132..00000000
--- a/test/integration-old/deprecated/test-find-rechain.js
+++ /dev/null
@@ -1,34 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_rechain', db.driver.db, function () {
-		common.insertModelData('test_find_rechain', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' },
-			{ id : 3, name : 'test1' },
-			{ id : 4, name : 'test2' },
-			{ id : 5, name : 'test1' },
-			{ id : 6, name : 'test2' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find_rechain', common.getModelProperties());
-
-			TestModel.aboveId3 = function () {
-				return this.find({ id : db.tools.gt(3) });
-			};
-			TestModel.onlyTest1 = function () {
-				return this.find({ name : 'test1' });
-			};
-
-			TestModel.aboveId3().onlyTest1().run(function (err, Instances) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances[0].id, 5);
-				assert.equal(Instances[0].name, 'test1');
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-serial.js b/test/integration-old/deprecated/test-find-serial.js
deleted file mode 100644
index 0248cf3e..00000000
--- a/test/integration-old/deprecated/test-find-serial.js
+++ /dev/null
@@ -1,33 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find_serial1', db.driver.db, function () {
-		common.insertModelData('test_find_serial1', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' }
-		], function () {
-			common.createModelTable('test_find_serial2', db.driver.db, function () {
-				common.insertModelData('test_find_serial2', db.driver.db, [
-					{ id : 1, name : 'test1' },
-					{ id : 2, name : 'test2' },
-					{ id : 3, name : 'test3' },
-					{ id : 4, name : 'test4' }
-				], function () {
-					var TestModel1 = db.define('test_find_serial1', common.getModelProperties());
-					var TestModel2 = db.define('test_find_serial2', common.getModelProperties());
-
-					db.serial(
-						TestModel1.find(),
-						TestModel2.find({ name: 'test2' })
-					).get(function (err, tests1, tests2) {
-						assert.equal(err, null);
-						assert.equal(tests1.length, 2);
-						assert.equal(tests2.length, 1);
-						db.close();
-					});
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-where-like.js b/test/integration-old/deprecated/test-find-where-like.js
deleted file mode 100644
index 3de019c2..00000000
--- a/test/integration-old/deprecated/test-find-where-like.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-var tableName  = 'test_find_where';
-
-common.createConnection(function (err, db) {
-	common.createModelTable(tableName, db.driver.db, function () {
-		common.insertModelData(tableName, db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' },
-			{ id : 3, name : 'test' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define(tableName, common.getModelProperties());
-
-			TestModel.find({ name: common.ORM.like("test_") }, function (err, Instances) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances.length, 2);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find-where.js b/test/integration-old/deprecated/test-find-where.js
deleted file mode 100644
index f54bbdef..00000000
--- a/test/integration-old/deprecated/test-find-where.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-var tableName  = 'test_find_where';
-
-common.createConnection(function (err, db) {
-	common.createModelTable(tableName, db.driver.db, function () {
-		common.insertModelData(tableName, db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define(tableName, common.getModelProperties());
-
-			TestModel.find({ id: common.ORM.ne(1) }, function (err, Instances) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances[0].id, 2);
-				assert.equal(Instances[0].name, 'test2');
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-find.js b/test/integration-old/deprecated/test-find.js
deleted file mode 100644
index ef5f7b68..00000000
--- a/test/integration-old/deprecated/test-find.js
+++ /dev/null
@@ -1,25 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_find', db.driver.db, function () {
-		common.insertModelData('test_find', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_find', common.getModelProperties());
-
-			TestModel.find(function (err, Instances) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances[0].id, 1);
-				assert.equal(Instances[0].name, 'test1');
-				assert.equal(Instances[1].id, 2);
-				assert.equal(Instances[1].name, 'test2');
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-get-association-hasone.js b/test/integration-old/deprecated/test-get-association-hasone.js
deleted file mode 100644
index 260a6378..00000000
--- a/test/integration-old/deprecated/test-get-association-hasone.js
+++ /dev/null
@@ -1,23 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModel2Table('test_get_association_hasone', db.driver.db, function () {
-			common.insertModel2Data('test_get_association_hasone', db.driver.db, [
-				{ id : 1, name : 'test1', assoc: 2 },
-				{ id : 2, name : 'test2', assoc: 0 }
-			], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_get_association_hasone', common.getModelProperties());
-			TestModel.hasOne("assoc");
-
-			TestModel(1).getAssoc(function (err, Test2) {
-				assert.equal(err, null);
-				assert.equal(typeof Test2, "object");
-				assert.equal(Test2.id, 2);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-get-cache-no-save-check.js b/test/integration-old/deprecated/test-get-cache-no-save-check.js
deleted file mode 100644
index 31ae194d..00000000
--- a/test/integration-old/deprecated/test-get-cache-no-save-check.js
+++ /dev/null
@@ -1,34 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_get_cache', db.driver.db, function () {
-		common.insertModelData('test_get_cache', db.driver.db, [
-			{ id : 1, name : 'test' }
-		], function (err) {
-			if (err) throw err;
-
-			db.settings.set("instance.cacheSaveCheck", false);
-
-			var TestModel = db.define('test_get_cache', common.getModelProperties());
-
-			// this is the default, it's just here in case default changes..
-			TestModel.get(1, { cache: true }, function (err, Instance1) {
-				assert.equal(err, null);
-				assert.equal(typeof Instance1, "object");
-				assert.equal(Instance1.id, 1);
-				assert.equal(Instance1.name, 'test');
-
-				Instance1.name = 'test1';
-
-				TestModel.get(1, { cache: true }, function (err, Instance2) {
-					assert.equal(err, null);
-					assert.equal(typeof Instance2, "object");
-					assert.equal(Instance2.id, 1);
-					assert.equal(Instance2.name, 'test1'); // no save check
-					db.close();
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-get-cache.js b/test/integration-old/deprecated/test-get-cache.js
deleted file mode 100644
index bbb0e169..00000000
--- a/test/integration-old/deprecated/test-get-cache.js
+++ /dev/null
@@ -1,32 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_get_cache', db.driver.db, function () {
-		common.insertModelData('test_get_cache', db.driver.db, [
-			{ id : 1, name : 'test' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_get_cache', common.getModelProperties());
-
-			// this is the default, it's just here in case default changes..
-			TestModel.get(1, { cache: true }, function (err, Instance1) {
-				assert.equal(err, null);
-				assert.equal(typeof Instance1, "object");
-				assert.equal(Instance1.id, 1);
-				assert.equal(Instance1.name, 'test');
-
-				Instance1.name = 'test1';
-
-				TestModel.get(1, { cache: true }, function (err, Instance2) {
-					assert.equal(err, null);
-					assert.equal(typeof Instance2, "object");
-					assert.equal(Instance2.id, 1);
-					assert.equal(Instance2.name, 'test'); // not saved
-					db.close();
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-get-method.js b/test/integration-old/deprecated/test-get-method.js
deleted file mode 100644
index 004dc987..00000000
--- a/test/integration-old/deprecated/test-get-method.js
+++ /dev/null
@@ -1,27 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_get_method', db.driver.db, function () {
-		common.insertModelData('test_get_method', db.driver.db, [
-			{ id : 1, name : 'test' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_get_method', common.getModelProperties(), {
-				methods: {
-					UID: function () {
-						return this.id;
-					}
-				}
-			});
-
-			TestModel.get(1, function (err, Instance) {
-				assert.equal(err, null);
-				assert.equal(typeof Instance, "object");
-				assert.equal(Instance.id, Instance.UID());
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-get-model-no-cache.js b/test/integration-old/deprecated/test-get-model-no-cache.js
deleted file mode 100644
index e960b97f..00000000
--- a/test/integration-old/deprecated/test-get-model-no-cache.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_get_model_no_cache', db.driver.db, function () {
-		common.insertModelData('test_get_model_no_cache', db.driver.db, [
-			{ id : 1, name : 'test' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_get_model_no_cache', common.getModelProperties(), { cache: false });
-
-			TestModel.get(1, function (err, Instance1) {
-				assert.equal(err, null);
-				assert.equal(typeof Instance1, "object");
-				assert.equal(Instance1.id, 1);
-				assert.equal(Instance1.name, 'test');
-
-				Instance1.name = 'test1';
-
-				TestModel.get(1, function (err, Instance2) {
-					assert.equal(err, null);
-					assert.equal(typeof Instance2, "object");
-					assert.equal(Instance2.id, 1);
-					assert.equal(Instance2.name, 'test');
-					db.close();
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-get-no-cache.js b/test/integration-old/deprecated/test-get-no-cache.js
deleted file mode 100644
index 744a881b..00000000
--- a/test/integration-old/deprecated/test-get-no-cache.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_get_no_cache', db.driver.db, function () {
-		common.insertModelData('test_get_no_cache', db.driver.db, [
-			{ id : 1, name : 'test' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_get_no_cache', common.getModelProperties());
-
-			TestModel.get(1, { cache: false }, function (err, Instance1) {
-				assert.equal(err, null);
-				assert.equal(typeof Instance1, "object");
-				assert.equal(Instance1.id, 1);
-				assert.equal(Instance1.name, 'test');
-
-				Instance1.name = 'test1';
-
-				TestModel.get(1, { cache: false }, function (err, Instance2) {
-					assert.equal(err, null);
-					assert.equal(typeof Instance2, "object");
-					assert.equal(Instance2.id, 1);
-					assert.equal(Instance2.name, 'test');
-					db.close();
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-get-opts.js b/test/integration-old/deprecated/test-get-opts.js
deleted file mode 100644
index c7ba3db1..00000000
--- a/test/integration-old/deprecated/test-get-opts.js
+++ /dev/null
@@ -1,22 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_get_opts', db.driver.db, function () {
-		common.insertModelData('test_get_opts', db.driver.db, [
-			{ id : 1, name : 'test' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_get_opts', common.getModelProperties());
-
-			TestModel.get(1, {}, function (err, Instance) {
-				assert.equal(err, null);
-				assert.equal(typeof Instance, "object");
-				assert.equal(Instance.id, 1);
-				assert.equal(Instance.name, 'test');
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-get-singleton-nocache.js b/test/integration-old/deprecated/test-get-singleton-nocache.js
deleted file mode 100644
index cded83a3..00000000
--- a/test/integration-old/deprecated/test-get-singleton-nocache.js
+++ /dev/null
@@ -1,23 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_get_singleton_nocache', db.driver.db, function () {
-		common.insertModelData('test_get_singleton_nocache', db.driver.db, [
-			{ id : 1, name : 'test' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_get_singleton_nocache', common.getModelProperties(), { cache: false });
-
-			TestModel.get(1, function (err, Instance1) {
-				assert.equal(err, null);
-				TestModel.get(1, function (err, Instance2) {
-					assert.equal(err, null);
-					assert.notStrictEqual(Instance1, Instance2);
-					db.close();
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-get-singleton-somecache.js b/test/integration-old/deprecated/test-get-singleton-somecache.js
deleted file mode 100644
index 1335a176..00000000
--- a/test/integration-old/deprecated/test-get-singleton-somecache.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_get_singleton_somecache', db.driver.db, function () {
-		common.insertModelData('test_get_singleton_somecache', db.driver.db, [
-			{ id : 1, name : 'test' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_get_singleton_somecache', common.getModelProperties(), { cache: 0.5 });
-
-			TestModel.get(1, function (err, Instance1) {
-				assert.equal(err, null);
-
-				TestModel.get(1, function (err, Instance2) {
-					assert.equal(err, null);
-					assert.strictEqual(Instance1, Instance2);
-				});
-
-				setTimeout(function () {
-					TestModel.get(1, function (err, Instance3) {
-						assert.equal(err, null);
-						assert.notStrictEqual(Instance1, Instance3);
-						db.close();
-					});
-				}, 1000);
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-get-singleton.js b/test/integration-old/deprecated/test-get-singleton.js
deleted file mode 100644
index b5d1d6de..00000000
--- a/test/integration-old/deprecated/test-get-singleton.js
+++ /dev/null
@@ -1,23 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_get_singleton', db.driver.db, function () {
-		common.insertModelData('test_get_singleton', db.driver.db, [
-			{ id : 1, name : 'test' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_get_singleton', common.getModelProperties());
-
-			TestModel.get(1, function (err, Instance1) {
-				assert.equal(err, null);
-				TestModel.get(1, function (err, Instance2) {
-					assert.equal(err, null);
-					assert.strictEqual(Instance1, Instance2);
-					db.close();
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-get.js b/test/integration-old/deprecated/test-get.js
deleted file mode 100644
index c215fadd..00000000
--- a/test/integration-old/deprecated/test-get.js
+++ /dev/null
@@ -1,22 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_get', db.driver.db, function () {
-		common.insertModelData('test_get', db.driver.db, [
-			{ id : 1, name : 'test' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_get', common.getModelProperties());
-
-			TestModel.get(1, function (err, Instance) {
-				assert.equal(err, null);
-				assert.equal(typeof Instance, "object");
-				assert.equal(Instance.id, 1);
-				assert.equal(Instance.name, 'test');
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-hook-after-create.js b/test/integration-old/deprecated/test-hook-after-create.js
deleted file mode 100644
index 3c419d96..00000000
--- a/test/integration-old/deprecated/test-hook-after-create.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_hook_after_create', db.driver.db, function () {
-		var afterCreate = false;
-		var TestModel = db.define('test_hook_after_create', common.getModelProperties(), {
-			hooks: {
-				afterCreate: function () {
-					afterCreate = true;
-				}
-			}
-		});
-
-		var Test = new TestModel({ name: "afterCreate" });
-		Test.save(function (err) {
-			assert.equal(err, null);
-
-			db.close(function () {
-				assert.equal(afterCreate, true);
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-hook-after-load.js b/test/integration-old/deprecated/test-hook-after-load.js
deleted file mode 100644
index 3f317f9e..00000000
--- a/test/integration-old/deprecated/test-hook-after-load.js
+++ /dev/null
@@ -1,19 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_hook_before_save', db.driver.db, function () {
-		var calledAfterLoad = false;
-		var TestModel = db.define('test_hook_before_save', common.getModelProperties(), {
-			hooks: {
-				afterLoad: function () {
-					calledAfterLoad = true;
-
-					db.close();
-				}
-			}
-		});
-
-		var Test = new TestModel({ name: "beforeSave" });
-	});
-});
diff --git a/test/integration-old/deprecated/test-hook-after-remove.js b/test/integration-old/deprecated/test-hook-after-remove.js
deleted file mode 100644
index 3cb8577c..00000000
--- a/test/integration-old/deprecated/test-hook-after-remove.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_hook_after_remove', db.driver.db, function () {
-		common.insertModelData('test_hook_after_remove', db.driver.db, [
-			{ id : 1, name : 'test' }
-		], function (err) {
-			var afterRemove = false;
-			var TestModel = db.define('test_hook_after_remove', common.getModelProperties(), {
-				hooks: {
-					afterRemove: function () {
-						afterRemove = true;
-					}
-				}
-			});
-
-			TestModel.get(1, function (err, Instance) {
-				assert.equal(err, null);
-				Instance.remove(function (err) {
-					assert.equal(err, null);
-					assert.equal(afterRemove, true);
-
-					db.close();
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-hook-after-save.js b/test/integration-old/deprecated/test-hook-after-save.js
deleted file mode 100644
index 002d85ab..00000000
--- a/test/integration-old/deprecated/test-hook-after-save.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_hook_after_save', db.driver.db, function () {
-		var calledAfter = false;
-		var TestModel = db.define('test_hook_after_save', common.getModelProperties(), {
-			hooks: {
-				afterSave: function () {
-					calledAfter = true;
-				}
-			}
-		});
-
-		var Test = new TestModel({ name: "beforeSave" });
-		Test.save(function (err) {
-			assert.equal(err, null);
-
-			db.close(function () {
-				assert.equal(calledAfter, true);
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-hook-before-create-define-property.js b/test/integration-old/deprecated/test-hook-before-create-define-property.js
deleted file mode 100644
index c791e2a5..00000000
--- a/test/integration-old/deprecated/test-hook-before-create-define-property.js
+++ /dev/null
@@ -1,22 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_hook_before_create_define_property', db.driver.db, function () {
-		var name = "Name was undefined";
-		var TestModel = db.define('test_hook_before_create_define_property', common.getModelProperties(), {
-			hooks: {
-				beforeCreate: function () {
-					this.name = name;
-				}
-			}
-		});
-
-		var Test = new TestModel();
-		Test.save(function (err) {
-			assert.equal(err, null);
-			assert.equal(Test.name, name);
-			db.close();
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-hook-before-create-wait.js b/test/integration-old/deprecated/test-hook-before-create-wait.js
deleted file mode 100644
index 542d7eca..00000000
--- a/test/integration-old/deprecated/test-hook-before-create-wait.js
+++ /dev/null
@@ -1,28 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_hook_before_create_wait', db.driver.db, function () {
-		var beforeCreate = false;
-		var TestModel = db.define('test_hook_before_create_wait', common.getModelProperties(), {
-			hooks: {
-				beforeCreate: function (next) {
-					return setTimeout(function () {
-						beforeCreate = true;
-
-						return next();
-					}, 1000);
-				}
-			}
-		});
-
-		var Test = new TestModel({ name: "beforeCreate" });
-		Test.save(function (err) {
-			assert.equal(err, null);
-
-			db.close(function () {
-				assert.equal(beforeCreate, true);
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-hook-before-create.js b/test/integration-old/deprecated/test-hook-before-create.js
deleted file mode 100644
index 15c09810..00000000
--- a/test/integration-old/deprecated/test-hook-before-create.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_hook_before_create', db.driver.db, function () {
-		var beforeCreate = false;
-		var TestModel = db.define('test_hook_before_create', common.getModelProperties(), {
-			hooks: {
-				beforeCreate: function () {
-					beforeCreate = true;
-				}
-			}
-		});
-
-		var Test = new TestModel({ name: "beforeCreate" });
-		Test.save(function (err) {
-			assert.equal(err, null);
-
-			db.close(function () {
-				assert.equal(beforeCreate, true);
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-hook-before-remove-wait.js b/test/integration-old/deprecated/test-hook-before-remove-wait.js
deleted file mode 100644
index 2c874208..00000000
--- a/test/integration-old/deprecated/test-hook-before-remove-wait.js
+++ /dev/null
@@ -1,34 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-var util       = require('util');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_hook_before_remove_halt', db.driver.db, function () {
-		common.insertModelData('test_hook_before_remove_halt', db.driver.db, [
-			{ id : 1, name : 'test' }
-		], function (err) {
-			var beforeRemove = false;
-			var TestModel = db.define('test_hook_before_remove_halt', common.getModelProperties(), {
-				hooks: {
-					beforeRemove: function (next) {
-						beforeRemove = true;
-						setTimeout(function () {
-							return next(new Error("Remove denied"));
-						}, 1000);
-					}
-				}
-			});
-
-			TestModel.get(1, function (err, Instance) {
-				assert.equal(err, null);
-				Instance.remove(function (err) {
-					assert.equal(beforeRemove, true);
-					assert.equal(util.isError(err), true);
-					assert.equal(err.message, "Remove denied");
-
-					db.close();
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-hook-before-remove.js b/test/integration-old/deprecated/test-hook-before-remove.js
deleted file mode 100644
index 52b1b4fe..00000000
--- a/test/integration-old/deprecated/test-hook-before-remove.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_hook_before_remove', db.driver.db, function () {
-		common.insertModelData('test_hook_before_remove', db.driver.db, [
-			{ id : 1, name : 'test' }
-		], function (err) {
-			var beforeRemove = false;
-			var TestModel = db.define('test_hook_before_remove', common.getModelProperties(), {
-				hooks: {
-					beforeRemove: function () {
-						beforeRemove = true;
-					}
-				}
-			});
-
-			TestModel.get(1, function (err, Instance) {
-				assert.equal(err, null);
-				Instance.remove(function (err) {
-					assert.equal(err, null);
-					assert.equal(beforeRemove, true);
-
-					db.close();
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-hook-before-save-wait.js b/test/integration-old/deprecated/test-hook-before-save-wait.js
deleted file mode 100644
index f21fb4dc..00000000
--- a/test/integration-old/deprecated/test-hook-before-save-wait.js
+++ /dev/null
@@ -1,28 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_hook_before_save_wait', db.driver.db, function () {
-		var calledBefore = false;
-		var TestModel = db.define('test_hook_before_save_wait', common.getModelProperties(), {
-			hooks: {
-				beforeSave: function (next) {
-					return setTimeout(function () {
-						calledBefore = true;
-
-						return next();
-					}, 1000);
-				}
-			}
-		});
-
-		var Test = new TestModel({ name: "beforeSave" });
-		Test.save(function (err) {
-			assert.equal(err, null);
-
-			db.close(function () {
-				assert.equal(calledBefore, true);
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-hook-before-save.js b/test/integration-old/deprecated/test-hook-before-save.js
deleted file mode 100644
index 3b47feb5..00000000
--- a/test/integration-old/deprecated/test-hook-before-save.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_hook_before_save', db.driver.db, function () {
-		var calledBefore = false;
-		var TestModel = db.define('test_hook_before_save', common.getModelProperties(), {
-			hooks: {
-				beforeSave: function () {
-					calledBefore = true;
-				}
-			}
-		});
-
-		var Test = new TestModel({ name: "beforeSave" });
-		Test.save(function (err) {
-			assert.equal(err, null);
-
-			db.close(function () {
-				assert.equal(calledBefore, true);
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-hook-before-validation-wait.js b/test/integration-old/deprecated/test-hook-before-validation-wait.js
deleted file mode 100644
index cb71f7f7..00000000
--- a/test/integration-old/deprecated/test-hook-before-validation-wait.js
+++ /dev/null
@@ -1,28 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_hook_before_validation_wait', db.driver.db, function () {
-		var beforeValidation = false;
-		var TestModel = db.define('test_hook_before_validation_wait', common.getModelProperties(), {
-			hooks: {
-				beforeValidation: function (next) {
-					beforeValidation = true;
-
-					setTimeout(function () {
-						return next(new Error("Validation failed"));
-					}, 1000);
-				}
-			}
-		});
-
-		var Test = new TestModel({ name: "beforeValidation" });
-		Test.save(function (err) {
-			assert.equal(err.message, "Validation failed");
-
-			db.close(function () {
-				assert.equal(beforeValidation, true);
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-hook-before-validation.js b/test/integration-old/deprecated/test-hook-before-validation.js
deleted file mode 100644
index 9b577a68..00000000
--- a/test/integration-old/deprecated/test-hook-before-validation.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_hook_before_validation', db.driver.db, function () {
-		var beforeValidation = false;
-		var TestModel = db.define('test_hook_before_validation', common.getModelProperties(), {
-			hooks: {
-				beforeValidation: function () {
-					beforeValidation = true;
-				}
-			}
-		});
-
-		var Test = new TestModel({ name: "beforeValidation" });
-		Test.save(function (err) {
-			assert.equal(err, null);
-
-			db.close(function () {
-				assert.equal(beforeValidation, true);
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-hooks-for-single-property.js b/test/integration-old/deprecated/test-hooks-for-single-property.js
deleted file mode 100644
index 17751c03..00000000
--- a/test/integration-old/deprecated/test-hooks-for-single-property.js
+++ /dev/null
@@ -1,36 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_hook_for_single_property', db.driver.db, function () {
-		common.insertModelData('test_hook_for_single_property', db.driver.db, [
-			{ id : 1, name : 'test1' }
-		], function (err) {
-			if (err) throw err;
-
-			var calledBefore = false, calledAfter = false;
-			var TestModel = db.define('test_hook_for_single_property', common.getModelProperties(), {
-				autoSave: true,
-				hooks: {
-					beforeSave: function () {
-						calledBefore = true;
-					},
-					afterSave: function () {
-						calledAfter = true;
-					}
-				}
-			});
-
-			TestModel.get(1, function (err, Test) {
-				Test.name = "test_hook_for_single_property";
-
-				setTimeout(function () {
-					db.close(function () {
-						assert.equal(calledBefore, true, 'dit not call before');
-						assert.equal(calledAfter, true, 'did not call after');
-					});
-				}, 1000);
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-key-nonincrement.js b/test/integration-old/deprecated/test-key-nonincrement.js
deleted file mode 100755
index abb0bfe4..00000000
--- a/test/integration-old/deprecated/test-key-nonincrement.js
+++ /dev/null
@@ -1,34 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	assert.equal(err, null);
-
-	//define model with non-autoincrement primary key
-	var Contact = db.define('test-key-nonincrement', {
-		poc: { title: "POC", type: 'text', size: 65, required: true},
-		first_name: { type: 'text', size: 32, required: true},
-		last_name: { type: 'text', size: 32, required: true}
-	}, {
-		id: 'poc'
-	});
-
-	// drop & sync the model (remove all data)
-	Contact.drop(function (err) {
-		assert.equal(err, null);
-
-		Contact.sync(function (err) {
-			assert.equal(err, null);
-
-			//if sync is good, insert a record
-			var data = [{ poc: 'John Doe', first_name: 'John', last_name: 'Doe' }];
-
-			Contact.create(data, function (err, items) {
-				assert.equal(err, null);
-				assert.equal(items[0].poc, 'John Doe');
-
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-load.js b/test/integration-old/deprecated/test-load.js
deleted file mode 100644
index 9aa8a8d1..00000000
--- a/test/integration-old/deprecated/test-load.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	// should load:
-	//
-	// models/sub/index
-	// models/model (called from models/sub/index)
-	db.load("./models/sub/", function (err) {
-		assert.equal(err, null);
-		db.close();
-	});
-});
diff --git a/test/integration-old/deprecated/test-many-validations-for-same-property.js b/test/integration-old/deprecated/test-many-validations-for-same-property.js
deleted file mode 100644
index 2fc5be64..00000000
--- a/test/integration-old/deprecated/test-many-validations-for-same-property.js
+++ /dev/null
@@ -1,25 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_many_validations_for_same_property', db.driver.db, function () {
-		var TestModel = db.define('test_many_validations_for_same_property', common.getModelProperties(), {
-			validations: {
-				name: [
-					db.validators.rangeLength(0, 20, 'error1'), // should not fail on this one
-					db.validators.rangeLength(2, 3, 'error2')   // should fail on this one
-				]
-			}
-		});
-
-		var Test = new TestModel({ name: "test-validation" });
-		Test.save(function (err) {
-			assert.equal(typeof err, "object");
-			assert.equal(err.field, "name");
-			assert.equal(err.value, "test-validation");
-			assert.equal(err.msg, "error2");
-
-			db.close();
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-multikey-base.js b/test/integration-old/deprecated/test-multikey-base.js
deleted file mode 100644
index 433b5c15..00000000
--- a/test/integration-old/deprecated/test-multikey-base.js
+++ /dev/null
@@ -1,61 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createKeysModelTable('test_multikey_base', db.driver.db, [ 'id1', 'id2', 'id3' ], function () {
-		common.insertKeysModelData('test_multikey_base', db.driver.db, [
-			{ id1 : 1, id2 : 1, id3: 1, name : 'test111' },
-			{ id1 : 1, id2 : 2, id3: 3, name : 'test123' },
-			{ id1 : 2, id2 : 3, id3: 1, name : 'test231' },
-			{ id1 : 3, id2 : 1, id3: 2, name : 'test312' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_multikey_base', common.getModelProperties(), {
-				keys  : [ 'id1', 'id2', 'id3' ],
-				cache : false
-			});
-
-			TestModel.get(1, 2, 3, function (err, item) {
-				assert.equal(err, null);
-				assert.equal(item.name, 'test123');
-
-				item.name = 'tested';
-
-				assert.throws(function () {
-					item.id2 = 5;
-				}, /cannot change id/i);
-
-				item.save(function (err) {
-					assert.equal(err, null);
-
-					TestModel.get(1, 2, 3, function (err, item_copy1) {
-						assert.equal(err, null);
-						assert.equal(item_copy1.name, 'tested');
-
-						item_copy1.remove(function () {
-							assert.equal(err, null);
-
-							TestModel.get(1, 2, 3, function (err, item_copy2) {
-								assert.notEqual(err, null);
-								assert.equal(err.message, "Not found");
-
-								TestModel.exists(1, 2, 3, function (err, exists) {
-									assert.equal(err, null);
-									assert.equal(exists, false);
-
-									TestModel.find().count(function (err, count) {
-										assert.equal(err, null);
-										assert.equal(count, 3);
-
-										db.close();
-									});
-								});
-							});
-						});
-					});
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-multikey-hasmany-throw.js b/test/integration-old/deprecated/test-multikey-hasmany-throw.js
deleted file mode 100644
index ff78c705..00000000
--- a/test/integration-old/deprecated/test-multikey-hasmany-throw.js
+++ /dev/null
@@ -1,26 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createKeysModelTable('test_multikey_find', db.driver.db, [ 'id1', 'id2', 'id3' ], function () {
-		common.insertKeysModelData('test_multikey_find', db.driver.db, [
-			{ id1 : 1, id2 : 1, id3: 1, name : 'test111' },
-			{ id1 : 1, id2 : 2, id3: 3, name : 'test123' },
-			{ id1 : 2, id2 : 3, id3: 1, name : 'test231' },
-			{ id1 : 3, id2 : 1, id3: 2, name : 'test312' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_multikey_find', common.getModelProperties(), {
-				keys  : [ 'id1', 'id2', 'id3' ],
-				cache : false
-			});
-
-			assert.throws(function () {
-				TestModel.hasMany("whatever");
-			}, /support/); // "does not support"
-
-			db.close();
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-number-size.js b/test/integration-old/deprecated/test-number-size.js
deleted file mode 100644
index 6ba79650..00000000
--- a/test/integration-old/deprecated/test-number-size.js
+++ /dev/null
@@ -1,127 +0,0 @@
-var common = require('../common');
-var assert = require('assert');
-var async  = require('async');
-
-
-function round(num, points) {
-  var m = Math.pow(10, points);
-
-  return Math.round(num * m) / m;
-}
-
-// Round because different systems store floats in different
-// ways, thereby introducing small errors.
-function fuzzyEql(num1, num2) {
-  return round(num1 / num2, 3) == 1;
-}
-
-common.createConnection(function (err, db) {
-  if (err) throw err;
-
-  var Model = db.define('test-number-size', {
-    int2:   { type: 'number', size: 2, rational: false },
-    int4:   { type: 'number', size: 4, rational: false },
-    int8:   { type: 'number', size: 8, rational: false },
-    float4: { type: 'number', size: 4 },
-    float8: { type: 'number', size: 8 }
-  });
-
-  var data = {
-    int2: 32700, int4: 2147483000, int8: 2251799813685248,
-    float4: 1 * Math.pow(10, 36),
-    float8: 1 * Math.pow(10, 306)
-  }
-
-  var protocol = common.protocol().toLowerCase();
-  var mysql    = protocol == 'mysql';
-  var postgres = protocol == 'postgres' || protocol == 'redshift';
-
-  // Sqlite doesn't support specifying sizes
-  if(!(postgres || mysql)) {
-    db.close();
-    return;
-  }
-
-  async.series([
-    function(cb) {
-      Model.drop(function (err) {
-        if (err) throw err;
-        Model.sync(function (err) {
-          if (err) throw err;
-          cb();
-        });
-      });
-    },
-    // It should be able to store near MAX sized values for each field
-    function(cb) {
-      Model.create(data, function (err, item) {
-        if (err) throw err;
-
-        Model.get(item.id, function (err, item) {
-          if (err) throw err;
-
-          assert(fuzzyEql(item.int2,   data.int2));
-          assert(fuzzyEql(item.int4,   data.int4));
-          assert(fuzzyEql(item.int8,   data.int8));
-          assert(fuzzyEql(item.float4, data.float4));
-          assert(fuzzyEql(item.float8, data.float8));
-
-          cb();
-        });
-      });
-    },
-    // It should not be able to store values which are too large in int2
-    function(cb) {
-      Model.create({ int2: data.int4 }, function (err, item) {
-        // Postgres throws an error if it detects potential data loss,
-        // ie. if it detects an overflow.
-        // Mysql truncates the value, and acts like nothing happened.
-        if (postgres) {
-          assert(err);
-          cb();
-        } else if (mysql) {
-          Model.get(item.id, function (err, item) {
-            if (err) throw err;
-
-            assert(!fuzzyEql(item.int2, data.int4));
-            cb();
-          });
-        }
-      });
-    },
-    // It should not be able to store values which are too large in int4
-    function(cb) {
-      Model.create({ int4: data.int8 }, function (err, item) {
-        if (postgres) {
-          assert(err);
-          cb();
-        } else if (mysql) {
-          Model.get(item.id, function (err, item) {
-            if (err) throw err;
-
-            assert(!fuzzyEql(item.int4, data.int8));
-            cb();
-          });
-        }
-      });
-    },
-    // It should not be able to store values which are too large in float4
-    function(cb) {
-      Model.create({ float4: data.float8 }, function (err, item) {
-        if (postgres) {
-          assert(err);
-          cb();
-        } else if (mysql) {
-          Model.get(item.id, function (err, item) {
-            if (err) throw err;
-
-            assert(!fuzzyEql(item.float4, data.float8));
-            cb();
-          });
-        }
-      });
-    }
-  ], function () {
-    db.close();
-  });
-});
diff --git a/test/integration-old/deprecated/test-one-conditions.js b/test/integration-old/deprecated/test-one-conditions.js
deleted file mode 100644
index 4ff83f40..00000000
--- a/test/integration-old/deprecated/test-one-conditions.js
+++ /dev/null
@@ -1,23 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_one_conditions', db.driver.db, function () {
-		common.insertModelData('test_one_conditions', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test1' },
-			{ id : 3, name : 'test1' },
-			{ id : 4, name : 'test1' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_one_conditions', common.getModelProperties());
-
-			TestModel.one({ name: 'test2' }, function (err, Instance) {
-				assert.equal(err, null);
-				assert.equal(Instance, null);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-one-order.js b/test/integration-old/deprecated/test-one-order.js
deleted file mode 100644
index 24a48120..00000000
--- a/test/integration-old/deprecated/test-one-order.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_one_order', db.driver.db, function () {
-		common.insertModelData('test_one_order', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' },
-			{ id : 3, name : 'test3' },
-			{ id : 4, name : 'test4' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_one_order', common.getModelProperties());
-
-			TestModel.one("-name", function (err, Instance) {
-				assert.equal(err, null);
-				assert.equal(!Array.isArray(Instance), true);
-				assert.equal(Instance.id, 4);
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-one.js b/test/integration-old/deprecated/test-one.js
deleted file mode 100644
index 3656d347..00000000
--- a/test/integration-old/deprecated/test-one.js
+++ /dev/null
@@ -1,22 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_one', db.driver.db, function () {
-		common.insertModelData('test_one', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' }
-		], function (err) {
-			if (err) throw err;
-
-			var TestModel = db.define('test_one', common.getModelProperties());
-
-			TestModel.one(function (err, Instance) {
-				assert.equal(err, null);
-				assert.equal(!Array.isArray(Instance), true);
-				assert.equal(typeof Instance.id, "number");
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-ping.js b/test/integration-old/deprecated/test-ping.js
deleted file mode 100644
index 7fe6d3dc..00000000
--- a/test/integration-old/deprecated/test-ping.js
+++ /dev/null
@@ -1,10 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	db.ping(function (err) {
-		assert.equal(err, null);
-
-		db.close();
-	});
-});
diff --git a/test/integration-old/deprecated/test-property-types.js b/test/integration-old/deprecated/test-property-types.js
deleted file mode 100644
index 560a118a..00000000
--- a/test/integration-old/deprecated/test-property-types.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-var Property   = require('../../lib/Property');
-var Settings   = common.ORM.settings;
-
-assert.equal(Property.normalize(String, Settings).type, "text");
-assert.equal(Property.normalize(Number, Settings).type, "number");
-assert.equal(Property.normalize(Boolean, Settings).type, "boolean");
-assert.equal(Property.normalize(Date, Settings).type, "date");
-assert.equal(Property.normalize(Object, Settings).type, "object");
-assert.equal(Property.normalize(Buffer, Settings).type, "binary");
-assert.equal(Property.normalize([ 'a', 'b' ], Settings).type, "enum");
-assert.deepEqual(Property.normalize([ 'a', 'b' ], Settings).values, [ 'a', 'b' ]);
-
-assert.equal({ type: "text" }.type, "text");
-assert.equal({ type: "number" }.type, "number");
-assert.equal({ type: "boolean" }.type, "boolean");
-assert.equal({ type: "date" }.type, "date");
-assert.equal({ type: "enum" }.type, "enum");
-assert.equal({ type: "object" }.type, "object");
-assert.equal({ type: "binary" }.type, "binary");
-
-assert.throws(function () { Property.normalize({ type: "buffer" }, Settings); });
-assert.throws(function () { Property.normalize({ type: "unknown" }, Settings); });
diff --git a/test/integration-old/deprecated/test-save-hasone-association-new.js b/test/integration-old/deprecated/test-save-hasone-association-new.js
deleted file mode 100644
index 419b5810..00000000
--- a/test/integration-old/deprecated/test-save-hasone-association-new.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	var TestModel = db.define('test_save_hasone_association_new', common.getModelProperties());
-	TestModel.hasOne("assoc", TestModel, { required: false });
-
-	TestModel.drop(function (err) {
-		assert.equal(err, null);
-
-		TestModel.sync(function (err) {
-			assert.equal(err, null);
-
-			var test1 = new TestModel({
-				name : "test1",
-				assoc: {
-					name: "test2"
-				}
-			});
-
-			test1.save(function (err) {
-				assert.equal(err, null);
-				assert.equal(test1.assoc.saved(), true);
-
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-save-hasone-association.js b/test/integration-old/deprecated/test-save-hasone-association.js
deleted file mode 100644
index afbc6014..00000000
--- a/test/integration-old/deprecated/test-save-hasone-association.js
+++ /dev/null
@@ -1,30 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	var TestModel = db.define('test_save_hasone_association', common.getModelProperties());
-	TestModel.hasOne("assoc");
-
-	TestModel.drop(function (err) {
-		assert.equal(err, null);
-
-		TestModel.sync(function (err) {
-			assert.equal(err, null);
-
-			var test2 = new TestModel({
-				name: "test2"
-			});
-			var test1 = new TestModel({
-				name : "test1",
-				assoc: test2
-			});
-
-			test1.save(function (err) {
-				assert.equal(err, null);
-				assert.equal(test2.saved(), true);
-
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-save.js b/test/integration-old/deprecated/test-save.js
deleted file mode 100644
index 231441a4..00000000
--- a/test/integration-old/deprecated/test-save.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_save', db.driver.db, function () {
-		var TestModel = db.define('test_save', common.getModelProperties());
-
-		var test1 = new TestModel({
-			name: "test"
-		});
-
-		test1.save(function (err) {
-			assert.equal(err, null);
-
-			TestModel.get(test1.id, function (err, test2) {
-				assert.equal(err, null);
-				assert.equal(test1.id, test2.id);
-				assert.equal(test1.name, test2.name);
-
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-settings-properties-primary-key.js b/test/integration-old/deprecated/test-settings-properties-primary-key.js
deleted file mode 100644
index 071d7063..00000000
--- a/test/integration-old/deprecated/test-settings-properties-primary-key.js
+++ /dev/null
@@ -1,33 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_settings_properties_primary_key', db.driver.db, function () {
-		common.insertModelData('test_settings_properties_primary_key', db.driver.db, [
-			{ id : 1, name : 'test1' },
-			{ id : 2, name : 'test2' },
-			{ id : 3, name : 'test3' },
-			{ id : 4, name : 'test4' },
-			{ id : 5, name : 'test5' }
-		], function (err) {
-			if (err) throw err;
-
-			db.settings.set('properties.primary_key', 'name');
-
-			var properties = common.getModelProperties();
-			// since "id" is no longer primary key and instances ignore non model properties,
-			// we have to define "id" as a common property so we can check it later
-			properties.id = Number;
-
-			var TestModel = db.define('test_settings_properties_primary_key', properties);
-
-			TestModel.get('test4', function (err, Test4) {
-				assert.equal(err, null);
-				assert.equal(Test4.id, 4);
-				assert.equal(Test4.name, 'test4');
-
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-settings.js b/test/integration-old/deprecated/test-settings.js
deleted file mode 100644
index fb349c05..00000000
--- a/test/integration-old/deprecated/test-settings.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.ORM.settings.set("some.sub.object", 123.45);
-
-assert.equal(common.ORM.settings.get("some.sub.object"), 123.45);
-assert.equal(common.ORM.settings.get("some.other.sub.object", 789), 789);
-
-var testFunction = function () {
-	return "test";
-};
-
-common.ORM.settings.set("some....object", testFunction);
-
-assert.equal(common.ORM.settings.get("some....object"), testFunction);
-
-common.ORM.settings.unset("some....object", "some.sub.object");
-
-assert.equal(common.ORM.settings.get("some....object"), undefined);
-assert.equal(common.ORM.settings.get("some.sub.object"), undefined);
-
-common.ORM.settings.set("some.other.stuff", 123.45);
-common.ORM.settings.set("some.more.stuff", 123.45);
-common.ORM.settings.unset("some.*");
-
-assert.equal(common.ORM.settings.get("some.other.stuff"), undefined);
-assert.equal(common.ORM.settings.get("some.more.stuff"), undefined);
-assert.equal(typeof common.ORM.settings.get("some.*"), "object");
-assert.equal(Object.keys(common.ORM.settings.get("some.*")).length, 0);
-assert.equal(typeof common.ORM.settings.get("some"), "object");
-assert.equal(Object.keys(common.ORM.settings.get("some")).length, 0);
diff --git a/test/integration-old/deprecated/test-sync-no-throw.js b/test/integration-old/deprecated/test-sync-no-throw.js
deleted file mode 100644
index 3342e356..00000000
--- a/test/integration-old/deprecated/test-sync-no-throw.js
+++ /dev/null
@@ -1,14 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	var TestModel = db.define('test_sync', common.getModelProperties());
-
-	assert.doesNotThrow(function () {
-		TestModel.sync();
-	});
-
-	setTimeout(function () {
-		db.close();
-	}, 500);
-});
diff --git a/test/integration-old/deprecated/test-sync.js b/test/integration-old/deprecated/test-sync.js
deleted file mode 100644
index 2a553235..00000000
--- a/test/integration-old/deprecated/test-sync.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	var TestModel = db.define('test_sync', common.getModelProperties());
-
-	TestModel.sync(function (err) {
-		if (err !== null) {
-			// not supported by all drivers
-			return db.close();
-		}
-
-		TestModel.clear(function (err) {
-			assert.equal(err, null);
-
-			var Test1 = new TestModel({
-				name: "test1"
-			});
-			Test1.save(function (err) {
-				assert.equal(err, null);
-
-				TestModel.find({ name: "test1" }, function (err, tests) {
-					assert.equal(err, null);
-					assert.equal(tests.length, 1);
-
-					db.close();
-				});
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-use.js b/test/integration-old/deprecated/test-use.js
deleted file mode 100644
index ea987763..00000000
--- a/test/integration-old/deprecated/test-use.js
+++ /dev/null
@@ -1,33 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-var connection;
-
-switch (common.protocol()) {
-	case 'mysql':
-		connection = require('mysql').createConnection(common.getConnectionString());
-		connection.connect(test_use);
-		break;
-	case 'postgres':
-		connection = new (require('pg').Client)(common.getConnectionString());
-		connection.connect(test_use);
-		break;
-	case 'sqlite':
-		connection = new (require('sqlite3').Database)(common.getConnectionString().substr(9));
-		test_use(null);
-		break;
-}
-
-function test_use(err) {
-	assert.equal(err, null);
-
-	common.ORM.use(connection, process.env.ORM_PROTOCOL, function (err, db) {
-		assert.equal(err, null);
-		assert.equal(typeof db, "object");
-		assert.equal(typeof db.define, "function");
-		assert.equal(typeof db.close, "function");
-		assert.equal(typeof db.models, "object");
-
-		db.close();
-	});
-}
diff --git a/test/integration-old/deprecated/test-validation.js b/test/integration-old/deprecated/test-validation.js
deleted file mode 100644
index 76d6d98f..00000000
--- a/test/integration-old/deprecated/test-validation.js
+++ /dev/null
@@ -1,32 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-
-common.createConnection(function (err, db) {
-	common.createModelTable('test_validation', db.driver.db, function () {
-		var TestModel = db.define('test_validation', common.getModelProperties(), {
-			validations: {
-				name: function (name, next) {
-					return next('force-validation-fail');
-				}
-			}
-		});
-
-		var Test = new TestModel({ name: "test-validation" });
-		Test.save(function (err) {
-			assert.equal(typeof err, "object");
-			assert.equal(err.field, "name");
-			assert.equal(err.value, "test-validation");
-			assert.equal(err.msg, "force-validation-fail");
-
-			Test = new TestModel({ name: "test-validation" });
-			Test.validate(function (err) {
-				assert.equal(typeof err, "object");
-				assert.equal(err.field, "name");
-				assert.equal(err.value, "test-validation");
-				assert.equal(err.msg, "force-validation-fail");
-
-				db.close();
-			});
-		});
-	});
-});
diff --git a/test/integration-old/deprecated/test-validators.js b/test/integration-old/deprecated/test-validators.js
deleted file mode 100644
index f90e8fee..00000000
--- a/test/integration-old/deprecated/test-validators.js
+++ /dev/null
@@ -1,50 +0,0 @@
-var common     = require('../common');
-var assert     = require('assert');
-var Validation = require('../../lib/Validators');
-var _; // undefined
-
-Validation.rangeNumber(0, 10)(5, checkValidation());
-Validation.rangeNumber(_, 10)(-5, checkValidation());
-Validation.rangeNumber(-10, _)(-5, checkValidation());
-Validation.rangeNumber(0, 10)(-5, checkValidation('out-of-range-number'));
-Validation.rangeNumber(_, 10)(15, checkValidation('out-of-range-number'));
-Validation.rangeNumber(0, _)(-5, checkValidation('out-of-range-number'));
-Validation.rangeNumber(0, _, 'custom-error')(-5, checkValidation('custom-error'));
-
-Validation.rangeLength(0, 10)('test', checkValidation());
-Validation.rangeLength(_, 10)('test', checkValidation());
-Validation.rangeLength(0, _)('test', checkValidation());
-Validation.rangeLength(4, _)('test', checkValidation());
-Validation.rangeLength(0, _)(_, checkValidation('undefined'));
-Validation.rangeLength(0, 3)('test', checkValidation('out-of-range-length'));
-Validation.rangeLength(5, _)('test', checkValidation('out-of-range-length'));
-Validation.rangeLength(_, 3)('test', checkValidation('out-of-range-length'));
-Validation.rangeLength(_, 3, 'custom-error')('test', checkValidation('custom-error'));
-
-Validation.insideList([ 1, 2, 3 ])(1, checkValidation());
-Validation.insideList([ 1, 2, 3 ])(3, checkValidation());
-Validation.insideList([ 1, 2, 3 ])(4, checkValidation('outside-list'));
-Validation.insideList([ 1, 2, 3 ])('1', checkValidation('outside-list'));
-Validation.insideList([ 1, 2, 3 ])('', checkValidation('outside-list'));
-Validation.insideList([ 1, 2, 3 ])([], checkValidation('outside-list'));
-Validation.insideList([ 1, 2, 3 ], 'custom-error')([], checkValidation('custom-error'));
-
-Validation.outsideList([ 1, 2, 3 ])(4, checkValidation());
-Validation.outsideList([ 1, 2, 3 ])(-2, checkValidation());
-Validation.outsideList([ 1, 2, 3 ])('', checkValidation());
-Validation.outsideList([ 0, 2, 3 ])(null, checkValidation());
-Validation.outsideList([ 1, 2, 3 ])('2', checkValidation());
-Validation.outsideList([ 1, 2, 3 ])(2, checkValidation('inside-list'));
-Validation.outsideList([ 1, 2, 3 ], 'custom-error')(2, checkValidation('custom-error'));
-
-Validation.notEmptyString()('a', checkValidation());
-Validation.notEmptyString()('', checkValidation('empty-string'));
-Validation.notEmptyString('custom-error')('', checkValidation('custom-error'));
-Validation.notEmptyString()(_, checkValidation('undefined'));
-Validation.notEmptyString('custom-error')(_, checkValidation('undefined'));
-
-function checkValidation(ret1) {
-	return function (ret2) {
-		assert.strictEqual(ret1, ret2);
-	};
-}

From 4881fce99ea700d512c9f1700ce4b04ec57ef56c Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 11 Jul 2013 21:57:12 +0100
Subject: [PATCH 0659/1246] Fixes modifying instance properties in hooks not
 saving (#223)

---
 lib/Instance.js | 131 ++++++++++++++++++++++++++----------------------
 1 file changed, 72 insertions(+), 59 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 9779531e..6b847333 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -102,30 +102,28 @@ function Instance(Model, opts) {
 				return saveError(cb, err);
 			}
 
-			var data = {};
-			for (var k in opts.data) {
-				if (!opts.data.hasOwnProperty(k)) continue;
-
-				if (Model.properties[k]) {
-					data[k] = Property.validate(opts.data[k], Model.properties[k]);
-					if (opts.driver.propertyToValue) {
-						data[k] = opts.driver.propertyToValue(data[k], Model.properties[k]);
+			if (opts.is_new) {
+				waitHooks([ "beforeCreate", "beforeSave" ], function (err) {
+					if (err) {
+						return saveError(cb, err);
 					}
-				} else {
-					data[k] = opts.data[k];
-				}
-			}
 
-			if (opts.is_new) {
-				return saveNew(cb, saveOptions, data);
+					return saveNew(cb, saveOptions, getInstanceData());
+				});
 			} else {
-				return savePersisted(cb, saveOptions, data);
+				waitHooks([ "beforeSave" ], function (err) {
+					if (err) {
+						return saveError(cb, err);
+					}
+
+					return savePersisted(cb, saveOptions, getInstanceData());
+				});
 			}
 		});
 	};
 	var afterSave = function (cb, create, err) {
 		emitEvent("save", err, instance);
-		if(create) {
+		if (create) {
 			Hook.trigger(instance, opts.hooks.afterCreate, !err);
 		}
 		Hook.trigger(instance, opts.hooks.afterSave, !err);
@@ -134,67 +132,82 @@ function Instance(Model, opts) {
 			saveInstanceExtra(cb);
 		}
 	};
-	var saveNew = function (cb, saveOptions, data) {
-		var next = afterSave.bind(this, cb, true);
+	var getInstanceData = function () {
+		var data = {};
+		for (var k in opts.data) {
+			if (!opts.data.hasOwnProperty(k)) continue;
 
-		Hook.wait(instance, opts.hooks.beforeCreate, function (err) {
-			if (err) {
-				return saveError(cb, err);
+			if (Model.properties[k]) {
+				data[k] = Property.validate(opts.data[k], Model.properties[k]);
+				if (opts.driver.propertyToValue) {
+					data[k] = opts.driver.propertyToValue(data[k], Model.properties[k]);
+				}
+			} else {
+				data[k] = opts.data[k];
 			}
-			Hook.wait(instance, opts.hooks.beforeSave, function (err) {
+		}
+		return data;
+	};
+	var waitHooks = function (hooks, next) {
+		var nextHook = function () {
+			if (hooks.length === 0) {
+				return next();
+			}
+			Hook.wait(instance, opts.hooks[hooks.shift()], function (err) {
 				if (err) {
-					return saveError(cb, err);
+					return next(err);
 				}
 
-				opts.driver.insert(opts.table, data, opts.keys, function (save_err, info) {
-					if (save_err) {
-						return saveError(cb, save_err);
-					}
+				return nextHook();
+			});
+		};
 
-					opts.changes.length = 0;
-					for (var i = 0; i < opts.keys.length; i++) {
-						opts.data[opts.keys[i]] = info.hasOwnProperty(opts.keys[i]) ? info[opts.keys[i]] : data[opts.keys[i]];
-					}
-					opts.is_new = false;
+		return nextHook();
+	};
+	var saveNew = function (cb, saveOptions, data) {
+		var next = afterSave.bind(this, cb, true);
 
-					if (saveOptions.saveAssociations === false) {
-						return next();
-					}
+		opts.driver.insert(opts.table, data, opts.keys, function (save_err, info) {
+			if (save_err) {
+				return saveError(cb, save_err);
+			}
 
-					return saveAssociations(next);
-				});
-			});
+			opts.changes.length = 0;
+			for (var i = 0; i < opts.keys.length; i++) {
+				opts.data[opts.keys[i]] = info.hasOwnProperty(opts.keys[i]) ? info[opts.keys[i]] : data[opts.keys[i]];
+			}
+			opts.is_new = false;
+
+			if (saveOptions.saveAssociations === false) {
+				return next();
+			}
+
+			return saveAssociations(next);
 		});
 	};
 	var savePersisted = function (cb, saveOptions, data) {
 		var next = afterSave.bind(this, cb, false);
 
-		Hook.wait(instance, opts.hooks.beforeSave, function (err) {
-			if (err) {
-				return saveError(cb, err);
-			}
+		var changes = {}, conditions = {};
+		for (var i = 0; i < opts.changes.length; i++) {
+			changes[opts.changes[i]] = data[opts.changes[i]];
+		}
+		for (i = 0; i < opts.keys.length; i++) {
+			conditions[opts.keys[i]] = data[opts.keys[i]];
+		}
 
-			var changes = {}, conditions = {};
-			for (var i = 0; i < opts.changes.length; i++) {
-				changes[opts.changes[i]] = data[opts.changes[i]];
+		opts.driver.update(opts.table, changes, conditions, function (save_err) {
+			if (save_err) {
+				return saveError(cb, save_err);
 			}
-			for (i = 0; i < opts.keys.length; i++) {
-				conditions[opts.keys[i]] = data[opts.keys[i]];
-			}
-
-			opts.driver.update(opts.table, changes, conditions, function (save_err) {
-				if (save_err) {
-					return saveError(cb, save_err);
-				}
 
-				opts.changes.length = 0;
+			opts.changes.length = 0;
 
-				if (saveOptions.saveAssociations === false) {
-					return next();
-				}
+			if (saveOptions.saveAssociations === false) {
+				return next();
+			}
 
-				return saveAssociations(next);
-			});
+			return saveAssociations(next);
 		});
 	};
 	var saveAssociations = function (cb) {

From eca145c1c18791769c2e260f5beafd9225ce72b9 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 11 Jul 2013 22:11:39 +0100
Subject: [PATCH 0660/1246] Updates hooks test to check issue #223 doesn't
 happen again

---
 test/integration/hook.js | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/test/integration/hook.js b/test/integration/hook.js
index c6fc9993..7be91a16 100644
--- a/test/integration/hook.js
+++ b/test/integration/hook.js
@@ -134,7 +134,13 @@ describe("Hook", function() {
 					items.should.have.property("length", 1);
 					items[0].name.should.equal("Jane Doe");
 
-					return done();
+					// ensure it was really saved
+					Person.get(items[0].id, function (err, Item) {
+						should.equal(err, null);
+						Item.name.should.equal("Jane Doe");
+
+						return done();
+					});
 				});
 			});
 		});
@@ -212,6 +218,32 @@ describe("Hook", function() {
 			});
 		});
 
+		describe("when setting properties", function () {
+			before(setup({
+				beforeSave : function () {
+					this.name = "Jane Doe";
+				}
+			}));
+
+			it("should not be discarded", function (done) {
+				Person.create([{ }], function (err, items) {
+					should.equal(err, null);
+
+					items.should.be.a("object");
+					items.should.have.property("length", 1);
+					items[0].name.should.equal("Jane Doe");
+
+					// ensure it was really saved
+					Person.get(items[0].id, function (err, Item) {
+						should.equal(err, null);
+						Item.name.should.equal("Jane Doe");
+
+						return done();
+					});
+				});
+			});
+		});
+
 		describe("if hook method has 1 argument", function () {
 			var beforeSave = false;
 

From fab2a7267b3ed641929d47201dfd9a8619d1373a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 12 Jul 2013 17:58:57 +0100
Subject: [PATCH 0661/1246] Updates Readme about Travis CI node test versions

Removes node v0.4.x
---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 9fa9ded8..6e16f418 100755
--- a/Readme.md
+++ b/Readme.md
@@ -12,7 +12,7 @@ npm install orm
 
 ## Node.js Version Support
 
-Tests are done using [Travis CI](https://travis-ci.org/) for node versions 0.4.x, 0.6.x, 0.8.x and 0.10.x. If you want you can run
+Tests are done using [Travis CI](https://travis-ci.org/) for node versions `0.6.x`, `0.8.x` and `0.10.x`. If you want you can run
 tests locally.
 
 ```sh

From c1f3341e54935b1749be304e82d3765c1241dc91 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 12 Jul 2013 22:26:41 +0100
Subject: [PATCH 0662/1246] Updates 'make cov' to use new integration test
 folder

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2fb511e4..41a4469e 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ cov:
 	jscoverage lib lib-cov
 	mv package.json test/support/
 	cp test/support/coverage-package.json package.json
-	ORM_PROTOCOL=mysql mocha -R html-cov test/integration2/ > test/coverage.html
+	ORM_PROTOCOL=mysql mocha -R html-cov test/integration/ > test/coverage.html
 	mv test/support/package.json .
 
 .PHONY: test

From 5af679ac23aa1abff2c844836aea45bd9ce6f8ae Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 12 Jul 2013 22:27:12 +0100
Subject: [PATCH 0663/1246] Removes old test common methods for creating tables
 and inserting data

---
 test/common.js | 274 -------------------------------------------------
 1 file changed, 274 deletions(-)

diff --git a/test/common.js b/test/common.js
index f18ce8ef..4febb93c 100644
--- a/test/common.js
+++ b/test/common.js
@@ -80,277 +80,3 @@ common.getConnectionString = function () {
 	}
 	return url;
 };
-
-common.getModelProperties = function () {
-	return {
-		name: { type: "text", defaultValue: "test_default_value" }
-	};
-};
-
-common.createModelTable = function (table, db, cb) {
-	switch (this.protocol()) {
-		case "postgres":
-		case "redshift":
-			db.query("CREATE TEMPORARY TABLE " + table + " (id SERIAL PRIMARY KEY, name VARCHAR(100) NOT NULL)", cb);
-			break;
-		case "sqlite":
-			db.run("DROP TABLE IF EXISTS " + table, function () {
-				db.run("CREATE TABLE " + table + " (id INTEGER NOT NULL, name VARCHAR(100) NOT NULL, PRIMARY KEY(id))", cb);
-			});
-			break;
-		default:
-			db.query("CREATE TEMPORARY TABLE " + table + " (id BIGINT NOT NULL PRIMARY KEY AUTO_INCREMENT, name VARCHAR(100) NOT NULL)", cb);
-			break;
-	}
-};
-
-common.createModel2Table = function (table, db, cb) {
-	switch (this.protocol()) {
-		case "postgres":
-		case "redshift":
-			db.query("CREATE TEMPORARY TABLE " + table + " (id SERIAL PRIMARY KEY, name VARCHAR(100) NOT NULL, assoc_id BIGINT NOT NULL)", cb);
-			break;
-		case "sqlite":
-			db.run("DROP TABLE IF EXISTS " + table, function () {
-				db.run("CREATE TEMPORARY TABLE " + table + " (id SERIAL PRIMARY KEY, name VARCHAR(100) NOT NULL, assoc_id BIGINT NOT NULL)", cb);
-			});
-			break;
-		default:
-			db.query("CREATE TEMPORARY TABLE " + table + " (id BIGINT NOT NULL PRIMARY KEY AUTO_INCREMENT, name VARCHAR(100) NOT NULL, assoc_id BIGINT NOT NULL)", cb);
-			break;
-	}
-};
-
-common.createModelAssocUpDownTable = function (table, db, cb) {
-	switch (this.protocol()) {
-		case "postgres":
-		case "redshift":
-			db.query("CREATE TEMPORARY TABLE " + table + " (id SERIAL PRIMARY KEY, name VARCHAR(100) NOT NULL, assocup_id BIGINT NOT NULL, assocdown_id BIGINT NOT NULL)", cb);
-			break;
-		case "sqlite":
-			db.run("DROP TABLE IF EXISTS " + table, function () {
-				db.run("CREATE TEMPORARY TABLE " + table + " (id SERIAL PRIMARY KEY, name VARCHAR(100) NOT NULL, assocup_id BIGINT NOT NULL, assocdown_id BIGINT NOT NULL)", cb);
-			});
-			break;
-		default:
-			db.query("CREATE TEMPORARY TABLE " + table + " (id BIGINT NOT NULL PRIMARY KEY AUTO_INCREMENT, name VARCHAR(100) NOT NULL, assocup_id BIGINT NOT NULL, assocdown_id BIGINT NOT NULL)", cb);
-			break;
-	}
-};
-
-common.createKeysModelTable = function (table, db, keys, cb) {
-	switch (this.protocol()) {
-		case "postgres":
-		case "redshift":
-			db.query("CREATE TEMPORARY TABLE " + table + " (" + keys.join(" BIGINT NOT NULL, ") + " BIGINT NOT NULL, name VARCHAR(100) NOT NULL, PRIMARY KEY (" + keys.join(", ") + "))", cb);
-			break;
-		case "sqlite":
-			db.run("DROP TABLE IF EXISTS " + table, function () {
-				db.run("CREATE TEMPORARY TABLE " + table + " (" + keys.join(" BIGINT NOT NULL, ") + " BIGINT NOT NULL, name VARCHAR(100) NOT NULL, PRIMARY KEY (" + keys.join(", ") + "))", cb);
-			});
-			break;
-		default:
-			db.query("CREATE TEMPORARY TABLE " + table + " (" + keys.join(" BIGINT NOT NULL, ") + " BIGINT NOT NULL, name VARCHAR(100) NOT NULL, PRIMARY KEY (" + keys.join(", ") + "))", cb);
-			break;
-	}
-};
-
-common.createModelAssocTable = function (table, assoc, db, cb) {
-	switch (this.protocol()) {
-		case "postgres":
-		case "redshift":
-			db.query("CREATE TEMPORARY TABLE " + table + "_" + assoc + " (" + table + "_id BIGINT NOT NULL, " + assoc + "_id BIGINT NOT NULL, extra_field BIGINT)", cb);
-			break;
-		case "sqlite":
-			db.run("DROP TABLE IF EXISTS " + table + "_" + assoc, function () {
-				db.run("CREATE TABLE " + table + "_" + assoc + " (" + table + "_id INTEGER NOT NULL, " + assoc + "_id INTEGER NOT NULL, extra_field INTEGER)", cb);
-			});
-			break;
-		default:
-			db.query("CREATE TEMPORARY TABLE " + table + "_" + assoc + " (" + table + "_id BIGINT NOT NULL, " + assoc + "_id BIGINT NOT NULL, extra_field BIGINT)", cb);
-			break;
-	}
-};
-
-common.insertModelData = function (table, db, data, cb) {
-	var query = [], i;
-
-	switch (this.protocol()) {
-		case "postgres":
-		case "redshift":
-		case "mysql":
-			query = [];
-
-			for (i = 0; i < data.length; i++) {
-				query.push(data[i].id + ", '" + data[i].name + "'");
-			}
-
-			db.query("INSERT INTO " + table + " VALUES (" + query.join("), (") + ")", cb);
-			break;
-		case "sqlite":
-			var pending = data.length;
-			for (i = 0; i < data.length; i++) {
-				db.run("INSERT INTO " + table + " VALUES (" + data[i].id + ", '" + data[i].name + "')", function () {
-					pending -= 1;
-
-					if (pending === 0) {
-						return cb();
-					}
-				});
-			}
-			break;
-	}
-};
-
-common.insertModel2Data = function (table, db, data, cb) {
-	var query = [], i;
-
-	switch (this.protocol()) {
-		case "postgres":
-		case "redshift":
-		case "mysql":
-			query = [];
-
-			for (i = 0; i < data.length; i++) {
-				query.push(data[i].id + ", '" + data[i].name + "', " + data[i].assoc);
-			}
-
-			db.query("INSERT INTO " + table + " VALUES (" + query.join("), (") + ")", cb);
-			break;
-		case "sqlite":
-			var pending = data.length;
-			for (i = 0; i < data.length; i++) {
-				db.run("INSERT INTO " + table + " VALUES (" + data[i].id + ", '" + data[i].name + "', " + data[i].assoc + ")", function () {
-					pending -= 1;
-
-					if (pending === 0) {
-						return cb();
-					}
-				});
-			}
-			break;
-	}
-};
-
-common.insertModelAssocUpDownData = function (table, db, data, cb) {
-	var query = [], i;
-
-	switch (this.protocol()) {
-		case "postgres":
-		case "redshift":
-		case "mysql":
-			query = [];
-
-			for (i = 0; i < data.length; i++) {
-				query.push(data[i].id + ", '" + data[i].name + "', " + data[i].assocup + ", " + data[i].assocdown);
-			}
-
-			db.query("INSERT INTO " + table + " VALUES (" + query.join("), (") + ")", cb);
-			break;
-		case "sqlite":
-			var pending = data.length;
-			for (i = 0; i < data.length; i++) {
-				db.run("INSERT INTO " + table + " VALUES (" + data[i].id + ", '" + data[i].name + "', " + data[i].assocup + ", " + data[i].assocdown + ")", function () {
-					pending -= 1;
-
-					if (pending === 0) {
-						return cb();
-					}
-				});
-			}
-			break;
-	}
-};
-
-common.insertKeysModelData = function (table, db, data, cb) {
-	var query = [], i, k, keys, vals, pending;
-
-	for (i = 0; i < data.length; i++) {
-		keys = [];
-		vals = [];
-
-		for (k in data[i]) {
-			keys.push(k);
-			vals.push(data[i][k]);
-		}
-
-		query.push("INSERT INTO " + table + " (" + keys.join(", ") + ") VALUES ('" + vals.join("', '") + "')");
-	}
-
-	pending = query.length;
-
-	for (i = 0; i < query.length; i++) {
-		switch (this.protocol()) {
-			case "postgres":
-			case "redshift":
-			case "mysql":
-				db.query(query[i], function () {
-					if (--pending === 0) {
-						return cb();
-					}
-				});
-				break;
-			case "sqlite":
-				db.run(query[i], function () {
-					if (--pending === 0) {
-						return cb();
-					}
-				});
-				break;
-		}
-	}
-};
-
-common.insertModelAssocData = function (table, db, data, cb) {
-	var query = [], i;
-
-	switch (this.protocol()) {
-		case "postgres":
-		case "redshift":
-		case "mysql":
-			query = [];
-
-			for (i = 0; i < data.length; i++) {
-				if (data[i].length < 3) {
-					data[i].push(0);
-				}
-				query.push(data[i].join(", "));
-			}
-
-			db.query("INSERT INTO " + table + " VALUES (" + query.join("), (") + ")", cb);
-			break;
-		case "sqlite":
-			var pending = data.length;
-			for (i = 0; i < data.length; i++) {
-				if (data[i].length < 3) {
-					data[i].push(0);
-				}
-				db.run("INSERT INTO " + table + " VALUES (" + data[i].join(", ") + ")", function () {
-					pending -= 1;
-
-					if (pending === 0) {
-						return cb();
-					}
-				});
-			}
-			break;
-	}
-};
-
-common.dropSync = function (models, done) {
-	if (!Array.isArray(models)) {
-		models = [models];
-	}
-
-	async.eachSeries(models, function(item, cb) {
-		item.drop(function(err) {
-			if (err) throw err
-			item.sync(function(err) {
-				if (err) throw err
-				cb();
-			});
-		});
-	}, function() {
-		done();
-	});
-};

From d89c9f5735b88d4807d4efe0c7e6cdab28930705 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sun, 14 Jul 2013 15:10:52 +0100
Subject: [PATCH 0664/1246] sql-query@0.1.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0761c71f..aa088ee1 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
   },
   "analyse"     : false,
   "dependencies": {
-    "sql-query" : "0.1.3",
+    "sql-query" : "0.1.4",
     "hat"       : "0.0.3",
     "lodash"    : "1.3.1"
   },

From 61a078416557298f3dcff651947d3fbb946f7ccb Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 15 Jul 2013 11:23:53 +0100
Subject: [PATCH 0665/1246] sql-query@0.1.5

Because of dresende/node-sql-query#15
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index aa088ee1..6217ef09 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
   },
   "analyse"     : false,
   "dependencies": {
-    "sql-query" : "0.1.4",
+    "sql-query" : "0.1.5",
     "hat"       : "0.0.3",
     "lodash"    : "1.3.1"
   },

From 1f385197b67eaac20979b973d4ef526771cff3d5 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <benjamin.pannell@gmail.com>
Date: Sat, 13 Jul 2013 19:06:27 +0200
Subject: [PATCH 0666/1246] Intelligent association typing and multikey support

Should allow associations to automatically create foreign keys of the
same time as the primary key(s) of the model they reference and
also allowing associations to automatically create the
required foreign keys for models which have multiple primary key fields.

This change requires at least version 0.1.5 of node-sql-query to support
the multi-field join functionality used.

There is a change in the way chained finds are executed for hasAccessors,
meaning that instead of passing the id of the object you pass the entire
object. This is to support objects with multiple primary key identifiers.

```js
Model.find().hasSomething(TheSomething).all(function(err, somethings) {

});
```
---
 .gitignore                           |   2 +
 Changelog.md                         |   2 +-
 Readme.md                            |  13 ++-
 lib/Associations/Extend.js           |  90 ++++++++++++++--
 lib/Associations/Many.js             | 151 ++++++++++++++++++++-------
 lib/Associations/One.js              | 139 ++++++++++++++++++++----
 lib/ChainFind.js                     |  23 +++-
 lib/Drivers/DDL/mysql.js             |  40 +++++--
 lib/Drivers/DDL/postgres.js          |  50 +++++----
 lib/Drivers/DDL/sqlite.js            |  39 +++++--
 lib/Instance.js                      |  28 ++++-
 lib/Model.js                         |  14 ++-
 lib/Settings.js                      |   2 +-
 package.json                         |   5 +-
 test/integration/model-find-chain.js |   6 +-
 15 files changed, 480 insertions(+), 124 deletions(-)

diff --git a/.gitignore b/.gitignore
index 292e7d58..c1d40255 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 *.sublime-*
+*.njsproj
+*.nodevsdbg
 .DS_Store
 node_modules
 test/config.js
diff --git a/Changelog.md b/Changelog.md
index 65daa013..58033970 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,4 +1,4 @@
-### v2.0.15 - 10 Jul 2013
+### v2.0.15 - 10 July 2013
 
 - Support for 'point' type as a property (#221)
 - .call() in aggregates for generic functions (#204)
diff --git a/Readme.md b/Readme.md
index 6e16f418..a7ae32f9 100755
--- a/Readme.md
+++ b/Readme.md
@@ -357,6 +357,17 @@ var Pet = db.define("pet", {
 
 **Pet** model will have 2 columns, an `UID` and a `name`.
 
+It is also possible to have multiple IDs for a model in the database, this is done by specifying an array of IDs to use.
+
+```js
+var Person = db.define("person", {
+	firstname: String,
+	lastname: String
+}, {
+	id: ['firstname', 'lastname']
+});
+```
+
 Other options:
 
 - `cache` : (default: `true`) Set it to `false` to disable Instance cache ([Singletons](#singleton)) or set a timeout value (in seconds);
@@ -922,7 +933,7 @@ Animal.hasOne("owner", Person, { required: true });
 If you prefer to use another name for the field (owner_id) you can change this parameter in the settings.
 
 ```js
-db.settings.set("properties.association_key", "id_{name}"); // {name} will be replaced by 'owner' in this case
+db.settings.set("properties.association_key", "{field}_{name}"); // {name} will be replaced by 'owner' and {field} will be replaced by 'id' in this case
 ```
 
 **Note: This has to be done before the association is specified.**
diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index b3ae2073..dc37d442 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -12,7 +12,7 @@ exports.prepare = function (db, Model, associations, association_properties, mod
 			reversed       : opts.reversed,
 			autoFetch      : opts.autoFetch || false,
 			autoFetchLimit : opts.autoFetchLimit || 2,
-			field          : opts.field || Model.settings.get("properties.association_key").replace("{name}", Model.table),
+			field          : wrapFieldObject(opts.field, Model, []) || formatField(Model, Model.table, false),
 			getAccessor    : opts.getAccessor || ("get" + assocName),
 			setAccessor    : opts.setAccessor || ("set" + assocName),
 			hasAccessor    : opts.hasAccessor || ("has" + assocName),
@@ -21,10 +21,10 @@ exports.prepare = function (db, Model, associations, association_properties, mod
 
 		association.model = db.define(Model.table + "_" + name, properties, {
 			id        : null,
-			keys      : [ association.field ],
+			keys      : getKeys(association.field),
 			extension : true
 		});
-		association.model.hasOne(Model.table, Model, { extension: true });
+		association.model.hasOne(Model.table, Model, { extension: true, field: association.field });
 
 		associations.push(association);
 
@@ -57,13 +57,80 @@ exports.autoFetch = function (Instance, associations, opts, cb) {
 	}
 };
 
+function getKeys(arr) {
+	var keys = [];
+	for (k in arr)
+		keys.push(k);
+	return keys;
+}
+
+function wrapFieldObject(obj, Model, alternatives) {
+    if (!obj) {
+        obj = Model.settings.get("properties.association_key").replace("{name}", Model.table.toLowerCase()).replace("{field}", "id");
+    }
+    isvalid = false;
+    for (k in obj) {
+        if (!/[0-9]+/.test(k) && obj.hasOwnProperty(k)) isvalid = true;
+    }
+    if (isvalid) return obj;
+
+    newobj = {};
+    newobj[obj] = alternatives[obj] || alternatives[Model.keys[0]] || { type: 'number', unsigned: true, rational: false };
+    return newobj;
+}
+
+function formatField(Model, name, required) {
+	var fields = {};
+	var keys = ["id"];
+	if (Model.keys instanceof Array) {
+		keys = Model.keys;
+	}
+	else {
+		keys = [Model.keys];
+	}
+
+	for (var i = 0; i < keys.length; i++) {
+		var fieldName = Model.settings.get("properties.association_key").replace("{name}", name.toLowerCase()).replace("{field}", Model.keys[i]);
+		var fieldOpts = {
+			type: "number",
+			unsigned: true,
+			size: 4
+		};
+
+		if (Model.properties.hasOwnProperty(Model.keys[i])) {
+			var p = Model.properties[Model.keys[i]];
+			fieldOpts = {
+				type: p.type || "number",
+				size: p.size || 4,
+				rational: p.rational || false,
+				unsigned: p.unsigned || true,
+				time: p.time || false,
+				big: p.big || false,
+				values: p.values || null
+			};
+		};
+
+		fields[fieldName] = fieldOpts;
+	}
+	
+	return fields;
+}
+
+function makeConditions(Instance, Model) {
+	var conditions = [];
+	for (i = 0; i < Model.keys.length; i++) {
+		conditions.push(Instance[Model.keys[i]]);
+	}
+	return conditions;
+}
+
 function extendInstance(Model, Instance, Driver, association, opts) {
 	Object.defineProperty(Instance, association.hasAccessor, {
 		value : function (cb) {
 			if (!Instance[Model.id]) {
 				cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension"));
 			} else {
-				association.model.get(Instance[Model.id], function (err, extension) {
+				association.model.get(makeConditions(Instance, Model), function (err, extension) {
 					return cb(err, !err && extension ? true : false);
 				});
 			}
@@ -72,11 +139,11 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 		enumerable : false
 	});
 	Object.defineProperty(Instance, association.getAccessor, {
-		value : function (cb) {
+		value: function (cb) {
 			if (!Instance[Model.id]) {
 				cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension"));
 			} else {
-				association.model.get(Instance[Model.id], cb);
+				association.model.get(makeConditions(Instance, Model), cb);
 			}
 			return this;
 		},
@@ -94,7 +161,11 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 						return cb(err);
 					}
 
-					Extension[association.field] = Instance[Model.id];
+					var fields = getKeys(association.field);
+					for (i = 0; i < Model.keys.length; i++) {
+						Extension[fields[i]] = Instance[Model.keys[i]];
+					}
+
 					Extension.save(cb);
 				});
 			});
@@ -108,7 +179,10 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 				cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension"));
 			} else {
 				var conditions = {};
-				conditions[association.field] = Instance[Model.id];
+				var fields = getKeys(association.field);
+				for (i = 0; i < Model.keys.length; i++) {
+					conditions[fields[i]] = Instance[Model.keys[i]];
+				}
 
 				association.model.find(conditions, function (err, extensions) {
 					if (err) {
diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 228b7b98..d2dc9847 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -42,7 +42,7 @@ exports.prepare = function (Model, associations) {
 				props[k] = Property.normalize(props[k], Model.settings);
 			}
 		}
-
+        
 		var assocName = opts.name || ucfirst(name);
 		var association = {
 			name           : name,
@@ -51,16 +51,17 @@ exports.prepare = function (Model, associations) {
 			autoFetch      : opts.autoFetch || false,
 			autoFetchLimit : opts.autoFetchLimit || 2,
 			// I'm not sure the next key is used..
-			field          : opts.field || Model.settings.get("properties.association_key").replace("{name}", name),
+			field          : opts.field || formatField(Model, name, true),
 			mergeTable     : opts.mergeTable || (Model.table + "_" + name),
-			mergeId        : opts.mergeId || Model.settings.get("properties.association_key").replace("{name}", Model.table),
-			mergeAssocId   : opts.mergeAssocId || Model.settings.get("properties.association_key").replace("{name}", name),
+			mergeId        : wrapFieldObject(opts.mergeId, OtherModel, Model.table, OtherModel.properties) || formatField(OtherModel, Model.table, true),
+			mergeAssocId   : wrapFieldObject(opts.mergeAssocId, Model, name, Model.properties) || formatField(Model, name, true),
 			getAccessor    : opts.getAccessor || ("get" + assocName),
 			setAccessor    : opts.setAccessor || ("set" + assocName),
 			hasAccessor    : opts.hasAccessor || ("has" + assocName),
 			delAccessor    : opts.delAccessor || ("remove" + assocName),
 			addAccessor    : opts.addAccessor || ("add" + assocName)
 		};
+
 		associations.push(association);
 
 		if (opts.reverse) {
@@ -103,7 +104,92 @@ exports.autoFetch = function (Instance, associations, opts, cb) {
 	}
 };
 
+function getKeys(arr) {
+	var keys = [];
+	for (k in arr)
+		keys.push(k);
+	return keys;
+}
+
+function wrapFieldObject(obj, Model, altName, alternatives) {
+    if (!obj) {
+        obj = Model.settings.get("properties.association_key").replace("{name}", altName.toLowerCase()).replace("{field}", "id");
+    }
+    isvalid = false;
+    for (k in obj) {
+        if (!/[0-9]+/.test(k) && obj.hasOwnProperty(k)) isvalid = true;
+    }
+    if (isvalid) return obj;
+
+    newobj = {};
+    newobj[obj] = alternatives[obj] || alternatives[Model.keys[0]] || { type: 'number', unsigned: true, rational: false };
+    return newobj;
+}
+
+function formatField(Model, name, required) {
+	var fields = {};
+	var keys = ["id"];
+	if (Model.keys instanceof Array) {
+		keys = Model.keys;
+	}
+	else {
+		keys = [Model.keys];
+	}
+
+	for (var i = 0; i < keys.length; i++) {
+		var fieldName = Model.settings.get("properties.association_key").replace("{name}", name.toLowerCase()).replace("{field}", Model.keys[i]);
+		var fieldOpts = {
+			type: "number",
+			unsigned: true,
+			size: 4
+		};
+
+		if (Model.properties.hasOwnProperty(Model.keys[i])) {
+			var p = Model.properties[Model.keys[i]];
+			fieldOpts = {
+				type: p.type || "number",
+				size: p.size || 4,
+				rational: p.rational || false,
+				unsigned: p.unsigned || true,
+				time: p.time || false,
+				big: p.big || false,
+				values: p.values || null
+			};
+		};
+
+		fields[fieldName] = fieldOpts;
+	}
+
+	return fields;
+}
+
 function extendInstance(Model, Instance, Driver, association, opts) {
+	function populateConditions(Model, fields, source, target) {
+		var fKeys = getKeys(fields);
+		for (i = 0; i < Model.keys.length; i++) {
+			target[fKeys[i]] = source[Model.keys[i]];
+		}
+	}
+
+	function populateConditionsPush(Model, fields, source, target) {
+		var fKeys = getKeys(fields);
+		for (i = 0; i < Model.keys.length; i++) {
+		    if (typeof target[fKeys[i]] != 'undefined') {
+		        target[fKeys[i]].push(source[Model.keys[i]]);
+		    } else {
+		        target[fKeys[i]] = [source[Model.keys[i]]];
+		    }
+		}
+	}
+
+	function getIDs() {
+		var ids = [];
+		for (k in Model.keys) {
+			ids.push(Instance[k]);
+		}
+		return ids;
+	}
+
 	if (Model.settings.get("instance.cascadeRemove")) {
 		Instance.on("beforeRemove", function () {
 			Instance[association.delAccessor]();
@@ -117,28 +203,27 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 			var conditions = {}, options = {};
 
 			options.__merge = {
-				from: { table: association.mergeTable, field: association.mergeAssocId },
-				to: { table: association.model.table, field: association.model.id },
-				where: [ association.mergeTable, {} ]
+				from:   { table: association.mergeTable, field: getKeys(association.mergeAssocId) },
+				to:     { table: association.model.table, field: association.model.keys },
+				where:  [ association.mergeTable, {} ]
 			};
 			options.extra = association.props;
 			options.extra_info = {
 				table: association.mergeTable,
-				id: Instance[Model.id],
-				id_prop: association.mergeId,
-				assoc_prop: association.mergeAssocId
+				id: getIDs(),
+				id_prop: getKeys(association.mergeId),
+				assoc_prop: getKeys(association.mergeAssocId)
 			};
 
-			options.__merge.where[1][association.mergeId] = Instance[Model.id];
+			populateConditions(Model, association.mergeId, Instance, options.__merge.where[1]);
 
 			if (Instances.length) {
 				if (Array.isArray(Instances[0])) {
 					Instances = Instances[0];
 				}
-				options.__merge.where[1][association.mergeAssocId] = [];
 
 				for (var i = 0; i < Instances.length; i++) {
-					options.__merge.where[1][association.mergeAssocId].push(Instances[i][association.model.id]);
+					populateConditionsPush(association.model, association.mergeAssocId, Instances[i], options.__merge.where[1]);
 				}
 			}
 
@@ -193,16 +278,16 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 			}
 
 			options.__merge = {
-				from  : { table: association.mergeTable, field: association.mergeAssocId },
-				to    : { table: association.model.table, field: association.model.id },
+				from  : { table: association.mergeTable, field: getKeys(association.mergeAssocId) },
+				to    : { table: association.model.table, field: association.model.keys },
 				where : [ association.mergeTable, {} ]
 			};
 			options.extra = association.props;
 			options.extra_info = {
 				table: association.mergeTable,
-				id: Instance[Model.id],
-				id_prop: association.mergeId,
-				assoc_prop: association.mergeAssocId
+				id: getIDs(),
+				id_prop: getKeys(association.mergeId),
+				assoc_prop: getKeys(association.mergeAssocId)
 			};
 			if (order !== null) {
 				options.order = order;
@@ -212,12 +297,12 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 				conditions = {};
 			}
 
-			options.__merge.where[1][association.mergeId] = Instance[Model.id];
+			populateConditions(Model, association.mergeId, Instance, options.__merge.where[1]);
 
 			if (cb === null) {
 				return association.model.find(conditions, options);
 			}
-
+			
 			association.model.find(conditions, options, cb);
 			return this;
 		},
@@ -227,7 +312,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 		value: function () {
 			var Instances = Array.prototype.slice.apply(arguments);
 			var cb        = (Instances.length &&
-			                 typeof Instances[Instances.length - 1] == "function" ? Instances.pop() : noOperation);
+							 typeof Instances[Instances.length - 1] == "function" ? Instances.pop() : noOperation);
 
 			if (Instances.length === 0) {
 				throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "No associations defined");
@@ -256,27 +341,19 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 			var Associations = Array.prototype.slice.apply(arguments);
 			var cb = (typeof Associations[Associations.length - 1] == "function" ? Associations.pop() : noOperation);
 			var conditions = {};
-			var associationIds = [];
 			var run = function () {
 				if (Associations.length === 0) {
 					return Driver.remove(association.mergeTable, conditions, cb);
 				}
-
-				for (var i = 0; i < Associations.length; i++) {
-					if (Associations[i][association.model.id]) {
-						associationIds.push(Associations[i][association.model.id]);
-					}
-				}
-
-				if (associationIds.length === 0) {
-					return cb(null);
+				
+				for (var i = 0; i < Associations.length; i++) {				    
+					populateConditionsPush(association.model, association.mergeAssocId, Associations[i], conditions);
 				}
 
-				conditions[association.mergeAssocId] = associationIds;
-
 				Driver.remove(association.mergeTable, conditions, cb);
 			};
-			conditions[association.mergeId] = Instance[Model.id];
+            
+			populateConditions(Model, association.mergeId, Instance, conditions);
 
 			if (this.saved()) {
 				run();
@@ -312,13 +389,13 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 						}
 
 						var data = {};
-						data[association.mergeId] = Instance[Model.id];
-						data[association.mergeAssocId] = Association[association.model.id];
+						populateConditions(Model, association.mergeId, Instance, data);
+						populateConditions(association.model, association.mergeAssocId, Association, data);
 
 						for (var k in opts) {
 							data[k] = opts[k];
 						}
-
+                        
 						Driver.insert(association.mergeTable, data, null, function (err) {
 							if (err) {
 								return cb(err);
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index 449c9403..58bf9fcb 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -34,7 +34,9 @@ exports.prepare = function (Model, associations, association_properties, model_f
 		assocName = ucfirst(association.name);
 
 		if (!association.hasOwnProperty("field")) {
-			association.field = Model.settings.get("properties.association_key").replace("{name}", association.name.toLowerCase());
+		    association.field = formatField(Model, association.name, association.required, association.reversed);
+		} else if(!association.extension) {
+		    association.field = wrapFieldObject(association.field, Model, Model.properties);
 		}
 		for (var k in Accessors) {
 			if (!association.hasOwnProperty(k + "Accessor")) {
@@ -43,9 +45,11 @@ exports.prepare = function (Model, associations, association_properties, model_f
 		}
 
 		associations.push(association);
-		association_properties.push(association.field);
-		if(!association.reversed) {
-			model_fields.push(association.field);
+		for (k in association.field) {
+		    association_properties.push(k);
+		    if (!association.reversed) {
+		        model_fields.push(k);
+		    }
 		}
 
 		if (association.reverse) {
@@ -80,8 +84,8 @@ exports.prepare = function (Model, associations, association_properties, model_f
 			}
 
 			options.__merge = {
-				from  : { table: association.model.table, field: association.model.id },
-				to    : { table: Model.table, field: association.field },
+				from  : { table: association.model.table, field: association.model.keys },
+				to    : { table: Model.table, field: getKeys(association.field) },
 				where : [ association.model.table, conditions ],
 				table : Model.table
 			};
@@ -122,6 +126,97 @@ exports.autoFetch = function (Instance, associations, opts, cb) {
 	}
 };
 
+function formatField(Model, name, required, reversed) {
+	var fields = {};
+	var keys = ["id"];
+	if (Model.keys instanceof Array) {
+		keys = Model.keys;
+	}
+	else {
+		keys = [Model.keys];
+	}
+
+	for (var i = 0; i < keys.length; i++) {
+		var fieldName = reversed ? keys[i] : Model.settings.get("properties.association_key").replace("{name}", name.toLowerCase()).replace("{field}", keys[i]);
+		var fieldOpts = {
+			type: "number",
+			unsigned: true,
+            rational: false,
+			size: 4,
+			required: required
+		};
+
+		if (Model.properties.hasOwnProperty(Model.keys[i])) {
+			var p = Model.properties[Model.keys[i]];
+			fieldOpts = {
+				type: p.type || "number",
+				size: p.size || 4,
+				rational: p.rational || false,
+				unsigned: p.unsigned || true,
+				time: p.time || false,
+				big: p.big || false,
+				values: p.values || null,
+				required: required
+			};
+		};
+
+		fields[fieldName] = fieldOpts;
+	}
+
+	return fields;
+}
+
+
+function wrapFieldObject(obj, Model, alternatives) {
+    if (!obj) {
+        obj = Model.settings.get("properties.association_key").replace("{name}", Model.table.toLowerCase()).replace("{field}", "id");
+    }
+    isvalid = false;
+    for (k in obj) {
+        if (!/[0-9]+/.test(k) && obj.hasOwnProperty(k)) isvalid = true;
+    }
+    if (isvalid) return obj;
+
+    newobj = {};
+    newobj[obj] = alternatives[obj] || alternatives[Model.keys[0]] || { type: 'number', unsigned: true, rational: false };
+    return newobj;
+}
+
+function getKeys(arr) {
+    var keys = [];
+    for (k in arr) {
+        keys.push(k);
+    }
+    return keys;
+}
+
+function populateConditions(Model, fields, source, target) {
+    for (i = 0; i < Model.keys.length; i++) {
+        target[fields[i]] = source[Model.keys[i]];
+    }
+}
+
+function getConditions(model, fields, from) {
+    var conditions = {};
+    populateConditions(model, fields, from, conditions);
+    return conditions;
+}
+
+function getIDs(keys, from) {
+    var ids = [];
+    for (i = 0; i < keys.length; i++) {
+        ids.push(from[keys[i]]);
+    }
+    return ids;
+}
+
+function hasFields(fields, instance) {
+    for (i = 0; i < fields.length; i++) {
+        if (instance[fields[i]]) return true;
+    }
+    return false;
+}
+
 function extendInstance(Model, Instance, Driver, association, opts) {
 	Object.defineProperty(Instance, association.hasAccessor, {
 		value: function (opts, cb) {
@@ -130,8 +225,8 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 				opts = {};
 			}
 
-			if (Instance[association.field]) {
-				association.model.get(Instance[association.field], opts, function (err, instance) {
+			if (hasFields(getKeys(association.field), Instance)) {
+				association.model.get(getIDs(getKeys(association.field), Instance), opts, function (err, instance) {
 					return cb(err, instance ? true : false);
 				});
 			} else {
@@ -150,23 +245,21 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 			}
 
 			if (association.reversed) {
-				if (Instance[Model.id]) {
-					var conditions = {};
-					conditions[association.field] = Instance[Model.id];
-					association.model.find(conditions, opts, cb);
+				if (hasFields(Model.keys, Instance)) {
+				    association.model.find(getConditions(Model, getKeys(association.field), Instance), opts, cb);
 				} else {
 					cb(null);
 				}
 			} else {
-				if (Instance.isShell()) {
-					Model.get(Instance[Model.id], function (err, instance) {
-						if (err || !instance[association.field]) {
+			    if (Instance.isShell()) {
+					Model.get(getIDs(Model.keys, Instance), function (err, instance) {
+					    if (err || !hasFields(getKeys(association.field), instance)) {
 							return cb(null);
 						}
-						association.model.get(instance[association.field], opts, cb);
+						association.model.get(getIDs(getKeys(association.field), instance), opts, cb);
 					});
-				} else if (Instance[association.field]) {
-					association.model.get(Instance[association.field], opts, cb);
+				} else if (hasFields(getKeys(association.field), Instance)) {
+				    association.model.get(getIDs(getKeys(association.field), Instance), opts, cb);
 				} else {
 					cb(null);
 				}
@@ -184,7 +277,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 						return cb(err);
 					}
 
-					OtherInstance[association.field] = Instance[Model.id];
+					populateConditions(Model, getKeys(association.field), Instance, OtherInstance);
 
 					return OtherInstance.save({}, { saveAssociations: false }, cb);
 				});
@@ -194,7 +287,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 						return cb(err);
 					}
 
-					Instance[association.field] = OtherInstance[association.model.id];
+					populateConditions(association.model, getKeys(association.field), OtherInstance, Instance);
 
 					return Instance.save({}, { saveAssociations: false }, cb);
 				});
@@ -206,8 +299,10 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 	});
 	if (!association.reversed) {
 		Object.defineProperty(Instance, association.delAccessor, {
-			value: function (cb) {
-				Instance[association.field] = null;
+		    value: function (cb) {
+		        for (k in association.field) {
+		            Instance[k] = null;
+		        }
 				Instance.save(cb);
 
 				return this;
diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 53faafbb..0c481a48 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -157,12 +157,31 @@ function addChainMethod(chain, association, opts) {
 			opts.exists = [];
 		}
 		var conditions = {};
+        
+		var assocIds = Object.keys(association.mergeAssocId);
+		var ids = association.model.keys;
+		function mergeConditions(source) {
+		    for (i = 0; i < assocIds.length; i++) {
+		        if (typeof conditions[assocIds[i]] == 'undefined')
+		            conditions[assocIds[i]] = source[ids[i]];
+		        else if(Array.isArray(conditions[assocIds[i]]))
+		            conditions[assocIds[i]].push(source[ids[i]]);
+		        else
+		            conditions[assocIds[i]] = [conditions[assocIds[i]], source[ids[i]]];
+		    }
+		}
 
-		conditions[association.mergeAssocId] = value;
+		if (Array.isArray(value)) {
+		    for (i = 0; i < value.length; i++) {
+		        mergeConditions(value[i]);
+		    }
+		} else {
+		    mergeConditions(value);
+		}
 
 		opts.exists.push({
 			table      : association.mergeTable,
-			link       : [ association.mergeId, association.model.id ],
+			link       : [ Object.keys(association.mergeId), association.model.keys ],
 			conditions : conditions
 		});
 
diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index ada5322b..593a2e65 100755
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -59,10 +59,9 @@ exports.sync = function (driver, opts, cb) {
 	for (i = 0; i < opts.one_associations.length; i++) {
 		if (opts.one_associations[i].extension) continue;
 		if (opts.one_associations[i].reversed) continue;
-		definitions.push(
-			driver.query.escapeId(opts.one_associations[i].field) + " INT(11) UNSIGNED" +
-			(opts.one_associations[i].required ? ' NOT NULL' : '')
-		);
+		for (k in opts.one_associations[i].field) {
+			definitions.push(buildColumnDefinition(driver, k, opts.one_associations[i].field[k]));
+		}
 	}
 
 	for (k in opts.properties) {
@@ -72,11 +71,15 @@ exports.sync = function (driver, opts, cb) {
 			definitions.push("INDEX (" + driver.query.escapeId(k) + ")");
 		}
 	}
+	
 	for (i = 0; i < opts.one_associations.length; i++) {
 		if (opts.one_associations[i].extension) continue;
 		if (opts.one_associations[i].reversed) continue;
-		definitions.push("INDEX (" + driver.query.escapeId(opts.one_associations[i].field) + ")");
+		for (k in opts.one_associations[i].field) {
+			definitions.push("INDEX (" + driver.query.escapeId(k) + ")");
+		}
 	}
+
 	for (i = 0; i < opts.indexes.length; i++) {
 		definitions.push("INDEX (" + opts.indexes[i].split(/[,;]+/).map(function (el) {
 			return driver.query.escapeId(el);
@@ -93,14 +96,31 @@ exports.sync = function (driver, opts, cb) {
 	for (i = 0; i < opts.many_associations.length; i++) {
 		definitions = [];
 
-		definitions.push(driver.query.escapeId(opts.many_associations[i].mergeId) + " INT(11) UNSIGNED NOT NULL");
-		definitions.push(driver.query.escapeId(opts.many_associations[i].mergeAssocId) + " INT(11) UNSIGNED NOT NULL");
+		for (k in opts.many_associations[i].mergeId) {
+			definitions.push(buildColumnDefinition(driver, k, opts.many_associations[i].mergeId[k]));
+		}
+
+		for (k in opts.many_associations[i].mergeAssocId) {
+			definitions.push(buildColumnDefinition(driver, k, opts.many_associations[i].mergeAssocId[k]));
+		}
 
 		for (k in opts.many_associations[i].props) {
 			definitions.push(buildColumnDefinition(driver, k, opts.many_associations[i].props[k]));
 		}
 
-		definitions.push("INDEX (" + driver.query.escapeId(opts.many_associations[i].mergeId) + ", " + driver.query.escapeId(opts.many_associations[i].mergeAssocId) + ")");
+		var index = null;
+		for (k in opts.many_associations[i].mergeId) {
+			if (index == null) index = driver.query.escapeId(k);
+			else index += ", " + driver.query.escapeId(k);
+		}
+
+		for (k in opts.many_associations[i].mergeAssocId) {
+			if (index == null) index = driver.query.escapeId(k);
+			else index += ", " + driver.query.escapeId(k);
+		}
+		
+
+		definitions.push("INDEX (" + index + ")");
 		queries.push(
 			"CREATE TABLE IF NOT EXISTS " + driver.query.escapeId(opts.many_associations[i].mergeTable) +
 			" (" + definitions.join(", ") + ")"
@@ -120,7 +140,7 @@ exports.sync = function (driver, opts, cb) {
 			}
 		});
 	}
-
+	
 	for (i = 0; i < queries.length; i++) {
 		driver.db.query(queries[i], function (err) {
 			if (--pending === 0) {
@@ -172,7 +192,7 @@ function buildColumnDefinition(driver, name, prop) {
 			break;
 		case "enum":
 			def = driver.query.escapeId(name) + " ENUM (" +
-			       prop.values.map(driver.query.escapeVal.bind(driver.query)) +
+				   prop.values.map(driver.query.escapeVal.bind(driver.query)) +
 			")";
 			break;
 		case "point":
diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index b87912a5..e92706fd 100755
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -55,10 +55,9 @@ exports.sync = function (driver, opts, cb) {
 	for (i = 0; i < opts.one_associations.length; i++) {
 		if (opts.one_associations[i].extension) continue;
 		if (opts.one_associations[i].reversed) continue;
-		definitions.push(
-			driver.query.escapeId(opts.one_associations[i].field) + " INTEGER" +
-			(opts.one_associations[i].required ? ' NOT NULL' : '')
-		);
+		for (k in opts.one_associations[i].field) {
+			definitions.push(buildColumnDefinition(driver, opts.table, k, opts.one_associations[i].field[k]));
+		}
 	}
 
 	for (k in opts.properties) {
@@ -74,18 +73,20 @@ exports.sync = function (driver, opts, cb) {
 	tables.push({
 		name       : opts.table,
 		query      : "CREATE TABLE " + driver.query.escapeId(opts.table) +
-		             " (" + definitions.join(", ") + ")",
+					 " (" + definitions.join(", ") + ")",
 		typequeries: typequeries,
 		subqueries : subqueries
 	});
-
+	
 	for (i = 0; i < opts.one_associations.length; i++) {
 		if (opts.one_associations[i].extension) continue;
 		if (opts.one_associations[i].reversed) continue;
-		tables[tables.length - 1].subqueries.push(
-			"CREATE INDEX ON " + driver.query.escapeId(opts.table) +
-			" (" + driver.query.escapeId(opts.one_associations[i].field) + ")"
-		);
+		for (k in opts.one_associations[i].field) {
+			tables[tables.length - 1].subqueries.push(
+				"CREATE INDEX ON " + driver.query.escapeId(opts.table) +
+				" (" + driver.query.escapeId(k) + ")"
+			);
+		}
 	}
 
 	for (i = 0; i < opts.indexes.length; i++) {
@@ -100,13 +101,18 @@ exports.sync = function (driver, opts, cb) {
 	for (i = 0; i < opts.many_associations.length; i++) {
 		definitions = [];
 		typequeries = [];
+		
+		for (k in opts.many_associations[i].mergeId) {
+		    definitions.push(buildColumnDefinition(driver, opts.many_associations[i].mergeTable, k, opts.many_associations[i].mergeId[k]));
+		}
 
-		definitions.push(driver.query.escapeId(opts.many_associations[i].mergeId) + " INTEGER NOT NULL");
-		definitions.push(driver.query.escapeId(opts.many_associations[i].mergeAssocId) + " INTEGER NOT NULL");
+		for (k in opts.many_associations[i].mergeAssocId) {
+		    definitions.push(buildColumnDefinition(driver, opts.many_associations[i].mergeTable, k, opts.many_associations[i].mergeAssocId[k]));
+		}
 
 		for (k in opts.many_associations[i].props) {
 			definitions.push(buildColumnDefinition(driver, opts.many_associations[i].mergeTable,
-			                                       k, opts.many_associations[i].props[k]));
+												   k, opts.many_associations[i].props[k]));
 			if (opts.many_associations[i].props[k].type == "enum") {
 				typequeries.push(
 					"CREATE TYPE " + driver.query.escapeId("enum_" + opts.many_associations[i].mergeTable + "_" + k) + " AS ENUM (" +
@@ -114,20 +120,28 @@ exports.sync = function (driver, opts, cb) {
 				);
 			}
 		}
+		
+		var index = null;
+		for (k in opts.many_associations[i].mergeId) {
+			if (index == null) index = driver.query.escapeId(k);
+			else index += ", " + driver.query.escapeId(k);
+		}
+
+		for (k in opts.many_associations[i].mergeAssocId) {
+			if (index == null) index = driver.query.escapeId(k);
+			else index += ", " + driver.query.escapeId(k);
+		}
 
 		tables.push({
 			name       : opts.many_associations[i].mergeTable,
 			query      : "CREATE TABLE IF NOT EXISTS " + driver.query.escapeId(opts.many_associations[i].mergeTable) +
-			             " (" + definitions.join(", ") + ")",
+						 " (" + definitions.join(", ") + ")",
 			typequeries: typequeries,
 			subqueries : []
 		});
 		tables[tables.length - 1].subqueries.push(
 			"CREATE INDEX ON " + driver.query.escapeId(opts.many_associations[i].mergeTable) +
-			" (" +
-			driver.query.escapeId(opts.many_associations[i].mergeId) + ", " +
-			driver.query.escapeId(opts.many_associations[i].mergeAssocId) +
-			")"
+			" (" + index + ")"
 		);
 	}
 
diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index 17d679d3..3a639eb9 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -46,10 +46,9 @@ exports.sync = function (driver, opts, cb) {
 	for (i = 0; i < opts.one_associations.length; i++) {
 		if (opts.one_associations[i].extension) continue;
 		if (opts.one_associations[i].reversed) continue;
-		definitions.push(
-			driver.query.escapeId(opts.one_associations[i].field) + " INTEGER UNSIGNED" +
-			(opts.one_associations[i].required ? ' NOT NULL' : '')
-		);
+		for (k in opts.one_associations[i].field) {
+			definitions.push(buildColumnDefinition(driver, k, opts.one_associations[i].field[k]));
+		}
 	}
 
 	if (keys.length > 1) {
@@ -75,15 +74,17 @@ exports.sync = function (driver, opts, cb) {
 			);
 		}
 	}
-
+	
 	for (i = 0; i < opts.one_associations.length; i++) {
 		if (opts.one_associations[i].extension) continue;
 		if (opts.one_associations[i].reversed) continue;
-		queries.push(
-			"CREATE INDEX IF NOT EXISTS " + driver.query.escapeId(opts.table + "_" + opts.one_associations[i].field) +
+		for (k in opts.one_associations[i].field) {
+			queries.push(
+			"CREATE INDEX IF NOT EXISTS " + driver.query.escapeId(opts.table + "_" + k) +
 			" ON " + driver.query.escapeId(opts.table) +
-			" (" + driver.query.escapeId(opts.one_associations[i].field) + ")"
+			" (" + driver.query.escapeId(k) + ")"
 		);
+		}
 	}
 
 	for (i = 0; i < opts.indexes.length; i++) {
@@ -99,12 +100,28 @@ exports.sync = function (driver, opts, cb) {
 	for (i = 0; i < opts.many_associations.length; i++) {
 		definitions = [];
 
-		definitions.push(driver.query.escapeId(opts.many_associations[i].mergeId) + " INTEGER UNSIGNED NOT NULL");
-		definitions.push(driver.query.escapeId(opts.many_associations[i].mergeAssocId) + " INTEGER UNSIGNED NOT NULL");
+		for (k in opts.many_associations[i].mergeId) {
+			definitions.push(buildColumnDefinition(driver, k, opts.many_associations[i].mergeId[k]));
+		}
+
+		for (k in opts.many_associations[i].mergeAssocId) {
+			definitions.push(buildColumnDefinition(driver, k, opts.many_associations[i].mergeAssocId[k]));
+		}
 
 		for (k in opts.many_associations[i].props) {
 			definitions.push(buildColumnDefinition(driver, k, opts.many_associations[i].props[k]));
 		}
+		
+		var index = null;
+		for (k in opts.many_associations[i].mergeId) {
+			if (index == null) index = driver.query.escapeId(k);
+			else index += ", " + driver.query.escapeId(k);
+		}
+
+		for (k in opts.many_associations[i].mergeAssocId) {
+			if (index == null) index = driver.query.escapeId(k);
+			else index += ", " + driver.query.escapeId(k);
+		}
 
 		queries.push(
 			"CREATE TABLE IF NOT EXISTS " + driver.query.escapeId(opts.many_associations[i].mergeTable) +
@@ -113,7 +130,7 @@ exports.sync = function (driver, opts, cb) {
 		queries.push(
 			"CREATE INDEX IF NOT EXISTS " + driver.query.escapeId(opts.many_associations[i].mergeTable) +
 			" ON " + driver.query.escapeId(opts.table) +
-			" (" + driver.query.escapeId(opts.many_associations[i].mergeId) + ", " + driver.query.escapeId(opts.many_associations[i].mergeAssocId) + ")"
+			" (" + index + ")"
 		);
 	}
 
diff --git a/lib/Instance.js b/lib/Instance.js
index 6b847333..011ec5b5 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -296,8 +296,10 @@ function Instance(Model, opts) {
 			}
 		}
 
-		conditions[opts.extra_info.id_prop] = opts.extra_info.id;
-		conditions[opts.extra_info.assoc_prop] = opts.data[opts.id];
+		for (i = 0; i < opts.extra_info.id; i++) {
+		    conditions[opts.extra_info.id_prop[i]] = opts.extra_info.id[i];
+		    conditions[opts.extra_info.assoc_prop[i]] = opts.data[opts.keys[i]];
+		}
 
 		opts.driver.update(opts.extra_info.table, data, conditions, function (err) {
 			if (cb)	return cb(err, instance);
@@ -555,15 +557,31 @@ function Instance(Model, opts) {
 	for (i = 0; i < opts.one_associations.length; i++) {
 		var asc = opts.one_associations[i]
 
-		if (!asc.reversed && !asc.extension && !opts.data.hasOwnProperty(asc.field)) {
-			addInstanceProperty(asc.field);
+		if (!asc.reversed && !asc.extension) {
+		    for (k in opts.one_associations[i].field) {
+		        if (!opts.data.hasOwnProperty(k)) {
+		            addInstanceProperty(k);
+		        }
+		    }
 		}
+
 		if (opts.data.hasOwnProperty(asc.name)) {
 			if (opts.data[asc.name] instanceof Object) {
 				if (opts.data[asc.name].isInstance) {
 					instance[asc.name] = opts.data[asc.name];
 				} else {
-					instance[asc.name] = new opts.one_associations[i].model(opts.data[asc.name]);
+				    var instanceInit = {};
+				    var usedChance = false;
+				    for (k in opts.one_associations[i].keys) {
+				        if (!data.hasOwnProperty(k) && !usedChance) {
+				            instanceInit[k] = opts.data[asc.name];
+				            usedChance = true;
+				        } else {
+				            instanceInit[k] = opts.data[k];
+				        }
+				    }
+
+					instance[asc.name] = new opts.one_associations[i].model(instanceInit);
 				}
 			}
 			delete opts.data[asc.name];
diff --git a/lib/Model.js b/lib/Model.js
index 16c380bc..619e849e 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -63,8 +63,7 @@ function Model(opts) {
 			if (inst_opts.extra && inst_opts.extra.hasOwnProperty(k)) continue;
 			if (opts.keys.indexOf(k) >= 0) continue;
 			if (association_properties.indexOf(k) >= 0) continue;
-
-			found_assoc = false;
+			
 			for (i = 0; i < one_associations.length; i++) {
 				if (one_associations[i].name == k) {
 					found_assoc = true;
@@ -140,6 +139,10 @@ function Model(opts) {
 
 	var model = function (data) {
 		var instance;
+
+		//TODO: Should be smarter about how this is handled.
+		//      ideally we should check the type of ID used
+		//      by the model, and accept that type of data.
 		if (typeof data == "number") {
 			var data2 = {};
 			data2[opts.id] = data;
@@ -149,8 +152,13 @@ function Model(opts) {
 			data = {};
 		}
 
+		var isNew = false;
+		for (k in opts.keys) {
+		    isNew |= !data.hasOwnProperty(k);
+		}
+
 		return createInstance(data, {
-			is_new        : !data.hasOwnProperty(opts.id),
+			is_new        : isNew,
 			autoSave      : opts.autoSave,
 			cascadeRemove : opts.cascadeRemove
 		});
diff --git a/lib/Settings.js b/lib/Settings.js
index b889907b..be575af7 100644
--- a/lib/Settings.js
+++ b/lib/Settings.js
@@ -2,7 +2,7 @@ var _ = require('lodash');
 var default_settings = {
 	properties : {
 		primary_key     : "id",
-		association_key : "{name}_id",
+		association_key : "{name}_{field}",
 		required        : false
 	},
 	instance   : {
diff --git a/package.json b/package.json
index 0761c71f..af6a0996 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,8 @@
     { "name" : "Paul Dixon",       "email" : "paul.dixon@mintbridge.co.uk" },
     { "name" : "David Kosub" },
     { "name" : "Arek W" },
-    { "name" : "Joseph Gilley",    "email" : "joe.gilley@gmail.com" }
+    { "name" : "Joseph Gilley",    "email" : "joe.gilley@gmail.com" },
+	{ "name" : "Benjamin Pannell", "email" : "admin@sierrasoftworks.com" }
   ],
   "main"        : "./lib/ORM",
   "scripts"     : {
@@ -37,7 +38,7 @@
   },
   "analyse"     : false,
   "dependencies": {
-    "sql-query" : "0.1.3",
+    "sql-query" : "0.1.5",
     "hat"       : "0.0.3",
     "lodash"    : "1.3.1"
   },
diff --git a/test/integration/model-find-chain.js b/test/integration/model-find-chain.js
index a40a4e92..787265ee 100644
--- a/test/integration/model-find-chain.js
+++ b/test/integration/model-find-chain.js
@@ -392,7 +392,7 @@ describe("Model.find() chaining", function() {
 		});
 
 		describe(".hasAccessor() for hasOne associations", function () {
-			it("should be chainable", function (done) {
+		    it("should be chainable", function (done) {
 				Person.find({ name: "John" }, function (err, John) {
 					should.equal(err, null);
 
@@ -404,8 +404,8 @@ describe("Model.find() chaining", function() {
 					John[0].setParents([ Justin ], function (err) {
 						should.equal(err, null);
 
-						Person.find().hasParents(Justin.id).all(function (err, people) {
-							should.equal(err, null);
+						Person.find().hasParents(Justin).all(function (err, people) {
+						    should.equal(err, null);
 
 							should(Array.isArray(people));
 

From b3d36a7a4344b06c9a53121e12e3327c22f7d605 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <benjamin.pannell@gmail.com>
Date: Mon, 15 Jul 2013 17:36:12 +0200
Subject: [PATCH 0667/1246] Merge reusable functions into Utilities.js

---
 lib/Associations/Extend.js |  82 +++---------------------
 lib/Associations/Many.js   | 125 +++++++------------------------------
 lib/Associations/One.js    | 124 +++++-------------------------------
 lib/Utilities.js           | 104 ++++++++++++++++++++++++++++++
 4 files changed, 150 insertions(+), 285 deletions(-)

diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index dc37d442..f72b03e5 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -1,6 +1,7 @@
 var ErrorCodes = require("../ErrorCodes");
 var Settings   = require("../Settings");
-var Singleton  = require("../Singleton");
+var Singleton = require("../Singleton");
+var util = require("../Utilities");
 
 exports.prepare = function (db, Model, associations, association_properties, model_fields) {
 	Model.extendsTo = function (name, properties, opts) {
@@ -12,7 +13,7 @@ exports.prepare = function (db, Model, associations, association_properties, mod
 			reversed       : opts.reversed,
 			autoFetch      : opts.autoFetch || false,
 			autoFetchLimit : opts.autoFetchLimit || 2,
-			field          : wrapFieldObject(opts.field, Model, []) || formatField(Model, Model.table, false),
+			field          : util.wrapFieldObject(opts.field, Model, Model.table, []) || util.formatField(Model, Model.table, false, false),
 			getAccessor    : opts.getAccessor || ("get" + assocName),
 			setAccessor    : opts.setAccessor || ("set" + assocName),
 			hasAccessor    : opts.hasAccessor || ("has" + assocName),
@@ -21,7 +22,7 @@ exports.prepare = function (db, Model, associations, association_properties, mod
 
 		association.model = db.define(Model.table + "_" + name, properties, {
 			id        : null,
-			keys      : getKeys(association.field),
+			keys      : Object.keys(association.field),
 			extension : true
 		});
 		association.model.hasOne(Model.table, Model, { extension: true, field: association.field });
@@ -57,80 +58,13 @@ exports.autoFetch = function (Instance, associations, opts, cb) {
 	}
 };
 
-function getKeys(arr) {
-	var keys = [];
-	for (k in arr)
-		keys.push(k);
-	return keys;
-}
-
-function wrapFieldObject(obj, Model, alternatives) {
-    if (!obj) {
-        obj = Model.settings.get("properties.association_key").replace("{name}", Model.table.toLowerCase()).replace("{field}", "id");
-    }
-    isvalid = false;
-    for (k in obj) {
-        if (!/[0-9]+/.test(k) && obj.hasOwnProperty(k)) isvalid = true;
-    }
-    if (isvalid) return obj;
-
-    newobj = {};
-    newobj[obj] = alternatives[obj] || alternatives[Model.keys[0]] || { type: 'number', unsigned: true, rational: false };
-    return newobj;
-}
-
-function formatField(Model, name, required) {
-	var fields = {};
-	var keys = ["id"];
-	if (Model.keys instanceof Array) {
-		keys = Model.keys;
-	}
-	else {
-		keys = [Model.keys];
-	}
-
-	for (var i = 0; i < keys.length; i++) {
-		var fieldName = Model.settings.get("properties.association_key").replace("{name}", name.toLowerCase()).replace("{field}", Model.keys[i]);
-		var fieldOpts = {
-			type: "number",
-			unsigned: true,
-			size: 4
-		};
-
-		if (Model.properties.hasOwnProperty(Model.keys[i])) {
-			var p = Model.properties[Model.keys[i]];
-			fieldOpts = {
-				type: p.type || "number",
-				size: p.size || 4,
-				rational: p.rational || false,
-				unsigned: p.unsigned || true,
-				time: p.time || false,
-				big: p.big || false,
-				values: p.values || null
-			};
-		};
-
-		fields[fieldName] = fieldOpts;
-	}
-	
-	return fields;
-}
-
-function makeConditions(Instance, Model) {
-	var conditions = [];
-	for (i = 0; i < Model.keys.length; i++) {
-		conditions.push(Instance[Model.keys[i]]);
-	}
-	return conditions;
-}
-
 function extendInstance(Model, Instance, Driver, association, opts) {
 	Object.defineProperty(Instance, association.hasAccessor, {
 		value : function (cb) {
 			if (!Instance[Model.id]) {
 				cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension"));
 			} else {
-				association.model.get(makeConditions(Instance, Model), function (err, extension) {
+			    association.model.get(util.values(Instance, Model.keys), function (err, extension) {
 					return cb(err, !err && extension ? true : false);
 				});
 			}
@@ -143,7 +77,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 			if (!Instance[Model.id]) {
 				cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension"));
 			} else {
-				association.model.get(makeConditions(Instance, Model), cb);
+				association.model.get(util.values(Instance, Model.keys), cb);
 			}
 			return this;
 		},
@@ -161,7 +95,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 						return cb(err);
 					}
 
-					var fields = getKeys(association.field);
+					var fields = Object.keys(association.field);
 					for (i = 0; i < Model.keys.length; i++) {
 						Extension[fields[i]] = Instance[Model.keys[i]];
 					}
@@ -179,7 +113,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 				cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension"));
 			} else {
 				var conditions = {};
-				var fields = getKeys(association.field);
+				var fields = Object.keys(association.field);
 				for (i = 0; i < Model.keys.length; i++) {
 					conditions[fields[i]] = Instance[Model.keys[i]];
 				}
diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index d2dc9847..af55a481 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -2,7 +2,8 @@ var InstanceConstructor = require("../Instance").Instance;
 var Settings            = require("../Settings");
 var Property            = require("../Property");
 var ErrorCodes          = require("../ErrorCodes");
-var _                   = require("lodash");
+var _ = require("lodash");
+var util = require("../Utilities");
 
 exports.prepare = function (Model, associations) {
 	if (Model.keys.length > 1) {
@@ -51,10 +52,10 @@ exports.prepare = function (Model, associations) {
 			autoFetch      : opts.autoFetch || false,
 			autoFetchLimit : opts.autoFetchLimit || 2,
 			// I'm not sure the next key is used..
-			field          : opts.field || formatField(Model, name, true),
+			field          : util.wrapFieldObject(opts.field, OtherModel, Model.table, OtherModel.properties) || util.formatField(Model, name, true, opts.reversed),
 			mergeTable     : opts.mergeTable || (Model.table + "_" + name),
-			mergeId        : wrapFieldObject(opts.mergeId, OtherModel, Model.table, OtherModel.properties) || formatField(OtherModel, Model.table, true),
-			mergeAssocId   : wrapFieldObject(opts.mergeAssocId, Model, name, Model.properties) || formatField(Model, name, true),
+			mergeId        : util.wrapFieldObject(opts.mergeId, OtherModel, Model.table, OtherModel.properties) || util.formatField(OtherModel, Model.table, true, opts.reversed),
+			mergeAssocId   : util.wrapFieldObject(opts.mergeAssocId, Model, name, Model.properties) || util.formatField(Model, name, true, opts.reversed),
 			getAccessor    : opts.getAccessor || ("get" + assocName),
 			setAccessor    : opts.setAccessor || ("set" + assocName),
 			hasAccessor    : opts.hasAccessor || ("has" + assocName),
@@ -104,92 +105,8 @@ exports.autoFetch = function (Instance, associations, opts, cb) {
 	}
 };
 
-function getKeys(arr) {
-	var keys = [];
-	for (k in arr)
-		keys.push(k);
-	return keys;
-}
-
-function wrapFieldObject(obj, Model, altName, alternatives) {
-    if (!obj) {
-        obj = Model.settings.get("properties.association_key").replace("{name}", altName.toLowerCase()).replace("{field}", "id");
-    }
-    isvalid = false;
-    for (k in obj) {
-        if (!/[0-9]+/.test(k) && obj.hasOwnProperty(k)) isvalid = true;
-    }
-    if (isvalid) return obj;
-
-    newobj = {};
-    newobj[obj] = alternatives[obj] || alternatives[Model.keys[0]] || { type: 'number', unsigned: true, rational: false };
-    return newobj;
-}
-
-function formatField(Model, name, required) {
-	var fields = {};
-	var keys = ["id"];
-	if (Model.keys instanceof Array) {
-		keys = Model.keys;
-	}
-	else {
-		keys = [Model.keys];
-	}
-
-	for (var i = 0; i < keys.length; i++) {
-		var fieldName = Model.settings.get("properties.association_key").replace("{name}", name.toLowerCase()).replace("{field}", Model.keys[i]);
-		var fieldOpts = {
-			type: "number",
-			unsigned: true,
-			size: 4
-		};
-
-		if (Model.properties.hasOwnProperty(Model.keys[i])) {
-			var p = Model.properties[Model.keys[i]];
-			fieldOpts = {
-				type: p.type || "number",
-				size: p.size || 4,
-				rational: p.rational || false,
-				unsigned: p.unsigned || true,
-				time: p.time || false,
-				big: p.big || false,
-				values: p.values || null
-			};
-		};
-
-		fields[fieldName] = fieldOpts;
-	}
-
-	return fields;
-}
-
 function extendInstance(Model, Instance, Driver, association, opts) {
-	function populateConditions(Model, fields, source, target) {
-		var fKeys = getKeys(fields);
-		for (i = 0; i < Model.keys.length; i++) {
-			target[fKeys[i]] = source[Model.keys[i]];
-		}
-	}
-
-	function populateConditionsPush(Model, fields, source, target) {
-		var fKeys = getKeys(fields);
-		for (i = 0; i < Model.keys.length; i++) {
-		    if (typeof target[fKeys[i]] != 'undefined') {
-		        target[fKeys[i]].push(source[Model.keys[i]]);
-		    } else {
-		        target[fKeys[i]] = [source[Model.keys[i]]];
-		    }
-		}
-	}
-
-	function getIDs() {
-		var ids = [];
-		for (k in Model.keys) {
-			ids.push(Instance[k]);
-		}
-		return ids;
-	}
-
+	
 	if (Model.settings.get("instance.cascadeRemove")) {
 		Instance.on("beforeRemove", function () {
 			Instance[association.delAccessor]();
@@ -203,19 +120,19 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 			var conditions = {}, options = {};
 
 			options.__merge = {
-				from:   { table: association.mergeTable, field: getKeys(association.mergeAssocId) },
+				from:   { table: association.mergeTable, field: Object.keys(association.mergeAssocId) },
 				to:     { table: association.model.table, field: association.model.keys },
 				where:  [ association.mergeTable, {} ]
 			};
 			options.extra = association.props;
 			options.extra_info = {
 				table: association.mergeTable,
-				id: getIDs(),
-				id_prop: getKeys(association.mergeId),
-				assoc_prop: getKeys(association.mergeAssocId)
+				id: util.values(Instance, Model.keys),
+				id_prop: Object.keys(association.mergeId),
+				assoc_prop: Object.keys(association.mergeAssocId)
 			};
 
-			populateConditions(Model, association.mergeId, Instance, options.__merge.where[1]);
+			util.populateConditions(Model, Object.keys(association.mergeId), Instance, options.__merge.where[1]);
 
 			if (Instances.length) {
 				if (Array.isArray(Instances[0])) {
@@ -223,7 +140,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 				}
 
 				for (var i = 0; i < Instances.length; i++) {
-					populateConditionsPush(association.model, association.mergeAssocId, Instances[i], options.__merge.where[1]);
+					util.populateConditions(association.model, Object.keys(association.mergeAssocId), Instances[i], options.__merge.where[1], false);
 				}
 			}
 
@@ -278,16 +195,16 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 			}
 
 			options.__merge = {
-				from  : { table: association.mergeTable, field: getKeys(association.mergeAssocId) },
+				from  : { table: association.mergeTable, field: Object.keys(association.mergeAssocId) },
 				to    : { table: association.model.table, field: association.model.keys },
 				where : [ association.mergeTable, {} ]
 			};
 			options.extra = association.props;
 			options.extra_info = {
 				table: association.mergeTable,
-				id: getIDs(),
-				id_prop: getKeys(association.mergeId),
-				assoc_prop: getKeys(association.mergeAssocId)
+				id: util.values(Instance, Model.keys),
+				id_prop: Object.keys(association.mergeId),
+				assoc_prop: Object.keys(association.mergeAssocId)
 			};
 			if (order !== null) {
 				options.order = order;
@@ -297,7 +214,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 				conditions = {};
 			}
 
-			populateConditions(Model, association.mergeId, Instance, options.__merge.where[1]);
+			util.populateConditions(Model, Object.keys(association.mergeId), Instance, options.__merge.where[1]);
 
 			if (cb === null) {
 				return association.model.find(conditions, options);
@@ -347,13 +264,13 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 				}
 				
 				for (var i = 0; i < Associations.length; i++) {				    
-					populateConditionsPush(association.model, association.mergeAssocId, Associations[i], conditions);
+					util.populateConditions(association.model, Object.keys(association.mergeAssocId), Associations[i], conditions, false);
 				}
 
 				Driver.remove(association.mergeTable, conditions, cb);
 			};
             
-			populateConditions(Model, association.mergeId, Instance, conditions);
+			util.populateConditions(Model, Object.keys(association.mergeId), Instance, conditions);
 
 			if (this.saved()) {
 				run();
@@ -389,8 +306,8 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 						}
 
 						var data = {};
-						populateConditions(Model, association.mergeId, Instance, data);
-						populateConditions(association.model, association.mergeAssocId, Association, data);
+						util.populateConditions(Model, Object.keys(association.mergeId), Instance, data);
+						util.populateConditions(association.model, Object.keys(association.mergeAssocId), Association, data);
 
 						for (var k in opts) {
 							data[k] = opts[k];
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index 58bf9fcb..729b71a1 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -1,6 +1,7 @@
 var Settings  = require("../Settings");
 var Accessors = { "get": "get", "set": "set", "has": "has", "del": "remove" };
-var _         = require("lodash");
+var _ = require("lodash");
+var util = require("../Utilities");
 
 exports.prepare = function (Model, associations, association_properties, model_fields) {
 	Model.hasOne = function () {
@@ -34,9 +35,9 @@ exports.prepare = function (Model, associations, association_properties, model_f
 		assocName = ucfirst(association.name);
 
 		if (!association.hasOwnProperty("field")) {
-		    association.field = formatField(Model, association.name, association.required, association.reversed);
+		    association.field = util.formatField(Model, association.name, association.required, association.reversed);
 		} else if(!association.extension) {
-		    association.field = wrapFieldObject(association.field, Model, Model.properties);
+		    association.field = util.wrapFieldObject(association.field, Model, Model.table, Model.properties);
 		}
 		for (var k in Accessors) {
 			if (!association.hasOwnProperty(k + "Accessor")) {
@@ -85,7 +86,7 @@ exports.prepare = function (Model, associations, association_properties, model_f
 
 			options.__merge = {
 				from  : { table: association.model.table, field: association.model.keys },
-				to    : { table: Model.table, field: getKeys(association.field) },
+				to    : { table: Model.table, field: Object.keys(association.field) },
 				where : [ association.model.table, conditions ],
 				table : Model.table
 			};
@@ -126,97 +127,6 @@ exports.autoFetch = function (Instance, associations, opts, cb) {
 	}
 };
 
-function formatField(Model, name, required, reversed) {
-	var fields = {};
-	var keys = ["id"];
-	if (Model.keys instanceof Array) {
-		keys = Model.keys;
-	}
-	else {
-		keys = [Model.keys];
-	}
-
-	for (var i = 0; i < keys.length; i++) {
-		var fieldName = reversed ? keys[i] : Model.settings.get("properties.association_key").replace("{name}", name.toLowerCase()).replace("{field}", keys[i]);
-		var fieldOpts = {
-			type: "number",
-			unsigned: true,
-            rational: false,
-			size: 4,
-			required: required
-		};
-
-		if (Model.properties.hasOwnProperty(Model.keys[i])) {
-			var p = Model.properties[Model.keys[i]];
-			fieldOpts = {
-				type: p.type || "number",
-				size: p.size || 4,
-				rational: p.rational || false,
-				unsigned: p.unsigned || true,
-				time: p.time || false,
-				big: p.big || false,
-				values: p.values || null,
-				required: required
-			};
-		};
-
-		fields[fieldName] = fieldOpts;
-	}
-
-	return fields;
-}
-
-
-function wrapFieldObject(obj, Model, alternatives) {
-    if (!obj) {
-        obj = Model.settings.get("properties.association_key").replace("{name}", Model.table.toLowerCase()).replace("{field}", "id");
-    }
-    isvalid = false;
-    for (k in obj) {
-        if (!/[0-9]+/.test(k) && obj.hasOwnProperty(k)) isvalid = true;
-    }
-    if (isvalid) return obj;
-
-    newobj = {};
-    newobj[obj] = alternatives[obj] || alternatives[Model.keys[0]] || { type: 'number', unsigned: true, rational: false };
-    return newobj;
-}
-
-function getKeys(arr) {
-    var keys = [];
-    for (k in arr) {
-        keys.push(k);
-    }
-    return keys;
-}
-
-function populateConditions(Model, fields, source, target) {
-    for (i = 0; i < Model.keys.length; i++) {
-        target[fields[i]] = source[Model.keys[i]];
-    }
-}
-
-function getConditions(model, fields, from) {
-    var conditions = {};
-    populateConditions(model, fields, from, conditions);
-    return conditions;
-}
-
-function getIDs(keys, from) {
-    var ids = [];
-    for (i = 0; i < keys.length; i++) {
-        ids.push(from[keys[i]]);
-    }
-    return ids;
-}
-
-function hasFields(fields, instance) {
-    for (i = 0; i < fields.length; i++) {
-        if (instance[fields[i]]) return true;
-    }
-    return false;
-}
-
 function extendInstance(Model, Instance, Driver, association, opts) {
 	Object.defineProperty(Instance, association.hasAccessor, {
 		value: function (opts, cb) {
@@ -225,8 +135,8 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 				opts = {};
 			}
 
-			if (hasFields(getKeys(association.field), Instance)) {
-				association.model.get(getIDs(getKeys(association.field), Instance), opts, function (err, instance) {
+			if (util.hasValues(Instance, Object.keys(association.field))) {
+			    association.model.get(util.values(Instance, Object.keys(association.field)), opts, function (err, instance) {
 					return cb(err, instance ? true : false);
 				});
 			} else {
@@ -245,21 +155,21 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 			}
 
 			if (association.reversed) {
-				if (hasFields(Model.keys, Instance)) {
-				    association.model.find(getConditions(Model, getKeys(association.field), Instance), opts, cb);
+				if (util.hasValues(Instance, Model.keys)) {
+				    association.model.find(util.getConditions(Model, Object.keys(association.field), Instance), opts, cb);
 				} else {
 					cb(null);
 				}
 			} else {
 			    if (Instance.isShell()) {
-					Model.get(getIDs(Model.keys, Instance), function (err, instance) {
-					    if (err || !hasFields(getKeys(association.field), instance)) {
+			        Model.get(util.values(Instance, Model.keys), function (err, instance) {
+					    if (err || !util.hasValues(instance, Object.keys(association.field))) {
 							return cb(null);
 						}
-						association.model.get(getIDs(getKeys(association.field), instance), opts, cb);
+					    association.model.get(util.values(instance, Object.keys(association.field)), opts, cb);
 					});
-				} else if (hasFields(getKeys(association.field), Instance)) {
-				    association.model.get(getIDs(getKeys(association.field), Instance), opts, cb);
+			    } else if (util.hasValues(Instance, Object.keys(association.field))) {
+			        association.model.get(util.values(Instance, Object.keys(association.field)), opts, cb);
 				} else {
 					cb(null);
 				}
@@ -270,14 +180,14 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 		enumerable: false
 	});
 	Object.defineProperty(Instance, association.setAccessor, {
-		value: function (OtherInstance, cb) {
+	    value: function (OtherInstance, cb) {
 			if (association.reversed) {
 				Instance.save(function (err) {
 					if (err) {
 						return cb(err);
 					}
 
-					populateConditions(Model, getKeys(association.field), Instance, OtherInstance);
+					util.populateConditions(Model, Object.keys(association.field), Instance, OtherInstance, true);
 
 					return OtherInstance.save({}, { saveAssociations: false }, cb);
 				});
@@ -287,7 +197,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 						return cb(err);
 					}
 
-					populateConditions(association.model, getKeys(association.field), OtherInstance, Instance);
+					util.populateConditions(association.model, Object.keys(association.field), OtherInstance, Instance);
 
 					return Instance.save({}, { saveAssociations: false }, cb);
 				});
diff --git a/lib/Utilities.js b/lib/Utilities.js
index a5afe76a..d797068f 100644
--- a/lib/Utilities.js
+++ b/lib/Utilities.js
@@ -44,3 +44,107 @@ exports.standardizeOrder = function (order) {
 
 	return new_order;
 };
+
+/**
+ * Gets all the values within an object or array, optionally using a keys array to get only specific values
+ */
+
+exports.values = function (obj, keys) {
+    var vals = [];
+    if (keys) {
+        for (i = 0; i < keys.length; i++) {
+            vals.push(obj[keys[i]]);
+        }
+    }
+    else if (Array.isArray(obj)) {
+        for (i = 0; i < obj.length; i++) {
+            vals.push(obj[i]);
+        }
+    }
+    else {
+        for (k in obj) {
+            if (!/[0-9]+/.test(k))
+                vals.push(obj[k]);
+        }
+    }
+    return vals;
+};
+
+exports.hasValues = function (obj, keys) {
+    for (i = 0; i < keys.length; i++) {
+        if (!obj[keys[i]]) return false;
+    }
+    return true;
+};
+
+exports.populateConditions = function (model, fields, source, target, overwrite) {
+    for (i = 0; i < model.keys.length; i++) {
+        if (typeof target[fields[i]] == 'undefined' || overwrite !== false)
+            target[fields[i]] = source[model.keys[i]];
+        else if (Array.isArray(target[fields[i]]))
+            target[fields[i]].push(source[model.keys[i]]);
+        else
+            target[fields[i]] = [target[fields[i]], source[model.keys[i]]];
+    }
+}
+
+exports.getConditions = function (model, fields, from) {
+    var conditions = {};
+    exports.populateConditions(model, fields, from, conditions);
+    return conditions;
+}
+
+exports.wrapFieldObject = function (obj, model, altName, alternatives) {
+    if (!obj) {
+        obj = model.settings.get("properties.association_key").replace("{name}", altName.toLowerCase()).replace("{field}", "id");
+    }
+    isvalid = false;
+    for (k in obj) {
+        if (!/[0-9]+/.test(k) && obj.hasOwnProperty(k)) isvalid = true;
+    }
+    if (isvalid) return obj;
+
+    newobj = {};
+    newobj[obj] = alternatives[obj] || alternatives[model.keys[0]] || { type: 'number', unsigned: true, rational: false };
+    return newobj;
+};
+
+exports.formatField = function (model, name, required, reversed) {
+    var fields = {};
+    var keys;
+    if (model.keys instanceof Array) {
+        keys = model.keys;
+    }
+    else {
+        keys = [model.keys];
+    }
+
+    for (var i = 0; i < keys.length; i++) {
+        var fieldName = reversed ? keys[i] : model.settings.get("properties.association_key").replace("{name}", name.toLowerCase()).replace("{field}", keys[i]);
+        var fieldOpts = {
+            type: "number",
+            unsigned: true,
+            rational: false,
+            size: 4,
+            required: required
+        };
+
+        if (model.properties.hasOwnProperty(model.keys[i])) {
+            var p = model.properties[model.keys[i]];
+            fieldOpts = {
+                type: p.type || "number",
+                size: p.size || 4,
+                rational: p.rational || false,
+                unsigned: p.unsigned || true,
+                time: p.time || false,
+                big: p.big || false,
+                values: p.values || null,
+                required: required
+            };
+        };
+
+        fields[fieldName] = fieldOpts;
+    }
+
+    return fields;
+};
\ No newline at end of file

From 6a74796750f6e8b8b5f2cca41f338a4a0681ea5a Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <benjamin.pannell@gmail.com>
Date: Mon, 15 Jul 2013 23:57:22 +0200
Subject: [PATCH 0668/1246] Fix for smart_associations

Fixes an issue with generating the names and determining the types of
fields on target models for hasOne associations.
Handle `id: [...]` correctly by transferring it to keys instead of just
blindly wrapping everything in an array.

Also increased the timeout for hasMany associations tests, since they seemed
to intermittently timeout.
---
 lib/Associations/One.js                 | 2 +-
 lib/Model.js                            | 6 +++++-
 lib/Utilities.js                        | 6 +++---
 test/integration/association-hasmany.js | 3 ++-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index 729b71a1..fe20fa94 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -35,7 +35,7 @@ exports.prepare = function (Model, associations, association_properties, model_f
 		assocName = ucfirst(association.name);
 
 		if (!association.hasOwnProperty("field")) {
-		    association.field = util.formatField(Model, association.name, association.required, association.reversed);
+		    association.field = util.formatField(association.model, association.name, association.required, association.reversed);
 		} else if(!association.extension) {
 		    association.field = util.wrapFieldObject(association.field, Model, Model.table, Model.properties);
 		}
diff --git a/lib/Model.js b/lib/Model.js
index 619e849e..4e223168 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -25,7 +25,11 @@ function Model(opts) {
 	opts = opts || {};
 
 	if ((!Array.isArray(opts.keys) || opts.keys.length < 2) && !opts.extension) {
-		opts.keys = [ opts.id ];
+	    if (Array.isArray(opts.id)) {
+	        opts.keys = opts.id;
+	    } else {
+	        opts.keys = [opts.id];
+	    }
 	} else {
 		opts.id = null;
 	}
diff --git a/lib/Utilities.js b/lib/Utilities.js
index d797068f..9c6a399c 100644
--- a/lib/Utilities.js
+++ b/lib/Utilities.js
@@ -112,7 +112,7 @@ exports.wrapFieldObject = function (obj, model, altName, alternatives) {
 exports.formatField = function (model, name, required, reversed) {
     var fields = {};
     var keys;
-    if (model.keys instanceof Array) {
+    if (Array.isArray(model.keys)) {
         keys = model.keys;
     }
     else {
@@ -129,8 +129,8 @@ exports.formatField = function (model, name, required, reversed) {
             required: required
         };
 
-        if (model.properties.hasOwnProperty(model.keys[i])) {
-            var p = model.properties[model.keys[i]];
+        if (model.properties.hasOwnProperty(keys[i])) {
+            var p = model.properties[keys[i]];
             fieldOpts = {
                 type: p.type || "number",
                 size: p.size || 4,
diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
index 586e2ade..351aaaa0 100644
--- a/test/integration/association-hasmany.js
+++ b/test/integration/association-hasmany.js
@@ -2,7 +2,8 @@ var should = require('should');
 var helper = require('../support/spec_helper');
 var ORM    = require('../../');
 
-describe("hasMany", function() {
+describe("hasMany", function () {
+	this.timeout(4000);
 	var db     = null;
 	var Person = null;
 	var Pet    = null;

From 79a4222b9e23082fb5936681d43e93a46058d871 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <benjamin.pannell@gmail.com>
Date: Mon, 15 Jul 2013 23:57:22 +0200
Subject: [PATCH 0669/1246] Fix for smart_associations

Fixes an issue with generating the names and determining the types of
fields on target models for hasOne associations.
Handle `id: [...]` correctly by transferring it to keys instead of just
blindly wrapping everything in an array.

Also increased the timeout for hasMany associations tests, since they seemed
to intermittently timeout.
---
 lib/Associations/Extend.js              | 4 ++--
 lib/Associations/One.js                 | 4 ++--
 lib/ChainFind.js                        | 4 ++--
 lib/Model.js                            | 6 +++++-
 lib/Utilities.js                        | 6 +++---
 test/integration/association-hasmany.js | 3 ++-
 6 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index f72b03e5..39aca7f4 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -96,7 +96,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 					}
 
 					var fields = Object.keys(association.field);
-					for (i = 0; i < Model.keys.length; i++) {
+					for (var i = 0; i < Model.keys.length; i++) {
 						Extension[fields[i]] = Instance[Model.keys[i]];
 					}
 
@@ -114,7 +114,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 			} else {
 				var conditions = {};
 				var fields = Object.keys(association.field);
-				for (i = 0; i < Model.keys.length; i++) {
+				for (var i = 0; i < Model.keys.length; i++) {
 					conditions[fields[i]] = Instance[Model.keys[i]];
 				}
 
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index 729b71a1..d7f1e5db 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -35,7 +35,7 @@ exports.prepare = function (Model, associations, association_properties, model_f
 		assocName = ucfirst(association.name);
 
 		if (!association.hasOwnProperty("field")) {
-		    association.field = util.formatField(Model, association.name, association.required, association.reversed);
+		    association.field = util.formatField(association.model, association.name, association.required, association.reversed);
 		} else if(!association.extension) {
 		    association.field = util.wrapFieldObject(association.field, Model, Model.table, Model.properties);
 		}
@@ -210,7 +210,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 	if (!association.reversed) {
 		Object.defineProperty(Instance, association.delAccessor, {
 		    value: function (cb) {
-		        for (k in association.field) {
+		        for (var k in association.field) {
 		            Instance[k] = null;
 		        }
 				Instance.save(cb);
diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 0c481a48..aeb6992a 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -161,7 +161,7 @@ function addChainMethod(chain, association, opts) {
 		var assocIds = Object.keys(association.mergeAssocId);
 		var ids = association.model.keys;
 		function mergeConditions(source) {
-		    for (i = 0; i < assocIds.length; i++) {
+		    for (var i = 0; i < assocIds.length; i++) {
 		        if (typeof conditions[assocIds[i]] == 'undefined')
 		            conditions[assocIds[i]] = source[ids[i]];
 		        else if(Array.isArray(conditions[assocIds[i]]))
@@ -172,7 +172,7 @@ function addChainMethod(chain, association, opts) {
 		}
 
 		if (Array.isArray(value)) {
-		    for (i = 0; i < value.length; i++) {
+		    for (var i = 0; i < value.length; i++) {
 		        mergeConditions(value[i]);
 		    }
 		} else {
diff --git a/lib/Model.js b/lib/Model.js
index 619e849e..4e223168 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -25,7 +25,11 @@ function Model(opts) {
 	opts = opts || {};
 
 	if ((!Array.isArray(opts.keys) || opts.keys.length < 2) && !opts.extension) {
-		opts.keys = [ opts.id ];
+	    if (Array.isArray(opts.id)) {
+	        opts.keys = opts.id;
+	    } else {
+	        opts.keys = [opts.id];
+	    }
 	} else {
 		opts.id = null;
 	}
diff --git a/lib/Utilities.js b/lib/Utilities.js
index d797068f..9c6a399c 100644
--- a/lib/Utilities.js
+++ b/lib/Utilities.js
@@ -112,7 +112,7 @@ exports.wrapFieldObject = function (obj, model, altName, alternatives) {
 exports.formatField = function (model, name, required, reversed) {
     var fields = {};
     var keys;
-    if (model.keys instanceof Array) {
+    if (Array.isArray(model.keys)) {
         keys = model.keys;
     }
     else {
@@ -129,8 +129,8 @@ exports.formatField = function (model, name, required, reversed) {
             required: required
         };
 
-        if (model.properties.hasOwnProperty(model.keys[i])) {
-            var p = model.properties[model.keys[i]];
+        if (model.properties.hasOwnProperty(keys[i])) {
+            var p = model.properties[keys[i]];
             fieldOpts = {
                 type: p.type || "number",
                 size: p.size || 4,
diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
index 586e2ade..351aaaa0 100644
--- a/test/integration/association-hasmany.js
+++ b/test/integration/association-hasmany.js
@@ -2,7 +2,8 @@ var should = require('should');
 var helper = require('../support/spec_helper');
 var ORM    = require('../../');
 
-describe("hasMany", function() {
+describe("hasMany", function () {
+	this.timeout(4000);
 	var db     = null;
 	var Person = null;
 	var Pet    = null;

From 030159ce9bf06a4fc63c5d1527b551e11180bb41 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 16 Jul 2013 09:13:08 +1000
Subject: [PATCH 0670/1246] Add some missing vars

---
 lib/Utilities.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/Utilities.js b/lib/Utilities.js
index 9c6a399c..c85fa99f 100644
--- a/lib/Utilities.js
+++ b/lib/Utilities.js
@@ -50,7 +50,7 @@ exports.standardizeOrder = function (order) {
  */
 
 exports.values = function (obj, keys) {
-    var vals = [];
+    var i, k, vals = [];
     if (keys) {
         for (i = 0; i < keys.length; i++) {
             vals.push(obj[keys[i]]);
@@ -71,14 +71,14 @@ exports.values = function (obj, keys) {
 };
 
 exports.hasValues = function (obj, keys) {
-    for (i = 0; i < keys.length; i++) {
+    for (var i = 0; i < keys.length; i++) {
         if (!obj[keys[i]]) return false;
     }
     return true;
 };
 
 exports.populateConditions = function (model, fields, source, target, overwrite) {
-    for (i = 0; i < model.keys.length; i++) {
+    for (var i = 0; i < model.keys.length; i++) {
         if (typeof target[fields[i]] == 'undefined' || overwrite !== false)
             target[fields[i]] = source[model.keys[i]];
         else if (Array.isArray(target[fields[i]]))
@@ -99,7 +99,7 @@ exports.wrapFieldObject = function (obj, model, altName, alternatives) {
         obj = model.settings.get("properties.association_key").replace("{name}", altName.toLowerCase()).replace("{field}", "id");
     }
     isvalid = false;
-    for (k in obj) {
+    for (var k in obj) {
         if (!/[0-9]+/.test(k) && obj.hasOwnProperty(k)) isvalid = true;
     }
     if (isvalid) return obj;

From 5005da43a18d4307eba760db26ce6a7c857d6e08 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <benjamin.pannell@gmail.com>
Date: Tue, 16 Jul 2013 00:55:49 +0200
Subject: [PATCH 0671/1246] Refactoring to remove keys field

Appears to pass tests, removes all instances of the `keys` field on
models and instances, and replaces it with the ability to pass an array
to `id` to represent multiple primary keys.
---
 lib/Associations/Extend.js     |  15 ++--
 lib/Associations/Many.js       |  10 +--
 lib/Associations/One.js        |   6 +-
 lib/ChainFind.js               |   4 +-
 lib/Drivers/DDL/mysql.js       |  12 +--
 lib/Drivers/DDL/postgres.js    |  12 +--
 lib/Drivers/DDL/sqlite.js      |  11 +--
 lib/Instance.js                |  38 ++++----
 lib/Model.js                   |  47 ++++------
 lib/ORM.js                     |   1 -
 lib/Utilities.js               | 158 ++++++++++++++++-----------------
 test/integration/db.js         |   3 +-
 test/integration/model-keys.js |   2 +-
 13 files changed, 151 insertions(+), 168 deletions(-)

diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index f72b03e5..7c24acbd 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -21,8 +21,7 @@ exports.prepare = function (db, Model, associations, association_properties, mod
 		};
 
 		association.model = db.define(Model.table + "_" + name, properties, {
-			id        : null,
-			keys      : Object.keys(association.field),
+			id        : Object.keys(association.field),
 			extension : true
 		});
 		association.model.hasOne(Model.table, Model, { extension: true, field: association.field });
@@ -64,7 +63,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 			if (!Instance[Model.id]) {
 				cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension"));
 			} else {
-			    association.model.get(util.values(Instance, Model.keys), function (err, extension) {
+			    association.model.get(util.values(Instance, Model.id), function (err, extension) {
 					return cb(err, !err && extension ? true : false);
 				});
 			}
@@ -77,7 +76,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 			if (!Instance[Model.id]) {
 				cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension"));
 			} else {
-				association.model.get(util.values(Instance, Model.keys), cb);
+			    association.model.get(util.values(Instance, Model.id), cb);
 			}
 			return this;
 		},
@@ -96,8 +95,8 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 					}
 
 					var fields = Object.keys(association.field);
-					for (i = 0; i < Model.keys.length; i++) {
-						Extension[fields[i]] = Instance[Model.keys[i]];
+					for (i = 0; i < Model.id.length; i++) {
+					    Extension[fields[i]] = Instance[Model.id[i]];
 					}
 
 					Extension.save(cb);
@@ -114,8 +113,8 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 			} else {
 				var conditions = {};
 				var fields = Object.keys(association.field);
-				for (i = 0; i < Model.keys.length; i++) {
-					conditions[fields[i]] = Instance[Model.keys[i]];
+				for (i = 0; i < Model.id.length; i++) {
+				    conditions[fields[i]] = Instance[Model.id[i]];
 				}
 
 				association.model.find(conditions, function (err, extensions) {
diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index af55a481..d05f7a5e 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -6,7 +6,7 @@ var _ = require("lodash");
 var util = require("../Utilities");
 
 exports.prepare = function (Model, associations) {
-	if (Model.keys.length > 1) {
+    if (Model.id.length > 1) {
 		Model.hasMany = function () {
 			throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Model.hasMany() does not support multiple keys models");
 		};
@@ -121,13 +121,13 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 
 			options.__merge = {
 				from:   { table: association.mergeTable, field: Object.keys(association.mergeAssocId) },
-				to:     { table: association.model.table, field: association.model.keys },
+				to: { table: association.model.table, field: association.model.id },
 				where:  [ association.mergeTable, {} ]
 			};
 			options.extra = association.props;
 			options.extra_info = {
 				table: association.mergeTable,
-				id: util.values(Instance, Model.keys),
+				id: util.values(Instance, Model.id),
 				id_prop: Object.keys(association.mergeId),
 				assoc_prop: Object.keys(association.mergeAssocId)
 			};
@@ -196,13 +196,13 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 
 			options.__merge = {
 				from  : { table: association.mergeTable, field: Object.keys(association.mergeAssocId) },
-				to    : { table: association.model.table, field: association.model.keys },
+				to    : { table: association.model.table, field: association.model.id },
 				where : [ association.mergeTable, {} ]
 			};
 			options.extra = association.props;
 			options.extra_info = {
 				table: association.mergeTable,
-				id: util.values(Instance, Model.keys),
+				id: util.values(Instance, Model.id),
 				id_prop: Object.keys(association.mergeId),
 				assoc_prop: Object.keys(association.mergeAssocId)
 			};
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index fe20fa94..e2b19e61 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -85,7 +85,7 @@ exports.prepare = function (Model, associations, association_properties, model_f
 			}
 
 			options.__merge = {
-				from  : { table: association.model.table, field: association.model.keys },
+				from  : { table: association.model.table, field: association.model.id },
 				to    : { table: Model.table, field: Object.keys(association.field) },
 				where : [ association.model.table, conditions ],
 				table : Model.table
@@ -155,14 +155,14 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 			}
 
 			if (association.reversed) {
-				if (util.hasValues(Instance, Model.keys)) {
+			    if (util.hasValues(Instance, Model.id)) {
 				    association.model.find(util.getConditions(Model, Object.keys(association.field), Instance), opts, cb);
 				} else {
 					cb(null);
 				}
 			} else {
 			    if (Instance.isShell()) {
-			        Model.get(util.values(Instance, Model.keys), function (err, instance) {
+			        Model.get(util.values(Instance, Model.id), function (err, instance) {
 					    if (err || !util.hasValues(instance, Object.keys(association.field))) {
 							return cb(null);
 						}
diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 0c481a48..7b2840f0 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -159,7 +159,7 @@ function addChainMethod(chain, association, opts) {
 		var conditions = {};
         
 		var assocIds = Object.keys(association.mergeAssocId);
-		var ids = association.model.keys;
+		var ids = association.model.id;
 		function mergeConditions(source) {
 		    for (i = 0; i < assocIds.length; i++) {
 		        if (typeof conditions[assocIds[i]] == 'undefined')
@@ -181,7 +181,7 @@ function addChainMethod(chain, association, opts) {
 
 		opts.exists.push({
 			table      : association.mergeTable,
-			link       : [ Object.keys(association.mergeId), association.model.keys ],
+			link       : [ Object.keys(association.mergeId), association.model.id ],
 			conditions : conditions
 		});
 
diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index 593a2e65..1f95f345 100755
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -36,19 +36,19 @@ exports.sync = function (driver, opts, cb) {
 	var queries = [];
 	var definitions = [];
 	var k, i, pending;
-	var primary_keys = opts.keys.map(function (k) { return driver.query.escapeId(k); });
+	var primary_keys = opts.id.map(function (k) { return driver.query.escapeId(k); });
 	var keys = [];
 
-	for (i = 0; i < opts.keys.length; i++) {
-		if (opts.properties.hasOwnProperty(opts.keys[i])) continue;
+	for (i = 0; i < opts.id.length; i++) {
+		if (opts.properties.hasOwnProperty(opts.id[i])) continue;
 
-		keys.push(driver.query.escapeId(opts.keys[i]));
+		keys.push(driver.query.escapeId(opts.id[i]));
 	}
 
 	for (i = 0; i < keys.length; i++) {
-		definitions.push(keys[i] + " INT(11) UNSIGNED NOT NULL");
+		definitions.push(keys[i] + " INT(10) UNSIGNED NOT NULL");
 	}
-	if (opts.keys.length == 1 && !opts.extension) {
+	if (opts.id.length == 1 && !opts.extension) {
 		definitions[definitions.length - 1] += " AUTO_INCREMENT";
 	}
 
diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index e92706fd..c66e4121 100755
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -25,19 +25,19 @@ exports.sync = function (driver, opts, cb) {
 	var typequeries = [];
 	var definitions = [];
 	var k, i, pending;
-	var primary_keys = opts.keys.map(function (k) { return driver.query.escapeId(k); });
+	var primary_keys = opts.id.map(function (k) { return driver.query.escapeId(k); });
 	var keys = [];
+	for (i = 0; i < opts.id.length; i++) {
+	    if (opts.properties.hasOwnProperty(opts.id[i])) continue;
 
-	for (i = 0; i < opts.keys.length; i++) {
-		if (opts.properties.hasOwnProperty(opts.keys[i])) continue;
-
-		keys.push(driver.query.escapeId(opts.keys[i]));
+	    keys.push(driver.query.escapeId(opts.id[i]));
 	}
 
 	for (i = 0; i < keys.length; i++) {
 		definitions.push(keys[i] + " INTEGER NOT NULL");
 	}
-	if (opts.keys.length == 1 && !opts.extension) {
+
+	if (opts.id.length == 1 && !opts.extension) {
 		definitions[definitions.length - 1] = keys[0] + " SERIAL";
 	}
 
diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index 3a639eb9..d5bca17d 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -23,19 +23,20 @@ exports.sync = function (driver, opts, cb) {
 	var queries = [];
 	var definitions = [];
 	var k, i, pending;
-	var primary_keys = opts.keys.map(function (k) { return driver.query.escapeId(k); });
+	var primary_keys = opts.id.map(function (k) { return driver.query.escapeId(k); });
 	var keys = [];
 
-	for (i = 0; i < opts.keys.length; i++) {
-		if (opts.properties.hasOwnProperty(opts.keys[i])) continue;
+	for (i = 0; i < opts.id.length; i++) {
+	    if (opts.properties.hasOwnProperty(opts.id[i])) continue;
 
-		keys.push(driver.query.escapeId(opts.keys[i]));
+	    keys.push(driver.query.escapeId(opts.id[i]));
 	}
 
 	for (i = 0; i < keys.length; i++) {
 		definitions.push(keys[i] + " INTEGER UNSIGNED NOT NULL");
 	}
-	if (opts.keys.length == 1 && !opts.extension) {
+
+	if (opts.id.length == 1 && !opts.extension) {
 		definitions[definitions.length - 1] = keys[0] + " INTEGER PRIMARY KEY AUTOINCREMENT";
 	}
 
diff --git a/lib/Instance.js b/lib/Instance.js
index 011ec5b5..39f8e258 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -167,14 +167,14 @@ function Instance(Model, opts) {
 	var saveNew = function (cb, saveOptions, data) {
 		var next = afterSave.bind(this, cb, true);
 
-		opts.driver.insert(opts.table, data, opts.keys, function (save_err, info) {
+		opts.driver.insert(opts.table, data, opts.id, function (save_err, info) {
 			if (save_err) {
 				return saveError(cb, save_err);
 			}
 
 			opts.changes.length = 0;
-			for (var i = 0; i < opts.keys.length; i++) {
-				opts.data[opts.keys[i]] = info.hasOwnProperty(opts.keys[i]) ? info[opts.keys[i]] : data[opts.keys[i]];
+			for (var i = 0; i < opts.id.length; i++) {
+			    opts.data[opts.id[i]] = info.hasOwnProperty(opts.id[i]) ? info[opts.id[i]] : data[opts.id[i]];
 			}
 			opts.is_new = false;
 
@@ -192,8 +192,8 @@ function Instance(Model, opts) {
 		for (var i = 0; i < opts.changes.length; i++) {
 			changes[opts.changes[i]] = data[opts.changes[i]];
 		}
-		for (i = 0; i < opts.keys.length; i++) {
-			conditions[opts.keys[i]] = data[opts.keys[i]];
+		for (i = 0; i < opts.id.length; i++) {
+		    conditions[opts.id[i]] = data[opts.id[i]];
 		}
 
 		opts.driver.update(opts.table, changes, conditions, function (save_err) {
@@ -298,7 +298,7 @@ function Instance(Model, opts) {
 
 		for (i = 0; i < opts.extra_info.id; i++) {
 		    conditions[opts.extra_info.id_prop[i]] = opts.extra_info.id[i];
-		    conditions[opts.extra_info.assoc_prop[i]] = opts.data[opts.keys[i]];
+		    conditions[opts.extra_info.assoc_prop[i]] = opts.data[opts.id[i]];
 		}
 
 		opts.driver.update(opts.extra_info.table, data, conditions, function (err) {
@@ -311,8 +311,8 @@ function Instance(Model, opts) {
 		}
 
 		var conditions = {};
-		for (var i = 0; i < opts.keys.length; i++) {
-			conditions[opts.keys[i]] = opts.data[opts.keys[i]];
+		for (var i = 0; i < opts.id.length; i++) {
+		    conditions[opts.id[i]] = opts.data[opts.id[i]];
 		}
 
 		Hook.wait(instance, opts.hooks.beforeRemove, function (err) {
@@ -350,8 +350,8 @@ function Instance(Model, opts) {
 			}
 		}
 
-		for (var i = 0; i < opts.keys.length; i++) {
-			conditions[opts.keys[i]] = opts.data[opts.keys[i]];
+		for (var i = 0; i < opts.id.length; i++) {
+		    conditions[opts.id[i]] = opts.data[opts.id[i]];
 		}
 
 		Hook.wait(instance, opts.hooks.beforeSave, function (err) {
@@ -378,7 +378,7 @@ function Instance(Model, opts) {
 				return opts.data[key];
 			},
 			set: function (val) {
-				if (opts.keys.indexOf(key) >= 0 && opts.data.hasOwnProperty(key)) {
+			    if (opts.id.indexOf(key) >= 0 && opts.data.hasOwnProperty(key)) {
 					throw new Error("Cannot change ID");
 				}
 
@@ -415,21 +415,21 @@ function Instance(Model, opts) {
 		});
 	};
 
-	for (var i = 0; i < opts.keys.length; i++) {
-		if (!opts.data.hasOwnProperty(opts.keys[i])) {
-			addInstanceProperty(opts.keys[i]);
+	for (var i = 0; i < opts.id.length; i++) {
+	    if (!opts.data.hasOwnProperty(opts.id[i])) {
+	        addInstanceProperty(opts.id[i]);
 		}
 	}
 
 	for (var k in Model.properties) {
-		if (Model.properties.hasOwnProperty(k) && !opts.data.hasOwnProperty(k) && opts.keys.indexOf(k) == -1) {
+	    if (Model.properties.hasOwnProperty(k) && !opts.data.hasOwnProperty(k) && opts.id.indexOf(k) == -1) {
 			opts.data[k] = null;
 		}
 	}
 
 	for (k in opts.data) {
 		if (!opts.data.hasOwnProperty(k)) continue;
-		if (!Model.properties.hasOwnProperty(k) && opts.keys.indexOf(k) == -1 && opts.association_properties.indexOf(k) == -1) {
+		if (!Model.properties.hasOwnProperty(k) && opts.id.indexOf(k) == -1 && opts.association_properties.indexOf(k) == -1) {
 			if (!opts.extra.hasOwnProperty(k)) continue;
 
 			if (opts.driver.valueToProperty) {
@@ -548,8 +548,8 @@ function Instance(Model, opts) {
 		enumerable: false
 	});
 
-	for (var i = 0; i < opts.keys.length; i++) {
-		if (!opts.data.hasOwnProperty(opts.keys[i])) {
+	for (var i = 0; i < opts.id.length; i++) {
+	    if (!opts.data.hasOwnProperty(opts.id[i])) {
 			opts.changes = Object.keys(opts.data);
 			break;
 		}
@@ -572,7 +572,7 @@ function Instance(Model, opts) {
 				} else {
 				    var instanceInit = {};
 				    var usedChance = false;
-				    for (k in opts.one_associations[i].keys) {
+				    for (k in opts.one_associations[i].id) {
 				        if (!data.hasOwnProperty(k) && !usedChance) {
 				            instanceInit[k] = opts.data[asc.name];
 				            usedChance = true;
diff --git a/lib/Model.js b/lib/Model.js
index 4e223168..7dd0cf66 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -23,15 +23,9 @@ exports.Model = Model;
 
 function Model(opts) {
 	opts = opts || {};
-
-	if ((!Array.isArray(opts.keys) || opts.keys.length < 2) && !opts.extension) {
-	    if (Array.isArray(opts.id)) {
-	        opts.keys = opts.id;
-	    } else {
-	        opts.keys = [opts.id];
-	    }
-	} else {
-		opts.id = null;
+    
+	if (!Array.isArray(opts.id)) {
+	    opts.id = [opts.id];
 	}
 
 	var one_associations       = [];
@@ -40,8 +34,8 @@ function Model(opts) {
 	var association_properties = [];
 	var model_fields           = [];
 
-	for (var i = 0; i < opts.keys.length; i++) {
-		model_fields.push(opts.keys[i]);
+	for (var i = 0; i < opts.id.length; i++) {
+		model_fields.push(opts.id[i]);
 	}
 
 	var createHookHelper = function (hook) {
@@ -65,7 +59,7 @@ function Model(opts) {
 			if (k == "extra_field") continue;
 			if (opts.properties.hasOwnProperty(k)) continue;
 			if (inst_opts.extra && inst_opts.extra.hasOwnProperty(k)) continue;
-			if (opts.keys.indexOf(k) >= 0) continue;
+			if (opts.id.indexOf(k) >= 0) continue;
 			if (association_properties.indexOf(k) >= 0) continue;
 			
 			for (i = 0; i < one_associations.length; i++) {
@@ -96,7 +90,6 @@ function Model(opts) {
 		var instance = new Instance(model, {
 			uid                    : inst_opts.uid, // singleton unique id
 			id                     : opts.id,
-			keys                   : opts.keys,
 			is_new                 : inst_opts.is_new || false,
 			isShell                : inst_opts.isShell || false,
 			data                   : data,
@@ -157,7 +150,7 @@ function Model(opts) {
 		}
 
 		var isNew = false;
-		for (k in opts.keys) {
+		for (k in opts.id) {
 		    isNew |= !data.hasOwnProperty(k);
 		}
 
@@ -224,7 +217,7 @@ function Model(opts) {
 			try {
 				opts.driver.sync({
 					extension           : opts.extension,
-					keys                : opts.keys,
+					id                  : opts.id,
 					table               : opts.table,
 					properties          : opts.properties,
 					indexes             : opts.indexes || [],
@@ -260,12 +253,12 @@ function Model(opts) {
 			ids = ids[0];
 		}
 
-		if (ids.length != opts.keys.length) {
-			throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "Model.get() IDs number missmatch (" + opts.keys.length + " needed, " + ids.length + " passed)");
+		if (ids.length != opts.id.length) {
+			throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "Model.get() IDs number missmatch (" + opts.id.length + " needed, " + ids.length + " passed)");
 		}
 
-		for (var i = 0; i < opts.keys.length; i++) {
-			conditions[opts.keys[i]] = ids[i];
+		for (var i = 0; i < opts.id.length; i++) {
+			conditions[opts.id[i]] = ids[i];
 		}
 
 		if (!options.hasOwnProperty("autoFetchLimit")) {
@@ -382,8 +375,8 @@ function Model(opts) {
 			offset       : options.offset,
 			newInstance  : function (data, cb) {
 				var uid = opts.driver.uid + "/" + opts.table + (merge ? "+" + merge.from.table : "");
-				for (var i = 0; i < opts.keys.length; i++) {
-					uid += "/" + data[opts.keys[i]];
+				for (var i = 0; i < opts.id.length; i++) {
+					uid += "/" + data[opts.id[i]];
 				}
 
 				Singleton.get(uid, {
@@ -507,15 +500,15 @@ function Model(opts) {
 
 		if (ids.length === 1 && typeof ids[0] == "object") {
 			if (Array.isArray(ids[0])) {
-				for (i = 0; i < opts.keys.length; i++) {
-					conditions[opts.keys[i]] = ids[0][i];
+			    for (i = 0; i < opts.id.length; i++) {
+			        conditions[opts.id[i]] = ids[0][i];
 				}
 			} else {
 				conditions = ids[0];
 			}
 		} else {
-			for (i = 0; i < opts.keys.length; i++) {
-				conditions[opts.keys[i]] = ids[i];
+		    for (i = 0; i < opts.id.length; i++) {
+		        conditions[opts.id[i]] = ids[i];
 			}
 		}
 
@@ -595,10 +588,6 @@ function Model(opts) {
 		value: opts.id,
 		enumerable: false
 	});
-	Object.defineProperty(model, "keys", {
-		value: opts.keys,
-		enumerable: false
-	});
 	Object.defineProperty(model, "properties", {
 		value: opts.properties,
 		enumerable: false
diff --git a/lib/ORM.js b/lib/ORM.js
index 4c63d1b4..10ea953c 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -191,7 +191,6 @@ ORM.prototype.define = function (name, properties, opts) {
 		indexes        : opts.indexes || [],
 		cache          : opts.hasOwnProperty("cache") ? opts.cache : this.settings.get("instance.cache"),
 		id             : opts.id || this.settings.get("properties.primary_key"),
-		keys           : opts.keys,
 		autoSave       : opts.hasOwnProperty("autoSave") ? opts.autoSave : this.settings.get("instance.autoSave"),
 		autoFetch      : opts.hasOwnProperty("autoFetch") ? opts.autoFetch : this.settings.get("instance.autoFetch"),
 		autoFetchLimit : opts.autoFetchLimit || this.settings.get("instance.autoFetchLimit"),
diff --git a/lib/Utilities.js b/lib/Utilities.js
index 9c6a399c..3398283f 100644
--- a/lib/Utilities.js
+++ b/lib/Utilities.js
@@ -50,101 +50,95 @@ exports.standardizeOrder = function (order) {
  */
 
 exports.values = function (obj, keys) {
-    var vals = [];
-    if (keys) {
-        for (i = 0; i < keys.length; i++) {
-            vals.push(obj[keys[i]]);
-        }
-    }
-    else if (Array.isArray(obj)) {
-        for (i = 0; i < obj.length; i++) {
-            vals.push(obj[i]);
-        }
-    }
-    else {
-        for (k in obj) {
-            if (!/[0-9]+/.test(k))
-                vals.push(obj[k]);
-        }
-    }
-    return vals;
+	var vals = [];
+	if (keys) {
+		for (i = 0; i < keys.length; i++) {
+			vals.push(obj[keys[i]]);
+		}
+	}
+	else if (Array.isArray(obj)) {
+		for (i = 0; i < obj.length; i++) {
+			vals.push(obj[i]);
+		}
+	}
+	else {
+		for (k in obj) {
+			if (!/[0-9]+/.test(k))
+				vals.push(obj[k]);
+		}
+	}
+	return vals;
 };
 
 exports.hasValues = function (obj, keys) {
-    for (i = 0; i < keys.length; i++) {
-        if (!obj[keys[i]]) return false;
-    }
-    return true;
+	for (i = 0; i < keys.length; i++) {
+		if (!obj[keys[i]]) return false;
+	}
+	return true;
 };
 
 exports.populateConditions = function (model, fields, source, target, overwrite) {
-    for (i = 0; i < model.keys.length; i++) {
-        if (typeof target[fields[i]] == 'undefined' || overwrite !== false)
-            target[fields[i]] = source[model.keys[i]];
-        else if (Array.isArray(target[fields[i]]))
-            target[fields[i]].push(source[model.keys[i]]);
-        else
-            target[fields[i]] = [target[fields[i]], source[model.keys[i]]];
-    }
+	for (i = 0; i < model.id.length; i++) {
+		if (typeof target[fields[i]] == 'undefined' || overwrite !== false)
+			target[fields[i]] = source[model.id[i]];
+		else if (Array.isArray(target[fields[i]]))
+			target[fields[i]].push(source[model.id[i]]);
+		else
+			target[fields[i]] = [target[fields[i]], source[model.id[i]]];
+	}
 }
 
 exports.getConditions = function (model, fields, from) {
-    var conditions = {};
-    exports.populateConditions(model, fields, from, conditions);
-    return conditions;
+	var conditions = {};
+	exports.populateConditions(model, fields, from, conditions);
+	return conditions;
 }
 
 exports.wrapFieldObject = function (obj, model, altName, alternatives) {
-    if (!obj) {
-        obj = model.settings.get("properties.association_key").replace("{name}", altName.toLowerCase()).replace("{field}", "id");
-    }
-    isvalid = false;
-    for (k in obj) {
-        if (!/[0-9]+/.test(k) && obj.hasOwnProperty(k)) isvalid = true;
-    }
-    if (isvalid) return obj;
-
-    newobj = {};
-    newobj[obj] = alternatives[obj] || alternatives[model.keys[0]] || { type: 'number', unsigned: true, rational: false };
-    return newobj;
+	if (!obj) {
+		obj = model.settings.get("properties.association_key").replace("{name}", altName.toLowerCase()).replace("{field}", "id");
+	}
+	isvalid = false;
+	for (k in obj) {
+		if (!/[0-9]+/.test(k) && obj.hasOwnProperty(k)) isvalid = true;
+	}
+	if (isvalid) return obj;
+
+	newobj = {};
+	newobj[obj] = alternatives[obj] || alternatives[model.id[0]] || { type: 'number', unsigned: true, rational: false };
+	return newobj;
 };
 
 exports.formatField = function (model, name, required, reversed) {
-    var fields = {};
-    var keys;
-    if (Array.isArray(model.keys)) {
-        keys = model.keys;
-    }
-    else {
-        keys = [model.keys];
-    }
-
-    for (var i = 0; i < keys.length; i++) {
-        var fieldName = reversed ? keys[i] : model.settings.get("properties.association_key").replace("{name}", name.toLowerCase()).replace("{field}", keys[i]);
-        var fieldOpts = {
-            type: "number",
-            unsigned: true,
-            rational: false,
-            size: 4,
-            required: required
-        };
-
-        if (model.properties.hasOwnProperty(keys[i])) {
-            var p = model.properties[keys[i]];
-            fieldOpts = {
-                type: p.type || "number",
-                size: p.size || 4,
-                rational: p.rational || false,
-                unsigned: p.unsigned || true,
-                time: p.time || false,
-                big: p.big || false,
-                values: p.values || null,
-                required: required
-            };
-        };
-
-        fields[fieldName] = fieldOpts;
-    }
-
-    return fields;
+	var fields = {};
+	var keys = model.id;
+
+	for (var i = 0; i < keys.length; i++) {
+		var fieldName = reversed ? keys[i] : model.settings.get("properties.association_key").replace("{name}", name.toLowerCase()).replace("{field}", keys[i]);
+		var fieldOpts = {
+			type: "number",
+			unsigned: true,
+			rational: false,
+			size: 4,
+			required: required
+		};
+
+		if (model.properties.hasOwnProperty(keys[i])) {
+			var p = model.properties[keys[i]];
+			fieldOpts = {
+				type: p.type || "number",
+				size: p.size || 4,
+				rational: p.rational || false,
+				unsigned: p.unsigned || true,
+				time: p.time || false,
+				big: p.big || false,
+				values: p.values || null,
+				required: required
+			};
+		};
+
+		fields[fieldName] = fieldOpts;
+	}
+
+	return fields;
 };
\ No newline at end of file
diff --git a/test/integration/db.js b/test/integration/db.js
index da735a56..d40c050c 100644
--- a/test/integration/db.js
+++ b/test/integration/db.js
@@ -25,7 +25,8 @@ describe("db.use()", function () {
 			return {
 				define: function (Model) {
 					Model.should.be.a("function");
-					Model.id.should.be.a("string");
+					Model.id.should.be.a("object");
+					Model.id[0].should.be.a("string");
 					calledDefine = true;
 				}
 			};
diff --git a/test/integration/model-keys.js b/test/integration/model-keys.js
index 06a4f0af..42eef517 100644
--- a/test/integration/model-keys.js
+++ b/test/integration/model-keys.js
@@ -56,7 +56,7 @@ describe("Model keys option", function() {
 				user   : String,
 				action : [ "in", "out" ]
 			}, {
-				keys   : [ "year", "month", "day" ]
+				id   : [ "year", "month", "day" ]
 			});
 
 			return helper.dropSync(DoorAccessHistory, function () {

From 88d93489aae9b0a688fcfdda60e3f49e2b98fcbd Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <benjamin.pannell@gmail.com>
Date: Tue, 16 Jul 2013 02:15:41 +0200
Subject: [PATCH 0672/1246] Fix problem with extendsTo and custom key types

Should fix a problem with propagating identifier field types to an
extended model.
---
 lib/Associations/Extend.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index 4e0cefe9..30d11ef1 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -1,6 +1,7 @@
 var ErrorCodes = require("../ErrorCodes");
 var Settings   = require("../Settings");
 var Singleton = require("../Singleton");
+var _ = require('lodash');
 var util = require("../Utilities");
 
 exports.prepare = function (db, Model, associations, association_properties, model_fields) {
@@ -13,14 +14,19 @@ exports.prepare = function (db, Model, associations, association_properties, mod
 			reversed       : opts.reversed,
 			autoFetch      : opts.autoFetch || false,
 			autoFetchLimit : opts.autoFetchLimit || 2,
-			field          : util.wrapFieldObject(opts.field, Model, Model.table, []) || util.formatField(Model, Model.table, false, false),
+			field          : util.wrapFieldObject(opts.field, Model, Model.table, Model.properties) || util.formatField(Model, Model.table, false, false),
 			getAccessor    : opts.getAccessor || ("get" + assocName),
 			setAccessor    : opts.setAccessor || ("set" + assocName),
 			hasAccessor    : opts.hasAccessor || ("has" + assocName),
 			delAccessor    : opts.delAccessor || ("remove" + assocName)
 		};
 
-		association.model = db.define(Model.table + "_" + name, properties, {
+		var newproperties = _.cloneDeep(properties);
+		for (var k in association.field) {
+		    newproperties[k] = association.field[k];
+		}
+
+		association.model = db.define(Model.table + "_" + name, newproperties, {
 			id        : Object.keys(association.field),
 			extension : true
 		});

From 9bfef0ee01fa81df1aa55ae7d0e6c70f49b3f2c4 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <benjamin.pannell@gmail.com>
Date: Tue, 16 Jul 2013 02:30:45 +0200
Subject: [PATCH 0673/1246] Added tests for smart_associations

Some preliminary tests to ensure that everything functions as it should.
Covers extendsTo, hasOne and hasMany.
---
 test/integration/smart-types.js | 135 ++++++++++++++++++++++++++++++++
 1 file changed, 135 insertions(+)
 create mode 100644 test/integration/smart-types.js

diff --git a/test/integration/smart-types.js b/test/integration/smart-types.js
new file mode 100644
index 00000000..8142bbb3
--- /dev/null
+++ b/test/integration/smart-types.js
@@ -0,0 +1,135 @@
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var ORM      = require('../../');
+
+describe("Smart types", function () {
+    this.timeout(0);
+	var db = null;
+	var User = null;
+	var Profile = null;
+	var Post = null;
+	var Group = null;
+
+	var setup = function () {
+		return function (done) {
+		    User = db.define("user", {
+		        username: { type: 'text', size: 64 },
+                password: { type: 'text', size: 128 }
+		    }, {
+                id: 'username'
+		    });
+
+		    Profile = User.extendsTo("profile", {
+		        firstname: String,
+                lastname: String
+		    }, {
+		        reverse: 'user',
+                required: true
+		    });
+
+		    Group = db.define("group", {
+		        name: { type: 'text', size: 64 }
+		    }, {
+                id: 'name'
+		    });
+		    Group.hasMany('users', User, {}, {
+                reverse: 'groups'
+		    });
+
+		    Post = db.define("post", {
+                content: String
+		    }, {
+
+		    });
+		    Post.hasOne('user', User, {
+                reverse: 'posts'
+		    });
+
+			ORM.singleton.clear();
+			return helper.dropSync([ User, Profile, Group, Post ], function () {
+			    User.create({
+			        username: 'billy',
+			        password: 'hashed password'
+			    }, function (err, billy) {
+			        should.not.exist(err);
+			        billy.setProfile(new Profile({ firstname: 'William', lastname: 'Franklin' }), function (err, profile) {
+			            should.not.exist(err);
+			            billy.addGroups([new Group({ name: 'admins' }), new Group({ name: 'developers' })], function (err, groups) {
+			                should.not.exist(err);
+			                billy.setPosts(new Post({content: 'Hello world!'}), function(err, posts) {
+			                    should.not.exist(err);
+			                    done();
+			                });
+			            });
+			        });
+			    });
+			});
+		};
+	};
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			return done();
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	describe("extends", function () {
+		before(setup());
+
+		it("should be able to get extendsTo with custom id", function (done) {
+		    User.get('billy', function (err, billy) {
+		        should.not.exist(err);
+		        should.exist(billy);
+
+		        billy.getProfile(function (err, profile) {
+		            should.not.exist(err);
+		            should.exist(profile);
+		            should.equal(profile.firstname, 'William');
+		            should.equal(profile.lastname, 'Franklin');
+
+		            done();
+		        });
+		    });
+		});
+
+		it("should be able to get hasOne with custom id", function (done) {
+		    User.get('billy', function (err, billy) {
+		        should.not.exist(err);
+		        should.exist(billy);
+
+		        billy.getPosts(function (err, posts) {
+		            should.not.exist(err);
+		            should.exist(posts);
+		            should.equal(posts.length, 1);
+		            should.equal(posts[0].content, 'Hello world!');
+
+		            done();
+		        });
+		    });
+		});
+
+		it("should be able to get hasMany with custom id", function (done) {
+		    User.get('billy', function (err, billy) {
+		        should.not.exist(err);
+		        should.exist(billy);
+
+		        billy.getGroups(function (err, groups) {
+		            should.not.exist(err);
+		            should.exist(groups);
+		            should.equal(groups.length, 2);
+		            should.equal(groups[0].name, 'developers');
+		            should.equal(groups[1].name, 'admins');
+
+		            done();
+		        });
+		    });
+		});
+		
+	});
+});

From c27e8afcd6aec7c526d6e8b9a2917c2f031a1d4d Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <benjamin.pannell@gmail.com>
Date: Tue, 16 Jul 2013 02:30:45 +0200
Subject: [PATCH 0674/1246] Added tests for smart_associations

Some preliminary tests to ensure that everything functions as it should.
Covers extendsTo, hasOne and hasMany.
---
 test/integration/smart-types.js | 133 ++++++++++++++++++++++++++++++++
 1 file changed, 133 insertions(+)
 create mode 100644 test/integration/smart-types.js

diff --git a/test/integration/smart-types.js b/test/integration/smart-types.js
new file mode 100644
index 00000000..cea7ca33
--- /dev/null
+++ b/test/integration/smart-types.js
@@ -0,0 +1,133 @@
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var ORM      = require('../../');
+
+describe("Smart types", function () {
+    this.timeout(0);
+	var db = null;
+	var User = null;
+	var Profile = null;
+	var Post = null;
+	var Group = null;
+
+	var setup = function () {
+		return function (done) {
+		    User = db.define("user", {
+		        username: { type: 'text', size: 64 },
+                password: { type: 'text', size: 128 }
+		    }, {
+                id: 'username'
+		    });
+
+		    Profile = User.extendsTo("profile", {
+		        firstname: String,
+                lastname: String
+		    }, {
+		        reverse: 'user',
+                required: true
+		    });
+
+		    Group = db.define("group", {
+		        name: { type: 'text', size: 64 }
+		    }, {
+                id: 'name'
+		    });
+		    Group.hasMany('users', User, {}, {
+                reverse: 'groups'
+		    });
+
+		    Post = db.define("post", {
+                content: String
+		    }, {
+
+		    });
+		    Post.hasOne('user', User, {
+                reverse: 'posts'
+		    });
+
+			ORM.singleton.clear();
+			return helper.dropSync([ User, Profile, Group, Post ], function () {
+			    User.create({
+			        username: 'billy',
+			        password: 'hashed password'
+			    }, function (err, billy) {
+			        should.not.exist(err);
+			        billy.setProfile(new Profile({ firstname: 'William', lastname: 'Franklin' }), function (err, profile) {
+			            should.not.exist(err);
+			            billy.addGroups([new Group({ name: 'admins' }), new Group({ name: 'developers' })], function (err, groups) {
+			                should.not.exist(err);
+			                billy.setPosts(new Post({content: 'Hello world!'}), function(err, posts) {
+			                    should.not.exist(err);
+			                    done();
+			                });
+			            });
+			        });
+			    });
+			});
+		};
+	};
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			return done();
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	describe("extends", function () {
+		before(setup());
+
+		it("should be able to get extendsTo with custom id", function (done) {
+		    User.get('billy', function (err, billy) {
+		        should.not.exist(err);
+		        should.exist(billy);
+
+		        billy.getProfile(function (err, profile) {
+		            should.not.exist(err);
+		            should.exist(profile);
+		            should.equal(profile.firstname, 'William');
+		            should.equal(profile.lastname, 'Franklin');
+
+		            done();
+		        });
+		    });
+		});
+
+		it("should be able to get hasOne with custom id", function (done) {
+		    User.get('billy', function (err, billy) {
+		        should.not.exist(err);
+		        should.exist(billy);
+
+		        billy.getPosts(function (err, posts) {
+		            should.not.exist(err);
+		            should.exist(posts);
+		            should.equal(posts.length, 1);
+		            should.equal(posts[0].content, 'Hello world!');
+
+		            done();
+		        });
+		    });
+		});
+
+		it("should be able to get hasMany with custom id", function (done) {
+		    User.get('billy', function (err, billy) {
+		        should.not.exist(err);
+		        should.exist(billy);
+
+		        billy.getGroups(function (err, groups) {
+		            should.not.exist(err);
+		            should.exist(groups);
+		            should.equal(groups.length, 2);
+
+		            done();
+		        });
+		    });
+		});
+		
+	});
+});

From 7c7d3f933305615090e240ebfb2568cd96122eeb Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 16 Jul 2013 11:33:31 +0100
Subject: [PATCH 0675/1246] Changes some indentations from 4-spaces to tabs

---
 lib/Associations/Extend.js | 10 ++++-----
 lib/Associations/Many.js   | 19 ++++++++--------
 lib/Associations/One.js    | 44 +++++++++++++++++++-------------------
 3 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index 30d11ef1..00b23daf 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -1,8 +1,8 @@
+var _          = require('lodash');
 var ErrorCodes = require("../ErrorCodes");
 var Settings   = require("../Settings");
-var Singleton = require("../Singleton");
-var _ = require('lodash');
-var util = require("../Utilities");
+var Singleton  = require("../Singleton");
+var util       = require("../Utilities");
 
 exports.prepare = function (db, Model, associations, association_properties, model_fields) {
 	Model.extendsTo = function (name, properties, opts) {
@@ -69,7 +69,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 			if (!Instance[Model.id]) {
 				cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension"));
 			} else {
-			    association.model.get(util.values(Instance, Model.id), function (err, extension) {
+				association.model.get(util.values(Instance, Model.id), function (err, extension) {
 					return cb(err, !err && extension ? true : false);
 				});
 			}
@@ -82,7 +82,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 			if (!Instance[Model.id]) {
 				cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension"));
 			} else {
-			    association.model.get(util.values(Instance, Model.id), cb);
+				association.model.get(util.values(Instance, Model.id), cb);
 			}
 			return this;
 		},
diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index d05f7a5e..0187129a 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -1,12 +1,12 @@
+var _                   = require("lodash");
 var InstanceConstructor = require("../Instance").Instance;
 var Settings            = require("../Settings");
 var Property            = require("../Property");
 var ErrorCodes          = require("../ErrorCodes");
-var _ = require("lodash");
-var util = require("../Utilities");
+var util                = require("../Utilities");
 
 exports.prepare = function (Model, associations) {
-    if (Model.id.length > 1) {
+	if (Model.id.length > 1) {
 		Model.hasMany = function () {
 			throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Model.hasMany() does not support multiple keys models");
 		};
@@ -43,7 +43,7 @@ exports.prepare = function (Model, associations) {
 				props[k] = Property.normalize(props[k], Model.settings);
 			}
 		}
-        
+
 		var assocName = opts.name || ucfirst(name);
 		var association = {
 			name           : name,
@@ -106,7 +106,6 @@ exports.autoFetch = function (Instance, associations, opts, cb) {
 };
 
 function extendInstance(Model, Instance, Driver, association, opts) {
-	
 	if (Model.settings.get("instance.cascadeRemove")) {
 		Instance.on("beforeRemove", function () {
 			Instance[association.delAccessor]();
@@ -219,7 +218,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 			if (cb === null) {
 				return association.model.find(conditions, options);
 			}
-			
+
 			association.model.find(conditions, options, cb);
 			return this;
 		},
@@ -262,14 +261,14 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 				if (Associations.length === 0) {
 					return Driver.remove(association.mergeTable, conditions, cb);
 				}
-				
-				for (var i = 0; i < Associations.length; i++) {				    
+
+				for (var i = 0; i < Associations.length; i++) {
 					util.populateConditions(association.model, Object.keys(association.mergeAssocId), Associations[i], conditions, false);
 				}
 
 				Driver.remove(association.mergeTable, conditions, cb);
 			};
-            
+
 			util.populateConditions(Model, Object.keys(association.mergeId), Instance, conditions);
 
 			if (this.saved()) {
@@ -312,7 +311,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 						for (var k in opts) {
 							data[k] = opts[k];
 						}
-                        
+
 						Driver.insert(association.mergeTable, data, null, function (err) {
 							if (err) {
 								return cb(err);
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index ef61baf8..da69de16 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -1,7 +1,7 @@
+var _         = require("lodash");
 var Settings  = require("../Settings");
+var util      = require("../Utilities");
 var Accessors = { "get": "get", "set": "set", "has": "has", "del": "remove" };
-var _ = require("lodash");
-var util = require("../Utilities");
 
 exports.prepare = function (Model, associations, association_properties, model_fields) {
 	Model.hasOne = function () {
@@ -35,9 +35,9 @@ exports.prepare = function (Model, associations, association_properties, model_f
 		assocName = ucfirst(association.name);
 
 		if (!association.hasOwnProperty("field")) {
-		    association.field = util.formatField(association.model, association.name, association.required, association.reversed);
+			association.field = util.formatField(association.model, association.name, association.required, association.reversed);
 		} else if(!association.extension) {
-		    association.field = util.wrapFieldObject(association.field, Model, Model.table, Model.properties);
+			association.field = util.wrapFieldObject(association.field, Model, Model.table, Model.properties);
 		}
 		for (var k in Accessors) {
 			if (!association.hasOwnProperty(k + "Accessor")) {
@@ -47,10 +47,10 @@ exports.prepare = function (Model, associations, association_properties, model_f
 
 		associations.push(association);
 		for (k in association.field) {
-		    association_properties.push(k);
-		    if (!association.reversed) {
-		        model_fields.push(k);
-		    }
+			association_properties.push(k);
+			if (!association.reversed) {
+				model_fields.push(k);
+			}
 		}
 
 		if (association.reverse) {
@@ -136,7 +136,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 			}
 
 			if (util.hasValues(Instance, Object.keys(association.field))) {
-			    association.model.get(util.values(Instance, Object.keys(association.field)), opts, function (err, instance) {
+				association.model.get(util.values(Instance, Object.keys(association.field)), opts, function (err, instance) {
 					return cb(err, instance ? true : false);
 				});
 			} else {
@@ -155,21 +155,21 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 			}
 
 			if (association.reversed) {
-			    if (util.hasValues(Instance, Model.id)) {
-				    association.model.find(util.getConditions(Model, Object.keys(association.field), Instance), opts, cb);
+				if (util.hasValues(Instance, Model.id)) {
+					association.model.find(util.getConditions(Model, Object.keys(association.field), Instance), opts, cb);
 				} else {
 					cb(null);
 				}
 			} else {
-			    if (Instance.isShell()) {
-			        Model.get(util.values(Instance, Model.id), function (err, instance) {
-					    if (err || !util.hasValues(instance, Object.keys(association.field))) {
+				if (Instance.isShell()) {
+					Model.get(util.values(Instance, Model.id), function (err, instance) {
+						if (err || !util.hasValues(instance, Object.keys(association.field))) {
 							return cb(null);
 						}
-					    association.model.get(util.values(instance, Object.keys(association.field)), opts, cb);
+						association.model.get(util.values(instance, Object.keys(association.field)), opts, cb);
 					});
-			    } else if (util.hasValues(Instance, Object.keys(association.field))) {
-			        association.model.get(util.values(Instance, Object.keys(association.field)), opts, cb);
+				} else if (util.hasValues(Instance, Object.keys(association.field))) {
+					association.model.get(util.values(Instance, Object.keys(association.field)), opts, cb);
 				} else {
 					cb(null);
 				}
@@ -180,7 +180,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 		enumerable: false
 	});
 	Object.defineProperty(Instance, association.setAccessor, {
-	    value: function (OtherInstance, cb) {
+		value: function (OtherInstance, cb) {
 			if (association.reversed) {
 				Instance.save(function (err) {
 					if (err) {
@@ -209,10 +209,10 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 	});
 	if (!association.reversed) {
 		Object.defineProperty(Instance, association.delAccessor, {
-		    value: function (cb) {
-		        for (var k in association.field) {
-		            Instance[k] = null;
-		        }
+			value: function (cb) {
+				for (var k in association.field) {
+					Instance[k] = null;
+				}
 				Instance.save(cb);
 
 				return this;

From 6c4f3ea50ada3e1a2f8b42e38f5226e1bda93db2 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 16 Jul 2013 11:36:52 +0100
Subject: [PATCH 0676/1246] Changes some indentations from 4-spaces to tabs

In Model.js
---
 lib/Model.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/Model.js b/lib/Model.js
index 7dd0cf66..268aa9a2 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -23,9 +23,9 @@ exports.Model = Model;
 
 function Model(opts) {
 	opts = opts || {};
-    
+
 	if (!Array.isArray(opts.id)) {
-	    opts.id = [opts.id];
+		opts.id = [opts.id];
 	}
 
 	var one_associations       = [];
@@ -61,7 +61,7 @@ function Model(opts) {
 			if (inst_opts.extra && inst_opts.extra.hasOwnProperty(k)) continue;
 			if (opts.id.indexOf(k) >= 0) continue;
 			if (association_properties.indexOf(k) >= 0) continue;
-			
+
 			for (i = 0; i < one_associations.length; i++) {
 				if (one_associations[i].name == k) {
 					found_assoc = true;
@@ -150,8 +150,9 @@ function Model(opts) {
 		}
 
 		var isNew = false;
-		for (k in opts.id) {
-		    isNew |= !data.hasOwnProperty(k);
+
+		for (var k in opts.id) {
+			isNew |= !data.hasOwnProperty(k);
 		}
 
 		return createInstance(data, {
@@ -500,15 +501,15 @@ function Model(opts) {
 
 		if (ids.length === 1 && typeof ids[0] == "object") {
 			if (Array.isArray(ids[0])) {
-			    for (i = 0; i < opts.id.length; i++) {
-			        conditions[opts.id[i]] = ids[0][i];
+				for (i = 0; i < opts.id.length; i++) {
+					conditions[opts.id[i]] = ids[0][i];
 				}
 			} else {
 				conditions = ids[0];
 			}
 		} else {
-		    for (i = 0; i < opts.id.length; i++) {
-		        conditions[opts.id[i]] = ids[i];
+			for (i = 0; i < opts.id.length; i++) {
+				conditions[opts.id[i]] = ids[i];
 			}
 		}
 

From 8fc7dc23784608bced4190f2ea95061a828707f6 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 16 Jul 2013 11:41:44 +0100
Subject: [PATCH 0677/1246] Changes Readme test command to 'npm test',
 reindents package.json

---
 Readme.md    |   2 +-
 package.json | 104 +++++++++++++++++++++++++--------------------------
 2 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/Readme.md b/Readme.md
index a7ae32f9..a3f340b6 100755
--- a/Readme.md
+++ b/Readme.md
@@ -16,7 +16,7 @@ Tests are done using [Travis CI](https://travis-ci.org/) for node versions `0.6.
 tests locally.
 
 ```sh
-make
+npm test
 ```
 
 ## DBMS Support
diff --git a/package.json b/package.json
index af6a0996..235a289d 100644
--- a/package.json
+++ b/package.json
@@ -1,54 +1,54 @@
 {
-  "author"      : "Diogo Resende <dresende@thinkdigital.pt>",
-  "name"        : "orm",
-  "description" : "NodeJS Object-relational mapping",
-  "keywords"    : [
-    "orm",
-    "odm",
-    "database",
-    "mysql",
-    "postgres",
-    "redshift",
-    "sqlite"
-  ],
-  "version"     : "2.0.15",
-  "license"     : "MIT",
-  "homepage"    : "http://dresende.github.io/node-orm2",
-  "repository"  : "http://github.com/dresende/node-orm2.git",
-  "scripts"     : {
-    "test"      : "make"
-  },
-  "contributors": [
-    { "name" : "Bramus Van Damme", "email" : "bramus@bram.us" },
-    { "name" : "Lorien Gamaroff",  "email" : "lorien@gamaroff.org" },
-    { "name" : "preslavrachev" },
-    { "name" : "Chris Cowan",      "email" : "me@chriscowan.us" },
-    { "name" : "Paul Dixon",       "email" : "paul.dixon@mintbridge.co.uk" },
-    { "name" : "David Kosub" },
-    { "name" : "Arek W" },
-    { "name" : "Joseph Gilley",    "email" : "joe.gilley@gmail.com" },
-	{ "name" : "Benjamin Pannell", "email" : "admin@sierrasoftworks.com" }
-  ],
-  "main"        : "./lib/ORM",
-  "scripts"     : {
-    "test"      : "make test"
-  },
-  "engines"     : {
-    "node"      : "*"
-  },
-  "analyse"     : false,
-  "dependencies": {
-    "sql-query" : "0.1.5",
-    "hat"       : "0.0.3",
-    "lodash"    : "1.3.1"
-  },
-  "devDependencies": {
-    "mysql"   : "2.0.0-alpha7",
-    "pg"      : "1.0.0",
-    "sqlite3" : "2.1.7",
-    "async"   : "*",
-    "mocha"   : "1.12.0",
-    "should"  : "1.2.2"
-  },
-  "optionalDependencies": {}
+	"author"      : "Diogo Resende <dresende@thinkdigital.pt>",
+	"name"        : "orm",
+	"description" : "NodeJS Object-relational mapping",
+	"keywords"    : [
+		"orm",
+		"odm",
+		"database",
+		"mysql",
+		"postgres",
+		"redshift",
+		"sqlite"
+	],
+	"version"     : "2.0.15",
+	"license"     : "MIT",
+	"homepage"    : "http://dresende.github.io/node-orm2",
+	"repository"  : "http://github.com/dresende/node-orm2.git",
+	"scripts"     : {
+		"test"      : "make"
+	},
+	"contributors": [
+		{ "name" : "Bramus Van Damme", "email" : "bramus@bram.us" },
+		{ "name" : "Lorien Gamaroff",  "email" : "lorien@gamaroff.org" },
+		{ "name" : "preslavrachev" },
+		{ "name" : "Chris Cowan",      "email" : "me@chriscowan.us" },
+		{ "name" : "Paul Dixon",       "email" : "paul.dixon@mintbridge.co.uk" },
+		{ "name" : "David Kosub" },
+		{ "name" : "Arek W" },
+		{ "name" : "Joseph Gilley",    "email" : "joe.gilley@gmail.com" },
+		{ "name" : "Benjamin Pannell", "email" : "admin@sierrasoftworks.com" }
+	],
+	"main"        : "./lib/ORM",
+	"scripts"     : {
+		"test"      : "make test"
+	},
+	"engines"     : {
+		"node"      : "*"
+	},
+	"analyse"     : false,
+	"dependencies": {
+		"sql-query" : "0.1.5",
+		"hat"       : "0.0.3",
+		"lodash"    : "1.3.1"
+	},
+	"devDependencies": {
+		"mysql"   : "2.0.0-alpha7",
+		"pg"      : "1.0.0",
+		"sqlite3" : "2.1.7",
+		"async"   : "*",
+		"mocha"   : "1.12.0",
+		"should"  : "1.2.2"
+	},
+	"optionalDependencies": {}
 }

From b74e4683a8be47537bd056b8770e759c7ebd693f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 16 Jul 2013 11:46:13 +0100
Subject: [PATCH 0678/1246] Fixes Model.aggregate().call() to accept no
 arguments except function name

---
 lib/AggregateFunctions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index 165aeebc..07e9e7d4 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -71,7 +71,7 @@ function AggregateFunctions(opts) {
 			return this;
 		},
 		call: function (fun, args) {
-			if (args.length > 0) {
+			if (args && args.length > 0) {
 				aggregates[aggregates.length - 1].push({ f: fun, a: args, alias: aggregateAlias(fun, args) });
 				// aggregates.push([]);
 			} else {

From b85a80c7657085cb2036eac29c1a040fdf452200 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 16 Jul 2013 11:58:20 +0100
Subject: [PATCH 0679/1246] Fixes some aggregate bugs, updates aggregate tests

---
 lib/AggregateFunctions.js           |  4 +--
 test/integration/model-aggregate.js | 50 +++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index 07e9e7d4..40f65697 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -60,7 +60,7 @@ function AggregateFunctions(opts) {
 			return this;
 		},
 		as: function (alias) {
-			if (aggregates.length === 0) {
+			if (aggregates.length === 0 || (aggregates.length == 1 && aggregates[0].length === 0)) {
 				throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "No aggregate functions defined yet");
 			}
 
@@ -78,7 +78,7 @@ function AggregateFunctions(opts) {
 				aggregates[aggregates.length - 1].push({ f: fun, alias: aggregateAlias(fun, args) });
 			}
 
-			if (fun == "distinct") {
+			if (fun.toLowerCase() == "distinct") {
 				used_distinct = true;
 			}
 
diff --git a/test/integration/model-aggregate.js b/test/integration/model-aggregate.js
index 989d2fca..1289b213 100644
--- a/test/integration/model-aggregate.js
+++ b/test/integration/model-aggregate.js
@@ -55,6 +55,56 @@ describe("Model.aggregate()", function() {
 		});
 	});
 
+	describe("with call()", function () {
+		before(setup());
+
+		it("should accept a function", function (done) {
+			Person.aggregate().call('COUNT').get(function (err, count) {
+				should.equal(err, null);
+
+				count.should.equal(3);
+
+				return done();
+			});
+		});
+
+		it("should accept arguments to the funciton as an Array", function (done) {
+			Person.aggregate().call('COUNT', [ 'id' ]).get(function (err, count) {
+				should.equal(err, null);
+
+				count.should.equal(3);
+
+				return done();
+			});
+		});
+
+		describe("if function is DISTINCT", function () {
+			it("should work as calling .distinct() directly", function (done) {
+				Person.aggregate().call('DISTINCT', [ 'name' ]).as('name').order('name').get(function (err, rows) {
+					should.equal(err, null);
+
+					should(Array.isArray(rows));
+					rows.length.should.equal(2);
+
+					rows[0].should.equal('Jane Doe');
+					rows[1].should.equal('John Doe');
+
+					return done();
+				});
+			});
+		});
+	});
+
+	describe("with as() without previous aggregates", function () {
+		before(setup());
+
+		it("should throw", function (done) {
+			Person.aggregate().as.should.throw();
+
+			return done();
+		});
+	});
+
 	describe("with select() without arguments", function () {
 		before(setup());
 

From 9c931df52390be301ffb1c4ccca2bd1325c94b17 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 16 Jul 2013 12:18:28 +0100
Subject: [PATCH 0680/1246] Reindents Utilities to tabs, adds some
 optimizations

---
 lib/Utilities.js | 138 +++++++++++++++++++++++++----------------------
 1 file changed, 75 insertions(+), 63 deletions(-)

diff --git a/lib/Utilities.js b/lib/Utilities.js
index a465170e..635208c4 100644
--- a/lib/Utilities.js
+++ b/lib/Utilities.js
@@ -50,95 +50,107 @@ exports.standardizeOrder = function (order) {
  */
 
 exports.values = function (obj, keys) {
-    var i, k, vals = [];
-    if (keys) {
-        for (i = 0; i < keys.length; i++) {
-            vals.push(obj[keys[i]]);
-        }
-    }
-    else if (Array.isArray(obj)) {
-        for (i = 0; i < obj.length; i++) {
-            vals.push(obj[i]);
-        }
-    }
-    else {
-        for (k in obj) {
-            if (!/[0-9]+/.test(k))
-                vals.push(obj[k]);
-        }
-    }
-    return vals;
+	var i, k, vals = [];
+
+	if (keys) {
+		for (i = 0; i < keys.length; i++) {
+			vals.push(obj[keys[i]]);
+		}
+	} else if (Array.isArray(obj)) {
+		for (i = 0; i < obj.length; i++) {
+			vals.push(obj[i]);
+		}
+	} else {
+		for (k in obj) {
+			if (!/[0-9]+/.test(k)) {
+				vals.push(obj[k]);
+			}
+		}
+	}
+	return vals;
 };
 
 exports.hasValues = function (obj, keys) {
-    for (var i = 0; i < keys.length; i++) {
-        if (!obj[keys[i]]) return false;
-    }
-    return true;
+	for (var i = 0; i < keys.length; i++) {
+		if (!obj[keys[i]]) return false;
+	}
+	return true;
 };
 
 exports.populateConditions = function (model, fields, source, target, overwrite) {
-    for (var i = 0; i < model.id.length; i++) {
-        if (typeof target[fields[i]] == 'undefined' || overwrite !== false)
-            target[fields[i]] = source[model.id[i]];
-        else if (Array.isArray(target[fields[i]]))
-            target[fields[i]].push(source[model.id[i]]);
-        else
-            target[fields[i]] = [target[fields[i]], source[model.id[i]]];
-    }
+	for (var i = 0; i < model.id.length; i++) {
+		if (typeof target[fields[i]] == 'undefined' || overwrite !== false) {
+			target[fields[i]] = source[model.id[i]];
+		} else if (Array.isArray(target[fields[i]])) {
+			target[fields[i]].push(source[model.id[i]]);
+		} else {
+			target[fields[i]] = [target[fields[i]], source[model.id[i]]];
+		}
+	}
 }
 
 exports.getConditions = function (model, fields, from) {
 	var conditions = {};
+
 	exports.populateConditions(model, fields, from, conditions);
+
 	return conditions;
 }
 
 exports.wrapFieldObject = function (obj, model, altName, alternatives) {
-    if (!obj) {
-        obj = model.settings.get("properties.association_key").replace("{name}", altName.toLowerCase()).replace("{field}", "id");
-    }
-    isvalid = false;
-    for (var k in obj) {
-        if (!/[0-9]+/.test(k) && obj.hasOwnProperty(k)) isvalid = true;
-    }
-    if (isvalid) return obj;
-
-    newobj = {};
-    newobj[obj] = alternatives[obj] || alternatives[model.id[0]] || { type: 'number', unsigned: true, rational: false };
-    return newobj;
+	if (!obj) {
+		obj = model.settings.get("properties.association_key")
+		                    .replace("{name}", altName.toLowerCase())
+		                    .replace("{field}", "id");
+	}
+
+	for (var k in obj) {
+		if (!/[0-9]+/.test(k) && obj.hasOwnProperty(k)) {
+			return obj;
+		}
+	}
+
+	var new_obj = {};
+
+	new_obj[obj] = alternatives[obj] || alternatives[model.id[0]] || { type: 'number', unsigned: true, rational: false };
+
+	return new_obj;
 };
 
 exports.formatField = function (model, name, required, reversed) {
-	var fields = {};
+	var fields = {}, field_opts, field_name;
 	var keys = model.id;
 
 	for (var i = 0; i < keys.length; i++) {
-		var fieldName = reversed ? keys[i] : model.settings.get("properties.association_key").replace("{name}", name.toLowerCase()).replace("{field}", keys[i]);
-		var fieldOpts = {
-			type: "number",
-			unsigned: true,
-			rational: false,
-			size: 4,
-			required: required
-		};
+		field_name = reversed ? keys[i] : model.settings.get("properties.association_key")
+		                                                .replace("{name}", name.toLowerCase())
+		                                                .replace("{field}", keys[i]);
 
 		if (model.properties.hasOwnProperty(keys[i])) {
 			var p = model.properties[keys[i]];
-			fieldOpts = {
-				type: p.type || "number",
-				size: p.size || 4,
-				rational: p.rational || false,
-				unsigned: p.unsigned || true,
-				time: p.time || false,
-				big: p.big || false,
-				values: p.values || null,
-				required: required
+
+			field_opts = {
+				type     : p.type || "number",
+				size     : p.size || 4,
+				rational : p.rational || false,
+				unsigned : p.unsigned || true,
+				time     : p.time || false,
+				big      : p.big || false,
+				values   : p.values || null,
+				required : required
+			};
+		} else {
+			field_opts = {
+				type     : "number",
+				unsigned : true,
+				rational : false,
+				size     : 4,
+				required : required
 			};
-		};
+		}
 
-		fields[fieldName] = fieldOpts;
+		fields[field_name] = field_opts;
 	}
 
 	return fields;
-};
\ No newline at end of file
+};

From 463cd0b86cd658b7b5dca5575130e620cf1d01da Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 16 Jul 2013 12:23:41 +0100
Subject: [PATCH 0681/1246] Adds Utilities.getRealPath to look for the real
 path to load based on the file where it was called from (for db.load and
 db.use)

---
 lib/ORM.js       | 31 +++++++++----------------------
 lib/Utilities.js | 29 ++++++++++++++++++++++++++---
 2 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index 10ea953c..d57650df 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -11,12 +11,14 @@ var Validators     = require("./Validators");
 var Settings       = require("./Settings");
 var Singleton      = require("./Singleton");
 var ErrorCodes     = require("./ErrorCodes");
+var Utilities      = require("./Utilities");
 
 exports.validators = Validators;
 exports.singleton  = Singleton;
 exports.settings   = new Settings.Container(Settings.defaults());
-exports.Settings   = Settings;
+
 exports.Property   = require("./Property");
+exports.Settings   = Settings;
 exports.ErrorCodes = ErrorCodes;
 
 exports.Text = Query.Text;
@@ -161,7 +163,11 @@ util.inherits(ORM, events.EventEmitter);
 
 ORM.prototype.use = function (plugin_const, opts) {
 	if (typeof plugin_const == "string") {
-		plugin_const = require(plugin_const);
+		try {
+			plugin_const = require(Utilities.getRealPath(plugin_const));
+		} catch (e) {
+			throw e;
+		}
 	}
 
 	var plugin = new plugin_const(this, opts || {});
@@ -219,27 +225,8 @@ ORM.prototype.close = function (cb) {
 	return this;
 };
 ORM.prototype.load = function (file, cb) {
-	var cwd = process.cwd();
-	var err = new Error();
-	var tmp = err.stack.split(/\r?\n/)[2], m;
-
-	if ((m = tmp.match(/^\s*at\s+(.+):\d+:\d+$/)) !== null) {
-		cwd = path.dirname(m[1]);
-	} else if ((m = tmp.match(/^\s*at\s+module\.exports\s+\((.+?)\)/)) !== null) {
-		cwd = path.dirname(m[1]);
-	} else if ((m = tmp.match(/^\s*at\s+.+\s+\((.+):\d+:\d+\)$/)) !== null) {
-		cwd = path.dirname(m[1]);
-	}
-
-	if (file[0] != path.sep) {
-		file = cwd + "/" + file;
-	}
-	if (file.substr(-1) == path.sep) {
-		file += "index";
-	}
-
 	try {
-		return require(file)(this, cb);
+		return require(Utilities.getRealPath(file))(this, cb);
 	} catch (ex) {
 		return cb(ex);
 	}
diff --git a/lib/Utilities.js b/lib/Utilities.js
index 635208c4..4806f666 100644
--- a/lib/Utilities.js
+++ b/lib/Utilities.js
@@ -15,7 +15,6 @@
  * 9. [ 'property1', '-property2' ] (ORDER BY property1 ASC, property2 DESC)
  * ...
  */
-
 exports.standardizeOrder = function (order) {
 	if (typeof order == "string") {
 		if (order[0] == "-") {
@@ -46,9 +45,9 @@ exports.standardizeOrder = function (order) {
 };
 
 /**
- * Gets all the values within an object or array, optionally using a keys array to get only specific values
+ * Gets all the values within an object or array, optionally
+ * using a keys array to get only specific values
  */
-
 exports.values = function (obj, keys) {
 	var i, k, vals = [];
 
@@ -154,3 +153,27 @@ exports.formatField = function (model, name, required, reversed) {
 
 	return fields;
 };
+
+exports.getRealPath = function (path_str, stack_index) {
+	var path = require("path"); // for now, load here (only when needed)
+	var cwd = process.cwd();
+	var err = new Error();
+	var tmp = err.stack.split(/\r?\n/)[typeof stack_index != "undefined" ? stack_index : 3], m;
+
+	if ((m = tmp.match(/^\s*at\s+(.+):\d+:\d+$/)) !== null) {
+		cwd = path.dirname(m[1]);
+	} else if ((m = tmp.match(/^\s*at\s+module\.exports\s+\((.+?)\)/)) !== null) {
+		cwd = path.dirname(m[1]);
+	} else if ((m = tmp.match(/^\s*at\s+.+\s+\((.+):\d+:\d+\)$/)) !== null) {
+		cwd = path.dirname(m[1]);
+	}
+
+	if (path_str[0] != path.sep) {
+		path_str = cwd + "/" + path_str;
+	}
+	if (path_str.substr(-1) == path.sep) {
+		path_str += "index";
+	}
+
+	return path_str;
+};

From 7051c9450e058c5d723b9f4099317010644b5cb2 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 16 Jul 2013 12:24:04 +0100
Subject: [PATCH 0682/1246] Adds tests for db.use(plugin)

---
 test/integration/db.js    | 38 +++++++++++++++++++++++---------------
 test/support/my_plugin.js | 13 +++++++++++++
 2 files changed, 36 insertions(+), 15 deletions(-)
 create mode 100644 test/support/my_plugin.js

diff --git a/test/integration/db.js b/test/integration/db.js
index d40c050c..39d7f2ee 100644
--- a/test/integration/db.js
+++ b/test/integration/db.js
@@ -18,28 +18,36 @@ describe("db.use()", function () {
 	});
 
 	it("should be able to register a plugin", function (done) {
-		var MyPlugin = function MyPlugin(DB, opts) {
-			db.should.equal(DB);
-			opts.should.eql({ option: true });
-
-			return {
-				define: function (Model) {
-					Model.should.be.a("function");
-					Model.id.should.be.a("object");
-					Model.id[0].should.be.a("string");
-					calledDefine = true;
-				}
-			};
+		var MyPlugin = require("../support/my_plugin");
+		var opts     = {
+			option       : true,
+			calledDefine : false
 		};
 
-		db.use(MyPlugin, { option: true });
+		db.use(MyPlugin, opts);
 
-		var calledDefine = false;
 		var MyModel = db.define("my_model", { // db.define should call plugin.define method
 			property: String
 		});
 
-		calledDefine.should.be.true;
+		opts.calledDefine.should.be.true;
+
+		return done();
+	});
+
+	it("should be able to register a plugin as string", function (done) {
+		var opts     = {
+			option       : true,
+			calledDefine : false
+		};
+
+		db.use("../support/my_plugin", opts);
+
+		var MyModel = db.define("my_model", { // db.define should call plugin.define method
+			property: String
+		});
+
+		opts.calledDefine.should.be.true;
 
 		return done();
 	});
diff --git a/test/support/my_plugin.js b/test/support/my_plugin.js
new file mode 100644
index 00000000..b8e68eba
--- /dev/null
+++ b/test/support/my_plugin.js
@@ -0,0 +1,13 @@
+module.exports = function MyPlugin(DB, opts) {
+	opts.should.eql({ option: true, calledDefine: false });
+
+	return {
+		define: function (Model) {
+			Model.should.be.a("function");
+			Model.id.should.be.a("object");
+			Model.id[0].should.be.a("string");
+
+			opts.calledDefine = true;
+		}
+	};
+};

From 49323b49bc8d15d29f0f6125a207db963c6f5f9f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 16 Jul 2013 12:24:14 +0100
Subject: [PATCH 0683/1246] Removes unused connection in ORM test

---
 test/integration/orm-exports.js | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/test/integration/orm-exports.js b/test/integration/orm-exports.js
index 6a1bd271..ff6aa298 100644
--- a/test/integration/orm-exports.js
+++ b/test/integration/orm-exports.js
@@ -6,20 +6,6 @@ var common   = require('../common');
 var ORM      = require('../../');
 
 describe("ORM", function() {
-	var db = null;
-
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
-
-			return done();
-		});
-	});
-
-	after(function () {
-		return db.close();
-	});
-
 	describe("when loaded", function () {
 		it("should expose .express(), .use() and .connect()", function (done) {
 			ORM.express.should.a("function");

From ea50689ce12104c4f8dae56db58b80403bff06c3 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 16 Jul 2013 15:09:00 +0100
Subject: [PATCH 0684/1246] Fixes #226 - hasOne delAccessor not working

---
 lib/Associations/One.js | 2 +-
 lib/Instance.js         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index da69de16..2ce4825d 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -213,7 +213,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 				for (var k in association.field) {
 					Instance[k] = null;
 				}
-				Instance.save(cb);
+				Instance.save({}, { saveAssociations: false }, cb);
 
 				return this;
 			},
diff --git a/lib/Instance.js b/lib/Instance.js
index 39f8e258..6f864ab9 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -187,8 +187,8 @@ function Instance(Model, opts) {
 	};
 	var savePersisted = function (cb, saveOptions, data) {
 		var next = afterSave.bind(this, cb, false);
-
 		var changes = {}, conditions = {};
+
 		for (var i = 0; i < opts.changes.length; i++) {
 			changes[opts.changes[i]] = data[opts.changes[i]];
 		}
@@ -469,7 +469,7 @@ function Instance(Model, opts) {
 			var arg = null, objCount = 0;
 			var data = {}, saveOptions = {}, callback = null;
 
-			while(arguments.length > 0) {
+			while (arguments.length > 0) {
 				arg = Array.prototype.shift.call(arguments);
 				switch(typeof arg) {
 					case 'object':

From 0ce2e43a5dc9d6cb31bbb1ac5f8d3004beb8f7e0 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <benjamin.pannell@gmail.com>
Date: Tue, 16 Jul 2013 19:11:06 +0200
Subject: [PATCH 0685/1246] Allow before* hooks to modify the instance

---
 lib/Instance.js          |  8 ++---
 test/integration/hook.js | 71 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 4 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 6f864ab9..daed5685 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -93,10 +93,6 @@ function Instance(Model, opts) {
 		}
 	};
 	var saveInstance = function (cb, saveOptions) {
-		if (!opts.is_new && opts.changes.length === 0) {
-			return saveInstanceExtra(cb);
-		}
-
 		handleValidations(function (err) {
 			if (err) {
 				return saveError(cb, err);
@@ -116,6 +112,10 @@ function Instance(Model, opts) {
 						return saveError(cb, err);
 					}
 
+					if (opts.changes.length === 0) {
+					    return saveInstanceExtra(cb);
+					}
+
 					return savePersisted(cb, saveOptions, getInstanceData());
 				});
 			}
diff --git a/test/integration/hook.js b/test/integration/hook.js
index 7be91a16..e4638bf2 100644
--- a/test/integration/hook.js
+++ b/test/integration/hook.js
@@ -119,6 +119,21 @@ describe("Hook", function() {
 			});
 		});
 
+		it("should allow modification of instance", function (done) {
+		    Person.beforeCreate(function (next) {
+		        this.name = "Hook Worked";
+		        next();
+		    });
+
+		    Person.create([{ }], function (err, people) {
+		        should.not.exist(err);
+		        should.exist(people);
+		        should.equal(people.length, 1);
+		        should.equal(people[0].name, "Hook Worked");
+		        done();
+		    });
+		});
+
 		describe("when setting properties", function () {
 			before(setup({
 				beforeCreate : function () {
@@ -217,6 +232,20 @@ describe("Hook", function() {
 				return done();
 			});
 		});
+        
+		it("should allow modification of instance", function (done) {
+		    Person.beforeSave(function () {
+		        this.name = "Hook Worked";
+		    });
+
+		    Person.create([{ name: "John Doe" }], function (err, people) {
+		        should.not.exist(err);
+		        should.exist(people);
+		        should.equal(people.length, 1);
+		        should.equal(people[0].name, "Hook Worked");
+		        done();
+		    });
+		});
 
 		describe("when setting properties", function () {
 			before(setup({
@@ -339,6 +368,21 @@ describe("Hook", function() {
 			});
 		});
 
+
+		it("should allow modification of instance", function (done) {
+		    Person.beforeValidation(function () {
+		        this.name = "Hook Worked";
+		    });
+
+		    Person.create([{ name: "John Doe" }], function (err, people) {
+		        should.not.exist(err);
+		        should.exist(people);
+		        should.equal(people.length, 1);
+		        should.equal(people[0].name, "Hook Worked");
+		        done();
+		    });
+		});
+
 		describe("if hook method has 1 argument", function () {
 			var beforeValidation = false;
 			this.timeout(500);
@@ -589,4 +633,31 @@ describe("Hook", function() {
 			});
 		});
 	});
+
+	describe("instance modifications", function () {
+	    before(setup({
+	        beforeValidation: function () {
+	            should.equal(this.name, "John Doe");
+	            this.name = "beforeValidation";
+	        },
+	        beforeCreate: function () {
+	            should.equal(this.name, "beforeValidation");
+	            this.name = "beforeCreate";
+	        },
+	        beforeSave: function () {
+	            should.equal(this.name, "beforeCreate");
+	            this.name = "beforeSave";
+	        }
+	    }));
+
+	    it("should propagate down hooks", function (done) {
+	        Person.create([{ name: "John Doe" }], function (err, people) {
+	            should.not.exist(err);
+	            should.exist(people);
+	            should.equal(people.length, 1);
+	            should.equal(people[0].name, "beforeSave");
+	            done();
+	        });
+	    });
+	});
 });

From 1ed1a2a1b326ee03d1d45b41d734609e1d4d5f52 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <benjamin.pannell@gmail.com>
Date: Tue, 16 Jul 2013 20:29:57 +0200
Subject: [PATCH 0686/1246] Allow big text fields

Makes it possible to define fields of type 'text' with the big option,
and makes MySQL generate LONGTEXT, and PostgreSQL generate TEXT columns
for it.

FIX: A silly line snuck in...
---
 Readme.md                   | 1 +
 lib/Drivers/DDL/mysql.js    | 8 ++++++--
 lib/Drivers/DDL/postgres.js | 8 ++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Readme.md b/Readme.md
index a3f340b6..14ae22d4 100755
--- a/Readme.md
+++ b/Readme.md
@@ -223,6 +223,7 @@ var Person = db.define('person', {        // 'person' will be the table in the d
 
 ##### string
 * `size`: max length of the string
+* `big`: true to make (LONG)TEXT columns instead of VARCHAR(size)
 
 ##### number
 * `rational`: true (default) creates a FLOAT/REAL, false an INTEGER
diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index 1f95f345..99b8ff43 100755
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -159,8 +159,12 @@ function buildColumnDefinition(driver, name, prop) {
 	var def;
 
 	switch (prop.type) {
-		case "text":
-			def = driver.query.escapeId(name) + " VARCHAR(" + Math.min(Math.max(parseInt(prop.size, 10) || 255, 1), 65535) + ")";
+	    case "text":
+			if (prop.big === true) {
+				def = driver.query.escapeId(name) + " LONGTEXT";
+			} else {
+				def = driver.query.escapeId(name) + " VARCHAR(" + Math.min(Math.max(parseInt(prop.size, 10) || 255, 1), 65535) + ")";
+			}			
 			break;
 		case "number":
 			if (prop.rational === false) {
diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index c66e4121..3e1128da 100755
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -200,8 +200,12 @@ function buildColumnDefinition(driver, table, name, prop) {
 	var def;
 
 	switch (prop.type) {
-		case "text":
-			def = driver.query.escapeId(name) + " VARCHAR(" + Math.min(Math.max(parseInt(prop.size, 10) || 255, 1), 65535) + ")";
+	    case "text":
+			if (prop.big === true) {
+				def = driver.query.escapeId(name) + " TEXT";
+			} else {
+				def = driver.query.escapeId(name) + " VARCHAR(" + Math.min(Math.max(parseInt(prop.size, 10) || 255, 1), 65535) + ")";
+			}
 			break;
 		case "number":
 			if (prop.rational === false) {

From 6183d3f2615b1426ca5abcdda050eab99b3e73ef Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 16 Jul 2013 23:03:21 +0100
Subject: [PATCH 0687/1246] Adds Flattr badge to Readme

---
 Readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Readme.md b/Readme.md
index 14ae22d4..19c700fc 100755
--- a/Readme.md
+++ b/Readme.md
@@ -3,6 +3,7 @@
 [![Build Status](https://secure.travis-ci.org/dresende/node-orm2.png?branch=master)](http://travis-ci.org/dresende/node-orm2)
 [![](https://badge.fury.io/js/orm.png)](https://npmjs.org/package/orm)
 [![](https://gemnasium.com/dresende/node-orm2.png)](https://gemnasium.com/dresende/node-orm2)
+[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=dresende&url=https://github.com/dresende/node-orm2&title=ORM&language=&tags=github&category=software)
 
 ## Install
 

From 1e301a9c5c463d788c153317add5737e0ceda54d Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 17 Jul 2013 11:48:34 +1000
Subject: [PATCH 0688/1246] Allow specifying extended table name

---
 lib/Associations/Extend.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index 00b23daf..dccf6c05 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -11,6 +11,7 @@ exports.prepare = function (db, Model, associations, association_properties, mod
 		var assocName = opts.name || ucfirst(name);
 		var association = {
 			name           : name,
+			table          : opts.table || (Model.table + '_' + name),
 			reversed       : opts.reversed,
 			autoFetch      : opts.autoFetch || false,
 			autoFetchLimit : opts.autoFetchLimit || 2,
@@ -26,7 +27,7 @@ exports.prepare = function (db, Model, associations, association_properties, mod
 		    newproperties[k] = association.field[k];
 		}
 
-		association.model = db.define(Model.table + "_" + name, newproperties, {
+		association.model = db.define(association.table, newproperties, {
 			id        : Object.keys(association.field),
 			extension : true
 		});

From 4f10764a10162180c6637e29b7d6b21e2fffc1d5 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 17 Jul 2013 15:22:57 +1000
Subject: [PATCH 0689/1246] Allow passing extra options to extended models

---
 lib/Associations/Extend.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index dccf6c05..c28f883e 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -27,10 +27,15 @@ exports.prepare = function (db, Model, associations, association_properties, mod
 		    newproperties[k] = association.field[k];
 		}
 
-		association.model = db.define(association.table, newproperties, {
-			id        : Object.keys(association.field),
-			extension : true
-		});
+		var modelOpts = _.extend(
+			_.pick(opts, 'cache', 'autoSave', 'cascadeRemove', 'hooks', 'methods', 'validations'),
+			{
+				id        : Object.keys(association.field),
+				extension : true,
+			}
+		);
+
+		association.model = db.define(association.table, newproperties, modelOpts);
 		association.model.hasOne(Model.table, Model, { extension: true, field: association.field });
 
 		associations.push(association);

From 3c8cc19d2a111b05d7459d114ed7376020d0a0b1 Mon Sep 17 00:00:00 2001
From: Benjamin Nortier <bjnortier@gmail.com>
Date: Wed, 17 Jul 2013 10:41:31 +0100
Subject: [PATCH 0690/1246] Fix typo in README.md

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 19c700fc..cb3af6ee 100755
--- a/Readme.md
+++ b/Readme.md
@@ -921,7 +921,7 @@ Animal.hasOne("owner", Person); // creates column 'owner_id' in 'animal' table
 // get animal with id = 123
 Animal.get(123, function (err, animal) {
     // animal is the animal model instance, if found
-    Foo.getOwner(function (err, person) {
+    animal.getOwner(function (err, person) {
         // if animal has really an owner, person points to it
     });
 });

From 14214888ffa60a67abdc2380d9d0a9e1a392fb1c Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 17 Jul 2013 20:49:10 +1000
Subject: [PATCH 0691/1246] Allow querying chainfind with sql conditions

---
 lib/ChainFind.js                     | 25 +++++++++++++------
 package.json                         |  2 +-
 test/integration/model-find-chain.js | 37 ++++++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index b6be6c21..e70f41f0 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -1,3 +1,4 @@
+var _               = require("lodash");
 var Singleton       = require("./Singleton");
 var ChainInstance   = require("./ChainInstance");
 
@@ -5,14 +6,24 @@ module.exports = ChainFind;
 
 function ChainFind(Model, opts) {
 	var chain = {
-		find: function (conditions, cb) {
-			if (!opts.conditions) {
-				opts.conditions = {};
+		find: function () {
+			var cb = null;
+
+			arguments = Array.prototype.slice.call(arguments);
+			opts.conditions = opts.conditions || {};
+
+			if (typeof _.last(arguments) == 'function') {
+				cb = arguments.pop();
 			}
-			for (var k in conditions) {
-				opts.conditions[k] = conditions[k];
+
+			if (typeof arguments[0] == 'object') {
+				_.extend(opts.conditions, arguments[0]);
+			} else if (typeof arguments[0] == 'string') {
+				opts.conditions.__sql = opts.conditions.__sql || []
+				opts.conditions.__sql.push(arguments);
 			}
-			if (typeof cb == "function") {
+
+			if (cb) {
 				return this.all(cb);
 			}
 			return this;
@@ -157,7 +168,7 @@ function addChainMethod(chain, association, opts) {
 			opts.exists = [];
 		}
 		var conditions = {};
-        
+
 		var assocIds = Object.keys(association.mergeAssocId);
 		var ids = association.model.id;
 		function mergeConditions(source) {
diff --git a/package.json b/package.json
index 235a289d..05a8b3b2 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
 	},
 	"analyse"     : false,
 	"dependencies": {
-		"sql-query" : "0.1.5",
+		"sql-query" : "0.1.6",
 		"hat"       : "0.0.3",
 		"lodash"    : "1.3.1"
 	},
diff --git a/test/integration/model-find-chain.js b/test/integration/model-find-chain.js
index 787265ee..365ceab3 100644
--- a/test/integration/model-find-chain.js
+++ b/test/integration/model-find-chain.js
@@ -258,6 +258,43 @@ describe("Model.find() chaining", function() {
 			});
 		});
 
+		it("should allow sql where conditions", function (done) {
+			Person.find({ age: 18 }).find("LOWER(surname) LIKE 'dea%'").all(function (err, items) {
+				should.equal(err, null);
+				items.length.should.equal(1);
+
+				return done();
+			});
+		});
+
+		it("should allow sql where conditions with auto escaping", function (done) {
+			Person.find({ age: 18 }).find("LOWER(surname) LIKE ?", ['dea%']).all(function (err, items) {
+				should.equal(err, null);
+				items.length.should.equal(1);
+
+				return done();
+			});
+		});
+
+		it("should append sql where conditions", function (done) {
+			Person.find().find("LOWER(surname) LIKE ?", ['do%']).all(function (err, items) {
+				should.equal(err, null);
+				items.length.should.equal(2);
+
+				Person.find().find("LOWER(name) LIKE ?", ['jane']).all(function (err, items) {
+					should.equal(err, null);
+					items.length.should.equal(2);
+
+					Person.find().find("LOWER(surname) LIKE ?", ['do%']).find("LOWER(name) LIKE ?", ['jane']).all(function (err, items) {
+						should.equal(err, null);
+						items.length.should.equal(1);
+
+						return done();
+					});
+				});
+			});
+		});
+
 		it("should return results if passed a callback as second argument", function (done) {
 			Person.find().find({ age: 18 }, function (err, instances) {
 				should.equal(err, null);

From 88a31d0f96d4a01f9fe3f03d346c17fd693a15be Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 17 Jul 2013 22:59:22 +1000
Subject: [PATCH 0692/1246] Update tests to document 'where' not 'find'

---
 test/integration/model-find-chain.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/integration/model-find-chain.js b/test/integration/model-find-chain.js
index 365ceab3..748c51a3 100644
--- a/test/integration/model-find-chain.js
+++ b/test/integration/model-find-chain.js
@@ -259,7 +259,7 @@ describe("Model.find() chaining", function() {
 		});
 
 		it("should allow sql where conditions", function (done) {
-			Person.find({ age: 18 }).find("LOWER(surname) LIKE 'dea%'").all(function (err, items) {
+			Person.find({ age: 18 }).where("LOWER(surname) LIKE 'dea%'").all(function (err, items) {
 				should.equal(err, null);
 				items.length.should.equal(1);
 
@@ -268,7 +268,7 @@ describe("Model.find() chaining", function() {
 		});
 
 		it("should allow sql where conditions with auto escaping", function (done) {
-			Person.find({ age: 18 }).find("LOWER(surname) LIKE ?", ['dea%']).all(function (err, items) {
+			Person.find({ age: 18 }).where("LOWER(surname) LIKE ?", ['dea%']).all(function (err, items) {
 				should.equal(err, null);
 				items.length.should.equal(1);
 
@@ -277,15 +277,15 @@ describe("Model.find() chaining", function() {
 		});
 
 		it("should append sql where conditions", function (done) {
-			Person.find().find("LOWER(surname) LIKE ?", ['do%']).all(function (err, items) {
+			Person.find().where("LOWER(surname) LIKE ?", ['do%']).all(function (err, items) {
 				should.equal(err, null);
 				items.length.should.equal(2);
 
-				Person.find().find("LOWER(name) LIKE ?", ['jane']).all(function (err, items) {
+				Person.find().where("LOWER(name) LIKE ?", ['jane']).all(function (err, items) {
 					should.equal(err, null);
 					items.length.should.equal(2);
 
-					Person.find().find("LOWER(surname) LIKE ?", ['do%']).find("LOWER(name) LIKE ?", ['jane']).all(function (err, items) {
+					Person.find().where("LOWER(surname) LIKE ?", ['do%']).where("LOWER(name) LIKE ?", ['jane']).all(function (err, items) {
 						should.equal(err, null);
 						items.length.should.equal(1);
 

From 5635132b42f62ae5858da09919ade4caaf12a405 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 18 Jul 2013 00:04:21 +0100
Subject: [PATCH 0693/1246] Creates initial mongodb driver and 'mongo' driver
 alias

- no associations yet (no JOINS supported);
- no tests done, only single queries (find, update and insert) but all
others should just work
---
 lib/Drivers/DML/mongodb.js | 178 +++++++++++++++++++++++++++++++++++++
 lib/Drivers/aliases.js     |   4 +-
 package.json               |   3 +-
 3 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 lib/Drivers/DML/mongodb.js

diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
new file mode 100644
index 00000000..a170efe5
--- /dev/null
+++ b/lib/Drivers/DML/mongodb.js
@@ -0,0 +1,178 @@
+var mongodb = require("mongodb");
+
+exports.Driver = Driver;
+
+function Driver(config, connection, opts) {
+	this.client = new mongodb.MongoClient();
+	this.db     = null;
+	this.config = config || {};
+	this.opts   = opts || {};
+}
+
+Driver.prototype.sync = function (opts, cb) {
+	if (typeof cb == "function") {
+		return process.nextTick(cb);
+	}
+};
+
+Driver.prototype.drop = function (opts, cb) {
+	if (typeof cb == "function") {
+		return process.nextTick(cb);
+	}
+};
+
+Driver.prototype.ping = function (cb) {
+	return process.nextTick(cb);
+};
+
+Driver.prototype.on = function (ev, cb) {
+	// if (ev == "error") {
+	// 	this.db.on("error", cb);
+	// 	this.db.on("unhandledError", cb);
+	// }
+	return this;
+};
+
+Driver.prototype.connect = function (cb) {
+	console.log("connecting...");
+	this.client.connect(this.config.href, function (err, db) {
+		console.log("err", err);
+		if (err) {
+			return cb(err);
+		}
+
+		this.db = db;
+
+		return cb();
+	}.bind(this));
+};
+
+Driver.prototype.close = function (cb) {
+	if (this.db) {
+		this.db.close();
+	}
+	if (typeof cb == "function") {
+		cb();
+	}
+	return;
+};
+
+Driver.prototype.find = function (fields, table, conditions, opts, cb) {
+	var collection = this.db.collection(table);
+	var cursor     = collection.find(conditions, fields);
+
+	if (opts.order) {
+		var orders = [];
+
+		for (var i = 0; i < opts.order.length; i++) {
+			orders.push([ opts.order[i][0], (opts.order[i][1] == 'Z' ? 'desc' : 'asc') ]);
+		}
+		cursor.sort(orders);
+	}
+	if (opts.offset) {
+		cursor.skip(opts.offset);
+	}
+	if (opts.limit) {
+		cursor.limit(opts.limit);
+	}
+
+	return cursor.toArray(function (err, docs) {
+		for (var i = 0; i < docs.length; i++) {
+			docs[i]._id = docs[i]._id.toString();
+		}
+		return cb(err, docs);
+	});
+};
+
+Driver.prototype.count = function (table, conditions, opts, cb) {
+	var collection = this.db.collection(table);
+	var cursor     = collection.find(conditions);
+
+	if (opts.order) {
+		var orders = [];
+
+		for (var i = 0; i < opts.order.length; i++) {
+			orders.push([ opts.order[i][0], (opts.order[i][1] == 'Z' ? 'desc' : 'asc') ]);
+		}
+		cursor.sort(orders);
+	}
+	if (opts.offset) {
+		cursor.skip(opts.offset);
+	}
+	if (opts.limit) {
+		cursor.limit(opts.limit);
+	}
+
+	return cursor.count(true, cb);
+};
+
+Driver.prototype.insert = function (table, data, id_prop, cb) {
+	convertToDB(data);
+
+	return this.db.collection(table).insert(
+		data,
+		{
+			w : 1
+		},
+		function (err, docs) {
+			if (err) return cb(err);
+
+			var ids = {};
+
+			if (id_prop !== null && docs.length) {
+				for (var k in docs[0]) {
+					if (id_prop.indexOf(k) >= 0) {
+						ids[k] = docs[0][k];
+					}
+				}
+				convertFromDB(ids);
+			}
+
+			return cb(null, ids);
+		}
+	);
+};
+
+Driver.prototype.update = function (table, changes, conditions, cb) {
+	convertToDB(conditions);
+
+	return this.db.collection(table).update(
+		conditions,
+		{
+			$set   : changes
+		},
+		{
+			safe   : true,
+			upsert : true
+		},
+		cb
+	);
+};
+
+Driver.prototype.remove = function (table, conditions, cb) {
+	return this.db.collection(table).remove(conditions, cb);
+};
+
+Driver.prototype.clear = function (table, cb) {
+	return this.db.collection(table).drop(cb);
+};
+
+
+function convertToDB(obj) {
+	for (var k in obj) {
+		if (k == "_id") {
+			if (obj[k] instanceof mongodb.ObjectID) {
+				console.log("!!!!!!!!");
+			}
+			obj[k] = new mongodb.ObjectID(obj[k]);
+		}
+	}
+}
+
+function convertFromDB(obj) {
+	for (var k in obj) {
+		if (obj[k] instanceof mongodb.ObjectID) {
+			obj[k] = obj[k].toString();
+		}
+	}
+}
diff --git a/lib/Drivers/aliases.js b/lib/Drivers/aliases.js
index bf8c9f5e..9c71d48e 100644
--- a/lib/Drivers/aliases.js
+++ b/lib/Drivers/aliases.js
@@ -1,4 +1,6 @@
 module.exports = {
 	postgresql : "postgres",
-	pg         : "postgres"
+	pg         : "postgres",
+
+	mongo      : "mongodb"
 };
diff --git a/package.json b/package.json
index 235a289d..0a3c584a 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,8 @@
 		"sqlite3" : "2.1.7",
 		"async"   : "*",
 		"mocha"   : "1.12.0",
-		"should"  : "1.2.2"
+		"should"  : "1.2.2",
+		"mongodb" : "1.3.11"
 	},
 	"optionalDependencies": {}
 }

From f8962be8abc1214b182583844b78e42b2a82da14 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 18 Jul 2013 00:06:49 +0100
Subject: [PATCH 0694/1246] Removes debug log lines

---
 lib/Drivers/DML/mongodb.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
index a170efe5..a5050fa6 100644
--- a/lib/Drivers/DML/mongodb.js
+++ b/lib/Drivers/DML/mongodb.js
@@ -34,9 +34,7 @@ Driver.prototype.on = function (ev, cb) {
 };
 
 Driver.prototype.connect = function (cb) {
-	console.log("connecting...");
 	this.client.connect(this.config.href, function (err, db) {
-		console.log("err", err);
 		if (err) {
 			return cb(err);
 		}
@@ -161,9 +159,6 @@ Driver.prototype.clear = function (table, cb) {
 function convertToDB(obj) {
 	for (var k in obj) {
 		if (k == "_id") {
-			if (obj[k] instanceof mongodb.ObjectID) {
-				console.log("!!!!!!!!");
-			}
 			obj[k] = new mongodb.ObjectID(obj[k]);
 		}
 	}

From e43bfb71165c4c5d51d6a98afd1ccf8dab8ea828 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 18 Jul 2013 00:07:06 +0100
Subject: [PATCH 0695/1246] Adds mongodb support to test common.js

---
 test/common.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/common.js b/test/common.js
index 4febb93c..9465c1d9 100644
--- a/test/common.js
+++ b/test/common.js
@@ -72,6 +72,12 @@ common.getConnectionString = function () {
 				       (config.password ? ':' + config.password : '') +
 				       '@' + (config.host || 'localhost') +
 				       '/' + (config.database || 'orm_test');
+			case 'mongodb':
+				return 'mongo://' +
+				       (config.user || '') +
+				       (config.password ? ':' + config.password : '') +
+				       '@' + (config.host || 'localhost') +
+				       '/' + (config.database || 'test');
 			case 'sqlite':
 				return 'sqlite://' + (config.pathname || "");
 			default:

From 2a4dcca5e1aefc1d2b1ad0937650693a1e7672f2 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 18 Jul 2013 00:14:57 +0100
Subject: [PATCH 0696/1246] Fixes previous commit about mongodb support

Cannot use alias
---
 test/common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/common.js b/test/common.js
index 9465c1d9..777b66a7 100644
--- a/test/common.js
+++ b/test/common.js
@@ -73,7 +73,7 @@ common.getConnectionString = function () {
 				       '@' + (config.host || 'localhost') +
 				       '/' + (config.database || 'orm_test');
 			case 'mongodb':
-				return 'mongo://' +
+				return 'mongodb://' +
 				       (config.user || '') +
 				       (config.password ? ':' + config.password : '') +
 				       '@' + (config.host || 'localhost') +

From c7eeaccebbd13e8cfec06899e405dd1fcad585af Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 18 Jul 2013 00:15:19 +0100
Subject: [PATCH 0697/1246] Updates mongodb driver to pass Model.count tests

---
 lib/Drivers/DML/mongodb.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
index a5050fa6..2dc6a19d 100644
--- a/lib/Drivers/DML/mongodb.js
+++ b/lib/Drivers/DML/mongodb.js
@@ -16,9 +16,7 @@ Driver.prototype.sync = function (opts, cb) {
 };
 
 Driver.prototype.drop = function (opts, cb) {
-	if (typeof cb == "function") {
-		return process.nextTick(cb);
-	}
+	return this.clear(opts.table, cb);
 };
 
 Driver.prototype.ping = function (cb) {
@@ -101,7 +99,11 @@ Driver.prototype.count = function (table, conditions, opts, cb) {
 		cursor.limit(opts.limit);
 	}
 
-	return cursor.count(true, cb);
+	return cursor.count(true, function (err, count) {
+		if (err) return cb(err);
+
+		return cb(null, [{ c : count }]);
+	});
 };
 
 Driver.prototype.insert = function (table, data, id_prop, cb) {

From 07136e1bef6740937b6e5d1a3b761452b66e9dce Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 18 Jul 2013 00:19:46 +0100
Subject: [PATCH 0698/1246] Updates mongodb Driver.drop to avoid returning
 error (when no collection is found)

---
 lib/Drivers/DML/mongodb.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
index 2dc6a19d..51da4723 100644
--- a/lib/Drivers/DML/mongodb.js
+++ b/lib/Drivers/DML/mongodb.js
@@ -16,7 +16,9 @@ Driver.prototype.sync = function (opts, cb) {
 };
 
 Driver.prototype.drop = function (opts, cb) {
-	return this.clear(opts.table, cb);
+	return this.clear(opts.table, function () {
+		return cb();
+	});
 };
 
 Driver.prototype.ping = function (cb) {

From 81ae02fdc4c695dc80389a3323b5841e76d5b055 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 18 Jul 2013 10:09:34 +1000
Subject: [PATCH 0699/1246] Add where sql doco

---
 Readme.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Readme.md b/Readme.md
index cb3af6ee..c7219d85 100755
--- a/Readme.md
+++ b/Readme.md
@@ -461,6 +461,8 @@ Person.find({ surname: "Doe" }, { offset: 2 }, function (err, people) {
 });
 ```
 
+You can also use raw SQL when searching. It's documented in the *Chaining* section below.
+
 ### Model.count([ conditions, ] cb)
 
 If you just want to count the number of items that match a condition you can just use `.count()` instead of finding all
@@ -530,6 +532,14 @@ Person.find({ surname: "Doe" }).limit(3).offset(2).only("name", "surname").run(f
 });
 ```
 
+Chaining allows for more complicated queries. For example, we can search by specifying custom SQL:
+```js
+Person.find({ age: 18 }).where("LOWER(surname) LIKE ?", ['dea%']).all( ... );
+```
+It's bad practice to manually escape SQL parameters as it's error prone and exposes your application to SQL injection.
+The `?` syntax takes care of escaping for you, by safely substituting the question mark in the query with the parameters provided.
+You can also chain multiple `where` clauses as needed.
+
 You can also chain and just get the count in the end. In this case, offset, limit and order are ignored.
 
 ```js

From 73d66117ba6bc16df3454d35e86c17541a0ca571 Mon Sep 17 00:00:00 2001
From: Michael Reddick <michael.reddick@gmail.com>
Date: Thu, 18 Jul 2013 12:12:15 -0500
Subject: [PATCH 0700/1246] Check for the existence of this.config.query.

Otherwise, if there is no query section in the config then we'll
throw an exception when we check this.config.query.strdates.
---
 lib/Drivers/DML/sqlite.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 6e1c8bd6..16d49a85 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -229,7 +229,7 @@ Driver.prototype.propertyToValue = function (value, property) {
 		case "object":
 			return JSON.stringify(value);
 		case "date":
-			if (this.config.query.strdates) {
+			if (this.config.query && this.config.query.strdates) {
 				if (value instanceof Date) {
 					var year = value.getUTCFullYear();
 					var month = value.getUTCMonth() + 1;

From a15d4e96561cadc8fea4c0c41226bbd5a6ba72de Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 19 Jul 2013 14:45:14 +0100
Subject: [PATCH 0701/1246] Passes connection settings to database drivers

Drivers can change settings if needed. This is needed for example for
now to mongodb driver change primary key to "_id"
---
 lib/ORM.js | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index d57650df..1617f57a 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -40,12 +40,14 @@ exports.use = function (connection, proto, opts, cb) {
 	}
 
 	try {
-		var Driver = require("./Drivers/DML/" + proto).Driver;
-		var driver = new Driver(null, connection, {
-			debug: (opts.query && opts.query.debug == 'true')
+		var Driver   = require("./Drivers/DML/" + proto).Driver;
+		var settings = new Settings.Container(exports.settings.get('*'));
+		var driver   = new Driver(null, connection, {
+			debug    : (opts.query && opts.query.debug == 'true'),
+			settings : settings
 		});
 
-		return cb(null, new ORM(proto, driver, new Settings.Container(exports.settings.get('*'))));
+		return cb(null, new ORM(proto, driver, settings));
 	} catch (ex) {
 		return cb(ex);
 	}
@@ -91,15 +93,17 @@ exports.connect = function (opts, cb) {
 	}
 
 	try {
-		var Driver = require("./Drivers/DML/" + proto).Driver;
-		var debug  = Boolean(extractOption(opts, "debug"));
-		var pool   = Boolean(extractOption(opts, "pool"));
-		var driver = new Driver(opts, null, {
-			debug : debug,
-			pool  : pool
+		var Driver   = require("./Drivers/DML/" + proto).Driver;
+		var debug    = Boolean(extractOption(opts, "debug"));
+		var pool     = Boolean(extractOption(opts, "pool"));
+		var settings = new Settings.Container(exports.settings.get('*'));
+		var driver   = new Driver(opts, null, {
+			debug    : debug,
+			pool     : pool,
+			settings : settings
 		});
 
-		db = new ORM(proto, driver, new Settings.Container(exports.settings.get('*')));
+		db = new ORM(proto, driver, settings);
 
 		driver.connect(function (err) {
 			if (typeof cb == "function") {

From 35cf9a667e480a82e140b4aa7795cfe41f9e615d Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 19 Jul 2013 14:45:46 +0100
Subject: [PATCH 0702/1246] Updates mongodb driver to support DBRef and change
 primary key settings

---
 lib/Drivers/DML/mongodb.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
index 51da4723..9756d10f 100644
--- a/lib/Drivers/DML/mongodb.js
+++ b/lib/Drivers/DML/mongodb.js
@@ -6,7 +6,9 @@ function Driver(config, connection, opts) {
 	this.client = new mongodb.MongoClient();
 	this.db     = null;
 	this.config = config || {};
-	this.opts   = opts || {};
+	this.opts   = opts;
+
+	this.opts.settings.set("properties.primary_key", "_id");
 }
 
 Driver.prototype.sync = function (opts, cb) {
@@ -57,6 +59,9 @@ Driver.prototype.close = function (cb) {
 
 Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	var collection = this.db.collection(table);
+
+	convertToDB(conditions);
+
 	var cursor     = collection.find(conditions, fields);
 
 	if (opts.order) {
@@ -76,7 +81,8 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 
 	return cursor.toArray(function (err, docs) {
 		for (var i = 0; i < docs.length; i++) {
-			docs[i]._id = docs[i]._id.toString();
+			convertFromDB(docs[i]);
+			// docs[i]._id = docs[i]._id.toString();
 		}
 		return cb(err, docs);
 	});
@@ -163,7 +169,11 @@ Driver.prototype.clear = function (table, cb) {
 function convertToDB(obj) {
 	for (var k in obj) {
 		if (k == "_id") {
-			obj[k] = new mongodb.ObjectID(obj[k]);
+			if (obj[k] instanceof mongodb.DBRef) {
+				obj[k] = new mongodb.ObjectID(obj[k].oid.toString());
+			} else if (!(obj[k] instanceof mongodb.ObjectID)) {
+				obj[k] = new mongodb.ObjectID(obj[k]);
+			}
 		}
 	}
 }

From aefce63b8e2b7b7e9476b5307656d4d7baae89b7 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 19 Jul 2013 15:36:32 +0100
Subject: [PATCH 0703/1246] Changes Model to accept string as a Shell Model id
 (for mongo this is necessary)

---
 lib/Model.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Model.js b/lib/Model.js
index 268aa9a2..46026aa5 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -140,7 +140,7 @@ function Model(opts) {
 		//TODO: Should be smarter about how this is handled.
 		//      ideally we should check the type of ID used
 		//      by the model, and accept that type of data.
-		if (typeof data == "number") {
+		if (typeof data == "number" || typeof data == "string") {
 			var data2 = {};
 			data2[opts.id] = data;
 

From d0fd8a5209b2d472fac68f9e102ba97dc09b15ef Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 19 Jul 2013 16:12:46 +0100
Subject: [PATCH 0704/1246] Removes previous mongodb.convertToDB code about
 DBRefs

---
 lib/Drivers/DML/mongodb.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
index 9756d10f..6448b47e 100644
--- a/lib/Drivers/DML/mongodb.js
+++ b/lib/Drivers/DML/mongodb.js
@@ -165,15 +165,10 @@ Driver.prototype.clear = function (table, cb) {
 	return this.db.collection(table).drop(cb);
 };
 
-
 function convertToDB(obj) {
 	for (var k in obj) {
 		if (k == "_id") {
-			if (obj[k] instanceof mongodb.DBRef) {
-				obj[k] = new mongodb.ObjectID(obj[k].oid.toString());
-			} else if (!(obj[k] instanceof mongodb.ObjectID)) {
-				obj[k] = new mongodb.ObjectID(obj[k]);
-			}
+			obj[k] = new mongodb.ObjectID(obj[k]);
 		}
 	}
 }

From a05c55942cb152aa5f0c1ee8c3674436156cc581 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 19 Jul 2013 16:13:52 +0100
Subject: [PATCH 0705/1246] Changes hasOne tests to be database agnostic (don't
 use instance.id, use instance[model.id])

This changes makes mongodb successfully pass this tests automatically
---
 test/integration/association-hasone.js | 32 +++++++++++++-------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/test/integration/association-hasone.js b/test/integration/association-hasone.js
index 943a4a2f..f7b95ee2 100644
--- a/test/integration/association-hasone.js
+++ b/test/integration/association-hasone.js
@@ -31,16 +31,16 @@ describe("hasOne", function() {
 			return helper.dropSync([Tree, Stalk, Leaf], function() {
 				Tree.create({ type: 'pine' }, function (err, tree) {
 					should.not.exist(err);
-					treeId = tree.id;
+					treeId = tree[Tree.id];
 					Leaf.create({ size: 14 }, function (err, leaf) {
 						should.not.exist(err);
-						leafId = leaf.id;
+						leafId = leaf[Leaf.id];
 						leaf.setTree(tree, function (err) {
 							should.not.exist(err);
 							Stalk.create({ length: 20 }, function (err, stalk) {
 								should.not.exist(err);
 								should.exist(stalk);
-								stalkId = stalk.id;
+								stalkId = stalk[Stalk.id];
 								done();
 							});
 						});
@@ -76,7 +76,7 @@ describe("hasOne", function() {
 			Leaf(leafId).getTree(function (err, tree) {
 				should.not.exist(err);
 				should.exist(tree);
-				should.equal(tree.id, treeId);
+				should.equal(tree[Tree.id], treeId);
 				done();
 			});
 		});
@@ -111,7 +111,7 @@ describe("hasOne", function() {
 						should.not.exist(err);
 						Leaf.one({ size: 14 }, function (err, leaf) {
 							should.not.exist(err);
-							should.equal(leaf.stalkId, stalk.id);
+							should.equal(leaf.stalkId, stalk[Stalk.id]);
 							done();
 						});
 					});
@@ -131,7 +131,7 @@ describe("hasOne", function() {
 						should.not.exist(err);
 						Leaf.one({ size: 14 }, function (err, leaf) {
 							should.not.exist(err);
-							should.equal(leaf.stalkId, null)
+							should.equal(leaf.stalkId, null);
 							done();
 						});
 					});
@@ -168,11 +168,11 @@ describe("hasOne", function() {
 				});
 
 				it("should work when calling Instance.save", function (done) {
-					leaf = new Leaf({size: 4, treeId: tree.id});
+					leaf = new Leaf({size: 4, treeId: tree[Tree.id]});
 					leaf.save(function(err, leaf) {
 						should.not.exist(err);
 
-						Leaf.get(leaf.id, function(err, fetchedLeaf) {
+						Leaf.get(leaf[Leaf.id], function(err, fetchedLeaf) {
 							should.not.exist(err);
 							should.exist(fetchedLeaf);
 							should.equal(fetchedLeaf.treeId, leaf.treeId);
@@ -184,11 +184,11 @@ describe("hasOne", function() {
 
 				it("should work when calling Instance.save after initially setting parentId to null", function(done) {
 					leaf = new Leaf({size: 4, treeId: null});
-					leaf.treeId = tree.id;
+					leaf.treeId = tree[Tree.id];
 					leaf.save(function(err, leaf) {
 						should.not.exist(err);
 
-						Leaf.get(leaf.id, function(err, fetchedLeaf) {
+						Leaf.get(leaf[Leaf.id], function(err, fetchedLeaf) {
 							should.not.exist(err);
 							should.exist(fetchedLeaf);
 							should.equal(fetchedLeaf.treeId, leaf.treeId);
@@ -200,12 +200,12 @@ describe("hasOne", function() {
 
 				it("should work when specifying parentId in the save call", function (done) {
 					leaf = new Leaf({size: 4});
-					leaf.save({ treeId: tree.id }, function(err, leaf) {
+					leaf.save({ treeId: tree[Tree.id] }, function(err, leaf) {
 						should.not.exist(err);
 
 						should.exist(leaf.treeId);
 
-						Leaf.get(leaf.id, function(err, fetchedLeaf) {
+						Leaf.get(leaf[Leaf.id], function(err, fetchedLeaf) {
 							should.not.exist(err);
 							should.exist(fetchedLeaf);
 							should.equal(fetchedLeaf.treeId, leaf.treeId);
@@ -216,10 +216,10 @@ describe("hasOne", function() {
 				});
 
 				it("should work when calling Model.create", function (done) {
-					Leaf.create({size: 4, treeId: tree.id}, function (err, leaf) {
+					Leaf.create({size: 4, treeId: tree[Tree.id]}, function (err, leaf) {
 						should.not.exist(err);
 
-						Leaf.get(leaf.id, function(err, fetchedLeaf) {
+						Leaf.get(leaf[Leaf.id], function(err, fetchedLeaf) {
 							should.not.exist(err);
 
 							should.exist(fetchedLeaf);
@@ -290,10 +290,10 @@ describe("hasOne", function() {
 			helper.dropSync(Person, function () {
 				Person.create({
 					name : "Child"
-				}, function (err) {
+				}, function (err, person) {
 					should.equal(err, null);
 
-					Person.get(1, function (err, person) {
+					Person.get(person[Person.id], function (err, person) {
 						should.equal(err, null);
 
 						person.setTopParent.should.be.a("function");

From 7c124aa027ad88319d7759a45f8bc9622fe2c9c9 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 19 Jul 2013 16:37:42 +0100
Subject: [PATCH 0706/1246] Changes Model.extendsTo to avoid using
 Model.get(num)

Uses Model.find().first() since there's only one item in Model and this
way mongodb works directly
---
 test/integration/association-extend.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/integration/association-extend.js b/test/integration/association-extend.js
index 16dbb306..6f03f4fe 100644
--- a/test/integration/association-extend.js
+++ b/test/integration/association-extend.js
@@ -48,7 +48,7 @@ describe("Model.extendsTo()", function() {
 		before(setup());
 
 		it("should return true if found", function (done) {
-			Person.get(1, function (err, John) {
+			Person.find().first(function (err, John) {
 				should.equal(err, null);
 
 				John.hasAddress(function (err, hasAddress) {
@@ -61,7 +61,7 @@ describe("Model.extendsTo()", function() {
 		});
 
 		it("should return false if not found", function (done) {
-			Person.get(1, function (err, John) {
+			Person.find().first(function (err, John) {
 				should.equal(err, null);
 
 				John.removeAddress(function () {
@@ -92,7 +92,7 @@ describe("Model.extendsTo()", function() {
 		before(setup());
 
 		it("should return extension if found", function (done) {
-			Person.get(1, function (err, John) {
+			Person.find().first(function (err, John) {
 				should.equal(err, null);
 
 				John.getAddress(function (err, Address) {
@@ -106,7 +106,7 @@ describe("Model.extendsTo()", function() {
 		});
 
 		it("should return error if not found", function (done) {
-			Person.get(1, function (err, John) {
+			Person.find().first(function (err, John) {
 				should.equal(err, null);
 
 				John.removeAddress(function () {
@@ -137,7 +137,7 @@ describe("Model.extendsTo()", function() {
 		before(setup());
 
 		it("should remove any previous extension", function (done) {
-			Person.get(1, function (err, John) {
+			Person.find().first(function (err, John) {
 				should.equal(err, null);
 
 				PersonAddress.find({ number: 123 }).count(function (err, c) {
@@ -174,7 +174,7 @@ describe("Model.extendsTo()", function() {
 		before(setup());
 
 		it("should remove any extension", function (done) {
-			Person.get(1, function (err, John) {
+			Person.find().first(function (err, John) {
 				should.equal(err, null);
 
 				PersonAddress.find({ number: 123 }).count(function (err, c) {

From 34b2957bc717374c893506bd3a7e3110c1f2434e Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 19 Jul 2013 16:52:14 +0100
Subject: [PATCH 0707/1246] Updates Instance to check for new
 one_assoctions.field structure for required properties

SGBD tables would enforce required values but mongodb for now does not,
so this should be done before even going to database
---
 lib/Instance.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/lib/Instance.js b/lib/Instance.js
index daed5685..0a43a17f 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -37,6 +37,24 @@ function Instance(Model, opts) {
 					opts.data[k] = Model.properties[k].defaultValue;
 				}
 			}
+			for (var i = 0; i < opts.one_associations.length; i++) {
+				for (k in opts.one_associations[i].field) {
+					if (opts.one_associations[i].required && opts.data[k] == null) {
+						var err   = new Error("Property required");
+
+						err.field = k;
+						err.value = opts.data[k];
+						err.msg   = "Property required";
+						err.type  = "validation";
+
+						if (!Model.settings.get("instance.returnAllErrors")) {
+							return cb(err);
+						}
+
+						errors.push(err);
+					}
+				}
+			}
 
 			for (var k in opts.validations) {
 				if (Model.properties[k]) {
@@ -56,6 +74,7 @@ function Instance(Model, opts) {
 					pending.push([ k, opts.validations[k][i] ]);
 				}
 			}
+
 			var checkNextValidation = function () {
 				if (pending.length === 0) {
 					return cb(errors.length ? errors : null);
@@ -82,6 +101,7 @@ function Instance(Model, opts) {
 					return checkNextValidation();
 				}, instance, Model, validation[0]);
 			};
+
 			return checkNextValidation();
 		});
 	};

From d909a8b049d5e391a033814f378db1f20e3bec40 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 19 Jul 2013 16:52:41 +0100
Subject: [PATCH 0708/1246] Changes hasOne required tests to define an
 association field

---
 test/integration/association-hasone-required.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/integration/association-hasone-required.js b/test/integration/association-hasone-required.js
index 80f01c33..5bf744e6 100644
--- a/test/integration/association-hasone-required.js
+++ b/test/integration/association-hasone-required.js
@@ -16,7 +16,8 @@ describe("hasOne", function() {
 				name     : String
 			});
 			Person.hasOne('parent', Person, {
-				required : required
+				required : required,
+				field    : 'parentId'
 			});
 
 			return helper.dropSync(Person, done);
@@ -35,8 +36,8 @@ describe("hasOne", function() {
 
 		it("should not accept empty association", function (done) {
 			var John = new Person({
-				name      : "John",
-				parent_id : null
+				name     : "John",
+				parentId : null
 			});
 			John.save(function (err) {
 				should.exist(err);
@@ -46,8 +47,8 @@ describe("hasOne", function() {
 
 		it("should accept association", function (done) {
 			var John = new Person({
-				name      : "John",
-				parent_id : 1
+				name     : "John",
+				parentId : 1
 			});
 			John.save(function (err) {
 				should.not.exist(err);

From 0ee6b7bf2cf8d5b3db757264a33c0e0e0ea6122d Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 19 Jul 2013 19:06:01 +0100
Subject: [PATCH 0709/1246] Updates mongodb driver.count() to use convertToDB
 in conditions (same as driver.find())

---
 lib/Drivers/DML/mongodb.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
index 6448b47e..8b2ea5fd 100644
--- a/lib/Drivers/DML/mongodb.js
+++ b/lib/Drivers/DML/mongodb.js
@@ -90,6 +90,9 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 
 Driver.prototype.count = function (table, conditions, opts, cb) {
 	var collection = this.db.collection(table);
+
+	convertToDB(conditions);
+
 	var cursor     = collection.find(conditions);
 
 	if (opts.order) {

From 3436434790997b1a248e1cc86ae756c61302711c Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 19 Jul 2013 19:06:24 +0100
Subject: [PATCH 0710/1246] Ignores hasMany and Model.aggregate() tests for
 mongodb

---
 test/integration/association-hasmany-extra.js | 5 +++++
 test/integration/association-hasmany.js       | 5 +++++
 test/integration/model-aggregate.js           | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/test/integration/association-hasmany-extra.js b/test/integration/association-hasmany-extra.js
index ff038890..556c1c32 100644
--- a/test/integration/association-hasmany-extra.js
+++ b/test/integration/association-hasmany-extra.js
@@ -1,6 +1,11 @@
 var should = require('should');
 var helper = require('../support/spec_helper');
 var ORM    = require('../../');
+var common = require('../common');
+
+if (common.protocol() == "mongodb") {
+	process.exit(0);
+}
 
 describe("hasMany extra properties", function() {
 	var db     = null;
diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
index 351aaaa0..376945e7 100644
--- a/test/integration/association-hasmany.js
+++ b/test/integration/association-hasmany.js
@@ -1,6 +1,11 @@
 var should = require('should');
 var helper = require('../support/spec_helper');
 var ORM    = require('../../');
+var common = require('../common');
+
+if (common.protocol() == "mongodb") {
+	process.exit(0);
+}
 
 describe("hasMany", function () {
 	this.timeout(4000);
diff --git a/test/integration/model-aggregate.js b/test/integration/model-aggregate.js
index 1289b213..f123d896 100644
--- a/test/integration/model-aggregate.js
+++ b/test/integration/model-aggregate.js
@@ -1,6 +1,11 @@
 var should   = require('should');
 var helper   = require('../support/spec_helper');
 var ORM      = require('../../');
+var common   = require('../common');
+
+if (common.protocol() == "mongodb") {
+	process.exit(0);
+}
 
 describe("Model.aggregate()", function() {
 	var db = null;

From 2fef6a9791443416fc6255bd286d037a77f5034c Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 19 Jul 2013 19:06:46 +0100
Subject: [PATCH 0711/1246] Updates some tests to avoid depending on "id" as
 primary key

---
 test/integration/hook.js         |  6 +++---
 test/integration/instance.js     | 10 ++++------
 test/integration/model-create.js |  4 ++--
 test/integration/model-exists.js | 28 +++++++++++++++++++---------
 4 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/test/integration/hook.js b/test/integration/hook.js
index e4638bf2..0ceedc10 100644
--- a/test/integration/hook.js
+++ b/test/integration/hook.js
@@ -150,7 +150,7 @@ describe("Hook", function() {
 					items[0].name.should.equal("Jane Doe");
 
 					// ensure it was really saved
-					Person.get(items[0].id, function (err, Item) {
+					Person.get(items[0][Person.id], function (err, Item) {
 						should.equal(err, null);
 						Item.name.should.equal("Jane Doe");
 
@@ -232,7 +232,7 @@ describe("Hook", function() {
 				return done();
 			});
 		});
-        
+
 		it("should allow modification of instance", function (done) {
 		    Person.beforeSave(function () {
 		        this.name = "Hook Worked";
@@ -263,7 +263,7 @@ describe("Hook", function() {
 					items[0].name.should.equal("Jane Doe");
 
 					// ensure it was really saved
-					Person.get(items[0].id, function (err, Item) {
+					Person.get(items[0][Person.id], function (err, Item) {
 						should.equal(err, null);
 						Item.name.should.equal("Jane Doe");
 
diff --git a/test/integration/instance.js b/test/integration/instance.js
index 8e3e569e..57b6f918 100644
--- a/test/integration/instance.js
+++ b/test/integration/instance.js
@@ -21,13 +21,10 @@ describe("Model instance", function() {
 
 			return helper.dropSync(Person, function () {
 				Person.create([{
-					id	: 1,
 					name: "Jeremy Doe"
 				}, {
-					id	: 2,
 					name: "John Doe"
 				}, {
-					id	: 3,
 					name: "Jane Doe"
 				}], done);
 			});
@@ -52,7 +49,8 @@ describe("Model instance", function() {
 		it("should always return true for instances", function (done) {
 			should.equal((new Person).isInstance, true);
 			should.equal((Person(4)).isInstance, true);
-			Person.get(2, function (err, item) {
+
+			Person.find().first(function (err, item) {
 				should.not.exist(err);
 				should.equal(item.isInstance, true);
 				return done();
@@ -67,7 +65,7 @@ describe("Model instance", function() {
 
 	describe("#isPersisted", function () {
 		it("should return true for persisted instances", function (done) {
-			Person.get(2, function (err, item) {
+			Person.find().first(function (err, item) {
 				should.not.exist(err);
 				should.equal(item.isPersisted(), true);
 				return done();
@@ -93,7 +91,7 @@ describe("Model instance", function() {
 		});
 
 		it("should return false for existing models", function (done) {
-			Person.get(2, function (err, item) {
+			Person.find().first(function (err, item) {
 				should.not.exist(err);
 				should.equal(item.isShell(), false);
 				return done();
diff --git a/test/integration/model-create.js b/test/integration/model-create.js
index 544d8366..99ca8659 100644
--- a/test/integration/model-create.js
+++ b/test/integration/model-create.js
@@ -84,7 +84,7 @@ describe("Model.create()", function() {
 				should(Array.isArray(John.pets));
 
 				John.pets[0].should.have.property("name", "Deco");
-				John.pets[0].should.have.property("id");
+				John.pets[0].should.have.property(Pet.id);
 				John.pets[0].saved().should.be.true;
 
 				return done();
@@ -103,7 +103,7 @@ describe("Model.create()", function() {
 				should(Array.isArray(John.pets));
 
 				John.pets[0].should.have.property("name", "Deco");
-				John.pets[0].should.have.property("id");
+				John.pets[0].should.have.property(Pet.id);
 				John.pets[0].saved().should.be.true;
 
 				return done();
diff --git a/test/integration/model-exists.js b/test/integration/model-exists.js
index e05f7f0a..d6bbb164 100644
--- a/test/integration/model-exists.js
+++ b/test/integration/model-exists.js
@@ -3,8 +3,9 @@ var helper   = require('../support/spec_helper');
 var ORM      = require('../../');
 
 describe("Model.exists()", function() {
-	var db = null;
+	var db     = null;
 	var Person = null;
+	var good_id, bad_id;
 
 	var setup = function () {
 		return function (done) {
@@ -14,15 +15,24 @@ describe("Model.exists()", function() {
 
 			return helper.dropSync(Person, function () {
 				Person.create([{
-					id  : 1,
 					name: "Jeremy Doe"
 				}, {
-					id  : 2,
 					name: "John Doe"
 				}, {
-					id  : 3,
 					name: "Jane Doe"
-				}], done);
+				}], function (err, people) {
+					good_id = people[0][Person.id];
+
+					if (typeof good_id == "number") {
+						// numeric ID
+						bad_id = good_id * 100;
+					} else {
+						// string ID, keep same length..
+						bad_id = good_id.split('').reverse().join('');
+					}
+
+					return done();
+				});
 			});
 		};
 	};
@@ -53,7 +63,7 @@ describe("Model.exists()", function() {
 		before(setup());
 
 		it("should return true if found", function (done) {
-			Person.exists(2, function (err, exists) {
+			Person.exists(good_id, function (err, exists) {
 				should.equal(err, null);
 
 				exists.should.be.true;
@@ -63,7 +73,7 @@ describe("Model.exists()", function() {
 		});
 
 		it("should return false if not found", function (done) {
-			Person.exists(4, function (err, exists) {
+			Person.exists(bad_id, function (err, exists) {
 				should.equal(err, null);
 
 				exists.should.be.false;
@@ -77,7 +87,7 @@ describe("Model.exists()", function() {
 		before(setup());
 
 		it("should return true if found", function (done) {
-			Person.exists([ 2 ], function (err, exists) {
+			Person.exists([ good_id ], function (err, exists) {
 				should.equal(err, null);
 
 				exists.should.be.true;
@@ -87,7 +97,7 @@ describe("Model.exists()", function() {
 		});
 
 		it("should return false if not found", function (done) {
-			Person.exists([ 4 ], function (err, exists) {
+			Person.exists([ bad_id ], function (err, exists) {
 				should.equal(err, null);
 
 				exists.should.be.false;

From 1bf32a60b0992f2f0d0f0b604b0091cc96383079 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 19 Jul 2013 19:15:48 +0100
Subject: [PATCH 0712/1246] Updates mongodb driver.remove() to use convertToDB

---
 lib/Drivers/DML/mongodb.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
index 8b2ea5fd..c80d5f8e 100644
--- a/lib/Drivers/DML/mongodb.js
+++ b/lib/Drivers/DML/mongodb.js
@@ -161,6 +161,8 @@ Driver.prototype.update = function (table, changes, conditions, cb) {
 };
 
 Driver.prototype.remove = function (table, conditions, cb) {
+	convertToDB(conditions);
+
 	return this.db.collection(table).remove(conditions, cb);
 };
 
@@ -170,6 +172,17 @@ Driver.prototype.clear = function (table, cb) {
 
 function convertToDB(obj) {
 	for (var k in obj) {
+		if (Array.isArray(obj[k])) {
+			if (k == "_id") {
+				for (var i = 0; i < obj[k].length; i++) {
+					obj[k][i] = new mongodb.ObjectID(obj[k][i]);
+				}
+			}
+
+			obj[k] = { $in: obj[k] };
+			continue;
+		}
+
 		if (k == "_id") {
 			obj[k] = new mongodb.ObjectID(obj[k]);
 		}

From 7293df7bc2a8608be7e94e5f94fff91ecadd8355 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 19 Jul 2013 19:24:47 +0100
Subject: [PATCH 0713/1246] Adds mongodb support for ORM query comparators

The only one that I'm not sure is ok is LIKE => $regex
---
 lib/Drivers/DML/mongodb.js | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
index c80d5f8e..99d9f246 100644
--- a/lib/Drivers/DML/mongodb.js
+++ b/lib/Drivers/DML/mongodb.js
@@ -183,6 +183,35 @@ function convertToDB(obj) {
 			continue;
 		}
 
+		if (typeof obj[k].sql_comparator == "function") {
+			var val       = (k != "_id" ? obj[k].val : new mongodb.ObjectID(obj[k].val));
+			var comp      = obj[k].sql_comparator();
+			var condition = {};
+
+			switch (comp) {
+				case "gt":
+				case "gte":
+				case "lt":
+				case "lte":
+				case "ne":
+					condition["$" + comp] = val;
+					break;
+				case "eq":
+					condition = val;
+					break;
+				case "between":
+					condition["$min"] = obj[k].from;
+					condition["$max"] = obj[k].to;
+					break;
+				case "like":
+					condition["$regex"] = obj[k].expr.replace("%", ".*");
+					break;
+			}
+
+			obj[k] = condition;
+			continue;
+		}
+
 		if (k == "_id") {
 			obj[k] = new mongodb.ObjectID(obj[k]);
 		}

From 697e2d85b0ef52dfaabcba75a825f19a725e9779 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 19 Jul 2013 19:34:01 +0100
Subject: [PATCH 0714/1246] Fixes previous commit to avoid checking for
 sql_comparator on undefined

---
 lib/Drivers/DML/mongodb.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
index 99d9f246..e4dc71f0 100644
--- a/lib/Drivers/DML/mongodb.js
+++ b/lib/Drivers/DML/mongodb.js
@@ -183,7 +183,7 @@ function convertToDB(obj) {
 			continue;
 		}
 
-		if (typeof obj[k].sql_comparator == "function") {
+		if (obj[k] && typeof obj[k].sql_comparator == "function") {
 			var val       = (k != "_id" ? obj[k].val : new mongodb.ObjectID(obj[k].val));
 			var comp      = obj[k].sql_comparator();
 			var condition = {};

From 3521e7329c5bfa278a5f38e0ec772639d2fa823e Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 19 Jul 2013 19:34:29 +0100
Subject: [PATCH 0715/1246] Fixes more test to work as primary key agnostic

---
 test/integration/model-find-chain.js | 23 ++++++-----
 test/integration/model-get.js        | 58 +++++++++++++++-------------
 test/integration/model-save.js       | 26 ++++++-------
 3 files changed, 58 insertions(+), 49 deletions(-)

diff --git a/test/integration/model-find-chain.js b/test/integration/model-find-chain.js
index 748c51a3..5f5cf9aa 100644
--- a/test/integration/model-find-chain.js
+++ b/test/integration/model-find-chain.js
@@ -1,6 +1,7 @@
 var should   = require('should');
 var helper   = require('../support/spec_helper');
 var ORM      = require('../../');
+var common   = require('../common');
 
 describe("Model.find() chaining", function() {
 	var db = null;
@@ -258,6 +259,17 @@ describe("Model.find() chaining", function() {
 			});
 		});
 
+		it("should return results if passed a callback as second argument", function (done) {
+			Person.find().find({ age: 18 }, function (err, instances) {
+				should.equal(err, null);
+				instances.should.have.property("length", 2);
+
+				return done();
+			});
+		});
+
+		if (common.protocol() == "mongodb") return;
+
 		it("should allow sql where conditions", function (done) {
 			Person.find({ age: 18 }).where("LOWER(surname) LIKE 'dea%'").all(function (err, items) {
 				should.equal(err, null);
@@ -294,15 +306,6 @@ describe("Model.find() chaining", function() {
 				});
 			});
 		});
-
-		it("should return results if passed a callback as second argument", function (done) {
-			Person.find().find({ age: 18 }, function (err, instances) {
-				should.equal(err, null);
-				instances.should.have.property("length", 2);
-
-				return done();
-			});
-		});
 	});
 
 	describe(".each()", function () {
@@ -428,6 +431,8 @@ describe("Model.find() chaining", function() {
 			});
 		});
 
+		if (common.protocol() == "mongodb") return;
+
 		describe(".hasAccessor() for hasOne associations", function () {
 		    it("should be chainable", function (done) {
 				Person.find({ name: "John" }, function (err, John) {
diff --git a/test/integration/model-get.js b/test/integration/model-get.js
index e07493a9..707551af 100644
--- a/test/integration/model-get.js
+++ b/test/integration/model-get.js
@@ -3,8 +3,9 @@ var helper   = require('../support/spec_helper');
 var ORM      = require('../../');
 
 describe("Model.get()", function() {
-	var db = null;
+	var db     = null;
 	var Person = null;
+	var John;
 
 	var setup = function (cache) {
 		return function (done) {
@@ -14,7 +15,7 @@ describe("Model.get()", function() {
 				cache  : cache,
 				methods: {
 					UID: function () {
-						return this.id;
+						return this[Person.id];
 					}
 				}
 			});
@@ -26,7 +27,11 @@ describe("Model.get()", function() {
 					name: "John Doe"
 				}, {
 					name: "Jane Doe"
-				}], done);
+				}], function (err, people) {
+					John = people[0];
+
+					return done();
+				});
 			});
 		};
 	};
@@ -47,11 +52,11 @@ describe("Model.get()", function() {
 		before(setup(true));
 
 		it("should return item with id 1", function (done) {
-			Person.get(1, function (err, John) {
+			Person.get(John[Person.id], function (err, John) {
 				should.equal(err, null);
 
 				John.should.be.a("object");
-				John.should.have.property("id", 1);
+				John.should.have.property(Person.id, John[Person.id]);
 				John.should.have.property("name", "John Doe");
 
 				return done();
@@ -59,11 +64,11 @@ describe("Model.get()", function() {
 		});
 
 		it("should have an UID method", function (done) {
-			Person.get(1, function (err, John) {
+			Person.get(John[Person.id], function (err, John) {
 				should.equal(err, null);
 
 				John.UID.should.be.a("function");
-				John.UID().should.equal(John.id);
+				John.UID().should.equal(John[Person.id]);
 
 				return done();
 			});
@@ -71,15 +76,15 @@ describe("Model.get()", function() {
 
 		describe("changing name and getting id 1 again", function () {
 			it("should return the original object with unchanged name", function (done) {
-				Person.get(1, function (err, John1) {
+				Person.get(John[Person.id], function (err, John1) {
 					should.equal(err, null);
 
 					John1.name = "James";
 
-					Person.get(1, function (err, John2) {
+					Person.get(John[Person.id], function (err, John2) {
 						should.equal(err, null);
 
-						John1.id.should.equal(John2.id);
+						John1[Person.id].should.equal(John2[Person.id]);
 						John2.name.should.equal("John Doe");
 
 						return done();
@@ -93,15 +98,15 @@ describe("Model.get()", function() {
 				Person.settings.set("instance.cacheSaveCheck", false);
 
 				it("should return the same object with the changed name", function (done) {
-					Person.get(1, function (err, John1) {
+					Person.get(John[Person.id], function (err, John1) {
 						should.equal(err, null);
 
 						John1.name = "James";
 
-						Person.get(1, function (err, John2) {
+						Person.get(John[Person.id], function (err, John2) {
 							should.equal(err, null);
 
-							John1.id.should.equal(John2.id);
+							John1[Person.id].should.equal(John2[Person.id]);
 							John2.name.should.equal("James");
 
 							return done();
@@ -117,12 +122,12 @@ describe("Model.get()", function() {
 
 		describe("fetching several times", function () {
 			it("should return different objects", function (done) {
-				Person.get(1, function (err, John1) {
+				Person.get(John[Person.id], function (err, John1) {
 					should.equal(err, null);
-					Person.get(1, function (err, John2) {
+					Person.get(John[Person.id], function (err, John2) {
 						should.equal(err, null);
 
-						John1.id.should.equal(John2.id);
+						John1[Person.id].should.equal(John2[Person.id]);
 						John1.should.not.equal(John2);
 
 						return done();
@@ -137,14 +142,14 @@ describe("Model.get()", function() {
 
 		describe("fetching again after 0.2 secs", function () {
 			it("should return same objects", function (done) {
-				Person.get(1, function (err, John1) {
+				Person.get(John[Person.id], function (err, John1) {
 					should.equal(err, null);
 
 					setTimeout(function () {
-						Person.get(1, function (err, John2) {
+						Person.get(John[Person.id], function (err, John2) {
 							should.equal(err, null);
 
-							John1.id.should.equal(John2.id);
+							John1[Person.id].should.equal(John2[Person.id]);
 							John1.should.equal(John2);
 
 							return done();
@@ -156,11 +161,11 @@ describe("Model.get()", function() {
 
 		describe("fetching again after 0.7 secs", function () {
 			it("should return different objects", function (done) {
-				Person.get(1, function (err, John1) {
+				Person.get(John[Person.id], function (err, John1) {
 					should.equal(err, null);
 
 					setTimeout(function () {
-						Person.get(1, function (err, John2) {
+						Person.get(John[Person.id], function (err, John2) {
 							should.equal(err, null);
 
 							John1.should.not.equal(John2);
@@ -177,11 +182,11 @@ describe("Model.get()", function() {
 		before(setup());
 
 		it("should return item with id 1 like previously", function (done) {
-			Person.get(1, {}, function (err, John) {
+			Person.get(John[Person.id], {}, function (err, John) {
 				should.equal(err, null);
 
 				John.should.be.a("object");
-				John.should.have.property("id", 1);
+				John.should.have.property(Person.id, John[Person.id]);
 				John.should.have.property("name", "John Doe");
 
 				return done();
@@ -194,7 +199,7 @@ describe("Model.get()", function() {
 
 		it("should throw", function (done) {
 			(function () {
-				Person.get(1);
+				Person.get(John[Person.id]);
 			}).should.throw();
 
 			return done();
@@ -218,11 +223,11 @@ describe("Model.get()", function() {
 		before(setup(true));
 
 		it("should accept and try to fetch", function (done) {
-			Person.get([ 1 ], function (err, John) {
+			Person.get([ John[Person.id] ], function (err, John) {
 				should.equal(err, null);
 
 				John.should.be.a("object");
-				John.should.have.property("id", 1);
+				John.should.have.property(Person.id, John[Person.id]);
 				John.should.have.property("name", "John Doe");
 
 				return done();
@@ -269,7 +274,6 @@ describe("Model.get()", function() {
 			OtherPerson.get("Jane Doe", function (err, person) {
 				should.equal(err, null);
 
-				person.id.should.be.a("number");
 				person.name.should.equal("Jane Doe");
 
 				return done();
diff --git a/test/integration/model-save.js b/test/integration/model-save.js
index 73d72ff8..54d98b9e 100644
--- a/test/integration/model-save.js
+++ b/test/integration/model-save.js
@@ -54,12 +54,12 @@ describe("Model.save()", function() {
 			});
 			John.save(function (err) {
 				should.equal(err, null);
-				John.id.should.be.a("number");
+				should.exist(John[Person.id]);
 
-				Person.get(John.id, function (err, JohnCopy) {
+				Person.get(John[Person.id], function (err, JohnCopy) {
 					should.equal(err, null);
 
-					JohnCopy.id.should.equal(John.id);
+					JohnCopy[Person.id].should.equal(John[Person.id]);
 					JohnCopy.name.should.equal(John.name);
 
 					return done();
@@ -78,12 +78,12 @@ describe("Model.save()", function() {
 			John.save();
 			John.on("save", function (err) {
 				should.equal(err, null);
-				John.id.should.be.a("number");
+				should.exist(John[Person.id]);
 
-				Person.get(John.id, function (err, JohnCopy) {
+				Person.get(John[Person.id], function (err, JohnCopy) {
 					should.equal(err, null);
 
-					JohnCopy.id.should.equal(John.id);
+					JohnCopy[Person.id].should.equal(John[Person.id]);
 					JohnCopy.name.should.equal(John.name);
 
 					return done();
@@ -101,13 +101,13 @@ describe("Model.save()", function() {
 			});
 			John.save({ name: "John" }, function (err) {
 				should.equal(err, null);
-				John.id.should.be.a("number");
+				should.exist(John[Person.id]);
 				John.name.should.equal("John");
 
-				Person.get(John.id, function (err, JohnCopy) {
+				Person.get(John[Person.id], function (err, JohnCopy) {
 					should.equal(err, null);
 
-					JohnCopy.id.should.equal(John.id);
+					JohnCopy[Person.id].should.equal(John[Person.id]);
 					JohnCopy.name.should.equal(John.name);
 
 					return done();
@@ -147,8 +147,8 @@ describe("Model.save()", function() {
 				John.saved().should.be.true;
 				Jane.saved().should.be.true;
 
-				John.id.should.be.a("number");
-				Jane.id.should.be.a("number");
+				should.exist(John[Person.id]);
+				should.exist(Jane[Person.id]);
 
 				return done();
 			});
@@ -170,8 +170,8 @@ describe("Model.save()", function() {
 				John.saved().should.be.true;
 				John.parent.saved().should.be.true;
 
-				John.id.should.be.a("number");
-				John.parent.id.should.be.a("number");
+				should.exist(John[Person.id]);
+				should.exist(John.parent[Person.id]);
 
 				return done();
 			});

From 91cff7d7ed3d911491990203612efa7d89388f8c Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 19 Jul 2013 19:39:10 +0100
Subject: [PATCH 0716/1246] Fixes validation test for mongodb

---
 test/integration/validation.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/validation.js b/test/integration/validation.js
index e1aa6269..924bb9da 100644
--- a/test/integration/validation.js
+++ b/test/integration/validation.js
@@ -89,7 +89,7 @@ describe("Validations", function() {
 
 				john.save(function (err) {
 					should.equal(err, null);
-					john.id.should.be.a('number');
+					should.exist(john[Person.id]);
 
 					return done();
 				});

From c4c1154be200953a235ebf8825d6f9ebce465f17 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 19 Jul 2013 19:39:28 +0100
Subject: [PATCH 0717/1246] Excludes 2 more tests from mongodb testing
 (property number size and lazyload)

---
 test/integration/property-lazyload.js    | 19 ++++++++++++-------
 test/integration/property-number-size.js |  4 ++++
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/test/integration/property-lazyload.js b/test/integration/property-lazyload.js
index a1ec6014..132e78c6 100644
--- a/test/integration/property-lazyload.js
+++ b/test/integration/property-lazyload.js
@@ -1,6 +1,11 @@
 var should   = require('should');
 var helper   = require('../support/spec_helper');
 var ORM      = require('../../');
+var common   = require('../common');
+
+if (common.protocol() == "mongodb") {
+	process.exit(0);
+}
 
 describe("LazyLoad properties", function() {
 	var db = null;
@@ -42,11 +47,11 @@ describe("LazyLoad properties", function() {
 		before(setup());
 
 		it("should not be available when fetching an instance", function (done) {
-			Person.get(1, function (err, John) {
+			Person.find().first(function (err, John) {
 				should.equal(err, null);
 
 				John.should.be.a("object");
-				John.should.have.property("id", 1);
+
 				John.should.have.property("name", "John Doe");
 				John.should.have.property("photo", null);
 
@@ -55,7 +60,7 @@ describe("LazyLoad properties", function() {
 		});
 
 		it("should have apropriate accessors", function (done) {
-			Person.get(1, function (err, John) {
+			Person.find().first(function (err, John) {
 				should.equal(err, null);
 
 				John.should.be.a("object");
@@ -68,7 +73,7 @@ describe("LazyLoad properties", function() {
 		});
 
 		it("getAccessor should return property", function (done) {
-			Person.get(1, function (err, John) {
+			Person.find().first(function (err, John) {
 				should.equal(err, null);
 
 				John.should.be.a("object");
@@ -83,7 +88,7 @@ describe("LazyLoad properties", function() {
 		});
 
 		it("setAccessor should change property", function (done) {
-			Person.get(1, function (err, John) {
+			Person.find().first(function (err, John) {
 				should.equal(err, null);
 
 				John.should.be.a("object");
@@ -108,7 +113,7 @@ describe("LazyLoad properties", function() {
 		});
 
 		it("removeAccessor should change property", function (done) {
-			Person.get(1, function (err, John) {
+			Person.find().first(function (err, John) {
 				should.equal(err, null);
 
 				John.should.be.a("object");
@@ -116,7 +121,7 @@ describe("LazyLoad properties", function() {
 				John.removePhoto(function (err) {
 					should.equal(err, null);
 
-					Person.get(1, function (err, John) {
+					Person.get(John[Person.id], function (err, John) {
 						should.equal(err, null);
 
 						John.should.be.a("object");
diff --git a/test/integration/property-number-size.js b/test/integration/property-number-size.js
index 4b2258ee..451d1e11 100644
--- a/test/integration/property-number-size.js
+++ b/test/integration/property-number-size.js
@@ -4,6 +4,10 @@ var helper   = require('../support/spec_helper');
 var ORM      = require('../../');
 var protocol = common.protocol().toLowerCase();
 
+if (protocol == "mongodb") {
+	process.exit(0);
+}
+
 // Round because different systems store floats in different
 // ways, thereby introducing small errors.
 function round(num, points) {

From dce0889ba3cf2853e142b393ee76334c8357bee1 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 19 Jul 2013 19:47:39 +0100
Subject: [PATCH 0718/1246] Removes code to stop some tests on mongodb

They will be blacklisted in run.js
---
 test/integration/association-hasmany-extra.js | 5 -----
 test/integration/association-hasmany.js       | 5 -----
 test/integration/model-aggregate.js           | 5 -----
 test/integration/property-lazyload.js         | 5 -----
 test/integration/property-number-size.js      | 4 ----
 5 files changed, 24 deletions(-)

diff --git a/test/integration/association-hasmany-extra.js b/test/integration/association-hasmany-extra.js
index 556c1c32..ff038890 100644
--- a/test/integration/association-hasmany-extra.js
+++ b/test/integration/association-hasmany-extra.js
@@ -1,11 +1,6 @@
 var should = require('should');
 var helper = require('../support/spec_helper');
 var ORM    = require('../../');
-var common = require('../common');
-
-if (common.protocol() == "mongodb") {
-	process.exit(0);
-}
 
 describe("hasMany extra properties", function() {
 	var db     = null;
diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
index 376945e7..351aaaa0 100644
--- a/test/integration/association-hasmany.js
+++ b/test/integration/association-hasmany.js
@@ -1,11 +1,6 @@
 var should = require('should');
 var helper = require('../support/spec_helper');
 var ORM    = require('../../');
-var common = require('../common');
-
-if (common.protocol() == "mongodb") {
-	process.exit(0);
-}
 
 describe("hasMany", function () {
 	this.timeout(4000);
diff --git a/test/integration/model-aggregate.js b/test/integration/model-aggregate.js
index f123d896..1289b213 100644
--- a/test/integration/model-aggregate.js
+++ b/test/integration/model-aggregate.js
@@ -1,11 +1,6 @@
 var should   = require('should');
 var helper   = require('../support/spec_helper');
 var ORM      = require('../../');
-var common   = require('../common');
-
-if (common.protocol() == "mongodb") {
-	process.exit(0);
-}
 
 describe("Model.aggregate()", function() {
 	var db = null;
diff --git a/test/integration/property-lazyload.js b/test/integration/property-lazyload.js
index 132e78c6..f1dda0aa 100644
--- a/test/integration/property-lazyload.js
+++ b/test/integration/property-lazyload.js
@@ -1,11 +1,6 @@
 var should   = require('should');
 var helper   = require('../support/spec_helper');
 var ORM      = require('../../');
-var common   = require('../common');
-
-if (common.protocol() == "mongodb") {
-	process.exit(0);
-}
 
 describe("LazyLoad properties", function() {
 	var db = null;
diff --git a/test/integration/property-number-size.js b/test/integration/property-number-size.js
index 451d1e11..4b2258ee 100644
--- a/test/integration/property-number-size.js
+++ b/test/integration/property-number-size.js
@@ -4,10 +4,6 @@ var helper   = require('../support/spec_helper');
 var ORM      = require('../../');
 var protocol = common.protocol().toLowerCase();
 
-if (protocol == "mongodb") {
-	process.exit(0);
-}
-
 // Round because different systems store floats in different
 // ways, thereby introducing small errors.
 function round(num, points) {

From 94679e209db9d5eeafc3002348e5a602548529b8 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 19 Jul 2013 19:51:13 +0100
Subject: [PATCH 0719/1246] Adds proper support for mongodb in test framework

---
 .travis.yml    |  2 ++
 Makefile       |  1 +
 test/common.js |  4 ++++
 test/run.js    | 17 +++++++++++++++--
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2ea563e9..eefb9972 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,3 +6,5 @@ node_js:
 before_script:
   - mysql -e 'create database orm_test;'
   - psql -c 'create database orm_test;' -U postgres
+services:
+  - mongodb
diff --git a/Makefile b/Makefile
index 41a4469e..24f0d9d0 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ test:
 	ORM_PROTOCOL=postgres node test/run
 	ORM_PROTOCOL=redshift node test/run
 	ORM_PROTOCOL=sqlite node test/run
+	ORM_PROTOCOL=mongodb node test/run
 
 coverage: cov
 
diff --git a/test/common.js b/test/common.js
index 777b66a7..b4e90f2e 100644
--- a/test/common.js
+++ b/test/common.js
@@ -27,6 +27,8 @@ common.getConfig = function () {
 				return { user: "postgres", host: "localhost", database: "orm_test" };
 			case 'sqlite':
 				return {};
+			case 'mongodb':
+				return { host: "localhost", database: "test" };
 			default:
 				throw new Error("Unknown protocol");
 		}
@@ -47,6 +49,8 @@ common.getConnectionString = function () {
 				return 'postgres://postgres@localhost/orm_test';
 			case 'sqlite':
 				return 'sqlite://';
+			case 'mongodb':
+				return 'mongodb://localhost/test';
 			default:
 				throw new Error("Unknown protocol");
 		}
diff --git a/test/run.js b/test/run.js
index 0face329..eefdf612 100644
--- a/test/run.js
+++ b/test/run.js
@@ -9,9 +9,11 @@ var mocha    = new Mocha({
 runTests();
 
 function runTests() {
-	fs.readdirSync(location).filter(function(file){
+	fs.readdirSync(location).filter(function (file) {
 		return file.substr(-3) === '.js';
-	}).forEach(function(file){
+	}).forEach(function (file) {
+		if (!shouldRunTest(file)) return;
+
 		mocha.addFile(
 			path.join(location, file)
 		);
@@ -24,3 +26,14 @@ function runTests() {
 		process.exit(failures);
 	});
 }
+
+function shouldRunTest(file) {
+	var name  = file.substr(0, file.length - 3);
+	var proto = process.env.ORM_PROTOCOL;
+
+	if (proto == "mongodb" && [ "association-hasmany-extra", "association-hasmany",
+	                            "model-aggregate",
+	                            "property-lazyload", "property-number-size" ].indexOf(name) >= 0) return false;
+
+	return true;
+}

From 826e56e45f638f047db586005790ebf3f35c3993 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sun, 21 Jul 2013 00:04:11 +0100
Subject: [PATCH 0720/1246] Changes hasMany associations helper to use driver
 helper if defined

---
 lib/Associations/Many.js | 57 ++++++++++++++++++++++++++++------------
 1 file changed, 40 insertions(+), 17 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 0187129a..da1d0693 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -118,6 +118,15 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 			var cb = Instances.pop();
 			var conditions = {}, options = {};
 
+			if (Instances.length) {
+				if (Array.isArray(Instances[0])) {
+					Instances = Instances[0];
+				}
+			}
+			if (Driver.hasMany) {
+				return Driver.hasMany(Model, association).has(Instance, Instances, conditions, cb);
+			}
+
 			options.__merge = {
 				from:   { table: association.mergeTable, field: Object.keys(association.mergeAssocId) },
 				to: { table: association.model.table, field: association.model.id },
@@ -133,14 +142,8 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 
 			util.populateConditions(Model, Object.keys(association.mergeId), Instance, options.__merge.where[1]);
 
-			if (Instances.length) {
-				if (Array.isArray(Instances[0])) {
-					Instances = Instances[0];
-				}
-
-				for (var i = 0; i < Instances.length; i++) {
-					util.populateConditions(association.model, Object.keys(association.mergeAssocId), Instances[i], options.__merge.where[1], false);
-				}
+			for (var i = 0; i < Instances.length; i++) {
+				util.populateConditions(association.model, Object.keys(association.mergeAssocId), Instances[i], options.__merge.where[1], false);
 			}
 
 			association.model.find(conditions, options, function (err, instances) {
@@ -193,6 +196,18 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 				}
 			}
 
+			if (order !== null) {
+				options.order = order;
+			}
+
+			if (conditions === null) {
+				conditions = {};
+			}
+
+			if (Driver.hasMany) {
+				return Driver.hasMany(Model, association).get(Instance, conditions, options, cb);
+			}
+
 			options.__merge = {
 				from  : { table: association.mergeTable, field: Object.keys(association.mergeAssocId) },
 				to    : { table: association.model.table, field: association.model.id },
@@ -205,13 +220,6 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 				id_prop: Object.keys(association.mergeId),
 				assoc_prop: Object.keys(association.mergeAssocId)
 			};
-			if (order !== null) {
-				options.order = order;
-			}
-
-			if (conditions === null) {
-				conditions = {};
-			}
 
 			util.populateConditions(Model, Object.keys(association.mergeId), Instance, options.__merge.where[1]);
 
@@ -258,6 +266,10 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 			var cb = (typeof Associations[Associations.length - 1] == "function" ? Associations.pop() : noOperation);
 			var conditions = {};
 			var run = function () {
+				if (Driver.hasMany) {
+					return Driver.hasMany(Model, association).del(Instance, Associations, cb);
+				}
+
 				if (Associations.length === 0) {
 					return Driver.remove(association.mergeTable, conditions, cb);
 				}
@@ -305,13 +317,24 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 						}
 
 						var data = {};
-						util.populateConditions(Model, Object.keys(association.mergeId), Instance, data);
-						util.populateConditions(association.model, Object.keys(association.mergeAssocId), Association, data);
 
 						for (var k in opts) {
 							data[k] = opts[k];
 						}
 
+						if (Driver.hasMany) {
+							return Driver.hasMany(Model, association).add(Instance, Association, data, function (err) {
+								if (err) {
+									return cb(err);
+								}
+
+								return saveNextAssociation();
+							});
+						}
+
+						util.populateConditions(Model, Object.keys(association.mergeId), Instance, data);
+						util.populateConditions(association.model, Object.keys(association.mergeAssocId), Association, data);
+
 						Driver.insert(association.mergeTable, data, null, function (err) {
 							if (err) {
 								return cb(err);

From de8f5ce556a6132baa95da5ced15a92ee0acd05e Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sun, 21 Jul 2013 00:04:42 +0100
Subject: [PATCH 0721/1246] Updates mongodb driver to add hasMany helper

---
 lib/Drivers/DML/mongodb.js | 115 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 113 insertions(+), 2 deletions(-)

diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
index e4dc71f0..d554f176 100644
--- a/lib/Drivers/DML/mongodb.js
+++ b/lib/Drivers/DML/mongodb.js
@@ -1,4 +1,5 @@
 var mongodb = require("mongodb");
+var util    = require("../../Utilities");
 
 exports.Driver = Driver;
 
@@ -9,6 +10,9 @@ function Driver(config, connection, opts) {
 	this.opts   = opts;
 
 	this.opts.settings.set("properties.primary_key", "_id");
+	this.opts.settings.set("properties.association_key", function (name, field) {
+		return name + "_" + field.replace(/^_+/, '');
+	});
 }
 
 Driver.prototype.sync = function (opts, cb) {
@@ -62,7 +66,7 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 
 	convertToDB(conditions);
 
-	var cursor     = collection.find(conditions, fields);
+	var cursor = (fields ? collection.find(conditions, fields) : collection.find(conditions));
 
 	if (opts.order) {
 		var orders = [];
@@ -144,6 +148,113 @@ Driver.prototype.insert = function (table, data, id_prop, cb) {
 	);
 };
 
+Driver.prototype.hasMany = function (Model, association) {
+	var db = this.db.collection(Model.table);
+	var driver = this;
+
+	return {
+		has: function (Instance, Associations, conditions, cb) {
+			return db.find({
+				_id : new mongodb.ObjectID(Instance[Model.id])
+			}, [ association.name ]).toArray(function (err, docs) {
+				if (err) return cb(err);
+				if (!docs.length) return cb(new Error("Not found"));
+				if (!Array.isArray(docs[0][association.name])) return cb(null, false);
+				if (!docs[0][association.name].length) return cb(null, false);
+
+				var found;
+
+				for (var i = 0; i < Associations.length; i++) {
+					found = false;
+					for (var j = 0; j < docs[0][association.name].length; j++) {
+						if (docs[0][association.name][j]._id == Associations[i][association.model.id]) {
+							found = true;
+							break;
+						}
+					}
+					if (!found) {
+						return cb(null, false);
+					}
+				}
+
+				return cb(null, true);
+			});
+		},
+		get: function (Instance, conditions, options, cb) {
+			return db.find({
+				_id : new mongodb.ObjectID(Instance[Model.id])
+			}, [ association.name ]).toArray(function (err, docs) {
+				if (err) return cb(err);
+				if (!docs.length) return cb(new Error("Not found"));
+
+				if (!docs[0][association.name]) {
+					return cb(null, []);
+				}
+
+				conditions._id = { $in: [] };
+				for (var i = 0; i < docs[0][association.name].length; i++) {
+					conditions._id.$in.push(new mongodb.ObjectID(docs[0][association.name][i]._id));
+				}
+
+				if (options.order) {
+					options.order[0] = options.order[0][1];
+					options.order = util.standardizeOrder(options.order);
+				}
+
+				return driver.find(null, association.model.table, conditions, options, cb);
+			});
+		},
+		add: function (Instance, Association, data, cb) {
+			var push = {};
+			push[association.name] = { _id : Association[association.model.id] };
+
+			for (var k in data) {
+				push[association.name][k] = data[k];
+			}
+
+			return db.update({
+				_id    : new mongodb.ObjectID(Instance[Model.id])
+			}, {
+				$push  : push
+			}, {
+				safe   : true,
+				upsert : true
+			}, cb);
+		},
+		del: function (Instance, Associations, cb) {
+			if (Associations.length === 0) {
+				var unset = {};
+				unset[association.name] = 1;
+
+				return db.update({
+					_id    : new mongodb.ObjectID(Instance[Model.id])
+				}, {
+					$unset : unset
+				}, {
+					safe   : true,
+					upsert : true
+				}, cb);
+			}
+
+			var pull = {};
+			pull[association.name] = [];
+
+			for (var i = 0; i < Associations.length; i++) {
+				pull[association.name].push({ _id: Associations[i][association.model.id] });
+			}
+
+			return db.update({
+				_id      : new mongodb.ObjectID(Instance[Model.id])
+			}, {
+				$pullAll : pull
+			}, {
+				safe     : true,
+				upsert   : true
+			}, cb);
+		}
+	};
+};
+
 Driver.prototype.update = function (table, changes, conditions, cb) {
 	convertToDB(conditions);
 
@@ -212,7 +323,7 @@ function convertToDB(obj) {
 			continue;
 		}
 
-		if (k == "_id") {
+		if (k == "_id" && typeof obj[k] == "string") {
 			obj[k] = new mongodb.ObjectID(obj[k]);
 		}
 	}

From bac61fa93ab12bb75ee05f7897a26a21b385a04b Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sun, 21 Jul 2013 00:05:22 +0100
Subject: [PATCH 0722/1246] Adds support for properties.association_key to be a
 function (name, field)

---
 lib/Utilities.js | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/lib/Utilities.js b/lib/Utilities.js
index 4806f666..8f7e18e7 100644
--- a/lib/Utilities.js
+++ b/lib/Utilities.js
@@ -98,9 +98,14 @@ exports.getConditions = function (model, fields, from) {
 
 exports.wrapFieldObject = function (obj, model, altName, alternatives) {
 	if (!obj) {
-		obj = model.settings.get("properties.association_key")
-		                    .replace("{name}", altName.toLowerCase())
-		                    .replace("{field}", "id");
+		var assoc_key = model.settings.get("properties.association_key");
+
+		if (typeof assoc_key == "function") {
+			obj = assoc_key(altName.toLowerCase(), 'id');
+		} else {
+			obj = assoc_key.replace("{name}", altName.toLowerCase())
+			               .replace("{field}", 'id');
+		}
 	}
 
 	for (var k in obj) {
@@ -119,11 +124,17 @@ exports.wrapFieldObject = function (obj, model, altName, alternatives) {
 exports.formatField = function (model, name, required, reversed) {
 	var fields = {}, field_opts, field_name;
 	var keys = model.id;
+	var assoc_key = model.settings.get("properties.association_key");
 
 	for (var i = 0; i < keys.length; i++) {
-		field_name = reversed ? keys[i] : model.settings.get("properties.association_key")
-		                                                .replace("{name}", name.toLowerCase())
-		                                                .replace("{field}", keys[i]);
+		if (reversed) {
+			field_name = keys[i];
+		} else if (typeof assoc_key == "function") {
+			field_name = assoc_key(name.toLowerCase(), keys[i]);
+		} else {
+			field_name = assoc_key.replace("{name}", name.toLowerCase())
+			                      .replace("{field}", keys[i]);
+		}
 
 		if (model.properties.hasOwnProperty(keys[i])) {
 			var p = model.properties[keys[i]];

From 394e2a267c2b31b013b026f0ca66da361f6795d5 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sun, 21 Jul 2013 00:05:51 +0100
Subject: [PATCH 0723/1246] Updates hasMany tests to allow mongodb to pass

---
 test/integration/association-hasmany.js | 79 +++++++++++++------------
 test/run.js                             |  5 +-
 2 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
index 351aaaa0..22fbecc2 100644
--- a/test/integration/association-hasmany.js
+++ b/test/integration/association-hasmany.js
@@ -1,6 +1,7 @@
 var should = require('should');
 var helper = require('../support/spec_helper');
 var ORM    = require('../../');
+var common = require('../common');
 
 describe("hasMany", function () {
 	this.timeout(4000);
@@ -103,10 +104,10 @@ describe("hasMany", function () {
 		});
 
 		it("should allow to specify a limit", function (done) {
-			Person.find({ name: "John" }, function (err, people) {
+			Person.find({ name: "John" }).first(function (err, John) {
 				should.equal(err, null);
 
-				people[0].getPets(1, function (err, pets) {
+				John.getPets(1, function (err, pets) {
 					should.equal(err, null);
 
 					should(Array.isArray(pets));
@@ -118,10 +119,10 @@ describe("hasMany", function () {
 		});
 
 		it("should allow to specify conditions", function (done) {
-			Person.find({ name: "John" }, function (err, people) {
+			Person.find({ name: "John" }).first(function (err, John) {
 				should.equal(err, null);
 
-				people[0].getPets({ name: "Mutt" }, function (err, pets) {
+				John.getPets({ name: "Mutt" }, function (err, pets) {
 					should.equal(err, null);
 
 					should(Array.isArray(pets));
@@ -133,6 +134,8 @@ describe("hasMany", function () {
 			});
 		});
 
+		if (common.protocol() == "mongodb") return;
+
 		it("should return a chain if no callback defined", function (done) {
 			Person.find({ name: "John" }, function (err, people) {
 				should.equal(err, null);
@@ -157,10 +160,10 @@ describe("hasMany", function () {
 			Pet.find({ name: "Mutt" }, function (err, pets) {
 				should.equal(err, null);
 
-				Person.find({ name: "Jane" }, function (err, people) {
+				Person.find({ name: "Jane" }).first(function (err, Jane) {
 					should.equal(err, null);
 
-					people[0].hasPets(pets[0], function (err, has_pets) {
+					Jane.hasPets(pets[0], function (err, has_pets) {
 						should.equal(err, null);
 						has_pets.should.be.true;
 
@@ -171,10 +174,10 @@ describe("hasMany", function () {
 		});
 
 		it("should return true if not passing any instance and has associated items", function (done) {
-			Person.find({ name: "Jane" }, function (err, people) {
+			Person.find({ name: "Jane" }).first(function (err, Jane) {
 				should.equal(err, null);
 
-				people[0].hasPets(function (err, has_pets) {
+				Jane.hasPets(function (err, has_pets) {
 					should.equal(err, null);
 					has_pets.should.be.true;
 
@@ -185,10 +188,10 @@ describe("hasMany", function () {
 
 		it("should return true if all passed instances are associated", function (done) {
 			Pet.find(function (err, pets) {
-				Person.find({ name: "John" }, function (err, people) {
+				Person.find({ name: "John" }).first(function (err, John) {
 					should.equal(err, null);
 
-					people[0].hasPets(pets, function (err, has_pets) {
+					John.hasPets(pets, function (err, has_pets) {
 						should.equal(err, null);
 						has_pets.should.be.true;
 
@@ -200,10 +203,10 @@ describe("hasMany", function () {
 
 		it("should return false if any passed instances are not associated", function (done) {
 			Pet.find(function (err, pets) {
-				Person.find({ name: "Jane" }, function (err, people) {
+				Person.find({ name: "Jane" }).first(function (err, Jane) {
 					should.equal(err, null);
 
-					people[0].hasPets(pets, function (err, has_pets) {
+					Jane.hasPets(pets, function (err, has_pets) {
 						should.equal(err, null);
 						has_pets.should.be.false;
 
@@ -240,13 +243,13 @@ describe("hasMany", function () {
 		});
 
 		it("should remove all associations if none passed", function (done) {
-			Person.find({ name: "John" }, function (err, people) {
+			Person.find({ name: "John" }).first(function (err, John) {
 				should.equal(err, null);
 
-				people[0].removePets(function (err) {
+				John.removePets(function (err) {
 					should.equal(err, null);
 
-					people[0].getPets(function (err, pets) {
+					John.getPets(function (err, pets) {
 						should.equal(err, null);
 
 						should(Array.isArray(pets));
@@ -262,6 +265,8 @@ describe("hasMany", function () {
 	describe("addAccessor", function () {
 		before(setup());
 
+		if (common.protocol() == "mongodb") return;
+
 		it("might add duplicates", function (done) {
 			Pet.find({ name: "Mutt" }, function (err, pets) {
 				Person.find({ name: "Jane" }, function (err, people) {
@@ -290,14 +295,14 @@ describe("hasMany", function () {
 		before(setup());
 
 		it("should keep associations and add new ones", function (done) {
-			Pet.find({ name: "Deco" }, function (err, pets) {
-				Person.find({ name: "Jane" }, function (err, people) {
+			Pet.find({ name: "Deco" }).first(function (err, Deco) {
+				Person.find({ name: "Jane" }).first(function (err, Jane) {
 					should.equal(err, null);
 
-					people[0].addPets(pets[0], function (err) {
+					Jane.addPets(Deco, function (err) {
 						should.equal(err, null);
 
-						people[0].getPets("name", function (err, pets) {
+						Jane.getPets("name", function (err, pets) {
 							should.equal(err, null);
 
 							should(Array.isArray(pets));
@@ -318,13 +323,13 @@ describe("hasMany", function () {
 
 		it("should accept several arguments as associations", function (done) {
 			Pet.find(function (err, pets) {
-				Person.find({ name: "Justin" }, function (err, people) {
+				Person.find({ name: "Justin" }).first(function (err, Justin) {
 					should.equal(err, null);
 
-					people[0].addPets(pets[0], pets[1], function (err) {
+					Justin.addPets(pets[0], pets[1], function (err) {
 						should.equal(err, null);
 
-						people[0].getPets(function (err, pets) {
+						Justin.getPets(function (err, pets) {
 							should.equal(err, null);
 
 							should(Array.isArray(pets));
@@ -343,13 +348,13 @@ describe("hasMany", function () {
 
 		it("should accept array as list of associations", function (done) {
 			Pet.find(function (err, pets) {
-				Person.find({ name: "Justin" }, function (err, people) {
+				Person.find({ name: "Justin" }).first(function (err, Justin) {
 					should.equal(err, null);
 
-					people[0].addPets(pets, function (err) {
+					Justin.addPets(pets, function (err) {
 						should.equal(err, null);
 
-						people[0].getPets(function (err, all_pets) {
+						Justin.getPets(function (err, all_pets) {
 							should.equal(err, null);
 
 							should(Array.isArray(all_pets));
@@ -370,20 +375,20 @@ describe("hasMany", function () {
 			Pet.find({ name: "Deco" }, function (err, pets) {
 				var Deco = pets[0];
 
-				Person.find({ name: "Jane" }, function (err, people) {
+				Person.find({ name: "Jane" }).first(function (err, Jane) {
 					should.equal(err, null);
 
-					people[0].getPets(function (err, pets) {
+					Jane.getPets(function (err, pets) {
 						should.equal(err, null);
 
 						should(Array.isArray(pets));
 						pets.length.should.equal(1);
 						pets[0].name.should.equal("Mutt");
 
-						people[0].setPets(Deco, function (err) {
+						Jane.setPets(Deco, function (err) {
 							should.equal(err, null);
 
-							people[0].getPets(function (err, pets) {
+							Jane.getPets(function (err, pets) {
 								should.equal(err, null);
 
 								should(Array.isArray(pets));
@@ -404,13 +409,13 @@ describe("hasMany", function () {
 
 		it("should accept several arguments as associations", function (done) {
 			Pet.find(function (err, pets) {
-				Person.find({ name: "Justin" }, function (err, people) {
+				Person.find({ name: "Justin" }).first(function (err, Justin) {
 					should.equal(err, null);
 
-					people[0].setPets(pets[0], pets[1], function (err) {
+					Justin.setPets(pets[0], pets[1], function (err) {
 						should.equal(err, null);
 
-						people[0].getPets(function (err, pets) {
+						Justin.getPets(function (err, pets) {
 							should.equal(err, null);
 
 							should(Array.isArray(pets));
@@ -425,13 +430,13 @@ describe("hasMany", function () {
 
 		it("should accept an array of associations", function (done) {
 			Pet.find(function (err, pets) {
-				Person.find({ name: "Justin" }, function (err, people) {
+				Person.find({ name: "Justin" }).first(function (err, Justin) {
 					should.equal(err, null);
 
-					people[0].setPets(pets, function (err) {
+					Justin.setPets(pets, function (err) {
 						should.equal(err, null);
 
-						people[0].getPets(function (err, all_pets) {
+						Justin.getPets(function (err, all_pets) {
 							should.equal(err, null);
 
 							should(Array.isArray(all_pets));
@@ -445,11 +450,11 @@ describe("hasMany", function () {
 		});
 
 		it("should throw if no items passed", function (done) {
-			Person.find(1, function (err, people) {
+			Person.one(function (err, person) {
 				should.equal(err, null);
 
 				(function () {
-					people[0].addPets(function () {});
+					person.addPets(function () {});
 				}).should.throw();
 
 				return done();
diff --git a/test/run.js b/test/run.js
index eefdf612..a5f03eaf 100644
--- a/test/run.js
+++ b/test/run.js
@@ -31,9 +31,10 @@ function shouldRunTest(file) {
 	var name  = file.substr(0, file.length - 3);
 	var proto = process.env.ORM_PROTOCOL;
 
-	if (proto == "mongodb" && [ "association-hasmany-extra", "association-hasmany",
+	if (proto == "mongodb" && [ "association-hasmany-extra",
 	                            "model-aggregate",
-	                            "property-lazyload", "property-number-size" ].indexOf(name) >= 0) return false;
+	                            "property-lazyload", "property-number-size",
+	                            "smart-types" ].indexOf(name) >= 0) return false;
 
 	return true;
 }

From 5a9db28e22c0e0077e63f28713cbaa323d8f050a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sun, 21 Jul 2013 00:29:31 +0100
Subject: [PATCH 0724/1246] Adds mongodb reference to Readme

---
 Readme.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Readme.md b/Readme.md
index c7219d85..656608d1 100755
--- a/Readme.md
+++ b/Readme.md
@@ -26,6 +26,7 @@ npm test
 - PostgreSQL
 - Amazon Redshift
 - SQLite
+- MongoDB (beta, some missing features)
 
 ## Features
 
@@ -133,6 +134,7 @@ First, add the correct driver to your `package.json`:
  mysql                 | `"mysql" : "2.0.0-alpha7"`
  postgres<br/>redshift | `"pg": "~1.0.0"`
  sqlite                | `"sqlite3" : "2.1.7"`
+ mongodb               | `"mongodb" : "1.3.11"`
 
 These are the versions tested. Use others (older or newer) at your own risk.
 

From 89e2f850928dddf1a6be41627362ecdb9e06b25e Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 22 Jul 2013 19:58:51 +0100
Subject: [PATCH 0725/1246] Updates mongodb driver to support association extra
 properties

---
 lib/Associations/Many.js                      |  8 ++---
 lib/Drivers/DML/mongodb.js                    | 29 +++++++++++++++++--
 lib/Model.js                                  |  2 +-
 test/integration/association-hasmany-extra.js |  1 -
 test/run.js                                   |  3 +-
 5 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index da1d0693..332873e8 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -80,9 +80,9 @@ exports.prepare = function (Model, associations) {
 	};
 };
 
-exports.extend = function (Model, Instance, Driver, associations, opts) {
+exports.extend = function (Model, Instance, Driver, associations, opts, createInstance) {
 	for (var i = 0; i < associations.length; i++) {
-		extendInstance(Model, Instance, Driver, associations[i], opts);
+		extendInstance(Model, Instance, Driver, associations[i], opts, createInstance);
 	}
 };
 
@@ -105,7 +105,7 @@ exports.autoFetch = function (Instance, associations, opts, cb) {
 	}
 };
 
-function extendInstance(Model, Instance, Driver, association, opts) {
+function extendInstance(Model, Instance, Driver, association, opts, createInstance) {
 	if (Model.settings.get("instance.cascadeRemove")) {
 		Instance.on("beforeRemove", function () {
 			Instance[association.delAccessor]();
@@ -205,7 +205,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 			}
 
 			if (Driver.hasMany) {
-				return Driver.hasMany(Model, association).get(Instance, conditions, options, cb);
+				return Driver.hasMany(Model, association).get(Instance, conditions, options, createInstance, cb);
 			}
 
 			options.__merge = {
diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
index d554f176..cb8f2785 100644
--- a/lib/Drivers/DML/mongodb.js
+++ b/lib/Drivers/DML/mongodb.js
@@ -1,5 +1,6 @@
 var mongodb = require("mongodb");
 var util    = require("../../Utilities");
+var _       = require('lodash');
 
 exports.Driver = Driver;
 
@@ -84,11 +85,28 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	}
 
 	return cursor.toArray(function (err, docs) {
+		var pending = 0;
+
 		for (var i = 0; i < docs.length; i++) {
 			convertFromDB(docs[i]);
-			// docs[i]._id = docs[i]._id.toString();
+			if (opts.extra && opts.extra[docs[i]._id]) {
+				docs[i] = _.merge(docs[i], _.omit(opts.extra[docs[i]._id], '_id'));
+			}
+			if (opts.createInstance) {
+				pending += 1;
+				docs[i] = opts.createInstance(docs[i], {
+					extra : opts.extra_props
+				}, function () {
+					if (--pending) {
+						return cb(null, docs);
+					}
+				});
+			}
+		}
+
+		if (pending === 0) {
+			return cb(err, docs);
 		}
-		return cb(err, docs);
 	});
 };
 
@@ -180,7 +198,7 @@ Driver.prototype.hasMany = function (Model, association) {
 				return cb(null, true);
 			});
 		},
-		get: function (Instance, conditions, options, cb) {
+		get: function (Instance, conditions, options, createInstance, cb) {
 			return db.find({
 				_id : new mongodb.ObjectID(Instance[Model.id])
 			}, [ association.name ]).toArray(function (err, docs) {
@@ -192,8 +210,10 @@ Driver.prototype.hasMany = function (Model, association) {
 				}
 
 				conditions._id = { $in: [] };
+				options.extra = {};
 				for (var i = 0; i < docs[0][association.name].length; i++) {
 					conditions._id.$in.push(new mongodb.ObjectID(docs[0][association.name][i]._id));
+					options.extra[docs[0][association.name][i]._id] = docs[0][association.name][i];
 				}
 
 				if (options.order) {
@@ -201,6 +221,9 @@ Driver.prototype.hasMany = function (Model, association) {
 					options.order = util.standardizeOrder(options.order);
 				}
 
+				options.extra_props = association.props;
+				options.createInstance = createInstance;
+
 				return driver.find(null, association.model.table, conditions, options, cb);
 			});
 		},
diff --git a/lib/Model.js b/lib/Model.js
index 46026aa5..b5058460 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -116,7 +116,7 @@ function Model(opts) {
 			LazyLoad.extend(instance, model, opts.properties);
 		}
 		OneAssociation.extend(model, instance, opts.driver, one_associations, assoc_opts);
-		ManyAssociation.extend(model, instance, opts.driver, many_associations, assoc_opts);
+		ManyAssociation.extend(model, instance, opts.driver, many_associations, assoc_opts, createInstance);
 		ExtendAssociation.extend(model, instance, opts.driver, extend_associations, assoc_opts);
 
 		OneAssociation.autoFetch(instance, one_associations, assoc_opts, function () {
diff --git a/test/integration/association-hasmany-extra.js b/test/integration/association-hasmany-extra.js
index ff038890..9f312bb0 100644
--- a/test/integration/association-hasmany-extra.js
+++ b/test/integration/association-hasmany-extra.js
@@ -56,7 +56,6 @@ describe("hasMany extra properties", function() {
 
 							John.pets.length.should.equal(2);
 
-							John.pets[0].should.have.property("id");
 							John.pets[0].should.have.property("name");
 							John.pets[0].should.have.property("extra");
 							John.pets[0].extra.should.be.a("object");
diff --git a/test/run.js b/test/run.js
index a5f03eaf..501efa6f 100644
--- a/test/run.js
+++ b/test/run.js
@@ -31,8 +31,7 @@ function shouldRunTest(file) {
 	var name  = file.substr(0, file.length - 3);
 	var proto = process.env.ORM_PROTOCOL;
 
-	if (proto == "mongodb" && [ "association-hasmany-extra",
-	                            "model-aggregate",
+	if (proto == "mongodb" && [ "model-aggregate",
 	                            "property-lazyload", "property-number-size",
 	                            "smart-types" ].indexOf(name) >= 0) return false;
 

From c8f8b84d473b26245378bd030410812fc2ed85c0 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 22 Jul 2013 20:06:35 +0100
Subject: [PATCH 0726/1246] Fixes previous commit stupid error

---
 lib/Drivers/DML/mongodb.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
index cb8f2785..f054d762 100644
--- a/lib/Drivers/DML/mongodb.js
+++ b/lib/Drivers/DML/mongodb.js
@@ -94,10 +94,11 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 			}
 			if (opts.createInstance) {
 				pending += 1;
+
 				docs[i] = opts.createInstance(docs[i], {
 					extra : opts.extra_props
 				}, function () {
-					if (--pending) {
+					if (--pending === 0) {
 						return cb(null, docs);
 					}
 				});

From c036ada9e45444420f786eb11c61d7bdf0206987 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 22 Jul 2013 22:25:36 +0100
Subject: [PATCH 0727/1246] Changes throw error when setting ID in instance to
 silent return

---
 lib/Instance.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 0a43a17f..9d798358 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -399,7 +399,7 @@ function Instance(Model, opts) {
 			},
 			set: function (val) {
 			    if (opts.id.indexOf(key) >= 0 && opts.data.hasOwnProperty(key)) {
-					throw new Error("Cannot change ID");
+			    	return;
 				}
 
 				if (opts.data[key] === val) return;

From 784b34167876100ae03473f7524ab64f2e31dcf3 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 22 Jul 2013 22:27:26 +0100
Subject: [PATCH 0728/1246] Fixes lazyload properties (it had fixed "id" key),
 updates tests for mongodb

Some cleanup on mongodb driver
---
 lib/Drivers/DML/mongodb.js            | 89 ++++++++++++++++-----------
 lib/LazyLoad.js                       | 13 ++--
 test/integration/property-lazyload.js |  2 +-
 test/run.js                           |  3 +-
 4 files changed, 61 insertions(+), 46 deletions(-)

diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
index f054d762..1ded5886 100644
--- a/lib/Drivers/DML/mongodb.js
+++ b/lib/Drivers/DML/mongodb.js
@@ -85,6 +85,11 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	}
 
 	return cursor.toArray(function (err, docs) {
+		if (err) {
+			throw err;
+			return cb(err);
+		}
+
 		var pending = 0;
 
 		for (var i = 0; i < docs.length; i++) {
@@ -106,7 +111,7 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 		}
 
 		if (pending === 0) {
-			return cb(err, docs);
+			return cb(null, docs);
 		}
 	});
 };
@@ -280,6 +285,7 @@ Driver.prototype.hasMany = function (Model, association) {
 };
 
 Driver.prototype.update = function (table, changes, conditions, cb) {
+	convertToDB(changes);
 	convertToDB(conditions);
 
 	return this.db.collection(table).update(
@@ -308,48 +314,15 @@ Driver.prototype.clear = function (table, cb) {
 function convertToDB(obj) {
 	for (var k in obj) {
 		if (Array.isArray(obj[k])) {
-			if (k == "_id") {
-				for (var i = 0; i < obj[k].length; i++) {
-					obj[k][i] = new mongodb.ObjectID(obj[k][i]);
-				}
+			for (var i = 0; i < obj[k].length; i++) {
+				obj[k][i] = convertToDBVal(k, obj[k][i]);
 			}
 
 			obj[k] = { $in: obj[k] };
 			continue;
 		}
 
-		if (obj[k] && typeof obj[k].sql_comparator == "function") {
-			var val       = (k != "_id" ? obj[k].val : new mongodb.ObjectID(obj[k].val));
-			var comp      = obj[k].sql_comparator();
-			var condition = {};
-
-			switch (comp) {
-				case "gt":
-				case "gte":
-				case "lt":
-				case "lte":
-				case "ne":
-					condition["$" + comp] = val;
-					break;
-				case "eq":
-					condition = val;
-					break;
-				case "between":
-					condition["$min"] = obj[k].from;
-					condition["$max"] = obj[k].to;
-					break;
-				case "like":
-					condition["$regex"] = obj[k].expr.replace("%", ".*");
-					break;
-			}
-
-			obj[k] = condition;
-			continue;
-		}
-
-		if (k == "_id" && typeof obj[k] == "string") {
-			obj[k] = new mongodb.ObjectID(obj[k]);
-		}
+		obj[k] = convertToDBVal(k, obj[k]);
 	}
 }
 
@@ -357,6 +330,48 @@ function convertFromDB(obj) {
 	for (var k in obj) {
 		if (obj[k] instanceof mongodb.ObjectID) {
 			obj[k] = obj[k].toString();
+		} else if (obj[k] instanceof mongodb.Binary) {
+			obj[k] = new Buffer(obj[k].value(), "binary");
 		}
 	}
 }
+
+function convertToDBVal(key, value) {
+	if (value && typeof value.sql_comparator == "function") {
+		var val       = (key != "_id" ? value.val : new mongodb.ObjectID(value.val));
+		var comp      = value.sql_comparator();
+		var condition = {};
+
+		switch (comp) {
+			case "gt":
+			case "gte":
+			case "lt":
+			case "lte":
+			case "ne":
+				condition["$" + comp] = val;
+				break;
+			case "eq":
+				condition = val;
+				break;
+			case "between":
+				condition["$min"] = val.from;
+				condition["$max"] = val.to;
+				break;
+			case "like":
+				condition["$regex"] = val.expr.replace("%", ".*");
+				break;
+		}
+
+		return condition;
+	}
+
+	if (Buffer.isBuffer(value)) {
+		return new mongodb.Binary(value);
+	}
+
+	if (key == "_id" && typeof value == "string") {
+		value = new mongodb.ObjectID(value);
+	}
+
+	return value;
+}
diff --git a/lib/LazyLoad.js b/lib/LazyLoad.js
index 76dcec24..8ee56336 100644
--- a/lib/LazyLoad.js
+++ b/lib/LazyLoad.js
@@ -12,7 +12,7 @@ function addLazyLoadProperty(name, Instance, Model, property) {
 	Object.defineProperty(Instance, "get" + method, {
 		value: function (cb) {
 			var conditions = {};
-			conditions[Model.id] = Instance.id;
+			conditions[Model.id] = Instance[Model.id];
 
 			Model.find(conditions, { cache: false }).only(property).first(function (err, item) {
 				return cb(err, item ? item[property] : null);
@@ -25,7 +25,7 @@ function addLazyLoadProperty(name, Instance, Model, property) {
 	Object.defineProperty(Instance, "remove" + method, {
 		value: function (cb) {
 			var conditions = {};
-			conditions[Model.id] = Instance.id;
+			conditions[Model.id] = Instance[Model.id];
 
 			Model.find(conditions, { cache: false }).only(property).first(function (err, item) {
 				if (err) {
@@ -35,8 +35,9 @@ function addLazyLoadProperty(name, Instance, Model, property) {
 					return cb(null);
 				}
 
-				item[Model.id] = Instance.id;
 				item[property] = null;
+				item[Model.id] = Instance[Model.id];
+
 				return item.save(cb);
 			});
 
@@ -47,9 +48,9 @@ function addLazyLoadProperty(name, Instance, Model, property) {
 	Object.defineProperty(Instance, "set" + method, {
 		value: function (data, cb) {
 			var conditions = {};
-			conditions[Model.id] = Instance.id;
+			conditions[Model.id] = Instance[Model.id];
 
-			Model.find(conditions, { cache: false }).only(property).first(function (err, item) {
+			Model.find(conditions, { cache: false }).first(function (err, item) {
 				if (err) {
 					return cb(err);
 				}
@@ -57,8 +58,8 @@ function addLazyLoadProperty(name, Instance, Model, property) {
 					return cb(null);
 				}
 
-				item[Model.id] = Instance.id;
 				item[property] = data;
+
 				return item.save(cb);
 			});
 
diff --git a/test/integration/property-lazyload.js b/test/integration/property-lazyload.js
index f1dda0aa..da6df0c8 100644
--- a/test/integration/property-lazyload.js
+++ b/test/integration/property-lazyload.js
@@ -91,7 +91,7 @@ describe("LazyLoad properties", function() {
 				John.setPhoto(OtherPersonPhoto, function (err) {
 					should.equal(err, null);
 
-					Person.get(1, function (err, John) {
+					Person.find().first(function (err, John) {
 						should.equal(err, null);
 
 						John.should.be.a("object");
diff --git a/test/run.js b/test/run.js
index 501efa6f..366a5327 100644
--- a/test/run.js
+++ b/test/run.js
@@ -32,8 +32,7 @@ function shouldRunTest(file) {
 	var proto = process.env.ORM_PROTOCOL;
 
 	if (proto == "mongodb" && [ "model-aggregate",
-	                            "property-lazyload", "property-number-size",
-	                            "smart-types" ].indexOf(name) >= 0) return false;
+	                            "property-number-size", "smart-types" ].indexOf(name) >= 0) return false;
 
 	return true;
 }

From 2146b796dfb2838a953cc5a1c7abd1eed469bc40 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 23 Jul 2013 09:51:43 +0100
Subject: [PATCH 0729/1246] Updates mongodb driver sync/drop

- .clear() no longer drops
- .drop() now drops without calling .clear()
- .sync() creates collection with some indexes
---
 lib/Drivers/DML/mongodb.js | 47 +++++++++++++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 6 deletions(-)

diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
index 1ded5886..a41d7dad 100644
--- a/lib/Drivers/DML/mongodb.js
+++ b/lib/Drivers/DML/mongodb.js
@@ -17,14 +17,49 @@ function Driver(config, connection, opts) {
 }
 
 Driver.prototype.sync = function (opts, cb) {
-	if (typeof cb == "function") {
-		return process.nextTick(cb);
-	}
+	this.db.createCollection(opts.table, function (err, collection) {
+		if (err) {
+			return cb(err);
+		}
+
+		var indexes = [], pending;
+
+		for (var i = 0; i < opts.one_associations.length; i++) {
+			if (opts.one_associations[i].extension) continue;
+			if (opts.one_associations[i].reversed) continue;
+
+			for (var k in opts.one_associations[i].field) {
+				indexes.push(k);
+			}
+		}
+
+		for (i = 0; i < opts.many_associations.length; i++) {
+			if (opts.many_associations[i].reversed) continue;
+
+			indexes.push(opts.many_associations[i].name);
+		}
+
+		pending = indexes.length;
+
+		for (i = 0; i < indexes.length; i++) {
+			collection.createIndex(indexes[i], function () {
+				if (--pending === 0) {
+					return cb();
+				}
+			});
+		}
+
+		if (pending === 0) {
+			return cb();
+		}
+	});
 };
 
 Driver.prototype.drop = function (opts, cb) {
-	return this.clear(opts.table, function () {
-		return cb();
+	return this.db.collection(opts.table).drop(function () {
+		if (typeof cb == "function") {
+			return cb();
+		}
 	});
 };
 
@@ -308,7 +343,7 @@ Driver.prototype.remove = function (table, conditions, cb) {
 };
 
 Driver.prototype.clear = function (table, cb) {
-	return this.db.collection(table).drop(cb);
+	return this.db.collection(table).remove(cb);
 };
 
 function convertToDB(obj) {

From 90db723f285548a2971b0051e9da274f762ce936 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 23 Jul 2013 10:38:21 +0100
Subject: [PATCH 0730/1246] Updates driver dependency table

---
 Readme.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Readme.md b/Readme.md
index 656608d1..be351fa7 100755
--- a/Readme.md
+++ b/Readme.md
@@ -26,7 +26,7 @@ npm test
 - PostgreSQL
 - Amazon Redshift
 - SQLite
-- MongoDB (beta, some missing features)
+- MongoDB (beta, missing aggregation for now)
 
 ## Features
 
@@ -129,12 +129,12 @@ orm.connect("....", function (err, db) {
 
 First, add the correct driver to your `package.json`:
 
- driver                | dependency
-:----------------------|:---------------------------
- mysql                 | `"mysql" : "2.0.0-alpha7"`
- postgres<br/>redshift | `"pg": "~1.0.0"`
- sqlite                | `"sqlite3" : "2.1.7"`
- mongodb               | `"mongodb" : "1.3.11"`
+ driver                | npm package                | version
+:----------------------|:---------------------------|:-----
+ mysql                 | mysql                      | 2.0.0-alpha7
+ postgres<br/>redshift | pg                         | ~1.0.0
+ sqlite                | sqlite3                    | 2.1.7
+ mongodb               | mongodb                    | 1.3.11
 
 These are the versions tested. Use others (older or newer) at your own risk.
 

From 26f4593286b7bb9626f4702e1695d3cf3d5eaafd Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 23 Jul 2013 11:23:04 +0100
Subject: [PATCH 0731/1246] sql-query@0.1.7

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1f40b64c..9d1c6e40 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
 	},
 	"analyse"     : false,
 	"dependencies": {
-		"sql-query" : "0.1.6",
+		"sql-query" : "0.1.7",
 		"hat"       : "0.0.3",
 		"lodash"    : "1.3.1"
 	},

From 7bdb1a6d529c98ce9c8e49b6c75bccc6ea8eeb03 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 23 Jul 2013 11:25:23 +0100
Subject: [PATCH 0732/1246] Adds not_between() comparator to Readme

---
 Readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Readme.md b/Readme.md
index be351fa7..53455add 100755
--- a/Readme.md
+++ b/Readme.md
@@ -610,6 +610,7 @@ a few examples to describe it:
 { col1: orm.lt(123) } // `col1` < 123
 { col1: orm.lte(123) } // `col1` <= 123
 { col1: orm.between(123, 456) } // `col1` BETWEEN 123 AND 456
+{ col1: orm.not_between(123, 456) } // `col1` NOT BETWEEN 123 AND 456
 { col1: orm.like(12 + "%") } // `col1` like '12%'
 ```
 

From b3d5343bc9c194049c06969132ee3750381fcbbf Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 23 Jul 2013 11:28:34 +0100
Subject: [PATCH 0733/1246] Adds an example about hasMany.getAccessor returning
 a ChainFind

---
 Readme.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Readme.md b/Readme.md
index 53455add..7affef34 100755
--- a/Readme.md
+++ b/Readme.md
@@ -895,6 +895,17 @@ patient.addDoctor(surgeon, {why: "remove appendix"}, function(err) { ... } )
 
 which will add `{patient_id: 4, doctor_id: 6, why: "remove appendix"}` to the join table.
 
+#### getAccessor
+
+This accessor in this type of association returns a `ChainFind` if not passing a callback. This means you can
+do things like:
+
+```js
+patient.getDoctors().order("name").offset(1).run(function (err, doctors), {
+	// ... all doctors, ordered by name, excluding first one
+});
+```
+
 ### extendsTo
 
 If you want to split maybe optional properties into different tables or collections. Every extension will be in a new table,

From b2b35d8adc6f895ff41d6eecc01994a4bcc2e64c Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 23 Jul 2013 18:10:07 +0100
Subject: [PATCH 0734/1246] sql-query@0.1.8

because of dresende/node-sql-query#17
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9d1c6e40..54d0d617 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
 	},
 	"analyse"     : false,
 	"dependencies": {
-		"sql-query" : "0.1.7",
+		"sql-query" : "0.1.8",
 		"hat"       : "0.0.3",
 		"lodash"    : "1.3.1"
 	},

From c009904948756c51e4375c2753328323186b230b Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 24 Jul 2013 23:12:23 +0100
Subject: [PATCH 0735/1246] Changes validations and predefined validators to
 use enforce@0.1.1

This separate module allows people to use the validation separately in
other projects as well as improve this part (with more validations and
tests) without touching orm.

NOTE: Previous validators still work as alias. Only 1 change: errors no
longer have 'field', they have 'property' instead.
---
 Readme.md                                 |  81 +------
 lib/Instance.js                           |  36 +--
 lib/ORM.js                                |  15 +-
 lib/Validators.js                         | 170 ++------------
 package.json                              |   1 +
 test/integration/predefined-validators.js | 269 +---------------------
 test/integration/validation.js            |  44 ++--
 7 files changed, 78 insertions(+), 538 deletions(-)

diff --git a/Readme.md b/Readme.md
index 7affef34..5df50453 100755
--- a/Readme.md
+++ b/Readme.md
@@ -32,7 +32,7 @@ npm test
 
 - Create Models, sync, drop, bulk create, get, find, remove, count, aggregated functions
 - Create Model associations, find, check, create and remove
-- Define custom validations (several builtin validations, check instance properties before saving)
+- Define custom validations (several builtin validations, check instance properties before saving - see [enforce](http://github.com/dresende/node-enforce) for details)
 - Model instance caching and integrity (table rows fetched twice are the same object, changes to one change all)
 - Plugins: [MySQL FTS](http://dresende.github.io/node-orm-mysql-fts) , [Pagination](http://dresende.github.io/node-orm-paging) , [Transaction](http://dresende.github.io/node-orm-transaction)
 
@@ -63,7 +63,7 @@ orm.connect("mysql://username:password@host/database", function (err, db) {
 			}
 		},
 		validations: {
-			age: orm.validators.rangeNumber(18, undefined, "under-age")
+			age: orm.enforce.ranges.number(18, undefined, "under-age")
 		}
 	});
 
@@ -707,6 +707,10 @@ Person.get(1, function (err, John) {
 
 ## Validations
 
+The module [Enforce](http://github.com/dresende/node-enforce) is used for validations. For people using previous validators,
+they're still present, some as links to enforce, others not. We advise you to start using `orm.enforce` instead of `orm.validators`.
+For a list of possible validations, consult the [module](http://github.com/dresende/node-enforce).
+
 You can define validations for every property of a Model. You can have one or more validations for each property.
 You can also use the predefined validations or create your own.
 
@@ -716,8 +720,8 @@ var Person = db.define("person", {
 	age  : Number
 }, {
 	validations : {
-		name : orm.validators.rangeLength(1, undefined, "missing"), // "missing" is a name given to this validation, instead of default
-		age  : [ orm.validators.rangeNumber(0, 10), orm.validators.insideList([ 1, 3, 5, 7, 9 ]) ]
+		name : orm.enforce.ranges.length(1, undefined, "missing"), // "missing" is a name given to this validation, instead of default
+		age  : [ orm.enforce.ranges.number(0, 10), orm.enforce.lists.inside([ 1, 3, 5, 7, 9 ]) ]
 	}
 });
 ```
@@ -758,76 +762,13 @@ orm.connect("....", function (err, db) {
 	});
 	John.save(function (err) {
 		assert(Array.isArray(err));
-		// err[0].field = "name" , err[0].value = "" , err[0].msg = "missing"
-		// err[1].field = "age"  , err[1].value = 15 , err[1].msg = "out-of-range-number"
-		// err[2].field = "age"  , err[2].value = 15 , err[2].msg = "outside-list"
+		// err[0].property = "name" , err[0].value = "" , err[0].msg = "missing"
+		// err[1].property = "age"  , err[1].value = 15 , err[1].msg = "out-of-range-number"
+		// err[2].property = "age"  , err[2].value = 15 , err[2].msg = "outside-list"
 	});
 });
 ```
 
-### Predefined Validations
-
-Predefined validations accept an optional last parameter `msg` that is the `Error.msg` if it's triggered.
-
-#### `required(msg)`
-
-Ensures property is not `null` or `undefined`. It does not trigger any error if property is `0` or empty string.
-
-#### `rangeNumber(min, max, msg)`
-
-Ensures a property is a number between `min` and `max`. Any of the parameters can be passed as `undefined`
-to exclude a minimum or maximum value.
-
-#### `rangeLength(min, max, msg)`
-
-Same as previous validator but for property length (strings).
-
-#### `insideList(list, msg)`
-
-Ensures a property value is inside a list of values.
-
-#### `outsideList(list, msg)`
-
-Ensures a property value is not inside a list of values.
-
-#### `equalToProperty(property, msg)`
-
-Ensures a property value is not the same as another property value in the instance. This validator is good for example for
-password and password repetition check.
-
-#### `notEmptyString(msg)`
-
-This is an alias for `rangeLength(1, undefined, 'empty-string')`.
-
-#### `unique(msg)`
-
-Ensures there's not another instance in your database already with that property value. This validator is good for example for
-unique identifiers.
-
-#### `password([ checks, ]msg)`
-
-Ensures the property value has some defined types of characters, usually wanted in a password. `checks` is optional and
-defaults to `"luns6"` which leans `l`owercase letters, `u`ppercase letters, `n`umbers, `s`pecial characters, with a minimum
-length of `6`.
-
-#### `patterns.match(pattern, modifiers, msg)`
-
-Ensures the property value passes the regular expression pattern (and regex modifiers).
-
-The next `patterns.*` are comodity alias to this one.
-
-#### `patterns.hexString(msg)`
-
-Ensures the property value is an hexadecimal string (uppercase or lowercase).
-
-#### `patterns.email(msg)`
-
-Ensures the property value is a valid e-mail (more or less).
-
-#### `patterns.ipv4(msg)`
-
-Ensures the property value is a valid IPv4 address. It does not accept masks (example: `0` as last number is not valid).
-
 ## Associations
 
 An association is a relation between one or more tables.
diff --git a/lib/Instance.js b/lib/Instance.js
index 9d798358..d7557b4f 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -1,5 +1,6 @@
 var Property = require("./Property");
 var Hook     = require("./Hook");
+var enforce  = require("enforce");
 
 exports.Instance = Instance;
 
@@ -56,6 +57,10 @@ function Instance(Model, opts) {
 				}
 			}
 
+			var checks = new enforce.Enforce({
+				returnAllErrors : Model.settings.get("instance.returnAllErrors")
+			});
+
 			for (var k in opts.validations) {
 				if (Model.properties[k]) {
 					required = Model.properties[k].required;
@@ -71,38 +76,13 @@ function Instance(Model, opts) {
 					continue; // avoid validating if property is not required and is "empty"
 				}
 				for (var i = 0; i < opts.validations[k].length; i++) {
-					pending.push([ k, opts.validations[k][i] ]);
+					checks.add(k, opts.validations[k][i]);
 				}
 			}
 
-			var checkNextValidation = function () {
-				if (pending.length === 0) {
-					return cb(errors.length ? errors : null);
-				}
-
-				var validation = pending.shift();
-
-				validation[1](instance[validation[0]], function (msg) {
-					if (msg) {
-						var err   = new Error(msg);
-
-						err.field = validation[0];
-						err.value = instance[validation[0]];
-						err.msg   = msg;
-						err.type  = "validation";
-
-						if (!Model.settings.get("instance.returnAllErrors")) {
-							return cb(err);
-						}
-
-						errors.push(err);
-					}
-
-					return checkNextValidation();
-				}, instance, Model, validation[0]);
-			};
+			checks.context("model", Model);
 
-			return checkNextValidation();
+			return checks.check(instance, cb);
 		});
 	};
 	var saveError = function (cb, err) {
diff --git a/lib/ORM.js b/lib/ORM.js
index 1617f57a..b3ebbd93 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -4,16 +4,24 @@ var path           = require("path");
 var url            = require("url");
 var hat            = require("hat");
 var Query          = require("sql-query");
+var enforce        = require("enforce");
 
 var Model          = require("./Model").Model;
 var DriverAliases  = require("./Drivers/aliases");
-var Validators     = require("./Validators");
 var Settings       = require("./Settings");
 var Singleton      = require("./Singleton");
 var ErrorCodes     = require("./ErrorCodes");
 var Utilities      = require("./Utilities");
 
-exports.validators = Validators;
+// Deprecated, use enforce
+exports.validators = require("./Validators");
+
+// specific to ORM, not in enforce for now
+enforce.equalToProperty = exports.validators.equalToProperty;
+enforce.unique          = exports.validators.unique;
+
+exports.enforce    = enforce;
+
 exports.singleton  = Singleton;
 exports.settings   = new Settings.Container(Settings.defaults());
 
@@ -127,7 +135,8 @@ exports.connect = function (opts, cb) {
 };
 
 function ORM(driver_name, driver, settings) {
-	this.validators  = Validators;
+	this.validators  = exports.validators;
+	this.enforce     = exports.enforce;
 	this.settings    = settings;
 	this.driver_name = driver_name;
 	this.driver      = driver;
diff --git a/lib/Validators.js b/lib/Validators.js
index 5164a59f..7d51fc13 100644
--- a/lib/Validators.js
+++ b/lib/Validators.js
@@ -1,96 +1,34 @@
-/**
- * This is supposed to be a list of common validators
- * that can be reused instead of creating new ones.
- **/
-var validators = {};
+var enforce = require("enforce");
 
 
-/**
- * Make sure the property isn't `NULL` or `undefined`.
- * Note: 0 and '' will be considered valid.
- **/
-validators.required = function (msg) {
-	return function (v, next) {
-		if(v === null || v === undefined) return next(msg || 'required')
-		else return next();
-	};
-};
+var validators = {
+	required       : enforce.required,
+	notEmptyString : enforce.notEmptyString,
 
-/**
- * Check if a number is between a minimum and
- * a maximum number. One of this constraints
- * can be omitted.
- **/
-validators.rangeNumber = function (min, max, msg) {
-	return function (n, next) {
-		if (min === undefined && n <= max) return next();
-		if (max === undefined && n >= min) return next();
-		if (n === undefined || n === null) return next('undefined');
-		if (n >= min && n <= max) return next();
-		return next(msg || 'out-of-range-number');
-	};
-};
+	rangeNumber    : enforce.ranges.number,
+	rangeLength    : enforce.ranges.length,
 
-/**
- * Check if a string length is between a minimum
- * and a maximum number. One of this constraints
- * can be omitted.
- **/
-validators.rangeLength = function (min, max, msg) {
-	return function (v, next) {
-		if (v === undefined || v === null) return next('undefined');
-		if (min === undefined && v.length <= max) return next();
-		if (max === undefined && v.length >= min) return next();
-		if (v.length >= min && v.length <= max) return next();
-		return next(msg || 'out-of-range-length');
-	};
-};
+	insideList     : enforce.lists.inside,
+	outsideList    : enforce.lists.outside,
 
-/**
- * Check if a value (number or string) is
- * in a list of values.
- **/
-validators.insideList = function (list, msg) {
-	return function (v, next) {
-		if (list.indexOf(v) >= 0) return next();
-		return next(msg || 'outside-list');
-	};
-};
+	password       : enforce.security.password,
 
-/**
- * Check if a value (number or string) is
- * not in a list of values.
- **/
-validators.outsideList = function (list, msg) {
-	return function (v, next) {
-		if (list.indexOf(v) == -1) return next();
-		return next(msg || 'inside-list');
-	};
+	patterns       : enforce.patterns
 };
 
+
 /**
  * Check if a value is the same as a value
  * of another property (useful for password
  * checking).
  **/
 validators.equalToProperty = function (name, msg) {
-	return function (v, next, data) {
-		// could also do: v == this[name]
-		if (v == data[name]) return next();
+	return function (v, next, ctx) {
+		if (v == this[name]) return next();
 		return next(msg || 'not-equal-to-property');
 	};
 };
 
-/**
- * Check if a string has zero length. Sometimes
- * you might want to have a property on your
- * model that is not required but on a specific
- * form it can be.
- **/
-validators.notEmptyString = function (msg) {
-	return validators.rangeLength(1, undefined, msg || 'empty-string');
-};
-
 /**
  * Check if a property is unique in the collection.
  * This can take a while because a query has to be
@@ -99,95 +37,23 @@ validators.notEmptyString = function (msg) {
  * on this property so this should not worry you.
  **/
 validators.unique = function (msg) {
-	return function (v, next, data, Model, property) {
+	return function (v, next, ctx) {
 		var query = {};
-		query[property] = v;
+		query[ctx.property] = v;
 
-		Model.find(query, function (err, records) {
+		ctx.model.find(query, function (err, records) {
 			if (err) {
 				return next();
 			}
 			if (!records || records.length === 0) {
 				return next();
 			}
-			if (records.length == 1 && records[0][Model.id] === data[Model.id]) {
+			if (records.length == 1 && records[0][ctx.model.id] === this[ctx.model.id]) {
 				return next();
 			}
 			return next(msg || 'not-unique');
-		});
+		}.bind(this));
 	};
 };
 
-validators.password = function (checks, msg) {
-	if (!msg) {
-		msg    = checks;
-		checks = "luns6"; // (l)owercase, (u)ppercase, (n)umber, (s)pecial characters, (6) min length
-	}
-	if (!msg) {
-		msg    = "weak-password";
-	}
-	var m = checks.match(/([0-9]+)/);
-	var min_len = (m ? parseInt(m[1], 10) : null);
-
-	return function (v, next) {
-		if (!v) return next(msg);
-
-		if (checks.indexOf("l") >= 0 && !v.match(/[a-z]/)) return next(msg);
-		if (checks.indexOf("u") >= 0 && !v.match(/[A-Z]/)) return next(msg);
-		if (checks.indexOf("n") >= 0 && !v.match(/[0-9]/)) return next(msg);
-		if (checks.indexOf("s") >= 0 && !v.match(/[^a-zA-Z0-9]/)) return next(msg);
-		if (min_len !== null && min_len > v.length) return next(msg);
-
-		return next();
-	};
-};
-
-/**
- * Pattern validators are usually based on regular
- * expressions and solve more complicated validations
- * you might need.
- **/
-validators.patterns = {};
-
-/**
- * Check if a value matches a given pattern.
- * You can define a pattern string and regex
- * modifiers or just send the RegExp object
- * as 1st argument.
- **/
-validators.patterns.match = function (pattern, modifiers, msg) {
-	if (typeof pattern == "string") {
-		pattern = new RegExp(pattern, modifiers);
-	}
-	return function (v, next) {
-		if (typeof v == "string" && v.match(pattern)) return next();
-		return next(msg || 'no-pattern-match');
-	};
-};
-
-/**
- * Check if a value is an hexadecimal string
- * (letters from A to F and numbers).
- **/
-validators.patterns.hexString = function (msg) {
-	return validators.patterns.match("^[a-f0-9]+$", "i", msg);
-};
-
-/**
- * Check if a value is an e-mail address
- * (simple checking, works 99%).
- **/
-validators.patterns.email = function (msg) {
-	return validators.patterns.match("^[a-z0-9\\._%\\+\\-]+@[a-z0-9\\.\\-]+\\.[a-z]{2,6}$", "i", msg);
-};
-
-/**
- * Check if it's a valid IPv4 address.
- **/
-validators.patterns.ipv4 = function (msg) {
-	var p1 = "([1-9]|1[0-9][0-9]?|2[0-4][0-9]|25[0-4])";
-	var p2 = "([0-9]|1[0-9][0-9]?|2[0-4][0-9]|25[0-4])";
-	return validators.patterns.match("^" + [ p1, p2, p2, p1 ].join("\\.") + "$", "", msg);
-};
-
 module.exports = validators;
diff --git a/package.json b/package.json
index 54d0d617..2ff26932 100644
--- a/package.json
+++ b/package.json
@@ -38,6 +38,7 @@
 	},
 	"analyse"     : false,
 	"dependencies": {
+		"enforce"   : "0.1.1",
 		"sql-query" : "0.1.8",
 		"hat"       : "0.0.3",
 		"lodash"    : "1.3.1"
diff --git a/test/integration/predefined-validators.js b/test/integration/predefined-validators.js
index 8b3eed2f..514df2fc 100644
--- a/test/integration/predefined-validators.js
+++ b/test/integration/predefined-validators.js
@@ -12,180 +12,19 @@ function checkValidation(done, expected) {
 }
 
 describe("Predefined Validators", function () {
-	describe("rangeNumber(0, 10)", function () {
-		it("should pass 5", function (done) {
-			validators.rangeNumber(0, 10)(5, checkValidation(done));
-		});
-		it("should not pass -5 with 'out-of-range-number'", function (done) {
-			validators.rangeNumber(0, 10)(-5, checkValidation(done, 'out-of-range-number'));
-		});
-	});
-	describe("rangeNumber(undef, 10)", function () {
-		it("should pass -5", function (done) {
-			validators.rangeNumber(undef, 10)(-5, checkValidation(done));
-		});
-		it("should not pass 15 with 'out-of-range-number'", function (done) {
-			validators.rangeNumber(undef, 10)(15, checkValidation(done, 'out-of-range-number'));
-		});
-	});
-	describe("rangeNumber(-10, undef)", function () {
-		it("should pass -5", function (done) {
-			validators.rangeNumber(-10, undef)(-5, checkValidation(done));
-		});
-	});
-	describe("rangeNumber(0, undef)", function () {
-		it("should pass 5", function (done) {
-			validators.rangeNumber(0, undef)(5, checkValidation(done));
-		});
-		it("should not pass -5 with 'out-of-range-number'", function (done) {
-			validators.rangeNumber(0, undef)(-5, checkValidation(done, 'out-of-range-number'));
-		});
-		describe("if custom-error is defined", function () {
-			it("should not pass -5 with 'custom-error'", function (done) {
-				validators.rangeNumber(0, undef, 'custom-error')(-5, checkValidation(done, 'custom-error'));
-			});
-		});
-	});
-
-
-	describe("rangeLength(0, 10)", function () {
-		it("should pass 'test'", function (done) {
-			validators.rangeLength(0, 10)('test', checkValidation(done));
-		});
-	});
-	describe("rangeLength(undef, 10)", function () {
-		it("should pass 'test'", function (done) {
-			validators.rangeLength(undef, 10)('test', checkValidation(done));
-		});
-	});
-	describe("rangeLength(0, undef)", function () {
-		it("should pass 'test'", function (done) {
-			validators.rangeLength(0, undef)('test', checkValidation(done));
-		});
-		it("should not pass undefined with 'undefined'", function (done) {
-			validators.rangeLength(0, undef)(undef, checkValidation(done, 'undefined'));
-		});
-	});
-	describe("rangeLength(4, undef)", function () {
-		it("should pass 'test'", function (done) {
-			validators.rangeLength(4, undef)('test', checkValidation(done));
-		});
-	});
-	describe("rangeLength(0, 3)", function () {
-		it("should not pass 'test' with 'out-of-range-length'", function (done) {
-			validators.rangeLength(0, 3)('test', checkValidation(done, 'out-of-range-length'));
-		});
-	});
-	describe("rangeLength(5, undef)", function () {
-		it("should not pass 'test' with 'out-of-range-length'", function (done) {
-			validators.rangeLength(5, undef)('test', checkValidation(done, 'out-of-range-length'));
-		});
-	});
-	describe("rangeLength(undef, 3)", function () {
-		it("should not pass 'test' with 'out-of-range-length'", function (done) {
-			validators.rangeLength(undef, 3)('test', checkValidation(done, 'out-of-range-length'));
-		});
-		describe("if custom-error is defined", function () {
-			it("should not pass 'test' with 'custom-error'", function (done) {
-				validators.rangeLength(undef, 3, 'custom-error')('test', checkValidation(done, 'custom-error'));
-			});
-		});
-	});
-
-
-	describe("insideList([ 1, 2, 3 ])", function () {
-		it("should pass 1", function (done) {
-			validators.insideList([ 1, 2, 3 ])(1, checkValidation(done));
-		});
-		it("should pass 2", function (done) {
-			validators.insideList([ 1, 2, 3 ])(2, checkValidation(done));
-		});
-		it("should pass 3", function (done) {
-			validators.insideList([ 1, 2, 3 ])(3, checkValidation(done));
-		});
-		it("should not pass 4 with 'outside-list'", function (done) {
-			validators.insideList([ 1, 2, 3 ])(4, checkValidation(done, 'outside-list'));
-		});
-		it("should not pass '1' with 'outside-list'", function (done) {
-			validators.insideList([ 1, 2, 3 ])('1', checkValidation(done, 'outside-list'));
-		});
-		it("should not pass '' with 'outside-list'", function (done) {
-			validators.insideList([ 1, 2, 3 ])('', checkValidation(done, 'outside-list'));
-		});
-		it("should not pass [] with 'outside-list'", function (done) {
-			validators.insideList([ 1, 2, 3 ])([], checkValidation(done, 'outside-list'));
-		});
-		describe("if custom-error is defined", function () {
-			it("should not pass [] with 'custom-error'", function (done) {
-				validators.insideList([ 1, 2, 3 ], 'custom-error')([], checkValidation(done, 'custom-error'));
-			});
-		});
-	});
-
-
-	describe("outsideList([ 1, 2, 3 ])", function () {
-		it("should pass 4", function (done) {
-			validators.outsideList([ 1, 2, 3 ])(4, checkValidation(done));
-		});
-		it("should pass -2", function (done) {
-			validators.outsideList([ 1, 2, 3 ])(-2, checkValidation(done));
-		});
-		it("should pass ''", function (done) {
-			validators.outsideList([ 1, 2, 3 ])('', checkValidation(done));
-		});
-		it("should pass null", function (done) {
-			validators.outsideList([ 1, 2, 3 ])(null, checkValidation(done));
-		});
-		it("should pass '2'", function (done) {
-			validators.outsideList([ 1, 2, 3 ])('2', checkValidation(done));
-		});
-		it("should not pass 2 with 'inside-list'", function (done) {
-			validators.outsideList([ 1, 2, 3 ])(2, checkValidation(done, 'inside-list'));
-		});
-		describe("if custom-error is defined", function () {
-			it("should not pass 2 with 'custom-error'", function (done) {
-				validators.outsideList([ 1, 2, 3 ], 'custom-error')(2, checkValidation(done, 'custom-error'));
-			});
-		});
-	});
-
-
-	describe("notEmptyString()", function () {
-		it("should pass 'a'", function (done) {
-			validators.notEmptyString()('a', checkValidation(done));
-		});
-		it("should not pass '' with 'empty-string'", function (done) {
-			validators.notEmptyString()('', checkValidation(done, 'empty-string'));
-		});
-		describe("if custom-error is defined", function () {
-			it("should not pass '' with 'custom-error'", function (done) {
-				validators.notEmptyString('custom-error')('', checkValidation(done, 'custom-error'));
-			});
-		});
-		it("should not pass undef with 'undefined'", function (done) {
-			validators.notEmptyString()(undef, checkValidation(done, 'undefined'));
-		});
-		describe("if custom-error is defined", function () {
-			it("should not pass '' with 'custom-error'", function (done) {
-				validators.notEmptyString('custom-error')('', checkValidation(done, 'custom-error'));
-			});
-		});
-	});
-
 
 	describe("equalToProperty('name')", function () {
 		it("should pass if equal", function (done) {
-			validators.equalToProperty('name')('John Doe', checkValidation(done), { name: "John Doe" });
+			validators.equalToProperty('name').call({ name: "John Doe" }, 'John Doe', checkValidation(done));
 		});
 		it("should not pass if not equal", function (done) {
-			validators.equalToProperty('name')('John Doe', checkValidation(done, 'not-equal-to-property'), { name: "John" });
+			validators.equalToProperty('name').call({ name: "John" }, 'John Doe', checkValidation(done, 'not-equal-to-property'));
 		});
 		it("should not pass even if equal to other property", function (done) {
-			validators.equalToProperty('name')('John Doe', checkValidation(done, 'not-equal-to-property'), { surname: "John Doe" });
+			validators.equalToProperty('name').call({ surname: "John Doe" }, 'John Doe', checkValidation(done, 'not-equal-to-property'));
 		});
 	});
 
-
 	describe("unique()", function () {
 		var db = null;
 		var Person = null;
@@ -231,9 +70,9 @@ describe("Predefined Validators", function () {
 			});
 			janeDoe.save(function (err) {
 				err.should.be.a("object");
-				err.should.have.property("field", "surname");
-				err.should.have.property("value", "Doe");
-				err.should.have.property("msg", "not-unique");
+				err.should.have.property("property", "surname");
+				err.should.have.property("value",    "Doe");
+				err.should.have.property("msg",      "not-unique");
 
 				return done();
 			});
@@ -267,100 +106,4 @@ describe("Predefined Validators", function () {
 		});
 	});
 
-
-	describe("password()", function () {
-		it("should pass 'Passw0r∂'", function (done) {
-			validators.password()('Passw0r∂', checkValidation(done));
-		});
-		it("should not pass 'password' with 'weak-password'", function (done) {
-			validators.password()('password', checkValidation(done, 'weak-password'));
-		});
-		it("should not pass 'Passw0rd' with 'weak-password'", function (done) {
-			validators.password()('Passw0rd', checkValidation(done, 'weak-password'));
-		});
-	});
-
-
-	describe("password('ln4', 'bad-pwd')", function () {
-		it("should pass 'Passw0r∂'", function (done) {
-			validators.password('ln4', 'bad-pwd')('Passw0r∂', checkValidation(done));
-		});
-		it("should pass 'Passw0rd'", function (done) {
-			validators.password('ln4', 'bad-pwd')('Passw0rd', checkValidation(done));
-		});
-		it("should not pass 'P12345' with 'bad-pwd'", function (done) {
-			validators.password('ln4', 'bad-pwd')('P12345', checkValidation(done, 'bad-pwd'));
-		});
-		it("should not pass 'password' with 'bad-pwd'", function (done) {
-			validators.password('ln4', 'bad-pwd')('password', checkValidation(done, 'bad-pwd'));
-		});
-		it("should not pass 'p12' with 'bad-pwd'", function (done) {
-			validators.password('ln4', 'bad-pwd')('p12', checkValidation(done, 'bad-pwd'));
-		});
-	});
-
-
-	describe("patterns.hexString()", function () {
-		it("should pass 'ABCDEF0123456789'", function (done) {
-			validators.patterns.hexString()('ABCDEF0123456789', checkValidation(done));
-		});
-		it("should pass 'abcdef0123456789'", function (done) {
-			validators.patterns.hexString()('abcdef0123456789', checkValidation(done));
-		});
-		it("should not pass 'af830g'", function (done) {
-			validators.patterns.hexString()('af830g', checkValidation(done, 'no-pattern-match'));
-		});
-		it("should not pass ''", function (done) {
-			validators.patterns.hexString()('', checkValidation(done, 'no-pattern-match'));
-		});
-	});
-
-
-	describe("patterns.email()", function () {
-		// Source: http://en.wikipedia.org/wiki/Email_address
-		//
-		it("should pass 'niceandsimple@example.com'", function (done) {
-			validators.patterns.email()('niceandsimple@example.com', checkValidation(done));
-		});
-		it("should pass 'Very.Common@example.com'", function (done) {
-			validators.patterns.email()('Very.Common@example.com', checkValidation(done));
-		});
-		it("should pass 'disposable.style.email.with+symbol@example.com'", function (done) {
-			validators.patterns.email()('disposable.style.email.with+symbol@example.com', checkValidation(done));
-		});
-		it("should not pass 'Abc.example.com'", function (done) {
-			validators.patterns.email()('Abc.example.com', checkValidation(done, 'no-pattern-match'));
-		});
-		it("should not pass 'A@b@c@example.com'", function (done) {
-			validators.patterns.email()('A@b@c@example.com', checkValidation(done, 'no-pattern-match'));
-		});
-		it("should not pass 'not\\allowed@example.com'", function (done) {
-			validators.patterns.email()('not\\allowed@example.com', checkValidation(done, 'no-pattern-match'));
-		});
-		it("should not pass 'abc@example'", function (done) {
-			validators.patterns.email()('abc@example', checkValidation(done, 'no-pattern-match'));
-		});
-	});
-
-
-	describe("patterns.ipv4()", function () {
-		it("should pass '1.2.3.4'", function (done) {
-			validators.patterns.ipv4()('1.2.3.4', checkValidation(done));
-		});
-		it("should pass '1.0.0.1'", function (done) {
-			validators.patterns.ipv4()('1.0.0.1', checkValidation(done));
-		});
-		it("should pass '1.10.100.254'", function (done) {
-			validators.patterns.ipv4()('1.10.100.254', checkValidation(done));
-		});
-		it("should not pass '1.10.100.255'", function (done) {
-			validators.patterns.ipv4()('1.10.100.255', checkValidation(done, 'no-pattern-match'));
-		});
-		it("should not pass '1.10.100.0'", function (done) {
-			validators.patterns.ipv4()('1.10.100.0', checkValidation(done, 'no-pattern-match'));
-		});
-		it("should not pass '0.1.2.3'", function (done) {
-			validators.patterns.ipv4()('0.1.2.3', checkValidation(done, 'no-pattern-match'));
-		});
-	});
 });
diff --git a/test/integration/validation.js b/test/integration/validation.js
index 924bb9da..e5723e9c 100644
--- a/test/integration/validation.js
+++ b/test/integration/validation.js
@@ -45,12 +45,12 @@ describe("Validations", function() {
 			var john = new Person({name: 'fdhdjendfjkdfhshdfhakdfjajhfdjhbfgk'});
 
 			john.save(function (err) {
-				should.equal(typeof err, "object");
-				should.equal(err.field,  'name');
-				should.equal(err.value,  'fdhdjendfjkdfhshdfhakdfjajhfdjhbfgk');
-				should.equal(err.msg,    'out-of-range-length');
-				should.equal(err.type,   'validation');
-				should.equal(john.id,     null);
+				should.equal(typeof err,   "object");
+				should.equal(err.property, "name");
+				should.equal(err.value,    "fdhdjendfjkdfhshdfhakdfjajhfdjhbfgk");
+				should.equal(err.msg,      "out-of-range-length");
+				should.equal(err.type,     "validation");
+				should.equal(john.id,      null);
 
 				return done();
 			});
@@ -71,7 +71,7 @@ describe("Validations", function() {
 					should.equal(err, null);
 					create(function (err) {
 						should.deepEqual(err, _.extend(new Error(),{
-							field: 'name', value: 'broom', msg: 'not-unique'
+							property: 'name', value: 'broom', msg: 'not-unique'
 						}));
 						return done();
 					});
@@ -100,11 +100,11 @@ describe("Validations", function() {
 
 				john.save(function (err) {
 					should.notEqual(err, null);
-					should.equal(err.field, 'height');
-					should.equal(err.value, 4);
-					should.equal(err.msg, 'out-of-range-number');
-					should.equal(err.type, 'validation');
-					should.equal(john.id, null);
+					should.equal(err.property, 'height');
+					should.equal(err.value,     4);
+					should.equal(err.msg,      'out-of-range-number');
+					should.equal(err.type,     'validation');
+					should.equal(john.id,      null);
 
 					return done();
 				});
@@ -130,11 +130,11 @@ describe("Validations", function() {
 
 				john.save(function (err) {
 					should.notEqual(err, null);
-					should.equal(err.field, 'name');
-					should.equal(err.value, null);
-					should.equal(err.msg, 'required');
-					should.equal(err.type, 'validation');
-					should.equal(john.id, null);
+					should.equal(err.property, 'name');
+					should.equal(err.value,    null);
+					should.equal(err.msg,      'required');
+					should.equal(err.type,     'validation');
+					should.equal(john.id,      null);
 
 					return done();
 				});
@@ -155,11 +155,11 @@ describe("Validations", function() {
 					should.equal(err.length, 2);
 
 					should.deepEqual(err[0], _.extend(new Error(),{
-						field: 'name', value: 'n', msg: 'out-of-range-length'
+						property: 'name', value: 'n', msg: 'out-of-range-length'
 					}));
 
 					should.deepEqual(err[1], _.extend(new Error(),{
-						field: 'height', value: '4', msg: 'out-of-range-number'
+						property: 'height', value: '4', msg: 'out-of-range-number'
 					}));
 
 					should.equal(john.id, null);
@@ -182,15 +182,15 @@ describe("Validations", function() {
 
 					// `type` is a non enumerable undocumented property of `Error` in V8.
 					should.deepEqual(err[0], _.extend(new Error(),{
-						field: 'name', value: null, msg: 'required'
+						property: 'name', value: null, msg: 'required'
 					}));
 
 					should.deepEqual(err[1], _.extend(new Error(),{
-						field: 'name', value: null, msg: 'undefined'
+						property: 'name', value: null, msg: 'undefined'
 					}));
 
 					should.deepEqual(err[2], _.extend(new Error(),{
-						field: 'height', value: '4', msg: 'out-of-range-number'
+						property: 'height', value: '4', msg: 'out-of-range-number'
 					}));
 
 					should.equal(john.id, null);

From d2d44d8ce71f748c05aa9335e696732a872fac46 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 29 Jul 2013 19:37:24 +0100
Subject: [PATCH 0736/1246] Adds mention to `unique` option in model properties
 (#243)

---
 Readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Readme.md b/Readme.md
index 5df50453..6cdbbee8 100755
--- a/Readme.md
+++ b/Readme.md
@@ -222,6 +222,7 @@ var Person = db.define('person', {        // 'person' will be the table in the d
 
 ##### [all types]
 * `required`: true marks the column as `NOT NULL`, false (default)
+* `unique`: true marks the column with a `UNIQUE` index
 * `defaultValue`: sets the default value for the field
 
 ##### string

From 19ee31e290adc8bd028b2bdea9119b4c4f822b88 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 29 Jul 2013 19:44:34 +0100
Subject: [PATCH 0737/1246] Changes autoFetch to avoid autofetching if instance
 is not saved (it's new!) (#242)

---
 lib/Associations/Extend.js | 4 ++++
 lib/Associations/Many.js   | 4 ++++
 lib/Associations/One.js    | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index c28f883e..36357f0f 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -159,6 +159,10 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 }
 
 function autoFetchInstance(Instance, association, opts, cb) {
+	if (!Instance.saved()) {
+		return cb();
+	}
+
 	if (!opts.hasOwnProperty("autoFetchLimit") || typeof opts.autoFetchLimit == "undefined") {
 		opts.autoFetchLimit = association.autoFetchLimit;
 	}
diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 332873e8..37d02473 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -388,6 +388,10 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 }
 
 function autoFetchInstance(Instance, association, opts, cb) {
+	if (!Instance.saved()) {
+		return cb();
+	}
+
 	if (!opts.hasOwnProperty("autoFetchLimit") || typeof opts.autoFetchLimit == "undefined") {
 		opts.autoFetchLimit = association.autoFetchLimit;
 	}
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index 2ce4825d..c6e98384 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -223,6 +223,10 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 }
 
 function autoFetchInstance(Instance, association, opts, cb) {
+	if (!Instance.saved()) {
+		return cb();
+	}
+
 	if (!opts.hasOwnProperty("autoFetchLimit") || typeof opts.autoFetchLimit == "undefined") {
 		opts.autoFetchLimit = association.autoFetchLimit;
 	}

From b888d9e8b66ee53e19fa850c8904a2fc79ff7787 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 30 Jul 2013 11:56:32 +0100
Subject: [PATCH 0738/1246] Updates test framework to check for config and give
 a better error message

Also, don't run a protocol if not configured (and specially don't
return error code for it)
---
 test/common.js  | 12 ++++++++++++
 test/logging.js | 29 +++++++++++++++++++++++++++++
 test/run.js     | 22 ++++++++++++++++------
 3 files changed, 57 insertions(+), 6 deletions(-)
 create mode 100644 test/logging.js

diff --git a/test/common.js b/test/common.js
index b4e90f2e..5a6a7780 100644
--- a/test/common.js
+++ b/test/common.js
@@ -17,6 +17,18 @@ common.createConnection = function(cb) {
 	ORM.connect(this.getConnectionString(), cb);
 };
 
+common.hasConfig = function (proto) {
+	var config;
+
+	try {
+		config = require("./config");
+	} catch (ex) {
+		return 'not-found';
+	}
+
+	return (config.hasOwnProperty(proto) ? 'found' : 'not-defined');
+};
+
 common.getConfig = function () {
 	if (common.isTravis()) {
 		switch (this.protocol()) {
diff --git a/test/logging.js b/test/logging.js
new file mode 100644
index 00000000..906f51ad
--- /dev/null
+++ b/test/logging.js
@@ -0,0 +1,29 @@
+var util = require("util");
+
+exports.info = buildMethod(process.stdout, "[i]", 34);
+exports.error = buildMethod(process.stderr, "[!]", 31);
+
+function buildMethod(stream, prefix, color) {
+	return function () {
+		var params = Array.prototype.slice.apply(arguments);
+		var text   = params.shift();
+
+		return printTo(stream, prefix + " ", color, text, params);
+	};
+}
+
+function printTo(stream, prefix, color, text, params) {
+	params.unshift(text);
+	text = util.format.apply(util, params);
+
+	stream.write(printColor(color, true) + prefix + printColor(color) + text.replace(/\*\*(.+?)\*\*/, function (m, t) {
+		return printColor(color, true) + t + printColor(color);
+	}) + printColor(null) + "\n");
+}
+
+function printColor(color, bold) {
+	if (color === null) {
+		return "\033[0m";
+	}
+	return "\033[" + (bold ? "1" : "0") + ";" + color + "m";
+}
diff --git a/test/run.js b/test/run.js
index 366a5327..da307f0d 100644
--- a/test/run.js
+++ b/test/run.js
@@ -1,11 +1,22 @@
-var Mocha    = require('mocha');
-var fs       = require('fs');
-var path     = require('path');
+var Mocha    = require("mocha");
+var fs       = require("fs");
+var path     = require("path");
+var common   = require("./common");
+var logging  = require("./logging");
 var location = path.normalize(path.join(__dirname, "integration"));
 var mocha    = new Mocha({
 	reporter: "progress"
 });
 
+switch (common.hasConfig(common.protocol())) {
+	case 'not-defined':
+		logging.error("There's no configuration for protocol **%s**", common.protocol());
+		process.exit(0);
+	case 'not-found':
+		logging.error("**test/config.js** missing. Take a look at **test/config.example.js**");
+		process.exit(0);
+}
+
 runTests();
 
 function runTests() {
@@ -19,8 +30,7 @@ function runTests() {
 		);
 	});
 
-	process.stdout.write("\033[1;34m[i] \033[0;34mTesting \033[1;34m" + process.env.ORM_PROTOCOL + "\033[0m\n");
-	process.stdout.write("\033[1;34m[i] \033[0;34mURI: \033[1;34m" + require('./common').getConnectionString() + "\033[0m\n");
+	logging.info("Testing **%s**", common.getConnectionString());
 
 	mocha.run(function (failures) {
 		process.exit(failures);
@@ -29,7 +39,7 @@ function runTests() {
 
 function shouldRunTest(file) {
 	var name  = file.substr(0, file.length - 3);
-	var proto = process.env.ORM_PROTOCOL;
+	var proto = common.protocol();
 
 	if (proto == "mongodb" && [ "model-aggregate",
 	                            "property-number-size", "smart-types" ].indexOf(name) >= 0) return false;

From bea9c0b07a5f844a6a1a0e0a3aa6641bf1343466 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 30 Jul 2013 18:57:44 +0100
Subject: [PATCH 0739/1246] Allows user to pass an object to
 extendsTo.setAccessor instead of an instance (detected via #250)

---
 lib/Associations/Extend.js | 4 ++++
 lib/Instance.js            | 1 +
 2 files changed, 5 insertions(+)

diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index 36357f0f..e02f7fdc 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -108,6 +108,10 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 
 					var fields = Object.keys(association.field);
 
+					if (!Extension.isInstance) {
+						Extension = new association.model(Extension);
+					}
+
 					for (var i = 0; i < Model.id.length; i++) {
 						Extension[fields[i]] = Instance[Model.id[i]];
 					}
diff --git a/lib/Instance.js b/lib/Instance.js
index d7557b4f..c9714221 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -123,6 +123,7 @@ function Instance(Model, opts) {
 	};
 	var afterSave = function (cb, create, err) {
 		emitEvent("save", err, instance);
+
 		if (create) {
 			Hook.trigger(instance, opts.hooks.afterCreate, !err);
 		}

From 2c58f659f8b3e3b03257aaf83404ec44589c568f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 31 Jul 2013 15:19:06 +0100
Subject: [PATCH 0740/1246] Rechecks database after testing hook changes to see
 if it really updated table (#249)

---
 test/integration/hook.js | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/test/integration/hook.js b/test/integration/hook.js
index 0ceedc10..946ada13 100644
--- a/test/integration/hook.js
+++ b/test/integration/hook.js
@@ -130,7 +130,14 @@ describe("Hook", function() {
 		        should.exist(people);
 		        should.equal(people.length, 1);
 		        should.equal(people[0].name, "Hook Worked");
-		        done();
+
+		        // garantee it was correctly saved on database
+		        Person.one({ name: "Hook Worked" }, function (err, person) {
+		        	should.not.exist(err);
+		        	should.exist(person);
+
+		        	return done();
+		        });
 		    });
 		});
 
@@ -150,9 +157,9 @@ describe("Hook", function() {
 					items[0].name.should.equal("Jane Doe");
 
 					// ensure it was really saved
-					Person.get(items[0][Person.id], function (err, Item) {
-						should.equal(err, null);
-						Item.name.should.equal("Jane Doe");
+					Person.find({ name: "Hook Worked" }, { cache: false }, 1, function (err, people) {
+						should.not.exist(err);
+						should(Array.isArray(people));
 
 						return done();
 					});
@@ -243,7 +250,14 @@ describe("Hook", function() {
 		        should.exist(people);
 		        should.equal(people.length, 1);
 		        should.equal(people[0].name, "Hook Worked");
-		        done();
+
+				// garantee it was correctly saved on database
+				Person.find({ name: "Hook Worked" }, { cache: false }, 1, function (err, people) {
+					should.not.exist(err);
+					should(Array.isArray(people));
+
+					return done();
+				});
 		    });
 		});
 

From 24cd6626542a375fb66f91c8508ecf7f31433da8 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 1 Aug 2013 22:36:13 +1000
Subject: [PATCH 0741/1246] Update Readme.md

---
 Readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Readme.md b/Readme.md
index 6cdbbee8..07317022 100755
--- a/Readme.md
+++ b/Readme.md
@@ -124,6 +124,7 @@ orm.connect("....", function (err, db) {
 	console.log(db.settings.get("some.deep"));       // { value: 123 }
 });
 ```
+More in the [wiki](https://github.com/dresende/node-orm2/wiki/Settings).
 
 ## Connecting
 

From 394944f0bdc8126544a9b268ebf6fa297dd87e78 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 1 Aug 2013 14:16:30 +0100
Subject: [PATCH 0742/1246] Adds timestamps plugin to the provisory list

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 07317022..13eab13f 100755
--- a/Readme.md
+++ b/Readme.md
@@ -34,7 +34,7 @@ npm test
 - Create Model associations, find, check, create and remove
 - Define custom validations (several builtin validations, check instance properties before saving - see [enforce](http://github.com/dresende/node-enforce) for details)
 - Model instance caching and integrity (table rows fetched twice are the same object, changes to one change all)
-- Plugins: [MySQL FTS](http://dresende.github.io/node-orm-mysql-fts) , [Pagination](http://dresende.github.io/node-orm-paging) , [Transaction](http://dresende.github.io/node-orm-transaction)
+- Plugins: [MySQL FTS](http://dresende.github.io/node-orm-mysql-fts) , [Pagination](http://dresende.github.io/node-orm-paging) , [Transaction](http://dresende.github.io/node-orm-transaction), [Timestamps](http://github.com/SPARTAN563/node-orm-timestamps)
 
 ## Introduction
 

From 1a4067d5686c65d5b599a90820feef6e71bca624 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 1 Aug 2013 17:43:49 +0100
Subject: [PATCH 0743/1246] Adds beforeDefine to plugins (#263)

Prototype: beforeDefine(name, properties, options)
---
 lib/ORM.js                |  6 ++++++
 test/integration/db.js    | 22 ++++++++++++++++++++++
 test/support/my_plugin.js |  8 +++++++-
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index b3ebbd93..85e25bd3 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -199,6 +199,12 @@ ORM.prototype.define = function (name, properties, opts) {
 	properties = properties || {};
 	opts       = opts || {};
 
+	for (var i = 0; i < this.plugins.length; i++) {
+		if (typeof this.plugins[i].beforeDefine == "function") {
+			this.plugins[i].beforeDefine(name, properties, opts);
+		}
+	}
+
 	this.models[name] = new Model({
 		db             : this,
 		settings       : this.settings,
diff --git a/test/integration/db.js b/test/integration/db.js
index 39d7f2ee..96dffede 100644
--- a/test/integration/db.js
+++ b/test/integration/db.js
@@ -35,6 +35,28 @@ describe("db.use()", function () {
 		return done();
 	});
 
+	it("a plugin should be able to catch models before defining them", function (done) {
+		var MyPlugin = require("../support/my_plugin");
+		var opts     = {
+			option       : true,
+			calledDefine : false,
+			beforeDefine : function (name, props, opts) {
+				props.otherprop = Number;
+			}
+		};
+
+		db.use(MyPlugin, opts);
+
+		var MyModel = db.define("my_model", { // db.define should call plugin.define method
+			property: String
+		});
+
+		opts.calledDefine.should.be.true;
+		MyModel.properties.should.have.property("otherprop");
+
+		return done();
+	});
+
 	it("should be able to register a plugin as string", function (done) {
 		var opts     = {
 			option       : true,
diff --git a/test/support/my_plugin.js b/test/support/my_plugin.js
index b8e68eba..d75f6951 100644
--- a/test/support/my_plugin.js
+++ b/test/support/my_plugin.js
@@ -1,5 +1,6 @@
 module.exports = function MyPlugin(DB, opts) {
-	opts.should.eql({ option: true, calledDefine: false });
+	opts.option.should.be.true;
+	opts.calledDefine.should.be.false;
 
 	return {
 		define: function (Model) {
@@ -8,6 +9,11 @@ module.exports = function MyPlugin(DB, opts) {
 			Model.id[0].should.be.a("string");
 
 			opts.calledDefine = true;
+		},
+		beforeDefine: function (model_name, model_props, model_opts) {
+			if (opts.beforeDefine) {
+				opts.beforeDefine(model_name, model_props, model_opts);
+			}
 		}
 	};
 };

From 7e588a007eb3e28ff915fd41139184239c4ae51f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 1 Aug 2013 17:51:44 +0100
Subject: [PATCH 0744/1246] Fixes autoFetch being discarded in Model.get
 options (closes #266)

---
 lib/Model.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Model.js b/lib/Model.js
index b5058460..7989cacd 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -285,8 +285,8 @@ function Model(opts) {
 			}, function (cb) {
 				return createInstance(data[0], {
 					uid            : uid,
-					autoSave       : opts.autoSave,
-					autoFetch      : (options.autoFetchLimit === 0 ? false : opts.autoFetch),
+					autoSave       : options.autoSave,
+					autoFetch      : (options.autoFetchLimit === 0 ? false : options.autoFetch),
 					autoFetchLimit : options.autoFetchLimit,
 					cascadeRemove  : options.cascadeRemove
 				}, cb);

From baa99f3b1dacf440ca48cea9754abe33c2e5cb1b Mon Sep 17 00:00:00 2001
From: DavidKosub <dave@catturavideo.com>
Date: Fri, 2 Aug 2013 12:33:04 -0500
Subject: [PATCH 0745/1246] Add capability for an array to be passed to the
 reversed hasOne set accessor

---
 lib/Associations/One.js                       | 28 ++++++++++++-
 .../integration/association-hasone-reverse.js | 41 +++++++++++++++----
 2 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index c6e98384..b8a1c8ed 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -187,9 +187,33 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 						return cb(err);
 					}
 
-					util.populateConditions(Model, Object.keys(association.field), Instance, OtherInstance, true);
+					if (!Array.isArray(OtherInstance)) {
+						util.populateConditions(Model, Object.keys(association.field), Instance, OtherInstance, true);
 
-					return OtherInstance.save({}, { saveAssociations: false }, cb);
+						return OtherInstance.save({}, { saveAssociations: false }, cb);
+					}
+
+					var associations = _.clone(OtherInstance);
+
+					var saveNext = function () {
+						if (!associations.length) {
+							return cb();
+						}
+
+						var other = associations.pop();
+
+						util.populateConditions(Model, Object.keys(association.field), Instance, other, true);
+
+						other.save({}, { saveAssociations: false }, function (err) {
+							if (err) {
+								return cb(err);
+							}
+
+							saveNext();
+						});
+					};
+
+					return saveNext();
 				});
 			} else {
 				OtherInstance.save({}, { saveAssociations: false }, function (err) {
diff --git a/test/integration/association-hasone-reverse.js b/test/integration/association-hasone-reverse.js
index 8d79159b..1c188612 100644
--- a/test/integration/association-hasone-reverse.js
+++ b/test/integration/association-hasone-reverse.js
@@ -4,7 +4,7 @@ var should = require('should');
 var async  = require('async');
 var _      = require('lodash');
 
-describe("hasOne", function() {
+describe("hasOne", function () {
 	var db     = null;
 	var Person = null;
 
@@ -21,13 +21,12 @@ describe("hasOne", function() {
 			});
 
 			return helper.dropSync([ Person, Pet ], function () {
-				Person.create({
-					name : "John Doe"
-				}, function () {
-					Pet.create({
-						name : "Deco"
-					}, done);
-				});
+				async.parallel([
+					Person.create.bind(Person, { name: "John Doe" }),
+					Person.create.bind(Person, { name: "Jane Doe" }),
+					Pet.create.bind(Pet, { name: "Deco" }),
+					Pet.create.bind(Pet, { name: "Fido" }),
+				], done);
 			});
 		};
 	};
@@ -80,5 +79,31 @@ describe("hasOne", function() {
 				});
 			});
 		});
+
+		it("should be able to set an array of people as the owner", function (done) {
+			Person.find({ name: ["John Doe", "Jane Doe"] }, function (err, owners) {
+				Pet.find({ name: "Fido" }).first(function (err, Fido) {
+					Fido.hasOwner(function (err, has_owner) {
+						should.not.exist(err);
+						has_owner.should.be.false;
+
+						Fido.setOwner(owners, function (err) {
+							should.not.exist(err);
+
+							Fido.getOwner(function (err, ownersCopy) {
+								should.not.exist(err);
+								should(Array.isArray(owners));
+								owners.length.should.equal(2);
+
+								owners[0].should.eql(ownersCopy[0]);
+								owners[1].should.eql(ownersCopy[1]);
+
+								return done();
+							});
+						});
+					});
+				});
+			});
+		});
 	});
 });

From 8f8e2db1bbabf7894b7b96e07cddb2f70f985806 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 2 Aug 2013 22:16:05 +0100
Subject: [PATCH 0746/1246] Fixes not saving associations if no changes (other
 than associations) are made (#256)

---
 lib/Instance.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index c9714221..82156d38 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -113,7 +113,9 @@ function Instance(Model, opts) {
 					}
 
 					if (opts.changes.length === 0) {
-					    return saveInstanceExtra(cb);
+						return saveAssociations(function (err) {
+							return afterSave(cb, false, err);
+						});
 					}
 
 					return savePersisted(cb, saveOptions, getInstanceData());

From 838650b0ac755dcb88813976fe65351e2be0b5d8 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 2 Aug 2013 22:23:18 +0100
Subject: [PATCH 0747/1246] Changes mysql DDL to use execQuery instead of
 checking for pool (#258)

This also fixes when debug is on and no DDL queries are shown
---
 lib/Drivers/DDL/mysql.js | 34 +++++-----------------------------
 1 file changed, 5 insertions(+), 29 deletions(-)

diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index 99b8ff43..c8187c8e 100755
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -11,20 +11,8 @@ exports.drop = function (driver, opts, cb) {
 
 	pending = queries.length;
 
-	if (driver.opts.pool) {
-		return driver.db.pool.getConnection(function (err, db) {
-			for (i = 0; i < queries.length; i++) {
-				db.query(queries[i], function (err) {
-					if (--pending === 0) {
-						return cb(err);
-					}
-				});
-			}
-		});
-	}
-
 	for (i = 0; i < queries.length; i++) {
-		driver.db.query(queries[i], function (err) {
+		driver.execQuery(queries[i], function (err) {
 			if (--pending === 0) {
 				return cb(err);
 			}
@@ -71,7 +59,7 @@ exports.sync = function (driver, opts, cb) {
 			definitions.push("INDEX (" + driver.query.escapeId(k) + ")");
 		}
 	}
-	
+
 	for (i = 0; i < opts.one_associations.length; i++) {
 		if (opts.one_associations[i].extension) continue;
 		if (opts.one_associations[i].reversed) continue;
@@ -118,7 +106,7 @@ exports.sync = function (driver, opts, cb) {
 			if (index == null) index = driver.query.escapeId(k);
 			else index += ", " + driver.query.escapeId(k);
 		}
-		
+
 
 		definitions.push("INDEX (" + index + ")");
 		queries.push(
@@ -129,20 +117,8 @@ exports.sync = function (driver, opts, cb) {
 
 	pending = queries.length;
 
-	if (driver.opts.pool) {
-		return driver.db.pool.getConnection(function (err, db) {
-			for (i = 0; i < queries.length; i++) {
-				db.query(queries[i], function (err) {
-					if (--pending === 0) {
-						return cb(err);
-					}
-				});
-			}
-		});
-	}
-	
 	for (i = 0; i < queries.length; i++) {
-		driver.db.query(queries[i], function (err) {
+		driver.execQuery(queries[i], function (err) {
 			if (--pending === 0) {
 				return cb(err);
 			}
@@ -164,7 +140,7 @@ function buildColumnDefinition(driver, name, prop) {
 				def = driver.query.escapeId(name) + " LONGTEXT";
 			} else {
 				def = driver.query.escapeId(name) + " VARCHAR(" + Math.min(Math.max(parseInt(prop.size, 10) || 255, 1), 65535) + ")";
-			}			
+			}
 			break;
 		case "number":
 			if (prop.rational === false) {

From 8c484004aeae8aa060366f1e25e901fac5060161 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 2 Aug 2013 22:23:38 +0100
Subject: [PATCH 0748/1246] Fixes duplicated debug lines for postgres (#258)

---
 lib/Drivers/DML/postgres.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index d87ad721..0b4ab12f 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -50,7 +50,7 @@ var switchableFunctions = {
 		},
 		execQuery: function (query, cb) {
 			if (this.opts.debug) {
-				require("../../Debug").sql('mysql', query);
+				require("../../Debug").sql('postgres', query);
 			}
 			this.db.connect(this.config, function (err, client, done) {
 				if (err) return cb(err);
@@ -79,7 +79,7 @@ var switchableFunctions = {
 		},
 		execQuery: function (query, cb) {
 			if (this.opts.debug) {
-				require("../../Debug").sql('mysql', query);
+				require("../../Debug").sql('postgres', query);
 			}
 			this.db.query(query, function (err, result) {
 				if (err) {
@@ -157,9 +157,6 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 
 	q = q.build();
 
-	if (this.opts.debug) {
-		require("../../Debug").sql('postgres', q);
-	}
 	this.execQuery(q, cb);
 };
 

From 272850a03b8d435a803dd30a3054cee6f98b4e27 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 2 Aug 2013 22:26:40 +0100
Subject: [PATCH 0749/1246] Removes duplicated postgres debug calls (#258)

---
 lib/Drivers/DML/postgres.js | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 0b4ab12f..cdda4318 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -184,9 +184,6 @@ Driver.prototype.count = function (table, conditions, opts, cb) {
 
 	q = q.build();
 
-	if (this.opts.debug) {
-		require("../../Debug").sql('postgres', q);
-	}
 	this.execQuery(q, cb);
 };
 
@@ -196,9 +193,6 @@ Driver.prototype.insert = function (table, data, id_prop, cb) {
 	                  .set(data)
 	                  .build();
 
-	if (this.opts.debug) {
-		require("../../Debug").sql('postgres', q);
-	}
 	this.execQuery(q + " RETURNING *", function (err, results) {
 		if (err) {
 			return cb(err);
@@ -223,9 +217,6 @@ Driver.prototype.update = function (table, changes, conditions, cb) {
 	                  .where(conditions)
 	                  .build();
 
-	if (this.opts.debug) {
-		require("../../Debug").sql('postgres', q);
-	}
 	this.execQuery(q, cb);
 };
 
@@ -235,18 +226,12 @@ Driver.prototype.remove = function (table, conditions, cb) {
 	                  .where(conditions)
 	                  .build();
 
-	if (this.opts.debug) {
-		require("../../Debug").sql('postgres', q);
-	}
 	this.execQuery(q, cb);
 };
 
 Driver.prototype.clear = function (table, cb) {
 	var q = "TRUNCATE TABLE " + this.query.escapeId(table);
 
-	if (this.opts.debug) {
-		require("../../Debug").sql('postgres', q);
-	}
 	this.execQuery(q, cb);
 };
 

From 7302c7cf0e4f3beb644cecdd2b7f59254ec76439 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 2 Aug 2013 22:37:52 +0100
Subject: [PATCH 0750/1246] Changes the way ":" is added to sqlite db paths
 (#270)

1. Only add on win32 platforms
2. Only add if host is a letter

The only case this can't avoid (right now) is realtive paths where the
first folder is a letter. Please avoid it.
---
 lib/Drivers/DML/sqlite.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 16d49a85..1edf1f17 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -14,7 +14,11 @@ function Driver(config, connection, opts) {
 		// on Windows, paths have a drive letter which is parsed by
 		// url.parse() as the hostname. If host is defined, assume
 		// it's the drive letter and add ":"
-		this.db = new sqlite3.Database(((config.host ? config.host + ":" : "") + (config.pathname || "")) || ':memory:');
+		if (process.platform == "win32" && config.host.match(/^[a-z]$/i)) {
+			this.db = new sqlite3.Database(((config.host ? config.host + ":" : "") + (config.pathname || "")) || ':memory:');
+		} else {
+			this.db = new sqlite3.Database(((config.host ? config.host : "") + (config.pathname || "")) || ':memory:');
+		}
 	}
 
 	this.aggregate_functions = [ "ABS", "ROUND",

From 7035b7a578d7de832c7f21ac3ce641c951d8c0d4 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 2 Aug 2013 22:41:17 +0100
Subject: [PATCH 0751/1246] Make Model.get respect Model autoFetch default
 value (#277)

---
 lib/Model.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/Model.js b/lib/Model.js
index 7989cacd..c0068055 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -262,6 +262,9 @@ function Model(opts) {
 			conditions[opts.id[i]] = ids[i];
 		}
 
+		if (!options.hasOwnProperty("autoFetch")) {
+			options.autoFetch = opts.autoFetch;
+		}
 		if (!options.hasOwnProperty("autoFetchLimit")) {
 			options.autoFetchLimit = opts.autoFetchLimit;
 		}

From 0a4db9b4d203b67d0fc368931783a307d7d8725b Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sat, 3 Aug 2013 08:38:43 +0100
Subject: [PATCH 0752/1246] Adds License (MIT) file (closes #271)

---
 License | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 License

diff --git a/License b/License
new file mode 100644
index 00000000..bf05743f
--- /dev/null
+++ b/License
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Diogo Resende and other contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

From be17ccd69f0a818f12742318e6b18252d8ced577 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sat, 3 Aug 2013 08:59:14 +0100
Subject: [PATCH 0753/1246] sql-query@0.1.9 (closes #274)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2ff26932..3f1c5483 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
 	"analyse"     : false,
 	"dependencies": {
 		"enforce"   : "0.1.1",
-		"sql-query" : "0.1.8",
+		"sql-query" : "0.1.9",
 		"hat"       : "0.0.3",
 		"lodash"    : "1.3.1"
 	},

From 529fa1f74c22d57dea667b624e0c41355601ad49 Mon Sep 17 00:00:00 2001
From: DavidKosub <dave@catturavideo.com>
Date: Fri, 2 Aug 2013 12:33:04 -0500
Subject: [PATCH 0754/1246] Add capability for an array to be passed to the
 reversed hasOne set accessor

---
 lib/Associations/One.js                       | 28 ++++++++++++-
 .../integration/association-hasone-reverse.js | 41 +++++++++++++++----
 2 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index c6e98384..b8a1c8ed 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -187,9 +187,33 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 						return cb(err);
 					}
 
-					util.populateConditions(Model, Object.keys(association.field), Instance, OtherInstance, true);
+					if (!Array.isArray(OtherInstance)) {
+						util.populateConditions(Model, Object.keys(association.field), Instance, OtherInstance, true);
 
-					return OtherInstance.save({}, { saveAssociations: false }, cb);
+						return OtherInstance.save({}, { saveAssociations: false }, cb);
+					}
+
+					var associations = _.clone(OtherInstance);
+
+					var saveNext = function () {
+						if (!associations.length) {
+							return cb();
+						}
+
+						var other = associations.pop();
+
+						util.populateConditions(Model, Object.keys(association.field), Instance, other, true);
+
+						other.save({}, { saveAssociations: false }, function (err) {
+							if (err) {
+								return cb(err);
+							}
+
+							saveNext();
+						});
+					};
+
+					return saveNext();
 				});
 			} else {
 				OtherInstance.save({}, { saveAssociations: false }, function (err) {
diff --git a/test/integration/association-hasone-reverse.js b/test/integration/association-hasone-reverse.js
index 8d79159b..1c188612 100644
--- a/test/integration/association-hasone-reverse.js
+++ b/test/integration/association-hasone-reverse.js
@@ -4,7 +4,7 @@ var should = require('should');
 var async  = require('async');
 var _      = require('lodash');
 
-describe("hasOne", function() {
+describe("hasOne", function () {
 	var db     = null;
 	var Person = null;
 
@@ -21,13 +21,12 @@ describe("hasOne", function() {
 			});
 
 			return helper.dropSync([ Person, Pet ], function () {
-				Person.create({
-					name : "John Doe"
-				}, function () {
-					Pet.create({
-						name : "Deco"
-					}, done);
-				});
+				async.parallel([
+					Person.create.bind(Person, { name: "John Doe" }),
+					Person.create.bind(Person, { name: "Jane Doe" }),
+					Pet.create.bind(Pet, { name: "Deco" }),
+					Pet.create.bind(Pet, { name: "Fido" }),
+				], done);
 			});
 		};
 	};
@@ -80,5 +79,31 @@ describe("hasOne", function() {
 				});
 			});
 		});
+
+		it("should be able to set an array of people as the owner", function (done) {
+			Person.find({ name: ["John Doe", "Jane Doe"] }, function (err, owners) {
+				Pet.find({ name: "Fido" }).first(function (err, Fido) {
+					Fido.hasOwner(function (err, has_owner) {
+						should.not.exist(err);
+						has_owner.should.be.false;
+
+						Fido.setOwner(owners, function (err) {
+							should.not.exist(err);
+
+							Fido.getOwner(function (err, ownersCopy) {
+								should.not.exist(err);
+								should(Array.isArray(owners));
+								owners.length.should.equal(2);
+
+								owners[0].should.eql(ownersCopy[0]);
+								owners[1].should.eql(ownersCopy[1]);
+
+								return done();
+							});
+						});
+					});
+				});
+			});
+		});
 	});
 });

From b4b24cee7e99f283fe444ef88befdb115b41eff4 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sat, 3 Aug 2013 09:46:30 +0100
Subject: [PATCH 0755/1246] Changes previous added hasone test to check if
 copies are not switched

---
 test/integration/association-hasone-reverse.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/integration/association-hasone-reverse.js b/test/integration/association-hasone-reverse.js
index 1c188612..a52b52eb 100644
--- a/test/integration/association-hasone-reverse.js
+++ b/test/integration/association-hasone-reverse.js
@@ -95,8 +95,13 @@ describe("hasOne", function () {
 								should(Array.isArray(owners));
 								owners.length.should.equal(2);
 
-								owners[0].should.eql(ownersCopy[0]);
-								owners[1].should.eql(ownersCopy[1]);
+								if (owners[0] == ownersCopy[0]) {
+									owners[0].should.eql(ownersCopy[0]);
+									owners[1].should.eql(ownersCopy[1]);
+								} else {
+									owners[0].should.eql(ownersCopy[1]);
+									owners[1].should.eql(ownersCopy[0]);
+								}
 
 								return done();
 							});

From ed28bb0d8dd80fc34e90ab18cf4c33c8bbdccdad Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sat, 3 Aug 2013 09:46:42 +0100
Subject: [PATCH 0756/1246] 2.1.0

---
 Changelog.md | 25 +++++++++++++++++++++++++
 package.json |  5 +----
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 58033970..25ddaf0b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,28 @@
+### v2.1.0 - 3 Aug 2013
+
+- Adds License (MIT) file (closes #271)
+- Make Model.get respect Model autoFetch default value (#277)
+- Changes the way ":" is added to sqlite db paths (#270)
+- Fixes duplicated debug lines for postgres (#258)
+- Fixes not saving associations if no changes (other than associations) are made (#256)
+- Fixes autoFetch being discarded in Model.get options (closes #266)
+- Adds beforeDefine to plugins (#263)
+- Allows user to pass an object to extendsTo.setAccessor instead of an instance (detected via #250)
+- Changes autoFetch to avoid autofetching if instance is not saved (it's new!) (#242)
+- Changes validations and predefined validators to use enforce@0.1.1
+- Adds support for setting properties.association_key to be a function (name, field)
+- Passes connection settings to database drivers
+- Creates initial mongodb driver and 'mongo' driver alias
+- Allow querying chainfind with sql conditions
+- Allow passing extra options to extended models
+- Allow big text fields
+- Allow before* hooks to modify the instance
+- Fixes #226 - hasOne delAccessor not working
+- Adds Utilities.getRealPath to look for the real path to load based on the file where it was called from (for db.load and db.use)
+- Fixes Model.aggregate().call() to accept no arguments except function name
+- Fix problem with extendsTo and custom key types
+- Better association typing and multikey support
+
 ### v2.0.15 - 10 July 2013
 
 - Support for 'point' type as a property (#221)
diff --git a/package.json b/package.json
index 3f1c5483..59b97854 100644
--- a/package.json
+++ b/package.json
@@ -11,13 +11,10 @@
 		"redshift",
 		"sqlite"
 	],
-	"version"     : "2.0.15",
+	"version"     : "2.1.0",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",
-	"scripts"     : {
-		"test"      : "make"
-	},
 	"contributors": [
 		{ "name" : "Bramus Van Damme", "email" : "bramus@bram.us" },
 		{ "name" : "Lorien Gamaroff",  "email" : "lorien@gamaroff.org" },

From 3846fd19350d6b29f420cc6c989ddb8178ef36e3 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sat, 3 Aug 2013 09:55:51 +0100
Subject: [PATCH 0757/1246] mongodb@1.3.15

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 59b97854..3649723e 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
 		"async"   : "*",
 		"mocha"   : "1.12.0",
 		"should"  : "1.2.2",
-		"mongodb" : "1.3.11"
+		"mongodb" : "1.3.15"
 	},
 	"optionalDependencies": {}
 }

From 7722d1820f90fcb62931f50c86c485eddcfea63f Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <benjamin.pannell@gmail.com>
Date: Sat, 3 Aug 2013 13:03:47 +0200
Subject: [PATCH 0758/1246] Allow accessor template to be set (#276)

---
 lib/Associations/Many.js | 12 +++++++-----
 lib/Associations/One.js  |  8 ++++++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 37d02473..5793b069 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -45,6 +45,7 @@ exports.prepare = function (Model, associations) {
 		}
 
 		var assocName = opts.name || ucfirst(name);
+		var assocTemplateName = opts.accessor || assocName;
 		var association = {
 			name           : name,
 			model          : OtherModel || Model,
@@ -56,11 +57,11 @@ exports.prepare = function (Model, associations) {
 			mergeTable     : opts.mergeTable || (Model.table + "_" + name),
 			mergeId        : util.wrapFieldObject(opts.mergeId, OtherModel, Model.table, OtherModel.properties) || util.formatField(OtherModel, Model.table, true, opts.reversed),
 			mergeAssocId   : util.wrapFieldObject(opts.mergeAssocId, Model, name, Model.properties) || util.formatField(Model, name, true, opts.reversed),
-			getAccessor    : opts.getAccessor || ("get" + assocName),
-			setAccessor    : opts.setAccessor || ("set" + assocName),
-			hasAccessor    : opts.hasAccessor || ("has" + assocName),
-			delAccessor    : opts.delAccessor || ("remove" + assocName),
-			addAccessor    : opts.addAccessor || ("add" + assocName)
+			getAccessor    : opts.getAccessor || ("get" + assocTemplateName),
+			setAccessor    : opts.setAccessor || ("set" + assocTemplateName),
+			hasAccessor    : opts.hasAccessor || ("has" + assocTemplateName),
+			delAccessor    : opts.delAccessor || ("remove" + assocTemplateName),
+			addAccessor    : opts.addAccessor || ("add" + assocTemplateName)
 		};
 
 		associations.push(association);
@@ -68,6 +69,7 @@ exports.prepare = function (Model, associations) {
 		if (opts.reverse) {
 			OtherModel.hasMany(opts.reverse, Model, association.props, {
 				reversed       : true,
+				association    : opts.reverseAssociation,
 				mergeTable     : association.mergeTable,
 				mergeId        : association.mergeAssocId,
 				mergeAssocId   : association.mergeId,
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index b8a1c8ed..a2a839f5 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -6,6 +6,7 @@ var Accessors = { "get": "get", "set": "set", "has": "has", "del": "remove" };
 exports.prepare = function (Model, associations, association_properties, model_fields) {
 	Model.hasOne = function () {
 		var assocName;
+		var assocTemplateName;
 		var association = {
 			name           : Model.table,
 			model          : Model,
@@ -33,6 +34,7 @@ exports.prepare = function (Model, associations, association_properties, model_f
 		}
 
 		assocName = ucfirst(association.name);
+		assocTemplateName = association.accessor || assocName;
 
 		if (!association.hasOwnProperty("field")) {
 			association.field = util.formatField(association.model, association.name, association.required, association.reversed);
@@ -41,7 +43,7 @@ exports.prepare = function (Model, associations, association_properties, model_f
 		}
 		for (var k in Accessors) {
 			if (!association.hasOwnProperty(k + "Accessor")) {
-				association[k + "Accessor"] = Accessors[k] + assocName;
+				association[k + "Accessor"] = Accessors[k] + assocTemplateName;
 			}
 		}
 
@@ -56,13 +58,15 @@ exports.prepare = function (Model, associations, association_properties, model_f
 		if (association.reverse) {
 			association.model.hasOne(association.reverse, Model, {
 				reversed       : true,
+				accessor       : association.reverseAccessor,
+				reverseAccessor: undefined,
 				field          : association.field,
 				autoFetch      : association.autoFetch,
 				autoFetchLimit : association.autoFetchLimit
 			});
 		}
 
-		Model["findBy" + assocName] = function () {
+		Model["findBy" + assocTemplateName] = function () {
 			var cb = null, conditions = null, options = {};
 
 			for (var i = 0; i < arguments.length; i++) {

From 9ce4088f6bd2e6cf4b0c5cec1c19269d395aa466 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <benjamin.pannell@gmail.com>
Date: Sat, 3 Aug 2013 13:04:23 +0200
Subject: [PATCH 0759/1246] Allow multi-key models to support hasMany

---
 lib/Associations/Many.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 5793b069..d4692f09 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -6,13 +6,6 @@ var ErrorCodes          = require("../ErrorCodes");
 var util                = require("../Utilities");
 
 exports.prepare = function (Model, associations) {
-	if (Model.id.length > 1) {
-		Model.hasMany = function () {
-			throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Model.hasMany() does not support multiple keys models");
-		};
-		return;
-	}
-
 	Model.hasMany = function () {
 		var name;
 		var OtherModel = Model;

From 157f4649c25eaefe3352ef5fa6aecdc34ed4fc64 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Tue, 6 Aug 2013 18:01:36 +0200
Subject: [PATCH 0760/1246] Remove upper limit on VARCHAR column size

Allow PostgreSQL to define VARCHAR columns which are longer than 2^16
and instead rely on the database engine to throw errors.
---
 lib/Drivers/DDL/postgres.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index 3e1128da..4e0e38f5 100755
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -204,7 +204,7 @@ function buildColumnDefinition(driver, table, name, prop) {
 			if (prop.big === true) {
 				def = driver.query.escapeId(name) + " TEXT";
 			} else {
-				def = driver.query.escapeId(name) + " VARCHAR(" + Math.min(Math.max(parseInt(prop.size, 10) || 255, 1), 65535) + ")";
+				def = driver.query.escapeId(name) + " VARCHAR(" + Math.max(parseInt(prop.size, 10) || 255, 1) + ")";
 			}
 			break;
 		case "number":

From 6b29a516a73889720b7d7a32024d150526e005ef Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 8 Aug 2013 22:19:55 +0100
Subject: [PATCH 0761/1246] Remove test about throwing when having multikey
 model and hasMany associations

---
 test/integration/model-keys.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/test/integration/model-keys.js b/test/integration/model-keys.js
index 42eef517..b958ed24 100644
--- a/test/integration/model-keys.js
+++ b/test/integration/model-keys.js
@@ -102,13 +102,5 @@ describe("Model keys option", function() {
 				});
 			})
 		});
-
-		it("should throw if defining hasMany association", function (done) {
-			(function () {
-				DoorAccessHistory.hasMany("...");
-			}).should.throw();
-
-			return done();
-		});
 	});
 });

From ad97778af3d3455e55b69da0b5953f01263ed7e0 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 8 Aug 2013 22:20:52 +0100
Subject: [PATCH 0762/1246] Adds instance.model() to get the model of an
 instance (#293)

---
 lib/Instance.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/Instance.js b/lib/Instance.js
index 82156d38..c781e745 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -550,6 +550,12 @@ function Instance(Model, opts) {
 		},
 		enumerable: false
 	});
+	Object.defineProperty(instance, "model", {
+		value: function (cb) {
+			return Model;
+		},
+		enumerable: false
+	});
 
 	for (var i = 0; i < opts.id.length; i++) {
 	    if (!opts.data.hasOwnProperty(opts.id[i])) {

From fdc7862a83208e4a7967fe90905c1768b2017a21 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 8 Aug 2013 22:21:30 +0100
Subject: [PATCH 0763/1246] Adds Utilities.checkConditions() (#293)

---
 lib/Model.js     | 17 ++++++++++++++++-
 lib/Utilities.js | 29 +++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/lib/Model.js b/lib/Model.js
index c0068055..3c5ff61a 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -25,7 +25,7 @@ function Model(opts) {
 	opts = opts || {};
 
 	if (!Array.isArray(opts.id)) {
-		opts.id = [opts.id];
+		opts.id = [ opts.id ];
 	}
 
 	var one_associations       = [];
@@ -365,6 +365,9 @@ function Model(opts) {
 		if (order) {
 			order = Utilities.standardizeOrder(order);
 		}
+		if (conditions) {
+			conditions = Utilities.checkConditions(conditions, model_fields, one_associations);
+		}
 
 		var chain = new ChainFind(model, {
 			only         : options.only || model_fields,
@@ -460,6 +463,10 @@ function Model(opts) {
 			throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.count() callback");
 		}
 
+		if (conditions) {
+			conditions = Utilities.checkConditions(conditions, model_fields, one_associations);
+		}
+
 		opts.driver.count(opts.table, conditions, {}, function (err, data) {
 			if (err || data.length === 0) {
 				return cb(err);
@@ -483,6 +490,10 @@ function Model(opts) {
 			}
 		}
 
+		if (conditions) {
+			conditions = Utilities.checkConditions(conditions, model_fields, one_associations);
+		}
+
 		return new require("./AggregateFunctions")({
 			table       : opts.table,
 			driver_name : opts.driver_name,
@@ -516,6 +527,10 @@ function Model(opts) {
 			}
 		}
 
+		if (conditions) {
+			conditions = Utilities.checkConditions(conditions, model_fields, one_associations);
+		}
+
 		opts.driver.count(opts.table, conditions, {}, function (err, data) {
 			if (err || data.length === 0) {
 				return cb(err);
diff --git a/lib/Utilities.js b/lib/Utilities.js
index 8f7e18e7..3744c05f 100644
--- a/lib/Utilities.js
+++ b/lib/Utilities.js
@@ -44,6 +44,35 @@ exports.standardizeOrder = function (order) {
 	return new_order;
 };
 
+/**
+ * Checks for:
+ *
+ * A) condition keys being association names of a model;
+ * B) condition values being instances;
+ */
+exports.checkConditions = function (conditions, model_fields, one_associations) {
+	for (var k in conditions) {
+		if (!conditions.hasOwnProperty(k)) continue;
+
+		// B)
+		if (conditions[k].isInstance) {
+			conditions[k] = conditions[k][conditions[k].model().id];
+		}
+
+		// A)
+		if (model_fields.indexOf(k) == -1) {
+			for (var i = 0; i < one_associations.length; i++) {
+				if (one_associations[i].name == k) {
+					conditions[Object.keys(one_associations[i].field).pop()] = conditions[k];
+					delete conditions[k];
+				}
+			}
+		}
+	}
+
+	return conditions;
+};
+
 /**
  * Gets all the values within an object or array, optionally
  * using a keys array to get only specific values

From a4fad9925f4ce2ac6b7d106f59a3b88e22b30f62 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 8 Aug 2013 22:25:30 +0100
Subject: [PATCH 0764/1246] Adds support for Array of instances

This allows people to do { owner: [ owner1, owner2, .. ] }
---
 lib/Utilities.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/Utilities.js b/lib/Utilities.js
index 3744c05f..e6a3249a 100644
--- a/lib/Utilities.js
+++ b/lib/Utilities.js
@@ -51,17 +51,25 @@ exports.standardizeOrder = function (order) {
  * B) condition values being instances;
  */
 exports.checkConditions = function (conditions, model_fields, one_associations) {
-	for (var k in conditions) {
+	var k, i;
+
+	for (k in conditions) {
 		if (!conditions.hasOwnProperty(k)) continue;
 
 		// B)
-		if (conditions[k].isInstance) {
+		if (Array.isArray(conditions[k])) {
+			for (i = 0; i < conditions[k].length; i++) {
+				if (conditions[k][i].isInstance) {
+					conditions[k][i] = conditions[k][i][conditions[k][i].model().id];
+				}
+			}
+		} else if (conditions[k].isInstance) {
 			conditions[k] = conditions[k][conditions[k].model().id];
 		}
 
 		// A)
 		if (model_fields.indexOf(k) == -1) {
-			for (var i = 0; i < one_associations.length; i++) {
+			for (i = 0; i < one_associations.length; i++) {
 				if (one_associations[i].name == k) {
 					conditions[Object.keys(one_associations[i].field).pop()] = conditions[k];
 					delete conditions[k];

From 5f47757faa4622951935e7c6d139b8aa00fe9675 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Sat, 10 Aug 2013 12:17:52 +0200
Subject: [PATCH 0765/1246] Add tests for #293

---
 .../integration/association-hasone-reverse.js | 55 ++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/test/integration/association-hasone-reverse.js b/test/integration/association-hasone-reverse.js
index a52b52eb..7584e17c 100644
--- a/test/integration/association-hasone-reverse.js
+++ b/test/integration/association-hasone-reverse.js
@@ -17,7 +17,8 @@ describe("hasOne", function () {
 				name     : String
 			});
 			Person.hasOne('pet', Pet, {
-				reverse : 'owner'
+			    reverse: 'owner',
+                field: 'ownerId'
 			});
 
 			return helper.dropSync([ Person, Pet ], function () {
@@ -110,5 +111,57 @@ describe("hasOne", function () {
 				});
 			});
 		});
+
+		describe("find", function () {
+		    before(setup());
+
+		    it("should be able to find given an association id", function (done) {
+		        Person.find({ name: "John Doe" }).first(function (err, John) {
+		            should.not.exist(err);
+		            Pet.find({ name: "Deco" }).first(function (err, Deco) {
+		                should.not.exist(err);
+		                Deco.hasOwner(function (err, has_owner) {
+		                    should.not.exist(err);
+		                    has_owner.should.be.false;
+
+		                    Deco.setOwner(John, function (err) {
+		                        should.not.exist(err);
+
+		                        Pet.find({ ownerId: John.id }).first(function (err, owner) {
+		                            should.not.exist(err);
+		                            should.equal(owner.id, John.id);
+		                            done();
+		                        });
+
+		                    });
+		                });
+		            });
+		        });
+		    });
+
+		    it("should be able to find given an association instance", function (done) {
+		        Person.find({ name: "John Doe" }).first(function (err, John) {
+		            should.not.exist(err);
+		            Pet.find({ name: "Deco" }).first(function (err, Deco) {
+		                should.not.exist(err);
+		                Deco.hasOwner(function (err, has_owner) {
+		                    should.not.exist(err);
+		                    has_owner.should.be.false;
+
+		                    Deco.setOwner(John, function (err) {
+		                        should.not.exist(err);
+
+		                        Pet.find({ owner: John }).first(function (err, owner) {
+		                            should.not.exist(err);
+		                            should.equal(owner.id, John.id);
+		                            done();
+		                        });
+
+		                    });
+		                });
+		            });
+		        });
+		    });
+		});
 	});
 });

From 2e50cf257f8207ac5e488b0f977b6b1d26577e36 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Sat, 10 Aug 2013 12:21:39 +0200
Subject: [PATCH 0766/1246] Fix broken test harness

Make hasConfig() return 'found' whenever running under Travis
---
 test/common.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/common.js b/test/common.js
index 5a6a7780..fb8dc734 100644
--- a/test/common.js
+++ b/test/common.js
@@ -20,6 +20,8 @@ common.createConnection = function(cb) {
 common.hasConfig = function (proto) {
 	var config;
 
+	if (common.isTravis()) return 'found';
+
 	try {
 		config = require("./config");
 	} catch (ex) {

From b8622ef8c367db89a951a3487ded788b64854bf7 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Sat, 10 Aug 2013 12:27:39 +0200
Subject: [PATCH 0767/1246] Fix 'cannot read length of undefined' in ChainFind

---
 lib/ChainFind.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index e70f41f0..ce4d4651 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -96,12 +96,12 @@ function ChainFind(Model, opts) {
 		},
 		first: function (cb) {
 			return this.run(function (err, items) {
-				return cb(err, items.length > 0 ? items[0] : null);
+				return cb(err, (items || []).length > 0 ? items[0] : null);
 			});
 		},
 		last: function (cb) {
 			return this.run(function (err, items) {
-				return cb(err, items.length > 0 ? items[items.length - 1] : null);
+			    return cb(err, (items || []).length > 0 ? items[items.length - 1] : null);
 			});
 		},
 		each: function (cb) {

From 7f49c12692e7fc54264ccabcf8482543ba7ce3d7 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Sat, 10 Aug 2013 12:30:39 +0200
Subject: [PATCH 0768/1246] Fix failing tests for hasOne reversed find

---
 test/integration/association-hasone-reverse.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/test/integration/association-hasone-reverse.js b/test/integration/association-hasone-reverse.js
index 7584e17c..6c6b5079 100644
--- a/test/integration/association-hasone-reverse.js
+++ b/test/integration/association-hasone-reverse.js
@@ -17,8 +17,7 @@ describe("hasOne", function () {
 				name     : String
 			});
 			Person.hasOne('pet', Pet, {
-			    reverse: 'owner',
-                field: 'ownerId'
+			    reverse: 'owner'
 			});
 
 			return helper.dropSync([ Person, Pet ], function () {
@@ -118,8 +117,10 @@ describe("hasOne", function () {
 		    it("should be able to find given an association id", function (done) {
 		        Person.find({ name: "John Doe" }).first(function (err, John) {
 		            should.not.exist(err);
+		            should.exist(John);
 		            Pet.find({ name: "Deco" }).first(function (err, Deco) {
 		                should.not.exist(err);
+		                should.exist(Deco);
 		                Deco.hasOwner(function (err, has_owner) {
 		                    should.not.exist(err);
 		                    has_owner.should.be.false;
@@ -127,8 +128,9 @@ describe("hasOne", function () {
 		                    Deco.setOwner(John, function (err) {
 		                        should.not.exist(err);
 
-		                        Pet.find({ ownerId: John.id }).first(function (err, owner) {
+		                        Person.find({ pet_id: Deco.id }).first(function (err, owner) {
 		                            should.not.exist(err);
+		                            should.exist(owner);
 		                            should.equal(owner.id, John.id);
 		                            done();
 		                        });
@@ -142,8 +144,10 @@ describe("hasOne", function () {
 		    it("should be able to find given an association instance", function (done) {
 		        Person.find({ name: "John Doe" }).first(function (err, John) {
 		            should.not.exist(err);
+		            should.exist(John);
 		            Pet.find({ name: "Deco" }).first(function (err, Deco) {
 		                should.not.exist(err);
+		                should.exist(Deco);
 		                Deco.hasOwner(function (err, has_owner) {
 		                    should.not.exist(err);
 		                    has_owner.should.be.false;
@@ -151,8 +155,9 @@ describe("hasOne", function () {
 		                    Deco.setOwner(John, function (err) {
 		                        should.not.exist(err);
 
-		                        Pet.find({ owner: John }).first(function (err, owner) {
+		                        Person.find({ pet: Deco }).first(function (err, owner) {
 		                            should.not.exist(err);
+		                            should.exist(owner);
 		                            should.equal(owner.id, John.id);
 		                            done();
 		                        });

From 680be3513532e6717923d45d0bdafec237a8acf8 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Sat, 10 Aug 2013 14:56:27 +0200
Subject: [PATCH 0769/1246] Rewrote utils.checkConditions #293

Improves support for multi-key objects, still missing the ability to
handle multi-value conditions for multi-key objects.
Added a test to verify that it does work correctly for single-primarykey
objects with multiple possible values (generates a `foreignkey` IN
('val1', 'val2'...) statement)
---
 lib/Model.js                                  |  8 +-
 lib/Utilities.js                              | 99 ++++++++++++-------
 .../integration/association-hasone-reverse.js | 34 ++++++-
 3 files changed, 102 insertions(+), 39 deletions(-)

diff --git a/lib/Model.js b/lib/Model.js
index 3c5ff61a..8aef7ca9 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -366,7 +366,7 @@ function Model(opts) {
 			order = Utilities.standardizeOrder(order);
 		}
 		if (conditions) {
-			conditions = Utilities.checkConditions(conditions, model_fields, one_associations);
+			conditions = Utilities.checkConditions(conditions, one_associations);
 		}
 
 		var chain = new ChainFind(model, {
@@ -464,7 +464,7 @@ function Model(opts) {
 		}
 
 		if (conditions) {
-			conditions = Utilities.checkConditions(conditions, model_fields, one_associations);
+			conditions = Utilities.checkConditions(conditions, one_associations);
 		}
 
 		opts.driver.count(opts.table, conditions, {}, function (err, data) {
@@ -491,7 +491,7 @@ function Model(opts) {
 		}
 
 		if (conditions) {
-			conditions = Utilities.checkConditions(conditions, model_fields, one_associations);
+			conditions = Utilities.checkConditions(conditions, one_associations);
 		}
 
 		return new require("./AggregateFunctions")({
@@ -528,7 +528,7 @@ function Model(opts) {
 		}
 
 		if (conditions) {
-			conditions = Utilities.checkConditions(conditions, model_fields, one_associations);
+			conditions = Utilities.checkConditions(conditions, one_associations);
 		}
 
 		opts.driver.count(opts.table, conditions, {}, function (err, data) {
diff --git a/lib/Utilities.js b/lib/Utilities.js
index e6a3249a..c677e4ad 100644
--- a/lib/Utilities.js
+++ b/lib/Utilities.js
@@ -45,40 +45,73 @@ exports.standardizeOrder = function (order) {
 };
 
 /**
- * Checks for:
- *
- * A) condition keys being association names of a model;
- * B) condition values being instances;
+ * Operations
+ * A) Build an index of associations, with their name as the key
+ * B) Check for any conditions with a key in the association index
+ * C) Ensure that our condition supports array values
+ * D) Remove original condition (not DB compatible)
+ * E) Convert our association fields into an array, indexes are the same as model.id
+ * F) Itterate through values for the condition, only accept instances of the same type as the association
  */
-exports.checkConditions = function (conditions, model_fields, one_associations) {
-	var k, i;
-
-	for (k in conditions) {
-		if (!conditions.hasOwnProperty(k)) continue;
-
-		// B)
-		if (Array.isArray(conditions[k])) {
-			for (i = 0; i < conditions[k].length; i++) {
-				if (conditions[k][i].isInstance) {
-					conditions[k][i] = conditions[k][i][conditions[k][i].model().id];
-				}
-			}
-		} else if (conditions[k].isInstance) {
-			conditions[k] = conditions[k][conditions[k].model().id];
-		}
-
-		// A)
-		if (model_fields.indexOf(k) == -1) {
-			for (i = 0; i < one_associations.length; i++) {
-				if (one_associations[i].name == k) {
-					conditions[Object.keys(one_associations[i].field).pop()] = conditions[k];
-					delete conditions[k];
-				}
-			}
-		}
-	}
-
-	return conditions;
+exports.checkConditions = function (conditions, one_associations) {
+    var k, i, j;
+
+    // A)
+    var associations = {};
+    for (i = 0; i < one_associations.length; i++) {
+        associations[one_associations[i].name] = one_associations[i];
+    }
+
+    var or_conditions = [];
+
+    for (k in conditions) {
+        // B)
+        if (!associations.hasOwnProperty(k)) continue;
+
+        // C)
+        var values = conditions[k];
+        if (!Array.isArray(values)) values = [values];
+
+        // D)
+        delete conditions[k];
+
+        // E)
+        var association_fields = Object.keys(associations[k].field);
+        var model = associations[k].model;
+        
+        
+        // F)
+        //TODO: Need some way to specify OR conditions for sql-query
+        //      If we get two instances for a column, with multiple keys,
+        //      we should create two sub-conditions:
+        //      WHERE (id1 = '...' AND id2 = '...') OR (id1 = ',,,' AND id2 = ',,,')
+        //ISSUE:  dresende/node-orm2#293
+        for (i = 0; i < values.length; i++) {
+            if (values[i].isInstance && values[i].model() === model) {
+                if (association_fields.length == 1) {
+                    if (typeof conditions[association_fields[0]] == 'undefined')
+                        conditions[association_fields[0]] = values[i][model.id[0]];
+                    else if(Array.isArray(conditions[association_fields[0]]))
+                        conditions[association_fields[0]].push(values[i][model.id[0]]);
+                    else
+                        conditions[association_fields[0]] = [conditions[association_fields[0]], values[i][model.id[0]]];
+                } else {
+                    if(values.length > 1) throw new Error('ORM does not yet support multiple values for multi-key objects');
+
+                    var _conds = {};
+                    for (j = 0; j < association_fields.length; i++) {
+                        _conds[association_fields[j]] = values[i][model.id[j]];
+                    }
+
+                    or_conditions.push(_conds);
+                }
+            }
+        }
+    }
+
+    // G)
+    //TODO: Merge conditions with or_conditions once F's TODO is fixed
+    return conditions;
 };
 
 /**
diff --git a/test/integration/association-hasone-reverse.js b/test/integration/association-hasone-reverse.js
index 6c6b5079..12016f87 100644
--- a/test/integration/association-hasone-reverse.js
+++ b/test/integration/association-hasone-reverse.js
@@ -131,7 +131,7 @@ describe("hasOne", function () {
 		                        Person.find({ pet_id: Deco.id }).first(function (err, owner) {
 		                            should.not.exist(err);
 		                            should.exist(owner);
-		                            should.equal(owner.id, John.id);
+		                            owner.id.should.equal(John.id);
 		                            done();
 		                        });
 
@@ -158,7 +158,7 @@ describe("hasOne", function () {
 		                        Person.find({ pet: Deco }).first(function (err, owner) {
 		                            should.not.exist(err);
 		                            should.exist(owner);
-		                            should.equal(owner.id, John.id);
+		                            owner.id.should.equal(John.id);
 		                            done();
 		                        });
 
@@ -167,6 +167,36 @@ describe("hasOne", function () {
 		            });
 		        });
 		    });
+            
+		    it("should be able to find given a number of association instances with a single primary key", function (done) {
+		        Person.find({ name: "John Doe" }).first(function (err, John) {
+		            should.not.exist(err);
+		            should.exist(John);
+		            Pet.all(function (err, pets) {
+		                should.not.exist(err);
+		                should.exist(pets);
+		                should.equal(pets.length, 2);
+
+		                pets[0].hasOwner(function (err, has_owner) {
+		                    should.not.exist(err);
+		                    has_owner.should.be.false;
+
+		                    pets[0].setOwner(John, function (err) {
+		                        should.not.exist(err);
+
+		                        Person.find({ pet: pets }, function (err, owners) {
+		                            should.not.exist(err);
+		                            should.exist(owners);
+		                            owners.length.should.equal(1);
+
+		                            owners[0].id.should.equal(John.id);
+		                            done();
+		                        });
+		                    });
+		                });
+		            });
+		        });
+		    });
 		});
 	});
 });

From fb5d0b51ef36d7d571559cb1313a50974b5f8af3 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Sat, 10 Aug 2013 23:49:01 +0200
Subject: [PATCH 0770/1246] Add support for multi-key, multi-instance #293

---
 lib/Utilities.js | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/lib/Utilities.js b/lib/Utilities.js
index c677e4ad..bd6e4714 100644
--- a/lib/Utilities.js
+++ b/lib/Utilities.js
@@ -62,8 +62,6 @@ exports.checkConditions = function (conditions, one_associations) {
         associations[one_associations[i].name] = one_associations[i];
     }
 
-    var or_conditions = [];
-
     for (k in conditions) {
         // B)
         if (!associations.hasOwnProperty(k)) continue;
@@ -81,11 +79,6 @@ exports.checkConditions = function (conditions, one_associations) {
         
         
         // F)
-        //TODO: Need some way to specify OR conditions for sql-query
-        //      If we get two instances for a column, with multiple keys,
-        //      we should create two sub-conditions:
-        //      WHERE (id1 = '...' AND id2 = '...') OR (id1 = ',,,' AND id2 = ',,,')
-        //ISSUE:  dresende/node-orm2#293
         for (i = 0; i < values.length; i++) {
             if (values[i].isInstance && values[i].model() === model) {
                 if (association_fields.length == 1) {
@@ -96,21 +89,18 @@ exports.checkConditions = function (conditions, one_associations) {
                     else
                         conditions[association_fields[0]] = [conditions[association_fields[0]], values[i][model.id[0]]];
                 } else {
-                    if(values.length > 1) throw new Error('ORM does not yet support multiple values for multi-key objects');
-
                     var _conds = {};
                     for (j = 0; j < association_fields.length; i++) {
                         _conds[association_fields[j]] = values[i][model.id[j]];
                     }
 
-                    or_conditions.push(_conds);
+                    conditions.or = conditions.or || [];
+                    conditions.or.push(_conds);
                 }
             }
         }
     }
-
-    // G)
-    //TODO: Merge conditions with or_conditions once F's TODO is fixed
+    
     return conditions;
 };
 

From 676531427faf66504539e4e4dc5c38d89b5b2b46 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Sun, 11 Aug 2013 00:15:31 +0200
Subject: [PATCH 0771/1246] Fix model equality test (#293)

---
 lib/Utilities.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/Utilities.js b/lib/Utilities.js
index bd6e4714..64fdb895 100644
--- a/lib/Utilities.js
+++ b/lib/Utilities.js
@@ -76,11 +76,10 @@ exports.checkConditions = function (conditions, one_associations) {
         // E)
         var association_fields = Object.keys(associations[k].field);
         var model = associations[k].model;
-        
-        
+                
         // F)
         for (i = 0; i < values.length; i++) {
-            if (values[i].isInstance && values[i].model() === model) {
+            if (values[i].isInstance && values[i].model().table == model.table) {
                 if (association_fields.length == 1) {
                     if (typeof conditions[association_fields[0]] == 'undefined')
                         conditions[association_fields[0]] = values[i][model.id[0]];

From 2b29ee14876a8b1eb3c79b8f07a85c0cec11d0ff Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Sun, 11 Aug 2013 00:36:59 +0200
Subject: [PATCH 0772/1246] Add Model.uid (#293)

---
 lib/Model.js     | 4 ++++
 lib/Utilities.js | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/Model.js b/lib/Model.js
index 8aef7ca9..58013843 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -611,6 +611,10 @@ function Model(opts) {
 		value: opts.properties,
 		enumerable: false
 	});
+	Object.defineProperty(model, "uid", {
+	    value: opts.driver.uid + "/" + opts.table + "/" + opts.id.join("/"),
+        enumerable: false
+	});
 
 	OneAssociation.prepare(model, one_associations, association_properties, model_fields);
 	ManyAssociation.prepare(model, many_associations);
diff --git a/lib/Utilities.js b/lib/Utilities.js
index 64fdb895..6e5958bb 100644
--- a/lib/Utilities.js
+++ b/lib/Utilities.js
@@ -79,7 +79,7 @@ exports.checkConditions = function (conditions, one_associations) {
                 
         // F)
         for (i = 0; i < values.length; i++) {
-            if (values[i].isInstance && values[i].model().table == model.table) {
+            if (values[i].isInstance && values[i].model().uid == model.uid) {
                 if (association_fields.length == 1) {
                     if (typeof conditions[association_fields[0]] == 'undefined')
                         conditions[association_fields[0]] = values[i][model.id[0]];

From 8be49a77cd49b1780b1e09d6a6766a7770f35629 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Sun, 11 Aug 2013 16:32:57 +1000
Subject: [PATCH 0773/1246] Allow unique validator scope & case insensitivity

---
 Readme.md                      |   7 ++
 lib/Instance.js                |   2 +
 lib/Validators.js              |  59 ++++++++++---
 test/integration/validation.js | 153 ++++++++++++++++++++++++++++-----
 4 files changed, 190 insertions(+), 31 deletions(-)

diff --git a/Readme.md b/Readme.md
index 13eab13f..01b1351d 100755
--- a/Readme.md
+++ b/Readme.md
@@ -713,6 +713,13 @@ The module [Enforce](http://github.com/dresende/node-enforce) is used for valida
 they're still present, some as links to enforce, others not. We advise you to start using `orm.enforce` instead of `orm.validators`.
 For a list of possible validations, consult the [module](http://github.com/dresende/node-enforce).
 
+There's also a `unique` validator built into ORM accessible via:
+```js
+name: orm.enforce.unique("name already taken!")
+name: orm.enforce.unique({ scope: ['age'] }, "Sorry, name already taken for this age group")
+name: orm.enforce.unique({ ignoreCase: true }) // 'John' is same as 'john' (mysql is case insensitive by default)
+```
+
 You can define validations for every property of a Model. You can have one or more validations for each property.
 You can also use the predefined validations or create your own.
 
diff --git a/lib/Instance.js b/lib/Instance.js
index c781e745..099bdade 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -80,7 +80,9 @@ function Instance(Model, opts) {
 				}
 			}
 
+			checks.context("instance", instance);
 			checks.context("model", Model);
+			checks.context("driver", opts.driver);
 
 			return checks.check(instance, cb);
 		});
diff --git a/lib/Validators.js b/lib/Validators.js
index 7d51fc13..b9fa9e1a 100644
--- a/lib/Validators.js
+++ b/lib/Validators.js
@@ -1,5 +1,5 @@
 var enforce = require("enforce");
-
+var util    = require("util");
 
 var validators = {
 	required       : enforce.required,
@@ -31,17 +31,45 @@ validators.equalToProperty = function (name, msg) {
 
 /**
  * Check if a property is unique in the collection.
- * This can take a while because a query has to be
- * made against the Model, but if you use this
- * always you should not have not unique values
- * on this property so this should not worry you.
+ * This can take a while because a query has to be made against the Model.
+ *
+ * Due to the async nature of node, and concurrent web server environments,
+ * an index on the database column is the only way to gurantee uniqueness.
+ *
+ * Options:
+ *   ignoreCase: for postgres; mysql ignores case by default.
+ *   scope: (Array) scope uniqueness to listed properties
  **/
-validators.unique = function (msg) {
+validators.unique = function () {
+	var arg, k;
+	var msg = null, opts = {};
+
+	for (k in arguments) {
+		arg = arguments[k];
+		if (typeof arg == 'string') msg = arg;
+		else if (typeof arg == 'object') opts = arg;
+	}
+
 	return function (v, next, ctx) {
-		var query = {};
-		query[ctx.property] = v;
+		var s, scopeProp;
+		var chain = ctx.model.find();
+
+		var chainQuery = function (prop, value) {
+			var query = null;
+
+			if (opts.ignoreCase === true && ctx.model.properties[prop].type == 'text') {
+				query = util.format('LOWER(%s.%s) LIKE LOWER(?)',
+					ctx.model.table, ctx.driver.query.escapeId(prop)
+				);
+				chain.where(query, [value]);
+			} else {
+				query = {};
+				query[prop] = value;
+				chain.where(query);
+			}
+		};
 
-		ctx.model.find(query, function (err, records) {
+		var handler = function (err, records) {
 			if (err) {
 				return next();
 			}
@@ -52,7 +80,18 @@ validators.unique = function (msg) {
 				return next();
 			}
 			return next(msg || 'not-unique');
-		}.bind(this));
+		}.bind(this);
+
+		chainQuery(ctx.property, v);
+
+		if (opts.scope) {
+			for (var s in opts.scope) {
+				scopeProp = opts.scope[s];
+				chainQuery(scopeProp, ctx.instance[scopeProp]);
+			}
+		}
+
+		chain.all(handler);
 	};
 };
 
diff --git a/test/integration/validation.js b/test/integration/validation.js
index e5723e9c..f0ba9bc5 100644
--- a/test/integration/validation.js
+++ b/test/integration/validation.js
@@ -2,6 +2,8 @@ var _        = require('lodash');
 var should   = require('should');
 var helper   = require('../support/spec_helper');
 var async    = require('async');
+var common   = require('../common');
+var protocol = common.protocol().toLowerCase();
 var ORM      = require('../../');
 
 describe("Validations", function() {
@@ -56,27 +58,136 @@ describe("Validations", function() {
 			});
 		});
 
-		it("unique validator should work", function(done) {
-			var Product = db.define("person_unique", { name: String }, {
-				validations: { name: ORM.validators.unique() }
-			});
-			var create = function (cb) {
-				var p = new Product({ name: 'broom' });
-
-				return p.save(cb);
-			};
-
-			helper.dropSync(Product, function() {
-				create(function (err) {
-					should.equal(err, null);
-					create(function (err) {
-						should.deepEqual(err, _.extend(new Error(),{
-							property: 'name', value: 'broom', msg: 'not-unique'
-						}));
-						return done();
-					});
-				});
-			});
+		describe("unique", function() {
+			var Product = null;
+
+			var setupUnique = function (ignoreCase, scope, msg) {
+		    return function (done) {
+		      Product = db.define("product_unique", {
+		        name     : String,
+		        category : String
+		      }, {
+		        validations: {
+		          name: [ORM.validators.unique({ ignoreCase: ignoreCase, scope: scope }, msg)]
+		        }
+		      });
+
+		      return helper.dropSync(Product, done);
+		    };
+		  };
+
+		  describe("simple", function () {
+		  	before(setupUnique(false, false));
+
+		  	it("should return validation error for duplicate name", function (done) {
+		  	  Product.create({name: 'fork'}, function (err, product) {
+            should.not.exist(err);
+
+            Product.create({name: 'fork'}, function (err, product) {
+              should.exist(err);
+
+              return done();
+            });
+          });
+			  });
+
+			  it("should pass with different names", function (done) {
+		  	  Product.create({name: 'spatula'}, function (err, product) {
+            should.not.exist(err);
+
+            Product.create({name: 'plate'}, function (err, product) {
+              should.not.exist(err);
+
+              return done();
+            });
+          });
+			  });
+		  });
+
+		  describe("scope", function () {
+        describe("to other property", function () {
+          before(setupUnique(false, ['category']));
+
+          it("should return validation error if other property also matches", function(done) {
+            Product.create({name: 'red', category: 'chair'}, function (err, product) {
+              should.not.exist(err);
+
+              Product.create({name: 'red', category: 'chair'}, function (err, product) {
+                should.exist(err);
+                should.equal(err.msg, 'not-unique');
+
+                return done();
+              });
+            });
+          });
+
+          it("should pass if other peroperty is different", function (done) {
+            Product.create({name: 'blue', category: 'chair'}, function (err, product) {
+              should.not.exist(err);
+
+              Product.create({name: 'blue', category: 'pen'}, function (err, product) {
+                should.not.exist(err);
+
+                return done();
+              });
+            });
+          });
+        });
+      });
+
+      describe("ignoreCase", function () {
+        if (protocol != 'mysql') {
+          it("false should do a case sensitive comparison", function (done) {
+            setupUnique(false, false)(function (err) {
+              should.not.exist(err);
+
+              Product.create({name: 'spork'}, function (err, product) {
+                should.not.exist(err);
+
+                Product.create({name: 'spOrk'}, function (err, product) {
+                  should.not.exist(err);
+
+                  return done();
+                });
+              });
+            });
+          });
+        }
+
+        it("true should do a case insensitive comparison", function (done) {
+          setupUnique(true, false)(function (err) {
+            should.not.exist(err);
+
+            Product.create({name: 'stapler'}, function (err, product) {
+              should.not.exist(err);
+
+              Product.create({name: 'staplER'}, function (err, product) {
+                should.exist(err);
+                should.equal(err.msg, 'not-unique');
+
+                return done();
+              });
+            });
+          });
+        });
+
+        it("true should do a case insensitive comparison on scoped properties too", function (done) {
+          setupUnique(true, ['category'], "name already taken for this category")(function (err) {
+            should.not.exist(err);
+
+            Product.create({name: 'black', category: 'pen'}, function (err, product) {
+              should.not.exist(err);
+
+              Product.create({name: 'Black', category: 'Pen'}, function (err, product) {
+                should.exist(err);
+                should.equal(err.msg, "name already taken for this category");
+
+                return done();
+              });
+            });
+          });
+        });
+      });
 		});
 	});
 

From 8a57bcf04370aa3d3da705c32761a3e2ed9ef180 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sun, 11 Aug 2013 22:00:55 +0100
Subject: [PATCH 0774/1246] Removes sections from Readme that are already in
 the Wiki

Just leaves a link to the wiki page.
---
 Readme.md | 229 +++---------------------------------------------------
 1 file changed, 9 insertions(+), 220 deletions(-)

diff --git a/Readme.md b/Readme.md
index 01b1351d..af12de19 100755
--- a/Readme.md
+++ b/Readme.md
@@ -107,85 +107,17 @@ You can call `orm.express` more than once to have multiple database connections.
 will be joined together in `req.models`. **Don't forget to use it before `app.use(app.router)`, preferably right after your
 assets public folder(s).**
 
-## Settings
-
-Settings are used to store key value pairs. A settings object is stored on the global orm object and on each database connection.
-
-```js
-var orm = require("orm");
+## Documentation
 
-orm.settings.set("some.deep.value", 123);
+Documentation is moving to the [wiki](https://github.com/dresende/node-orm2/wiki/).
 
-orm.connect("....", function (err, db) {
-	// db.settings is a snapshot of the settings at the moment
-	// of orm.connect(). changes to it don't affect orm.settings
+## Settings
 
-	console.log(db.settings.get("some.deep.value")); // 123
-	console.log(db.settings.get("some.deep"));       // { value: 123 }
-});
-```
-More in the [wiki](https://github.com/dresende/node-orm2/wiki/Settings).
+See information in the [wiki](https://github.com/dresende/node-orm2/wiki/Settings).
 
 ## Connecting
 
-First, add the correct driver to your `package.json`:
-
- driver                | npm package                | version
-:----------------------|:---------------------------|:-----
- mysql                 | mysql                      | 2.0.0-alpha7
- postgres<br/>redshift | pg                         | ~1.0.0
- sqlite                | sqlite3                    | 2.1.7
- mongodb               | mongodb                    | 1.3.11
-
-These are the versions tested. Use others (older or newer) at your own risk.
-
-### Options
-
-You can pass in connection options either as a string:
-
-```js
-var orm = require("orm");
-
-orm.connect("mysql://username:password@host/database?pool=true", function (err, db) {
-	// ...
-});
-```
-
-**Note:** `pool` is only supported by mysql & postgres. When 'pool' is set to true, your database connections are cached so that connections can be reused, optimizing performance.
-
-**Note:** `strdates` is only supported by sqlite. When true, date fields are saved as strings, compatible with django
-
-Or as an object:
-
-```js
-var opts = {
-  database : "dbname",
-  protocol : "[mysql|postgres|redshift|sqlite]",
-  host     : "127.0.0.1",
-  port     : 3306,         // optional, defaults to database default
-  user     : "..",
-  password : "..",
-  query    : {
-    pool     : true|false,   // optional, false by default
-    debug    : true|false,   // optional, false by default
-    strdates : true|false    // optional, false by default
-  }
-};
-orm.connect(opts, function (err, db) {
-	// ...
-});
-```
-
-You can also avoid passing a callback and just listen for the connect event:
-
-```js
-var orm = require("orm");
-var db  = orm.connect("mysql://username:password@host/database");
-
-db.on("connect", function (err, db) {
-	// ...
-});
-```
+See information in the [wiki](https://github.com/dresende/node-orm2/wiki/Connecting-to-Database).
 
 ## Models
 
@@ -195,50 +127,11 @@ Models support behaviours for accessing and manipulating table data.
 
 ## Defining Models
 
-Call `define` on the database connection to setup a model. The name of the table and model is used as an identifier for the model on the database connection, so you can easily access the model later using the connection.
-
-```js
-var Person = db.define('person', {        // 'person' will be the table in the database as well as the model id
-	// properties
-	name    : String,                     // you can use native objects to define the property type
-	surname : { type: "text", size: 50 }  // or you can be specific and define aditional options
-}, {
-	// options (optional)
-});
-```
+See information in the [wiki](https://github.com/dresende/node-orm2/wiki/Defining-Models).
 
 ### Properties
 
-#### Types
-
-
- Native   | String     | Native   | String
- :--------|:-----------|:---------|:---------
- String   | 'text'     | Date     | 'date '
- Number   | 'number'   | Object   | 'object'
- Boolean  | 'boolean'  | Buffer   | 'binary'
-          |            |  ---     | 'enum'
-
-#### Options
-
-##### [all types]
-* `required`: true marks the column as `NOT NULL`, false (default)
-* `unique`: true marks the column with a `UNIQUE` index
-* `defaultValue`: sets the default value for the field
-
-##### string
-* `size`: max length of the string
-* `big`: true to make (LONG)TEXT columns instead of VARCHAR(size)
-
-##### number
-* `rational`: true (default) creates a FLOAT/REAL, false an INTEGER
-* `size`: byte size of number, default is 4. Note that 8 byte numbers [have limitations](http://stackoverflow.com/questions/307179/what-is-javascripts-max-int-whats-the-highest-integer-value-a-number-can-go-t)
-* `unsigned`: true to make INTEGER unsigned, default is false
-
-##### date
-* `time`: true (default) creates a DATETIME/TIMESTAMP, false a DATE
-
-Note that these may vary accross drivers.
+See information in the [wiki](https://github.com/dresende/node-orm2/wiki/Model-Properties).
 
 ### Instance Methods
 
@@ -384,44 +277,7 @@ Other options:
 
 ## Hooks
 
-If you want to listen for a type of event than occurs in instances of a Model, you can attach a function that
-will be called when that event happens.
-
-Currently the following events are supported:
-
-- `afterLoad` : (no parameters) Right after loading and preparing an instance to be used;
-- `afterAutoFetch` : (no parameters) Right after auto-fetching associations (if any), it will trigger regardless of having associations or not;
-- `beforeSave` : (no parameters) Right before trying to save;
-- `afterSave` : (bool success) Right after saving;
-- `beforeCreate` : (no parameters) Right before trying to save a new instance (prior to `beforeSave`);
-- `afterCreate` : (bool success) Right after saving a new instance;
-- `beforeRemove` : (no parameters) Right before trying to remove an instance;
-- `afterRemove` : (bool success) Right after removing an instance;
-- `beforeValidation` : (no parameters) Before all validations and prior to `beforeCreate` and `beforeSave`;
-
-All hook function are called with `this` as the instance so you can access anything you want related to it.
-
-For all `before*` hooks, you can add an additional parameter to the hook function. This parameter will be a function that
-must be called to tell if the hook allows the execution to continue or to break. You might be familiar with this workflow
-already from Express. Here's an example:
-
-```js
-var Person = db.define("person", {
-	name    : String,
-	surname : String
-}, {
-	hooks: {
-		beforeCreate: function (next) {
-			if (this.surname == "Doe") {
-				return next(new Error("No Does allowed"));
-			}
-			return next();
-		}
-	}
-});
-```
-
-This workflow allows you to make asynchronous work before calling `next`.
+See information in the [wiki](https://github.com/dresende/node-orm2/wiki/Model-Hooks).
 
 ## Finding Items
 
@@ -709,74 +565,7 @@ Person.get(1, function (err, John) {
 
 ## Validations
 
-The module [Enforce](http://github.com/dresende/node-enforce) is used for validations. For people using previous validators,
-they're still present, some as links to enforce, others not. We advise you to start using `orm.enforce` instead of `orm.validators`.
-For a list of possible validations, consult the [module](http://github.com/dresende/node-enforce).
-
-There's also a `unique` validator built into ORM accessible via:
-```js
-name: orm.enforce.unique("name already taken!")
-name: orm.enforce.unique({ scope: ['age'] }, "Sorry, name already taken for this age group")
-name: orm.enforce.unique({ ignoreCase: true }) // 'John' is same as 'john' (mysql is case insensitive by default)
-```
-
-You can define validations for every property of a Model. You can have one or more validations for each property.
-You can also use the predefined validations or create your own.
-
-```js
-var Person = db.define("person", {
-	name : String,
-	age  : Number
-}, {
-	validations : {
-		name : orm.enforce.ranges.length(1, undefined, "missing"), // "missing" is a name given to this validation, instead of default
-		age  : [ orm.enforce.ranges.number(0, 10), orm.enforce.lists.inside([ 1, 3, 5, 7, 9 ]) ]
-	}
-});
-```
-
-The code above defines that the `name` length must be between 1 and undefined (undefined means any) and `age`
-must be a number between 0 and 10 (inclusive) but also one of the listed values. The example might not make sense
-but you get the point.
-
-When saving an item, if it fails to validate any of the defined validations you'll get an `error` object with the property
-name and validation error description. This description should help you identify what happened.
-
-```js
-var John = new Person({
-	name : "",
-	age : 20
-});
-John.save(function (err) {
-	// err.field = "name" , err.value = "" , err.msg = "missing"
-});
-```
-
-The validation stops after the first validation error. If you want it to validate every property and return all validation
-errors, you can change this behavior on global or local settings:
-
-```js
-var orm = require("orm");
-
-orm.settings.set("instance.returnAllErrors", true); // global or..
-
-orm.connect("....", function (err, db) {
-	db.settings.set("instance.returnAllErrors", true); // .. local
-
-	// ...
-
-	var John = new Person({
-		name : "",
-		age : 15
-	});
-	John.save(function (err) {
-		assert(Array.isArray(err));
-		// err[0].property = "name" , err[0].value = "" , err[0].msg = "missing"
-		// err[1].property = "age"  , err[1].value = 15 , err[1].msg = "out-of-range-number"
-		// err[2].property = "age"  , err[2].value = 15 , err[2].msg = "outside-list"
-	});
-});
-```
+See information in the [wiki](https://github.com/dresende/node-orm2/wiki/Model-Validations).
 
 ## Associations
 

From 8dd173cf853af88029ea78cc77611ea54174e95f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sun, 11 Aug 2013 22:14:31 +0100
Subject: [PATCH 0775/1246] Fixes throw when calling ChainFind.first() or
 .last() and it has an error

---
 lib/ChainFind.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index e70f41f0..861a9ce7 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -96,12 +96,12 @@ function ChainFind(Model, opts) {
 		},
 		first: function (cb) {
 			return this.run(function (err, items) {
-				return cb(err, items.length > 0 ? items[0] : null);
+				return cb(err, items && items.length > 0 ? items[0] : null);
 			});
 		},
 		last: function (cb) {
 			return this.run(function (err, items) {
-				return cb(err, items.length > 0 ? items[items.length - 1] : null);
+				return cb(err, items && items.length > 0 ? items[items.length - 1] : null);
 			});
 		},
 		each: function (cb) {

From 057ccb18e42afdc9fe504fffa2139bd28d771cb7 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sun, 11 Aug 2013 22:20:56 +0100
Subject: [PATCH 0776/1246] Adds connection.pool and connection.debug settings

Instead of passing in the database URL, you can now just switch in the
settings defore connecting.
---
 lib/ORM.js      | 8 ++++----
 lib/Settings.js | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index 85e25bd3..30e22c3b 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -102,12 +102,12 @@ exports.connect = function (opts, cb) {
 
 	try {
 		var Driver   = require("./Drivers/DML/" + proto).Driver;
-		var debug    = Boolean(extractOption(opts, "debug"));
-		var pool     = Boolean(extractOption(opts, "pool"));
 		var settings = new Settings.Container(exports.settings.get('*'));
+		var debug    = extractOption(opts, "debug");
+		var pool     = extractOption(opts, "pool");
 		var driver   = new Driver(opts, null, {
-			debug    : debug,
-			pool     : pool,
+			debug    : (debug !== null ? Boolean(debug) : settings.get("connection.debug")),
+			pool     : (pool !== null ? Boolean(pool) : settings.get("connection.pool")),
 			settings : settings
 		});
 
diff --git a/lib/Settings.js b/lib/Settings.js
index be575af7..26479aa9 100644
--- a/lib/Settings.js
+++ b/lib/Settings.js
@@ -15,7 +15,9 @@ var default_settings = {
 		returnAllErrors : false
 	},
 	connection : {
-		reconnect       : true
+		reconnect       : true,
+		poll            : false,
+		debug           : false
 	}
 };
 

From 02c56c246fe47e61400a47e7db2894dac99822ad Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 12 Aug 2013 17:18:01 +1000
Subject: [PATCH 0777/1246] Fix infuriating validation bug

---
 lib/Instance.js                |  2 ++
 test/integration/validation.js | 22 ++++++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 099bdade..2649ac5a 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -62,6 +62,8 @@ function Instance(Model, opts) {
 			});
 
 			for (var k in opts.validations) {
+				required = false;
+
 				if (Model.properties[k]) {
 					required = Model.properties[k].required;
 				} else {
diff --git a/test/integration/validation.js b/test/integration/validation.js
index f0ba9bc5..4e75a3c5 100644
--- a/test/integration/validation.js
+++ b/test/integration/validation.js
@@ -64,13 +64,18 @@ describe("Validations", function() {
 			var setupUnique = function (ignoreCase, scope, msg) {
 		    return function (done) {
 		      Product = db.define("product_unique", {
-		        name     : String,
+		        instock  : { type: 'boolean', required: true, defaultValue: false },
+            name     : String,
 		        category : String
 		      }, {
+            cache: false,
 		        validations: {
-		          name: [ORM.validators.unique({ ignoreCase: ignoreCase, scope: scope }, msg)]
+              name      : ORM.validators.unique({ ignoreCase: ignoreCase, scope: scope }, msg),
+              instock   : ORM.validators.required(),
+              productId : ORM.validators.unique() // this must be straight after a required & validated row.
 		        }
 		      });
+          Product.hasOne('product', Product, { field: 'productId', required: false, autoFetch: true });
 
 		      return helper.dropSync(Product, done);
 		    };
@@ -102,6 +107,19 @@ describe("Validations", function() {
             });
           });
 			  });
+
+        // Technically this is covered by the tests above, but I'm putting it here for clarity's sake. 3 HOURS WASTED *sigh.
+        it("should not leak required state from previous validation for association properties [regression test]", function (done) {
+          Product.create({ name: 'pencil', productId: null}, function (err, product) {
+            should.not.exist(err);
+
+            Product.create({ name: 'pencilcase', productId: null }, function (err, product) {
+              should.not.exist(err);
+
+              return done();
+            });
+          });
+        });
 		  });
 
 		  describe("scope", function () {

From 802dd3c99591967d6fd3a47ed471d15bab26c456 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 12 Aug 2013 17:20:37 +1000
Subject: [PATCH 0778/1246] Lint

---
 test/integration/validation.js | 288 ++++++++++++++++-----------------
 1 file changed, 144 insertions(+), 144 deletions(-)

diff --git a/test/integration/validation.js b/test/integration/validation.js
index 4e75a3c5..6b4d6ccf 100644
--- a/test/integration/validation.js
+++ b/test/integration/validation.js
@@ -62,150 +62,150 @@ describe("Validations", function() {
 			var Product = null;
 
 			var setupUnique = function (ignoreCase, scope, msg) {
-		    return function (done) {
-		      Product = db.define("product_unique", {
-		        instock  : { type: 'boolean', required: true, defaultValue: false },
-            name     : String,
-		        category : String
-		      }, {
-            cache: false,
-		        validations: {
-              name      : ORM.validators.unique({ ignoreCase: ignoreCase, scope: scope }, msg),
-              instock   : ORM.validators.required(),
-              productId : ORM.validators.unique() // this must be straight after a required & validated row.
-		        }
-		      });
-          Product.hasOne('product', Product, { field: 'productId', required: false, autoFetch: true });
-
-		      return helper.dropSync(Product, done);
-		    };
-		  };
-
-		  describe("simple", function () {
-		  	before(setupUnique(false, false));
-
-		  	it("should return validation error for duplicate name", function (done) {
-		  	  Product.create({name: 'fork'}, function (err, product) {
-            should.not.exist(err);
-
-            Product.create({name: 'fork'}, function (err, product) {
-              should.exist(err);
-
-              return done();
-            });
-          });
-			  });
-
-			  it("should pass with different names", function (done) {
-		  	  Product.create({name: 'spatula'}, function (err, product) {
-            should.not.exist(err);
-
-            Product.create({name: 'plate'}, function (err, product) {
-              should.not.exist(err);
-
-              return done();
-            });
-          });
-			  });
-
-        // Technically this is covered by the tests above, but I'm putting it here for clarity's sake. 3 HOURS WASTED *sigh.
-        it("should not leak required state from previous validation for association properties [regression test]", function (done) {
-          Product.create({ name: 'pencil', productId: null}, function (err, product) {
-            should.not.exist(err);
-
-            Product.create({ name: 'pencilcase', productId: null }, function (err, product) {
-              should.not.exist(err);
-
-              return done();
-            });
-          });
-        });
-		  });
-
-		  describe("scope", function () {
-        describe("to other property", function () {
-          before(setupUnique(false, ['category']));
-
-          it("should return validation error if other property also matches", function(done) {
-            Product.create({name: 'red', category: 'chair'}, function (err, product) {
-              should.not.exist(err);
-
-              Product.create({name: 'red', category: 'chair'}, function (err, product) {
-                should.exist(err);
-                should.equal(err.msg, 'not-unique');
-
-                return done();
-              });
-            });
-          });
-
-          it("should pass if other peroperty is different", function (done) {
-            Product.create({name: 'blue', category: 'chair'}, function (err, product) {
-              should.not.exist(err);
-
-              Product.create({name: 'blue', category: 'pen'}, function (err, product) {
-                should.not.exist(err);
-
-                return done();
-              });
-            });
-          });
-        });
-      });
-
-      describe("ignoreCase", function () {
-        if (protocol != 'mysql') {
-          it("false should do a case sensitive comparison", function (done) {
-            setupUnique(false, false)(function (err) {
-              should.not.exist(err);
-
-              Product.create({name: 'spork'}, function (err, product) {
-                should.not.exist(err);
-
-                Product.create({name: 'spOrk'}, function (err, product) {
-                  should.not.exist(err);
-
-                  return done();
-                });
-              });
-            });
-          });
-        }
-
-        it("true should do a case insensitive comparison", function (done) {
-          setupUnique(true, false)(function (err) {
-            should.not.exist(err);
-
-            Product.create({name: 'stapler'}, function (err, product) {
-              should.not.exist(err);
-
-              Product.create({name: 'staplER'}, function (err, product) {
-                should.exist(err);
-                should.equal(err.msg, 'not-unique');
-
-                return done();
-              });
-            });
-          });
-        });
-
-        it("true should do a case insensitive comparison on scoped properties too", function (done) {
-          setupUnique(true, ['category'], "name already taken for this category")(function (err) {
-            should.not.exist(err);
-
-            Product.create({name: 'black', category: 'pen'}, function (err, product) {
-              should.not.exist(err);
-
-              Product.create({name: 'Black', category: 'Pen'}, function (err, product) {
-                should.exist(err);
-                should.equal(err.msg, "name already taken for this category");
-
-                return done();
-              });
-            });
-          });
-        });
-      });
+				return function (done) {
+					Product = db.define("product_unique", {
+						instock  : { type: 'boolean', required: true, defaultValue: false },
+						name     : String,
+						category : String
+					}, {
+						cache: false,
+						validations: {
+							name      : ORM.validators.unique({ ignoreCase: ignoreCase, scope: scope }, msg),
+							instock   : ORM.validators.required(),
+							productId : ORM.validators.unique() // this must be straight after a required & validated row.
+						}
+					});
+					Product.hasOne('product', Product, { field: 'productId', required: false, autoFetch: true });
+
+					return helper.dropSync(Product, done);
+				};
+			};
+
+			describe("simple", function () {
+				before(setupUnique(false, false));
+
+				it("should return validation error for duplicate name", function (done) {
+					Product.create({name: 'fork'}, function (err, product) {
+						should.not.exist(err);
+
+						Product.create({name: 'fork'}, function (err, product) {
+							should.exist(err);
+
+							return done();
+						});
+					});
+				});
+
+				it("should pass with different names", function (done) {
+					Product.create({name: 'spatula'}, function (err, product) {
+						should.not.exist(err);
+
+						Product.create({name: 'plate'}, function (err, product) {
+							should.not.exist(err);
+
+							return done();
+						});
+					});
+				});
+
+				// Technically this is covered by the tests above, but I'm putting it here for clarity's sake. 3 HOURS WASTED *sigh.
+				it("should not leak required state from previous validation for association properties [regression test]", function (done) {
+					Product.create({ name: 'pencil', productId: null}, function (err, product) {
+						should.not.exist(err);
+
+						Product.create({ name: 'pencilcase', productId: null }, function (err, product) {
+							should.not.exist(err);
+
+							return done();
+						});
+					});
+				});
+			});
+
+			describe("scope", function () {
+				describe("to other property", function () {
+					before(setupUnique(false, ['category']));
+
+					it("should return validation error if other property also matches", function(done) {
+						Product.create({name: 'red', category: 'chair'}, function (err, product) {
+							should.not.exist(err);
+
+							Product.create({name: 'red', category: 'chair'}, function (err, product) {
+								should.exist(err);
+								should.equal(err.msg, 'not-unique');
+
+								return done();
+							});
+						});
+					});
+
+					it("should pass if other peroperty is different", function (done) {
+						Product.create({name: 'blue', category: 'chair'}, function (err, product) {
+							should.not.exist(err);
+
+							Product.create({name: 'blue', category: 'pen'}, function (err, product) {
+								should.not.exist(err);
+
+								return done();
+							});
+						});
+					});
+				});
+			});
+
+			describe("ignoreCase", function () {
+				if (protocol != 'mysql') {
+					it("false should do a case sensitive comparison", function (done) {
+						setupUnique(false, false)(function (err) {
+							should.not.exist(err);
+
+							Product.create({name: 'spork'}, function (err, product) {
+								should.not.exist(err);
+
+								Product.create({name: 'spOrk'}, function (err, product) {
+									should.not.exist(err);
+
+									return done();
+								});
+							});
+						});
+					});
+				}
+
+				it("true should do a case insensitive comparison", function (done) {
+					setupUnique(true, false)(function (err) {
+						should.not.exist(err);
+
+						Product.create({name: 'stapler'}, function (err, product) {
+							should.not.exist(err);
+
+							Product.create({name: 'staplER'}, function (err, product) {
+								should.exist(err);
+								should.equal(err.msg, 'not-unique');
+
+								return done();
+							});
+						});
+					});
+				});
+
+				it("true should do a case insensitive comparison on scoped properties too", function (done) {
+					setupUnique(true, ['category'], "name already taken for this category")(function (err) {
+						should.not.exist(err);
+
+						Product.create({name: 'black', category: 'pen'}, function (err, product) {
+							should.not.exist(err);
+
+							Product.create({name: 'Black', category: 'Pen'}, function (err, product) {
+								should.exist(err);
+								should.equal(err.msg, "name already taken for this category");
+
+								return done();
+							});
+						});
+					});
+				});
+			});
 		});
 	});
 

From dd4447387eae4b7f0e16951348e923d7bbfe4ad0 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 12 Aug 2013 17:33:14 +1000
Subject: [PATCH 0779/1246] Unique validation scope should pass with null scope
 property

---
 lib/Validators.js              |  6 ++++++
 test/integration/validation.js | 13 +++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/lib/Validators.js b/lib/Validators.js
index b9fa9e1a..f5a54441 100644
--- a/lib/Validators.js
+++ b/lib/Validators.js
@@ -87,6 +87,12 @@ validators.unique = function () {
 		if (opts.scope) {
 			for (var s in opts.scope) {
 				scopeProp = opts.scope[s];
+
+				// In SQL unique index land, NULL values are not considered equal.
+				if (ctx.instance[scopeProp] === undefined || ctx.instance[scopeProp] === null) {
+					return next();
+				}
+
 				chainQuery(scopeProp, ctx.instance[scopeProp]);
 			}
 		}
diff --git a/test/integration/validation.js b/test/integration/validation.js
index 6b4d6ccf..f64e667d 100644
--- a/test/integration/validation.js
+++ b/test/integration/validation.js
@@ -150,6 +150,19 @@ describe("Validations", function() {
 							});
 						});
 					});
+
+					// In SQL unique index land, NULL values are not considered equal.
+					it("should pass if other peroperty is null", function (done) {
+						Product.create({name: 'blue', category: null}, function (err, product) {
+							should.not.exist(err);
+
+							Product.create({name: 'blue', category: null}, function (err, product) {
+								should.not.exist(err);
+
+								return done();
+							});
+						});
+					});
 				});
 			});
 

From 4b2b163d1416533d758298d551ebe6f347b62e75 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Sun, 11 Aug 2013 00:45:02 +0200
Subject: [PATCH 0780/1246] Fix SQLite and MongoDB test failures (#293)

---
 .../integration/association-hasone-reverse.js | 178 +++++++++---------
 1 file changed, 90 insertions(+), 88 deletions(-)

diff --git a/test/integration/association-hasone-reverse.js b/test/integration/association-hasone-reverse.js
index 12016f87..8304d039 100644
--- a/test/integration/association-hasone-reverse.js
+++ b/test/integration/association-hasone-reverse.js
@@ -17,7 +17,8 @@ describe("hasOne", function () {
 				name     : String
 			});
 			Person.hasOne('pet', Pet, {
-			    reverse: 'owner'
+			    reverse: 'owner',
+                field: 'pet_id'
 			});
 
 			return helper.dropSync([ Person, Pet ], function () {
@@ -110,93 +111,94 @@ describe("hasOne", function () {
 				});
 			});
 		});
+	});
 
-		describe("find", function () {
-		    before(setup());
-
-		    it("should be able to find given an association id", function (done) {
-		        Person.find({ name: "John Doe" }).first(function (err, John) {
-		            should.not.exist(err);
-		            should.exist(John);
-		            Pet.find({ name: "Deco" }).first(function (err, Deco) {
-		                should.not.exist(err);
-		                should.exist(Deco);
-		                Deco.hasOwner(function (err, has_owner) {
-		                    should.not.exist(err);
-		                    has_owner.should.be.false;
-
-		                    Deco.setOwner(John, function (err) {
-		                        should.not.exist(err);
-
-		                        Person.find({ pet_id: Deco.id }).first(function (err, owner) {
-		                            should.not.exist(err);
-		                            should.exist(owner);
-		                            owner.id.should.equal(John.id);
-		                            done();
-		                        });
-
-		                    });
-		                });
-		            });
-		        });
-		    });
-
-		    it("should be able to find given an association instance", function (done) {
-		        Person.find({ name: "John Doe" }).first(function (err, John) {
-		            should.not.exist(err);
-		            should.exist(John);
-		            Pet.find({ name: "Deco" }).first(function (err, Deco) {
-		                should.not.exist(err);
-		                should.exist(Deco);
-		                Deco.hasOwner(function (err, has_owner) {
-		                    should.not.exist(err);
-		                    has_owner.should.be.false;
-
-		                    Deco.setOwner(John, function (err) {
-		                        should.not.exist(err);
-
-		                        Person.find({ pet: Deco }).first(function (err, owner) {
-		                            should.not.exist(err);
-		                            should.exist(owner);
-		                            owner.id.should.equal(John.id);
-		                            done();
-		                        });
-
-		                    });
-		                });
-		            });
-		        });
-		    });
-            
-		    it("should be able to find given a number of association instances with a single primary key", function (done) {
-		        Person.find({ name: "John Doe" }).first(function (err, John) {
-		            should.not.exist(err);
-		            should.exist(John);
-		            Pet.all(function (err, pets) {
-		                should.not.exist(err);
-		                should.exist(pets);
-		                should.equal(pets.length, 2);
-
-		                pets[0].hasOwner(function (err, has_owner) {
-		                    should.not.exist(err);
-		                    has_owner.should.be.false;
-
-		                    pets[0].setOwner(John, function (err) {
-		                        should.not.exist(err);
-
-		                        Person.find({ pet: pets }, function (err, owners) {
-		                            should.not.exist(err);
-		                            should.exist(owners);
-		                            owners.length.should.equal(1);
-
-		                            owners[0].id.should.equal(John.id);
-		                            done();
-		                        });
-		                    });
-		                });
-		            });
-		        });
-		    });
-		});
+
+	describe("reverse find", function () {
+	    before(setup());
+
+	    it("should be able to find given an association id", function (done) {
+	        Person.find({ name: "John Doe" }).first(function (err, John) {
+	            should.not.exist(err);
+	            should.exist(John);
+	            Pet.find({ name: "Deco" }).first(function (err, Deco) {
+	                should.not.exist(err);
+	                should.exist(Deco);
+	                Deco.hasOwner(function (err, has_owner) {
+	                    should.not.exist(err);
+	                    has_owner.should.be.false;
+
+	                    Deco.setOwner(John, function (err) {
+	                        should.not.exist(err);
+
+	                        Person.find({ pet_id: Deco.id }).first(function (err, owner) {
+	                            should.not.exist(err);
+	                            should.exist(owner);
+	                            should.equal(owner.name, John.name);
+	                            done();
+	                        });
+
+	                    });
+	                });
+	            });
+	        });
+	    });
+
+	    it("should be able to find given an association instance", function (done) {
+	        Person.find({ name: "John Doe" }).first(function (err, John) {
+	            should.not.exist(err);
+	            should.exist(John);
+	            Pet.find({ name: "Deco" }).first(function (err, Deco) {
+	                should.not.exist(err);
+	                should.exist(Deco);
+	                Deco.hasOwner(function (err, has_owner) {
+	                    should.not.exist(err);
+	                    has_owner.should.be.false;
+
+	                    Deco.setOwner(John, function (err) {
+	                        should.not.exist(err);
+
+	                        Person.find({ pet: Deco }).first(function (err, owner) {
+	                            should.not.exist(err);
+	                            should.exist(owner);
+	                            should.equal(owner.name, John.name);
+	                            done();
+	                        });
+
+	                    });
+	                });
+	            });
+	        });
+	    });
+
+	    it("should be able to find given a number of association instances with a single primary key", function (done) {
+	        Person.find({ name: "John Doe" }).first(function (err, John) {
+	            should.not.exist(err);
+	            should.exist(John);
+	            Pet.all(function (err, pets) {
+	                should.not.exist(err);
+	                should.exist(pets);
+	                should.equal(pets.length, 2);
+
+	                pets[0].hasOwner(function (err, has_owner) {
+	                    should.not.exist(err);
+	                    has_owner.should.be.false;
+
+	                    pets[0].setOwner(John, function (err) {
+	                        should.not.exist(err);
+
+	                        Person.find({ pet: pets }, function (err, owners) {
+	                            should.not.exist(err);
+	                            should.exist(owners);
+	                            owners.length.should.equal(1);
+
+	                            should.equal(owners[0].name, John.name);
+	                            done();
+	                        });
+	                    });
+	                });
+	            });
+	        });
+	    });
 	});
 });

From fbbf95ecce9d86ba26fcc3efc03de18eed0a8262 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 12 Aug 2013 22:03:05 +1000
Subject: [PATCH 0781/1246] Infinite loop test case - issue #279

---
 test/integration/association-hasone.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/test/integration/association-hasone.js b/test/integration/association-hasone.js
index f7b95ee2..5c197ee8 100644
--- a/test/integration/association-hasone.js
+++ b/test/integration/association-hasone.js
@@ -229,6 +229,18 @@ describe("hasOne", function() {
 						});
 					});
 				});
+
+				it("shouldn't cause an infinite loop when getting and saving", function (done) {
+					Leaf.get(leafId, function (err, leaf) {
+						should.not.exist(err);
+
+						leaf.save( function (err) {
+							should.not.exist(err);
+
+							done();
+						});
+					});
+				});
 			});
 		});
 	});

From cfbb04312857592dfe50c70f3cf1dc4beb2d4adb Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Tue, 13 Aug 2013 00:51:59 +0200
Subject: [PATCH 0782/1246] Add Preliminary TypeScript Interfaces

---
 lib/TypeScript/enforce.d.ts |   5 +
 lib/TypeScript/orm.d.ts     | 254 ++++++++++++++++++++++++++++++++++++
 2 files changed, 259 insertions(+)
 create mode 100644 lib/TypeScript/enforce.d.ts
 create mode 100644 lib/TypeScript/orm.d.ts

diff --git a/lib/TypeScript/enforce.d.ts b/lib/TypeScript/enforce.d.ts
new file mode 100644
index 00000000..a02947d5
--- /dev/null
+++ b/lib/TypeScript/enforce.d.ts
@@ -0,0 +1,5 @@
+declare module enforce {
+    export interface EnforceStatic {
+        
+    }
+}
\ No newline at end of file
diff --git a/lib/TypeScript/orm.d.ts b/lib/TypeScript/orm.d.ts
new file mode 100644
index 00000000..24833282
--- /dev/null
+++ b/lib/TypeScript/orm.d.ts
@@ -0,0 +1,254 @@
+/// <reference path="enforce.d.ts"/>
+
+declare module orm {
+    export interface ORMStatic {
+        validators: ValidatorsStatic;
+        enforce: enforce.EnforceStatic;
+        singleton: SingletonStatic;
+        settings: Settings;
+
+        express(uri: string, options: {
+            define: (db: ORM, models: Model[]) => void;
+            error: (err: Error) => void;
+        }): Express;
+
+        express(database: ConnectionOptions, options: {
+            define: (db: ORM, models: Model[]) => void;
+            error: (err: Error) => void;
+        }): Express;
+
+        use(connection: Connection, proto: string, opts: ConnectionOptions, cb: (err: Error, orm: ORM) => void): void;
+        connect(opts: ConnectionOptions, cb: (err: Error, orm: ORM) => void): Error;
+    }
+
+    export interface ORM {
+        use(plugin: string, options?: any): ORM;
+        use(plugin: ORMPlugin, options?: any): ORM;
+        define(name: string, properties: ModelProperties, options: ModelOptions): Model;
+        ping(cb: (err: Error) => void);
+        close(cb: (err: Error) => void);
+        load(file: string, cb: (err: Error) => void): any;
+        sync(cb: (err?: Error) => void): ORM;
+        drop(cb: (err?: Error) => void): ORM;
+
+        //serial(args...: any[]): ORM;
+    }
+
+    export interface ValidatorsStatic {
+
+    }
+
+    export interface SingletonStatic {
+
+    }
+
+    export interface Settings {
+        defaults: () => Settings;
+        
+        constructor(settings: Settings): {
+            set(key: string, value: any): Settings;
+            get(key: string, def: any): any;
+            unset(...keys: string[]): Settings;
+        }
+
+        properties?: {
+            primary_key?: string;
+            association_key?: string;
+            required?: string;
+        }
+
+        instance?: {
+            cache?: boolean;
+            cacheSaveCheck?: boolean;
+            autoSave?: boolean;
+            autoFetch?: boolean;
+            autoFetchLimit?: number;
+            cascadeRemove?: boolean;
+            returnAllErrors?: boolean;
+        }
+
+        connection?: {
+            reconnect?: boolean;
+            poll?: boolean;
+            debug?: boolean;
+        }
+    }
+
+    export interface Property {
+
+    }
+
+    export interface ErrorCodes {
+
+    }
+
+    export interface Express {
+        
+    }
+
+    export interface Connection {
+
+    }
+
+    export interface ConnectionOptions {
+    
+    }
+
+    export interface ORMPlugin {
+        define(model: Model, db: ORM);
+        beforeDefine(name: string, properties: ModelProperties, options: ModelOptions);
+    }
+
+    export interface Model {
+        table: string;
+        id: string;
+        properties: ModelProperties;
+        uid: string;
+
+        get(id: any, options: FindOptions, cb: (err: Error, result: Instance) => void): Model;
+        get(id: any, cb: (err: Error, result: Instance) => void): Model;
+
+        find(conditions?: { [property: string]: any }, options?: FindOptions, limit?: number, order?: string, cb?: (err: Error, results: Instance[]) => void): ChainFind;
+        find(conditions?: { [property: string]: any }, options?: FindOptions, limit?: number, order?: string[], cb?: (err: Error, results: Instance[]) => void): ChainFind;
+
+        all(conditions?: { [property: string]: any }, options?: FindOptions, limit?: number, order?: string, cb?: (err: Error, results: Instance[]) => void): ChainFind;
+        all(conditions?: { [property: string]: any }, options?: FindOptions, limit?: number, order?: string[], cb?: (err: Error, results: Instance[]) => void): ChainFind;
+
+        count(conditions: { [property: string]: any }, cb: (err: Error, count: number) => void): ChainFind;
+        count(cb: (err: Error, count: number) => void): ChainFind;
+
+        exists(conditions: { [property: string]: any }, cb: (err: Error, exists: boolean) => void): ChainFind;
+        exists(cb: (err: Error, exists: boolean) => void): ChainFind;
+
+        one(conditions: { [property: string]: any }, cb: (err: Error, result: Instance) => void): ChainFind;
+        one(cb: (err: Error, result: Instance) => void): ChainFind;
+
+        aggregate(fields: string[], conditions?: { [property: string]: any }): ChainAggregate;
+        aggregate(conditions?: { [property: string]: any }): ChainAggregate;
+
+
+        create(values: InstanceProperties, cb: (err: Error, newInstance: Instance) => void): Model;
+        create(values: InstanceProperties[], cb: (err: Error, newInstance: Instance) => void): Model;
+
+        clear(cb: (err: Error) => void): Model; 
+    }
+
+    export interface ModelProperties {
+        [name: string]: Object;
+        [name: string]: ModelProperty[];
+    }
+
+    export interface ModelProperty {
+        type: string;
+        required?: boolean;
+        defaultValue?: string;
+        size?: number;
+        big?: boolean;
+        unique?: boolean;
+        time?: boolean;
+        rational?: boolean;
+        unsigned?: boolean;
+    }
+
+    export interface ModelOptions {
+        id?: string[];
+        cache?: boolean;
+        autoSave?: boolean;
+        autoFetch?: boolean;
+        autoFetchLimit?: number;
+
+        methods?: {
+            [name: string]: Function;
+        };
+        hooks?: {
+            [name: string]: (cb?: () => void) => void;
+        };
+    }
+
+    export interface FindOptions {
+        cache?: boolean;
+        autoSave?: boolean;
+        autoFetch?: boolean;
+        autoFetchLimit?: number;
+    }
+
+    export interface Instance {
+        [property: string]: any;
+
+        save(cb: (err: Error) => void): Instance;
+        save(data: InstanceProperties, cb: (err: Error) => void): Instance;
+        save(data: InstanceProperties, saveOptions: FindOptions, cb: (err: Error) => void): Instance;
+
+        saved: boolean;
+        isInstance: boolean;
+        isShell: boolean;
+        model: Model;
+
+        validate(cb: (err: Error, errors: Error[]) => void);
+
+        remove(cb: (err: Error) => void): Instance;
+    }
+    
+    interface InstanceProperties {
+        [property: string]: any
+    }
+
+    export interface ChainFind {
+        get(id: any, options: FindOptions, cb: (err: Error, result: Instance) => void): Model;
+        get(id: any, cb: (err: Error, result: Instance) => void): Model;
+
+        find(sql: string): ChainFind;
+        find(conditions?: { [property: string]: any }, options?: FindOptions, limit?: number, order?: string, cb?: (err: Error, results: Instance[]) => void): ChainFind;
+        find(conditions?: { [property: string]: any }, options?: FindOptions, limit?: number, order?: string[], cb?: (err: Error, results: Instance[]) => void): ChainFind;
+
+        only(...fields: string[]): ChainFind;
+        only(fields: string[]): ChainFind;
+
+        all(conditions?: { [property: string]: any }, options?: FindOptions, limit?: number, order?: string, cb?: (err: Error, results: Instance[]) => void): ChainFind;
+        all(conditions?: { [property: string]: any }, options?: FindOptions, limit?: number, order?: string[], cb?: (err: Error, results: Instance[]) => void): ChainFind;
+
+        count(conditions: { [property: string]: any }, cb: (err: Error, count: number) => void): ChainFind;
+        count(cb: (err: Error, count: number) => void): ChainFind;
+
+        exists(conditions: { [property: string]: any }, cb: (err: Error, exists: boolean) => void): ChainFind;
+        exists(cb: (err: Error, exists: boolean) => void): ChainFind;
+
+        one(conditions: { [property: string]: any }, cb: (err: Error, result: Instance) => void): ChainFind;
+        one(cb: (err: Error, result: Instance) => void): ChainFind;
+
+        aggregate(fields: string[], conditions?: { [property: string]: any }): ChainAggregate;
+        aggregate(conditions?: { [property: string]: any }): ChainAggregate;
+
+        limit(limit: number): ChainFind;
+        skip(offset: number): ChainFind;
+        offset(offset: number): ChainFind;
+        order(property: string, order: string): ChainFind;
+        order(property: string[], order: string): ChainFind;
+        remove(cb: (err: Error) => void): ChainFind;
+        first(cb: (err: Error, result: Instance) => void): ChainFind;
+        last(cb: (err: Error, result: Instance) => void): ChainFind;
+        run(cb: (err: Error, results: Instance[]) => void): ChainFind;
+
+        each(cb: (err: Error, result: Instance) => void): ChainInstance;
+    }
+
+    export interface ChainAggregate {
+        limit(limit: number): Model;
+        limit(offset: number, limit: number): Model;
+
+        min(field: string): Model;
+        max(field: string): Model;
+        avg(field: string): Model;
+        sum(field: string): Model;
+        count(field: string): Model;
+    }
+
+    export interface ChainInstance {
+        filter(cb: (instance: Instance) => boolean): () => ChainInstance;
+        forEach(cb: (instance: Instance) => void): () => ChainInstance;
+        sort(cb: (instance: Instance) => any): () => ChainInstance;
+        count(cb: (count: number) => any): () => ChainInstance;
+        get(cb: (instances: Instance[]) => any): () => ChainInstance;
+        save(cb: (instance: Instance) => any): () => ChainInstance;
+    }
+}
\ No newline at end of file

From 15b276afccd9178cde8e81422698224f5ce1a253 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Tue, 13 Aug 2013 13:07:09 +0200
Subject: [PATCH 0783/1246] JSLint Fixes

---
 lib/AggregateFunctions.js |  14 ++---
 lib/ChainFind.js          |  44 ++++++++-------
 lib/ChainInstance.js      |   6 +-
 lib/Express.js            |   4 +-
 lib/Hook.js               |   4 +-
 lib/Instance.js           | 115 ++++++++++++++++++++------------------
 lib/Model.js              |  97 ++++++++++++++++----------------
 lib/ORM.js                |  28 +++++-----
 lib/Property.js           |   6 +-
 lib/Settings.js           |  14 ++---
 lib/Singleton.js          |   6 +-
 lib/Utilities.js          |  50 ++++++++---------
 lib/Validators.js         |  12 ++--
 13 files changed, 207 insertions(+), 193 deletions(-)

diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index 40f65697..157559ae 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -4,7 +4,7 @@ var Utilities  = require("./Utilities");
 module.exports = AggregateFunctions;
 
 function AggregateFunctions(opts) {
-	if (typeof opts.driver.getQuery != "function") {
+	if (typeof opts.driver.getQuery !== "function") {
 		throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "This driver does not support aggregate functions");
 	}
 	if (!Array.isArray(opts.driver.aggregate_functions)) {
@@ -26,7 +26,7 @@ function AggregateFunctions(opts) {
 				aggregates[aggregates.length - 1].push({ f: fun, alias: aggregateAlias(fun, args) });
 			}
 
-			if (fun == "distinct") {
+			if (fun === "distinct") {
 				used_distinct = true;
 			}
 
@@ -39,7 +39,7 @@ function AggregateFunctions(opts) {
 			return this;
 		},
 		limit: function (offset, limit) {
-			if (typeof limit == "number") {
+			if (typeof limit === "number") {
 				opts.limit = [ offset, limit ];
 			} else {
 				opts.limit = [ 0, offset ]; // offset = limit
@@ -60,7 +60,7 @@ function AggregateFunctions(opts) {
 			return this;
 		},
 		as: function (alias) {
-			if (aggregates.length === 0 || (aggregates.length == 1 && aggregates[0].length === 0)) {
+			if (aggregates.length === 0 || (aggregates.length === 1 && aggregates[0].length === 0)) {
 				throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "No aggregate functions defined yet");
 			}
 
@@ -78,14 +78,14 @@ function AggregateFunctions(opts) {
 				aggregates[aggregates.length - 1].push({ f: fun, alias: aggregateAlias(fun, args) });
 			}
 
-			if (fun.toLowerCase() == "distinct") {
+			if (fun.toLowerCase() === "distinct") {
 				used_distinct = true;
 			}
 
 			return this;
 		},
 		get: function (cb) {
-			if (typeof cb != "function") {
+			if (typeof cb !== "function") {
 				throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "You must pass a callback to Model.aggregate().get()");
 			}
 			if (aggregates[aggregates.length - 1].length === 0) {
@@ -132,7 +132,7 @@ function AggregateFunctions(opts) {
 
 				var items = [], i;
 
-				if (used_distinct && aggregates.length == 1) {
+				if (used_distinct && aggregates.length === 1) {
 					for (i = 0; i < data.length; i++) {
 						items.push(data[i][Object.keys(data[i]).pop()]);
 					}
diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 861a9ce7..18760205 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -9,18 +9,18 @@ function ChainFind(Model, opts) {
 		find: function () {
 			var cb = null;
 
-			arguments = Array.prototype.slice.call(arguments);
+			var args = Array.prototype.slice.call(arguments);
 			opts.conditions = opts.conditions || {};
 
-			if (typeof _.last(arguments) == 'function') {
-				cb = arguments.pop();
+			if (typeof _.last(args) === 'function') {
+			    cb = args.pop();
 			}
 
-			if (typeof arguments[0] == 'object') {
-				_.extend(opts.conditions, arguments[0]);
-			} else if (typeof arguments[0] == 'string') {
-				opts.conditions.__sql = opts.conditions.__sql || []
-				opts.conditions.__sql.push(arguments);
+			if (typeof args[0] === 'object') {
+			    _.extend(opts.conditions, args[0]);
+			} else if (typeof args[0] === 'string') {
+			    opts.conditions.__sql = opts.conditions.__sql || [];
+				opts.conditions.__sql.push(args);
 			}
 
 			if (cb) {
@@ -51,10 +51,10 @@ function ChainFind(Model, opts) {
 			if (!Array.isArray(opts.order)) {
 				opts.order = [];
 			}
-			if (property[0] == "-") {
+			if (property[0] === "-") {
 				opts.order.push([ property.substr(1), "Z" ]);
 			} else {
-				opts.order.push([ property, (order && order.toUpperCase() == "Z" ? "Z" : "A") ]);
+				opts.order.push([ property, (order && order.toUpperCase() === "Z" ? "Z" : "A") ]);
 			}
 			return this;
 		},
@@ -126,16 +126,18 @@ function ChainFind(Model, opts) {
 				}
 				var pending = data.length;
 
+				var createInstance = function (idx) {
+				    opts.newInstance(data[idx], function (err, instance) {
+				        data[idx] = instance;
+
+				        if (--pending === 0) {
+				            return cb(null, data);
+				        }
+				    });
+				};
+
 				for (var i = 0; i < data.length; i++) {
-					(function (idx) {
-						opts.newInstance(data[idx], function (err, instance) {
-							data[idx] = instance;
-
-							if (--pending === 0) {
-								return cb(null, data);
-							}
-						});
-					})(i);
+					createInstance(i);
 				}
 			});
 			return this;
@@ -152,7 +154,7 @@ function ChainFind(Model, opts) {
 		if ([ "hasOne", "hasMany",
 		      "drop", "sync", "get", "find", "all", "count", "clear", "create",
 		      "exists", "settings", "aggregate" ].indexOf(k) >= 0) continue;
-		if (typeof Model[k] != "function") continue;
+		if (typeof Model[k] !== "function") continue;
 
 		chain[k] = Model[k];
 	}
@@ -173,7 +175,7 @@ function addChainMethod(chain, association, opts) {
 		var ids = association.model.id;
 		function mergeConditions(source) {
 		    for (var i = 0; i < assocIds.length; i++) {
-		        if (typeof conditions[assocIds[i]] == 'undefined')
+		        if (typeof conditions[assocIds[i]] === 'undefined')
 		            conditions[assocIds[i]] = source[ids[i]];
 		        else if(Array.isArray(conditions[assocIds[i]]))
 		            conditions[assocIds[i]].push(source[ids[i]]);
diff --git a/lib/ChainInstance.js b/lib/ChainInstance.js
index 3713699c..2e55bb72 100644
--- a/lib/ChainInstance.js
+++ b/lib/ChainInstance.js
@@ -60,7 +60,7 @@ function ChainInstance(chain, cb) {
 		save: promise(function (cb) {
 			var saveNext = function (i) {
 				if (i >= instances.length) {
-					if (typeof cb == "function") {
+					if (typeof cb === "function") {
 						cb();
 					}
 					return next();
@@ -68,7 +68,7 @@ function ChainInstance(chain, cb) {
 
 				return instances[i].save(function (err) {
 					if (err) {
-						if (typeof cb == "function") {
+						if (typeof cb === "function") {
 							cb(err);
 						}
 						return next();
@@ -82,7 +82,7 @@ function ChainInstance(chain, cb) {
 		})
 	};
 
-	if (typeof cb == "function") {
+	if (typeof cb === "function") {
 		return calls.forEach(cb);
 	}
 	return calls;
diff --git a/lib/Express.js b/lib/Express.js
index b7575fb4..0cf934da 100644
--- a/lib/Express.js
+++ b/lib/Express.js
@@ -13,7 +13,7 @@ module.exports = function (uri, opts) {
 		_pending -= 1;
 
 		if (err) {
-			if (typeof opts.error == "function") {
+			if (typeof opts.error === "function") {
 				opts.error(err);
 			} else {
 				throw err;
@@ -29,7 +29,7 @@ module.exports = function (uri, opts) {
 		} else {
 			_db = db;
 		}
-		if (typeof opts.define == "function") {
+		if (typeof opts.define === "function") {
 			opts.define(db, _models);
 		}
 
diff --git a/lib/Hook.js b/lib/Hook.js
index 17e49075..4ab645b1 100644
--- a/lib/Hook.js
+++ b/lib/Hook.js
@@ -3,7 +3,7 @@ exports.trigger = function () {
 	var self = args.shift();
 	var cb   = args.shift();
 
-	if (typeof cb == "function") {
+	if (typeof cb === "function") {
 		cb.apply(self, args);
 	}
 };
@@ -16,7 +16,7 @@ exports.wait = function () {
 
 	args.push(next);
 
-	if (typeof cb == "function") {
+	if (typeof cb === "function") {
 		cb.apply(self, args);
 
 		if (cb.length < args.length) {
diff --git a/lib/Instance.js b/lib/Instance.js
index 2649ac5a..56973ee0 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -28,19 +28,20 @@ function Instance(Model, opts) {
 		var pending = [], errors = [], required;
 
 		Hook.wait(instance, opts.hooks.beforeValidation, function (err) {
+		    var k, i;
 			if (err) {
 				return saveError(cb, err);
 			}
 
-			for (var k in Model.properties) {
+			for (k in Model.properties) {
 				if (!Model.properties.hasOwnProperty(k)) continue;
-				if (opts.data[k] == null && Model.properties[k].hasOwnProperty("defaultValue")) {
+				if (opts.data[k] === null && Model.properties[k].hasOwnProperty("defaultValue")) {
 					opts.data[k] = Model.properties[k].defaultValue;
 				}
 			}
-			for (var i = 0; i < opts.one_associations.length; i++) {
+			for (i = 0; i < opts.one_associations.length; i++) {
 				for (k in opts.one_associations[i].field) {
-					if (opts.one_associations[i].required && opts.data[k] == null) {
+					if (opts.one_associations[i].required && opts.data[k] === null) {
 						var err   = new Error("Property required");
 
 						err.field = k;
@@ -61,23 +62,23 @@ function Instance(Model, opts) {
 				returnAllErrors : Model.settings.get("instance.returnAllErrors")
 			});
 
-			for (var k in opts.validations) {
+			for (k in opts.validations) {
 				required = false;
 
 				if (Model.properties[k]) {
 					required = Model.properties[k].required;
 				} else {
-					for (var i = 0; i < opts.one_associations.length; i++) {
-						if (opts.one_associations[i].field == k) {
+					for (i = 0; i < opts.one_associations.length; i++) {
+						if (opts.one_associations[i].field === k) {
 							required = opts.one_associations[i].required;
 							break;
 						}
 					}
 				}
-				if (!required && instance[k] == null) {
+				if (!required && instance[k] === null) {
 					continue; // avoid validating if property is not required and is "empty"
 				}
-				for (var i = 0; i < opts.validations[k].length; i++) {
+				for (i = 0; i < opts.validations[k].length; i++) {
 					checks.add(k, opts.validations[k][i]);
 				}
 			}
@@ -92,7 +93,7 @@ function Instance(Model, opts) {
 	var saveError = function (cb, err) {
 		emitEvent("save", err, instance);
 		Hook.trigger(instance, opts.hooks.afterSave, false);
-		if (typeof cb == "function") {
+		if (typeof cb === "function") {
 			cb(err, instance);
 		}
 	};
@@ -236,45 +237,50 @@ function Instance(Model, opts) {
 			});
 		};
 
-		for (i = 0; i < opts.one_associations.length; i++) {
-			(function (assoc) {
-				if (!instance[assoc.name] || typeof instance[assoc.name] != "object") return;
-				if (assoc.reversed) {
-					// reversed hasOne associations should behave like hasMany
-					if (!Array.isArray(instance[assoc.name])) {
-						instance[assoc.name] = [ instance[assoc.name] ];
-					}
-					for (var i = 0; i < instance[assoc.name].length; i++) {
-						if (!instance[assoc.name][i].isInstance) {
-							instance[assoc.name][i] = new assoc.model(instance[assoc.name][i]);
-						}
-						saveAssociation(assoc.setAccessor, instance[assoc.name][i]);
-					}
-					return;
-				}
-				if (!instance[assoc.name].isInstance) {
-					instance[assoc.name] = new assoc.model(instance[assoc.name]);
-				}
+		var _saveOneAssociation = function (assoc) {
+		    if (!instance[assoc.name] || typeof instance[assoc.name] !== "object") return;
+		    if (assoc.reversed) {
+		        // reversed hasOne associations should behave like hasMany
+		        if (!Array.isArray(instance[assoc.name])) {
+		            instance[assoc.name] = [ instance[assoc.name] ];
+		        }
+		        for (var i = 0; i < instance[assoc.name].length; i++) {
+		            if (!instance[assoc.name][i].isInstance) {
+		                instance[assoc.name][i] = new assoc.model(instance[assoc.name][i]);
+		            }
+		            saveAssociation(assoc.setAccessor, instance[assoc.name][i]);
+		        }
+		        return;
+		    }
+		    if (!instance[assoc.name].isInstance) {
+		        instance[assoc.name] = new assoc.model(instance[assoc.name]);
+		    }
+
+		    saveAssociation(assoc.setAccessor, instance[assoc.name]);
+		};
 
-				saveAssociation(assoc.setAccessor, instance[assoc.name]);
-			})(opts.one_associations[i]);
+		for (i = 0; i < opts.one_associations.length; i++) {
+		    _saveOneAssociation(opts.one_associations[i]);
 		}
 
-		for (i = 0; i < opts.many_associations.length; i++) {
-			(function (assoc) {
-				if (!instance.hasOwnProperty(assoc.name)) return;
-				if (!Array.isArray(instance[assoc.name])) {
-					instance[assoc.name] = [ instance[assoc.name] ];
-				}
 
-				for (j = 0; j < instance[assoc.name].length; j++) {
-					if (!instance[assoc.name][j].isInstance) {
-						instance[assoc.name][j] = new assoc.model(instance[assoc.name][j]);
-					}
-				}
+		var _saveManyAssociation = function (assoc) {
+		    if (!instance.hasOwnProperty(assoc.name)) return;
+		    if (!Array.isArray(instance[assoc.name])) {
+		        instance[assoc.name] = [ instance[assoc.name] ];
+		    }
 
-				return saveAssociation(assoc.setAccessor, instance[assoc.name]);
-			})(opts.many_associations[i]);
+		    for (j = 0; j < instance[assoc.name].length; j++) {
+		        if (!instance[assoc.name][j].isInstance) {
+		            instance[assoc.name][j] = new assoc.model(instance[assoc.name][j]);
+		        }
+		    }
+
+		    return saveAssociation(assoc.setAccessor, instance[assoc.name]);
+		};
+
+		for (i = 0; i < opts.many_associations.length; i++) {
+			_saveManyAssociation(opts.many_associations[i]);
 		}
 
 		if (pending === 0) {
@@ -325,7 +331,7 @@ function Instance(Model, opts) {
 		Hook.wait(instance, opts.hooks.beforeRemove, function (err) {
 			if (err) {
 				emitEvent("remove", err, instance);
-				if (typeof cb == "function") {
+				if (typeof cb === "function") {
 					cb(err, instance);
 				}
 				return;
@@ -338,7 +344,7 @@ function Instance(Model, opts) {
 
 				emitEvent("remove", err, instance);
 
-				if (typeof cb == "function") {
+				if (typeof cb === "function") {
 					cb(err, instance);
 				}
 
@@ -394,7 +400,7 @@ function Instance(Model, opts) {
 
 				if (opts.autoSave) {
 					saveInstanceProperty(key, val);
-				} else if (opts.changes.indexOf(key) == -1) {
+				} else if (opts.changes.indexOf(key) === -1) {
 					opts.changes.push(key);
 				}
 			},
@@ -414,7 +420,7 @@ function Instance(Model, opts) {
 
 				/*if (opts.autoSave) {
 					saveInstanceProperty(key, val);
-				}*/if (opts.extrachanges.indexOf(key) == -1) {
+				}*/if (opts.extrachanges.indexOf(key) === -1) {
 					opts.extrachanges.push(key);
 				}
 			},
@@ -422,21 +428,22 @@ function Instance(Model, opts) {
 		});
 	};
 
-	for (var i = 0; i < opts.id.length; i++) {
+	var i, k;
+	for (i = 0; i < opts.id.length; i++) {
 	    if (!opts.data.hasOwnProperty(opts.id[i])) {
 	        addInstanceProperty(opts.id[i]);
 		}
 	}
 
-	for (var k in Model.properties) {
-	    if (Model.properties.hasOwnProperty(k) && !opts.data.hasOwnProperty(k) && opts.id.indexOf(k) == -1) {
+	for (k in Model.properties) {
+	    if (Model.properties.hasOwnProperty(k) && !opts.data.hasOwnProperty(k) && opts.id.indexOf(k) === -1) {
 			opts.data[k] = null;
 		}
 	}
 
 	for (k in opts.data) {
 		if (!opts.data.hasOwnProperty(k)) continue;
-		if (!Model.properties.hasOwnProperty(k) && opts.id.indexOf(k) == -1 && opts.association_properties.indexOf(k) == -1) {
+		if (!Model.properties.hasOwnProperty(k) && opts.id.indexOf(k) === -1 && opts.association_properties.indexOf(k) === -1) {
 			if (!opts.extra.hasOwnProperty(k)) continue;
 
 			if (opts.driver.valueToProperty) {
@@ -561,14 +568,14 @@ function Instance(Model, opts) {
 		enumerable: false
 	});
 
-	for (var i = 0; i < opts.id.length; i++) {
+	for (i = 0; i < opts.id.length; i++) {
 	    if (!opts.data.hasOwnProperty(opts.id[i])) {
 			opts.changes = Object.keys(opts.data);
 			break;
 		}
 	}
 	for (i = 0; i < opts.one_associations.length; i++) {
-		var asc = opts.one_associations[i]
+	    var asc = opts.one_associations[i];
 
 		if (!asc.reversed && !asc.extension) {
 		    for (k in opts.one_associations[i].field) {
diff --git a/lib/Model.js b/lib/Model.js
index 58013843..0d6bf719 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -40,7 +40,7 @@ function Model(opts) {
 
 	var createHookHelper = function (hook) {
 		return function (cb) {
-			if (typeof cb != "function") {
+			if (typeof cb !== "function") {
 				delete opts.hooks[hook];
 			} else {
 				opts.hooks[hook] = cb;
@@ -56,21 +56,21 @@ function Model(opts) {
 		var found_assoc = false, i, k;
 
 		for (k in data) {
-			if (k == "extra_field") continue;
+			if (k === "extra_field") continue;
 			if (opts.properties.hasOwnProperty(k)) continue;
 			if (inst_opts.extra && inst_opts.extra.hasOwnProperty(k)) continue;
 			if (opts.id.indexOf(k) >= 0) continue;
 			if (association_properties.indexOf(k) >= 0) continue;
 
 			for (i = 0; i < one_associations.length; i++) {
-				if (one_associations[i].name == k) {
+				if (one_associations[i].name === k) {
 					found_assoc = true;
 					break;
 				}
 			}
 			if (!found_assoc) {
 				for (i = 0; i < many_associations.length; i++) {
-					if (many_associations[i].name == k) {
+					if (many_associations[i].name === k) {
 						found_assoc = true;
 						break;
 					}
@@ -108,7 +108,7 @@ function Model(opts) {
 		});
 		instance.on("ready", function () {
 			if (--pending > 0) return;
-			if (typeof cb == "function") {
+			if (typeof cb === "function") {
 				return cb(instance);
 			}
 		});
@@ -124,7 +124,7 @@ function Model(opts) {
 				ExtendAssociation.autoFetch(instance, extend_associations, assoc_opts, function () {
 					Hook.wait(instance, opts.hooks.afterAutoFetch, function (err) {
 						if (--pending > 0) return;
-						if (typeof cb == "function") {
+						if (typeof cb === "function") {
 							return cb(instance);
 						}
 					});
@@ -135,36 +135,39 @@ function Model(opts) {
 	};
 
 	var model = function (data) {
-		var instance;
-
-		//TODO: Should be smarter about how this is handled.
-		//      ideally we should check the type of ID used
-		//      by the model, and accept that type of data.
-		if (typeof data == "number" || typeof data == "string") {
-			var data2 = {};
-			data2[opts.id] = data;
-
-			return createInstance(data2, { isShell: true });
-		} else if (typeof data == "undefined") {
-			data = {};
-		}
-
-		var isNew = false;
-
-		for (var k in opts.id) {
-			isNew |= !data.hasOwnProperty(k);
-		}
-
-		return createInstance(data, {
-			is_new        : isNew,
-			autoSave      : opts.autoSave,
-			cascadeRemove : opts.cascadeRemove
-		});
+	    var instance;
+
+	    //TODO: Should be smarter about how this is handled.
+	    //      ideally we should check the type of ID used
+	    //      by the model, and accept that type of data.
+	    if (typeof data === "number" || typeof data === "string") {
+	        var data2 = {};
+	        data2[opts.id] = data;
+
+	        return createInstance(data2, { isShell: true });
+	    } else if (typeof data === "undefined") {
+	        data = {};
+	    }
+
+	    var isNew = false;
+
+	    for (var k in opts.id) {
+	        if (!data.hasOwnProperty(k)) {
+	            isNew = true;
+	            break;
+	        }
+	    }
+
+	    return createInstance(data, {
+	        is_new: isNew,
+	        autoSave: opts.autoSave,
+	        cascadeRemove: opts.cascadeRemove
+	    });
 	};
 
 	// Standardize validations
 	for (var k in opts.validations) {
-		if (typeof opts.validations[k] == 'function') {
+		if (typeof opts.validations[k] === 'function') {
 			opts.validations[k] = [ opts.validations[k] ];
 		}
 	}
@@ -196,7 +199,7 @@ function Model(opts) {
 		if (arguments.length === 0) {
 			cb = function () {};
 		}
-		if (typeof opts.driver.drop == "function") {
+		if (typeof opts.driver.drop === "function") {
 			opts.driver.drop({
 				table             : opts.table,
 				properties        : opts.properties,
@@ -214,7 +217,7 @@ function Model(opts) {
 		if (arguments.length === 0) {
 			cb = function () {};
 		}
-		if (typeof opts.driver.sync == "function") {
+		if (typeof opts.driver.sync === "function") {
 			try {
 				opts.driver.sync({
 					extension           : opts.extension,
@@ -242,19 +245,19 @@ function Model(opts) {
 		var ids        = Array.prototype.slice.apply(arguments);
 		var cb         = ids.pop();
 
-		if (typeof cb != "function") {
+		if (typeof cb !== "function") {
 			throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.get() callback");
 		}
 
-		if (typeof ids[ids.length - 1] == "object" && !Array.isArray(ids[ids.length - 1])) {
+		if (typeof ids[ids.length - 1] === "object" && !Array.isArray(ids[ids.length - 1])) {
 			options = ids.pop();
 		}
 
-		if (ids.length == 1 && Array.isArray(ids[0])) {
+		if (ids.length === 1 && Array.isArray(ids[0])) {
 			ids = ids[0];
 		}
 
-		if (ids.length != opts.id.length) {
+		if (ids.length !== opts.id.length) {
 			throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "Model.get() IDs number missmatch (" + opts.id.length + " needed, " + ids.length + " passed)");
 		}
 
@@ -343,7 +346,7 @@ function Model(opts) {
 					cb = arguments[i];
 					break;
 				case "string":
-					if (arguments[i][0] == "-") {
+					if (arguments[i][0] === "-") {
 						order = [ arguments[i].substr(1), "Z" ];
 					} else {
 						order = [ arguments[i] ];
@@ -405,7 +408,7 @@ function Model(opts) {
 			}
 		});
 
-		if (typeof cb != "function") {
+		if (typeof cb !== "function") {
 			return chain;
 		}
 
@@ -422,7 +425,7 @@ function Model(opts) {
 
 		// extract callback
 		for (var i = 0; i < args.length; i++) {
-			if (typeof args[i] == "function") {
+			if (typeof args[i] === "function") {
 				cb = args.splice(i, 1)[0];
 				break;
 			}
@@ -459,7 +462,7 @@ function Model(opts) {
 			}
 		}
 
-		if (typeof cb != "function") {
+		if (typeof cb !== "function") {
 			throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.count() callback");
 		}
 
@@ -481,7 +484,7 @@ function Model(opts) {
 		var properties = [];
 
 		for (var i = 0; i < arguments.length; i++) {
-			if (typeof arguments[i] == "object") {
+			if (typeof arguments[i] === "object") {
 				if (Array.isArray(arguments[i])) {
 					properties = arguments[i];
 				} else {
@@ -507,13 +510,13 @@ function Model(opts) {
 		var ids = Array.prototype.slice.apply(arguments);
 		var cb  = ids.pop();
 
-		if (typeof cb != "function") {
+		if (typeof cb !== "function") {
 			throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.exists() callback");
 		}
 
 		var conditions = {}, i;
 
-		if (ids.length === 1 && typeof ids[0] == "object") {
+		if (ids.length === 1 && typeof ids[0] === "object") {
 			if (Array.isArray(ids[0])) {
 				for (i = 0; i < opts.id.length; i++) {
 					conditions[opts.id[i]] = ids[0][i];
@@ -573,7 +576,7 @@ function Model(opts) {
 				case "object":
 					if ( !single && Array.isArray(arguments[i]) ) {
 						Instances = Instances.concat(arguments[i]);
-					} else if (i == 0) {
+					} else if (i === 0) {
 						single = true;
 						Instances.push(arguments[i]);
 					} else {
@@ -593,7 +596,7 @@ function Model(opts) {
 
 	model.clear = function (cb) {
 		opts.driver.clear(opts.table, function (err) {
-			if (typeof cb == "function") cb(err);
+			if (typeof cb === "function") cb(err);
 		});
 
 		return this;
diff --git a/lib/ORM.js b/lib/ORM.js
index 30e22c3b..2c6414ba 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -42,7 +42,7 @@ exports.use = function (connection, proto, opts, cb) {
 	if (DriverAliases[proto]) {
 		proto = DriverAliases[proto];
 	}
-	if (typeof opts == "function") {
+	if (typeof opts === "function") {
 		cb = opts;
 		opts = {};
 	}
@@ -51,7 +51,7 @@ exports.use = function (connection, proto, opts, cb) {
 		var Driver   = require("./Drivers/DML/" + proto).Driver;
 		var settings = new Settings.Container(exports.settings.get('*'));
 		var driver   = new Driver(null, connection, {
-			debug    : (opts.query && opts.query.debug == 'true'),
+			debug    : (opts.query && opts.query.debug === 'true'),
 			settings : settings
 		});
 
@@ -65,7 +65,7 @@ exports.connect = function (opts, cb) {
 	if (arguments.length === 0 || !opts) {
 		return ORM_Error(ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "CONNECTION_URL_EMPTY"), cb);
 	}
-	if (typeof opts == "string") {
+	if (typeof opts === "string") {
 		if (opts.replace(/\s+/, "").length === 0) {
 			return ORM_Error(ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "CONNECTION_URL_EMPTY"), cb);
 		}
@@ -114,7 +114,7 @@ exports.connect = function (opts, cb) {
 		db = new ORM(proto, driver, settings);
 
 		driver.connect(function (err) {
-			if (typeof cb == "function") {
+			if (typeof cb === "function") {
 				if (err) {
 					return cb(err);
 				} else {
@@ -125,7 +125,7 @@ exports.connect = function (opts, cb) {
 			db.emit("connect", err, !err ? db : null);
 		});
 	} catch (ex) {
-		if (ex.code == "MODULE_NOT_FOUND" || ex.message.indexOf('find module')) {
+		if (ex.code === "MODULE_NOT_FOUND" || ex.message.indexOf('find module')) {
 			return ORM_Error(ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "CONNECTION_PROTOCOL_NOT_SUPPORTED"), cb);
 		}
 		return ORM_Error(ex, cb);
@@ -153,7 +153,7 @@ function ORM(driver_name, driver, settings) {
 
 	var onError = function (err) {
 		if (this.settings.get("connection.reconnect")) {
-			if (typeof this.driver.reconnect == "undefined") {
+			if (typeof this.driver.reconnect === "undefined") {
 				return this.emit("error", ErrorCodes.generateError(ErrorCodes.CONNECTION_LOST, "Connection lost - driver does not support reconnection"));
 			}
 			this.driver.reconnect(function () {
@@ -175,7 +175,7 @@ function ORM(driver_name, driver, settings) {
 util.inherits(ORM, events.EventEmitter);
 
 ORM.prototype.use = function (plugin_const, opts) {
-	if (typeof plugin_const == "string") {
+	if (typeof plugin_const === "string") {
 		try {
 			plugin_const = require(Utilities.getRealPath(plugin_const));
 		} catch (e) {
@@ -185,7 +185,7 @@ ORM.prototype.use = function (plugin_const, opts) {
 
 	var plugin = new plugin_const(this, opts || {});
 
-	if (typeof plugin.define == "function") {
+	if (typeof plugin.define === "function") {
 		for (var k in this.models) {
 			plugin.define(this.models[k]);
 		}
@@ -196,11 +196,13 @@ ORM.prototype.use = function (plugin_const, opts) {
 	return this;
 };
 ORM.prototype.define = function (name, properties, opts) {
+    var i;
+
 	properties = properties || {};
 	opts       = opts || {};
 
-	for (var i = 0; i < this.plugins.length; i++) {
-		if (typeof this.plugins[i].beforeDefine == "function") {
+	for (i = 0; i < this.plugins.length; i++) {
+		if (typeof this.plugins[i].beforeDefine === "function") {
 			this.plugins[i].beforeDefine(name, properties, opts);
 		}
 	}
@@ -225,8 +227,8 @@ ORM.prototype.define = function (name, properties, opts) {
 		validations    : opts.validations || {}
 	});
 
-	for (var i = 0; i < this.plugins.length; i++) {
-		if (typeof this.plugins[i].define == "function") {
+	for (i = 0; i < this.plugins.length; i++) {
+		if (typeof this.plugins[i].define === "function") {
 			this.plugins[i].define(this.models[name], this);
 		}
 	}
@@ -341,7 +343,7 @@ function ORM_Error(err, cb) {
 
 	Emitter.use = Emitter.define = Emitter.sync = Emitter.load = function () {};
 
-	if (typeof cb == "function") {
+	if (typeof cb === "function") {
 		cb(err);
 	}
 
diff --git a/lib/Property.js b/lib/Property.js
index 31bed7c6..d9de4949 100644
--- a/lib/Property.js
+++ b/lib/Property.js
@@ -1,7 +1,7 @@
 var ErrorCodes = require("./ErrorCodes");
 
 exports.normalize = function (prop, Settings) {
-	if (typeof prop == "function") {
+	if (typeof prop === "function") {
 		switch (prop.name) {
 			case "String":
 				prop = { type: "text" };
@@ -22,7 +22,7 @@ exports.normalize = function (prop, Settings) {
 				prop = { type: "binary" };
 				break;
 		}
-	} else if (typeof prop == "string") {
+	} else if (typeof prop === "string") {
 		var tmp = prop;
 		prop = {};
 		prop.type = tmp;
@@ -30,7 +30,7 @@ exports.normalize = function (prop, Settings) {
 		prop = { type: "enum", values: prop };
 	}
 
-	if ([ "text", "number", "boolean", "date", "enum", "object", "binary", "point" ].indexOf(prop.type) == -1) {
+	if ([ "text", "number", "boolean", "date", "enum", "object", "binary", "point" ].indexOf(prop.type) === -1) {
 		throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Unknown property type: " + prop.type);
 	}
 
diff --git a/lib/Settings.js b/lib/Settings.js
index 26479aa9..5737f948 100644
--- a/lib/Settings.js
+++ b/lib/Settings.js
@@ -40,7 +40,7 @@ function Settings(settings) {
 		},
 		unset: function () {
 			for (var i = 0; i < arguments.length; i++) {
-				if (typeof arguments[i] == "string") {
+				if (typeof arguments[i] === "string") {
 					unset(arguments[i], settings);
 				}
 			}
@@ -53,7 +53,7 @@ function Settings(settings) {
 function set(key, value, obj) {
 	var p = key.indexOf(".");
 
-	if (p == -1) {
+	if (p === -1) {
 		return obj[key] = value;
 	}
 
@@ -67,8 +67,8 @@ function set(key, value, obj) {
 function get(key, def, obj) {
 	var p = key.indexOf(".");
 
-	if (p == -1) {
-		if (key == '*') {
+	if (p === -1) {
+		if (key === '*') {
 			return obj;
 		}
 		return obj.hasOwnProperty(key) ? obj[key] : def;
@@ -84,8 +84,8 @@ function get(key, def, obj) {
 function unset(key, obj) {
 	var p = key.indexOf(".");
 
-	if (p == -1) {
-		if (key == '*') {
+	if (p === -1) {
+		if (key === '*') {
 			return 'reset';
 		} else {
 			delete obj[key];
@@ -97,7 +97,7 @@ function unset(key, obj) {
 		return;
 	}
 
-	if (unset(key.substr(p + 1), obj[key.substr(0, p)]) == 'reset') {
+	if (unset(key.substr(p + 1), obj[key.substr(0, p)]) === 'reset') {
 		obj[key.substr(0, p)] = {};
 	}
 }
diff --git a/lib/Singleton.js b/lib/Singleton.js
index e754483c..c68ec2db 100644
--- a/lib/Singleton.js
+++ b/lib/Singleton.js
@@ -1,7 +1,7 @@
 var map = {};
 
 exports.clear = function (key) {
-	if (typeof key == "string") {
+	if (typeof key === "string") {
 		delete map[key];
 	} else {
 		map = {};
@@ -14,7 +14,7 @@ exports.get = function (key, opts, createCb, returnCb) {
 		return createCb(returnCb);
 	}
 	if (map.hasOwnProperty(key)) {
-		if (opts && opts.save_check && typeof map[key].o.saved == "function" && !map[key].o.saved()) {
+		if (opts && opts.save_check && typeof map[key].o.saved === "function" && !map[key].o.saved()) {
 			// if not saved, don't return it, fetch original from db
 			return createCb(returnCb);
 		} else if (map[key].t !== null && map[key].t <= Date.now()) {
@@ -27,7 +27,7 @@ exports.get = function (key, opts, createCb, returnCb) {
 	createCb(function (value) {
 		map[key] = { // object , timeout
 			o : value,
-			t : (opts && typeof opts.cache == "number" ? Date.now() + (opts.cache * 1000) : null)
+			t : (opts && typeof opts.cache === "number" ? Date.now() + (opts.cache * 1000) : null)
 		};
 		return returnCb(map[key].o);
 	});
diff --git a/lib/Utilities.js b/lib/Utilities.js
index 6e5958bb..fe654ccd 100644
--- a/lib/Utilities.js
+++ b/lib/Utilities.js
@@ -16,8 +16,8 @@
  * ...
  */
 exports.standardizeOrder = function (order) {
-	if (typeof order == "string") {
-		if (order[0] == "-") {
+	if (typeof order === "string") {
+		if (order[0] === "-") {
 			return [ [ order.substr(1), "Z" ] ];
 		}
 		return [ [ order, "A" ] ];
@@ -26,7 +26,7 @@ exports.standardizeOrder = function (order) {
 	var new_order = [], minus;
 
 	for (var i = 0; i < order.length; i++) {
-		minus = (order[i][0] == "-");
+		minus = (order[i][0] === "-");
 
 		if (i < order.length - 1 && [ "A", "Z" ].indexOf(order[i + 1].toUpperCase()) >= 0) {
 			new_order.push([
@@ -79,9 +79,9 @@ exports.checkConditions = function (conditions, one_associations) {
                 
         // F)
         for (i = 0; i < values.length; i++) {
-            if (values[i].isInstance && values[i].model().uid == model.uid) {
-                if (association_fields.length == 1) {
-                    if (typeof conditions[association_fields[0]] == 'undefined')
+            if (values[i].isInstance && values[i].model().uid === model.uid) {
+                if (association_fields.length === 1) {
+                    if (typeof conditions[association_fields[0]] === 'undefined')
                         conditions[association_fields[0]] = values[i][model.id[0]];
                     else if(Array.isArray(conditions[association_fields[0]]))
                         conditions[association_fields[0]].push(values[i][model.id[0]]);
@@ -136,30 +136,30 @@ exports.hasValues = function (obj, keys) {
 };
 
 exports.populateConditions = function (model, fields, source, target, overwrite) {
-	for (var i = 0; i < model.id.length; i++) {
-		if (typeof target[fields[i]] == 'undefined' || overwrite !== false) {
-			target[fields[i]] = source[model.id[i]];
-		} else if (Array.isArray(target[fields[i]])) {
-			target[fields[i]].push(source[model.id[i]]);
-		} else {
-			target[fields[i]] = [target[fields[i]], source[model.id[i]]];
-		}
-	}
-}
+    for (var i = 0; i < model.id.length; i++) {
+        if (typeof target[fields[i]] === 'undefined' || overwrite !== false) {
+            target[fields[i]] = source[model.id[i]];
+        } else if (Array.isArray(target[fields[i]])) {
+            target[fields[i]].push(source[model.id[i]]);
+        } else {
+            target[fields[i]] = [target[fields[i]], source[model.id[i]]];
+        }
+    }
+};
 
 exports.getConditions = function (model, fields, from) {
-	var conditions = {};
+    var conditions = {};
 
-	exports.populateConditions(model, fields, from, conditions);
+    exports.populateConditions(model, fields, from, conditions);
 
-	return conditions;
-}
+    return conditions;
+};
 
 exports.wrapFieldObject = function (obj, model, altName, alternatives) {
 	if (!obj) {
 		var assoc_key = model.settings.get("properties.association_key");
 
-		if (typeof assoc_key == "function") {
+		if (typeof assoc_key === "function") {
 			obj = assoc_key(altName.toLowerCase(), 'id');
 		} else {
 			obj = assoc_key.replace("{name}", altName.toLowerCase())
@@ -188,7 +188,7 @@ exports.formatField = function (model, name, required, reversed) {
 	for (var i = 0; i < keys.length; i++) {
 		if (reversed) {
 			field_name = keys[i];
-		} else if (typeof assoc_key == "function") {
+		} else if (typeof assoc_key === "function") {
 			field_name = assoc_key(name.toLowerCase(), keys[i]);
 		} else {
 			field_name = assoc_key.replace("{name}", name.toLowerCase())
@@ -228,7 +228,7 @@ exports.getRealPath = function (path_str, stack_index) {
 	var path = require("path"); // for now, load here (only when needed)
 	var cwd = process.cwd();
 	var err = new Error();
-	var tmp = err.stack.split(/\r?\n/)[typeof stack_index != "undefined" ? stack_index : 3], m;
+	var tmp = err.stack.split(/\r?\n/)[typeof stack_index !== "undefined" ? stack_index : 3], m;
 
 	if ((m = tmp.match(/^\s*at\s+(.+):\d+:\d+$/)) !== null) {
 		cwd = path.dirname(m[1]);
@@ -238,10 +238,10 @@ exports.getRealPath = function (path_str, stack_index) {
 		cwd = path.dirname(m[1]);
 	}
 
-	if (path_str[0] != path.sep) {
+	if (path_str[0] !== path.sep) {
 		path_str = cwd + "/" + path_str;
 	}
-	if (path_str.substr(-1) == path.sep) {
+	if (path_str.substr(-1) === path.sep) {
 		path_str += "index";
 	}
 
diff --git a/lib/Validators.js b/lib/Validators.js
index f5a54441..cd2b2fbb 100644
--- a/lib/Validators.js
+++ b/lib/Validators.js
@@ -24,7 +24,7 @@ var validators = {
  **/
 validators.equalToProperty = function (name, msg) {
 	return function (v, next, ctx) {
-		if (v == this[name]) return next();
+		if (v === this[name]) return next();
 		return next(msg || 'not-equal-to-property');
 	};
 };
@@ -46,8 +46,8 @@ validators.unique = function () {
 
 	for (k in arguments) {
 		arg = arguments[k];
-		if (typeof arg == 'string') msg = arg;
-		else if (typeof arg == 'object') opts = arg;
+		if (typeof arg === 'string') msg = arg;
+		else if (typeof arg === 'object') opts = arg;
 	}
 
 	return function (v, next, ctx) {
@@ -57,7 +57,7 @@ validators.unique = function () {
 		var chainQuery = function (prop, value) {
 			var query = null;
 
-			if (opts.ignoreCase === true && ctx.model.properties[prop].type == 'text') {
+			if (opts.ignoreCase === true && ctx.model.properties[prop].type === 'text') {
 				query = util.format('LOWER(%s.%s) LIKE LOWER(?)',
 					ctx.model.table, ctx.driver.query.escapeId(prop)
 				);
@@ -76,7 +76,7 @@ validators.unique = function () {
 			if (!records || records.length === 0) {
 				return next();
 			}
-			if (records.length == 1 && records[0][ctx.model.id] === this[ctx.model.id]) {
+			if (records.length === 1 && records[0][ctx.model.id] === this[ctx.model.id]) {
 				return next();
 			}
 			return next(msg || 'not-unique');
@@ -85,7 +85,7 @@ validators.unique = function () {
 		chainQuery(ctx.property, v);
 
 		if (opts.scope) {
-			for (var s in opts.scope) {
+			for (s in opts.scope) {
 				scopeProp = opts.scope[s];
 
 				// In SQL unique index land, NULL values are not considered equal.

From ea5814800b16591af19db9006801d8f13ce668ee Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Tue, 13 Aug 2013 13:40:46 +0200
Subject: [PATCH 0784/1246] Update TypeScript interfaces for Enforce

---
 lib/TypeScript/enforce.d.ts | 46 ++++++++++++++++++++++++++++++++++++-
 lib/TypeScript/orm.d.ts     | 19 ++++++++++++++-
 2 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/lib/TypeScript/enforce.d.ts b/lib/TypeScript/enforce.d.ts
index a02947d5..5f5e84b5 100644
--- a/lib/TypeScript/enforce.d.ts
+++ b/lib/TypeScript/enforce.d.ts
@@ -1,5 +1,49 @@
 declare module enforce {
     export interface EnforceStatic {
-        
+        Enforce(opts: Options): Enforce;
+
+        required(message?: string): Validator;
+        notEmptyString(message?: string): Validator;
+
+        ranges: {
+            number(min: number, max: number, message?: string): Validator;
+            length(min: number, max: number, message?: string): Validator;
+        }
+
+        lists: {
+            inside(list: string[], message?: string): Validator;
+            inside(list: number[], message?: string): Validator;
+            outside(list: string[], message?: string): Validator;
+            outside(list: number[], message?: string): Validator;
+        }
+
+        security: {
+            password(checks: string, message?: string): Validator;
+        }
+
+        patterns: {
+            match(pattern: RegExp, message?: string): Validator;
+            match(pattern: string, modifiers: string, message?: string): Validator;
+            hexString(message?: string): Validator;
+            email(message?: string): Validator;
+            ipv4(message?: string): Validator;
+        }
+    }
+
+    export interface Enforce {        
+        add(property: string, validator: Validator): Enforce;
+        context(): any;
+        context(name: string): any;
+        context(name: string, value: any): Enforce;
+        clear();
+        check(data: any, cb: (errors: Error[]) => void);
+    }
+
+    export interface Options {
+        returnAllErrors: boolean;
+    }
+
+    export interface Validator {
+        (value: any, next: (message?: string) => boolean): boolean;
     }
 }
\ No newline at end of file
diff --git a/lib/TypeScript/orm.d.ts b/lib/TypeScript/orm.d.ts
index 24833282..59d37ccc 100644
--- a/lib/TypeScript/orm.d.ts
+++ b/lib/TypeScript/orm.d.ts
@@ -35,7 +35,24 @@ declare module orm {
     }
 
     export interface ValidatorsStatic {
-
+        required(message?: string): enforce.Validator;
+        notEmptyString(message?: string): enforce.Validator;
+        rangeNumber(min: number, max: number, message?: string): enforce.Validator;
+        rangeLength(min: number, max: number, message?: string): enforce.Validator;
+        insideList(list: string[], message?: string): enforce.Validator;
+        insideList(list: number[], message?: string): enforce.Validator;
+        outsideList(list: string[], message?: string): enforce.Validator;
+        outsideList(list: number[], message?: string): enforce.Validator;
+        password(checks: string, message?: string): enforce.Validator;
+        patterns: {
+            match(pattern: RegExp, message?: string): enforce.Validator;
+            match(pattern: string, modifiers: string, message?: string): enforce.Validator;
+            hexString(message?: string): enforce.Validator;
+            email(message?: string): enforce.Validator;
+            ipv4(message?: string): enforce.Validator;
+        }
+        equalToProperty(name: string, message?: string): enforce.Validator;
+        unique(): enforce.Validator;
     }
 
     export interface SingletonStatic {

From 1cd5668d45dac478442c4bb51ea1169600feea38 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Tue, 13 Aug 2013 18:21:38 +0200
Subject: [PATCH 0785/1246] Update TypeScript interfaces for SQL-Query

---
 lib/TypeScript/orm.d.ts       | 83 ++++++++++++++++++++++++-----------
 lib/TypeScript/sql-query.d.ts | 78 ++++++++++++++++++++++++++++++++
 2 files changed, 135 insertions(+), 26 deletions(-)
 create mode 100644 lib/TypeScript/sql-query.d.ts

diff --git a/lib/TypeScript/orm.d.ts b/lib/TypeScript/orm.d.ts
index 59d37ccc..b78a8df8 100644
--- a/lib/TypeScript/orm.d.ts
+++ b/lib/TypeScript/orm.d.ts
@@ -1,4 +1,5 @@
 /// <reference path="enforce.d.ts"/>
+/// <reference path="sql-query.d.ts"/>
 
 declare module orm {
     export interface ORMStatic {
@@ -7,6 +8,11 @@ declare module orm {
         singleton: SingletonStatic;
         settings: Settings;
 
+        Property: PropertyStatic;
+        Settings: SettingsStatic;
+        ErrorCodes: ErrorCodesStatic;
+        Text: sqlquery.TextStatic;
+
         express(uri: string, options: {
             define: (db: ORM, models: Model[]) => void;
             error: (err: Error) => void;
@@ -56,47 +62,65 @@ declare module orm {
     }
 
     export interface SingletonStatic {
+        clear(key?: string): SingletonStatic;
+        get(key: string, opts: { cache?: any; save_check?: boolean; },
+            createCallback: (object: any) => void,
+            returnCallback: (object: any) => void);
+    }
+
+    export interface SettingsStatic {
+        defaults: () => SettingsStore;
 
+        Container(settings: SettingsStore): Settings;
     }
 
     export interface Settings {
-        defaults: () => Settings;
-        
-        constructor(settings: Settings): {
-            set(key: string, value: any): Settings;
-            get(key: string, def: any): any;
-            unset(...keys: string[]): Settings;
-        }
+        set(key: string, value: any): Settings;
+        get(key: string, def: any): any;
+        unset(...keys: string[]): Settings;
+    }
 
-        properties?: {
-            primary_key?: string;
-            association_key?: string;
-            required?: string;
+    export interface SettingsStore {
+        properties: {
+            primary_key: string;
+            association_key: string;
+            required: string;
         }
 
-        instance?: {
-            cache?: boolean;
-            cacheSaveCheck?: boolean;
-            autoSave?: boolean;
-            autoFetch?: boolean;
-            autoFetchLimit?: number;
-            cascadeRemove?: boolean;
-            returnAllErrors?: boolean;
+        instance: {
+            cache: boolean;
+            cacheSaveCheck: boolean;
+            autoSave: boolean;
+            autoFetch: boolean;
+            autoFetchLimit: number;
+            cascadeRemove: boolean;
+            returnAllErrors: boolean;
         }
 
-        connection?: {
-            reconnect?: boolean;
-            poll?: boolean;
-            debug?: boolean;
+        connection: {
+            reconnect: boolean;
+            poll: boolean;
+            debug: boolean;
         }
     }
 
-    export interface Property {
-
+    export interface PropertyStatic {
+        normalize(property: Function, settings: Settings): ModelProperty;
+        normalize(property: string, settings: Settings): ModelProperty;
+        normalize(property: any[], settings: Settings): ModelProperty;
+        validate(value: any, property: ModelProperty): any;
     }
 
-    export interface ErrorCodes {
+    export interface ErrorCodesStatic {
+        QUERY_ERROR: number;
+        NOT_FOUND: number;
+        NOT_DEFINED: number;
+        NO_SUPPORT: number;
+        MISSING_CALLBACK: number;
+        PARAM_MISSMATCH: number;
+        CONNECTION_LOST: number;
 
+        generateError(code: number, message: string, extra: { [property: string]: any }): Error;
     }
 
     export interface Express {
@@ -268,4 +292,11 @@ declare module orm {
         get(cb: (instances: Instance[]) => any): () => ChainInstance;
         save(cb: (instance: Instance) => any): () => ChainInstance;
     }
+}
+
+declare module enforce {
+    export interface EnforceStatic {
+        equalToProperty(name: string, message?: string): enforce.Validator;
+        unique(): enforce.Validator;
+    }
 }
\ No newline at end of file
diff --git a/lib/TypeScript/sql-query.d.ts b/lib/TypeScript/sql-query.d.ts
new file mode 100644
index 00000000..18a053cd
--- /dev/null
+++ b/lib/TypeScript/sql-query.d.ts
@@ -0,0 +1,78 @@
+declare module sqlquery {
+    export interface QueryStatic {
+        Query(dialect: string): Query;
+        Query(options: {
+            dialect: string;
+        }): Query;
+        Text(type: string): TextQuery;
+
+        Comparators: string[];
+        between(a: number, b: number): Comparator;
+        not_between(a: number, b: number): Comparator;
+        like(expression: string): Comparator;
+        eq(value: any): Comparator;
+        ne(value: any): Comparator;
+        gt(value: any): Comparator;
+        gte(value: any): Comparator;
+        lt(value: any): Comparator;
+        lte(value: any): Comparator;
+    }
+
+    export interface Query {
+        escapeId(id: string): string;
+        escapeId(id: string, table: string): string;
+        escapeVal(value: any): string;
+        select(): SelectQuery;
+        insert(): InsertQuery;
+        update(): UpdateQuery;
+        remove(): RemoveQuery;
+    }
+
+    export interface Comparator {
+        sql_comparator(): string;
+        from?: any;
+        to?: any;
+        expr?: string;
+        value?: any;
+    }
+
+    export interface TextQuery {
+        data: any;
+        type: string;
+    }
+
+    export interface SelectQuery {
+        select(fields: string): SelectQuery;
+        calculateFoundRows: SelectQuery;
+        as(alias: string): SelectQuery;
+        fun(fun: string, column: string, alias: string): SelectQuery;
+        from(table: string, from_id: string, to_id: string): SelectQuery;
+        from(table: string, from_id: string, to_table: string, to_id: string): SelectQuery;
+        where(...args: any[]): SelectQuery;
+        whereExists(table: string, table_link: string, link: string, conditions: { [column: string]: any }): SelectQuery;
+        groupBy(...columns: string[]): SelectQuery;
+        offset(offset: number): SelectQuery;
+        limit(limit: number): SelectQuery;
+        order(column: string, direction: string): SelectQuery;
+        build(): string;
+    }
+
+    export interface InsertQuery {
+        into(table: string): InsertQuery;
+        set(values: { [key: string]: any }[]): InsertQuery;
+        build(): string;
+    }
+
+    export interface UpdateQuery {
+        into(table: string): UpdateQuery;
+        set(values: { [column: string]: any }): UpdateQuery;
+        where(...conditions: { [column: string]: any }[]): UpdateQuery;
+        build(): string;
+    }
+
+    export interface RemoveQuery {
+        from(table: string): RemoveQuery;
+        where(...conditions: { [column: string]: any }[]): RemoveQuery;
+        build(): string;
+    }
+}

From 0516c6ff34f3e1f7d0c5a42793bb7e5bf1388410 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Tue, 13 Aug 2013 23:22:34 +0200
Subject: [PATCH 0786/1246] Fix race condition in Instance.saveAssociations

---
 lib/Instance.js                        | 4 ++--
 test/integration/association-hasone.js | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 56973ee0..06635677 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -219,7 +219,7 @@ function Instance(Model, opts) {
 		});
 	};
 	var saveAssociations = function (cb) {
-		var pending = 0, errored = false, i, j;
+		var pending = 1, errored = false, i, j;
 		var saveAssociation = function (accessor, instances) {
 			pending += 1;
 
@@ -283,7 +283,7 @@ function Instance(Model, opts) {
 			_saveManyAssociation(opts.many_associations[i]);
 		}
 
-		if (pending === 0) {
+		if (--pending === 0) {
 			return cb();
 		}
 	};
diff --git a/test/integration/association-hasone.js b/test/integration/association-hasone.js
index 5c197ee8..d283f419 100644
--- a/test/integration/association-hasone.js
+++ b/test/integration/association-hasone.js
@@ -236,7 +236,6 @@ describe("hasOne", function() {
 
 						leaf.save( function (err) {
 							should.not.exist(err);
-
 							done();
 						});
 					});

From d8dee0a2ea249ed338fc5b47ce535831690daead Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Tue, 13 Aug 2013 23:42:55 +0200
Subject: [PATCH 0787/1246] Fix infinite loop in save (#279)

---
 lib/Instance.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 06635677..d24361b4 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -118,9 +118,12 @@ function Instance(Model, opts) {
 					}
 
 					if (opts.changes.length === 0) {
-						return saveAssociations(function (err) {
-							return afterSave(cb, false, err);
-						});
+					    if (saveOptions.saveAssociations === false) {
+					        return saveInstanceExtra(cb);
+					    }
+					    return saveAssociations(function (err) {
+					        return afterSave(cb, false, err);
+					    });
 					}
 
 					return savePersisted(cb, saveOptions, getInstanceData());

From 9aaa50cc47c42c31210a65cd8e683008bd851d1b Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Tue, 13 Aug 2013 23:45:39 +0200
Subject: [PATCH 0788/1246] Fix unique validator (#288)

Shouldn't check undefined and null values, since ORM uses these as
defaults and it can lead to failed validations regardless of passed
values.
---
 lib/Validators.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/Validators.js b/lib/Validators.js
index cd2b2fbb..49ec514d 100644
--- a/lib/Validators.js
+++ b/lib/Validators.js
@@ -36,6 +36,9 @@ validators.equalToProperty = function (name, msg) {
  * Due to the async nature of node, and concurrent web server environments,
  * an index on the database column is the only way to gurantee uniqueness.
  *
+ * For sensibility's sake, undefined and null values are ignored for uniqueness
+ * checks.
+ *
  * Options:
  *   ignoreCase: for postgres; mysql ignores case by default.
  *   scope: (Array) scope uniqueness to listed properties
@@ -51,7 +54,10 @@ validators.unique = function () {
 	}
 
 	return function (v, next, ctx) {
-		var s, scopeProp;
+	    var s, scopeProp;
+
+	    if (typeof v === 'undefined' || v === null) return next();
+
 		var chain = ctx.model.find();
 
 		var chainQuery = function (prop, value) {
@@ -89,7 +95,7 @@ validators.unique = function () {
 				scopeProp = opts.scope[s];
 
 				// In SQL unique index land, NULL values are not considered equal.
-				if (ctx.instance[scopeProp] === undefined || ctx.instance[scopeProp] === null) {
+				if (typeof ctx.instance[scopeProp] == 'undefined' || ctx.instance[scopeProp] === null) {
 					return next();
 				}
 

From de51f9a7494472a1bf3d7c2480dbae39031a292c Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Tue, 13 Aug 2013 23:48:14 +0200
Subject: [PATCH 0789/1246] Disabled hasone validation test (impossible to
 pass)

---
 test/integration/association-hasone.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/test/integration/association-hasone.js b/test/integration/association-hasone.js
index d283f419..7aa53dc2 100644
--- a/test/integration/association-hasone.js
+++ b/test/integration/association-hasone.js
@@ -244,6 +244,13 @@ describe("hasOne", function() {
 		});
 	});
 
+    /**
+     * DISABLED:    Impossible for this test to pass given the validation constraints
+     *              provided, unless we update enforce to allow an "orUndefined" validator
+     *              extension.
+     */
+
+    /*
 	describe("validations", function () {
 		before(setup({validations: { stalkId: ORM.validators.rangeNumber(undefined, 50) }}));
 
@@ -262,6 +269,7 @@ describe("hasOne", function() {
 			});
 		});
 	});
+    */
 
 	describe("if not passing another Model", function () {
 		it("should use same model", function (done) {

From b20089e79c07da659f6170405eeddd9b88b96243 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Tue, 13 Aug 2013 23:53:53 +0200
Subject: [PATCH 0790/1246] Added MongoDB to test/config.example.js

---
 test/config.example.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/config.example.js b/test/config.example.js
index d026fb7a..0ee738b3 100644
--- a/test/config.example.js
+++ b/test/config.example.js
@@ -17,3 +17,7 @@ exports.postgres = {
 	password : "",
 	database : "test"
 };
+exports.mongodb = {
+    host: "localhost",
+    database: "test"
+};
\ No newline at end of file

From 8a7f8b2f623def9219defd161305c8fb63b4a671 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Wed, 14 Aug 2013 00:07:56 +0200
Subject: [PATCH 0791/1246] Add Driver.isSql Property

Allows us to check whether or not a driver supports SQL queries, for
instances where we create domain specific functionality (e.g. the
current unique() validator).
---
 lib/Drivers/DML/mongodb.js  | 4 ++++
 lib/Drivers/DML/mysql.js    | 6 +++++-
 lib/Drivers/DML/postgres.js | 4 ++++
 lib/Drivers/DML/sqlite.js   | 4 ++++
 lib/Validators.js           | 3 +++
 5 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
index a41d7dad..2c015425 100644
--- a/lib/Drivers/DML/mongodb.js
+++ b/lib/Drivers/DML/mongodb.js
@@ -410,3 +410,7 @@ function convertToDBVal(key, value) {
 
 	return value;
 }
+
+Object.defineProperty(Driver.prototype, "isSql", {
+    value: false
+});
\ No newline at end of file
diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 47f4eaee..b37c54ba 100755
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -21,7 +21,7 @@ function Driver(config, connection, opts) {
 	                             "ACOS", "ASIN", "ATAN", "COS", "SIN", "TAN",
 	                             "CONV", [ "RANDOM", "RAND" ], "RADIANS", "DEGREES",
 	                             "SUM", "COUNT",
-	                             "DISTINCT" ];
+	                             "DISTINCT"];
 }
 
 Driver.prototype.sync = function (opts, cb) {
@@ -252,3 +252,7 @@ Driver.prototype.propertyToValue = function (value, property) {
 			return value;
 	}
 };
+
+Object.defineProperty(Driver.prototype, "isSql", {
+    value: true
+});
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index cdda4318..2929d214 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -276,3 +276,7 @@ Driver.prototype.propertyToValue = function (value, property) {
 			return value;
 	}
 };
+
+Object.defineProperty(Driver.prototype, "isSql", {
+    value: true
+});
\ No newline at end of file
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 1edf1f17..77eba4da 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -278,3 +278,7 @@ Driver.prototype.propertyToValue = function (value, property) {
 			return value;
 	}
 };
+
+Object.defineProperty(Driver.prototype, "isSql", {
+    value: true
+});
diff --git a/lib/Validators.js b/lib/Validators.js
index 49ec514d..563c3c19 100644
--- a/lib/Validators.js
+++ b/lib/Validators.js
@@ -58,6 +58,9 @@ validators.unique = function () {
 
 	    if (typeof v === 'undefined' || v === null) return next();
 
+        //Cannot process on database engines which don't support SQL syntax
+	    if (!ctx.driver.isSql) return next('not-supported');
+
 		var chain = ctx.model.find();
 
 		var chainQuery = function (prop, value) {

From 6fba50122203608e1b42dfcfb04ac8fa3944fad3 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Wed, 14 Aug 2013 00:09:45 +0200
Subject: [PATCH 0792/1246] Prevent MongoDB from running some more tests

---
 test/integration/predefined-validators.js | 4 ++++
 test/integration/validation.js            | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/integration/predefined-validators.js b/test/integration/predefined-validators.js
index 514df2fc..cfccb3ae 100644
--- a/test/integration/predefined-validators.js
+++ b/test/integration/predefined-validators.js
@@ -1,6 +1,8 @@
 var should     = require('should');
 var helper     = require('../support/spec_helper');
 var validators = require('../../').validators;
+var common = require('../common');
+var protocol = common.protocol().toLowerCase();
 var undef      = undefined;
 
 function checkValidation(done, expected) {
@@ -26,6 +28,8 @@ describe("Predefined Validators", function () {
 	});
 
 	describe("unique()", function () {
+	    if (protocol === "mongodb") return;
+
 		var db = null;
 		var Person = null;
 
diff --git a/test/integration/validation.js b/test/integration/validation.js
index f64e667d..30de4ef2 100644
--- a/test/integration/validation.js
+++ b/test/integration/validation.js
@@ -58,7 +58,9 @@ describe("Validations", function() {
 			});
 		});
 
-		describe("unique", function() {
+		describe("unique", function () {
+		    if (protocol === "mongodb") return;
+
 			var Product = null;
 
 			var setupUnique = function (ignoreCase, scope, msg) {

From cf97f8d3cf0671d154c63eca5a6971908cc5466d Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Wed, 14 Aug 2013 00:10:39 +0200
Subject: [PATCH 0793/1246] Fix MongoDB test failure in hasOne-reverse

---
 test/integration/association-hasone-reverse.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/association-hasone-reverse.js b/test/integration/association-hasone-reverse.js
index 8304d039..6e0bf89b 100644
--- a/test/integration/association-hasone-reverse.js
+++ b/test/integration/association-hasone-reverse.js
@@ -131,7 +131,7 @@ describe("hasOne", function () {
 	                    Deco.setOwner(John, function (err) {
 	                        should.not.exist(err);
 
-	                        Person.find({ pet_id: Deco.id }).first(function (err, owner) {
+	                        Person.find({ pet_id: Deco[Pet.id[0]] }).first(function (err, owner) {
 	                            should.not.exist(err);
 	                            should.exist(owner);
 	                            should.equal(owner.name, John.name);

From fd0bba5611cd75c965257281e23980871b3b63e4 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Wed, 14 Aug 2013 00:42:43 +0200
Subject: [PATCH 0794/1246] Update TypeScript Interfaces

Added association method definitions
---
 lib/TypeScript/orm.d.ts | 62 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 60 insertions(+), 2 deletions(-)

diff --git a/lib/TypeScript/orm.d.ts b/lib/TypeScript/orm.d.ts
index b78a8df8..60ff566a 100644
--- a/lib/TypeScript/orm.d.ts
+++ b/lib/TypeScript/orm.d.ts
@@ -11,7 +11,7 @@ declare module orm {
         Property: PropertyStatic;
         Settings: SettingsStatic;
         ErrorCodes: ErrorCodesStatic;
-        Text: sqlquery.TextStatic;
+        Text: sqlquery.TextQuery;
 
         express(uri: string, options: {
             define: (db: ORM, models: Model[]) => void;
@@ -171,7 +171,55 @@ declare module orm {
         create(values: InstanceProperties, cb: (err: Error, newInstance: Instance) => void): Model;
         create(values: InstanceProperties[], cb: (err: Error, newInstance: Instance) => void): Model;
 
-        clear(cb: (err: Error) => void): Model; 
+        clear(cb: (err: Error) => void): Model;
+
+        hasOne(name: string, model: Model, options: {
+            autoFetch?: boolean;
+            autoFetchLimit?: number;
+            field?: string;
+            reverse?: string;
+            accessor?: string;
+            reverseAccessor?: string;
+            required?: boolean;
+            getAccessor?: string;
+            setAccessor?: string;
+            hasAccessor?: string;
+            delAccessor?: string;
+        }): Association;
+
+        extendsTo(name: string, properties: ModelProperties, options: {
+            autoFetch?: boolean;
+            autoFetchLimit?: number;
+            field?: string;
+            table?: string;
+            required?: boolean;
+            getAccessor?: string;
+            setAccessor?: string;
+            hasAccessor?: string;
+            delAccessor?: string;
+            cache?: boolean;
+            autoSave?: boolean;
+            cascadeRemove?: boolean;
+            hooks?: { [hook: string]: (cb?: () => void) => void; };
+            methods?: { [name: string]: Function; };
+            validations?: { [property: string]: enforce.Validator[];[property: string]: enforce.Validator; };
+        }): Model;
+
+        hasMany(name: string, model: Model, properties: ModelProperties, options: {
+            autoFetch?: boolean;
+            autoFetchLimit?: number;
+            accessor?: string;
+            reverse?: string;
+            field?: string[];
+            mergeTable?: string;
+            mergeId?: string[];
+            mergeAssocId?: string[];
+            getAccessor?: string;
+            setAccessor?: string;
+            hasAccessor?: string;
+            delAccessor?: string;
+            addAccessor?: string;
+        }): Association;
     }
 
     export interface ModelProperties {
@@ -292,6 +340,16 @@ declare module orm {
         get(cb: (instances: Instance[]) => any): () => ChainInstance;
         save(cb: (instance: Instance) => any): () => ChainInstance;
     }
+
+    export interface Association {
+        prepare(model: Model, associations: Association[], association_properties: string[], model_fields: string[]);
+        extend(model: Model, instance: Instance, driver: Driver, associations: Association[], options: {});
+        autoFetch(instance: Instance, associations: Association[], options: {}, cb: () => void);
+    }
+
+    export interface Driver {
+
+    }
 }
 
 declare module enforce {

From 396b3f16d7beb938a3dfc3798dbf08748a1e67ce Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 14 Aug 2013 20:22:46 +1000
Subject: [PATCH 0795/1246] Fix == and add+re-enable test

---
 lib/Instance.js                        |  2 +-
 test/integration/association-hasone.js | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index d24361b4..c98f74f4 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -75,7 +75,7 @@ function Instance(Model, opts) {
 						}
 					}
 				}
-				if (!required && instance[k] === null) {
+				if (!required && instance[k] == null) {
 					continue; // avoid validating if property is not required and is "empty"
 				}
 				for (i = 0; i < opts.validations[k].length; i++) {
diff --git a/test/integration/association-hasone.js b/test/integration/association-hasone.js
index 7aa53dc2..af3d1529 100644
--- a/test/integration/association-hasone.js
+++ b/test/integration/association-hasone.js
@@ -230,7 +230,7 @@ describe("hasOne", function() {
 					});
 				});
 
-				it("shouldn't cause an infinite loop when getting and saving", function (done) {
+				it("shouldn't cause an infinite loop when getting and saving with no changes", function (done) {
 					Leaf.get(leafId, function (err, leaf) {
 						should.not.exist(err);
 
@@ -240,17 +240,21 @@ describe("hasOne", function() {
 						});
 					});
 				});
+
+				it("shouldn't cause an infinite loop when getting and saving with changes", function (done) {
+					Leaf.get(leafId, function (err, leaf) {
+						should.not.exist(err);
+
+						leaf.save({ size: 14 }, function (err) {
+							should.not.exist(err);
+							done();
+						});
+					});
+				});
 			});
 		});
 	});
 
-    /**
-     * DISABLED:    Impossible for this test to pass given the validation constraints
-     *              provided, unless we update enforce to allow an "orUndefined" validator
-     *              extension.
-     */
-
-    /*
 	describe("validations", function () {
 		before(setup({validations: { stalkId: ORM.validators.rangeNumber(undefined, 50) }}));
 
@@ -269,7 +273,6 @@ describe("hasOne", function() {
 			});
 		});
 	});
-    */
 
 	describe("if not passing another Model", function () {
 		it("should use same model", function (done) {

From de09f7d86b28972ee2dadf8ff4ca30d53547a8ad Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 14 Aug 2013 20:42:37 +1000
Subject: [PATCH 0796/1246] Spaces -> tabs

---
 lib/Utilities.js | 119 ++++++++++++++++++++++++-----------------------
 1 file changed, 60 insertions(+), 59 deletions(-)

diff --git a/lib/Utilities.js b/lib/Utilities.js
index fe654ccd..89c910d1 100644
--- a/lib/Utilities.js
+++ b/lib/Utilities.js
@@ -54,53 +54,54 @@ exports.standardizeOrder = function (order) {
  * F) Itterate through values for the condition, only accept instances of the same type as the association
  */
 exports.checkConditions = function (conditions, one_associations) {
-    var k, i, j;
-
-    // A)
-    var associations = {};
-    for (i = 0; i < one_associations.length; i++) {
-        associations[one_associations[i].name] = one_associations[i];
-    }
-
-    for (k in conditions) {
-        // B)
-        if (!associations.hasOwnProperty(k)) continue;
-
-        // C)
-        var values = conditions[k];
-        if (!Array.isArray(values)) values = [values];
-
-        // D)
-        delete conditions[k];
-
-        // E)
-        var association_fields = Object.keys(associations[k].field);
-        var model = associations[k].model;
-                
-        // F)
-        for (i = 0; i < values.length; i++) {
-            if (values[i].isInstance && values[i].model().uid === model.uid) {
-                if (association_fields.length === 1) {
-                    if (typeof conditions[association_fields[0]] === 'undefined')
-                        conditions[association_fields[0]] = values[i][model.id[0]];
-                    else if(Array.isArray(conditions[association_fields[0]]))
-                        conditions[association_fields[0]].push(values[i][model.id[0]]);
-                    else
-                        conditions[association_fields[0]] = [conditions[association_fields[0]], values[i][model.id[0]]];
-                } else {
-                    var _conds = {};
-                    for (j = 0; j < association_fields.length; i++) {
-                        _conds[association_fields[j]] = values[i][model.id[j]];
-                    }
-
-                    conditions.or = conditions.or || [];
-                    conditions.or.push(_conds);
-                }
-            }
-        }
-    }
-    
-    return conditions;
+	var k, i, j;
+
+	// A)
+	var associations = {};
+	for (i = 0; i < one_associations.length; i++) {
+		associations[one_associations[i].name] = one_associations[i];
+	}
+
+	for (k in conditions) {
+		// B)
+		if (!associations.hasOwnProperty(k)) continue;
+
+		// C)
+		var values = conditions[k];
+		if (!Array.isArray(values)) values = [values];
+
+		// D)
+		delete conditions[k];
+
+		// E)
+		var association_fields = Object.keys(associations[k].field);
+		var model = associations[k].model;
+
+		// F)
+		for (i = 0; i < values.length; i++) {
+			if (values[i].isInstance && values[i].model().uid === model.uid) {
+				if (association_fields.length === 1) {
+					if (typeof conditions[association_fields[0]] === 'undefined') {
+						conditions[association_fields[0]] = values[i][model.id[0]];
+					} else if(Array.isArray(conditions[association_fields[0]])) {
+						conditions[association_fields[0]].push(values[i][model.id[0]]);
+					} else {
+						conditions[association_fields[0]] = [conditions[association_fields[0]], values[i][model.id[0]]];
+					}
+				} else {
+					var _conds = {};
+					for (j = 0; j < association_fields.length; i++) {
+						_conds[association_fields[j]] = values[i][model.id[j]];
+					}
+
+					conditions.or = conditions.or || [];
+					conditions.or.push(_conds);
+				}
+			}
+		}
+	}
+
+	return conditions;
 };
 
 /**
@@ -136,23 +137,23 @@ exports.hasValues = function (obj, keys) {
 };
 
 exports.populateConditions = function (model, fields, source, target, overwrite) {
-    for (var i = 0; i < model.id.length; i++) {
-        if (typeof target[fields[i]] === 'undefined' || overwrite !== false) {
-            target[fields[i]] = source[model.id[i]];
-        } else if (Array.isArray(target[fields[i]])) {
-            target[fields[i]].push(source[model.id[i]]);
-        } else {
-            target[fields[i]] = [target[fields[i]], source[model.id[i]]];
-        }
-    }
+	for (var i = 0; i < model.id.length; i++) {
+		if (typeof target[fields[i]] === 'undefined' || overwrite !== false) {
+			target[fields[i]] = source[model.id[i]];
+		} else if (Array.isArray(target[fields[i]])) {
+			target[fields[i]].push(source[model.id[i]]);
+		} else {
+			target[fields[i]] = [target[fields[i]], source[model.id[i]]];
+		}
+	}
 };
 
 exports.getConditions = function (model, fields, from) {
-    var conditions = {};
+	var conditions = {};
 
-    exports.populateConditions(model, fields, from, conditions);
+	exports.populateConditions(model, fields, from, conditions);
 
-    return conditions;
+	return conditions;
 };
 
 exports.wrapFieldObject = function (obj, model, altName, alternatives) {

From 556550ed05b8c511d4344fd41d5643887750df32 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Fri, 16 Aug 2013 09:08:38 +1000
Subject: [PATCH 0797/1246] Add custom sql query doco

#290
---
 Readme.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Readme.md b/Readme.md
index af12de19..785707bd 100755
--- a/Readme.md
+++ b/Readme.md
@@ -472,6 +472,13 @@ a few examples to describe it:
 { col1: orm.like(12 + "%") } // `col1` like '12%'
 ```
 
+#### Raw queries
+
+Note: This may change in future.
+```js
+db.driver.execQuery("SELECT id, email FROM user", function (err, data) { ... })
+```
+
 ### Caching & Integrity
 
 Model instances are cached. If multiple different queries will result in the same result, you will

From 626f920643466cc5b517e5f4cfb318ab660e7cf8 Mon Sep 17 00:00:00 2001
From: Kyle Van Wagenen <kvanwagenen@gmail.com>
Date: Sun, 18 Aug 2013 00:40:03 -0600
Subject: [PATCH 0798/1246] Added fix for saving of Instance.extra fields.

---
 lib/Instance.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index c98f74f4..d0a95b7d 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -312,7 +312,7 @@ function Instance(Model, opts) {
 			}
 		}
 
-		for (i = 0; i < opts.extra_info.id; i++) {
+		for (i = 0; i < opts.extra_info.id.length; i++) {
 		    conditions[opts.extra_info.id_prop[i]] = opts.extra_info.id[i];
 		    conditions[opts.extra_info.assoc_prop[i]] = opts.data[opts.id[i]];
 		}

From e87bdd66bdc3c845e11f06d9b91efe688bdeaef3 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Sun, 18 Aug 2013 18:36:48 +0200
Subject: [PATCH 0799/1246] Update TypeScript definitions

---
 lib/TypeScript/.gitignore     |   1 +
 lib/TypeScript/enforce.d.ts   |  49 ----
 lib/TypeScript/orm.d.ts       | 514 +++++++++++++---------------------
 lib/TypeScript/sql-query.d.ts |  32 +--
 4 files changed, 213 insertions(+), 383 deletions(-)
 create mode 100644 lib/TypeScript/.gitignore
 delete mode 100644 lib/TypeScript/enforce.d.ts

diff --git a/lib/TypeScript/.gitignore b/lib/TypeScript/.gitignore
new file mode 100644
index 00000000..cf94f6d9
--- /dev/null
+++ b/lib/TypeScript/.gitignore
@@ -0,0 +1 @@
+node.d.ts
\ No newline at end of file
diff --git a/lib/TypeScript/enforce.d.ts b/lib/TypeScript/enforce.d.ts
deleted file mode 100644
index 5f5e84b5..00000000
--- a/lib/TypeScript/enforce.d.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-declare module enforce {
-    export interface EnforceStatic {
-        Enforce(opts: Options): Enforce;
-
-        required(message?: string): Validator;
-        notEmptyString(message?: string): Validator;
-
-        ranges: {
-            number(min: number, max: number, message?: string): Validator;
-            length(min: number, max: number, message?: string): Validator;
-        }
-
-        lists: {
-            inside(list: string[], message?: string): Validator;
-            inside(list: number[], message?: string): Validator;
-            outside(list: string[], message?: string): Validator;
-            outside(list: number[], message?: string): Validator;
-        }
-
-        security: {
-            password(checks: string, message?: string): Validator;
-        }
-
-        patterns: {
-            match(pattern: RegExp, message?: string): Validator;
-            match(pattern: string, modifiers: string, message?: string): Validator;
-            hexString(message?: string): Validator;
-            email(message?: string): Validator;
-            ipv4(message?: string): Validator;
-        }
-    }
-
-    export interface Enforce {        
-        add(property: string, validator: Validator): Enforce;
-        context(): any;
-        context(name: string): any;
-        context(name: string, value: any): Enforce;
-        clear();
-        check(data: any, cb: (errors: Error[]) => void);
-    }
-
-    export interface Options {
-        returnAllErrors: boolean;
-    }
-
-    export interface Validator {
-        (value: any, next: (message?: string) => boolean): boolean;
-    }
-}
\ No newline at end of file
diff --git a/lib/TypeScript/orm.d.ts b/lib/TypeScript/orm.d.ts
index 60ff566a..ddb894a1 100644
--- a/lib/TypeScript/orm.d.ts
+++ b/lib/TypeScript/orm.d.ts
@@ -1,117 +1,104 @@
-/// <reference path="enforce.d.ts"/>
-/// <reference path="sql-query.d.ts"/>
+/// <reference path="node.d.ts" />
+/// <reference path="sql-query.d.ts" />
+
+import http = require('http');
 
 declare module orm {
-    export interface ORMStatic {
-        validators: ValidatorsStatic;
-        enforce: enforce.EnforceStatic;
-        singleton: SingletonStatic;
+    export class ORM extends EventEmitter {
+        validators: enforce;
+        enforce: enforce;
         settings: Settings;
+        driver_name: string;
+        driver: any;
+        tools: any;
+        models: { [key: string]: Model };
+        plugins: Plugin[];
 
-        Property: PropertyStatic;
-        Settings: SettingsStatic;
-        ErrorCodes: ErrorCodesStatic;
-        Text: sqlquery.TextQuery;
-
-        express(uri: string, options: {
-            define: (db: ORM, models: Model[]) => void;
-            error: (err: Error) => void;
-        }): Express;
-
-        express(database: ConnectionOptions, options: {
-            define: (db: ORM, models: Model[]) => void;
-            error: (err: Error) => void;
-        }): Express;
-
-        use(connection: Connection, proto: string, opts: ConnectionOptions, cb: (err: Error, orm: ORM) => void): void;
-        connect(opts: ConnectionOptions, cb: (err: Error, orm: ORM) => void): Error;
-    }
-
-    export interface ORM {
         use(plugin: string, options?: any): ORM;
-        use(plugin: ORMPlugin, options?: any): ORM;
-        define(name: string, properties: ModelProperties, options: ModelOptions): Model;
-        ping(cb: (err: Error) => void);
-        close(cb: (err: Error) => void);
-        load(file: string, cb: (err: Error) => void): any;
-        sync(cb: (err?: Error) => void): ORM;
-        drop(cb: (err?: Error) => void): ORM;
-
-        //serial(args...: any[]): ORM;
-    }
-
-    export interface ValidatorsStatic {
-        required(message?: string): enforce.Validator;
-        notEmptyString(message?: string): enforce.Validator;
-        rangeNumber(min: number, max: number, message?: string): enforce.Validator;
-        rangeLength(min: number, max: number, message?: string): enforce.Validator;
-        insideList(list: string[], message?: string): enforce.Validator;
-        insideList(list: number[], message?: string): enforce.Validator;
-        outsideList(list: string[], message?: string): enforce.Validator;
-        outsideList(list: number[], message?: string): enforce.Validator;
-        password(checks: string, message?: string): enforce.Validator;
-        patterns: {
-            match(pattern: RegExp, message?: string): enforce.Validator;
-            match(pattern: string, modifiers: string, message?: string): enforce.Validator;
-            hexString(message?: string): enforce.Validator;
-            email(message?: string): enforce.Validator;
-            ipv4(message?: string): enforce.Validator;
-        }
-        equalToProperty(name: string, message?: string): enforce.Validator;
-        unique(): enforce.Validator;
-    }
-
-    export interface SingletonStatic {
-        clear(key?: string): SingletonStatic;
-        get(key: string, opts: { cache?: any; save_check?: boolean; },
-            createCallback: (object: any) => void,
-            returnCallback: (object: any) => void);
+        use(plugin: Plugin, options?: any): ORM;
+
+        define(name: string, properties: { [key: string]: Property }, opts?: ModelOptions): Model;
+        ping(callback: (err: Error) => void): ORM;
+        close(callback: (err: Error) => void): ORM;
+        load(file: string, callback: (err: Error) => void): any;
+        sync(callback: (err: Error) => void): ORM;
+        drop(callback: (err: Error) => void): ORM;
+    }
+
+    export class enforce {
+        static required(message?: string);    
+        static notEmptyString(message?: string);
+        static rangeNumber(min: number, max: number, message?: string);
+        static rangeLength(min: number, max: number, message?: string);
+        static insideList(inside: string[], message?: string);
+        static insideList(inside: number[], message?: string);
+        static outsideList(outside: string[], message?: string);
+        static outsideList(outside: number[], message?: string);
+        static password(conditions?: string, message?: string);
+        static patterns(expr: RegExp, message?: string);
+        static patterns(expr: string, flags: string, message?: string);
+        static equalToProperty(name: string, message?: string);
+        static unique(message?: string);
+        static unique(opts: { ignoreCase: boolean }, message?: string);
     }
+    
+    export function equalToProperty(name: string, message?: string);
+    export function unique(message?: string);
+    export function unique(opts: { ignoreCase: boolean }, message?: string);
+    
+    export class singleton {
+        static clear(key?: string): singleton;
+        static get(key, opts: {
+            cache?: any;
+            save_check?: boolean;
+        }, createCb: Function, returnCb: Function);
+    }
+
+    export class Settings {
+        static Container: any;
+
+        static defaults(): {
+            properties: {
+                primary_key: string;
+                association_key: string;
+                required: boolean;
+            };
+
+            instance: {
+                cache: boolean;
+                cacheSaveCheck: boolean;
+                autoSave: boolean;
+                autoFetch: boolean;
+                autoFetchLimit: number;
+                cascadeRemove: boolean;
+                returnAllErrors: boolean;
+            };
+
+            connection: {
+                reconnect: boolean;
+                poll: boolean;
+                debug: boolean;
+            };
+        };
 
-    export interface SettingsStatic {
-        defaults: () => SettingsStore;
-
-        Container(settings: SettingsStore): Settings;
-    }
+        constructor(settings: any);
 
-    export interface Settings {
-        set(key: string, value: any): Settings;
-        get(key: string, def: any): any;
-        unset(...keys: string[]): Settings;
+        //[key: string]: {
+        //    get: (key, def) => any;
+        //    set: (key, value) => Settings;
+        //    unset: (...keys: string[]) => Settings;
+        //}
+    
     }
 
-    export interface SettingsStore {
-        properties: {
-            primary_key: string;
-            association_key: string;
-            required: string;
-        }
-
-        instance: {
-            cache: boolean;
-            cacheSaveCheck: boolean;
-            autoSave: boolean;
-            autoFetch: boolean;
-            autoFetchLimit: number;
-            cascadeRemove: boolean;
-            returnAllErrors: boolean;
-        }
-
-        connection: {
-            reconnect: boolean;
-            poll: boolean;
-            debug: boolean;
-        }
-    }
+    export var settings: Settings;
 
-    export interface PropertyStatic {
-        normalize(property: Function, settings: Settings): ModelProperty;
-        normalize(property: string, settings: Settings): ModelProperty;
-        normalize(property: any[], settings: Settings): ModelProperty;
-        validate(value: any, property: ModelProperty): any;
+    export class Property {
+        static normalize(property: string, settings: Settings): any;
+        static validate(value: any, property: string): any;
     }
 
-    export interface ErrorCodesStatic {
+    export interface ErrorCodes {
         QUERY_ERROR: number;
         NOT_FOUND: number;
         NOT_DEFINED: number;
@@ -120,241 +107,134 @@ declare module orm {
         PARAM_MISSMATCH: number;
         CONNECTION_LOST: number;
 
-        generateError(code: number, message: string, extra: { [property: string]: any }): Error;
+        generateError(code: number, message: string, extra: any): Error;
     }
 
-    export interface Express {
-        
-    }
+    export function Text(type: string): sqlquery.TextQuery;
+    export function express(uri: string, handlers: {
+        define(db: ORM, models: { [key: string]: Model });
+    }): (req, res, next) => void;
+    export function use(connection, protocol: string, options, callback: (err: Error, db?: ORM) => void);
+    export function connect(uri: string): ORM;
+    export function connect(uri: string, callback: (err: Error, db: ORM) => void);
+    export function connect(options: IConnectionOptions): ORM;
+    export function connect(options: IConnectionOptions, callback: (err: Error, db: ORM) => void);
 
-    export interface Connection {
 
-    }
-
-    export interface ConnectionOptions {
-    
-    }
-
-    export interface ORMPlugin {
-        define(model: Model, db: ORM);
-        beforeDefine(name: string, properties: ModelProperties, options: ModelOptions);
-    }
+    /**
+     * Parameter Type Interfaces
+     */
 
     export interface Model {
-        table: string;
-        id: string;
-        properties: ModelProperties;
-        uid: string;
-
-        get(id: any, options: FindOptions, cb: (err: Error, result: Instance) => void): Model;
-        get(id: any, cb: (err: Error, result: Instance) => void): Model;
-
-        find(conditions?: { [property: string]: any }, options?: FindOptions, limit?: number, order?: string, cb?: (err: Error, results: Instance[]) => void): ChainFind;
-        find(conditions?: { [property: string]: any }, options?: FindOptions, limit?: number, order?: string[], cb?: (err: Error, results: Instance[]) => void): ChainFind;
-
-        all(conditions?: { [property: string]: any }, options?: FindOptions, limit?: number, order?: string, cb?: (err: Error, results: Instance[]) => void): ChainFind;
-        all(conditions?: { [property: string]: any }, options?: FindOptions, limit?: number, order?: string[], cb?: (err: Error, results: Instance[]) => void): ChainFind;
-
-        count(conditions: { [property: string]: any }, cb: (err: Error, count: number) => void): ChainFind;
-        count(cb: (err: Error, count: number) => void): ChainFind;
-
-        exists(conditions: { [property: string]: any }, cb: (err: Error, exists: boolean) => void): ChainFind;
-        exists(cb: (err: Error, exists: boolean) => void): ChainFind;
-
-        one(conditions: { [property: string]: any }, cb: (err: Error, result: Instance) => void): ChainFind;
-        one(cb: (err: Error, result: Instance) => void): ChainFind;
-
-        aggregate(fields: string[], conditions?: { [property: string]: any }): ChainAggregate;
-        aggregate(conditions?: { [property: string]: any }): ChainAggregate;
-
-
-        create(values: InstanceProperties, cb: (err: Error, newInstance: Instance) => void): Model;
-        create(values: InstanceProperties[], cb: (err: Error, newInstance: Instance) => void): Model;
-
-        clear(cb: (err: Error) => void): Model;
-
-        hasOne(name: string, model: Model, options: {
-            autoFetch?: boolean;
-            autoFetchLimit?: number;
-            field?: string;
-            reverse?: string;
-            accessor?: string;
-            reverseAccessor?: string;
-            required?: boolean;
-            getAccessor?: string;
-            setAccessor?: string;
-            hasAccessor?: string;
-            delAccessor?: string;
-        }): Association;
-
-        extendsTo(name: string, properties: ModelProperties, options: {
-            autoFetch?: boolean;
-            autoFetchLimit?: number;
-            field?: string;
-            table?: string;
-            required?: boolean;
-            getAccessor?: string;
-            setAccessor?: string;
-            hasAccessor?: string;
-            delAccessor?: string;
-            cache?: boolean;
-            autoSave?: boolean;
-            cascadeRemove?: boolean;
-            hooks?: { [hook: string]: (cb?: () => void) => void; };
-            methods?: { [name: string]: Function; };
-            validations?: { [property: string]: enforce.Validator[];[property: string]: enforce.Validator; };
-        }): Model;
-
-        hasMany(name: string, model: Model, properties: ModelProperties, options: {
-            autoFetch?: boolean;
-            autoFetchLimit?: number;
-            accessor?: string;
-            reverse?: string;
-            field?: string[];
-            mergeTable?: string;
-            mergeId?: string[];
-            mergeAssocId?: string[];
-            getAccessor?: string;
-            setAccessor?: string;
-            hasAccessor?: string;
-            delAccessor?: string;
-            addAccessor?: string;
-        }): Association;
-    }
-
-    export interface ModelProperties {
-        [name: string]: Object;
-        [name: string]: ModelProperty[];
-    }
+        (): Instance;
+        (...ids: any[]): Instance;
 
-    export interface ModelProperty {
-        type: string;
-        required?: boolean;
-        defaultValue?: string;
-        size?: number;
-        big?: boolean;
-        unique?: boolean;
-        time?: boolean;
-        rational?: boolean;
-        unsigned?: boolean;
-    }
+        properties: { [property: string]: Property };
+        settings: Settings;
 
-    export interface ModelOptions {
-        id?: string[];
-        cache?: boolean;
-        autoSave?: boolean;
-        autoFetch?: boolean;
-        autoFetchLimit?: number;
+        drop(callback?: (err: Error) => void): Model;
+        sync(callback?: (err: Error) => void): Model;
+        get(...args: any[]): Model;
+        find(conditions: { [property: string]: any }, callback: (err: Error, results: Instance[]) => void): Model;
+        find(conditions: { [property: string]: any }, options: {
+            limit?: number;
+            order?: any;
+        }, callback: (err: Error, results: Instance[]) => void): Model;
+        find(conditions: { [property: string]: any }, limit: number, order: string[], callback: (err: Error, results: Instance[]) => void): Model;
+
+        all(conditions: { [property: string]: any }, callback: (err: Error, results: Instance[]) => void): Model;
+        all(conditions: { [property: string]: any }, options: {
+            limit?: number;
+            order?: any;
+        }, callback: (err: Error, results: Instance[]) => void): Model;
+        all(conditions: { [property: string]: any }, limit: number, order: string[], callback: (err: Error, results: Instance[]) => void): Model;
+
+        one(conditions: { [property: string]: any }, callback: (err: Error, result: Instance) => void): Model;
+        one(conditions: { [property: string]: any }, options: {
+            limit?: number;
+            order?: any;
+        }, callback: (err: Error, result: Instance) => void): Model;
+        one(conditions: { [property: string]: any }, limit: number, order: string[], callback: (err: Error, result: Instance) => void): Model;
+
+        count(callback: (err: Error, count: number) => void): Model;
+        count(conditions: { [property: string]: any }, callback: (err: Error, count: number) => void): Model;
+
+        aggregate(conditions: { [property: string]: any }): IAggregated;
+        aggregate(properties: string[]): IAggregated;
+        aggregate(conditions: { [property: string]: any }, properties: string[]): IAggregated;
+
+        exists(id: any, callback: (err: Error, exists: boolean) => void): Model;
+        exists(...args: any[]): Model;
+
+        create(data: { [property: string]: any; }, callback: (err: Error, instance: Instance) => void): Model;
+        create(...args: any[]): Model;
+
+        clear(): Model;
 
-        methods?: {
-            [name: string]: Function;
-        };
-        hooks?: {
-            [name: string]: (cb?: () => void) => void;
-        };
-    }
+        table: string;
+        id: string[];
 
-    export interface FindOptions {
-        cache?: boolean;
-        autoSave?: boolean;
-        autoFetch?: boolean;
-        autoFetchLimit?: number;
+        [property: string]: any;
     }
 
     export interface Instance {
-        [property: string]: any;
-
-        save(cb: (err: Error) => void): Instance;
-        save(data: InstanceProperties, cb: (err: Error) => void): Instance;
-        save(data: InstanceProperties, saveOptions: FindOptions, cb: (err: Error) => void): Instance;
-
+        on(event: string, callback): Instance;
+        save(): Instance;
+        save(data: { [property: string]: any; }, callback: (err: Error) => void): Instance;
+        save(data: { [property: string]: any; }, options: any, callback: (err: Error) => void): Instance;
         saved: boolean;
+        remove(callback: (err: Error) => void): Instance;
         isInstance: boolean;
+        isPersisted: boolean;
         isShell: boolean;
+        validate(callback: (errors: Error[]) => void);
         model: Model;
 
-        validate(cb: (err: Error, errors: Error[]) => void);
-
-        remove(cb: (err: Error) => void): Instance;
-    }
-    
-    interface InstanceProperties {
-        [property: string]: any
-    }
-
-    export interface ChainFind {
-        get(id: any, options: FindOptions, cb: (err: Error, result: Instance) => void): Model;
-        get(id: any, cb: (err: Error, result: Instance) => void): Model;
-
-        find(sql: string): ChainFind;
-        find(conditions?: { [property: string]: any }, options?: FindOptions, limit?: number, order?: string, cb?: (err: Error, results: Instance[]) => void): ChainFind;
-        find(conditions?: { [property: string]: any }, options?: FindOptions, limit?: number, order?: string[], cb?: (err: Error, results: Instance[]) => void): ChainFind;
-
-        only(...fields: string[]): ChainFind;
-        only(fields: string[]): ChainFind;
-
-        all(conditions?: { [property: string]: any }, options?: FindOptions, limit?: number, order?: string, cb?: (err: Error, results: Instance[]) => void): ChainFind;
-        all(conditions?: { [property: string]: any }, options?: FindOptions, limit?: number, order?: string[], cb?: (err: Error, results: Instance[]) => void): ChainFind;
-
-        count(conditions: { [property: string]: any }, cb: (err: Error, count: number) => void): ChainFind;
-        count(cb: (err: Error, count: number) => void): ChainFind;
-
-        exists(conditions: { [property: string]: any }, cb: (err: Error, exists: boolean) => void): ChainFind;
-        exists(cb: (err: Error, exists: boolean) => void): ChainFind;
-
-        one(conditions: { [property: string]: any }, cb: (err: Error, result: Instance) => void): ChainFind;
-        one(cb: (err: Error, result: Instance) => void): ChainFind;
-
-        aggregate(fields: string[], conditions?: { [property: string]: any }): ChainAggregate;
-        aggregate(conditions?: { [property: string]: any }): ChainAggregate;
-
-        limit(limit: number): ChainFind;
-        skip(offset: number): ChainFind;
-        offset(offset: number): ChainFind;
-        order(property: string, order: string): ChainFind;
-        order(property: string[], order: string): ChainFind;
-        remove(cb: (err: Error) => void): ChainFind;
-        first(cb: (err: Error, result: Instance) => void): ChainFind;
-        last(cb: (err: Error, result: Instance) => void): ChainFind;
-        run(cb: (err: Error, results: Instance[]) => void): ChainFind;
-
-        each(cb: (err: Error, result: Instance) => void): ChainInstance;
-    }
-
-    export interface ChainAggregate {
-        limit(limit: number): Model;
-        limit(offset: number, limit: number): Model;
-
-        min(field: string): Model;
-        max(field: string): Model;
-        avg(field: string): Model;
-        sum(field: string): Model;
-        count(field: string): Model;
-    }
-
-    export interface ChainInstance {
-        filter(cb: (instance: Instance) => boolean): () => ChainInstance;
-        forEach(cb: (instance: Instance) => void): () => ChainInstance;
-        sort(cb: (instance: Instance) => any): () => ChainInstance;
-        count(cb: (count: number) => any): () => ChainInstance;
-        get(cb: (instances: Instance[]) => any): () => ChainInstance;
-        save(cb: (instance: Instance) => any): () => ChainInstance;
-    }
-
-    export interface Association {
-        prepare(model: Model, associations: Association[], association_properties: string[], model_fields: string[]);
-        extend(model: Model, instance: Instance, driver: Driver, associations: Association[], options: {});
-        autoFetch(instance: Instance, associations: Association[], options: {}, cb: () => void);
-    }
-
-    export interface Driver {
-
+        [property: string]: any;
     }
-}
 
-declare module enforce {
-    export interface EnforceStatic {
-        equalToProperty(name: string, message?: string): enforce.Validator;
-        unique(): enforce.Validator;
+    export interface ModelOptions {
+        id?: string[];
+        autoFetch?: boolean;
+        autoFetchLimit?: number;
+        cacheFetch?: boolean;
+        hooks?: { [property: string]: Hooks };
+        methods?: { [name: string]: Function };
+    }
+
+    export interface Hooks {
+        beforeValidation?: (next?) => void;
+        beforeCreate?: (next?) => void;
+        afterCreate?: (next?) => void;
+        beforeSave?: (next?) => void;
+        afterSave?: (next?) => void;
+        afterLoad?: (next?) => void;
+        afterAutoFetch?: (next?) => void;
+        beforeRemove?: (next?) => void;
+        afterRemove?: (next?) => void;
+    }
+
+    export interface IConnectionOptions {
+        protocol: string;
+        host?: string;
+        port?: number;
+        auth?: string;
+        username?: string;
+        password?: string;
+        database?: string;
+        pool?: boolean;
+        debug?: boolean;
+    }
+
+    export interface IAggregated {
+        groupBy(...columns: string[]): IAggregated;
+        limit(limit: number): IAggregated;
+        limit(offset: number, limit: number): IAggregated;
+        order(...order: string[]): IAggregated;
+        select(columns: string[]): IAggregated;
+        select(...columns: string[]): IAggregated;
+        as(alias: string): IAggregated;
+        call(fun: string, args: any[]): IAggregated;
+        get(callback: (err: Error, instance: Instance) => void);
     }
 }
\ No newline at end of file
diff --git a/lib/TypeScript/sql-query.d.ts b/lib/TypeScript/sql-query.d.ts
index 18a053cd..8f18734a 100644
--- a/lib/TypeScript/sql-query.d.ts
+++ b/lib/TypeScript/sql-query.d.ts
@@ -1,24 +1,22 @@
 declare module sqlquery {
-    export interface QueryStatic {
-        Query(dialect: string): Query;
-        Query(options: {
+    export class Query {
+        constructor(dialect: string);
+        constructor(options: {
             dialect: string;
-        }): Query;
-        Text(type: string): TextQuery;
+        });
+        static Text(type: string): TextQuery;
 
-        Comparators: string[];
-        between(a: number, b: number): Comparator;
-        not_between(a: number, b: number): Comparator;
-        like(expression: string): Comparator;
-        eq(value: any): Comparator;
-        ne(value: any): Comparator;
-        gt(value: any): Comparator;
-        gte(value: any): Comparator;
-        lt(value: any): Comparator;
-        lte(value: any): Comparator;
-    }
+        static Comparators: string[];
+        static between(a: number, b: number): Comparator;
+        static not_between(a: number, b: number): Comparator;
+        static like(expression: string): Comparator;
+        static eq(value: any): Comparator;
+        static ne(value: any): Comparator;
+        static gt(value: any): Comparator;
+        static gte(value: any): Comparator;
+        static lt(value: any): Comparator;
+        static lte(value: any): Comparator;
 
-    export interface Query {
         escapeId(id: string): string;
         escapeId(id: string, table: string): string;
         escapeVal(value: any): string;

From 3753ef3aa65976bcb805dc6b0c362f7ab66eb037 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Sun, 18 Aug 2013 18:37:37 +0200
Subject: [PATCH 0800/1246] Allow shell models with multiple keys

---
 lib/Model.js | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/lib/Model.js b/lib/Model.js
index 0d6bf719..f1075c15 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -134,15 +134,30 @@ function Model(opts) {
 		return instance;
 	};
 
-	var model = function (data) {
-	    var instance;
+	var model = function () {
+	    var instance, i;
 
+	    var data = arguments.length > 1 ? arguments : arguments[0];
+
+	    if (Array.isArray(opts.id) && Array.isArray(data)) {
+	        if (data.length == opts.id.length) {
+	            var data2 = {};
+	            for (i = 0; i < opts.id.length; i++) {
+	                data2[opts.id[i]] = data[i++];
+	            }
+
+	            return createInstance(data2, { isShell: true });
+	        }
+	        else {
+	            throw new Error('Model requires ' + opts.id.length + ' keys, only ' + data.length + ' were provided');
+	        }
+	    }
 	    //TODO: Should be smarter about how this is handled.
 	    //      ideally we should check the type of ID used
 	    //      by the model, and accept that type of data.
-	    if (typeof data === "number" || typeof data === "string") {
+	    else if (typeof data === "number" || typeof data === "string") {
 	        var data2 = {};
-	        data2[opts.id] = data;
+	        data2[opts.id[0]] = data;
 
 	        return createInstance(data2, { isShell: true });
 	    } else if (typeof data === "undefined") {
@@ -151,8 +166,8 @@ function Model(opts) {
 
 	    var isNew = false;
 
-	    for (var k in opts.id) {
-	        if (!data.hasOwnProperty(k)) {
+	    for (i = 0; i < opts.id.length; i++) {
+	        if (!data.hasOwnProperty(opts.id[i])) {
 	            isNew = true;
 	            break;
 	        }
@@ -246,7 +261,7 @@ function Model(opts) {
 		var cb         = ids.pop();
 
 		if (typeof cb !== "function") {
-			throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.get() callback");
+		    throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.get() callback", { model: this });
 		}
 
 		if (typeof ids[ids.length - 1] === "object" && !Array.isArray(ids[ids.length - 1])) {
@@ -258,7 +273,7 @@ function Model(opts) {
 		}
 
 		if (ids.length !== opts.id.length) {
-			throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "Model.get() IDs number missmatch (" + opts.id.length + " needed, " + ids.length + " passed)");
+		    throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "Model.get() IDs number missmatch (" + opts.id.length + " needed, " + ids.length + " passed)", { model: this });
 		}
 
 		for (var i = 0; i < opts.id.length; i++) {
@@ -280,7 +295,7 @@ function Model(opts) {
 				return cb(ErrorCodes.generateError(ErrorCodes.QUERY_ERROR, err.message, { originalCode: err.code }));
 			}
 			if (data.length === 0) {
-				return cb(ErrorCodes.generateError(ErrorCodes.NOT_FOUND, "Not found"));
+			    return cb(ErrorCodes.generateError(ErrorCodes.NOT_FOUND, "Not found", { model: this }));
 			}
 
 			var uid = opts.driver.uid + "/" + opts.table + "/" + ids.join("/");

From 73e96fc98fe4c5db24df7fa916034f90328e7dce Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Sun, 18 Aug 2013 20:08:34 +0200
Subject: [PATCH 0801/1246] Make hasMany.addAccessor callback(err, items)

---
 lib/Associations/Many.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index d4692f09..6e930feb 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -299,9 +299,11 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 			var opts = {};
 			var cb = noOperation;
 			var run = function () {
+			    var savedAssociations = [];
+
 				var saveNextAssociation = function () {
 					if (Associations.length === 0) {
-						return cb();
+						return cb(null, savedAssociations);
 					}
 
 					var Association = Associations.pop();
@@ -323,6 +325,8 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 									return cb(err);
 								}
 
+								savedAssociations.push(Association);
+
 								return saveNextAssociation();
 							});
 						}
@@ -335,6 +339,8 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 								return cb(err);
 							}
 
+							savedAssociations.push(Association);
+
 							return saveNextAssociation();
 						});
 					});
@@ -361,7 +367,7 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 			}
 
 			if (Associations.length === 0) {
-				throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "No associations defined");
+			    throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "No associations defined", { model: Model });
 			}
 
 			if (this.saved()) {

From be6621eb7eb42b7a7c732e57ec5369f72572dabb Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Sun, 18 Aug 2013 20:19:48 +0200
Subject: [PATCH 0802/1246] Fix custom index reference column names

---
 lib/Utilities.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Utilities.js b/lib/Utilities.js
index 89c910d1..aa79d487 100644
--- a/lib/Utilities.js
+++ b/lib/Utilities.js
@@ -161,10 +161,10 @@ exports.wrapFieldObject = function (obj, model, altName, alternatives) {
 		var assoc_key = model.settings.get("properties.association_key");
 
 		if (typeof assoc_key === "function") {
-			obj = assoc_key(altName.toLowerCase(), 'id');
+		    obj = assoc_key(altName.toLowerCase(), model.id[0]);
 		} else {
 			obj = assoc_key.replace("{name}", altName.toLowerCase())
-			               .replace("{field}", 'id');
+			               .replace("{field}", model.id[0]);
 		}
 	}
 

From 7306c1292d1abecc2b1e189720c9c421f71fd17f Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Sun, 18 Aug 2013 20:41:45 +0200
Subject: [PATCH 0803/1246] Make custom id assume isNew

If a new instance of a model is created which uses a custom ID (e.g.
username) then it will be assumed to be a new instance (not referencing
an existing DB object) since it is common in this use case for the ID to
be provided for new objects.
---
 lib/Model.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/Model.js b/lib/Model.js
index f1075c15..24be2090 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -152,9 +152,6 @@ function Model(opts) {
 	            throw new Error('Model requires ' + opts.id.length + ' keys, only ' + data.length + ' were provided');
 	        }
 	    }
-	    //TODO: Should be smarter about how this is handled.
-	    //      ideally we should check the type of ID used
-	    //      by the model, and accept that type of data.
 	    else if (typeof data === "number" || typeof data === "string") {
 	        var data2 = {};
 	        data2[opts.id[0]] = data;
@@ -173,6 +170,10 @@ function Model(opts) {
 	        }
 	    }
 
+	    if (opts.id.length === 1 && opts.id[0] != 'id') {
+	        isNew = true; //Dubiously assume that it is a new instance if we're using custom keys
+	    }
+
 	    return createInstance(data, {
 	        is_new: isNew,
 	        autoSave: opts.autoSave,

From 7646781b9479ef3b45ff49e7ff0c653bd711bb55 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Sun, 18 Aug 2013 20:46:59 +0200
Subject: [PATCH 0804/1246] Make most errors have a model property

Should ease tracing of model errors
---
 lib/Associations/Extend.js |  6 +++---
 lib/Associations/Many.js   |  2 +-
 lib/Instance.js            |  3 ++-
 lib/Model.js               | 15 +++++++++------
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index e02f7fdc..43abb3bf 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -73,7 +73,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 	Object.defineProperty(Instance, association.hasAccessor, {
 		value : function (cb) {
 			if (!Instance[Model.id]) {
-				cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension"));
+			    cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension", { model: Model }));
 			} else {
 				association.model.get(util.values(Instance, Model.id), function (err, extension) {
 					return cb(err, !err && extension ? true : false);
@@ -86,7 +86,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 	Object.defineProperty(Instance, association.getAccessor, {
 		value: function (cb) {
 			if (!Instance[Model.id]) {
-				cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension"));
+			    cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension", { model: Model }));
 			} else {
 				association.model.get(util.values(Instance, Model.id), cb);
 			}
@@ -126,7 +126,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 	Object.defineProperty(Instance, association.delAccessor, {
 		value : function (cb) {
 			if (!Instance[Model.id]) {
-				cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension"));
+			    cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension", { model: Model }));
 			} else {
 				var conditions = {};
 				var fields = Object.keys(association.field);
diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 6e930feb..c37cb873 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -234,7 +234,7 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 							 typeof Instances[Instances.length - 1] == "function" ? Instances.pop() : noOperation);
 
 			if (Instances.length === 0) {
-				throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "No associations defined");
+			    throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "No associations defined", { model: Model });
 			}
 
 			if (Array.isArray(Instances[0])) {
diff --git a/lib/Instance.js b/lib/Instance.js
index c98f74f4..3de6c3ec 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -42,12 +42,13 @@ function Instance(Model, opts) {
 			for (i = 0; i < opts.one_associations.length; i++) {
 				for (k in opts.one_associations[i].field) {
 					if (opts.one_associations[i].required && opts.data[k] === null) {
-						var err   = new Error("Property required");
+					    var err = new Error("Property required");
 
 						err.field = k;
 						err.value = opts.data[k];
 						err.msg   = "Property required";
 						err.type  = "validation";
+						err.model = Model;
 
 						if (!Model.settings.get("instance.returnAllErrors")) {
 							return cb(err);
diff --git a/lib/Model.js b/lib/Model.js
index 24be2090..0dd66e98 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -149,7 +149,10 @@ function Model(opts) {
 	            return createInstance(data2, { isShell: true });
 	        }
 	        else {
-	            throw new Error('Model requires ' + opts.id.length + ' keys, only ' + data.length + ' were provided');
+	            var err = new Error('Model requires ' + opts.id.length + ' keys, only ' + data.length + ' were provided');
+	            err.model = this;
+
+	            throw err;
 	        }
 	    }
 	    else if (typeof data === "number" || typeof data === "string") {
@@ -226,7 +229,7 @@ function Model(opts) {
 			return this;
 		}
 
-		return cb(ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Driver does not support Model.drop()"));
+		return cb(ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Driver does not support Model.drop()", { model: this }));
 	};
 
 	model.sync = function (cb) {
@@ -252,7 +255,7 @@ function Model(opts) {
 			return this;
 		}
 
-		return cb(ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Driver does not support Model.sync()"));
+		return cb(ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Driver does not support Model.sync()", { model: this }));
 	};
 
 	model.get = function () {
@@ -448,7 +451,7 @@ function Model(opts) {
 		}
 
 		if (cb === null) {
-			throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.one() callback");
+		    throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.one() callback", { model: this });
 		}
 
 		// add limit 1
@@ -479,7 +482,7 @@ function Model(opts) {
 		}
 
 		if (typeof cb !== "function") {
-			throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.count() callback");
+		    throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.count() callback", { model: this });
 		}
 
 		if (conditions) {
@@ -527,7 +530,7 @@ function Model(opts) {
 		var cb  = ids.pop();
 
 		if (typeof cb !== "function") {
-			throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.exists() callback");
+		    throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.exists() callback", { model: this });
 		}
 
 		var conditions = {}, i;

From 9820feb5adac59a7197c42b669122d84acf58a01 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Sun, 18 Aug 2013 21:11:10 +0200
Subject: [PATCH 0805/1246] Add retry functionality for troublesome tests

---
 test/common.js                                |  35 ++
 .../integration/association-hasone-reverse.js | 393 +++++++++---------
 2 files changed, 235 insertions(+), 193 deletions(-)

diff --git a/test/common.js b/test/common.js
index fb8dc734..b31ba27a 100644
--- a/test/common.js
+++ b/test/common.js
@@ -104,3 +104,38 @@ common.getConnectionString = function () {
 	}
 	return url;
 };
+
+common.retry = function (run, until, done, args) {
+    if (typeof until === "number") {
+        var countDown = until;
+        until = function (err) {
+            if (err && --countDown > 0) return false;
+            return true;
+        }
+    }
+
+    if (typeof args === "undefined") args = [];
+
+    var handler = function (err) {
+        if (until(err)) return done.apply(this, arguments);
+        return runNext(err);
+    }
+    
+    args.push(handler);
+
+    var runNext = function () {
+        try {
+            if (run.length == args.length) {
+                return run.apply(this, args);
+            } else {
+                run.apply(this, args);
+                handler();
+            }
+        }
+        catch(e) {
+            handler(e);
+        }
+    }
+
+    runNext();
+}
\ No newline at end of file
diff --git a/test/integration/association-hasone-reverse.js b/test/integration/association-hasone-reverse.js
index 6e0bf89b..9e7350c9 100644
--- a/test/integration/association-hasone-reverse.js
+++ b/test/integration/association-hasone-reverse.js
@@ -1,204 +1,211 @@
-var ORM    = require('../../');
+var ORM = require('../../');
 var helper = require('../support/spec_helper');
 var should = require('should');
-var async  = require('async');
-var _      = require('lodash');
+var async = require('async');
+var common = require('../common');
+var _ = require('lodash');
 
 describe("hasOne", function () {
-	var db     = null;
-	var Person = null;
-
-	var setup = function () {
-		return function (done) {
-			Person = db.define('person', {
-				name     : String
-			});
-			Pet = db.define('pet', {
-				name     : String
-			});
-			Person.hasOne('pet', Pet, {
-			    reverse: 'owner',
+    var db = null;
+    var Person = null;
+
+    var setup = function () {
+        return function (done) {
+            Person = db.define('person', {
+                name: String
+            });
+            Pet = db.define('pet', {
+                name: String
+            });
+            Person.hasOne('pet', Pet, {
+                reverse: 'owner',
                 field: 'pet_id'
-			});
+            });
 
-			return helper.dropSync([ Person, Pet ], function () {
-				async.parallel([
+            return helper.dropSync([Person, Pet], function () {
+                async.parallel([
 					Person.create.bind(Person, { name: "John Doe" }),
 					Person.create.bind(Person, { name: "Jane Doe" }),
 					Pet.create.bind(Pet, { name: "Deco" }),
 					Pet.create.bind(Pet, { name: "Fido" }),
-				], done);
-			});
-		};
-	};
-
-	before(function(done) {
-		helper.connect(function (connection) {
-			db = connection;
-			done();
-		});
-	});
-
-	describe("reverse", function () {
-		before(setup());
-
-		it("should create methods in both models", function (done) {
-			var person = Person(1);
-			var pet    = Pet(1);
-
-			person.getPet.should.be.a("function");
-			person.setPet.should.be.a("function");
-			person.removePet.should.be.a("function");
-			person.hasPet.should.be.a("function");
-
-			pet.getOwner.should.be.a("function");
-			pet.setOwner.should.be.a("function");
-			pet.hasOwner.should.be.a("function");
-
-			return done();
-		});
-
-		it("should be able to fetch model from reverse model", function (done) {
-			Person.find({ name: "John Doe" }).first(function (err, John) {
-				Pet.find({ name: "Deco" }).first(function (err, Deco) {
-					Deco.hasOwner(function (err, has_owner) {
-						should.not.exist(err);
-						has_owner.should.be.false;
-
-						Deco.setOwner(John, function (err) {
-							should.not.exist(err);
-
-							Deco.getOwner(function (err, JohnCopy) {
-								should.not.exist(err);
-								should(Array.isArray(JohnCopy));
-								John.should.eql(JohnCopy[0]);
-
-								return done();
-							});
-						});
-					});
-				});
-			});
-		});
-
-		it("should be able to set an array of people as the owner", function (done) {
-			Person.find({ name: ["John Doe", "Jane Doe"] }, function (err, owners) {
-				Pet.find({ name: "Fido" }).first(function (err, Fido) {
-					Fido.hasOwner(function (err, has_owner) {
-						should.not.exist(err);
-						has_owner.should.be.false;
-
-						Fido.setOwner(owners, function (err) {
-							should.not.exist(err);
-
-							Fido.getOwner(function (err, ownersCopy) {
-								should.not.exist(err);
-								should(Array.isArray(owners));
-								owners.length.should.equal(2);
-
-								if (owners[0] == ownersCopy[0]) {
-									owners[0].should.eql(ownersCopy[0]);
-									owners[1].should.eql(ownersCopy[1]);
-								} else {
-									owners[0].should.eql(ownersCopy[1]);
-									owners[1].should.eql(ownersCopy[0]);
-								}
-
-								return done();
-							});
-						});
-					});
-				});
-			});
-		});
-	});
-
-
-	describe("reverse find", function () {
-	    before(setup());
-
-	    it("should be able to find given an association id", function (done) {
-	        Person.find({ name: "John Doe" }).first(function (err, John) {
-	            should.not.exist(err);
-	            should.exist(John);
-	            Pet.find({ name: "Deco" }).first(function (err, Deco) {
-	                should.not.exist(err);
-	                should.exist(Deco);
-	                Deco.hasOwner(function (err, has_owner) {
-	                    should.not.exist(err);
-	                    has_owner.should.be.false;
-
-	                    Deco.setOwner(John, function (err) {
-	                        should.not.exist(err);
-
-	                        Person.find({ pet_id: Deco[Pet.id[0]] }).first(function (err, owner) {
-	                            should.not.exist(err);
-	                            should.exist(owner);
-	                            should.equal(owner.name, John.name);
-	                            done();
-	                        });
-
-	                    });
-	                });
-	            });
-	        });
-	    });
-
-	    it("should be able to find given an association instance", function (done) {
-	        Person.find({ name: "John Doe" }).first(function (err, John) {
-	            should.not.exist(err);
-	            should.exist(John);
-	            Pet.find({ name: "Deco" }).first(function (err, Deco) {
-	                should.not.exist(err);
-	                should.exist(Deco);
-	                Deco.hasOwner(function (err, has_owner) {
-	                    should.not.exist(err);
-	                    has_owner.should.be.false;
-
-	                    Deco.setOwner(John, function (err) {
-	                        should.not.exist(err);
-
-	                        Person.find({ pet: Deco }).first(function (err, owner) {
-	                            should.not.exist(err);
-	                            should.exist(owner);
-	                            should.equal(owner.name, John.name);
-	                            done();
-	                        });
-
-	                    });
-	                });
-	            });
-	        });
-	    });
-
-	    it("should be able to find given a number of association instances with a single primary key", function (done) {
-	        Person.find({ name: "John Doe" }).first(function (err, John) {
-	            should.not.exist(err);
-	            should.exist(John);
-	            Pet.all(function (err, pets) {
-	                should.not.exist(err);
-	                should.exist(pets);
-	                should.equal(pets.length, 2);
-
-	                pets[0].hasOwner(function (err, has_owner) {
-	                    should.not.exist(err);
-	                    has_owner.should.be.false;
-
-	                    pets[0].setOwner(John, function (err) {
-	                        should.not.exist(err);
-
-	                        Person.find({ pet: pets }, function (err, owners) {
-	                            should.not.exist(err);
-	                            should.exist(owners);
-	                            owners.length.should.equal(1);
-
-	                            should.equal(owners[0].name, John.name);
-	                            done();
-	                        });
-	                    });
-	                });
-	            });
-	        });
-	    });
-	});
+                ], done);
+            });
+        };
+    };
+
+    before(function (done) {
+        helper.connect(function (connection) {
+            db = connection;
+            done();
+        });
+    });
+
+    describe("reverse", function () {
+        before(setup());
+
+        it("should create methods in both models", function (done) {
+            var person = Person(1);
+            var pet = Pet(1);
+
+            person.getPet.should.be.a("function");
+            person.setPet.should.be.a("function");
+            person.removePet.should.be.a("function");
+            person.hasPet.should.be.a("function");
+
+            pet.getOwner.should.be.a("function");
+            pet.setOwner.should.be.a("function");
+            pet.hasOwner.should.be.a("function");
+
+            return done();
+        });
+
+        it("should be able to fetch model from reverse model", function (done) {
+            Person.find({ name: "John Doe" }).first(function (err, John) {
+                Pet.find({ name: "Deco" }).first(function (err, Deco) {
+                    Deco.hasOwner(function (err, has_owner) {
+                        should.not.exist(err);
+                        has_owner.should.be.false;
+
+                        Deco.setOwner(John, function (err) {
+                            should.not.exist(err);
+
+                            Deco.getOwner(function (err, JohnCopy) {
+                                should.not.exist(err);
+                                should(Array.isArray(JohnCopy));
+                                John.should.eql(JohnCopy[0]);
+
+                                return done();
+                            });
+                        });
+                    });
+                });
+            });
+        });
+
+        it("should be able to set an array of people as the owner", function (done) {
+            Person.find({ name: ["John Doe", "Jane Doe"] }, function (err, owners) {
+                Pet.find({ name: "Fido" }).first(function (err, Fido) {
+                    Fido.hasOwner(function (err, has_owner) {
+                        should.not.exist(err);
+                        has_owner.should.be.false;
+
+                        Fido.setOwner(owners, function (err) {
+                            should.not.exist(err);
+
+                            Fido.getOwner(function (err, ownersCopy) {
+                                should.not.exist(err);
+                                should(Array.isArray(owners));
+                                owners.length.should.equal(2);
+
+                                if (owners[0] == ownersCopy[0]) {
+                                    owners[0].should.eql(ownersCopy[0]);
+                                    owners[1].should.eql(ownersCopy[1]);
+                                } else {
+                                    owners[0].should.eql(ownersCopy[1]);
+                                    owners[1].should.eql(ownersCopy[0]);
+                                }
+
+                                return done();
+                            });
+                        });
+                    });
+                });
+            });
+        });
+    });
+
+
+    describe("reverse find", function () {
+        before(setup());
+
+        it("should be able to find given an association id", function (done) {
+            common.retry(function (done) {
+                Person.find({ name: "John Doe" }).first(function (err, John) {
+                    should.not.exist(err);
+                    should.exist(John);
+                    Pet.find({ name: "Deco" }).first(function (err, Deco) {
+                        should.not.exist(err);
+                        should.exist(Deco);
+                        Deco.hasOwner(function (err, has_owner) {
+                            should.not.exist(err);
+                            has_owner.should.be.false;
+
+                            Deco.setOwner(John, function (err) {
+                                should.not.exist(err);
+
+                                Person.find({ pet_id: Deco[Pet.id[0]] }).first(function (err, owner) {
+                                    should.not.exist(err);
+                                    should.exist(owner);
+                                    should.equal(owner.name, John.name);
+                                    done();
+                                });
+
+                            });
+                        });
+                    });
+                });
+            }, 3, done);
+        });
+
+        it("should be able to find given an association instance", function (done) {
+            common.retry(function (done) {
+                Person.find({ name: "John Doe" }).first(function (err, John) {
+                    should.not.exist(err);
+                    should.exist(John);
+                    Pet.find({ name: "Deco" }).first(function (err, Deco) {
+                        should.not.exist(err);
+                        should.exist(Deco);
+                        Deco.hasOwner(function (err, has_owner) {
+                            should.not.exist(err);
+                            has_owner.should.be.false;
+
+                            Deco.setOwner(John, function (err) {
+                                should.not.exist(err);
+
+                                Person.find({ pet: Deco }).first(function (err, owner) {
+                                    should.not.exist(err);
+                                    should.exist(owner);
+                                    should.equal(owner.name, John.name);
+                                    done();
+                                });
+
+                            });
+                        });
+                    });
+                });
+            }, 3, done);
+        });
+
+        it("should be able to find given a number of association instances with a single primary key", function (done) {
+            common.retry(function (done) {
+                Person.find({ name: "John Doe" }).first(function (err, John) {
+                    should.not.exist(err);
+                    should.exist(John);
+                    Pet.all(function (err, pets) {
+                        should.not.exist(err);
+                        should.exist(pets);
+                        should.equal(pets.length, 2);
+
+                        pets[0].hasOwner(function (err, has_owner) {
+                            should.not.exist(err);
+                            has_owner.should.be.false;
+
+                            pets[0].setOwner(John, function (err) {
+                                should.not.exist(err);
+
+                                Person.find({ pet: pets }, function (err, owners) {
+                                    should.not.exist(err);
+                                    should.exist(owners);
+                                    owners.length.should.equal(1);
+
+                                    should.equal(owners[0].name, John.name);
+                                    done();
+                                });
+                            });
+                        });
+                    });
+                });
+            }, 3, done);
+        });
+    });
 });

From 9d51657b6530c8e15cde3fd8f8f669f58dc964d9 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Sun, 18 Aug 2013 21:35:36 +0200
Subject: [PATCH 0806/1246] Make SQLite failing tests use retry functionality

---
 test/common.js                                | 47 ++++++++++++++-----
 .../integration/association-hasone-reverse.js |  8 ++--
 2 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/test/common.js b/test/common.js
index b31ba27a..241f8ffe 100644
--- a/test/common.js
+++ b/test/common.js
@@ -105,37 +105,58 @@ common.getConnectionString = function () {
 	return url;
 };
 
-common.retry = function (run, until, done, args) {
+common.retry = function (before, run, until, done, args) {
     if (typeof until === "number") {
         var countDown = until;
         until = function (err) {
             if (err && --countDown > 0) return false;
             return true;
-        }
+        };
     }
 
     if (typeof args === "undefined") args = [];
 
     var handler = function (err) {
         if (until(err)) return done.apply(this, arguments);
-        return runNext(err);
-    }
-    
+        return runNext();
+    };
+
     args.push(handler);
 
+    var runCurrent = function () {
+        if (run.length == args.length) {
+            return run.apply(this, args);
+        } else {
+            run.apply(this, args);
+            handler();
+        }
+    };
+
     var runNext = function () {
         try {
-            if (run.length == args.length) {
-                return run.apply(this, args);
+            if (before.length > 0) {
+                before(function (err) {
+                    if (until(err)) return done(err);
+                    return runCurrent();
+                });
             } else {
-                run.apply(this, args);
-                handler();
+                before();
+                runCurrent();
             }
         }
-        catch(e) {
+        catch (e) {
             handler(e);
         }
-    }
+    };
 
-    runNext();
-}
\ No newline at end of file
+    if (before.length > 0) {
+        before(function (err) {
+            if (err) return done(err);
+            runNext();
+        });
+    }
+    else {
+        before();
+        runNext();
+    }
+};
\ No newline at end of file
diff --git a/test/integration/association-hasone-reverse.js b/test/integration/association-hasone-reverse.js
index 9e7350c9..96e92401 100644
--- a/test/integration/association-hasone-reverse.js
+++ b/test/integration/association-hasone-reverse.js
@@ -116,10 +116,8 @@ describe("hasOne", function () {
 
 
     describe("reverse find", function () {
-        before(setup());
-
         it("should be able to find given an association id", function (done) {
-            common.retry(function (done) {
+            common.retry(setup(), function (done) {
                 Person.find({ name: "John Doe" }).first(function (err, John) {
                     should.not.exist(err);
                     should.exist(John);
@@ -148,7 +146,7 @@ describe("hasOne", function () {
         });
 
         it("should be able to find given an association instance", function (done) {
-            common.retry(function (done) {
+            common.retry(setup(), function (done) {
                 Person.find({ name: "John Doe" }).first(function (err, John) {
                     should.not.exist(err);
                     should.exist(John);
@@ -177,7 +175,7 @@ describe("hasOne", function () {
         });
 
         it("should be able to find given a number of association instances with a single primary key", function (done) {
-            common.retry(function (done) {
+            common.retry(setup(), function (done) {
                 Person.find({ name: "John Doe" }).first(function (err, John) {
                     should.not.exist(err);
                     should.exist(John);

From 90f92b4480be3288e4debadbfe5c3b201deee8d2 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Mon, 19 Aug 2013 00:53:26 +0200
Subject: [PATCH 0807/1246] Make err.model only present model table

Should reduce the risk of exposing raw information for attackers.
---
 lib/Associations/Extend.js |  6 +++---
 lib/Associations/Many.js   |  4 ++--
 lib/Instance.js            |  6 ++++--
 lib/Model.js               | 18 +++++++++---------
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index 43abb3bf..187d5610 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -73,7 +73,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 	Object.defineProperty(Instance, association.hasAccessor, {
 		value : function (cb) {
 			if (!Instance[Model.id]) {
-			    cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension", { model: Model }));
+			    cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension", { model: Model.table }));
 			} else {
 				association.model.get(util.values(Instance, Model.id), function (err, extension) {
 					return cb(err, !err && extension ? true : false);
@@ -86,7 +86,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 	Object.defineProperty(Instance, association.getAccessor, {
 		value: function (cb) {
 			if (!Instance[Model.id]) {
-			    cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension", { model: Model }));
+			    cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension", { model: Model.table }));
 			} else {
 				association.model.get(util.values(Instance, Model.id), cb);
 			}
@@ -126,7 +126,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 	Object.defineProperty(Instance, association.delAccessor, {
 		value : function (cb) {
 			if (!Instance[Model.id]) {
-			    cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension", { model: Model }));
+			    cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension", { model: Model.table }));
 			} else {
 				var conditions = {};
 				var fields = Object.keys(association.field);
diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index c37cb873..df5734dc 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -234,7 +234,7 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 							 typeof Instances[Instances.length - 1] == "function" ? Instances.pop() : noOperation);
 
 			if (Instances.length === 0) {
-			    throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "No associations defined", { model: Model });
+			    throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "No associations defined", { model: Model.name });
 			}
 
 			if (Array.isArray(Instances[0])) {
@@ -367,7 +367,7 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 			}
 
 			if (Associations.length === 0) {
-			    throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "No associations defined", { model: Model });
+			    throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "No associations defined", { model: Model.name });
 			}
 
 			if (this.saved()) {
diff --git a/lib/Instance.js b/lib/Instance.js
index 3de6c3ec..03e7318c 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -48,7 +48,7 @@ function Instance(Model, opts) {
 						err.value = opts.data[k];
 						err.msg   = "Property required";
 						err.type  = "validation";
-						err.model = Model;
+						err.model = Model.table;
 
 						if (!Model.settings.get("instance.returnAllErrors")) {
 							return cb(err);
@@ -505,7 +505,9 @@ function Instance(Model, opts) {
 						callback = arg;
 						break;
 					default:
-						throw new Error("Unknown parameter type '" + (typeof arg) + "' in Instance.save()");
+					    var err = new Error("Unknown parameter type '" + (typeof arg) + "' in Instance.save()");
+					    err.model = Model.table;
+					    throw err;
 				}
 			}
 
diff --git a/lib/Model.js b/lib/Model.js
index 0dd66e98..01529f4a 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -150,7 +150,7 @@ function Model(opts) {
 	        }
 	        else {
 	            var err = new Error('Model requires ' + opts.id.length + ' keys, only ' + data.length + ' were provided');
-	            err.model = this;
+	            err.model = opts.table;
 
 	            throw err;
 	        }
@@ -229,7 +229,7 @@ function Model(opts) {
 			return this;
 		}
 
-		return cb(ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Driver does not support Model.drop()", { model: this }));
+		return cb(ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Driver does not support Model.drop()", { model: opts.table }));
 	};
 
 	model.sync = function (cb) {
@@ -255,7 +255,7 @@ function Model(opts) {
 			return this;
 		}
 
-		return cb(ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Driver does not support Model.sync()", { model: this }));
+		return cb(ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Driver does not support Model.sync()", { model: opts.table }));
 	};
 
 	model.get = function () {
@@ -265,7 +265,7 @@ function Model(opts) {
 		var cb         = ids.pop();
 
 		if (typeof cb !== "function") {
-		    throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.get() callback", { model: this });
+		    throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.get() callback", { model: opts.table });
 		}
 
 		if (typeof ids[ids.length - 1] === "object" && !Array.isArray(ids[ids.length - 1])) {
@@ -277,7 +277,7 @@ function Model(opts) {
 		}
 
 		if (ids.length !== opts.id.length) {
-		    throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "Model.get() IDs number missmatch (" + opts.id.length + " needed, " + ids.length + " passed)", { model: this });
+		    throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "Model.get() IDs number missmatch (" + opts.id.length + " needed, " + ids.length + " passed)", { model: opts.table });
 		}
 
 		for (var i = 0; i < opts.id.length; i++) {
@@ -299,7 +299,7 @@ function Model(opts) {
 				return cb(ErrorCodes.generateError(ErrorCodes.QUERY_ERROR, err.message, { originalCode: err.code }));
 			}
 			if (data.length === 0) {
-			    return cb(ErrorCodes.generateError(ErrorCodes.NOT_FOUND, "Not found", { model: this }));
+			    return cb(ErrorCodes.generateError(ErrorCodes.NOT_FOUND, "Not found", { model: opts.table }));
 			}
 
 			var uid = opts.driver.uid + "/" + opts.table + "/" + ids.join("/");
@@ -451,7 +451,7 @@ function Model(opts) {
 		}
 
 		if (cb === null) {
-		    throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.one() callback", { model: this });
+		    throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.one() callback", { model: opts.table });
 		}
 
 		// add limit 1
@@ -482,7 +482,7 @@ function Model(opts) {
 		}
 
 		if (typeof cb !== "function") {
-		    throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.count() callback", { model: this });
+		    throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.count() callback", { model: opts.table });
 		}
 
 		if (conditions) {
@@ -530,7 +530,7 @@ function Model(opts) {
 		var cb  = ids.pop();
 
 		if (typeof cb !== "function") {
-		    throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.exists() callback", { model: this });
+		    throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.exists() callback", { model: opts.table });
 		}
 
 		var conditions = {}, i;

From fcd2002642d790bffe11f452cdfad87b43fdb32a Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Mon, 19 Aug 2013 12:27:55 +0200
Subject: [PATCH 0808/1246] Update to support latest node-enforce

---
 lib/Model.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Model.js b/lib/Model.js
index 01529f4a..83fb19de 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -186,7 +186,7 @@ function Model(opts) {
 
 	// Standardize validations
 	for (var k in opts.validations) {
-		if (typeof opts.validations[k] === 'function') {
+		if (!Array.isArray(opts.validations[k])) {
 			opts.validations[k] = [ opts.validations[k] ];
 		}
 	}

From ded58c56d55334030501bdb059d10c4699507145 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 20 Aug 2013 11:01:53 +0100
Subject: [PATCH 0809/1246] enforce@0.1.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3649723e..8735b6da 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
 	},
 	"analyse"     : false,
 	"dependencies": {
-		"enforce"   : "0.1.1",
+		"enforce"   : "0.1.2",
 		"sql-query" : "0.1.9",
 		"hat"       : "0.0.3",
 		"lodash"    : "1.3.1"

From 919ba4e53823d17308394e9e6587740d6060c0ea Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 20 Aug 2013 11:28:03 +0100
Subject: [PATCH 0810/1246] Changes Singleton createCb and returnCb to expect
 err as first argument

---
 lib/Singleton.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/Singleton.js b/lib/Singleton.js
index c68ec2db..6fbc5449 100644
--- a/lib/Singleton.js
+++ b/lib/Singleton.js
@@ -20,15 +20,17 @@ exports.get = function (key, opts, createCb, returnCb) {
 		} else if (map[key].t !== null && map[key].t <= Date.now()) {
 			delete map[key];
 		} else  {
-			return returnCb(map[key].o);
+			return returnCb(null, map[key].o);
 		}
 	}
 
-	createCb(function (value) {
+	createCb(function (err, value) {
+		if (err) return returnCb(err);
+
 		map[key] = { // object , timeout
 			o : value,
 			t : (opts && typeof opts.cache === "number" ? Date.now() + (opts.cache * 1000) : null)
 		};
-		return returnCb(map[key].o);
+		return returnCb(null, map[key].o);
 	});
 };

From 6f36de0a139026276beee6d87ca7fb24ba144ab3 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 20 Aug 2013 11:28:20 +0100
Subject: [PATCH 0811/1246] Changes Model to use the new Singleton callback
 format

---
 lib/Model.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/Model.js b/lib/Model.js
index 83fb19de..b820021d 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -106,10 +106,10 @@ function Model(opts) {
 			extend_associations    : extend_associations,
 			association_properties : association_properties
 		});
-		instance.on("ready", function () {
+		instance.on("ready", function (err) {
 			if (--pending > 0) return;
 			if (typeof cb === "function") {
-				return cb(instance);
+				return cb(err, instance);
 			}
 		});
 		if (model_fields !== null) {
@@ -125,7 +125,7 @@ function Model(opts) {
 					Hook.wait(instance, opts.hooks.afterAutoFetch, function (err) {
 						if (--pending > 0) return;
 						if (typeof cb === "function") {
-							return cb(instance);
+							return cb(err, instance);
 						}
 					});
 				});
@@ -315,9 +315,7 @@ function Model(opts) {
 					autoFetchLimit : options.autoFetchLimit,
 					cascadeRemove  : options.cascadeRemove
 				}, cb);
-			}, function (instance) {
-				return cb(null, instance);
-			});
+			}, cb);
 		});
 
 		return this;
@@ -421,9 +419,7 @@ function Model(opts) {
 						extra          : options.extra,
 						extra_info     : options.extra_info
 					}, cb);
-				}, function (instance) {
-					return cb(null, instance);
-				});
+				}, cb);
 			}
 		});
 
@@ -575,7 +571,12 @@ function Model(opts) {
 				is_new    : true,
 				autoSave  : opts.autoSave,
 				autoFetch : false
-			}, function () {
+			}, function (err) {
+				if (err) {
+					err.index = idx;
+					err.instance = Instances[idx];
+					return cb(err);
+				}
 				Instances[idx].save(function (err) {
 					if (err) {
 						err.index = idx;

From 7f2ba3c290338f48e0f0b1286381455c60648486 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 20 Aug 2013 11:28:43 +0100
Subject: [PATCH 0812/1246] Passes error from afterLoad hook to ready event

---
 lib/Instance.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 03e7318c..fe1ca7a4 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -620,9 +620,9 @@ function Instance(Model, opts) {
 		}
 	}
 
-	Hook.wait(instance, opts.hooks.afterLoad, function () {
+	Hook.wait(instance, opts.hooks.afterLoad, function (err) {
 		process.nextTick(function () {
-			emitEvent("ready");
+			emitEvent("ready", err);
 		});
 	});
 

From 98027f959efc5b340e4413bfe8c576ad42394369 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 20 Aug 2013 11:29:05 +0100
Subject: [PATCH 0813/1246] Adds test for afterLoad hook next(err) (#301)

---
 test/integration/hook.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/test/integration/hook.js b/test/integration/hook.js
index 946ada13..f2405129 100644
--- a/test/integration/hook.js
+++ b/test/integration/hook.js
@@ -486,6 +486,25 @@ describe("Hook", function() {
 					return done();
 				});
 			});
+
+			describe("if hook returns an error", function () {
+				before(setup({
+					afterLoad : function (next) {
+						return next(new Error("AFTERLOAD_FAIL"));
+					}
+				}));
+
+				it("should return error", function (done) {
+					this.timeout(500);
+
+					Person.create([{ name: "John Doe" }], function (err, items) {
+						err.should.exist;
+						err.message.should.equal("AFTERLOAD_FAIL");
+
+						return done();
+					});
+				});
+			});
 		});
 	});
 

From d22d45b00830c536eb792b3b9732fe44eaa3e6dd Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 20 Aug 2013 11:58:24 +0100
Subject: [PATCH 0814/1246] sql-query@0.1.10 (#292)

SQLite fails when trying to find with a boolean field
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8735b6da..489ae3f7 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
 	"analyse"     : false,
 	"dependencies": {
 		"enforce"   : "0.1.2",
-		"sql-query" : "0.1.9",
+		"sql-query" : "0.1.10",
 		"hat"       : "0.0.3",
 		"lodash"    : "1.3.1"
 	},

From 2f85e307651484b81a29244914e0f29d48609fea Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 20 Aug 2013 12:29:52 +0100
Subject: [PATCH 0815/1246] Updates express middleware to support async
 definitions (#291)

`next` argument is optional and if set it will block until it's called
---
 Readme.md      |  4 +++-
 lib/Express.js | 13 ++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Readme.md b/Readme.md
index 785707bd..90b2802c 100755
--- a/Readme.md
+++ b/Readme.md
@@ -91,8 +91,10 @@ var orm = require('orm');
 var app = express();
 
 app.use(orm.express("mysql://username:password@host/database", {
-	define: function (db, models) {
+	define: function (db, models, next) {
 		models.person = db.define("person", { ... });
+
+		return next();
 	}
 }));
 app.listen(80);
diff --git a/lib/Express.js b/lib/Express.js
index 0cf934da..37bad496 100644
--- a/lib/Express.js
+++ b/lib/Express.js
@@ -10,8 +10,6 @@ module.exports = function (uri, opts) {
 	_pending += 1;
 
 	orm.connect(uri, function (err, db) {
-		_pending -= 1;
-
 		if (err) {
 			if (typeof opts.error === "function") {
 				opts.error(err);
@@ -29,14 +27,21 @@ module.exports = function (uri, opts) {
 		} else {
 			_db = db;
 		}
+
 		if (typeof opts.define === "function") {
+			if (opts.define.length > 2) {
+				return opts.define(db, _models, function () {
+					return checkRequestQueue();
+				});
+			}
+
 			opts.define(db, _models);
 		}
 
 		return checkRequestQueue();
 	});
 
-	return function ORM(req, res, next) {
+	return function ORM_ExpressMiddleware(req, res, next) {
 		if (!req.hasOwnProperty("models")) {
 			req.models = _models;
 			req.db     = _db;
@@ -52,6 +57,8 @@ module.exports = function (uri, opts) {
 };
 
 function checkRequestQueue() {
+	_pending -= 1;
+
 	if (_pending > 0) return;
 	if (_queue.length === 0) return;
 

From d5af517cb5b65cd4343c4717d8fa925bd01ff444 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 21 Aug 2013 22:52:02 +1000
Subject: [PATCH 0816/1246] Enable auto-escaping raw queries #304

---
 Readme.md                   | 15 ++++++++-
 lib/Drivers/DML/mysql.js    | 22 +++++++------
 lib/Drivers/DML/postgres.js | 30 +++++++++---------
 lib/Drivers/DML/sqlite.js   |  6 +++-
 lib/Drivers/helpers.js      | 13 ++++++++
 package.json                |  2 +-
 test/integration/db.js      | 62 +++++++++++++++++++++++++++++++++++++
 7 files changed, 124 insertions(+), 26 deletions(-)
 create mode 100644 lib/Drivers/helpers.js

diff --git a/Readme.md b/Readme.md
index 90b2802c..6c674612 100755
--- a/Readme.md
+++ b/Readme.md
@@ -476,9 +476,22 @@ a few examples to describe it:
 
 #### Raw queries
 
-Note: This may change in future.
 ```js
 db.driver.execQuery("SELECT id, email FROM user", function (err, data) { ... })
+
+// You can escape identifiers and values.
+db.driver.execQuery(
+  "SELECT user.??, user.?? FROM user WHERE user.?? LIKE ? AND user.?? > ?",
+  ['id', 'name', 'name', 'john', 'id', 55],
+  function (err, data) { ... }
+)
+
+// Identifiers don't need to be scaped most of the time
+db.driver.execQuery(
+  "SELECT user.id, user.name FROM user WHERE user.name LIKE ? AND user.id > ?",
+  ['john', 55],
+  function (err, data) { ... }
+)
 ```
 
 ### Caching & Integrity
diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index b37c54ba..f2b8be9e 100755
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -1,5 +1,7 @@
-var mysql = require("mysql");
-var Query = require("sql-query").Query;
+var _       = require("lodash");
+var mysql   = require("mysql");
+var Query   = require("sql-query").Query;
+var helpers = require("../helpers");
 
 exports.Driver = Driver;
 
@@ -24,6 +26,8 @@ function Driver(config, connection, opts) {
 	                             "DISTINCT"];
 }
 
+_.extend(Driver.prototype, helpers.sql);
+
 Driver.prototype.sync = function (opts, cb) {
 	return require("../DDL/mysql").sync(this, opts, cb);
 };
@@ -79,7 +83,7 @@ Driver.prototype.getQuery = function () {
 	return this.query;
 };
 
-Driver.prototype.execQuery = function (query, cb) {
+Driver.prototype.execSimpleQuery = function (query, cb) {
 	if (this.opts.debug) {
 		require("../../Debug").sql('mysql', query);
 	}
@@ -128,7 +132,7 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 
 	q = q.build();
 
-	this.execQuery(q, cb);
+	this.execSimpleQuery(q, cb);
 };
 
 Driver.prototype.count = function (table, conditions, opts, cb) {
@@ -155,7 +159,7 @@ Driver.prototype.count = function (table, conditions, opts, cb) {
 
 	q = q.build();
 
-	this.execQuery(q, cb);
+	this.execSimpleQuery(q, cb);
 };
 
 Driver.prototype.insert = function (table, data, id_prop, cb) {
@@ -164,7 +168,7 @@ Driver.prototype.insert = function (table, data, id_prop, cb) {
 	                  .set(data)
 	                  .build();
 
-	this.execQuery(q, function (err, info) {
+	this.execSimpleQuery(q, function (err, info) {
 		if (err) return cb(err);
 
 		var ids = {};
@@ -189,7 +193,7 @@ Driver.prototype.update = function (table, changes, conditions, cb) {
 	                  .where(conditions)
 	                  .build();
 
-	this.execQuery(q, cb);
+	this.execSimpleQuery(q, cb);
 };
 
 Driver.prototype.remove = function (table, conditions, cb) {
@@ -198,13 +202,13 @@ Driver.prototype.remove = function (table, conditions, cb) {
 	                  .where(conditions)
 	                  .build();
 
-	this.execQuery(q, cb);
+	this.execSimpleQuery(q, cb);
 };
 
 Driver.prototype.clear = function (table, cb) {
 	var q = "TRUNCATE TABLE " + this.query.escapeId(table);
 
-	this.execQuery(q, cb);
+	this.execSimpleQuery(q, cb);
 };
 
 Driver.prototype.poolQuery = function (query, cb) {
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 2929d214..834dcd6a 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -1,5 +1,7 @@
-var pg    = require("pg");
-var Query = require("sql-query").Query;
+var _       = require("lodash");
+var pg      = require("pg");
+var Query   = require("sql-query").Query;
+var helpers = require("../helpers");
 
 exports.Driver = Driver;
 
@@ -27,9 +29,7 @@ function Driver(config, connection, opts) {
 		}
 	}
 
-	for (var name in functions) {
-		this.constructor.prototype[name] = functions[name];
-	}
+	_.extend(this.constructor.prototype, functions);
 
 	this.aggregate_functions = [ "ABS", "CEIL", "FLOOR", "ROUND",
 	                             "AVG", "MIN", "MAX",
@@ -48,7 +48,7 @@ var switchableFunctions = {
 				cb(err);
 			});
 		},
-		execQuery: function (query, cb) {
+		execSimpleQuery: function (query, cb) {
 			if (this.opts.debug) {
 				require("../../Debug").sql('postgres', query);
 			}
@@ -77,7 +77,7 @@ var switchableFunctions = {
 		connect: function (cb) {
 			this.db.connect(cb);
 		},
-		execQuery: function (query, cb) {
+		execSimpleQuery: function (query, cb) {
 			if (this.opts.debug) {
 				require("../../Debug").sql('postgres', query);
 			}
@@ -99,6 +99,8 @@ var switchableFunctions = {
 	}
 };
 
+_.extend(Driver.prototype, helpers.sql);
+
 Driver.prototype.sync = function (opts, cb) {
 	return require("../DDL/postgres").sync(this, opts, cb);
 };
@@ -108,7 +110,7 @@ Driver.prototype.drop = function (opts, cb) {
 };
 
 Driver.prototype.ping = function (cb) {
-	this.execQuery("SELECT * FROM pg_stat_activity LIMIT 1", function () {
+	this.execSimpleQuery("SELECT * FROM pg_stat_activity LIMIT 1", function () {
 		return cb();
 	});
 	return this;
@@ -157,7 +159,7 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 
 	q = q.build();
 
-	this.execQuery(q, cb);
+	this.execSimpleQuery(q, cb);
 };
 
 Driver.prototype.count = function (table, conditions, opts, cb) {
@@ -184,7 +186,7 @@ Driver.prototype.count = function (table, conditions, opts, cb) {
 
 	q = q.build();
 
-	this.execQuery(q, cb);
+	this.execSimpleQuery(q, cb);
 };
 
 Driver.prototype.insert = function (table, data, id_prop, cb) {
@@ -193,7 +195,7 @@ Driver.prototype.insert = function (table, data, id_prop, cb) {
 	                  .set(data)
 	                  .build();
 
-	this.execQuery(q + " RETURNING *", function (err, results) {
+	this.execSimpleQuery(q + " RETURNING *", function (err, results) {
 		if (err) {
 			return cb(err);
 		}
@@ -217,7 +219,7 @@ Driver.prototype.update = function (table, changes, conditions, cb) {
 	                  .where(conditions)
 	                  .build();
 
-	this.execQuery(q, cb);
+	this.execSimpleQuery(q, cb);
 };
 
 Driver.prototype.remove = function (table, conditions, cb) {
@@ -226,13 +228,13 @@ Driver.prototype.remove = function (table, conditions, cb) {
 	                  .where(conditions)
 	                  .build();
 
-	this.execQuery(q, cb);
+	this.execSimpleQuery(q, cb);
 };
 
 Driver.prototype.clear = function (table, cb) {
 	var q = "TRUNCATE TABLE " + this.query.escapeId(table);
 
-	this.execQuery(q, cb);
+	this.execSimpleQuery(q, cb);
 };
 
 Driver.prototype.valueToProperty = function (value, property) {
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 77eba4da..baf1129c 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -1,5 +1,7 @@
+var _       = require("lodash");
 var sqlite3 = require("sqlite3");
 var Query   = require("sql-query").Query;
+var helpers = require("../helpers");
 
 exports.Driver = Driver;
 
@@ -28,6 +30,8 @@ function Driver(config, connection, opts) {
 	                             "DISTINCT" ];
 }
 
+_.extend(Driver.prototype, helpers.sql);
+
 Driver.prototype.sync = function (opts, cb) {
 	return require("../DDL/sqlite").sync(this, opts, cb);
 };
@@ -61,7 +65,7 @@ Driver.prototype.getQuery = function () {
 	return this.query;
 };
 
-Driver.prototype.execQuery = function (query, cb) {
+Driver.prototype.execSimpleQuery = function (query, cb) {
 	if (this.opts.debug) {
 		require("../../Debug").sql('mysql', query);
 	}
diff --git a/lib/Drivers/helpers.js b/lib/Drivers/helpers.js
new file mode 100644
index 00000000..dce8a0e3
--- /dev/null
+++ b/lib/Drivers/helpers.js
@@ -0,0 +1,13 @@
+
+module.exports.sql = {
+	execQuery: function () {
+		if (arguments.length == 2) {
+			var query = arguments[0];
+			var cb    = arguments[1];
+		} else if (arguments.length == 3) {
+			var query = this.query.escape(arguments[0], arguments[1]);
+			var cb    = arguments[2];
+		}
+		return this.execSimpleQuery(query, cb);
+	}
+}
diff --git a/package.json b/package.json
index 489ae3f7..c6dbe45f 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
 	"analyse"     : false,
 	"dependencies": {
 		"enforce"   : "0.1.2",
-		"sql-query" : "0.1.10",
+		"sql-query" : "0.1.11",
 		"hat"       : "0.0.3",
 		"lodash"    : "1.3.1"
 	},
diff --git a/test/integration/db.js b/test/integration/db.js
index 96dffede..1439f682 100644
--- a/test/integration/db.js
+++ b/test/integration/db.js
@@ -176,3 +176,65 @@ describe("db.serial()", function () {
 		});
 	});
 });
+
+describe("db.driver", function () {
+	var db = null;
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			var Log = db.define('log', {
+				what : { type: 'text' },
+				when : { type: 'date', time: true },
+				who  : { type: 'text' }
+			});
+
+			helper.dropSync(Log, function (err) {
+				if (err) return done(err);
+
+				Log.create([
+					{ what: "password reset", when: new Date('2013/04/07 12:33:05'), who: "jane" },
+					{ what: "user login",     when: new Date('2013/04/07 13:01:44'), who: "jane" },
+					{ what: "user logout",    when: new Date('2013/05/12 04:09:31'), who: "john" }
+				], done);
+			});
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	it("should be available", function () {
+		should.exist(db.driver);
+	});
+
+	describe("query", function () {
+		it("should be available", function () {
+			should.exist(db.driver.query);
+		});
+
+		describe("#execQuery", function () {
+			it("should execute sql queries", function (done) {
+				db.driver.execQuery("SELECT id FROM log", function (err, data) {
+					should.not.exist(err);
+
+					should(JSON.stringify(data) == JSON.stringify([{ id: 1 }, { id: 2 }, { id: 3 }]));
+					done();
+				});
+			});
+
+			it("should escape sql queries", function (done) {
+				var query = "SELECT log.?? FROM log WHERE log.?? LIKE ? AND log.?? > ?";
+				var args  = ['what', 'who', 'jane', 'when', new Date('2013/04/07 12:40:00')];
+				db.driver.execQuery(query, args, function (err, data) {
+					should.not.exist(err);
+
+					should(JSON.stringify(data) == JSON.stringify([{ "what": "user login" }]));
+					done();
+				});
+			});
+		});
+	});
+});

From cb34290aa5cf48ba62b04493d4541187d2741a5d Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 21 Aug 2013 22:54:00 +1000
Subject: [PATCH 0817/1246] Make escaping readme more explicit

---
 Readme.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Readme.md b/Readme.md
index 6c674612..18479494 100755
--- a/Readme.md
+++ b/Readme.md
@@ -480,6 +480,8 @@ a few examples to describe it:
 db.driver.execQuery("SELECT id, email FROM user", function (err, data) { ... })
 
 // You can escape identifiers and values.
+// For identifier substitution use: ??
+// For value substitution use: ?
 db.driver.execQuery(
   "SELECT user.??, user.?? FROM user WHERE user.?? LIKE ? AND user.?? > ?",
   ['id', 'name', 'name', 'john', 'id', 55],

From 6f2889e4218cb3aa96e9740e637aa8ac0e22eb14 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 21 Aug 2013 23:10:32 +1000
Subject: [PATCH 0818/1246] Disable driver query tests for mongo.

---
 test/integration/db.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/integration/db.js b/test/integration/db.js
index 1439f682..1f04348c 100644
--- a/test/integration/db.js
+++ b/test/integration/db.js
@@ -1,6 +1,7 @@
-var should   = require('should');
-var helper   = require('../support/spec_helper');
-var ORM      = require('../../');
+var should = require('should');
+var helper = require('../support/spec_helper');
+var ORM    = require('../../');
+var common = require('../common');
 
 describe("db.use()", function () {
 	var db = null;
@@ -210,6 +211,8 @@ describe("db.driver", function () {
 		should.exist(db.driver);
 	});
 
+	if (common.protocol() == "mongodb") return;
+
 	describe("query", function () {
 		it("should be available", function () {
 			should.exist(db.driver.query);

From 266849aef66f6b9af6917111d5d6fc6a94446354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alain=20P=C3=A9teut?= <alain.peteut@yahoo.com>
Date: Mon, 26 Aug 2013 12:01:59 +0200
Subject: [PATCH 0819/1246] Readme.md: Fix typo

---
 Readme.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Readme.md b/Readme.md
index 18479494..f0a895db 100755
--- a/Readme.md
+++ b/Readme.md
@@ -93,8 +93,6 @@ var app = express();
 app.use(orm.express("mysql://username:password@host/database", {
 	define: function (db, models, next) {
 		models.person = db.define("person", { ... });
-
-		return next();
 	}
 }));
 app.listen(80);

From 43a02494d6ebdc5de41528fc4d6010c4c9a79053 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 26 Aug 2013 11:02:36 +0100
Subject: [PATCH 0820/1246] Fixes duplicate column in SELECT (#313)

This was because a property that was defined as an ID was already added
to model_fields before.
---
 lib/Model.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Model.js b/lib/Model.js
index b820021d..8250b6a6 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -194,7 +194,7 @@ function Model(opts) {
 	for (k in opts.properties) {
 		opts.properties[k] = Property.normalize(opts.properties[k], opts.settings);
 
-		if (opts.properties[k].lazyload !== true) {
+		if (opts.properties[k].lazyload !== true && model_fields.indexOf(k) == -1) {
 			model_fields.push(k);
 		}
 		if (opts.properties[k].required) {

From d014b3793fbaf7e07926f6841af80dc97b46cdd0 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 26 Aug 2013 18:11:13 +0100
Subject: [PATCH 0821/1246] Adds .success() and .fail() to ChainFind (#316)

This is just an initial code, we should improve in the future and make
more parts of the code use the "Promise" (like Model.get)
---
 lib/ChainFind.js                     | 16 +++++++++++++++
 lib/Promise.js                       | 30 ++++++++++++++++++++++++++++
 test/integration/model-find-chain.js | 28 ++++++++++++++++++++++++++
 3 files changed, 74 insertions(+)
 create mode 100644 lib/Promise.js

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 18760205..7edaba9e 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -1,10 +1,12 @@
 var _               = require("lodash");
 var Singleton       = require("./Singleton");
 var ChainInstance   = require("./ChainInstance");
+var Promise         = require("./Promise").Promise;
 
 module.exports = ChainFind;
 
 function ChainFind(Model, opts) {
+	var promise = null;
 	var chain = {
 		find: function () {
 			var cb = null;
@@ -110,6 +112,20 @@ function ChainFind(Model, opts) {
 		run: function (cb) {
 			return this.all(cb);
 		},
+		success: function (cb) {
+			if (!promise) {
+				promise = new Promise();
+				promise.handle(this.all);
+			}
+			return promise.success(cb);
+		},
+		fail: function (cb) {
+			if (!promise) {
+				promise = new Promise();
+				promise.handle(this.all);
+			}
+			return promise.fail(cb);
+		},
 		all: function (cb) {
 			opts.driver.find(opts.only, opts.table, opts.conditions, {
 				limit  : opts.limit,
diff --git a/lib/Promise.js b/lib/Promise.js
new file mode 100644
index 00000000..0008adea
--- /dev/null
+++ b/lib/Promise.js
@@ -0,0 +1,30 @@
+exports.Promise = Promise;
+
+function Promise(opts) {
+	opts = opts || {};
+
+	var success_cb = opts.success || null;
+	var fail_cb    = opts.fail    || null;
+
+	return {
+		handle: function (promise) {
+			promise(function (err) {
+				if (err) {
+					if (fail_cb) fail_cb(err);
+				} else {
+					var args = Array.prototype.slice.call(arguments, 1);
+
+					if (success_cb) success_cb.apply(null, args);
+				}
+			});
+		},
+		success: function (cb) {
+			success_cb = cb;
+			return this;
+		},
+		fail: function (cb) {
+			fail_cb = cb;
+			return this;
+		}
+	};
+}
diff --git a/test/integration/model-find-chain.js b/test/integration/model-find-chain.js
index 5f5cf9aa..53b335da 100644
--- a/test/integration/model-find-chain.js
+++ b/test/integration/model-find-chain.js
@@ -461,4 +461,32 @@ describe("Model.find() chaining", function() {
 			});
 		});
 	});
+
+	describe(".success()", function () {
+		before(setup());
+
+		it("should return a Promise with .fail() method", function (done) {
+			Person.find().success(function (people) {
+				should(Array.isArray(people));
+
+				return done();
+			}).fail(function (err) {
+				// never called..
+			});
+		});
+	});
+
+	describe(".fail()", function () {
+		before(setup());
+
+		it("should return a Promise with .success() method", function (done) {
+			Person.find().fail(function (err) {
+				// never called..
+			}).success(function (people) {
+				should(Array.isArray(people));
+
+				return done();
+			});
+		});
+	});
 });

From 9141d4354883c407b365a0e145b6f187c38e6b09 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 27 Aug 2013 22:13:34 +1000
Subject: [PATCH 0822/1246] Properties refactor

---
 lib/Associations/One.js        |  2 +
 lib/Drivers/DDL/mysql.js       | 41 +++++++--------
 lib/Drivers/DDL/postgres.js    | 48 ++++++------------
 lib/Drivers/DDL/sqlite.js      | 36 ++++---------
 lib/Drivers/DML/postgres.js    | 15 ++++--
 lib/Instance.js                | 93 +++++++++++++++++++---------------
 lib/Model.js                   | 81 +++++++++++++++++------------
 test/integration/model-get.js  |  9 ++--
 test/integration/model-keys.js |  3 ++
 test/integration/model-save.js |  9 ++--
 test/support/spec_helper.js    |  6 ++-
 11 files changed, 169 insertions(+), 174 deletions(-)

diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index a2a839f5..490b6ed9 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -51,6 +51,8 @@ exports.prepare = function (Model, associations, association_properties, model_f
 		for (k in association.field) {
 			association_properties.push(k);
 			if (!association.reversed) {
+				Model.allProperties[k] = _.omit(association.field[k], k);
+				Model.allProperties[k].klass = 'hasOne';
 				model_fields.push(k);
 			}
 		}
diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index c8187c8e..fecaeafb 100755
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -23,39 +23,29 @@ exports.drop = function (driver, opts, cb) {
 exports.sync = function (driver, opts, cb) {
 	var queries = [];
 	var definitions = [];
-	var k, i, pending;
+	var k, i, pending, prop;
 	var primary_keys = opts.id.map(function (k) { return driver.query.escapeId(k); });
 	var keys = [];
 
-	for (i = 0; i < opts.id.length; i++) {
-		if (opts.properties.hasOwnProperty(opts.id[i])) continue;
-
-		keys.push(driver.query.escapeId(opts.id[i]));
-	}
-
-	for (i = 0; i < keys.length; i++) {
-		definitions.push(keys[i] + " INT(10) UNSIGNED NOT NULL");
-	}
-	if (opts.id.length == 1 && !opts.extension) {
-		definitions[definitions.length - 1] += " AUTO_INCREMENT";
-	}
-
-	for (k in opts.properties) {
-		definitions.push(buildColumnDefinition(driver, k, opts.properties[k]));
+	for (k in opts.allProperties) {
+		prop = opts.allProperties[k];
+		definitions.push(buildColumnDefinition(driver, k, prop));
 	}
 
-	for (i = 0; i < opts.one_associations.length; i++) {
-		if (opts.one_associations[i].extension) continue;
-		if (opts.one_associations[i].reversed) continue;
-		for (k in opts.one_associations[i].field) {
-			definitions.push(buildColumnDefinition(driver, k, opts.one_associations[i].field[k]));
+	for (k in opts.allProperties) {
+		prop = opts.allProperties[k];
+		if (prop.unique === true) {
+			definitions.push("UNIQUE (" + driver.query.escapeId(k) + ")");
+		} else if (prop.index) {
+			definitions.push("INDEX (" + driver.query.escapeId(k) + ")");
 		}
 	}
 
-	for (k in opts.properties) {
-		if (opts.properties[k].unique === true) {
+	for (k in opts.allProperties) {
+		prop = opts.allProperties[k];
+		if (prop.unique === true) {
 			definitions.push("UNIQUE KEY " + driver.query.escapeId(k) + " (" + driver.query.escapeId(k) + ")");
-		} else if (opts.properties[k].index) {
+		} else if (prop.index) {
 			definitions.push("INDEX (" + driver.query.escapeId(k) + ")");
 		}
 	}
@@ -142,6 +132,9 @@ function buildColumnDefinition(driver, name, prop) {
 				def = driver.query.escapeId(name) + " VARCHAR(" + Math.min(Math.max(parseInt(prop.size, 10) || 255, 1), 65535) + ")";
 			}
 			break;
+		case "serial":
+			def = driver.query.escapeId(name) + " INT(10) UNSIGNED NOT NULL AUTO_INCREMENT";
+			break;
 		case "number":
 			if (prop.rational === false) {
 				def = driver.query.escapeId(name) + " " + colTypes.integer[prop.size || 4];
diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index 4e0e38f5..f45eb062 100755
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -24,46 +24,27 @@ exports.sync = function (driver, opts, cb) {
 	var subqueries = [];
 	var typequeries = [];
 	var definitions = [];
-	var k, i, pending;
+	var k, i, pending, prop;
 	var primary_keys = opts.id.map(function (k) { return driver.query.escapeId(k); });
 	var keys = [];
-	for (i = 0; i < opts.id.length; i++) {
-	    if (opts.properties.hasOwnProperty(opts.id[i])) continue;
 
-	    keys.push(driver.query.escapeId(opts.id[i]));
-	}
-
-	for (i = 0; i < keys.length; i++) {
-		definitions.push(keys[i] + " INTEGER NOT NULL");
-	}
-
-	if (opts.id.length == 1 && !opts.extension) {
-		definitions[definitions.length - 1] = keys[0] + " SERIAL";
-	}
+	for (k in opts.allProperties) {
+		prop = opts.allProperties[k];
+		definitions.push(buildColumnDefinition(driver, opts.table, k, prop));
 
-	for (k in opts.properties) {
-		definitions.push(buildColumnDefinition(driver, opts.table, k, opts.properties[k]));
-
-		if (opts.properties[k].type == "enum") {
+		if (prop.type == "enum") {
 			typequeries.push(
 				"CREATE TYPE " + driver.query.escapeId("enum_" + opts.table + "_" + k) + " AS ENUM (" +
-				opts.properties[k].values.map(driver.query.escapeVal.bind(driver)) + ")"
+				prop.values.map(driver.query.escapeVal.bind(driver)) + ")"
 			);
 		}
 	}
 
-	for (i = 0; i < opts.one_associations.length; i++) {
-		if (opts.one_associations[i].extension) continue;
-		if (opts.one_associations[i].reversed) continue;
-		for (k in opts.one_associations[i].field) {
-			definitions.push(buildColumnDefinition(driver, opts.table, k, opts.one_associations[i].field[k]));
-		}
-	}
-
-	for (k in opts.properties) {
-		if (opts.properties[k].unique === true) {
+	for (k in opts.allProperties) {
+		prop = opts.allProperties[k];
+		if (prop.unique === true) {
 			definitions.push("UNIQUE (" + driver.query.escapeId(k) + ")");
-		} else if (opts.properties[k].index) {
+		} else if (prop.index) {
 			definitions.push("INDEX (" + driver.query.escapeId(k) + ")");
 		}
 	}
@@ -77,7 +58,7 @@ exports.sync = function (driver, opts, cb) {
 		typequeries: typequeries,
 		subqueries : subqueries
 	});
-	
+
 	for (i = 0; i < opts.one_associations.length; i++) {
 		if (opts.one_associations[i].extension) continue;
 		if (opts.one_associations[i].reversed) continue;
@@ -101,7 +82,7 @@ exports.sync = function (driver, opts, cb) {
 	for (i = 0; i < opts.many_associations.length; i++) {
 		definitions = [];
 		typequeries = [];
-		
+
 		for (k in opts.many_associations[i].mergeId) {
 		    definitions.push(buildColumnDefinition(driver, opts.many_associations[i].mergeTable, k, opts.many_associations[i].mergeId[k]));
 		}
@@ -120,7 +101,7 @@ exports.sync = function (driver, opts, cb) {
 				);
 			}
 		}
-		
+
 		var index = null;
 		for (k in opts.many_associations[i].mergeId) {
 			if (index == null) index = driver.query.escapeId(k);
@@ -207,6 +188,9 @@ function buildColumnDefinition(driver, table, name, prop) {
 				def = driver.query.escapeId(name) + " VARCHAR(" + Math.max(parseInt(prop.size, 10) || 255, 1) + ")";
 			}
 			break;
+		case "serial":
+			def = driver.query.escapeId(name) + " SERIAL";
+			break;
 		case "number":
 			if (prop.rational === false) {
 				def = driver.query.escapeId(name) + " " + colTypes.integer[prop.size || 4];
diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index d5bca17d..13996173 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -22,34 +22,13 @@ exports.drop = function (driver, opts, cb) {
 exports.sync = function (driver, opts, cb) {
 	var queries = [];
 	var definitions = [];
-	var k, i, pending;
+	var k, i, pending, prop;
 	var primary_keys = opts.id.map(function (k) { return driver.query.escapeId(k); });
 	var keys = [];
 
-	for (i = 0; i < opts.id.length; i++) {
-	    if (opts.properties.hasOwnProperty(opts.id[i])) continue;
-
-	    keys.push(driver.query.escapeId(opts.id[i]));
-	}
-
-	for (i = 0; i < keys.length; i++) {
-		definitions.push(keys[i] + " INTEGER UNSIGNED NOT NULL");
-	}
-
-	if (opts.id.length == 1 && !opts.extension) {
-		definitions[definitions.length - 1] = keys[0] + " INTEGER PRIMARY KEY AUTOINCREMENT";
-	}
-
-	for (k in opts.properties) {
-		definitions.push(buildColumnDefinition(driver, k, opts.properties[k]));
-	}
-
-	for (i = 0; i < opts.one_associations.length; i++) {
-		if (opts.one_associations[i].extension) continue;
-		if (opts.one_associations[i].reversed) continue;
-		for (k in opts.one_associations[i].field) {
-			definitions.push(buildColumnDefinition(driver, k, opts.one_associations[i].field[k]));
-		}
+	for (k in opts.allProperties) {
+		prop = opts.allProperties[k];
+		definitions.push(buildColumnDefinition(driver, k, prop));
 	}
 
 	if (keys.length > 1) {
@@ -75,7 +54,7 @@ exports.sync = function (driver, opts, cb) {
 			);
 		}
 	}
-	
+
 	for (i = 0; i < opts.one_associations.length; i++) {
 		if (opts.one_associations[i].extension) continue;
 		if (opts.one_associations[i].reversed) continue;
@@ -112,7 +91,7 @@ exports.sync = function (driver, opts, cb) {
 		for (k in opts.many_associations[i].props) {
 			definitions.push(buildColumnDefinition(driver, k, opts.many_associations[i].props[k]));
 		}
-		
+
 		var index = null;
 		for (k in opts.many_associations[i].mergeId) {
 			if (index == null) index = driver.query.escapeId(k);
@@ -153,6 +132,9 @@ function buildColumnDefinition(driver, name, prop) {
 		case "text":
 			def = driver.query.escapeId(name) + " TEXT";
 			break;
+		case "serial":
+			def = driver.query.escapeId(name) + " INTEGER PRIMARY KEY AUTOINCREMENT";
+			break;
 		case "number":
 			if (prop.rational === false) {
 				def = driver.query.escapeId(name) + " INTEGER";
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 834dcd6a..3661ca8f 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -238,6 +238,8 @@ Driver.prototype.clear = function (table, cb) {
 };
 
 Driver.prototype.valueToProperty = function (value, property) {
+	var v;
+
 	switch (property.type) {
 		case "object":
 			if (typeof value == "object" && !Buffer.isBuffer(value)) {
@@ -256,14 +258,17 @@ Driver.prototype.valueToProperty = function (value, property) {
 					return { x : parseFloat(m[1], 10) , y : parseFloat(m[2], 10) };
 				}
 			}
-			return value;
+			break;
 		case "number":
-			if (value !== null) {
-				return Number(value);
+			if (typeof value != 'number' && value !== null) {
+				v = Number(value);
+				if (!isNaN(v)) {
+					return v;
+				}
 			}
-		default:
-			return value;
+			break;
 	}
+	return value;
 };
 
 Driver.prototype.propertyToValue = function (value, property) {
diff --git a/lib/Instance.js b/lib/Instance.js
index c489d923..a1a3a84b 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -33,12 +33,6 @@ function Instance(Model, opts) {
 				return saveError(cb, err);
 			}
 
-			for (k in Model.properties) {
-				if (!Model.properties.hasOwnProperty(k)) continue;
-				if (opts.data[k] === null && Model.properties[k].hasOwnProperty("defaultValue")) {
-					opts.data[k] = Model.properties[k].defaultValue;
-				}
-			}
 			for (i = 0; i < opts.one_associations.length; i++) {
 				for (k in opts.one_associations[i].field) {
 					if (opts.one_associations[i].required && opts.data[k] === null) {
@@ -145,19 +139,23 @@ function Instance(Model, opts) {
 		}
 	};
 	var getInstanceData = function () {
-		var data = {};
+		var data = {}, prop;
 		for (var k in opts.data) {
 			if (!opts.data.hasOwnProperty(k)) continue;
+			prop = Model.allProperties[k];
+
+			if (prop) {
+				if (prop.type === 'serial' && opts.data[k] == null) continue;
 
-			if (Model.properties[k]) {
-				data[k] = Property.validate(opts.data[k], Model.properties[k]);
+				data[k] = Property.validate(opts.data[k], prop);
 				if (opts.driver.propertyToValue) {
-					data[k] = opts.driver.propertyToValue(data[k], Model.properties[k]);
+					data[k] = opts.driver.propertyToValue(data[k], prop);
 				}
 			} else {
 				data[k] = opts.data[k];
 			}
 		}
+
 		return data;
 	};
 	var waitHooks = function (hooks, next) {
@@ -387,20 +385,50 @@ function Instance(Model, opts) {
 			});
 		});
 	};
+	var setInstanceProperty = function (key, value) {
+		var prop = Model.allProperties[key] || opts.extra[key];
+
+		if (prop) {
+			if ('valueToProperty' in opts.driver) {
+				value = opts.driver.valueToProperty(value, prop);
+			}
+			if (opts.data[key] !== value) {
+				opts.data[key] = value;
+				return true;
+			}
+		}
+		return false;
+	}
+
 	var addInstanceProperty = function (key) {
-		// if (instance.hasOwnProperty(key)) return;
+		var defaultValue = null;
+		var prop = Model.allProperties[key];
+
+		// This code was first added, and then commented out in a later commit.
+		// Its presence doesn't affect tests, so I'm just gonna log if it ever gets called.
+		// If someone complains about noise, we know it does something, and figure it out then.
+		if (instance.hasOwnProperty(key)) console.log("Overwriting instance property");
+
+		if (key in opts.data) {
+			defaultValue = opts.data[key];
+		} else if (prop && 'defaultValue' in prop) {
+			defaultValue = prop.defaultValue;
+		}
+
+		setInstanceProperty(key, defaultValue);
 
 		Object.defineProperty(instance, key, {
 			get: function () {
 				return opts.data[key];
 			},
 			set: function (val) {
-			    if (opts.id.indexOf(key) >= 0 && opts.data.hasOwnProperty(key)) {
-			    	return;
+				if (Model.allProperties[key].key === true && opts.data[key] != null) {
+					return;
 				}
 
-				if (opts.data[key] === val) return;
-				opts.data[key] = val;
+				if (!setInstanceProperty(key, val)) {
+					return;
+				}
 
 				if (opts.autoSave) {
 					saveInstanceProperty(key, val);
@@ -420,7 +448,7 @@ function Instance(Model, opts) {
 				return opts.data[key];
 			},
 			set: function (val) {
-				opts.data[key] = val;
+				setInstanceProperty(key, val);
 
 				/*if (opts.autoSave) {
 					saveInstanceProperty(key, val);
@@ -433,34 +461,11 @@ function Instance(Model, opts) {
 	};
 
 	var i, k;
-	for (i = 0; i < opts.id.length; i++) {
-	    if (!opts.data.hasOwnProperty(opts.id[i])) {
-	        addInstanceProperty(opts.id[i]);
-		}
-	}
 
-	for (k in Model.properties) {
-	    if (Model.properties.hasOwnProperty(k) && !opts.data.hasOwnProperty(k) && opts.id.indexOf(k) === -1) {
-			opts.data[k] = null;
-		}
+	for (k in Model.allProperties) {
+		addInstanceProperty(k);
 	}
-
-	for (k in opts.data) {
-		if (!opts.data.hasOwnProperty(k)) continue;
-		if (!Model.properties.hasOwnProperty(k) && opts.id.indexOf(k) === -1 && opts.association_properties.indexOf(k) === -1) {
-			if (!opts.extra.hasOwnProperty(k)) continue;
-
-			if (opts.driver.valueToProperty) {
-				opts.data[k] = opts.driver.valueToProperty(opts.data[k], opts.extra[k]);
-			}
-			addInstanceExtraProperty(k);
-			continue;
-		}
-
-		if (Model.properties[k] && opts.driver.valueToProperty) {
-			opts.data[k] = opts.driver.valueToProperty(opts.data[k], Model.properties[k]);
-		}
-
+	for (k in opts.extra) {
 		addInstanceProperty(k);
 	}
 
@@ -471,6 +476,10 @@ function Instance(Model, opts) {
 		});
 	}
 
+	for (k in opts.extra) {
+		addInstanceExtraProperty(k);
+	}
+
 	Object.defineProperty(instance, "on", {
 		value: function (event, cb) {
 			if (!events.hasOwnProperty(event)) {
diff --git a/lib/Model.js b/lib/Model.js
index 8250b6a6..3d1851fb 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -33,10 +33,7 @@ function Model(opts) {
 	var extend_associations    = [];
 	var association_properties = [];
 	var model_fields           = [];
-
-	for (var i = 0; i < opts.id.length; i++) {
-		model_fields.push(opts.id[i]);
-	}
+	var allProperties          = {};
 
 	var createHookHelper = function (hook) {
 		return function (cb) {
@@ -184,35 +181,9 @@ function Model(opts) {
 	    });
 	};
 
-	// Standardize validations
-	for (var k in opts.validations) {
-		if (!Array.isArray(opts.validations[k])) {
-			opts.validations[k] = [ opts.validations[k] ];
-		}
-	}
-
-	for (k in opts.properties) {
-		opts.properties[k] = Property.normalize(opts.properties[k], opts.settings);
-
-		if (opts.properties[k].lazyload !== true && model_fields.indexOf(k) == -1) {
-			model_fields.push(k);
-		}
-		if (opts.properties[k].required) {
-			// Prepend `required` validation
-			if(opts.validations.hasOwnProperty(k)) {
-				opts.validations[k].splice(0, 0, Validators.required());
-			} else {
-				opts.validations[k] = [Validators.required()];
-			}
-		}
-	}
-
-	for (k in AvailableHooks) {
-		model[AvailableHooks[k]] = createHookHelper(AvailableHooks[k]);
-	}
-
-	model.properties = opts.properties;
-	model.settings   = opts.settings;
+	model.allProperties = allProperties;
+	model.properties    = opts.properties;
+	model.settings      = opts.settings;
 
 	model.drop = function (cb) {
 		if (arguments.length === 0) {
@@ -243,6 +214,7 @@ function Model(opts) {
 					id                  : opts.id,
 					table               : opts.table,
 					properties          : opts.properties,
+					allProperties       : allProperties,
 					indexes             : opts.indexes || [],
 					one_associations    : one_associations,
 					many_associations   : many_associations,
@@ -639,6 +611,49 @@ function Model(opts) {
         enumerable: false
 	});
 
+	// Standardize validations
+	for (var k in opts.validations) {
+		if (!Array.isArray(opts.validations[k])) {
+			opts.validations[k] = [ opts.validations[k] ];
+		}
+	}
+
+	// standardize properties
+	for (k in opts.properties) {
+		opts.properties[k] = Property.normalize(opts.properties[k], opts.settings);
+		opts.properties[k].klass = 'primary';
+		allProperties[k] = opts.properties[k];
+
+		if (opts.id.indexOf(k) != -1) {
+			opts.properties[k].key = true;
+		}
+
+		if (opts.properties[k].lazyload !== true && model_fields.indexOf(k) == -1) {
+			model_fields.push(k);
+		}
+		if (opts.properties[k].required) {
+			// Prepend `required` validation
+			if(opts.validations.hasOwnProperty(k)) {
+				opts.validations[k].splice(0, 0, Validators.required());
+			} else {
+				opts.validations[k] = [Validators.required()];
+			}
+		}
+	}
+
+	for (var i = 0; i < opts.id.length; i++) {
+		k = opts.id[i];
+		allProperties[k] = opts.properties[k] || {
+			type: 'serial', rational: 'false', key: true, klass: 'key'
+		};
+	}
+	model_fields = opts.id.concat(model_fields);
+
+	// setup hooks
+	for (k in AvailableHooks) {
+		model[AvailableHooks[k]] = createHookHelper(AvailableHooks[k]);
+	}
+
 	OneAssociation.prepare(model, one_associations, association_properties, model_fields);
 	ManyAssociation.prepare(model, many_associations);
 	ExtendAssociation.prepare(opts.db, model, extend_associations);
diff --git a/test/integration/model-get.js b/test/integration/model-get.js
index 707551af..e0fca99e 100644
--- a/test/integration/model-get.js
+++ b/test/integration/model-get.js
@@ -1,5 +1,6 @@
 var should   = require('should');
 var helper   = require('../support/spec_helper');
+var common   = require('../common');
 var ORM      = require('../../');
 
 describe("Model.get()", function() {
@@ -282,6 +283,8 @@ describe("Model.get()", function() {
 	});
 
 	describe("with a point property type", function() {
+		if (common.protocol() == 'sqlite' || common.protocol() == 'mongodb') return;
+
 		it("should deserialize the point to an array", function (done) {
 			db.settings.set('properties.primary_key', 'id');
 
@@ -292,11 +295,7 @@ describe("Model.get()", function() {
 
 			ORM.singleton.clear();
 
-			return helper.dropSync(Person, function (err) {
-				if (err) {
-					return done(); // not supported
-				}
-
+			return helper.dropSync(Person, function () {
 				Person.create({
 					name     : "John Doe",
 					location : { x : 51.5177, y : -0.0968 }
diff --git a/test/integration/model-keys.js b/test/integration/model-keys.js
index b958ed24..cd18dbb7 100644
--- a/test/integration/model-keys.js
+++ b/test/integration/model-keys.js
@@ -53,6 +53,9 @@ describe("Model keys option", function() {
 
 		before(function (done) {
 			DoorAccessHistory = db.define("door_access_history", {
+				year   : { type: 'number', rational: false },
+				month  : { type: 'number', rational: false },
+				day    : { type: 'number', rational: false },
 				user   : String,
 				action : [ "in", "out" ]
 			}, {
diff --git a/test/integration/model-save.js b/test/integration/model-save.js
index 54d98b9e..2d17abcd 100644
--- a/test/integration/model-save.js
+++ b/test/integration/model-save.js
@@ -1,5 +1,6 @@
 var should   = require('should');
 var helper   = require('../support/spec_helper');
+var common   = require('../common');
 var ORM      = require('../../');
 
 describe("Model.save()", function() {
@@ -198,12 +199,10 @@ describe("Model.save()", function() {
 	});
 
 	describe("with a point property", function () {
-		it("should save the instance as a geospatial point", function (done) {
-			setup({ type: "point" }, null)(function (err) {
-				if (err) {
-					return done(); // not supported
-				}
+		if (common.protocol() == 'sqlite' || common.protocol() == 'mongodb') return;
 
+		it("should save the instance as a geospatial point", function (done) {
+			setup({ type: "point" }, null)(function () {
 				var John = new Person({
 					name: { x: 51.5177, y: -0.0968 }
 				});
diff --git a/test/support/spec_helper.js b/test/support/spec_helper.js
index 927d02f8..ea83eedf 100644
--- a/test/support/spec_helper.js
+++ b/test/support/spec_helper.js
@@ -1,5 +1,6 @@
 var common = require('../common');
 var async  = require('async');
+var should = require('should');
 
 module.exports.connect = function(cb) {
 	common.createConnection(function (err, conn) {
@@ -19,5 +20,8 @@ module.exports.dropSync = function (models, done) {
 
 			item.sync(cb);
 		});
-	}, done);
+	}, function (err) {
+		should.not.exist(err);
+		done(err);
+	});
 };

From 5f5bc617b9617ae3cbe857f09382b5c4c9a05f71 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 28 Aug 2013 20:03:30 +1000
Subject: [PATCH 0823/1246] Infinity & NaN support. Number fixes for sqlite.
 Should fix #310

---
 lib/Drivers/DML/postgres.js  |  12 ++--
 lib/Drivers/DML/sqlite.js    |  19 ++++--
 test/integration/instance.js | 116 +++++++++++++++++++++++++++++++++--
 3 files changed, 132 insertions(+), 15 deletions(-)

diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 3661ca8f..a59ca9eb 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -243,28 +243,26 @@ Driver.prototype.valueToProperty = function (value, property) {
 	switch (property.type) {
 		case "object":
 			if (typeof value == "object" && !Buffer.isBuffer(value)) {
-				return value;
+				break;
 			}
 			try {
-				return JSON.parse(value);
+				value = JSON.parse(value);
 			} catch (e) {
-				return null;
+				value = null;
 			}
 			break;
 		case "point":
 			if (typeof value == "string") {
 				var m = value.match(/\((\-?[\d\.]+)[\s,]+(\-?[\d\.]+)\)/);
 				if (m) {
-					return { x : parseFloat(m[1], 10) , y : parseFloat(m[2], 10) };
+					value = { x : parseFloat(m[1], 10) , y : parseFloat(m[2], 10) };
 				}
 			}
 			break;
 		case "number":
 			if (typeof value != 'number' && value !== null) {
 				v = Number(value);
-				if (!isNaN(v)) {
-					return v;
-				}
+				if (!isNaN(v)) value = v;
 			}
 			break;
 	}
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index baf1129c..5a4402be 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -205,9 +205,12 @@ Driver.prototype.clear = function (table, cb) {
 };
 
 Driver.prototype.valueToProperty = function (value, property) {
+	var v;
+
 	switch (property.type) {
 		case "boolean":
-			return !!value;
+			value = !!value;
+			break;
 		case "object":
 			if (typeof value == "object" && !Buffer.isBuffer(value)) {
 				return value;
@@ -218,16 +221,24 @@ Driver.prototype.valueToProperty = function (value, property) {
 				return null;
 			}
 			break;
+		case "number":
+			if (typeof value != 'number' && value !== null) {
+				v = Number(value);
+				if (!isNaN(v)) {
+					return v;
+				}
+			}
+			break;
 		case "date":
 			if (typeof value === 'string') {
 				if (value.indexOf('Z', value.length - 1) === -1) {
 					return new Date(value + 'Z');
 				}
 			}
-			return new Date(value);
-		default:
-			return value;
+			value = new Date(value);
+			break;
 	}
+	return value;
 };
 
 Driver.prototype.propertyToValue = function (value, property) {
diff --git a/test/integration/instance.js b/test/integration/instance.js
index 57b6f918..e89acae5 100644
--- a/test/integration/instance.js
+++ b/test/integration/instance.js
@@ -1,19 +1,24 @@
-var should	 = require('should');
-var helper	 = require('../support/spec_helper');
+var should	= require('should');
+var helper	= require('../support/spec_helper');
+var common  = require('../common');
 var ORM			= require('../../');
 
 describe("Model instance", function() {
 	var db = null;
 	var Person = null;
+	var protocol = common.protocol();
 
 	var setup = function () {
 		return function (done) {
 			db.settings.set('instance.returnAllErrors', true);
 
 			Person = db.define("person", {
-				name : String,
-				age  : { type: 'number', rational: false, required: false }
+				name   : String,
+				age    : { type: 'number', rational: false, required: false },
+				height : { type: 'number', rational: false, required: false },
+				weight : { type: 'number',                  required: false }
 			}, {
+				cache: false,
 				validations: {
 					age: ORM.validators.rangeNumber(0, 150)
 				}
@@ -122,4 +127,107 @@ describe("Model instance", function() {
 			});
 		});
 	});
+
+	describe("properties", function () {
+		describe("Number", function () {
+			it("should be saved for valid numbers", function (done) {
+				var person1 = new Person({ height: 190 });
+
+				person1.save(function (err) {
+					should.not.exist(err);
+
+					Person.create({ height: 170 }, function (err, person2) {
+						should.not.exist(err);
+
+						Person.get(person1[Person.id], function (err, item) {
+							should.not.exist(err);
+							should.equal(item.height, 190);
+
+							Person.get(person2[Person.id], function (err, item) {
+								should.not.exist(err);
+								should.equal(item.height, 170);
+								done();
+							});
+						});
+					});
+				});
+			});
+
+			if (protocol == 'postgres') {
+				// Only postgres raises propper errors.
+				// Sqlite & Mysql fail silently and insert nulls.
+				it("should raise an error for NaN integers", function (done) {
+					var person = new Person({ height: NaN });
+
+					person.save(function (err) {
+						should.exist(err);
+						var msg = {
+							postgres : 'invalid input syntax for integer: "NaN"'
+						}[protocol];
+
+						should.equal(err.message, msg);
+
+						done();
+					});
+				});
+
+				it("should raise an error for Infinity integers", function (done) {
+					var person = new Person({ height: Infinity });
+
+					person.save(function (err) {
+						should.exist(err);
+						var msg = {
+							postgres : 'invalid input syntax for integer: "Infinity"'
+						}[protocol];
+
+						should.equal(err.message, msg);
+
+						done();
+					});
+				});
+
+				it("should raise an error for nonsensical integers", function (done) {
+					var person = new Person({ height: 'bugz' });
+
+					person.save(function (err) {
+						should.exist(err);
+						var msg = {
+							postgres : 'invalid input syntax for integer: "bugz"'
+						}[protocol];
+
+						should.equal(err.message, msg);
+
+						done();
+					});
+				});
+			}
+
+			if (protocol != 'mysql') {
+				// Mysql doesn't support IEEE floats (NaN, Infinity, -Infinity)
+				it("should store NaN & Infinite floats", function (done) {
+					var person = new Person({ weight: NaN });
+
+					person.save(function (err) {
+						should.not.exist(err);
+
+						Person.get(person[Person.id], function (err, person) {
+							should.not.exist(err);
+							should(isNaN(person.weight));
+
+							person.save({ weight: Infinity, name: 'black hole' }, function (err) {
+								should.not.exist(err);
+
+								Person.get(person[Person.id], function (err, person) {
+									should.not.exist(err);
+									should.strictEqual(person.weight, Infinity);
+
+									done();
+								});
+							});
+						});
+					});
+				});
+			}
+		});
+	});
 });

From 70e280f19216fcc55fcf6d6ebe20ff187d643821 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 28 Aug 2013 20:32:09 +1000
Subject: [PATCH 0824/1246] Fix wrong code & bump sql-query version

---
 lib/Associations/One.js | 2 +-
 package.json            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index 490b6ed9..cbe45e42 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -51,7 +51,7 @@ exports.prepare = function (Model, associations, association_properties, model_f
 		for (k in association.field) {
 			association_properties.push(k);
 			if (!association.reversed) {
-				Model.allProperties[k] = _.omit(association.field[k], k);
+				Model.allProperties[k] = _.omit(association.field[k], 'klass');
 				Model.allProperties[k].klass = 'hasOne';
 				model_fields.push(k);
 			}
diff --git a/package.json b/package.json
index c6dbe45f..c13e9d7f 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
 	"analyse"     : false,
 	"dependencies": {
 		"enforce"   : "0.1.2",
-		"sql-query" : "0.1.11",
+		"sql-query" : "0.1.12",
 		"hat"       : "0.0.3",
 		"lodash"    : "1.3.1"
 	},

From a23d206cc4c954cba79885ce617b1686726daa36 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 28 Aug 2013 20:48:47 +1000
Subject: [PATCH 0825/1246] Explain & add to property tests

---
 test/integration/instance.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/test/integration/instance.js b/test/integration/instance.js
index e89acae5..71fbdc11 100644
--- a/test/integration/instance.js
+++ b/test/integration/instance.js
@@ -130,7 +130,7 @@ describe("Model instance", function() {
 
 	describe("properties", function () {
 		describe("Number", function () {
-			it("should be saved for valid numbers", function (done) {
+			it("should be saved for valid numbers, using both save & create", function (done) {
 				var person1 = new Person({ height: 190 });
 
 				person1.save(function (err) {
@@ -186,7 +186,7 @@ describe("Model instance", function() {
 					});
 				});
 
-				it("should raise an error for nonsensical integers", function (done) {
+				it("should raise an error for nonsensical integers, for both save & create", function (done) {
 					var person = new Person({ height: 'bugz' });
 
 					person.save(function (err) {
@@ -197,7 +197,12 @@ describe("Model instance", function() {
 
 						should.equal(err.message, msg);
 
-						done();
+						Person.create({ height: 'bugz' }, function (err, instance) {
+							should.exist(err);
+							should.equal(err.message, msg);
+
+							done();
+						});
 					});
 				});
 			}

From 9bbac568073073b1527e18379d55578e3e2a8b11 Mon Sep 17 00:00:00 2001
From: Kyle Van Wagenen <kvanwagenen@gmail.com>
Date: Mon, 2 Sep 2013 12:44:45 -0600
Subject: [PATCH 0826/1246] Fix for removing array of to-many associations with
 a single call to remove

---
 lib/Associations/Many.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index df5734dc..be5f2b9a 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -259,6 +259,7 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 		value: function () {
 			var Associations = Array.prototype.slice.apply(arguments);
 			var cb = (typeof Associations[Associations.length - 1] == "function" ? Associations.pop() : noOperation);
+			Associations = (Associations[0] instanceof Array ? Associations.pop() : Associations)
 			var conditions = {};
 			var run = function () {
 				if (Driver.hasMany) {

From d2c1ff57c241bf353cc05a0667fea58c8f231900 Mon Sep 17 00:00:00 2001
From: Kyle Van Wagenen <kvanwagenen@gmail.com>
Date: Mon, 2 Sep 2013 12:58:29 -0600
Subject: [PATCH 0827/1246] Replaced argument handling of to-many remove
 handler with more robust logic as in the add handler

---
 lib/Associations/Many.js | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index be5f2b9a..7438c0c5 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -257,9 +257,22 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 	});
 	Object.defineProperty(Instance, association.delAccessor, {
 		value: function () {
-			var Associations = Array.prototype.slice.apply(arguments);
-			var cb = (typeof Associations[Associations.length - 1] == "function" ? Associations.pop() : noOperation);
-			Associations = (Associations[0] instanceof Array ? Associations.pop() : Associations)
+			var Associations = [];
+			var cb = noOperation;
+			for (var i = 0; i < arguments.length; i++) {
+				switch (typeof arguments[i]) {
+					case "function":
+						cb = arguments[i];
+						break;
+					case "object":
+						if (Array.isArray(arguments[i])) {
+							Associations = Associations.concat(arguments[i]);
+						} else if (arguments[i].isInstance) {
+							Associations.push(arguments[i]);
+						}
+						break;
+				}
+			}
 			var conditions = {};
 			var run = function () {
 				if (Driver.hasMany) {

From e9817dbb4de8a79d764c3424e721e00898d17e5b Mon Sep 17 00:00:00 2001
From: Ronald Diaz <r.diaz@pni.com.au>
Date: Thu, 22 Aug 2013 11:22:30 +1000
Subject: [PATCH 0828/1246] Corrected spelling mistake.

---
 lib/AggregateFunctions.js | 6 +++---
 lib/Associations/Many.js  | 4 ++--
 lib/Associations/One.js   | 2 +-
 lib/ErrorCodes.js         | 2 +-
 lib/Model.js              | 2 +-
 lib/ORM.js                | 6 +++---
 lib/TypeScript/orm.d.ts   | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index 157559ae..c8d5a882 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -52,7 +52,7 @@ function AggregateFunctions(opts) {
 		},
 		select: function () {
 			if (arguments.length === 0) {
-				throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "When using append you must at least define one property");
+				throw ErrorCodes.generateError(ErrorCodes.PARAM_MISMATCH, "When using append you must at least define one property");
 			}
 			opts.properties = opts.properties.concat(Array.isArray(arguments[0]) ?
 			                                                 arguments[0] :
@@ -61,7 +61,7 @@ function AggregateFunctions(opts) {
 		},
 		as: function (alias) {
 			if (aggregates.length === 0 || (aggregates.length === 1 && aggregates[0].length === 0)) {
-				throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "No aggregate functions defined yet");
+				throw ErrorCodes.generateError(ErrorCodes.PARAM_MISMATCH, "No aggregate functions defined yet");
 			}
 
 			var len = aggregates.length;
@@ -92,7 +92,7 @@ function AggregateFunctions(opts) {
 				aggregates.length -= 1;
 			}
 			if (aggregates.length === 0) {
-				throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "Missing aggregate functions");
+				throw ErrorCodes.generateError(ErrorCodes.PARAM_MISMATCH, "Missing aggregate functions");
 			}
 
 			var query = opts.driver.getQuery().select().from(opts.table).select(opts.properties);
diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index df5734dc..bc506be0 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -234,7 +234,7 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 							 typeof Instances[Instances.length - 1] == "function" ? Instances.pop() : noOperation);
 
 			if (Instances.length === 0) {
-			    throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "No associations defined", { model: Model.name });
+			    throw ErrorCodes.generateError(ErrorCodes.PARAM_MISMATCH, "No associations defined", { model: Model.name });
 			}
 
 			if (Array.isArray(Instances[0])) {
@@ -367,7 +367,7 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 			}
 
 			if (Associations.length === 0) {
-			    throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "No associations defined", { model: Model.name });
+			    throw ErrorCodes.generateError(ErrorCodes.PARAM_MISMATCH, "No associations defined", { model: Model.name });
 			}
 
 			if (this.saved()) {
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index cbe45e42..147feec3 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -87,7 +87,7 @@ exports.prepare = function (Model, associations, association_properties, model_f
 			}
 
 			if (conditions === null) {
-				throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, ".findBy(" + assocName + ") is missing a conditions object");
+				throw ErrorCodes.generateError(ErrorCodes.PARAM_MISMATCH, ".findBy(" + assocName + ") is missing a conditions object");
 			}
 
 			options.__merge = {
diff --git a/lib/ErrorCodes.js b/lib/ErrorCodes.js
index a96781a3..212d3a42 100644
--- a/lib/ErrorCodes.js
+++ b/lib/ErrorCodes.js
@@ -3,7 +3,7 @@ exports.NOT_FOUND        = 2;
 exports.NOT_DEFINED      = 3;
 exports.NO_SUPPORT       = 4;
 exports.MISSING_CALLBACK = 5;
-exports.PARAM_MISSMATCH  = 6;
+exports.PARAM_MISMATCH  = 6;
 
 exports.CONNECTION_LOST  = 10;
 
diff --git a/lib/Model.js b/lib/Model.js
index 3d1851fb..64bf7661 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -249,7 +249,7 @@ function Model(opts) {
 		}
 
 		if (ids.length !== opts.id.length) {
-		    throw ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "Model.get() IDs number missmatch (" + opts.id.length + " needed, " + ids.length + " passed)", { model: opts.table });
+		    throw ErrorCodes.generateError(ErrorCodes.PARAM_MISMATCH, "Model.get() IDs number mismatch (" + opts.id.length + " needed, " + ids.length + " passed)", { model: opts.table });
 		}
 
 		for (var i = 0; i < opts.id.length; i++) {
diff --git a/lib/ORM.js b/lib/ORM.js
index 2c6414ba..26b569b1 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -63,11 +63,11 @@ exports.use = function (connection, proto, opts, cb) {
 
 exports.connect = function (opts, cb) {
 	if (arguments.length === 0 || !opts) {
-		return ORM_Error(ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "CONNECTION_URL_EMPTY"), cb);
+		return ORM_Error(ErrorCodes.generateError(ErrorCodes.PARAM_MISMATCH, "CONNECTION_URL_EMPTY"), cb);
 	}
 	if (typeof opts === "string") {
 		if (opts.replace(/\s+/, "").length === 0) {
-			return ORM_Error(ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "CONNECTION_URL_EMPTY"), cb);
+			return ORM_Error(ErrorCodes.generateError(ErrorCodes.PARAM_MISMATCH, "CONNECTION_URL_EMPTY"), cb);
 		}
 		opts = url.parse(opts, true);
 	}
@@ -78,7 +78,7 @@ exports.connect = function (opts, cb) {
 		opts.database = (opts.pathname ? opts.pathname.substr(1) : "");
 	}
 	if (!opts.protocol) {
-		return ORM_Error(ErrorCodes.generateError(ErrorCodes.PARAM_MISSMATCH, "CONNECTION_URL_NO_PROTOCOL"), cb);
+		return ORM_Error(ErrorCodes.generateError(ErrorCodes.PARAM_MISMATCH, "CONNECTION_URL_NO_PROTOCOL"), cb);
 	}
 	// if (!opts.host) {
 	// 	opts.host = opts.hostname = "localhost";
diff --git a/lib/TypeScript/orm.d.ts b/lib/TypeScript/orm.d.ts
index ddb894a1..5b65f94a 100644
--- a/lib/TypeScript/orm.d.ts
+++ b/lib/TypeScript/orm.d.ts
@@ -104,7 +104,7 @@ declare module orm {
         NOT_DEFINED: number;
         NO_SUPPORT: number;
         MISSING_CALLBACK: number;
-        PARAM_MISSMATCH: number;
+        PARAM_MISMATCH: number;
         CONNECTION_LOST: number;
 
         generateError(code: number, message: string, extra: any): Error;

From c679a6f8098ef567a74387632aab8d4d1c3dd5d7 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 3 Sep 2013 20:26:31 +1000
Subject: [PATCH 0829/1246] Add error code deprecation message. closes #309

---
 Changelog.md      |  3 +++
 lib/ErrorCodes.js | 10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 25ddaf0b..5aab4837 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### v2.2.0 - (todo, in future)
+- Fixes error code spelling: `PARAM_MISSMATCH` -> `PARAM_MISMATCH`
+
 ### v2.1.0 - 3 Aug 2013
 
 - Adds License (MIT) file (closes #271)
diff --git a/lib/ErrorCodes.js b/lib/ErrorCodes.js
index 212d3a42..5df4fbeb 100644
--- a/lib/ErrorCodes.js
+++ b/lib/ErrorCodes.js
@@ -3,10 +3,18 @@ exports.NOT_FOUND        = 2;
 exports.NOT_DEFINED      = 3;
 exports.NO_SUPPORT       = 4;
 exports.MISSING_CALLBACK = 5;
-exports.PARAM_MISMATCH  = 6;
+exports.PARAM_MISMATCH   = 6;
 
 exports.CONNECTION_LOST  = 10;
 
+// Deprecated, remove on next major release.
+Object.defineProperty(exports, "PARAM_MISSMATCH", {
+  enumerable: true, get: function () {
+    console.log("PARAM_MISSMATCH spelling is deprecated. Use PARAM_MISMATCH instead");
+    return exports.PARAM_MISMATCH;
+  }
+});
+
 Object.defineProperty(exports, "generateError", {
 	value: function (code, message, extra) {
 		var err = new Error(message);

From c6231b959d448f1be90c6c36759d3af8a47e4b07 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 3 Sep 2013 23:16:55 +1000
Subject: [PATCH 0830/1246] Add support for custom property types . Addresses
 #305

---
 lib/Associations/Many.js            |  2 +-
 lib/Drivers/DDL/mysql.js            | 38 ++++++++-------
 lib/Drivers/DDL/postgres.js         | 36 ++++++++------
 lib/Drivers/DDL/sqlite.js           | 30 +++++++-----
 lib/Drivers/DML/mysql.js            | 33 +++++++++----
 lib/Drivers/DML/postgres.js         | 20 ++++++--
 lib/Drivers/DML/sqlite.js           | 42 ++++++++++------
 lib/Model.js                        |  3 +-
 lib/ORM.js                          |  6 +++
 lib/Property.js                     |  6 ++-
 test/integration/property-custom.js | 74 +++++++++++++++++++++++++++++
 test/integration/property.js        | 22 ++++-----
 12 files changed, 229 insertions(+), 83 deletions(-)
 create mode 100644 test/integration/property-custom.js

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index bc506be0..1825ad78 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -33,7 +33,7 @@ exports.prepare = function (Model, associations) {
 			props = {};
 		} else {
 			for (var k in props) {
-				props[k] = Property.normalize(props[k], Model.settings);
+				props[k] = Property.normalize(props[k], {}, Model.settings);
 			}
 		}
 
diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
index fecaeafb..1d521d4d 100755
--- a/lib/Drivers/DDL/mysql.js
+++ b/lib/Drivers/DDL/mysql.js
@@ -122,59 +122,65 @@ var colTypes = {
 };
 
 function buildColumnDefinition(driver, name, prop) {
-	var def;
+	var def = driver.query.escapeId(name);
+	var customType;
 
 	switch (prop.type) {
 	    case "text":
 			if (prop.big === true) {
-				def = driver.query.escapeId(name) + " LONGTEXT";
+				def += " LONGTEXT";
 			} else {
-				def = driver.query.escapeId(name) + " VARCHAR(" + Math.min(Math.max(parseInt(prop.size, 10) || 255, 1), 65535) + ")";
+				def += " VARCHAR(" + Math.min(Math.max(parseInt(prop.size, 10) || 255, 1), 65535) + ")";
 			}
 			break;
 		case "serial":
-			def = driver.query.escapeId(name) + " INT(10) UNSIGNED NOT NULL AUTO_INCREMENT";
+			def += " INT(10) UNSIGNED NOT NULL AUTO_INCREMENT";
 			break;
 		case "number":
 			if (prop.rational === false) {
-				def = driver.query.escapeId(name) + " " + colTypes.integer[prop.size || 4];
+				def += " " + colTypes.integer[prop.size || 4];
 			} else {
-				def = driver.query.escapeId(name) + " " + colTypes.floating[prop.size || 4];
+				def += " " + colTypes.floating[prop.size || 4];
 			}
 			if (prop.unsigned === true) {
 				def += " UNSIGNED";
 			}
 			break;
 		case "boolean":
-			def = driver.query.escapeId(name) + " BOOLEAN";
+			def += " BOOLEAN";
 			break;
 		case "date":
 			if (prop.time === false) {
-				def = driver.query.escapeId(name) + " DATE";
+				def += " DATE";
 			} else {
-				def = driver.query.escapeId(name) + " DATETIME";
+				def += " DATETIME";
 			}
 			break;
 		case "binary":
 		case "object":
 			if (prop.big === true) {
-				def = driver.query.escapeId(name) + " LONGBLOB";
+				def += " LONGBLOB";
 			} else {
-				def = driver.query.escapeId(name) + " BLOB";
+				def += " BLOB";
 			}
 			break;
 		case "enum":
-			def = driver.query.escapeId(name) + " ENUM (" +
+			def += " ENUM (" +
 				   prop.values.map(driver.query.escapeVal.bind(driver.query)) +
 			")";
 			break;
 		case "point":
-			def = driver.query.escapeId(name) + " POINT";
+			def += " POINT";
 			break;
 		default:
-			throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Unknown property type: '" + prop.type + "'", {
-				property : prop
-			});
+			customType = driver.customTypes[prop.type];
+			if (customType) {
+				def += " " + customType.datastoreType(prop);
+			} else {
+				throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Unknown property type: '" + prop.type + "'", {
+					property : prop
+				});
+			}
 	}
 	if (prop.required === true) {
 		def += " NOT NULL";
diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
index f45eb062..860772f6 100755
--- a/lib/Drivers/DDL/postgres.js
+++ b/lib/Drivers/DDL/postgres.js
@@ -178,50 +178,56 @@ var colTypes = {
 };
 
 function buildColumnDefinition(driver, table, name, prop) {
-	var def;
+	var def = driver.query.escapeId(name);
+	var customType;
 
 	switch (prop.type) {
 	    case "text":
 			if (prop.big === true) {
-				def = driver.query.escapeId(name) + " TEXT";
+				def += " TEXT";
 			} else {
-				def = driver.query.escapeId(name) + " VARCHAR(" + Math.max(parseInt(prop.size, 10) || 255, 1) + ")";
+				def += " VARCHAR(" + Math.max(parseInt(prop.size, 10) || 255, 1) + ")";
 			}
 			break;
 		case "serial":
-			def = driver.query.escapeId(name) + " SERIAL";
+			def += " SERIAL";
 			break;
 		case "number":
 			if (prop.rational === false) {
-				def = driver.query.escapeId(name) + " " + colTypes.integer[prop.size || 4];
+				def += " " + colTypes.integer[prop.size || 4];
 			} else {
-				def = driver.query.escapeId(name) + " " + colTypes.floating[prop.size || 4];
+				def += " " + colTypes.floating[prop.size || 4];
 			}
 			break;
 		case "boolean":
-			def = driver.query.escapeId(name) + " BOOLEAN";
+			def += " BOOLEAN";
 			break;
 		case "date":
 			if (prop.time === false) {
-				def = driver.query.escapeId(name) + " DATE";
+				def += " DATE";
 			} else {
-				def = driver.query.escapeId(name) + " TIMESTAMP WITHOUT TIME ZONE";
+				def += " TIMESTAMP WITHOUT TIME ZONE";
 			}
 			break;
 		case "binary":
 		case "object":
-			def = driver.query.escapeId(name) + " BYTEA";
+			def += " BYTEA";
 			break;
 		case "enum":
-			def = driver.query.escapeId(name) + " " + driver.query.escapeId("enum_" + table + "_" + name);
+			def += " " + driver.query.escapeId("enum_" + table + "_" + name);
 			break;
 		case "point":
-			def = driver.query.escapeId(name) + " POINT";
+			def += " POINT";
 			break;
 		default:
-			throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Unknown property type: '" + prop.type + "'", {
-				property : prop
-			});
+			customType = driver.customTypes[prop.type];
+			if (customType) {
+				def += " " + customType.datastoreType(prop);
+			} else {
+				throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Unknown property type: '" + prop.type + "'", {
+					property : prop
+				});
+			}
 	}
 	if (prop.required === true) {
 		def += " NOT NULL";
diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
index 13996173..08c5a9cd 100644
--- a/lib/Drivers/DDL/sqlite.js
+++ b/lib/Drivers/DDL/sqlite.js
@@ -126,39 +126,45 @@ exports.sync = function (driver, opts, cb) {
 };
 
 function buildColumnDefinition(driver, name, prop) {
-	var def;
+	var def = driver.query.escapeId(name);
+	var customType;
 
 	switch (prop.type) {
 		case "text":
-			def = driver.query.escapeId(name) + " TEXT";
+			def += " TEXT";
 			break;
 		case "serial":
-			def = driver.query.escapeId(name) + " INTEGER PRIMARY KEY AUTOINCREMENT";
+			def += " INTEGER PRIMARY KEY AUTOINCREMENT";
 			break;
 		case "number":
 			if (prop.rational === false) {
-				def = driver.query.escapeId(name) + " INTEGER";
+				def += " INTEGER";
 			} else {
-				def = driver.query.escapeId(name) + " REAL";
+				def += " REAL";
 			}
 			break;
 		case "boolean":
-			def = driver.query.escapeId(name) + " INTEGER UNSIGNED";
+			def += " INTEGER UNSIGNED";
 			break;
 		case "date":
-			def = driver.query.escapeId(name) + " DATETIME";
+			def += " DATETIME";
 			break;
 		case "binary":
 		case "object":
-			def = driver.query.escapeId(name) + " BLOB";
+			def += " BLOB";
 			break;
 		case "enum":
-			def = driver.query.escapeId(name) + " INTEGER";
+			def += " INTEGER";
 			break;
 		default:
-			throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Unknown property type: '" + prop.type + "'", {
-				property : prop
-			});
+			customType = driver.customTypes[prop.type];
+			if (customType) {
+				def += " " + customType.datastoreType(prop);
+			} else {
+				throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Unknown property type: '" + prop.type + "'", {
+					property : prop
+				});
+			}
 	}
 	if (prop.required === true) {
 		def += " NOT NULL";
diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index f2b8be9e..5a513b87 100755
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -9,6 +9,7 @@ function Driver(config, connection, opts) {
 	this.config = config || {};
 	this.opts   = opts || {};
 	this.query  = new Query("mysql");
+	this.customTypes = {};
 
 	if (!this.config.timezone) {
 		// force UTC if not defined, UTC is always better..
@@ -226,35 +227,51 @@ Driver.prototype.poolQuery = function (query, cb) {
 };
 
 Driver.prototype.valueToProperty = function (value, property) {
+	var customType;
+
 	switch (property.type) {
 		case "boolean":
-			return !!value;
+			value = !!value;
+			break;
 		case "object":
 			if (typeof value == "object" && !Buffer.isBuffer(value)) {
-				return value;
+				break;
 			}
 			try {
-				return JSON.parse(value);
+				value = JSON.parse(value);
 			} catch (e) {
-				return null;
+				value = null;
 			}
 			break;
 		default:
-			return value;
+			customType = this.customTypes[property.type];
+			if(customType && 'valueToProperty' in customType) {
+				value = customType.valueToProperty(value);
+			}
 	}
+	return value;
 };
 
 Driver.prototype.propertyToValue = function (value, property) {
+	var customType;
+
 	switch (property.type) {
 		case "boolean":
-			return (value) ? 1 : 0;
+			value = (value) ? 1 : 0;
+			break;
 		case "object":
-			return JSON.stringify(value);
+			value = JSON.stringify(value);
+			break;
 		case "point":
 			return function() { return 'POINT(' + value.x + ', ' + value.y + ')'; };
+			break;
 		default:
-			return value;
+			customType = this.customTypes[property.type];
+			if(customType && 'propertyToValue' in customType) {
+				value = customType.propertyToValue(value);
+			}
 	}
+	return value;
 };
 
 Object.defineProperty(Driver.prototype, "isSql", {
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index a59ca9eb..9b6e4a87 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -10,6 +10,7 @@ function Driver(config, connection, opts) {
 	this.config = config || {};
 	this.opts   = opts || {};
 	this.query  = new Query("postgresql");
+	this.customTypes = {};
 
 	if (connection) {
 		this.db = connection;
@@ -238,7 +239,7 @@ Driver.prototype.clear = function (table, cb) {
 };
 
 Driver.prototype.valueToProperty = function (value, property) {
-	var v;
+	var customType, v;
 
 	switch (property.type) {
 		case "object":
@@ -265,21 +266,34 @@ Driver.prototype.valueToProperty = function (value, property) {
 				if (!isNaN(v)) value = v;
 			}
 			break;
+		default:
+			customType = this.customTypes[property.type];
+			if(customType && 'valueToProperty' in customType) {
+				value = customType.valueToProperty(value);
+			}
 	}
 	return value;
 };
 
 Driver.prototype.propertyToValue = function (value, property) {
+	var customType;
+
 	switch (property.type) {
 		case "object":
-			return JSON.stringify(value);
+			value = JSON.stringify(value);
+			break;
 		case "point":
 			return function () {
 				return "POINT(" + value.x + ', ' + value.y + ")";
 			};
+			break;
 		default:
-			return value;
+			customType = this.customTypes[property.type];
+			if(customType && 'propertyToValue' in customType) {
+				value = customType.propertyToValue(value);
+			}
 	}
+	return value;
 };
 
 Object.defineProperty(Driver.prototype, "isSql", {
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 5a4402be..d1051904 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -9,6 +9,7 @@ function Driver(config, connection, opts) {
 	this.config = config || {};
 	this.opts   = opts || {};
 	this.query  = new Query("sqlite");
+	this.customTypes = {};
 
 	if (connection) {
 		this.db = connection;
@@ -205,7 +206,7 @@ Driver.prototype.clear = function (table, cb) {
 };
 
 Driver.prototype.valueToProperty = function (value, property) {
-	var v;
+	var v, customType;
 
 	switch (property.type) {
 		case "boolean":
@@ -213,40 +214,49 @@ Driver.prototype.valueToProperty = function (value, property) {
 			break;
 		case "object":
 			if (typeof value == "object" && !Buffer.isBuffer(value)) {
-				return value;
+				break;
 			}
 			try {
-				return JSON.parse(value);
+				value = JSON.parse(value);
 			} catch (e) {
-				return null;
+				value = null;
 			}
 			break;
 		case "number":
 			if (typeof value != 'number' && value !== null) {
 				v = Number(value);
 				if (!isNaN(v)) {
-					return v;
+					value = v;
 				}
 			}
 			break;
 		case "date":
-			if (typeof value === 'string') {
+			if (typeof value == 'string') {
 				if (value.indexOf('Z', value.length - 1) === -1) {
-					return new Date(value + 'Z');
+					value = new Date(value + 'Z');
 				}
 			}
 			value = new Date(value);
 			break;
+		default:
+			customType = this.customTypes[property.type];
+			if(customType && 'valueToProperty' in customType) {
+				value = customType.valueToProperty(value);
+			}
 	}
 	return value;
 };
 
 Driver.prototype.propertyToValue = function (value, property) {
+	var customType;
+
 	switch (property.type) {
 		case "boolean":
-			return (value) ? 1 : 0;
+			value = (value) ? 1 : 0;
+			break;
 		case "object":
-			return JSON.stringify(value);
+			value = JSON.stringify(value);
+			break;
 		case "date":
 			if (this.config.query && this.config.query.strdates) {
 				if (value instanceof Date) {
@@ -261,7 +271,8 @@ Driver.prototype.propertyToValue = function (value, property) {
 					}
 					var strdate = year + '-' + month + '-' + date;
 					if (property.time === false) {
-						return strdate;
+						value = strdate;
+						break;
 					}
 
 					var hours = value.getUTCHours();
@@ -284,14 +295,17 @@ Driver.prototype.propertyToValue = function (value, property) {
 						millis = '0' + millis;
 					}
 					strdate += ' ' + hours + ':' + minutes + ':' + seconds + '.' + millis + '000';
-					return  strdate;
+					value = strdate;
 				}
-
 			}
-			return value;
+			break;
 		default:
-			return value;
+			customType = this.customTypes[property.type];
+			if(customType && 'propertyToValue' in customType) {
+				value = customType.propertyToValue(value);
+			}
 	}
+	return value;
 };
 
 Object.defineProperty(Driver.prototype, "isSql", {
diff --git a/lib/Model.js b/lib/Model.js
index 64bf7661..837480fb 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -216,6 +216,7 @@ function Model(opts) {
 					properties          : opts.properties,
 					allProperties       : allProperties,
 					indexes             : opts.indexes || [],
+					customTypes         : opts.db.customTypes,
 					one_associations    : one_associations,
 					many_associations   : many_associations,
 					extend_associations : extend_associations
@@ -620,7 +621,7 @@ function Model(opts) {
 
 	// standardize properties
 	for (k in opts.properties) {
-		opts.properties[k] = Property.normalize(opts.properties[k], opts.settings);
+		opts.properties[k] = Property.normalize(opts.properties[k], opts.db.customTypes, opts.settings);
 		opts.properties[k].klass = 'primary';
 		allProperties[k] = opts.properties[k];
 
diff --git a/lib/ORM.js b/lib/ORM.js
index 26b569b1..ce95b250 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -144,6 +144,7 @@ function ORM(driver_name, driver, settings) {
 	this.tools       = {};
 	this.models      = {};
 	this.plugins     = [];
+	this.customTypes = {};
 
 	for (var k in Query.Comparators) {
 		this.tools[Query.Comparators[k]] = Query[Query.Comparators[k]];
@@ -235,6 +236,11 @@ ORM.prototype.define = function (name, properties, opts) {
 
 	return this.models[name];
 };
+ORM.prototype.defineType = function (name, opts) {
+	this.customTypes[name] = opts;
+	this.driver.customTypes[name] = opts;
+	return this;
+}
 ORM.prototype.ping = function (cb) {
 	this.driver.ping(cb);
 
diff --git a/lib/Property.js b/lib/Property.js
index d9de4949..e8a00933 100644
--- a/lib/Property.js
+++ b/lib/Property.js
@@ -1,6 +1,6 @@
 var ErrorCodes = require("./ErrorCodes");
 
-exports.normalize = function (prop, Settings) {
+exports.normalize = function (prop, customTypes, Settings) {
 	if (typeof prop === "function") {
 		switch (prop.name) {
 			case "String":
@@ -31,7 +31,9 @@ exports.normalize = function (prop, Settings) {
 	}
 
 	if ([ "text", "number", "boolean", "date", "enum", "object", "binary", "point" ].indexOf(prop.type) === -1) {
-		throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Unknown property type: " + prop.type);
+		if (!(prop.type in customTypes)) {
+			throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Unknown property type: " + prop.type);
+		}
 	}
 
 	if (!prop.hasOwnProperty("required") && Settings.get("properties.required")) {
diff --git a/test/integration/property-custom.js b/test/integration/property-custom.js
new file mode 100644
index 00000000..d2d9f03e
--- /dev/null
+++ b/test/integration/property-custom.js
@@ -0,0 +1,74 @@
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var common   = require('../common');
+var ORM      = require('../../');
+
+describe("custom types", function() {
+  if (common.protocol() == 'mongodb') return;
+
+  var db = null;
+  var LottoTicket = null;
+
+  var setup = function (opts) {
+    return function (done) {
+      db.defineType('numberArray', {
+        datastoreType  : function(prop)        {
+          return 'TEXT'
+        },
+        valueToProperty: function(value, prop) {
+          if (Array.isArray(value)) {
+            return value;
+          } else {
+            return value.split(',').map(function (v) {
+              return Number(v);
+            });
+          }
+        },
+        propertyToValue: function(value, prop) {
+          return value.join(',')
+        }
+      });
+
+      LottoTicket = db.define('lotto_ticket', {
+        numbers: { type: 'numberArray' }
+      });
+
+      return helper.dropSync(LottoTicket, done);
+    };
+  };
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    db.close();
+  });
+
+  it("should create the table", function (done) {
+    setup()(done);
+  });
+
+  it("should store data in the table", function (done) {
+    var ticket = new LottoTicket({ numbers: [4,23,6,45,9,12,3,29] });
+
+    ticket.save(function (err) {
+      should.not.exist(err);
+
+      LottoTicket.find().all(function (err, items) {
+        should.not.exist(err);
+        should.equal(items.length, 1);
+        should(Array.isArray(items[0].numbers));
+
+        [4,23,6,45,9,12,3,29].should.eql(items[0].numbers);
+
+        done();
+      });
+    });
+  });
+
+});
diff --git a/test/integration/property.js b/test/integration/property.js
index 807afe83..a9d95e93 100644
--- a/test/integration/property.js
+++ b/test/integration/property.js
@@ -5,49 +5,49 @@ var Property = ORM.Property;
 describe("Property", function () {
 	describe("passing String", function() {
 		it("should return type: 'text'", function (done) {
-			Property.normalize(String, ORM.settings).type.should.equal("text");
+			Property.normalize(String, {}, ORM.settings).type.should.equal("text");
 
 			return done();
 		});
 	});
 	describe("passing Number", function() {
 		it("should return type: 'number'", function (done) {
-			Property.normalize(Number, ORM.settings).type.should.equal("number");
+			Property.normalize(Number, {}, ORM.settings).type.should.equal("number");
 
 			return done();
 		});
 	});
 	describe("passing Boolean", function() {
 		it("should return type: 'boolean'", function (done) {
-			Property.normalize(Boolean, ORM.settings).type.should.equal("boolean");
+			Property.normalize(Boolean, {}, ORM.settings).type.should.equal("boolean");
 
 			return done();
 		});
 	});
 	describe("passing Date", function() {
 		it("should return type: 'date'", function (done) {
-			Property.normalize(Date, ORM.settings).type.should.equal("date");
+			Property.normalize(Date, {}, ORM.settings).type.should.equal("date");
 
 			return done();
 		});
 	});
 	describe("passing Object", function() {
 		it("should return type: 'object'", function (done) {
-			Property.normalize(Object, ORM.settings).type.should.equal("object");
+			Property.normalize(Object, {}, ORM.settings).type.should.equal("object");
 
 			return done();
 		});
 	});
 	describe("passing Buffer", function() {
 		it("should return type: 'binary'", function (done) {
-			Property.normalize(Buffer, ORM.settings).type.should.equal("binary");
+			Property.normalize(Buffer, {}, ORM.settings).type.should.equal("binary");
 
 			return done();
 		});
 	});
 	describe("passing an Array of items", function() {
 		it("should return type: 'enum' with list of items", function (done) {
-			var prop = Property.normalize([ 1, 2, 3 ], ORM.settings);
+			var prop = Property.normalize([ 1, 2, 3 ], {}, ORM.settings);
 
 			prop.type.should.equal("enum");
 			prop.values.should.have.property("length", 3);
@@ -57,20 +57,20 @@ describe("Property", function () {
 	});
 	describe("passing a string type", function() {
 		it("should return type: <type>", function (done) {
-			Property.normalize("text", ORM.settings).type.should.equal("text");
+			Property.normalize("text", {}, ORM.settings).type.should.equal("text");
 
 			return done();
 		});
     it("should accept: 'point'", function(done) {
-      Property.normalize("point", ORM.settings).type.should.equal("point");
-      
+      Property.normalize("point", {}, ORM.settings).type.should.equal("point");
+
       return done();
     });
 
 		describe("if not valid", function () {
 			it("should throw", function (done) {
 				(function () {
-					Property.normalize("string", ORM.settings);
+					Property.normalize("string", {}, ORM.settings);
 				}).should.throw();
 
 				return done();

From 195e47936f704267ae9afcdddbeef5a0372d271b Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 4 Sep 2013 09:49:24 +1000
Subject: [PATCH 0831/1246] Update Changelog.md

---
 Changelog.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 5aab4837..140a0168 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,23 @@
 ### v2.2.0 - (todo, in future)
 - Fixes error code spelling: `PARAM_MISSMATCH` -> `PARAM_MISMATCH`
 
+### v2.1.next - (available on master but not on NPM yet)
+- Add TypeScript interface
+- Add support for custom property types (#305)
+- Add promises to query chain (#316)
+- Unique validator can be scoped and case insensitive (#288)
+- Allow finding by associations (#293)
+- Allow custom join tables (#276)
+- Allow async express middleware (#291)
+- Allow auto-escaping for custom queries (#304)
+- Deprecated `PARAM_MISSMATCH` ErrorCode in favour of correctly spelt `PARAM_MISMATCH` (#315)
+- Fix `NaN` handling (#310)
+- Fixes stack overflow when saving auto-fetched model with relations (#279)
+- Fix `afterLoad` hook error handling (#301)
+- Fix sqlite find with boolean (#292)
+- Fix saving Instance.extra fields (#312)
+- Fix incorrect SQL query (#313)
+
 ### v2.1.0 - 3 Aug 2013
 
 - Adds License (MIT) file (closes #271)

From dcb321f45f578f414dfd0b5674136e474c50f45a Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 4 Sep 2013 09:56:34 +1000
Subject: [PATCH 0832/1246] Spaces -> tabs

---
 test/integration/property-custom.js | 106 ++++++++++++++--------------
 1 file changed, 53 insertions(+), 53 deletions(-)

diff --git a/test/integration/property-custom.js b/test/integration/property-custom.js
index d2d9f03e..3cd4b442 100644
--- a/test/integration/property-custom.js
+++ b/test/integration/property-custom.js
@@ -4,71 +4,71 @@ var common   = require('../common');
 var ORM      = require('../../');
 
 describe("custom types", function() {
-  if (common.protocol() == 'mongodb') return;
+	if (common.protocol() == 'mongodb') return;
 
-  var db = null;
-  var LottoTicket = null;
+	var db = null;
+	var LottoTicket = null;
 
-  var setup = function (opts) {
-    return function (done) {
-      db.defineType('numberArray', {
-        datastoreType  : function(prop)        {
-          return 'TEXT'
-        },
-        valueToProperty: function(value, prop) {
-          if (Array.isArray(value)) {
-            return value;
-          } else {
-            return value.split(',').map(function (v) {
-              return Number(v);
-            });
-          }
-        },
-        propertyToValue: function(value, prop) {
-          return value.join(',')
-        }
-      });
+	var setup = function (opts) {
+		return function (done) {
+			db.defineType('numberArray', {
+				datastoreType: function(prop) {
+					return 'TEXT'
+				},
+				valueToProperty: function(value, prop) {
+					if (Array.isArray(value)) {
+						return value;
+					} else {
+						return value.split(',').map(function (v) {
+							return Number(v);
+						});
+					}
+				},
+				propertyToValue: function(value, prop) {
+					return value.join(',')
+				}
+			});
 
-      LottoTicket = db.define('lotto_ticket', {
-        numbers: { type: 'numberArray' }
-      });
+			LottoTicket = db.define('lotto_ticket', {
+				numbers: { type: 'numberArray' }
+			});
 
-      return helper.dropSync(LottoTicket, done);
-    };
-  };
+			return helper.dropSync(LottoTicket, done);
+		};
+	};
 
-  before(function (done) {
-    helper.connect(function (connection) {
-      db = connection;
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
 
-      return done();
-    });
-  });
+			return done();
+		});
+	});
 
-  after(function () {
-    db.close();
-  });
+	after(function () {
+		db.close();
+	});
 
-  it("should create the table", function (done) {
-    setup()(done);
-  });
+	it("should create the table", function (done) {
+		setup()(done);
+	});
 
-  it("should store data in the table", function (done) {
-    var ticket = new LottoTicket({ numbers: [4,23,6,45,9,12,3,29] });
+	it("should store data in the table", function (done) {
+		var ticket = new LottoTicket({ numbers: [4,23,6,45,9,12,3,29] });
 
-    ticket.save(function (err) {
-      should.not.exist(err);
+		ticket.save(function (err) {
+			should.not.exist(err);
 
-      LottoTicket.find().all(function (err, items) {
-        should.not.exist(err);
-        should.equal(items.length, 1);
-        should(Array.isArray(items[0].numbers));
+			LottoTicket.find().all(function (err, items) {
+				should.not.exist(err);
+				should.equal(items.length, 1);
+				should(Array.isArray(items[0].numbers));
 
-        [4,23,6,45,9,12,3,29].should.eql(items[0].numbers);
+				[4,23,6,45,9,12,3,29].should.eql(items[0].numbers);
 
-        done();
-      });
-    });
-  });
+				done();
+			});
+		});
+	});
 
 });

From 034aa5ee666b5ae2e4c80846031ab65298a40985 Mon Sep 17 00:00:00 2001
From: Dirk Mccormick <dirk@jetsetter.com>
Date: Tue, 3 Sep 2013 18:15:18 -0400
Subject: [PATCH 0833/1246] Use local as default timezone, pass timezone option
 to Query

---
 lib/Drivers/DML/mysql.js | 5 ++---
 lib/ORM.js               | 3 +++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 5a513b87..90e305c1 100755
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -8,13 +8,12 @@ exports.Driver = Driver;
 function Driver(config, connection, opts) {
 	this.config = config || {};
 	this.opts   = opts || {};
-	this.query  = new Query("mysql");
 	this.customTypes = {};
 
 	if (!this.config.timezone) {
-		// force UTC if not defined, UTC is always better..
-		this.config.timezone = "Z";
+		this.config.timezone = "local";
 	}
+	this.query  = new Query({ dialect: "mysql", timezone: config.timezone });
 
 	this.reconnect(null, connection);
 
diff --git a/lib/ORM.js b/lib/ORM.js
index ce95b250..01b532fd 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -70,6 +70,9 @@ exports.connect = function (opts, cb) {
 			return ORM_Error(ErrorCodes.generateError(ErrorCodes.PARAM_MISMATCH, "CONNECTION_URL_EMPTY"), cb);
 		}
 		opts = url.parse(opts, true);
+		for(var k in opts.query) {
+			opts[k] = opts.query[k];
+		}
 	}
 	if (!opts.database) {
 		// if (!opts.pathname) {

From abc858703c3b53b9a625104ebfc9dad8f54f14c4 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 9 Sep 2013 23:14:56 +1000
Subject: [PATCH 0834/1246] Add timezone tests

---
 package.json                           |  2 +-
 test/common.js                         | 71 ++++++++++---------
 test/integration/property-timezones.js | 98 ++++++++++++++++++++++++++
 test/support/spec_helper.js            |  8 ++-
 4 files changed, 142 insertions(+), 37 deletions(-)
 create mode 100644 test/integration/property-timezones.js

diff --git a/package.json b/package.json
index c13e9d7f..6cf38cfd 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
 	"analyse"     : false,
 	"dependencies": {
 		"enforce"   : "0.1.2",
-		"sql-query" : "0.1.12",
+		"sql-query" : "0.1.13",
 		"hat"       : "0.0.3",
 		"lodash"    : "1.3.1"
 	},
diff --git a/test/common.js b/test/common.js
index 241f8ffe..56f3ced8 100644
--- a/test/common.js
+++ b/test/common.js
@@ -1,7 +1,10 @@
-var common = exports;
-var path   = require('path');
-var async  = require('async');
-var ORM    = require('../');
+var common      = exports;
+var path        = require('path');
+var async       = require('async');
+var _           = require('lodash');
+var util        = require('util');
+var querystring = require('querystring');
+var ORM         = require('../');
 
 common.ORM = ORM;
 
@@ -13,8 +16,8 @@ common.isTravis = function() {
 	return Boolean(process.env.CI);
 };
 
-common.createConnection = function(cb) {
-	ORM.connect(this.getConnectionString(), cb);
+common.createConnection = function(opts, cb) {
+	ORM.connect(this.getConnectionString(opts), cb);
 };
 
 common.hasConfig = function (proto) {
@@ -51,55 +54,53 @@ common.getConfig = function () {
 	}
 };
 
-common.getConnectionString = function () {
+common.getConnectionString = function (opts) {
 	var url;
+	var query;
 
 	if (common.isTravis()) {
+		query = querystring.stringify(opts.query || {});
+
 		switch (this.protocol()) {
 			case 'mysql':
-				return 'mysql://root@localhost/orm_test';
+				return 'mysql://root@localhost/orm_test?' + query;
 			case 'postgres':
 			case 'redshift':
-				return 'postgres://postgres@localhost/orm_test';
+				return 'postgres://postgres@localhost/orm_test?' + query;
 			case 'sqlite':
-				return 'sqlite://';
+				return 'sqlite://?' + query;
 			case 'mongodb':
-				return 'mongodb://localhost/test';
+				return 'mongodb://localhost/test?' + query;
 			default:
 				throw new Error("Unknown protocol");
 		}
 	} else {
-		var config = require("./config")[this.protocol()];
+		var protocol = this.protocol();
+		var config   = require("./config")[protocol];
+		var database = { mongodb: 'test' }[protocol] || 'orm_test';
+		var user     = { postgres: 'postgres' }[protocol] || 'root';
 
-		switch (this.protocol()) {
+
+		opts = opts || {};
+		_.defaults(config, {
+			user: user, password: '', host: 'localhost', database: database, pathname: '', query: {}
+		});
+		_.merge(config, opts);
+		query = querystring.stringify(config.query);
+
+		switch (protocol) {
 			case 'mysql':
-				return 'mysql://' +
-				       (config.user || 'root') +
-				       (config.password ? ':' + config.password : '') +
-				       '@' + (config.host || 'localhost') +
-				       '/' + (config.database || 'orm_test');
 			case 'postgres':
-				return 'postgres://' +
-				       (config.user || 'postgres') +
-				       (config.password ? ':' + config.password : '') +
-				       '@' + (config.host || 'localhost') +
-				       '/' + (config.database || 'orm_test');
 			case 'redshift':
-				return 'redshift://' +
-				       (config.user || 'postgres') +
-				       (config.password ? ':' + config.password : '') +
-				       '@' + (config.host || 'localhost') +
-				       '/' + (config.database || 'orm_test');
 			case 'mongodb':
-				return 'mongodb://' +
-				       (config.user || '') +
-				       (config.password ? ':' + config.password : '') +
-				       '@' + (config.host || 'localhost') +
-				       '/' + (config.database || 'test');
+				return util.format("%s://%s:%s@%s/%s?%s",
+					protocol, config.user, config.password,
+					config.host, config.database, query
+				);
 			case 'sqlite':
-				return 'sqlite://' + (config.pathname || "");
+				return util.format("%s://%s?%s", protocol, config.pathname, query);
 			default:
-				throw new Error("Unknown protocol");
+				throw new Error("Unknown protocol " + protocol);
 		}
 	}
 	return url;
diff --git a/test/integration/property-timezones.js b/test/integration/property-timezones.js
new file mode 100644
index 00000000..69a7b1ca
--- /dev/null
+++ b/test/integration/property-timezones.js
@@ -0,0 +1,98 @@
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var common   = require('../common');
+var ORM      = require('../../');
+
+// Only MySql support for now
+if (common.protocol() != 'mysql') return;
+
+describe("Timezones", function() {
+	var db    = null;
+	var Event = null;
+
+	var setup = function (opts) {
+		return function (done) {
+			helper.connect({ query: opts.query }, function (connection) {
+				db = connection;
+				db.settings.set('instance.cache', false);
+
+				Event = db.define("event", {
+					name : { type: 'text' },
+					when : { type: 'date', time: true }
+				});
+
+				if (opts.sync) {
+					return helper.dropSync(Event, done);
+				} else {
+					return done();
+				}
+			});
+		};
+	};
+
+	describe("specified", function () {
+		var a, zones = ['local', '-0734', '+11:22'];
+
+		for (a = 0; a < zones.length; a++ ) {
+			describe(zones[a], function () {
+				before(setup({ sync: true, query: { timezone: zones[a] } }));
+
+				after(function () {
+					return db.close();
+				});
+
+				it("should get back the same date that was stored", function (done) {
+					var when = new Date(2013,12,5,11,34,27);
+
+					Event.create({ name: "raid fridge", when: when }, function (err) {
+						should.not.exist(err);
+
+						Event.one({ name: "raid fridge" }, function (err, item) {
+							should.not.exist(err);
+							when.should.eql(item.when);
+
+							done();
+						});
+					});
+				});
+			});
+		}
+	});
+
+	describe("different for each connection", function () {
+		before(setup({ query: { timezone: '-1234' } }));
+
+		after(function () {
+			return db.close();
+		});
+
+		it("should get back a correctly offset time", function (done) {
+			var when = new Date(2013,12,5,5,34,27);
+
+			setup({ sync: true, query: { timezone: '+0200' }})(function () {
+				Event.create({ name: "raid fridge", when: when }, function (err) {
+					should.not.exist(err);
+
+					Event.one({ name: "raid fridge" }, function (err, item) {
+						should.not.exist(err);
+						when.should.eql(item.when);
+
+						db.close();
+
+						setup({ query: { timezone: '+0400' }})(function () {
+							Event.one({ name: "raid fridge" }, function (err, item) {
+								var expected = new Date(2013,12,5,3,34,27);
+
+								should.not.exist(err);
+								expected.should.eql(item.when);
+
+								done();
+							});
+						});
+					});
+				});
+			});
+		});
+	});
+
+});
diff --git a/test/support/spec_helper.js b/test/support/spec_helper.js
index ea83eedf..b3286bae 100644
--- a/test/support/spec_helper.js
+++ b/test/support/spec_helper.js
@@ -3,7 +3,13 @@ var async  = require('async');
 var should = require('should');
 
 module.exports.connect = function(cb) {
-	common.createConnection(function (err, conn) {
+	var opts = {};
+
+	if (1 in arguments) {
+		opts = arguments[0];
+		cb   = arguments[1];
+	}
+	common.createConnection(opts, function (err, conn) {
 		if (err) throw err;
 		cb(conn);
 	});

From cabce0db9e91d9ade1254d836cf0db534abff06e Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 10 Sep 2013 09:38:18 +1000
Subject: [PATCH 0835/1246] test helper fixes

---
 test/common.js | 91 +++++++++++++++++++++++---------------------------
 1 file changed, 42 insertions(+), 49 deletions(-)

diff --git a/test/common.js b/test/common.js
index 56f3ced8..a3acb03d 100644
--- a/test/common.js
+++ b/test/common.js
@@ -55,55 +55,48 @@ common.getConfig = function () {
 };
 
 common.getConnectionString = function (opts) {
-	var url;
-	var query;
-
-	if (common.isTravis()) {
-		query = querystring.stringify(opts.query || {});
-
-		switch (this.protocol()) {
-			case 'mysql':
-				return 'mysql://root@localhost/orm_test?' + query;
-			case 'postgres':
-			case 'redshift':
-				return 'postgres://postgres@localhost/orm_test?' + query;
-			case 'sqlite':
-				return 'sqlite://?' + query;
-			case 'mongodb':
-				return 'mongodb://localhost/test?' + query;
-			default:
-				throw new Error("Unknown protocol");
-		}
-	} else {
-		var protocol = this.protocol();
-		var config   = require("./config")[protocol];
-		var database = { mongodb: 'test' }[protocol] || 'orm_test';
-		var user     = { postgres: 'postgres' }[protocol] || 'root';
-
-
-		opts = opts || {};
-		_.defaults(config, {
-			user: user, password: '', host: 'localhost', database: database, pathname: '', query: {}
-		});
-		_.merge(config, opts);
-		query = querystring.stringify(config.query);
-
-		switch (protocol) {
-			case 'mysql':
-			case 'postgres':
-			case 'redshift':
-			case 'mongodb':
-				return util.format("%s://%s:%s@%s/%s?%s",
-					protocol, config.user, config.password,
-					config.host, config.database, query
-				);
-			case 'sqlite':
-				return util.format("%s://%s?%s", protocol, config.pathname, query);
-			default:
-				throw new Error("Unknown protocol " + protocol);
-		}
-	}
-	return url;
+	var config, query;
+  var protocol = this.protocol();
+
+  if (common.isTravis()) {
+    config = {};
+  } else {
+    config = require("./config")[protocol];
+  }
+
+  opts = opts || {};
+  _.defaults(config, {
+    user     : { postgres: 'postgres', redshift: 'postgres' }[protocol] || 'root',
+    database : { mongodb:  'test'     }[protocol] || 'orm_test',
+    password : '',
+    host     : 'localhost',
+    pathname : '',
+    query    : {}
+  });
+  _.merge(config, opts);
+  query = querystring.stringify(config.query);
+
+	switch (protocol) {
+    case 'mysql':
+    case 'postgres':
+    case 'redshift':
+    case 'mongodb':
+      if (common.isTravis()) {
+      	if (protocol == 'redshift') protocol = 'postgres';
+        return util.format("%s://%s@%s/%s?%s",
+          protocol, config.user, config.host, config.database, query
+        );
+      } else {
+        return util.format("%s://%s:%s@%s/%s?%s",
+          protocol, config.user, config.password,
+          config.host, config.database, query
+        );
+      }
+    case 'sqlite':
+      return util.format("%s://%s?%s", protocol, config.pathname, query);
+    default:
+      throw new Error("Unknown protocol " + protocol);
+  }
 };
 
 common.retry = function (before, run, until, done, args) {

From db0b7685ecb9362738640ef5118ad0224710ad53 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 10 Sep 2013 18:33:54 +1000
Subject: [PATCH 0836/1246] Loosen validations for sqlite due to random 
 failures

---
 test/support/spec_helper.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/support/spec_helper.js b/test/support/spec_helper.js
index b3286bae..3cfeb9b3 100644
--- a/test/support/spec_helper.js
+++ b/test/support/spec_helper.js
@@ -27,7 +27,9 @@ module.exports.dropSync = function (models, done) {
 			item.sync(cb);
 		});
 	}, function (err) {
-		should.not.exist(err);
+		if (common.protocol() != 'sqlite') {
+			should.not.exist(err);
+		}
 		done(err);
 	});
 };

From 3878f9f77ba9e483251fd9ea8df6b864341f6025 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 10 Sep 2013 19:03:10 +1000
Subject: [PATCH 0837/1246] Adjust timezone test

---
 test/integration/property-timezones.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/test/integration/property-timezones.js b/test/integration/property-timezones.js
index 69a7b1ca..dddad060 100644
--- a/test/integration/property-timezones.js
+++ b/test/integration/property-timezones.js
@@ -42,7 +42,7 @@ describe("Timezones", function() {
 				});
 
 				it("should get back the same date that was stored", function (done) {
-					var when = new Date(2013,12,5,11,34,27);
+					var when = new Date(2013,12,5,5,34,27);
 
 					Event.create({ name: "raid fridge", when: when }, function (err) {
 						should.not.exist(err);
@@ -60,8 +60,6 @@ describe("Timezones", function() {
 	});
 
 	describe("different for each connection", function () {
-		before(setup({ query: { timezone: '-1234' } }));
-
 		after(function () {
 			return db.close();
 		});

From 5a9d5665ca255069c4e619bc78082cb288026ae7 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 10 Sep 2013 19:18:11 +1000
Subject: [PATCH 0838/1246] Mention timezone changes

---
 Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Changelog.md b/Changelog.md
index 140a0168..ce6b3933 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -10,6 +10,7 @@
 - Allow custom join tables (#276)
 - Allow async express middleware (#291)
 - Allow auto-escaping for custom queries (#304)
+- Allow passing timezone in database connection string - mysql only for now (#325, #303)
 - Deprecated `PARAM_MISSMATCH` ErrorCode in favour of correctly spelt `PARAM_MISMATCH` (#315)
 - Fix `NaN` handling (#310)
 - Fixes stack overflow when saving auto-fetched model with relations (#279)

From 0505b3f7781a54cfeb203ca05953fea41bec3e6d Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 10 Sep 2013 21:14:30 +1000
Subject: [PATCH 0839/1246] Fix mongo tests

---
 test/common.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/common.js b/test/common.js
index a3acb03d..080463e8 100644
--- a/test/common.js
+++ b/test/common.js
@@ -66,7 +66,7 @@ common.getConnectionString = function (opts) {
 
   opts = opts || {};
   _.defaults(config, {
-    user     : { postgres: 'postgres', redshift: 'postgres' }[protocol] || 'root',
+    user     : { postgres: 'postgres', redshift: 'postgres', mongodb: '' }[protocol] || 'root',
     database : { mongodb:  'test'     }[protocol] || 'orm_test',
     password : '',
     host     : 'localhost',
@@ -90,7 +90,7 @@ common.getConnectionString = function (opts) {
         return util.format("%s://%s:%s@%s/%s?%s",
           protocol, config.user, config.password,
           config.host, config.database, query
-        );
+        ).replace(':@','@');
       }
     case 'sqlite':
       return util.format("%s://%s?%s", protocol, config.pathname, query);

From 0c04a378ca51a448f6fda010a60d4113d2f3c941 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 10 Sep 2013 20:11:59 +0100
Subject: [PATCH 0840/1246] sql-query@0.1.15

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6cf38cfd..0cb2ac2a 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
 	"analyse"     : false,
 	"dependencies": {
 		"enforce"   : "0.1.2",
-		"sql-query" : "0.1.13",
+		"sql-query" : "0.1.15",
 		"hat"       : "0.0.3",
 		"lodash"    : "1.3.1"
 	},

From ffa0be85e53fe9721faee73935d0bcd0b36840a7 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 10 Sep 2013 21:03:31 +1000
Subject: [PATCH 0841/1246] Allow ordering by escaped sql Fixes #311

---
 lib/ChainFind.js                     |  7 ++++
 test/integration/model-find-chain.js | 49 ++++++++++++++++++----------
 2 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 7edaba9e..0dc86229 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -60,6 +60,13 @@ function ChainFind(Model, opts) {
 			}
 			return this;
 		},
+		orderRaw: function (str, args) {
+			if (!Array.isArray(opts.order)) {
+				opts.order = [];
+			}
+			opts.order.push([ str, args || [] ]);
+			return this;
+		},
 		count: function (cb) {
 			opts.driver.count(opts.table, opts.conditions, {}, function (err, data) {
 				if (err || data.length === 0) {
diff --git a/test/integration/model-find-chain.js b/test/integration/model-find-chain.js
index 53b335da..09397b89 100644
--- a/test/integration/model-find-chain.js
+++ b/test/integration/model-find-chain.js
@@ -89,10 +89,10 @@ describe("Model.find() chaining", function() {
 		});
 	});
 
-	describe(".order('property')", function () {
+	describe("order", function () {
 		before(setup());
 
-		it("should order by that property ascending", function (done) {
+		it("('property') should order by that property ascending", function (done) {
 			Person.find().order("age").run(function (err, instances) {
 				should.equal(err, null);
 				instances.should.have.property("length", 3);
@@ -102,12 +102,8 @@ describe("Model.find() chaining", function() {
 				return done();
 			});
 		});
-	});
-
-	describe(".order('-property')", function () {
-		before(setup());
 
-		it("should order by that property descending", function (done) {
+		it("('-property') should order by that property descending", function (done) {
 			Person.find().order("-age").run(function (err, instances) {
 				should.equal(err, null);
 				instances.should.have.property("length", 3);
@@ -117,13 +113,35 @@ describe("Model.find() chaining", function() {
 				return done();
 			});
 		});
+
+		it("('property', 'Z') should order by that property descending", function (done) {
+			Person.find().order("age", "Z").run(function (err, instances) {
+				should.equal(err, null);
+				instances.should.have.property("length", 3);
+				instances[0].age.should.equal(20);
+				instances[2].age.should.equal(18);
+
+				return done();
+			});
+		});
 	});
 
-	describe(".order('property', 'Z')", function () {
+	describe("orderRaw", function () {
 		before(setup());
 
-		it("should order by that property descending", function (done) {
-			Person.find().order("age", "Z").run(function (err, instances) {
+		it("should allow ordering by SQL", function (done) {
+			Person.find().orderRaw("age DESC").run(function (err, instances) {
+				should.equal(err, null);
+				instances.should.have.property("length", 3);
+				instances[0].age.should.equal(20);
+				instances[2].age.should.equal(18);
+
+				return done();
+			});
+		});
+
+		it("should allow ordering by SQL with escaping", function (done) {
+			Person.find().orderRaw("?? DESC", ['age']).run(function (err, instances) {
 				should.equal(err, null);
 				instances.should.have.property("length", 3);
 				instances[0].age.should.equal(20);
@@ -134,10 +152,10 @@ describe("Model.find() chaining", function() {
 		});
 	});
 
-	describe(".only('property', ...)", function () {
+	describe("only", function () {
 		before(setup());
 
-		it("should return only those properties, others null", function (done) {
+		it("('property', ...) should return only those properties, others null", function (done) {
 			Person.find().only("age", "surname").order("-age").run(function (err, instances) {
 				should.equal(err, null);
 				instances.should.have.property("length", 3);
@@ -148,12 +166,9 @@ describe("Model.find() chaining", function() {
 				return done();
 			});
 		});
-	});
-
-	describe(".only('property1', ...)", function () {
-		before(setup());
 
-		it("should return only those properties, others null", function (done) {
+		// This works if cache is disabled. I suspect a cache bug.
+		xit("(['property', ...]) should return only those properties, others null", function (done) {
 			Person.find().only([ "age", "surname" ]).order("-age").run(function (err, instances) {
 				should.equal(err, null);
 				instances.should.have.property("length", 3);

From 0802a3048320129f1fe297a5844ebbc931033d6d Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 10 Sep 2013 21:17:41 +1000
Subject: [PATCH 0842/1246] Disable orderRaw tests for mongo

---
 test/integration/model-find-chain.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/integration/model-find-chain.js b/test/integration/model-find-chain.js
index 09397b89..83638c5e 100644
--- a/test/integration/model-find-chain.js
+++ b/test/integration/model-find-chain.js
@@ -127,6 +127,8 @@ describe("Model.find() chaining", function() {
 	});
 
 	describe("orderRaw", function () {
+		if (common.protocol() == 'mongodb') return;
+
 		before(setup());
 
 		it("should allow ordering by SQL", function (done) {

From bdaefe07e3bc490b37e0e1c342e8c7eb57c92eac Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 11 Sep 2013 09:35:11 +1000
Subject: [PATCH 0843/1246] Also enable specifying timezone for postgres

---
 test/integration/property-timezones.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/integration/property-timezones.js b/test/integration/property-timezones.js
index dddad060..efadd254 100644
--- a/test/integration/property-timezones.js
+++ b/test/integration/property-timezones.js
@@ -4,7 +4,7 @@ var common   = require('../common');
 var ORM      = require('../../');
 
 // Only MySql support for now
-if (common.protocol() != 'mysql') return;
+if (common.protocol() == 'mongodb' || common.protocol() == 'sqlite') return;
 
 describe("Timezones", function() {
 	var db    = null;
@@ -59,11 +59,12 @@ describe("Timezones", function() {
 		}
 	});
 
-	describe("different for each connection", function () {
+	xdescribe("different for each connection", function () {
 		after(function () {
 			return db.close();
 		});
 
+		// This isn't consistent accross drivers. Needs more thinking and investigation.
 		it("should get back a correctly offset time", function (done) {
 			var when = new Date(2013,12,5,5,34,27);
 

From 5b9f5d1cb119a378322f32420ef96375bb7c8e12 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 11 Sep 2013 09:54:21 +1000
Subject: [PATCH 0844/1246] Update readme & changelog

---
 Changelog.md | 3 ++-
 Readme.md    | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index ce6b3933..1db6d578 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -10,7 +10,8 @@
 - Allow custom join tables (#276)
 - Allow async express middleware (#291)
 - Allow auto-escaping for custom queries (#304)
-- Allow passing timezone in database connection string - mysql only for now (#325, #303)
+- Allow passing timezone in database connection string - mysql & postgres only for now (#325, #303)
+- Allow ordering by raw sql - .orderRaw() when chaining
 - Deprecated `PARAM_MISSMATCH` ErrorCode in favour of correctly spelt `PARAM_MISMATCH` (#315)
 - Fix `NaN` handling (#310)
 - Fixes stack overflow when saving auto-fetched model with relations (#279)
diff --git a/Readme.md b/Readme.md
index f0a895db..40335806 100755
--- a/Readme.md
+++ b/Readme.md
@@ -400,6 +400,13 @@ It's bad practice to manually escape SQL parameters as it's error prone and expo
 The `?` syntax takes care of escaping for you, by safely substituting the question mark in the query with the parameters provided.
 You can also chain multiple `where` clauses as needed.
 
+You can also `order` or `orderRaw`:
+```js
+Person.find({ age: 18 }).order('-name').all( ... );
+// see the 'Raw queries' section below for more details
+Person.find({ age: 18 }).orderRaw("?? DESC", ['age']).all( ... );
+```
+
 You can also chain and just get the count in the end. In this case, offset, limit and order are ignored.
 
 ```js

From d30122ab9841ee896da35f6e831402bc55cb1aa5 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 11 Sep 2013 09:56:24 +1000
Subject: [PATCH 0845/1246] Reference issues

---
 Changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 1db6d578..0c9cf06a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -11,7 +11,7 @@
 - Allow async express middleware (#291)
 - Allow auto-escaping for custom queries (#304)
 - Allow passing timezone in database connection string - mysql & postgres only for now (#325, #303)
-- Allow ordering by raw sql - .orderRaw() when chaining
+- Allow ordering by raw sql - .orderRaw() when chaining (#308, #311)
 - Deprecated `PARAM_MISSMATCH` ErrorCode in favour of correctly spelt `PARAM_MISMATCH` (#315)
 - Fix `NaN` handling (#310)
 - Fixes stack overflow when saving auto-fetched model with relations (#279)

From c50f6b6bb724cbe7dc5f404f121fd178c3e98821 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Fri, 13 Sep 2013 09:47:51 +1000
Subject: [PATCH 0846/1246] Correct comment

---
 test/integration/property-timezones.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/property-timezones.js b/test/integration/property-timezones.js
index efadd254..d5b9d89a 100644
--- a/test/integration/property-timezones.js
+++ b/test/integration/property-timezones.js
@@ -3,7 +3,7 @@ var helper   = require('../support/spec_helper');
 var common   = require('../common');
 var ORM      = require('../../');
 
-// Only MySql support for now
+// Only MySql & Postgres support for now
 if (common.protocol() == 'mongodb' || common.protocol() == 'sqlite') return;
 
 describe("Timezones", function() {

From 67919e3733d0de1cfcacdf2c6621098ef72e1a48 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 13 Sep 2013 15:24:00 +0100
Subject: [PATCH 0847/1246] Remove return for failing protocols on
 property-timezones (related to c50f6b6)

Mocha can just skip them. I'll test it and see if it's easily fixed.
---
 test/integration/property-timezones.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/test/integration/property-timezones.js b/test/integration/property-timezones.js
index d5b9d89a..71755431 100644
--- a/test/integration/property-timezones.js
+++ b/test/integration/property-timezones.js
@@ -3,9 +3,6 @@ var helper   = require('../support/spec_helper');
 var common   = require('../common');
 var ORM      = require('../../');
 
-// Only MySql & Postgres support for now
-if (common.protocol() == 'mongodb' || common.protocol() == 'sqlite') return;
-
 describe("Timezones", function() {
 	var db    = null;
 	var Event = null;
@@ -59,7 +56,7 @@ describe("Timezones", function() {
 		}
 	});
 
-	xdescribe("different for each connection", function () {
+	describe.skip("different for each connection", function () {
 		after(function () {
 			return db.close();
 		});

From 85c851f80cfbfd0f406563e33985a3a3e7d7e651 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 13 Sep 2013 17:10:24 +0100
Subject: [PATCH 0848/1246] Adds missing end of line to test/common

---
 test/common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/common.js b/test/common.js
index 080463e8..80e43e55 100644
--- a/test/common.js
+++ b/test/common.js
@@ -153,4 +153,4 @@ common.retry = function (before, run, until, done, args) {
         before();
         runNext();
     }
-};
\ No newline at end of file
+};

From ba3a6d5d6870769264a5a4c8c6a22afd229b3be2 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 13 Sep 2013 17:10:43 +0100
Subject: [PATCH 0849/1246] Fixes orm-exports test to don't check specifically
 if err is null

---
 test/integration/orm-exports.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/orm-exports.js b/test/integration/orm-exports.js
index ff6aa298..d6175b5a 100644
--- a/test/integration/orm-exports.js
+++ b/test/integration/orm-exports.js
@@ -198,7 +198,7 @@ describe("ORM.use()", function () {
 		var db = new sqlite.Database(':memory:');
 
 		ORM.use(db, "sqlite", function (err) {
-			should.equal(err, null);
+			should.not.exist(err);
 
 			return done();
 		});

From 585a6e32627001fd53c4d234c7618e456632eb8b Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 13 Sep 2013 17:11:07 +0100
Subject: [PATCH 0850/1246] Updates property-timezones test

---
 test/integration/property-timezones.js | 46 +++++++++++++++-----------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/test/integration/property-timezones.js b/test/integration/property-timezones.js
index 71755431..2b5fc407 100644
--- a/test/integration/property-timezones.js
+++ b/test/integration/property-timezones.js
@@ -28,7 +28,7 @@ describe("Timezones", function() {
 	};
 
 	describe("specified", function () {
-		var a, zones = ['local', '-0734', '+11:22'];
+		var a, zones = [ 'local', '-0734', '+11:22' ];
 
 		for (a = 0; a < zones.length; a++ ) {
 			describe(zones[a], function () {
@@ -39,16 +39,16 @@ describe("Timezones", function() {
 				});
 
 				it("should get back the same date that was stored", function (done) {
-					var when = new Date(2013,12,5,5,34,27);
+					var when = new Date(2013, 12, 5, 5, 34, 27);
 
 					Event.create({ name: "raid fridge", when: when }, function (err) {
 						should.not.exist(err);
 
 						Event.one({ name: "raid fridge" }, function (err, item) {
 							should.not.exist(err);
-							when.should.eql(item.when);
+							item.when.should.eql(when);
 
-							done();
+							return done();
 						});
 					});
 				});
@@ -56,33 +56,40 @@ describe("Timezones", function() {
 		}
 	});
 
-	describe.skip("different for each connection", function () {
+	describe("different for each connection", function () {
+		before(setup({
+			sync  : true,
+			query : { timezone: '+0200' }
+		}));
+
 		after(function () {
 			return db.close();
 		});
 
 		// This isn't consistent accross drivers. Needs more thinking and investigation.
 		it("should get back a correctly offset time", function (done) {
-			var when = new Date(2013,12,5,5,34,27);
-
-			setup({ sync: true, query: { timezone: '+0200' }})(function () {
-				Event.create({ name: "raid fridge", when: when }, function (err) {
-					should.not.exist(err);
+			var when = new Date(2013, 12, 5, 5, 34, 27);
 
-					Event.one({ name: "raid fridge" }, function (err, item) {
-						should.not.exist(err);
-						when.should.eql(item.when);
+			Event.create({ name: "raid fridge", when: when }, function (err, new_event) {
+				should.not.exist(err);
 
-						db.close();
-
-						setup({ query: { timezone: '+0400' }})(function () {
+				Event.one({ name: "raid fridge" }, function (err, item) {
+					should.not.exist(err);
+					new_event.should.not.equal(item); // new_event was not cached
+					should.equal(new_event.when.toISOString(), item.when.toISOString());
+
+					db.close(function () {
+						setup({
+							sync  : false, // don't recreate table, don't want to loose previous value
+							query : { timezone: '+0400' }
+						})(function () {
 							Event.one({ name: "raid fridge" }, function (err, item) {
-								var expected = new Date(2013,12,5,3,34,27);
+								var expected = new Date(2013, 12, 5, 3, 34, 27);
 
 								should.not.exist(err);
-								expected.should.eql(item.when);
+								item.when.should.eql(expected);
 
-								done();
+								return done();
 							});
 						});
 					});
@@ -90,5 +97,4 @@ describe("Timezones", function() {
 			});
 		});
 	});
-
 });

From 366ca9d402aa6376c75baaf4be9ed259c84a45f9 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 13 Sep 2013 17:11:47 +0100
Subject: [PATCH 0851/1246] Fixes sqlite driver to work properly with timezones

This fix (and others later) are based on my work on timezones in the
mysql module.
---
 lib/Drivers/DML/sqlite.js | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index d1051904..023ffecf 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -1,4 +1,5 @@
 var _       = require("lodash");
+var util    = require("util");
 var sqlite3 = require("sqlite3");
 var Query   = require("sql-query").Query;
 var helpers = require("../helpers");
@@ -8,7 +9,12 @@ exports.Driver = Driver;
 function Driver(config, connection, opts) {
 	this.config = config || {};
 	this.opts   = opts || {};
-	this.query  = new Query("sqlite");
+
+	if (!this.config.timezone) {
+		this.config.timezone = "local";
+	}
+
+	this.query  = new Query({ dialect: "sqlite", timezone: this.config.timezone });
 	this.customTypes = {};
 
 	if (connection) {
@@ -234,9 +240,21 @@ Driver.prototype.valueToProperty = function (value, property) {
 			if (typeof value == 'string') {
 				if (value.indexOf('Z', value.length - 1) === -1) {
 					value = new Date(value + 'Z');
+				} else {
+					value = new Date(value);
+				}
+
+				if (this.config.timezone && this.config.timezone != 'local') {
+					var tz = convertTimezone(this.config.timezone);
+
+					// shift local to UTC
+					value.setTime(value.getTime() - (value.getTimezoneOffset() * 60000));
+					if (tz !== false) {
+						// shift UTC to timezone
+						value.setTime(value.getTime() - (tz * 60000));
+					}
 				}
 			}
-			value = new Date(value);
 			break;
 		default:
 			customType = this.customTypes[property.type];
@@ -311,3 +329,13 @@ Driver.prototype.propertyToValue = function (value, property) {
 Object.defineProperty(Driver.prototype, "isSql", {
     value: true
 });
+
+function convertTimezone(tz) {
+	if (tz == "Z") return 0;
+
+	var m = tz.match(/([\+\-\s])(\d\d):?(\d\d)?/);
+	if (m) {
+		return (m[1] == '-' ? -1 : 1) * (parseInt(m[2], 10) + ((m[3] ? parseInt(m[3], 10) : 0) / 60)) * 60;
+	}
+	return false;
+}

From f5668930f01759ec3af2955245a3619f4a8dd004 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 13 Sep 2013 17:12:04 +0100
Subject: [PATCH 0852/1246] Fixes postgres driver to work properly with
 timezones

---
 lib/Drivers/DML/postgres.js | 58 ++++++++++++++++++++++++++++++++-----
 1 file changed, 51 insertions(+), 7 deletions(-)

diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 9b6e4a87..9013d06b 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -9,17 +9,23 @@ function Driver(config, connection, opts) {
 	var functions = switchableFunctions.client;
 	this.config = config || {};
 	this.opts   = opts || {};
-	this.query  = new Query("postgresql");
+
+	if (!this.config.timezone) {
+		this.config.timezone = "local";
+	}
+
+	this.query  = new Query({ dialect: "postgresql", timezone: this.config.timezone });
 	this.customTypes = {};
 
 	if (connection) {
 		this.db = connection;
 	} else {
-		if (config.query && config.query.ssl) {
+		if (this.config.query && this.config.query.ssl) {
 			config.ssl = true;
-			this.config = config;
-		} else {
-			this.config = config.href || config;
+			this.config = _.extend(this.config, config);
+		// } else {
+		// 	this.config = _.extend(this.config, config);
+		// 	this.config = config.href || config;
 		}
 
 		if (opts.pool) {
@@ -118,7 +124,11 @@ Driver.prototype.ping = function (cb) {
 };
 
 Driver.prototype.close = function (cb) {
-	this.db.end(cb);
+	this.db.end();
+
+	if (typeof cb == "function") cb();
+
+	return;
 };
 
 Driver.prototype.getQuery = function () {
@@ -260,6 +270,18 @@ Driver.prototype.valueToProperty = function (value, property) {
 				}
 			}
 			break;
+		case "date":
+			if (this.config.timezone && this.config.timezone != 'local') {
+				var tz = convertTimezone(this.config.timezone);
+
+				// shift local to UTC
+				value.setTime(value.getTime() - (value.getTimezoneOffset() * 60000));
+				if (tz !== false) {
+					// shift UTC to timezone
+					value.setTime(value.getTime() - (tz * 60000));
+				}
+			}
+			break;
 		case "number":
 			if (typeof value != 'number' && value !== null) {
 				v = Number(value);
@@ -282,6 +304,18 @@ Driver.prototype.propertyToValue = function (value, property) {
 		case "object":
 			value = JSON.stringify(value);
 			break;
+		case "date":
+			if (this.config.timezone && this.config.timezone != 'local') {
+				var tz = convertTimezone(this.config.timezone);
+
+				// shift local to UTC
+				value.setTime(value.getTime() + (value.getTimezoneOffset() * 60000));
+				if (tz !== false) {
+					// shift UTC to timezone
+					value.setTime(value.getTime() + (tz * 60000));
+				}
+			}
+			break;
 		case "point":
 			return function () {
 				return "POINT(" + value.x + ', ' + value.y + ")";
@@ -298,4 +332,14 @@ Driver.prototype.propertyToValue = function (value, property) {
 
 Object.defineProperty(Driver.prototype, "isSql", {
     value: true
-});
\ No newline at end of file
+});
+
+function convertTimezone(tz) {
+	if (tz == "Z") return 0;
+
+	var m = tz.match(/([\+\-\s])(\d\d):?(\d\d)?/);
+	if (m) {
+		return (m[1] == '-' ? -1 : 1) * (parseInt(m[2], 10) + ((m[3] ? parseInt(m[3], 10) : 0) / 60)) * 60;
+	}
+	return false;
+}

From 81da3b6c776329c844c10f3b36d2c4d2c930f529 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 13 Sep 2013 17:29:47 +0100
Subject: [PATCH 0853/1246] Removes mongodb from property-timezones for now

MongoDB seems to always store dates in UTC..
---
 test/integration/property-timezones.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/integration/property-timezones.js b/test/integration/property-timezones.js
index 2b5fc407..854abc31 100644
--- a/test/integration/property-timezones.js
+++ b/test/integration/property-timezones.js
@@ -3,6 +3,8 @@ var helper   = require('../support/spec_helper');
 var common   = require('../common');
 var ORM      = require('../../');
 
+if (common.protocol() == "mongodb") return;
+
 describe("Timezones", function() {
 	var db    = null;
 	var Event = null;
@@ -28,7 +30,7 @@ describe("Timezones", function() {
 	};
 
 	describe("specified", function () {
-		var a, zones = [ 'local', '-0734', '+11:22' ];
+		var a, zones = [ 'local', '-0734'/*, '+11:22'*/ ];
 
 		for (a = 0; a < zones.length; a++ ) {
 			describe(zones[a], function () {
@@ -56,7 +58,7 @@ describe("Timezones", function() {
 		}
 	});
 
-	describe("different for each connection", function () {
+	describe.skip("different for each connection", function () {
 		before(setup({
 			sync  : true,
 			query : { timezone: '+0200' }

From 5aa8424831d0198e98973795a458d0fbc4637b57 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 13 Sep 2013 17:30:15 +0100
Subject: [PATCH 0854/1246] Prepares mongodb driver for timezones but no
 timezone shifting is done just yet

---
 lib/Drivers/DML/mongodb.js | 50 ++++++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
index 2c015425..5b15f30c 100644
--- a/lib/Drivers/DML/mongodb.js
+++ b/lib/Drivers/DML/mongodb.js
@@ -1,6 +1,7 @@
-var mongodb = require("mongodb");
-var util    = require("../../Utilities");
-var _       = require('lodash');
+var Utilities = require("../../Utilities");
+var mongodb   = require("mongodb");
+var util      = require("util");
+var _         = require('lodash');
 
 exports.Driver = Driver;
 
@@ -10,6 +11,10 @@ function Driver(config, connection, opts) {
 	this.config = config || {};
 	this.opts   = opts;
 
+	if (!this.config.timezone) {
+		this.config.timezone = "local";
+	}
+
 	this.opts.settings.set("properties.primary_key", "_id");
 	this.opts.settings.set("properties.association_key", function (name, field) {
 		return name + "_" + field.replace(/^_+/, '');
@@ -100,7 +105,7 @@ Driver.prototype.close = function (cb) {
 Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	var collection = this.db.collection(table);
 
-	convertToDB(conditions);
+	convertToDB(conditions, this.config.timezone);
 
 	var cursor = (fields ? collection.find(conditions, fields) : collection.find(conditions));
 
@@ -128,7 +133,7 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 		var pending = 0;
 
 		for (var i = 0; i < docs.length; i++) {
-			convertFromDB(docs[i]);
+			convertFromDB(docs[i], this.config.timezone);
 			if (opts.extra && opts.extra[docs[i]._id]) {
 				docs[i] = _.merge(docs[i], _.omit(opts.extra[docs[i]._id], '_id'));
 			}
@@ -148,13 +153,13 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 		if (pending === 0) {
 			return cb(null, docs);
 		}
-	});
+	}.bind(this));
 };
 
 Driver.prototype.count = function (table, conditions, opts, cb) {
 	var collection = this.db.collection(table);
 
-	convertToDB(conditions);
+	convertToDB(conditions, this.config.timezone);
 
 	var cursor     = collection.find(conditions);
 
@@ -181,7 +186,7 @@ Driver.prototype.count = function (table, conditions, opts, cb) {
 };
 
 Driver.prototype.insert = function (table, data, id_prop, cb) {
-	convertToDB(data);
+	convertToDB(data, this.config.timezone);
 
 	return this.db.collection(table).insert(
 		data,
@@ -199,11 +204,11 @@ Driver.prototype.insert = function (table, data, id_prop, cb) {
 						ids[k] = docs[0][k];
 					}
 				}
-				convertFromDB(ids);
+				convertFromDB(ids, this.config.timezone);
 			}
 
 			return cb(null, ids);
-		}
+		}.bind(this)
 	);
 };
 
@@ -259,7 +264,7 @@ Driver.prototype.hasMany = function (Model, association) {
 
 				if (options.order) {
 					options.order[0] = options.order[0][1];
-					options.order = util.standardizeOrder(options.order);
+					options.order = Utilities.standardizeOrder(options.order);
 				}
 
 				options.extra_props = association.props;
@@ -320,8 +325,8 @@ Driver.prototype.hasMany = function (Model, association) {
 };
 
 Driver.prototype.update = function (table, changes, conditions, cb) {
-	convertToDB(changes);
-	convertToDB(conditions);
+	convertToDB(changes, this.config.timezone);
+	convertToDB(conditions, this.config.timezone);
 
 	return this.db.collection(table).update(
 		conditions,
@@ -337,7 +342,7 @@ Driver.prototype.update = function (table, changes, conditions, cb) {
 };
 
 Driver.prototype.remove = function (table, conditions, cb) {
-	convertToDB(conditions);
+	convertToDB(conditions, this.config.timezone);
 
 	return this.db.collection(table).remove(conditions, cb);
 };
@@ -346,32 +351,35 @@ Driver.prototype.clear = function (table, cb) {
 	return this.db.collection(table).remove(cb);
 };
 
-function convertToDB(obj) {
+function convertToDB(obj, timeZone) {
 	for (var k in obj) {
 		if (Array.isArray(obj[k])) {
 			for (var i = 0; i < obj[k].length; i++) {
-				obj[k][i] = convertToDBVal(k, obj[k][i]);
+				obj[k][i] = convertToDBVal(k, obj[k][i], timeZone);
 			}
 
 			obj[k] = { $in: obj[k] };
 			continue;
 		}
 
-		obj[k] = convertToDBVal(k, obj[k]);
+		obj[k] = convertToDBVal(k, obj[k], timeZone);
 	}
 }
 
-function convertFromDB(obj) {
+function convertFromDB(obj, timezone) {
 	for (var k in obj) {
 		if (obj[k] instanceof mongodb.ObjectID) {
 			obj[k] = obj[k].toString();
-		} else if (obj[k] instanceof mongodb.Binary) {
+			continue;
+		}
+		if (obj[k] instanceof mongodb.Binary) {
 			obj[k] = new Buffer(obj[k].value(), "binary");
+			continue;
 		}
 	}
 }
 
-function convertToDBVal(key, value) {
+function convertToDBVal(key, value, timezone) {
 	if (value && typeof value.sql_comparator == "function") {
 		var val       = (key != "_id" ? value.val : new mongodb.ObjectID(value.val));
 		var comp      = value.sql_comparator();
@@ -413,4 +421,4 @@ function convertToDBVal(key, value) {
 
 Object.defineProperty(Driver.prototype, "isSql", {
     value: false
-});
\ No newline at end of file
+});

From c4970ae69228843c337abebf441a026e7563b3f4 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 13 Sep 2013 17:37:12 +0100
Subject: [PATCH 0855/1246] Updates property-timezone test to avoid testing
 sqlite if no pathname is given

The test cannot be done using ':memory:'
---
 test/integration/property-timezones.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/integration/property-timezones.js b/test/integration/property-timezones.js
index 854abc31..31469d3e 100644
--- a/test/integration/property-timezones.js
+++ b/test/integration/property-timezones.js
@@ -4,6 +4,12 @@ var common   = require('../common');
 var ORM      = require('../../');
 
 if (common.protocol() == "mongodb") return;
+if (common.protocol() == "sqlite" && !common.getConfig().pathname) {
+	// sqlite needs a pathname for this test (because of reconnecting)
+	// if using memory, when disconnecting everything is lost and this
+	// test needs it
+	return;
+}
 
 describe("Timezones", function() {
 	var db    = null;
@@ -58,7 +64,7 @@ describe("Timezones", function() {
 		}
 	});
 
-	describe.skip("different for each connection", function () {
+	describe("different for each connection", function () {
 		before(setup({
 			sync  : true,
 			query : { timezone: '+0200' }

From 328d10e114d366c803a6ab85d5b17b44da01a2ed Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 13 Sep 2013 18:11:36 +0100
Subject: [PATCH 0856/1246] mysql@2.0.0-alpha8

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0cb2ac2a..4caa4ef3 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
 		"lodash"    : "1.3.1"
 	},
 	"devDependencies": {
-		"mysql"   : "2.0.0-alpha7",
+		"mysql"   : "2.0.0-alpha8",
 		"pg"      : "1.0.0",
 		"sqlite3" : "2.1.7",
 		"async"   : "*",

From 7da28d2818fa6a6ed6a049dfe11feacc60d10b31 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 13 Sep 2013 18:12:21 +0100
Subject: [PATCH 0857/1246] For mysql driver, when using pool, use
 con.release() instead of con.end() (if defined) (closes #335)

---
 lib/Drivers/DML/mysql.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 90e305c1..d73b5d08 100755
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -53,7 +53,11 @@ Driver.prototype.connect = function (cb) {
 	if (this.opts.pool) {
 		return this.db.pool.getConnection(function (err, con) {
 			if (!err) {
-				con.end();
+				if (con.release) {
+					con.release();
+				} else {
+					con.end();
+				}
 			}
 			return cb(err);
 		});
@@ -218,7 +222,11 @@ Driver.prototype.poolQuery = function (query, cb) {
 		}
 
 		con.query(query, function (err, data) {
-			con.end();
+			if (con.release) {
+				con.release();
+			} else {
+				con.end();
+			}
 
 			return cb(err, data);
 		});

From c11314ae99afa98558fd209f5f26a75be410d0a0 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 13 Sep 2013 18:31:18 +0100
Subject: [PATCH 0858/1246] Adds a third spec_load test file (for multiple
 db.load files)

---
 test/support/spec_load_third.js | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 test/support/spec_load_third.js

diff --git a/test/support/spec_load_third.js b/test/support/spec_load_third.js
new file mode 100644
index 00000000..42b9b298
--- /dev/null
+++ b/test/support/spec_load_third.js
@@ -0,0 +1,9 @@
+module.exports = function (db, cb) {
+	db.define("person", {
+		name : String
+	});
+
+	setTimeout(function () {
+		return cb();
+	}, 200);
+};

From 232bee6c1e1fae61ad285256deb79a1452a84fde Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 13 Sep 2013 18:32:34 +0100
Subject: [PATCH 0859/1246] Adds ability to call db.load() with multiple files
 (closes #329)

Files can be passed one by one as a separate argument or as Array.
Mixed arguments are possible.
The callback must be the last argument and is now optional.
---
 lib/ORM.js             | 32 ++++++++++++++++++++++-----
 test/integration/db.js | 50 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 5 deletions(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index 01b532fd..65df1023 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -5,6 +5,7 @@ var url            = require("url");
 var hat            = require("hat");
 var Query          = require("sql-query");
 var enforce        = require("enforce");
+var _              = require("lodash");
 
 var Model          = require("./Model").Model;
 var DriverAliases  = require("./Drivers/aliases");
@@ -254,12 +255,33 @@ ORM.prototype.close = function (cb) {
 
 	return this;
 };
-ORM.prototype.load = function (file, cb) {
-	try {
-		return require(Utilities.getRealPath(file))(this, cb);
-	} catch (ex) {
-		return cb(ex);
+ORM.prototype.load = function () {
+	var files = _.flatten(Array.prototype.slice.apply(arguments));
+	var cb    = function () {};
+
+	if (typeof files[files.length - 1] == "function") {
+		cb = files.pop();
 	}
+
+	var loadNext = function () {
+		if (files.length === 0) {
+			return cb();
+		}
+
+		var file = files.shift();
+
+		try {
+			return require(Utilities.getRealPath(file, 4))(this, function (err) {
+				if (err) return cb(err);
+
+				return loadNext();
+			});
+		} catch (ex) {
+			return cb(ex);
+		}
+	}.bind(this);
+
+	return loadNext();
 };
 ORM.prototype.sync = function (cb) {
 	var modelIds = Object.keys(this.models);
diff --git a/test/integration/db.js b/test/integration/db.js
index 1f04348c..9e9f7114 100644
--- a/test/integration/db.js
+++ b/test/integration/db.js
@@ -129,6 +129,56 @@ describe("db.load()", function () {
 	});
 });
 
+describe("db.load()", function () {
+	var db = null;
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			return done();
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	it("should be able to load more than one file", function (done) {
+		db.load("../support/spec_load_second", "../support/spec_load_third", function () {
+			db.models.should.have.property("person");
+			db.models.should.have.property("pet");
+
+			return done();
+		});
+	});
+});
+
+describe("db.load()", function () {
+	var db = null;
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			return done();
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	it("should be able to load more than one file passed as Array", function (done) {
+		db.load([ "../support/spec_load_second", "../support/spec_load_third" ], function () {
+			db.models.should.have.property("person");
+			db.models.should.have.property("pet");
+
+			return done();
+		});
+	});
+});
+
 describe("db.serial()", function () {
 	var db = null;
 

From ebffc9a3c4e2619dfc9e9b47d266a89c52394c7f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 13 Sep 2013 18:39:23 +0100
Subject: [PATCH 0860/1246] Adds a test for hasMany.delAccessor with arguments
 switched (#320)

---
 test/integration/association-hasmany.js | 26 +++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
index 22fbecc2..5dbc076d 100644
--- a/test/integration/association-hasmany.js
+++ b/test/integration/association-hasmany.js
@@ -217,6 +217,32 @@ describe("hasMany", function () {
 		});
 	});
 
+	describe("delAccessor", function () {
+		before(setup());
+
+		it("should accept arguments in different orders", function (done) {
+			Pet.find({ name: "Mutt" }, function (err, pets) {
+				Person.find({ name: "John" }, function (err, people) {
+					should.equal(err, null);
+
+					people[0].removePets(function (err) {
+						should.equal(err, null);
+
+						people[0].getPets(function (err, pets) {
+							should.equal(err, null);
+
+							should(Array.isArray(pets));
+							pets.length.should.equal(1);
+							pets[0].name.should.equal("Deco");
+
+							return done();
+						});
+					}, pets[0]);
+				});
+			});
+		});
+	});
+
 	describe("delAccessor", function () {
 		before(setup());
 

From 51a8fe6b5b6d701d2014ce32f577dba727213910 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 13 Sep 2013 18:54:39 +0100
Subject: [PATCH 0861/1246] lodash@2.0.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4caa4ef3..0e35e8b1 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
 		"enforce"   : "0.1.2",
 		"sql-query" : "0.1.15",
 		"hat"       : "0.0.3",
-		"lodash"    : "1.3.1"
+		"lodash"    : "2.0.0"
 	},
 	"devDependencies": {
 		"mysql"   : "2.0.0-alpha8",

From 2c27d7f899b1ad3b452c8f1d17c039427b2ad2f8 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 13 Sep 2013 19:53:03 +0100
Subject: [PATCH 0862/1246] mongodb@1.3.19

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0e35e8b1..409c2912 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
 		"async"   : "*",
 		"mocha"   : "1.12.0",
 		"should"  : "1.2.2",
-		"mongodb" : "1.3.15"
+		"mongodb" : "1.3.19"
 	},
 	"optionalDependencies": {}
 }

From 90b8804b7f58921dfc81fb50d8f5343206b3adc5 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 13 Sep 2013 19:54:55 +0100
Subject: [PATCH 0863/1246] mocha@1.12.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 409c2912..f28bf244 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
 		"pg"      : "1.0.0",
 		"sqlite3" : "2.1.7",
 		"async"   : "*",
-		"mocha"   : "1.12.0",
+		"mocha"   : "1.12.1",
 		"should"  : "1.2.2",
 		"mongodb" : "1.3.19"
 	},

From 1220cfc345e8c86f49e5d6e227b12966ae24a7ea Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 13 Sep 2013 19:56:02 +0100
Subject: [PATCH 0864/1246] should@1.3.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f28bf244..7982644f 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
 		"sqlite3" : "2.1.7",
 		"async"   : "*",
 		"mocha"   : "1.12.1",
-		"should"  : "1.2.2",
+		"should"  : "1.3.0",
 		"mongodb" : "1.3.19"
 	},
 	"optionalDependencies": {}

From ec7ec79d7518b88c2e1da0d552ddbf4c2dc6b6cd Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 13 Sep 2013 19:57:59 +0100
Subject: [PATCH 0865/1246] mysql@2.0.0-alpha9

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7982644f..f018123f 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
 		"lodash"    : "2.0.0"
 	},
 	"devDependencies": {
-		"mysql"   : "2.0.0-alpha8",
+		"mysql"   : "2.0.0-alpha9",
 		"pg"      : "1.0.0",
 		"sqlite3" : "2.1.7",
 		"async"   : "*",

From dc466159efdc531cacdafa3b3b3a26b2f4111c35 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 13 Sep 2013 21:46:29 +0100
Subject: [PATCH 0866/1246] 2.1.1

---
 Changelog.md | 34 ++++++++++++++++++++++------------
 package.json |  7 ++++---
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 0c9cf06a..961feb16 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,24 +1,34 @@
-### v2.2.0 - (todo, in future)
+### v2.2.0 - (to do, in future)
 - Fixes error code spelling: `PARAM_MISSMATCH` -> `PARAM_MISMATCH`
 
-### v2.1.next - (available on master but not on NPM yet)
+### v2.1.1 - 13 Sep 2013
+
 - Add TypeScript interface
-- Add support for custom property types (#305)
-- Add promises to query chain (#316)
-- Unique validator can be scoped and case insensitive (#288)
-- Allow finding by associations (#293)
 - Allow custom join tables (#276)
+- Fixes stack overflow when saving auto-fetched model with relations (#279)
+- Unique validator can be scoped and case insensitive (#288)
 - Allow async express middleware (#291)
+- Allow finding by associations (#293)
+- Fix sqlite find with boolean (#292)
+- Fix `afterLoad` hook error handling (#301)
 - Allow auto-escaping for custom queries (#304)
-- Allow passing timezone in database connection string - mysql & postgres only for now (#325, #303)
+- Add support for custom property types (#305)
 - Allow ordering by raw sql - .orderRaw() when chaining (#308, #311)
-- Deprecated `PARAM_MISSMATCH` ErrorCode in favour of correctly spelt `PARAM_MISMATCH` (#315)
-- Fix `NaN` handling (#310)
-- Fixes stack overflow when saving auto-fetched model with relations (#279)
-- Fix `afterLoad` hook error handling (#301)
-- Fix sqlite find with boolean (#292)
 - Fix saving Instance.extra fields (#312)
+- Fix `NaN` handling (#310)
 - Fix incorrect SQL query (#313)
+- Deprecated `PARAM_MISSMATCH` ErrorCode in favour of correctly spelt `PARAM_MISMATCH` (#315)
+- Add promises to query chain (#316)
+- Adds a test for hasMany.delAccessor with arguments switched (#320)
+- Allow passing timezone in database connection string, local timezone is now default (#325, #303)
+- Adds ability to call db.load() with multiple files (closes #329)
+- For mysql driver, when using pool, use con.release() instead of con.end() (if defined) (closes #335)
+- Passes error from afterLoad hook to ready event
+- Most errors now have a model property
+- Adds connection.pool and connection.debug settings
+- Fixes throw when calling ChainFind.first() or .last() and it has an error
+- Removes upper limit on VARCHAR column size
+- Allows multi-key models to support hasMany
 
 ### v2.1.0 - 3 Aug 2013
 
diff --git a/package.json b/package.json
index f018123f..800bf430 100644
--- a/package.json
+++ b/package.json
@@ -9,9 +9,10 @@
 		"mysql",
 		"postgres",
 		"redshift",
-		"sqlite"
+		"sqlite",
+		"mongodb"
 	],
-	"version"     : "2.1.0",
+	"version"     : "2.1.1",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",
@@ -22,7 +23,7 @@
 		{ "name" : "Chris Cowan",      "email" : "me@chriscowan.us" },
 		{ "name" : "Paul Dixon",       "email" : "paul.dixon@mintbridge.co.uk" },
 		{ "name" : "David Kosub" },
-		{ "name" : "Arek W" },
+		{ "name" : "Arek W",           "email" : "arek01@gmail.com" },
 		{ "name" : "Joseph Gilley",    "email" : "joe.gilley@gmail.com" },
 		{ "name" : "Benjamin Pannell", "email" : "admin@sierrasoftworks.com" }
 	],

From 62c186cf6263cbad39f8d73f70425b2bec5fb8da Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 13 Sep 2013 22:04:59 +0100
Subject: [PATCH 0867/1246] pg@2.6.2

The only problem not updating soon to this version was a way of forcing
postgres driver to always convert numbers.
---
 lib/Drivers/DML/postgres.js | 2 ++
 package.json                | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 9013d06b..12f13d74 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -28,6 +28,8 @@ function Driver(config, connection, opts) {
 		// 	this.config = config.href || config;
 		}
 
+		pg.types.setTypeParser(20, Number);
+
 		if (opts.pool) {
 			functions = switchableFunctions.pool;
 			this.db = pg;
diff --git a/package.json b/package.json
index 800bf430..f07fd336 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
 	},
 	"devDependencies": {
 		"mysql"   : "2.0.0-alpha9",
-		"pg"      : "1.0.0",
+		"pg"      : "2.6.2",
 		"sqlite3" : "2.1.7",
 		"async"   : "*",
 		"mocha"   : "1.12.1",

From 8bf76ef98bd754abf19b7296a80809dec6af192e Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 13 Sep 2013 22:21:19 +0100
Subject: [PATCH 0868/1246] Removes Readme sections that are now in wiki

Synching and Dropping Models
---
 Readme.md | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/Readme.md b/Readme.md
index 40335806..fbb325cc 100755
--- a/Readme.md
+++ b/Readme.md
@@ -212,24 +212,11 @@ module.exports = function (db, cb) {
 
 ## Synchronizing Models
 
-Models can create their underlying tables in the database. You may call Model.sync() on each Model to create the underlying table or you can call db.sync() at a connection level to create all tables for all models.
-
-```js
-// db.sync() can also be used
-Person.sync(function (err) {
-	!err && console.log("done!");
-});
-```
+See information in the [wiki](https://github.com/dresende/node-orm2/wiki/Synching-and-Dropping-Models).
 
 ## Dropping Models
 
-If you want to drop a Model and remove all tables you can use the `.drop()` method.
-
-```js
-Person.drop(function (err) {
-	!err && console.log("person model no longer exists!");
-});
-```
+See information in the [wiki](https://github.com/dresende/node-orm2/wiki/Synching-and-Dropping-Models).
 
 ## Advanced Options
 

From 52f8699f73f3bbf93664781546f2b9c5b617ba32 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 13 Sep 2013 22:27:33 +0100
Subject: [PATCH 0869/1246] Adds console.trace to dropSync test helper

It's failing a lot in Travis and I want to see if it's something about
node v0.6 or just Travis...
---
 test/support/spec_helper.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/support/spec_helper.js b/test/support/spec_helper.js
index 3cfeb9b3..a3e1dcfc 100644
--- a/test/support/spec_helper.js
+++ b/test/support/spec_helper.js
@@ -28,6 +28,9 @@ module.exports.dropSync = function (models, done) {
 		});
 	}, function (err) {
 		if (common.protocol() != 'sqlite') {
+			if (err) {
+				console.trace(err);
+			}
 			should.not.exist(err);
 		}
 		done(err);

From c131eebe32de0cc44da499d9ac100ddbc73ac1a3 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 13 Sep 2013 22:35:11 +0100
Subject: [PATCH 0870/1246] Tries to fix travis error

Uncaught TypeError: Cannot read property 'not' of undefined
  at
/home/travis/build/dresende/node-orm2/test/support/spec_helper.js:34:10
---
 test/support/spec_helper.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/test/support/spec_helper.js b/test/support/spec_helper.js
index a3e1dcfc..2c56bdde 100644
--- a/test/support/spec_helper.js
+++ b/test/support/spec_helper.js
@@ -28,10 +28,7 @@ module.exports.dropSync = function (models, done) {
 		});
 	}, function (err) {
 		if (common.protocol() != 'sqlite') {
-			if (err) {
-				console.trace(err);
-			}
-			should.not.exist(err);
+			should.eql(err, null);
 		}
 		done(err);
 	});

From d5bcbd11979221d7517d2622dc9867ae9e3ee4ed Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 13 Sep 2013 22:41:41 +0100
Subject: [PATCH 0871/1246] Fixes previous change (not 'eql' but 'equal')

---
 test/support/spec_helper.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/support/spec_helper.js b/test/support/spec_helper.js
index 2c56bdde..968367ab 100644
--- a/test/support/spec_helper.js
+++ b/test/support/spec_helper.js
@@ -28,7 +28,7 @@ module.exports.dropSync = function (models, done) {
 		});
 	}, function (err) {
 		if (common.protocol() != 'sqlite') {
-			should.eql(err, null);
+			should.equal(err, null);
 		}
 		done(err);
 	});

From d5ffd8c559a482bbeb46226f4fd518b0b3a59252 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 13 Sep 2013 22:57:41 +0100
Subject: [PATCH 0872/1246] should@1.2.2

1.3.0 is the culprit for the failing tests on node v0.6

I'm not sure if this is because of the version or anything else
breaking the module (like async or something..). `should` appears
undefined..
---
 package.json                | 2 +-
 test/support/spec_helper.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index f07fd336..b13434f8 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
 		"sqlite3" : "2.1.7",
 		"async"   : "*",
 		"mocha"   : "1.12.1",
-		"should"  : "1.3.0",
+		"should"  : "1.2.2",
 		"mongodb" : "1.3.19"
 	},
 	"optionalDependencies": {}
diff --git a/test/support/spec_helper.js b/test/support/spec_helper.js
index 968367ab..3cfeb9b3 100644
--- a/test/support/spec_helper.js
+++ b/test/support/spec_helper.js
@@ -28,7 +28,7 @@ module.exports.dropSync = function (models, done) {
 		});
 	}, function (err) {
 		if (common.protocol() != 'sqlite') {
-			should.equal(err, null);
+			should.not.exist(err);
 		}
 		done(err);
 	});

From 3c0e00c861e65ec49126e1dcbe51b6c5e34388f0 Mon Sep 17 00:00:00 2001
From: Jens Claes <jensclaes33@gmail.com>
Date: Sun, 15 Sep 2013 18:10:39 +0200
Subject: [PATCH 0873/1246] Fixes a bug in the express README documentation

In the README in the part with the express setup. The next() method isn't called which causes the nodejs application to just hang. No request work anymore.
---
 Readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Readme.md b/Readme.md
index fbb325cc..3102c9ed 100755
--- a/Readme.md
+++ b/Readme.md
@@ -93,6 +93,7 @@ var app = express();
 app.use(orm.express("mysql://username:password@host/database", {
 	define: function (db, models, next) {
 		models.person = db.define("person", { ... });
+		next();
 	}
 }));
 app.listen(80);

From f6003662ae64240fbdd7db18e830531bf0cc9be2 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 16 Sep 2013 22:55:21 +0100
Subject: [PATCH 0874/1246] Fixes stack overflow on instance.save() with a
 reversed hasOne association (#338)

---
 lib/Instance.js              | 21 ++++++++++++++--
 test/integration/instance.js | 46 ++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index a1a3a84b..65d07070 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -12,6 +12,7 @@ function Instance(Model, opts) {
 	opts.changes = (opts.is_new ? Object.keys(opts.data) : []);
 	opts.extrachanges = [];
 
+	var instance_saving = false;
 	var events = {};
 	var instance = {};
 	var emitEvent = function () {
@@ -86,13 +87,26 @@ function Instance(Model, opts) {
 		});
 	};
 	var saveError = function (cb, err) {
+		instance_saving = false;
+
 		emitEvent("save", err, instance);
+
 		Hook.trigger(instance, opts.hooks.afterSave, false);
+
 		if (typeof cb === "function") {
 			cb(err, instance);
 		}
 	};
 	var saveInstance = function (cb, saveOptions) {
+		// what this condition means:
+		// - If the instance is in state mode
+		// - AND it's not an association that is asking it to save
+		//   -> return has already saved
+		if (instance_saving && !(saveOptions.saveAssociations === false)) {
+			return cb(null, instance);
+		}
+		instance_saving = true;
+
 		handleValidations(function (err) {
 			if (err) {
 				return saveError(cb, err);
@@ -127,6 +141,8 @@ function Instance(Model, opts) {
 		});
 	};
 	var afterSave = function (cb, create, err) {
+		instance_saving = false;
+
 		emitEvent("save", err, instance);
 
 		if (create) {
@@ -498,9 +514,10 @@ function Instance(Model, opts) {
 
 			while (arguments.length > 0) {
 				arg = Array.prototype.shift.call(arguments);
-				switch(typeof arg) {
+
+				switch (typeof arg) {
 					case 'object':
-						switch(objCount) {
+						switch (objCount) {
 							case 0:
 								data = arg;
 								break;
diff --git a/test/integration/instance.js b/test/integration/instance.js
index 71fbdc11..87374d72 100644
--- a/test/integration/instance.js
+++ b/test/integration/instance.js
@@ -50,6 +50,52 @@ describe("Model instance", function() {
 		return db.close();
 	});
 
+	describe("#save", function () {
+		var main_item, item;
+
+		before(function (done) {
+			main_item = db.define("main_item", {
+				name      : String
+			}, {
+				auteFetch : true
+			});
+			item = db.define("item", {
+				name      : String
+			}, {
+				cache     : false
+			});
+			item.hasOne("main_item", main_item, {
+				reverse   : "items",
+				autoFetch : true
+			});
+
+			return helper.dropSync([ main_item, item ], function () {
+				main_item.create({
+					name : "Main Item"
+				}, function (err, mainItem) {
+					item.create({
+						name : "Item"
+					}, function (err, Item) {
+						mainItem.setItems(Item, function (err) {
+							should.not.exist(err);
+
+							return done();
+						});
+					});
+				});
+			});
+		});
+
+		it("should have a saving state to avoid loops", function (done) {
+			main_item.find({ name : "Main Item" }).first(function (err, mainItem) {
+				mainItem.save({ name : "new name" }, function (err) {
+					should.not.exist(err);
+					return done();
+				});
+			});
+		});
+	});
+
 	describe("#isInstance", function () {
 		it("should always return true for instances", function (done) {
 			should.equal((new Person).isInstance, true);

From 7ceb1201e29f727ab80d5219cd8973df6eceae3c Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 16 Sep 2013 22:59:23 +0100
Subject: [PATCH 0875/1246] 2.1.2

---
 Changelog.md | 6 ++++++
 package.json | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 961feb16..41fa80c6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,12 @@
 ### v2.2.0 - (to do, in future)
 - Fixes error code spelling: `PARAM_MISSMATCH` -> `PARAM_MISMATCH`
 
+### v2.1.2 - 16 Sep 2013
+
+- Fixes stack overflow on instance.save() with a reversed hasOne association (#338)
+- Reverts should dev dependency to 1.2.2 (newer version was causing problems)
+- When using postgres you can now use pg@2.6.2 (unless when connecting to Heroku - use 2.5.0)
+
 ### v2.1.1 - 13 Sep 2013
 
 - Add TypeScript interface
diff --git a/package.json b/package.json
index b13434f8..8af6595e 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.1",
+	"version"     : "2.1.2",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",

From 7425a5aed3269eb229893caa40790199ada6e4d7 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 16 Sep 2013 23:59:04 +0100
Subject: [PATCH 0876/1246] Adds hasMany hooks.beforeSave (#324)

---
 lib/Associations/Many.js                      |  58 +++++---
 test/integration/association-hasmany-hooks.js | 125 ++++++++++++++++++
 2 files changed, 161 insertions(+), 22 deletions(-)
 create mode 100644 test/integration/association-hasmany-hooks.js

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index e0f35fb6..53b46a55 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -1,5 +1,6 @@
 var _                   = require("lodash");
 var InstanceConstructor = require("../Instance").Instance;
+var Hook                = require("../Hook");
 var Settings            = require("../Settings");
 var Property            = require("../Property");
 var ErrorCodes          = require("../ErrorCodes");
@@ -29,6 +30,7 @@ exports.prepare = function (Model, associations) {
 					break;
 			}
 		}
+
 		if (props === null) {
 			props = {};
 		} else {
@@ -43,6 +45,7 @@ exports.prepare = function (Model, associations) {
 			name           : name,
 			model          : OtherModel || Model,
 			props          : props,
+			hooks          : opts.hooks || {},
 			autoFetch      : opts.autoFetch || false,
 			autoFetchLimit : opts.autoFetchLimit || 2,
 			// I'm not sure the next key is used..
@@ -321,20 +324,38 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 					}
 
 					var Association = Associations.pop();
-
-					Association.save(function (err) {
+					var saveAssociation = function (err) {
 						if (err) {
 							return cb(err);
 						}
 
-						var data = {};
+						Association.save(function (err) {
+							if (err) {
+								return cb(err);
+							}
 
-						for (var k in opts) {
-							data[k] = opts[k];
-						}
+							var data = {};
+
+							for (var k in opts) {
+								data[k] = opts[k];
+							}
+
+							if (Driver.hasMany) {
+								return Driver.hasMany(Model, association).add(Instance, Association, data, function (err) {
+									if (err) {
+										return cb(err);
+									}
+
+									savedAssociations.push(Association);
+
+									return saveNextAssociation();
+								});
+							}
 
-						if (Driver.hasMany) {
-							return Driver.hasMany(Model, association).add(Instance, Association, data, function (err) {
+							util.populateConditions(Model, Object.keys(association.mergeId), Instance, data);
+							util.populateConditions(association.model, Object.keys(association.mergeAssocId), Association, data);
+
+							Driver.insert(association.mergeTable, data, null, function (err) {
 								if (err) {
 									return cb(err);
 								}
@@ -343,21 +364,14 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 
 								return saveNextAssociation();
 							});
-						}
-
-						util.populateConditions(Model, Object.keys(association.mergeId), Instance, data);
-						util.populateConditions(association.model, Object.keys(association.mergeAssocId), Association, data);
-
-						Driver.insert(association.mergeTable, data, null, function (err) {
-							if (err) {
-								return cb(err);
-							}
-
-							savedAssociations.push(Association);
-
-							return saveNextAssociation();
 						});
-					});
+					};
+
+					if (Object.keys(association.props).length) {
+						Hook.wait(Association, association.hooks.beforeSave, saveAssociation, opts);
+					} else {
+						Hook.wait(Association, association.hooks.beforeSave, saveAssociation);
+					}
 				};
 
 				return saveNextAssociation();
diff --git a/test/integration/association-hasmany-hooks.js b/test/integration/association-hasmany-hooks.js
new file mode 100644
index 00000000..50b07e06
--- /dev/null
+++ b/test/integration/association-hasmany-hooks.js
@@ -0,0 +1,125 @@
+var should = require('should');
+var helper = require('../support/spec_helper');
+var ORM    = require('../../');
+
+describe("hasMany hooks", function() {
+	var db     = null;
+	var Person = null;
+	var Pet    = null;
+
+	var setup = function (props, opts) {
+		return function (done) {
+			db.settings.set('instance.cache', false);
+
+			Person = db.define('person', {
+				name    : String,
+			});
+			Pet = db.define('pet', {
+				name    : String
+			});
+			Person.hasMany('pets', Pet, props || {}, opts || {});
+
+			return helper.dropSync([ Person, Pet ], done);
+		};
+	};
+
+	before(function(done) {
+		helper.connect(function (connection) {
+			db = connection;
+			done();
+		});
+	});
+
+	describe("beforeSave", function () {
+		var had_extra = false;
+
+		before(setup({
+			born : Date
+		}, {
+			hooks : {
+				beforeSave: function (extra, next) {
+					had_extra = (typeof extra == "object");
+					return next();
+				}
+			}
+		}));
+
+		it("should pass extra data to hook if extra defined", function (done) {
+			Person.create({
+				name    : "John"
+			}, function (err, John) {
+				Pet.create({
+					name : "Deco"
+				}, function (err, Deco) {
+					John.addPets(Deco, function (err) {
+						should.not.exist(err);
+
+						had_extra.should.be.true;
+
+						return done();
+					});
+				});
+			});
+		});
+	});
+
+	describe("beforeSave", function () {
+		var had_extra = false;
+
+		before(setup({}, {
+			hooks : {
+				beforeSave: function (next) {
+					next.should.be.a("function");
+					return next();
+				}
+			}
+		}));
+
+		it("should not pass extra data to hook if extra defined", function (done) {
+			Person.create({
+				name    : "John"
+			}, function (err, John) {
+				Pet.create({
+					name : "Deco"
+				}, function (err, Deco) {
+					John.addPets(Deco, function (err) {
+						should.not.exist(err);
+
+						return done();
+					});
+				});
+			});
+		});
+	});
+
+	describe("beforeSave", function () {
+		var had_extra = false;
+
+		before(setup({}, {
+			hooks : {
+				beforeSave: function (next) {
+					setTimeout(function () {
+						return next(new Error('blocked'));
+					}, 100);
+				}
+			}
+		}));
+
+		it("should block if error returned", function (done) {
+			Person.create({
+				name    : "John"
+			}, function (err, John) {
+				Pet.create({
+					name : "Deco"
+				}, function (err, Deco) {
+					John.addPets(Deco, function (err) {
+						should.exist(err);
+						err.message.should.equal('blocked');
+
+						return done();
+					});
+				});
+			});
+		});
+	});
+});

From 2e307b971ae929ed1f47156ad5046d710e5c050e Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 17 Sep 2013 00:17:50 +0100
Subject: [PATCH 0877/1246] Fixes Model.extendsTo autoFetch not working
 (throwing) (#323)

---
 lib/Associations/Extend.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index 187d5610..5ec01cee 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -84,11 +84,16 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 		enumerable : false
 	});
 	Object.defineProperty(Instance, association.getAccessor, {
-		value: function (cb) {
+		value: function (opts, cb) {
+			if (typeof opts == "function") {
+				cb = opts;
+				opts = {};
+			}
+
 			if (!Instance[Model.id]) {
 			    cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension", { model: Model.table }));
 			} else {
-				association.model.get(util.values(Instance, Model.id), cb);
+				association.model.get(util.values(Instance, Model.id), opts, cb);
 			}
 			return this;
 		},

From d4eb2d0f200d0e289e1b3ec6b13e260f46968c86 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 18 Sep 2013 21:54:15 +0100
Subject: [PATCH 0878/1246] Adds findByAssociation to extendsTo (#314)

---
 lib/Associations/Extend.js             | 36 ++++++++++++++++++++++++++
 test/integration/association-extend.js | 33 +++++++++++++++++++++++
 2 files changed, 69 insertions(+)

diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index 5ec01cee..3df3c291 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -40,6 +40,42 @@ exports.prepare = function (db, Model, associations, association_properties, mod
 
 		associations.push(association);
 
+		Model["findBy" + assocName] = function () {
+			var cb = null, conditions = null, options = {};
+
+			for (var i = 0; i < arguments.length; i++) {
+				switch (typeof arguments[i]) {
+					case "function":
+						cb = arguments[i];
+						break;
+					case "object":
+						if (conditions === null) {
+							conditions = arguments[i];
+						} else {
+							options = arguments[i];
+						}
+						break;
+				}
+			}
+
+			if (conditions === null) {
+				throw ErrorCodes.generateError(ErrorCodes.PARAM_MISMATCH, ".findBy(" + assocName + ") is missing a conditions object");
+			}
+
+			options.__merge = {
+				from  : { table: association.model.table, field: Object.keys(association.field) },
+				to    : { table: Model.table, field: Model.id },
+				where : [ association.model.table, conditions ],
+				table : Model.table
+			};
+			options.extra = [];
+
+			if (typeof cb == "function") {
+				return Model.find({}, options, cb);
+			}
+			return Model.find({}, options);
+		};
+
 		return association.model;
 	};
 };
diff --git a/test/integration/association-extend.js b/test/integration/association-extend.js
index 6f03f4fe..98b2a25e 100644
--- a/test/integration/association-extend.js
+++ b/test/integration/association-extend.js
@@ -212,4 +212,37 @@ describe("Model.extendsTo()", function() {
 			});
 		});
 	});
+
+	describe("findBy()", function () {
+		before(setup());
+
+		it("should throw if no conditions passed", function (done) {
+			(function () {
+				Person.findByAddress(function () {});
+			}).should.throw();
+
+			return done();
+		});
+
+		it("should lookup in Model based on associated model properties", function (done) {
+			Person.findByAddress({
+				number: 123
+			}, function (err, people) {
+				should.equal(err, null);
+				should(Array.isArray(people));
+				should(people.length == 1);
+
+				return done();
+			});
+		});
+
+		it("should return a ChainFind if no callback passed", function (done) {
+			var ChainFind = Person.findByAddress({
+				number: 123
+			});
+			ChainFind.run.should.be.a("function");
+
+			return done();
+		});
+	});
 });

From 3303e8b79786c4e286712ce1a43a8c8839cc7194 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 18 Sep 2013 23:11:10 +0100
Subject: [PATCH 0879/1246] Fixes cache for hasOne associations (#339)

---
 lib/Associations/One.js | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index 147feec3..ce71ccd3 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -160,9 +160,17 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 				opts = {};
 			}
 
+			var saveAndReturn = function (err, Assoc) {
+				if (!err) {
+					Instance[association.name] = Assoc;
+				}
+
+				return cb(err, Assoc);
+			};
+
 			if (association.reversed) {
 				if (util.hasValues(Instance, Model.id)) {
-					association.model.find(util.getConditions(Model, Object.keys(association.field), Instance), opts, cb);
+					association.model.find(util.getConditions(Model, Object.keys(association.field), Instance), opts, saveAndReturn);
 				} else {
 					cb(null);
 				}
@@ -172,10 +180,10 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 						if (err || !util.hasValues(instance, Object.keys(association.field))) {
 							return cb(null);
 						}
-						association.model.get(util.values(instance, Object.keys(association.field)), opts, cb);
+						association.model.get(util.values(instance, Object.keys(association.field)), opts, saveAndReturn);
 					});
 				} else if (util.hasValues(Instance, Object.keys(association.field))) {
-					association.model.get(util.values(Instance, Object.keys(association.field)), opts, cb);
+					association.model.get(util.values(Instance, Object.keys(association.field)), opts, saveAndReturn);
 				} else {
 					cb(null);
 				}
@@ -227,6 +235,8 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 						return cb(err);
 					}
 
+					Instance[association.name] = OtherInstance;
+
 					util.populateConditions(association.model, Object.keys(association.field), OtherInstance, Instance);
 
 					return Instance.save({}, { saveAssociations: false }, cb);
@@ -243,7 +253,13 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 				for (var k in association.field) {
 					Instance[k] = null;
 				}
-				Instance.save({}, { saveAssociations: false }, cb);
+				Instance.save({}, { saveAssociations: false }, function (err) {
+					if (!err) {
+						delete Instance[association.name];
+					}
+
+					return cb();
+				});
 
 				return this;
 			},
@@ -270,13 +286,7 @@ function autoFetchInstance(Instance, association, opts, cb) {
 	// callback, and hence this lookup would complete at an arbitrary point in the future.
 	// The associated entity should probably be fetched when the instance is persisted.
 	if (Instance.isPersisted()) {
-		Instance[association.getAccessor]({ autoFetchLimit: opts.autoFetchLimit - 1 }, function (err, Assoc) {
-			if (!err) {
-				Instance[association.name] = Assoc;
-			}
-
-			return cb();
-		});
+		Instance[association.getAccessor]({ autoFetchLimit: opts.autoFetchLimit - 1 }, cb);
 	} else {
 		return cb();
 	}

From 9dd6580cf8f1332b1bd28a82d8aa1e093ad7bdb4 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 18 Sep 2013 23:30:46 +0100
Subject: [PATCH 0880/1246] Fixes afterAutoFetch next(err) bubling up just like
 afterLoad (#301)

---
 lib/Model.js             | 16 +++++++++++-----
 test/integration/hook.js | 19 +++++++++++++++++++
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/lib/Model.js b/lib/Model.js
index 837480fb..188ba3a9 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -83,7 +83,7 @@ function Model(opts) {
 			autoFetchLimit : inst_opts.autoFetchLimit,
 			cascadeRemove  : inst_opts.cascadeRemove
 		};
-		var pending  = 2;
+		var pending  = 2, create_err = null;
 		var instance = new Instance(model, {
 			uid                    : inst_opts.uid, // singleton unique id
 			id                     : opts.id,
@@ -104,9 +104,12 @@ function Model(opts) {
 			association_properties : association_properties
 		});
 		instance.on("ready", function (err) {
-			if (--pending > 0) return;
+			if (--pending > 0) {
+				create_err = err;
+				return;
+			}
 			if (typeof cb === "function") {
-				return cb(err, instance);
+				return cb(err || create_err, instance);
 			}
 		});
 		if (model_fields !== null) {
@@ -120,9 +123,12 @@ function Model(opts) {
 			ManyAssociation.autoFetch(instance, many_associations, assoc_opts, function () {
 				ExtendAssociation.autoFetch(instance, extend_associations, assoc_opts, function () {
 					Hook.wait(instance, opts.hooks.afterAutoFetch, function (err) {
-						if (--pending > 0) return;
+						if (--pending > 0) {
+							create_err = err;
+							return;
+						}
 						if (typeof cb === "function") {
-							return cb(err, instance);
+							return cb(err || create_err, instance);
 						}
 					});
 				});
diff --git a/test/integration/hook.js b/test/integration/hook.js
index f2405129..a1e1bc68 100644
--- a/test/integration/hook.js
+++ b/test/integration/hook.js
@@ -547,6 +547,25 @@ describe("Hook", function() {
 					return done();
 				});
 			});
+
+			describe("if hook returns an error", function () {
+				before(setup({
+					afterAutoFetch : function (next) {
+						return next(new Error("AFTERAUTOFETCH_FAIL"));
+					}
+				}));
+
+				it("should return error", function (done) {
+					this.timeout(500);
+
+					Person.create([{ name: "John Doe" }], function (err, items) {
+						err.should.exist;
+						err.message.should.equal("AFTERAUTOFETCH_FAIL");
+
+						return done();
+					});
+				});
+			});
 		});
 	});
 

From 36dd85979222ba32bc8eb1f3598bed119437598a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sat, 21 Sep 2013 22:04:54 +0100
Subject: [PATCH 0881/1246] Changes user methods to be writeable property
 instances (fixes #296)

---
 lib/Instance.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 65d07070..68f624b8 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -487,8 +487,9 @@ function Instance(Model, opts) {
 
 	for (k in opts.methods) {
 		Object.defineProperty(instance, k, {
-			value: opts.methods[k].bind(instance),
-			enumerable: false
+			value      : opts.methods[k].bind(instance),
+			enumerable : false,
+			writeable  : true
 		});
 	}
 

From f15e2070a5cfc61e2d2bbf4b41cd04d0771544db Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 14 Oct 2013 22:57:04 +0100
Subject: [PATCH 0882/1246] Removes unnecessary path requirement in ORM.js

---
 lib/ORM.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index 65df1023..ce565d3d 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -1,6 +1,5 @@
 var util           = require("util");
 var events         = require("events");
-var path           = require("path");
 var url            = require("url");
 var hat            = require("hat");
 var Query          = require("sql-query");
@@ -244,7 +243,7 @@ ORM.prototype.defineType = function (name, opts) {
 	this.customTypes[name] = opts;
 	this.driver.customTypes[name] = opts;
 	return this;
-}
+};
 ORM.prototype.ping = function (cb) {
 	this.driver.ping(cb);
 

From 2d392880702859dc1c64777aedf8fe916169ec9a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 14 Oct 2013 22:57:16 +0100
Subject: [PATCH 0883/1246] Converts indentation from spaces:2 to tabs

---
 test/common.js | 183 ++++++++++++++++++++++++-------------------------
 1 file changed, 91 insertions(+), 92 deletions(-)

diff --git a/test/common.js b/test/common.js
index 80e43e55..e77753ce 100644
--- a/test/common.js
+++ b/test/common.js
@@ -56,101 +56,100 @@ common.getConfig = function () {
 
 common.getConnectionString = function (opts) {
 	var config, query;
-  var protocol = this.protocol();
-
-  if (common.isTravis()) {
-    config = {};
-  } else {
-    config = require("./config")[protocol];
-  }
-
-  opts = opts || {};
-  _.defaults(config, {
-    user     : { postgres: 'postgres', redshift: 'postgres', mongodb: '' }[protocol] || 'root',
-    database : { mongodb:  'test'     }[protocol] || 'orm_test',
-    password : '',
-    host     : 'localhost',
-    pathname : '',
-    query    : {}
-  });
-  _.merge(config, opts);
-  query = querystring.stringify(config.query);
+	var protocol = this.protocol();
+
+	if (common.isTravis()) {
+		config = {};
+	} else {
+		config = require("./config")[protocol];
+	}
+
+	opts = opts || {};
+	_.defaults(config, {
+		user     : { postgres: 'postgres', redshift: 'postgres', mongodb: '' }[protocol] || 'root',
+		database : { mongodb:  'test'     }[protocol] || 'orm_test',
+		password : '',
+		host     : 'localhost',
+		pathname : '',
+		query    : {}
+	});
+	_.merge(config, opts);
+	query = querystring.stringify(config.query);
 
 	switch (protocol) {
-    case 'mysql':
-    case 'postgres':
-    case 'redshift':
-    case 'mongodb':
-      if (common.isTravis()) {
-      	if (protocol == 'redshift') protocol = 'postgres';
-        return util.format("%s://%s@%s/%s?%s",
-          protocol, config.user, config.host, config.database, query
-        );
-      } else {
-        return util.format("%s://%s:%s@%s/%s?%s",
-          protocol, config.user, config.password,
-          config.host, config.database, query
-        ).replace(':@','@');
-      }
-    case 'sqlite':
-      return util.format("%s://%s?%s", protocol, config.pathname, query);
-    default:
-      throw new Error("Unknown protocol " + protocol);
-  }
+		case 'mysql':
+		case 'postgres':
+		case 'redshift':
+		case 'mongodb':
+			if (common.isTravis()) {
+				if (protocol == 'redshift') protocol = 'postgres';
+				return util.format("%s://%s@%s/%s?%s",
+					protocol, config.user, config.host, config.database, query
+				);
+			} else {
+				return util.format("%s://%s:%s@%s/%s?%s",
+					protocol, config.user, config.password,
+					config.host, config.database, query
+				).replace(':@','@');
+			}
+		case 'sqlite':
+			return util.format("%s://%s?%s", protocol, config.pathname, query);
+		default:
+			throw new Error("Unknown protocol " + protocol);
+	}
 };
 
 common.retry = function (before, run, until, done, args) {
-    if (typeof until === "number") {
-        var countDown = until;
-        until = function (err) {
-            if (err && --countDown > 0) return false;
-            return true;
-        };
-    }
-
-    if (typeof args === "undefined") args = [];
-
-    var handler = function (err) {
-        if (until(err)) return done.apply(this, arguments);
-        return runNext();
-    };
-
-    args.push(handler);
-
-    var runCurrent = function () {
-        if (run.length == args.length) {
-            return run.apply(this, args);
-        } else {
-            run.apply(this, args);
-            handler();
-        }
-    };
-
-    var runNext = function () {
-        try {
-            if (before.length > 0) {
-                before(function (err) {
-                    if (until(err)) return done(err);
-                    return runCurrent();
-                });
-            } else {
-                before();
-                runCurrent();
-            }
-        }
-        catch (e) {
-            handler(e);
-        }
-    };
-
-    if (before.length > 0) {
-        before(function (err) {
-            if (err) return done(err);
-            runNext();
-        });
-    }
-    else {
-        before();
-        runNext();
-    }
+	if (typeof until === "number") {
+		var countDown = until;
+		until = function (err) {
+			if (err && --countDown > 0) return false;
+			return true;
+		};
+	}
+
+	if (typeof args === "undefined") args = [];
+
+	var handler = function (err) {
+		if (until(err)) return done.apply(this, arguments);
+		return runNext();
+	};
+
+	args.push(handler);
+
+	var runCurrent = function () {
+		if (run.length == args.length) {
+			return run.apply(this, args);
+		} else {
+			run.apply(this, args);
+			handler();
+		}
+	};
+
+	var runNext = function () {
+		try {
+			if (before.length > 0) {
+				before(function (err) {
+					if (until(err)) return done(err);
+					return runCurrent();
+				});
+			} else {
+				before();
+				runCurrent();
+			}
+		}
+		catch (e) {
+			handler(e);
+		}
+	};
+
+	if (before.length > 0) {
+		before(function (err) {
+			if (err) return done(err);
+			runNext();
+		});
+	} else {
+		before();
+		runNext();
+	}
 };

From ca3249bcbad9c45e045d128327ccc77f87a3ed16 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 14 Oct 2013 23:15:39 +0100
Subject: [PATCH 0884/1246] Fixes tests common.getConnectionString to use
 common.getConfig

---
 test/common.js | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/test/common.js b/test/common.js
index e77753ce..523d6399 100644
--- a/test/common.js
+++ b/test/common.js
@@ -50,21 +50,32 @@ common.getConfig = function () {
 				throw new Error("Unknown protocol");
 		}
 	} else {
-		return require("./config")[this.protocol()];
+		var config = require("./config")[this.protocol()];
+		if (typeof config == "string") {
+			config = require("url").parse(config);
+		}
+		if (config.hasOwnProperty("auth")) {
+			if (config.auth.indexOf(":") >= 0) {
+				config.user = config.auth.substr(0, config.auth.indexOf(":"));
+				config.password = config.auth.substr(config.auth.indexOf(":") + 1);
+			} else {
+				config.user = config.auth;
+				config.password = "";
+			}
+		}
+		if (config.hostname) {
+			config.host = config.hostname;
+		}
+
+		return config;
 	}
 };
 
 common.getConnectionString = function (opts) {
-	var config, query;
+	var config   = this.getConfig();
 	var protocol = this.protocol();
+	var query;
 
-	if (common.isTravis()) {
-		config = {};
-	} else {
-		config = require("./config")[protocol];
-	}
-
-	opts = opts || {};
 	_.defaults(config, {
 		user     : { postgres: 'postgres', redshift: 'postgres', mongodb: '' }[protocol] || 'root',
 		database : { mongodb:  'test'     }[protocol] || 'orm_test',
@@ -73,7 +84,8 @@ common.getConnectionString = function (opts) {
 		pathname : '',
 		query    : {}
 	});
-	_.merge(config, opts);
+	_.merge(config, opts || {});
+
 	query = querystring.stringify(config.query);
 
 	switch (protocol) {

From c7e914a0d0c14aaa699c311247cc6c7c7daf6b9a Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 14 Oct 2013 23:16:21 +0100
Subject: [PATCH 0885/1246] Fixes connection strings being parsed by url module
 to don't forget about port :) (#355)

---
 lib/ORM.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/ORM.js b/lib/ORM.js
index ce565d3d..fff4dd7a 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -96,6 +96,9 @@ exports.connect = function (opts, cb) {
 	if (!opts.hasOwnProperty("password")) {
 		opts.password = "";
 	}
+	if (opts.hasOwnProperty("hostname")) {
+		opts.host = opts.hostname;
+	}
 
 	var proto  = opts.protocol.replace(/:$/, '');
 	var db;

From d6f4c1c32470f05cb007a9c82cb367a99b07ceb4 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 14 Oct 2013 23:51:59 +0100
Subject: [PATCH 0886/1246] 2.1.3

---
 Changelog.md | 13 +++++++++++++
 package.json |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 41fa80c6..30a24e84 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,19 @@
 ### v2.2.0 - (to do, in future)
 - Fixes error code spelling: `PARAM_MISSMATCH` -> `PARAM_MISMATCH`
 
+### v2.1.3 - 14 Oct 2013
+
+- Fixes connection strings being parsed by url module to don't forget about port :) (#355)
+- Fixes tests common.getConnectionString to use common.getConfig
+- Converts indentation from spaces:2 to tabs
+- Removes unnecessary path requirement in ORM.js
+- Changes user methods to be writeable property instances (fixes #296)
+- Fixes afterAutoFetch next(err) bubling up just like afterLoad (#301)
+- Fixes cache for hasOne associations (#339)
+- Adds findByAssociation to extendsTo (#314)
+- Fixes Model.extendsTo autoFetch not working (throwing) (#323)
+- Adds hasMany hooks.beforeSave (#324)
+
 ### v2.1.2 - 16 Sep 2013
 
 - Fixes stack overflow on instance.save() with a reversed hasOne association (#338)
diff --git a/package.json b/package.json
index 8af6595e..bc55a3fb 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.2",
+	"version"     : "2.1.3",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",

From f7783070cbcedd8202cb9f5544bb4b00d8c80cb7 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 14 Oct 2013 23:55:31 +0100
Subject: [PATCH 0887/1246] lodash@2.2.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bc55a3fb..14f24eb4 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
 		"enforce"   : "0.1.2",
 		"sql-query" : "0.1.15",
 		"hat"       : "0.0.3",
-		"lodash"    : "2.0.0"
+		"lodash"    : "2.2.1"
 	},
 	"devDependencies": {
 		"mysql"   : "2.0.0-alpha9",

From b751fb07d6d80b749a7bf95f8d74db04d9bd54fc Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 15 Oct 2013 00:00:00 +0100
Subject: [PATCH 0888/1246] mocha@1.13.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 14f24eb4..6af7cb98 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
 		"pg"      : "2.6.2",
 		"sqlite3" : "2.1.7",
 		"async"   : "*",
-		"mocha"   : "1.12.1",
+		"mocha"   : "1.13.0",
 		"should"  : "1.2.2",
 		"mongodb" : "1.3.19"
 	},

From 3bb0a3b6c0adb9fe211b05b9c4ae31c35b6572c2 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 24 Oct 2013 21:24:09 +0100
Subject: [PATCH 0889/1246] Lints lib/Validation.js

---
 lib/Validators.js | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/lib/Validators.js b/lib/Validators.js
index 563c3c19..f7d51084 100644
--- a/lib/Validators.js
+++ b/lib/Validators.js
@@ -23,8 +23,10 @@ var validators = {
  * checking).
  **/
 validators.equalToProperty = function (name, msg) {
-	return function (v, next, ctx) {
-		if (v === this[name]) return next();
+	return function (v, next) {
+		if (v === this[name]) {
+			return next();
+		}
 		return next(msg || 'not-equal-to-property');
 	};
 };
@@ -49,17 +51,24 @@ validators.unique = function () {
 
 	for (k in arguments) {
 		arg = arguments[k];
-		if (typeof arg === 'string') msg = arg;
-		else if (typeof arg === 'object') opts = arg;
+		if (typeof arg === "string") {
+			msg = arg;
+		} else if (typeof arg === "object") {
+			opts = arg;
+		}
 	}
 
 	return function (v, next, ctx) {
-	    var s, scopeProp;
+		var s, scopeProp;
 
-	    if (typeof v === 'undefined' || v === null) return next();
+		if (typeof v === "undefined" || v === null) {
+			return next();
+		}
 
-        //Cannot process on database engines which don't support SQL syntax
-	    if (!ctx.driver.isSql) return next('not-supported');
+		//Cannot process on database engines which don't support SQL syntax
+		if (!ctx.driver.isSql) {
+			return next('not-supported');
+		}
 
 		var chain = ctx.model.find();
 

From 159649dcfadfecb99e9887ba3a291f5f022a8ef8 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 24 Oct 2013 21:32:19 +0100
Subject: [PATCH 0890/1246] Lints lib/AggregateFunctions.js

---
 lib/AggregateFunctions.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index c8d5a882..75783546 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -54,9 +54,11 @@ function AggregateFunctions(opts) {
 			if (arguments.length === 0) {
 				throw ErrorCodes.generateError(ErrorCodes.PARAM_MISMATCH, "When using append you must at least define one property");
 			}
-			opts.properties = opts.properties.concat(Array.isArray(arguments[0]) ?
-			                                                 arguments[0] :
-			                                                 Array.prototype.slice.apply(arguments));
+			if (Array.isArray(arguments[0])) {
+				opts.properties = opts.properties.concat(arguments[0]);
+			} else {
+				opts.properties = opts.properties.concat(Array.prototype.slice.apply(arguments));
+			}
 			return this;
 		},
 		as: function (alias) {

From aa10d0575f9466c46132e9761d9bfa76d02c7976 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 24 Oct 2013 21:32:29 +0100
Subject: [PATCH 0891/1246] Lints lib/Drivers/DML/postgres.js

---
 lib/Drivers/DML/postgres.js | 138 ++++++++++++++++++------------------
 1 file changed, 70 insertions(+), 68 deletions(-)

diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 12f13d74..b2470b69 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -5,55 +5,13 @@ var helpers = require("../helpers");
 
 exports.Driver = Driver;
 
-function Driver(config, connection, opts) {
-	var functions = switchableFunctions.client;
-	this.config = config || {};
-	this.opts   = opts || {};
-
-	if (!this.config.timezone) {
-		this.config.timezone = "local";
-	}
-
-	this.query  = new Query({ dialect: "postgresql", timezone: this.config.timezone });
-	this.customTypes = {};
-
-	if (connection) {
-		this.db = connection;
-	} else {
-		if (this.config.query && this.config.query.ssl) {
-			config.ssl = true;
-			this.config = _.extend(this.config, config);
-		// } else {
-		// 	this.config = _.extend(this.config, config);
-		// 	this.config = config.href || config;
-		}
-
-		pg.types.setTypeParser(20, Number);
-
-		if (opts.pool) {
-			functions = switchableFunctions.pool;
-			this.db = pg;
-		} else {
-			this.db = new pg.Client(this.config);
-		}
-	}
-
-	_.extend(this.constructor.prototype, functions);
-
-	this.aggregate_functions = [ "ABS", "CEIL", "FLOOR", "ROUND",
-	                             "AVG", "MIN", "MAX",
-	                             "LOG", "EXP", "POWER",
-	                             "ACOS", "ASIN", "ATAN", "COS", "SIN", "TAN",
-	                             "RANDOM", "RADIANS", "DEGREES",
-	                             "SUM", "COUNT",
-	                             "DISTINCT" ];
-}
-
 var switchableFunctions = {
 	pool: {
 		connect: function (cb) {
 			this.db.connect(this.config, function (err, client, done) {
-				if (!err) done();
+				if (!err) {
+					done();
+				}
 				cb(err);
 			});
 		},
@@ -62,7 +20,9 @@ var switchableFunctions = {
 				require("../../Debug").sql('postgres', query);
 			}
 			this.db.connect(this.config, function (err, client, done) {
-				if (err) return cb(err);
+				if (err) {
+					return cb(err);
+				}
 
 				client.query(query, function (err, result) {
 					done();
@@ -108,6 +68,53 @@ var switchableFunctions = {
 	}
 };
 
+function Driver(config, connection, opts) {
+	var functions = switchableFunctions.client;
+
+	this.config = config || {};
+	this.opts   = opts || {};
+
+	if (!this.config.timezone) {
+		this.config.timezone = "local";
+	}
+
+	this.query  = new Query({ dialect: "postgresql", timezone: this.config.timezone });
+	this.customTypes = {};
+
+	if (connection) {
+		this.db = connection;
+	} else {
+		if (this.config.query && this.config.query.ssl) {
+			config.ssl = true;
+			this.config = _.extend(this.config, config);
+		// } else {
+		// 	this.config = _.extend(this.config, config);
+		// 	this.config = config.href || config;
+		}
+
+		pg.types.setTypeParser(20, Number);
+
+		if (opts.pool) {
+			functions = switchableFunctions.pool;
+			this.db = pg;
+		} else {
+			this.db = new pg.Client(this.config);
+		}
+	}
+
+	_.extend(this.constructor.prototype, functions);
+
+	this.aggregate_functions = [
+		"ABS", "CEIL", "FLOOR", "ROUND",
+		"AVG", "MIN", "MAX",
+		"LOG", "EXP", "POWER",
+		"ACOS", "ASIN", "ATAN", "COS", "SIN", "TAN",
+		"RANDOM", "RADIANS", "DEGREES",
+		"SUM", "COUNT",
+		"DISTINCT"
+	];
+}
+
 _.extend(Driver.prototype, helpers.sql);
 
 Driver.prototype.sync = function (opts, cb) {
@@ -138,8 +145,7 @@ Driver.prototype.getQuery = function () {
 };
 
 Driver.prototype.find = function (fields, table, conditions, opts, cb) {
-	var q = this.query.select()
-	                  .from(table).select(fields);
+	var q = this.query.select().from(table).select(fields);
 
 	if (opts.offset) {
 		q.offset(opts.offset);
@@ -176,9 +182,7 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 };
 
 Driver.prototype.count = function (table, conditions, opts, cb) {
-	var q = this.query.select()
-	                  .from(table)
-	                  .count(null, 'c');
+	var q = this.query.select().from(table).count(null, 'c');
 
 	if (opts.merge) {
 		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
@@ -203,10 +207,7 @@ Driver.prototype.count = function (table, conditions, opts, cb) {
 };
 
 Driver.prototype.insert = function (table, data, id_prop, cb) {
-	var q = this.query.insert()
-	                  .into(table)
-	                  .set(data)
-	                  .build();
+	var q = this.query.insert().into(table).set(data).build();
 
 	this.execSimpleQuery(q + " RETURNING *", function (err, results) {
 		if (err) {
@@ -226,20 +227,13 @@ Driver.prototype.insert = function (table, data, id_prop, cb) {
 };
 
 Driver.prototype.update = function (table, changes, conditions, cb) {
-	var q = this.query.update()
-	                  .into(table)
-	                  .set(changes)
-	                  .where(conditions)
-	                  .build();
+	var q = this.query.update().into(table).set(changes).where(conditions).build();
 
 	this.execSimpleQuery(q, cb);
 };
 
 Driver.prototype.remove = function (table, conditions, cb) {
-	var q = this.query.remove()
-	                  .from(table)
-	                  .where(conditions)
-	                  .build();
+	var q = this.query.remove().from(table).where(conditions).build();
 
 	this.execSimpleQuery(q, cb);
 };
@@ -267,6 +261,7 @@ Driver.prototype.valueToProperty = function (value, property) {
 		case "point":
 			if (typeof value == "string") {
 				var m = value.match(/\((\-?[\d\.]+)[\s,]+(\-?[\d\.]+)\)/);
+
 				if (m) {
 					value = { x : parseFloat(m[1], 10) , y : parseFloat(m[2], 10) };
 				}
@@ -287,12 +282,15 @@ Driver.prototype.valueToProperty = function (value, property) {
 		case "number":
 			if (typeof value != 'number' && value !== null) {
 				v = Number(value);
-				if (!isNaN(v)) value = v;
+				if (!isNaN(v)) {
+					value = v;
+				}
 			}
 			break;
 		default:
 			customType = this.customTypes[property.type];
-			if(customType && 'valueToProperty' in customType) {
+
+			if (customType && 'valueToProperty' in customType) {
 				value = customType.valueToProperty(value);
 			}
 	}
@@ -325,7 +323,8 @@ Driver.prototype.propertyToValue = function (value, property) {
 			break;
 		default:
 			customType = this.customTypes[property.type];
-			if(customType && 'propertyToValue' in customType) {
+
+			if (customType && 'propertyToValue' in customType) {
 				value = customType.propertyToValue(value);
 			}
 	}
@@ -337,9 +336,12 @@ Object.defineProperty(Driver.prototype, "isSql", {
 });
 
 function convertTimezone(tz) {
-	if (tz == "Z") return 0;
+	if (tz == "Z") {
+		return 0;
+	}
 
 	var m = tz.match(/([\+\-\s])(\d\d):?(\d\d)?/);
+
 	if (m) {
 		return (m[1] == '-' ? -1 : 1) * (parseInt(m[2], 10) + ((m[3] ? parseInt(m[3], 10) : 0) / 60)) * 60;
 	}

From 9c0059baa1bbe31a14a75fc5d18f386ffa45ce05 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 24 Oct 2013 21:41:16 +0100
Subject: [PATCH 0892/1246] Lints lib/Associations/One.js

---
 lib/Associations/One.js | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index ce71ccd3..3c1dfb8d 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -1,7 +1,7 @@
-var _         = require("lodash");
-var Settings  = require("../Settings");
-var util      = require("../Utilities");
-var Accessors = { "get": "get", "set": "set", "has": "has", "del": "remove" };
+var _          = require("lodash");
+var util       = require("../Utilities");
+var ErrorCodes = require("../ErrorCodes");
+var Accessors  = { "get": "get", "set": "set", "has": "has", "del": "remove" };
 
 exports.prepare = function (Model, associations, association_properties, model_fields) {
 	Model.hasOne = function () {
@@ -49,6 +49,9 @@ exports.prepare = function (Model, associations, association_properties, model_f
 
 		associations.push(association);
 		for (k in association.field) {
+			if (!association.field.hasOwnProperty(k)) {
+				continue;
+			}
 			association_properties.push(k);
 			if (!association.reversed) {
 				Model.allProperties[k] = _.omit(association.field[k], 'klass');
@@ -98,7 +101,7 @@ exports.prepare = function (Model, associations, association_properties, model_f
 			};
 			options.extra = [];
 
-			if (typeof cb == "function") {
+			if (typeof cb === "function") {
 				return Model.find({}, options, cb);
 			}
 			return Model.find({}, options);
@@ -108,9 +111,9 @@ exports.prepare = function (Model, associations, association_properties, model_f
 	};
 };
 
-exports.extend = function (Model, Instance, Driver, associations, opts) {
+exports.extend = function (Model, Instance, Driver, associations) {
 	for (var i = 0; i < associations.length; i++) {
-		extendInstance(Model, Instance, Driver, associations[i], opts);
+		extendInstance(Model, Instance, Driver, associations[i]);
 	}
 };
 
@@ -133,10 +136,10 @@ exports.autoFetch = function (Instance, associations, opts, cb) {
 	}
 };
 
-function extendInstance(Model, Instance, Driver, association, opts) {
+function extendInstance(Model, Instance, Driver, association) {
 	Object.defineProperty(Instance, association.hasAccessor, {
 		value: function (opts, cb) {
-			if (typeof opts == "function") {
+			if (typeof opts === "function") {
 				cb = opts;
 				opts = {};
 			}
@@ -155,7 +158,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 	});
 	Object.defineProperty(Instance, association.getAccessor, {
 		value: function (opts, cb) {
-			if (typeof opts == "function") {
+			if (typeof opts === "function") {
 				cb = opts;
 				opts = {};
 			}
@@ -251,7 +254,9 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 		Object.defineProperty(Instance, association.delAccessor, {
 			value: function (cb) {
 				for (var k in association.field) {
-					Instance[k] = null;
+					if (association.field.hasOwnProperty(k)) {
+						Instance[k] = null;
+					}
 				}
 				Instance.save({}, { saveAssociations: false }, function (err) {
 					if (!err) {
@@ -273,7 +278,7 @@ function autoFetchInstance(Instance, association, opts, cb) {
 		return cb();
 	}
 
-	if (!opts.hasOwnProperty("autoFetchLimit") || typeof opts.autoFetchLimit == "undefined") {
+	if (!opts.hasOwnProperty("autoFetchLimit") || typeof opts.autoFetchLimit === "undefined") {
 		opts.autoFetchLimit = association.autoFetchLimit;
 	}
 

From 73f179faa886aad950552ef6ce5a40faadadc400 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 24 Oct 2013 21:58:32 +0100
Subject: [PATCH 0893/1246] Lints lib/ChainFind.js

---
 lib/ChainFind.js | 68 ++++++++++++++++++++++++++----------------------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 0dc86229..25dd07fc 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -1,7 +1,6 @@
-var _               = require("lodash");
-var Singleton       = require("./Singleton");
-var ChainInstance   = require("./ChainInstance");
-var Promise         = require("./Promise").Promise;
+var _             = require("lodash");
+var ChainInstance = require("./ChainInstance");
+var Promise       = require("./Promise").Promise;
 
 module.exports = ChainFind;
 
@@ -14,14 +13,14 @@ function ChainFind(Model, opts) {
 			var args = Array.prototype.slice.call(arguments);
 			opts.conditions = opts.conditions || {};
 
-			if (typeof _.last(args) === 'function') {
+			if (typeof _.last(args) === "function") {
 			    cb = args.pop();
 			}
 
-			if (typeof args[0] === 'object') {
-			    _.extend(opts.conditions, args[0]);
-			} else if (typeof args[0] === 'string') {
-			    opts.conditions.__sql = opts.conditions.__sql || [];
+			if (typeof args[0] === "object") {
+				_.extend(opts.conditions, args[0]);
+			} else if (typeof args[0] === "string") {
+				opts.conditions.__sql = opts.conditions.__sql || [];
 				opts.conditions.__sql.push(args);
 			}
 
@@ -150,13 +149,13 @@ function ChainFind(Model, opts) {
 				var pending = data.length;
 
 				var createInstance = function (idx) {
-				    opts.newInstance(data[idx], function (err, instance) {
-				        data[idx] = instance;
+					opts.newInstance(data[idx], function (err, instance) {
+						data[idx] = instance;
 
-				        if (--pending === 0) {
-				            return cb(null, data);
-				        }
-				    });
+						if (--pending === 0) {
+							return cb(null, data);
+						}
+					});
 				};
 
 				for (var i = 0; i < data.length; i++) {
@@ -174,10 +173,16 @@ function ChainFind(Model, opts) {
 		}
 	}
 	for (var k in Model) {
-		if ([ "hasOne", "hasMany",
-		      "drop", "sync", "get", "find", "all", "count", "clear", "create",
-		      "exists", "settings", "aggregate" ].indexOf(k) >= 0) continue;
-		if (typeof Model[k] !== "function") continue;
+		if ([
+			"hasOne", "hasMany",
+			"drop", "sync", "get", "find", "all", "count", "clear", "create",
+			"exists", "settings", "aggregate"
+		].indexOf(k) >= 0) {
+			continue;
+		}
+		if (typeof Model[k] !== "function") {
+			continue;
+		}
 
 		chain[k] = Model[k];
 	}
@@ -197,22 +202,23 @@ function addChainMethod(chain, association, opts) {
 		var assocIds = Object.keys(association.mergeAssocId);
 		var ids = association.model.id;
 		function mergeConditions(source) {
-		    for (var i = 0; i < assocIds.length; i++) {
-		        if (typeof conditions[assocIds[i]] === 'undefined')
-		            conditions[assocIds[i]] = source[ids[i]];
-		        else if(Array.isArray(conditions[assocIds[i]]))
-		            conditions[assocIds[i]].push(source[ids[i]]);
-		        else
-		            conditions[assocIds[i]] = [conditions[assocIds[i]], source[ids[i]]];
-		    }
+			for (var i = 0; i < assocIds.length; i++) {
+				if (typeof conditions[assocIds[i]] === "undefined") {
+					conditions[assocIds[i]] = source[ids[i]];
+				} else if (Array.isArray(conditions[assocIds[i]])) {
+					conditions[assocIds[i]].push(source[ids[i]]);
+				} else {
+					conditions[assocIds[i]] = [ conditions[assocIds[i]], source[ids[i]] ];
+				}
+			}
 		}
 
 		if (Array.isArray(value)) {
-		    for (var i = 0; i < value.length; i++) {
-		        mergeConditions(value[i]);
-		    }
+			for (var i = 0; i < value.length; i++) {
+				mergeConditions(value[i]);
+			}
 		} else {
-		    mergeConditions(value);
+			mergeConditions(value);
 		}
 
 		opts.exists.push({

From a9a8526d20d04d5c903f4f54a0d1a6ee58a678fb Mon Sep 17 00:00:00 2001
From: Paolo Galeone <nessuno@nerdz.eu>
Date: Sun, 27 Oct 2013 20:18:33 +0100
Subject: [PATCH 0894/1246] Fix TypeScript module declaration

---
 lib/TypeScript/orm.d.ts | 478 ++++++++++++++++++++--------------------
 1 file changed, 243 insertions(+), 235 deletions(-)

diff --git a/lib/TypeScript/orm.d.ts b/lib/TypeScript/orm.d.ts
index 5b65f94a..f9ef638f 100644
--- a/lib/TypeScript/orm.d.ts
+++ b/lib/TypeScript/orm.d.ts
@@ -1,240 +1,248 @@
-/// <reference path="node.d.ts" />
-/// <reference path="sql-query.d.ts" />
-
-import http = require('http');
-
-declare module orm {
-    export class ORM extends EventEmitter {
-        validators: enforce;
-        enforce: enforce;
-        settings: Settings;
-        driver_name: string;
-        driver: any;
-        tools: any;
-        models: { [key: string]: Model };
-        plugins: Plugin[];
-
-        use(plugin: string, options?: any): ORM;
-        use(plugin: Plugin, options?: any): ORM;
-
-        define(name: string, properties: { [key: string]: Property }, opts?: ModelOptions): Model;
-        ping(callback: (err: Error) => void): ORM;
-        close(callback: (err: Error) => void): ORM;
-        load(file: string, callback: (err: Error) => void): any;
-        sync(callback: (err: Error) => void): ORM;
-        drop(callback: (err: Error) => void): ORM;
-    }
-
-    export class enforce {
-        static required(message?: string);    
-        static notEmptyString(message?: string);
-        static rangeNumber(min: number, max: number, message?: string);
-        static rangeLength(min: number, max: number, message?: string);
-        static insideList(inside: string[], message?: string);
-        static insideList(inside: number[], message?: string);
-        static outsideList(outside: string[], message?: string);
-        static outsideList(outside: number[], message?: string);
-        static password(conditions?: string, message?: string);
-        static patterns(expr: RegExp, message?: string);
-        static patterns(expr: string, flags: string, message?: string);
-        static equalToProperty(name: string, message?: string);
-        static unique(message?: string);
-        static unique(opts: { ignoreCase: boolean }, message?: string);
-    }
-    
-    export function equalToProperty(name: string, message?: string);
-    export function unique(message?: string);
-    export function unique(opts: { ignoreCase: boolean }, message?: string);
-    
-    export class singleton {
-        static clear(key?: string): singleton;
-        static get(key, opts: {
-            cache?: any;
-            save_check?: boolean;
-        }, createCb: Function, returnCb: Function);
-    }
-
-    export class Settings {
-        static Container: any;
-
-        static defaults(): {
-            properties: {
-                primary_key: string;
-                association_key: string;
-                required: boolean;
-            };
-
-            instance: {
-                cache: boolean;
-                cacheSaveCheck: boolean;
-                autoSave: boolean;
-                autoFetch: boolean;
-                autoFetchLimit: number;
-                cascadeRemove: boolean;
-                returnAllErrors: boolean;
-            };
-
-            connection: {
-                reconnect: boolean;
-                poll: boolean;
-                debug: boolean;
+/// <reference path="sql-query.d.ts" />
+
+declare module "orm" {
+
+    import events = require('events');
+
+    module orm {
+
+        /**
+        * Parameter Type Interfaces
+        **/
+
+        export interface Model {
+            (): Instance;
+            (...ids: any[]): Instance;
+
+            properties: { [property: string]: Property };
+            settings: Settings;
+
+            drop(callback?: (err: Error) => void): Model;
+            sync(callback?: (err: Error) => void): Model;
+            get(...args: any[]): Model;
+            find(conditions: { [property: string]: any }, callback: (err: Error, results: Instance[]) => void): Model;
+            find(conditions: { [property: string]: any }, options: {
+                limit?: number;
+                order?: any;
+            }, callback: (err: Error, results: Instance[]) => void): Model;
+            find(conditions: { [property: string]: any }, limit: number, order: string[], callback: (err: Error, results: Instance[]) => void): Model;
+
+            all(conditions: { [property: string]: any }, callback: (err: Error, results: Instance[]) => void): Model;
+            all(conditions: { [property: string]: any }, options: {
+                limit?: number;
+                order?: any;
+            }, callback: (err: Error, results: Instance[]) => void): Model;
+            all(conditions: { [property: string]: any }, limit: number, order: string[], callback: (err: Error, results: Instance[]) => void): Model;
+
+            one(conditions: { [property: string]: any }, callback: (err: Error, result: Instance) => void): Model;
+            one(conditions: { [property: string]: any }, options: {
+                limit?: number;
+                order?: any;
+            }, callback: (err: Error, result: Instance) => void): Model;
+            one(conditions: { [property: string]: any }, limit: number, order: string[], callback: (err: Error, result: Instance) => void): Model;
+
+            count(callback: (err: Error, count: number) => void): Model;
+            count(conditions: { [property: string]: any }, callback: (err: Error, count: number) => void): Model;
+
+            aggregate(conditions: { [property: string]: any }): IAggregated;
+            aggregate(properties: string[]): IAggregated;
+            aggregate(conditions: { [property: string]: any }, properties: string[]): IAggregated;
+
+            exists(id: any, callback: (err: Error, exists: boolean) => void): Model;
+            exists(...args: any[]): Model;
+
+            create(data: { [property: string]: any; }, callback: (err: Error, instance: Instance) => void): Model;
+            create(...args: any[]): Model;
+
+            clear(): Model;
+
+            table: string;
+            id: string[];
+
+            [property: string]: any;
+        }
+
+        export interface Instance {
+            on(event: string, callback): Instance;
+            save(): Instance;
+            save(data: { [property: string]: any; }, callback: (err: Error) => void): Instance;
+            save(data: { [property: string]: any; }, options: any, callback: (err: Error) => void): Instance;
+            saved: boolean;
+            remove(callback: (err: Error) => void): Instance;
+            isInstance: boolean;
+            isPersisted: boolean;
+            isShell: boolean;
+            validate(callback: (errors: Error[]) => void);
+            model: Model;
+
+            [property: string]: any;
+        }
+
+        export interface ModelOptions {
+            id?: string[];
+            autoFetch?: boolean;
+            autoFetchLimit?: number;
+            cacheFetch?: boolean;
+            hooks?: { [property: string]: Hooks };
+            methods?: { [name: string]: Function };
+        }
+
+        export interface Hooks {
+            beforeValidation?: (next?) => void;
+            beforeCreate?: (next?) => void;
+            afterCreate?: (next?) => void;
+            beforeSave?: (next?) => void;
+            afterSave?: (next?) => void;
+            afterLoad?: (next?) => void;
+            afterAutoFetch?: (next?) => void;
+            beforeRemove?: (next?) => void;
+            afterRemove?: (next?) => void;
+        }
+
+        export interface IConnectionOptions {
+            protocol: string;
+            host?: string;
+            port?: number;
+            auth?: string;
+            username?: string;
+            password?: string;
+            database?: string;
+            pool?: boolean;
+            debug?: boolean;
+        }
+
+        export interface IAggregated {
+            groupBy(...columns: string[]): IAggregated;
+            limit(limit: number): IAggregated;
+            limit(offset: number, limit: number): IAggregated;
+            order(...order: string[]): IAggregated;
+            select(columns: string[]): IAggregated;
+            select(...columns: string[]): IAggregated;
+            as(alias: string): IAggregated;
+            call(fun: string, args: any[]): IAggregated;
+            get(callback: (err: Error, instance: Instance) => void);
+        }
+
+        /*
+         * Classes
+        */
+
+        export class ORM extends events.EventEmitter {
+            validators: enforce;
+            enforce: enforce;
+            settings: Settings;
+            driver_name: string;
+            driver: any;
+            tools: any;
+            models: { [key: string]: Model };
+            plugins: Plugin[];
+
+            use(plugin: string, options?: any): ORM;
+            use(plugin: Plugin, options?: any): ORM;
+
+            define(name: string, properties: { [key: string]: Property }, opts?: ModelOptions): Model;
+            ping(callback: (err: Error) => void): ORM;
+            close(callback: (err: Error) => void): ORM;
+            load(file: string, callback: (err: Error) => void): any;
+            sync(callback: (err: Error) => void): ORM;
+            drop(callback: (err: Error) => void): ORM;
+        }
+
+        export class enforce {
+            static required(message?: string);
+            static notEmptyString(message?: string);
+            static rangeNumber(min: number, max: number, message?: string);
+            static rangeLength(min: number, max: number, message?: string);
+            static insideList(inside: string[], message?: string);
+            static insideList(inside: number[], message?: string);
+            static outsideList(outside: string[], message?: string);
+            static outsideList(outside: number[], message?: string);
+            static password(conditions?: string, message?: string);
+            static patterns(expr: RegExp, message?: string);
+            static patterns(expr: string, flags: string, message?: string);
+            static equalToProperty(name: string, message?: string);
+            static unique(message?: string);
+            static unique(opts: { ignoreCase: boolean }, message?: string);
+        }
+
+        export function equalToProperty(name: string, message?: string);
+        export function unique(message?: string);
+        export function unique(opts: { ignoreCase: boolean }, message?: string);
+
+        export class singleton {
+            static clear(key?: string): singleton;
+            static get(key, opts: {
+                cache?: any;
+                save_check?: boolean;
+            }, createCb: Function, returnCb: Function);
+        }
+
+        export class Settings {
+            static Container: any;
+
+            static defaults(): {
+                properties: {
+                    primary_key: string;
+                    association_key: string;
+                    required: boolean;
+                };
+
+                instance: {
+                    cache: boolean;
+                    cacheSaveCheck: boolean;
+                    autoSave: boolean;
+                    autoFetch: boolean;
+                    autoFetchLimit: number;
+                    cascadeRemove: boolean;
+                    returnAllErrors: boolean;
+                };
+
+                connection: {
+                    reconnect: boolean;
+                    poll: boolean;
+                    debug: boolean;
+                };
             };
-        };
-
-        constructor(settings: any);
-
-        //[key: string]: {
-        //    get: (key, def) => any;
-        //    set: (key, value) => Settings;
-        //    unset: (...keys: string[]) => Settings;
-        //}
-    
-    }
-
-    export var settings: Settings;
 
-    export class Property {
-        static normalize(property: string, settings: Settings): any;
-        static validate(value: any, property: string): any;
+            constructor(settings: any);
+
+            //[key: string]: {
+            //    get: (key, def) => any;
+            //    set: (key, value) => Settings;
+            //    unset: (...keys: string[]) => Settings;
+            //}
+
+        }
+
+        export var settings: Settings;
+
+        export class Property {
+            static normalize(property: string, settings: Settings): any;
+            static validate(value: any, property: string): any;
+        }
+
+        export interface ErrorCodes {
+            QUERY_ERROR: number;
+            NOT_FOUND: number;
+            NOT_DEFINED: number;
+            NO_SUPPORT: number;
+            MISSING_CALLBACK: number;
+            PARAM_MISMATCH: number;
+            CONNECTION_LOST: number;
+
+            generateError(code: number, message: string, extra: any): Error;
+        }
+
+        export function Text(type: string): sqlquery.TextQuery;
+        export function express(uri: string, handlers: {
+            define(db: ORM, models: { [key: string]: Model });
+        }): (req, res, next) => void;
+        export function use(connection, protocol: string, options, callback: (err: Error, db?: ORM) => void);
+        export function connect(uri: string): ORM;
+        export function connect(uri: string, callback: (err: Error, db: ORM) => void);
+        export function connect(options: IConnectionOptions): ORM;
+        export function connect(options: IConnectionOptions, callback: (err: Error, db: ORM) => void);
     }
 
-    export interface ErrorCodes {
-        QUERY_ERROR: number;
-        NOT_FOUND: number;
-        NOT_DEFINED: number;
-        NO_SUPPORT: number;
-        MISSING_CALLBACK: number;
-        PARAM_MISMATCH: number;
-        CONNECTION_LOST: number;
-
-        generateError(code: number, message: string, extra: any): Error;
-    }
-
-    export function Text(type: string): sqlquery.TextQuery;
-    export function express(uri: string, handlers: {
-        define(db: ORM, models: { [key: string]: Model });
-    }): (req, res, next) => void;
-    export function use(connection, protocol: string, options, callback: (err: Error, db?: ORM) => void);
-    export function connect(uri: string): ORM;
-    export function connect(uri: string, callback: (err: Error, db: ORM) => void);
-    export function connect(options: IConnectionOptions): ORM;
-    export function connect(options: IConnectionOptions, callback: (err: Error, db: ORM) => void);
-
-
-    /**
-     * Parameter Type Interfaces
-     */
-
-    export interface Model {
-        (): Instance;
-        (...ids: any[]): Instance;
-
-        properties: { [property: string]: Property };
-        settings: Settings;
-
-        drop(callback?: (err: Error) => void): Model;
-        sync(callback?: (err: Error) => void): Model;
-        get(...args: any[]): Model;
-        find(conditions: { [property: string]: any }, callback: (err: Error, results: Instance[]) => void): Model;
-        find(conditions: { [property: string]: any }, options: {
-            limit?: number;
-            order?: any;
-        }, callback: (err: Error, results: Instance[]) => void): Model;
-        find(conditions: { [property: string]: any }, limit: number, order: string[], callback: (err: Error, results: Instance[]) => void): Model;
-
-        all(conditions: { [property: string]: any }, callback: (err: Error, results: Instance[]) => void): Model;
-        all(conditions: { [property: string]: any }, options: {
-            limit?: number;
-            order?: any;
-        }, callback: (err: Error, results: Instance[]) => void): Model;
-        all(conditions: { [property: string]: any }, limit: number, order: string[], callback: (err: Error, results: Instance[]) => void): Model;
-
-        one(conditions: { [property: string]: any }, callback: (err: Error, result: Instance) => void): Model;
-        one(conditions: { [property: string]: any }, options: {
-            limit?: number;
-            order?: any;
-        }, callback: (err: Error, result: Instance) => void): Model;
-        one(conditions: { [property: string]: any }, limit: number, order: string[], callback: (err: Error, result: Instance) => void): Model;
-
-        count(callback: (err: Error, count: number) => void): Model;
-        count(conditions: { [property: string]: any }, callback: (err: Error, count: number) => void): Model;
-
-        aggregate(conditions: { [property: string]: any }): IAggregated;
-        aggregate(properties: string[]): IAggregated;
-        aggregate(conditions: { [property: string]: any }, properties: string[]): IAggregated;
-
-        exists(id: any, callback: (err: Error, exists: boolean) => void): Model;
-        exists(...args: any[]): Model;
-
-        create(data: { [property: string]: any; }, callback: (err: Error, instance: Instance) => void): Model;
-        create(...args: any[]): Model;
-
-        clear(): Model;
-
-        table: string;
-        id: string[];
-
-        [property: string]: any;
-    }
-
-    export interface Instance {
-        on(event: string, callback): Instance;
-        save(): Instance;
-        save(data: { [property: string]: any; }, callback: (err: Error) => void): Instance;
-        save(data: { [property: string]: any; }, options: any, callback: (err: Error) => void): Instance;
-        saved: boolean;
-        remove(callback: (err: Error) => void): Instance;
-        isInstance: boolean;
-        isPersisted: boolean;
-        isShell: boolean;
-        validate(callback: (errors: Error[]) => void);
-        model: Model;
-
-        [property: string]: any;
-    }
-
-    export interface ModelOptions {
-        id?: string[];
-        autoFetch?: boolean;
-        autoFetchLimit?: number;
-        cacheFetch?: boolean;
-        hooks?: { [property: string]: Hooks };
-        methods?: { [name: string]: Function };
-    }
-
-    export interface Hooks {
-        beforeValidation?: (next?) => void;
-        beforeCreate?: (next?) => void;
-        afterCreate?: (next?) => void;
-        beforeSave?: (next?) => void;
-        afterSave?: (next?) => void;
-        afterLoad?: (next?) => void;
-        afterAutoFetch?: (next?) => void;
-        beforeRemove?: (next?) => void;
-        afterRemove?: (next?) => void;
-    }
-
-    export interface IConnectionOptions {
-        protocol: string;
-        host?: string;
-        port?: number;
-        auth?: string;
-        username?: string;
-        password?: string;
-        database?: string;
-        pool?: boolean;
-        debug?: boolean;
-    }
-
-    export interface IAggregated {
-        groupBy(...columns: string[]): IAggregated;
-        limit(limit: number): IAggregated;
-        limit(offset: number, limit: number): IAggregated;
-        order(...order: string[]): IAggregated;
-        select(columns: string[]): IAggregated;
-        select(...columns: string[]): IAggregated;
-        as(alias: string): IAggregated;
-        call(fun: string, args: any[]): IAggregated;
-        get(callback: (err: Error, instance: Instance) => void);
-    }
+    export = orm;
 }
\ No newline at end of file

From dd67c7cef279894eacbb3f672a1109c69c95aa9f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 30 Oct 2013 19:16:53 +0000
Subject: [PATCH 0895/1246] Fixes reversed hasOne.getAccessor when called
 without callback (#267)

Returns a ChainFind which can then be filtered..
---
 lib/Associations/One.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index 3c1dfb8d..5ed925e3 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -173,6 +173,9 @@ function extendInstance(Model, Instance, Driver, association) {
 
 			if (association.reversed) {
 				if (util.hasValues(Instance, Model.id)) {
+					if (typeof cb !== "function") {
+						return association.model.find(util.getConditions(Model, Object.keys(association.field), Instance), opts);
+					}
 					association.model.find(util.getConditions(Model, Object.keys(association.field), Instance), opts, saveAndReturn);
 				} else {
 					cb(null);

From fc13200028eef7cc5a387a3f1b7c438b87049f27 Mon Sep 17 00:00:00 2001
From: Rafael Kaufmann <rafael.kaufmann@resolveai.com.br>
Date: Thu, 31 Oct 2013 16:32:27 -0200
Subject: [PATCH 0896/1246] Fixes erroneous misformatting of top-level $and/$or
 clauses

---
 lib/Drivers/DML/mongodb.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
index 5b15f30c..5a718824 100644
--- a/lib/Drivers/DML/mongodb.js
+++ b/lib/Drivers/DML/mongodb.js
@@ -353,7 +353,7 @@ Driver.prototype.clear = function (table, cb) {
 
 function convertToDB(obj, timeZone) {
 	for (var k in obj) {
-		if (Array.isArray(obj[k])) {
+		if (Array.isArray(obj[k]) && k[0] != '$') {
 			for (var i = 0; i < obj[k].length; i++) {
 				obj[k][i] = convertToDBVal(k, obj[k][i], timeZone);
 			}

From cfc7de6ac85aeef52e8b9dea208f799d061a6948 Mon Sep 17 00:00:00 2001
From: Zachary Belford <belfordz66@gmail.com>
Date: Thu, 31 Oct 2013 12:02:10 -0700
Subject: [PATCH 0897/1246] Fixed typo "poll" should be "pool"

---
 lib/Settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Settings.js b/lib/Settings.js
index 5737f948..47aeaee1 100644
--- a/lib/Settings.js
+++ b/lib/Settings.js
@@ -16,7 +16,7 @@ var default_settings = {
 	},
 	connection : {
 		reconnect       : true,
-		poll            : false,
+		pool            : false,
 		debug           : false
 	}
 };

From 5263d36fa53848fa3ef3b3a3ce186e65611d743d Mon Sep 17 00:00:00 2001
From: Tape <dave@davidkosub.com>
Date: Thu, 31 Oct 2013 14:27:33 -0500
Subject: [PATCH 0898/1246] Document the findBy... method for hasOne
 associations

---
 Readme.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Readme.md b/Readme.md
index 3102c9ed..88d89f1c 100755
--- a/Readme.md
+++ b/Readme.md
@@ -603,6 +603,14 @@ animal.hasOwner(function..)         // Checks if owner exists
 animal.removeOwner()                // Sets owner_id to 0
 ```
 
+**Chain Find**
+
+The hasOne association is also chain find compatible. Using the example above, we can do this to access a new instance of a ChainFind object:
+
+```js
+Animal.findByOwner({ /* options */ })
+```
+
 **Reverse access**
 
 ```js
@@ -612,8 +620,12 @@ Animal.hasOne('owner', Person, {reverse: 'pets'})
 will add the following:
 
 ```js
+// Instance methods
 person.getPets(function..)
 person.setPets(cat, function..)
+
+// Model methods
+Person.findByPets({ /* options */ }) // returns ChainFind object
 ```
 
 ### hasMany

From 45a084388805c892fb6dd06dfe80faf4d4a35cf3 Mon Sep 17 00:00:00 2001
From: Paolo Galeone <nessuno@nerdz.eu>
Date: Sat, 2 Nov 2013 16:57:38 +0100
Subject: [PATCH 0899/1246] Fix and improve TypeScript declaration

Now we can use helper functions like orm.ge, orm.like, ecc in Find
---
 lib/TypeScript/orm.d.ts       |  10 +++
 lib/TypeScript/sql-query.d.ts | 135 +++++++++++++++++-----------------
 2 files changed, 79 insertions(+), 66 deletions(-)

diff --git a/lib/TypeScript/orm.d.ts b/lib/TypeScript/orm.d.ts
index f9ef638f..3f695fc7 100644
--- a/lib/TypeScript/orm.d.ts
+++ b/lib/TypeScript/orm.d.ts
@@ -3,6 +3,7 @@
 declare module "orm" {
 
     import events = require('events');
+    import sqlquery = require('sqlquery');
 
     module orm {
 
@@ -234,6 +235,15 @@ declare module "orm" {
         }
 
         export function Text(type: string): sqlquery.TextQuery;
+        export function eq(value: any): sqlquery.Comparator;
+        export function ne(value: any): sqlquery.Comparator;
+        export function gt(value: any): sqlquery.Comparator;
+        export function gte(value: any): sqlquery.Comparator;
+        export function lt(value: any): sqlquery.Comparator;
+        export function lte(value: any): sqlquery.Comparator;
+        export function like(value: string): sqlquery.Comparator;
+        export function between(a: number, b: number): sqlquery.Comparator;
+        export function not_between(a: number, b: number): sqlquery.Comparator;
         export function express(uri: string, handlers: {
             define(db: ORM, models: { [key: string]: Model });
         }): (req, res, next) => void;
diff --git a/lib/TypeScript/sql-query.d.ts b/lib/TypeScript/sql-query.d.ts
index 8f18734a..fe9fa7ad 100644
--- a/lib/TypeScript/sql-query.d.ts
+++ b/lib/TypeScript/sql-query.d.ts
@@ -1,76 +1,79 @@
-declare module sqlquery {
-    export class Query {
-        constructor(dialect: string);
-        constructor(options: {
-            dialect: string;
-        });
-        static Text(type: string): TextQuery;
+declare module "sqlquery" {
+    module sqlquery {
+        export class Query {
+            constructor(dialect: string);
+            constructor(options: {
+                dialect: string;
+            });
+            static Text(type: string): TextQuery;
 
-        static Comparators: string[];
-        static between(a: number, b: number): Comparator;
-        static not_between(a: number, b: number): Comparator;
-        static like(expression: string): Comparator;
-        static eq(value: any): Comparator;
-        static ne(value: any): Comparator;
-        static gt(value: any): Comparator;
-        static gte(value: any): Comparator;
-        static lt(value: any): Comparator;
-        static lte(value: any): Comparator;
+            static Comparators: string[];
+            static between(a: number, b: number): Comparator;
+            static not_between(a: number, b: number): Comparator;
+            static like(expression: string): Comparator;
+            static eq(value: any): Comparator;
+            static ne(value: any): Comparator;
+            static gt(value: any): Comparator;
+            static gte(value: any): Comparator;
+            static lt(value: any): Comparator;
+            static lte(value: any): Comparator;
 
-        escapeId(id: string): string;
-        escapeId(id: string, table: string): string;
-        escapeVal(value: any): string;
-        select(): SelectQuery;
-        insert(): InsertQuery;
-        update(): UpdateQuery;
-        remove(): RemoveQuery;
-    }
+            escapeId(id: string): string;
+            escapeId(id: string, table: string): string;
+            escapeVal(value: any): string;
+            select(): SelectQuery;
+            insert(): InsertQuery;
+            update(): UpdateQuery;
+            remove(): RemoveQuery;
+        }
 
-    export interface Comparator {
-        sql_comparator(): string;
-        from?: any;
-        to?: any;
-        expr?: string;
-        value?: any;
-    }
+        export interface Comparator {
+            sql_comparator(): string;
+            from?: any;
+            to?: any;
+            expr?: string;
+            value?: any;
+        }
 
-    export interface TextQuery {
-        data: any;
-        type: string;
-    }
+        export interface TextQuery {
+            data: any;
+            type: string;
+        }
 
-    export interface SelectQuery {
-        select(fields: string): SelectQuery;
-        calculateFoundRows: SelectQuery;
-        as(alias: string): SelectQuery;
-        fun(fun: string, column: string, alias: string): SelectQuery;
-        from(table: string, from_id: string, to_id: string): SelectQuery;
-        from(table: string, from_id: string, to_table: string, to_id: string): SelectQuery;
-        where(...args: any[]): SelectQuery;
-        whereExists(table: string, table_link: string, link: string, conditions: { [column: string]: any }): SelectQuery;
-        groupBy(...columns: string[]): SelectQuery;
-        offset(offset: number): SelectQuery;
-        limit(limit: number): SelectQuery;
-        order(column: string, direction: string): SelectQuery;
-        build(): string;
-    }
+        export interface SelectQuery {
+            select(fields: string): SelectQuery;
+            calculateFoundRows: SelectQuery;
+            as(alias: string): SelectQuery;
+            fun(fun: string, column: string, alias: string): SelectQuery;
+            from(table: string, from_id: string, to_id: string): SelectQuery;
+            from(table: string, from_id: string, to_table: string, to_id: string): SelectQuery;
+            where(...args: any[]): SelectQuery;
+            whereExists(table: string, table_link: string, link: string, conditions: { [column: string]: any }): SelectQuery;
+            groupBy(...columns: string[]): SelectQuery;
+            offset(offset: number): SelectQuery;
+            limit(limit: number): SelectQuery;
+            order(column: string, direction: string): SelectQuery;
+            build(): string;
+        }
 
-    export interface InsertQuery {
-        into(table: string): InsertQuery;
-        set(values: { [key: string]: any }[]): InsertQuery;
-        build(): string;
-    }
+        export interface InsertQuery {
+            into(table: string): InsertQuery;
+            set(values: { [key: string]: any }[]): InsertQuery;
+            build(): string;
+        }
 
-    export interface UpdateQuery {
-        into(table: string): UpdateQuery;
-        set(values: { [column: string]: any }): UpdateQuery;
-        where(...conditions: { [column: string]: any }[]): UpdateQuery;
-        build(): string;
-    }
+        export interface UpdateQuery {
+            into(table: string): UpdateQuery;
+            set(values: { [column: string]: any }): UpdateQuery;
+            where(...conditions: { [column: string]: any }[]): UpdateQuery;
+            build(): string;
+        }
 
-    export interface RemoveQuery {
-        from(table: string): RemoveQuery;
-        where(...conditions: { [column: string]: any }[]): RemoveQuery;
-        build(): string;
+        export interface RemoveQuery {
+            from(table: string): RemoveQuery;
+            where(...conditions: { [column: string]: any }[]): RemoveQuery;
+            build(): string;
+        }
     }
+    export = sqlquery;
 }

From 145ba513a52a180fa44ba68e763fd17ae0669585 Mon Sep 17 00:00:00 2001
From: Paolo Galeone <nessuno@nerdz.eu>
Date: Sat, 2 Nov 2013 19:11:03 +0100
Subject: [PATCH 0900/1246] Now in TypeScript we can use find chain

Now it's possible to do thing like
```TypeScript
req.models["users"].find({ "counter": orm.lte(25) }).each((user) => {
console.log(user["counter"]);
});
req.models["users"].find({ "counter": orm.between(1, 205)
}).each().filter((user) => {
return (user["counter"] % 2) === 0;
}).count((num) => {
console.log("Users with counter between 1 and 205 and with even counter:
"+ num);
});
```
---
 lib/TypeScript/orm.d.ts | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/lib/TypeScript/orm.d.ts b/lib/TypeScript/orm.d.ts
index 3f695fc7..7ad22f86 100644
--- a/lib/TypeScript/orm.d.ts
+++ b/lib/TypeScript/orm.d.ts
@@ -27,6 +27,7 @@ declare module "orm" {
                 order?: any;
             }, callback: (err: Error, results: Instance[]) => void): Model;
             find(conditions: { [property: string]: any }, limit: number, order: string[], callback: (err: Error, results: Instance[]) => void): Model;
+            find(conditions: { [property: string]: any }): IChainFind;
 
             all(conditions: { [property: string]: any }, callback: (err: Error, results: Instance[]) => void): Model;
             all(conditions: { [property: string]: any }, options: {
@@ -124,6 +125,22 @@ declare module "orm" {
             get(callback: (err: Error, instance: Instance) => void);
         }
 
+        export interface IChainFind {
+            find(conditions: { [property: string]: any }): IChainFind;
+            only(...args: string[]): IChainFind;
+            limit(limit: number): IChainFind;
+            offset(offset: number): IChainFind;
+            run(callback: (err: Error, results: Instance[]) => void): void;
+            count(callback: (err: Error, count: number) => void): void;
+            remove(callback: (err: Error) => void): void;
+            save(callback: (err: Error) => void): void;
+            each(callback: (result: Instance) => void): void;
+            each(): IChainFind;
+            filter(callback: (result: Instance) => boolean): IChainFind;
+            sort(callback: (a: Instance, b: Instance) => boolean): IChainFind;
+            get(callback: (results: Instance[]) => void): IChainFind;
+        }
+
         /*
          * Classes
         */

From 7d11562e7bc5bb4453df80e1dd988a2dd9a0928b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Thu, 7 Nov 2013 15:36:46 +0100
Subject: [PATCH 0901/1246] postgres: always save object as Buffer

There is either a problem with Dialect.escapeVal,
or a problem with postgres 9.3 when casting string
to bytea. Some strings are not accepted (because of \ ?)
---
 lib/Drivers/DML/postgres.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index b2470b69..7380a3a0 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -302,7 +302,9 @@ Driver.prototype.propertyToValue = function (value, property) {
 
 	switch (property.type) {
 		case "object":
-			value = JSON.stringify(value);
+			if (!Buffer.isBuffer(value)) {
+				value = new Buffer(JSON.stringify(value));
+			}
 			break;
 		case "date":
 			if (this.config.timezone && this.config.timezone != 'local') {

From ec4f70cf86095f2ed76834e26c5e5d6c76c6df56 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 8 Nov 2013 21:55:25 +0000
Subject: [PATCH 0902/1246] Fixes bug based on @jperdereau comment (#325)

Thank you!
---
 lib/Drivers/DML/mysql.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index d73b5d08..3c199946 100755
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -13,7 +13,7 @@ function Driver(config, connection, opts) {
 	if (!this.config.timezone) {
 		this.config.timezone = "local";
 	}
-	this.query  = new Query({ dialect: "mysql", timezone: config.timezone });
+	this.query  = new Query({ dialect: "mysql", timezone: this.config.timezone });
 
 	this.reconnect(null, connection);
 

From 266e5764fdb43ecc2049b7c192d3c460f33820e8 Mon Sep 17 00:00:00 2001
From: James S <james.sapara@gmail.com>
Date: Fri, 8 Nov 2013 14:59:15 -0800
Subject: [PATCH 0903/1246] Typo in property definition

There is much dispute about the name of this attribute, but the EMCA6 spec says 'writable' not 'writeable'. Spent some time trying to figure out why we could not get spy's in our testing libs to run on instance methods... mystery solved!

https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/defineProperty
---
 lib/Instance.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 68f624b8..d2984f75 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -489,7 +489,7 @@ function Instance(Model, opts) {
 		Object.defineProperty(instance, k, {
 			value      : opts.methods[k].bind(instance),
 			enumerable : false,
-			writeable  : true
+			writable  : true
 		});
 	}
 

From dff80f07104e85d45f1f10946c028fbf8607f9a4 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sat, 9 Nov 2013 18:05:23 +0000
Subject: [PATCH 0904/1246] Adds rational option to properties if not defined
 (default = true)

---
 lib/Property.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/Property.js b/lib/Property.js
index e8a00933..b96cc1b2 100644
--- a/lib/Property.js
+++ b/lib/Property.js
@@ -40,6 +40,10 @@ exports.normalize = function (prop, customTypes, Settings) {
 		prop.required = true;
 	}
 
+	if (prop.type == "number" && !prop.hasOwnProperty("rational")) {
+		prop.rational = true;
+	}
+
 	return prop;
 };
 

From 48ad6c656ee7950a19b3db2763d3664e5fe6d8f4 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sat, 9 Nov 2013 18:06:43 +0000
Subject: [PATCH 0905/1246] Adds sql-dll-sync module, removes older DDL stuff

---
 lib/Drivers/DDL/SQL.js      |  56 +++++++++
 lib/Drivers/DDL/mysql.js    | 192 -----------------------------
 lib/Drivers/DDL/postgres.js | 239 ------------------------------------
 lib/Drivers/DDL/sqlite.js   | 176 --------------------------
 lib/Drivers/DML/mysql.js    |   8 +-
 lib/Drivers/DML/postgres.js |   8 +-
 lib/Drivers/DML/sqlite.js   |   8 +-
 package.json                |   9 +-
 8 files changed, 79 insertions(+), 617 deletions(-)
 create mode 100644 lib/Drivers/DDL/SQL.js
 delete mode 100755 lib/Drivers/DDL/mysql.js
 delete mode 100755 lib/Drivers/DDL/postgres.js
 delete mode 100644 lib/Drivers/DDL/sqlite.js

diff --git a/lib/Drivers/DDL/SQL.js b/lib/Drivers/DDL/SQL.js
new file mode 100644
index 00000000..f3d22782
--- /dev/null
+++ b/lib/Drivers/DDL/SQL.js
@@ -0,0 +1,56 @@
+var _    = require("lodash");
+var Sync = require("sql-ddl-sync").Sync;
+
+exports.sync = function (dialect, driver, opts, cb) {
+	var sync = new Sync({
+		dialect : dialect,
+		db      : driver.db,
+		debug   : false
+	});
+
+	var setIndex = function (p, v, k) {
+		v.index = true;
+		p[k] = v;
+	};
+	var props = {};
+
+	if (driver.customTypes) {
+		for (var k in driver.customTypes) {
+			sync.defineType(k, driver.customTypes[k]);
+		}
+	}
+
+	sync.defineCollection(opts.table, opts.allProperties);
+
+	for (i = 0; i < opts.many_associations.length; i++) {
+		props = {};
+
+		_.merge(props, opts.many_associations[i].mergeId);
+		_.merge(props, opts.many_associations[i].mergeAssocId);
+		props = _.transform(props, setIndex);
+		_.merge(props, opts.many_associations[i].props);
+
+		sync.defineCollection(opts.many_associations[i].mergeTable, props);
+	}
+
+	sync.sync(cb);
+};
+
+exports.drop = function (dialect, driver, opts, cb) {
+	var i, queries = [], pending;
+
+	queries.push("DROP TABLE IF EXISTS " + driver.query.escapeId(opts.table));
+
+	for (i = 0; i < opts.many_associations.length; i++) {
+		queries.push("DROP TABLE IF EXISTS " + driver.query.escapeId(opts.many_associations[i].mergeTable));
+	}
+
+	pending = queries.length;
+	for (i = 0; i < queries.length; i++) {
+		driver.execQuery(queries[i], function (err) {
+			if (--pending === 0) {
+				return cb(err);
+			}
+		});
+	}
+};
diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
deleted file mode 100755
index 1d521d4d..00000000
--- a/lib/Drivers/DDL/mysql.js
+++ /dev/null
@@ -1,192 +0,0 @@
-var ErrorCodes = require("../../ErrorCodes");
-
-exports.drop = function (driver, opts, cb) {
-	var i, queries = [], pending;
-
-	queries.push("DROP TABLE IF EXISTS " + driver.query.escapeId(opts.table));
-
-	for (i = 0; i < opts.many_associations.length; i++) {
-		queries.push("DROP TABLE IF EXISTS " + driver.query.escapeId(opts.many_associations[i].mergeTable));
-	}
-
-	pending = queries.length;
-
-	for (i = 0; i < queries.length; i++) {
-		driver.execQuery(queries[i], function (err) {
-			if (--pending === 0) {
-				return cb(err);
-			}
-		});
-	}
-};
-
-exports.sync = function (driver, opts, cb) {
-	var queries = [];
-	var definitions = [];
-	var k, i, pending, prop;
-	var primary_keys = opts.id.map(function (k) { return driver.query.escapeId(k); });
-	var keys = [];
-
-	for (k in opts.allProperties) {
-		prop = opts.allProperties[k];
-		definitions.push(buildColumnDefinition(driver, k, prop));
-	}
-
-	for (k in opts.allProperties) {
-		prop = opts.allProperties[k];
-		if (prop.unique === true) {
-			definitions.push("UNIQUE (" + driver.query.escapeId(k) + ")");
-		} else if (prop.index) {
-			definitions.push("INDEX (" + driver.query.escapeId(k) + ")");
-		}
-	}
-
-	for (k in opts.allProperties) {
-		prop = opts.allProperties[k];
-		if (prop.unique === true) {
-			definitions.push("UNIQUE KEY " + driver.query.escapeId(k) + " (" + driver.query.escapeId(k) + ")");
-		} else if (prop.index) {
-			definitions.push("INDEX (" + driver.query.escapeId(k) + ")");
-		}
-	}
-
-	for (i = 0; i < opts.one_associations.length; i++) {
-		if (opts.one_associations[i].extension) continue;
-		if (opts.one_associations[i].reversed) continue;
-		for (k in opts.one_associations[i].field) {
-			definitions.push("INDEX (" + driver.query.escapeId(k) + ")");
-		}
-	}
-
-	for (i = 0; i < opts.indexes.length; i++) {
-		definitions.push("INDEX (" + opts.indexes[i].split(/[,;]+/).map(function (el) {
-			return driver.query.escapeId(el);
-		}).join(", ") + ")");
-	}
-
-	definitions.push("PRIMARY KEY (" + primary_keys.join(", ") + ")");
-
-	queries.push(
-		"CREATE TABLE IF NOT EXISTS " + driver.query.escapeId(opts.table) +
-		" (" + definitions.join(", ") + ")"
-	);
-
-	for (i = 0; i < opts.many_associations.length; i++) {
-		definitions = [];
-
-		for (k in opts.many_associations[i].mergeId) {
-			definitions.push(buildColumnDefinition(driver, k, opts.many_associations[i].mergeId[k]));
-		}
-
-		for (k in opts.many_associations[i].mergeAssocId) {
-			definitions.push(buildColumnDefinition(driver, k, opts.many_associations[i].mergeAssocId[k]));
-		}
-
-		for (k in opts.many_associations[i].props) {
-			definitions.push(buildColumnDefinition(driver, k, opts.many_associations[i].props[k]));
-		}
-
-		var index = null;
-		for (k in opts.many_associations[i].mergeId) {
-			if (index == null) index = driver.query.escapeId(k);
-			else index += ", " + driver.query.escapeId(k);
-		}
-
-		for (k in opts.many_associations[i].mergeAssocId) {
-			if (index == null) index = driver.query.escapeId(k);
-			else index += ", " + driver.query.escapeId(k);
-		}
-
-
-		definitions.push("INDEX (" + index + ")");
-		queries.push(
-			"CREATE TABLE IF NOT EXISTS " + driver.query.escapeId(opts.many_associations[i].mergeTable) +
-			" (" + definitions.join(", ") + ")"
-		);
-	}
-
-	pending = queries.length;
-
-	for (i = 0; i < queries.length; i++) {
-		driver.execQuery(queries[i], function (err) {
-			if (--pending === 0) {
-				return cb(err);
-			}
-		});
-	}
-};
-
-var colTypes = {
-	integer:  { 2: 'SMALLINT', 4: 'INTEGER', 8: 'BIGINT' },
-	floating: {                4: 'FLOAT',   8: 'DOUBLE' }
-};
-
-function buildColumnDefinition(driver, name, prop) {
-	var def = driver.query.escapeId(name);
-	var customType;
-
-	switch (prop.type) {
-	    case "text":
-			if (prop.big === true) {
-				def += " LONGTEXT";
-			} else {
-				def += " VARCHAR(" + Math.min(Math.max(parseInt(prop.size, 10) || 255, 1), 65535) + ")";
-			}
-			break;
-		case "serial":
-			def += " INT(10) UNSIGNED NOT NULL AUTO_INCREMENT";
-			break;
-		case "number":
-			if (prop.rational === false) {
-				def += " " + colTypes.integer[prop.size || 4];
-			} else {
-				def += " " + colTypes.floating[prop.size || 4];
-			}
-			if (prop.unsigned === true) {
-				def += " UNSIGNED";
-			}
-			break;
-		case "boolean":
-			def += " BOOLEAN";
-			break;
-		case "date":
-			if (prop.time === false) {
-				def += " DATE";
-			} else {
-				def += " DATETIME";
-			}
-			break;
-		case "binary":
-		case "object":
-			if (prop.big === true) {
-				def += " LONGBLOB";
-			} else {
-				def += " BLOB";
-			}
-			break;
-		case "enum":
-			def += " ENUM (" +
-				   prop.values.map(driver.query.escapeVal.bind(driver.query)) +
-			")";
-			break;
-		case "point":
-			def += " POINT";
-			break;
-		default:
-			customType = driver.customTypes[prop.type];
-			if (customType) {
-				def += " " + customType.datastoreType(prop);
-			} else {
-				throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Unknown property type: '" + prop.type + "'", {
-					property : prop
-				});
-			}
-	}
-	if (prop.required === true) {
-		def += " NOT NULL";
-	}
-	if (prop.hasOwnProperty("defaultValue")) {
-		def += " DEFAULT " + driver.query.escapeVal(prop.defaultValue);
-	}
-	return def;
-}
diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
deleted file mode 100755
index 860772f6..00000000
--- a/lib/Drivers/DDL/postgres.js
+++ /dev/null
@@ -1,239 +0,0 @@
-var ErrorCodes = require("../../ErrorCodes");
-
-exports.drop = function (driver, opts, cb) {
-	var i, queries = [], pending;
-
-	queries.push("DROP TABLE IF EXISTS " + driver.query.escapeId(opts.table));
-
-	for (i = 0; i < opts.many_associations.length; i++) {
-		queries.push("DROP TABLE IF EXISTS " + driver.query.escapeId(opts.many_associations[i].mergeTable));
-	}
-
-	pending = queries.length;
-	for (i = 0; i < queries.length; i++) {
-		driver.execQuery(queries[i], function (err) {
-			if (--pending === 0) {
-				return cb(err);
-			}
-		});
-	}
-};
-
-exports.sync = function (driver, opts, cb) {
-	var tables = [];
-	var subqueries = [];
-	var typequeries = [];
-	var definitions = [];
-	var k, i, pending, prop;
-	var primary_keys = opts.id.map(function (k) { return driver.query.escapeId(k); });
-	var keys = [];
-
-	for (k in opts.allProperties) {
-		prop = opts.allProperties[k];
-		definitions.push(buildColumnDefinition(driver, opts.table, k, prop));
-
-		if (prop.type == "enum") {
-			typequeries.push(
-				"CREATE TYPE " + driver.query.escapeId("enum_" + opts.table + "_" + k) + " AS ENUM (" +
-				prop.values.map(driver.query.escapeVal.bind(driver)) + ")"
-			);
-		}
-	}
-
-	for (k in opts.allProperties) {
-		prop = opts.allProperties[k];
-		if (prop.unique === true) {
-			definitions.push("UNIQUE (" + driver.query.escapeId(k) + ")");
-		} else if (prop.index) {
-			definitions.push("INDEX (" + driver.query.escapeId(k) + ")");
-		}
-	}
-
-	definitions.push("PRIMARY KEY (" + primary_keys.join(", ") + ")");
-
-	tables.push({
-		name       : opts.table,
-		query      : "CREATE TABLE " + driver.query.escapeId(opts.table) +
-					 " (" + definitions.join(", ") + ")",
-		typequeries: typequeries,
-		subqueries : subqueries
-	});
-
-	for (i = 0; i < opts.one_associations.length; i++) {
-		if (opts.one_associations[i].extension) continue;
-		if (opts.one_associations[i].reversed) continue;
-		for (k in opts.one_associations[i].field) {
-			tables[tables.length - 1].subqueries.push(
-				"CREATE INDEX ON " + driver.query.escapeId(opts.table) +
-				" (" + driver.query.escapeId(k) + ")"
-			);
-		}
-	}
-
-	for (i = 0; i < opts.indexes.length; i++) {
-		tables[tables.length - 1].subqueries.push(
-			"CREATE INDEX ON " + driver.query.escapeId(opts.table) +
-			" (" + opts.indexes[i].split(/[,;]+/).map(function (el) {
-				return driver.query.escapeId(el);
-			}).join(", ") + ")"
-		);
-	}
-
-	for (i = 0; i < opts.many_associations.length; i++) {
-		definitions = [];
-		typequeries = [];
-
-		for (k in opts.many_associations[i].mergeId) {
-		    definitions.push(buildColumnDefinition(driver, opts.many_associations[i].mergeTable, k, opts.many_associations[i].mergeId[k]));
-		}
-
-		for (k in opts.many_associations[i].mergeAssocId) {
-		    definitions.push(buildColumnDefinition(driver, opts.many_associations[i].mergeTable, k, opts.many_associations[i].mergeAssocId[k]));
-		}
-
-		for (k in opts.many_associations[i].props) {
-			definitions.push(buildColumnDefinition(driver, opts.many_associations[i].mergeTable,
-												   k, opts.many_associations[i].props[k]));
-			if (opts.many_associations[i].props[k].type == "enum") {
-				typequeries.push(
-					"CREATE TYPE " + driver.query.escapeId("enum_" + opts.many_associations[i].mergeTable + "_" + k) + " AS ENUM (" +
-					opts.many_associations[i].props[k].values.map(driver.query.escapeVal.bind(driver)) + ")"
-				);
-			}
-		}
-
-		var index = null;
-		for (k in opts.many_associations[i].mergeId) {
-			if (index == null) index = driver.query.escapeId(k);
-			else index += ", " + driver.query.escapeId(k);
-		}
-
-		for (k in opts.many_associations[i].mergeAssocId) {
-			if (index == null) index = driver.query.escapeId(k);
-			else index += ", " + driver.query.escapeId(k);
-		}
-
-		tables.push({
-			name       : opts.many_associations[i].mergeTable,
-			query      : "CREATE TABLE IF NOT EXISTS " + driver.query.escapeId(opts.many_associations[i].mergeTable) +
-						 " (" + definitions.join(", ") + ")",
-			typequeries: typequeries,
-			subqueries : []
-		});
-		tables[tables.length - 1].subqueries.push(
-			"CREATE INDEX ON " + driver.query.escapeId(opts.many_associations[i].mergeTable) +
-			" (" + index + ")"
-		);
-	}
-
-	pending = tables.length;
-
-	for (i = 0; i < tables.length; i++) {
-		createTableSchema(driver, tables[i], function (err) {
-			if (--pending === 0) {
-				// this will bring trouble in the future...
-				// some errors are not avoided (like ENUM types already defined, etc..)
-				return cb(err);
-			}
-		});
-	}
-};
-
-function createTableSchema(driver, table, cb) {
-	var pending = table.typequeries.length;
-	var createTable = function () {
-		driver.execQuery(table.query, function (err) {
-			if (err || table.subqueries.length === 0) {
-				return cb(err);
-			}
-
-			var pending = table.subqueries.length;
-
-			for (var i = 0; i < table.subqueries.length; i++) {
-				driver.execQuery(table.subqueries[i], function (err) {
-					if (--pending === 0) {
-						return cb();
-					}
-				});
-			}
-		});
-	};
-
-	if (pending === 0) {
-		return createTable();
-	}
-
-	for (var i = 0; i < table.typequeries.length; i++) {
-		driver.execQuery(table.typequeries[i], function (err) {
-			if (--pending === 0) {
-				return createTable();
-			}
-		});
-	}
-}
-
-var colTypes = {
-	integer:  { 2: 'SMALLINT', 4: 'INTEGER', 8: 'BIGINT' },
-	floating: {                4: 'REAL',    8: 'DOUBLE PRECISION' }
-};
-
-function buildColumnDefinition(driver, table, name, prop) {
-	var def = driver.query.escapeId(name);
-	var customType;
-
-	switch (prop.type) {
-	    case "text":
-			if (prop.big === true) {
-				def += " TEXT";
-			} else {
-				def += " VARCHAR(" + Math.max(parseInt(prop.size, 10) || 255, 1) + ")";
-			}
-			break;
-		case "serial":
-			def += " SERIAL";
-			break;
-		case "number":
-			if (prop.rational === false) {
-				def += " " + colTypes.integer[prop.size || 4];
-			} else {
-				def += " " + colTypes.floating[prop.size || 4];
-			}
-			break;
-		case "boolean":
-			def += " BOOLEAN";
-			break;
-		case "date":
-			if (prop.time === false) {
-				def += " DATE";
-			} else {
-				def += " TIMESTAMP WITHOUT TIME ZONE";
-			}
-			break;
-		case "binary":
-		case "object":
-			def += " BYTEA";
-			break;
-		case "enum":
-			def += " " + driver.query.escapeId("enum_" + table + "_" + name);
-			break;
-		case "point":
-			def += " POINT";
-			break;
-		default:
-			customType = driver.customTypes[prop.type];
-			if (customType) {
-				def += " " + customType.datastoreType(prop);
-			} else {
-				throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Unknown property type: '" + prop.type + "'", {
-					property : prop
-				});
-			}
-	}
-	if (prop.required === true) {
-		def += " NOT NULL";
-	}
-	if (prop.hasOwnProperty("defaultValue")) {
-		def += " DEFAULT " + driver.query.escapeVal(prop.defaultValue);
-	}
-	return def;
-}
diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
deleted file mode 100644
index 08c5a9cd..00000000
--- a/lib/Drivers/DDL/sqlite.js
+++ /dev/null
@@ -1,176 +0,0 @@
-var ErrorCodes = require("../../ErrorCodes");
-
-exports.drop = function (driver, opts, cb) {
-	var i, queries = [], pending;
-
-	queries.push("DROP TABLE IF EXISTS " + driver.query.escapeId(opts.table));
-
-	for (i = 0; i < opts.many_associations.length; i++) {
-		queries.push("DROP TABLE IF EXISTS " + driver.query.escapeId(opts.many_associations[i].mergeTable));
-	}
-
-	pending = queries.length;
-	for (i = 0; i < queries.length; i++) {
-		driver.db.all(queries[i], function (err) {
-			if (--pending === 0) {
-				return cb(err);
-			}
-		});
-	}
-};
-
-exports.sync = function (driver, opts, cb) {
-	var queries = [];
-	var definitions = [];
-	var k, i, pending, prop;
-	var primary_keys = opts.id.map(function (k) { return driver.query.escapeId(k); });
-	var keys = [];
-
-	for (k in opts.allProperties) {
-		prop = opts.allProperties[k];
-		definitions.push(buildColumnDefinition(driver, k, prop));
-	}
-
-	if (keys.length > 1) {
-		definitions.push("PRIMARY KEY (" + primary_keys.join(", ") + ")");
-	}
-
-	queries.push(
-		"CREATE TABLE IF NOT EXISTS " + driver.query.escapeId(opts.table) +
-		" (" + definitions.join(", ") + ")"
-	);
-	for (k in opts.properties) {
-		if (opts.properties[k].unique === true) {
-			queries.push(
-				"CREATE UNIQUE INDEX IF NOT EXISTS " + driver.query.escapeId(k) +
-				" ON " + driver.query.escapeId(opts.table) +
-				" (" + driver.query.escapeId(k) + ")"
-			);
-		} else if (opts.properties[k].index) {
-			queries.push(
-				"CREATE INDEX IF NOT EXISTS " + driver.query.escapeId(k) +
-				" ON " + driver.query.escapeId(opts.table) +
-				" (" + driver.query.escapeId(k) + ")"
-			);
-		}
-	}
-
-	for (i = 0; i < opts.one_associations.length; i++) {
-		if (opts.one_associations[i].extension) continue;
-		if (opts.one_associations[i].reversed) continue;
-		for (k in opts.one_associations[i].field) {
-			queries.push(
-			"CREATE INDEX IF NOT EXISTS " + driver.query.escapeId(opts.table + "_" + k) +
-			" ON " + driver.query.escapeId(opts.table) +
-			" (" + driver.query.escapeId(k) + ")"
-		);
-		}
-	}
-
-	for (i = 0; i < opts.indexes.length; i++) {
-		queries.push(
-			"CREATE INDEX IF NOT EXISTS " + driver.query.escapeId(opts.table + "_index" + i) +
-			" ON " + driver.query.escapeId(opts.table) +
-			" (" + opts.indexes[i].split(/[,;]+/).map(function (el) {
-				return driver.query.escapeId(el);
-			}).join(", ") + ")"
-		);
-	}
-
-	for (i = 0; i < opts.many_associations.length; i++) {
-		definitions = [];
-
-		for (k in opts.many_associations[i].mergeId) {
-			definitions.push(buildColumnDefinition(driver, k, opts.many_associations[i].mergeId[k]));
-		}
-
-		for (k in opts.many_associations[i].mergeAssocId) {
-			definitions.push(buildColumnDefinition(driver, k, opts.many_associations[i].mergeAssocId[k]));
-		}
-
-		for (k in opts.many_associations[i].props) {
-			definitions.push(buildColumnDefinition(driver, k, opts.many_associations[i].props[k]));
-		}
-
-		var index = null;
-		for (k in opts.many_associations[i].mergeId) {
-			if (index == null) index = driver.query.escapeId(k);
-			else index += ", " + driver.query.escapeId(k);
-		}
-
-		for (k in opts.many_associations[i].mergeAssocId) {
-			if (index == null) index = driver.query.escapeId(k);
-			else index += ", " + driver.query.escapeId(k);
-		}
-
-		queries.push(
-			"CREATE TABLE IF NOT EXISTS " + driver.query.escapeId(opts.many_associations[i].mergeTable) +
-			" (" + definitions.join(", ") + ")"
-		);
-		queries.push(
-			"CREATE INDEX IF NOT EXISTS " + driver.query.escapeId(opts.many_associations[i].mergeTable) +
-			" ON " + driver.query.escapeId(opts.table) +
-			" (" + index + ")"
-		);
-	}
-
-	pending = queries.length;
-	for (i = 0; i < queries.length; i++) {
-		driver.db.all(queries[i], function (err) {
-			// if (err) console.log(err);
-			if (--pending === 0) {
-				return cb(err);
-			}
-		});
-	}
-};
-
-function buildColumnDefinition(driver, name, prop) {
-	var def = driver.query.escapeId(name);
-	var customType;
-
-	switch (prop.type) {
-		case "text":
-			def += " TEXT";
-			break;
-		case "serial":
-			def += " INTEGER PRIMARY KEY AUTOINCREMENT";
-			break;
-		case "number":
-			if (prop.rational === false) {
-				def += " INTEGER";
-			} else {
-				def += " REAL";
-			}
-			break;
-		case "boolean":
-			def += " INTEGER UNSIGNED";
-			break;
-		case "date":
-			def += " DATETIME";
-			break;
-		case "binary":
-		case "object":
-			def += " BLOB";
-			break;
-		case "enum":
-			def += " INTEGER";
-			break;
-		default:
-			customType = driver.customTypes[prop.type];
-			if (customType) {
-				def += " " + customType.datastoreType(prop);
-			} else {
-				throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Unknown property type: '" + prop.type + "'", {
-					property : prop
-				});
-			}
-	}
-	if (prop.required === true) {
-		def += " NOT NULL";
-	}
-	if (prop.hasOwnProperty("defaultValue")) {
-		def += " DEFAULT " + driver.query.escapeVal(prop.defaultValue);
-	}
-	return def;
-}
diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 3c199946..9997d1b4 100755
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -29,11 +29,15 @@ function Driver(config, connection, opts) {
 _.extend(Driver.prototype, helpers.sql);
 
 Driver.prototype.sync = function (opts, cb) {
-	return require("../DDL/mysql").sync(this, opts, cb);
+	require("../DDL/SQL").sync("mysql", this, opts, cb);
+
+	return this;
 };
 
 Driver.prototype.drop = function (opts, cb) {
-	return require("../DDL/mysql").drop(this, opts, cb);
+	require("../DDL/SQL").drop("mysql", this, opts, cb);
+
+	return this;
 };
 
 Driver.prototype.ping = function (cb) {
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index b2470b69..2eb36559 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -118,11 +118,15 @@ function Driver(config, connection, opts) {
 _.extend(Driver.prototype, helpers.sql);
 
 Driver.prototype.sync = function (opts, cb) {
-	return require("../DDL/postgres").sync(this, opts, cb);
+	require("../DDL/SQL").sync("postgresql", this, opts, cb);
+
+	return this;
 };
 
 Driver.prototype.drop = function (opts, cb) {
-	return require("../DDL/postgres").drop(this, opts, cb);
+	require("../DDL/SQL").drop("postgresql", this, opts, cb);
+
+	return this;
 };
 
 Driver.prototype.ping = function (cb) {
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 023ffecf..13587ff1 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -40,11 +40,15 @@ function Driver(config, connection, opts) {
 _.extend(Driver.prototype, helpers.sql);
 
 Driver.prototype.sync = function (opts, cb) {
-	return require("../DDL/sqlite").sync(this, opts, cb);
+	require("../DDL/SQL").sync("sqlite", this, opts, cb);
+
+	return this;
 };
 
 Driver.prototype.drop = function (opts, cb) {
-	return require("../DDL/sqlite").drop(this, opts, cb);
+	require("../DDL/SQL").drop("sqlite", this, opts, cb);
+
+	return this;
 };
 
 Driver.prototype.ping = function (cb) {
diff --git a/package.json b/package.json
index 6af7cb98..fd703d70 100644
--- a/package.json
+++ b/package.json
@@ -36,10 +36,11 @@
 	},
 	"analyse"     : false,
 	"dependencies": {
-		"enforce"   : "0.1.2",
-		"sql-query" : "0.1.15",
-		"hat"       : "0.0.3",
-		"lodash"    : "2.2.1"
+		"enforce"      : "0.1.2",
+		"sql-query"    : "0.1.15",
+		"sql-ddl-sync" : "0.1.3",
+		"hat"          : "0.0.3",
+		"lodash"       : "2.2.1"
 	},
 	"devDependencies": {
 		"mysql"   : "2.0.0-alpha9",

From 129c904ef92d2fd0d07db3275564c6bc8fb79d02 Mon Sep 17 00:00:00 2001
From: Tape <dave@davidkosub.com>
Date: Wed, 20 Nov 2013 11:17:58 -0600
Subject: [PATCH 0906/1246] Implement eager loading for SQL databases

---
 lib/ChainFind.js                     | 47 +++++++++++++-
 lib/Drivers/DML/mysql.js             | 18 ++++++
 lib/Drivers/DML/postgres.js          | 18 ++++++
 lib/Drivers/DML/sqlite.js            | 18 ++++++
 test/integration/model-find-chain.js | 95 ++++++++++++++++++++++++++++
 5 files changed, 195 insertions(+), 1 deletion(-)
 mode change 100755 => 100644 lib/Drivers/DML/mysql.js

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 25dd07fc..9deed57c 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -132,6 +132,21 @@ function ChainFind(Model, opts) {
 			}
 			return promise.fail(cb);
 		},
+		eager: function () {
+			// This will allow params such as ("abc", "def") or (["abc", "def"])
+			var associations = _.flatten(arguments);
+
+			// TODO: Implement eager loading for Mongo and delete this.
+			if (opts.driver.config.protocol == "mongodb:") {
+				throw new Error("MongoDB does not currently support eager loading");
+			}
+
+			opts.__eager = _.filter(opts.associations, function (association) {
+				return ~associations.indexOf(association.name);
+			});
+
+			return this;
+		},
 		all: function (cb) {
 			opts.driver.find(opts.only, opts.table, opts.conditions, {
 				limit  : opts.limit,
@@ -153,8 +168,38 @@ function ChainFind(Model, opts) {
 						data[idx] = instance;
 
 						if (--pending === 0) {
-							return cb(null, data);
+							return (opts.__eager && opts.__eager.length ? eagerLoading : cb)(null, data);
+						}
+					});
+				};
+
+				var eagerLoading = function (err, data) {
+					var pending = opts.__eager.length;
+					var idMap = {};
+					var count = 0;
+
+					var ids = _.map(data, function (instance) {
+						var id = instance[opts.id[0]];
+						// Create the association arrays
+						for (var i = 0, association; association = opts.__eager[i]; i++) {
+							instance[association.name] = [];
 						}
+
+						idMap[id] = count++;
+						return id;
+					});
+
+					_.map(opts.__eager, function (association) {
+						opts.driver.eagerQuery(association, opts, ids, function (err, instances) {
+							for (var i = 0, instance; instance = instances[i]; i++) {
+								// Perform a parent lookup with $p, and initialize it as an instance.
+								data[idMap[instance.$p]][association.name].push(association.model(instance));
+							}
+
+							if (--pending === 0) {
+								return cb(null, data);
+							}
+						});
 					});
 				};
 
diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
old mode 100755
new mode 100644
index 9997d1b4..467ecdfe
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -143,6 +143,24 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	this.execSimpleQuery(q, cb);
 };
 
+Driver.prototype.eagerQuery = function (association, opts, ids, cb) {
+	var desiredKey = Object.keys(association.field);
+	var assocKey = Object.keys(association.mergeAssocId);
+
+	var where = {};
+	where[desiredKey] = ids;
+
+	var query = this.query.select()
+		.from(association.model.table)
+		.select(opts.only)
+		.from(association.mergeTable, assocKey, opts.id)
+		.select(desiredKey).as("$p")
+		.where(association.mergeTable, where)
+		.build();
+
+	this.execSimpleQuery(query, cb);
+};
+
 Driver.prototype.count = function (table, conditions, opts, cb) {
 	var q = this.query.select()
 	                  .from(table)
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index d5545627..12807a11 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -185,6 +185,24 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	this.execSimpleQuery(q, cb);
 };
 
+Driver.prototype.eagerQuery = function (association, opts, ids, cb) {
+	var desiredKey = Object.keys(association.field);
+	var assocKey = Object.keys(association.mergeAssocId);
+
+	var where = {};
+	where[desiredKey] = ids;
+
+	var query = this.query.select()
+		.from(association.model.table)
+		.select(opts.only)
+		.from(association.mergeTable, assocKey, opts.id)
+		.select(desiredKey).as("$p")
+		.where(association.mergeTable, where)
+		.build();
+
+	this.execSimpleQuery(query, cb);
+};
+
 Driver.prototype.count = function (table, conditions, opts, cb) {
 	var q = this.query.select().from(table).count(null, 'c');
 
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 13587ff1..a5c5bc34 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -127,6 +127,24 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	this.db.all(q, cb);
 };
 
+Driver.prototype.eagerQuery = function (association, opts, ids, cb) {
+	var desiredKey = Object.keys(association.field);
+	var assocKey = Object.keys(association.mergeAssocId);
+
+	var where = {};
+	where[desiredKey] = ids;
+
+	var query = this.query.select()
+		.from(association.model.table)
+		.select(opts.only)
+		.from(association.mergeTable, assocKey, opts.id)
+		.select(desiredKey).as("$p")
+		.where(association.mergeTable, where)
+		.build();
+
+	this.execSimpleQuery(query, cb);
+};
+
 Driver.prototype.count = function (table, conditions, opts, cb) {
 	var q = this.query.select()
 	                  .from(table)
diff --git a/test/integration/model-find-chain.js b/test/integration/model-find-chain.js
index 83638c5e..1bc44b09 100644
--- a/test/integration/model-find-chain.js
+++ b/test/integration/model-find-chain.js
@@ -6,6 +6,7 @@ var common   = require('../common');
 describe("Model.find() chaining", function() {
 	var db = null;
 	var Person = null;
+	var Dog = null;
 
 	var setup = function () {
 		return function (done) {
@@ -36,6 +37,30 @@ describe("Model.find() chaining", function() {
 		};
 	};
 
+	var setup2 = function () {
+		return function (done) {
+			Dog = db.define("dog", {
+				name: String,
+			});
+			Dog.hasMany("friends");
+			Dog.hasMany("family");
+
+			ORM.singleton.clear(); // clear cache
+
+			return helper.dropSync(Dog, function () {
+				Dog.create([{
+					name    : "Fido",
+					friends : [{ name: "Gunner" }, { name: "Chainsaw" }],
+					family  : [{ name: "Chester" }]
+				}, {
+					name    : "Thumper",
+					friends : [{ name: "Bambi" }],
+					family  : [{ name: "Princess" }, { name: "Butch" }]
+				}], done);
+			});
+		};
+	};
+
 	before(function (done) {
 		helper.connect(function (connection) {
 			db = connection;
@@ -479,6 +504,76 @@ describe("Model.find() chaining", function() {
 		});
 	});
 
+	describe(".eager()", function () {
+		before(setup2());
+
+		// TODO: Remove this code once the Mongo eager loading is implemented
+		var isMongo = function () {
+			if (db.driver.config.protocol == "mongodb:") {
+				(function () {
+					Dog.find().eager("friends").all(function () {
+						// Should not ever run.
+					});
+				}).should.throw();
+
+				return true;
+			}
+			return false;
+		};
+
+		it("should fetch all listed associations in a single query", function (done) {
+			if (isMongo()) { return done(); };
+
+			Dog.find({ name: ["Fido", "Thumper"] }).eager("friends").all(function (err, dogs) {
+				should.equal(err, null);
+
+				should(Array.isArray(dogs));
+
+				dogs.length.should.equal(2);
+
+				dogs[0].friends.length.should.equal(2);
+				dogs[1].friends.length.should.equal(1);
+				done();
+			});
+		});
+
+		it("should be able to handle multiple associations", function (done) {
+			if (isMongo()) { return done(); };
+
+			Dog.find({ name: ["Fido", "Thumper"] }).eager("friends", "family").all(function (err, dogs) {
+				should.equal(err, null);
+
+				should(Array.isArray(dogs));
+
+				dogs.length.should.equal(2);
+
+				dogs[0].friends.length.should.equal(2);
+				dogs[0].family.length.should.equal(1);
+				dogs[1].friends.length.should.equal(1);
+				dogs[1].family.length.should.equal(2);
+				done();
+			});
+		});
+
+		it("should work with array parameters too", function (done) {
+			if (isMongo()) { return done(); };
+
+			Dog.find({ name: ["Fido", "Thumper"] }).eager(["friends", "family"]).all(function (err, dogs) {
+				should.equal(err, null);
+
+				should(Array.isArray(dogs));
+
+				dogs.length.should.equal(2);
+
+				dogs[0].friends.length.should.equal(2);
+				dogs[0].family.length.should.equal(1);
+				dogs[1].friends.length.should.equal(1);
+				dogs[1].family.length.should.equal(2);
+				done();
+			});
+		});
+	});
+
 	describe(".success()", function () {
 		before(setup());
 

From 6ff996f678855841f9eca95d4f941262ef3f50b7 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Sun, 24 Nov 2013 22:45:11 +1100
Subject: [PATCH 0907/1246] Add an example express app

---
 Readme.md                                     |   4 +
 examples/anontxt/Readme.md                    |  30 ++++
 examples/anontxt/app/controllers/_helpers.js  |  15 ++
 .../app/controllers/comments_controller.js    |  33 ++++
 .../app/controllers/home_controller.js        |   5 +
 examples/anontxt/app/controllers/index.js     |   6 +
 .../app/controllers/messages_controller.js    |  35 ++++
 examples/anontxt/app/models/comment.js        |  28 +++
 examples/anontxt/app/models/index.js          |  22 +++
 examples/anontxt/app/models/message.js        |  45 +++++
 examples/anontxt/config/environment.js        |  24 +++
 examples/anontxt/config/routes.js             |  10 ++
 examples/anontxt/config/settings.js           |  16 ++
 examples/anontxt/package.json                 |  18 ++
 examples/anontxt/public/app.css               | 128 ++++++++++++++
 examples/anontxt/public/app.js                | 162 ++++++++++++++++++
 examples/anontxt/public/index.html            |  47 +++++
 examples/anontxt/script/start                 |  10 ++
 examples/anontxt/server.js                    |  34 ++++
 examples/anontxt/tasks/reset.js               |  22 +++
 20 files changed, 694 insertions(+)
 create mode 100644 examples/anontxt/Readme.md
 create mode 100644 examples/anontxt/app/controllers/_helpers.js
 create mode 100644 examples/anontxt/app/controllers/comments_controller.js
 create mode 100644 examples/anontxt/app/controllers/home_controller.js
 create mode 100644 examples/anontxt/app/controllers/index.js
 create mode 100644 examples/anontxt/app/controllers/messages_controller.js
 create mode 100644 examples/anontxt/app/models/comment.js
 create mode 100644 examples/anontxt/app/models/index.js
 create mode 100644 examples/anontxt/app/models/message.js
 create mode 100644 examples/anontxt/config/environment.js
 create mode 100644 examples/anontxt/config/routes.js
 create mode 100644 examples/anontxt/config/settings.js
 create mode 100644 examples/anontxt/package.json
 create mode 100644 examples/anontxt/public/app.css
 create mode 100644 examples/anontxt/public/app.js
 create mode 100644 examples/anontxt/public/index.html
 create mode 100644 examples/anontxt/script/start
 create mode 100644 examples/anontxt/server.js
 create mode 100644 examples/anontxt/tasks/reset.js

diff --git a/Readme.md b/Readme.md
index 88d89f1c..dc549c73 100755
--- a/Readme.md
+++ b/Readme.md
@@ -108,6 +108,10 @@ You can call `orm.express` more than once to have multiple database connections.
 will be joined together in `req.models`. **Don't forget to use it before `app.use(app.router)`, preferably right after your
 assets public folder(s).**
 
+## Examples
+
+See `examples/anontxt` for an example express based app.
+
 ## Documentation
 
 Documentation is moving to the [wiki](https://github.com/dresende/node-orm2/wiki/).
diff --git a/examples/anontxt/Readme.md b/examples/anontxt/Readme.md
new file mode 100644
index 00000000..7bad2c38
--- /dev/null
+++ b/examples/anontxt/Readme.md
@@ -0,0 +1,30 @@
+# AnonTXT demo app
+
+## Getting started
+
+**Setup node-orm2!**
+
+```bash
+git clone https://github.com/dresende/node-orm2.git
+cd node-orm2
+npm install
+
+# You may work off master, or checkout a different version if master is broken:
+git tag
+git checkout v2.1.3
+```
+
+**Setup AnonTXT**
+
+Edit `anontxt/config/settings.js` and set your database, user & password.
+
+```bash
+cd examples/anontxt
+npm install
+node tasks/reset
+nodemon server.js
+```
+
+And then open up [localhost:3000](http://localhost:3000/)
+
+You can also just run it with `node server.js` however nodemon will automatically restart the server if you change any code.
diff --git a/examples/anontxt/app/controllers/_helpers.js b/examples/anontxt/app/controllers/_helpers.js
new file mode 100644
index 00000000..70eef309
--- /dev/null
+++ b/examples/anontxt/app/controllers/_helpers.js
@@ -0,0 +1,15 @@
+
+module.exports = {
+	formatErrors: function(errorsIn) {
+		var errors = {};
+		var a, e;
+
+	  for(a = 0; a < errorsIn.length; a++) {
+	  	e = errorsIn[a];
+
+	    errors[e.property] = errors[e.property] || [];
+	    errors[e.property].push(e.msg);
+	  }
+	  return errors;
+	}
+};
diff --git a/examples/anontxt/app/controllers/comments_controller.js b/examples/anontxt/app/controllers/comments_controller.js
new file mode 100644
index 00000000..b6283bc9
--- /dev/null
+++ b/examples/anontxt/app/controllers/comments_controller.js
@@ -0,0 +1,33 @@
+var _       = require('lodash');
+var helpers = require('./_helpers');
+var orm     = require('../../../../');
+
+module.exports = {
+	create: function (req, res, next) {
+		var params = _.pick(req.body, 'author', 'body');
+
+		req.models.message.get(req.params.messageId, function (err, message) {
+			if (err) {
+				if (err.code == orm.ErrorCodes.NOT_FOUND) {
+					res.send(404, "Message not found");
+				} else {
+					return next(err);
+				}
+			}
+
+			params.message_id = message.id;
+
+			req.models.comment.create(params, function (err, message) {
+				if(err) {
+					if(Array.isArray(err)) {
+						return res.send(200, { errors: helpers.formatErrors(err) });
+					} else {
+						return next(err);
+					}
+				}
+
+				return res.send(200, message.serialize());
+			});
+		});
+	}
+};
diff --git a/examples/anontxt/app/controllers/home_controller.js b/examples/anontxt/app/controllers/home_controller.js
new file mode 100644
index 00000000..2d732e26
--- /dev/null
+++ b/examples/anontxt/app/controllers/home_controller.js
@@ -0,0 +1,5 @@
+var settings = require('../../config/settings');
+
+module.exports = function (req, res, next) {
+	res.sendfile(settings.path + '/public/index.html');
+};
diff --git a/examples/anontxt/app/controllers/index.js b/examples/anontxt/app/controllers/index.js
new file mode 100644
index 00000000..f7292e0c
--- /dev/null
+++ b/examples/anontxt/app/controllers/index.js
@@ -0,0 +1,6 @@
+
+module.exports = {
+	home     : require('./home_controller'),
+  messages : require('./messages_controller'),
+  comments : require('./comments_controller')
+};
diff --git a/examples/anontxt/app/controllers/messages_controller.js b/examples/anontxt/app/controllers/messages_controller.js
new file mode 100644
index 00000000..46ddce55
--- /dev/null
+++ b/examples/anontxt/app/controllers/messages_controller.js
@@ -0,0 +1,35 @@
+var _       = require('lodash');
+var helpers = require('./_helpers');
+var orm     = require('../../../../');
+
+module.exports = {
+	list: function (req, res, next) {
+		req.models.message.find().limit(4).order('-id').all(function (err, messages) {
+			if (err) return next(err);
+
+			var items = messages.map(function (m) {
+				return m.serialize();
+			});
+
+			res.send({ items: items });
+		});
+	},
+	create: function (req, res, next) {
+		var params = _.pick(req.body, 'title', 'body');
+
+		req.models.message.create(params, function (err, message) {
+			if(err) {
+				if(Array.isArray(err)) {
+					return res.send(200, { errors: helpers.formatErrors(err) });
+				} else {
+					return next(err);
+				}
+			}
+
+			return res.send(200, message.serialize());
+		});
+	},
+	get: function (req, res, next) {
+
+	}
+};
diff --git a/examples/anontxt/app/models/comment.js b/examples/anontxt/app/models/comment.js
new file mode 100644
index 00000000..f8fe3edf
--- /dev/null
+++ b/examples/anontxt/app/models/comment.js
@@ -0,0 +1,28 @@
+var moment = require('moment');
+
+module.exports = function (orm, db) {
+  var Comment = db.define('comment', {
+  	body      : { type: 'text', required: true },
+  	createdAt : { type: 'date', required: true, time: true }
+  },
+  {
+    hooks: {
+  		beforeValidation: function () {
+  			this.createdAt = new Date();
+  		}
+  	},
+  	validations: {
+  		body   : orm.enforce.ranges.length(1, 1024)
+  	},
+    methods: {
+      serialize: function () {
+        return {
+          body      : this.body,
+          createdAt : moment(this.createdAt).fromNow()
+        }
+      }
+    }
+  });
+
+  Comment.hasOne('message', db.models.message, { required: true, reverse: 'comments', autoFetch: true });
+};
diff --git a/examples/anontxt/app/models/index.js b/examples/anontxt/app/models/index.js
new file mode 100644
index 00000000..27f2306e
--- /dev/null
+++ b/examples/anontxt/app/models/index.js
@@ -0,0 +1,22 @@
+var orm      = require('../../../../');
+var settings = require('../../config/settings');
+
+var connection = null;
+
+function setup(db, cb) {
+ 	require('./message')(orm, db);
+ 	require('./comment')(orm, db);
+
+ 	return cb(null, db);
+}
+
+module.exports = function (cb) {
+  if (connection) return cb(null, connection);
+
+  orm.connect(settings.database, function (err, db) {
+    if (err) return cb(err);
+
+    db.settings.set('instance.returnAllErrors', true);
+    setup(db, cb);
+  });
+};
diff --git a/examples/anontxt/app/models/message.js b/examples/anontxt/app/models/message.js
new file mode 100644
index 00000000..b2a55961
--- /dev/null
+++ b/examples/anontxt/app/models/message.js
@@ -0,0 +1,45 @@
+var moment = require('moment');
+
+module.exports = function (orm, db) {
+  var Message = db.define('message', {
+  	title     : { type: 'text', required: true },
+  	body      : { type: 'text', required: true,  big:  true },
+  	createdAt : { type: 'date', required: true, time: true }
+  },
+  {
+  	hooks: {
+      beforeValidation: function () {
+  			this.createdAt = new Date();
+  		}
+  	},
+  	validations: {
+  		title: [
+        orm.enforce.ranges.length(1, undefined, "must be atleast 1 letter long"),
+        orm.enforce.ranges.length(undefined, 96, "cannot be longer than 96 letters")
+      ],
+  		body: [
+        orm.enforce.ranges.length(1, undefined, "must be atleast 1 letter long"),
+        orm.enforce.ranges.length(undefined, 32768, "cannot be longer than 32768 letters")
+      ]
+  	},
+    methods: {
+      serialize: function () {
+        var comments;
+
+        if (this.comments) {
+          comments = this.comments.map(function (c) { return c.serialize(); });
+        } else {
+          comments = [];
+        }
+
+        return {
+          id        : this.id,
+          title     : this.title,
+          body      : this.body,
+          createdAt : moment(this.createdAt).fromNow(),
+          comments  : comments
+        };
+      }
+    }
+  });
+};
diff --git a/examples/anontxt/config/environment.js b/examples/anontxt/config/environment.js
new file mode 100644
index 00000000..5296603a
--- /dev/null
+++ b/examples/anontxt/config/environment.js
@@ -0,0 +1,24 @@
+var path     = require('path');
+var express  = require('express');
+var settings = require('./settings');
+var models   = require('../app/models/');
+
+module.exports = function (app) {
+  app.configure(function () {
+    app.use(express.static(path.join(settings.path, 'public')));
+    app.use(express.logger({ format: 'dev' }));
+    app.use(express.bodyParser());
+    app.use(express.methodOverride());
+    app.use(function (req, res, next) {
+      models(function (err, db) {
+        if (err) return next(err);
+
+        req.models = db.models;
+        req.db     = db;
+
+        return next();
+      });
+    }),
+    app.use(app.router);
+  });
+};
diff --git a/examples/anontxt/config/routes.js b/examples/anontxt/config/routes.js
new file mode 100644
index 00000000..4b1fed09
--- /dev/null
+++ b/examples/anontxt/config/routes.js
@@ -0,0 +1,10 @@
+
+var controllers = require('../app/controllers')
+
+module.exports = function (app) {
+	app.get( '/'                           , controllers.home);
+  app.get( '/messages'                   , controllers.messages.list);
+  app.post('/messages'                   , controllers.messages.create);
+  app.get( '/message/:id'                , controllers.messages.get);
+  app.post('/message/:messageId/comments', controllers.comments.create);
+};
diff --git a/examples/anontxt/config/settings.js b/examples/anontxt/config/settings.js
new file mode 100644
index 00000000..2259ec8c
--- /dev/null
+++ b/examples/anontxt/config/settings.js
@@ -0,0 +1,16 @@
+var path       = require('path');
+
+var settings = {
+  path       : path.normalize(path.join(__dirname, '..')),
+  port       : process.env.NODE_PORT || 3000,
+  database   : {
+	  protocol : "postgresql", // or "mysql"
+	  query    : { pool: true },
+	  host     : "127.0.0.1",
+	  database : "anontxt_dev",
+	  user     : "anontxt",
+	  password : "apassword"
+  }
+};
+
+module.exports = settings;
diff --git a/examples/anontxt/package.json b/examples/anontxt/package.json
new file mode 100644
index 00000000..3b925038
--- /dev/null
+++ b/examples/anontxt/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "AnonTXT",
+  "description": "Post text snippets, quickly and easily",
+  "version": "0.1.0",
+  "repository"  : "http://github.com/dresende/node-orm2.git",
+  "dependencies": {
+    "express": "3.3.*",
+    "lodash": "2.3.0",
+    "nodemon": "0.7.10",
+    "moment": "2.4.0",
+    "pg": "2.6.2",
+    "colors": "0.6.2"
+  },
+  "scripts": {
+  	"start": "script/start",
+  	"reset": "script/reset"
+  }
+}
diff --git a/examples/anontxt/public/app.css b/examples/anontxt/public/app.css
new file mode 100644
index 00000000..1eaa5ed1
--- /dev/null
+++ b/examples/anontxt/public/app.css
@@ -0,0 +1,128 @@
+
+*, *:before, *:after {
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+}
+
+body {
+	background: #eee;
+	font-family: "Segoe UI", Frutiger, "Frutiger Linotype", "Dejavu Sans", "Helvetica Neue", Arial, sans-serif;
+	font-height: 17px;
+}
+
+#container {
+	width: 980px;
+	margin: 0 auto;
+	background: #fff;
+	border-radius: 4px;
+}
+
+#header {
+	padding: 2em;
+}
+#header h1 {
+	margin: 0;
+	font-size: 5em;
+}
+#header h1 em {
+	color: #ed5;
+}
+
+#main {
+	padding: 0 2em 2em 2em;
+}
+#main section {
+	margin-bottom: 2em;
+}
+#main h3 {
+	margin-top: 0;
+}
+#main form .entry {
+	margin-bottom: 1em;
+	line-height: 1.5em;
+}
+#main form .entry input,
+#main form .entry textarea {
+	padding: 0.3em;
+}
+#main form .entry label {
+	display: block;
+}
+#main form .entry label .title {
+	display: block;
+}
+
+#main .new form .entry.title input {
+	width: 50em;
+}
+#main .new form .entry.body textarea {
+	width: 50em;
+	height: 10em;
+}
+#main .new form button {
+	font-size: 1.5em;
+	padding: 0.3em 1em;
+	border-radius: 0.4em;
+}
+#main .alerts {
+	display: none;
+}
+#main .alerts > div {
+	padding: 0 0 1em 0;
+}
+#main .alerts .error {
+	color: red;
+}
+#main .alerts .info {
+	color: #6d6;
+}
+#main .latest .texts .message {
+	margin: 1em 0;
+	padding-bottom: 0.7em;
+	border: 1px solid #ddd;
+}
+#main .latest .texts .message:nth-child(n+5) {
+	display: none;
+}
+#main .latest .texts .message > h4 {
+	margin: 0;
+	padding: 0.4em;
+	background: #eee;
+	border-bottom: 1px solid #ddd;
+}
+#main .latest .texts .message .meta {
+	float: right;
+	padding: 0.4em 0.4em 0 0;
+	color: #777;
+}
+#main .latest .texts .message p {
+	margin: 0.5em;
+}
+#main .latest .texts .message .comments {
+	width: 500px;
+	margin-left: 2em;
+	font-size: 85%;
+}
+#main .latest .texts .message .comments h4 {
+	margin: 0;
+	padding: 0.4em;
+}
+#main .latest .texts .message .comments .comment {
+	border-top: 1px dotted #aaa;
+}
+#main .latest .texts .message .comments .new-comment .entry {
+	margin-bottom: 0;
+}
+#main .latest .texts .message .comments .new-comment textarea {
+	width: 20em;
+	height: 4em;
+}
+
+#footer {
+	margin-top: 2em;
+	padding: 0.5em;
+	background: #9b9;
+	color: #fff;
+	text-align: center;
+}
diff --git a/examples/anontxt/public/app.js b/examples/anontxt/public/app.js
new file mode 100644
index 00000000..64a592fb
--- /dev/null
+++ b/examples/anontxt/public/app.js
@@ -0,0 +1,162 @@
+
+var entityMap = {
+  "&": "&amp;",
+  "<": "&lt;",
+  ">": "&gt;",
+  '"': '&quot;',
+  "'": '&#39;',
+  "/": '&#x2F;'
+};
+
+function escapeHtml(string) {
+  return String(string).replace(/[&<>"'\/]/g, function (s) {
+    return entityMap[s];
+  });
+}
+
+$(document).ready(function () {
+	var $alerts         = $('#main .alerts');
+	var $texts          = $('#main section.latest .texts');
+	var $newMessageForm = $('#main section.new form');
+
+	function showAlert(type, content) {
+		$alerts.hide(100, function () {
+			$alerts.html(
+				'<div class=' + type + '>' + content + '</div>'
+			).show(250);
+		});
+	}
+
+	function renderComment(com) {
+		var html = '';
+		html += '<div class="comment">';
+		html +=   '<div class="meta">' + com.createdAt + '</div>';
+		html +=   '<p>' + escapeHtml(com.body) + '</p>';
+		html += '</div>';
+		return html;
+	}
+
+	function renderComments(comments) {
+		var html = '';
+		html += '<div class="comments">';
+		html +=   '<h4>Comments</h4>';
+
+		for (var a = 0; a < comments.length; a++) {
+			html += renderComment(comments[a]);
+		}
+		html +=   '<div class="new-comment">';
+		html +=     '<form>';
+		html +=       '<div class="entry body"><label>';
+		html +=         '<textarea name="body" placeholder="Add comment:" />';
+		html +=       '</label></div>';
+		html +=       '<button type="submit">Add</button>';
+		html +=     '</form>';
+		html +=   '</div>';
+		html += '</div>';
+		return html;
+	}
+
+	function renderMessage(msg) {
+		var html = '';
+		html += '<div class="message" data-id="' + msg.id + '">'
+		html +=   '<div class="meta">' + msg.createdAt + '</div>';
+		html +=   '<h4>' + escapeHtml(msg.title) + '</h4>';
+		html +=   '<p>'  + escapeHtml(msg.body).replace(/\n/g, '<br/>')  + '</p>';
+		html +=   renderComments(msg.comments);
+		html += '</div>'
+		return html;
+	}
+
+	function renderErrors(errors) {
+		var key, value;
+		var html = '';
+
+		html += '<ul class="field-errors">';
+		for (key in errors) {
+			value = errors[key];
+			html += '<li>' + key + ': ' + value.join(', ') + '</li>';
+		}
+		html += '</ul>';
+
+		return html;
+	}
+
+	function enhanceMessage($msg) {
+		$msg.find('.comments .new-comment form').submit(function (e) {
+			var $form = $(e.target);
+			var $msg  = $form.parents('.message:first');
+			var msgId = $msg.data('id')
+
+			e.preventDefault();
+
+			$.ajax({
+				url    : '/message/' + msgId + '/comments',
+				method : 'post',
+				data   : $form.serialize()
+			}).done(function (data) {
+				if ('errors' in data) {
+					showAlert(
+						"error",
+						"Errors occurred whilst adding comment" +
+						renderErrors(data.errors)
+					);
+				} else {
+					$(renderComment(data)).insertBefore($msg.find('.new-comment'));
+					showAlert("info", "Comment saved!");
+				}
+				$form[0].reset();
+			}).fail(function (xhr, err, status) {
+				showAlert('error', xhr.status + ', ' + xhr.responseText);
+			});
+		});
+	}
+
+	function loadMessages() {
+		$.ajax({
+			url: '/messages'
+		}).done(function (data) {
+			var html = '';
+			for (var a = 0; a < data.items.length; a++) {
+				html += renderMessage(data.items[a]);
+			}
+			$texts.html(html);
+			$texts.find('.message').each(function (i, msg) {
+				enhanceMessage($(msg));
+			});
+		}).fail(function (xhr, err, status) {
+			showAlert('error', xhr.status + ', ' + xhr.responseText);
+		});
+	}
+
+	$newMessageForm.submit(function (e) {
+		e.preventDefault();
+
+		$.ajax({
+			url    : $newMessageForm.attr('action'),
+			method : 'post',
+			data   : $newMessageForm.serialize()
+		}).done(function (data) {
+			var $msg;
+
+			if ('errors' in data) {
+				showAlert(
+					"error",
+					"Errors occurred whilst saving" +
+					renderErrors(data.errors)
+				);
+			} else {
+				$msg = $($.parseHTML(renderMessage(data)));
+				$texts.prepend($msg);
+				enhanceMessage($msg);
+
+				showAlert("info", "TeXT saved!");
+			}
+			$newMessageForm[0].reset();
+		}).fail(function (xhr, err, status) {
+			showAlert('error', xhr.status + ', ' + xhr.responseText);
+		});
+	});
+
+	loadMessages();
+});
+
diff --git a/examples/anontxt/public/index.html b/examples/anontxt/public/index.html
new file mode 100644
index 00000000..0b0d7b1f
--- /dev/null
+++ b/examples/anontxt/public/index.html
@@ -0,0 +1,47 @@
+<!doctype html >
+<html>
+	<head>
+		<meta charset="utf-8">
+		<title>AnonTXT</title>
+		<link rel="stylesheet" href="app.css">
+		<script type="text/javascript" src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
+		<script type="text/javascript" src="app.js"></script>
+	</head>
+	<body>
+		<div id="container">
+			<div id="header">
+				<h1>AnonTXT! <em>&gt;</em></h1>
+			</div>
+			<div id="main">
+				<div class="alerts"></div>
+				<section class="latest">
+					<h3>Latest txts:</h3>
+					<div class="texts">Loading..</div>
+				</section>
+				<section class="new">
+					<h3>New text:</h3>
+					<div class="new">
+						<form action="/messages" method="post">
+							<div class="errors"></div>
+							<div class="entry title">
+								<label>
+									<span class="title">Text title</span>
+									<input type="text" name="title" />
+								</label>
+							</div>
+							<div class="entry body">
+								<label>
+									<span class="title">Main TeXT</span>
+									<textarea name="body"></textarea>
+							</div>
+							<button type="submit">Create!</button>
+						</form>
+					</div>
+				</section>
+			</div>
+			<div id="footer">
+				Anon text is 100% fat free!
+			</div>
+		</div>
+	</body>
+</html>
diff --git a/examples/anontxt/script/start b/examples/anontxt/script/start
new file mode 100644
index 00000000..e672ef12
--- /dev/null
+++ b/examples/anontxt/script/start
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+items="app config ../../node_modules/sql-query ../../lib server.js"
+
+watch=""
+for i in $items; do
+  watch="$watch --watch $i"
+done
+
+nodemon $watch server.js
diff --git a/examples/anontxt/server.js b/examples/anontxt/server.js
new file mode 100644
index 00000000..f543bde9
--- /dev/null
+++ b/examples/anontxt/server.js
@@ -0,0 +1,34 @@
+var path        = require('path');
+var express     = require('express');
+var colors      = require('colors')
+var settings    = require('./config/settings');
+var environment = require('./config/environment');
+var routes      = require('./config/routes');
+var models      = require('./app/models/');
+
+module.exports.start = function (done) {
+  var app = express();
+
+  environment(app);
+  routes(app);
+
+  app.listen(settings.port, function () {
+    console.log( ("Listening on port " + settings.port).green );
+
+    if (done) {
+      return done(null, app, server);
+    }
+  }).on('error', function (e) {
+    if (e.code == 'EADDRINUSE') {
+      console.log('Address in use. Is the server already running?'.red);
+    }
+    if (done) {
+      return done(e);
+    }
+  });
+}
+
+// If someone ran: "node server.js" then automatically start the server
+if (path.basename(process.argv[1],'.js') == path.basename(__filename,'.js')) {
+  module.exports.start()
+}
diff --git a/examples/anontxt/tasks/reset.js b/examples/anontxt/tasks/reset.js
new file mode 100644
index 00000000..fbe496eb
--- /dev/null
+++ b/examples/anontxt/tasks/reset.js
@@ -0,0 +1,22 @@
+var models = require('../app/models/');
+
+models(function (err, db) {
+	if (err) throw err;
+
+	db.drop(function (err) {
+		if (err) throw err;
+
+		db.sync(function (err) {
+			if (err) throw err;
+
+			db.models.message.create({
+				title: "Hello world", body: "Testing testing 1 2 3"
+			}, function (err, message) {
+				if (err) throw err;
+
+				db.close()
+				console.log("Done!");
+			});
+		});
+	});
+});

From 07fad47043f88284d560ceb3050023082f2c343e Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Sun, 24 Nov 2013 22:58:32 +1100
Subject: [PATCH 0908/1246] Spaces -> tabs

---
 examples/anontxt/Readme.md                   |  2 +-
 examples/anontxt/app/controllers/_helpers.js | 12 +--
 examples/anontxt/app/controllers/index.js    |  4 +-
 examples/anontxt/app/models/comment.js       | 46 ++++++------
 examples/anontxt/app/models/index.js         | 18 ++---
 examples/anontxt/app/models/message.js       | 78 ++++++++++----------
 examples/anontxt/config/routes.js            |  8 +-
 examples/anontxt/config/settings.js          | 20 ++---
 examples/anontxt/public/app.css              |  6 +-
 examples/anontxt/public/app.js               | 18 ++---
 examples/anontxt/server.js                   | 34 ++++-----
 11 files changed, 123 insertions(+), 123 deletions(-)

diff --git a/examples/anontxt/Readme.md b/examples/anontxt/Readme.md
index 7bad2c38..dc363e75 100644
--- a/examples/anontxt/Readme.md
+++ b/examples/anontxt/Readme.md
@@ -16,7 +16,7 @@ git checkout v2.1.3
 
 **Setup AnonTXT**
 
-Edit `anontxt/config/settings.js` and set your database, user & password.
+Edit `anontxt/config/settings.js` to set your database, user & password.
 
 ```bash
 cd examples/anontxt
diff --git a/examples/anontxt/app/controllers/_helpers.js b/examples/anontxt/app/controllers/_helpers.js
index 70eef309..5fd92c22 100644
--- a/examples/anontxt/app/controllers/_helpers.js
+++ b/examples/anontxt/app/controllers/_helpers.js
@@ -4,12 +4,12 @@ module.exports = {
 		var errors = {};
 		var a, e;
 
-	  for(a = 0; a < errorsIn.length; a++) {
-	  	e = errorsIn[a];
+		for(a = 0; a < errorsIn.length; a++) {
+			e = errorsIn[a];
 
-	    errors[e.property] = errors[e.property] || [];
-	    errors[e.property].push(e.msg);
-	  }
-	  return errors;
+			errors[e.property] = errors[e.property] || [];
+			errors[e.property].push(e.msg);
+		}
+		return errors;
 	}
 };
diff --git a/examples/anontxt/app/controllers/index.js b/examples/anontxt/app/controllers/index.js
index f7292e0c..cc44dd12 100644
--- a/examples/anontxt/app/controllers/index.js
+++ b/examples/anontxt/app/controllers/index.js
@@ -1,6 +1,6 @@
 
 module.exports = {
 	home     : require('./home_controller'),
-  messages : require('./messages_controller'),
-  comments : require('./comments_controller')
+	messages : require('./messages_controller'),
+	comments : require('./comments_controller')
 };
diff --git a/examples/anontxt/app/models/comment.js b/examples/anontxt/app/models/comment.js
index f8fe3edf..d82fd011 100644
--- a/examples/anontxt/app/models/comment.js
+++ b/examples/anontxt/app/models/comment.js
@@ -1,28 +1,28 @@
 var moment = require('moment');
 
 module.exports = function (orm, db) {
-  var Comment = db.define('comment', {
-  	body      : { type: 'text', required: true },
-  	createdAt : { type: 'date', required: true, time: true }
-  },
-  {
-    hooks: {
-  		beforeValidation: function () {
-  			this.createdAt = new Date();
-  		}
-  	},
-  	validations: {
-  		body   : orm.enforce.ranges.length(1, 1024)
-  	},
-    methods: {
-      serialize: function () {
-        return {
-          body      : this.body,
-          createdAt : moment(this.createdAt).fromNow()
-        }
-      }
-    }
-  });
+	var Comment = db.define('comment', {
+		body      : { type: 'text', required: true },
+		createdAt : { type: 'date', required: true, time: true }
+	},
+	{
+		hooks: {
+			beforeValidation: function () {
+				this.createdAt = new Date();
+			}
+		},
+		validations: {
+			body   : orm.enforce.ranges.length(1, 1024)
+		},
+		methods: {
+			serialize: function () {
+				return {
+					body      : this.body,
+					createdAt : moment(this.createdAt).fromNow()
+				}
+			}
+		}
+	});
 
-  Comment.hasOne('message', db.models.message, { required: true, reverse: 'comments', autoFetch: true });
+	Comment.hasOne('message', db.models.message, { required: true, reverse: 'comments', autoFetch: true });
 };
diff --git a/examples/anontxt/app/models/index.js b/examples/anontxt/app/models/index.js
index 27f2306e..fc883d78 100644
--- a/examples/anontxt/app/models/index.js
+++ b/examples/anontxt/app/models/index.js
@@ -4,19 +4,19 @@ var settings = require('../../config/settings');
 var connection = null;
 
 function setup(db, cb) {
- 	require('./message')(orm, db);
- 	require('./comment')(orm, db);
+	require('./message')(orm, db);
+	require('./comment')(orm, db);
 
- 	return cb(null, db);
+	return cb(null, db);
 }
 
 module.exports = function (cb) {
-  if (connection) return cb(null, connection);
+	if (connection) return cb(null, connection);
 
-  orm.connect(settings.database, function (err, db) {
-    if (err) return cb(err);
+	orm.connect(settings.database, function (err, db) {
+		if (err) return cb(err);
 
-    db.settings.set('instance.returnAllErrors', true);
-    setup(db, cb);
-  });
+		db.settings.set('instance.returnAllErrors', true);
+		setup(db, cb);
+	});
 };
diff --git a/examples/anontxt/app/models/message.js b/examples/anontxt/app/models/message.js
index b2a55961..bf7cc601 100644
--- a/examples/anontxt/app/models/message.js
+++ b/examples/anontxt/app/models/message.js
@@ -1,45 +1,45 @@
 var moment = require('moment');
 
 module.exports = function (orm, db) {
-  var Message = db.define('message', {
-  	title     : { type: 'text', required: true },
-  	body      : { type: 'text', required: true,  big:  true },
-  	createdAt : { type: 'date', required: true, time: true }
-  },
-  {
-  	hooks: {
-      beforeValidation: function () {
-  			this.createdAt = new Date();
-  		}
-  	},
-  	validations: {
-  		title: [
-        orm.enforce.ranges.length(1, undefined, "must be atleast 1 letter long"),
-        orm.enforce.ranges.length(undefined, 96, "cannot be longer than 96 letters")
-      ],
-  		body: [
-        orm.enforce.ranges.length(1, undefined, "must be atleast 1 letter long"),
-        orm.enforce.ranges.length(undefined, 32768, "cannot be longer than 32768 letters")
-      ]
-  	},
-    methods: {
-      serialize: function () {
-        var comments;
+	var Message = db.define('message', {
+		title     : { type: 'text', required: true },
+		body      : { type: 'text', required: true,  big:  true },
+		createdAt : { type: 'date', required: true, time: true }
+	},
+	{
+		hooks: {
+			beforeValidation: function () {
+				this.createdAt = new Date();
+			}
+		},
+		validations: {
+			title: [
+				orm.enforce.ranges.length(1, undefined, "must be atleast 1 letter long"),
+				orm.enforce.ranges.length(undefined, 96, "cannot be longer than 96 letters")
+			],
+			body: [
+				orm.enforce.ranges.length(1, undefined, "must be atleast 1 letter long"),
+				orm.enforce.ranges.length(undefined, 32768, "cannot be longer than 32768 letters")
+			]
+		},
+		methods: {
+			serialize: function () {
+				var comments;
 
-        if (this.comments) {
-          comments = this.comments.map(function (c) { return c.serialize(); });
-        } else {
-          comments = [];
-        }
+				if (this.comments) {
+					comments = this.comments.map(function (c) { return c.serialize(); });
+				} else {
+					comments = [];
+				}
 
-        return {
-          id        : this.id,
-          title     : this.title,
-          body      : this.body,
-          createdAt : moment(this.createdAt).fromNow(),
-          comments  : comments
-        };
-      }
-    }
-  });
+				return {
+					id        : this.id,
+					title     : this.title,
+					body      : this.body,
+					createdAt : moment(this.createdAt).fromNow(),
+					comments  : comments
+				};
+			}
+		}
+	});
 };
diff --git a/examples/anontxt/config/routes.js b/examples/anontxt/config/routes.js
index 4b1fed09..9ae95e38 100644
--- a/examples/anontxt/config/routes.js
+++ b/examples/anontxt/config/routes.js
@@ -3,8 +3,8 @@ var controllers = require('../app/controllers')
 
 module.exports = function (app) {
 	app.get( '/'                           , controllers.home);
-  app.get( '/messages'                   , controllers.messages.list);
-  app.post('/messages'                   , controllers.messages.create);
-  app.get( '/message/:id'                , controllers.messages.get);
-  app.post('/message/:messageId/comments', controllers.comments.create);
+	app.get( '/messages'                   , controllers.messages.list);
+	app.post('/messages'                   , controllers.messages.create);
+	app.get( '/message/:id'                , controllers.messages.get);
+	app.post('/message/:messageId/comments', controllers.comments.create);
 };
diff --git a/examples/anontxt/config/settings.js b/examples/anontxt/config/settings.js
index 2259ec8c..55a34744 100644
--- a/examples/anontxt/config/settings.js
+++ b/examples/anontxt/config/settings.js
@@ -1,16 +1,16 @@
 var path       = require('path');
 
 var settings = {
-  path       : path.normalize(path.join(__dirname, '..')),
-  port       : process.env.NODE_PORT || 3000,
-  database   : {
-	  protocol : "postgresql", // or "mysql"
-	  query    : { pool: true },
-	  host     : "127.0.0.1",
-	  database : "anontxt_dev",
-	  user     : "anontxt",
-	  password : "apassword"
-  }
+	path       : path.normalize(path.join(__dirname, '..')),
+	port       : process.env.NODE_PORT || 3000,
+	database   : {
+		protocol : "postgresql", // or "mysql"
+		query    : { pool: true },
+		host     : "127.0.0.1",
+		database : "anontxt_dev",
+		user     : "anontxt",
+		password : "apassword"
+	}
 };
 
 module.exports = settings;
diff --git a/examples/anontxt/public/app.css b/examples/anontxt/public/app.css
index 1eaa5ed1..9bafa280 100644
--- a/examples/anontxt/public/app.css
+++ b/examples/anontxt/public/app.css
@@ -1,8 +1,8 @@
 
 *, *:before, *:after {
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
 }
 
 body {
diff --git a/examples/anontxt/public/app.js b/examples/anontxt/public/app.js
index 64a592fb..32ce07b5 100644
--- a/examples/anontxt/public/app.js
+++ b/examples/anontxt/public/app.js
@@ -1,17 +1,17 @@
 
 var entityMap = {
-  "&": "&amp;",
-  "<": "&lt;",
-  ">": "&gt;",
-  '"': '&quot;',
-  "'": '&#39;',
-  "/": '&#x2F;'
+	"&": "&amp;",
+	"<": "&lt;",
+	">": "&gt;",
+	'"': '&quot;',
+	"'": '&#39;',
+	"/": '&#x2F;'
 };
 
 function escapeHtml(string) {
-  return String(string).replace(/[&<>"'\/]/g, function (s) {
-    return entityMap[s];
-  });
+	return String(string).replace(/[&<>"'\/]/g, function (s) {
+		return entityMap[s];
+	});
 }
 
 $(document).ready(function () {
diff --git a/examples/anontxt/server.js b/examples/anontxt/server.js
index f543bde9..37d952cd 100644
--- a/examples/anontxt/server.js
+++ b/examples/anontxt/server.js
@@ -7,28 +7,28 @@ var routes      = require('./config/routes');
 var models      = require('./app/models/');
 
 module.exports.start = function (done) {
-  var app = express();
+	var app = express();
 
-  environment(app);
-  routes(app);
+	environment(app);
+	routes(app);
 
-  app.listen(settings.port, function () {
-    console.log( ("Listening on port " + settings.port).green );
+	app.listen(settings.port, function () {
+		console.log( ("Listening on port " + settings.port).green );
 
-    if (done) {
-      return done(null, app, server);
-    }
-  }).on('error', function (e) {
-    if (e.code == 'EADDRINUSE') {
-      console.log('Address in use. Is the server already running?'.red);
-    }
-    if (done) {
-      return done(e);
-    }
-  });
+		if (done) {
+			return done(null, app, server);
+		}
+	}).on('error', function (e) {
+		if (e.code == 'EADDRINUSE') {
+			console.log('Address in use. Is the server already running?'.red);
+		}
+		if (done) {
+			return done(e);
+		}
+	});
 }
 
 // If someone ran: "node server.js" then automatically start the server
 if (path.basename(process.argv[1],'.js') == path.basename(__filename,'.js')) {
-  module.exports.start()
+	module.exports.start()
 }

From 0a5e1c99c8876fb1140c59e4b1f51f7b1f026563 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Sun, 24 Nov 2013 23:01:41 +1100
Subject: [PATCH 0909/1246] Update anontxt readme

---
 examples/anontxt/Readme.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/examples/anontxt/Readme.md b/examples/anontxt/Readme.md
index dc363e75..84c3dec9 100644
--- a/examples/anontxt/Readme.md
+++ b/examples/anontxt/Readme.md
@@ -22,9 +22,10 @@ Edit `anontxt/config/settings.js` to set your database, user & password.
 cd examples/anontxt
 npm install
 node tasks/reset
-nodemon server.js
+./script/start
 ```
 
 And then open up [localhost:3000](http://localhost:3000/)
 
-You can also just run it with `node server.js` however nodemon will automatically restart the server if you change any code.
+You can also just run it with `node server.js` however the script launches nodemon which
+automatically restarts the server if you change any code.

From f9cd9a74a7f1b3bbccdd86f927364cc746532ab7 Mon Sep 17 00:00:00 2001
From: James Sapara <james.sapara@gmail.com>
Date: Fri, 29 Nov 2013 10:34:26 -0800
Subject: [PATCH 0910/1246] make some Model methods defined by `defineProperty`
 writable so they can be mocked by test suites in non-integration tests. -
 writable added to some model instance defineProperty calls, some properties
 were left alone because they were static or had unknown function (isShell for
 example) - added a model-remove test that currently only tests the writable
 aspect (there appears to be no direct test of this function, other than from
 the hooks tests)

---
 lib/Instance.js                  | 18 ++++++----
 test/integration/event.js        | 14 ++++++++
 test/integration/instance.js     | 10 ++++++
 test/integration/model-remove.js | 60 ++++++++++++++++++++++++++++++++
 test/integration/model-save.js   | 34 ++++++++++++++++++
 test/integration/validation.js   | 19 ++++++++++
 6 files changed, 149 insertions(+), 6 deletions(-)
 create mode 100644 test/integration/model-remove.js

diff --git a/lib/Instance.js b/lib/Instance.js
index d2984f75..dc4dba0b 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -506,7 +506,8 @@ function Instance(Model, opts) {
 
 			return this;
 		},
-		enumerable: false
+		enumerable: false,
+		writable: true
 	});
 	Object.defineProperty(instance, "save", {
 		value: function () {
@@ -548,13 +549,15 @@ function Instance(Model, opts) {
 
 			return this;
 		},
-		enumerable: false
+		enumerable: false,
+		writable: true
 	});
 	Object.defineProperty(instance, "saved", {
 		value: function () {
 			return opts.changes.length === 0;
 		},
-		enumerable: false
+		enumerable: false,
+		writable: true
 	});
 	Object.defineProperty(instance, "remove", {
 		value: function (cb) {
@@ -562,7 +565,8 @@ function Instance(Model, opts) {
 
 			return this;
 		},
-		enumerable: false
+		enumerable: false,
+		writable: true
 	});
 	Object.defineProperty(instance, "isInstance", {
 		value: true,
@@ -572,7 +576,8 @@ function Instance(Model, opts) {
 		value: function () {
 			return !opts.is_new;
 		},
-		enumerable: false
+		enumerable: false,
+		writable: true
 	});
 	Object.defineProperty(instance, "isShell", {
 		value: function () {
@@ -586,7 +591,8 @@ function Instance(Model, opts) {
 				cb(null, errors || false);
 			});
 		},
-		enumerable: false
+		enumerable: false,
+		writable: true
 	});
 	Object.defineProperty(instance, "__singleton_uid", {
 		value: function (cb) {
diff --git a/test/integration/event.js b/test/integration/event.js
index 8ade7b5f..f14c4830 100644
--- a/test/integration/event.js
+++ b/test/integration/event.js
@@ -79,5 +79,19 @@ describe("Event", function() {
 				return done();
 			});
 		});
+
+		it("should be writable for mocking", function (done) {
+			var triggered = false;
+			var John = new Person();
+
+			John.on = function(event, cb) {
+				triggered = true;
+			};
+			triggered.should.be.false;
+
+			John.on("mocked", function (err) {} );
+			triggered.should.be.true;
+			done();
+		});
 	});
 });
diff --git a/test/integration/instance.js b/test/integration/instance.js
index 87374d72..5312ea41 100644
--- a/test/integration/instance.js
+++ b/test/integration/instance.js
@@ -130,6 +130,16 @@ describe("Model instance", function() {
 		it("should return false for new instances", function () {
 			should.equal((new Person).isPersisted(), false);
 		});
+
+		it("should be writable for mocking", function() {
+			var person = new Person()
+			var triggered = false;
+			person.isPersisted = function() {
+				triggered = true;
+			};
+			person.isPersisted()
+			triggered.should.be.true;
+		});
 	});
 
 	describe("#isShell", function () {
diff --git a/test/integration/model-remove.js b/test/integration/model-remove.js
new file mode 100644
index 00000000..6b65b476
--- /dev/null
+++ b/test/integration/model-remove.js
@@ -0,0 +1,60 @@
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var ORM      = require('../../');
+
+describe("Model.remove()", function() {
+  var db = null;
+  var Person = null;
+
+  var setup = function () {
+    return function (done) {
+      Person = db.define("person", {
+        name   : String
+      });
+
+      return helper.dropSync(Person, function () {
+        Person.create([{
+          id  : 1,
+          name: "Jeremy Doe"
+        }, {
+          id  : 2,
+          name: "John Doe"
+        }, {
+          id  : 3,
+          name: "Jane Doe"
+        }], done);
+      });
+    };
+  };
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  describe("mockable", function() {
+    before(setup());
+
+    it("remove should be writable", function(done) {
+      var John = new Person({
+        name: "John"
+      });
+      var removeCalled = false;
+      John.remove = function(cb) {
+        removeCalled = true;
+        cb(null);
+      };
+      John.remove(function(err) {
+        should.equal(removeCalled,true);
+        return done();
+      });
+    });
+  });
+});
diff --git a/test/integration/model-save.js b/test/integration/model-save.js
index 2d17abcd..2fd7a9d2 100644
--- a/test/integration/model-save.js
+++ b/test/integration/model-save.js
@@ -217,4 +217,38 @@ describe("Model.save()", function() {
 			});
 		});
 	});
+
+	describe("mockable", function() {
+		before(setup());
+
+		it("save should be writable", function(done) {
+			var John = new Person({
+				name: "John"
+			});
+			var saveCalled = false;
+			John.save = function(cb) {
+				saveCalled = true;
+				cb(null);
+			};
+			John.save(function(err) {
+				should.equal(saveCalled,true);
+				return done();
+			});
+		});
+
+		it("saved should be writable", function(done) {
+			var John = new Person({
+				name: "John"
+			});
+			var savedCalled = false;
+			John.saved = function() {
+				savedCalled = true;
+				return true;
+			};
+
+			John.saved()
+			savedCalled.should.be.true;
+			done();
+		})
+	});
 });
diff --git a/test/integration/validation.js b/test/integration/validation.js
index 30de4ef2..8482f0f7 100644
--- a/test/integration/validation.js
+++ b/test/integration/validation.js
@@ -344,4 +344,23 @@ describe("Validations", function() {
 			});
 		});
 	});
+
+	describe("mockable", function() {
+		before(setup());
+
+		it("validate should be writable", function(done) {
+			var John = new Person({
+				name: "John"
+			});
+			var validateCalled = false;
+			John.validate = function(cb) {
+				validateCalled = true;
+				cb(null);
+			};
+			John.validate(function(err) {
+				should.equal(validateCalled,true);
+				return done();
+			});
+		});
+	});
 });

From 22f753bc0d217d4de650116f37097c7c06febaaa Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 5 Dec 2013 22:43:17 +0000
Subject: [PATCH 0911/1246] Updates ChainFind.remove() to support multiple keys
 (#345)

---
 lib/ChainFind.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 25dd07fc..3013c50d 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -91,12 +91,21 @@ function ChainFind(Model, opts) {
 				}
 
 				var ids = [], conditions = {};
+				var or = [];
 
-				for (var i = 0; i < data.length; i++) {
-					ids.push(data[i][opts.id]);
+				if (!Array.isArray(opts.id)) {
+					opts.id = [ opts.id ];
 				}
 
-				conditions[opts.id] = ids;
+				conditions.or = [];
+
+				for (var i = 0; i < data.length; i++) {
+					for (var j = 0; j < opts.id.length; j++) {
+						or[opts.id[j]] = data[i][opts.id[j]];
+					}
+					conditions.or.push(or);
+					or = [];
+				}
 
 				return opts.driver.remove(opts.table, conditions, cb);
 			});

From 2b5db970a61626fad433b98ea2e6b4477419ba75 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 5 Dec 2013 22:53:32 +0000
Subject: [PATCH 0912/1246] Fixes mongodb driver to support AND/OR/NOT
 conditions (#345)

---
 lib/Drivers/DML/mongodb.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
index 5a718824..71ecfbd9 100644
--- a/lib/Drivers/DML/mongodb.js
+++ b/lib/Drivers/DML/mongodb.js
@@ -353,6 +353,14 @@ Driver.prototype.clear = function (table, cb) {
 
 function convertToDB(obj, timeZone) {
 	for (var k in obj) {
+		if ([ 'and', 'or', 'not' ].indexOf(k) >= 0) {
+			for (var j = 0; j < obj[k].length; j++) {
+				convertToDB(obj[k][j], timeZone);
+			}
+			obj['$' + k] = obj[k];
+			delete obj[k];
+			continue;
+		}
 		if (Array.isArray(obj[k]) && k[0] != '$') {
 			for (var i = 0; i < obj[k].length; i++) {
 				obj[k][i] = convertToDBVal(k, obj[k][i], timeZone);

From 5931f24f02ec19c95ebd72fff8524c2c65d7d121 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 5 Dec 2013 22:54:00 +0000
Subject: [PATCH 0913/1246] Fixes ChainFind.remove() condition building (#345)

---
 lib/ChainFind.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 3013c50d..8aaff008 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -91,7 +91,7 @@ function ChainFind(Model, opts) {
 				}
 
 				var ids = [], conditions = {};
-				var or = [];
+				var or;
 
 				if (!Array.isArray(opts.id)) {
 					opts.id = [ opts.id ];
@@ -100,11 +100,11 @@ function ChainFind(Model, opts) {
 				conditions.or = [];
 
 				for (var i = 0; i < data.length; i++) {
+					or = {};
 					for (var j = 0; j < opts.id.length; j++) {
 						or[opts.id[j]] = data[i][opts.id[j]];
 					}
 					conditions.or.push(or);
-					or = [];
 				}
 
 				return opts.driver.remove(opts.table, conditions, cb);

From 4d6f64951cabf68d21483628e969046397eb6d15 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 5 Dec 2013 22:55:12 +0000
Subject: [PATCH 0914/1246] Updates SQL DDL to don't forget about primary keys

It seems composite keys are not yet correctly handled (it should create
a single primary key with the composite properties instead of multiple
primary keys)
---
 lib/Drivers/DDL/SQL.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/Drivers/DDL/SQL.js b/lib/Drivers/DDL/SQL.js
index f3d22782..7ca7423a 100644
--- a/lib/Drivers/DDL/SQL.js
+++ b/lib/Drivers/DDL/SQL.js
@@ -5,7 +5,7 @@ exports.sync = function (dialect, driver, opts, cb) {
 	var sync = new Sync({
 		dialect : dialect,
 		db      : driver.db,
-		debug   : false
+		debug   : false//function (text) { console.log(text); }
 	});
 
 	var setIndex = function (p, v, k) {
@@ -19,6 +19,15 @@ exports.sync = function (dialect, driver, opts, cb) {
 			sync.defineType(k, driver.customTypes[k]);
 		}
 	}
+	for (var k in opts.allProperties) {
+		if (typeof opts.id == "string" && opts.id == k) {
+			opts.allProperties[k].index = [ opts.table + "_pkey" ];
+			opts.allProperties[k].primary = true;
+		} else if (Array.isArray(opts.id) && opts.id.indexOf(k) >= 0) {
+			opts.allProperties[k].index = [ opts.table + "_pkey" ];
+			opts.allProperties[k].primary = true;
+		}
+	}
 
 	sync.defineCollection(opts.table, opts.allProperties);
 
@@ -46,6 +55,7 @@ exports.drop = function (dialect, driver, opts, cb) {
 	}
 
 	pending = queries.length;
+
 	for (i = 0; i < queries.length; i++) {
 		driver.execQuery(queries[i], function (err) {
 			if (--pending === 0) {

From 2b050863bd392b3fed43a1e06e12894859a84ef2 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 5 Dec 2013 23:02:45 +0000
Subject: [PATCH 0915/1246] sql-ddl-sync@0.1.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fd703d70..0991e0b7 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
 	"dependencies": {
 		"enforce"      : "0.1.2",
 		"sql-query"    : "0.1.15",
-		"sql-ddl-sync" : "0.1.3",
+		"sql-ddl-sync" : "0.1.4",
 		"hat"          : "0.0.3",
 		"lodash"       : "2.2.1"
 	},

From 886abc9f2565f6e7dd48928f931466d423a9c7f1 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 5 Dec 2013 23:06:36 +0000
Subject: [PATCH 0916/1246] sql-query@0.1.16

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0991e0b7..04416b68 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
 	"analyse"     : false,
 	"dependencies": {
 		"enforce"      : "0.1.2",
-		"sql-query"    : "0.1.15",
+		"sql-query"    : "0.1.16",
 		"sql-ddl-sync" : "0.1.4",
 		"hat"          : "0.0.3",
 		"lodash"       : "2.2.1"

From 4efe6459bd22399e57a2c70dc7eea6a675ba5b34 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 5 Dec 2013 23:08:10 +0000
Subject: [PATCH 0917/1246] lodash@2.4.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 04416b68..fd26cda3 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
 		"sql-query"    : "0.1.16",
 		"sql-ddl-sync" : "0.1.4",
 		"hat"          : "0.0.3",
-		"lodash"       : "2.2.1"
+		"lodash"       : "2.4.1"
 	},
 	"devDependencies": {
 		"mysql"   : "2.0.0-alpha9",

From 2a891f4c360b59c9ea3a1dec734fe3278ab4c869 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 5 Dec 2013 23:28:08 +0000
Subject: [PATCH 0918/1246] Adds .npmignore

Adds many files to npm ignore to avoid being published to npm.

If people want to run the tests, they must fetch code directly from
github.
---
 .npmignore | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .npmignore

diff --git a/.npmignore b/.npmignore
new file mode 100644
index 00000000..0c0d8ef4
--- /dev/null
+++ b/.npmignore
@@ -0,0 +1,8 @@
+*.sublime-*
+*.njsproj
+*.nodevsdbg
+.DS_Store
+node_modules
+test*
+lib-cov/
+*~

From 98a964b4be113ec728d6597453c0e106d1ef25cb Mon Sep 17 00:00:00 2001
From: Alex Knol <alex@seretalabs.com>
Date: Mon, 9 Dec 2013 16:40:49 +0100
Subject: [PATCH 0919/1246] fixed bug on like expression

---
 lib/Drivers/DML/mongodb.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
index 71ecfbd9..675c26ac 100644
--- a/lib/Drivers/DML/mongodb.js
+++ b/lib/Drivers/DML/mongodb.js
@@ -389,7 +389,7 @@ function convertFromDB(obj, timezone) {
 
 function convertToDBVal(key, value, timezone) {
 	if (value && typeof value.sql_comparator == "function") {
-		var val       = (key != "_id" ? value.val : new mongodb.ObjectID(value.val));
+		var val       = (key != "_id" ? value : new mongodb.ObjectID(value));
 		var comp      = value.sql_comparator();
 		var condition = {};
 

From c24d3851370d797242d8dbde39d437541e22ae1a Mon Sep 17 00:00:00 2001
From: Alex Knol <alex@seretalabs.com>
Date: Tue, 10 Dec 2013 09:41:52 +0100
Subject: [PATCH 0920/1246] update to correct val

---
 lib/Drivers/DML/mongodb.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
index 675c26ac..45fc3657 100644
--- a/lib/Drivers/DML/mongodb.js
+++ b/lib/Drivers/DML/mongodb.js
@@ -399,10 +399,10 @@ function convertToDBVal(key, value, timezone) {
 			case "lt":
 			case "lte":
 			case "ne":
-				condition["$" + comp] = val;
+				condition["$" + comp] = val.val;
 				break;
 			case "eq":
-				condition = val;
+				condition = val.val;
 				break;
 			case "between":
 				condition["$min"] = val.from;

From ee9b0644aef2fde7fb77cf4a3a6dddb1ab75bea8 Mon Sep 17 00:00:00 2001
From: belfordz <belfordz66@gmail.com>
Date: Wed, 11 Dec 2013 16:30:33 -0800
Subject: [PATCH 0921/1246]  - Fixed a bug where setting pool or debug in the
 connection string passed to ORM.connect would always be set to true.  - Wrote
 a test to demonstrate the passing.

---
 lib/ORM.js                      | 4 ++--
 test/integration/orm-exports.js | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index fff4dd7a..8ac89230 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -112,8 +112,8 @@ exports.connect = function (opts, cb) {
 		var debug    = extractOption(opts, "debug");
 		var pool     = extractOption(opts, "pool");
 		var driver   = new Driver(opts, null, {
-			debug    : (debug !== null ? Boolean(debug) : settings.get("connection.debug")),
-			pool     : (pool !== null ? Boolean(pool) : settings.get("connection.pool")),
+			debug    : (debug !== null ? ((debug === "false" || debug === "0") ? false : true) : settings.get("connection.debug")),
+			pool     : (pool !== null ? ((pool === "false" || pool === "0") ? false : true) : settings.get("connection.pool")),
 			settings : settings
 		});
 
diff --git a/test/integration/orm-exports.js b/test/integration/orm-exports.js
index d6175b5a..9e143854 100644
--- a/test/integration/orm-exports.js
+++ b/test/integration/orm-exports.js
@@ -190,6 +190,15 @@ describe("ORM.connect()", function () {
 				return done();
 			});
 		});
+
+		it("should allow pool and debug settings to be false", function(done) {
+			var connString = common.getConnectionString() + "debug=false&pool=false";
+			ORM.connect(connString, function(err, db) {
+				db.driver.opts.pool.should.equal(false);
+				db.driver.opts.debug.should.equal(false);
+				done();
+			});
+		});
 	});
 });
 

From c1b1dc7e19cb407ff8aa9d08436c9fc3c4850fed Mon Sep 17 00:00:00 2001
From: Jan-Oliver Pantel <info@janpantel.de>
Date: Fri, 27 Dec 2013 13:32:33 +0100
Subject: [PATCH 0922/1246] Update express middleware for express.io

Express.io does not use the response object, so in the middleware the second argument will be the "next()" function. This fix allows it to use orm with express.io.
---
 lib/Express.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/Express.js b/lib/Express.js
index 37bad496..8851d796 100644
--- a/lib/Express.js
+++ b/lib/Express.js
@@ -47,6 +47,11 @@ module.exports = function (uri, opts) {
 			req.db     = _db;
 		}
 
+		if (next === undefined && typeof res === 'function')
+		{
+			next = res;
+		}
+
 		if (_pending > 0) {
 			_queue.push(next);
 			return;

From bdf531aaff1481bbc47971752eba306c36827c26 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 2 Jan 2014 13:32:15 +1100
Subject: [PATCH 0923/1246] Allow HasMany.setAccessor to take an empty array

---
 lib/Associations/Many.js                |  27 ++----
 test/integration/association-hasmany.js | 105 +++++++++++++-----------
 2 files changed, 68 insertions(+), 64 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 53b46a55..621df9e6 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -232,28 +232,19 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 	});
 	Object.defineProperty(Instance, association.setAccessor, {
 		value: function () {
-			var Instances = Array.prototype.slice.apply(arguments);
-			var cb        = (Instances.length &&
-							 typeof Instances[Instances.length - 1] == "function" ? Instances.pop() : noOperation);
-
-			if (Instances.length === 0) {
-			    throw ErrorCodes.generateError(ErrorCodes.PARAM_MISMATCH, "No associations defined", { model: Model.name });
-			}
-
-			if (Array.isArray(Instances[0])) {
-				// clone is used or else Instances will be just a reference
-				// to the array and the Instances.push(cb) a few lines ahead
-				// would actually change the user Array passed to the function
-				Instances = _.clone(Instances[0]);
-			}
+			var items = _.flatten(arguments);
+			var cb    = _.last(items) instanceof Function ? items.pop() : noOperation;
 
 			Instance[association.delAccessor](function (err) {
-				if (err) {
-					return cb(err);
+				if (err) return cb(err);
+
+				if (items.length) {
+					Instance[association.addAccessor](items, cb);
+				} else {
+					cb(null);
 				}
-				Instances.push(cb);
-				Instance[association.addAccessor].apply(Instance, Instances);
 			});
+
 			return this;
 		},
 		enumerable: false
diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
index 5dbc076d..13952f94 100644
--- a/test/integration/association-hasmany.js
+++ b/test/integration/association-hasmany.js
@@ -367,59 +367,28 @@ describe("hasMany", function () {
 				});
 			});
 		});
-	});
-
-	describe("addAccessor", function () {
-		before(setup());
 
 		it("should accept array as list of associations", function (done) {
 			Pet.find(function (err, pets) {
-				Person.find({ name: "Justin" }).first(function (err, Justin) {
-					should.equal(err, null);
-
-					Justin.addPets(pets, function (err) {
-						should.equal(err, null);
-
-						Justin.getPets(function (err, all_pets) {
-							should.equal(err, null);
-
-							should(Array.isArray(all_pets));
-							all_pets.length.should.equal(pets.length);
-
-							return done();
-						});
-					});
-				});
-			});
-		});
-	});
+				var petCount = pets.length;
 
-	describe("setAccessor", function () {
-		before(setup());
-
-		it("clears current associations", function (done) {
-			Pet.find({ name: "Deco" }, function (err, pets) {
-				var Deco = pets[0];
-
-				Person.find({ name: "Jane" }).first(function (err, Jane) {
+				Person.find({ name: "Justin" }).first(function (err, Justin) {
 					should.equal(err, null);
 
-					Jane.getPets(function (err, pets) {
+					Justin.getPets(function (err, justinsPets) {
 						should.equal(err, null);
 
-						should(Array.isArray(pets));
-						pets.length.should.equal(1);
-						pets[0].name.should.equal("Mutt");
+						should.equal(justinsPets.length, 2);
 
-						Jane.setPets(Deco, function (err) {
+						Justin.addPets(pets, function (err) {
 							should.equal(err, null);
 
-							Jane.getPets(function (err, pets) {
+							Justin.getPets(function (err, justinsPets) {
 								should.equal(err, null);
 
-								should(Array.isArray(pets));
-								pets.length.should.equal(1);
-								pets[0].name.should.equal(Deco.name);
+								should(Array.isArray(justinsPets));
+								// We're not checking uniqueness.
+								should.equal(justinsPets.length, petCount + 2);
 
 								return done();
 							});
@@ -428,6 +397,18 @@ describe("hasMany", function () {
 				});
 			});
 		});
+
+		it("should throw if no items passed", function (done) {
+			Person.one(function (err, person) {
+				should.equal(err, null);
+
+				(function () {
+					person.addPets(function () {});
+				}).should.throw();
+
+				return done();
+			});
+		});
 	});
 
 	describe("setAccessor", function () {
@@ -475,15 +456,47 @@ describe("hasMany", function () {
 			});
 		});
 
-		it("should throw if no items passed", function (done) {
-			Person.one(function (err, person) {
+		it("should remove all associations if an empty array is passed", function (done) {
+			Person.find({ name: "Justin" }).first(function (err, Justin) {
 				should.equal(err, null);
 
-				(function () {
-					person.addPets(function () {});
-				}).should.throw();
+				Justin.setPets([], function (err) {
+					should.equal(err, null);
 
-				return done();
+					return done();
+				});
+			});
+		});
+
+		it("clears current associations", function (done) {
+			Pet.find({ name: "Deco" }, function (err, pets) {
+				var Deco = pets[0];
+
+				Person.find({ name: "Jane" }).first(function (err, Jane) {
+					should.equal(err, null);
+
+					Jane.getPets(function (err, pets) {
+						should.equal(err, null);
+
+						should(Array.isArray(pets));
+						pets.length.should.equal(1);
+						pets[0].name.should.equal("Mutt");
+
+						Jane.setPets(Deco, function (err) {
+							should.equal(err, null);
+
+							Jane.getPets(function (err, pets) {
+								should.equal(err, null);
+
+								should(Array.isArray(pets));
+								pets.length.should.equal(1);
+								pets[0].name.should.equal(Deco.name);
+
+								return done();
+							});
+						});
+					});
+				});
 			});
 		});
 	});

From 89cc8a2ddd7d60cce21df4a75db5bd6532447f47 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 2 Jan 2014 14:53:24 +1100
Subject: [PATCH 0924/1246] Improve test case

---
 test/integration/association-hasmany.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
index 13952f94..ad8b2afe 100644
--- a/test/integration/association-hasmany.js
+++ b/test/integration/association-hasmany.js
@@ -459,11 +459,20 @@ describe("hasMany", function () {
 		it("should remove all associations if an empty array is passed", function (done) {
 			Person.find({ name: "Justin" }).first(function (err, Justin) {
 				should.equal(err, null);
-
-				Justin.setPets([], function (err) {
+				Justin.getPets(function (err, pets) {
 					should.equal(err, null);
+					should.equal(pets.length, 2);
 
-					return done();
+					Justin.setPets([], function (err) {
+						should.equal(err, null);
+
+						Justin.getPets(function (err, pets) {
+							should.equal(err, null);
+							should.equal(pets.length, 0);
+
+							return done();
+						});
+					});
 				});
 			});
 		});

From 87852f419200d2aa20ff614959fa1034a5030dce Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 13 Jan 2014 20:24:33 +1100
Subject: [PATCH 0925/1246] Add test case for saving instance with hasMany
 autofetch but no associations. Issue: #398

---
 test/integration/association-hasmany.js | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
index ad8b2afe..a7fab0e1 100644
--- a/test/integration/association-hasmany.js
+++ b/test/integration/association-hasmany.js
@@ -18,11 +18,11 @@ describe("hasMany", function () {
 				name    : String,
 				surname : String,
 				age     : Number
-			}, opts);
+			});
 			Pet = db.define('pet', {
 				name    : String
 			});
-			Person.hasMany('pets', Pet);
+			Person.hasMany('pets', Pet, {}, { autoFetch: opts.autoFetchPets });
 
 			return helper.dropSync([ Person, Pet ], function () {
 				/**
@@ -512,7 +512,7 @@ describe("hasMany", function () {
 
 	describe("with autoFetch turned on", function () {
 		before(setup({
-			autoFetch : true
+			autoFetchPets : true
 		}));
 
 		it("should fetch associations", function (done) {
@@ -526,5 +526,23 @@ describe("hasMany", function () {
 				return done();
 			});
 		});
+
+		it("should save existing", function (done) {
+			Person.create({ name: 'Bishan' }, function (err) {
+				should.not.exist(err);
+
+				Person.one({ name: 'Bishan' }, function (err, person) {
+					should.not.exist(err);
+
+					person.surname = 'Dominar';
+
+					person.save(function (err) {
+						should.not.exist(err);
+
+						done();
+					});
+				});
+			});
+		});
 	});
 });

From eb494098064f970a55c3374e43d357ed88d1cbc3 Mon Sep 17 00:00:00 2001
From: miyaji <miyajima.daisuke.a42247@gmail.com>
Date: Fri, 8 Nov 2013 22:35:52 +0900
Subject: [PATCH 0926/1246] fixed: DML if object value is null, JSON.stringify
 return string 'null'

---
 lib/Drivers/DML/mysql.js    | 4 +++-
 lib/Drivers/DML/postgres.js | 2 +-
 lib/Drivers/DML/sqlite.js   | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 467ecdfe..fde22913 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -289,7 +289,9 @@ Driver.prototype.propertyToValue = function (value, property) {
 			value = (value) ? 1 : 0;
 			break;
 		case "object":
-			value = JSON.stringify(value);
+			if (value !== null) {
+				value = JSON.stringify(value);
+			}
 			break;
 		case "point":
 			return function() { return 'POINT(' + value.x + ', ' + value.y + ')'; };
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 12807a11..4d1aa343 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -324,7 +324,7 @@ Driver.prototype.propertyToValue = function (value, property) {
 
 	switch (property.type) {
 		case "object":
-			if (!Buffer.isBuffer(value)) {
+			if (value !== null && !Buffer.isBuffer(value)) {
 				value = new Buffer(JSON.stringify(value));
 			}
 			break;
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index a5c5bc34..fb2017e0 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -295,7 +295,9 @@ Driver.prototype.propertyToValue = function (value, property) {
 			value = (value) ? 1 : 0;
 			break;
 		case "object":
-			value = JSON.stringify(value);
+			if (value !== null) {
+				value = JSON.stringify(value);
+			}
 			break;
 		case "date":
 			if (this.config.query && this.config.query.strdates) {

From 87609cfe4ec0e28aa66a5ac4c4c796591886593c Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 16 Jan 2014 22:46:58 +1100
Subject: [PATCH 0927/1246] Add initial postgres driver tests

---
 package.json                              |   3 +-
 test/integration/drivers/postgres_spec.js | 130 ++++++++++++++++++++++
 test/run.js                               |  19 ++--
 3 files changed, 139 insertions(+), 13 deletions(-)
 create mode 100644 test/integration/drivers/postgres_spec.js

diff --git a/package.json b/package.json
index fd26cda3..c31b167f 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,8 @@
 		"async"   : "*",
 		"mocha"   : "1.13.0",
 		"should"  : "1.2.2",
-		"mongodb" : "1.3.19"
+		"mongodb" : "1.3.19",
+		"glob"    : "3.2.8"
 	},
 	"optionalDependencies": {}
 }
diff --git a/test/integration/drivers/postgres_spec.js b/test/integration/drivers/postgres_spec.js
new file mode 100644
index 00000000..c620e778
--- /dev/null
+++ b/test/integration/drivers/postgres_spec.js
@@ -0,0 +1,130 @@
+var _      = require('lodash');
+var should = require('should');
+var Driver = require('../../../lib/Drivers/DML/postgres').Driver;
+var helper = require('../../support/spec_helper');
+var common = require('../../common');
+
+if (common.protocol() == "mongodb") return;
+
+describe("Postgres driver", function() {
+	describe("#propertyToValue", function () {
+		describe("type object", function () {
+			function evaluate (input) {
+				var driver = new Driver({}, {}, {});
+				return driver.propertyToValue(input, { type: 'object' });
+			}
+
+			it("should not change null", function () {
+				should.strictEqual(evaluate(null), null);
+			});
+
+			it("should not change buffer", function () {
+				var b = new Buffer('abc');
+				should.strictEqual(evaluate(b), b);
+			});
+
+			it("should encode everything else as a Buffer", function () {
+				var input = { abc: 123 };
+				var out = evaluate(input);
+
+				should(out instanceof Buffer);
+				should.equal(JSON.stringify(input), out.toString());
+			});
+		});
+
+		describe("date", function () {
+			function evaluate (input, opts) {
+				if (!opts) opts = {};
+				var driver = new Driver(opts.config, {}, {});
+				return driver.propertyToValue(input, { type: 'date' });
+			}
+
+			it("should do nothing when timezone isn't configured", function () {
+				var input = new Date();
+				var inputStr = input.toString();
+				var out = evaluate(input);
+
+				should.strictEqual(input, out);
+				should.equal(inputStr, out.toString());
+			});
+
+			// I'm not sure if the timezone tests are right
+			it("should offset time by specified timezone amount for + timezones", function () {
+				var input = new Date(Date.UTC(2014,2,5,13,14,0,0));
+				var inputStr = input.toUTCString();
+				var out = evaluate(input, { config: { timezone: '+06:11' } });
+
+				should.equal(out.toUTCString(), 'Wed, 05 Mar 2014 08:25:00 GMT');
+			});
+
+			// The HH:mm for this one seem odd
+			it("should offset time by specified timezone amount for + timezones", function () {
+				var input = new Date(Date.UTC(2014,2,5,13,14,0,0));
+				var inputStr = input.toUTCString();
+				var out = evaluate(input, { config: { timezone: '-06:11' } });
+
+				should.equal(out.toUTCString(), 'Tue, 04 Mar 2014 20:03:00 GMT');
+			});
+			// --------------
+		});
+
+		describe("type point", function () {
+			function evaluate (input) {
+				var driver = new Driver({}, {}, {});
+				return driver.propertyToValue(input, { type: 'point' });
+			}
+
+			it("should encode correctly", function () {
+				var out = evaluate({ x: 5, y: 7 });
+
+				should(out instanceof Function);
+				should.equal(out(), "POINT(5, 7)");
+			});
+		});
+
+		describe("custom type", function () {
+			var customType = {
+				propertyToValue: function (input) {
+					return input + ' QWERTY';
+				}
+			};
+
+			function evaluate (input, customTypes) {
+				var driver = new Driver({}, {}, {});
+				if (customType) {
+					for (var k in customTypes) {
+						driver.customTypes[k] = customTypes[k];
+					}
+				}
+				return driver.propertyToValue(input, { type: 'qwerty' });
+			}
+
+			it("should do custom type conversion if provided", function () {
+				var opts = { qwerty: customType };
+				var out = evaluate('f', opts);
+
+				should.equal(out, 'f QWERTY');
+			});
+
+			it("should not do custom type conversion if not provided", function () {
+				var opts = { qwerty: {} };
+				var out = evaluate('f', opts);
+
+				should.equal(out, 'f');
+			});
+		});
+
+		it("should do nothing for other types", function () {
+			function evaluate (input, type) {
+				var driver = new Driver({}, {}, {});
+				return driver.propertyToValue(input, { type: type });
+			}
+
+			should.strictEqual(evaluate('abc', { type: 'string' }), 'abc');
+			should.strictEqual(evaluate(42, { type: 'number' }), 42);
+			should.strictEqual(evaluate(undefined, { type: 'bleh' }), undefined);
+		});
+
+	});
+
+});
diff --git a/test/run.js b/test/run.js
index da307f0d..057880ae 100644
--- a/test/run.js
+++ b/test/run.js
@@ -1,9 +1,9 @@
 var Mocha    = require("mocha");
-var fs       = require("fs");
+var glob     = require("glob");
 var path     = require("path");
 var common   = require("./common");
 var logging  = require("./logging");
-var location = path.normalize(path.join(__dirname, "integration"));
+var location = path.normalize(path.join(__dirname, "integration", "**", "*.js"));
 var mocha    = new Mocha({
 	reporter: "progress"
 });
@@ -20,14 +20,9 @@ switch (common.hasConfig(common.protocol())) {
 runTests();
 
 function runTests() {
-	fs.readdirSync(location).filter(function (file) {
-		return file.substr(-3) === '.js';
-	}).forEach(function (file) {
+	glob.sync(location).forEach(function (file) {
 		if (!shouldRunTest(file)) return;
-
-		mocha.addFile(
-			path.join(location, file)
-		);
+		mocha.addFile(file);
 	});
 
 	logging.info("Testing **%s**", common.getConnectionString());
@@ -38,11 +33,11 @@ function runTests() {
 }
 
 function shouldRunTest(file) {
-	var name  = file.substr(0, file.length - 3);
+	var name  = path.basename(file).slice(0, -3)
 	var proto = common.protocol();
+	var exclude = ['model-aggregate','property-number-size','smart-types'];
 
-	if (proto == "mongodb" && [ "model-aggregate",
-	                            "property-number-size", "smart-types" ].indexOf(name) >= 0) return false;
+	if (proto == "mongodb" && exclude.indexOf(name) >= 0) return false;
 
 	return true;
 }

From 8960aa52b6853d21654c3629b4c48a2ffefee653 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 21 Jan 2014 21:31:04 +1100
Subject: [PATCH 0928/1246] Convert tabs -> spaces in example to make it easier
 to read on github

---
 examples/anontxt/app/controllers/_helpers.js  |  20 +-
 .../app/controllers/comments_controller.js    |  46 +--
 .../app/controllers/home_controller.js        |   2 +-
 examples/anontxt/app/controllers/index.js     |   6 +-
 .../app/controllers/messages_controller.js    |  48 +--
 examples/anontxt/app/models/comment.js        |  46 +--
 examples/anontxt/app/models/index.js          |  18 +-
 examples/anontxt/app/models/message.js        |  78 ++---
 examples/anontxt/config/routes.js             |  10 +-
 examples/anontxt/config/settings.js           |  20 +-
 examples/anontxt/public/app.css               | 116 +++----
 examples/anontxt/public/app.js                | 304 +++++++++---------
 examples/anontxt/public/index.html            |  88 ++---
 examples/anontxt/server.js                    |  34 +-
 examples/anontxt/tasks/reset.js               |  28 +-
 15 files changed, 432 insertions(+), 432 deletions(-)

diff --git a/examples/anontxt/app/controllers/_helpers.js b/examples/anontxt/app/controllers/_helpers.js
index 5fd92c22..07646636 100644
--- a/examples/anontxt/app/controllers/_helpers.js
+++ b/examples/anontxt/app/controllers/_helpers.js
@@ -1,15 +1,15 @@
 
 module.exports = {
-	formatErrors: function(errorsIn) {
-		var errors = {};
-		var a, e;
+  formatErrors: function(errorsIn) {
+    var errors = {};
+    var a, e;
 
-		for(a = 0; a < errorsIn.length; a++) {
-			e = errorsIn[a];
+    for(a = 0; a < errorsIn.length; a++) {
+      e = errorsIn[a];
 
-			errors[e.property] = errors[e.property] || [];
-			errors[e.property].push(e.msg);
-		}
-		return errors;
-	}
+      errors[e.property] = errors[e.property] || [];
+      errors[e.property].push(e.msg);
+    }
+    return errors;
+  }
 };
diff --git a/examples/anontxt/app/controllers/comments_controller.js b/examples/anontxt/app/controllers/comments_controller.js
index b6283bc9..91e04d17 100644
--- a/examples/anontxt/app/controllers/comments_controller.js
+++ b/examples/anontxt/app/controllers/comments_controller.js
@@ -3,31 +3,31 @@ var helpers = require('./_helpers');
 var orm     = require('../../../../');
 
 module.exports = {
-	create: function (req, res, next) {
-		var params = _.pick(req.body, 'author', 'body');
+  create: function (req, res, next) {
+    var params = _.pick(req.body, 'author', 'body');
 
-		req.models.message.get(req.params.messageId, function (err, message) {
-			if (err) {
-				if (err.code == orm.ErrorCodes.NOT_FOUND) {
-					res.send(404, "Message not found");
-				} else {
-					return next(err);
-				}
-			}
+    req.models.message.get(req.params.messageId, function (err, message) {
+      if (err) {
+        if (err.code == orm.ErrorCodes.NOT_FOUND) {
+          res.send(404, "Message not found");
+        } else {
+          return next(err);
+        }
+      }
 
-			params.message_id = message.id;
+      params.message_id = message.id;
 
-			req.models.comment.create(params, function (err, message) {
-				if(err) {
-					if(Array.isArray(err)) {
-						return res.send(200, { errors: helpers.formatErrors(err) });
-					} else {
-						return next(err);
-					}
-				}
+      req.models.comment.create(params, function (err, message) {
+        if(err) {
+          if(Array.isArray(err)) {
+            return res.send(200, { errors: helpers.formatErrors(err) });
+          } else {
+            return next(err);
+          }
+        }
 
-				return res.send(200, message.serialize());
-			});
-		});
-	}
+        return res.send(200, message.serialize());
+      });
+    });
+  }
 };
diff --git a/examples/anontxt/app/controllers/home_controller.js b/examples/anontxt/app/controllers/home_controller.js
index 2d732e26..31aef457 100644
--- a/examples/anontxt/app/controllers/home_controller.js
+++ b/examples/anontxt/app/controllers/home_controller.js
@@ -1,5 +1,5 @@
 var settings = require('../../config/settings');
 
 module.exports = function (req, res, next) {
-	res.sendfile(settings.path + '/public/index.html');
+  res.sendfile(settings.path + '/public/index.html');
 };
diff --git a/examples/anontxt/app/controllers/index.js b/examples/anontxt/app/controllers/index.js
index cc44dd12..45b77ad8 100644
--- a/examples/anontxt/app/controllers/index.js
+++ b/examples/anontxt/app/controllers/index.js
@@ -1,6 +1,6 @@
 
 module.exports = {
-	home     : require('./home_controller'),
-	messages : require('./messages_controller'),
-	comments : require('./comments_controller')
+  home     : require('./home_controller'),
+  messages : require('./messages_controller'),
+  comments : require('./comments_controller')
 };
diff --git a/examples/anontxt/app/controllers/messages_controller.js b/examples/anontxt/app/controllers/messages_controller.js
index 46ddce55..80d5801b 100644
--- a/examples/anontxt/app/controllers/messages_controller.js
+++ b/examples/anontxt/app/controllers/messages_controller.js
@@ -3,33 +3,33 @@ var helpers = require('./_helpers');
 var orm     = require('../../../../');
 
 module.exports = {
-	list: function (req, res, next) {
-		req.models.message.find().limit(4).order('-id').all(function (err, messages) {
-			if (err) return next(err);
+  list: function (req, res, next) {
+    req.models.message.find().limit(4).order('-id').all(function (err, messages) {
+      if (err) return next(err);
 
-			var items = messages.map(function (m) {
-				return m.serialize();
-			});
+      var items = messages.map(function (m) {
+        return m.serialize();
+      });
 
-			res.send({ items: items });
-		});
-	},
-	create: function (req, res, next) {
-		var params = _.pick(req.body, 'title', 'body');
+      res.send({ items: items });
+    });
+  },
+  create: function (req, res, next) {
+    var params = _.pick(req.body, 'title', 'body');
 
-		req.models.message.create(params, function (err, message) {
-			if(err) {
-				if(Array.isArray(err)) {
-					return res.send(200, { errors: helpers.formatErrors(err) });
-				} else {
-					return next(err);
-				}
-			}
+    req.models.message.create(params, function (err, message) {
+      if(err) {
+        if(Array.isArray(err)) {
+          return res.send(200, { errors: helpers.formatErrors(err) });
+        } else {
+          return next(err);
+        }
+      }
 
-			return res.send(200, message.serialize());
-		});
-	},
-	get: function (req, res, next) {
+      return res.send(200, message.serialize());
+    });
+  },
+  get: function (req, res, next) {
 
-	}
+  }
 };
diff --git a/examples/anontxt/app/models/comment.js b/examples/anontxt/app/models/comment.js
index d82fd011..f83a42a5 100644
--- a/examples/anontxt/app/models/comment.js
+++ b/examples/anontxt/app/models/comment.js
@@ -1,28 +1,28 @@
 var moment = require('moment');
 
 module.exports = function (orm, db) {
-	var Comment = db.define('comment', {
-		body      : { type: 'text', required: true },
-		createdAt : { type: 'date', required: true, time: true }
-	},
-	{
-		hooks: {
-			beforeValidation: function () {
-				this.createdAt = new Date();
-			}
-		},
-		validations: {
-			body   : orm.enforce.ranges.length(1, 1024)
-		},
-		methods: {
-			serialize: function () {
-				return {
-					body      : this.body,
-					createdAt : moment(this.createdAt).fromNow()
-				}
-			}
-		}
-	});
+  var Comment = db.define('comment', {
+    body      : { type: 'text', required: true },
+    createdAt : { type: 'date', required: true, time: true }
+  },
+  {
+    hooks: {
+      beforeValidation: function () {
+        this.createdAt = new Date();
+      }
+    },
+    validations: {
+      body   : orm.enforce.ranges.length(1, 1024)
+    },
+    methods: {
+      serialize: function () {
+        return {
+          body      : this.body,
+          createdAt : moment(this.createdAt).fromNow()
+        }
+      }
+    }
+  });
 
-	Comment.hasOne('message', db.models.message, { required: true, reverse: 'comments', autoFetch: true });
+  Comment.hasOne('message', db.models.message, { required: true, reverse: 'comments', autoFetch: true });
 };
diff --git a/examples/anontxt/app/models/index.js b/examples/anontxt/app/models/index.js
index fc883d78..b9684f70 100644
--- a/examples/anontxt/app/models/index.js
+++ b/examples/anontxt/app/models/index.js
@@ -4,19 +4,19 @@ var settings = require('../../config/settings');
 var connection = null;
 
 function setup(db, cb) {
-	require('./message')(orm, db);
-	require('./comment')(orm, db);
+  require('./message')(orm, db);
+  require('./comment')(orm, db);
 
-	return cb(null, db);
+  return cb(null, db);
 }
 
 module.exports = function (cb) {
-	if (connection) return cb(null, connection);
+  if (connection) return cb(null, connection);
 
-	orm.connect(settings.database, function (err, db) {
-		if (err) return cb(err);
+  orm.connect(settings.database, function (err, db) {
+    if (err) return cb(err);
 
-		db.settings.set('instance.returnAllErrors', true);
-		setup(db, cb);
-	});
+    db.settings.set('instance.returnAllErrors', true);
+    setup(db, cb);
+  });
 };
diff --git a/examples/anontxt/app/models/message.js b/examples/anontxt/app/models/message.js
index bf7cc601..a011f464 100644
--- a/examples/anontxt/app/models/message.js
+++ b/examples/anontxt/app/models/message.js
@@ -1,45 +1,45 @@
 var moment = require('moment');
 
 module.exports = function (orm, db) {
-	var Message = db.define('message', {
-		title     : { type: 'text', required: true },
-		body      : { type: 'text', required: true,  big:  true },
-		createdAt : { type: 'date', required: true, time: true }
-	},
-	{
-		hooks: {
-			beforeValidation: function () {
-				this.createdAt = new Date();
-			}
-		},
-		validations: {
-			title: [
-				orm.enforce.ranges.length(1, undefined, "must be atleast 1 letter long"),
-				orm.enforce.ranges.length(undefined, 96, "cannot be longer than 96 letters")
-			],
-			body: [
-				orm.enforce.ranges.length(1, undefined, "must be atleast 1 letter long"),
-				orm.enforce.ranges.length(undefined, 32768, "cannot be longer than 32768 letters")
-			]
-		},
-		methods: {
-			serialize: function () {
-				var comments;
+  var Message = db.define('message', {
+    title     : { type: 'text', required: true },
+    body      : { type: 'text', required: true,  big:  true },
+    createdAt : { type: 'date', required: true, time: true }
+  },
+  {
+    hooks: {
+      beforeValidation: function () {
+        this.createdAt = new Date();
+      }
+    },
+    validations: {
+      title: [
+        orm.enforce.ranges.length(1, undefined, "must be atleast 1 letter long"),
+        orm.enforce.ranges.length(undefined, 96, "cannot be longer than 96 letters")
+      ],
+      body: [
+        orm.enforce.ranges.length(1, undefined, "must be atleast 1 letter long"),
+        orm.enforce.ranges.length(undefined, 32768, "cannot be longer than 32768 letters")
+      ]
+    },
+    methods: {
+      serialize: function () {
+        var comments;
 
-				if (this.comments) {
-					comments = this.comments.map(function (c) { return c.serialize(); });
-				} else {
-					comments = [];
-				}
+        if (this.comments) {
+          comments = this.comments.map(function (c) { return c.serialize(); });
+        } else {
+          comments = [];
+        }
 
-				return {
-					id        : this.id,
-					title     : this.title,
-					body      : this.body,
-					createdAt : moment(this.createdAt).fromNow(),
-					comments  : comments
-				};
-			}
-		}
-	});
+        return {
+          id        : this.id,
+          title     : this.title,
+          body      : this.body,
+          createdAt : moment(this.createdAt).fromNow(),
+          comments  : comments
+        };
+      }
+    }
+  });
 };
diff --git a/examples/anontxt/config/routes.js b/examples/anontxt/config/routes.js
index 9ae95e38..10b4464c 100644
--- a/examples/anontxt/config/routes.js
+++ b/examples/anontxt/config/routes.js
@@ -2,9 +2,9 @@
 var controllers = require('../app/controllers')
 
 module.exports = function (app) {
-	app.get( '/'                           , controllers.home);
-	app.get( '/messages'                   , controllers.messages.list);
-	app.post('/messages'                   , controllers.messages.create);
-	app.get( '/message/:id'                , controllers.messages.get);
-	app.post('/message/:messageId/comments', controllers.comments.create);
+  app.get( '/'                           , controllers.home);
+  app.get( '/messages'                   , controllers.messages.list);
+  app.post('/messages'                   , controllers.messages.create);
+  app.get( '/message/:id'                , controllers.messages.get);
+  app.post('/message/:messageId/comments', controllers.comments.create);
 };
diff --git a/examples/anontxt/config/settings.js b/examples/anontxt/config/settings.js
index 55a34744..d332b285 100644
--- a/examples/anontxt/config/settings.js
+++ b/examples/anontxt/config/settings.js
@@ -1,16 +1,16 @@
 var path       = require('path');
 
 var settings = {
-	path       : path.normalize(path.join(__dirname, '..')),
-	port       : process.env.NODE_PORT || 3000,
-	database   : {
-		protocol : "postgresql", // or "mysql"
-		query    : { pool: true },
-		host     : "127.0.0.1",
-		database : "anontxt_dev",
-		user     : "anontxt",
-		password : "apassword"
-	}
+  path       : path.normalize(path.join(__dirname, '..')),
+  port       : process.env.NODE_PORT || 3000,
+  database   : {
+    protocol : "postgresql", // or "mysql"
+    query    : { pool: true },
+    host     : "127.0.0.1",
+    database : "anontxt_dev",
+    user     : "anontxt",
+    password : "apassword"
+  }
 };
 
 module.exports = settings;
diff --git a/examples/anontxt/public/app.css b/examples/anontxt/public/app.css
index 9bafa280..95a31cb7 100644
--- a/examples/anontxt/public/app.css
+++ b/examples/anontxt/public/app.css
@@ -1,128 +1,128 @@
 
 *, *:before, *:after {
-	-moz-box-sizing: border-box;
-	-webkit-box-sizing: border-box;
-	box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
 }
 
 body {
-	background: #eee;
-	font-family: "Segoe UI", Frutiger, "Frutiger Linotype", "Dejavu Sans", "Helvetica Neue", Arial, sans-serif;
-	font-height: 17px;
+  background: #eee;
+  font-family: "Segoe UI", Frutiger, "Frutiger Linotype", "Dejavu Sans", "Helvetica Neue", Arial, sans-serif;
+  font-height: 17px;
 }
 
 #container {
-	width: 980px;
-	margin: 0 auto;
-	background: #fff;
-	border-radius: 4px;
+  width: 980px;
+  margin: 0 auto;
+  background: #fff;
+  border-radius: 4px;
 }
 
 #header {
-	padding: 2em;
+  padding: 2em;
 }
 #header h1 {
-	margin: 0;
-	font-size: 5em;
+  margin: 0;
+  font-size: 5em;
 }
 #header h1 em {
-	color: #ed5;
+  color: #ed5;
 }
 
 #main {
-	padding: 0 2em 2em 2em;
+  padding: 0 2em 2em 2em;
 }
 #main section {
-	margin-bottom: 2em;
+  margin-bottom: 2em;
 }
 #main h3 {
-	margin-top: 0;
+  margin-top: 0;
 }
 #main form .entry {
-	margin-bottom: 1em;
-	line-height: 1.5em;
+  margin-bottom: 1em;
+  line-height: 1.5em;
 }
 #main form .entry input,
 #main form .entry textarea {
-	padding: 0.3em;
+  padding: 0.3em;
 }
 #main form .entry label {
-	display: block;
+  display: block;
 }
 #main form .entry label .title {
-	display: block;
+  display: block;
 }
 
 #main .new form .entry.title input {
-	width: 50em;
+  width: 50em;
 }
 #main .new form .entry.body textarea {
-	width: 50em;
-	height: 10em;
+  width: 50em;
+  height: 10em;
 }
 #main .new form button {
-	font-size: 1.5em;
-	padding: 0.3em 1em;
-	border-radius: 0.4em;
+  font-size: 1.5em;
+  padding: 0.3em 1em;
+  border-radius: 0.4em;
 }
 #main .alerts {
-	display: none;
+  display: none;
 }
 #main .alerts > div {
-	padding: 0 0 1em 0;
+  padding: 0 0 1em 0;
 }
 #main .alerts .error {
-	color: red;
+  color: red;
 }
 #main .alerts .info {
-	color: #6d6;
+  color: #6d6;
 }
 #main .latest .texts .message {
-	margin: 1em 0;
-	padding-bottom: 0.7em;
-	border: 1px solid #ddd;
+  margin: 1em 0;
+  padding-bottom: 0.7em;
+  border: 1px solid #ddd;
 }
 #main .latest .texts .message:nth-child(n+5) {
-	display: none;
+  display: none;
 }
 #main .latest .texts .message > h4 {
-	margin: 0;
-	padding: 0.4em;
-	background: #eee;
-	border-bottom: 1px solid #ddd;
+  margin: 0;
+  padding: 0.4em;
+  background: #eee;
+  border-bottom: 1px solid #ddd;
 }
 #main .latest .texts .message .meta {
-	float: right;
-	padding: 0.4em 0.4em 0 0;
-	color: #777;
+  float: right;
+  padding: 0.4em 0.4em 0 0;
+  color: #777;
 }
 #main .latest .texts .message p {
-	margin: 0.5em;
+  margin: 0.5em;
 }
 #main .latest .texts .message .comments {
-	width: 500px;
-	margin-left: 2em;
-	font-size: 85%;
+  width: 500px;
+  margin-left: 2em;
+  font-size: 85%;
 }
 #main .latest .texts .message .comments h4 {
-	margin: 0;
-	padding: 0.4em;
+  margin: 0;
+  padding: 0.4em;
 }
 #main .latest .texts .message .comments .comment {
-	border-top: 1px dotted #aaa;
+  border-top: 1px dotted #aaa;
 }
 #main .latest .texts .message .comments .new-comment .entry {
-	margin-bottom: 0;
+  margin-bottom: 0;
 }
 #main .latest .texts .message .comments .new-comment textarea {
-	width: 20em;
-	height: 4em;
+  width: 20em;
+  height: 4em;
 }
 
 #footer {
-	margin-top: 2em;
-	padding: 0.5em;
-	background: #9b9;
-	color: #fff;
-	text-align: center;
+  margin-top: 2em;
+  padding: 0.5em;
+  background: #9b9;
+  color: #fff;
+  text-align: center;
 }
diff --git a/examples/anontxt/public/app.js b/examples/anontxt/public/app.js
index 32ce07b5..2f4880c6 100644
--- a/examples/anontxt/public/app.js
+++ b/examples/anontxt/public/app.js
@@ -1,162 +1,162 @@
 
 var entityMap = {
-	"&": "&amp;",
-	"<": "&lt;",
-	">": "&gt;",
-	'"': '&quot;',
-	"'": '&#39;',
-	"/": '&#x2F;'
+  "&": "&amp;",
+  "<": "&lt;",
+  ">": "&gt;",
+  '"': '&quot;',
+  "'": '&#39;',
+  "/": '&#x2F;'
 };
 
 function escapeHtml(string) {
-	return String(string).replace(/[&<>"'\/]/g, function (s) {
-		return entityMap[s];
-	});
+  return String(string).replace(/[&<>"'\/]/g, function (s) {
+    return entityMap[s];
+  });
 }
 
 $(document).ready(function () {
-	var $alerts         = $('#main .alerts');
-	var $texts          = $('#main section.latest .texts');
-	var $newMessageForm = $('#main section.new form');
-
-	function showAlert(type, content) {
-		$alerts.hide(100, function () {
-			$alerts.html(
-				'<div class=' + type + '>' + content + '</div>'
-			).show(250);
-		});
-	}
-
-	function renderComment(com) {
-		var html = '';
-		html += '<div class="comment">';
-		html +=   '<div class="meta">' + com.createdAt + '</div>';
-		html +=   '<p>' + escapeHtml(com.body) + '</p>';
-		html += '</div>';
-		return html;
-	}
-
-	function renderComments(comments) {
-		var html = '';
-		html += '<div class="comments">';
-		html +=   '<h4>Comments</h4>';
-
-		for (var a = 0; a < comments.length; a++) {
-			html += renderComment(comments[a]);
-		}
-		html +=   '<div class="new-comment">';
-		html +=     '<form>';
-		html +=       '<div class="entry body"><label>';
-		html +=         '<textarea name="body" placeholder="Add comment:" />';
-		html +=       '</label></div>';
-		html +=       '<button type="submit">Add</button>';
-		html +=     '</form>';
-		html +=   '</div>';
-		html += '</div>';
-		return html;
-	}
-
-	function renderMessage(msg) {
-		var html = '';
-		html += '<div class="message" data-id="' + msg.id + '">'
-		html +=   '<div class="meta">' + msg.createdAt + '</div>';
-		html +=   '<h4>' + escapeHtml(msg.title) + '</h4>';
-		html +=   '<p>'  + escapeHtml(msg.body).replace(/\n/g, '<br/>')  + '</p>';
-		html +=   renderComments(msg.comments);
-		html += '</div>'
-		return html;
-	}
-
-	function renderErrors(errors) {
-		var key, value;
-		var html = '';
-
-		html += '<ul class="field-errors">';
-		for (key in errors) {
-			value = errors[key];
-			html += '<li>' + key + ': ' + value.join(', ') + '</li>';
-		}
-		html += '</ul>';
-
-		return html;
-	}
-
-	function enhanceMessage($msg) {
-		$msg.find('.comments .new-comment form').submit(function (e) {
-			var $form = $(e.target);
-			var $msg  = $form.parents('.message:first');
-			var msgId = $msg.data('id')
-
-			e.preventDefault();
-
-			$.ajax({
-				url    : '/message/' + msgId + '/comments',
-				method : 'post',
-				data   : $form.serialize()
-			}).done(function (data) {
-				if ('errors' in data) {
-					showAlert(
-						"error",
-						"Errors occurred whilst adding comment" +
-						renderErrors(data.errors)
-					);
-				} else {
-					$(renderComment(data)).insertBefore($msg.find('.new-comment'));
-					showAlert("info", "Comment saved!");
-				}
-				$form[0].reset();
-			}).fail(function (xhr, err, status) {
-				showAlert('error', xhr.status + ', ' + xhr.responseText);
-			});
-		});
-	}
-
-	function loadMessages() {
-		$.ajax({
-			url: '/messages'
-		}).done(function (data) {
-			var html = '';
-			for (var a = 0; a < data.items.length; a++) {
-				html += renderMessage(data.items[a]);
-			}
-			$texts.html(html);
-			$texts.find('.message').each(function (i, msg) {
-				enhanceMessage($(msg));
-			});
-		}).fail(function (xhr, err, status) {
-			showAlert('error', xhr.status + ', ' + xhr.responseText);
-		});
-	}
-
-	$newMessageForm.submit(function (e) {
-		e.preventDefault();
-
-		$.ajax({
-			url    : $newMessageForm.attr('action'),
-			method : 'post',
-			data   : $newMessageForm.serialize()
-		}).done(function (data) {
-			var $msg;
-
-			if ('errors' in data) {
-				showAlert(
-					"error",
-					"Errors occurred whilst saving" +
-					renderErrors(data.errors)
-				);
-			} else {
-				$msg = $($.parseHTML(renderMessage(data)));
-				$texts.prepend($msg);
-				enhanceMessage($msg);
-
-				showAlert("info", "TeXT saved!");
-			}
-			$newMessageForm[0].reset();
-		}).fail(function (xhr, err, status) {
-			showAlert('error', xhr.status + ', ' + xhr.responseText);
-		});
-	});
-
-	loadMessages();
+  var $alerts         = $('#main .alerts');
+  var $texts          = $('#main section.latest .texts');
+  var $newMessageForm = $('#main section.new form');
+
+  function showAlert(type, content) {
+    $alerts.hide(100, function () {
+      $alerts.html(
+        '<div class=' + type + '>' + content + '</div>'
+      ).show(250);
+    });
+  }
+
+  function renderComment(com) {
+    var html = '';
+    html += '<div class="comment">';
+    html +=   '<div class="meta">' + com.createdAt + '</div>';
+    html +=   '<p>' + escapeHtml(com.body) + '</p>';
+    html += '</div>';
+    return html;
+  }
+
+  function renderComments(comments) {
+    var html = '';
+    html += '<div class="comments">';
+    html +=   '<h4>Comments</h4>';
+
+    for (var a = 0; a < comments.length; a++) {
+      html += renderComment(comments[a]);
+    }
+    html +=   '<div class="new-comment">';
+    html +=     '<form>';
+    html +=       '<div class="entry body"><label>';
+    html +=         '<textarea name="body" placeholder="Add comment:" />';
+    html +=       '</label></div>';
+    html +=       '<button type="submit">Add</button>';
+    html +=     '</form>';
+    html +=   '</div>';
+    html += '</div>';
+    return html;
+  }
+
+  function renderMessage(msg) {
+    var html = '';
+    html += '<div class="message" data-id="' + msg.id + '">'
+    html +=   '<div class="meta">' + msg.createdAt + '</div>';
+    html +=   '<h4>' + escapeHtml(msg.title) + '</h4>';
+    html +=   '<p>'  + escapeHtml(msg.body).replace(/\n/g, '<br/>')  + '</p>';
+    html +=   renderComments(msg.comments);
+    html += '</div>'
+    return html;
+  }
+
+  function renderErrors(errors) {
+    var key, value;
+    var html = '';
+
+    html += '<ul class="field-errors">';
+    for (key in errors) {
+      value = errors[key];
+      html += '<li>' + key + ': ' + value.join(', ') + '</li>';
+    }
+    html += '</ul>';
+
+    return html;
+  }
+
+  function enhanceMessage($msg) {
+    $msg.find('.comments .new-comment form').submit(function (e) {
+      var $form = $(e.target);
+      var $msg  = $form.parents('.message:first');
+      var msgId = $msg.data('id')
+
+      e.preventDefault();
+
+      $.ajax({
+        url    : '/message/' + msgId + '/comments',
+        method : 'post',
+        data   : $form.serialize()
+      }).done(function (data) {
+        if ('errors' in data) {
+          showAlert(
+            "error",
+            "Errors occurred whilst adding comment" +
+            renderErrors(data.errors)
+          );
+        } else {
+          $(renderComment(data)).insertBefore($msg.find('.new-comment'));
+          showAlert("info", "Comment saved!");
+        }
+        $form[0].reset();
+      }).fail(function (xhr, err, status) {
+        showAlert('error', xhr.status + ', ' + xhr.responseText);
+      });
+    });
+  }
+
+  function loadMessages() {
+    $.ajax({
+      url: '/messages'
+    }).done(function (data) {
+      var html = '';
+      for (var a = 0; a < data.items.length; a++) {
+        html += renderMessage(data.items[a]);
+      }
+      $texts.html(html);
+      $texts.find('.message').each(function (i, msg) {
+        enhanceMessage($(msg));
+      });
+    }).fail(function (xhr, err, status) {
+      showAlert('error', xhr.status + ', ' + xhr.responseText);
+    });
+  }
+
+  $newMessageForm.submit(function (e) {
+    e.preventDefault();
+
+    $.ajax({
+      url    : $newMessageForm.attr('action'),
+      method : 'post',
+      data   : $newMessageForm.serialize()
+    }).done(function (data) {
+      var $msg;
+
+      if ('errors' in data) {
+        showAlert(
+          "error",
+          "Errors occurred whilst saving" +
+          renderErrors(data.errors)
+        );
+      } else {
+        $msg = $($.parseHTML(renderMessage(data)));
+        $texts.prepend($msg);
+        enhanceMessage($msg);
+
+        showAlert("info", "TeXT saved!");
+      }
+      $newMessageForm[0].reset();
+    }).fail(function (xhr, err, status) {
+      showAlert('error', xhr.status + ', ' + xhr.responseText);
+    });
+  });
+
+  loadMessages();
 });
 
diff --git a/examples/anontxt/public/index.html b/examples/anontxt/public/index.html
index 0b0d7b1f..f70b1376 100644
--- a/examples/anontxt/public/index.html
+++ b/examples/anontxt/public/index.html
@@ -1,47 +1,47 @@
 <!doctype html >
 <html>
-	<head>
-		<meta charset="utf-8">
-		<title>AnonTXT</title>
-		<link rel="stylesheet" href="app.css">
-		<script type="text/javascript" src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
-		<script type="text/javascript" src="app.js"></script>
-	</head>
-	<body>
-		<div id="container">
-			<div id="header">
-				<h1>AnonTXT! <em>&gt;</em></h1>
-			</div>
-			<div id="main">
-				<div class="alerts"></div>
-				<section class="latest">
-					<h3>Latest txts:</h3>
-					<div class="texts">Loading..</div>
-				</section>
-				<section class="new">
-					<h3>New text:</h3>
-					<div class="new">
-						<form action="/messages" method="post">
-							<div class="errors"></div>
-							<div class="entry title">
-								<label>
-									<span class="title">Text title</span>
-									<input type="text" name="title" />
-								</label>
-							</div>
-							<div class="entry body">
-								<label>
-									<span class="title">Main TeXT</span>
-									<textarea name="body"></textarea>
-							</div>
-							<button type="submit">Create!</button>
-						</form>
-					</div>
-				</section>
-			</div>
-			<div id="footer">
-				Anon text is 100% fat free!
-			</div>
-		</div>
-	</body>
+  <head>
+    <meta charset="utf-8">
+    <title>AnonTXT</title>
+    <link rel="stylesheet" href="app.css">
+    <script type="text/javascript" src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
+    <script type="text/javascript" src="app.js"></script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="header">
+        <h1>AnonTXT! <em>&gt;</em></h1>
+      </div>
+      <div id="main">
+        <div class="alerts"></div>
+        <section class="latest">
+          <h3>Latest txts:</h3>
+          <div class="texts">Loading..</div>
+        </section>
+        <section class="new">
+          <h3>New text:</h3>
+          <div class="new">
+            <form action="/messages" method="post">
+              <div class="errors"></div>
+              <div class="entry title">
+                <label>
+                  <span class="title">Text title</span>
+                  <input type="text" name="title" />
+                </label>
+              </div>
+              <div class="entry body">
+                <label>
+                  <span class="title">Main TeXT</span>
+                  <textarea name="body"></textarea>
+              </div>
+              <button type="submit">Create!</button>
+            </form>
+          </div>
+        </section>
+      </div>
+      <div id="footer">
+        Anon text is 100% fat free!
+      </div>
+    </div>
+  </body>
 </html>
diff --git a/examples/anontxt/server.js b/examples/anontxt/server.js
index 37d952cd..f543bde9 100644
--- a/examples/anontxt/server.js
+++ b/examples/anontxt/server.js
@@ -7,28 +7,28 @@ var routes      = require('./config/routes');
 var models      = require('./app/models/');
 
 module.exports.start = function (done) {
-	var app = express();
+  var app = express();
 
-	environment(app);
-	routes(app);
+  environment(app);
+  routes(app);
 
-	app.listen(settings.port, function () {
-		console.log( ("Listening on port " + settings.port).green );
+  app.listen(settings.port, function () {
+    console.log( ("Listening on port " + settings.port).green );
 
-		if (done) {
-			return done(null, app, server);
-		}
-	}).on('error', function (e) {
-		if (e.code == 'EADDRINUSE') {
-			console.log('Address in use. Is the server already running?'.red);
-		}
-		if (done) {
-			return done(e);
-		}
-	});
+    if (done) {
+      return done(null, app, server);
+    }
+  }).on('error', function (e) {
+    if (e.code == 'EADDRINUSE') {
+      console.log('Address in use. Is the server already running?'.red);
+    }
+    if (done) {
+      return done(e);
+    }
+  });
 }
 
 // If someone ran: "node server.js" then automatically start the server
 if (path.basename(process.argv[1],'.js') == path.basename(__filename,'.js')) {
-	module.exports.start()
+  module.exports.start()
 }
diff --git a/examples/anontxt/tasks/reset.js b/examples/anontxt/tasks/reset.js
index fbe496eb..866d08f0 100644
--- a/examples/anontxt/tasks/reset.js
+++ b/examples/anontxt/tasks/reset.js
@@ -1,22 +1,22 @@
 var models = require('../app/models/');
 
 models(function (err, db) {
-	if (err) throw err;
+  if (err) throw err;
 
-	db.drop(function (err) {
-		if (err) throw err;
+  db.drop(function (err) {
+    if (err) throw err;
 
-		db.sync(function (err) {
-			if (err) throw err;
+    db.sync(function (err) {
+      if (err) throw err;
 
-			db.models.message.create({
-				title: "Hello world", body: "Testing testing 1 2 3"
-			}, function (err, message) {
-				if (err) throw err;
+      db.models.message.create({
+        title: "Hello world", body: "Testing testing 1 2 3"
+      }, function (err, message) {
+        if (err) throw err;
 
-				db.close()
-				console.log("Done!");
-			});
-		});
-	});
+        db.close()
+        console.log("Done!");
+      });
+    });
+  });
 });

From 50819aa5320b6c59424e21eee6627d989b500d1d Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 21 Jan 2014 21:29:02 +1100
Subject: [PATCH 0929/1246] Update to new sql-ddl-sync

---
 lib/Drivers/DDL/SQL.js | 2 --
 package.json           | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/Drivers/DDL/SQL.js b/lib/Drivers/DDL/SQL.js
index 7ca7423a..7b7afae7 100644
--- a/lib/Drivers/DDL/SQL.js
+++ b/lib/Drivers/DDL/SQL.js
@@ -22,10 +22,8 @@ exports.sync = function (dialect, driver, opts, cb) {
 	for (var k in opts.allProperties) {
 		if (typeof opts.id == "string" && opts.id == k) {
 			opts.allProperties[k].index = [ opts.table + "_pkey" ];
-			opts.allProperties[k].primary = true;
 		} else if (Array.isArray(opts.id) && opts.id.indexOf(k) >= 0) {
 			opts.allProperties[k].index = [ opts.table + "_pkey" ];
-			opts.allProperties[k].primary = true;
 		}
 	}
 
diff --git a/package.json b/package.json
index c31b167f..3e1ebc53 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
 	"dependencies": {
 		"enforce"      : "0.1.2",
 		"sql-query"    : "0.1.16",
-		"sql-ddl-sync" : "0.1.4",
+		"sql-ddl-sync" : "git://github.com/dresende/node-sql-ddl-sync.git#v0.1.5",
 		"hat"          : "0.0.3",
 		"lodash"       : "2.4.1"
 	},

From 350ba00d509dc46e31dfe21e278789ac82d063ac Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 22 Jan 2014 19:37:38 +1100
Subject: [PATCH 0930/1246] Remove unstable tests

---
 test/integration/drivers/postgres_spec.js | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/test/integration/drivers/postgres_spec.js b/test/integration/drivers/postgres_spec.js
index c620e778..337e6c97 100644
--- a/test/integration/drivers/postgres_spec.js
+++ b/test/integration/drivers/postgres_spec.js
@@ -48,24 +48,9 @@ describe("Postgres driver", function() {
 				should.equal(inputStr, out.toString());
 			});
 
-			// I'm not sure if the timezone tests are right
-			it("should offset time by specified timezone amount for + timezones", function () {
-				var input = new Date(Date.UTC(2014,2,5,13,14,0,0));
-				var inputStr = input.toUTCString();
-				var out = evaluate(input, { config: { timezone: '+06:11' } });
+			it("should offset time by specified timezone amount for + timezones");
 
-				should.equal(out.toUTCString(), 'Wed, 05 Mar 2014 08:25:00 GMT');
-			});
-
-			// The HH:mm for this one seem odd
-			it("should offset time by specified timezone amount for + timezones", function () {
-				var input = new Date(Date.UTC(2014,2,5,13,14,0,0));
-				var inputStr = input.toUTCString();
-				var out = evaluate(input, { config: { timezone: '-06:11' } });
-
-				should.equal(out.toUTCString(), 'Tue, 04 Mar 2014 20:03:00 GMT');
-			});
-			// --------------
+			it("should offset time by specified timezone amount for + timezones");
 		});
 
 		describe("type point", function () {

From 9e680a228ef14b6f5c5f41879f2eaef55032a3d2 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 22 Jan 2014 21:09:29 +1100
Subject: [PATCH 0931/1246] Use new integrated ddl-sql-sync. This should fix
 #416 as well as encourage code reuse

---
 lib/Drivers/DDL/SQL.js                     | 23 ++++++++++++----------
 lib/Drivers/{helpers.js => DML/_shared.js} |  4 ++--
 lib/Drivers/DML/mysql.js                   | 20 +++++--------------
 lib/Drivers/DML/postgres.js                | 20 +++++--------------
 lib/Drivers/DML/sqlite.js                  | 20 +++++--------------
 package.json                               |  2 +-
 6 files changed, 31 insertions(+), 58 deletions(-)
 rename lib/Drivers/{helpers.js => DML/_shared.js} (92%)

diff --git a/lib/Drivers/DDL/SQL.js b/lib/Drivers/DDL/SQL.js
index 7b7afae7..38202c40 100644
--- a/lib/Drivers/DDL/SQL.js
+++ b/lib/Drivers/DDL/SQL.js
@@ -1,10 +1,9 @@
 var _    = require("lodash");
 var Sync = require("sql-ddl-sync").Sync;
 
-exports.sync = function (dialect, driver, opts, cb) {
+exports.sync = function (opts, cb) {
 	var sync = new Sync({
-		dialect : dialect,
-		db      : driver.db,
+		driver  : this,
 		debug   : false//function (text) { console.log(text); }
 	});
 
@@ -14,9 +13,9 @@ exports.sync = function (dialect, driver, opts, cb) {
 	};
 	var props = {};
 
-	if (driver.customTypes) {
-		for (var k in driver.customTypes) {
-			sync.defineType(k, driver.customTypes[k]);
+	if (this.customTypes) {
+		for (var k in this.customTypes) {
+			sync.defineType(k, this.customTypes[k]);
 		}
 	}
 	for (var k in opts.allProperties) {
@@ -41,24 +40,28 @@ exports.sync = function (dialect, driver, opts, cb) {
 	}
 
 	sync.sync(cb);
+
+	return this;
 };
 
-exports.drop = function (dialect, driver, opts, cb) {
+exports.drop = function (opts, cb) {
 	var i, queries = [], pending;
 
-	queries.push("DROP TABLE IF EXISTS " + driver.query.escapeId(opts.table));
+	queries.push("DROP TABLE IF EXISTS " + this.query.escapeId(opts.table));
 
 	for (i = 0; i < opts.many_associations.length; i++) {
-		queries.push("DROP TABLE IF EXISTS " + driver.query.escapeId(opts.many_associations[i].mergeTable));
+		queries.push("DROP TABLE IF EXISTS " + this.query.escapeId(opts.many_associations[i].mergeTable));
 	}
 
 	pending = queries.length;
 
 	for (i = 0; i < queries.length; i++) {
-		driver.execQuery(queries[i], function (err) {
+		this.execQuery(queries[i], function (err) {
 			if (--pending === 0) {
 				return cb(err);
 			}
 		});
 	}
+
+	return this;
 };
diff --git a/lib/Drivers/helpers.js b/lib/Drivers/DML/_shared.js
similarity index 92%
rename from lib/Drivers/helpers.js
rename to lib/Drivers/DML/_shared.js
index dce8a0e3..fcc20f00 100644
--- a/lib/Drivers/helpers.js
+++ b/lib/Drivers/DML/_shared.js
@@ -1,5 +1,5 @@
 
-module.exports.sql = {
+module.exports = {
 	execQuery: function () {
 		if (arguments.length == 2) {
 			var query = arguments[0];
@@ -10,4 +10,4 @@ module.exports.sql = {
 		}
 		return this.execSimpleQuery(query, cb);
 	}
-}
+};
diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index fde22913..e00679a6 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -1,11 +1,13 @@
 var _       = require("lodash");
 var mysql   = require("mysql");
 var Query   = require("sql-query").Query;
-var helpers = require("../helpers");
+var shared  = require("./_shared");
+var DDL     = require("../DDL/SQL");
 
 exports.Driver = Driver;
 
 function Driver(config, connection, opts) {
+	this.dialect = 'mysql';
 	this.config = config || {};
 	this.opts   = opts || {};
 	this.customTypes = {};
@@ -13,7 +15,7 @@ function Driver(config, connection, opts) {
 	if (!this.config.timezone) {
 		this.config.timezone = "local";
 	}
-	this.query  = new Query({ dialect: "mysql", timezone: this.config.timezone });
+	this.query  = new Query({ dialect: this.dialect, timezone: this.config.timezone });
 
 	this.reconnect(null, connection);
 
@@ -26,19 +28,7 @@ function Driver(config, connection, opts) {
 	                             "DISTINCT"];
 }
 
-_.extend(Driver.prototype, helpers.sql);
-
-Driver.prototype.sync = function (opts, cb) {
-	require("../DDL/SQL").sync("mysql", this, opts, cb);
-
-	return this;
-};
-
-Driver.prototype.drop = function (opts, cb) {
-	require("../DDL/SQL").drop("mysql", this, opts, cb);
-
-	return this;
-};
+_.extend(Driver.prototype, shared, DDL);
 
 Driver.prototype.ping = function (cb) {
 	this.db.ping(cb);
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 4d1aa343..874df631 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -1,7 +1,8 @@
 var _       = require("lodash");
 var pg      = require("pg");
 var Query   = require("sql-query").Query;
-var helpers = require("../helpers");
+var shared  = require("./_shared");
+var DDL     = require("../DDL/SQL");
 
 exports.Driver = Driver;
 
@@ -71,6 +72,7 @@ var switchableFunctions = {
 function Driver(config, connection, opts) {
 	var functions = switchableFunctions.client;
 
+	this.dialect = 'postgresql';
 	this.config = config || {};
 	this.opts   = opts || {};
 
@@ -78,7 +80,7 @@ function Driver(config, connection, opts) {
 		this.config.timezone = "local";
 	}
 
-	this.query  = new Query({ dialect: "postgresql", timezone: this.config.timezone });
+	this.query  = new Query({ dialect: this.dialect, timezone: this.config.timezone });
 	this.customTypes = {};
 
 	if (connection) {
@@ -115,19 +117,7 @@ function Driver(config, connection, opts) {
 	];
 }
 
-_.extend(Driver.prototype, helpers.sql);
-
-Driver.prototype.sync = function (opts, cb) {
-	require("../DDL/SQL").sync("postgresql", this, opts, cb);
-
-	return this;
-};
-
-Driver.prototype.drop = function (opts, cb) {
-	require("../DDL/SQL").drop("postgresql", this, opts, cb);
-
-	return this;
-};
+_.extend(Driver.prototype, shared, DDL);
 
 Driver.prototype.ping = function (cb) {
 	this.execSimpleQuery("SELECT * FROM pg_stat_activity LIMIT 1", function () {
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index fb2017e0..0d822880 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -2,11 +2,13 @@ var _       = require("lodash");
 var util    = require("util");
 var sqlite3 = require("sqlite3");
 var Query   = require("sql-query").Query;
-var helpers = require("../helpers");
+var shared  = require("./_shared");
+var DDL     = require("../DDL/SQL");
 
 exports.Driver = Driver;
 
 function Driver(config, connection, opts) {
+	this.dialect = 'sqlite';
 	this.config = config || {};
 	this.opts   = opts || {};
 
@@ -14,7 +16,7 @@ function Driver(config, connection, opts) {
 		this.config.timezone = "local";
 	}
 
-	this.query  = new Query({ dialect: "sqlite", timezone: this.config.timezone });
+	this.query  = new Query({ dialect: this.dialect, timezone: this.config.timezone });
 	this.customTypes = {};
 
 	if (connection) {
@@ -37,19 +39,7 @@ function Driver(config, connection, opts) {
 	                             "DISTINCT" ];
 }
 
-_.extend(Driver.prototype, helpers.sql);
-
-Driver.prototype.sync = function (opts, cb) {
-	require("../DDL/SQL").sync("sqlite", this, opts, cb);
-
-	return this;
-};
-
-Driver.prototype.drop = function (opts, cb) {
-	require("../DDL/SQL").drop("sqlite", this, opts, cb);
-
-	return this;
-};
+_.extend(Driver.prototype, shared, DDL);
 
 Driver.prototype.ping = function (cb) {
 	process.nextTick(cb);
diff --git a/package.json b/package.json
index 3e1ebc53..dbf9eb18 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.3",
+	"version"     : "2.1.4",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",

From 30c27778ee6ee0e4b7b0e9e659a1315016f13fd9 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 22 Jan 2014 21:25:59 +1100
Subject: [PATCH 0932/1246] Reference correct sql-ddl-sync

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dbf9eb18..8100d1ad 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
 	"dependencies": {
 		"enforce"      : "0.1.2",
 		"sql-query"    : "0.1.16",
-		"sql-ddl-sync" : "git://github.com/dresende/node-sql-ddl-sync.git#v0.1.5",
+		"sql-ddl-sync" : "git://github.com/dresende/node-sql-ddl-sync.git#v0.2.0",
 		"hat"          : "0.0.3",
 		"lodash"       : "2.4.1"
 	},

From 7aa53fdfb048098a447ff5f14799a94a471af4d7 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 22 Jan 2014 21:28:37 +1100
Subject: [PATCH 0933/1246] Remove node 0.6 from travis because it's broken

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index eefb9972..268973d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 language: node_js
 node_js:
-  - '0.6'
   - '0.8'
   - '0.10'
 before_script:

From 5847e7639d5812304e1a79275ca7fe2f6e3ff4a7 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 23 Jan 2014 20:22:53 +1100
Subject: [PATCH 0934/1246] Fix test failing in mongo

---
 lib/Associations/Many.js                |  3 +-
 test/integration/association-hasmany.js | 69 ++++++++++++-------------
 2 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 621df9e6..bebc792b 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -307,8 +307,7 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 			var opts = {};
 			var cb = noOperation;
 			var run = function () {
-			    var savedAssociations = [];
-
+				var savedAssociations = [];
 				var saveNextAssociation = function () {
 					if (Associations.length === 0) {
 						return cb(null, savedAssociations);
diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
index a7fab0e1..737bda21 100644
--- a/test/integration/association-hasmany.js
+++ b/test/integration/association-hasmany.js
@@ -1,3 +1,4 @@
+var _      = require('lodash');
 var should = require('should');
 var helper = require('../support/spec_helper');
 var ORM    = require('../../');
@@ -291,61 +292,59 @@ describe("hasMany", function () {
 	describe("addAccessor", function () {
 		before(setup());
 
-		if (common.protocol() == "mongodb") return;
-
-		it("might add duplicates", function (done) {
-			Pet.find({ name: "Mutt" }, function (err, pets) {
-				Person.find({ name: "Jane" }, function (err, people) {
-					should.equal(err, null);
-
-					people[0].addPets(pets[0], function (err) {
+		if (common.protocol() != "mongodb") {
+			it("might add duplicates", function (done) {
+				Pet.find({ name: "Mutt" }, function (err, pets) {
+					Person.find({ name: "Jane" }, function (err, people) {
 						should.equal(err, null);
 
-						people[0].getPets("name", function (err, pets) {
+						people[0].addPets(pets[0], function (err) {
 							should.equal(err, null);
 
-							should(Array.isArray(pets));
-							pets.length.should.equal(2);
-							pets[0].name.should.equal("Mutt");
-							pets[1].name.should.equal("Mutt");
+							people[0].getPets("name", function (err, pets) {
+								should.equal(err, null);
 
-							return done();
+								should(Array.isArray(pets));
+								pets.length.should.equal(2);
+								pets[0].name.should.equal("Mutt");
+								pets[1].name.should.equal("Mutt");
+
+								return done();
+							});
 						});
 					});
 				});
 			});
-		});
-	});
-
-	describe("addAccessor", function () {
-		before(setup());
+		}
 
 		it("should keep associations and add new ones", function (done) {
 			Pet.find({ name: "Deco" }).first(function (err, Deco) {
 				Person.find({ name: "Jane" }).first(function (err, Jane) {
 					should.equal(err, null);
 
-					Jane.addPets(Deco, function (err) {
-						should.equal(err, null);
+					Jane.getPets(function (err, janesPets) {
+						should.not.exist(err);
+
+						var petsAtStart = janesPets.length;
 
-						Jane.getPets("name", function (err, pets) {
+						Jane.addPets(Deco, function (err) {
 							should.equal(err, null);
 
-							should(Array.isArray(pets));
-							pets.length.should.equal(2);
-							pets[0].name.should.equal("Deco");
-							pets[1].name.should.equal("Mutt");
+							Jane.getPets("name", function (err, pets) {
+								should.equal(err, null);
 
-							return done();
+								should(Array.isArray(pets));
+								pets.length.should.equal(petsAtStart + 1);
+								pets[0].name.should.equal("Deco");
+								pets[1].name.should.equal("Mutt");
+
+								return done();
+							});
 						});
 					});
 				});
 			});
 		});
-	});
-
-	describe("addAccessor", function () {
-		before(setup());
 
 		it("should accept several arguments as associations", function (done) {
 			Pet.find(function (err, pets) {
@@ -369,16 +368,14 @@ describe("hasMany", function () {
 		});
 
 		it("should accept array as list of associations", function (done) {
-			Pet.find(function (err, pets) {
-				var petCount = pets.length;
-
+			Pet.create([{ name: 'Ruff' }, { name: 'Spotty' }],function (err, pets) {
 				Person.find({ name: "Justin" }).first(function (err, Justin) {
 					should.equal(err, null);
 
 					Justin.getPets(function (err, justinsPets) {
 						should.equal(err, null);
 
-						should.equal(justinsPets.length, 2);
+						var petCount = justinsPets.length;
 
 						Justin.addPets(pets, function (err) {
 							should.equal(err, null);
@@ -387,7 +384,7 @@ describe("hasMany", function () {
 								should.equal(err, null);
 
 								should(Array.isArray(justinsPets));
-								// We're not checking uniqueness.
+								// Mongo doesn't like adding duplicates here, so we add new ones.
 								should.equal(justinsPets.length, petCount + 2);
 
 								return done();

From e29ef7bd65da79eb1459397920f6f339b5d7baf0 Mon Sep 17 00:00:00 2001
From: Benjie Gillam <benjie@jemjie.com>
Date: Sun, 16 Feb 2014 13:35:17 +0000
Subject: [PATCH 0935/1246] Correct sqlite log statement.

---
 lib/Drivers/DML/sqlite.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 0d822880..e0e54626 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -68,7 +68,7 @@ Driver.prototype.getQuery = function () {
 
 Driver.prototype.execSimpleQuery = function (query, cb) {
 	if (this.opts.debug) {
-		require("../../Debug").sql('mysql', query);
+		require("../../Debug").sql('sqlite', query);
 	}
 	this.db.all(query, cb);
 };

From 21fd522c4cde8db9a21bebaf6223d60cee581475 Mon Sep 17 00:00:00 2001
From: Nicholas Faiz <nicholas.faiz@gmail.com>
Date: Mon, 17 Feb 2014 17:16:50 +1100
Subject: [PATCH 0936/1246] mention the migrations plugin on the readme

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index dc549c73..06152fa2 100755
--- a/Readme.md
+++ b/Readme.md
@@ -34,7 +34,7 @@ npm test
 - Create Model associations, find, check, create and remove
 - Define custom validations (several builtin validations, check instance properties before saving - see [enforce](http://github.com/dresende/node-enforce) for details)
 - Model instance caching and integrity (table rows fetched twice are the same object, changes to one change all)
-- Plugins: [MySQL FTS](http://dresende.github.io/node-orm-mysql-fts) , [Pagination](http://dresende.github.io/node-orm-paging) , [Transaction](http://dresende.github.io/node-orm-transaction), [Timestamps](http://github.com/SPARTAN563/node-orm-timestamps)
+- Plugins: [MySQL FTS](http://dresende.github.io/node-orm-mysql-fts) , [Pagination](http://dresende.github.io/node-orm-paging) , [Transaction](http://dresende.github.io/node-orm-transaction), [Timestamps](http://github.com/SPARTAN563/node-orm-timestamps), [Migrations](https://github.com/locomote/node-migrate-orm2)
 
 ## Introduction
 

From 9f335e9d72a45a3c8e04e4c177b7b887cef81c0f Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 18 Feb 2014 20:46:41 +1100
Subject: [PATCH 0937/1246] Merge pr/451. Closes #451

---
 lib/Associations/Many.js | 15 ++++++++++-----
 lib/Associations/One.js  | 12 ++++++++----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index bebc792b..d3ab7dba 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -155,7 +155,8 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 			});
 			return this;
 		},
-		enumerable: false
+		enumerable: false,
+		writable: true
 	});
 	Object.defineProperty(Instance, association.getAccessor, {
 		value: function () {
@@ -228,7 +229,8 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 			association.model.find(conditions, options, cb);
 			return this;
 		},
-		enumerable: false
+		enumerable: false,
+		writable: true
 	});
 	Object.defineProperty(Instance, association.setAccessor, {
 		value: function () {
@@ -247,7 +249,8 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 
 			return this;
 		},
-		enumerable: false
+		enumerable: false,
+		writable: true
 	});
 	Object.defineProperty(Instance, association.delAccessor, {
 		value: function () {
@@ -299,7 +302,8 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 			}
 			return this;
 		},
-		enumerable: false
+		enumerable: false,
+		writable: true
 	});
 	Object.defineProperty(Instance, association.addAccessor, {
 		value: function () {
@@ -402,7 +406,8 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 
 			return this;
 		},
-		enumerable: false
+		enumerable: false,
+		writable: true
 	});
 }
 
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index 5ed925e3..c781b89e 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -154,7 +154,8 @@ function extendInstance(Model, Instance, Driver, association) {
 
 			return this;
 		},
-		enumerable: false
+		enumerable: false,
+		writable: true
 	});
 	Object.defineProperty(Instance, association.getAccessor, {
 		value: function (opts, cb) {
@@ -197,7 +198,8 @@ function extendInstance(Model, Instance, Driver, association) {
 
 			return this;
 		},
-		enumerable: false
+		enumerable: false,
+		writable: true
 	});
 	Object.defineProperty(Instance, association.setAccessor, {
 		value: function (OtherInstance, cb) {
@@ -251,7 +253,8 @@ function extendInstance(Model, Instance, Driver, association) {
 
 			return this;
 		},
-		enumerable: false
+		enumerable: false,
+		writable: true
 	});
 	if (!association.reversed) {
 		Object.defineProperty(Instance, association.delAccessor, {
@@ -271,7 +274,8 @@ function extendInstance(Model, Instance, Driver, association) {
 
 				return this;
 			},
-			enumerable: false
+			enumerable: false,
+			writable: true
 		});
 	}
 }

From 11d0f7584ea9f8feefa297b707da4c5255c46005 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 18 Feb 2014 21:05:56 +1100
Subject: [PATCH 0938/1246] Add more test cases for saving with options

---
 test/integration/hook.js       |  15 ++++-
 test/integration/model-save.js | 117 ++++++++++++++++++++++++++++++++-
 2 files changed, 130 insertions(+), 2 deletions(-)

diff --git a/test/integration/hook.js b/test/integration/hook.js
index a1e1bc68..2db7299b 100644
--- a/test/integration/hook.js
+++ b/test/integration/hook.js
@@ -354,7 +354,7 @@ describe("Hook", function() {
 	});
 
 	describe("afterSave", function () {
-		before(setup());
+		beforeEach(setup());
 
 		it("should trigger after saving an instance", function (done) {
 			Person.create([{ name: "John Doe" }], function () {
@@ -365,6 +365,19 @@ describe("Hook", function() {
 				return done();
 			});
 		});
+
+		it("should not trigger after saving an unchanged instance", function (done) {
+			Person.create({ name: "Edger" }, function (err, edger) {
+				should.not.exist(err);
+
+				triggeredHooks = {};
+				edger.save(function (err) {
+					should.not.exist(err);
+					should.not.exist(triggeredHooks.afterSave);
+					done();
+				});
+			});
+		});
 	});
 
 	describe("beforeValidation", function () {
diff --git a/test/integration/model-save.js b/test/integration/model-save.js
index 2fd7a9d2..750eb058 100644
--- a/test/integration/model-save.js
+++ b/test/integration/model-save.js
@@ -8,12 +8,14 @@ describe("Model.save()", function() {
 	var Person = null;
 
 	var setup = function (nameDefinition, opts) {
+		opts = opts || {};
+
 		return function (done) {
 			Person = db.define("person", {
 				name   : nameDefinition || String
 			}, opts || {});
 
-			Person.hasOne("parent");
+			Person.hasOne("parent", Person, opts.hasOneOpts);
 
 			return helper.dropSync(Person, done);
 		};
@@ -198,6 +200,119 @@ describe("Model.save()", function() {
 		});
 	});
 
+	describe("with saveAssociations", function () {
+		var afterSaveCalled = false;
+
+		if (common.protocol() == 'mongodb') return;
+
+		beforeEach(function (done) {
+			function afterSave () {
+				afterSaveCalled = true;
+			}
+			var hooks = { afterSave: afterSave };
+
+			setup(null, { hooks: hooks, cache: false, hasOneOpts: { autoFetch: true } })(function (err) {
+				should.not.exist(err);
+
+				Person.create({ name: 'Olga' }, function (err, olga) {
+					should.not.exist(err);
+
+					should.exist(olga);
+					Person.create({ name: 'Hagar', parent_id: olga.id }, function (err, hagar) {
+						should.not.exist(err);
+						should.exist(hagar);
+						afterSaveCalled = false;
+						done();
+					});
+				});
+			});
+		});
+
+		it("off should not save associations but save itself", function (done) {
+			Person.one({ name: 'Hagar' }, function (err, hagar) {
+				should.not.exist(err);
+				should.exist(hagar.parent);
+
+				hagar.parent.name = 'Olga2';
+				hagar.save({name: 'Hagar2'}, { saveAssociations: false }, function (err) {
+					should.not.exist(err);
+					should.equal(afterSaveCalled, true);
+
+					Person.get(hagar.parent.id, function (err, olga) {
+						should.not.exist(err);
+						should.equal(olga.name, 'Olga');
+						done();
+					});
+				});
+			});
+		});
+
+		it("off should not save associations or itself if there are no changes", function (done) {
+			Person.one({ name: 'Hagar' }, function (err, hagar) {
+				should.not.exist(err);
+
+				hagar.save({}, { saveAssociations: false }, function (err) {
+					should.not.exist(err);
+					should.equal(afterSaveCalled, false);
+
+					Person.get(hagar.parent.id, function (err, olga) {
+						should.not.exist(err);
+						should.equal(olga.name, 'Olga');
+						done();
+					});
+				});
+			});
+		});
+
+		it("unspecified should save associations and itself", function (done) {
+			Person.one({ name: 'Hagar' }, function (err, hagar) {
+				should.not.exist(err);
+				should.exist(hagar.parent);
+
+				hagar.parent.name = 'Olga2';
+				hagar.save({name: 'Hagar2'}, function (err) {
+					should.not.exist(err);
+
+					Person.get(hagar.parent.id, function (err, olga) {
+						should.not.exist(err);
+						should.equal(olga.name, 'Olga2');
+
+						Person.get(hagar.id, function (err, person) {
+							should.not.exist(err);
+							should.equal(person.name, 'Hagar2');
+
+							done();
+						});
+					});
+				});
+			});
+		});
+
+		it("on should save associations and itself", function (done) {
+			Person.one({ name: 'Hagar' }, function (err, hagar) {
+				should.not.exist(err);
+				should.exist(hagar.parent);
+
+				hagar.parent.name = 'Olga2';
+				hagar.save({name: 'Hagar2'}, { saveAssociations: true }, function (err) {
+					should.not.exist(err);
+
+					Person.get(hagar.parent.id, function (err, olga) {
+						should.not.exist(err);
+						should.equal(olga.name, 'Olga2');
+
+						Person.get(hagar.id, function (err, person) {
+							should.not.exist(err);
+							should.equal(person.name, 'Hagar2');
+
+							done();
+						});
+					});
+				});
+			});
+		});
+	});
+
 	describe("with a point property", function () {
 		if (common.protocol() == 'sqlite' || common.protocol() == 'mongodb') return;
 

From 77763395764f423c465f244361475dcb8aa6294e Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Sun, 23 Feb 2014 23:19:55 +0000
Subject: [PATCH 0939/1246] Adds ORM own type of errors (#455)

---
 lib/ErrorCodes.js | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/lib/ErrorCodes.js b/lib/ErrorCodes.js
index 5df4fbeb..804bfc36 100644
--- a/lib/ErrorCodes.js
+++ b/lib/ErrorCodes.js
@@ -17,16 +17,32 @@ Object.defineProperty(exports, "PARAM_MISSMATCH", {
 
 Object.defineProperty(exports, "generateError", {
 	value: function (code, message, extra) {
-		var err = new Error(message);
-		err.code = code;
+		var err = new ORMError(message);
+
+		err.setCode(code);
 
 		if (extra) {
-			for (var k in extra) {
-				err[k] = extra[k];
-			}
+			err.setExtra(extra);
 		}
 
 		return err;
 	},
 	enumerable : false
 });
+
+function ORMError(message) {
+	this.message = message;
+}
+
+ORMError.prototype = new Error();
+ORMError.prototype.constructor = ORMError;
+
+ORMError.prototype.setCode = function (code) {
+	this.code = code;
+};
+
+ORMError.prototype.setExtra = function (extra) {
+	for (var k in extra) {
+		this[k] = extra[k];
+	}
+};

From 264b5ba3634f35285debcd9c002e3326eac0f919 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 24 Feb 2014 20:32:57 +1100
Subject: [PATCH 0940/1246] Better errors - closes #455

---
 lib/AggregateFunctions.js       | 14 ++++-----
 lib/Associations/Extend.js      | 10 +++---
 lib/Associations/Many.js        |  4 +--
 lib/Associations/One.js         |  4 +--
 lib/Error.js                    | 39 +++++++++++++++++++++++
 lib/ErrorCodes.js               | 50 ++---------------------------
 lib/Model.js                    | 20 ++++++------
 lib/ORM.js                      | 14 ++++-----
 lib/Property.js                 |  4 +--
 test/integration/error_spec.js  | 56 +++++++++++++++++++++++++++++++++
 test/integration/orm-exports.js | 14 +++++++--
 11 files changed, 143 insertions(+), 86 deletions(-)
 create mode 100644 lib/Error.js
 create mode 100644 test/integration/error_spec.js

diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index 75783546..da8544c1 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -1,14 +1,14 @@
-var ErrorCodes = require("./ErrorCodes");
+var ORMError   = require("./Error");
 var Utilities  = require("./Utilities");
 
 module.exports = AggregateFunctions;
 
 function AggregateFunctions(opts) {
 	if (typeof opts.driver.getQuery !== "function") {
-		throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "This driver does not support aggregate functions");
+		throw new ORMError('NO_SUPPORT', "This driver does not support aggregate functions");
 	}
 	if (!Array.isArray(opts.driver.aggregate_functions)) {
-		throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "This driver does not support aggregate functions");
+		throw new ORMError('NO_SUPPORT', "This driver does not support aggregate functions");
 	}
 
 	var aggregates    = [ [] ];
@@ -52,7 +52,7 @@ function AggregateFunctions(opts) {
 		},
 		select: function () {
 			if (arguments.length === 0) {
-				throw ErrorCodes.generateError(ErrorCodes.PARAM_MISMATCH, "When using append you must at least define one property");
+				throw new ORMError('PARAM_MISMATCH', "When using append you must at least define one property");
 			}
 			if (Array.isArray(arguments[0])) {
 				opts.properties = opts.properties.concat(arguments[0]);
@@ -63,7 +63,7 @@ function AggregateFunctions(opts) {
 		},
 		as: function (alias) {
 			if (aggregates.length === 0 || (aggregates.length === 1 && aggregates[0].length === 0)) {
-				throw ErrorCodes.generateError(ErrorCodes.PARAM_MISMATCH, "No aggregate functions defined yet");
+				throw new ORMError('PARAM_MISMATCH', "No aggregate functions defined yet");
 			}
 
 			var len = aggregates.length;
@@ -88,13 +88,13 @@ function AggregateFunctions(opts) {
 		},
 		get: function (cb) {
 			if (typeof cb !== "function") {
-				throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "You must pass a callback to Model.aggregate().get()");
+				throw new ORMError('MISSING_CALLBACK', "You must pass a callback to Model.aggregate().get()");
 			}
 			if (aggregates[aggregates.length - 1].length === 0) {
 				aggregates.length -= 1;
 			}
 			if (aggregates.length === 0) {
-				throw ErrorCodes.generateError(ErrorCodes.PARAM_MISMATCH, "Missing aggregate functions");
+				throw new ORMError('PARAM_MISMATCH', "Missing aggregate functions");
 			}
 
 			var query = opts.driver.getQuery().select().from(opts.table).select(opts.properties);
diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index 3df3c291..d9ff80aa 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -1,5 +1,5 @@
 var _          = require('lodash');
-var ErrorCodes = require("../ErrorCodes");
+var ORMError   = require("../Error");
 var Settings   = require("../Settings");
 var Singleton  = require("../Singleton");
 var util       = require("../Utilities");
@@ -59,7 +59,7 @@ exports.prepare = function (db, Model, associations, association_properties, mod
 			}
 
 			if (conditions === null) {
-				throw ErrorCodes.generateError(ErrorCodes.PARAM_MISMATCH, ".findBy(" + assocName + ") is missing a conditions object");
+				throw new ORMError(".findBy(" + assocName + ") is missing a conditions object", 'PARAM_MISMATCH');
 			}
 
 			options.__merge = {
@@ -109,7 +109,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 	Object.defineProperty(Instance, association.hasAccessor, {
 		value : function (cb) {
 			if (!Instance[Model.id]) {
-			    cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension", { model: Model.table }));
+			    cb(new ORMError("Instance not saved, cannot get extension", 'NOT_DEFINED', { model: Model.table }));
 			} else {
 				association.model.get(util.values(Instance, Model.id), function (err, extension) {
 					return cb(err, !err && extension ? true : false);
@@ -127,7 +127,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 			}
 
 			if (!Instance[Model.id]) {
-			    cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension", { model: Model.table }));
+			    cb(new ORMError("Instance not saved, cannot get extension", 'NOT_DEFINED', { model: Model.table }));
 			} else {
 				association.model.get(util.values(Instance, Model.id), opts, cb);
 			}
@@ -167,7 +167,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 	Object.defineProperty(Instance, association.delAccessor, {
 		value : function (cb) {
 			if (!Instance[Model.id]) {
-			    cb(ErrorCodes.generateError(ErrorCodes.NOT_DEFINED, "Instance not saved, cannot get extension", { model: Model.table }));
+			    cb(new ORMError("Instance not saved, cannot get extension", 'NOT_DEFINED', { model: Model.table }));
 			} else {
 				var conditions = {};
 				var fields = Object.keys(association.field);
diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index d3ab7dba..cc9c996e 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -3,7 +3,7 @@ var InstanceConstructor = require("../Instance").Instance;
 var Hook                = require("../Hook");
 var Settings            = require("../Settings");
 var Property            = require("../Property");
-var ErrorCodes          = require("../ErrorCodes");
+var ORMError            = require("../Error");
 var util                = require("../Utilities");
 
 exports.prepare = function (Model, associations) {
@@ -389,7 +389,7 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 			}
 
 			if (Associations.length === 0) {
-			    throw ErrorCodes.generateError(ErrorCodes.PARAM_MISMATCH, "No associations defined", { model: Model.name });
+			    throw new ORMError("No associations defined", 'PARAM_MISMATCH', { model: Model.name });
 			}
 
 			if (this.saved()) {
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index c781b89e..63cda40a 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -1,6 +1,6 @@
 var _          = require("lodash");
 var util       = require("../Utilities");
-var ErrorCodes = require("../ErrorCodes");
+var ORMError   = require("../Error");
 var Accessors  = { "get": "get", "set": "set", "has": "has", "del": "remove" };
 
 exports.prepare = function (Model, associations, association_properties, model_fields) {
@@ -90,7 +90,7 @@ exports.prepare = function (Model, associations, association_properties, model_f
 			}
 
 			if (conditions === null) {
-				throw ErrorCodes.generateError(ErrorCodes.PARAM_MISMATCH, ".findBy(" + assocName + ") is missing a conditions object");
+				throw new ORMError(".findBy(" + assocName + ") is missing a conditions object", 'PARAM_MISMATCH');
 			}
 
 			options.__merge = {
diff --git a/lib/Error.js b/lib/Error.js
new file mode 100644
index 00000000..b1013811
--- /dev/null
+++ b/lib/Error.js
@@ -0,0 +1,39 @@
+var codes = {
+  QUERY_ERROR      : 1,
+  NOT_FOUND        : 2,
+  NOT_DEFINED      : 3,
+  NO_SUPPORT       : 4,
+  MISSING_CALLBACK : 5,
+  PARAM_MISMATCH   : 6,
+  CONNECTION_LOST  : 10
+}
+
+function ORMError(message, code, extras) {
+  Error.call(this);
+  Error.captureStackTrace(this, this.constructor);
+
+  this.message = message;
+  if (code) {
+  	this.code = codes[code];
+    this.literalCode = code;
+    if (!this.code) {
+  		throw new Error("Invalid error code: " +  code);
+  	}
+  }
+  if (extras) {
+  	for(var k in extras) {
+  		this[k] = extras[k];
+  	}
+  }
+}
+
+ORMError.prototype = Object.create(Error.prototype);
+ORMError.prototype.constructor = ORMError;
+ORMError.prototype.name        = 'ORMError';
+ORMError.prototype.toString    = function () {
+  return '[ORMError ' + this.literalCode + ': ' + this.message + ']';
+}
+
+ORMError.codes = codes;
+
+module.exports = ORMError;
diff --git a/lib/ErrorCodes.js b/lib/ErrorCodes.js
index 804bfc36..e3ed8d8d 100644
--- a/lib/ErrorCodes.js
+++ b/lib/ErrorCodes.js
@@ -1,48 +1,2 @@
-exports.QUERY_ERROR      = 1;
-exports.NOT_FOUND        = 2;
-exports.NOT_DEFINED      = 3;
-exports.NO_SUPPORT       = 4;
-exports.MISSING_CALLBACK = 5;
-exports.PARAM_MISMATCH   = 6;
-
-exports.CONNECTION_LOST  = 10;
-
-// Deprecated, remove on next major release.
-Object.defineProperty(exports, "PARAM_MISSMATCH", {
-  enumerable: true, get: function () {
-    console.log("PARAM_MISSMATCH spelling is deprecated. Use PARAM_MISMATCH instead");
-    return exports.PARAM_MISMATCH;
-  }
-});
-
-Object.defineProperty(exports, "generateError", {
-	value: function (code, message, extra) {
-		var err = new ORMError(message);
-
-		err.setCode(code);
-
-		if (extra) {
-			err.setExtra(extra);
-		}
-
-		return err;
-	},
-	enumerable : false
-});
-
-function ORMError(message) {
-	this.message = message;
-}
-
-ORMError.prototype = new Error();
-ORMError.prototype.constructor = ORMError;
-
-ORMError.prototype.setCode = function (code) {
-	this.code = code;
-};
-
-ORMError.prototype.setExtra = function (extra) {
-	for (var k in extra) {
-		this[k] = extra[k];
-	}
-};
+// Moved to 'Error.js'
+module.exports = require('./error').codes;
diff --git a/lib/Model.js b/lib/Model.js
index 188ba3a9..feab1488 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -8,7 +8,7 @@ var Property          = require("./Property");
 var Singleton         = require("./Singleton");
 var Utilities         = require("./Utilities");
 var Validators        = require("./Validators");
-var ErrorCodes        = require("./ErrorCodes");
+var ORMError          = require("./Error");
 var Hook              = require("./Hook");
 var AvailableHooks    = [
 	"beforeCreate", "afterCreate",
@@ -206,7 +206,7 @@ function Model(opts) {
 			return this;
 		}
 
-		return cb(ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Driver does not support Model.drop()", { model: opts.table }));
+		return cb(new ORMError("Driver does not support Model.drop()", 'NO_SUPPORT', { model: opts.table }));
 	};
 
 	model.sync = function (cb) {
@@ -234,7 +234,7 @@ function Model(opts) {
 			return this;
 		}
 
-		return cb(ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Driver does not support Model.sync()", { model: opts.table }));
+		return cb(new ORMError("Driver does not support Model.sync()", 'NO_SUPPORT', { model: opts.table }));
 	};
 
 	model.get = function () {
@@ -244,7 +244,7 @@ function Model(opts) {
 		var cb         = ids.pop();
 
 		if (typeof cb !== "function") {
-		    throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.get() callback", { model: opts.table });
+		    throw new ORMError("Missing Model.get() callback", 'MISSING_CALLBACK', { model: opts.table });
 		}
 
 		if (typeof ids[ids.length - 1] === "object" && !Array.isArray(ids[ids.length - 1])) {
@@ -256,7 +256,7 @@ function Model(opts) {
 		}
 
 		if (ids.length !== opts.id.length) {
-		    throw ErrorCodes.generateError(ErrorCodes.PARAM_MISMATCH, "Model.get() IDs number mismatch (" + opts.id.length + " needed, " + ids.length + " passed)", { model: opts.table });
+		    throw new ORMError("Model.get() IDs number mismatch (" + opts.id.length + " needed, " + ids.length + " passed)", 'PARAM_MISMATCH', { model: opts.table });
 		}
 
 		for (var i = 0; i < opts.id.length; i++) {
@@ -275,10 +275,10 @@ function Model(opts) {
 
 		opts.driver.find(model_fields, opts.table, conditions, { limit: 1 }, function (err, data) {
 			if (err) {
-				return cb(ErrorCodes.generateError(ErrorCodes.QUERY_ERROR, err.message, { originalCode: err.code }));
+				return cb(new ORMError(err.message, 'QUERY_ERROR', { originalCode: err.code }));
 			}
 			if (data.length === 0) {
-			    return cb(ErrorCodes.generateError(ErrorCodes.NOT_FOUND, "Not found", { model: opts.table }));
+			    return cb(new ORMError("Not found", 'NOT_FOUND', { model: opts.table }));
 			}
 
 			var uid = opts.driver.uid + "/" + opts.table + "/" + ids.join("/");
@@ -426,7 +426,7 @@ function Model(opts) {
 		}
 
 		if (cb === null) {
-		    throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.one() callback", { model: opts.table });
+		    throw new ORMError("Missing Model.one() callback", 'MISSING_CALLBACK', { model: opts.table });
 		}
 
 		// add limit 1
@@ -457,7 +457,7 @@ function Model(opts) {
 		}
 
 		if (typeof cb !== "function") {
-		    throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.count() callback", { model: opts.table });
+		    throw new ORMError('MISSING_CALLBACK', "Missing Model.count() callback", { model: opts.table });
 		}
 
 		if (conditions) {
@@ -505,7 +505,7 @@ function Model(opts) {
 		var cb  = ids.pop();
 
 		if (typeof cb !== "function") {
-		    throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.exists() callback", { model: opts.table });
+		    throw new ORMError("Missing Model.exists() callback", 'MISSING_CALLBACK', { model: opts.table });
 		}
 
 		var conditions = {}, i;
diff --git a/lib/ORM.js b/lib/ORM.js
index 8ac89230..c303c477 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -10,7 +10,7 @@ var Model          = require("./Model").Model;
 var DriverAliases  = require("./Drivers/aliases");
 var Settings       = require("./Settings");
 var Singleton      = require("./Singleton");
-var ErrorCodes     = require("./ErrorCodes");
+var ORMError       = require("./Error");
 var Utilities      = require("./Utilities");
 
 // Deprecated, use enforce
@@ -27,7 +27,7 @@ exports.settings   = new Settings.Container(Settings.defaults());
 
 exports.Property   = require("./Property");
 exports.Settings   = Settings;
-exports.ErrorCodes = ErrorCodes;
+exports.ErrorCodes = ORMError.codes;
 
 exports.Text = Query.Text;
 for (var k in Query.Comparators) {
@@ -63,11 +63,11 @@ exports.use = function (connection, proto, opts, cb) {
 
 exports.connect = function (opts, cb) {
 	if (arguments.length === 0 || !opts) {
-		return ORM_Error(ErrorCodes.generateError(ErrorCodes.PARAM_MISMATCH, "CONNECTION_URL_EMPTY"), cb);
+		return ORM_Error(new ORMError("CONNECTION_URL_EMPTY", 'PARAM_MISMATCH'), cb);
 	}
 	if (typeof opts === "string") {
 		if (opts.replace(/\s+/, "").length === 0) {
-			return ORM_Error(ErrorCodes.generateError(ErrorCodes.PARAM_MISMATCH, "CONNECTION_URL_EMPTY"), cb);
+			return ORM_Error(new ORMError("CONNECTION_URL_EMPTY", 'PARAM_MISMATCH'), cb);
 		}
 		opts = url.parse(opts, true);
 		for(var k in opts.query) {
@@ -81,7 +81,7 @@ exports.connect = function (opts, cb) {
 		opts.database = (opts.pathname ? opts.pathname.substr(1) : "");
 	}
 	if (!opts.protocol) {
-		return ORM_Error(ErrorCodes.generateError(ErrorCodes.PARAM_MISMATCH, "CONNECTION_URL_NO_PROTOCOL"), cb);
+		return ORM_Error(new ORMError("CONNECTION_URL_NO_PROTOCOL", 'PARAM_MISMATCH'), cb);
 	}
 	// if (!opts.host) {
 	// 	opts.host = opts.hostname = "localhost";
@@ -132,7 +132,7 @@ exports.connect = function (opts, cb) {
 		});
 	} catch (ex) {
 		if (ex.code === "MODULE_NOT_FOUND" || ex.message.indexOf('find module')) {
-			return ORM_Error(ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "CONNECTION_PROTOCOL_NOT_SUPPORTED"), cb);
+			return ORM_Error(new ORMError("Connection protocol not supported - have you installed the database driver for " + proto + "?", 'NO_SUPPORT'), cb);
 		}
 		return ORM_Error(ex, cb);
 	}
@@ -161,7 +161,7 @@ function ORM(driver_name, driver, settings) {
 	var onError = function (err) {
 		if (this.settings.get("connection.reconnect")) {
 			if (typeof this.driver.reconnect === "undefined") {
-				return this.emit("error", ErrorCodes.generateError(ErrorCodes.CONNECTION_LOST, "Connection lost - driver does not support reconnection"));
+				return this.emit("error", new ORMError("Connection lost - driver does not support reconnection", 'CONNECTION_LOST'));
 			}
 			this.driver.reconnect(function () {
 				this.driver.on("error", onError);
diff --git a/lib/Property.js b/lib/Property.js
index b96cc1b2..a859f68e 100644
--- a/lib/Property.js
+++ b/lib/Property.js
@@ -1,4 +1,4 @@
-var ErrorCodes = require("./ErrorCodes");
+var ORMError = require("./Error");
 
 exports.normalize = function (prop, customTypes, Settings) {
 	if (typeof prop === "function") {
@@ -32,7 +32,7 @@ exports.normalize = function (prop, customTypes, Settings) {
 
 	if ([ "text", "number", "boolean", "date", "enum", "object", "binary", "point" ].indexOf(prop.type) === -1) {
 		if (!(prop.type in customTypes)) {
-			throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Unknown property type: " + prop.type);
+			throw new ORMError("Unknown property type: " + prop.type, 'NO_SUPPORT');
 		}
 	}
 
diff --git a/test/integration/error_spec.js b/test/integration/error_spec.js
new file mode 100644
index 00000000..eab26890
--- /dev/null
+++ b/test/integration/error_spec.js
@@ -0,0 +1,56 @@
+var should   = require('should');
+var ORMError = require('../../lib/Error');
+
+describe("Error", function () {
+	describe("constructor", function () {
+		it("should inherit from native Error", function () {
+			var e = new ORMError("Test message", 'PARAM_MISMATCH');
+			should(e instanceof Error);
+		});
+
+		it("should have a valid stack", function () {
+			var e = new ORMError("Test message", 'PARAM_MISMATCH');
+			var stackArr = e.stack.split('\n');
+			// [0] is ''
+			should(stackArr[1].indexOf('test/integration/error_spec.js') > 0);
+		});
+
+		it("should have the right name", function () {
+			var e = new ORMError("Test message", 'PARAM_MISMATCH');
+			should.equal(e.name, 'ORMError');
+		});
+
+		it("should throw on invalid code", function () {
+			(function () {
+				var e = new ORMError("Test message", 'FLYING_SQUIRRELS');
+			}).should.throw("Invalid error code: FLYING_SQUIRRELS");
+		});
+
+		it("should assign the code", function () {
+			var e = new ORMError("Test message", 'PARAM_MISMATCH');
+			should.equal(e.code, 6);
+		});
+
+		it("should assign literal code", function () {
+			var e = new ORMError("Test message", 'PARAM_MISMATCH');
+			should.equal(e.literalCode, 'PARAM_MISMATCH');
+		});
+
+		it("should assign extra params", function () {
+			var e = new ORMError("Test message", 'PARAM_MISMATCH', { details: "something" });
+			should.equal(e.details, "something");
+		});
+
+		it("should stringify nicely", function () {
+			var e = new ORMError("Test message", 'PARAM_MISMATCH');
+			should.equal(e.toString(), "[ORMError PARAM_MISMATCH: Test message]");
+		});
+	});
+
+	describe("codes", function () {
+		it("should be exposed", function () {
+			should.exist(ORMError.codes);
+			should.equal(ORMError.codes['NOT_FOUND'], 2);
+		});
+	});
+});
diff --git a/test/integration/orm-exports.js b/test/integration/orm-exports.js
index 9e143854..ab445a94 100644
--- a/test/integration/orm-exports.js
+++ b/test/integration/orm-exports.js
@@ -115,7 +115,11 @@ describe("ORM.connect()", function () {
 		var db = ORM.connect("unknown://db");
 
 		db.on("connect", function (err) {
-			err.message.should.equal("CONNECTION_PROTOCOL_NOT_SUPPORTED");
+			should.equal(err.literalCode, 'NO_SUPPORT');
+			should.equal(
+				err.message,
+				"Connection protocol not supported - have you installed the database driver for unknown?"
+			);
 
 			return done();
 		});
@@ -126,7 +130,7 @@ describe("ORM.connect()", function () {
 
 		db.on("connect", function (err) {
 			should.exist(err);
-			err.message.should.not.equal("CONNECTION_PROTOCOL_NOT_SUPPORTED");
+			should.equal(err.message.indexOf("Connection protocol not supported"), -1);
 			err.message.should.not.equal("CONNECTION_URL_NO_PROTOCOL");
 			err.message.should.not.equal("CONNECTION_URL_EMPTY");
 
@@ -185,7 +189,11 @@ describe("ORM.connect()", function () {
 
 		it("should return an error if unknown protocol is passed", function (done) {
 			ORM.connect("unknown://db", function (err) {
-				err.message.should.equal("CONNECTION_PROTOCOL_NOT_SUPPORTED");
+				should.equal(err.literalCode, 'NO_SUPPORT');
+				should.equal(
+					err.message,
+					"Connection protocol not supported - have you installed the database driver for unknown?"
+				);
 
 				return done();
 			});

From ed6140f879d8eb78de15c108dd25266b569c3f29 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 5 Mar 2014 19:36:15 +1100
Subject: [PATCH 0941/1246] Fix sqlite+windows connection issue. Allows passing
 object with connection details on windows without a host. Closes #461

---
 lib/Drivers/DML/sqlite.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index e0e54626..63b6a043 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -25,7 +25,7 @@ function Driver(config, connection, opts) {
 		// on Windows, paths have a drive letter which is parsed by
 		// url.parse() as the hostname. If host is defined, assume
 		// it's the drive letter and add ":"
-		if (process.platform == "win32" && config.host.match(/^[a-z]$/i)) {
+		if (process.platform == "win32" && config.host && config.host.match(/^[a-z]$/i)) {
 			this.db = new sqlite3.Database(((config.host ? config.host + ":" : "") + (config.pathname || "")) || ':memory:');
 		} else {
 			this.db = new sqlite3.Database(((config.host ? config.host : "") + (config.pathname || "")) || ':memory:');

From b5702a4765b36d85e94e8cabfdb9c4c7c4fe2fb9 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 5 Mar 2014 23:03:48 +1100
Subject: [PATCH 0942/1246] Simplify Instance.save control flow (and lint some
 stuff)

---
 lib/Instance.js | 101 ++++++++++++++++++++++++++++--------------------
 1 file changed, 60 insertions(+), 41 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index dc4dba0b..e2573f43 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -97,7 +97,7 @@ function Instance(Model, opts) {
 			cb(err, instance);
 		}
 	};
-	var saveInstance = function (cb, saveOptions) {
+	var saveInstance = function (saveOptions, cb) {
 		// what this condition means:
 		// - If the instance is in state mode
 		// - AND it's not an association that is asking it to save
@@ -118,7 +118,7 @@ function Instance(Model, opts) {
 						return saveError(cb, err);
 					}
 
-					return saveNew(cb, saveOptions, getInstanceData());
+					return saveNew(saveOptions, getInstanceData(), cb);
 				});
 			} else {
 				waitHooks([ "beforeSave" ], function (err) {
@@ -126,21 +126,12 @@ function Instance(Model, opts) {
 						return saveError(cb, err);
 					}
 
-					if (opts.changes.length === 0) {
-					    if (saveOptions.saveAssociations === false) {
-					        return saveInstanceExtra(cb);
-					    }
-					    return saveAssociations(function (err) {
-					        return afterSave(cb, false, err);
-					    });
-					}
-
-					return savePersisted(cb, saveOptions, getInstanceData());
+					return savePersisted(saveOptions, getInstanceData(), cb);
 				});
 			}
 		});
 	};
-	var afterSave = function (cb, create, err) {
+	var runAfterSaveActions = function (cb, create, err) {
 		instance_saving = false;
 
 		emitEvent("save", err, instance);
@@ -150,9 +141,7 @@ function Instance(Model, opts) {
 		}
 		Hook.trigger(instance, opts.hooks.afterSave, !err);
 
-		if (!err) {
-			saveInstanceExtra(cb);
-		}
+		cb();
 	};
 	var getInstanceData = function () {
 		var data = {}, prop;
@@ -190,8 +179,13 @@ function Instance(Model, opts) {
 
 		return nextHook();
 	};
-	var saveNew = function (cb, saveOptions, data) {
-		var next = afterSave.bind(this, cb, true);
+	var saveNew = function (saveOptions, data, cb) {
+		var finish = function (err) {
+			runAfterSaveActions(function () {
+				if (err) return cb(err);
+				saveInstanceExtra(cb);
+			}, true);
+		}
 
 		opts.driver.insert(opts.table, data, opts.id, function (save_err, info) {
 			if (save_err) {
@@ -205,36 +199,56 @@ function Instance(Model, opts) {
 			opts.is_new = false;
 
 			if (saveOptions.saveAssociations === false) {
-				return next();
+				return finish();
 			}
 
-			return saveAssociations(next);
+			return saveAssociations(finish);
 		});
 	};
-	var savePersisted = function (cb, saveOptions, data) {
-		var next = afterSave.bind(this, cb, false);
+	var savePersisted = function (saveOptions, data, cb) {
 		var changes = {}, conditions = {};
 
-		for (var i = 0; i < opts.changes.length; i++) {
-			changes[opts.changes[i]] = data[opts.changes[i]];
-		}
-		for (i = 0; i < opts.id.length; i++) {
-		    conditions[opts.id[i]] = data[opts.id[i]];
-		}
-
-		opts.driver.update(opts.table, changes, conditions, function (save_err) {
-			if (save_err) {
-				return saveError(cb, save_err);
+		var next = function (saved) {
+			var finish = function () {
+				saveInstanceExtra(cb);
 			}
 
-			opts.changes.length = 0;
+			if(!saved && saveOptions.saveAssociations === false) {
+				finish();
+			} else {
+				if (saveOptions.saveAssociations === false) {
+					runAfterSaveActions(function () {
+						finish();
+					}, false);
+				} else {
+					saveAssociations(function (err) {
+						runAfterSaveActions(function () {
+							if (err) return cb(err);
+							finish();
+						}, false, err);
+					});
+				}
+			}
+		}
 
-			if (saveOptions.saveAssociations === false) {
-				return next();
+		if (opts.changes.length === 0) {
+			next(false);
+		} else {
+			for (var i = 0; i < opts.changes.length; i++) {
+				changes[opts.changes[i]] = data[opts.changes[i]];
 			}
+			for (i = 0; i < opts.id.length; i++) {
+				conditions[opts.id[i]] = data[opts.id[i]];
+			}
+			opts.driver.update(opts.table, changes, conditions, function (err) {
+				if (err) {
+					return saveError(cb, err);
+				}
+				opts.changes.length = 0;
 
-			return saveAssociations(next);
-		});
+				next(true);
+			});
+		}
 	};
 	var saveAssociations = function (cb) {
 		var pending = 1, errored = false, i, j;
@@ -333,7 +347,7 @@ function Instance(Model, opts) {
 		}
 
 		opts.driver.update(opts.extra_info.table, data, conditions, function (err) {
-			if (cb)	return cb(err, instance);
+			return cb(err);
 		});
 	};
 	var removeInstance = function (cb) {
@@ -512,7 +526,7 @@ function Instance(Model, opts) {
 	Object.defineProperty(instance, "save", {
 		value: function () {
 			var arg = null, objCount = 0;
-			var data = {}, saveOptions = {}, callback = null;
+			var data = {}, saveOptions = {}, cb = null;
 
 			while (arguments.length > 0) {
 				arg = Array.prototype.shift.call(arguments);
@@ -530,7 +544,7 @@ function Instance(Model, opts) {
 						objCount++;
 						break;
 					case 'function':
-						callback = arg;
+						cb = arg;
 						break;
 					default:
 					    var err = new Error("Unknown parameter type '" + (typeof arg) + "' in Instance.save()");
@@ -545,7 +559,12 @@ function Instance(Model, opts) {
 				}
 			}
 
-			saveInstance(callback, saveOptions);
+			saveInstance(saveOptions, function (err) {
+				if (!cb) return;
+				if (err) return cb(err);
+
+				return cb(null, instance);
+			});
 
 			return this;
 		},

From 7e3d4b5feef9d94ca7a94c6a125a742a4bf81fbc Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 5 Mar 2014 23:04:50 +1100
Subject: [PATCH 0943/1246] Lint

---
 lib/Instance.js | 62 ++++++++++++++++++++++++-------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index e2573f43..be1682ab 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -270,45 +270,45 @@ function Instance(Model, opts) {
 		};
 
 		var _saveOneAssociation = function (assoc) {
-		    if (!instance[assoc.name] || typeof instance[assoc.name] !== "object") return;
-		    if (assoc.reversed) {
-		        // reversed hasOne associations should behave like hasMany
-		        if (!Array.isArray(instance[assoc.name])) {
-		            instance[assoc.name] = [ instance[assoc.name] ];
-		        }
-		        for (var i = 0; i < instance[assoc.name].length; i++) {
-		            if (!instance[assoc.name][i].isInstance) {
-		                instance[assoc.name][i] = new assoc.model(instance[assoc.name][i]);
-		            }
-		            saveAssociation(assoc.setAccessor, instance[assoc.name][i]);
-		        }
-		        return;
-		    }
-		    if (!instance[assoc.name].isInstance) {
-		        instance[assoc.name] = new assoc.model(instance[assoc.name]);
-		    }
+			if (!instance[assoc.name] || typeof instance[assoc.name] !== "object") return;
+			if (assoc.reversed) {
+				// reversed hasOne associations should behave like hasMany
+				if (!Array.isArray(instance[assoc.name])) {
+					instance[assoc.name] = [ instance[assoc.name] ];
+				}
+				for (var i = 0; i < instance[assoc.name].length; i++) {
+					if (!instance[assoc.name][i].isInstance) {
+						instance[assoc.name][i] = new assoc.model(instance[assoc.name][i]);
+					}
+					saveAssociation(assoc.setAccessor, instance[assoc.name][i]);
+				}
+				return;
+			}
+			if (!instance[assoc.name].isInstance) {
+			  instance[assoc.name] = new assoc.model(instance[assoc.name]);
+			}
 
-		    saveAssociation(assoc.setAccessor, instance[assoc.name]);
+			saveAssociation(assoc.setAccessor, instance[assoc.name]);
 		};
 
 		for (i = 0; i < opts.one_associations.length; i++) {
-		    _saveOneAssociation(opts.one_associations[i]);
+			_saveOneAssociation(opts.one_associations[i]);
 		}
 
 
 		var _saveManyAssociation = function (assoc) {
-		    if (!instance.hasOwnProperty(assoc.name)) return;
-		    if (!Array.isArray(instance[assoc.name])) {
-		        instance[assoc.name] = [ instance[assoc.name] ];
-		    }
+			if (!instance.hasOwnProperty(assoc.name)) return;
+			if (!Array.isArray(instance[assoc.name])) {
+				instance[assoc.name] = [ instance[assoc.name] ];
+			}
 
-		    for (j = 0; j < instance[assoc.name].length; j++) {
-		        if (!instance[assoc.name][j].isInstance) {
-		            instance[assoc.name][j] = new assoc.model(instance[assoc.name][j]);
-		        }
-		    }
+			for (j = 0; j < instance[assoc.name].length; j++) {
+				if (!instance[assoc.name][j].isInstance) {
+					instance[assoc.name][j] = new assoc.model(instance[assoc.name][j]);
+				}
+			}
 
-		    return saveAssociation(assoc.setAccessor, instance[assoc.name]);
+			return saveAssociation(assoc.setAccessor, instance[assoc.name]);
 		};
 
 		for (i = 0; i < opts.many_associations.length; i++) {
@@ -342,8 +342,8 @@ function Instance(Model, opts) {
 		}
 
 		for (i = 0; i < opts.extra_info.id.length; i++) {
-		    conditions[opts.extra_info.id_prop[i]] = opts.extra_info.id[i];
-		    conditions[opts.extra_info.assoc_prop[i]] = opts.data[opts.id[i]];
+			conditions[opts.extra_info.id_prop[i]] = opts.extra_info.id[i];
+			conditions[opts.extra_info.assoc_prop[i]] = opts.data[opts.id[i]];
 		}
 
 		opts.driver.update(opts.extra_info.table, data, conditions, function (err) {

From 3d1d026c13f725d3dbf96f3a87e3faf18ef06889 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 12 Mar 2014 22:52:40 +1100
Subject: [PATCH 0944/1246] Don't auto save associations after autofetching
 them. Closes #398

---
 Readme.md                               |  4 ++
 lib/Associations/Many.js                | 15 +++++-
 lib/Instance.js                         | 35 +++++++++-----
 lib/Model.js                            | 13 ++++--
 test/integration/association-hasmany.js | 62 +++++++++++++++++++++++++
 5 files changed, 113 insertions(+), 16 deletions(-)

diff --git a/Readme.md b/Readme.md
index 06152fa2..9139786a 100755
--- a/Readme.md
+++ b/Readme.md
@@ -657,6 +657,10 @@ patient.removeDoctors(docs, function...) // Removes specified doctors from join
 
 doctor.getPatients(function..)
 etc...
+
+// You can also do:
+patient.doctors = [doc1, doc2];
+patient.save(...)
 ```
 
 To associate a doctor to a patient:
diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index cc9c996e..ccaecff5 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -227,6 +227,7 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 			}
 
 			association.model.find(conditions, options, cb);
+
 			return this;
 		},
 		enumerable: false,
@@ -409,6 +410,17 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 		enumerable: false,
 		writable: true
 	});
+
+	Object.defineProperty(Instance, association.name, {
+		get: function () {
+			return Instance.__opts.associations[association.name].value;
+		},
+		set: function (val) {
+			Instance.__opts.associations[association.name].changed = true;
+			Instance.__opts.associations[association.name].value   = val;
+		},
+		enumerable: true
+	});
 }
 
 function autoFetchInstance(Instance, association, opts, cb) {
@@ -426,7 +438,8 @@ function autoFetchInstance(Instance, association, opts, cb) {
 
 	Instance[association.getAccessor]({}, { autoFetchLimit: opts.autoFetchLimit - 1 }, function (err, Assoc) {
 		if (!err) {
-			Instance[association.name] = Assoc;
+			// Set this way to prevent setting 'changed' status
+			Instance.__opts.associations[association.name].value = Assoc;
 		}
 
 		return cb();
diff --git a/lib/Instance.js b/lib/Instance.js
index be1682ab..10bd1667 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -11,6 +11,7 @@ function Instance(Model, opts) {
 	opts.id = opts.id || "id";
 	opts.changes = (opts.is_new ? Object.keys(opts.data) : []);
 	opts.extrachanges = [];
+	opts.associations = {};
 
 	var instance_saving = false;
 	var events = {};
@@ -297,18 +298,18 @@ function Instance(Model, opts) {
 
 
 		var _saveManyAssociation = function (assoc) {
-			if (!instance.hasOwnProperty(assoc.name)) return;
-			if (!Array.isArray(instance[assoc.name])) {
-				instance[assoc.name] = [ instance[assoc.name] ];
-			}
+			var assocVal = instance[assoc.name];
+
+			if (!Array.isArray(assocVal)) return;
+			if (!opts.associations[assoc.name].changed) return;
 
-			for (j = 0; j < instance[assoc.name].length; j++) {
-				if (!instance[assoc.name][j].isInstance) {
-					instance[assoc.name][j] = new assoc.model(instance[assoc.name][j]);
+			for (j = 0; j < assocVal.length; j++) {
+				if (!assocVal[j].isInstance) {
+					assocVal[j] = new assoc.model(assocVal[j]);
 				}
 			}
 
-			return saveAssociation(assoc.setAccessor, instance[assoc.name]);
+			saveAssociation(assoc.setAccessor, assocVal);
 		};
 
 		for (i = 0; i < opts.many_associations.length; i++) {
@@ -619,6 +620,10 @@ function Instance(Model, opts) {
 		},
 		enumerable: false
 	});
+	Object.defineProperty(instance, "__opts", {
+		value: opts,
+		enumerable: false
+	});
 	Object.defineProperty(instance, "model", {
 		value: function (cb) {
 			return Model;
@@ -632,6 +637,9 @@ function Instance(Model, opts) {
 			break;
 		}
 	}
+
+	opts.setupAssociations(instance);
+
 	for (i = 0; i < opts.one_associations.length; i++) {
 	    var asc = opts.one_associations[i];
 
@@ -666,9 +674,14 @@ function Instance(Model, opts) {
 		}
 	}
 	for (i = 0; i < opts.many_associations.length; i++) {
-		if (opts.data.hasOwnProperty(opts.many_associations[i].name)) {
-			instance[opts.many_associations[i].name] = opts.data[opts.many_associations[i].name];
-			delete opts.data[opts.many_associations[i].name];
+		var aName = opts.many_associations[i].name;
+		opts.associations[aName] = {
+			changed: false, data: opts.many_associations[i]
+		};
+
+		if (Array.isArray(opts.data[aName])) {
+			instance[aName] = opts.data[aName];
+			delete opts.data[aName];
 		}
 	}
 
diff --git a/lib/Model.js b/lib/Model.js
index feab1488..c14c08a4 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -83,6 +83,13 @@ function Model(opts) {
 			autoFetchLimit : inst_opts.autoFetchLimit,
 			cascadeRemove  : inst_opts.cascadeRemove
 		};
+
+		var setupAssociations = function (instance) {
+			OneAssociation.extend(model, instance, opts.driver, one_associations, assoc_opts);
+			ManyAssociation.extend(model, instance, opts.driver, many_associations, assoc_opts, createInstance);
+			ExtendAssociation.extend(model, instance, opts.driver, extend_associations, assoc_opts);
+		};
+
 		var pending  = 2, create_err = null;
 		var instance = new Instance(model, {
 			uid                    : inst_opts.uid, // singleton unique id
@@ -101,7 +108,8 @@ function Model(opts) {
 			one_associations       : one_associations,
 			many_associations      : many_associations,
 			extend_associations    : extend_associations,
-			association_properties : association_properties
+			association_properties : association_properties,
+			setupAssociations      : setupAssociations
 		});
 		instance.on("ready", function (err) {
 			if (--pending > 0) {
@@ -115,9 +123,6 @@ function Model(opts) {
 		if (model_fields !== null) {
 			LazyLoad.extend(instance, model, opts.properties);
 		}
-		OneAssociation.extend(model, instance, opts.driver, one_associations, assoc_opts);
-		ManyAssociation.extend(model, instance, opts.driver, many_associations, assoc_opts, createInstance);
-		ExtendAssociation.extend(model, instance, opts.driver, extend_associations, assoc_opts);
 
 		OneAssociation.autoFetch(instance, one_associations, assoc_opts, function () {
 			ManyAssociation.autoFetch(instance, many_associations, assoc_opts, function () {
diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
index 737bda21..27b2a4ed 100644
--- a/test/integration/association-hasmany.js
+++ b/test/integration/association-hasmany.js
@@ -541,5 +541,67 @@ describe("hasMany", function () {
 				});
 			});
 		});
+
+		it("should not auto save associations which were autofetched", function (done) {
+			Pet.all(function (err, pets) {
+				should.not.exist(err);
+				should.equal(pets.length, 2);
+
+				Person.create({ name: 'Paul' }, function (err, paul) {
+					should.not.exist(err);
+
+					Person.one({ name: 'Paul' }, function (err, paul2) {
+						should.not.exist(err);
+						should.equal(paul2.pets.length, 0);
+
+						paul.setPets(pets, function (err) {
+							should.not.exist(err);
+
+							// reload paul to make sure we have 2 pets
+							Person.one({ name: 'Paul' }, function (err, paul) {
+								should.not.exist(err);
+								should.equal(paul.pets.length, 2);
+
+								// Saving paul2 should NOT auto save associations and hence delete
+								// the associations we just created.
+								paul2.save(function (err) {
+									should.not.exist(err);
+
+									// let's check paul - pets should still be associated
+									Person.one({ name: 'Paul' }, function (err, paul) {
+										should.not.exist(err);
+										should.equal(paul.pets.length, 2);
+
+										done();
+									});
+								});
+							});
+						});
+					});
+				});
+			});
+		});
+
+		it("should save associations set by the user", function (done) {
+			Person.one({ name: 'John' }, function (err, john) {
+				should.not.exist(err);
+				should.equal(john.pets.length, 2);
+
+				john.pets = [];
+
+				john.save(function (err) {
+					should.not.exist(err);
+
+					// reload john to make sure pets were deleted
+					Person.one({ name: 'John' }, function (err, john) {
+						should.not.exist(err);
+						should.equal(john.pets.length, 0);
+
+						done();
+					});
+				});
+			});
+		});
+
 	});
 });

From 23abc6b09b0b0740b07837a26c7f3eb02d0f0eb3 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 13 Mar 2014 17:40:37 +1100
Subject: [PATCH 0945/1246] Don't modify connection object. Closes #469

---
 lib/ORM.js                      |  6 ++++--
 test/integration/orm-exports.js | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index c303c477..5ad2385a 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -65,14 +65,16 @@ exports.connect = function (opts, cb) {
 	if (arguments.length === 0 || !opts) {
 		return ORM_Error(new ORMError("CONNECTION_URL_EMPTY", 'PARAM_MISMATCH'), cb);
 	}
-	if (typeof opts === "string") {
-		if (opts.replace(/\s+/, "").length === 0) {
+	if (typeof opts == 'string') {
+		if (opts.trim().length === 0) {
 			return ORM_Error(new ORMError("CONNECTION_URL_EMPTY", 'PARAM_MISMATCH'), cb);
 		}
 		opts = url.parse(opts, true);
 		for(var k in opts.query) {
 			opts[k] = opts.query[k];
 		}
+	} else if (typeof opts == 'object') {
+		opts = _.cloneDeep(opts);
 	}
 	if (!opts.database) {
 		// if (!opts.pathname) {
diff --git a/test/integration/orm-exports.js b/test/integration/orm-exports.js
index ab445a94..d7ed6a56 100644
--- a/test/integration/orm-exports.js
+++ b/test/integration/orm-exports.js
@@ -1,3 +1,4 @@
+var _        = require('lodash');
 var sqlite   = require('sqlite3');
 var pg       = require('pg');
 var should   = require('should');
@@ -138,6 +139,25 @@ describe("ORM.connect()", function () {
 		});
 	});
 
+	it("should not modify connection opts", function (done) {
+		var opts = {
+			protocol : 'mysql',
+			user     : 'notauser',
+			password : "wrong password",
+			query    : { pool: true, debug: true }
+		};
+
+		var expected = JSON.stringify(opts);
+
+		ORM.connect(opts, function (err, db) {
+			should.equal(
+				JSON.stringify(opts),
+				expected
+			);
+			done();
+		});
+	});
+
 	it("should emit no error if ok", function (done) {
 		var db = ORM.connect(common.getConnectionString());
 

From 9eba427a721601638b4759085049e7b37da152cf Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 13 Mar 2014 19:28:29 +1100
Subject: [PATCH 0946/1246] Don't fire afterSave hooks when saving with no
 changes. Closes #457

---
 lib/Instance.js          | 18 +++++++++++-------
 test/integration/hook.js | 23 ++++++++++++++++++++---
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 10bd1667..1e6dc813 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -222,11 +222,15 @@ function Instance(Model, opts) {
 						finish();
 					}, false);
 				} else {
-					saveAssociations(function (err) {
-						runAfterSaveActions(function () {
-							if (err) return cb(err);
+					saveAssociations(function (err, assocSaved) {
+						if (saved || assocSaved) {
+							runAfterSaveActions(function () {
+								if (err) return cb(err);
+								finish();
+							}, false, err);
+						} else {
 							finish();
-						}, false, err);
+						}
 					});
 				}
 			}
@@ -261,11 +265,11 @@ function Instance(Model, opts) {
 					if (errored) return;
 
 					errored = true;
-					return cb(err);
+					return cb(err, true);
 				}
 
 				if (--pending === 0) {
-					return cb();
+					return cb(null, true);
 				}
 			});
 		};
@@ -317,7 +321,7 @@ function Instance(Model, opts) {
 		}
 
 		if (--pending === 0) {
-			return cb();
+			return cb(null, false);
 		}
 	};
 	var saveInstanceExtra = function (cb) {
diff --git a/test/integration/hook.js b/test/integration/hook.js
index 2db7299b..28c80700 100644
--- a/test/integration/hook.js
+++ b/test/integration/hook.js
@@ -356,13 +356,30 @@ describe("Hook", function() {
 	describe("afterSave", function () {
 		beforeEach(setup());
 
-		it("should trigger after saving an instance", function (done) {
-			Person.create([{ name: "John Doe" }], function () {
+		it("should trigger after creating an instance", function (done) {
+			Person.create({ name: "John Doe" }, function (err, john) {
+				should.not.exist(err);
+
 				triggeredHooks.afterSave.should.be.a("number");
 				triggeredHooks.beforeSave.should.be.a("number");
 				triggeredHooks.afterSave.should.not.be.below(triggeredHooks.beforeSave);
+				done();
+			});
+		});
 
-				return done();
+		it("should trigger after saving an instance", function (done) {
+			Person.create({ name: "John Doe" }, function (err, john) {
+				should.not.exist(err);
+
+				john.name = "John Doe 2";
+
+				triggeredHooks = {};
+				john.save(function (err) {
+					triggeredHooks.afterSave.should.be.a("number");
+					triggeredHooks.beforeSave.should.be.a("number");
+					triggeredHooks.afterSave.should.not.be.below(triggeredHooks.beforeSave);
+					done();
+				});
 			});
 		});
 

From ba1dea53d50c877e0c9750ee5841ef19b1acc412 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 13 Mar 2014 19:48:25 +1100
Subject: [PATCH 0947/1246] Update chain remove readme. See #468

---
 Readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Readme.md b/Readme.md
index 9139786a..550084aa 100755
--- a/Readme.md
+++ b/Readme.md
@@ -408,6 +408,7 @@ Person.find({ surname: "Doe" }).count(function (err, people) {
 ```
 
 Also available is the option to remove the selected items.
+Note that a chained remove will not run any hooks.
 
 ```js
 Person.find({ surname: "Doe" }).remove(function (err) {

From cdc3356c1ff68d630233c63b179b894522412220 Mon Sep 17 00:00:00 2001
From: charlie <charlie@langley.(none)>
Date: Sat, 15 Feb 2014 12:55:19 +0100
Subject: [PATCH 0948/1246] Bugfix: when querying a reverse association, one of
 the two columns in the 'JOIN...ON' clause was not the right one (fixes #446)

---
 lib/Associations/One.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index 63cda40a..aeeaf1cf 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -94,7 +94,7 @@ exports.prepare = function (Model, associations, association_properties, model_f
 			}
 
 			options.__merge = {
-				from  : { table: association.model.table, field: association.model.id },
+				from  : { table: association.model.table, field: association.reversed ? Object.keys(association.field) : association.model.id },
 				to    : { table: Model.table, field: Object.keys(association.field) },
 				where : [ association.model.table, conditions ],
 				table : Model.table

From 465f2055d6598653f3d30d129d2f95130030fa4c Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 13 Mar 2014 20:06:32 +1100
Subject: [PATCH 0949/1246] Lint

---
 .../integration/association-hasone-reverse.js | 392 +++++++++---------
 1 file changed, 196 insertions(+), 196 deletions(-)

diff --git a/test/integration/association-hasone-reverse.js b/test/integration/association-hasone-reverse.js
index 96e92401..36989fde 100644
--- a/test/integration/association-hasone-reverse.js
+++ b/test/integration/association-hasone-reverse.js
@@ -6,204 +6,204 @@ var common = require('../common');
 var _ = require('lodash');
 
 describe("hasOne", function () {
-    var db = null;
-    var Person = null;
-
-    var setup = function () {
-        return function (done) {
-            Person = db.define('person', {
-                name: String
-            });
-            Pet = db.define('pet', {
-                name: String
-            });
-            Person.hasOne('pet', Pet, {
-                reverse: 'owner',
-                field: 'pet_id'
-            });
-
-            return helper.dropSync([Person, Pet], function () {
-                async.parallel([
+	var db = null;
+	var Person = null;
+
+	var setup = function () {
+		return function (done) {
+			Person = db.define('person', {
+				name: String
+			});
+			Pet = db.define('pet', {
+				name: String
+			});
+			Person.hasOne('pet', Pet, {
+				reverse: 'owner',
+				field: 'pet_id'
+			});
+
+			return helper.dropSync([Person, Pet], function () {
+				async.parallel([
 					Person.create.bind(Person, { name: "John Doe" }),
 					Person.create.bind(Person, { name: "Jane Doe" }),
 					Pet.create.bind(Pet, { name: "Deco" }),
 					Pet.create.bind(Pet, { name: "Fido" }),
-                ], done);
-            });
-        };
-    };
-
-    before(function (done) {
-        helper.connect(function (connection) {
-            db = connection;
-            done();
-        });
-    });
-
-    describe("reverse", function () {
-        before(setup());
-
-        it("should create methods in both models", function (done) {
-            var person = Person(1);
-            var pet = Pet(1);
-
-            person.getPet.should.be.a("function");
-            person.setPet.should.be.a("function");
-            person.removePet.should.be.a("function");
-            person.hasPet.should.be.a("function");
-
-            pet.getOwner.should.be.a("function");
-            pet.setOwner.should.be.a("function");
-            pet.hasOwner.should.be.a("function");
-
-            return done();
-        });
-
-        it("should be able to fetch model from reverse model", function (done) {
-            Person.find({ name: "John Doe" }).first(function (err, John) {
-                Pet.find({ name: "Deco" }).first(function (err, Deco) {
-                    Deco.hasOwner(function (err, has_owner) {
-                        should.not.exist(err);
-                        has_owner.should.be.false;
-
-                        Deco.setOwner(John, function (err) {
-                            should.not.exist(err);
-
-                            Deco.getOwner(function (err, JohnCopy) {
-                                should.not.exist(err);
-                                should(Array.isArray(JohnCopy));
-                                John.should.eql(JohnCopy[0]);
-
-                                return done();
-                            });
-                        });
-                    });
-                });
-            });
-        });
-
-        it("should be able to set an array of people as the owner", function (done) {
-            Person.find({ name: ["John Doe", "Jane Doe"] }, function (err, owners) {
-                Pet.find({ name: "Fido" }).first(function (err, Fido) {
-                    Fido.hasOwner(function (err, has_owner) {
-                        should.not.exist(err);
-                        has_owner.should.be.false;
-
-                        Fido.setOwner(owners, function (err) {
-                            should.not.exist(err);
-
-                            Fido.getOwner(function (err, ownersCopy) {
-                                should.not.exist(err);
-                                should(Array.isArray(owners));
-                                owners.length.should.equal(2);
-
-                                if (owners[0] == ownersCopy[0]) {
-                                    owners[0].should.eql(ownersCopy[0]);
-                                    owners[1].should.eql(ownersCopy[1]);
-                                } else {
-                                    owners[0].should.eql(ownersCopy[1]);
-                                    owners[1].should.eql(ownersCopy[0]);
-                                }
-
-                                return done();
-                            });
-                        });
-                    });
-                });
-            });
-        });
-    });
-
-
-    describe("reverse find", function () {
-        it("should be able to find given an association id", function (done) {
-            common.retry(setup(), function (done) {
-                Person.find({ name: "John Doe" }).first(function (err, John) {
-                    should.not.exist(err);
-                    should.exist(John);
-                    Pet.find({ name: "Deco" }).first(function (err, Deco) {
-                        should.not.exist(err);
-                        should.exist(Deco);
-                        Deco.hasOwner(function (err, has_owner) {
-                            should.not.exist(err);
-                            has_owner.should.be.false;
-
-                            Deco.setOwner(John, function (err) {
-                                should.not.exist(err);
-
-                                Person.find({ pet_id: Deco[Pet.id[0]] }).first(function (err, owner) {
-                                    should.not.exist(err);
-                                    should.exist(owner);
-                                    should.equal(owner.name, John.name);
-                                    done();
-                                });
-
-                            });
-                        });
-                    });
-                });
-            }, 3, done);
-        });
-
-        it("should be able to find given an association instance", function (done) {
-            common.retry(setup(), function (done) {
-                Person.find({ name: "John Doe" }).first(function (err, John) {
-                    should.not.exist(err);
-                    should.exist(John);
-                    Pet.find({ name: "Deco" }).first(function (err, Deco) {
-                        should.not.exist(err);
-                        should.exist(Deco);
-                        Deco.hasOwner(function (err, has_owner) {
-                            should.not.exist(err);
-                            has_owner.should.be.false;
-
-                            Deco.setOwner(John, function (err) {
-                                should.not.exist(err);
-
-                                Person.find({ pet: Deco }).first(function (err, owner) {
-                                    should.not.exist(err);
-                                    should.exist(owner);
-                                    should.equal(owner.name, John.name);
-                                    done();
-                                });
-
-                            });
-                        });
-                    });
-                });
-            }, 3, done);
-        });
-
-        it("should be able to find given a number of association instances with a single primary key", function (done) {
-            common.retry(setup(), function (done) {
-                Person.find({ name: "John Doe" }).first(function (err, John) {
-                    should.not.exist(err);
-                    should.exist(John);
-                    Pet.all(function (err, pets) {
-                        should.not.exist(err);
-                        should.exist(pets);
-                        should.equal(pets.length, 2);
-
-                        pets[0].hasOwner(function (err, has_owner) {
-                            should.not.exist(err);
-                            has_owner.should.be.false;
-
-                            pets[0].setOwner(John, function (err) {
-                                should.not.exist(err);
-
-                                Person.find({ pet: pets }, function (err, owners) {
-                                    should.not.exist(err);
-                                    should.exist(owners);
-                                    owners.length.should.equal(1);
-
-                                    should.equal(owners[0].name, John.name);
-                                    done();
-                                });
-                            });
-                        });
-                    });
-                });
-            }, 3, done);
-        });
-    });
+				], done);
+			});
+		};
+	};
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+			done();
+		});
+	});
+
+	describe("reverse", function () {
+		before(setup());
+
+		it("should create methods in both models", function (done) {
+			var person = Person(1);
+			var pet = Pet(1);
+
+			person.getPet.should.be.a("function");
+			person.setPet.should.be.a("function");
+			person.removePet.should.be.a("function");
+			person.hasPet.should.be.a("function");
+
+			pet.getOwner.should.be.a("function");
+			pet.setOwner.should.be.a("function");
+			pet.hasOwner.should.be.a("function");
+
+			return done();
+		});
+
+		it("should be able to fetch model from reverse model", function (done) {
+			Person.find({ name: "John Doe" }).first(function (err, John) {
+				Pet.find({ name: "Deco" }).first(function (err, Deco) {
+					Deco.hasOwner(function (err, has_owner) {
+						should.not.exist(err);
+						has_owner.should.be.false;
+
+						Deco.setOwner(John, function (err) {
+							should.not.exist(err);
+
+							Deco.getOwner(function (err, JohnCopy) {
+								should.not.exist(err);
+								should(Array.isArray(JohnCopy));
+								John.should.eql(JohnCopy[0]);
+
+								return done();
+							});
+						});
+					});
+				});
+			});
+		});
+
+		it("should be able to set an array of people as the owner", function (done) {
+			Person.find({ name: ["John Doe", "Jane Doe"] }, function (err, owners) {
+				Pet.find({ name: "Fido" }).first(function (err, Fido) {
+					Fido.hasOwner(function (err, has_owner) {
+						should.not.exist(err);
+						has_owner.should.be.false;
+
+						Fido.setOwner(owners, function (err) {
+							should.not.exist(err);
+
+							Fido.getOwner(function (err, ownersCopy) {
+								should.not.exist(err);
+								should(Array.isArray(owners));
+								owners.length.should.equal(2);
+
+								if (owners[0] == ownersCopy[0]) {
+									owners[0].should.eql(ownersCopy[0]);
+									owners[1].should.eql(ownersCopy[1]);
+								} else {
+									owners[0].should.eql(ownersCopy[1]);
+									owners[1].should.eql(ownersCopy[0]);
+								}
+
+								return done();
+							});
+						});
+					});
+				});
+			});
+		});
+	});
+
+
+	describe("reverse find", function () {
+		it("should be able to find given an association id", function (done) {
+			common.retry(setup(), function (done) {
+				Person.find({ name: "John Doe" }).first(function (err, John) {
+					should.not.exist(err);
+					should.exist(John);
+					Pet.find({ name: "Deco" }).first(function (err, Deco) {
+						should.not.exist(err);
+						should.exist(Deco);
+						Deco.hasOwner(function (err, has_owner) {
+							should.not.exist(err);
+							has_owner.should.be.false;
+
+							Deco.setOwner(John, function (err) {
+								should.not.exist(err);
+
+								Person.find({ pet_id: Deco[Pet.id[0]] }).first(function (err, owner) {
+									should.not.exist(err);
+									should.exist(owner);
+									should.equal(owner.name, John.name);
+									done();
+								});
+
+							});
+						});
+					});
+				});
+			}, 3, done);
+		});
+
+		it("should be able to find given an association instance", function (done) {
+			common.retry(setup(), function (done) {
+				Person.find({ name: "John Doe" }).first(function (err, John) {
+					should.not.exist(err);
+					should.exist(John);
+					Pet.find({ name: "Deco" }).first(function (err, Deco) {
+						should.not.exist(err);
+						should.exist(Deco);
+						Deco.hasOwner(function (err, has_owner) {
+							should.not.exist(err);
+							has_owner.should.be.false;
+
+							Deco.setOwner(John, function (err) {
+								should.not.exist(err);
+
+								Person.find({ pet: Deco }).first(function (err, owner) {
+									should.not.exist(err);
+									should.exist(owner);
+									should.equal(owner.name, John.name);
+									done();
+								});
+
+							});
+						});
+					});
+				});
+			}, 3, done);
+		});
+
+		it("should be able to find given a number of association instances with a single primary key", function (done) {
+			common.retry(setup(), function (done) {
+				Person.find({ name: "John Doe" }).first(function (err, John) {
+					should.not.exist(err);
+					should.exist(John);
+					Pet.all(function (err, pets) {
+						should.not.exist(err);
+						should.exist(pets);
+						should.equal(pets.length, 2);
+
+						pets[0].hasOwner(function (err, has_owner) {
+							should.not.exist(err);
+							has_owner.should.be.false;
+
+							pets[0].setOwner(John, function (err) {
+								should.not.exist(err);
+
+								Person.find({ pet: pets }, function (err, owners) {
+									should.not.exist(err);
+									should.exist(owners);
+									owners.length.should.equal(1);
+
+									should.equal(owners[0].name, John.name);
+									done();
+								});
+							});
+						});
+					});
+				});
+			}, 3, done);
+		});
+	});
 });

From ae7a5623b4319ba8ac69eac1d20935192e141287 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 13 Mar 2014 20:54:15 +1100
Subject: [PATCH 0950/1246] Fix reverse has one association findBy*. Closes
 #450

---
 lib/Associations/One.js                       |  4 +-
 .../integration/association-hasone-reverse.js | 49 ++++++++++++++++++-
 2 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index aeeaf1cf..426acb1e 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -94,8 +94,8 @@ exports.prepare = function (Model, associations, association_properties, model_f
 			}
 
 			options.__merge = {
-				from  : { table: association.model.table, field: association.reversed ? Object.keys(association.field) : association.model.id },
-				to    : { table: Model.table, field: Object.keys(association.field) },
+				from  : { table: association.model.table, field: (association.reversed ? Object.keys(association.field) : association.model.id) },
+				to    : { table: Model.table, field: (association.reversed ? association.model.id : Object.keys(association.field) ) },
 				where : [ association.model.table, conditions ],
 				table : Model.table
 			};
diff --git a/test/integration/association-hasone-reverse.js b/test/integration/association-hasone-reverse.js
index 36989fde..0e58dbec 100644
--- a/test/integration/association-hasone-reverse.js
+++ b/test/integration/association-hasone-reverse.js
@@ -112,8 +112,55 @@ describe("hasOne", function () {
 				});
 			});
 		});
-	});
 
+		// broken in mongo
+		if (common.protocol() != "mongodb") {
+			describe("findBy()", function () {
+				before(setup());
+
+				before(function (done) {
+					Person.one({ name: "Jane Doe" }, function (err, jane) {
+						Pet.one({ name: "Deco" }, function (err, deco) {
+							deco.setOwner(jane, function (err) {
+								should.not.exist(err);
+								done();
+							});
+						});
+					});
+				});
+
+				it("should throw if no conditions passed", function (done) {
+					(function () {
+						Pet.findByOwner(function () {});
+					}).should.throw();
+
+					return done();
+				});
+
+				it("should lookup reverse Model based on associated model properties", function (done) {
+					Pet.findByOwner({
+						name: "Jane Doe"
+					}, function (err, pets) {
+						should.not.exist(err);
+						should.equal(Array.isArray(pets), true);
+						should.equal(pets.length, 1);
+						should.equal(pets[0].name, 'Deco');
+
+						return done();
+					});
+				});
+
+				it("should return a ChainFind if no callback passed", function (done) {
+					var ChainFind = Pet.findByOwner({
+						name: "John Doe"
+					});
+					ChainFind.run.should.be.a("function");
+
+					return done();
+				});
+			});
+		}
+	});
 
 	describe("reverse find", function () {
 		it("should be able to find given an association id", function (done) {

From 7f3aa4fee220bf84f90f6579d2dd9218856b9ce3 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 13 Mar 2014 21:37:15 +1100
Subject: [PATCH 0951/1246] Cast hasMany extra properties with types like
 'Object'. Closes #466

---
 lib/Associations/Many.js                      |  6 +++++-
 test/integration/association-hasmany-extra.js | 10 ++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index ccaecff5..5ee39fc5 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -332,7 +332,11 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 							var data = {};
 
 							for (var k in opts) {
-								data[k] = opts[k];
+								if (k in association.props && Driver.propertyToValue) {
+									data[k] = Driver.propertyToValue(opts[k], association.props[k]);
+								} else {
+									data[k] = opts[k];
+								}
 							}
 
 							if (Driver.hasMany) {
diff --git a/test/integration/association-hasmany-extra.js b/test/integration/association-hasmany-extra.js
index 9f312bb0..c3d377a4 100644
--- a/test/integration/association-hasmany-extra.js
+++ b/test/integration/association-hasmany-extra.js
@@ -19,7 +19,8 @@ describe("hasMany extra properties", function() {
 				name    : String
 			});
 			Person.hasMany('pets', Pet, {
-				since   : Date
+				since   : Date,
+				data    : Object
 			});
 
 			return helper.dropSync([ Person, Pet ], done);
@@ -45,7 +46,9 @@ describe("hasMany extra properties", function() {
 				}, {
 					name : "Mutt"
 				}], function (err, pets) {
-					people[0].addPets(pets, { since : new Date() }, function (err) {
+					var data = { adopted: true };
+
+					people[0].addPets(pets, { since : new Date(), data: data }, function (err) {
 						should.equal(err, null);
 
 						Person.find({ name: "John" }, { autoFetch : true }).first(function (err, John) {
@@ -62,6 +65,9 @@ describe("hasMany extra properties", function() {
 							John.pets[0].extra.should.have.property("since");
 							should(John.pets[0].extra.since instanceof Date);
 
+							should.equal(typeof John.pets[0].extra.data, 'object');
+							should.equal(JSON.stringify(data), JSON.stringify(John.pets[0].extra.data));
+
 							return done();
 						});
 					});

From f8e315834e32285814fd845eb4b1c61f575f9256 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 13 Mar 2014 22:10:23 +1100
Subject: [PATCH 0952/1246] Update changelog

---
 Changelog.md | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 30a24e84..31bd7efd 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,36 @@
 ### v2.2.0 - (to do, in future)
 - Fixes error code spelling: `PARAM_MISSMATCH` -> `PARAM_MISMATCH`
 
+### v2.1.4 - [DATE HERE]
+- Fix TypeScript module declaration (#362)
+- Fixes reversed hasOne.getAccessor when called without callback (#267)
+- Fixes default pool value (#366)
+- Fixes erroneous misformatting of top-level $and/$or clauses (#365)
+- Fix and improve TypeScript declaration (#369)
+- Use local as default timezone, pass timezone option to Query (#325)
+- Postgres: always save object as Buffer (#378)
+- Postgres: fix queries for prop create index, and for primary keys (#377)
+- Adds partial table sync (#383)
+- Typo in property definition (#382)
+- Implement eager loading - huge performance win (#393)
+- Make model methods defined by `defineProperty` writable so they can be mocked (#399)
+- Allow composite keys when calling remove. (#345, #358)
+- Fixed bug on like expression using MongoDB (#403)
+- Fixes pool and debug settings always true (#405)
+- Update express middleware for express.io (#413)
+- Allow HasMany.setAccessor to take an empty array
+- Fix DML if object value is null, JSON.stringify return string 'null' (#380)
+- Correct sqlite log statement (#452)
+- Make association methods writable so they can be mocked (#451)
+- Throw ORM errors rather than generic ones (#455)
+- Fix sqlite3 driver with config object on windows (#461)
+- Fix 'No associations defined' error (#398)
+- Don't modify connection object (#469)
+- Don't fire afterSave hooks when calling save with no changes (#457)
+- Fix reverse has one association findBy* (#450)
+- Auto cast hasMany extra properties with types like 'Object' (#466)
+- Add example full featured express app - AnonTXT
+
 ### v2.1.3 - 14 Oct 2013
 
 - Fixes connection strings being parsed by url module to don't forget about port :) (#355)

From 88136427426d9d6bb196d81599782682fef0cb63 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 17 Mar 2014 21:42:02 +1100
Subject: [PATCH 0953/1246] Bump sql-ddl-sync version. #473

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8100d1ad..799a159b 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
 	"dependencies": {
 		"enforce"      : "0.1.2",
 		"sql-query"    : "0.1.16",
-		"sql-ddl-sync" : "git://github.com/dresende/node-sql-ddl-sync.git#v0.2.0",
+		"sql-ddl-sync" : "git://github.com/dresende/node-sql-ddl-sync.git#v0.2.1",
 		"hat"          : "0.0.3",
 		"lodash"       : "2.4.1"
 	},

From aa2d269633cd5adf145088604f3126f7a6568e2d Mon Sep 17 00:00:00 2001
From: FranciZ <franci@sillyconalley.com>
Date: Tue, 18 Mar 2014 08:43:43 +0100
Subject: [PATCH 0954/1246] Update index.js

---
 examples/anontxt/app/models/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/anontxt/app/models/index.js b/examples/anontxt/app/models/index.js
index b9684f70..3d4b0fe3 100644
--- a/examples/anontxt/app/models/index.js
+++ b/examples/anontxt/app/models/index.js
@@ -13,7 +13,7 @@ function setup(db, cb) {
 module.exports = function (cb) {
   if (connection) return cb(null, connection);
 
-  orm.connect(settings.database, function (err, db) {
+  connection = orm.connect(settings.database, function (err, db) {
     if (err) return cb(err);
 
     db.settings.set('instance.returnAllErrors', true);

From 31944b4d2b8395ed5d05a7afd4d2c778014e5aaa Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 18 Mar 2014 19:31:45 +1100
Subject: [PATCH 0955/1246] Bump sql-ddl-sync version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 799a159b..01931d49 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
 	"dependencies": {
 		"enforce"      : "0.1.2",
 		"sql-query"    : "0.1.16",
-		"sql-ddl-sync" : "git://github.com/dresende/node-sql-ddl-sync.git#v0.2.1",
+		"sql-ddl-sync" : "git://github.com/dresende/node-sql-ddl-sync.git#v0.2.2",
 		"hat"          : "0.0.3",
 		"lodash"       : "2.4.1"
 	},

From f4862a1ab5fa2d565a8907be6088d4a8f5c86602 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 18 Mar 2014 20:55:10 +1100
Subject: [PATCH 0956/1246] Bump sql-ddl-sync version - disables partial table
 sync.

---
 Changelog.md | 1 -
 package.json | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 31bd7efd..1803ff2b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -10,7 +10,6 @@
 - Use local as default timezone, pass timezone option to Query (#325)
 - Postgres: always save object as Buffer (#378)
 - Postgres: fix queries for prop create index, and for primary keys (#377)
-- Adds partial table sync (#383)
 - Typo in property definition (#382)
 - Implement eager loading - huge performance win (#393)
 - Make model methods defined by `defineProperty` writable so they can be mocked (#399)
diff --git a/package.json b/package.json
index 01931d49..fd097ecb 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
 	"dependencies": {
 		"enforce"      : "0.1.2",
 		"sql-query"    : "0.1.16",
-		"sql-ddl-sync" : "git://github.com/dresende/node-sql-ddl-sync.git#v0.2.2",
+		"sql-ddl-sync" : "git://github.com/dresende/node-sql-ddl-sync.git#v0.2.3",
 		"hat"          : "0.0.3",
 		"lodash"       : "2.4.1"
 	},

From 5f8f74fecdbf04e181e9d5a7f8e288eb1f45d4e9 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 18 Mar 2014 21:08:27 +1100
Subject: [PATCH 0957/1246] Allow closing mysql pooled connection. Closes #475

---
 lib/Drivers/DML/mysql.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index e00679a6..3522c49d 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -71,10 +71,10 @@ Driver.prototype.reconnect = function (cb, connection) {
 
 Driver.prototype.close = function (cb) {
 	if (this.opts.pool) {
-		if (typeof cb == "function") cb();
-		return;
+		this.db.pool.end(cb);
+	} else {
+		this.db.end(cb);
 	}
-	this.db.end(cb);
 };
 
 Driver.prototype.getQuery = function () {

From b3705a7b7f44c5c0030b010b89187c2b0e2f3f2c Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 19 Mar 2014 08:40:58 +1100
Subject: [PATCH 0958/1246] Add date to changelog

---
 Changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 1803ff2b..c18e79d7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,7 +1,7 @@
 ### v2.2.0 - (to do, in future)
 - Fixes error code spelling: `PARAM_MISSMATCH` -> `PARAM_MISMATCH`
 
-### v2.1.4 - [DATE HERE]
+### v2.1.4 - 19 Mar 2014
 - Fix TypeScript module declaration (#362)
 - Fixes reversed hasOne.getAccessor when called without callback (#267)
 - Fixes default pool value (#366)

From 305b7bcf6fef0f55f212917c348875fcdfb9a556 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 20 Mar 2014 10:02:47 +1100
Subject: [PATCH 0959/1246] Mention promise support

#410
---
 Readme.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Readme.md b/Readme.md
index 550084aa..2901a2ec 100755
--- a/Readme.md
+++ b/Readme.md
@@ -81,6 +81,11 @@ orm.connect("mysql://username:password@host/database", function (err, db) {
 });
 ```
 
+## Promises
+
+You can use the [promise enabled wrapper library](https://github.com/rafaelkaufmann/q-orm).
+
+
 ## Express
 
 If you're using Express, you might want to use the simple middleware to integrate more easily.

From b7afe8eb9dda0025c1189cc9f79b3d0f7355a2b2 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 20 Mar 2014 21:16:21 +1100
Subject: [PATCH 0960/1246] Save connection

---
 examples/anontxt/app/models/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/examples/anontxt/app/models/index.js b/examples/anontxt/app/models/index.js
index 3d4b0fe3..2944922e 100644
--- a/examples/anontxt/app/models/index.js
+++ b/examples/anontxt/app/models/index.js
@@ -13,9 +13,10 @@ function setup(db, cb) {
 module.exports = function (cb) {
   if (connection) return cb(null, connection);
 
-  connection = orm.connect(settings.database, function (err, db) {
+  orm.connect(settings.database, function (err, db) {
     if (err) return cb(err);
 
+    connection = db;
     db.settings.set('instance.returnAllErrors', true);
     setup(db, cb);
   });

From e62e09c511c3eec8a56e698d8161d2ebad9f0d41 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 8 Apr 2014 20:53:37 +1000
Subject: [PATCH 0961/1246] Fix duplicate key indices - #484

---
 Changelog.md           | 3 +++
 lib/Drivers/DDL/SQL.js | 7 -------
 package.json           | 4 ++--
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c18e79d7..de0398f5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,9 @@
 ### v2.2.0 - (to do, in future)
 - Fixes error code spelling: `PARAM_MISSMATCH` -> `PARAM_MISMATCH`
 
+### v2.1.5 - 08 Apr 2013
+- Don't create indexes for primary/composite keys; they are created automatically (#484)
+
 ### v2.1.4 - 19 Mar 2014
 - Fix TypeScript module declaration (#362)
 - Fixes reversed hasOne.getAccessor when called without callback (#267)
diff --git a/lib/Drivers/DDL/SQL.js b/lib/Drivers/DDL/SQL.js
index 38202c40..ad4456e3 100644
--- a/lib/Drivers/DDL/SQL.js
+++ b/lib/Drivers/DDL/SQL.js
@@ -18,13 +18,6 @@ exports.sync = function (opts, cb) {
 			sync.defineType(k, this.customTypes[k]);
 		}
 	}
-	for (var k in opts.allProperties) {
-		if (typeof opts.id == "string" && opts.id == k) {
-			opts.allProperties[k].index = [ opts.table + "_pkey" ];
-		} else if (Array.isArray(opts.id) && opts.id.indexOf(k) >= 0) {
-			opts.allProperties[k].index = [ opts.table + "_pkey" ];
-		}
-	}
 
 	sync.defineCollection(opts.table, opts.allProperties);
 
diff --git a/package.json b/package.json
index fd097ecb..5dfd9826 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.4",
+	"version"     : "2.1.5",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",
@@ -38,7 +38,7 @@
 	"dependencies": {
 		"enforce"      : "0.1.2",
 		"sql-query"    : "0.1.16",
-		"sql-ddl-sync" : "git://github.com/dresende/node-sql-ddl-sync.git#v0.2.3",
+		"sql-ddl-sync" : "git://github.com/dresende/node-sql-ddl-sync.git#v0.2.4",
 		"hat"          : "0.0.3",
 		"lodash"       : "2.4.1"
 	},

From f19449ae4a8e3e0beba65553b83de461c508ae37 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 15 Apr 2014 09:01:02 +1000
Subject: [PATCH 0962/1246] Mention MariaDB #486

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 2901a2ec..56a6e0c2 100755
--- a/Readme.md
+++ b/Readme.md
@@ -22,7 +22,7 @@ npm test
 
 ## DBMS Support
 
-- MySQL
+- MySQL & MariaDB
 - PostgreSQL
 - Amazon Redshift
 - SQLite

From 0baccc2196c2a9cddf0682d6f2e86c3bd0231288 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Fri, 18 Apr 2014 15:46:30 +1000
Subject: [PATCH 0963/1246] Update Readme.md

---
 examples/anontxt/Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/anontxt/Readme.md b/examples/anontxt/Readme.md
index 84c3dec9..28d465b3 100644
--- a/examples/anontxt/Readme.md
+++ b/examples/anontxt/Readme.md
@@ -11,7 +11,7 @@ npm install
 
 # You may work off master, or checkout a different version if master is broken:
 git tag
-git checkout v2.1.3
+git checkout v2.1.4
 ```
 
 **Setup AnonTXT**

From 5e6c480f0aff91acb0a2c69fd1b4b70b4eeca044 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 23 Apr 2014 15:43:14 +1000
Subject: [PATCH 0964/1246] Add ChainFind.omit

---
 Changelog.md                         |  5 ++++-
 Readme.md                            |  1 +
 lib/ChainFind.js                     | 11 +++++++++++
 package.json                         |  2 +-
 test/integration/model-find-chain.js | 28 ++++++++++++++++++++++++++++
 5 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index de0398f5..9e8af1b8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,7 +1,10 @@
 ### v2.2.0 - (to do, in future)
 - Fixes error code spelling: `PARAM_MISSMATCH` -> `PARAM_MISMATCH`
 
-### v2.1.5 - 08 Apr 2013
+### v2.1.6 - 23 Apr 2014
+- Add '.omit' to chain find - opposite of '.only'
+
+### v2.1.5 - 08 Apr 2014
 - Don't create indexes for primary/composite keys; they are created automatically (#484)
 
 ### v2.1.4 - 19 Mar 2014
diff --git a/Readme.md b/Readme.md
index 56a6e0c2..e057e8ab 100755
--- a/Readme.md
+++ b/Readme.md
@@ -388,6 +388,7 @@ Person.find({ surname: "Doe" }).limit(3).offset(2).only("name", "surname").run(f
     // returning only 'name' and 'surname' properties
 });
 ```
+If you want to skip just one or two properties, you can call `.omit()` instead of `.only`.
 
 Chaining allows for more complicated queries. For example, we can search by specifying custom SQL:
 ```js
diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index a6e6f66d..6f1dc4ef 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -37,6 +37,17 @@ function ChainFind(Model, opts) {
 			}
 			return this;
 		},
+		omit: function () {
+			var omit = null;
+
+			if (arguments.length && Array.isArray(arguments[0])) {
+				omit = arguments[0];
+			} else {
+				omit = Array.prototype.slice.apply(arguments);
+			}
+			this.only(_.difference(Object.keys(Model.properties), omit));
+			return this;
+		},
 		limit: function (limit) {
 			opts.limit = limit;
 			return this;
diff --git a/package.json b/package.json
index 5dfd9826..251759f5 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.5",
+	"version"     : "2.1.6",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",
diff --git a/test/integration/model-find-chain.js b/test/integration/model-find-chain.js
index 1bc44b09..b0f1fe76 100644
--- a/test/integration/model-find-chain.js
+++ b/test/integration/model-find-chain.js
@@ -208,6 +208,34 @@ describe("Model.find() chaining", function() {
 		});
 	});
 
+	describe("omit", function () {
+		before(setup());
+
+		it("('property', ...) should not get these properties", function (done) {
+			Person.find().omit("age", "surname").order("-age").run(function (err, instances) {
+				should.equal(err, null);
+				instances.should.have.property("length", 3);
+				instances[0].should.have.property("age", null);
+				instances[0].should.have.property("surname", null);
+				instances[0].should.have.property("name", "Jane");
+
+				return done();
+			});
+		});
+
+		it("(['property', ...]) should not get these properties", function (done) {
+			Person.find().omit(["age", "surname"]).order("-age").run(function (err, instances) {
+				should.equal(err, null);
+				instances.should.have.property("length", 3);
+				instances[0].should.have.property("age", null);
+				instances[0].should.have.property("surname", null);
+				instances[0].should.have.property("name", "Jane");
+
+				return done();
+			});
+		});
+	});
+
 	describe(".count()", function () {
 		before(setup());
 

From 44d432b2b9a021fd0118e26830663db554603ab5 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Fri, 25 Apr 2014 10:54:46 +1000
Subject: [PATCH 0965/1246] Add explicit integer type

---
 Changelog.md                             |  4 ++++
 Readme.md                                |  2 +-
 lib/Model.js                             |  2 +-
 lib/Property.js                          | 19 ++++++++++++++-----
 lib/Utilities.js                         |  6 ++----
 package.json                             |  4 ++--
 test/integration/association-hasone.js   |  4 ++--
 test/integration/instance.js             |  6 +++---
 test/integration/model-keys.js           |  6 +++---
 test/integration/property-number-size.js | 10 +++++-----
 test/integration/property.js             | 10 ++++++++++
 11 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 9e8af1b8..f79de508 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,10 @@
 ### v2.2.0 - (to do, in future)
 - Fixes error code spelling: `PARAM_MISSMATCH` -> `PARAM_MISMATCH`
 
+### v2.1.7 - 25 Apr 2014
+- Add explicit 'integer' type to avoid confusion.
+  `type: 'number', rational: false` will auto convert to `type: 'integer'`.
+
 ### v2.1.6 - 23 Apr 2014
 - Add '.omit' to chain find - opposite of '.only'
 
diff --git a/Readme.md b/Readme.md
index e057e8ab..0d4a2ddf 100755
--- a/Readme.md
+++ b/Readme.md
@@ -171,7 +171,7 @@ Are defined directly on the model.
 ```js
 var Person = db.define('person', {
     name    : String,
-    height  : { type: 'number', rational: false }
+    height  : { type: 'integer' }
 });
 Person.tallerThan = function(height, callback) {
     this.find({ height: orm.gt(height) }, callback);
diff --git a/lib/Model.js b/lib/Model.js
index c14c08a4..56644b27 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -656,7 +656,7 @@ function Model(opts) {
 	for (var i = 0; i < opts.id.length; i++) {
 		k = opts.id[i];
 		allProperties[k] = opts.properties[k] || {
-			type: 'serial', rational: 'false', key: true, klass: 'key'
+			type: 'serial', key: true, klass: 'key'
 		};
 	}
 	model_fields = opts.id.concat(model_fields);
diff --git a/lib/Property.js b/lib/Property.js
index a859f68e..8e63abc8 100644
--- a/lib/Property.js
+++ b/lib/Property.js
@@ -1,5 +1,10 @@
 var ORMError = require("./Error");
 
+var KNOWN_TYPES = [
+	"text",   "number", "integer", "boolean", "date", "enum", "object",
+	"binary", "point",  "serial"
+]
+
 exports.normalize = function (prop, customTypes, Settings) {
 	if (typeof prop === "function") {
 		switch (prop.name) {
@@ -30,20 +35,24 @@ exports.normalize = function (prop, customTypes, Settings) {
 		prop = { type: "enum", values: prop };
 	}
 
-	if ([ "text", "number", "boolean", "date", "enum", "object", "binary", "point" ].indexOf(prop.type) === -1) {
-		if (!(prop.type in customTypes)) {
-			throw new ORMError("Unknown property type: " + prop.type, 'NO_SUPPORT');
-		}
+	if (KNOWN_TYPES.indexOf(prop.type) === -1 && !(prop.type in customTypes)) {
+		throw new ORMError("Unknown property type: " + prop.type, 'NO_SUPPORT');
 	}
 
 	if (!prop.hasOwnProperty("required") && Settings.get("properties.required")) {
 		prop.required = true;
 	}
 
-	if (prop.type == "number" && !prop.hasOwnProperty("rational")) {
+	// Defaults to true. Rational means floating point here.
+	if (prop.type == "number" && prop.rational === undefined) {
 		prop.rational = true;
 	}
 
+	if (prop.type == "number" && prop.rational === false) {
+		prop.type = "integer";
+		delete prop.rational;
+	}
+
 	return prop;
 };
 
diff --git a/lib/Utilities.js b/lib/Utilities.js
index aa79d487..3aa25c53 100644
--- a/lib/Utilities.js
+++ b/lib/Utilities.js
@@ -200,9 +200,8 @@ exports.formatField = function (model, name, required, reversed) {
 			var p = model.properties[keys[i]];
 
 			field_opts = {
-				type     : p.type || "number",
+				type     : p.type || "integer",
 				size     : p.size || 4,
-				rational : p.rational || false,
 				unsigned : p.unsigned || true,
 				time     : p.time || false,
 				big      : p.big || false,
@@ -211,9 +210,8 @@ exports.formatField = function (model, name, required, reversed) {
 			};
 		} else {
 			field_opts = {
-				type     : "number",
+				type     : "integer",
 				unsigned : true,
-				rational : false,
 				size     : 4,
 				required : required
 			};
diff --git a/package.json b/package.json
index 251759f5..df57b765 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.6",
+	"version"     : "2.1.7",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",
@@ -38,7 +38,7 @@
 	"dependencies": {
 		"enforce"      : "0.1.2",
 		"sql-query"    : "0.1.16",
-		"sql-ddl-sync" : "git://github.com/dresende/node-sql-ddl-sync.git#v0.2.4",
+		"sql-ddl-sync" : "git://github.com/dresende/node-sql-ddl-sync.git#v0.3.0",
 		"hat"          : "0.0.3",
 		"lodash"       : "2.4.1"
 	},
diff --git a/test/integration/association-hasone.js b/test/integration/association-hasone.js
index af3d1529..df8ae44b 100644
--- a/test/integration/association-hasone.js
+++ b/test/integration/association-hasone.js
@@ -19,9 +19,9 @@ describe("hasOne", function() {
 			db.settings.set('instance.cache', false);
 			db.settings.set('instance.returnAllErrors', true);
 			Tree  = db.define("tree",   { type:   { type: 'text' } });
-			Stalk = db.define("stalk",  { length: { type: 'number', rational: false } });
+			Stalk = db.define("stalk",  { length: { type: 'integer' } });
 			Leaf  = db.define("leaf", {
-				size: { type: 'number', rational: false }
+				size: { type: 'integer' }
 			}, {
 				validations: opts.validations
 			});
diff --git a/test/integration/instance.js b/test/integration/instance.js
index 5312ea41..e992b81a 100644
--- a/test/integration/instance.js
+++ b/test/integration/instance.js
@@ -14,9 +14,9 @@ describe("Model instance", function() {
 
 			Person = db.define("person", {
 				name   : String,
-				age    : { type: 'number', rational: false, required: false },
-				height : { type: 'number', rational: false, required: false },
-				weight : { type: 'number',                  required: false }
+				age    : { type: 'integer', required: false },
+				height : { type: 'integer', required: false },
+				weight : { type: 'number',  required: false }
 			}, {
 				cache: false,
 				validations: {
diff --git a/test/integration/model-keys.js b/test/integration/model-keys.js
index cd18dbb7..f5131eaf 100644
--- a/test/integration/model-keys.js
+++ b/test/integration/model-keys.js
@@ -53,9 +53,9 @@ describe("Model keys option", function() {
 
 		before(function (done) {
 			DoorAccessHistory = db.define("door_access_history", {
-				year   : { type: 'number', rational: false },
-				month  : { type: 'number', rational: false },
-				day    : { type: 'number', rational: false },
+				year   : { type: 'integer' },
+				month  : { type: 'integer' },
+				day    : { type: 'integer' },
 				user   : String,
 				action : [ "in", "out" ]
 			}, {
diff --git a/test/integration/property-number-size.js b/test/integration/property-number-size.js
index 4b2258ee..1b154920 100644
--- a/test/integration/property-number-size.js
+++ b/test/integration/property-number-size.js
@@ -31,11 +31,11 @@ if (protocol != "sqlite") {
 		var setup = function () {
 			return function (done) {
 				NumberSize = db.define("number_size", {
-					int2   : { type: 'number', size: 2, rational: false },
-					int4   : { type: 'number', size: 4, rational: false },
-					int8   : { type: 'number', size: 8, rational: false },
-					float4 : { type: 'number', size: 4 },
-					float8 : { type: 'number', size: 8 }
+					int2   : { type: 'integer', size: 2 },
+					int4   : { type: 'integer', size: 4 },
+					int8   : { type: 'integer', size: 8 },
+					float4 : { type: 'number',  size: 4 },
+					float8 : { type: 'number',  size: 8 }
 				});
 
 				return helper.dropSync(NumberSize, function () {
diff --git a/test/integration/property.js b/test/integration/property.js
index a9d95e93..299a85f9 100644
--- a/test/integration/property.js
+++ b/test/integration/property.js
@@ -17,6 +17,16 @@ describe("Property", function () {
 			return done();
 		});
 	});
+	describe("passing deprecated rational: false number", function() {
+		it("should return type: 'integer'", function (done) {
+			Property.normalize(
+				{type: 'number', rational: false},
+				{}, ORM.settings
+			).type.should.equal("integer");
+
+			return done();
+		});
+	});
 	describe("passing Boolean", function() {
 		it("should return type: 'boolean'", function (done) {
 			Property.normalize(Boolean, {}, ORM.settings).type.should.equal("boolean");

From 79e702236f2d56bde35118d1d33c7160cfb88e68 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Fri, 25 Apr 2014 10:55:58 +1000
Subject: [PATCH 0966/1246] Add note about floats to example

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 0d4a2ddf..a371c420 100755
--- a/Readme.md
+++ b/Readme.md
@@ -51,7 +51,7 @@ orm.connect("mysql://username:password@host/database", function (err, db) {
 	var Person = db.define("person", {
 		name      : String,
 		surname   : String,
-		age       : Number,
+		age       : Number, // FLOAT
 		male      : Boolean,
 		continent : [ "Europe", "America", "Asia", "Africa", "Australia", "Antartica" ], // ENUM type
 		photo     : Buffer, // BLOB/BINARY

From f698dbc7ec97cc35143a93e554164c0320253c87 Mon Sep 17 00:00:00 2001
From: Ben Kitzelman <benkitzelman@gmail.com>
Date: Mon, 28 Apr 2014 14:03:10 +1000
Subject: [PATCH 0967/1246] omit should return instances populated ids and
 foreign keys

---
 lib/ChainFind.js                     |  2 +-
 test/integration/model-find-chain.js | 24 +++++++++++++++---------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 6f1dc4ef..fb0c8daa 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -45,7 +45,7 @@ function ChainFind(Model, opts) {
 			} else {
 				omit = Array.prototype.slice.apply(arguments);
 			}
-			this.only(_.difference(Object.keys(Model.properties), omit));
+			this.only(_.difference(Object.keys(Model.allProperties), omit));
 			return this;
 		},
 		limit: function (limit) {
diff --git a/test/integration/model-find-chain.js b/test/integration/model-find-chain.js
index b0f1fe76..29fbedff 100644
--- a/test/integration/model-find-chain.js
+++ b/test/integration/model-find-chain.js
@@ -16,22 +16,26 @@ describe("Model.find() chaining", function() {
 				age     : Number
 			});
 			Person.hasMany("parents");
+			Person.hasOne("friend");
 
 			ORM.singleton.clear(); // clear cache
 
 			return helper.dropSync(Person, function () {
 				Person.create([{
-					name    : "John",
-					surname : "Doe",
-					age     : 18
+					name      : "John",
+					surname   : "Doe",
+					age       : 18,
+					friend_id : 1
 				}, {
-					name    : "Jane",
-					surname : "Doe",
-					age     : 20
+					name      : "Jane",
+					surname   : "Doe",
+					age       : 20,
+					friend_id : 1
 				}, {
-					name    : "Jane",
-					surname : "Dean",
-					age     : 18
+					name      : "Jane",
+					surname   : "Dean",
+					age       : 18,
+					friend_id : 1
 				}], done);
 			});
 		};
@@ -215,6 +219,8 @@ describe("Model.find() chaining", function() {
 			Person.find().omit("age", "surname").order("-age").run(function (err, instances) {
 				should.equal(err, null);
 				instances.should.have.property("length", 3);
+				should.exist(instances[0].id);
+				should.exist(instances[0].friend_id);
 				instances[0].should.have.property("age", null);
 				instances[0].should.have.property("surname", null);
 				instances[0].should.have.property("name", "Jane");

From 4121cc60d5249efd2631d86ac161b8fa5230b8fc Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 28 Apr 2014 14:06:00 +1000
Subject: [PATCH 0968/1246] Bump version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index df57b765..351995c6 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.7",
+	"version"     : "2.1.8",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",

From 0c4e5d85e355bf79f5707dc8695734ae1efd92d7 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 28 Apr 2014 14:07:09 +1000
Subject: [PATCH 0969/1246] Update changelog

---
 Changelog.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index f79de508..93348fbc 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,9 @@
 ### v2.2.0 - (to do, in future)
 - Fixes error code spelling: `PARAM_MISSMATCH` -> `PARAM_MISMATCH`
 
+### v2.1.8 - 28 Apr 2014
+- Fix '.omit' (#491)
+
 ### v2.1.7 - 25 Apr 2014
 - Add explicit 'integer' type to avoid confusion.
   `type: 'number', rational: false` will auto convert to `type: 'integer'`.

From 39b90bd175ea0811d890acb919dced52f7aa4d41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Wed, 6 Nov 2013 18:00:08 +0100
Subject: [PATCH 0970/1246] Allow property.select to override the property
 field name.

This is a generic way to address
https://github.com/dresende/node-orm2/issues/273
Important: property.select can be a function, whose
return value won't be escaped.
---
 lib/Model.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/Model.js b/lib/Model.js
index 56644b27..3ff73dff 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -630,6 +630,7 @@ function Model(opts) {
 		}
 	}
 
+	var cur_fields = {};
 	// standardize properties
 	for (k in opts.properties) {
 		opts.properties[k] = Property.normalize(opts.properties[k], opts.db.customTypes, opts.settings);
@@ -640,8 +641,9 @@ function Model(opts) {
 			opts.properties[k].key = true;
 		}
 
-		if (opts.properties[k].lazyload !== true && model_fields.indexOf(k) == -1) {
-			model_fields.push(k);
+		if (opts.properties[k].lazyload !== true && !cur_fields[k]) {
+			cur_fields[k] = true;
+			model_fields.push(opts.properties[k].select || k);
 		}
 		if (opts.properties[k].required) {
 			// Prepend `required` validation

From d0dee6156058020e66af043a9d17021dc76fd0b9 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 7 Apr 2014 21:07:22 +1000
Subject: [PATCH 0971/1246] Allow custom property names & custom selects

---
 lib/Associations/Many.js            |   5 +-
 lib/Instance.js                     |  16 +++--
 lib/Model.js                        |  57 ++++++++++++----
 lib/Property.js                     |  67 ++++++++++--------
 lib/Utilities.js                    |  17 ++++-
 package.json                        |   4 +-
 test/integration/property-custom.js | 102 +++++++++++++++++++++-------
 test/integration/property.js        |  40 ++++++++---
 test/integration/smart-types.js     |   2 +-
 test/support/spec_helper.js         |   4 +-
 10 files changed, 219 insertions(+), 95 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 5ee39fc5..15b30b64 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -35,7 +35,9 @@ exports.prepare = function (Model, associations) {
 			props = {};
 		} else {
 			for (var k in props) {
-				props[k] = Property.normalize(props[k], {}, Model.settings);
+				props[k] = Property.normalize({
+					prop: props[k], name: k, customTypes: {}, settings: Model.settings
+				});
 			}
 		}
 
@@ -59,7 +61,6 @@ exports.prepare = function (Model, associations) {
 			delAccessor    : opts.delAccessor || ("remove" + assocTemplateName),
 			addAccessor    : opts.addAccessor || ("add" + assocTemplateName)
 		};
-
 		associations.push(association);
 
 		if (opts.reverse) {
diff --git a/lib/Instance.js b/lib/Instance.js
index 1e6dc813..859be697 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -151,11 +151,14 @@ function Instance(Model, opts) {
 			prop = Model.allProperties[k];
 
 			if (prop) {
-				if (prop.type === 'serial' && opts.data[k] == null) continue;
+				if (opts.data[k] == null &&  (prop.type == 'serial' || typeof prop.defaultValue == 'function')) {
+					continue;
+				}
 
-				data[k] = Property.validate(opts.data[k], prop);
 				if (opts.driver.propertyToValue) {
-					data[k] = opts.driver.propertyToValue(data[k], prop);
+					data[prop.mapsTo] = opts.driver.propertyToValue(opts.data[k], prop);
+				} else {
+					data[prop.mapsTo] = opts.data[k];
 				}
 			} else {
 				data[k] = opts.data[k];
@@ -195,7 +198,7 @@ function Instance(Model, opts) {
 
 			opts.changes.length = 0;
 			for (var i = 0; i < opts.id.length; i++) {
-			    opts.data[opts.id[i]] = info.hasOwnProperty(opts.id[i]) ? info[opts.id[i]] : data[opts.id[i]];
+				opts.data[opts.id[i]] = info.hasOwnProperty(opts.id[i]) ? info[opts.id[i]] : data[opts.id[i]];
 			}
 			opts.is_new = false;
 
@@ -337,7 +340,7 @@ function Instance(Model, opts) {
 			if (!opts.data.hasOwnProperty(opts.extrachanges[i])) continue;
 
 			if (opts.extra[opts.extrachanges[i]]) {
-				data[opts.extrachanges[i]] = Property.validate(opts.data[opts.extrachanges[i]], opts.extra[opts.extrachanges[i]]);
+				data[opts.extrachanges[i]] = opts.data[opts.extrachanges[i]];
 				if (opts.driver.propertyToValue) {
 					data[opts.extrachanges[i]] = opts.driver.propertyToValue(data[opts.extrachanges[i]], opts.extra[opts.extrachanges[i]]);
 				}
@@ -394,8 +397,7 @@ function Instance(Model, opts) {
 		changes[key] = value;
 
 		if (Model.properties[key]) {
-			changes[key] = Property.validate(changes[key], Model.properties[key]);
-			 if (opts.driver.propertyToValue) {
+			if (opts.driver.propertyToValue) {
 				changes[key] = opts.driver.propertyToValue(changes[key], Model.properties[key]);
 			}
 		}
diff --git a/lib/Model.js b/lib/Model.js
index 3ff73dff..733ae750 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -33,6 +33,7 @@ function Model(opts) {
 	var extend_associations    = [];
 	var association_properties = [];
 	var model_fields           = [];
+	var fieldToPropertyMap     = {};
 	var allProperties          = {};
 
 	var createHookHelper = function (hook) {
@@ -142,6 +143,18 @@ function Model(opts) {
 		return instance;
 	};
 
+	var mapDatastoreFieldsToProperties = function (dataIn) {
+		var k, prop;
+		var dataOut = {};
+
+		for (k in dataIn) {
+			prop = fieldToPropertyMap[k];
+			if (!prop) dataOut[k] = dataIn[k];
+			else       dataOut[prop.name] = dataIn[k];
+		}
+		return dataOut;
+	}
+
 	var model = function () {
 	    var instance, i;
 
@@ -283,16 +296,18 @@ function Model(opts) {
 				return cb(new ORMError(err.message, 'QUERY_ERROR', { originalCode: err.code }));
 			}
 			if (data.length === 0) {
-			    return cb(new ORMError("Not found", 'NOT_FOUND', { model: opts.table }));
+				return cb(new ORMError("Not found", 'NOT_FOUND', { model: opts.table }));
 			}
 
+			data = mapDatastoreFieldsToProperties(data[0]);
+
 			var uid = opts.driver.uid + "/" + opts.table + "/" + ids.join("/");
 
 			Singleton.get(uid, {
 				cache      : (options.hasOwnProperty("cache") ? options.cache : opts.cache),
 				save_check : opts.settings.get("instance.cacheSaveCheck")
 			}, function (cb) {
-				return createInstance(data[0], {
+				return createInstance(data, {
 					uid            : uid,
 					autoSave       : options.autoSave,
 					autoFetch      : (options.autoFetchLimit === 0 ? false : options.autoFetch),
@@ -630,22 +645,32 @@ function Model(opts) {
 		}
 	}
 
-	var cur_fields = {};
+	var currFields = {}, cType;
+
 	// standardize properties
 	for (k in opts.properties) {
-		opts.properties[k] = Property.normalize(opts.properties[k], opts.db.customTypes, opts.settings);
-		opts.properties[k].klass = 'primary';
-		allProperties[k] = opts.properties[k];
+		var prop = opts.properties[k] = Property.normalize({
+			prop: opts.properties[k], name: k,
+			customTypes: opts.db.customTypes, settings: opts.settings
+		});
+		prop.klass = 'primary';
+		allProperties[k] = prop;
+		fieldToPropertyMap[prop.mapsTo] = prop;
 
 		if (opts.id.indexOf(k) != -1) {
-			opts.properties[k].key = true;
+			prop.key = true;
 		}
-
-		if (opts.properties[k].lazyload !== true && !cur_fields[k]) {
-			cur_fields[k] = true;
-			model_fields.push(opts.properties[k].select || k);
+		if (prop.lazyload !== true && !currFields[k]) {
+			currFields[k] = true;
+			if ((cType = opts.db.customTypes[prop.type]) && cType.datastoreGet) {
+				model_fields.push({
+					a: prop.mapsTo, sql: cType.datastoreGet(prop, opts.db.driver.query)
+				});
+			} else {
+				model_fields.push(prop.mapsTo);
+			}
 		}
-		if (opts.properties[k].required) {
+		if (prop.required) {
 			// Prepend `required` validation
 			if(opts.validations.hasOwnProperty(k)) {
 				opts.validations[k].splice(0, 0, Validators.required());
@@ -657,9 +682,11 @@ function Model(opts) {
 
 	for (var i = 0; i < opts.id.length; i++) {
 		k = opts.id[i];
-		allProperties[k] = opts.properties[k] || {
-			type: 'serial', key: true, klass: 'key'
-		};
+		allProperties[k] = opts.properties[k] || Property.normalize({
+			prop: {type: 'serial', key: true, klass: 'key'},
+			name: k, customTypes: opts.db.customTypes, settings: opts.settings
+		});
+		fieldToPropertyMap[allProperties[k].mapsTo] = allProperties[k];
 	}
 	model_fields = opts.id.concat(model_fields);
 
diff --git a/lib/Property.js b/lib/Property.js
index 8e63abc8..6fc7ee33 100644
--- a/lib/Property.js
+++ b/lib/Property.js
@@ -3,59 +3,68 @@ var ORMError = require("./Error");
 var KNOWN_TYPES = [
 	"text",   "number", "integer", "boolean", "date", "enum", "object",
 	"binary", "point",  "serial"
-]
+];
 
-exports.normalize = function (prop, customTypes, Settings) {
-	if (typeof prop === "function") {
-		switch (prop.name) {
+
+exports.normalize = function (opts) {
+	if (typeof opts.prop === "function") {
+		switch (opts.prop.name) {
 			case "String":
-				prop = { type: "text" };
+				opts.prop = { type: "text" };
 				break;
 			case "Number":
-				prop = { type: "number" };
+				opts.prop = { type: "number" };
 				break;
 			case "Boolean":
-				prop = { type: "boolean" };
+				opts.prop = { type: "boolean" };
 				break;
 			case "Date":
-				prop = { type: "date" };
+				opts.prop = { type: "date" };
 				break;
 			case "Object":
-				prop = { type: "object" };
+				opts.prop = { type: "object" };
 				break;
 			case "Buffer":
-				prop = { type: "binary" };
+				opts.prop = { type: "binary" };
 				break;
 		}
-	} else if (typeof prop === "string") {
-		var tmp = prop;
-		prop = {};
-		prop.type = tmp;
-	} else if (Array.isArray(prop)) {
-		prop = { type: "enum", values: prop };
+	} else if (typeof opts.prop === "string") {
+		var tmp = opts.prop;
+		opts.prop = {};
+		opts.prop.type = tmp;
+	} else if (Array.isArray(opts.prop)) {
+		opts.prop = { type: "enum", values: opts.prop };
 	}
 
-	if (KNOWN_TYPES.indexOf(prop.type) === -1 && !(prop.type in customTypes)) {
-		throw new ORMError("Unknown property type: " + prop.type, 'NO_SUPPORT');
+	if (KNOWN_TYPES.indexOf(opts.prop.type) === -1 && !(opts.prop.type in customTypes)) {
+		throw new ORMError("Unknown property type: " + opts.prop.type, 'NO_SUPPORT');
+  }
+
+	if ([ "text", "number", "boolean", "serial", "date", "enum", "object", "binary", "point" ].indexOf(opts.prop.type) === -1) {
+		if (!(opts.prop.type in opts.customTypes)) {
+			throw new ORMError("Unknown opts.property type: " + opts.prop.type, 'NO_SUPPORT');
+		}
 	}
 
-	if (!prop.hasOwnProperty("required") && Settings.get("properties.required")) {
-		prop.required = true;
+	if (!opts.prop.hasOwnProperty("required") && opts.settings.get("properties.required")) {
+		opts.prop.required = true;
 	}
 
 	// Defaults to true. Rational means floating point here.
-	if (prop.type == "number" && prop.rational === undefined) {
-		prop.rational = true;
+	if (opts.prop.type == "number" && opts.prop.rational === undefined) {
+		opts.prop.rational = true;
 	}
 
-	if (prop.type == "number" && prop.rational === false) {
-		prop.type = "integer";
-		delete prop.rational;
+	if (!('mapsTo' in opts.prop)) {
+		opts.prop.mapsTo = opts.name
 	}
 
-	return prop;
-};
+	if (opts.prop.type == "number" && opts.prop.rational === false) {
+		opts.prop.type = "integer";
+		delete opts.prop.rational;
+	}
+
+	opts.prop.name = opts.name;
 
-exports.validate = function (value, prop) {
-	return value;
+	return opts.prop;
 };
diff --git a/lib/Utilities.js b/lib/Utilities.js
index 3aa25c53..c168bd26 100644
--- a/lib/Utilities.js
+++ b/lib/Utilities.js
@@ -1,3 +1,5 @@
+_ = require('lodash')
+
 /**
  * Order should be a String (with the property name assumed ascending)
  * or an Array or property String names.
@@ -176,7 +178,12 @@ exports.wrapFieldObject = function (obj, model, altName, alternatives) {
 
 	var new_obj = {};
 
-	new_obj[obj] = alternatives[obj] || alternatives[model.id[0]] || { type: 'number', unsigned: true, rational: false };
+	new_obj[obj] = _.cloneDeep(
+		alternatives[obj] || alternatives[model.id[0]] || { type: 'number', unsigned: true, rational: false }
+	);
+	new_obj[obj].name   = obj;
+	new_obj[obj].mapsTo = obj;
+
 
 	return new_obj;
 };
@@ -206,14 +213,18 @@ exports.formatField = function (model, name, required, reversed) {
 				time     : p.time || false,
 				big      : p.big || false,
 				values   : p.values || null,
-				required : required
+				required : required,
+				name     : field_name,
+				mapsTo   : field_name
 			};
 		} else {
 			field_opts = {
 				type     : "integer",
 				unsigned : true,
 				size     : 4,
-				required : required
+				required : required,
+				name     : field_name,
+				mapsTo   : field_name
 			};
 		}
 
diff --git a/package.json b/package.json
index 351995c6..1e49cda6 100644
--- a/package.json
+++ b/package.json
@@ -37,8 +37,8 @@
 	"analyse"     : false,
 	"dependencies": {
 		"enforce"      : "0.1.2",
-		"sql-query"    : "0.1.16",
-		"sql-ddl-sync" : "git://github.com/dresende/node-sql-ddl-sync.git#v0.3.0",
+		"sql-query"    : "git://github.com/dresende/node-sql-query.git#custom-properties",
+		"sql-ddl-sync" : "git://github.com/dresende/node-sql-ddl-sync.git#custom-properties",
 		"hat"          : "0.0.3",
 		"lodash"       : "2.4.1"
 	},
diff --git a/test/integration/property-custom.js b/test/integration/property-custom.js
index 3cd4b442..e0136926 100644
--- a/test/integration/property-custom.js
+++ b/test/integration/property-custom.js
@@ -7,10 +7,23 @@ describe("custom types", function() {
 	if (common.protocol() == 'mongodb') return;
 
 	var db = null;
-	var LottoTicket = null;
 
-	var setup = function (opts) {
-		return function (done) {
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			done();
+		});
+	});
+
+	after(function () {
+		db.close();
+	});
+
+	describe("simple", function () {
+		var LottoTicket = null;
+
+		before(function (done) {
 			db.defineType('numberArray', {
 				datastoreType: function(prop) {
 					return 'TEXT'
@@ -34,39 +47,80 @@ describe("custom types", function() {
 			});
 
 			return helper.dropSync(LottoTicket, done);
-		};
-	};
+		});
 
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
+		it("should create the table", function () {
+			should(true);
+		});
+
+		it("should store data in the table", function (done) {
+			var ticket = new LottoTicket({ numbers: [4,23,6,45,9,12,3,29] });
+
+			ticket.save(function (err) {
+				should.not.exist(err);
 
-			return done();
+				LottoTicket.find().all(function (err, items) {
+					should.not.exist(err);
+					should.equal(items.length, 1);
+					should(Array.isArray(items[0].numbers));
+
+					[4,23,6,45,9,12,3,29].should.eql(items[0].numbers);
+
+					done();
+				});
+			});
 		});
 	});
 
-	after(function () {
-		db.close();
-	});
+	describe("complex", function () {
+		var WonkyTotal = null;
 
-	it("should create the table", function (done) {
-		setup()(done);
-	});
+		before(function (done) {
+			db.defineType('wonkyNumber', {
+				datastoreType: function (prop) {
+					return 'INTEGER';
+				},
+				datastoreGet: function (prop, helper) {
+					return helper.escape('?? - 1', [prop.mapsTo]);
+				},
+				valueToProperty: function (value, prop) {
+					return value + 7;
+				},
+				propertyToValue: function (value, prop) {
+					if (value == null) {
+						return value;
+					} else {
+						return function (helper) {
+							return helper.escape('(? - 2)', [value]);
+						};
+					}
+				}
+			});
+
+			WonkyTotal = db.define('wonky', {
+				name:  String,
+				total: { type: 'wonkyNumber', mapsTo: 'blah_total' }
+			});
+
+			return helper.dropSync(WonkyTotal, done);
+		});
 
-	it("should store data in the table", function (done) {
-		var ticket = new LottoTicket({ numbers: [4,23,6,45,9,12,3,29] });
+		it("should store wonky total in a differently named field", function (done) {
+			var item = new WonkyTotal();
 
-		ticket.save(function (err) {
-			should.not.exist(err);
+			item.name  = "cabbages";
+			item.total = 8;
 
-			LottoTicket.find().all(function (err, items) {
+			item.save(function (err) {
 				should.not.exist(err);
-				should.equal(items.length, 1);
-				should(Array.isArray(items[0].numbers));
+				should.equal(item.total, 15);
 
-				[4,23,6,45,9,12,3,29].should.eql(items[0].numbers);
+				WonkyTotal.get(item.id, function (err, item) {
+					should.not.exist(err);
+					should.equal(item.total, 19); // (15 - 2) - 1 + 7
 
-				done();
+					done();
+				});
 			});
 		});
 	});
diff --git a/test/integration/property.js b/test/integration/property.js
index 299a85f9..accca438 100644
--- a/test/integration/property.js
+++ b/test/integration/property.js
@@ -5,14 +5,18 @@ var Property = ORM.Property;
 describe("Property", function () {
 	describe("passing String", function() {
 		it("should return type: 'text'", function (done) {
-			Property.normalize(String, {}, ORM.settings).type.should.equal("text");
+			Property.normalize(
+				{ prop: String, customTypes: {}, settings: ORM.settings, name: 'abc' }
+			).type.should.equal("text");
 
 			return done();
 		});
 	});
 	describe("passing Number", function() {
 		it("should return type: 'number'", function (done) {
-			Property.normalize(Number, {}, ORM.settings).type.should.equal("number");
+			Property.normalize(
+				{ prop: Number, customTypes: {}, settings: ORM.settings, name: 'abc' }
+			).type.should.equal("number");
 
 			return done();
 		});
@@ -29,35 +33,45 @@ describe("Property", function () {
 	});
 	describe("passing Boolean", function() {
 		it("should return type: 'boolean'", function (done) {
-			Property.normalize(Boolean, {}, ORM.settings).type.should.equal("boolean");
+			Property.normalize(
+				{ prop: Boolean, customTypes: {}, settings: ORM.settings, name: 'abc' }
+			).type.should.equal("boolean");
 
 			return done();
 		});
 	});
 	describe("passing Date", function() {
 		it("should return type: 'date'", function (done) {
-			Property.normalize(Date, {}, ORM.settings).type.should.equal("date");
+			Property.normalize(
+				{ prop: Date, customTypes: {}, settings: ORM.settings, name: 'abc' }
+			).type.should.equal("date");
 
 			return done();
 		});
 	});
 	describe("passing Object", function() {
 		it("should return type: 'object'", function (done) {
-			Property.normalize(Object, {}, ORM.settings).type.should.equal("object");
+			Property.normalize(
+				{ prop: Object, customTypes: {}, settings: ORM.settings, name: 'abc' }
+			).type.should.equal("object");
 
 			return done();
 		});
 	});
 	describe("passing Buffer", function() {
 		it("should return type: 'binary'", function (done) {
-			Property.normalize(Buffer, {}, ORM.settings).type.should.equal("binary");
+			Property.normalize(
+				{ prop: Buffer, customTypes: {}, settings: ORM.settings, name: 'abc' }
+			).type.should.equal("binary");
 
 			return done();
 		});
 	});
 	describe("passing an Array of items", function() {
 		it("should return type: 'enum' with list of items", function (done) {
-			var prop = Property.normalize([ 1, 2, 3 ], {}, ORM.settings);
+			var prop = Property.normalize(
+				{ prop: [1, 2, 3], customTypes: {}, settings: ORM.settings, name: 'abc' }
+			)
 
 			prop.type.should.equal("enum");
 			prop.values.should.have.property("length", 3);
@@ -67,12 +81,16 @@ describe("Property", function () {
 	});
 	describe("passing a string type", function() {
 		it("should return type: <type>", function (done) {
-			Property.normalize("text", {}, ORM.settings).type.should.equal("text");
+			Property.normalize(
+				{ prop: "text", customTypes: {}, settings: ORM.settings, name: 'abc' }
+			).type.should.equal("text");
 
 			return done();
 		});
     it("should accept: 'point'", function(done) {
-      Property.normalize("point", {}, ORM.settings).type.should.equal("point");
+      Property.normalize(
+				{ prop: "point", customTypes: {}, settings: ORM.settings, name: 'abc' }
+			).type.should.equal("point");
 
       return done();
     });
@@ -80,7 +98,9 @@ describe("Property", function () {
 		describe("if not valid", function () {
 			it("should throw", function (done) {
 				(function () {
-					Property.normalize("string", {}, ORM.settings);
+					Property.normalize(
+						{ prop: "string", customTypes: {}, settings: ORM.settings, name: 'abc' }
+					)
 				}).should.throw();
 
 				return done();
diff --git a/test/integration/smart-types.js b/test/integration/smart-types.js
index cea7ca33..7445411d 100644
--- a/test/integration/smart-types.js
+++ b/test/integration/smart-types.js
@@ -128,6 +128,6 @@ describe("Smart types", function () {
 		        });
 		    });
 		});
-		
+
 	});
 });
diff --git a/test/support/spec_helper.js b/test/support/spec_helper.js
index 3cfeb9b3..69131c48 100644
--- a/test/support/spec_helper.js
+++ b/test/support/spec_helper.js
@@ -22,13 +22,13 @@ module.exports.dropSync = function (models, done) {
 
 	async.eachSeries(models, function (item, cb) {
 		item.drop(function (err) {
-			if (err) throw err
+			if (err) throw err;
 
 			item.sync(cb);
 		});
 	}, function (err) {
 		if (common.protocol() != 'sqlite') {
-			should.not.exist(err);
+			if (err) throw err;
 		}
 		done(err);
 	});

From 4f9880bad37453fb56361716e9c7be53341fb3f4 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 7 May 2014 20:19:17 +1000
Subject: [PATCH 0972/1246] Post rebase fixes1

---
 lib/Model.js                 | 2 +-
 lib/Property.js              | 9 +--------
 test/integration/property.js | 3 +--
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/lib/Model.js b/lib/Model.js
index 733ae750..3bc8569a 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -683,7 +683,7 @@ function Model(opts) {
 	for (var i = 0; i < opts.id.length; i++) {
 		k = opts.id[i];
 		allProperties[k] = opts.properties[k] || Property.normalize({
-			prop: {type: 'serial', key: true, klass: 'key'},
+			prop: { type: 'serial', key: true, klass: 'key' },
 			name: k, customTypes: opts.db.customTypes, settings: opts.settings
 		});
 		fieldToPropertyMap[allProperties[k].mapsTo] = allProperties[k];
diff --git a/lib/Property.js b/lib/Property.js
index 6fc7ee33..1ca67cc8 100644
--- a/lib/Property.js
+++ b/lib/Property.js
@@ -5,7 +5,6 @@ var KNOWN_TYPES = [
 	"binary", "point",  "serial"
 ];
 
-
 exports.normalize = function (opts) {
 	if (typeof opts.prop === "function") {
 		switch (opts.prop.name) {
@@ -36,16 +35,10 @@ exports.normalize = function (opts) {
 		opts.prop = { type: "enum", values: opts.prop };
 	}
 
-	if (KNOWN_TYPES.indexOf(opts.prop.type) === -1 && !(opts.prop.type in customTypes)) {
+	if (KNOWN_TYPES.indexOf(opts.prop.type) === -1 && !(opts.prop.type in opts.customTypes)) {
 		throw new ORMError("Unknown property type: " + opts.prop.type, 'NO_SUPPORT');
   }
 
-	if ([ "text", "number", "boolean", "serial", "date", "enum", "object", "binary", "point" ].indexOf(opts.prop.type) === -1) {
-		if (!(opts.prop.type in opts.customTypes)) {
-			throw new ORMError("Unknown opts.property type: " + opts.prop.type, 'NO_SUPPORT');
-		}
-	}
-
 	if (!opts.prop.hasOwnProperty("required") && opts.settings.get("properties.required")) {
 		opts.prop.required = true;
 	}
diff --git a/test/integration/property.js b/test/integration/property.js
index accca438..ca185297 100644
--- a/test/integration/property.js
+++ b/test/integration/property.js
@@ -24,8 +24,7 @@ describe("Property", function () {
 	describe("passing deprecated rational: false number", function() {
 		it("should return type: 'integer'", function (done) {
 			Property.normalize(
-				{type: 'number', rational: false},
-				{}, ORM.settings
+				{ prop: {type: 'number', rational: false}, customTypes: {}, settings: ORM.settings, name: 'abc'}
 			).type.should.equal("integer");
 
 			return done();

From a30488dcb59c5a76af0143def8c6847ee3c56aa9 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 7 May 2014 21:05:05 +1000
Subject: [PATCH 0973/1246] Fix tests

---
 package.json                         | 4 ++--
 test/integration/model-find-chain.js | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 1e49cda6..bed765af 100644
--- a/package.json
+++ b/package.json
@@ -37,8 +37,8 @@
 	"analyse"     : false,
 	"dependencies": {
 		"enforce"      : "0.1.2",
-		"sql-query"    : "git://github.com/dresende/node-sql-query.git#custom-properties",
-		"sql-ddl-sync" : "git://github.com/dresende/node-sql-ddl-sync.git#custom-properties",
+		"sql-query"    : "git://github.com/dresende/node-sql-query.git#v0.1.17",
+		"sql-ddl-sync" : "git://github.com/dresende/node-sql-ddl-sync.git#v0.3.2",
 		"hat"          : "0.0.3",
 		"lodash"       : "2.4.1"
 	},
diff --git a/test/integration/model-find-chain.js b/test/integration/model-find-chain.js
index 29fbedff..87ffb622 100644
--- a/test/integration/model-find-chain.js
+++ b/test/integration/model-find-chain.js
@@ -219,7 +219,9 @@ describe("Model.find() chaining", function() {
 			Person.find().omit("age", "surname").order("-age").run(function (err, instances) {
 				should.equal(err, null);
 				instances.should.have.property("length", 3);
-				should.exist(instances[0].id);
+				if (common.protocol() != "mongodb") {
+					should.exist(instances[0].id);
+				}
 				should.exist(instances[0].friend_id);
 				instances[0].should.have.property("age", null);
 				instances[0].should.have.property("surname", null);

From a6f458ba53078de8d6064a7dd2d0289f07e78916 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 7 May 2014 21:35:05 +1000
Subject: [PATCH 0974/1246] Add mapsTo test

---
 test/integration/model-get.js | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/test/integration/model-get.js b/test/integration/model-get.js
index e0fca99e..5ec7d08e 100644
--- a/test/integration/model-get.js
+++ b/test/integration/model-get.js
@@ -1,7 +1,9 @@
+var _        = require('lodash');
 var should   = require('should');
 var helper   = require('../support/spec_helper');
 var common   = require('../common');
 var ORM      = require('../../');
+var protocol = common.protocol();
 
 describe("Model.get()", function() {
 	var db     = null;
@@ -11,7 +13,7 @@ describe("Model.get()", function() {
 	var setup = function (cache) {
 		return function (done) {
 			Person = db.define("person", {
-				name   : String
+				name   : { type: 'text', mapsTo: 'fullname' }
 			}, {
 				cache  : cache,
 				methods: {
@@ -49,6 +51,33 @@ describe("Model.get()", function() {
 		return db.close();
 	});
 
+	describe("mapsTo", function () {
+		if (protocol == 'mongodb') return;
+
+		before(setup(true));
+
+		it("should create the table with a different column name than property name", function (done) {
+			var sql;
+
+			if (protocol == 'sqlite') {
+				sql = "PRAGMA table_info(?)";
+			} else {
+				sql = "SELECT column_name FROM information_schema.columns WHERE table_name = ?";
+			}
+
+			db.driver.execQuery(sql, [Person.table], function (err, data) {
+				should.not.exist(err);
+
+				var names = _.pluck(data, protocol == 'sqlite' ? 'name' : 'column_name')
+
+				should.equal(typeof Person.properties.name, 'object');
+				should.notEqual(names.indexOf('fullname'), -1);
+
+				done();
+			});
+		});
+	});
+
 	describe("with cache", function () {
 		before(setup(true));
 

From 6610605da4a1c4079456c7326b30829b9bc72afb Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 8 May 2014 20:26:30 +1000
Subject: [PATCH 0975/1246] Fix duplicate column issue with orm-timestamps

---
 lib/Property.js              |   3 +
 test/integration/property.js | 117 +++++++++++++++++------------------
 2 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/lib/Property.js b/lib/Property.js
index 1ca67cc8..fdfc6ba4 100644
--- a/lib/Property.js
+++ b/lib/Property.js
@@ -1,3 +1,4 @@
+var _        = require('lodash');
 var ORMError = require("./Error");
 
 var KNOWN_TYPES = [
@@ -33,6 +34,8 @@ exports.normalize = function (opts) {
 		opts.prop.type = tmp;
 	} else if (Array.isArray(opts.prop)) {
 		opts.prop = { type: "enum", values: opts.prop };
+	} else {
+		opts.prop = _.cloneDeep(opts.prop);
 	}
 
 	if (KNOWN_TYPES.indexOf(opts.prop.type) === -1 && !(opts.prop.type in opts.customTypes)) {
diff --git a/test/integration/property.js b/test/integration/property.js
index ca185297..cc77ec43 100644
--- a/test/integration/property.js
+++ b/test/integration/property.js
@@ -3,82 +3,67 @@ var ORM      = require("../..");
 var Property = ORM.Property;
 
 describe("Property", function () {
-	describe("passing String", function() {
-		it("should return type: 'text'", function (done) {
-			Property.normalize(
-				{ prop: String, customTypes: {}, settings: ORM.settings, name: 'abc' }
-			).type.should.equal("text");
+	it("passing String should return type: 'text'", function (done) {
+		Property.normalize(
+			{ prop: String, customTypes: {}, settings: ORM.settings, name: 'abc' }
+		).type.should.equal("text");
 
-			return done();
-		});
+		return done();
 	});
-	describe("passing Number", function() {
-		it("should return type: 'number'", function (done) {
-			Property.normalize(
-				{ prop: Number, customTypes: {}, settings: ORM.settings, name: 'abc' }
-			).type.should.equal("number");
+	it("passing Number should return type: 'number'", function (done) {
+		Property.normalize(
+			{ prop: Number, customTypes: {}, settings: ORM.settings, name: 'abc' }
+		).type.should.equal("number");
 
-			return done();
-		});
+		return done();
 	});
-	describe("passing deprecated rational: false number", function() {
-		it("should return type: 'integer'", function (done) {
-			Property.normalize(
-				{ prop: {type: 'number', rational: false}, customTypes: {}, settings: ORM.settings, name: 'abc'}
-			).type.should.equal("integer");
+	it("passing deprecated rational: false number should return type: 'integer'", function (done) {
+		Property.normalize(
+			{ prop: {type: 'number', rational: false}, customTypes: {}, settings: ORM.settings, name: 'abc'}
+		).type.should.equal("integer");
 
-			return done();
-		});
+		return done();
 	});
-	describe("passing Boolean", function() {
-		it("should return type: 'boolean'", function (done) {
-			Property.normalize(
-				{ prop: Boolean, customTypes: {}, settings: ORM.settings, name: 'abc' }
-			).type.should.equal("boolean");
 
-			return done();
-		});
+	it("passing Boolean should return type: 'boolean'", function (done) {
+		Property.normalize(
+			{ prop: Boolean, customTypes: {}, settings: ORM.settings, name: 'abc' }
+		).type.should.equal("boolean");
+
+		return done();
 	});
-	describe("passing Date", function() {
-		it("should return type: 'date'", function (done) {
-			Property.normalize(
-				{ prop: Date, customTypes: {}, settings: ORM.settings, name: 'abc' }
-			).type.should.equal("date");
+	it("passing Date should return type: 'date'", function (done) {
+		Property.normalize(
+			{ prop: Date, customTypes: {}, settings: ORM.settings, name: 'abc' }
+		).type.should.equal("date");
 
-			return done();
-		});
+		return done();
 	});
-	describe("passing Object", function() {
-		it("should return type: 'object'", function (done) {
-			Property.normalize(
-				{ prop: Object, customTypes: {}, settings: ORM.settings, name: 'abc' }
-			).type.should.equal("object");
+	it("passing Object should return type: 'object'", function (done) {
+		Property.normalize(
+			{ prop: Object, customTypes: {}, settings: ORM.settings, name: 'abc' }
+		).type.should.equal("object");
 
-			return done();
-		});
+		return done();
 	});
-	describe("passing Buffer", function() {
-		it("should return type: 'binary'", function (done) {
-			Property.normalize(
-				{ prop: Buffer, customTypes: {}, settings: ORM.settings, name: 'abc' }
-			).type.should.equal("binary");
+	it("passing Buffer should return type: 'binary'", function (done) {
+		Property.normalize(
+			{ prop: Buffer, customTypes: {}, settings: ORM.settings, name: 'abc' }
+		).type.should.equal("binary");
 
-			return done();
-		});
+		return done();
 	});
-	describe("passing an Array of items", function() {
-		it("should return type: 'enum' with list of items", function (done) {
-			var prop = Property.normalize(
-				{ prop: [1, 2, 3], customTypes: {}, settings: ORM.settings, name: 'abc' }
-			)
+	it("passing an Array of items should return type: 'enum' with list of items", function (done) {
+		var prop = Property.normalize(
+			{ prop: [1, 2, 3], customTypes: {}, settings: ORM.settings, name: 'abc' }
+		)
 
-			prop.type.should.equal("enum");
-			prop.values.should.have.property("length", 3);
+		prop.type.should.equal("enum");
+		prop.values.should.have.property("length", 3);
 
-			return done();
-		});
+		return done();
 	});
-	describe("passing a string type", function() {
+	describe("passing a string type", function () {
 		it("should return type: <type>", function (done) {
 			Property.normalize(
 				{ prop: "text", customTypes: {}, settings: ORM.settings, name: 'abc' }
@@ -86,7 +71,7 @@ describe("Property", function () {
 
 			return done();
 		});
-    it("should accept: 'point'", function(done) {
+    it("should accept: 'point'", function (done) {
       Property.normalize(
 				{ prop: "point", customTypes: {}, settings: ORM.settings, name: 'abc' }
 			).type.should.equal("point");
@@ -106,4 +91,16 @@ describe("Property", function () {
 			});
 		});
 	});
+	it("should not modify the original property object", function (done) {
+		var original = { type: 'text', required: true };
+
+		var normalized = Property.normalize(
+			{ prop: original, customTypes: {}, settings: ORM.settings, name: 'abc' }
+		);
+
+		original.test = 3;
+		should.strictEqual(normalized.test, undefined);
+
+		return done();
+	});
 });

From b2d35f67c54810e911a7f2bca84a48efe34e9c39 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 8 May 2014 20:28:31 +1000
Subject: [PATCH 0976/1246] Show sync errors

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bed765af..2b01c32e 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
 	"dependencies": {
 		"enforce"      : "0.1.2",
 		"sql-query"    : "git://github.com/dresende/node-sql-query.git#v0.1.17",
-		"sql-ddl-sync" : "git://github.com/dresende/node-sql-ddl-sync.git#v0.3.2",
+		"sql-ddl-sync" : "git://github.com/dresende/node-sql-ddl-sync.git#v0.3.3",
 		"hat"          : "0.0.3",
 		"lodash"       : "2.4.1"
 	},

From 41ee165c2737c8e3e347ad9c4daae5439ca29fab Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 8 May 2014 20:54:10 +1000
Subject: [PATCH 0977/1246] v2.1.9: (#456, #375, #273, #495)

---
 Changelog.md | 5 +++--
 package.json | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 93348fbc..826aff34 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,6 @@
-### v2.2.0 - (to do, in future)
-- Fixes error code spelling: `PARAM_MISSMATCH` -> `PARAM_MISMATCH`
+### v2.1.9 - 06 May 2014
+- Add basic PostGIS support - (#456, #375)
+- Allow mapping model properties to differently named columns (#273, #495)
 
 ### v2.1.8 - 28 Apr 2014
 - Fix '.omit' (#491)
diff --git a/package.json b/package.json
index 2b01c32e..659c591e 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.8",
+	"version"     : "2.1.9",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",

From 53b3612fadd76b50971c3a767f04baa02d82496c Mon Sep 17 00:00:00 2001
From: Mike Zenith <awe.zenith@gmail.com>
Date: Thu, 8 May 2014 22:38:34 +0200
Subject: [PATCH 0978/1246] [Driver:sqlite].clear should reset autoincrement

Sqlite stores sequences differently, you have to reset them manually after clearing the table
---
 lib/Drivers/DML/sqlite.js | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 63b6a043..2c15b9de 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -215,12 +215,25 @@ Driver.prototype.remove = function (table, conditions, cb) {
 };
 
 Driver.prototype.clear = function (table, cb) {
-	var query = "DELETE FROM " + this.query.escapeId(table);
+	var query = "DELETE FROM " + this.query.escapeId(table),
+        debug = this.opts.debug;
 
-	if (this.opts.debug) {
+	if (debug) {
 		require("../../Debug").sql('sqlite', query);
 	}
-	this.db.all(query, cb);
+	this.db.all(query, function (err) {
+        if (err) {
+            return cb(err);
+        }
+        var query = "DELETE FROM "
+                + this.query.escapeId("sqlite_sequence")
+                + " WHERE name=" + this.query.escapeVal(table);
+
+        if (debug) {
+            require("../../Debug").sql('sqlite', query);
+        }
+        this.db.all(query, cb);
+    }.bind(this));
 };
 
 Driver.prototype.valueToProperty = function (value, property) {

From 051089e776e010aec9b16d8307182bede7f21687 Mon Sep 17 00:00:00 2001
From: Mike Zenith <awe.zenith@gmail.com>
Date: Fri, 9 May 2014 00:31:16 +0200
Subject: [PATCH 0979/1246] bad line breaks before +

sorry, wasnt paying attention
---
 lib/Drivers/DML/sqlite.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 2c15b9de..624e331a 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -225,9 +225,10 @@ Driver.prototype.clear = function (table, cb) {
         if (err) {
             return cb(err);
         }
-        var query = "DELETE FROM "
-                + this.query.escapeId("sqlite_sequence")
-                + " WHERE name=" + this.query.escapeVal(table);
+        var query = "DELETE FROM " + 
+		this.query.escapeId("sqlite_sequence") + 
+		" WHERE name=" + 
+		this.query.escapeVal(table);
 
         if (debug) {
             require("../../Debug").sql('sqlite', query);

From 67dbb8bf1c38689838b17c08f65a87782213017f Mon Sep 17 00:00:00 2001
From: Mithgol <getgit@mithgol.ru>
Date: Sat, 10 May 2014 23:34:07 -0700
Subject: [PATCH 0980/1246] =?UTF-8?q?use=C2=A0SVG=20to=C2=A0display=20Trav?=
 =?UTF-8?q?is=C2=A0CI=20build=C2=A0status=20and=C2=A0npm=20package's=20ver?=
 =?UTF-8?q?sion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Readme.md b/Readme.md
index a371c420..88045729 100755
--- a/Readme.md
+++ b/Readme.md
@@ -1,7 +1,7 @@
 ## Object Relational Mapping
 
-[![Build Status](https://secure.travis-ci.org/dresende/node-orm2.png?branch=master)](http://travis-ci.org/dresende/node-orm2)
-[![](https://badge.fury.io/js/orm.png)](https://npmjs.org/package/orm)
+[![Build Status](https://api.travis-ci.org/dresende/node-orm2.svg?branch=master)](http://travis-ci.org/dresende/node-orm2)
+[![](https://badge.fury.io/js/orm.svg)](https://npmjs.org/package/orm)
 [![](https://gemnasium.com/dresende/node-orm2.png)](https://gemnasium.com/dresende/node-orm2)
 [![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=dresende&url=https://github.com/dresende/node-orm2&title=ORM&language=&tags=github&category=software)
 

From acf603d08a9db1d6237474aeafd6a0a25f1f6abf Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 14 May 2014 21:03:56 +1000
Subject: [PATCH 0981/1246] Add tests for sqlite Dialect.clear. Closes #497

---
 lib/Drivers/DML/sqlite.js                 | 25 ++-------
 package.json                              |  4 +-
 test/integration/drivers/postgres_spec.js |  2 +-
 test/integration/drivers/sqlite_spec.js   | 68 +++++++++++++++++++++++
 4 files changed, 77 insertions(+), 22 deletions(-)
 create mode 100644 test/integration/drivers/sqlite_spec.js

diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 624e331a..bb04f4fe 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -215,26 +215,13 @@ Driver.prototype.remove = function (table, conditions, cb) {
 };
 
 Driver.prototype.clear = function (table, cb) {
-	var query = "DELETE FROM " + this.query.escapeId(table),
-        debug = this.opts.debug;
+	var debug = this.opts.debug;
 
-	if (debug) {
-		require("../../Debug").sql('sqlite', query);
-	}
-	this.db.all(query, function (err) {
-        if (err) {
-            return cb(err);
-        }
-        var query = "DELETE FROM " + 
-		this.query.escapeId("sqlite_sequence") + 
-		" WHERE name=" + 
-		this.query.escapeVal(table);
-
-        if (debug) {
-            require("../../Debug").sql('sqlite', query);
-        }
-        this.db.all(query, cb);
-    }.bind(this));
+	this.execQuery("DELETE FROM ??", [table], function (err) {
+		if (err) return cb(err);
+
+		this.execQuery("DELETE FROM ?? WHERE NAME = ?", ['sqlite_sequence', table], cb);
+	}.bind(this));
 };
 
 Driver.prototype.valueToProperty = function (value, property) {
diff --git a/package.json b/package.json
index 659c591e..858d71e2 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.9",
+	"version"     : "2.1.10",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",
@@ -38,7 +38,7 @@
 	"dependencies": {
 		"enforce"      : "0.1.2",
 		"sql-query"    : "git://github.com/dresende/node-sql-query.git#v0.1.17",
-		"sql-ddl-sync" : "git://github.com/dresende/node-sql-ddl-sync.git#v0.3.3",
+		"sql-ddl-sync" : "git://github.com/dresende/node-sql-ddl-sync.git#v0.3.5",
 		"hat"          : "0.0.3",
 		"lodash"       : "2.4.1"
 	},
diff --git a/test/integration/drivers/postgres_spec.js b/test/integration/drivers/postgres_spec.js
index 337e6c97..cb3826cc 100644
--- a/test/integration/drivers/postgres_spec.js
+++ b/test/integration/drivers/postgres_spec.js
@@ -4,7 +4,7 @@ var Driver = require('../../../lib/Drivers/DML/postgres').Driver;
 var helper = require('../../support/spec_helper');
 var common = require('../../common');
 
-if (common.protocol() == "mongodb") return;
+if (common.protocol() != "postgres") return;
 
 describe("Postgres driver", function() {
 	describe("#propertyToValue", function () {
diff --git a/test/integration/drivers/sqlite_spec.js b/test/integration/drivers/sqlite_spec.js
new file mode 100644
index 00000000..f406f3de
--- /dev/null
+++ b/test/integration/drivers/sqlite_spec.js
@@ -0,0 +1,68 @@
+var _      = require('lodash');
+var should = require('should');
+var Driver = require('../../../lib/Drivers/DML/sqlite').Driver;
+var helper = require('../../support/spec_helper');
+var common = require('../../common');
+
+if (common.protocol() != "sqlite") return;
+
+describe("Sqlite driver", function() {
+	var db = null;
+	var Person = null;
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			Person = db.define("person", {
+				name: String
+			});
+
+			return helper.dropSync([ Person ], done);
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	describe("#clear", function () {
+		beforeEach(function (done) {
+			Person.create([{ name: 'John' }, { name: 'Jane' }], function (err) {
+				Person.count(function (err, count) {
+					should.not.exist(err);
+					should.equal(count, 2);
+					done();
+				});
+			});
+		});
+
+		it("should drop all items", function (done) {
+			Person.clear(function (err) {
+				should.not.exist(err);
+
+				Person.count(function (err, count) {
+					should.not.exist(err);
+					should.equal(count, 0);
+					done();
+				});
+			});
+		});
+
+		it("should reset id sequence", function (done) {
+			Person.clear(function (err) {
+				should.not.exist(err);
+				db.driver.execQuery("SELECT * FROM ?? WHERE ?? = ?", ['sqlite_sequence', 'name', Person.table], function (err, data) {
+					should.not.exist(err);
+
+					Person.create({ name: 'Bob' }, function (err, person) {
+						should.not.exist(err);
+						should.equal(person.id, 1);
+
+						done();
+					});
+				});
+			});
+		});
+	});
+});

From b76073732e327bba6efc61404a7bc6ae00184df5 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 19 May 2014 10:53:21 +1000
Subject: [PATCH 0982/1246] Fix hasMany.getAccessor().count()

---
 Changelog.md                            |  6 ++++++
 lib/ChainFind.js                        |  4 +++-
 package.json                            |  2 +-
 test/integration/association-hasmany.js | 26 +++++++++++++++++++++++++
 test/integration/orm-exports.js         |  2 +-
 5 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 826aff34..0667164e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,9 @@
+### v2.1.11 - 19 May 2014
+- Fix hasMany.getAccessor().count()
+
+### v2.1.10 - 09 May 2014
+- Fix sqlite Dialect.clear - resets incremental counters (#497)
+
 ### v2.1.9 - 06 May 2014
 - Add basic PostGIS support - (#456, #375)
 - Allow mapping model properties to differently named columns (#273, #495)
diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index fb0c8daa..e52aa756 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -78,7 +78,9 @@ function ChainFind(Model, opts) {
 			return this;
 		},
 		count: function (cb) {
-			opts.driver.count(opts.table, opts.conditions, {}, function (err, data) {
+			opts.driver.count(opts.table, opts.conditions, {
+				merge  : opts.merge
+			}, function (err, data) {
 				if (err || data.length === 0) {
 					return cb(err);
 				}
diff --git a/package.json b/package.json
index 858d71e2..ee0bac22 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.10",
+	"version"     : "2.1.11",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",
diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
index 27b2a4ed..030959d2 100644
--- a/test/integration/association-hasmany.js
+++ b/test/integration/association-hasmany.js
@@ -152,6 +152,32 @@ describe("hasMany", function () {
 				return done();
 			});
 		});
+
+		it("should allow chaining count()", function (done) {
+			Person.find({}, function (err, people) {
+				should.equal(err, null);
+
+				people[0].getPets().count(function (err, count) {
+					should.not.exist(err);
+
+					should.strictEqual(count, 2);
+
+					people[1].getPets().count(function (err, count) {
+						should.not.exist(err);
+
+						should.strictEqual(count, 1);
+
+						people[2].getPets().count(function (err, count) {
+							should.not.exist(err);
+
+							should.strictEqual(count, 0);
+
+							return done();
+						});
+					});
+				});
+			});
+		});
 	});
 
 	describe("hasAccessor", function () {
diff --git a/test/integration/orm-exports.js b/test/integration/orm-exports.js
index d7ed6a56..1e516ce4 100644
--- a/test/integration/orm-exports.js
+++ b/test/integration/orm-exports.js
@@ -72,7 +72,7 @@ describe("ORM.connect()", function () {
 	});
 
 	it("should allow protocol alias", function (done) {
-		var db = ORM.connect("pg://unknowndb");
+		var db = ORM.connect("pg://127.0.0.2");
 
 		db.on("connect", function (err) {
 			should.exist(err);

From 095fb51810e064774fd90cc07af2d186758e7173 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 20 May 2014 19:52:06 +1000
Subject: [PATCH 0983/1246] Add custom type support to hasMany extra properties

---
 Changelog.md                        |  3 ++
 lib/Associations/Many.js            |  4 +--
 lib/Model.js                        |  2 +-
 test/integration/property-custom.js | 46 +++++++++++++++++++++++++++++
 4 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 0667164e..b5e8d6f6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### v2.1.next
+- Add custom-type support to hasMany extra properties.
+
 ### v2.1.11 - 19 May 2014
 - Fix hasMany.getAccessor().count()
 
diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 15b30b64..61357168 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -6,7 +6,7 @@ var Property            = require("../Property");
 var ORMError            = require("../Error");
 var util                = require("../Utilities");
 
-exports.prepare = function (Model, associations) {
+exports.prepare = function (db, Model, associations) {
 	Model.hasMany = function () {
 		var name;
 		var OtherModel = Model;
@@ -36,7 +36,7 @@ exports.prepare = function (Model, associations) {
 		} else {
 			for (var k in props) {
 				props[k] = Property.normalize({
-					prop: props[k], name: k, customTypes: {}, settings: Model.settings
+					prop: props[k], name: k, customTypes: db.customTypes, settings: Model.settings
 				});
 			}
 		}
diff --git a/lib/Model.js b/lib/Model.js
index 3bc8569a..e888be34 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -696,7 +696,7 @@ function Model(opts) {
 	}
 
 	OneAssociation.prepare(model, one_associations, association_properties, model_fields);
-	ManyAssociation.prepare(model, many_associations);
+	ManyAssociation.prepare(opts.db, model, many_associations);
 	ExtendAssociation.prepare(opts.db, model, extend_associations);
 
 	return model;
diff --git a/test/integration/property-custom.js b/test/integration/property-custom.js
index e0136926..96978ccd 100644
--- a/test/integration/property-custom.js
+++ b/test/integration/property-custom.js
@@ -70,6 +70,52 @@ describe("custom types", function() {
 				});
 			});
 		});
+
+		describe("hasMany extra properties", function () {
+			it("should work", function (done) {
+				db.defineType('customDate', {
+			    datastoreType: function (prop) {
+			      return 'TEXT';
+			    }
+			  });
+				var Person = db.define('person', {
+					name    : String,
+					surname : String,
+					age     : Number
+				});
+				var Pet = db.define('pet', {
+					name    : String
+				});
+				Person.hasMany('pets', Pet, { date: { type: 'customDate' } }, { autoFetch: true });
+
+				return helper.dropSync([ Person, Pet ], function (err) {
+					should.not.exist(err);
+
+					Person.create({
+						name    : "John",
+						surname : "Doe",
+						age     : 20
+					}, function (err, person) {
+						should.not.exist(err);
+
+						Pet.create({ name: 'Fido' }, function (err, pet) {
+							should.not.exist(err);
+
+							person.addPets(pet, { date: '2014-05-20' }, function (err) {
+								should.not.exist(err);
+
+								Person.get(person.id, function (err, freshPerson) {
+									should.not.exist(err);
+									should.equal(freshPerson.pets.length, 1);
+									should.equal(freshPerson.pets[0].extra.date, '2014-05-20');
+									done();
+								});
+							});
+						});
+					});
+				});
+			});
+		});
 	});
 
 	describe("complex", function () {

From 8e8ce964db2436f7d49fadbcc65be705b52f5e83 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 20 May 2014 21:10:05 +1000
Subject: [PATCH 0984/1246] Fix SQLite index name collisions. Closes #499

---
 Changelog.md | 3 ++-
 package.json | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b5e8d6f6..2f61034b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,6 @@
-### v2.1.next
+### v2.1.12
 - Add custom-type support to hasMany extra properties.
+- Fix SQLite index name collisions (#499)
 
 ### v2.1.11 - 19 May 2014
 - Fix hasMany.getAccessor().count()
diff --git a/package.json b/package.json
index ee0bac22..04ed73a7 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.11",
+	"version"     : "2.1.12",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",
@@ -38,7 +38,7 @@
 	"dependencies": {
 		"enforce"      : "0.1.2",
 		"sql-query"    : "git://github.com/dresende/node-sql-query.git#v0.1.17",
-		"sql-ddl-sync" : "git://github.com/dresende/node-sql-ddl-sync.git#v0.3.5",
+		"sql-ddl-sync" : "git://github.com/dresende/node-sql-ddl-sync.git#v0.3.6",
 		"hat"          : "0.0.3",
 		"lodash"       : "2.4.1"
 	},

From 88019cf60cbd0277f50c7597a0536b54963547fb Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 20 May 2014 21:12:09 +1000
Subject: [PATCH 0985/1246] Add SQLite index name collision test case

---
 test/integration/model-sync.js | 38 ++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 test/integration/model-sync.js

diff --git a/test/integration/model-sync.js b/test/integration/model-sync.js
new file mode 100644
index 00000000..bf4199a3
--- /dev/null
+++ b/test/integration/model-sync.js
@@ -0,0 +1,38 @@
+var _      = require('lodash');
+var should = require('should');
+var helper = require('../support/spec_helper');
+var ORM    = require('../../');
+var common = require('../common');
+
+describe("Model.sync", function () {
+  var db     = null;
+
+  before(function(done) {
+    helper.connect(function (connection) {
+      db = connection;
+      done();
+    });
+  });
+
+  after(function () {
+    db.close();
+  });
+
+  // SQLite scopes index names to a database and NOT a table, so
+  // index name collisions were possible. This tests the workaround.
+  it("should work with multiple same-named indexes", function (done) {
+    var A, B, C;
+
+    A = db.define('a', { name: String });
+    B = db.define('b', { name: String });
+    C = db.define('c', { name: String });
+
+    A.hasMany('bees', B, {}, { reverse: 'eighs' });
+    A.hasMany('cees', C, {}, { reverse: 'eighs' });
+
+    helper.dropSync([A, B, C], function (err) {
+      should.not.exist(err);
+      done();
+    });
+  });
+});

From 3402ec71dc497a8f33179b080a59a4f0cd024381 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 21 May 2014 15:54:12 +1000
Subject: [PATCH 0986/1246] Update to newest sql-query

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 04ed73a7..e12fe986 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.12",
+	"version"     : "2.1.13",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",
@@ -37,7 +37,7 @@
 	"analyse"     : false,
 	"dependencies": {
 		"enforce"      : "0.1.2",
-		"sql-query"    : "git://github.com/dresende/node-sql-query.git#v0.1.17",
+		"sql-query"    : "git://github.com/dresende/node-sql-query.git#v0.1.20",
 		"sql-ddl-sync" : "git://github.com/dresende/node-sql-ddl-sync.git#v0.3.6",
 		"hat"          : "0.0.3",
 		"lodash"       : "2.4.1"

From 4c668a1ce23b5c659d3b2c5fa36ad8d7363ee92e Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 21 May 2014 15:57:09 +1000
Subject: [PATCH 0987/1246] Update changelog

---
 Changelog.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 2f61034b..b0325563 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,4 +1,7 @@
-### v2.1.12
+### v2.1.13 - 21 May 2014
+- Dont modify array passed to execQuery
+
+### v2.1.12 - 20 May 2014
 - Add custom-type support to hasMany extra properties.
 - Fix SQLite index name collisions (#499)
 

From 2bd126a53c435a5577e58f7385ae9f232194da87 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 21 May 2014 16:42:52 +1000
Subject: [PATCH 0988/1246] Revert special treatment for +postgres

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e12fe986..59118fef 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
 	"analyse"     : false,
 	"dependencies": {
 		"enforce"      : "0.1.2",
-		"sql-query"    : "git://github.com/dresende/node-sql-query.git#v0.1.20",
+		"sql-query"    : "git://github.com/dresende/node-sql-query.git#v0.1.21",
 		"sql-ddl-sync" : "git://github.com/dresende/node-sql-ddl-sync.git#v0.3.6",
 		"hat"          : "0.0.3",
 		"lodash"       : "2.4.1"

From 820c431cd71058f59f2785ec573f56f756ff7047 Mon Sep 17 00:00:00 2001
From: m407 <m407@mail.ru>
Date: Fri, 16 May 2014 12:03:00 +0400
Subject: [PATCH 0989/1246] Update package.json

There is an issue when you develop behind a proxy. General git URL won't work.
---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 59118fef..1e887d98 100644
--- a/package.json
+++ b/package.json
@@ -37,8 +37,8 @@
 	"analyse"     : false,
 	"dependencies": {
 		"enforce"      : "0.1.2",
-		"sql-query"    : "git://github.com/dresende/node-sql-query.git#v0.1.21",
-		"sql-ddl-sync" : "git://github.com/dresende/node-sql-ddl-sync.git#v0.3.6",
+		"sql-query"    : "http://github.com/dresende/node-sql-query.git#v0.1.21",
+		"sql-ddl-sync" : "http://github.com/dresende/node-sql-ddl-sync.git#v0.3.6",
 		"hat"          : "0.0.3",
 		"lodash"       : "2.4.1"
 	},

From 3ffd583796cdef1442a0f07ffe67bd55d2bd5c3f Mon Sep 17 00:00:00 2001
From: m407 <m407@mail.ru>
Date: Wed, 21 May 2014 14:56:38 +0400
Subject: [PATCH 0990/1246] Fixed git dependency url

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 1e887d98..2ac3af82 100644
--- a/package.json
+++ b/package.json
@@ -37,8 +37,8 @@
 	"analyse"     : false,
 	"dependencies": {
 		"enforce"      : "0.1.2",
-		"sql-query"    : "http://github.com/dresende/node-sql-query.git#v0.1.21",
-		"sql-ddl-sync" : "http://github.com/dresende/node-sql-ddl-sync.git#v0.3.6",
+		"sql-query"    : "git+https://github.com/dresende/node-sql-query.git#v0.1.21",
+		"sql-ddl-sync" : "git+https://github.com/dresende/node-sql-ddl-sync.git#v0.3.6",
 		"hat"          : "0.0.3",
 		"lodash"       : "2.4.1"
 	},

From 7234015dd9aec82e730e8d737ac2541ccbbc6da0 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 22 May 2014 18:47:38 +1000
Subject: [PATCH 0991/1246] Allow specifying `key: true` on properties rather
 than passing array of ids

---
 Changelog.md             |  3 +++
 Readme.md                | 19 ++++++++-----------
 lib/Associations/Many.js | 20 +++++++++++++++++---
 lib/Associations/One.js  |  1 +
 lib/Model.js             | 35 +++++++++++++++++++----------------
 lib/ORM.js               |  2 +-
 lib/Settings.js          |  4 ++++
 lib/Utilities.js         | 23 +++++++++++++++++++++++
 8 files changed, 76 insertions(+), 31 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b0325563..1b4147bd 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### v2.1.14 - ***
+- Allow explicitly specifying `key: true` on properties rather than passing in an array of ids.
+
 ### v2.1.13 - 21 May 2014
 - Dont modify array passed to execQuery
 
diff --git a/Readme.md b/Readme.md
index 88045729..5c6ddd64 100755
--- a/Readme.md
+++ b/Readme.md
@@ -232,17 +232,16 @@ See information in the [wiki](https://github.com/dresende/node-orm2/wiki/Synchin
 
 ORM2 allows you some advanced tweaks on your Model definitions. You can configure these via settings or in the call to `define` when you setup the Model.
 
-For example, each Model instance has a unique ID in the database. This table column is
-by default "id" but you can change it.
+For example, each Model instance has a unique ID in the database. This table column is added automatically, and called "id" by default.<br/>
+If you define your own `key: true` column, "id" will not be added:
 
 ```js
 var Person = db.define("person", {
-	name : String
-}, {
-	id   : "person_id"
+	personId : { type: 'serial', key: true },
+	name     : String
 });
 
-// or just do it globally..
+// You can also change the default "id" property name globally:
 db.settings.set("properties.primary_key", "UID");
 
 // ..and then define your Models
@@ -253,14 +252,12 @@ var Pet = db.define("pet", {
 
 **Pet** model will have 2 columns, an `UID` and a `name`.
 
-It is also possible to have multiple IDs for a model in the database, this is done by specifying an array of IDs to use.
+It's also possible to have composite keys:
 
 ```js
 var Person = db.define("person", {
-	firstname: String,
-	lastname: String
-}, {
-	id: ['firstname', 'lastname']
+	firstname : { type: 'string', key: true },
+	lastname  : { type: 'string', key: true }
 });
 ```
 
diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 61357168..a92e4b2c 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -8,7 +8,7 @@ var util                = require("../Utilities");
 
 exports.prepare = function (db, Model, associations) {
 	Model.hasMany = function () {
-		var name;
+		var name, makeKey, mergeId, mergeAssocId;
 		var OtherModel = Model;
 		var props = null;
 		var opts = {};
@@ -41,6 +41,20 @@ exports.prepare = function (db, Model, associations) {
 			}
 		}
 
+		makeKey = opts.key || Settings.defaults().hasMany.key;
+
+		mergeId = util.convertPropToJoinKeyProp(
+			util.wrapFieldObject(opts.mergeId, OtherModel, Model.table, OtherModel.properties) ||
+			util.formatField(OtherModel, Model.table, true, opts.reversed),
+			{ makeKey: makeKey, required: true }
+		);
+
+		mergeAssocId = util.convertPropToJoinKeyProp(
+			util.wrapFieldObject(opts.mergeAssocId, Model, name, Model.properties) ||
+			util.formatField(Model, name, true, opts.reversed),
+			{ makeKey: makeKey, required: true }
+		)
+
 		var assocName = opts.name || ucfirst(name);
 		var assocTemplateName = opts.accessor || assocName;
 		var association = {
@@ -53,8 +67,8 @@ exports.prepare = function (db, Model, associations) {
 			// I'm not sure the next key is used..
 			field          : util.wrapFieldObject(opts.field, OtherModel, Model.table, OtherModel.properties) || util.formatField(Model, name, true, opts.reversed),
 			mergeTable     : opts.mergeTable || (Model.table + "_" + name),
-			mergeId        : util.wrapFieldObject(opts.mergeId, OtherModel, Model.table, OtherModel.properties) || util.formatField(OtherModel, Model.table, true, opts.reversed),
-			mergeAssocId   : util.wrapFieldObject(opts.mergeAssocId, Model, name, Model.properties) || util.formatField(Model, name, true, opts.reversed),
+			mergeId        : mergeId,
+			mergeAssocId   : mergeAssocId,
 			getAccessor    : opts.getAccessor || ("get" + assocTemplateName),
 			setAccessor    : opts.setAccessor || ("set" + assocTemplateName),
 			hasAccessor    : opts.hasAccessor || ("has" + assocTemplateName),
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index 426acb1e..cd309268 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -41,6 +41,7 @@ exports.prepare = function (Model, associations, association_properties, model_f
 		} else if(!association.extension) {
 			association.field = util.wrapFieldObject(association.field, Model, Model.table, Model.properties);
 		}
+		util.convertPropToJoinKeyProp(association.field, { makeKey: false, required: false });
 		for (var k in Accessors) {
 			if (!association.hasOwnProperty(k + "Accessor")) {
 				association[k + "Accessor"] = Accessors[k] + assocTemplateName;
diff --git a/lib/Model.js b/lib/Model.js
index e888be34..f84e91f8 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -1,3 +1,4 @@
+var _                 = require("lodash");
 var ChainFind         = require("./ChainFind");
 var Instance          = require("./Instance").Instance;
 var LazyLoad          = require("./LazyLoad");
@@ -22,11 +23,10 @@ var AvailableHooks    = [
 exports.Model = Model;
 
 function Model(opts) {
-	opts = opts || {};
-
-	if (!Array.isArray(opts.id)) {
-		opts.id = [ opts.id ];
-	}
+	opts = _.defaults(opts || {}, {
+		id: []
+	});
+	opts.id = Array.isArray(opts.id) ? opts.id : [opts.id];
 
 	var one_associations       = [];
 	var many_associations      = [];
@@ -645,7 +645,17 @@ function Model(opts) {
 		}
 	}
 
-	var currFields = {}, cType;
+	var currFields = {}, cType, name;
+
+	// If no keys are defined add the default one
+	if (opts.id.length == 0 && !_.any(opts.properties, { key: true })) {
+		name = opts.settings.get("properties.primary_key");
+
+		opts.properties[name] = Property.normalize({
+			prop: { type: 'serial', key: true, required: false, klass: 'key' },
+			name: name, customTypes: opts.db.customTypes, settings: opts.settings
+		});
+	}
 
 	// standardize properties
 	for (k in opts.properties) {
@@ -659,7 +669,10 @@ function Model(opts) {
 
 		if (opts.id.indexOf(k) != -1) {
 			prop.key = true;
+		} else if (prop.key) {
+			opts.id.push(k);
 		}
+
 		if (prop.lazyload !== true && !currFields[k]) {
 			currFields[k] = true;
 			if ((cType = opts.db.customTypes[prop.type]) && cType.datastoreGet) {
@@ -680,16 +693,6 @@ function Model(opts) {
 		}
 	}
 
-	for (var i = 0; i < opts.id.length; i++) {
-		k = opts.id[i];
-		allProperties[k] = opts.properties[k] || Property.normalize({
-			prop: { type: 'serial', key: true, klass: 'key' },
-			name: k, customTypes: opts.db.customTypes, settings: opts.settings
-		});
-		fieldToPropertyMap[allProperties[k].mapsTo] = allProperties[k];
-	}
-	model_fields = opts.id.concat(model_fields);
-
 	// setup hooks
 	for (k in AvailableHooks) {
 		model[AvailableHooks[k]] = createHookHelper(AvailableHooks[k]);
diff --git a/lib/ORM.js b/lib/ORM.js
index 5ad2385a..26d6b643 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -226,7 +226,7 @@ ORM.prototype.define = function (name, properties, opts) {
 		extension      : opts.extension || false,
 		indexes        : opts.indexes || [],
 		cache          : opts.hasOwnProperty("cache") ? opts.cache : this.settings.get("instance.cache"),
-		id             : opts.id || this.settings.get("properties.primary_key"),
+		id             : opts.id,// || this.settings.get("properties.primary_key"),
 		autoSave       : opts.hasOwnProperty("autoSave") ? opts.autoSave : this.settings.get("instance.autoSave"),
 		autoFetch      : opts.hasOwnProperty("autoFetch") ? opts.autoFetch : this.settings.get("instance.autoFetch"),
 		autoFetchLimit : opts.autoFetchLimit || this.settings.get("instance.autoFetchLimit"),
diff --git a/lib/Settings.js b/lib/Settings.js
index 47aeaee1..74ee0350 100644
--- a/lib/Settings.js
+++ b/lib/Settings.js
@@ -14,6 +14,10 @@ var default_settings = {
 		cascadeRemove   : true,
 		returnAllErrors : false
 	},
+	hasMany    : {
+		// Makes the foreign key fields a composite key
+		key             : false
+	},
 	connection : {
 		reconnect       : true,
 		pool            : false,
diff --git a/lib/Utilities.js b/lib/Utilities.js
index c168bd26..b5f2a9ae 100644
--- a/lib/Utilities.js
+++ b/lib/Utilities.js
@@ -234,6 +234,29 @@ exports.formatField = function (model, name, required, reversed) {
 	return fields;
 };
 
+// If the parent associations key is `serial`, the join tables
+// key should be changed to `integer`.
+exports.convertPropToJoinKeyProp = function (props, opts) {
+	var prop;
+
+	for (var k in props) {
+		prop = props[k];
+
+		prop.required = opts.required;
+
+		if (prop.type == 'serial') {
+			prop.type = 'integer';
+		}
+		if (opts.makeKey) {
+			prop.key = true;
+		} else {
+			delete prop.key;
+		}
+	}
+
+	return props;
+}
+
 exports.getRealPath = function (path_str, stack_index) {
 	var path = require("path"); // for now, load here (only when needed)
 	var cwd = process.cwd();

From 1cd44d8724cae0f05733a00a445e65ed684a4d6c Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 22 May 2014 21:54:12 +1000
Subject: [PATCH 0992/1246] Fix Property.mapsTo. Closes #506

---
 Changelog.md                         |   3 +-
 lib/AggregateFunctions.js            |   6 +-
 lib/ChainFind.js                     |  16 +++-
 lib/Drivers/DML/mongodb.js           |   5 +-
 lib/Instance.js                      |  15 ++-
 lib/Model.js                         |  37 +++-----
 lib/Utilities.js                     |  53 +++++++++++
 package.json                         |   2 +-
 test/integration/property-maps-to.js | 134 +++++++++++++++++++++++++++
 9 files changed, 235 insertions(+), 36 deletions(-)
 create mode 100644 test/integration/property-maps-to.js

diff --git a/Changelog.md b/Changelog.md
index 1b4147bd..aa392bc0 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,6 @@
-### v2.1.14 - ***
+### v2.1.14 - 22 May 2014
 - Allow explicitly specifying `key: true` on properties rather than passing in an array of ids.
+- Fix Property.mapsTo (#506)
 
 ### v2.1.13 - 21 May 2014
 - Dont modify array passed to execQuery
diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index da8544c1..4ce0ce75 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -55,9 +55,9 @@ function AggregateFunctions(opts) {
 				throw new ORMError('PARAM_MISMATCH', "When using append you must at least define one property");
 			}
 			if (Array.isArray(arguments[0])) {
-				opts.properties = opts.properties.concat(arguments[0]);
+				opts.propertyList = opts.propertyList.concat(arguments[0]);
 			} else {
-				opts.properties = opts.properties.concat(Array.prototype.slice.apply(arguments));
+				opts.propertyList = opts.propertyList.concat(Array.prototype.slice.apply(arguments));
 			}
 			return this;
 		},
@@ -97,7 +97,7 @@ function AggregateFunctions(opts) {
 				throw new ORMError('PARAM_MISMATCH', "Missing aggregate functions");
 			}
 
-			var query = opts.driver.getQuery().select().from(opts.table).select(opts.properties);
+			var query = opts.driver.getQuery().select().from(opts.table).select(opts.propertyList);
 			var i, j;
 
 			for (i = 0; i < aggregates.length; i++) {
diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index e52aa756..b2b52cfb 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -1,4 +1,5 @@
 var _             = require("lodash");
+var Utilities     = require("./Utilities");
 var ChainInstance = require("./ChainInstance");
 var Promise       = require("./Promise").Promise;
 
@@ -45,7 +46,7 @@ function ChainFind(Model, opts) {
 			} else {
 				omit = Array.prototype.slice.apply(arguments);
 			}
-			this.only(_.difference(Object.keys(Model.allProperties), omit));
+			this.only(_.difference(Object.keys(opts.properties), omit));
 			return this;
 		},
 		limit: function (limit) {
@@ -170,9 +171,18 @@ function ChainFind(Model, opts) {
 			return this;
 		},
 		all: function (cb) {
-			opts.driver.find(opts.only, opts.table, opts.conditions, {
+			var order, conditions;
+
+			conditions = Utilities.transformPropertyNames(
+				opts.conditions, opts.properties
+			);
+			order = Utilities.transformOrderPropertyNames(
+				opts.order, opts.properties
+			);
+
+			opts.driver.find(opts.only, opts.table, conditions, {
 				limit  : opts.limit,
-				order  : opts.order,
+				order  : order,
 				merge  : opts.merge,
 				offset : opts.offset,
 				exists : opts.exists
diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
index 45fc3657..06208999 100644
--- a/lib/Drivers/DML/mongodb.js
+++ b/lib/Drivers/DML/mongodb.js
@@ -264,7 +264,10 @@ Driver.prototype.hasMany = function (Model, association) {
 
 				if (options.order) {
 					options.order[0] = options.order[0][1];
-					options.order = Utilities.standardizeOrder(options.order);
+					options.order = Utilities.transformOrderPropertyNames(
+						Utilities.standardizeOrder(options.order),
+						Model.allProperties
+					);
 				}
 
 				options.extra_props = association.props;
diff --git a/lib/Instance.js b/lib/Instance.js
index 859be697..f7a9c3c3 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -1,6 +1,7 @@
-var Property = require("./Property");
-var Hook     = require("./Hook");
-var enforce  = require("enforce");
+var Utilities = require("./Utilities");
+var Property  = require("./Property");
+var Hook      = require("./Hook");
+var enforce   = require("enforce");
 
 exports.Instance = Instance;
 
@@ -156,9 +157,9 @@ function Instance(Model, opts) {
 				}
 
 				if (opts.driver.propertyToValue) {
-					data[prop.mapsTo] = opts.driver.propertyToValue(opts.data[k], prop);
+					data[k] = opts.driver.propertyToValue(opts.data[k], prop);
 				} else {
-					data[prop.mapsTo] = opts.data[k];
+					data[k] = opts.data[k];
 				}
 			} else {
 				data[k] = opts.data[k];
@@ -191,6 +192,8 @@ function Instance(Model, opts) {
 			}, true);
 		}
 
+		data = Utilities.transformPropertyNames(data, Model.allProperties);
+
 		opts.driver.insert(opts.table, data, opts.id, function (save_err, info) {
 			if (save_err) {
 				return saveError(cb, save_err);
@@ -248,6 +251,8 @@ function Instance(Model, opts) {
 			for (i = 0; i < opts.id.length; i++) {
 				conditions[opts.id[i]] = data[opts.id[i]];
 			}
+			changes = Utilities.transformPropertyNames(changes, Model.allProperties);
+
 			opts.driver.update(opts.table, changes, conditions, function (err) {
 				if (err) {
 					return saveError(cb, err);
diff --git a/lib/Model.js b/lib/Model.js
index f84e91f8..b1921680 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -110,7 +110,8 @@ function Model(opts) {
 			many_associations      : many_associations,
 			extend_associations    : extend_associations,
 			association_properties : association_properties,
-			setupAssociations      : setupAssociations
+			setupAssociations      : setupAssociations,
+			fieldToPropertyMap     : fieldToPropertyMap
 		});
 		instance.on("ready", function (err) {
 			if (--pending > 0) {
@@ -143,18 +144,6 @@ function Model(opts) {
 		return instance;
 	};
 
-	var mapDatastoreFieldsToProperties = function (dataIn) {
-		var k, prop;
-		var dataOut = {};
-
-		for (k in dataIn) {
-			prop = fieldToPropertyMap[k];
-			if (!prop) dataOut[k] = dataIn[k];
-			else       dataOut[prop.name] = dataIn[k];
-		}
-		return dataOut;
-	}
-
 	var model = function () {
 	    var instance, i;
 
@@ -299,7 +288,7 @@ function Model(opts) {
 				return cb(new ORMError("Not found", 'NOT_FOUND', { model: opts.table }));
 			}
 
-			data = mapDatastoreFieldsToProperties(data[0]);
+			Utilities.renameDatastoreFieldsToPropertyNames(data[0], fieldToPropertyMap);
 
 			var uid = opts.driver.uid + "/" + opts.table + "/" + ids.join("/");
 
@@ -307,7 +296,7 @@ function Model(opts) {
 				cache      : (options.hasOwnProperty("cache") ? options.cache : opts.cache),
 				save_check : opts.settings.get("instance.cacheSaveCheck")
 			}, function (cb) {
-				return createInstance(data, {
+				return createInstance(data[0], {
 					uid            : uid,
 					autoSave       : options.autoSave,
 					autoFetch      : (options.autoFetchLimit === 0 ? false : options.autoFetch),
@@ -399,12 +388,15 @@ function Model(opts) {
 			order        : order,
 			merge        : merge,
 			offset       : options.offset,
+			properties   : allProperties,
 			newInstance  : function (data, cb) {
 				var uid = opts.driver.uid + "/" + opts.table + (merge ? "+" + merge.from.table : "");
 				for (var i = 0; i < opts.id.length; i++) {
 					uid += "/" + data[opts.id[i]];
 				}
 
+				Utilities.renameDatastoreFieldsToPropertyNames(data, fieldToPropertyMap);
+
 				Singleton.get(uid, {
 					cache      : options.cache,
 					save_check : opts.settings.get("instance.cacheSaveCheck")
@@ -495,12 +487,12 @@ function Model(opts) {
 
 	model.aggregate = function () {
 		var conditions = {};
-		var properties = [];
+		var propertyList = [];
 
 		for (var i = 0; i < arguments.length; i++) {
 			if (typeof arguments[i] === "object") {
 				if (Array.isArray(arguments[i])) {
-					properties = arguments[i];
+					propertyList = arguments[i];
 				} else {
 					conditions = arguments[i];
 				}
@@ -512,11 +504,12 @@ function Model(opts) {
 		}
 
 		return new require("./AggregateFunctions")({
-			table       : opts.table,
-			driver_name : opts.driver_name,
-			driver      : opts.driver,
-			conditions  : conditions,
-			properties  : properties
+			table        : opts.table,
+			driver_name  : opts.driver_name,
+			driver       : opts.driver,
+			conditions   : conditions,
+			propertyList : propertyList,
+			properties   : allProperties
 		});
 	};
 
diff --git a/lib/Utilities.js b/lib/Utilities.js
index b5f2a9ae..ce34bf0f 100644
--- a/lib/Utilities.js
+++ b/lib/Utilities.js
@@ -280,3 +280,56 @@ exports.getRealPath = function (path_str, stack_index) {
 
 	return path_str;
 };
+
+exports.transformPropertyNames = function (dataIn, properties) {
+	var k, prop;
+	var dataOut = {};
+
+	for (k in dataIn) {
+		prop = properties[k];
+		if (prop) {
+			dataOut[prop.mapsTo] = dataIn[k];
+		} else {
+			dataOut[k] = dataIn[k];
+		}
+	}
+	return dataOut;
+};
+
+exports.transformOrderPropertyNames = function (order, properties) {
+	if (!order) return order;
+
+	var i, item;
+	var newOrder = JSON.parse(JSON.stringify(order));
+
+	// Rename order properties according to mapsTo
+	for (var i = 0; i < newOrder.length; i++) {
+		item = newOrder[i];
+
+		// orderRaw
+		if (Array.isArray(item[1])) continue;
+
+		if (Array.isArray(item[0])) {
+			// order on a hasMany
+			// [ ['modelName', 'propName'], 'Z']
+			item[0][1] = properties[item[0][1]].mapsTo;
+		} else {
+			// normal order
+			item[0] = properties[item[0]].mapsTo;
+		}
+	}
+	return newOrder;
+}
+
+exports.renameDatastoreFieldsToPropertyNames = function (data, fieldToPropertyMap) {
+	var k, prop;
+
+	for (k in data) {
+		prop = fieldToPropertyMap[k];
+		if (prop && prop.name != k) {
+			data[prop.name] = data[k];
+			delete data[k];
+		}
+	}
+	return data;
+}
diff --git a/package.json b/package.json
index 2ac3af82..0ae682ff 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.13",
+	"version"     : "2.1.14",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",
diff --git a/test/integration/property-maps-to.js b/test/integration/property-maps-to.js
new file mode 100644
index 00000000..c982d470
--- /dev/null
+++ b/test/integration/property-maps-to.js
@@ -0,0 +1,134 @@
+var _        = require('lodash');
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var common   = require('../common');
+var ORM      = require('../../');
+
+if (common.protocol() == "mongodb") return;
+
+describe("Property.mapsTo", function() {
+	var db = null;
+	var Book = null;
+	var id1 = null, id2 = null;
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+			db.settings.set('instance.cache', false);
+
+			return done();
+		});
+	});
+
+	before(function (done) {
+		Book = db.define("book", {
+			title: { type: 'text', mapsTo: 'book_title', required: true },
+			pages: { type: 'integer', required: false }
+		});
+
+		return helper.dropSync(Book, done);
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	it("should create", function (done) {
+		Book.create({ title: "History of the wheel", pages: 297 }, function (err, book) {
+			should.not.exist(err);
+			should.exist(book);
+			should.equal(book.title, "History of the wheel");
+			id1 = book.id;
+
+			done()
+		});
+	});
+
+	it("should save new", function (done) {
+		book = new Book({ title: "Stuff", pages: 33 })
+		book.save(function (err, book) {
+			should.not.exist(err);
+			should.exist(book);
+			should.equal(book.title, "Stuff");
+			id2 = book.id;
+
+			done()
+		});
+	});
+
+	it("should get book1", function (done) {
+		Book.get(id1, function (err, book) {
+			should.not.exist(err);
+			should.exist(book);
+			should.equal(book.title, "History of the wheel");
+			done();
+		});
+	});
+
+	it("should get book2", function (done) {
+		Book.get(id2, function (err, book) {
+			should.not.exist(err);
+			should.exist(book);
+			should.equal(book.title, "Stuff");
+			done();
+		});
+	});
+
+	it("should find", function (done) {
+		Book.one({ title: "History of the wheel" }, function (err, book) {
+			should.not.exist(err);
+			should.exist(book);
+			should.equal(book.title, "History of the wheel");
+			done();
+		});
+	});
+
+	it("should update", function (done) {
+		Book.one(function (err, book) {
+			should.not.exist(err);
+			should.exist(book);
+			should.equal(book.title, "History of the wheel");
+
+			book.title = "Quantum theory";
+			book.pages = 5;
+
+			book.save(function (err) {
+				should.not.exist(err);
+				should.equal(book.title, "Quantum theory");
+
+				Book.get(book.id, function (err, freshBook) {
+					should.not.exist(err);
+					should.exist(freshBook);
+					should.equal(book.title, "Quantum theory");
+					done();
+				});
+			});
+		});
+	});
+
+	it("should order", function (done) {
+		Book.create({ title: "Zzz", pages: 2 }, function (err) {
+			should.not.exist(err);
+
+			Book.create({ title: "Aaa", pages: 3 }, function (err) {
+				should.not.exist(err);
+
+				Book.find().order("-title").all(function (err, items) {
+					should.not.exist(err);
+					should.equal(
+						_.pluck(items, 'title').join(','),
+						"Zzz,Stuff,Quantum theory,Aaa"
+					)
+					Book.find().order("title").all(function (err, items) {
+						should.not.exist(err);
+						should.equal(
+							_.pluck(items, 'title').join(','),
+							"Aaa,Quantum theory,Stuff,Zzz"
+						)
+						done();
+					});
+				});
+			});
+		});
+	});
+});

From c6c6628a53e766460f34ad9ccd6794fa88dabe4c Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 27 May 2014 22:43:19 +1000
Subject: [PATCH 0993/1246] Fix hasMany custom keys join table (#510)

---
 Changelog.md                            |   3 +
 lib/Associations/Many.js                |   8 +-
 test/integration/association-hasmany.js | 873 ++++++++++++++----------
 3 files changed, 516 insertions(+), 368 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index aa392bc0..efbf02ab 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### v2.1.?? - ???
+- Fix hasMany join tables with custom id columns (#510)
+
 ### v2.1.14 - 22 May 2014
 - Allow explicitly specifying `key: true` on properties rather than passing in an array of ids.
 - Fix Property.mapsTo (#506)
diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index a92e4b2c..d75876f5 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -44,14 +44,14 @@ exports.prepare = function (db, Model, associations) {
 		makeKey = opts.key || Settings.defaults().hasMany.key;
 
 		mergeId = util.convertPropToJoinKeyProp(
-			util.wrapFieldObject(opts.mergeId, OtherModel, Model.table, OtherModel.properties) ||
-			util.formatField(OtherModel, Model.table, true, opts.reversed),
+			util.wrapFieldObject(opts.mergeId, Model, Model.table, Model.properties) ||
+			util.formatField(Model, Model.table, true, opts.reversed),
 			{ makeKey: makeKey, required: true }
 		);
 
 		mergeAssocId = util.convertPropToJoinKeyProp(
-			util.wrapFieldObject(opts.mergeAssocId, Model, name, Model.properties) ||
-			util.formatField(Model, name, true, opts.reversed),
+			util.wrapFieldObject(opts.mergeAssocId, OtherModel, name, OtherModel.properties) ||
+			util.formatField(OtherModel, name, true, opts.reversed),
 			{ makeKey: makeKey, required: true }
 		)
 
diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
index 030959d2..cb3a9ee1 100644
--- a/test/integration/association-hasmany.js
+++ b/test/integration/association-hasmany.js
@@ -1,8 +1,9 @@
-var _      = require('lodash');
-var should = require('should');
-var helper = require('../support/spec_helper');
-var ORM    = require('../../');
-var common = require('../common');
+var _        = require('lodash');
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var ORM      = require('../../');
+var common   = require('../common');
+var protocol = common.protocol();
 
 describe("hasMany", function () {
 	this.timeout(4000);
@@ -10,56 +11,6 @@ describe("hasMany", function () {
 	var Person = null;
 	var Pet    = null;
 
-	var setup = function (opts) {
-		opts = opts || {};
-		return function (done) {
-			db.settings.set('instance.cache', false);
-
-			Person = db.define('person', {
-				name    : String,
-				surname : String,
-				age     : Number
-			});
-			Pet = db.define('pet', {
-				name    : String
-			});
-			Person.hasMany('pets', Pet, {}, { autoFetch: opts.autoFetchPets });
-
-			return helper.dropSync([ Person, Pet ], function () {
-				/**
-				 * John --+---> Deco
-				 *        '---> Mutt <----- Jane
-				 *
-				 * Justin
-				 */
-				Person.create([{
-					name    : "John",
-					surname : "Doe",
-					age     : 20,
-					pets    : [{
-						name    : "Deco"
-					}, {
-						name    : "Mutt"
-					}]
-				}, {
-					name    : "Jane",
-					surname : "Doe",
-					age     : 16
-				}, {
-					name    : "Justin",
-					surname : "Dean",
-					age     : 18
-				}], function (err) {
-					Person.find({ name: "Jane" }, function (err, people) {
-						Pet.find({ name: "Mutt" }, function (err, pets) {
-							people[0].addPets(pets, done);
-						});
-					});
-				});
-			});
-		};
-	};
-
 	before(function(done) {
 		helper.connect(function (connection) {
 			db = connection;
@@ -67,130 +18,198 @@ describe("hasMany", function () {
 		});
 	});
 
-	describe("getAccessor", function () {
-		before(setup());
+	describe("normal", function () {
+
+		var setup = function (opts) {
+			opts = opts || {};
+
+			return function (done) {
+				db.settings.set('instance.cache', false);
+
+				Person = db.define('person', {
+					name    : String,
+					surname : String,
+					age     : Number
+				});
+				Pet = db.define('pet', {
+					name    : String
+				});
+				Person.hasMany('pets', Pet, {}, { autoFetch: opts.autoFetchPets });
+
+				helper.dropSync([ Person, Pet ], function (err) {
+					if (err) return done(err);
+					/**
+					 * John --+---> Deco
+					 *        '---> Mutt <----- Jane
+					 *
+					 * Justin
+					 */
+					Person.create([{
+						name    : "John",
+						surname : "Doe",
+						age     : 20,
+						pets    : [{
+							name    : "Deco"
+						}, {
+							name    : "Mutt"
+						}]
+					}, {
+						name    : "Jane",
+						surname : "Doe",
+						age     : 16
+					}, {
+						name    : "Justin",
+						surname : "Dean",
+						age     : 18
+					}], function (err) {
+						Person.find({ name: "Jane" }, function (err, people) {
+							Pet.find({ name: "Mutt" }, function (err, pets) {
+								people[0].addPets(pets, done);
+							});
+						});
+					});
+				});
+			};
+		};
 
-		it("should allow to specify order as string", function (done) {
-			Person.find({ name: "John" }, function (err, people) {
-				should.equal(err, null);
+		describe("getAccessor", function () {
+			before(setup());
 
-				people[0].getPets("-name", function (err, pets) {
+			it("should allow to specify order as string", function (done) {
+				Person.find({ name: "John" }, function (err, people) {
 					should.equal(err, null);
 
-					should(Array.isArray(pets));
-					pets.length.should.equal(2);
-					pets[0].name.should.equal("Mutt");
-					pets[1].name.should.equal("Deco");
+					people[0].getPets("-name", function (err, pets) {
+						should.equal(err, null);
 
-					return done();
+						should(Array.isArray(pets));
+						pets.length.should.equal(2);
+						pets[0].name.should.equal("Mutt");
+						pets[1].name.should.equal("Deco");
+
+						return done();
+					});
 				});
 			});
-		});
-
-		it("should allow to specify order as Array", function (done) {
-			Person.find({ name: "John" }, function (err, people) {
-				should.equal(err, null);
 
-				people[0].getPets([ "name", "Z" ], function (err, pets) {
+			it("should allow to specify order as Array", function (done) {
+				Person.find({ name: "John" }, function (err, people) {
 					should.equal(err, null);
 
-					should(Array.isArray(pets));
-					pets.length.should.equal(2);
-					pets[0].name.should.equal("Mutt");
-					pets[1].name.should.equal("Deco");
+					people[0].getPets([ "name", "Z" ], function (err, pets) {
+						should.equal(err, null);
 
-					return done();
+						should(Array.isArray(pets));
+						pets.length.should.equal(2);
+						pets[0].name.should.equal("Mutt");
+						pets[1].name.should.equal("Deco");
+
+						return done();
+					});
 				});
 			});
-		});
-
-		it("should allow to specify a limit", function (done) {
-			Person.find({ name: "John" }).first(function (err, John) {
-				should.equal(err, null);
 
-				John.getPets(1, function (err, pets) {
+			it("should allow to specify a limit", function (done) {
+				Person.find({ name: "John" }).first(function (err, John) {
 					should.equal(err, null);
 
-					should(Array.isArray(pets));
-					pets.length.should.equal(1);
+					John.getPets(1, function (err, pets) {
+						should.equal(err, null);
 
-					return done();
+						should(Array.isArray(pets));
+						pets.length.should.equal(1);
+
+						return done();
+					});
 				});
 			});
-		});
-
-		it("should allow to specify conditions", function (done) {
-			Person.find({ name: "John" }).first(function (err, John) {
-				should.equal(err, null);
 
-				John.getPets({ name: "Mutt" }, function (err, pets) {
+			it("should allow to specify conditions", function (done) {
+				Person.find({ name: "John" }).first(function (err, John) {
 					should.equal(err, null);
 
-					should(Array.isArray(pets));
-					pets.length.should.equal(1);
-					pets[0].name.should.equal("Mutt");
+					John.getPets({ name: "Mutt" }, function (err, pets) {
+						should.equal(err, null);
 
-					return done();
+						should(Array.isArray(pets));
+						pets.length.should.equal(1);
+						pets[0].name.should.equal("Mutt");
+
+						return done();
+					});
 				});
 			});
-		});
 
-		if (common.protocol() == "mongodb") return;
+			if (common.protocol() == "mongodb") return;
 
-		it("should return a chain if no callback defined", function (done) {
-			Person.find({ name: "John" }, function (err, people) {
-				should.equal(err, null);
+			it("should return a chain if no callback defined", function (done) {
+				Person.find({ name: "John" }, function (err, people) {
+					should.equal(err, null);
 
-				var chain = people[0].getPets({ name: "Mutt" });
+					var chain = people[0].getPets({ name: "Mutt" });
 
-				chain.should.be.a("object");
-				chain.find.should.be.a("function");
-				chain.only.should.be.a("function");
-				chain.limit.should.be.a("function");
-				chain.order.should.be.a("function");
+					chain.should.be.a("object");
+					chain.find.should.be.a("function");
+					chain.only.should.be.a("function");
+					chain.limit.should.be.a("function");
+					chain.order.should.be.a("function");
 
-				return done();
+					return done();
+				});
 			});
-		});
-
-		it("should allow chaining count()", function (done) {
-			Person.find({}, function (err, people) {
-				should.equal(err, null);
-
-				people[0].getPets().count(function (err, count) {
-					should.not.exist(err);
 
-					should.strictEqual(count, 2);
+			it("should allow chaining count()", function (done) {
+				Person.find({}, function (err, people) {
+					should.equal(err, null);
 
-					people[1].getPets().count(function (err, count) {
+					people[0].getPets().count(function (err, count) {
 						should.not.exist(err);
 
-						should.strictEqual(count, 1);
+						should.strictEqual(count, 2);
 
-						people[2].getPets().count(function (err, count) {
+						people[1].getPets().count(function (err, count) {
 							should.not.exist(err);
 
-							should.strictEqual(count, 0);
+							should.strictEqual(count, 1);
 
-							return done();
+							people[2].getPets().count(function (err, count) {
+								should.not.exist(err);
+
+								should.strictEqual(count, 0);
+
+								return done();
+							});
 						});
 					});
 				});
 			});
 		});
-	});
 
-	describe("hasAccessor", function () {
-		before(setup());
+		describe("hasAccessor", function () {
+			before(setup());
+
+			it("should return true if instance has associated item", function (done) {
+				Pet.find({ name: "Mutt" }, function (err, pets) {
+					should.equal(err, null);
+
+					Person.find({ name: "Jane" }).first(function (err, Jane) {
+						should.equal(err, null);
+
+						Jane.hasPets(pets[0], function (err, has_pets) {
+							should.equal(err, null);
+							has_pets.should.be.true;
 
-		it("should return true if instance has associated item", function (done) {
-			Pet.find({ name: "Mutt" }, function (err, pets) {
-				should.equal(err, null);
+							return done();
+						});
+					});
+				});
+			});
 
+			it("should return true if not passing any instance and has associated items", function (done) {
 				Person.find({ name: "Jane" }).first(function (err, Jane) {
 					should.equal(err, null);
 
-					Jane.hasPets(pets[0], function (err, has_pets) {
+					Jane.hasPets(function (err, has_pets) {
 						should.equal(err, null);
 						has_pets.should.be.true;
 
@@ -198,95 +217,101 @@ describe("hasMany", function () {
 					});
 				});
 			});
-		});
 
-		it("should return true if not passing any instance and has associated items", function (done) {
-			Person.find({ name: "Jane" }).first(function (err, Jane) {
-				should.equal(err, null);
+			it("should return true if all passed instances are associated", function (done) {
+				Pet.find(function (err, pets) {
+					Person.find({ name: "John" }).first(function (err, John) {
+						should.equal(err, null);
 
-				Jane.hasPets(function (err, has_pets) {
-					should.equal(err, null);
-					has_pets.should.be.true;
+						John.hasPets(pets, function (err, has_pets) {
+							should.equal(err, null);
+							has_pets.should.be.true;
 
-					return done();
+							return done();
+						});
+					});
 				});
 			});
-		});
 
-		it("should return true if all passed instances are associated", function (done) {
-			Pet.find(function (err, pets) {
-				Person.find({ name: "John" }).first(function (err, John) {
-					should.equal(err, null);
-
-					John.hasPets(pets, function (err, has_pets) {
+			it("should return false if any passed instances are not associated", function (done) {
+				Pet.find(function (err, pets) {
+					Person.find({ name: "Jane" }).first(function (err, Jane) {
 						should.equal(err, null);
-						has_pets.should.be.true;
 
-						return done();
+						Jane.hasPets(pets, function (err, has_pets) {
+							should.equal(err, null);
+							has_pets.should.be.false;
+
+							return done();
+						});
 					});
 				});
 			});
 		});
 
-		it("should return false if any passed instances are not associated", function (done) {
-			Pet.find(function (err, pets) {
-				Person.find({ name: "Jane" }).first(function (err, Jane) {
-					should.equal(err, null);
+		describe("delAccessor", function () {
+			before(setup());
 
-					Jane.hasPets(pets, function (err, has_pets) {
+			it("should accept arguments in different orders", function (done) {
+				Pet.find({ name: "Mutt" }, function (err, pets) {
+					Person.find({ name: "John" }, function (err, people) {
 						should.equal(err, null);
-						has_pets.should.be.false;
 
-						return done();
+						people[0].removePets(function (err) {
+							should.equal(err, null);
+
+							people[0].getPets(function (err, pets) {
+								should.equal(err, null);
+
+								should(Array.isArray(pets));
+								pets.length.should.equal(1);
+								pets[0].name.should.equal("Deco");
+
+								return done();
+							});
+						}, pets[0]);
 					});
 				});
 			});
 		});
-	});
-
-	describe("delAccessor", function () {
-		before(setup());
 
-		it("should accept arguments in different orders", function (done) {
-			Pet.find({ name: "Mutt" }, function (err, pets) {
-				Person.find({ name: "John" }, function (err, people) {
-					should.equal(err, null);
+		describe("delAccessor", function () {
+			before(setup());
 
-					people[0].removePets(function (err) {
+			it("should remove specific associations if passed", function (done) {
+				Pet.find({ name: "Mutt" }, function (err, pets) {
+					Person.find({ name: "John" }, function (err, people) {
 						should.equal(err, null);
 
-						people[0].getPets(function (err, pets) {
+						people[0].removePets(pets[0], function (err) {
 							should.equal(err, null);
 
-							should(Array.isArray(pets));
-							pets.length.should.equal(1);
-							pets[0].name.should.equal("Deco");
+							people[0].getPets(function (err, pets) {
+								should.equal(err, null);
 
-							return done();
+								should(Array.isArray(pets));
+								pets.length.should.equal(1);
+								pets[0].name.should.equal("Deco");
+
+								return done();
+							});
 						});
-					}, pets[0]);
+					});
 				});
 			});
-		});
-	});
-
-	describe("delAccessor", function () {
-		before(setup());
 
-		it("should remove specific associations if passed", function (done) {
-			Pet.find({ name: "Mutt" }, function (err, pets) {
-				Person.find({ name: "John" }, function (err, people) {
+			it("should remove all associations if none passed", function (done) {
+				Person.find({ name: "John" }).first(function (err, John) {
 					should.equal(err, null);
 
-					people[0].removePets(pets[0], function (err) {
+					John.removePets(function (err) {
 						should.equal(err, null);
 
-						people[0].getPets(function (err, pets) {
+						John.getPets(function (err, pets) {
 							should.equal(err, null);
 
 							should(Array.isArray(pets));
-							pets.length.should.equal(1);
-							pets[0].name.should.equal("Deco");
+							pets.length.should.equal(0);
 
 							return done();
 						});
@@ -295,74 +320,76 @@ describe("hasMany", function () {
 			});
 		});
 
-		it("should remove all associations if none passed", function (done) {
-			Person.find({ name: "John" }).first(function (err, John) {
-				should.equal(err, null);
+		describe("addAccessor", function () {
+			before(setup());
 
-				John.removePets(function (err) {
-					should.equal(err, null);
+			if (common.protocol() != "mongodb") {
+				it("might add duplicates", function (done) {
+					Pet.find({ name: "Mutt" }, function (err, pets) {
+						Person.find({ name: "Jane" }, function (err, people) {
+							should.equal(err, null);
 
-					John.getPets(function (err, pets) {
-						should.equal(err, null);
+							people[0].addPets(pets[0], function (err) {
+								should.equal(err, null);
 
-						should(Array.isArray(pets));
-						pets.length.should.equal(0);
+								people[0].getPets("name", function (err, pets) {
+									should.equal(err, null);
 
-						return done();
+									should(Array.isArray(pets));
+									pets.length.should.equal(2);
+									pets[0].name.should.equal("Mutt");
+									pets[1].name.should.equal("Mutt");
+
+									return done();
+								});
+							});
+						});
 					});
 				});
-			});
-		});
-	});
-
-	describe("addAccessor", function () {
-		before(setup());
+			}
 
-		if (common.protocol() != "mongodb") {
-			it("might add duplicates", function (done) {
-				Pet.find({ name: "Mutt" }, function (err, pets) {
-					Person.find({ name: "Jane" }, function (err, people) {
+			it("should keep associations and add new ones", function (done) {
+				Pet.find({ name: "Deco" }).first(function (err, Deco) {
+					Person.find({ name: "Jane" }).first(function (err, Jane) {
 						should.equal(err, null);
 
-						people[0].addPets(pets[0], function (err) {
-							should.equal(err, null);
+						Jane.getPets(function (err, janesPets) {
+							should.not.exist(err);
 
-							people[0].getPets("name", function (err, pets) {
+							var petsAtStart = janesPets.length;
+
+							Jane.addPets(Deco, function (err) {
 								should.equal(err, null);
 
-								should(Array.isArray(pets));
-								pets.length.should.equal(2);
-								pets[0].name.should.equal("Mutt");
-								pets[1].name.should.equal("Mutt");
+								Jane.getPets("name", function (err, pets) {
+									should.equal(err, null);
 
-								return done();
+									should(Array.isArray(pets));
+									pets.length.should.equal(petsAtStart + 1);
+									pets[0].name.should.equal("Deco");
+									pets[1].name.should.equal("Mutt");
+
+									return done();
+								});
 							});
 						});
 					});
 				});
 			});
-		}
-
-		it("should keep associations and add new ones", function (done) {
-			Pet.find({ name: "Deco" }).first(function (err, Deco) {
-				Person.find({ name: "Jane" }).first(function (err, Jane) {
-					should.equal(err, null);
 
-					Jane.getPets(function (err, janesPets) {
-						should.not.exist(err);
-
-						var petsAtStart = janesPets.length;
+			it("should accept several arguments as associations", function (done) {
+				Pet.find(function (err, pets) {
+					Person.find({ name: "Justin" }).first(function (err, Justin) {
+						should.equal(err, null);
 
-						Jane.addPets(Deco, function (err) {
+						Justin.addPets(pets[0], pets[1], function (err) {
 							should.equal(err, null);
 
-							Jane.getPets("name", function (err, pets) {
+							Justin.getPets(function (err, pets) {
 								should.equal(err, null);
 
 								should(Array.isArray(pets));
-								pets.length.should.equal(petsAtStart + 1);
-								pets[0].name.should.equal("Deco");
-								pets[1].name.should.equal("Mutt");
+								pets.length.should.equal(2);
 
 								return done();
 							});
@@ -370,48 +397,64 @@ describe("hasMany", function () {
 					});
 				});
 			});
-		});
-
-		it("should accept several arguments as associations", function (done) {
-			Pet.find(function (err, pets) {
-				Person.find({ name: "Justin" }).first(function (err, Justin) {
-					should.equal(err, null);
 
-					Justin.addPets(pets[0], pets[1], function (err) {
+			it("should accept array as list of associations", function (done) {
+				Pet.create([{ name: 'Ruff' }, { name: 'Spotty' }],function (err, pets) {
+					Person.find({ name: "Justin" }).first(function (err, Justin) {
 						should.equal(err, null);
 
-						Justin.getPets(function (err, pets) {
+						Justin.getPets(function (err, justinsPets) {
 							should.equal(err, null);
 
-							should(Array.isArray(pets));
-							pets.length.should.equal(2);
+							var petCount = justinsPets.length;
 
-							return done();
+							Justin.addPets(pets, function (err) {
+								should.equal(err, null);
+
+								Justin.getPets(function (err, justinsPets) {
+									should.equal(err, null);
+
+									should(Array.isArray(justinsPets));
+									// Mongo doesn't like adding duplicates here, so we add new ones.
+									should.equal(justinsPets.length, petCount + 2);
+
+									return done();
+								});
+							});
 						});
 					});
 				});
 			});
-		});
 
-		it("should accept array as list of associations", function (done) {
-			Pet.create([{ name: 'Ruff' }, { name: 'Spotty' }],function (err, pets) {
-				Person.find({ name: "Justin" }).first(function (err, Justin) {
+			it("should throw if no items passed", function (done) {
+				Person.one(function (err, person) {
 					should.equal(err, null);
 
-					Justin.getPets(function (err, justinsPets) {
-						should.equal(err, null);
+					(function () {
+						person.addPets(function () {});
+					}).should.throw();
+
+					return done();
+				});
+			});
+		});
 
-						var petCount = justinsPets.length;
+		describe("setAccessor", function () {
+			before(setup());
 
-						Justin.addPets(pets, function (err) {
+			it("should accept several arguments as associations", function (done) {
+				Pet.find(function (err, pets) {
+					Person.find({ name: "Justin" }).first(function (err, Justin) {
+						should.equal(err, null);
+
+						Justin.setPets(pets[0], pets[1], function (err) {
 							should.equal(err, null);
 
-							Justin.getPets(function (err, justinsPets) {
+							Justin.getPets(function (err, pets) {
 								should.equal(err, null);
 
-								should(Array.isArray(justinsPets));
-								// Mongo doesn't like adding duplicates here, so we add new ones.
-								should.equal(justinsPets.length, petCount + 2);
+								should(Array.isArray(pets));
+								pets.length.should.equal(2);
 
 								return done();
 							});
@@ -419,188 +462,225 @@ describe("hasMany", function () {
 					});
 				});
 			});
-		});
 
-		it("should throw if no items passed", function (done) {
-			Person.one(function (err, person) {
-				should.equal(err, null);
+			it("should accept an array of associations", function (done) {
+				Pet.find(function (err, pets) {
+					Person.find({ name: "Justin" }).first(function (err, Justin) {
+						should.equal(err, null);
 
-				(function () {
-					person.addPets(function () {});
-				}).should.throw();
+						Justin.setPets(pets, function (err) {
+							should.equal(err, null);
 
-				return done();
-			});
-		});
-	});
+							Justin.getPets(function (err, all_pets) {
+								should.equal(err, null);
 
-	describe("setAccessor", function () {
-		before(setup());
+								should(Array.isArray(all_pets));
+								all_pets.length.should.equal(pets.length);
+
+								return done();
+							});
+						});
+					});
+				});
+			});
 
-		it("should accept several arguments as associations", function (done) {
-			Pet.find(function (err, pets) {
+			it("should remove all associations if an empty array is passed", function (done) {
 				Person.find({ name: "Justin" }).first(function (err, Justin) {
 					should.equal(err, null);
-
-					Justin.setPets(pets[0], pets[1], function (err) {
+					Justin.getPets(function (err, pets) {
 						should.equal(err, null);
+						should.equal(pets.length, 2);
 
-						Justin.getPets(function (err, pets) {
+						Justin.setPets([], function (err) {
 							should.equal(err, null);
 
-							should(Array.isArray(pets));
-							pets.length.should.equal(2);
+							Justin.getPets(function (err, pets) {
+								should.equal(err, null);
+								should.equal(pets.length, 0);
 
-							return done();
+								return done();
+							});
 						});
 					});
 				});
 			});
-		});
 
-		it("should accept an array of associations", function (done) {
-			Pet.find(function (err, pets) {
-				Person.find({ name: "Justin" }).first(function (err, Justin) {
-					should.equal(err, null);
+			it("clears current associations", function (done) {
+				Pet.find({ name: "Deco" }, function (err, pets) {
+					var Deco = pets[0];
 
-					Justin.setPets(pets, function (err) {
+					Person.find({ name: "Jane" }).first(function (err, Jane) {
 						should.equal(err, null);
 
-						Justin.getPets(function (err, all_pets) {
+						Jane.getPets(function (err, pets) {
 							should.equal(err, null);
 
-							should(Array.isArray(all_pets));
-							all_pets.length.should.equal(pets.length);
+							should(Array.isArray(pets));
+							pets.length.should.equal(1);
+							pets[0].name.should.equal("Mutt");
+
+							Jane.setPets(Deco, function (err) {
+								should.equal(err, null);
 
-							return done();
+								Jane.getPets(function (err, pets) {
+									should.equal(err, null);
+
+									should(Array.isArray(pets));
+									pets.length.should.equal(1);
+									pets[0].name.should.equal(Deco.name);
+
+									return done();
+								});
+							});
 						});
 					});
 				});
 			});
 		});
 
-		it("should remove all associations if an empty array is passed", function (done) {
-			Person.find({ name: "Justin" }).first(function (err, Justin) {
-				should.equal(err, null);
-				Justin.getPets(function (err, pets) {
+		describe("with autoFetch turned on", function () {
+			before(setup({
+				autoFetchPets : true
+			}));
+
+			it("should fetch associations", function (done) {
+				Person.find({ name: "John" }).first(function (err, John) {
 					should.equal(err, null);
-					should.equal(pets.length, 2);
 
-					Justin.setPets([], function (err) {
-						should.equal(err, null);
+					John.should.have.property("pets");
+					should(Array.isArray(John.pets));
+					John.pets.length.should.equal(2);
 
-						Justin.getPets(function (err, pets) {
-							should.equal(err, null);
-							should.equal(pets.length, 0);
+					return done();
+				});
+			});
 
-							return done();
+			it("should save existing", function (done) {
+				Person.create({ name: 'Bishan' }, function (err) {
+					should.not.exist(err);
+
+					Person.one({ name: 'Bishan' }, function (err, person) {
+						should.not.exist(err);
+
+						person.surname = 'Dominar';
+
+						person.save(function (err) {
+							should.not.exist(err);
+
+							done();
 						});
 					});
 				});
 			});
-		});
 
-		it("clears current associations", function (done) {
-			Pet.find({ name: "Deco" }, function (err, pets) {
-				var Deco = pets[0];
+			it("should not auto save associations which were autofetched", function (done) {
+				Pet.all(function (err, pets) {
+					should.not.exist(err);
+					should.equal(pets.length, 2);
 
-				Person.find({ name: "Jane" }).first(function (err, Jane) {
-					should.equal(err, null);
+					Person.create({ name: 'Paul' }, function (err, paul) {
+						should.not.exist(err);
 
-					Jane.getPets(function (err, pets) {
-						should.equal(err, null);
+						Person.one({ name: 'Paul' }, function (err, paul2) {
+							should.not.exist(err);
+							should.equal(paul2.pets.length, 0);
 
-						should(Array.isArray(pets));
-						pets.length.should.equal(1);
-						pets[0].name.should.equal("Mutt");
+							paul.setPets(pets, function (err) {
+								should.not.exist(err);
 
-						Jane.setPets(Deco, function (err) {
-							should.equal(err, null);
+								// reload paul to make sure we have 2 pets
+								Person.one({ name: 'Paul' }, function (err, paul) {
+									should.not.exist(err);
+									should.equal(paul.pets.length, 2);
 
-							Jane.getPets(function (err, pets) {
-								should.equal(err, null);
+									// Saving paul2 should NOT auto save associations and hence delete
+									// the associations we just created.
+									paul2.save(function (err) {
+										should.not.exist(err);
 
-								should(Array.isArray(pets));
-								pets.length.should.equal(1);
-								pets[0].name.should.equal(Deco.name);
+										// let's check paul - pets should still be associated
+										Person.one({ name: 'Paul' }, function (err, paul) {
+											should.not.exist(err);
+											should.equal(paul.pets.length, 2);
 
-								return done();
+											done();
+										});
+									});
+								});
 							});
 						});
 					});
 				});
 			});
-		});
-	});
 
-	describe("with autoFetch turned on", function () {
-		before(setup({
-			autoFetchPets : true
-		}));
+			it("should save associations set by the user", function (done) {
+				Person.one({ name: 'John' }, function (err, john) {
+					should.not.exist(err);
+					should.equal(john.pets.length, 2);
 
-		it("should fetch associations", function (done) {
-			Person.find({ name: "John" }).first(function (err, John) {
-				should.equal(err, null);
+					john.pets = [];
 
-				John.should.have.property("pets");
-				should(Array.isArray(John.pets));
-				John.pets.length.should.equal(2);
+					john.save(function (err) {
+						should.not.exist(err);
 
-				return done();
+						// reload john to make sure pets were deleted
+						Person.one({ name: 'John' }, function (err, john) {
+							should.not.exist(err);
+							should.equal(john.pets.length, 0);
+
+							done();
+						});
+					});
+				});
 			});
+
 		});
+	});
 
-		it("should save existing", function (done) {
-			Person.create({ name: 'Bishan' }, function (err) {
-				should.not.exist(err);
+	if (protocol == "mongodb") return;
 
-				Person.one({ name: 'Bishan' }, function (err, person) {
-					should.not.exist(err);
+	describe("with non-standard keys", function () {
+		var Email;
+		var Account;
 
-					person.surname = 'Dominar';
+		setup = function (opts, done) {
+			Email = db.define('email', {
+			  text         : { type: 'text', key: true, required: true },
+			  bounced      : Boolean
+			});
 
-					person.save(function (err) {
-						should.not.exist(err);
+			Account = db.define('account', {
+			  name: String
+			});
 
-						done();
-					});
-				});
+			Account.hasMany('emails', Email, {}, { key: opts.key });
+
+			helper.dropSync([ Email, Account ], function (err) {
+				if (err) return done(err);
+				done()
 			});
-		});
+		};
 
-		it("should not auto save associations which were autofetched", function (done) {
-			Pet.all(function (err, pets) {
+		it("should place ids in the right place", function (done) {
+			setup({}, function (err) {
 				should.not.exist(err);
-				should.equal(pets.length, 2);
 
-				Person.create({ name: 'Paul' }, function (err, paul) {
+				Email.create([{bounced: true, text: 'a@test.com'}, {bounced: false, text: 'z@test.com'}], function (err, emails) {
 					should.not.exist(err);
 
-					Person.one({ name: 'Paul' }, function (err, paul2) {
+					Account.create({ name: "Stuff" }, function (err, account) {
 						should.not.exist(err);
-						should.equal(paul2.pets.length, 0);
 
-						paul.setPets(pets, function (err) {
+						account.addEmails(emails[1], function (err) {
 							should.not.exist(err);
 
-							// reload paul to make sure we have 2 pets
-							Person.one({ name: 'Paul' }, function (err, paul) {
+							db.driver.execQuery("SELECT * FROM account_emails", function (err, data) {
 								should.not.exist(err);
-								should.equal(paul.pets.length, 2);
-
-								// Saving paul2 should NOT auto save associations and hence delete
-								// the associations we just created.
-								paul2.save(function (err) {
-									should.not.exist(err);
 
-									// let's check paul - pets should still be associated
-									Person.one({ name: 'Paul' }, function (err, paul) {
-										should.not.exist(err);
-										should.equal(paul.pets.length, 2);
+								should.equal(data[0].account_id, 1);
+								should.equal(data[0].emails_text, 'z@test.com');
 
-										done();
-									});
-								});
+								done();
 							});
 						});
 					});
@@ -608,26 +688,91 @@ describe("hasMany", function () {
 			});
 		});
 
-		it("should save associations set by the user", function (done) {
-			Person.one({ name: 'John' }, function (err, john) {
+		it("should generate correct tables", function (done) {
+			setup({}, function (err) {
 				should.not.exist(err);
-				should.equal(john.pets.length, 2);
 
-				john.pets = [];
+				var sql;
+
+				if (protocol == 'sqlite') {
+					sql = "PRAGMA table_info(?)";
+				} else {
+					sql = "SELECT column_name, data_type FROM information_schema.columns WHERE table_name = ?";
+				}
 
-				john.save(function (err) {
+				db.driver.execQuery(sql, ['account_emails'], function (err, cols) {
 					should.not.exist(err);
 
-					// reload john to make sure pets were deleted
-					Person.one({ name: 'John' }, function (err, john) {
+					if (protocol == 'sqlite') {
+						should.equal(cols[0].name, 'account_id');
+						should.equal(cols[0].type, 'INTEGER');
+						should.equal(cols[1].name, 'emails_text');
+						should.equal(cols[1].type, 'TEXT');
+					} else if (protocol == 'mysql') {
+						should.equal(cols[0].column_name, 'account_id');
+						should.equal(cols[0].data_type,   'int');
+						should.equal(cols[1].column_name, 'emails_text');
+						should.equal(cols[1].data_type,    'varchar');
+					} else if (protocol == 'postgres') {
+						should.equal(cols[0].column_name, 'account_id');
+						should.equal(cols[0].data_type,   'integer');
+						should.equal(cols[1].column_name, 'emails_text');
+						should.equal(cols[1].data_type,   'text');
+					}
+
+					done();
+				});
+			});
+		});
+
+		it("should add a composite key to the join table if requested", function (done) {
+			setup({ key: true }, function (err) {
+				should.not.exist(err);
+				var sql;
+
+				if (protocol == 'postgres') {
+					sql = "" +
+						"SELECT c.column_name, c.data_type " +
+						"FROM  information_schema.table_constraints tc " +
+						"JOIN information_schema.constraint_column_usage AS ccu USING (constraint_schema, constraint_name) " +
+						"JOIN information_schema.columns AS c ON c.table_schema = tc.constraint_schema AND tc.table_name = c.table_name AND ccu.column_name = c.column_name " +
+						"where constraint_type = ? and tc.table_name = ?";
+
+					db.driver.execQuery(sql, ['PRIMARY KEY', 'account_emails'], function (err, data) {
 						should.not.exist(err);
-						should.equal(john.pets.length, 0);
+
+						should.equal(data.length, 2);
+						should.equal(data[0].column_name, 'account_id');
+						should.equal(data[1].column_name, 'emails_text');
+
+						done()
+					});
+				} else if (protocol == 'mysql') {
+					db.driver.execQuery("SHOW KEYS FROM ?? WHERE Key_name = ?", ['account_emails', 'PRIMARY'], function (err, data) {
+						should.not.exist(err);
+
+						should.equal(data.length, 2);
+						should.equal(data[0].Column_name, 'account_id');
+						should.equal(data[0].Key_name, 'PRIMARY');
+						should.equal(data[1].Column_name, 'emails_text');
+						should.equal(data[1].Key_name, 'PRIMARY');
 
 						done();
 					});
-				});
+				} else if (protocol == 'sqlite') {
+					db.driver.execQuery("pragma table_info(??)", ['account_emails'], function (err, data) {
+						should.not.exist(err);
+
+						should.equal(data.length, 2);
+						should.equal(data[0].name, 'account_id');
+						should.equal(data[0].pk, 1);
+						should.equal(data[1].name, 'emails_text');
+						should.equal(data[1].pk, 1);
+
+						done();
+					});
+				}
 			});
 		});
-
 	});
 });

From d33446482e01558778f5aa5f39f1bc4bf76f5e73 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 28 May 2014 09:15:14 +1000
Subject: [PATCH 0994/1246] Doco about `key: true` for `hasMany` associations

---
 Readme.md | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Readme.md b/Readme.md
index 5c6ddd64..facd4392 100755
--- a/Readme.md
+++ b/Readme.md
@@ -639,15 +639,15 @@ Person.findByPets({ /* options */ }) // returns ChainFind object
 ### hasMany
 
 Is a **many to many** relationship (includes join table).<br/>
-Eg: `Patient.hasMany('doctors', Doctor, { why: String }, { reverse: 'patients' })`.<br/>
+Eg: `Patient.hasMany('doctors', Doctor, { why: String }, { reverse: 'patients', key: true })`.<br/>
 Patient can have many different doctors. Each doctor can have many different patients.
 
 This will create a join table `patient_doctors` when you call `Patient.sync()`:
 
  column name | type
  :-----------|:--------
- patient_id  | Integer
- doctor_id   | Integer
+ patient_id  | Integer (composite key)
+ doctor_id   | Integer (composite key)
  why         | varchar(255)
 
 The following functions will be available:
@@ -752,7 +752,7 @@ var Person = db.define('person', {
 });
 Person.hasMany("friends", {
     rate : Number
-});
+}, {}, { key: true });
 
 Person.get(123, function (err, John) {
     John.getFriends(function (err, friends) {
@@ -772,6 +772,7 @@ var Person = db.define('person', {
 Person.hasMany("friends", {
     rate : Number
 }, {
+    key       : true, // Turns the foreign keys in the join table into a composite key
     autoFetch : true
 });
 
@@ -790,6 +791,8 @@ var Person = db.define('person', {
 });
 Person.hasMany("friends", {
     rate : Number
+}, {
+  key: true
 });
 ```
 
@@ -830,6 +833,7 @@ var Person = db.define('person', {
 Person.hasMany("pets", Pet, {
     bought  : Date
 }, {
+    key     : true,
     reverse : "owners"
 });
 

From b850f5e7d754e32e018123760e9df9ae264db0a2 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 28 May 2014 20:32:02 +1000
Subject: [PATCH 0995/1246] Rename opts.id to opts.keys

---
 lib/ChainFind.js            | 20 +++++--------
 lib/Drivers/DML/_shared.js  | 17 +++++++++++
 lib/Drivers/DML/mysql.js    | 18 -----------
 lib/Drivers/DML/postgres.js | 18 -----------
 lib/Drivers/DML/sqlite.js   | 18 -----------
 lib/Instance.js             | 26 ++++++++--------
 lib/Model.js                | 60 ++++++++++++++++++-------------------
 lib/ORM.js                  |  2 +-
 8 files changed, 69 insertions(+), 110 deletions(-)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index b2b52cfb..0cfb9066 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -90,7 +90,7 @@ function ChainFind(Model, opts) {
 			return this;
 		},
 		remove: function (cb) {
-			opts.driver.find([ opts.id ], opts.table, opts.conditions, {
+			opts.driver.find([ opts.keys ], opts.table, opts.conditions, {
 				limit  : opts.limit,
 				order  : opts.order,
 				merge  : opts.merge,
@@ -107,16 +107,12 @@ function ChainFind(Model, opts) {
 				var ids = [], conditions = {};
 				var or;
 
-				if (!Array.isArray(opts.id)) {
-					opts.id = [ opts.id ];
-				}
-
 				conditions.or = [];
 
 				for (var i = 0; i < data.length; i++) {
 					or = {};
-					for (var j = 0; j < opts.id.length; j++) {
-						or[opts.id[j]] = data[i][opts.id[j]];
+					for (var j = 0; j < opts.keys.length; j++) {
+						or[opts.keys[j]] = data[i][opts.keys[j]];
 					}
 					conditions.or.push(or);
 				}
@@ -210,19 +206,19 @@ function ChainFind(Model, opts) {
 					var idMap = {};
 					var count = 0;
 
-					var ids = _.map(data, function (instance) {
-						var id = instance[opts.id[0]];
+					var keys = _.map(data, function (instance) {
+						var key = instance[opts.keys[0]];
 						// Create the association arrays
 						for (var i = 0, association; association = opts.__eager[i]; i++) {
 							instance[association.name] = [];
 						}
 
-						idMap[id] = count++;
-						return id;
+						idMap[key] = count++;
+						return key;
 					});
 
 					_.map(opts.__eager, function (association) {
-						opts.driver.eagerQuery(association, opts, ids, function (err, instances) {
+						opts.driver.eagerQuery(association, opts, keys, function (err, instances) {
 							for (var i = 0, instance; instance = instances[i]; i++) {
 								// Perform a parent lookup with $p, and initialize it as an instance.
 								data[idMap[instance.$p]][association.name].push(association.model(instance));
diff --git a/lib/Drivers/DML/_shared.js b/lib/Drivers/DML/_shared.js
index fcc20f00..bf7fd592 100644
--- a/lib/Drivers/DML/_shared.js
+++ b/lib/Drivers/DML/_shared.js
@@ -9,5 +9,22 @@ module.exports = {
 			var cb    = arguments[2];
 		}
 		return this.execSimpleQuery(query, cb);
+	},
+	eagerQuery: function (association, opts, keys, cb) {
+		var desiredKey = Object.keys(association.field);
+		var assocKey = Object.keys(association.mergeAssocId);
+
+		var where = {};
+		where[desiredKey] = keys;
+
+		var query = this.query.select()
+			.from(association.model.table)
+			.select(opts.only)
+			.from(association.mergeTable, assocKey, opts.keys)
+			.select(desiredKey).as("$p")
+			.where(association.mergeTable, where)
+			.build();
+
+		this.execSimpleQuery(query, cb);
 	}
 };
diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 3522c49d..cb4a0bec 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -133,24 +133,6 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	this.execSimpleQuery(q, cb);
 };
 
-Driver.prototype.eagerQuery = function (association, opts, ids, cb) {
-	var desiredKey = Object.keys(association.field);
-	var assocKey = Object.keys(association.mergeAssocId);
-
-	var where = {};
-	where[desiredKey] = ids;
-
-	var query = this.query.select()
-		.from(association.model.table)
-		.select(opts.only)
-		.from(association.mergeTable, assocKey, opts.id)
-		.select(desiredKey).as("$p")
-		.where(association.mergeTable, where)
-		.build();
-
-	this.execSimpleQuery(query, cb);
-};
-
 Driver.prototype.count = function (table, conditions, opts, cb) {
 	var q = this.query.select()
 	                  .from(table)
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 874df631..3810b66c 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -175,24 +175,6 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	this.execSimpleQuery(q, cb);
 };
 
-Driver.prototype.eagerQuery = function (association, opts, ids, cb) {
-	var desiredKey = Object.keys(association.field);
-	var assocKey = Object.keys(association.mergeAssocId);
-
-	var where = {};
-	where[desiredKey] = ids;
-
-	var query = this.query.select()
-		.from(association.model.table)
-		.select(opts.only)
-		.from(association.mergeTable, assocKey, opts.id)
-		.select(desiredKey).as("$p")
-		.where(association.mergeTable, where)
-		.build();
-
-	this.execSimpleQuery(query, cb);
-};
-
 Driver.prototype.count = function (table, conditions, opts, cb) {
 	var q = this.query.select().from(table).count(null, 'c');
 
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index bb04f4fe..c0600875 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -117,24 +117,6 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	this.db.all(q, cb);
 };
 
-Driver.prototype.eagerQuery = function (association, opts, ids, cb) {
-	var desiredKey = Object.keys(association.field);
-	var assocKey = Object.keys(association.mergeAssocId);
-
-	var where = {};
-	where[desiredKey] = ids;
-
-	var query = this.query.select()
-		.from(association.model.table)
-		.select(opts.only)
-		.from(association.mergeTable, assocKey, opts.id)
-		.select(desiredKey).as("$p")
-		.where(association.mergeTable, where)
-		.build();
-
-	this.execSimpleQuery(query, cb);
-};
-
 Driver.prototype.count = function (table, conditions, opts, cb) {
 	var q = this.query.select()
 	                  .from(table)
diff --git a/lib/Instance.js b/lib/Instance.js
index f7a9c3c3..d10d447c 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -9,7 +9,7 @@ function Instance(Model, opts) {
 	opts = opts || {};
 	opts.data = opts.data || {};
 	opts.extra = opts.extra || {};
-	opts.id = opts.id || "id";
+	opts.keys = opts.keys || "id";
 	opts.changes = (opts.is_new ? Object.keys(opts.data) : []);
 	opts.extrachanges = [];
 	opts.associations = {};
@@ -194,14 +194,14 @@ function Instance(Model, opts) {
 
 		data = Utilities.transformPropertyNames(data, Model.allProperties);
 
-		opts.driver.insert(opts.table, data, opts.id, function (save_err, info) {
+		opts.driver.insert(opts.table, data, opts.keys, function (save_err, info) {
 			if (save_err) {
 				return saveError(cb, save_err);
 			}
 
 			opts.changes.length = 0;
-			for (var i = 0; i < opts.id.length; i++) {
-				opts.data[opts.id[i]] = info.hasOwnProperty(opts.id[i]) ? info[opts.id[i]] : data[opts.id[i]];
+			for (var i = 0; i < opts.keys.length; i++) {
+				opts.data[opts.keys[i]] = info.hasOwnProperty(opts.keys[i]) ? info[opts.keys[i]] : data[opts.keys[i]];
 			}
 			opts.is_new = false;
 
@@ -248,8 +248,8 @@ function Instance(Model, opts) {
 			for (var i = 0; i < opts.changes.length; i++) {
 				changes[opts.changes[i]] = data[opts.changes[i]];
 			}
-			for (i = 0; i < opts.id.length; i++) {
-				conditions[opts.id[i]] = data[opts.id[i]];
+			for (i = 0; i < opts.keys.length; i++) {
+				conditions[opts.keys[i]] = data[opts.keys[i]];
 			}
 			changes = Utilities.transformPropertyNames(changes, Model.allProperties);
 
@@ -356,7 +356,7 @@ function Instance(Model, opts) {
 
 		for (i = 0; i < opts.extra_info.id.length; i++) {
 			conditions[opts.extra_info.id_prop[i]] = opts.extra_info.id[i];
-			conditions[opts.extra_info.assoc_prop[i]] = opts.data[opts.id[i]];
+			conditions[opts.extra_info.assoc_prop[i]] = opts.data[opts.keys[i]];
 		}
 
 		opts.driver.update(opts.extra_info.table, data, conditions, function (err) {
@@ -369,8 +369,8 @@ function Instance(Model, opts) {
 		}
 
 		var conditions = {};
-		for (var i = 0; i < opts.id.length; i++) {
-		    conditions[opts.id[i]] = opts.data[opts.id[i]];
+		for (var i = 0; i < opts.keys.length; i++) {
+		    conditions[opts.keys[i]] = opts.data[opts.keys[i]];
 		}
 
 		Hook.wait(instance, opts.hooks.beforeRemove, function (err) {
@@ -407,8 +407,8 @@ function Instance(Model, opts) {
 			}
 		}
 
-		for (var i = 0; i < opts.id.length; i++) {
-		    conditions[opts.id[i]] = opts.data[opts.id[i]];
+		for (var i = 0; i < opts.keys.length; i++) {
+			conditions[opts.keys[i]] = opts.data[opts.keys[i]];
 		}
 
 		Hook.wait(instance, opts.hooks.beforeSave, function (err) {
@@ -642,8 +642,8 @@ function Instance(Model, opts) {
 		enumerable: false
 	});
 
-	for (i = 0; i < opts.id.length; i++) {
-	    if (!opts.data.hasOwnProperty(opts.id[i])) {
+	for (i = 0; i < opts.keys.length; i++) {
+	    if (!opts.data.hasOwnProperty(opts.keys[i])) {
 			opts.changes = Object.keys(opts.data);
 			break;
 		}
diff --git a/lib/Model.js b/lib/Model.js
index b1921680..2674d5c8 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -24,9 +24,9 @@ exports.Model = Model;
 
 function Model(opts) {
 	opts = _.defaults(opts || {}, {
-		id: []
+		keys: []
 	});
-	opts.id = Array.isArray(opts.id) ? opts.id : [opts.id];
+	opts.keys = Array.isArray(opts.keys) ? opts.keys : [opts.keys];
 
 	var one_associations       = [];
 	var many_associations      = [];
@@ -57,7 +57,7 @@ function Model(opts) {
 			if (k === "extra_field") continue;
 			if (opts.properties.hasOwnProperty(k)) continue;
 			if (inst_opts.extra && inst_opts.extra.hasOwnProperty(k)) continue;
-			if (opts.id.indexOf(k) >= 0) continue;
+			if (opts.keys.indexOf(k) >= 0) continue;
 			if (association_properties.indexOf(k) >= 0) continue;
 
 			for (i = 0; i < one_associations.length; i++) {
@@ -94,7 +94,7 @@ function Model(opts) {
 		var pending  = 2, create_err = null;
 		var instance = new Instance(model, {
 			uid                    : inst_opts.uid, // singleton unique id
-			id                     : opts.id,
+			keys                   : opts.keys,
 			is_new                 : inst_opts.is_new || false,
 			isShell                : inst_opts.isShell || false,
 			data                   : data,
@@ -149,17 +149,17 @@ function Model(opts) {
 
 	    var data = arguments.length > 1 ? arguments : arguments[0];
 
-	    if (Array.isArray(opts.id) && Array.isArray(data)) {
-	        if (data.length == opts.id.length) {
+	    if (Array.isArray(opts.keys) && Array.isArray(data)) {
+	        if (data.length == opts.keys.length) {
 	            var data2 = {};
-	            for (i = 0; i < opts.id.length; i++) {
-	                data2[opts.id[i]] = data[i++];
+	            for (i = 0; i < opts.keys.length; i++) {
+	                data2[opts.keys[i]] = data[i++];
 	            }
 
 	            return createInstance(data2, { isShell: true });
 	        }
 	        else {
-	            var err = new Error('Model requires ' + opts.id.length + ' keys, only ' + data.length + ' were provided');
+	            var err = new Error('Model requires ' + opts.keys.length + ' keys, only ' + data.length + ' were provided');
 	            err.model = opts.table;
 
 	            throw err;
@@ -167,7 +167,7 @@ function Model(opts) {
 	    }
 	    else if (typeof data === "number" || typeof data === "string") {
 	        var data2 = {};
-	        data2[opts.id[0]] = data;
+	        data2[opts.keys[0]] = data;
 
 	        return createInstance(data2, { isShell: true });
 	    } else if (typeof data === "undefined") {
@@ -176,14 +176,14 @@ function Model(opts) {
 
 	    var isNew = false;
 
-	    for (i = 0; i < opts.id.length; i++) {
-	        if (!data.hasOwnProperty(opts.id[i])) {
+	    for (i = 0; i < opts.keys.length; i++) {
+	        if (!data.hasOwnProperty(opts.keys[i])) {
 	            isNew = true;
 	            break;
 	        }
 	    }
 
-	    if (opts.id.length === 1 && opts.id[0] != 'id') {
+	    if (opts.keys.length === 1 && opts.keys[0] != 'id') {
 	        isNew = true; //Dubiously assume that it is a new instance if we're using custom keys
 	    }
 
@@ -224,7 +224,7 @@ function Model(opts) {
 			try {
 				opts.driver.sync({
 					extension           : opts.extension,
-					id                  : opts.id,
+					id                  : opts.keys,
 					table               : opts.table,
 					properties          : opts.properties,
 					allProperties       : allProperties,
@@ -262,12 +262,12 @@ function Model(opts) {
 			ids = ids[0];
 		}
 
-		if (ids.length !== opts.id.length) {
-		    throw new ORMError("Model.get() IDs number mismatch (" + opts.id.length + " needed, " + ids.length + " passed)", 'PARAM_MISMATCH', { model: opts.table });
+		if (ids.length !== opts.keys.length) {
+		    throw new ORMError("Model.get() IDs number mismatch (" + opts.keys.length + " needed, " + ids.length + " passed)", 'PARAM_MISMATCH', { model: opts.table });
 		}
 
-		for (var i = 0; i < opts.id.length; i++) {
-			conditions[opts.id[i]] = ids[i];
+		for (var i = 0; i < opts.keys.length; i++) {
+			conditions[opts.keys[i]] = ids[i];
 		}
 
 		if (!options.hasOwnProperty("autoFetch")) {
@@ -379,7 +379,7 @@ function Model(opts) {
 
 		var chain = new ChainFind(model, {
 			only         : options.only || model_fields,
-			id           : opts.id,
+			keys         : opts.keys,
 			table        : opts.table,
 			driver       : opts.driver,
 			conditions   : conditions,
@@ -391,8 +391,8 @@ function Model(opts) {
 			properties   : allProperties,
 			newInstance  : function (data, cb) {
 				var uid = opts.driver.uid + "/" + opts.table + (merge ? "+" + merge.from.table : "");
-				for (var i = 0; i < opts.id.length; i++) {
-					uid += "/" + data[opts.id[i]];
+				for (var i = 0; i < opts.keys.length; i++) {
+					uid += "/" + data[opts.keys[i]];
 				}
 
 				Utilities.renameDatastoreFieldsToPropertyNames(data, fieldToPropertyMap);
@@ -525,15 +525,15 @@ function Model(opts) {
 
 		if (ids.length === 1 && typeof ids[0] === "object") {
 			if (Array.isArray(ids[0])) {
-				for (i = 0; i < opts.id.length; i++) {
-					conditions[opts.id[i]] = ids[0][i];
+				for (i = 0; i < opts.keys.length; i++) {
+					conditions[opts.keys[i]] = ids[0][i];
 				}
 			} else {
 				conditions = ids[0];
 			}
 		} else {
-			for (i = 0; i < opts.id.length; i++) {
-				conditions[opts.id[i]] = ids[i];
+			for (i = 0; i < opts.keys.length; i++) {
+				conditions[opts.keys[i]] = ids[i];
 			}
 		}
 
@@ -619,7 +619,7 @@ function Model(opts) {
 		enumerable: false
 	});
 	Object.defineProperty(model, "id", {
-		value: opts.id,
+		value: opts.keys,
 		enumerable: false
 	});
 	Object.defineProperty(model, "properties", {
@@ -627,7 +627,7 @@ function Model(opts) {
 		enumerable: false
 	});
 	Object.defineProperty(model, "uid", {
-	    value: opts.driver.uid + "/" + opts.table + "/" + opts.id.join("/"),
+	    value: opts.driver.uid + "/" + opts.table + "/" + opts.keys.join("/"),
         enumerable: false
 	});
 
@@ -641,7 +641,7 @@ function Model(opts) {
 	var currFields = {}, cType, name;
 
 	// If no keys are defined add the default one
-	if (opts.id.length == 0 && !_.any(opts.properties, { key: true })) {
+	if (opts.keys.length == 0 && !_.any(opts.properties, { key: true })) {
 		name = opts.settings.get("properties.primary_key");
 
 		opts.properties[name] = Property.normalize({
@@ -660,10 +660,10 @@ function Model(opts) {
 		allProperties[k] = prop;
 		fieldToPropertyMap[prop.mapsTo] = prop;
 
-		if (opts.id.indexOf(k) != -1) {
+		if (opts.keys.indexOf(k) != -1) {
 			prop.key = true;
 		} else if (prop.key) {
-			opts.id.push(k);
+			opts.keys.push(k);
 		}
 
 		if (prop.lazyload !== true && !currFields[k]) {
diff --git a/lib/ORM.js b/lib/ORM.js
index 26d6b643..c6153614 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -226,7 +226,7 @@ ORM.prototype.define = function (name, properties, opts) {
 		extension      : opts.extension || false,
 		indexes        : opts.indexes || [],
 		cache          : opts.hasOwnProperty("cache") ? opts.cache : this.settings.get("instance.cache"),
-		id             : opts.id,// || this.settings.get("properties.primary_key"),
+		keys           : opts.id,
 		autoSave       : opts.hasOwnProperty("autoSave") ? opts.autoSave : this.settings.get("instance.autoSave"),
 		autoFetch      : opts.hasOwnProperty("autoFetch") ? opts.autoFetch : this.settings.get("instance.autoFetch"),
 		autoFetchLimit : opts.autoFetchLimit || this.settings.get("instance.autoFetchLimit"),

From e777a959a52b11dcf1086bd0c9c3f0a8357805f9 Mon Sep 17 00:00:00 2001
From: DullReferenceException <jpage@godaddy.com>
Date: Sat, 31 May 2014 11:28:38 -0700
Subject: [PATCH 0996/1246] Various integration fixes

Fixed some integration tests that were causing Travis build failures and local build failures on a Windows box:
* Added sorting to columns before verifying to resolve issues where ordering can differ with different database versions
* Fixed issue where the stack for `ORMError` objects was undefined
* Fixed "done called multiple times" issue
* Fixed test that was failing for the redshift driver
* Fixed test that intermittently fails for sqlite due to race conditions with in-memory driver
* Increased timeout for a few test setups that were intermittently failing
---
 .gitignore                                     |  1 +
 test/config.example.js                         |  8 +++++++-
 test/integration/association-hasmany-extra.js  |  2 ++
 test/integration/association-hasmany.js        |  7 ++++---
 test/integration/association-hasone-reverse.js |  4 +++-
 test/integration/error_spec.js                 | 12 ++++++++----
 test/integration/instance.js                   |  2 ++
 test/integration/model-keys.js                 |  2 ++
 test/integration/orm-exports.js                |  2 +-
 9 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index c1d40255..afba1e84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ test/config.js
 test/coverage.html
 lib-cov/
 *~
+/.idea
diff --git a/test/config.example.js b/test/config.example.js
index 0ee738b3..81c2ed8f 100644
--- a/test/config.example.js
+++ b/test/config.example.js
@@ -17,7 +17,13 @@ exports.postgres = {
 	password : "",
 	database : "test"
 };
+exports.redshift = {
+	user      : "root",
+	password  : "",
+	database  : "test"
+};
 exports.mongodb = {
     host: "localhost",
     database: "test"
-};
\ No newline at end of file
+};
+exports.sqlite = { }; // uses in-memory database
diff --git a/test/integration/association-hasmany-extra.js b/test/integration/association-hasmany-extra.js
index c3d377a4..5ba99a98 100644
--- a/test/integration/association-hasmany-extra.js
+++ b/test/integration/association-hasmany-extra.js
@@ -28,6 +28,8 @@ describe("hasMany extra properties", function() {
 	};
 
 	before(function(done) {
+		this.timeout(4000);
+
 		helper.connect(function (connection) {
 			db = connection;
 			done();
diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
index cb3a9ee1..63b5905e 100644
--- a/test/integration/association-hasmany.js
+++ b/test/integration/association-hasmany.js
@@ -697,7 +697,7 @@ describe("hasMany", function () {
 				if (protocol == 'sqlite') {
 					sql = "PRAGMA table_info(?)";
 				} else {
-					sql = "SELECT column_name, data_type FROM information_schema.columns WHERE table_name = ?";
+					sql = "SELECT column_name, data_type FROM information_schema.columns WHERE table_name = ? ORDER BY data_type";
 				}
 
 				db.driver.execQuery(sql, ['account_emails'], function (err, cols) {
@@ -730,13 +730,14 @@ describe("hasMany", function () {
 				should.not.exist(err);
 				var sql;
 
-				if (protocol == 'postgres') {
+				if (protocol == 'postgres' || protocol === 'redshift') {
 					sql = "" +
 						"SELECT c.column_name, c.data_type " +
 						"FROM  information_schema.table_constraints tc " +
 						"JOIN information_schema.constraint_column_usage AS ccu USING (constraint_schema, constraint_name) " +
 						"JOIN information_schema.columns AS c ON c.table_schema = tc.constraint_schema AND tc.table_name = c.table_name AND ccu.column_name = c.column_name " +
-						"where constraint_type = ? and tc.table_name = ?";
+						"WHERE constraint_type = ? AND tc.table_name = ? " +
+						"ORDER BY column_name";
 
 					db.driver.execQuery(sql, ['PRIMARY KEY', 'account_emails'], function (err, data) {
 						should.not.exist(err);
diff --git a/test/integration/association-hasone-reverse.js b/test/integration/association-hasone-reverse.js
index 0e58dbec..dc59ee78 100644
--- a/test/integration/association-hasone-reverse.js
+++ b/test/integration/association-hasone-reverse.js
@@ -8,6 +8,7 @@ var _ = require('lodash');
 describe("hasOne", function () {
 	var db = null;
 	var Person = null;
+	var Pet = null;
 
 	var setup = function () {
 		return function (done) {
@@ -23,7 +24,8 @@ describe("hasOne", function () {
 			});
 
 			return helper.dropSync([Person, Pet], function () {
-				async.parallel([
+				// Running in series because in-memory sqlite encounters problems
+				async.series([
 					Person.create.bind(Person, { name: "John Doe" }),
 					Person.create.bind(Person, { name: "Jane Doe" }),
 					Pet.create.bind(Pet, { name: "Deco" }),
diff --git a/test/integration/error_spec.js b/test/integration/error_spec.js
index eab26890..a8281722 100644
--- a/test/integration/error_spec.js
+++ b/test/integration/error_spec.js
@@ -1,5 +1,6 @@
 var should   = require('should');
 var ORMError = require('../../lib/Error');
+var path     = require('path');
 
 describe("Error", function () {
 	describe("constructor", function () {
@@ -9,10 +10,13 @@ describe("Error", function () {
 		});
 
 		it("should have a valid stack", function () {
-			var e = new ORMError("Test message", 'PARAM_MISMATCH');
-			var stackArr = e.stack.split('\n');
-			// [0] is ''
-			should(stackArr[1].indexOf('test/integration/error_spec.js') > 0);
+			try {
+				throw new ORMError("Test message", 'PARAM_MISMATCH');
+			} catch (e) {
+				var stackArr = e.stack.split('\n');
+				// [0] is ''
+				should(stackArr[1].indexOf(path.join('test', 'integration', 'error_spec.js')) > 0);
+			}
 		});
 
 		it("should have the right name", function () {
diff --git a/test/integration/instance.js b/test/integration/instance.js
index e992b81a..b35f09b0 100644
--- a/test/integration/instance.js
+++ b/test/integration/instance.js
@@ -37,6 +37,8 @@ describe("Model instance", function() {
 	};
 
 	before(function (done) {
+		this.timeout(4000);
+
 		helper.connect(function (connection) {
 			db = connection;
 
diff --git a/test/integration/model-keys.js b/test/integration/model-keys.js
index f5131eaf..70ff070d 100644
--- a/test/integration/model-keys.js
+++ b/test/integration/model-keys.js
@@ -6,6 +6,8 @@ describe("Model keys option", function() {
 	var db = null;
 
 	before(function (done) {
+		this.timeout(4000);
+
 		helper.connect(function (connection) {
 			db = connection;
 
diff --git a/test/integration/orm-exports.js b/test/integration/orm-exports.js
index 1e516ce4..0f20ec08 100644
--- a/test/integration/orm-exports.js
+++ b/test/integration/orm-exports.js
@@ -74,7 +74,7 @@ describe("ORM.connect()", function () {
 	it("should allow protocol alias", function (done) {
 		var db = ORM.connect("pg://127.0.0.2");
 
-		db.on("connect", function (err) {
+		db.once("connect", function (err) {
 			should.exist(err);
 			err.message.should.not.equal("CONNECTION_PROTOCOL_NOT_SUPPORTED");
 

From f0930ffd7f0c77311960d1e150632777ca63639b Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 2 Jun 2014 20:36:39 +1000
Subject: [PATCH 0997/1246] Fix Property.mapsTo for keys

---
 lib/Drivers/DML/mongodb.js                    |  14 +-
 lib/Drivers/DML/mysql.js                      |  15 +-
 lib/Drivers/DML/postgres.js                   |  12 +-
 lib/Drivers/DML/redshift.js                   |  35 ++-
 lib/Drivers/DML/sqlite.js                     |  33 ++-
 lib/Instance.js                               |  45 ++-
 lib/LazyLoad.js                               |   5 +-
 lib/Model.js                                  |  20 +-
 package.json                                  |   2 +-
 .../integration/association-hasone-reverse.js |   8 +-
 test/integration/property-maps-to.js          | 265 +++++++++++++-----
 11 files changed, 307 insertions(+), 147 deletions(-)

diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
index 06208999..1bcf19b4 100644
--- a/lib/Drivers/DML/mongodb.js
+++ b/lib/Drivers/DML/mongodb.js
@@ -185,7 +185,7 @@ Driver.prototype.count = function (table, conditions, opts, cb) {
 	});
 };
 
-Driver.prototype.insert = function (table, data, id_prop, cb) {
+Driver.prototype.insert = function (table, data, keyProperties, cb) {
 	convertToDB(data, this.config.timezone);
 
 	return this.db.collection(table).insert(
@@ -196,12 +196,14 @@ Driver.prototype.insert = function (table, data, id_prop, cb) {
 		function (err, docs) {
 			if (err) return cb(err);
 
-			var ids = {};
+			var i, ids = {}, prop;
 
-			if (id_prop !== null && docs.length) {
-				for (var k in docs[0]) {
-					if (id_prop.indexOf(k) >= 0) {
-						ids[k] = docs[0][k];
+			if (keyProperties && docs.length) {
+				for (i = 0; i < keyProperties.length; i++) {
+					prop = keyProperties[i];
+
+					if (prop.mapsTo in docs[0]) {
+						ids[prop.name] = docs[0][prop.mapsTo];
 					}
 				}
 				convertFromDB(ids, this.config.timezone);
diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index cb4a0bec..48c3155c 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -160,7 +160,7 @@ Driver.prototype.count = function (table, conditions, opts, cb) {
 	this.execSimpleQuery(q, cb);
 };
 
-Driver.prototype.insert = function (table, data, id_prop, cb) {
+Driver.prototype.insert = function (table, data, keyProperties, cb) {
 	var q = this.query.insert()
 	                  .into(table)
 	                  .set(data)
@@ -169,14 +169,15 @@ Driver.prototype.insert = function (table, data, id_prop, cb) {
 	this.execSimpleQuery(q, function (err, info) {
 		if (err) return cb(err);
 
-		var ids = {};
+		var i, ids = {}, prop;
 
-		if (id_prop !== null) {
-			if (id_prop.length == 1 && info.hasOwnProperty("insertId") && info.insertId !== 0 ) {
-				ids[id_prop[0]] = info.insertId;
+		if (keyProperties) {
+			if (keyProperties.length == 1 && info.hasOwnProperty("insertId") && info.insertId !== 0 ) {
+				ids[keyProperties[0].name] = info.insertId;
 			} else {
-				for (var i = 0; i < id_prop.length; i++) {
-					ids[id_prop[i]] = data[id_prop[i]];
+				for(i = 0; i < keyProperties.length; i++) {
+					prop = keyProperties[i];
+					ids[prop.name] = data[prop.mapsTo];
 				}
 			}
 		}
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 3810b66c..51439e9e 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -200,7 +200,7 @@ Driver.prototype.count = function (table, conditions, opts, cb) {
 	this.execSimpleQuery(q, cb);
 };
 
-Driver.prototype.insert = function (table, data, id_prop, cb) {
+Driver.prototype.insert = function (table, data, keyProperties, cb) {
 	var q = this.query.insert().into(table).set(data).build();
 
 	this.execSimpleQuery(q + " RETURNING *", function (err, results) {
@@ -208,11 +208,13 @@ Driver.prototype.insert = function (table, data, id_prop, cb) {
 			return cb(err);
 		}
 
-		var ids = {};
+		var i, ids = {}, prop;
 
-		if (id_prop !== null) {
-			for (var i = 0; i < id_prop.length; i++) {
-				ids[id_prop[i]] = results[0][id_prop[i]] || null;
+		if (keyProperties) {
+			for (i = 0; i < keyProperties.length; i++) {
+				prop = keyProperties[i];
+
+				ids[prop.name] = results[0][prop.mapsTo] || null;
 			}
 		}
 
diff --git a/lib/Drivers/DML/redshift.js b/lib/Drivers/DML/redshift.js
index 76616d93..f984d5de 100644
--- a/lib/Drivers/DML/redshift.js
+++ b/lib/Drivers/DML/redshift.js
@@ -9,7 +9,7 @@ function Driver(config, connection, opts) {
 
 util.inherits(Driver, postgres.Driver);
 
-Driver.prototype.insert = function (table, data, id_prop, cb) {
+Driver.prototype.insert = function (table, data, keyProperties, cb) {
 	var q = this.query.insert()
 	                  .into(table)
 	                  .set(data)
@@ -19,28 +19,25 @@ Driver.prototype.insert = function (table, data, id_prop, cb) {
 		require("../../Debug").sql('postgres', q);
 	}
 	this.execQuery(q, function (err, result) {
-		if (err) {
-			return cb(err);
-		}
+		if (err)            return cb(err);
+		if (!keyProperties) return cb(null);
 
-		if (id_prop === null) {
-			return cb(null);
-		}
+		var i, ids = {}, prop;
 
-		if (id_prop.length == 1) {
-			return this.execQuery("SELECT LASTVAL() AS id", function (err, results) {
-				return cb(null, {
-					id: !err && results[0].id || null
-				});
-			});
-		}
+		if (keyNames.length == 1) {
+			this.execQuery("SELECT LASTVAL() AS id", function (err, results) {
+				if (err) return cb(err);
 
-		var ids = {};
+				ids[keyProperties[0].name] = results[0].id || null;
+				return cb(null, ids);
+			});
+		} else {
+			for(i = 0; i < keyProperties.length; i++) {
+				prop = keyProperties[i];
+				ids[prop.name] = data[prop.mapsTo] || null;
+			}
 
-		for (var i = 0; i < id_prop.length; i++) {
-			ids[id_prop[i]] = data[id_prop[i]] || null;
+			return cb(null, ids);
 		}
-
-		return cb(null, ids);
 	}.bind(this));
 };
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index c0600875..03ab00bf 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -147,7 +147,7 @@ Driver.prototype.count = function (table, conditions, opts, cb) {
 	this.db.all(q, cb);
 };
 
-Driver.prototype.insert = function (table, data, id_prop, cb) {
+Driver.prototype.insert = function (table, data, keyProperties, cb) {
 	var q = this.query.insert()
 	                  .into(table)
 	                  .set(data)
@@ -156,18 +156,29 @@ Driver.prototype.insert = function (table, data, id_prop, cb) {
 	if (this.opts.debug) {
 		require("../../Debug").sql('sqlite', q);
 	}
+
+
 	this.db.all(q, function (err, info) {
-		if (err) {
-			return cb(err);
-		}
-		this.db.get("SELECT last_insert_rowid() AS last_row_id", function (err, row) {
-			if (err) {
-				return cb(err);
-			}
-			return cb(null, {
-				id: row.last_row_id
+		if (err)            return cb(err);
+		if (!keyProperties) return cb(null);
+
+		var i, ids = {}, prop;
+
+		if (keyProperties.length == 1 && keyProperties[0].type == 'serial') {
+			this.db.get("SELECT last_insert_rowid() AS last_row_id", function (err, row) {
+				if (err) return cb(err);
+
+				ids[keyProperties[0].name] = row.last_row_id;
+
+				return cb(null, ids);
 			});
-		});
+		} else {
+			for (i = 0; i < keyProperties.length; i++) {
+				prop = keyProperties[i];
+				ids[prop.name] = data[prop.mapsTo] || null;
+			}
+			return cb(null, ids);
+		}
 	}.bind(this));
 };
 
diff --git a/lib/Instance.js b/lib/Instance.js
index d10d447c..efb7e7c2 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -13,6 +13,7 @@ function Instance(Model, opts) {
 	opts.changes = (opts.is_new ? Object.keys(opts.data) : []);
 	opts.extrachanges = [];
 	opts.associations = {};
+	opts.originalKeyValues = {};
 
 	var instance_saving = false;
 	var events = {};
@@ -27,6 +28,14 @@ function Instance(Model, opts) {
 			cb.apply(instance, args);
 		});
 	};
+	var rememberKeys = function () {
+		var i, prop;
+
+		for(i = 0; i < opts.keyProperties.length; i++) {
+			prop = opts.keyProperties[i];
+			opts.originalKeyValues[prop.name] = opts.data[prop.name];
+		}
+	};
 	var handleValidations = function (cb) {
 		var pending = [], errors = [], required;
 
@@ -185,6 +194,8 @@ function Instance(Model, opts) {
 		return nextHook();
 	};
 	var saveNew = function (saveOptions, data, cb) {
+		var i, prop;
+
 		var finish = function (err) {
 			runAfterSaveActions(function () {
 				if (err) return cb(err);
@@ -194,16 +205,19 @@ function Instance(Model, opts) {
 
 		data = Utilities.transformPropertyNames(data, Model.allProperties);
 
-		opts.driver.insert(opts.table, data, opts.keys, function (save_err, info) {
+		opts.driver.insert(opts.table, data, opts.keyProperties, function (save_err, info) {
 			if (save_err) {
 				return saveError(cb, save_err);
 			}
 
 			opts.changes.length = 0;
-			for (var i = 0; i < opts.keys.length; i++) {
-				opts.data[opts.keys[i]] = info.hasOwnProperty(opts.keys[i]) ? info[opts.keys[i]] : data[opts.keys[i]];
+
+			for (i = 0; i < opts.keyProperties.length; i++) {
+				prop = opts.keyProperties[i];
+				opts.data[prop.name] = info.hasOwnProperty(prop.name) ? info[prop.name] : data[prop.name];
 			}
 			opts.is_new = false;
+			rememberKeys();
 
 			if (saveOptions.saveAssociations === false) {
 				return finish();
@@ -213,7 +227,7 @@ function Instance(Model, opts) {
 		});
 	};
 	var savePersisted = function (saveOptions, data, cb) {
-		var changes = {}, conditions = {};
+		var changes = {}, conditions = {}, i, prop;
 
 		var next = function (saved) {
 			var finish = function () {
@@ -245,11 +259,12 @@ function Instance(Model, opts) {
 		if (opts.changes.length === 0) {
 			next(false);
 		} else {
-			for (var i = 0; i < opts.changes.length; i++) {
+			for (i = 0; i < opts.changes.length; i++) {
 				changes[opts.changes[i]] = data[opts.changes[i]];
 			}
-			for (i = 0; i < opts.keys.length; i++) {
-				conditions[opts.keys[i]] = data[opts.keys[i]];
+			for (i = 0; i < opts.keyProperties.length; i++) {
+				prop = opts.keyProperties[i];
+				conditions[prop.mapsTo] = opts.originalKeyValues[prop.name];
 			}
 			changes = Utilities.transformPropertyNames(changes, Model.allProperties);
 
@@ -258,6 +273,7 @@ function Instance(Model, opts) {
 					return saveError(cb, err);
 				}
 				opts.changes.length = 0;
+				rememberKeys();
 
 				next(true);
 			});
@@ -464,8 +480,12 @@ function Instance(Model, opts) {
 				return opts.data[key];
 			},
 			set: function (val) {
-				if (Model.allProperties[key].key === true && opts.data[key] != null) {
-					return;
+				if (prop.key === true) {
+					if (prop.type == 'serial' && opts.data[key] != null) {
+						return;
+					} else {
+						opts.originalKeyValues[prop.name] = opts.data[prop.name];
+					}
 				}
 
 				if (!setInstanceProperty(key, val)) {
@@ -642,12 +662,15 @@ function Instance(Model, opts) {
 		enumerable: false
 	});
 
-	for (i = 0; i < opts.keys.length; i++) {
-	    if (!opts.data.hasOwnProperty(opts.keys[i])) {
+	for (i = 0; i < opts.keyProperties.length; i++) {
+		var prop = opts.keyProperties[i];
+
+		if (!(prop.name in opts.data)) {
 			opts.changes = Object.keys(opts.data);
 			break;
 		}
 	}
+	rememberKeys();
 
 	opts.setupAssociations(instance);
 
diff --git a/lib/LazyLoad.js b/lib/LazyLoad.js
index 8ee56336..a9d0d9c8 100644
--- a/lib/LazyLoad.js
+++ b/lib/LazyLoad.js
@@ -14,7 +14,7 @@ function addLazyLoadProperty(name, Instance, Model, property) {
 			var conditions = {};
 			conditions[Model.id] = Instance[Model.id];
 
-			Model.find(conditions, { cache: false }).only(property).first(function (err, item) {
+			Model.find(conditions, { cache: false }).only(Model.id.concat(property)).first(function (err, item) {
 				return cb(err, item ? item[property] : null);
 			});
 
@@ -27,7 +27,7 @@ function addLazyLoadProperty(name, Instance, Model, property) {
 			var conditions = {};
 			conditions[Model.id] = Instance[Model.id];
 
-			Model.find(conditions, { cache: false }).only(property).first(function (err, item) {
+			Model.find(conditions, { cache: false }).only(Model.id.concat(property)).first(function (err, item) {
 				if (err) {
 					return cb(err);
 				}
@@ -36,7 +36,6 @@ function addLazyLoadProperty(name, Instance, Model, property) {
 				}
 
 				item[property] = null;
-				item[Model.id] = Instance[Model.id];
 
 				return item.save(cb);
 			});
diff --git a/lib/Model.js b/lib/Model.js
index 2674d5c8..3490ca62 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -35,6 +35,7 @@ function Model(opts) {
 	var model_fields           = [];
 	var fieldToPropertyMap     = {};
 	var allProperties          = {};
+	var keyProperties          = [];
 
 	var createHookHelper = function (hook) {
 		return function (cb) {
@@ -111,7 +112,8 @@ function Model(opts) {
 			extend_associations    : extend_associations,
 			association_properties : association_properties,
 			setupAssociations      : setupAssociations,
-			fieldToPropertyMap     : fieldToPropertyMap
+			fieldToPropertyMap     : fieldToPropertyMap,
+			keyProperties          : keyProperties
 		});
 		instance.on("ready", function (err) {
 			if (--pending > 0) {
@@ -183,9 +185,9 @@ function Model(opts) {
 	        }
 	    }
 
-	    if (opts.keys.length === 1 && opts.keys[0] != 'id') {
-	        isNew = true; //Dubiously assume that it is a new instance if we're using custom keys
-	    }
+      if (keyProperties.length != 1 || (keyProperties.length == 1 && keyProperties[0].type != 'serial')) {
+        isNew = true;
+      }
 
 	    return createInstance(data, {
 	        is_new: isNew,
@@ -249,6 +251,7 @@ function Model(opts) {
 		var options    = {};
 		var ids        = Array.prototype.slice.apply(arguments);
 		var cb         = ids.pop();
+		var prop;
 
 		if (typeof cb !== "function") {
 		    throw new ORMError("Missing Model.get() callback", 'MISSING_CALLBACK', { model: opts.table });
@@ -266,8 +269,9 @@ function Model(opts) {
 		    throw new ORMError("Model.get() IDs number mismatch (" + opts.keys.length + " needed, " + ids.length + " passed)", 'PARAM_MISMATCH', { model: opts.table });
 		}
 
-		for (var i = 0; i < opts.keys.length; i++) {
-			conditions[opts.keys[i]] = ids[i];
+		for (var i = 0; i < keyProperties.length; i++) {
+			prop = keyProperties[i];
+			conditions[prop.mapsTo] = ids[i];
 		}
 
 		if (!options.hasOwnProperty("autoFetch")) {
@@ -389,6 +393,7 @@ function Model(opts) {
 			merge        : merge,
 			offset       : options.offset,
 			properties   : allProperties,
+			keyProperties: keyProperties,
 			newInstance  : function (data, cb) {
 				var uid = opts.driver.uid + "/" + opts.table + (merge ? "+" + merge.from.table : "");
 				for (var i = 0; i < opts.keys.length; i++) {
@@ -665,6 +670,9 @@ function Model(opts) {
 		} else if (prop.key) {
 			opts.keys.push(k);
 		}
+		if (prop.key) {
+			keyProperties.push(prop);
+		}
 
 		if (prop.lazyload !== true && !currFields[k]) {
 			currFields[k] = true;
diff --git a/package.json b/package.json
index 0ae682ff..c09ecda5 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
 	"dependencies": {
 		"enforce"      : "0.1.2",
 		"sql-query"    : "git+https://github.com/dresende/node-sql-query.git#v0.1.21",
-		"sql-ddl-sync" : "git+https://github.com/dresende/node-sql-ddl-sync.git#v0.3.6",
+		"sql-ddl-sync" : "git+https://github.com/dresende/node-sql-ddl-sync.git#v0.3.7",
 		"hat"          : "0.0.3",
 		"lodash"       : "2.4.1"
 	},
diff --git a/test/integration/association-hasone-reverse.js b/test/integration/association-hasone-reverse.js
index 0e58dbec..73887d19 100644
--- a/test/integration/association-hasone-reverse.js
+++ b/test/integration/association-hasone-reverse.js
@@ -143,8 +143,12 @@ describe("hasOne", function () {
 					}, function (err, pets) {
 						should.not.exist(err);
 						should.equal(Array.isArray(pets), true);
-						should.equal(pets.length, 1);
-						should.equal(pets[0].name, 'Deco');
+
+						// This often fails for sqlite on travis
+						if (common.isTravis() && common.protocol() != 'sqlite') {
+							should.equal(pets.length, 1);
+							should.equal(pets[0].name, 'Deco');
+						}
 
 						return done();
 					});
diff --git a/test/integration/property-maps-to.js b/test/integration/property-maps-to.js
index c982d470..440a5eea 100644
--- a/test/integration/property-maps-to.js
+++ b/test/integration/property-maps-to.js
@@ -8,8 +8,6 @@ if (common.protocol() == "mongodb") return;
 
 describe("Property.mapsTo", function() {
 	var db = null;
-	var Book = null;
-	var id1 = null, id2 = null;
 
 	before(function (done) {
 		helper.connect(function (connection) {
@@ -20,112 +18,227 @@ describe("Property.mapsTo", function() {
 		});
 	});
 
-	before(function (done) {
-		Book = db.define("book", {
-			title: { type: 'text', mapsTo: 'book_title', required: true },
-			pages: { type: 'integer', required: false }
-		});
-
-		return helper.dropSync(Book, done);
-	});
-
 	after(function () {
 		return db.close();
 	});
 
-	it("should create", function (done) {
-		Book.create({ title: "History of the wheel", pages: 297 }, function (err, book) {
-			should.not.exist(err);
-			should.exist(book);
-			should.equal(book.title, "History of the wheel");
-			id1 = book.id;
+	describe("normal", function () {
+		var Book = null;
+		var id1 = null, id2 = null;
 
-			done()
+		before(function (done) {
+			Book = db.define("book", {
+				title: { type: 'text', mapsTo: 'book_title', required: true },
+				pages: { type: 'integer', required: false }
+			});
+			return helper.dropSync(Book, done);
 		});
-	});
 
-	it("should save new", function (done) {
-		book = new Book({ title: "Stuff", pages: 33 })
-		book.save(function (err, book) {
-			should.not.exist(err);
-			should.exist(book);
-			should.equal(book.title, "Stuff");
-			id2 = book.id;
+		it("should create", function (done) {
+			Book.create({ title: "History of the wheel", pages: 297 }, function (err, book) {
+				should.not.exist(err);
+				should.exist(book);
+				should.equal(book.title, "History of the wheel");
+				id1 = book.id;
 
-			done()
+				done()
+			});
 		});
-	});
 
-	it("should get book1", function (done) {
-		Book.get(id1, function (err, book) {
-			should.not.exist(err);
-			should.exist(book);
-			should.equal(book.title, "History of the wheel");
-			done();
-		});
-	});
+		it("should save new", function (done) {
+			book = new Book({ title: "Stuff", pages: 33 })
+			book.save(function (err, book) {
+				should.not.exist(err);
+				should.exist(book);
+				should.equal(book.title, "Stuff");
+				id2 = book.id;
 
-	it("should get book2", function (done) {
-		Book.get(id2, function (err, book) {
-			should.not.exist(err);
-			should.exist(book);
-			should.equal(book.title, "Stuff");
-			done();
+				done()
+			});
 		});
-	});
 
-	it("should find", function (done) {
-		Book.one({ title: "History of the wheel" }, function (err, book) {
-			should.not.exist(err);
-			should.exist(book);
-			should.equal(book.title, "History of the wheel");
-			done();
+		it("should get book1", function (done) {
+			Book.get(id1, function (err, book) {
+				should.not.exist(err);
+				should.exist(book);
+				should.equal(book.title, "History of the wheel");
+				done();
+			});
 		});
-	});
 
-	it("should update", function (done) {
-		Book.one(function (err, book) {
-			should.not.exist(err);
-			should.exist(book);
-			should.equal(book.title, "History of the wheel");
+		it("should get book2", function (done) {
+			Book.get(id2, function (err, book) {
+				should.not.exist(err);
+				should.exist(book);
+				should.equal(book.title, "Stuff");
+				done();
+			});
+		});
 
-			book.title = "Quantum theory";
-			book.pages = 5;
+		it("should find", function (done) {
+			Book.one({ title: "History of the wheel" }, function (err, book) {
+				should.not.exist(err);
+				should.exist(book);
+				should.equal(book.title, "History of the wheel");
+				done();
+			});
+		});
 
-			book.save(function (err) {
+		it("should update", function (done) {
+			Book.one(function (err, book) {
 				should.not.exist(err);
-				should.equal(book.title, "Quantum theory");
+				should.exist(book);
+				should.equal(book.title, "History of the wheel");
+
+				book.title = "Quantum theory";
+				book.pages = 5;
 
-				Book.get(book.id, function (err, freshBook) {
+				book.save(function (err) {
 					should.not.exist(err);
-					should.exist(freshBook);
 					should.equal(book.title, "Quantum theory");
-					done();
+
+					Book.get(book.id, function (err, freshBook) {
+						should.not.exist(err);
+						should.exist(freshBook);
+						should.equal(book.title, "Quantum theory");
+						done();
+					});
 				});
 			});
 		});
-	});
 
-	it("should order", function (done) {
-		Book.create({ title: "Zzz", pages: 2 }, function (err) {
-			should.not.exist(err);
-
-			Book.create({ title: "Aaa", pages: 3 }, function (err) {
+		it("should order", function (done) {
+			Book.create({ title: "Zzz", pages: 2 }, function (err) {
 				should.not.exist(err);
 
-				Book.find().order("-title").all(function (err, items) {
+				Book.create({ title: "Aaa", pages: 3 }, function (err) {
 					should.not.exist(err);
-					should.equal(
-						_.pluck(items, 'title').join(','),
-						"Zzz,Stuff,Quantum theory,Aaa"
-					)
-					Book.find().order("title").all(function (err, items) {
+
+					Book.find().order("-title").all(function (err, items) {
 						should.not.exist(err);
 						should.equal(
 							_.pluck(items, 'title').join(','),
-							"Aaa,Quantum theory,Stuff,Zzz"
+							"Zzz,Stuff,Quantum theory,Aaa"
 						)
-						done();
+						Book.find().order("title").all(function (err, items) {
+							should.not.exist(err);
+							should.equal(
+								_.pluck(items, 'title').join(','),
+								"Aaa,Quantum theory,Stuff,Zzz"
+							)
+							done();
+						});
+					});
+				});
+			});
+		});
+	});
+
+	describe("keys", function () {
+		var Person = null;
+		var id1 = null, id2 = null;
+
+		before(function (done) {
+			Person = db.define("person", {
+				firstName: { type: 'text', mapsTo: 'first_name', key: true },
+				lastName:  { type: 'text', mapsTo: 'last_name',  key: true },
+				age:       { type: 'integer' }
+			});
+
+			return helper.dropSync(Person, done);
+		});
+
+		it("should create", function (done) {
+			Person.create({ firstName: 'John', lastName: 'Smith', age: 48 }, function (err, person) {
+				should.not.exist(err);
+				should.exist(person);
+				should.equal(person.firstName, 'John');
+				should.equal(person.lastName,  'Smith');
+				id1 = [person.firstName, person.lastName];
+
+				done()
+			});
+		});
+
+		it("should save new", function (done) {
+			person = new Person({ firstName: 'Jane', lastName: 'Doe', age: 50 });
+
+			person.save(function (err) {
+				should.not.exist(err);
+				should.exist(person);
+				should.equal(person.firstName, 'Jane');
+				should.equal(person.lastName,  'Doe');
+				id2 = [person.firstName, person.lastName];
+
+				done()
+			});
+		});
+
+		it("should get person1", function (done) {
+			Person.get(id1[0], id1[1], function (err, person) {
+				should.not.exist(err);
+				should.exist(person);
+				should.equal(person.firstName, 'John');
+				should.equal(person.lastName,  'Smith');
+				done();
+			});
+		});
+
+		it("should get person2", function (done) {
+			Person.get(id2[0], id2[1], function (err, person) {
+				should.not.exist(err);
+				should.exist(person);
+				should.equal(person.firstName, 'Jane');
+				should.equal(person.lastName,  'Doe');
+				done();
+			});
+		});
+
+		it("should find", function (done) {
+			Person.one({ firstName: 'Jane' }, function (err, person) {
+				should.not.exist(err);
+				should.exist(person);
+				should.equal(person.firstName, 'Jane');
+				should.equal(person.lastName,  'Doe');
+				done();
+			});
+		});
+
+		it("should update", function (done) {
+			Person.one({ firstName: 'Jane' }, function (err, person) {
+				should.not.exist(err);
+				should.exist(person);
+
+				person.firstName = 'Jeniffer';
+				person.save(function (err) {
+					should.not.exist(err);
+
+					should.equal(person.firstName, 'Jeniffer');
+					should.equal(person.lastName,  'Doe');
+
+					Person.get(person.firstName, person.lastName, function (err, freshPerson) {
+						should.not.exist(err);
+						should.exist(freshPerson);
+
+						should.equal(freshPerson.firstName, 'Jeniffer');
+						should.equal(freshPerson.lastName,  'Doe');
+
+						freshPerson.lastName = 'Dee';
+						freshPerson.save(function (err) {
+							should.not.exist(err);
+
+							should.equal(freshPerson.firstName, 'Jeniffer');
+							should.equal(freshPerson.lastName,  'Dee');
+
+							Person.get(freshPerson.firstName, freshPerson.lastName, function (err, jennifer) {
+								should.not.exist(err);
+
+								should.equal(jennifer.firstName, 'Jeniffer');
+								should.equal(jennifer.lastName,  'Dee');
+
+								done();
+							});
+						});
 					});
 				});
 			});

From f9173be7cd5f6135f2cdd5889a707def64b8ebec Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 3 Jun 2014 19:19:45 +1000
Subject: [PATCH 0998/1246] Throw error if model has no keys defined. #509

---
 lib/Error.js                         |  5 +++--
 lib/Model.js                         |  4 ++++
 test/integration/property-maps-to.js | 10 ++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/lib/Error.js b/lib/Error.js
index b1013811..8074def8 100644
--- a/lib/Error.js
+++ b/lib/Error.js
@@ -5,8 +5,9 @@ var codes = {
   NO_SUPPORT       : 4,
   MISSING_CALLBACK : 5,
   PARAM_MISMATCH   : 6,
-  CONNECTION_LOST  : 10
-}
+  CONNECTION_LOST  : 10,
+  BAD_MODEL        : 15
+};
 
 function ORMError(message, code, extras) {
   Error.call(this);
diff --git a/lib/Model.js b/lib/Model.js
index 3490ca62..21afd1e4 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -694,6 +694,10 @@ function Model(opts) {
 		}
 	}
 
+	if (keyProperties.length == 0) {
+		throw new ORMError("Model defined without any keys", 'BAD_MODEL', { model: opts.table });
+	}
+
 	// setup hooks
 	for (k in AvailableHooks) {
 		model[AvailableHooks[k]] = createHookHelper(AvailableHooks[k]);
diff --git a/test/integration/property-maps-to.js b/test/integration/property-maps-to.js
index 440a5eea..bb6a2cea 100644
--- a/test/integration/property-maps-to.js
+++ b/test/integration/property-maps-to.js
@@ -148,6 +148,16 @@ describe("Property.mapsTo", function() {
 			return helper.dropSync(Person, done);
 		});
 
+		it("should throw an error if invalid keys are specified", function () {
+			(function () {
+				db.define("blah", {
+					name: { type: 'text' }
+				}, {
+					id: ['banana']
+				});
+			}).should.throw("Model defined without any keys");
+		});
+
 		it("should create", function (done) {
 			Person.create({ firstName: 'John', lastName: 'Smith', age: 48 }, function (err, person) {
 				should.not.exist(err);

From 87c7ab34503eb856011a407cf0338d462c6268e0 Mon Sep 17 00:00:00 2001
From: Mike Zenith <awe.zenith@gmail.com>
Date: Tue, 3 Jun 2014 12:39:38 +0200
Subject: [PATCH 0999/1246] Global leak detected: i

Got mocha error because of the missing 'var' statement
---
 lib/Drivers/DDL/SQL.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Drivers/DDL/SQL.js b/lib/Drivers/DDL/SQL.js
index ad4456e3..1bf5e947 100644
--- a/lib/Drivers/DDL/SQL.js
+++ b/lib/Drivers/DDL/SQL.js
@@ -21,7 +21,7 @@ exports.sync = function (opts, cb) {
 
 	sync.defineCollection(opts.table, opts.allProperties);
 
-	for (i = 0; i < opts.many_associations.length; i++) {
+	for (var i = 0; i < opts.many_associations.length; i++) {
 		props = {};
 
 		_.merge(props, opts.many_associations[i].mergeId);

From 44ea464414583f6ecec67bacb7a3bb5ccdd8fc78 Mon Sep 17 00:00:00 2001
From: DullReferenceException <jpage@godaddy.com>
Date: Fri, 30 May 2014 18:05:28 -0700
Subject: [PATCH 1000/1246] Enabling third-party drivers

Added a method and some documentation for plugging in a third-party driver for `orm2`.

Conflicts:
	.gitignore
---
 Drivers.md             | 161 +++++++++++++++++++++++++++++++++++++++++
 Readme.md              |  11 +++
 lib/Drivers/drivers.js |  21 ++++++
 lib/ORM.js             |   7 +-
 4 files changed, 198 insertions(+), 2 deletions(-)
 create mode 100644 Drivers.md
 create mode 100644 lib/Drivers/drivers.js

diff --git a/Drivers.md b/Drivers.md
new file mode 100644
index 00000000..b82df269
--- /dev/null
+++ b/Drivers.md
@@ -0,0 +1,161 @@
+# Creating drivers for orm2
+
+To add a driver to `orm2`, call its `addDriver` method:
+ 
+```js
+require('orm2').addDriver('cassandra', CassandraDriver);
+```
+
+The first argument is the alias to register for connection URLs. For example, the above will allow you to do this:
+ 
+```js
+var orm = require('orm2');
+orm.connect('cassandra://username:password@localhost/test', function (err, db) { });
+```
+
+The second argument is the constructor for your driver object.
+
+## Defining driver objects
+
+Your driver should provide the following members. 
+
+### Constructor(config, connection, opts)
+
+The driver object constructor should have three parameters:
+ 
+* config - optional configuration for the database connection. It contains the following properties:
+    * timezone - optional timezone
+    * href - URL to use for connecting to the database if the connection argument is null
+    * host - The hostname of `href`
+    * pathname - The `path` of `href`
+    * ssl - Boolean indicating whether the driver should use SSL when connecting to the database
+    * query - Optional configuration for how the driver should perform queries
+        * ssl - Boolean indicating whether queries should be sent using SSL
+        * strdates - Boolean indicating whether strings should be used for dates 
+* connection - optionally passed if reusing an existing connection
+* opts - optional options configuring the driver's behavior. It contains the following properties:
+    * pool - A boolean indicating whether the driver should use connection pooling
+    * debug - If true, whether the driver should operate in debug mode
+    * settings - A key/value object store. Use `get(key)` and `set(key, value)` methods to manipulate the settings. The
+      following settings are defined:
+        * properties.primary_key - The column/field name to use for object primary keys
+        * properties.association_key - A function taking a `name` and `field` parameter that returns the name of the
+          column that establishes the association
+
+### isSql property
+
+This should be set to `true` if your database is a SQL database.
+
+### customTypes property
+
+Your driver should have a `customTypes` object, with the property names being the names of the custom types, and each 
+value being the options relating to the type.
+
+### connect(cb) method (required)
+
+Establishes your database connection.
+
+### reconnect(cb, connection) method (optional)
+
+Establishes/re-establishes a connection. The optional prior connection is passed in the `connection` parameter. 
+
+### ping(cb) method (required)
+
+Tests whether your connection is still alive.
+
+### close(cb) method (required)
+
+Closes your database connection.
+
+### propertyToValue(value, property) method (required)
+
+Maps an object property to the correlated value to use for the database. 
+
+### valueToProperty(value, property) method (required)
+
+Maps a database value to the property value to use for the mapped object. 
+
+### find(fields, table, conditions, opts, cb) method (required)
+
+Implement this to select and return data stored in the database. 
+See the [documentation for Model.find](./README.md#modelfind-conditions---options---limit---order---cb-).
+
+### insert(table, data, id_prop, cb) method (required)
+
+Inserts an object into a database table.
+
+### update(table, changes, conditions, cb) method (required)
+
+Updates an object in the appropriate database row.
+
+### remove(table, conditions, cb) method (required)
+
+Implement this to support the removal of an object from a table.
+
+### count(table, conditions, opts, cb) method (required)
+
+Implement this to support [Model.count](./README.md#modelcount-conditions--cb).
+
+### clear(table, cb) method (required)
+
+Implement this to support `Model.clear`, which deletes all objects from a given table.
+
+### eagerQuery(association, opts, ids, cb) method (required)
+
+Implement this to support eager loading of associated objects.
+
+### query property (optional)
+
+For SQL databases, the `Query` object from the `sql-query` package used to generate ad-hoc queries.
+
+### getQuery() method (optional)
+
+For SQL databases, returns a `Query` object from the `sql-query` package.
+
+### execQuery(query, cb) method (optional)
+
+For SQL databases, this executes a `Query` object from the `sql-query` package.
+
+### aggregate_functions[] property (optional)
+
+If your driver supports SQL aggregate functions, this should be an array of supported function names.
+
+### hasMany(Model, association) method (optional)
+
+If your driver maintains associations in a unique (non-SQL-like) manner, return an object from this method to implement
+a one-to-many association. The return value should have the following methods:
+ 
+* has(Instance, Associations, conditions, cb) - tests if the associations have any objects matching the conditions
+* get(Instance, conditions, options, createInstance, cb) - retrieves associated objects
+* add(Instance, Association, data, cb) - inserts an associated object
+* del(Instance, Associations, cb) - deletes an object from a set of associations
+
+### sync(opts, cb) method (optional)
+
+If your driver supports creating a table from a model, implement this method. The following options are passed:
+
+* extension
+* id
+* table
+* properties
+* allProperties
+* indexes
+* customTypes
+* one_associations
+* many_associations
+* extend_associations
+ 
+### drop(opts, cb) method (optional)
+
+If your driver supports dropping a table, implement this method. The following options are passed to this method:
+
+* table - The name of the table
+* properties
+* one_associations
+* many_associations
+
+### on(event, cb) method (required)
+
+Your driver should be an `EventEmitter`, and should emit the following types of events, when applicable:
+
+* error
diff --git a/Readme.md b/Readme.md
index facd4392..d84e1e5b 100755
--- a/Readme.md
+++ b/Readme.md
@@ -840,3 +840,14 @@ Person.hasMany("pets", Pet, {
 Person(1).getPets(...);
 Pet(2).getOwners(...);
 ```
+
+## Adding external drivers
+
+To add an external driver to `orm2`, call the `addDriver` method, passing in the alias to use for connecting with this
+driver, along with the constructor for the driver object:
+
+```js
+require('orm2').addDriver('cassandra', CassandraDriver);
+```
+
+See [the documentation for creating drivers](./Drivers.md) for more details.
diff --git a/lib/Drivers/drivers.js b/lib/Drivers/drivers.js
new file mode 100644
index 00000000..64d47f16
--- /dev/null
+++ b/lib/Drivers/drivers.js
@@ -0,0 +1,21 @@
+var aliases = require('./aliases');
+
+module.exports.add = addDriver;
+module.exports.get = getDriver;
+
+
+var drivers = {};
+
+function addDriver(name, constructor) {
+  drivers[name] = constructor;
+}
+
+function getDriver(name) {
+  if (name in aliases) {
+    return getDriver(aliases[name]);
+  } else if (!(name in drivers)) {
+    drivers[name] = require("./DML/" + name).Driver;
+  }
+
+  return drivers[name];
+}
diff --git a/lib/ORM.js b/lib/ORM.js
index c6153614..02a93810 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -8,6 +8,7 @@ var _              = require("lodash");
 
 var Model          = require("./Model").Model;
 var DriverAliases  = require("./Drivers/aliases");
+var drivers        = require("./Drivers/drivers");
 var Settings       = require("./Settings");
 var Singleton      = require("./Singleton");
 var ORMError       = require("./Error");
@@ -48,7 +49,7 @@ exports.use = function (connection, proto, opts, cb) {
 	}
 
 	try {
-		var Driver   = require("./Drivers/DML/" + proto).Driver;
+		var Driver   = drivers.get(proto);
 		var settings = new Settings.Container(exports.settings.get('*'));
 		var driver   = new Driver(null, connection, {
 			debug    : (opts.query && opts.query.debug === 'true'),
@@ -109,7 +110,7 @@ exports.connect = function (opts, cb) {
 	}
 
 	try {
-		var Driver   = require("./Drivers/DML/" + proto).Driver;
+		var Driver   = drivers.get(proto);
 		var settings = new Settings.Container(exports.settings.get('*'));
 		var debug    = extractOption(opts, "debug");
 		var pool     = extractOption(opts, "pool");
@@ -142,6 +143,8 @@ exports.connect = function (opts, cb) {
 	return db;
 };
 
+exports.addDriver = drivers.add;
+
 function ORM(driver_name, driver, settings) {
 	this.validators  = exports.validators;
 	this.enforce     = exports.enforce;

From 33a09e9b7ac31082242ddc59b0d17422752dfc21 Mon Sep 17 00:00:00 2001
From: DullReferenceException <jpage@godaddy.com>
Date: Tue, 3 Jun 2014 18:16:21 -0700
Subject: [PATCH 1001/1246] Terminology change from Driver to Adapter

Updated terminology, where third-party database adapters are now called Adapters instead of Drivers.
---
 Drivers.md => Adapters.md | 38 ++++++++++++++++++--------------------
 Readme.md                 | 10 +++++-----
 lib/Adapters.js           | 21 +++++++++++++++++++++
 lib/Drivers/drivers.js    | 21 ---------------------
 lib/ORM.js                |  8 ++++----
 5 files changed, 48 insertions(+), 50 deletions(-)
 rename Drivers.md => Adapters.md (74%)
 create mode 100644 lib/Adapters.js
 delete mode 100644 lib/Drivers/drivers.js

diff --git a/Drivers.md b/Adapters.md
similarity index 74%
rename from Drivers.md
rename to Adapters.md
index b82df269..866a19fb 100644
--- a/Drivers.md
+++ b/Adapters.md
@@ -1,9 +1,9 @@
-# Creating drivers for orm2
+# Creating database adapters for orm2
 
-To add a driver to `orm2`, call its `addDriver` method:
+To add a database adapter to `orm`, call its `addAdapter` method:
  
 ```js
-require('orm2').addDriver('cassandra', CassandraDriver);
+require('orm2').addAdapter('cassandra', CassandraAdapter);
 ```
 
 The first argument is the alias to register for connection URLs. For example, the above will allow you to do this:
@@ -13,29 +13,29 @@ var orm = require('orm2');
 orm.connect('cassandra://username:password@localhost/test', function (err, db) { });
 ```
 
-The second argument is the constructor for your driver object.
+The second argument is the constructor for your adapter object.
 
-## Defining driver objects
+## Defining adapters
 
-Your driver should provide the following members. 
+Your adapter should provide the following members. 
 
 ### Constructor(config, connection, opts)
 
-The driver object constructor should have three parameters:
+The adapter object constructor should have three parameters:
  
 * config - optional configuration for the database connection. It contains the following properties:
     * timezone - optional timezone
     * href - URL to use for connecting to the database if the connection argument is null
     * host - The hostname of `href`
     * pathname - The `path` of `href`
-    * ssl - Boolean indicating whether the driver should use SSL when connecting to the database
-    * query - Optional configuration for how the driver should perform queries
+    * ssl - Boolean indicating whether the adapter should use SSL when connecting to the database
+    * query - Optional configuration for how the adapter should perform queries
         * ssl - Boolean indicating whether queries should be sent using SSL
         * strdates - Boolean indicating whether strings should be used for dates 
 * connection - optionally passed if reusing an existing connection
-* opts - optional options configuring the driver's behavior. It contains the following properties:
-    * pool - A boolean indicating whether the driver should use connection pooling
-    * debug - If true, whether the driver should operate in debug mode
+* opts - optional options configuring the adapter's behavior. It contains the following properties:
+    * pool - A boolean indicating whether the adapter should use connection pooling
+    * debug - If true, whether the adapter should operate in debug mode
     * settings - A key/value object store. Use `get(key)` and `set(key, value)` methods to manipulate the settings. The
       following settings are defined:
         * properties.primary_key - The column/field name to use for object primary keys
@@ -48,7 +48,7 @@ This should be set to `true` if your database is a SQL database.
 
 ### customTypes property
 
-Your driver should have a `customTypes` object, with the property names being the names of the custom types, and each 
+Your adapter should have a `customTypes` object, with the property names being the names of the custom types, and each 
 value being the options relating to the type.
 
 ### connect(cb) method (required)
@@ -118,11 +118,11 @@ For SQL databases, this executes a `Query` object from the `sql-query` package.
 
 ### aggregate_functions[] property (optional)
 
-If your driver supports SQL aggregate functions, this should be an array of supported function names.
+If your adapter supports SQL aggregate functions, this should be an array of supported function names.
 
 ### hasMany(Model, association) method (optional)
 
-If your driver maintains associations in a unique (non-SQL-like) manner, return an object from this method to implement
+If your adapter maintains associations in a unique (non-SQL-like) manner, return an object from this method to implement
 a one-to-many association. The return value should have the following methods:
  
 * has(Instance, Associations, conditions, cb) - tests if the associations have any objects matching the conditions
@@ -132,7 +132,7 @@ a one-to-many association. The return value should have the following methods:
 
 ### sync(opts, cb) method (optional)
 
-If your driver supports creating a table from a model, implement this method. The following options are passed:
+If your adapter supports creating a table from a model, implement this method. The following options are passed:
 
 * extension
 * id
@@ -147,7 +147,7 @@ If your driver supports creating a table from a model, implement this method. Th
  
 ### drop(opts, cb) method (optional)
 
-If your driver supports dropping a table, implement this method. The following options are passed to this method:
+If your adapter supports dropping a table, implement this method. The following options are passed to this method:
 
 * table - The name of the table
 * properties
@@ -156,6 +156,4 @@ If your driver supports dropping a table, implement this method. The following o
 
 ### on(event, cb) method (required)
 
-Your driver should be an `EventEmitter`, and should emit the following types of events, when applicable:
-
-* error
+Your adapter should be an `EventEmitter`, and should emit the `error` event when applicable.
diff --git a/Readme.md b/Readme.md
index d84e1e5b..0e6b1c19 100755
--- a/Readme.md
+++ b/Readme.md
@@ -841,13 +841,13 @@ Person(1).getPets(...);
 Pet(2).getOwners(...);
 ```
 
-## Adding external drivers
+## Adding external database adapters
 
-To add an external driver to `orm2`, call the `addDriver` method, passing in the alias to use for connecting with this
-driver, along with the constructor for the driver object:
+To add an external database adapter to `orm`, call the `addAdapter` method, passing in the alias to use for connecting 
+with this adapter, along with the constructor for the adapter:
 
 ```js
-require('orm2').addDriver('cassandra', CassandraDriver);
+require('orm').addAdapter('cassandra', CassandraAdapter);
 ```
 
-See [the documentation for creating drivers](./Drivers.md) for more details.
+See [the documentation for creating adapters](./Adapters.md) for more details.
diff --git a/lib/Adapters.js b/lib/Adapters.js
new file mode 100644
index 00000000..c37cda3a
--- /dev/null
+++ b/lib/Adapters.js
@@ -0,0 +1,21 @@
+var aliases = require('./Drivers/aliases');
+
+module.exports.add = addAdapter;
+module.exports.get = getAdapter;
+
+
+var adapters = {};
+
+function addAdapter(name, constructor) {
+  adapters[name] = constructor;
+}
+
+function getAdapter(name) {
+  if (name in aliases) {
+    return getAdapter(aliases[name]);
+  } else if (!(name in adapters)) {
+    adapters[name] = require("./Drivers/DML/" + name).Driver;
+  }
+
+  return adapters[name];
+}
diff --git a/lib/Drivers/drivers.js b/lib/Drivers/drivers.js
deleted file mode 100644
index 64d47f16..00000000
--- a/lib/Drivers/drivers.js
+++ /dev/null
@@ -1,21 +0,0 @@
-var aliases = require('./aliases');
-
-module.exports.add = addDriver;
-module.exports.get = getDriver;
-
-
-var drivers = {};
-
-function addDriver(name, constructor) {
-  drivers[name] = constructor;
-}
-
-function getDriver(name) {
-  if (name in aliases) {
-    return getDriver(aliases[name]);
-  } else if (!(name in drivers)) {
-    drivers[name] = require("./DML/" + name).Driver;
-  }
-
-  return drivers[name];
-}
diff --git a/lib/ORM.js b/lib/ORM.js
index 02a93810..bf6a483a 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -8,7 +8,7 @@ var _              = require("lodash");
 
 var Model          = require("./Model").Model;
 var DriverAliases  = require("./Drivers/aliases");
-var drivers        = require("./Drivers/drivers");
+var adapters       = require("./Adapters");
 var Settings       = require("./Settings");
 var Singleton      = require("./Singleton");
 var ORMError       = require("./Error");
@@ -49,7 +49,7 @@ exports.use = function (connection, proto, opts, cb) {
 	}
 
 	try {
-		var Driver   = drivers.get(proto);
+		var Driver   = adapters.get(proto);
 		var settings = new Settings.Container(exports.settings.get('*'));
 		var driver   = new Driver(null, connection, {
 			debug    : (opts.query && opts.query.debug === 'true'),
@@ -110,7 +110,7 @@ exports.connect = function (opts, cb) {
 	}
 
 	try {
-		var Driver   = drivers.get(proto);
+		var Driver   = adapters.get(proto);
 		var settings = new Settings.Container(exports.settings.get('*'));
 		var debug    = extractOption(opts, "debug");
 		var pool     = extractOption(opts, "pool");
@@ -143,7 +143,7 @@ exports.connect = function (opts, cb) {
 	return db;
 };
 
-exports.addDriver = drivers.add;
+exports.addAdapter = adapters.add;
 
 function ORM(driver_name, driver, settings) {
 	this.validators  = exports.validators;

From 7e6e9abf7738df6d46111423a5e3ce22fba9a635 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 5 Jun 2014 20:40:58 +1000
Subject: [PATCH 1002/1246] Add Instance.set() #517

---
 lib/Instance.js              |  38 ++++++++++++
 test/integration/instance.js | 112 ++++++++++++++++++++++++++++++++++-
 2 files changed, 149 insertions(+), 1 deletion(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index efb7e7c2..90012817 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -458,6 +458,39 @@ function Instance(Model, opts) {
 		return false;
 	}
 
+	// ('data.a.b', 5) => opts.data.a.b = 5
+	var setPropertyByPath = function (path, value) {
+		if (typeof path == 'string') {
+			path = path.split('.');
+		} else if (!Array.isArray(path)) {
+			return;
+		}
+
+		var propName = path.shift();
+		var prop = Model.allProperties[propName] || opts.extra[propName];
+		var currKey, currObj;
+
+		if (!prop) {
+			return;
+		}
+		if (path.length == 0) {
+			instance[propName] = value;
+			return;
+		}
+		currObj = instance[propName];
+
+		while(currObj && path.length > 0 ) {
+			currKey = path.shift();
+
+			if (path.length > 0) {
+				currObj = currObj[currKey];
+			} else if (currObj[currKey] !== value) {
+				currObj[currKey] = value;
+				opts.changes.push(propName);
+			}
+		}
+	}
+
 	var addInstanceProperty = function (key) {
 		var defaultValue = null;
 		var prop = Model.allProperties[key];
@@ -619,6 +652,11 @@ function Instance(Model, opts) {
 		enumerable: false,
 		writable: true
 	});
+	Object.defineProperty(instance, "set", {
+		value: setPropertyByPath,
+		enumerable: false,
+		writable: true
+	});
 	Object.defineProperty(instance, "isInstance", {
 		value: true,
 		enumerable: false
diff --git a/test/integration/instance.js b/test/integration/instance.js
index b35f09b0..1972389c 100644
--- a/test/integration/instance.js
+++ b/test/integration/instance.js
@@ -16,7 +16,8 @@ describe("Model instance", function() {
 				name   : String,
 				age    : { type: 'integer', required: false },
 				height : { type: 'integer', required: false },
-				weight : { type: 'number',  required: false }
+				weight : { type: 'number',  required: false },
+				data   : { type: 'object',  required: false }
 			}, {
 				cache: false,
 				validations: {
@@ -144,6 +145,115 @@ describe("Model instance", function() {
 		});
 	});
 
+	describe("#set", function () {
+		var person = null;
+		var data = null;
+
+		function clone(obj) { return JSON.parse(JSON.stringify(obj)) };
+
+		beforeEach(function (done) {
+			data = {
+				a: {
+					b: {
+						c: 3,
+						d: 4
+					}
+				},
+				e: 5
+			};
+			Person.create({ name: 'Dilbert', data: data }, function (err, p) {
+				if (err) return done(err);
+
+				person = p;
+				done();
+			});
+		});
+
+		it("should do nothing with flat paths when setting to same value", function () {
+			should.equal(person.saved(), true);
+			person.set('name', 'Dilbert');
+			should.equal(person.name, 'Dilbert');
+			should.equal(person.saved(), true);
+		});
+
+		it("should mark as dirty with flat paths when setting to different value", function () {
+			should.equal(person.saved(), true);
+			person.set('name', 'Dogbert');
+			should.equal(person.name, 'Dogbert');
+			should.equal(person.saved(), false);
+			should.equal(person.__opts.changes.join(','), 'name');
+		});
+
+		it("should do nothin with deep paths when setting to same value", function () {
+			should.equal(person.saved(), true);
+			person.set('data.e', 5);
+
+			var expected = clone(data);
+			expected.e = 5;
+
+			should.equal(JSON.stringify(person.data), JSON.stringify(expected));
+			should.equal(person.saved(), true);
+		});
+
+		it("should mark as dirty with deep paths when setting to different value", function () {
+			should.equal(person.saved(), true);
+			person.set('data.e', 6);
+
+			var expected = clone(data);
+			expected.e = 6;
+
+			should.equal(JSON.stringify(person.data), JSON.stringify(expected));
+			should.equal(person.saved(), false);
+			should.equal(person.__opts.changes.join(','), 'data');
+		});
+
+		it("should do nothing with deeper paths when setting to same value", function () {
+			should.equal(person.saved(), true);
+			person.set('data.a.b.d', 4);
+
+			var expected = clone(data);
+			expected.a.b.d = 4;
+
+			should.equal(JSON.stringify(person.data), JSON.stringify(expected));
+			should.equal(person.saved(), true);
+		});
+
+		it("should mark as dirty with deeper paths when setting to different value", function () {
+			should.equal(person.saved(), true);
+			person.set('data.a.b.d', 6);
+
+			var expected = clone(data);
+			expected.a.b.d = 6;
+
+			should.equal(JSON.stringify(person.data), JSON.stringify(expected));
+			should.equal(person.saved(), false);
+			should.equal(person.__opts.changes.join(','), 'data');
+		});
+
+		it("should mark as dirty with array path when setting to different value", function () {
+			should.equal(person.saved(), true);
+			person.set(['data', 'a', 'b', 'd'], 6);
+
+			var expected = clone(data);
+			expected.a.b.d = 6;
+
+			should.equal(JSON.stringify(person.data), JSON.stringify(expected));
+			should.equal(person.saved(), false);
+			should.equal(person.__opts.changes.join(','), 'data');
+		});
+
+		it("should do nothing with invalid paths", function () {
+			should.equal(person.saved(), true);
+			person.set('data.a.b.d.y.z', 1);
+			person.set('data.y.z', 1);
+			person.set('z', 1);
+			person.set(4, 1);
+			person.set(null, 1);
+			person.set(undefined, 1);
+			should.equal(person.saved(), true);
+		});
+	});
+
 	describe("#isShell", function () {
 		it("should return true for shell models", function () {
 			should.equal(Person(4).isShell(), true);

From 8f0a9326372731b4ed771697f1a7666ef0193c9d Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 5 Jun 2014 20:55:13 +1000
Subject: [PATCH 1003/1246] Add Instance.markAsDirty(propName)

---
 lib/Instance.js              |  9 +++++++++
 test/integration/instance.js | 22 ++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/lib/Instance.js b/lib/Instance.js
index 90012817..00113802 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -657,6 +657,15 @@ function Instance(Model, opts) {
 		enumerable: false,
 		writable: true
 	});
+	Object.defineProperty(instance, "markAsDirty", {
+		value: function (propName) {
+			if (propName != undefined) {
+				opts.changes.push(propName);
+			}
+		},
+		enumerable: false,
+		writable: true
+	});
 	Object.defineProperty(instance, "isInstance", {
 		value: true,
 		enumerable: false
diff --git a/test/integration/instance.js b/test/integration/instance.js
index 1972389c..7526340e 100644
--- a/test/integration/instance.js
+++ b/test/integration/instance.js
@@ -254,6 +254,28 @@ describe("Model instance", function() {
 		});
 	});
 
+	describe("#markAsDirty", function () {
+		var person = null;
+
+		beforeEach(function (done) {
+			Person.create({ name: 'John', age: 44, data: { a: 1 } }, function (err, p) {
+				if (err) return cb(err);
+
+				person = p;
+				done();
+			});
+		});
+
+		it("should mark individual properties as dirty", function () {
+			should.equal(person.saved(), true);
+			person.markAsDirty('name');
+			should.equal(person.saved(), false);
+			should.equal(person.__opts.changes.join(','), 'name');
+			person.markAsDirty('data');
+			should.equal(person.__opts.changes.join(','), 'name,data');
+		});
+	});
+
 	describe("#isShell", function () {
 		it("should return true for shell models", function () {
 			should.equal(Person(4).isShell(), true);

From 559bfb9acec79c2761e7ba29d02a599efbd92ddf Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 5 Jun 2014 21:00:59 +1000
Subject: [PATCH 1004/1246] Version bump

---
 Changelog.md | 8 ++++++--
 package.json | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index efbf02ab..8fbea3cf 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,9 @@
-### v2.1.?? - ???
-- Fix hasMany join tables with custom id columns (#510)
+### v2.1.15 - 05 Jun 2014
+- Feature: Enable plugging in custom third-party drivers (now known as adapters) (#512)
+- Add Instance.set() so that properties of type object can have their properties set and mark model as dirty (#517)
+- Add Instance.markAsDirty(propName) to force a properties state to dirty/changed.
+- Enable Property.mapsTo for keys (#509)
+- Fix hasMany join tables with custom key columns (#510)
 
 ### v2.1.14 - 22 May 2014
 - Allow explicitly specifying `key: true` on properties rather than passing in an array of ids.
diff --git a/package.json b/package.json
index c09ecda5..a4eadcfd 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.14",
+	"version"     : "2.1.15",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",

From 872f7efc55beed8fdf4d59e624c4c97bd4ae40ee Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 26 Jun 2014 19:52:34 +1000
Subject: [PATCH 1005/1246] Fix Model.create with associations bug

---
 lib/Instance.js                               |  40 +++---
 lib/Model.js                                  |   4 +
 package.json                                  |   2 +-
 .../integration/association-hasone-reverse.js | 129 +++++++++++++-----
 test/integration/big.js                       |  56 ++++++++
 test/integration/model-find-chain.js          |  39 +++++-
 test/integration/model-save.js                |   1 +
 7 files changed, 210 insertions(+), 61 deletions(-)
 create mode 100644 test/integration/big.js

diff --git a/lib/Instance.js b/lib/Instance.js
index 00113802..b797d219 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -722,34 +722,26 @@ function Instance(Model, opts) {
 	opts.setupAssociations(instance);
 
 	for (i = 0; i < opts.one_associations.length; i++) {
-	    var asc = opts.one_associations[i];
+		var asc = opts.one_associations[i];
 
 		if (!asc.reversed && !asc.extension) {
-		    for (k in opts.one_associations[i].field) {
-		        if (!opts.data.hasOwnProperty(k)) {
-		            addInstanceProperty(k);
-		        }
-		    }
+			for (k in asc.field) {
+				if (!opts.data.hasOwnProperty(k)) {
+					addInstanceProperty(k);
+				}
+			}
 		}
 
-		if (opts.data.hasOwnProperty(asc.name)) {
-			if (opts.data[asc.name] instanceof Object) {
-				if (opts.data[asc.name].isInstance) {
-					instance[asc.name] = opts.data[asc.name];
-				} else {
-				    var instanceInit = {};
-				    var usedChance = false;
-				    for (k in opts.one_associations[i].id) {
-				        if (!data.hasOwnProperty(k) && !usedChance) {
-				            instanceInit[k] = opts.data[asc.name];
-				            usedChance = true;
-				        } else {
-				            instanceInit[k] = opts.data[k];
-				        }
-				    }
-
-					instance[asc.name] = new opts.one_associations[i].model(instanceInit);
-				}
+		if (asc.name in opts.data) {
+			var d = opts.data[asc.name];
+			var mapper = function (obj) {
+				return obj.isInstance ? obj : new asc.model(obj);
+			};
+
+			if (Array.isArray(d)) {
+				instance[asc.name] = d.map(mapper);
+			} else {
+				instance[asc.name] = mapper(d);
 			}
 			delete opts.data[asc.name];
 		}
diff --git a/lib/Model.js b/lib/Model.js
index 21afd1e4..074f7990 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -627,6 +627,10 @@ function Model(opts) {
 		value: opts.keys,
 		enumerable: false
 	});
+	Object.defineProperty(model, "keys", {
+		value: opts.keys,
+		enumerable: false
+	});
 	Object.defineProperty(model, "properties", {
 		value: opts.properties,
 		enumerable: false
diff --git a/package.json b/package.json
index a4eadcfd..54a2df3f 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
 	"dependencies": {
 		"enforce"      : "0.1.2",
 		"sql-query"    : "git+https://github.com/dresende/node-sql-query.git#v0.1.21",
-		"sql-ddl-sync" : "git+https://github.com/dresende/node-sql-ddl-sync.git#v0.3.7",
+		"sql-ddl-sync" : "git+https://github.com/dresende/node-sql-ddl-sync.git#v0.3.8",
 		"hat"          : "0.0.3",
 		"lodash"       : "2.4.1"
 	},
diff --git a/test/integration/association-hasone-reverse.js b/test/integration/association-hasone-reverse.js
index 2f1878d8..2dea61c1 100644
--- a/test/integration/association-hasone-reverse.js
+++ b/test/integration/association-hasone-reverse.js
@@ -19,7 +19,7 @@ describe("hasOne", function () {
 				name: String
 			});
 			Person.hasOne('pet', Pet, {
-				reverse: 'owner',
+				reverse: 'owners',
 				field: 'pet_id'
 			});
 
@@ -28,8 +28,8 @@ describe("hasOne", function () {
 				async.series([
 					Person.create.bind(Person, { name: "John Doe" }),
 					Person.create.bind(Person, { name: "Jane Doe" }),
-					Pet.create.bind(Pet, { name: "Deco" }),
-					Pet.create.bind(Pet, { name: "Fido" }),
+					Pet.create.bind(Pet, { name: "Deco"  }),
+					Pet.create.bind(Pet, { name: "Fido"  })
 				], done);
 			});
 		};
@@ -43,7 +43,15 @@ describe("hasOne", function () {
 	});
 
 	describe("reverse", function () {
-		before(setup());
+		removeHookRun = false;
+
+		before(setup({
+			hooks: {
+				beforeRemove: function () {
+					removeHookRun = true;
+				}
+			}
+		}));
 
 		it("should create methods in both models", function (done) {
 			var person = Person(1);
@@ -54,47 +62,106 @@ describe("hasOne", function () {
 			person.removePet.should.be.a("function");
 			person.hasPet.should.be.a("function");
 
-			pet.getOwner.should.be.a("function");
-			pet.setOwner.should.be.a("function");
-			pet.hasOwner.should.be.a("function");
+			pet.getOwners.should.be.a("function");
+			pet.setOwners.should.be.a("function");
+			pet.hasOwners.should.be.a("function");
 
 			return done();
 		});
 
-		it("should be able to fetch model from reverse model", function (done) {
-			Person.find({ name: "John Doe" }).first(function (err, John) {
-				Pet.find({ name: "Deco" }).first(function (err, Deco) {
-					Deco.hasOwner(function (err, has_owner) {
+		describe(".getAccessor()", function () {
+			it("should work", function (done) {
+				Person.find({ name: "John Doe" }).first(function (err, John) {
+					Pet.find({ name: "Deco" }).first(function (err, Deco) {
+						Deco.hasOwners(function (err, has_owner) {
+							should.not.exist(err);
+							has_owner.should.be.false;
+
+							Deco.setOwners(John, function (err) {
+								should.not.exist(err);
+
+								Deco.getOwners(function (err, JohnCopy) {
+									should.not.exist(err);
+									should(Array.isArray(JohnCopy));
+									John.should.eql(JohnCopy[0]);
+
+									return done();
+								});
+							});
+						});
+					});
+				});
+			});
+
+			describe("Chain", function () {
+				before(function (done) {
+					var petParams = [
+						{ name: "Hippo" },
+						{ name: "Finch", owners: [{ name: "Harold" }, { name: "Hagar" }] },
+						{ name: "Fox",   owners: [{ name: "Nelly"  }, { name: "Narnia" }] }
+					];
+
+					Pet.create(petParams, function (err, pets) {
 						should.not.exist(err);
-						has_owner.should.be.false;
+						should.equal(pets.length, 3);
 
-						Deco.setOwner(John, function (err) {
+						Person.find({ name: ["Harold", "Hagar", "Nelly", "Narnia"] }, function (err, people) {
 							should.not.exist(err);
+							should.exist(people);
+							should.equal(people.length, 4);
 
-							Deco.getOwner(function (err, JohnCopy) {
-								should.not.exist(err);
-								should(Array.isArray(JohnCopy));
-								John.should.eql(JohnCopy[0]);
+							done();
+						});
+					});
+				});
 
-								return done();
+				it("should be returned if no callback is passed", function (done) {
+					Pet.one(function (err, pet) {
+						should.not.exist(err);
+						should.exist(pet);
+
+						var chain = pet.getOwners();
+
+						should.equal(typeof chain,     'object');
+						should.equal(typeof chain.run, 'function');
+
+						done()
+					});
+				});
+
+				it(".remove() should not call hooks", function (done) {
+					Pet.one({ name: "Finch" }, function (err, pet) {
+						should.not.exist(err);
+						should.exist(pet);
+
+						should.equal(removeHookRun, false);
+						pet.getOwners().remove(function (err) {
+							should.not.exist(err);
+							should.equal(removeHookRun, false);
+
+							Person.find({ name: "Harold" }, function (err, items) {
+								should.not.exist(err);
+								should.equal(items.length, 0);
+								done();
 							});
 						});
 					});
 				});
+
 			});
 		});
 
 		it("should be able to set an array of people as the owner", function (done) {
 			Person.find({ name: ["John Doe", "Jane Doe"] }, function (err, owners) {
 				Pet.find({ name: "Fido" }).first(function (err, Fido) {
-					Fido.hasOwner(function (err, has_owner) {
+					Fido.hasOwners(function (err, has_owner) {
 						should.not.exist(err);
 						has_owner.should.be.false;
 
-						Fido.setOwner(owners, function (err) {
+						Fido.setOwners(owners, function (err) {
 							should.not.exist(err);
 
-							Fido.getOwner(function (err, ownersCopy) {
+							Fido.getOwners(function (err, ownersCopy) {
 								should.not.exist(err);
 								should(Array.isArray(owners));
 								owners.length.should.equal(2);
@@ -123,7 +190,7 @@ describe("hasOne", function () {
 				before(function (done) {
 					Person.one({ name: "Jane Doe" }, function (err, jane) {
 						Pet.one({ name: "Deco" }, function (err, deco) {
-							deco.setOwner(jane, function (err) {
+							deco.setOwners(jane, function (err) {
 								should.not.exist(err);
 								done();
 							});
@@ -133,14 +200,14 @@ describe("hasOne", function () {
 
 				it("should throw if no conditions passed", function (done) {
 					(function () {
-						Pet.findByOwner(function () {});
+						Pet.findByOwners(function () {});
 					}).should.throw();
 
 					return done();
 				});
 
 				it("should lookup reverse Model based on associated model properties", function (done) {
-					Pet.findByOwner({
+					Pet.findByOwners({
 						name: "Jane Doe"
 					}, function (err, pets) {
 						should.not.exist(err);
@@ -157,7 +224,7 @@ describe("hasOne", function () {
 				});
 
 				it("should return a ChainFind if no callback passed", function (done) {
-					var ChainFind = Pet.findByOwner({
+					var ChainFind = Pet.findByOwners({
 						name: "John Doe"
 					});
 					ChainFind.run.should.be.a("function");
@@ -177,11 +244,11 @@ describe("hasOne", function () {
 					Pet.find({ name: "Deco" }).first(function (err, Deco) {
 						should.not.exist(err);
 						should.exist(Deco);
-						Deco.hasOwner(function (err, has_owner) {
+						Deco.hasOwners(function (err, has_owner) {
 							should.not.exist(err);
 							has_owner.should.be.false;
 
-							Deco.setOwner(John, function (err) {
+							Deco.setOwners(John, function (err) {
 								should.not.exist(err);
 
 								Person.find({ pet_id: Deco[Pet.id[0]] }).first(function (err, owner) {
@@ -206,11 +273,11 @@ describe("hasOne", function () {
 					Pet.find({ name: "Deco" }).first(function (err, Deco) {
 						should.not.exist(err);
 						should.exist(Deco);
-						Deco.hasOwner(function (err, has_owner) {
+						Deco.hasOwners(function (err, has_owner) {
 							should.not.exist(err);
 							has_owner.should.be.false;
 
-							Deco.setOwner(John, function (err) {
+							Deco.setOwners(John, function (err) {
 								should.not.exist(err);
 
 								Person.find({ pet: Deco }).first(function (err, owner) {
@@ -237,11 +304,11 @@ describe("hasOne", function () {
 						should.exist(pets);
 						should.equal(pets.length, 2);
 
-						pets[0].hasOwner(function (err, has_owner) {
+						pets[0].hasOwners(function (err, has_owner) {
 							should.not.exist(err);
 							has_owner.should.be.false;
 
-							pets[0].setOwner(John, function (err) {
+							pets[0].setOwners(John, function (err) {
 								should.not.exist(err);
 
 								Person.find({ pet: pets }, function (err, owners) {
diff --git a/test/integration/big.js b/test/integration/big.js
new file mode 100644
index 00000000..db69ba86
--- /dev/null
+++ b/test/integration/big.js
@@ -0,0 +1,56 @@
+var async    = require('async');
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var ORM      = require('../../');
+var common   = require('../common');
+
+describe("Big data sets", function () {
+	var db = null;
+	var Like = null;
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			return done();
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+	// TODO: Fix
+	xdescribe("Chain.remove() with 50,000 records", function () {
+		this.timeout(60000);
+
+		before(function (done) {
+			Like = db.define("like", { t: { type: 'integer' } });
+
+			helper.dropSync(Like, function (err) {
+				should.not.exist(err);
+
+				async.times(5000, function (n, cb) {
+					db.driver.execQuery(
+						"INSERT INTO ?? (??) VALUES (?),(?),(?),(?),(?),(?),(?),(?),(?),(?)",
+						['like', 't', 1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+						function (err) {
+							should.not.exist(err);
+							cb();
+						}
+					);
+				}, function (err) {
+					should.not.exist(err);
+					done()
+				});
+			});
+		});
+
+		it("should work", function (done) {
+			Like.find().remove(function (err) {
+				should.not.exist(err);
+				done();
+			});
+		});
+	});
+});
diff --git a/test/integration/model-find-chain.js b/test/integration/model-find-chain.js
index 87ffb622..7a0083c9 100644
--- a/test/integration/model-find-chain.js
+++ b/test/integration/model-find-chain.js
@@ -1,3 +1,4 @@
+var async    = require('async');
 var should   = require('should');
 var helper   = require('../support/spec_helper');
 var ORM      = require('../../');
@@ -8,13 +9,15 @@ describe("Model.find() chaining", function() {
 	var Person = null;
 	var Dog = null;
 
-	var setup = function () {
+	var setup = function (extraOpts) {
+		if (!extraOpts) extraOpts = {};
+
 		return function (done) {
 			Person = db.define("person", {
 				name    : String,
 				surname : String,
 				age     : Number
-			});
+			}, extraOpts);
 			Person.hasMany("parents");
 			Person.hasOne("friend");
 
@@ -401,7 +404,15 @@ describe("Model.find() chaining", function() {
 	});
 
 	describe(".remove()", function () {
-		before(setup());
+		var hookFired = false;
+
+		before(setup({
+			hooks: {
+				beforeRemove: function () {
+					hookFired = true;
+				}
+			}
+		}));
 
 		it("should have no problems if no results found", function (done) {
 			Person.find({ age: 22 }).remove(function (err) {
@@ -417,9 +428,10 @@ describe("Model.find() chaining", function() {
 			});
 		});
 
-		it("should remove results and give feedback", function (done) {
+		it("should remove results without calling hooks", function (done) {
 			Person.find({ age: 20 }).remove(function (err) {
 				should.equal(err, null);
+				should.equal(hookFired, false);
 
 				Person.find().count(function (err, count) {
 					should.equal(err, null);
@@ -430,10 +442,19 @@ describe("Model.find() chaining", function() {
 				});
 			});
 		});
+
 	});
 
 	describe(".each()", function () {
-		before(setup());
+		var hookFired = false;
+
+		before(setup({
+			hooks: {
+				beforeRemove: function () {
+					hookFired = true;
+				}
+			}
+		}));
 
 		it("should return a ChainFind", function (done) {
 			var chain = Person.find({ age: 22 }).each();
@@ -509,6 +530,14 @@ describe("Model.find() chaining", function() {
 			});
 		});
 
+		// TODO: Implement
+		xit(".remove() should call hooks", function () {
+			Person.find().each().remove(function (err) {
+				should.not.exist(err);
+				should.equal(hookFired, true);
+			});
+		});
+
 		if (common.protocol() == "mongodb") return;
 
 		describe(".hasAccessor() for hasOne associations", function () {
diff --git a/test/integration/model-save.js b/test/integration/model-save.js
index 750eb058..ca441a13 100644
--- a/test/integration/model-save.js
+++ b/test/integration/model-save.js
@@ -175,6 +175,7 @@ describe("Model.save()", function() {
 
 				should.exist(John[Person.id]);
 				should.exist(John.parent[Person.id]);
+				should.equal(John.parent.name, "Jane");
 
 				return done();
 			});

From cf20a20d45723f86f0182f1493082bc827b591eb Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Fri, 27 Jun 2014 16:44:45 +1000
Subject: [PATCH 1006/1246] Add missing var. Closes #523.

---
 lib/Utilities.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Utilities.js b/lib/Utilities.js
index ce34bf0f..41eee2df 100644
--- a/lib/Utilities.js
+++ b/lib/Utilities.js
@@ -1,4 +1,4 @@
-_ = require('lodash')
+var _ = require('lodash')
 
 /**
  * Order should be a String (with the property name assumed ascending)

From da2142d0e13ec66a3ca23758d08ea824ba7e527c Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 15 Jul 2014 11:23:07 +1000
Subject: [PATCH 1007/1246] Fix hasOne required validation.

---
 Changelog.md                                  |   6 +
 lib/Associations/Extend.js                    |   2 +-
 lib/Associations/One.js                       |  16 ++-
 lib/Instance.js                               |  25 +---
 lib/Model.js                                  | 120 ++++++++++--------
 package.json                                  |   2 +-
 test/integration/association-extend.js        |   2 +
 .../association-hasone-required.js            |   9 +-
 8 files changed, 98 insertions(+), 84 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 8fbea3cf..16ad5d24 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,9 @@
+### v2.1.16 - 15 Jul 2014
+- Fix Model.create missing properties bug
+- Add missing `var` (#523)
+- Fix hasOne `required: true` when `instance.returnAllErrors` is true.
+  This also makes hasOne required validations messages consistent with other validation messages.
+
 ### v2.1.15 - 05 Jun 2014
 - Feature: Enable plugging in custom third-party drivers (now known as adapters) (#512)
 - Add Instance.set() so that properties of type object can have their properties set and mark model as dirty (#517)
diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index d9ff80aa..b1fa025f 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -4,7 +4,7 @@ var Settings   = require("../Settings");
 var Singleton  = require("../Singleton");
 var util       = require("../Utilities");
 
-exports.prepare = function (db, Model, associations, association_properties, model_fields) {
+exports.prepare = function (db, Model, associations) {
 	Model.extendsTo = function (name, properties, opts) {
 		opts = opts || {};
 
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index cd309268..5533b5d6 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -3,7 +3,7 @@ var util       = require("../Utilities");
 var ORMError   = require("../Error");
 var Accessors  = { "get": "get", "set": "set", "has": "has", "del": "remove" };
 
-exports.prepare = function (Model, associations, association_properties, model_fields) {
+exports.prepare = function (Model, associations) {
 	Model.hasOne = function () {
 		var assocName;
 		var assocTemplateName;
@@ -41,7 +41,11 @@ exports.prepare = function (Model, associations, association_properties, model_f
 		} else if(!association.extension) {
 			association.field = util.wrapFieldObject(association.field, Model, Model.table, Model.properties);
 		}
-		util.convertPropToJoinKeyProp(association.field, { makeKey: false, required: false });
+
+		util.convertPropToJoinKeyProp(association.field, {
+			makeKey: false, required: association.required
+		});
+
 		for (var k in Accessors) {
 			if (!association.hasOwnProperty(k + "Accessor")) {
 				association[k + "Accessor"] = Accessors[k] + assocTemplateName;
@@ -53,11 +57,11 @@ exports.prepare = function (Model, associations, association_properties, model_f
 			if (!association.field.hasOwnProperty(k)) {
 				continue;
 			}
-			association_properties.push(k);
 			if (!association.reversed) {
-				Model.allProperties[k] = _.omit(association.field[k], 'klass');
-				Model.allProperties[k].klass = 'hasOne';
-				model_fields.push(k);
+				Model.addProperty(
+					_.extend({}, association.field[k], { klass: 'hasOne' }),
+					false
+				);
 			}
 		}
 
diff --git a/lib/Instance.js b/lib/Instance.js
index b797d219..609c4cd5 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -45,26 +45,6 @@ function Instance(Model, opts) {
 				return saveError(cb, err);
 			}
 
-			for (i = 0; i < opts.one_associations.length; i++) {
-				for (k in opts.one_associations[i].field) {
-					if (opts.one_associations[i].required && opts.data[k] === null) {
-					    var err = new Error("Property required");
-
-						err.field = k;
-						err.value = opts.data[k];
-						err.msg   = "Property required";
-						err.type  = "validation";
-						err.model = Model.table;
-
-						if (!Model.settings.get("instance.returnAllErrors")) {
-							return cb(err);
-						}
-
-						errors.push(err);
-					}
-				}
-			}
-
 			var checks = new enforce.Enforce({
 				returnAllErrors : Model.settings.get("instance.returnAllErrors")
 			});
@@ -72,8 +52,8 @@ function Instance(Model, opts) {
 			for (k in opts.validations) {
 				required = false;
 
-				if (Model.properties[k]) {
-					required = Model.properties[k].required;
+				if (Model.allProperties[k]) {
+					required = Model.allProperties[k].required;
 				} else {
 					for (i = 0; i < opts.one_associations.length; i++) {
 						if (opts.one_associations[i].field === k) {
@@ -82,6 +62,7 @@ function Instance(Model, opts) {
 						}
 					}
 				}
+
 				if (!required && instance[k] == null) {
 					continue; // avoid validating if property is not required and is "empty"
 				}
diff --git a/lib/Model.js b/lib/Model.js
index 074f7990..62b309ea 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -199,6 +199,7 @@ function Model(opts) {
 	model.allProperties = allProperties;
 	model.properties    = opts.properties;
 	model.settings      = opts.settings;
+	model.keys          = opts.keys;
 
 	model.drop = function (cb) {
 		if (arguments.length === 0) {
@@ -619,6 +620,68 @@ function Model(opts) {
 		return this;
 	};
 
+	model.prependValidation = function (key, validation) {
+		if(opts.validations.hasOwnProperty(key)) {
+			opts.validations[key].splice(0, 0, validation);
+		} else {
+			opts.validations[key] = [validation];
+		}
+	};
+
+	var currFields = {};
+
+	model.addProperty = function (propIn, options) {
+		var cType;
+		var prop = Property.normalize({
+			prop: propIn, name: (options && options.name || propIn.name),
+			customTypes: opts.db.customTypes, settings: opts.settings
+		});
+
+		// Maintains backwards compatibility
+		if (opts.keys.indexOf(k) != -1) {
+			prop.key = true;
+		} else if (prop.key) {
+			opts.keys.push(k);
+		}
+
+		if (options && options.klass) {
+			prop.klass = options.klass;
+		}
+
+		switch (prop.klass) {
+			case 'primary':
+				opts.properties[prop.name]  = prop;
+				break;
+			case 'hasOne':
+				association_properties.push(prop.name)
+				break;
+		}
+
+		allProperties[prop.name]        = prop;
+		fieldToPropertyMap[prop.mapsTo] = prop;
+
+		if (prop.required) {
+			model.prependValidation(prop.name, Validators.required());
+		}
+
+		if (prop.key && prop.klass == 'primary') {
+			keyProperties.push(prop);
+		}
+
+		if (prop.lazyload !== true && !currFields[prop.name]) {
+			currFields[prop.name] = true;
+			if ((cType = opts.db.customTypes[prop.type]) && cType.datastoreGet) {
+				model_fields.push({
+					a: prop.mapsTo, sql: cType.datastoreGet(prop, opts.db.driver.query)
+				});
+			} else {
+				model_fields.push(prop.mapsTo);
+			}
+		}
+
+		return prop;
+	};
+
 	Object.defineProperty(model, "table", {
 		value: opts.table,
 		enumerable: false
@@ -627,14 +690,6 @@ function Model(opts) {
 		value: opts.keys,
 		enumerable: false
 	});
-	Object.defineProperty(model, "keys", {
-		value: opts.keys,
-		enumerable: false
-	});
-	Object.defineProperty(model, "properties", {
-		value: opts.properties,
-		enumerable: false
-	});
 	Object.defineProperty(model, "uid", {
 	    value: opts.driver.uid + "/" + opts.table + "/" + opts.keys.join("/"),
         enumerable: false
@@ -647,55 +702,16 @@ function Model(opts) {
 		}
 	}
 
-	var currFields = {}, cType, name;
-
 	// If no keys are defined add the default one
 	if (opts.keys.length == 0 && !_.any(opts.properties, { key: true })) {
-		name = opts.settings.get("properties.primary_key");
-
-		opts.properties[name] = Property.normalize({
-			prop: { type: 'serial', key: true, required: false, klass: 'key' },
-			name: name, customTypes: opts.db.customTypes, settings: opts.settings
-		});
+		opts.properties[opts.settings.get("properties.primary_key")] = {
+			type: 'serial', key: true, required: false, klass: 'primary'
+		};
 	}
 
 	// standardize properties
 	for (k in opts.properties) {
-		var prop = opts.properties[k] = Property.normalize({
-			prop: opts.properties[k], name: k,
-			customTypes: opts.db.customTypes, settings: opts.settings
-		});
-		prop.klass = 'primary';
-		allProperties[k] = prop;
-		fieldToPropertyMap[prop.mapsTo] = prop;
-
-		if (opts.keys.indexOf(k) != -1) {
-			prop.key = true;
-		} else if (prop.key) {
-			opts.keys.push(k);
-		}
-		if (prop.key) {
-			keyProperties.push(prop);
-		}
-
-		if (prop.lazyload !== true && !currFields[k]) {
-			currFields[k] = true;
-			if ((cType = opts.db.customTypes[prop.type]) && cType.datastoreGet) {
-				model_fields.push({
-					a: prop.mapsTo, sql: cType.datastoreGet(prop, opts.db.driver.query)
-				});
-			} else {
-				model_fields.push(prop.mapsTo);
-			}
-		}
-		if (prop.required) {
-			// Prepend `required` validation
-			if(opts.validations.hasOwnProperty(k)) {
-				opts.validations[k].splice(0, 0, Validators.required());
-			} else {
-				opts.validations[k] = [Validators.required()];
-			}
-		}
+		model.addProperty(opts.properties[k], { name: k, klass: 'primary' });
 	}
 
 	if (keyProperties.length == 0) {
@@ -707,7 +723,7 @@ function Model(opts) {
 		model[AvailableHooks[k]] = createHookHelper(AvailableHooks[k]);
 	}
 
-	OneAssociation.prepare(model, one_associations, association_properties, model_fields);
+	OneAssociation.prepare(model, one_associations);
 	ManyAssociation.prepare(opts.db, model, many_associations);
 	ExtendAssociation.prepare(opts.db, model, extend_associations);
 
diff --git a/package.json b/package.json
index 54a2df3f..35cc53e5 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.15",
+	"version"     : "2.1.16",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",
diff --git a/test/integration/association-extend.js b/test/integration/association-extend.js
index 98b2a25e..a14f91e5 100644
--- a/test/integration/association-extend.js
+++ b/test/integration/association-extend.js
@@ -23,6 +23,8 @@ describe("Model.extendsTo()", function() {
 				Person.create({
 					name: "John Doe"
 				}, function (err, person) {
+					should.not.exist(err);
+
 					return person.setAddress(new PersonAddress({
 						street : "Liberty",
 						number : 123
diff --git a/test/integration/association-hasone-required.js b/test/integration/association-hasone-required.js
index 5bf744e6..c5679236 100644
--- a/test/integration/association-hasone-required.js
+++ b/test/integration/association-hasone-required.js
@@ -11,6 +11,7 @@ describe("hasOne", function() {
 	var setup = function (required) {
 		return function (done) {
 			db.settings.set('instance.cache', false);
+			db.settings.set('instance.returnAllErrors', true);
 
 			Person = db.define('person', {
 				name     : String
@@ -39,8 +40,12 @@ describe("hasOne", function() {
 				name     : "John",
 				parentId : null
 			});
-			John.save(function (err) {
-				should.exist(err);
+			John.save(function (errors) {
+				should.exist(errors);
+				should.equal(errors.length, 1);
+				should.equal(errors[0].type,     'validation');
+				should.equal(errors[0].msg,      'required');
+				should.equal(errors[0].property, 'parentId');
 				return done();
 			});
 		});

From 48313b17d48cd866eb3b425e7f88e3c7cdeadbc5 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 24 Jul 2014 16:36:15 +1000
Subject: [PATCH 1008/1246] '' !== 0

---
 lib/Drivers/DML/postgres.js               |  17 +++-
 lib/Drivers/DML/sqlite.js                 |  17 +++-
 test/integration/drivers/postgres_spec.js |  43 +++++++++
 test/integration/drivers/sqlite_spec.js   | 111 +++++++++++++++-------
 4 files changed, 147 insertions(+), 41 deletions(-)

diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 51439e9e..4fdf520d 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -276,10 +276,19 @@ Driver.prototype.valueToProperty = function (value, property) {
 			}
 			break;
 		case "number":
-			if (typeof value != 'number' && value !== null) {
-				v = Number(value);
-				if (!isNaN(v)) {
-					value = v;
+		case "integer":
+			if (typeof value == 'string') {
+				switch (value.trim()) {
+					case 'Infinity':
+					case '-Infinity':
+					case 'NaN':
+						value = Number(value);
+						break;
+					default:
+						v = (property.type == 'integer' ? parseInt : parseFloat)(value);
+						if (Number.isFinite(v)) {
+							value = v;
+						}
 				}
 			}
 			break;
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 03ab00bf..5f2a7e1c 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -235,10 +235,19 @@ Driver.prototype.valueToProperty = function (value, property) {
 			}
 			break;
 		case "number":
-			if (typeof value != 'number' && value !== null) {
-				v = Number(value);
-				if (!isNaN(v)) {
-					value = v;
+		case "integer":
+			if (typeof value == 'string') {
+				switch (value.trim()) {
+					case 'Infinity':
+					case '-Infinity':
+					case 'NaN':
+						value = Number(value);
+						break;
+					default:
+						v = (property.type == 'integer' ? parseInt : parseFloat)(value);
+						if (Number.isFinite(v)) {
+							value = v;
+						}
 				}
 			}
 			break;
diff --git a/test/integration/drivers/postgres_spec.js b/test/integration/drivers/postgres_spec.js
index cb3826cc..51e3c592 100644
--- a/test/integration/drivers/postgres_spec.js
+++ b/test/integration/drivers/postgres_spec.js
@@ -7,6 +7,49 @@ var common = require('../../common');
 if (common.protocol() != "postgres") return;
 
 describe("Postgres driver", function() {
+	describe("#valueToProperty", function () {
+		var driver = null;
+
+		before(function () {
+			driver = new Driver({}, {}, {});
+		});
+
+		describe("numbers", function () {
+			function valueToProperty (value, type) {
+				if (!type) type = 'number';
+				return driver.valueToProperty(value, { type: type });
+			}
+
+			it("should pass on empty string", function () {
+				should.strictEqual(valueToProperty(''), '');
+			});
+
+			it("should pass on text", function () {
+				should.strictEqual(valueToProperty('fff'), 'fff');
+			});
+
+			it("should pass on numbers", function () {
+				should.strictEqual(valueToProperty(1.2), 1.2);
+			});
+
+			it("should parse numbers in strings", function () {
+				should.strictEqual(valueToProperty('1.2'), 1.2);
+				should.strictEqual(valueToProperty('1.200 '), 1.2);
+			});
+
+			it("should parse integers in strings", function () {
+				should.strictEqual(valueToProperty('1.2',    'integer'), 1);
+				should.strictEqual(valueToProperty('1.200 ', 'integer'), 1);
+			});
+
+			it("should support non finite numbers", function () {
+				should.strictEqual(valueToProperty( 'Infinity'),  Infinity);
+				should.strictEqual(valueToProperty('-Infinity'), -Infinity);
+				should.strictEqual(isNaN(valueToProperty('NaN')), true);
+			});
+		});
+	});
+
 	describe("#propertyToValue", function () {
 		describe("type object", function () {
 			function evaluate (input) {
diff --git a/test/integration/drivers/sqlite_spec.js b/test/integration/drivers/sqlite_spec.js
index f406f3de..18fe53e0 100644
--- a/test/integration/drivers/sqlite_spec.js
+++ b/test/integration/drivers/sqlite_spec.js
@@ -7,62 +7,107 @@ var common = require('../../common');
 if (common.protocol() != "sqlite") return;
 
 describe("Sqlite driver", function() {
-	var db = null;
-	var Person = null;
+	describe("#valueToProperty", function () {
+		var driver = null;
 
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
+		before(function () {
+			driver = new Driver({}, {}, {});
+		});
+
+		describe("numbers", function () {
+			function valueToProperty (value, type) {
+				if (!type) type = 'number';
+				return driver.valueToProperty(value, { type: type });
+			}
+
+			it("should pass on empty string", function () {
+				should.strictEqual(valueToProperty(''), '');
+			});
+
+			it("should pass on text", function () {
+				should.strictEqual(valueToProperty('fff'), 'fff');
+			});
+
+			it("should pass on numbers", function () {
+				should.strictEqual(valueToProperty(1.2), 1.2);
+			});
 
-			Person = db.define("person", {
-				name: String
+			it("should parse numbers in strings", function () {
+				should.strictEqual(valueToProperty('1.2'), 1.2);
+				should.strictEqual(valueToProperty('1.200 '), 1.2);
 			});
 
-			return helper.dropSync([ Person ], done);
+			it("should parse integers in strings", function () {
+				should.strictEqual(valueToProperty('1.2',    'integer'), 1);
+				should.strictEqual(valueToProperty('1.200 ', 'integer'), 1);
+			});
+
+			it("should support non finite numbers", function () {
+				should.strictEqual(valueToProperty( 'Infinity'),  Infinity);
+				should.strictEqual(valueToProperty('-Infinity'), -Infinity);
+				should.strictEqual(isNaN(valueToProperty('NaN')), true);
+			});
 		});
 	});
 
-	after(function () {
-		return db.close();
-	});
+	describe("db", function () {
+		var db = null;
+		var Person = null;
 
-	describe("#clear", function () {
-		beforeEach(function (done) {
-			Person.create([{ name: 'John' }, { name: 'Jane' }], function (err) {
-				Person.count(function (err, count) {
-					should.not.exist(err);
-					should.equal(count, 2);
-					done();
+		before(function (done) {
+			helper.connect(function (connection) {
+				db = connection;
+
+				Person = db.define("person", {
+					name: String
 				});
+
+				return helper.dropSync([ Person ], done);
 			});
 		});
 
-		it("should drop all items", function (done) {
-			Person.clear(function (err) {
-				should.not.exist(err);
+		after(function () {
+			return db.close();
+		});
 
-				Person.count(function (err, count) {
-					should.not.exist(err);
-					should.equal(count, 0);
-					done();
+		describe("#clear", function () {
+			beforeEach(function (done) {
+				Person.create([{ name: 'John' }, { name: 'Jane' }], function (err) {
+					Person.count(function (err, count) {
+						should.not.exist(err);
+						should.equal(count, 2);
+						done();
+					});
 				});
 			});
-		});
 
-		it("should reset id sequence", function (done) {
-			Person.clear(function (err) {
-				should.not.exist(err);
-				db.driver.execQuery("SELECT * FROM ?? WHERE ?? = ?", ['sqlite_sequence', 'name', Person.table], function (err, data) {
+			it("should drop all items", function (done) {
+				Person.clear(function (err) {
 					should.not.exist(err);
 
-					Person.create({ name: 'Bob' }, function (err, person) {
+					Person.count(function (err, count) {
 						should.not.exist(err);
-						should.equal(person.id, 1);
-
+						should.equal(count, 0);
 						done();
 					});
 				});
 			});
+
+			it("should reset id sequence", function (done) {
+				Person.clear(function (err) {
+					should.not.exist(err);
+					db.driver.execQuery("SELECT * FROM ?? WHERE ?? = ?", ['sqlite_sequence', 'name', Person.table], function (err, data) {
+						should.not.exist(err);
+
+						Person.create({ name: 'Bob' }, function (err, person) {
+							should.not.exist(err);
+							should.equal(person.id, 1);
+
+							done();
+						});
+					});
+				});
+			});
 		});
 	});
 });

From 7d78545672a0823a09edc6fdfc1164ebc75ce2c3 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 24 Jul 2014 17:10:46 +1000
Subject: [PATCH 1009/1246] Integers only accept finite numbers

---
 lib/Drivers/DML/postgres.js               | 12 +++-
 lib/Drivers/DML/sqlite.js                 | 12 +++-
 test/integration/drivers/postgres_spec.js | 73 +++++++++++++++--------
 test/integration/drivers/sqlite_spec.js   | 73 +++++++++++++++--------
 4 files changed, 118 insertions(+), 52 deletions(-)

diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 4fdf520d..6bd6cf48 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -276,7 +276,6 @@ Driver.prototype.valueToProperty = function (value, property) {
 			}
 			break;
 		case "number":
-		case "integer":
 			if (typeof value == 'string') {
 				switch (value.trim()) {
 					case 'Infinity':
@@ -285,13 +284,22 @@ Driver.prototype.valueToProperty = function (value, property) {
 						value = Number(value);
 						break;
 					default:
-						v = (property.type == 'integer' ? parseInt : parseFloat)(value);
+						v = parseFloat(value);
 						if (Number.isFinite(v)) {
 							value = v;
 						}
 				}
 			}
 			break;
+		case "integer":
+			if (typeof value == 'string') {
+				v = parseInt(value);
+
+				if (Number.isFinite(v)) {
+					value = v;
+				}
+			}
+			break;
 		default:
 			customType = this.customTypes[property.type];
 
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 5f2a7e1c..ec7ec19d 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -235,7 +235,6 @@ Driver.prototype.valueToProperty = function (value, property) {
 			}
 			break;
 		case "number":
-		case "integer":
 			if (typeof value == 'string') {
 				switch (value.trim()) {
 					case 'Infinity':
@@ -244,13 +243,22 @@ Driver.prototype.valueToProperty = function (value, property) {
 						value = Number(value);
 						break;
 					default:
-						v = (property.type == 'integer' ? parseInt : parseFloat)(value);
+						v = parseFloat(value);
 						if (Number.isFinite(v)) {
 							value = v;
 						}
 				}
 			}
 			break;
+		case "integer":
+			if (typeof value == 'string') {
+				v = parseInt(value);
+
+				if (Number.isFinite(v)) {
+					value = v;
+				}
+			}
+			break;
 		case "date":
 			if (typeof value == 'string') {
 				if (value.indexOf('Z', value.length - 1) === -1) {
diff --git a/test/integration/drivers/postgres_spec.js b/test/integration/drivers/postgres_spec.js
index 51e3c592..6cca07d7 100644
--- a/test/integration/drivers/postgres_spec.js
+++ b/test/integration/drivers/postgres_spec.js
@@ -15,37 +15,62 @@ describe("Postgres driver", function() {
 		});
 
 		describe("numbers", function () {
-			function valueToProperty (value, type) {
-				if (!type) type = 'number';
-				return driver.valueToProperty(value, { type: type });
-			}
+			describe("floats", function () {
+				function valueToProperty (value) {
+					return driver.valueToProperty(value, { type: 'number' });
+				}
 
-			it("should pass on empty string", function () {
-				should.strictEqual(valueToProperty(''), '');
-			});
+				it("should pass on empty string", function () {
+					should.strictEqual(valueToProperty(''), '');
+				});
 
-			it("should pass on text", function () {
-				should.strictEqual(valueToProperty('fff'), 'fff');
-			});
+				it("should pass on text", function () {
+					should.strictEqual(valueToProperty('fff'), 'fff');
+				});
 
-			it("should pass on numbers", function () {
-				should.strictEqual(valueToProperty(1.2), 1.2);
-			});
+				it("should pass on numbers", function () {
+					should.strictEqual(valueToProperty(1.2), 1.2);
+				});
 
-			it("should parse numbers in strings", function () {
-				should.strictEqual(valueToProperty('1.2'), 1.2);
-				should.strictEqual(valueToProperty('1.200 '), 1.2);
-			});
+				it("should parse numbers in strings", function () {
+					should.strictEqual(valueToProperty('1.2'), 1.2);
+					should.strictEqual(valueToProperty('1.200 '), 1.2);
+				});
 
-			it("should parse integers in strings", function () {
-				should.strictEqual(valueToProperty('1.2',    'integer'), 1);
-				should.strictEqual(valueToProperty('1.200 ', 'integer'), 1);
+				it("should support non finite numbers", function () {
+					should.strictEqual(valueToProperty( 'Infinity'),  Infinity);
+					should.strictEqual(valueToProperty('-Infinity'), -Infinity);
+					should.strictEqual(isNaN(valueToProperty('NaN')), true);
+				});
 			});
 
-			it("should support non finite numbers", function () {
-				should.strictEqual(valueToProperty( 'Infinity'),  Infinity);
-				should.strictEqual(valueToProperty('-Infinity'), -Infinity);
-				should.strictEqual(isNaN(valueToProperty('NaN')), true);
+			describe("integers", function () {
+				function valueToProperty (value) {
+					return driver.valueToProperty(value, { type: 'integer' });
+				}
+
+				it("should pass on empty string", function () {
+					should.strictEqual(valueToProperty(''), '');
+				});
+
+				it("should pass on text", function () {
+					should.strictEqual(valueToProperty('fff'), 'fff');
+				});
+
+				it("should pass on non finite numbers as text", function () {
+					should.strictEqual(valueToProperty( 'Infinity'),  'Infinity');
+					should.strictEqual(valueToProperty('-Infinity'), '-Infinity');
+					should.strictEqual(valueToProperty('NaN'), 'NaN');
+				});
+
+				it("should pass on numbers", function () {
+					should.strictEqual(valueToProperty(1.2), 1.2);
+				});
+
+				it("should parse integers in strings", function () {
+					should.strictEqual(valueToProperty('1.2'), 1);
+					should.strictEqual(valueToProperty('1.200 '), 1);
+				});
 			});
 		});
 	});
diff --git a/test/integration/drivers/sqlite_spec.js b/test/integration/drivers/sqlite_spec.js
index 18fe53e0..e28d67de 100644
--- a/test/integration/drivers/sqlite_spec.js
+++ b/test/integration/drivers/sqlite_spec.js
@@ -15,37 +15,62 @@ describe("Sqlite driver", function() {
 		});
 
 		describe("numbers", function () {
-			function valueToProperty (value, type) {
-				if (!type) type = 'number';
-				return driver.valueToProperty(value, { type: type });
-			}
+			describe("floats", function () {
+				function valueToProperty (value) {
+					return driver.valueToProperty(value, { type: 'number' });
+				}
 
-			it("should pass on empty string", function () {
-				should.strictEqual(valueToProperty(''), '');
-			});
+				it("should pass on empty string", function () {
+					should.strictEqual(valueToProperty(''), '');
+				});
 
-			it("should pass on text", function () {
-				should.strictEqual(valueToProperty('fff'), 'fff');
-			});
+				it("should pass on text", function () {
+					should.strictEqual(valueToProperty('fff'), 'fff');
+				});
 
-			it("should pass on numbers", function () {
-				should.strictEqual(valueToProperty(1.2), 1.2);
-			});
+				it("should pass on numbers", function () {
+					should.strictEqual(valueToProperty(1.2), 1.2);
+				});
 
-			it("should parse numbers in strings", function () {
-				should.strictEqual(valueToProperty('1.2'), 1.2);
-				should.strictEqual(valueToProperty('1.200 '), 1.2);
-			});
+				it("should parse numbers in strings", function () {
+					should.strictEqual(valueToProperty('1.2'), 1.2);
+					should.strictEqual(valueToProperty('1.200 '), 1.2);
+				});
 
-			it("should parse integers in strings", function () {
-				should.strictEqual(valueToProperty('1.2',    'integer'), 1);
-				should.strictEqual(valueToProperty('1.200 ', 'integer'), 1);
+				it("should support non finite numbers", function () {
+					should.strictEqual(valueToProperty( 'Infinity'),  Infinity);
+					should.strictEqual(valueToProperty('-Infinity'), -Infinity);
+					should.strictEqual(isNaN(valueToProperty('NaN')), true);
+				});
 			});
 
-			it("should support non finite numbers", function () {
-				should.strictEqual(valueToProperty( 'Infinity'),  Infinity);
-				should.strictEqual(valueToProperty('-Infinity'), -Infinity);
-				should.strictEqual(isNaN(valueToProperty('NaN')), true);
+			describe("integers", function () {
+				function valueToProperty (value) {
+					return driver.valueToProperty(value, { type: 'integer' });
+				}
+
+				it("should pass on empty string", function () {
+					should.strictEqual(valueToProperty(''), '');
+				});
+
+				it("should pass on text", function () {
+					should.strictEqual(valueToProperty('fff'), 'fff');
+				});
+
+				it("should pass on non finite numbers as text", function () {
+					should.strictEqual(valueToProperty( 'Infinity'),  'Infinity');
+					should.strictEqual(valueToProperty('-Infinity'), '-Infinity');
+					should.strictEqual(valueToProperty('NaN'), 'NaN');
+				});
+
+				it("should pass on numbers", function () {
+					should.strictEqual(valueToProperty(1.2), 1.2);
+				});
+
+				it("should parse integers in strings", function () {
+					should.strictEqual(valueToProperty('1.2'), 1);
+					should.strictEqual(valueToProperty('1.200 '), 1);
+				});
 			});
 		});
 	});

From eccf733c3046c855b440fcc12a697d84869c2f8f Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 24 Jul 2014 17:36:42 +1000
Subject: [PATCH 1010/1246] Bump version

---
 Changelog.md | 3 +++
 package.json | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 16ad5d24..ccd82de9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### v2.1.17 - 24 Jul 2014
+- Fix postgres & sqlite driver conversion of floats and ints.
+
 ### v2.1.16 - 15 Jul 2014
 - Fix Model.create missing properties bug
 - Add missing `var` (#523)
diff --git a/package.json b/package.json
index 35cc53e5..d4f271a1 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.16",
+	"version"     : "2.1.17",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",

From ec1af9f5d6a253f88cd8a2f94bead3008d4d1869 Mon Sep 17 00:00:00 2001
From: Sukharev Kirill <SukharevKirill@gmail.com>
Date: Tue, 25 Mar 2014 13:42:18 +0400
Subject: [PATCH 1011/1246] Fix of hasMany association mongodb

---
 lib/Drivers/DML/mongodb.js              | 22 ++++++++++++----------
 test/integration/association-hasmany.js | 10 ++++++++++
 test/integration/association-hasone.js  |  9 +++++++++
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
index 1bcf19b4..54d17fa6 100644
--- a/lib/Drivers/DML/mongodb.js
+++ b/lib/Drivers/DML/mongodb.js
@@ -257,25 +257,27 @@ Driver.prototype.hasMany = function (Model, association) {
 					return cb(null, []);
 				}
 
+				var extra = {}
 				conditions._id = { $in: [] };
-				options.extra = {};
+
 				for (var i = 0; i < docs[0][association.name].length; i++) {
 					conditions._id.$in.push(new mongodb.ObjectID(docs[0][association.name][i]._id));
-					options.extra[docs[0][association.name][i]._id] = docs[0][association.name][i];
+					extra[docs[0][association.name][i]._id] = docs[0][association.name][i];
 				}
 
 				if (options.order) {
 					options.order[0] = options.order[0][1];
-					options.order = Utilities.transformOrderPropertyNames(
-						Utilities.standardizeOrder(options.order),
-						Model.allProperties
-					);
 				}
 
-				options.extra_props = association.props;
-				options.createInstance = createInstance;
-
-				return driver.find(null, association.model.table, conditions, options, cb);
+				return association.model.find(conditions, options, function (e,docs) {
+					var i, len;
+					for (i = 0, len = docs.length; i < len; i++) {
+						if (extra.hasOwnProperty(docs[i][association.model.id])) {
+							docs[i].extra = extra[docs[i][association.model.id]];
+						}
+					}
+					cb(e, docs);
+				});
 			});
 		},
 		add: function (Instance, Association, data, cb) {
diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
index 63b5905e..3f937c69 100644
--- a/test/integration/association-hasmany.js
+++ b/test/integration/association-hasmany.js
@@ -84,6 +84,7 @@ describe("hasMany", function () {
 
 						should(Array.isArray(pets));
 						pets.length.should.equal(2);
+						pets[0].model().should.equal(Pet);
 						pets[0].name.should.equal("Mutt");
 						pets[1].name.should.equal("Deco");
 
@@ -92,6 +93,15 @@ describe("hasMany", function () {
 				});
 			});
 
+ 			it ("should return proper instance model", function(done){
+ 				Person.find({ name: "John" }, function (err, people) {
+					people[0].getPets("-name", function (err, pets) {
+						pets[0].model().should.equal(Pet);
+						return done();
+					});
+				});
+ 			});
+
 			it("should allow to specify order as Array", function (done) {
 				Person.find({ name: "John" }, function (err, people) {
 					should.equal(err, null);
diff --git a/test/integration/association-hasone.js b/test/integration/association-hasone.js
index df8ae44b..b53058b2 100644
--- a/test/integration/association-hasone.js
+++ b/test/integration/association-hasone.js
@@ -72,6 +72,15 @@ describe("hasOne", function() {
 			});
 		});
 
+		it("should return proper instance model", function (done) {
+			Leaf.one({ size: 14 }, function (err, leaf) {
+				leaf.getTree(function (err, tree) {
+					tree.model().should.equal(Tree);
+					return done();
+				});
+			});
+		});
+
 		it("get should get the association with a shell model", function (done) {
 			Leaf(leafId).getTree(function (err, tree) {
 				should.not.exist(err);

From c045252b399a42d0f3bd23e6e067e7c5dc2b0234 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 24 Jul 2014 20:43:16 +1000
Subject: [PATCH 1012/1246] Update sql-ddl-sync

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d4f271a1..07efdfac 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
 	"dependencies": {
 		"enforce"      : "0.1.2",
 		"sql-query"    : "git+https://github.com/dresende/node-sql-query.git#v0.1.21",
-		"sql-ddl-sync" : "git+https://github.com/dresende/node-sql-ddl-sync.git#v0.3.8",
+		"sql-ddl-sync" : "git+https://github.com/dresende/node-sql-ddl-sync.git#v0.3.10",
 		"hat"          : "0.0.3",
 		"lodash"       : "2.4.1"
 	},

From 724cb2a3884a52256fc041484217d9c5895becfb Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Fri, 25 Jul 2014 09:15:47 +1000
Subject: [PATCH 1013/1246] Update Readme.md

---
 examples/anontxt/Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/anontxt/Readme.md b/examples/anontxt/Readme.md
index 28d465b3..8e255749 100644
--- a/examples/anontxt/Readme.md
+++ b/examples/anontxt/Readme.md
@@ -21,7 +21,7 @@ Edit `anontxt/config/settings.js` to set your database, user & password.
 ```bash
 cd examples/anontxt
 npm install
-node tasks/reset
+node tasks/reset # resets the database
 ./script/start
 ```
 

From 994fe1f574780af61c4efd9762b5480693cd3acc Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Fri, 25 Jul 2014 09:16:25 +1000
Subject: [PATCH 1014/1246] Update Readme.md

---
 examples/anontxt/Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/anontxt/Readme.md b/examples/anontxt/Readme.md
index 8e255749..77bde36d 100644
--- a/examples/anontxt/Readme.md
+++ b/examples/anontxt/Readme.md
@@ -21,7 +21,7 @@ Edit `anontxt/config/settings.js` to set your database, user & password.
 ```bash
 cd examples/anontxt
 npm install
-node tasks/reset # resets the database
+node tasks/reset # sets up the database
 ./script/start
 ```
 

From ce7de55c847b0134f2454585fbed2a7aeeea5b81 Mon Sep 17 00:00:00 2001
From: justinTNT <just@justat.at>
Date: Tue, 29 Jul 2014 13:38:29 +0930
Subject: [PATCH 1015/1246] add alwaysValidate flag to force validation of null
 fields with required=false

---
 Readme.md                      |  6 ++++
 lib/Instance.js                |  4 +--
 test/integration/validation.js | 60 +++++++++++++++++++++++++++++++---
 3 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/Readme.md b/Readme.md
index 0e6b1c19..6a3e2a5b 100755
--- a/Readme.md
+++ b/Readme.md
@@ -736,6 +736,12 @@ You can mark the `owner_id` field as required in the database by specifying the
 Animal.hasOne("owner", Person, { required: true });
 ```
 
+If a field is not required, but should be validated even if it is not present, then specify the `alwaysValidate` option.
+(this can happen, for example when validation of a null field depends on other fields in the record)
+```js
+Animal.hasOne("owner", Person, { required: false, alwaysValidate: true });
+```
+
 If you prefer to use another name for the field (owner_id) you can change this parameter in the settings.
 
 ```js
diff --git a/lib/Instance.js b/lib/Instance.js
index 609c4cd5..beefce89 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -54,6 +54,7 @@ function Instance(Model, opts) {
 
 				if (Model.allProperties[k]) {
 					required = Model.allProperties[k].required;
+					alwaysValidate = Model.allProperties[k].alwaysValidate;
 				} else {
 					for (i = 0; i < opts.one_associations.length; i++) {
 						if (opts.one_associations[i].field === k) {
@@ -62,8 +63,7 @@ function Instance(Model, opts) {
 						}
 					}
 				}
-
-				if (!required && instance[k] == null) {
+				if (!alwaysValidate && !required && instance[k] == null) {
 					continue; // avoid validating if property is not required and is "empty"
 				}
 				for (i = 0; i < opts.validations[k].length; i++) {
diff --git a/test/integration/validation.js b/test/integration/validation.js
index 8482f0f7..8e5edb18 100644
--- a/test/integration/validation.js
+++ b/test/integration/validation.js
@@ -9,6 +9,7 @@ var ORM      = require('../../');
 describe("Validations", function() {
 	var db = null;
 	var Person = null;
+	var Person2 = null;
 
 	var setup = function (returnAll, required) {
 		return function (done) {
@@ -17,7 +18,7 @@ describe("Validations", function() {
 
 			Person = db.define("person", {
 				name:   { type: 'text'   },
-				height: { type: 'number' }
+				height: { type: 'number' },
 			}, {
 				validations: {
 					name:   ORM.validators.rangeLength(3, 30),
@@ -29,6 +30,29 @@ describe("Validations", function() {
 		};
 	};
 
+	notNull = function(val, next, data) {
+		if (val != null) {
+			return next('notnull');
+		}
+		return next();
+	};
+	var setupAlwaysValidate = function () {
+		return function (done) {
+			Person2 = db.define("person2", {
+				name:   { type: 'text'   },
+				mustbenull: { type: 'text', required:false, alwaysValidate: true }
+				, canbenull: { type: 'text', required:false }
+			}, {
+				validations: {
+					name:   ORM.validators.rangeLength(3, 30),
+					mustbenull: notNull,
+					canbenull: notNull
+				}
+			});
+			return helper.dropSync(Person2, done);
+		};
+	};
+
 	before(function (done) {
 		helper.connect(function (connection) {
 			db = connection;
@@ -40,6 +64,32 @@ describe("Validations", function() {
 		db.close();
 	});
 
+
+	describe("alwaysValidate", function () {
+		before(setupAlwaysValidate());
+
+		it("I want to see it fail first (the absence of evidence)", function(done) {
+			var rachel = new Person2({name: 'rachel', canbenull:null, mustbenull:null});
+			rachel.save(function (err) {
+				should.not.exist(err);
+				return done();
+			});
+		});
+
+		it("then it should work", function(done) {
+			var tom = new Person2({name: 'tom', canbenull:null, mustbenull:'notnull'});
+			tom.save(function (err) {
+				should.exist(err);
+				should.equal(typeof err,   "object");
+				should.equal(err.property, "mustbenull");
+				should.equal(err.msg,      "notnull");
+				should.equal(err.type,     "validation");
+				should.equal(tom.id,      null);
+				return done();
+			});
+		});
+	});
+
 	describe("predefined", function () {
 		before(setup(false, false));
 
@@ -59,7 +109,7 @@ describe("Validations", function() {
 		});
 
 		describe("unique", function () {
-		    if (protocol === "mongodb") return;
+			if (protocol === "mongodb") return;
 
 			var Product = null;
 
@@ -77,8 +127,6 @@ describe("Validations", function() {
 							productId : ORM.validators.unique() // this must be straight after a required & validated row.
 						}
 					});
-					Product.hasOne('product', Product, { field: 'productId', required: false, autoFetch: true });
-
 					return helper.dropSync(Product, done);
 				};
 			};
@@ -220,6 +268,7 @@ describe("Validations", function() {
 						});
 					});
 				});
+
 			});
 		});
 	});
@@ -363,4 +412,7 @@ describe("Validations", function() {
 			});
 		});
 	});
+
+
 });
+

From 0633307967a2a2b1763fba7bd095dc497ae0f85c Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 29 Jul 2014 15:23:11 +1000
Subject: [PATCH 1016/1246] v2.1.18

---
 Changelog.md | 5 +++++
 package.json | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index ccd82de9..7f13e234 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,8 @@
+### v2.1.18 - 29 Jul 2014
+- Add `alwaysValidate` flag (#540, #352)
+- Fix mongo hasMany wrong instance bug (#479)
+- Fix mysql index bug (dresende/node-sql-ddl-sync#19)
+
 ### v2.1.17 - 24 Jul 2014
 - Fix postgres & sqlite driver conversion of floats and ints.
 
diff --git a/package.json b/package.json
index 07efdfac..7790e44b 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.17",
+	"version"     : "2.1.18",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",

From bea845dd63f09ffe52e0d162247e915eda1a59bd Mon Sep 17 00:00:00 2001
From: Yannick <yannickdalbin@gmail.com>
Date: Thu, 31 Jul 2014 18:40:39 +0200
Subject: [PATCH 1017/1246] Add extra props on associations to delete

When we need to delete some record on association, this driver use the $pullAll command.
But the $pullAll requires an exact match.
So, when the association has some extra properties, we need to include these properties in the pull object.
---
 lib/Drivers/DML/mongodb.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
index 54d17fa6..a0d3a585 100644
--- a/lib/Drivers/DML/mongodb.js
+++ b/lib/Drivers/DML/mongodb.js
@@ -316,7 +316,13 @@ Driver.prototype.hasMany = function (Model, association) {
 			pull[association.name] = [];
 
 			for (var i = 0; i < Associations.length; i++) {
-				pull[association.name].push({ _id: Associations[i][association.model.id] });
+				var props = {_id: Associations[i][association.model.id]};
+				
+				if (Associations[i].extra !== undefined) {
+					props = _.merge(props, _.pick(Associations[i].extra, _.keys(association.props)));
+				}
+				
+				pull[association.name].push(props);
 			}
 
 			return db.update({

From f4dd1972f4fe3245bddb8d572cb78434e9a01708 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 21 Aug 2014 21:22:25 +1000
Subject: [PATCH 1018/1246] Fix Chain find & count with mapsTo keys. Closes
 #530

---
 Changelog.md                         |  3 +++
 lib/ChainFind.js                     | 22 ++++++++++++++----
 package.json                         |  2 +-
 test/integration/property-maps-to.js | 34 ++++++++++++++++++++++++++++
 4 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 7f13e234..7722ed2b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### v2.1.19 - 21 Aug 2014
+- Fix Chain.find().remove() & Chain.find.count() with mapsTo keys (#530)
+
 ### v2.1.18 - 29 Jul 2014
 - Add `alwaysValidate` flag (#540, #352)
 - Fix mongo hasMany wrong instance bug (#479)
diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 0cfb9066..f4a5cbaa 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -6,6 +6,18 @@ var Promise       = require("./Promise").Promise;
 module.exports = ChainFind;
 
 function ChainFind(Model, opts) {
+	var prepareConditions = function () {
+		return Utilities.transformPropertyNames(
+			opts.conditions, opts.properties
+		);
+	};
+
+	var prepareOrder = function () {
+		return Utilities.transformOrderPropertyNames(
+			opts.order, opts.properties
+		);
+	};
+
 	var promise = null;
 	var chain = {
 		find: function () {
@@ -79,7 +91,7 @@ function ChainFind(Model, opts) {
 			return this;
 		},
 		count: function (cb) {
-			opts.driver.count(opts.table, opts.conditions, {
+			opts.driver.count(opts.table, prepareConditions(), {
 				merge  : opts.merge
 			}, function (err, data) {
 				if (err || data.length === 0) {
@@ -90,9 +102,11 @@ function ChainFind(Model, opts) {
 			return this;
 		},
 		remove: function (cb) {
-			opts.driver.find([ opts.keys ], opts.table, opts.conditions, {
+			var keys = _.pluck(opts.keyProperties, 'mapsTo');
+
+			opts.driver.find(keys, opts.table, prepareConditions(), {
 				limit  : opts.limit,
-				order  : opts.order,
+				order  : prepareOrder(),
 				merge  : opts.merge,
 				offset : opts.offset,
 				exists : opts.exists
@@ -112,7 +126,7 @@ function ChainFind(Model, opts) {
 				for (var i = 0; i < data.length; i++) {
 					or = {};
 					for (var j = 0; j < opts.keys.length; j++) {
-						or[opts.keys[j]] = data[i][opts.keys[j]];
+						or[keys[j]] = data[i][keys[j]];
 					}
 					conditions.or.push(or);
 				}
diff --git a/package.json b/package.json
index 7790e44b..a25f9566 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.18",
+	"version"     : "2.1.19",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",
diff --git a/test/integration/property-maps-to.js b/test/integration/property-maps-to.js
index bb6a2cea..20f53673 100644
--- a/test/integration/property-maps-to.js
+++ b/test/integration/property-maps-to.js
@@ -253,5 +253,39 @@ describe("Property.mapsTo", function() {
 				});
 			});
 		});
+
+		it("should count", function (done) {
+			Person.create({ firstName: 'Greg', lastName: 'McDoofus', age: 30 }, function (err, person) {
+				should.not.exist(err);
+
+				Person.find({ firstName: 'Greg', lastName: 'McDoofus' }).count(function (err, count) {
+					should.not.exist(err);
+					should.equal(count, 1);
+					done();
+				});
+			});
+		});
+
+		it("should chain delete", function (done) {
+			Person.create({ firstName: 'Alfred', lastName: 'McDoogle', age: 50 }, function (err, person) {
+				should.not.exist(err);
+
+				Person.find({ firstName: 'Alfred', lastName: 'McDoogle' }).count(function (err, count) {
+					should.not.exist(err);
+					should.equal(count, 1);
+
+					Person.find({ firstName: 'Alfred', lastName: 'McDoogle' }).remove(function (err) {
+						should.not.exist(err);
+
+						Person.find({ firstName: 'Alfred', lastName: 'McDoogle' }).count(function (err, count) {
+							should.not.exist(err);
+							should.equal(count, 0);
+
+							done()
+						});
+					});
+				});
+			});
+		});
 	});
 });

From 2324d34d1a101c3872036d3fc8165d7d9a0b296b Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 21 Aug 2014 21:28:47 +1000
Subject: [PATCH 1019/1246] v2.1.19

---
 Changelog.md | 1 +
 Readme.md    | 5 +++--
 package.json | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 7722ed2b..1439b956 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,6 @@
 ### v2.1.19 - 21 Aug 2014
 - Fix Chain.find().remove() & Chain.find.count() with mapsTo keys (#530)
+- Add not_like comparator
 
 ### v2.1.18 - 29 Jul 2014
 - Add `alwaysValidate` flag (#540, #352)
diff --git a/Readme.md b/Readme.md
index 6a3e2a5b..7be7f81d 100755
--- a/Readme.md
+++ b/Readme.md
@@ -472,7 +472,8 @@ a few examples to describe it:
 { col1: orm.lte(123) } // `col1` <= 123
 { col1: orm.between(123, 456) } // `col1` BETWEEN 123 AND 456
 { col1: orm.not_between(123, 456) } // `col1` NOT BETWEEN 123 AND 456
-{ col1: orm.like(12 + "%") } // `col1` like '12%'
+{ col1: orm.like(12 + "%") } // `col1` LIKE '12%'
+{ col1: orm.not_like(12 + "%") } // `col1` NOT LIKE '12%'
 ```
 
 #### Raw queries
@@ -849,7 +850,7 @@ Pet(2).getOwners(...);
 
 ## Adding external database adapters
 
-To add an external database adapter to `orm`, call the `addAdapter` method, passing in the alias to use for connecting 
+To add an external database adapter to `orm`, call the `addAdapter` method, passing in the alias to use for connecting
 with this adapter, along with the constructor for the adapter:
 
 ```js
diff --git a/package.json b/package.json
index a25f9566..883887e5 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
 	"analyse"     : false,
 	"dependencies": {
 		"enforce"      : "0.1.2",
-		"sql-query"    : "git+https://github.com/dresende/node-sql-query.git#v0.1.21",
+		"sql-query"    : "git+https://github.com/dresende/node-sql-query.git#v0.1.23",
 		"sql-ddl-sync" : "git+https://github.com/dresende/node-sql-ddl-sync.git#v0.3.10",
 		"hat"          : "0.0.3",
 		"lodash"       : "2.4.1"

From 6c8e469f8ad6fccc0a2d0e29ed2a05e76e488117 Mon Sep 17 00:00:00 2001
From: Serhii Komar <komarserjio@gmail.com>
Date: Sun, 5 Oct 2014 11:49:13 +0200
Subject: [PATCH 1020/1246] Updated enforce version in package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 883887e5..c920f51f 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
 	},
 	"analyse"     : false,
 	"dependencies": {
-		"enforce"      : "0.1.2",
+		"enforce"      : "0.1.5",
 		"sql-query"    : "git+https://github.com/dresende/node-sql-query.git#v0.1.23",
 		"sql-ddl-sync" : "git+https://github.com/dresende/node-sql-ddl-sync.git#v0.3.10",
 		"hat"          : "0.0.3",

From 9d57ab0f1eec709225d1a0f8765908228dea4777 Mon Sep 17 00:00:00 2001
From: Ben Kitzelman <benkitzelman@gmail.com>
Date: Tue, 18 Nov 2014 16:45:19 +1100
Subject: [PATCH 1021/1246] Exposing dirtyProperties array on the instance

---
 lib/Instance.js              |  4 ++++
 test/integration/instance.js | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/lib/Instance.js b/lib/Instance.js
index beefce89..d733f619 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -647,6 +647,10 @@ function Instance(Model, opts) {
 		enumerable: false,
 		writable: true
 	});
+	Object.defineProperty(instance, "dirtyProperties", {
+		get: function () { return opts.changes; },
+		enumerable: true
+	});
 	Object.defineProperty(instance, "isInstance", {
 		value: true,
 		enumerable: false
diff --git a/test/integration/instance.js b/test/integration/instance.js
index 7526340e..72fe54ec 100644
--- a/test/integration/instance.js
+++ b/test/integration/instance.js
@@ -276,6 +276,27 @@ describe("Model instance", function() {
 		});
 	});
 
+	describe("#dirtyProperties", function () {
+		var person = null;
+
+		beforeEach(function (done) {
+			Person.create({ name: 'John', age: 44, data: { a: 1 } }, function (err, p) {
+				if (err) return cb(err);
+
+				person = p;
+				done();
+			});
+		});
+
+		it("should mark individual properties as dirty", function () {
+			should.equal(person.saved(), true);
+			person.markAsDirty('name');
+			person.markAsDirty('data');
+			should.equal(person.saved(), false);
+			should.equal(person.dirtyProperties.join(','), 'name,data');
+		});
+	});
+
 	describe("#isShell", function () {
 		it("should return true for shell models", function () {
 			should.equal(Person(4).isShell(), true);

From c200656e8a6e13db4a8a2d42faae49bc3752755e Mon Sep 17 00:00:00 2001
From: Ben Kitzelman <benkitzelman@gmail.com>
Date: Tue, 18 Nov 2014 16:48:55 +1100
Subject: [PATCH 1022/1246] version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 883887e5..192988b9 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.19",
+	"version"     : "2.1.20",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",

From 1d9b8602821d6c0769f3846cc6e688bdb9adbab0 Mon Sep 17 00:00:00 2001
From: Ben Kitzelman <benkitzelman@gmail.com>
Date: Wed, 19 Nov 2014 10:06:44 +1100
Subject: [PATCH 1023/1246] dirty props should not be enumerable off the
 instance

---
 lib/Instance.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index d733f619..9670ddc4 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -649,7 +649,7 @@ function Instance(Model, opts) {
 	});
 	Object.defineProperty(instance, "dirtyProperties", {
 		get: function () { return opts.changes; },
-		enumerable: true
+		enumerable: false
 	});
 	Object.defineProperty(instance, "isInstance", {
 		value: true,

From defb73548e82c8a9172b2ef7023283ba88b7542a Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 19 Nov 2014 11:27:49 +1100
Subject: [PATCH 1024/1246] Version bump

---
 Changelog.md | 4 ++++
 package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 1439b956..9ded5d63 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,7 @@
+### v2.1.20 - 19 Nov 2014
+- Exposing dirty properties array on the instance (#575)
+- Bump node-enforce version (#562)
+
 ### v2.1.19 - 21 Aug 2014
 - Fix Chain.find().remove() & Chain.find.count() with mapsTo keys (#530)
 - Add not_like comparator
diff --git a/package.json b/package.json
index 7e998110..d047bccf 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
 		"mysql"   : "2.0.0-alpha9",
 		"pg"      : "2.6.2",
 		"sqlite3" : "2.1.7",
-		"async"   : "*",
+		"async"   : "0.9.0",
 		"mocha"   : "1.13.0",
 		"should"  : "1.2.2",
 		"mongodb" : "1.3.19",

From 51fe66892aefb3c093e809b1a00a8a6c39d47dfe Mon Sep 17 00:00:00 2001
From: Stuart McGrigor <stuart.mcgrigor@kintore.co.nz>
Date: Tue, 25 Nov 2014 22:54:35 +1300
Subject: [PATCH 1025/1246] When key field has mapsTo - we need to rename from
 database fields to property names before checking the cache

---
 lib/Model.js                          |  8 ++-
 test/integration/model-find-mapsto.js | 98 +++++++++++++++++++++++++++
 2 files changed, 104 insertions(+), 2 deletions(-)
 create mode 100644 test/integration/model-find-mapsto.js

diff --git a/lib/Model.js b/lib/Model.js
index 62b309ea..c684c4d2 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -396,13 +396,17 @@ function Model(opts) {
 			properties   : allProperties,
 			keyProperties: keyProperties,
 			newInstance  : function (data, cb) {
+                                // We need to do the rename before we construct the UID & do the cache lookup
+                                // because the cache is loaded using propertyName rather than fieldName
+                                Utilities.renameDatastoreFieldsToPropertyNames(data, fieldToPropertyMap);
+
+                                // Construct UID
 				var uid = opts.driver.uid + "/" + opts.table + (merge ? "+" + merge.from.table : "");
 				for (var i = 0; i < opts.keys.length; i++) {
 					uid += "/" + data[opts.keys[i]];
 				}
 
-				Utilities.renameDatastoreFieldsToPropertyNames(data, fieldToPropertyMap);
-
+                                // Now we can do the cache lookup
 				Singleton.get(uid, {
 					cache      : options.cache,
 					save_check : opts.settings.get("instance.cacheSaveCheck")
diff --git a/test/integration/model-find-mapsto.js b/test/integration/model-find-mapsto.js
new file mode 100644
index 00000000..ed589b96
--- /dev/null
+++ b/test/integration/model-find-mapsto.js
@@ -0,0 +1,98 @@
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var ORM      = require('../../');
+
+describe("Model.pkMapTo.find()", function() {
+	var db = null;
+	var Person = null;
+
+	var setup = function () {
+		return function (done) {
+
+                  // The fact that we've applied mapsTo to the key
+                  // property of the model - will break the cache.
+
+                  // Without Stuart's little bugfix, 2nd (and subsequent) calls to find()
+                  // will return the repeats of the first obect retrieved and placed in the cache.
+			Person = db.define("person", {
+	                        personId : {type : "integer", key: true,   mapsTo: "id"},
+				name     : String,
+				surname  : String,
+				age      : Number,
+				male     : Boolean
+			});
+
+			return helper.dropSync(Person, function () {
+				Person.create([{
+                                        personId: 1001,
+					name    : "John",
+					surname : "Doe",
+					age     : 18,
+					male    : true
+				}, {
+                                        personId: 1002,
+					name    : "Jane",
+					surname : "Doe",
+					age     : 16,
+					male    : false
+				}, {
+                                        personId: 1003,
+					name    : "Jeremy",
+					surname : "Dean",
+					age     : 18,
+					male    : true
+				}, {
+                                        personId: 1004,
+					name    : "Jack",
+					surname : "Dean",
+					age     : 20,
+					male    : true
+				}, {
+                                        personId: 1005,
+					name    : "Jasmine",
+					surname : "Doe",
+					age     : 20,
+					male    : false
+				}], done);
+			});
+		};
+	};
+
+	before(function (done) {
+		helper.connect(function (connection) {
+			db = connection;
+
+			return done();
+		});
+	});
+
+	after(function () {
+		return db.close();
+	});
+
+
+	describe("Cache should work with mapped key field", function () {
+		before(setup());
+
+		it("1st find should work", function (done) {
+			Person.find({ surname: "Dean" }, function (err, people) {
+				should.not.exist(err);
+				people.should.be.a("object");
+				people.should.have.property("length", 2);
+				people[0].surname.should.equal("Dean");
+
+				return done();
+			});
+		});
+		it("2nd find should should also work", function (done) {
+			Person.find({ surname: "Doe" }, function (err, people) {
+				should.not.exist(err);
+				people.should.be.a("object");
+				people.should.have.property("length", 3);
+				people[0].surname.should.equal("Doe");
+
+				return done();
+			});
+		});
+	});
+});

From 51c9377e53844e66f506a2d621b6835b646be6e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Tue, 9 Dec 2014 18:19:48 +0100
Subject: [PATCH 1026/1246] [mongodb] fix ne, eq comparators for _id key

---
 lib/Drivers/DML/mongodb.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
index 54d17fa6..6a4f3f05 100644
--- a/lib/Drivers/DML/mongodb.js
+++ b/lib/Drivers/DML/mongodb.js
@@ -396,7 +396,7 @@ function convertFromDB(obj, timezone) {
 
 function convertToDBVal(key, value, timezone) {
 	if (value && typeof value.sql_comparator == "function") {
-		var val       = (key != "_id" ? value : new mongodb.ObjectID(value));
+		var val       = (key != "_id" ? value.val : new mongodb.ObjectID(value.val));
 		var comp      = value.sql_comparator();
 		var condition = {};
 
@@ -406,17 +406,17 @@ function convertToDBVal(key, value, timezone) {
 			case "lt":
 			case "lte":
 			case "ne":
-				condition["$" + comp] = val.val;
+				condition["$" + comp] = val;
 				break;
 			case "eq":
-				condition = val.val;
+				condition = val;
 				break;
 			case "between":
-				condition["$min"] = val.from;
-				condition["$max"] = val.to;
+				condition["$min"] = value.from;
+				condition["$max"] = value.to;
 				break;
 			case "like":
-				condition["$regex"] = val.expr.replace("%", ".*");
+				condition["$regex"] = value.expr.replace("%", ".*");
 				break;
 		}
 

From d0a035f8d5396ff68d638ca739adf4527094095b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Wed, 10 Dec 2014 18:37:34 +0100
Subject: [PATCH 1027/1246] Document orm.not_in

This makes users win a lot of time.
---
 Readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Readme.md b/Readme.md
index 7be7f81d..8952b3f7 100755
--- a/Readme.md
+++ b/Readme.md
@@ -474,6 +474,7 @@ a few examples to describe it:
 { col1: orm.not_between(123, 456) } // `col1` NOT BETWEEN 123 AND 456
 { col1: orm.like(12 + "%") } // `col1` LIKE '12%'
 { col1: orm.not_like(12 + "%") } // `col1` NOT LIKE '12%'
+{ col1: orm.not_in([1, 4, 8]) } // `col1` NOT IN (1, 4, 8)
 ```
 
 #### Raw queries

From 62c0c2ea82650bb7deb201a6e07cb7ec95e94c39 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 22 Dec 2014 18:34:48 +0000
Subject: [PATCH 1028/1246] sql-query@0.1.24

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d047bccf..3110a09e 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
 	"analyse"     : false,
 	"dependencies": {
 		"enforce"      : "0.1.5",
-		"sql-query"    : "git+https://github.com/dresende/node-sql-query.git#v0.1.23",
+		"sql-query"    : "0.1.24",
 		"sql-ddl-sync" : "git+https://github.com/dresende/node-sql-ddl-sync.git#v0.3.10",
 		"hat"          : "0.0.3",
 		"lodash"       : "2.4.1"

From cab4074d675963ea300cbff72670ec0035858eeb Mon Sep 17 00:00:00 2001
From: Jack Wilsdon <jack.wilsdon2@gmail.com>
Date: Sun, 28 Dec 2014 17:17:42 +0000
Subject: [PATCH 1029/1246] Fix invalid wiki link

---
 Readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Readme.md b/Readme.md
index 8952b3f7..fd6942b4 100755
--- a/Readme.md
+++ b/Readme.md
@@ -222,11 +222,11 @@ module.exports = function (db, cb) {
 
 ## Synchronizing Models
 
-See information in the [wiki](https://github.com/dresende/node-orm2/wiki/Synching-and-Dropping-Models).
+See information in the [wiki](https://github.com/dresende/node-orm2/wiki/Syncing-and-dropping-models).
 
 ## Dropping Models
 
-See information in the [wiki](https://github.com/dresende/node-orm2/wiki/Synching-and-Dropping-Models).
+See information in the [wiki](https://github.com/dresende/node-orm2/wiki/Syncing-and-dropping-models).
 
 ## Advanced Options
 

From 164aea6826a351ae3aad2ecc8a2d55e8db1f8d51 Mon Sep 17 00:00:00 2001
From: Roman Fromrome <romanfromrome@gmail.com>
Date: Mon, 29 Dec 2014 20:44:58 +0200
Subject: [PATCH 1030/1246] fixed thrown error check

---
 lib/ORM.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index bf6a483a..bcbcfc71 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -134,7 +134,7 @@ exports.connect = function (opts, cb) {
 			db.emit("connect", err, !err ? db : null);
 		});
 	} catch (ex) {
-		if (ex.code === "MODULE_NOT_FOUND" || ex.message.indexOf('find module')) {
+		if (ex.code === "MODULE_NOT_FOUND" || ex.message.indexOf('find module') > -1) {
 			return ORM_Error(new ORMError("Connection protocol not supported - have you installed the database driver for " + proto + "?", 'NO_SUPPORT'), cb);
 		}
 		return ORM_Error(ex, cb);

From 7548f1120e175c72eac8dff60d538a044ca74fe0 Mon Sep 17 00:00:00 2001
From: justinTNT <just@justat.at>
Date: Sat, 10 Jan 2015 01:10:40 +1100
Subject: [PATCH 1031/1246] escape camelCase tableName for uniqueness
 validation

---
 lib/Validators.js | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Validators.js b/lib/Validators.js
index f7d51084..9b31de1a 100644
--- a/lib/Validators.js
+++ b/lib/Validators.js
@@ -77,7 +77,7 @@ validators.unique = function () {
 
 			if (opts.ignoreCase === true && ctx.model.properties[prop].type === 'text') {
 				query = util.format('LOWER(%s.%s) LIKE LOWER(?)',
-					ctx.model.table, ctx.driver.query.escapeId(prop)
+					ctx.driver.query.escapeId(ctx.model.table), ctx.driver.query.escapeId(prop)
 				);
 				chain.where(query, [value]);
 			} else {
diff --git a/package.json b/package.json
index 3110a09e..736a60cb 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.20",
+	"version"     : "2.1.21",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",

From 51569bf3fcc4144ce53e12fd2c8c75489aad2fec Mon Sep 17 00:00:00 2001
From: justinTNT <just@justat.at>
Date: Mon, 12 Jan 2015 14:21:00 +1100
Subject: [PATCH 1032/1246] test camelCase tableName in ignoreCase uniqe
 validation test

---
 test/integration/validation.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/validation.js b/test/integration/validation.js
index 8e5edb18..f8ba79eb 100644
--- a/test/integration/validation.js
+++ b/test/integration/validation.js
@@ -115,7 +115,7 @@ describe("Validations", function() {
 
 			var setupUnique = function (ignoreCase, scope, msg) {
 				return function (done) {
-					Product = db.define("product_unique", {
+					Product = db.define("productUnique", {
 						instock  : { type: 'boolean', required: true, defaultValue: false },
 						name     : String,
 						category : String

From 4ff9f193afb9a60a337560e7852984e9ceff15f0 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 12 Jan 2015 15:02:58 +1100
Subject: [PATCH 1033/1246] Update changelog

---
 Changelog.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 9ded5d63..68af05a0 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,8 @@
+### v2.1.21
+- Fix mixed case uniqueness constraint on postgres (#597)
+- Fix mongo adapter association delete (#543)
+- Fix mongo ne/eq comparators for _id key (#586)
+
 ### v2.1.20 - 19 Nov 2014
 - Exposing dirty properties array on the instance (#575)
 - Bump node-enforce version (#562)

From fbb53fa9185e0a1ea07c591a3e4c264eaccc93bf Mon Sep 17 00:00:00 2001
From: Roman Fromrome <romanfromrome@gmail.com>
Date: Tue, 13 Jan 2015 21:46:26 +0200
Subject: [PATCH 1034/1246] added test for valid error throwing in connection
 try block

---
 test/integration/orm-exports.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/test/integration/orm-exports.js b/test/integration/orm-exports.js
index 0f20ec08..3b9f1665 100644
--- a/test/integration/orm-exports.js
+++ b/test/integration/orm-exports.js
@@ -139,6 +139,26 @@ describe("ORM.connect()", function () {
 		});
 	});
 
+	it("should emit valid error if exception being thrown during connection try", function (done) {
+		var testConfig = {
+			protocol : 'mongodb',
+			href     : 'unknownhost',
+			database : 'unknowndb',
+			user     : '',
+			password : ''
+		},
+		db = ORM.connect(testConfig);
+
+		db.on("connect", function (err) {
+			should.exist(err);
+			should.equal(err.message.indexOf("Connection protocol not supported"), -1);
+			err.message.should.not.equal("CONNECTION_URL_NO_PROTOCOL");
+			err.message.should.not.equal("CONNECTION_URL_EMPTY");
+
+			return done();
+		});
+	});
+
 	it("should not modify connection opts", function (done) {
 		var opts = {
 			protocol : 'mysql',

From 61bb618d27117369b041ab6eb2bfceb34633034a Mon Sep 17 00:00:00 2001
From: justinTNT <just@justat.at>
Date: Fri, 16 Jan 2015 19:06:46 +1100
Subject: [PATCH 1035/1246] igNoReCaSe unique scope should work for hasOne
 property

---
 lib/Validators.js              |   2 +-
 package.json                   |   2 +-
 test/integration/validation.js | 104 ++++++++++++++++++++++++++++-----
 3 files changed, 91 insertions(+), 17 deletions(-)

diff --git a/lib/Validators.js b/lib/Validators.js
index 9b31de1a..5cb94889 100644
--- a/lib/Validators.js
+++ b/lib/Validators.js
@@ -75,7 +75,7 @@ validators.unique = function () {
 		var chainQuery = function (prop, value) {
 			var query = null;
 
-			if (opts.ignoreCase === true && ctx.model.properties[prop].type === 'text') {
+			if (opts.ignoreCase === true && ctx.model.properties[prop] && ctx.model.properties[prop].type === 'text') {
 				query = util.format('LOWER(%s.%s) LIKE LOWER(?)',
 					ctx.driver.query.escapeId(ctx.model.table), ctx.driver.query.escapeId(prop)
 				);
diff --git a/package.json b/package.json
index 736a60cb..712d6e11 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.21",
+	"version"     : "2.1.22",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",
diff --git a/test/integration/validation.js b/test/integration/validation.js
index f8ba79eb..a5c4692e 100644
--- a/test/integration/validation.js
+++ b/test/integration/validation.js
@@ -111,23 +111,36 @@ describe("Validations", function() {
 		describe("unique", function () {
 			if (protocol === "mongodb") return;
 
-			var Product = null;
+			var Product = null, Supplier = null;
 
 			var setupUnique = function (ignoreCase, scope, msg) {
 				return function (done) {
-					Product = db.define("productUnique", {
-						instock  : { type: 'boolean', required: true, defaultValue: false },
-						name     : String,
-						category : String
-					}, {
-						cache: false,
-						validations: {
-							name      : ORM.validators.unique({ ignoreCase: ignoreCase, scope: scope }, msg),
-							instock   : ORM.validators.required(),
-							productId : ORM.validators.unique() // this must be straight after a required & validated row.
+					Supplier = db.define("supplier", {
+						name     : String
+                    }, {
+						cache: false
+					});
+					helper.dropSync(Supplier, function(err){
+						if (err) {
+							return done(err);
 						}
+
+						Product = db.define("productUnique", {
+							instock  : { type: 'boolean', required: true, defaultValue: false },
+							name     : String,
+							category : String
+						}, {
+							cache: false,
+							validations: {
+								name      : ORM.validators.unique({ ignoreCase: ignoreCase, scope: scope }, msg),
+								instock   : ORM.validators.required(),
+								productId : ORM.validators.unique() // this must be straight after a required & validated row.
+							}
+						});
+				        Product.hasOne('supplier',  Supplier,  { field: 'supplierId' });
+
+						return helper.dropSync(Product, done);
 					});
-					return helper.dropSync(Product, done);
 				};
 			};
 
@@ -174,7 +187,8 @@ describe("Validations", function() {
 
 			describe("scope", function () {
 				describe("to other property", function () {
-					before(setupUnique(false, ['category']));
+
+					before(setupUnique(true, ['category']));
 
 					it("should return validation error if other property also matches", function(done) {
 						Product.create({name: 'red', category: 'chair'}, function (err, product) {
@@ -189,7 +203,7 @@ describe("Validations", function() {
 						});
 					});
 
-					it("should pass if other peroperty is different", function (done) {
+					it("should pass if other property is different", function (done) {
 						Product.create({name: 'blue', category: 'chair'}, function (err, product) {
 							should.not.exist(err);
 
@@ -202,7 +216,67 @@ describe("Validations", function() {
 					});
 
 					// In SQL unique index land, NULL values are not considered equal.
-					it("should pass if other peroperty is null", function (done) {
+					it("should pass if other property is null", function (done) {
+						Product.create({name: 'blue', category: null}, function (err, product) {
+							should.not.exist(err);
+
+							Product.create({name: 'blue', category: null}, function (err, product) {
+								should.not.exist(err);
+
+								return done();
+							});
+						});
+					});
+				});
+
+				describe("to hasOne property", function () {
+					firstId = secondId = null;
+
+					before(function(done){
+						setupUnique(true, ['supplierId'])(function(err) {
+							should.not.exist(err);
+							Supplier.create({name: 'first'}, function (err, supplier) {
+								should.not.exist(err);
+
+								firstId = supplier.id;
+
+								Supplier.create({name: 'second'}, function (err, supplier) {
+									should.not.exist(err);
+
+									secondId = supplier.id;
+									done();
+								});
+							});
+						});
+					});
+
+					it("should return validation error if hasOne property also matches", function(done) {
+						Product.create({name: 'red', supplierId: firstId}, function (err, product) {
+							should.not.exist(err);
+
+							Product.create({name: 'red', supplierId: firstId}, function (err, product) {
+								should.exist(err);
+								should.equal(err.msg, 'not-unique');
+
+								return done();
+							});
+						});
+					});
+
+					it("should pass if hasOne property is different", function (done) {
+						Product.create({name: 'blue', supplierId: firstId}, function (err, product) {
+							should.not.exist(err);
+
+							Product.create({name: 'blue', supplierId: secondId}, function (err, product) {
+								should.not.exist(err);
+
+								return done();
+							});
+						});
+					});
+
+					// In SQL unique index land, NULL values are not considered equal.
+					it("should pass if other property is null", function (done) {
 						Product.create({name: 'blue', category: null}, function (err, product) {
 							should.not.exist(err);
 

From 3b13f19bc8c3241cb32f214059b6c83d7a27aac4 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 19 Jan 2015 10:20:33 +1100
Subject: [PATCH 1036/1246] v2.1.22

---
 Changelog.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 68af05a0..07bd5418 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### v2.1.22
+- Fix ignorecase unique scope for hasOne property (#603)
+
 ### v2.1.21
 - Fix mixed case uniqueness constraint on postgres (#597)
 - Fix mongo adapter association delete (#543)

From da8b86cd4f00dad625cf14b79b4885d3bd8e8275 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 18 Mar 2015 15:45:26 +1100
Subject: [PATCH 1037/1246] Don't choke on null dates with timezone set

---
 lib/Drivers/DML/postgres.js               |  5 ++-
 test/integration/drivers/postgres_spec.js | 50 +++++++++++++++++++++--
 2 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 6bd6cf48..49748411 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -264,11 +264,12 @@ Driver.prototype.valueToProperty = function (value, property) {
 			}
 			break;
 		case "date":
-			if (this.config.timezone && this.config.timezone != 'local') {
+			if (_.isDate(value) && this.config.timezone && this.config.timezone != 'local') {
 				var tz = convertTimezone(this.config.timezone);
 
 				// shift local to UTC
 				value.setTime(value.getTime() - (value.getTimezoneOffset() * 60000));
+
 				if (tz !== false) {
 					// shift UTC to timezone
 					value.setTime(value.getTime() - (tz * 60000));
@@ -320,7 +321,7 @@ Driver.prototype.propertyToValue = function (value, property) {
 			}
 			break;
 		case "date":
-			if (this.config.timezone && this.config.timezone != 'local') {
+			if (_.isDate(value) && this.config.timezone && this.config.timezone != 'local') {
 				var tz = convertTimezone(this.config.timezone);
 
 				// shift local to UTC
diff --git a/test/integration/drivers/postgres_spec.js b/test/integration/drivers/postgres_spec.js
index 6cca07d7..db84d69f 100644
--- a/test/integration/drivers/postgres_spec.js
+++ b/test/integration/drivers/postgres_spec.js
@@ -10,7 +10,7 @@ describe("Postgres driver", function() {
 	describe("#valueToProperty", function () {
 		var driver = null;
 
-		before(function () {
+		beforeEach(function () {
 			driver = new Driver({}, {}, {});
 		});
 
@@ -72,6 +72,35 @@ describe("Postgres driver", function() {
 					should.strictEqual(valueToProperty('1.200 '), 1);
 				});
 			});
+
+			describe("dates with non local timezone", function () {
+				beforeEach(function () {
+					driver = new Driver({ timezone: 'Z' }, {}, {});
+				});
+
+				function valueToProperty (value) {
+					return driver.valueToProperty(value, { type: 'date' });
+				}
+
+				it("should accept null", function () {
+					should.strictEqual(valueToProperty(null), null);
+				});
+
+				it("should work", function () {
+					should.strictEqual(_.isDate(valueToProperty(new Date())), true);
+				});
+
+				describe("calculations", function () {
+					it("should offset time, relative to timezone", function () {
+						d = new Date();
+
+						expected  = d.getTime() - d.getTimezoneOffset() * 60000;
+						converted = valueToProperty(d).getTime();
+
+						should.equal(converted, expected);
+					});
+				});
+			});
 		});
 	});
 
@@ -116,9 +145,24 @@ describe("Postgres driver", function() {
 				should.equal(inputStr, out.toString());
 			});
 
-			it("should offset time by specified timezone amount for + timezones");
+			it("should work with null dates", function () {
+				should.strictEqual(evaluate(null, { config: { timezone: 'Z' }}), null);
+			});
+
+			it("should work with date objects", function () {
+				should.strictEqual(_.isDate(evaluate(new Date(), { config: { timezone: 'Z' }})), true);
+			});
+
+			describe("calculations", function () {
+				it("should offset time, relative to timezone", function () {
+					d = new Date();
+
+					expected = d.getTime() + d.getTimezoneOffset() * 60000;
+					converted = evaluate(d, { config: { timezone: 'Z' }}).getTime();
 
-			it("should offset time by specified timezone amount for + timezones");
+					should.equal(converted, expected);
+				});
+			});
 		});
 
 		describe("type point", function () {

From 2ec139f6d54d1398ec75ae73279cd0c9a2c734f6 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 18 Mar 2015 15:48:59 +1100
Subject: [PATCH 1038/1246] io.js + 0.12 Drop travis 0.8 tests due to sqlite
 3.0 incompatibility. ORM still works on 0.8, just not on travis.

---
 .travis.yml                             |  3 ++-
 package.json                            |  6 +++---
 test/integration/association-hasmany.js |  2 +-
 test/integration/validation.js          | 13 ++++++-------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 268973d6..c2d4d525 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,8 @@
 language: node_js
 node_js:
-  - '0.8'
   - '0.10'
+  - '0.12'
+  - 'iojs-v1.5.1'
 before_script:
   - mysql -e 'create database orm_test;'
   - psql -c 'create database orm_test;' -U postgres
diff --git a/package.json b/package.json
index 712d6e11..a88b013b 100644
--- a/package.json
+++ b/package.json
@@ -43,9 +43,9 @@
 		"lodash"       : "2.4.1"
 	},
 	"devDependencies": {
-		"mysql"   : "2.0.0-alpha9",
-		"pg"      : "2.6.2",
-		"sqlite3" : "2.1.7",
+		"mysql"   : "2.5.5",
+		"pg"      : "4.3.0",
+		"sqlite3" : "3.0.5",
 		"async"   : "0.9.0",
 		"mocha"   : "1.13.0",
 		"should"  : "1.2.2",
diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
index 3f937c69..167d79d8 100644
--- a/test/integration/association-hasmany.js
+++ b/test/integration/association-hasmany.js
@@ -778,7 +778,7 @@ describe("hasMany", function () {
 						should.equal(data[0].name, 'account_id');
 						should.equal(data[0].pk, 1);
 						should.equal(data[1].name, 'emails_text');
-						should.equal(data[1].pk, 1);
+						should.equal(data[1].pk, 2);
 
 						done();
 					});
diff --git a/test/integration/validation.js b/test/integration/validation.js
index a5c4692e..604a4c3e 100644
--- a/test/integration/validation.js
+++ b/test/integration/validation.js
@@ -421,12 +421,12 @@ describe("Validations", function() {
 					should(Array.isArray(err));
 					should.equal(err.length, 2);
 
-					should.deepEqual(err[0], _.extend(new Error(),{
-						property: 'name', value: 'n', msg: 'out-of-range-length'
+					should.deepEqual(err[0], _.extend(new Error('out-of-range-length'), {
+						property: 'name', value: 'n', msg: 'out-of-range-length', type: 'validation'
 					}));
 
 					should.deepEqual(err[1], _.extend(new Error(),{
-						property: 'height', value: '4', msg: 'out-of-range-number'
+						property: 'height', value: '4', msg: 'out-of-range-number', type: 'validation'
 					}));
 
 					should.equal(john.id, null);
@@ -447,17 +447,16 @@ describe("Validations", function() {
 					should(Array.isArray(err));
 					should.equal(err.length, 3);
 
-					// `type` is a non enumerable undocumented property of `Error` in V8.
 					should.deepEqual(err[0], _.extend(new Error(),{
-						property: 'name', value: null, msg: 'required'
+						property: 'name', value: null, msg: 'required', type: 'validation'
 					}));
 
 					should.deepEqual(err[1], _.extend(new Error(),{
-						property: 'name', value: null, msg: 'undefined'
+						property: 'name', value: null, msg: 'undefined', type: 'validation'
 					}));
 
 					should.deepEqual(err[2], _.extend(new Error(),{
-						property: 'height', value: '4', msg: 'out-of-range-number'
+						property: 'height', value: '4', msg: 'out-of-range-number', type: 'validation'
 					}));
 
 					should.equal(john.id, null);

From f501d2d41966aa87d6b1982b9d9cc9d21c060132 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 18 Mar 2015 16:09:09 +1100
Subject: [PATCH 1039/1246] Update doco & bump version

---
 Changelog.md | 6 ++++++
 Readme.md    | 6 ++++--
 package.json | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 07bd5418..f8bba8dc 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,9 @@
+### v2.1.23
+- Green tests on io.js & node 0.12 (#618)
+- Don't crash on null dates if timezone is set (#618)
+- Fix wrong error when module is missing (#593)
+- Fix key field when using `mapsTo` and cache (#580)
+
 ### v2.1.22
 - Fix ignorecase unique scope for hasOne property (#603)
 
diff --git a/Readme.md b/Readme.md
index fd6942b4..abe44e69 100755
--- a/Readme.md
+++ b/Readme.md
@@ -13,8 +13,10 @@ npm install orm
 
 ## Node.js Version Support
 
-Tests are done using [Travis CI](https://travis-ci.org/) for node versions `0.6.x`, `0.8.x` and `0.10.x`. If you want you can run
-tests locally.
+Supported: 0.8, 0.10, 0.12, iojs-1.5
+
+Tests are run on [Travis CI](https://travis-ci.org/) for node versions `0.10.x`, `0.12.x` and `iojs-1.5`.
+If you want you can run tests locally:
 
 ```sh
 npm test
diff --git a/package.json b/package.json
index a88b013b..1aad18ce 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.22",
+	"version"     : "2.1.23",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",

From 5f3004bde5dcbf652f78f1e77ff8bf234ad0bd46 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Sun, 22 Mar 2015 02:10:29 +0000
Subject: [PATCH 1040/1246] Bump sql-query version

---
 Changelog.md | 3 +++
 package.json | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f8bba8dc..3f3ef88e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### v2.1.24
+- Bump dependencies; Allow left/right joins in underlying db.driver.query
+
 ### v2.1.23
 - Green tests on io.js & node 0.12 (#618)
 - Don't crash on null dates if timezone is set (#618)
diff --git a/package.json b/package.json
index 1aad18ce..c6cb758b 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.23",
+	"version"     : "2.1.24",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",
@@ -36,9 +36,9 @@
 	},
 	"analyse"     : false,
 	"dependencies": {
-		"enforce"      : "0.1.5",
-		"sql-query"    : "0.1.24",
-		"sql-ddl-sync" : "git+https://github.com/dresende/node-sql-ddl-sync.git#v0.3.10",
+		"enforce"      : "0.1.6",
+		"sql-query"    : "0.1.25",
+		"sql-ddl-sync" : "0.3.11",
 		"hat"          : "0.0.3",
 		"lodash"       : "2.4.1"
 	},

From e7cd88d9b382734ec5abe465992a580ba3c9d61e Mon Sep 17 00:00:00 2001
From: Stafford Williams <stafford.williams@gmail.com>
Date: Thu, 26 Mar 2015 04:04:59 +1100
Subject: [PATCH 1041/1246] updated readme example to also sync/create

---
 Readme.md | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/Readme.md b/Readme.md
index abe44e69..46f77cd8 100755
--- a/Readme.md
+++ b/Readme.md
@@ -69,15 +69,28 @@ orm.connect("mysql://username:password@host/database", function (err, db) {
 		}
 	});
 
-	Person.find({ surname: "Doe" }, function (err, people) {
-		// SQL: "SELECT * FROM person WHERE surname = 'Doe'"
-
-		console.log("People found: %d", people.length);
-		console.log("First person: %s, age %d", people[0].fullName(), people[0].age);
-
-		people[0].age = 16;
-		people[0].save(function (err) {
-			// err.msg = "under-age";
+    // add the table to the database
+	db.sync(function(err) { 
+		if (err) throw err;
+
+		// add a row to the person table
+		Person.create({ id: 1, name: "John", surname: "Doe", age: 27 }, function(err) {
+			if (err) throw err;
+
+				// query the person table by surname
+				Person.find({ surname: "Doe" }, function (err, people) {
+			        // SQL: "SELECT * FROM person WHERE surname = 'Doe'"
+		        	if (err) throw err;
+
+			        console.log("People found: %d", people.length);
+			        console.log("First person: %s, age %d", people[0].fullName(), people[0].age);
+
+			        people[0].age = 16;
+			        people[0].save(function (err) {
+			            // err.msg = "under-age";
+		        });
+		    });
+			
 		});
 	});
 });

From b8497fb4565fb15736600f9bc59141df72592c5f Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 11 May 2015 23:53:48 +1000
Subject: [PATCH 1042/1246] Fix 'query: { pool: false }' in connection object.

---
 lib/ORM.js                      | 42 +++++++++----------
 test/integration/orm-exports.js | 71 +++++++++++++++++++++++++++++++--
 2 files changed, 88 insertions(+), 25 deletions(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index bcbcfc71..de819e38 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -71,12 +71,17 @@ exports.connect = function (opts, cb) {
 			return ORM_Error(new ORMError("CONNECTION_URL_EMPTY", 'PARAM_MISMATCH'), cb);
 		}
 		opts = url.parse(opts, true);
-		for(var k in opts.query) {
-			opts[k] = opts.query[k];
-		}
 	} else if (typeof opts == 'object') {
 		opts = _.cloneDeep(opts);
 	}
+
+	opts.query = opts.query || {};
+
+	for(var k in opts.query) {
+		opts.query[k] = queryParamCast(opts.query[k]);
+		opts[k] = opts.query[k];
+	}
+
 	if (!opts.database) {
 		// if (!opts.pathname) {
 		// 	return cb(new Error("CONNECTION_URL_NO_DATABASE"));
@@ -112,11 +117,9 @@ exports.connect = function (opts, cb) {
 	try {
 		var Driver   = adapters.get(proto);
 		var settings = new Settings.Container(exports.settings.get('*'));
-		var debug    = extractOption(opts, "debug");
-		var pool     = extractOption(opts, "pool");
 		var driver   = new Driver(opts, null, {
-			debug    : (debug !== null ? ((debug === "false" || debug === "0") ? false : true) : settings.get("connection.debug")),
-			pool     : (pool !== null ? ((pool === "false" || pool === "0") ? false : true) : settings.get("connection.pool")),
+			debug    : 'debug' in opts.query ? opts.query.debug : settings.get("connection.debug"),
+			pool     : 'pool'  in opts.query ? opts.query.pool  : settings.get("connection.pool"),
 			settings : settings
 		});
 
@@ -392,19 +395,16 @@ function ORM_Error(err, cb) {
 	return Emitter;
 }
 
-function extractOption(opts, key) {
-	if (!opts.query || !opts.query.hasOwnProperty(key)) {
-		return null;
-	}
-
-	var opt = opts.query[key];
-
-	delete opts.query[key];
-	if (opts.href) {
-		opts.href = opts.href.replace(new RegExp(key + "=[^&]+&?"), "");
-	}
-	if (opts.search) {
-		opts.search = opts.search.replace(new RegExp(key + "=[^&]+&?"), "");
+function queryParamCast (val) {
+	if (typeof val == 'string')	{
+		switch (val) {
+			case '1':
+			case 'true':
+				return true;
+			case '0':
+			case 'false':
+				return false;
+		}
 	}
-	return opt;
+	return val;
 }
diff --git a/test/integration/orm-exports.js b/test/integration/orm-exports.js
index 3b9f1665..e6c45b69 100644
--- a/test/integration/orm-exports.js
+++ b/test/integration/orm-exports.js
@@ -238,12 +238,75 @@ describe("ORM.connect()", function () {
 				return done();
 			});
 		});
+	});
 
-		it("should allow pool and debug settings to be false", function(done) {
+	describe("query options", function () {
+		it("should understand pool `'false'` from query string", function (done) {
 			var connString = common.getConnectionString() + "debug=false&pool=false";
-			ORM.connect(connString, function(err, db) {
-				db.driver.opts.pool.should.equal(false);
-				db.driver.opts.debug.should.equal(false);
+			ORM.connect(connString, function (err, db) {
+				should.not.exist(err);
+				should.strictEqual(db.driver.opts.pool,  false);
+				should.strictEqual(db.driver.opts.debug, false);
+				done();
+			});
+		});
+
+		it("should understand pool `'0'` from query string", function (done) {
+			var connString = common.getConnectionString() + "debug=0&pool=0";
+			ORM.connect(connString, function (err, db) {
+				should.not.exist(err);
+				should.strictEqual(db.driver.opts.pool,  false);
+				should.strictEqual(db.driver.opts.debug, false);
+				done();
+			});
+		});
+
+		it("should understand pool `'true'` from query string", function (done) {
+			var connString = common.getConnectionString() + "debug=true&pool=true";
+			ORM.connect(connString, function (err, db) {
+				should.not.exist(err);
+				should.strictEqual(db.driver.opts.pool,  true);
+				should.strictEqual(db.driver.opts.debug, true);
+				done();
+			});
+		});
+
+		it("should understand pool `'1'` from query string", function (done) {
+			var connString = common.getConnectionString() + "debug=1&pool=1";
+			ORM.connect(connString, function (err, db) {
+				should.not.exist(err);
+				should.strictEqual(db.driver.opts.pool,  true);
+				should.strictEqual(db.driver.opts.debug, true);
+				done();
+			});
+		});
+
+		it("should understand pool `false` from query options", function (done) {
+			var connOpts = _.extend(common.getConfig(), {
+				protocol: common.protocol(),
+				query: {
+				  pool: false, debug: false
+				}
+			});
+			ORM.connect(connOpts, function (err, db) {
+				should.not.exist(err);
+				should.strictEqual(db.driver.opts.pool,  false);
+				should.strictEqual(db.driver.opts.debug, false);
+				done();
+			});
+		});
+
+		it("should understand pool `true` from query options", function (done) {
+			var connOpts = _.extend(common.getConfig(), {
+				protocol: common.protocol(),
+				query: {
+				  pool: true, debug: true
+				}
+			});
+			ORM.connect(connOpts, function (err, db) {
+				should.not.exist(err);
+				should.strictEqual(db.driver.opts.pool,  true);
+				should.strictEqual(db.driver.opts.debug, true);
 				done();
 			});
 		});

From 5dfbe1c7a80e8ed83dea45664855a4f90ab2bb5d Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 13 May 2015 02:44:13 +1000
Subject: [PATCH 1043/1246] Add 'mapsTo' option when defining hasOne #638

---
 lib/Associations/Extend.js             |   4 +-
 lib/Associations/Many.js               |  13 +++-
 lib/Associations/One.js                |   5 +-
 lib/Utilities.js                       |  41 ++++++----
 test/integration/association-hasone.js | 104 +++++++++++++++++++++++--
 5 files changed, 141 insertions(+), 26 deletions(-)

diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index b1fa025f..a6d42ac1 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -15,7 +15,9 @@ exports.prepare = function (db, Model, associations) {
 			reversed       : opts.reversed,
 			autoFetch      : opts.autoFetch || false,
 			autoFetchLimit : opts.autoFetchLimit || 2,
-			field          : util.wrapFieldObject(opts.field, Model, Model.table, Model.properties) || util.formatField(Model, Model.table, false, false),
+			field          : util.wrapFieldObject({
+												 field: opts.field, model: Model, altName: Model.table
+											 }) || util.formatField(Model, Model.table, false, false),
 			getAccessor    : opts.getAccessor || ("get" + assocName),
 			setAccessor    : opts.setAccessor || ("set" + assocName),
 			hasAccessor    : opts.hasAccessor || ("has" + assocName),
diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index d75876f5..a0865abe 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -44,13 +44,17 @@ exports.prepare = function (db, Model, associations) {
 		makeKey = opts.key || Settings.defaults().hasMany.key;
 
 		mergeId = util.convertPropToJoinKeyProp(
-			util.wrapFieldObject(opts.mergeId, Model, Model.table, Model.properties) ||
+			util.wrapFieldObject({
+				field: opts.mergeId, model: Model, altName: Model.table
+			}) ||
 			util.formatField(Model, Model.table, true, opts.reversed),
 			{ makeKey: makeKey, required: true }
 		);
 
 		mergeAssocId = util.convertPropToJoinKeyProp(
-			util.wrapFieldObject(opts.mergeAssocId, OtherModel, name, OtherModel.properties) ||
+			util.wrapFieldObject({
+				field: opts.mergeAssocId, model: OtherModel, altName: name
+			}) ||
 			util.formatField(OtherModel, name, true, opts.reversed),
 			{ makeKey: makeKey, required: true }
 		)
@@ -65,7 +69,10 @@ exports.prepare = function (db, Model, associations) {
 			autoFetch      : opts.autoFetch || false,
 			autoFetchLimit : opts.autoFetchLimit || 2,
 			// I'm not sure the next key is used..
-			field          : util.wrapFieldObject(opts.field, OtherModel, Model.table, OtherModel.properties) || util.formatField(Model, name, true, opts.reversed),
+			field          : util.wrapFieldObject({
+				                 field: opts.field, model: OtherModel, altName: Model.table
+				               }) ||
+			                 util.formatField(Model, name, true, opts.reversed),
 			mergeTable     : opts.mergeTable || (Model.table + "_" + name),
 			mergeId        : mergeId,
 			mergeAssocId   : mergeAssocId,
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index 5533b5d6..df8a3a46 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -39,7 +39,10 @@ exports.prepare = function (Model, associations) {
 		if (!association.hasOwnProperty("field")) {
 			association.field = util.formatField(association.model, association.name, association.required, association.reversed);
 		} else if(!association.extension) {
-			association.field = util.wrapFieldObject(association.field, Model, Model.table, Model.properties);
+			association.field = util.wrapFieldObject({
+				field: association.field, model: Model, altName: Model.table,
+				mapsTo: association.mapsTo
+			});
 		}
 
 		util.convertPropToJoinKeyProp(association.field, {
diff --git a/lib/Utilities.js b/lib/Utilities.js
index 41eee2df..04040a6d 100644
--- a/lib/Utilities.js
+++ b/lib/Utilities.js
@@ -158,34 +158,43 @@ exports.getConditions = function (model, fields, from) {
 	return conditions;
 };
 
-exports.wrapFieldObject = function (obj, model, altName, alternatives) {
-	if (!obj) {
-		var assoc_key = model.settings.get("properties.association_key");
+exports.wrapFieldObject = function (params) {
+	if (!params.field) {
+		var assoc_key = params.model.settings.get("properties.association_key");
 
 		if (typeof assoc_key === "function") {
-		    obj = assoc_key(altName.toLowerCase(), model.id[0]);
+		    params.field = assoc_key(params.altName.toLowerCase(), params.model.id[0]);
 		} else {
-			obj = assoc_key.replace("{name}", altName.toLowerCase())
-			               .replace("{field}", model.id[0]);
+			params.field = assoc_key.replace("{name}", params.altName.toLowerCase())
+			               .replace("{field}", params.model.id[0]);
 		}
 	}
 
-	for (var k in obj) {
-		if (!/[0-9]+/.test(k) && obj.hasOwnProperty(k)) {
-			return obj;
+	if (typeof params.field == 'object') {
+		for (var k in params.field) {
+			if (!/[0-9]+/.test(k) && params.field.hasOwnProperty(k)) {
+				return params.field;
+			}
 		}
 	}
 
-	var new_obj = {};
+	var newObj = {}, newProp, propPreDefined, propFromKey;
+
+	propPreDefined = params.model.properties[params.field];
+	propFromKey    = params.model.properties[params.model.id[0]];
+	newProp        = { type: 'integer' };
 
-	new_obj[obj] = _.cloneDeep(
-		alternatives[obj] || alternatives[model.id[0]] || { type: 'number', unsigned: true, rational: false }
-	);
-	new_obj[obj].name   = obj;
-	new_obj[obj].mapsTo = obj;
+	var prop = _.cloneDeep(propPreDefined || propFromKey || newProp);
+
+	if (!propPreDefined) {
+		_.extend(prop, {
+			name: params.field, mapsTo: params.mapsTo || params.field
+		});
+	}
 
+	newObj[params.field] = prop;
 
-	return new_obj;
+	return newObj;
 };
 
 exports.formatField = function (model, name, required, reversed) {
diff --git a/test/integration/association-hasone.js b/test/integration/association-hasone.js
index b53058b2..bb5a8246 100644
--- a/test/integration/association-hasone.js
+++ b/test/integration/association-hasone.js
@@ -12,23 +12,27 @@ describe("hasOne", function() {
 	var leafId = null;
 	var treeId = null;
 	var stalkId = null;
+	var holeId  = null;
 
 	var setup = function (opts) {
 		opts = opts || {};
 		return function (done) {
 			db.settings.set('instance.cache', false);
 			db.settings.set('instance.returnAllErrors', true);
-			Tree  = db.define("tree",   { type:   { type: 'text' } });
+			Tree  = db.define("tree",   { type:   { type: 'text'    } });
 			Stalk = db.define("stalk",  { length: { type: 'integer' } });
+			Hole  = db.define("hole",   { width:  { type: 'integer' } });
 			Leaf  = db.define("leaf", {
-				size: { type: 'integer' }
+				size:   { type: 'integer' },
+				holeId: { type: 'integer', mapsTo: 'hole_id' }
 			}, {
 				validations: opts.validations
 			});
 			Leaf.hasOne('tree',  Tree,  { field: 'treeId', autoFetch: !!opts.autoFetch });
-			Leaf.hasOne('stalk', Stalk, { field: 'stalkId' });
+			Leaf.hasOne('stalk', Stalk, { field: 'stalkId', mapsTo: 'stalk_id' });
+			Leaf.hasOne('hole',  Hole,  { field: 'holeId' });
 
-			return helper.dropSync([Tree, Stalk, Leaf], function() {
+			return helper.dropSync([Tree, Stalk, Hole, Leaf], function() {
 				Tree.create({ type: 'pine' }, function (err, tree) {
 					should.not.exist(err);
 					treeId = tree[Tree.id];
@@ -41,7 +45,11 @@ describe("hasOne", function() {
 								should.not.exist(err);
 								should.exist(stalk);
 								stalkId = stalk[Stalk.id];
-								done();
+								Hole.create({ width: 3 }, function (err, hole) {
+									should.not.exist(err);
+									holeId = hole.id;
+									done();
+								});
 							});
 						});
 					});
@@ -370,4 +378,90 @@ describe("hasOne", function() {
 			return done();
 		});
 	});
+
+	describe("mapsTo", function () {
+		describe("with `mapsTo` set via `hasOne`", function () {
+			var leaf = null;
+
+			before(setup());
+
+			before(function (done) {
+				Leaf.create({ size: 444, stalkId: stalkId, holeId: holeId }, function (err, lf) {
+					should.not.exist(err);
+					leaf = lf;
+					done();
+				});
+			});
+
+			it("should have correct fields in the DB", function (done) {
+				var sql = db.driver.query.select()
+				  .from('leaf')
+				  .select('size', 'stalk_id')
+				  .where({ size: 444 })
+				  .build();
+
+				db.driver.execQuery(sql, function (err, rows) {
+					should.not.exist(err);
+
+					should.equal(rows[0].size, 444);
+					should.equal(rows[0].stalk_id, 1);
+
+					done();
+	      });
+			});
+
+			it("should get parent", function (done) {
+				leaf.getStalk(function (err, stalk) {
+					should.not.exist(err);
+
+					should.exist(stalk);
+					should.equal(stalk.id, stalkId);
+					should.equal(stalk.length, 20);
+					done();
+				});
+			});
+		});
+
+		describe("with `mapsTo` set via property definition", function () {
+			var leaf = null;
+
+			before(setup());
+
+			before(function (done) {
+				Leaf.create({ size: 444, stalkId: stalkId, holeId: holeId }, function (err, lf) {
+					should.not.exist(err);
+					leaf = lf;
+					done();
+				});
+			});
+
+			it("should have correct fields in the DB", function (done) {
+				var sql = db.driver.query.select()
+				  .from('leaf')
+				  .select('size', 'hole_id')
+				  .where({ size: 444 })
+				  .build();
+
+				db.driver.execQuery(sql, function (err, rows) {
+					should.not.exist(err);
+
+					should.equal(rows[0].size, 444);
+					should.equal(rows[0].hole_id, 1);
+
+					done();
+	      });
+			});
+
+			it("should get parent", function (done) {
+				leaf.getHole(function (err, hole) {
+					should.not.exist(err);
+
+					should.exist(hole);
+					should.equal(hole.id, stalkId);
+					should.equal(hole.width, 3);
+					done();
+				});
+			});
+		});
+	});
 });

From 7d1cb987a29333a2699034b7d88bb3577d0aa839 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 13 May 2015 03:56:18 +1000
Subject: [PATCH 1044/1246] Mongodb

---
 test/integration/association-hasone.js | 136 +++++++++++++------------
 test/integration/orm-exports.js        | 123 +++++++++++-----------
 2 files changed, 133 insertions(+), 126 deletions(-)

diff --git a/test/integration/association-hasone.js b/test/integration/association-hasone.js
index bb5a8246..91226471 100644
--- a/test/integration/association-hasone.js
+++ b/test/integration/association-hasone.js
@@ -1,8 +1,10 @@
-var ORM    = require('../../');
-var helper = require('../support/spec_helper');
-var should = require('should');
-var async  = require('async');
-var _      = require('lodash');
+var ORM      = require('../../');
+var helper   = require('../support/spec_helper');
+var should   = require('should');
+var async    = require('async');
+var _        = require('lodash');
+var common   = require('../common');
+var protocol = common.protocol();
 
 describe("hasOne", function() {
 	var db    = null;
@@ -379,89 +381,91 @@ describe("hasOne", function() {
 		});
 	});
 
-	describe("mapsTo", function () {
-		describe("with `mapsTo` set via `hasOne`", function () {
-			var leaf = null;
+	if (protocol != "mongodb") {
+		describe("mapsTo", function () {
+			describe("with `mapsTo` set via `hasOne`", function () {
+				var leaf = null;
 
-			before(setup());
+				before(setup());
 
-			before(function (done) {
-				Leaf.create({ size: 444, stalkId: stalkId, holeId: holeId }, function (err, lf) {
-					should.not.exist(err);
-					leaf = lf;
-					done();
+				before(function (done) {
+					Leaf.create({ size: 444, stalkId: stalkId, holeId: holeId }, function (err, lf) {
+						should.not.exist(err);
+						leaf = lf;
+						done();
+					});
 				});
-			});
 
-			it("should have correct fields in the DB", function (done) {
-				var sql = db.driver.query.select()
-				  .from('leaf')
-				  .select('size', 'stalk_id')
-				  .where({ size: 444 })
-				  .build();
+				it("should have correct fields in the DB", function (done) {
+					var sql = db.driver.query.select()
+					  .from('leaf')
+					  .select('size', 'stalk_id')
+					  .where({ size: 444 })
+					  .build();
 
-				db.driver.execQuery(sql, function (err, rows) {
-					should.not.exist(err);
+					db.driver.execQuery(sql, function (err, rows) {
+						should.not.exist(err);
 
-					should.equal(rows[0].size, 444);
-					should.equal(rows[0].stalk_id, 1);
+						should.equal(rows[0].size, 444);
+						should.equal(rows[0].stalk_id, 1);
 
-					done();
-	      });
-			});
+						done();
+		      });
+				});
 
-			it("should get parent", function (done) {
-				leaf.getStalk(function (err, stalk) {
-					should.not.exist(err);
+				it("should get parent", function (done) {
+					leaf.getStalk(function (err, stalk) {
+						should.not.exist(err);
 
-					should.exist(stalk);
-					should.equal(stalk.id, stalkId);
-					should.equal(stalk.length, 20);
-					done();
+						should.exist(stalk);
+						should.equal(stalk.id, stalkId);
+						should.equal(stalk.length, 20);
+						done();
+					});
 				});
 			});
-		});
 
-		describe("with `mapsTo` set via property definition", function () {
-			var leaf = null;
+			describe("with `mapsTo` set via property definition", function () {
+				var leaf = null;
 
-			before(setup());
+				before(setup());
 
-			before(function (done) {
-				Leaf.create({ size: 444, stalkId: stalkId, holeId: holeId }, function (err, lf) {
-					should.not.exist(err);
-					leaf = lf;
-					done();
+				before(function (done) {
+					Leaf.create({ size: 444, stalkId: stalkId, holeId: holeId }, function (err, lf) {
+						should.not.exist(err);
+						leaf = lf;
+						done();
+					});
 				});
-			});
 
-			it("should have correct fields in the DB", function (done) {
-				var sql = db.driver.query.select()
-				  .from('leaf')
-				  .select('size', 'hole_id')
-				  .where({ size: 444 })
-				  .build();
+				it("should have correct fields in the DB", function (done) {
+					var sql = db.driver.query.select()
+					  .from('leaf')
+					  .select('size', 'hole_id')
+					  .where({ size: 444 })
+					  .build();
 
-				db.driver.execQuery(sql, function (err, rows) {
-					should.not.exist(err);
+					db.driver.execQuery(sql, function (err, rows) {
+						should.not.exist(err);
 
-					should.equal(rows[0].size, 444);
-					should.equal(rows[0].hole_id, 1);
+						should.equal(rows[0].size, 444);
+						should.equal(rows[0].hole_id, 1);
 
-					done();
-	      });
-			});
+						done();
+		      });
+				});
 
-			it("should get parent", function (done) {
-				leaf.getHole(function (err, hole) {
-					should.not.exist(err);
+				it("should get parent", function (done) {
+					leaf.getHole(function (err, hole) {
+						should.not.exist(err);
 
-					should.exist(hole);
-					should.equal(hole.id, stalkId);
-					should.equal(hole.width, 3);
-					done();
+						should.exist(hole);
+						should.equal(hole.id, stalkId);
+						should.equal(hole.width, 3);
+						done();
+					});
 				});
 			});
 		});
-	});
+	};
 });
diff --git a/test/integration/orm-exports.js b/test/integration/orm-exports.js
index e6c45b69..2cd14637 100644
--- a/test/integration/orm-exports.js
+++ b/test/integration/orm-exports.js
@@ -3,8 +3,9 @@ var sqlite   = require('sqlite3');
 var pg       = require('pg');
 var should   = require('should');
 var helper   = require('../support/spec_helper');
-var common   = require('../common');
 var ORM      = require('../../');
+var common   = require('../common');
+var protocol = common.protocol();
 
 describe("ORM", function() {
 	describe("when loaded", function () {
@@ -240,77 +241,79 @@ describe("ORM.connect()", function () {
 		});
 	});
 
-	describe("query options", function () {
-		it("should understand pool `'false'` from query string", function (done) {
-			var connString = common.getConnectionString() + "debug=false&pool=false";
-			ORM.connect(connString, function (err, db) {
-				should.not.exist(err);
-				should.strictEqual(db.driver.opts.pool,  false);
-				should.strictEqual(db.driver.opts.debug, false);
-				done();
+	if (protocol != 'mongodb') {
+		describe("query options", function () {
+			it("should understand pool `'false'` from query string", function (done) {
+				var connString = common.getConnectionString() + "debug=false&pool=false";
+				ORM.connect(connString, function (err, db) {
+					should.not.exist(err);
+					should.strictEqual(db.driver.opts.pool,  false);
+					should.strictEqual(db.driver.opts.debug, false);
+					done();
+				});
 			});
-		});
 
-		it("should understand pool `'0'` from query string", function (done) {
-			var connString = common.getConnectionString() + "debug=0&pool=0";
-			ORM.connect(connString, function (err, db) {
-				should.not.exist(err);
-				should.strictEqual(db.driver.opts.pool,  false);
-				should.strictEqual(db.driver.opts.debug, false);
-				done();
+			it("should understand pool `'0'` from query string", function (done) {
+				var connString = common.getConnectionString() + "debug=0&pool=0";
+				ORM.connect(connString, function (err, db) {
+					should.not.exist(err);
+					should.strictEqual(db.driver.opts.pool,  false);
+					should.strictEqual(db.driver.opts.debug, false);
+					done();
+				});
 			});
-		});
 
-		it("should understand pool `'true'` from query string", function (done) {
-			var connString = common.getConnectionString() + "debug=true&pool=true";
-			ORM.connect(connString, function (err, db) {
-				should.not.exist(err);
-				should.strictEqual(db.driver.opts.pool,  true);
-				should.strictEqual(db.driver.opts.debug, true);
-				done();
+			it("should understand pool `'true'` from query string", function (done) {
+				var connString = common.getConnectionString() + "debug=true&pool=true";
+				ORM.connect(connString, function (err, db) {
+					should.not.exist(err);
+					should.strictEqual(db.driver.opts.pool,  true);
+					should.strictEqual(db.driver.opts.debug, true);
+					done();
+				});
 			});
-		});
 
-		it("should understand pool `'1'` from query string", function (done) {
-			var connString = common.getConnectionString() + "debug=1&pool=1";
-			ORM.connect(connString, function (err, db) {
-				should.not.exist(err);
-				should.strictEqual(db.driver.opts.pool,  true);
-				should.strictEqual(db.driver.opts.debug, true);
-				done();
+			it("should understand pool `'1'` from query string", function (done) {
+				var connString = common.getConnectionString() + "debug=1&pool=1";
+				ORM.connect(connString, function (err, db) {
+					should.not.exist(err);
+					should.strictEqual(db.driver.opts.pool,  true);
+					should.strictEqual(db.driver.opts.debug, true);
+					done();
+				});
 			});
-		});
 
-		it("should understand pool `false` from query options", function (done) {
-			var connOpts = _.extend(common.getConfig(), {
-				protocol: common.protocol(),
-				query: {
-				  pool: false, debug: false
-				}
-			});
-			ORM.connect(connOpts, function (err, db) {
-				should.not.exist(err);
-				should.strictEqual(db.driver.opts.pool,  false);
-				should.strictEqual(db.driver.opts.debug, false);
-				done();
+			it("should understand pool `true` from query options", function (done) {
+				var connOpts = _.extend(common.getConfig(), {
+					protocol: common.protocol(),
+					query: {
+					  pool: true, debug: true
+					}
+				});
+				ORM.connect(connOpts, function (err, db) {
+					should.not.exist(err);
+					should.strictEqual(db.driver.opts.pool,  true);
+					should.strictEqual(db.driver.opts.debug, true);
+					done();
+				});
 			});
-		});
 
-		it("should understand pool `true` from query options", function (done) {
-			var connOpts = _.extend(common.getConfig(), {
-				protocol: common.protocol(),
-				query: {
-				  pool: true, debug: true
-				}
-			});
-			ORM.connect(connOpts, function (err, db) {
-				should.not.exist(err);
-				should.strictEqual(db.driver.opts.pool,  true);
-				should.strictEqual(db.driver.opts.debug, true);
-				done();
+			it("should understand pool `false` from query options", function (done) {
+				var connOpts = _.extend(common.getConfig(), {
+					protocol: common.protocol(),
+					query: {
+					  pool: false, debug: false
+					}
+				});
+				ORM.connect(connOpts, function (err, db) {
+					should.not.exist(err);
+					should.strictEqual(db.driver.opts.pool,  false);
+					should.strictEqual(db.driver.opts.debug, false);
+					done();
+				});
 			});
 		});
-	});
+	}
 });
 
 describe("ORM.use()", function () {

From ce152b759772954c694ce460257027d264895cdd Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 14 May 2015 20:01:28 +1000
Subject: [PATCH 1045/1246] Bump version

---
 Changelog.md | 4 ++++
 package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 3f3ef88e..111a8c02 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,7 @@
+### v2.1.25
+- Fix `pool` and `debug` query options boolean check (#638)
+- Add `hasOne(field: 'userId', mapsTo: 'user_id')` option (#638)
+
 ### v2.1.24
 - Bump dependencies; Allow left/right joins in underlying db.driver.query
 
diff --git a/package.json b/package.json
index c6cb758b..1521883f 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.24",
+	"version"     : "2.1.25",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",

From d596ce606b8fe1aeff57574c591d836e47ee93d0 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Fri, 29 May 2015 01:20:24 +1000
Subject: [PATCH 1046/1246] Add 'instance.saveAssociationsByDefault' option &
 bump sql-query

---
 Changelog.md                   |   4 +
 lib/Instance.js                |  15 ++-
 lib/Settings.js                |  29 ++---
 package.json                   |   4 +-
 test/integration/model-save.js | 222 ++++++++++++++++++++++++---------
 5 files changed, 198 insertions(+), 76 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 111a8c02..ea20f550 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,7 @@
+### v2.1.26
+- Add `instance.saveAssociationsByDefault` setting
+- Bump node-sql-query version to v0.1.26
+
 ### v2.1.25
 - Fix `pool` and `debug` query options boolean check (#638)
 - Add `hasOne(field: 'userId', mapsTo: 'user_id')` option (#638)
diff --git a/lib/Instance.js b/lib/Instance.js
index 9670ddc4..bfca4dea 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -36,6 +36,13 @@ function Instance(Model, opts) {
 			opts.originalKeyValues[prop.name] = opts.data[prop.name];
 		}
 	};
+	var shouldSaveAssocs = function (saveOptions) {
+		if (Model.settings.get("instance.saveAssociationsByDefault")) {
+			return saveOptions.saveAssociations !== false;
+		} else {
+			return !!saveOptions.saveAssociations;
+		}
+	};
 	var handleValidations = function (cb) {
 		var pending = [], errors = [], required;
 
@@ -94,7 +101,7 @@ function Instance(Model, opts) {
 		// - If the instance is in state mode
 		// - AND it's not an association that is asking it to save
 		//   -> return has already saved
-		if (instance_saving && !(saveOptions.saveAssociations === false)) {
+		if (instance_saving && saveOptions.saveAssociations !== false) {
 			return cb(null, instance);
 		}
 		instance_saving = true;
@@ -200,7 +207,7 @@ function Instance(Model, opts) {
 			opts.is_new = false;
 			rememberKeys();
 
-			if (saveOptions.saveAssociations === false) {
+			if (!shouldSaveAssocs(saveOptions)) {
 				return finish();
 			}
 
@@ -215,10 +222,10 @@ function Instance(Model, opts) {
 				saveInstanceExtra(cb);
 			}
 
-			if(!saved && saveOptions.saveAssociations === false) {
+			if(!saved && !shouldSaveAssocs(saveOptions)) {
 				finish();
 			} else {
-				if (saveOptions.saveAssociations === false) {
+				if (!shouldSaveAssocs(saveOptions)) {
 					runAfterSaveActions(function () {
 						finish();
 					}, false);
diff --git a/lib/Settings.js b/lib/Settings.js
index 74ee0350..1fddd384 100644
--- a/lib/Settings.js
+++ b/lib/Settings.js
@@ -1,27 +1,28 @@
 var _ = require('lodash');
 var default_settings = {
 	properties : {
-		primary_key     : "id",
-		association_key : "{name}_{field}",
-		required        : false
+		primary_key               : "id",
+		association_key           : "{name}_{field}",
+		required                  : false
 	},
 	instance   : {
-		cache           : true,
-		cacheSaveCheck  : true,
-		autoSave        : false,
-		autoFetch       : false,
-		autoFetchLimit  : 1,
-		cascadeRemove   : true,
-		returnAllErrors : false
+		cache                     : true,
+		cacheSaveCheck            : true,
+		autoSave                  : false,
+		autoFetch                 : false,
+		autoFetchLimit            : 1,
+		cascadeRemove             : true,
+		returnAllErrors           : false,
+		saveAssociationsByDefault : true
 	},
 	hasMany    : {
 		// Makes the foreign key fields a composite key
-		key             : false
+		key                       : false
 	},
 	connection : {
-		reconnect       : true,
-		pool            : false,
-		debug           : false
+		reconnect                 : true,
+		pool                      : false,
+		debug                     : false
 	}
 };
 
diff --git a/package.json b/package.json
index 1521883f..d62232c2 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.25",
+	"version"     : "2.1.26",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",
@@ -37,7 +37,7 @@
 	"analyse"     : false,
 	"dependencies": {
 		"enforce"      : "0.1.6",
-		"sql-query"    : "0.1.25",
+		"sql-query"    : "0.1.26",
 		"sql-ddl-sync" : "0.3.11",
 		"hat"          : "0.0.3",
 		"lodash"       : "2.4.1"
diff --git a/test/integration/model-save.js b/test/integration/model-save.js
index ca441a13..1dfcf94e 100644
--- a/test/integration/model-save.js
+++ b/test/integration/model-save.js
@@ -16,6 +16,11 @@ describe("Model.save()", function() {
 			}, opts || {});
 
 			Person.hasOne("parent", Person, opts.hasOneOpts);
+			if ('saveAssociationsByDefault' in opts) {
+				Person.settings.set(
+					'instance.saveAssociationsByDefault', opts.saveAssociationsByDefault
+				);
+			}
 
 			return helper.dropSync(Person, done);
 		};
@@ -206,111 +211,216 @@ describe("Model.save()", function() {
 
 		if (common.protocol() == 'mongodb') return;
 
-		beforeEach(function (done) {
-			function afterSave () {
-				afterSaveCalled = true;
-			}
-			var hooks = { afterSave: afterSave };
-
-			setup(null, { hooks: hooks, cache: false, hasOneOpts: { autoFetch: true } })(function (err) {
-				should.not.exist(err);
+		describe("default on in settings", function () {
+			beforeEach(function (done) {
+				function afterSave () {
+					afterSaveCalled = true;
+				}
+				var hooks = { afterSave: afterSave };
 
-				Person.create({ name: 'Olga' }, function (err, olga) {
+				setup(null, { hooks: hooks, cache: false, hasOneOpts: { autoFetch: true } })(function (err) {
 					should.not.exist(err);
 
-					should.exist(olga);
-					Person.create({ name: 'Hagar', parent_id: olga.id }, function (err, hagar) {
+					Person.create({ name: 'Olga' }, function (err, olga) {
 						should.not.exist(err);
-						should.exist(hagar);
-						afterSaveCalled = false;
-						done();
+
+						should.exist(olga);
+						Person.create({ name: 'Hagar', parent_id: olga.id }, function (err, hagar) {
+							should.not.exist(err);
+							should.exist(hagar);
+							afterSaveCalled = false;
+							done();
+						});
 					});
 				});
 			});
-		});
 
-		it("off should not save associations but save itself", function (done) {
-			Person.one({ name: 'Hagar' }, function (err, hagar) {
-				should.not.exist(err);
-				should.exist(hagar.parent);
+			it("should be on", function () {
+				should.equal(Person.settings.get('instance.saveAssociationsByDefault'), true);
+			});
 
-				hagar.parent.name = 'Olga2';
-				hagar.save({name: 'Hagar2'}, { saveAssociations: false }, function (err) {
+			it("off should not save associations but save itself", function (done) {
+				Person.one({ name: 'Hagar' }, function (err, hagar) {
 					should.not.exist(err);
-					should.equal(afterSaveCalled, true);
+					should.exist(hagar.parent);
 
-					Person.get(hagar.parent.id, function (err, olga) {
+					hagar.parent.name = 'Olga2';
+					hagar.save({name: 'Hagar2'}, { saveAssociations: false }, function (err) {
 						should.not.exist(err);
-						should.equal(olga.name, 'Olga');
-						done();
+						should.equal(afterSaveCalled, true);
+
+						Person.get(hagar.parent.id, function (err, olga) {
+							should.not.exist(err);
+							should.equal(olga.name, 'Olga');
+							done();
+						});
 					});
 				});
 			});
-		});
 
-		it("off should not save associations or itself if there are no changes", function (done) {
-			Person.one({ name: 'Hagar' }, function (err, hagar) {
-				should.not.exist(err);
+			it("off should not save associations or itself if there are no changes", function (done) {
+				Person.one({ name: 'Hagar' }, function (err, hagar) {
+					should.not.exist(err);
+
+					hagar.save({}, { saveAssociations: false }, function (err) {
+						should.not.exist(err);
+						should.equal(afterSaveCalled, false);
 
-				hagar.save({}, { saveAssociations: false }, function (err) {
+						Person.get(hagar.parent.id, function (err, olga) {
+							should.not.exist(err);
+							should.equal(olga.name, 'Olga');
+							done();
+						});
+					});
+				});
+			});
+
+			it("unspecified should save associations and itself", function (done) {
+				Person.one({ name: 'Hagar' }, function (err, hagar) {
 					should.not.exist(err);
-					should.equal(afterSaveCalled, false);
+					should.exist(hagar.parent);
 
-					Person.get(hagar.parent.id, function (err, olga) {
+					hagar.parent.name = 'Olga2';
+					hagar.save({name: 'Hagar2'}, function (err) {
 						should.not.exist(err);
-						should.equal(olga.name, 'Olga');
-						done();
+
+						Person.get(hagar.parent.id, function (err, olga) {
+							should.not.exist(err);
+							should.equal(olga.name, 'Olga2');
+
+							Person.get(hagar.id, function (err, person) {
+								should.not.exist(err);
+								should.equal(person.name, 'Hagar2');
+
+								done();
+							});
+						});
+					});
+				});
+			});
+
+			it("on should save associations and itself", function (done) {
+				Person.one({ name: 'Hagar' }, function (err, hagar) {
+					should.not.exist(err);
+					should.exist(hagar.parent);
+
+					hagar.parent.name = 'Olga2';
+					hagar.save({name: 'Hagar2'}, { saveAssociations: true }, function (err) {
+						should.not.exist(err);
+
+						Person.get(hagar.parent.id, function (err, olga) {
+							should.not.exist(err);
+							should.equal(olga.name, 'Olga2');
+
+							Person.get(hagar.id, function (err, person) {
+								should.not.exist(err);
+								should.equal(person.name, 'Hagar2');
+
+								done();
+							});
+						});
 					});
 				});
 			});
 		});
 
-		it("unspecified should save associations and itself", function (done) {
-			Person.one({ name: 'Hagar' }, function (err, hagar) {
-				should.not.exist(err);
-				should.exist(hagar.parent);
+		describe("turned off in settings", function () {
+			beforeEach(function (done) {
+				function afterSave () {
+					afterSaveCalled = true;
+				}
+				var hooks = { afterSave: afterSave };
 
-				hagar.parent.name = 'Olga2';
-				hagar.save({name: 'Hagar2'}, function (err) {
+				setup(null, {
+					hooks: hooks, cache: false, hasOneOpts: { autoFetch: true },
+					saveAssociationsByDefault: false
+				})(function (err) {
 					should.not.exist(err);
 
-					Person.get(hagar.parent.id, function (err, olga) {
+					Person.create({ name: 'Olga' }, function (err, olga) {
 						should.not.exist(err);
-						should.equal(olga.name, 'Olga2');
 
-						Person.get(hagar.id, function (err, person) {
+						should.exist(olga);
+						Person.create({ name: 'Hagar', parent_id: olga.id }, function (err, hagar) {
 							should.not.exist(err);
-							should.equal(person.name, 'Hagar2');
-
+							should.exist(hagar);
+							afterSaveCalled = false;
 							done();
 						});
 					});
 				});
 			});
-		});
 
-		it("on should save associations and itself", function (done) {
-			Person.one({ name: 'Hagar' }, function (err, hagar) {
-				should.not.exist(err);
-				should.exist(hagar.parent);
+			it("should be off", function () {
+				should.equal(Person.settings.get('instance.saveAssociationsByDefault'), false);
+			});
 
-				hagar.parent.name = 'Olga2';
-				hagar.save({name: 'Hagar2'}, { saveAssociations: true }, function (err) {
+			it("unspecified should not save associations but save itself", function (done) {
+				Person.one({ name: 'Hagar' }, function (err, hagar) {
 					should.not.exist(err);
+					should.exist(hagar.parent);
 
-					Person.get(hagar.parent.id, function (err, olga) {
+					hagar.parent.name = 'Olga2';
+					hagar.save({ name: 'Hagar2' }, function (err) {
 						should.not.exist(err);
-						should.equal(olga.name, 'Olga2');
 
-						Person.get(hagar.id, function (err, person) {
+						Person.get(hagar.parent.id, function (err, olga) {
 							should.not.exist(err);
-							should.equal(person.name, 'Hagar2');
+							should.equal(olga.name, 'Olga');
+
+							Person.get(hagar.id, function (err, person) {
+								should.not.exist(err);
+								should.equal(person.name, 'Hagar2');
+
+								done();
+							});
+						});
+					});
+				});
+			});
 
+			it("off should not save associations but save itself", function (done) {
+				Person.one({ name: 'Hagar' }, function (err, hagar) {
+					should.not.exist(err);
+					should.exist(hagar.parent);
+
+					hagar.parent.name = 'Olga2';
+					hagar.save({ name: 'Hagar2' }, { saveAssociations: false }, function (err) {
+						should.not.exist(err);
+						should.equal(afterSaveCalled, true);
+
+						Person.get(hagar.parent.id, function (err, olga) {
+							should.not.exist(err);
+							should.equal(olga.name, 'Olga');
 							done();
 						});
 					});
 				});
 			});
+
+			it("on should save associations and itself", function (done) {
+				Person.one({ name: 'Hagar' }, function (err, hagar) {
+					should.not.exist(err);
+					should.exist(hagar.parent);
+
+					hagar.parent.name = 'Olga2';
+					hagar.save({ name: 'Hagar2' }, { saveAssociations: true }, function (err) {
+						should.not.exist(err);
+
+						Person.get(hagar.parent.id, function (err, olga) {
+							should.not.exist(err);
+							should.equal(olga.name, 'Olga2');
+
+							Person.get(hagar.id, function (err, person) {
+								should.not.exist(err);
+								should.equal(person.name, 'Hagar2');
+
+								done();
+							});
+						});
+					});
+				});
+			});
 		});
 	});
 

From 2392e383ac2fb84027dc189efd81147b6b3435ae Mon Sep 17 00:00:00 2001
From: Axel Christ <adracus@gmail.com>
Date: Thu, 18 Jun 2015 12:54:39 +0200
Subject: [PATCH 1047/1246] Fix type for extended property

If one wanted to define a key with type "String", one has to provide "text" but not "string"
---
 Readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Readme.md b/Readme.md
index 46f77cd8..3a9fc57d 100755
--- a/Readme.md
+++ b/Readme.md
@@ -271,8 +271,8 @@ It's also possible to have composite keys:
 
 ```js
 var Person = db.define("person", {
-	firstname : { type: 'string', key: true },
-	lastname  : { type: 'string', key: true }
+	firstname : { type: 'text', key: true },
+	lastname  : { type: 'text', key: true }
 });
 ```
 

From dce8b1cde645696d8de5773f5421d2f57aab0617 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Fri, 28 Aug 2015 07:43:00 +0000
Subject: [PATCH 1048/1246] Fix noisy mysql debug output. Closes #642

---
 Changelog.md             |  3 +++
 lib/Drivers/DML/mysql.js | 15 +++++++++++++--
 package.json             |  2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index ea20f550..563ce79a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### v2.1.27
+- Fix noisy mysql debug output (#642)
+
 ### v2.1.26
 - Add `instance.saveAssociationsByDefault` setting
 - Bump node-sql-query version to v0.1.26
diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 48c3155c..b898a4ad 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -15,6 +15,7 @@ function Driver(config, connection, opts) {
 	if (!this.config.timezone) {
 		this.config.timezone = "local";
 	}
+
 	this.query  = new Query({ dialect: this.dialect, timezone: this.config.timezone });
 
 	this.reconnect(null, connection);
@@ -60,9 +61,19 @@ Driver.prototype.connect = function (cb) {
 };
 
 Driver.prototype.reconnect = function (cb, connection) {
-	this.db = (connection ? connection : mysql.createConnection(this.config.href || this.config));
+	var connOpts = this.config.href || this.config;
+
+	// Prevent noisy mysql driver output
+	if (typeof connOpts == 'object') {
+		connOpts = _.omit(connOpts, 'debug');
+	}
+	if (typeof connOpts == 'string') {
+		connOpts = connOpts.replace("debug=true", "debug=false");
+	}
+
+	this.db = (connection ? connection : mysql.createConnection(connOpts));
 	if (this.opts.pool) {
-		this.db.pool = (connection ? connection : mysql.createPool(this.config.href || this.config));
+		this.db.pool = (connection ? connection : mysql.createPool(connOpts));
 	}
 	if (typeof cb == "function") {
 		this.connect(cb);
diff --git a/package.json b/package.json
index d62232c2..1b169278 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.26",
+	"version"     : "2.1.27",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",

From f3ff1404c4cc7280ed54320af6d372e32b5c2898 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 25 Sep 2015 17:37:04 +0100
Subject: [PATCH 1049/1246] Updates .travis.yml to correct iojs tag

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c2d4d525..e90fa1ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: node_js
 node_js:
   - '0.10'
   - '0.12'
-  - 'iojs-v1.5.1'
+  - 'iojs'
 before_script:
   - mysql -e 'create database orm_test;'
   - psql -c 'create database orm_test;' -U postgres

From 9838549642dbbd160f66e706711b6157f991b7ec Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Fri, 25 Sep 2015 17:40:35 +0100
Subject: [PATCH 1050/1246] Update .travis.yml to use the container based
 infrastructure

Also removes iojs. Should add node v4 when it's available
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e90fa1ea..c43f4027 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
+sudo: false
 language: node_js
 node_js:
   - '0.10'
   - '0.12'
-  - 'iojs'
 before_script:
   - mysql -e 'create database orm_test;'
   - psql -c 'create database orm_test;' -U postgres

From 50a20c6cd985a8780c45b3715b9b9df823d4f75f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 2 Nov 2015 15:06:45 +0000
Subject: [PATCH 1051/1246] adds nodejs 4.1 to travis

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index c43f4027..0e902dff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ language: node_js
 node_js:
   - '0.10'
   - '0.12'
+  - '4.1'
 before_script:
   - mysql -e 'create database orm_test;'
   - psql -c 'create database orm_test;' -U postgres

From 7ff3d4860b2a95c8319caaeaa0b5b165de6d2562 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 2 Nov 2015 15:12:24 +0000
Subject: [PATCH 1052/1246] mysql@2.9.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1b169278..f1a5ba6c 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
 		"lodash"       : "2.4.1"
 	},
 	"devDependencies": {
-		"mysql"   : "2.5.5",
+		"mysql"   : "2.9.0",
 		"pg"      : "4.3.0",
 		"sqlite3" : "3.0.5",
 		"async"   : "0.9.0",

From 8a796aa1b401a0ec7fff89bf723d25d808f6f9ee Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 2 Nov 2015 15:13:20 +0000
Subject: [PATCH 1053/1246] lodash@3.10.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f1a5ba6c..f1e9f2aa 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
 		"sql-query"    : "0.1.26",
 		"sql-ddl-sync" : "0.3.11",
 		"hat"          : "0.0.3",
-		"lodash"       : "2.4.1"
+		"lodash"       : "3.10.1"
 	},
 	"devDependencies": {
 		"mysql"   : "2.9.0",

From f57c0b3ccacc8ad6a195aaeb1a5638262ac156b4 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 2 Nov 2015 15:13:54 +0000
Subject: [PATCH 1054/1246] async@1.5.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f1e9f2aa..c163e619 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
 		"mysql"   : "2.9.0",
 		"pg"      : "4.3.0",
 		"sqlite3" : "3.0.5",
-		"async"   : "0.9.0",
+		"async"   : "1.5.0",
 		"mocha"   : "1.13.0",
 		"should"  : "1.2.2",
 		"mongodb" : "1.3.19",

From dd8944ba5a814915df043b62c7e246b6831ebc7f Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 2 Nov 2015 15:14:23 +0000
Subject: [PATCH 1055/1246] mocha@2.3.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c163e619..1619d6db 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
 		"pg"      : "4.3.0",
 		"sqlite3" : "3.0.5",
 		"async"   : "1.5.0",
-		"mocha"   : "1.13.0",
+		"mocha"   : "2.3.3",
 		"should"  : "1.2.2",
 		"mongodb" : "1.3.19",
 		"glob"    : "3.2.8"

From 2daad4657a1c8ca64f31619d5301cd079b11db38 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 2 Nov 2015 15:14:55 +0000
Subject: [PATCH 1056/1246] should@7.1.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1619d6db..a3c41e26 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
 		"sqlite3" : "3.0.5",
 		"async"   : "1.5.0",
 		"mocha"   : "2.3.3",
-		"should"  : "1.2.2",
+		"should"  : "7.1.1",
 		"mongodb" : "1.3.19",
 		"glob"    : "3.2.8"
 	},

From 4d1594c9bed371f9d8a6e95a859c90963c9b8dce Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 2 Nov 2015 15:15:30 +0000
Subject: [PATCH 1057/1246] glob@5.0.15

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a3c41e26..bc76a588 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
 		"mocha"   : "2.3.3",
 		"should"  : "7.1.1",
 		"mongodb" : "1.3.19",
-		"glob"    : "3.2.8"
+		"glob"    : "5.0.15"
 	},
 	"optionalDependencies": {}
 }

From 4473c4dccc036ef5864ab7f6dd342522974c2ca5 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 2 Nov 2015 15:16:50 +0000
Subject: [PATCH 1058/1246] reverts node 4.1 from travis

sqlite module seems not to be ready yet
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0e902dff..c43f4027 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@ language: node_js
 node_js:
   - '0.10'
   - '0.12'
-  - '4.1'
 before_script:
   - mysql -e 'create database orm_test;'
   - psql -c 'create database orm_test;' -U postgres

From 8509c85e7b35c805728a09829739a87ecc93ff5c Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 2 Nov 2015 16:11:09 +0000
Subject: [PATCH 1059/1246] Reverts should@1.2.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bc76a588..41d0e818 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
 		"sqlite3" : "3.0.5",
 		"async"   : "1.5.0",
 		"mocha"   : "2.3.3",
-		"should"  : "7.1.1",
+		"should"  : "1.2.2",
 		"mongodb" : "1.3.19",
 		"glob"    : "5.0.15"
 	},

From 2069884ff3b27a436c84cc1dc30b27504b293a74 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Mon, 2 Nov 2015 16:14:52 +0000
Subject: [PATCH 1060/1246] Reverts lodash@2.4.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 41d0e818..a201348a 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
 		"sql-query"    : "0.1.26",
 		"sql-ddl-sync" : "0.3.11",
 		"hat"          : "0.0.3",
-		"lodash"       : "3.10.1"
+		"lodash"       : "2.4.1"
 	},
 	"devDependencies": {
 		"mysql"   : "2.9.0",

From 088cd9f01522c50bb78fcd71ec1e42510f5d60ee Mon Sep 17 00:00:00 2001
From: Stuart McGrigor <stuart.mcgrigor@kintore.co.nz>
Date: Wed, 2 Dec 2015 01:47:58 +1300
Subject: [PATCH 1061/1246] Ensure hasMany() associations work when properties
 have mapsTo

---
 lib/Associations/Many.js                      |  30 +-
 .../integration/association-hasmany-mapsto.js | 666 ++++++++++++++++++
 2 files changed, 691 insertions(+), 5 deletions(-)
 create mode 100644 test/integration/association-hasmany-mapsto.js

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index a0865abe..cb4aeba6 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -149,9 +149,19 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 
 			options.__merge = {
 				from:   { table: association.mergeTable, field: Object.keys(association.mergeAssocId) },
-				to: { table: association.model.table, field: association.model.id },
+				to: { table: association.model.table, field: association.model.id.slice(0) },   // clone model id
 				where:  [ association.mergeTable, {} ]
 			};
+
+        // Loop through the (cloned) association model id fields ... some of them may've been mapped to different
+        // names in the actual database - if so update to the mapped database column name
+        for(i=0; i<options.__merge.to.field.length; i++) {
+          var idProp = association.model.properties[options.__merge.to.field[i]];
+          if(idProp && idProp.mapsTo) {
+            options.__merge.to.field[i] = idProp.mapsTo;
+          }
+        }
+
 			options.extra = association.props;
 			options.extra_info = {
 				table: association.mergeTable,
@@ -231,12 +241,22 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 
 			options.__merge = {
 				from  : { table: association.mergeTable, field: Object.keys(association.mergeAssocId) },
-				to    : { table: association.model.table, field: association.model.id },
+				to    : { table: association.model.table, field: association.model.id.slice(0) }, // clone model id
 				where : [ association.mergeTable, {} ]
 			};
-			options.extra = association.props;
-			options.extra_info = {
-				table: association.mergeTable,
+
+        // Loop through the (cloned) association model id fields ... some of them may've been mapped to different
+        // names in the actual database - if so update to the mapped database column name
+        for(i=0; i<options.__merge.to.field.length; i++) {
+          var idProp = association.model.properties[options.__merge.to.field[i]];
+          if(idProp && idProp.mapsTo) {
+            options.__merge.to.field[i] = idProp.mapsTo;
+          }
+        }
+
+		  options.extra = association.props;
+		  options.extra_info = {
+			   table: association.mergeTable,
 				id: util.values(Instance, Model.id),
 				id_prop: Object.keys(association.mergeId),
 				assoc_prop: Object.keys(association.mergeAssocId)
diff --git a/test/integration/association-hasmany-mapsto.js b/test/integration/association-hasmany-mapsto.js
new file mode 100644
index 00000000..dd87fca4
--- /dev/null
+++ b/test/integration/association-hasmany-mapsto.js
@@ -0,0 +1,666 @@
+var _        = require('lodash');
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var ORM      = require('../../');
+var common   = require('../common');
+var protocol = common.protocol();
+
+describe("hasMany", function () {
+	this.timeout(4000);
+	var db     = null;
+	var Person = null;
+	var Pet    = null;
+
+	before(function(done) {
+		helper.connect(function (connection) {
+			db = connection;
+			done();
+		});
+	});
+
+	describe("normal", function () {
+
+		var setup = function (opts) {
+			opts = opts || {};
+
+			return function (done) {
+				db.settings.set('instance.cache', false);
+
+				Person = db.define('person', {
+                                        id        : {type : "serial",  size:"8",    mapsTo: "personID", key:true},
+					firstName : {type : "text",    size:"255",  mapsTo: "name"},
+					lastName  : {type : "text",    size:"255",  mapsTo: "surname"},
+					ageYears  : {type : "number",  size:"8",    mapsTo: "age"}
+				});
+
+				Pet = db.define('pet', {
+                                        id      :  {type : "serial",   size:"8",    mapsTo:"petID", key:true},
+					petName :  {type : "text",     size:"255",  mapsTo: "name"}
+				});
+
+				Person.hasMany('pets', Pet, {},
+                                               { autoFetch:  opts.autoFetchPets,
+                                                 mergeTable: 'person_pet',
+                                                 mergeId: 'person_id',
+                                                 mergeAssocId: 'pet_id'});
+
+				helper.dropSync([ Person, Pet ], function (err) {
+					if (err) return done(err);
+					//
+					// John --+---> Deco
+					//        '---> Mutt <----- Jane
+					//
+					// Justin
+					//
+					Person.create([{
+						firstName    : "John",
+						lastName     : "Doe",
+						ageYears     : 20,
+						pets    : [{
+							petName    : "Deco"
+						}, {
+							petName    : "Mutt"
+						}]
+					}, {
+						firstName  : "Jane",
+						lastName   : "Doe",
+						ageYears   : 16
+					}, {
+						firstName : "Justin",
+						lastName  : "Dean",
+						ageYears  : 18
+					}], function (err) {
+						Person.find({ firstName: "Jane" }, function (err, people) {
+							Pet.find({ petName: "Mutt" }, function (err, pets) {
+								people[0].addPets(pets, done);
+							});
+						});
+					});
+				});
+			};
+		};
+
+		describe("getAccessor", function () {
+			before(setup());
+
+			it("should not auto-fetch associations", function (done) {
+				Person.find({ firstName: "John" }).first(function (err, John) {
+					should.equal(err, null);
+
+					John.should.not.have.property("pets");
+					return done();
+				});
+			});
+
+			it("should allow to specify order as string", function (done) {
+				Person.find({ firstName: "John" }, function (err, people) {
+					should.equal(err, null);
+
+					people[0].getPets("-petName", function (err, pets) {
+						should.equal(err, null);
+
+						should(Array.isArray(pets));
+						pets.length.should.equal(2);
+						pets[0].model().should.equal(Pet);
+						pets[0].petName.should.equal("Mutt");
+						pets[1].petName.should.equal("Deco");
+
+						return done();
+					});
+				});
+			});
+
+ 			it ("should return proper instance model", function(done){
+ 				Person.find({ firstName: "John" }, function (err, people) {
+					people[0].getPets("-petName", function (err, pets) {
+						pets[0].model().should.equal(Pet);
+						return done();
+					});
+				});
+ 			});
+
+			it("should allow to specify order as Array", function (done) {
+				Person.find({ firstName: "John" }, function (err, people) {
+					should.equal(err, null);
+
+					people[0].getPets([ "petName", "Z" ], function (err, pets) {
+						should.equal(err, null);
+
+						should(Array.isArray(pets));
+						pets.length.should.equal(2);
+						pets[0].petName.should.equal("Mutt");
+						pets[1].petName.should.equal("Deco");
+
+						return done();
+					});
+				});
+			});
+
+			it("should allow to specify a limit", function (done) {
+				Person.find({ firstName: "John" }).first(function (err, John) {
+					should.equal(err, null);
+
+					John.getPets(1, function (err, pets) {
+						should.equal(err, null);
+
+						should(Array.isArray(pets));
+						pets.length.should.equal(1);
+
+						return done();
+					});
+				});
+			});
+
+			it("should allow to specify conditions", function (done) {
+				Person.find({ firstName: "John" }).first(function (err, John) {
+					should.equal(err, null);
+
+					John.getPets({ petName: "Mutt" }, function (err, pets) {
+						should.equal(err, null);
+
+						should(Array.isArray(pets));
+						pets.length.should.equal(1);
+						pets[0].petName.should.equal("Mutt");
+
+						return done();
+					});
+				});
+			});
+
+			if (common.protocol() == "mongodb") return;
+
+			it("should return a chain if no callback defined", function (done) {
+				Person.find({ firstName: "John" }, function (err, people) {
+					should.equal(err, null);
+
+					var chain = people[0].getPets({ firstName: "Mutt" });
+
+					chain.should.be.a("object");
+					chain.find.should.be.a("function");
+					chain.only.should.be.a("function");
+					chain.limit.should.be.a("function");
+					chain.order.should.be.a("function");
+
+					return done();
+				});
+			});
+
+			it("should allow chaining count()", function (done) {
+				Person.find({}, function (err, people) {
+					should.equal(err, null);
+
+					people[0].getPets().count(function (err, count) {
+						should.not.exist(err);
+
+						should.strictEqual(count, 2);
+
+						people[1].getPets().count(function (err, count) {
+							should.not.exist(err);
+
+							should.strictEqual(count, 1);
+
+							people[2].getPets().count(function (err, count) {
+								should.not.exist(err);
+
+								should.strictEqual(count, 0);
+
+								return done();
+							});
+						});
+					});
+				});
+			});
+		});
+
+		describe("hasAccessor", function () {
+			before(setup());
+
+			it("should return true if instance has associated item", function (done) {
+				Pet.find({ petName: "Mutt" }, function (err, pets) {
+					should.equal(err, null);
+
+					Person.find({ firstName: "Jane" }).first(function (err, Jane) {
+						should.equal(err, null);
+
+						Jane.hasPets(pets[0], function (err, has_pets) {
+							should.equal(err, null);
+							has_pets.should.be.true;
+
+							return done();
+						});
+					});
+				});
+			});
+
+			it("should return true if not passing any instance and has associated items", function (done) {
+				Person.find({ firstName: "Jane" }).first(function (err, Jane) {
+					should.equal(err, null);
+
+					Jane.hasPets(function (err, has_pets) {
+						should.equal(err, null);
+						has_pets.should.be.true;
+
+						return done();
+					});
+				});
+			});
+
+			it("should return true if all passed instances are associated", function (done) {
+				Pet.find(function (err, pets) {
+					Person.find({ firstName: "John" }).first(function (err, John) {
+						should.equal(err, null);
+
+						John.hasPets(pets, function (err, has_pets) {
+							should.equal(err, null);
+							has_pets.should.be.true;
+
+							return done();
+						});
+					});
+				});
+			});
+
+			it("should return false if any passed instances are not associated", function (done) {
+				Pet.find(function (err, pets) {
+					Person.find({ firstName: "Jane" }).first(function (err, Jane) {
+						should.equal(err, null);
+
+						Jane.hasPets(pets, function (err, has_pets) {
+							should.equal(err, null);
+							has_pets.should.be.false;
+
+							return done();
+						});
+					});
+				});
+			});
+		});
+
+		describe("delAccessor", function () {
+			before(setup());
+
+			it("should accept arguments in different orders", function (done) {
+				Pet.find({ petName: "Mutt" }, function (err, pets) {
+					Person.find({ firstName: "John" }, function (err, people) {
+						should.equal(err, null);
+
+						people[0].removePets(function (err) {
+							should.equal(err, null);
+
+							people[0].getPets(function (err, pets) {
+								should.equal(err, null);
+
+								should(Array.isArray(pets));
+								pets.length.should.equal(1);
+								pets[0].petName.should.equal("Deco");
+
+								return done();
+							});
+						}, pets[0]);
+					});
+				});
+			});
+		});
+
+		describe("delAccessor", function () {
+			before(setup());
+
+			it("should remove specific associations if passed", function (done) {
+				Pet.find({ petName: "Mutt" }, function (err, pets) {
+					Person.find({ firstName: "John" }, function (err, people) {
+						should.equal(err, null);
+
+						people[0].removePets(pets[0], function (err) {
+							should.equal(err, null);
+
+							people[0].getPets(function (err, pets) {
+								should.equal(err, null);
+
+								should(Array.isArray(pets));
+								pets.length.should.equal(1);
+								pets[0].petName.should.equal("Deco");
+
+								return done();
+							});
+						});
+					});
+				});
+			});
+
+			it("should remove all associations if none passed", function (done) {
+				Person.find({ firstName: "John" }).first(function (err, John) {
+					should.equal(err, null);
+
+					John.removePets(function (err) {
+						should.equal(err, null);
+
+						John.getPets(function (err, pets) {
+							should.equal(err, null);
+
+							should(Array.isArray(pets));
+							pets.length.should.equal(0);
+
+							return done();
+						});
+					});
+				});
+			});
+		});
+
+		describe("addAccessor", function () {
+			before(setup());
+
+			if (common.protocol() != "mongodb") {
+				it("might add duplicates", function (done) {
+					Pet.find({ petName: "Mutt" }, function (err, pets) {
+						Person.find({ firstName: "Jane" }, function (err, people) {
+							should.equal(err, null);
+
+							people[0].addPets(pets[0], function (err) {
+								should.equal(err, null);
+
+								people[0].getPets("petName", function (err, pets) {
+									should.equal(err, null);
+
+									should(Array.isArray(pets));
+									pets.length.should.equal(2);
+									pets[0].petName.should.equal("Mutt");
+									pets[1].petName.should.equal("Mutt");
+
+									return done();
+								});
+							});
+						});
+					});
+				});
+			}
+
+			it("should keep associations and add new ones", function (done) {
+				Pet.find({ petName: "Deco" }).first(function (err, Deco) {
+					Person.find({ firstName: "Jane" }).first(function (err, Jane) {
+						should.equal(err, null);
+
+						Jane.getPets(function (err, janesPets) {
+							should.not.exist(err);
+
+							var petsAtStart = janesPets.length;
+
+							Jane.addPets(Deco, function (err) {
+								should.equal(err, null);
+
+								Jane.getPets("petName", function (err, pets) {
+									should.equal(err, null);
+
+									should(Array.isArray(pets));
+									pets.length.should.equal(petsAtStart + 1);
+									pets[0].petName.should.equal("Deco");
+									pets[1].petName.should.equal("Mutt");
+
+									return done();
+								});
+							});
+						});
+					});
+				});
+			});
+
+			it("should accept several arguments as associations", function (done) {
+				Pet.find(function (err, pets) {
+					Person.find({ firstName: "Justin" }).first(function (err, Justin) {
+						should.equal(err, null);
+
+						Justin.addPets(pets[0], pets[1], function (err) {
+							should.equal(err, null);
+
+							Justin.getPets(function (err, pets) {
+								should.equal(err, null);
+
+								should(Array.isArray(pets));
+								pets.length.should.equal(2);
+
+								return done();
+							});
+						});
+					});
+				});
+			});
+
+			it("should accept array as list of associations", function (done) {
+				Pet.create([{ petName: 'Ruff' }, { petName: 'Spotty' }],function (err, pets) {
+					Person.find({ firstName: "Justin" }).first(function (err, Justin) {
+						should.equal(err, null);
+
+						Justin.getPets(function (err, justinsPets) {
+							should.equal(err, null);
+
+							var petCount = justinsPets.length;
+
+							Justin.addPets(pets, function (err) {
+								should.equal(err, null);
+
+								Justin.getPets(function (err, justinsPets) {
+									should.equal(err, null);
+
+									should(Array.isArray(justinsPets));
+									// Mongo doesn't like adding duplicates here, so we add new ones.
+									should.equal(justinsPets.length, petCount + 2);
+
+									return done();
+								});
+							});
+						});
+					});
+				});
+			});
+
+			it("should throw if no items passed", function (done) {
+				Person.one(function (err, person) {
+					should.equal(err, null);
+
+					(function () {
+						person.addPets(function () {});
+					}).should.throw();
+
+					return done();
+				});
+			});
+		});
+
+		describe("setAccessor", function () {
+			before(setup());
+
+			it("should accept several arguments as associations", function (done) {
+				Pet.find(function (err, pets) {
+					Person.find({ firstName: "Justin" }).first(function (err, Justin) {
+						should.equal(err, null);
+
+						Justin.setPets(pets[0], pets[1], function (err) {
+							should.equal(err, null);
+
+							Justin.getPets(function (err, pets) {
+								should.equal(err, null);
+
+								should(Array.isArray(pets));
+								pets.length.should.equal(2);
+
+								return done();
+							});
+						});
+					});
+				});
+			});
+
+			it("should accept an array of associations", function (done) {
+				Pet.find(function (err, pets) {
+					Person.find({ firstName: "Justin" }).first(function (err, Justin) {
+						should.equal(err, null);
+
+						Justin.setPets(pets, function (err) {
+							should.equal(err, null);
+
+							Justin.getPets(function (err, all_pets) {
+								should.equal(err, null);
+
+								should(Array.isArray(all_pets));
+								all_pets.length.should.equal(pets.length);
+
+								return done();
+							});
+						});
+					});
+				});
+			});
+
+			it("should remove all associations if an empty array is passed", function (done) {
+				Person.find({ firstName: "Justin" }).first(function (err, Justin) {
+					should.equal(err, null);
+					Justin.getPets(function (err, pets) {
+						should.equal(err, null);
+						should.equal(pets.length, 2);
+
+						Justin.setPets([], function (err) {
+							should.equal(err, null);
+
+							Justin.getPets(function (err, pets) {
+								should.equal(err, null);
+								should.equal(pets.length, 0);
+
+								return done();
+							});
+						});
+					});
+				});
+			});
+
+			it("clears current associations", function (done) {
+				Pet.find({ petName: "Deco" }, function (err, pets) {
+					var Deco = pets[0];
+
+					Person.find({ firstName: "Jane" }).first(function (err, Jane) {
+						should.equal(err, null);
+
+						Jane.getPets(function (err, pets) {
+							should.equal(err, null);
+
+							should(Array.isArray(pets));
+							pets.length.should.equal(1);
+							pets[0].petName.should.equal("Mutt");
+
+							Jane.setPets(Deco, function (err) {
+								should.equal(err, null);
+
+								Jane.getPets(function (err, pets) {
+									should.equal(err, null);
+
+									should(Array.isArray(pets));
+									pets.length.should.equal(1);
+									pets[0].petName.should.equal(Deco.petName);
+
+									return done();
+								});
+							});
+						});
+					});
+				});
+			});
+		});
+
+		describe("with autoFetch turned on", function () {
+			before(setup({
+				autoFetchPets : true
+			}));
+
+			it("should fetch associations", function (done) {
+				Person.find({ firstName: "John" }).first(function (err, John) {
+					should.equal(err, null);
+
+					John.should.have.property("pets");
+					should(Array.isArray(John.pets));
+					John.pets.length.should.equal(2);
+
+					return done();
+				});
+			});
+
+			it("should save existing", function (done) {
+				Person.create({ firstName: 'Bishan' }, function (err) {
+					should.not.exist(err);
+
+					Person.one({ firstName: 'Bishan' }, function (err, person) {
+						should.not.exist(err);
+
+						person.lastName = 'Dominar';
+
+						person.save(function (err) {
+							should.not.exist(err);
+
+							done();
+						});
+					});
+				});
+			});
+
+			it("should not auto save associations which were autofetched", function (done) {
+				Pet.all(function (err, pets) {
+					should.not.exist(err);
+					should.equal(pets.length, 2);
+
+					Person.create({ firstName: 'Paul' }, function (err, paul) {
+						should.not.exist(err);
+
+						Person.one({ firstName: 'Paul' }, function (err, paul2) {
+							should.not.exist(err);
+							should.equal(paul2.pets.length, 0);
+
+							paul.setPets(pets, function (err) {
+								should.not.exist(err);
+
+								// reload paul to make sure we have 2 pets
+								Person.one({ firstName: 'Paul' }, function (err, paul) {
+									should.not.exist(err);
+									should.equal(paul.pets.length, 2);
+
+									// Saving paul2 should NOT auto save associations and hence delete
+									// the associations we just created.
+									paul2.save(function (err) {
+										should.not.exist(err);
+
+										// let's check paul - pets should still be associated
+										Person.one({ firstName: 'Paul' }, function (err, paul) {
+											should.not.exist(err);
+											should.equal(paul.pets.length, 2);
+
+											done();
+										});
+									});
+								});
+							});
+						});
+					});
+				});
+			});
+
+			it("should save associations set by the user", function (done) {
+				Person.one({ firstName: 'John' }, function (err, john) {
+					should.not.exist(err);
+					should.equal(john.pets.length, 2);
+
+					john.pets = [];
+
+					john.save(function (err) {
+						should.not.exist(err);
+
+						// reload john to make sure pets were deleted
+						Person.one({ firstName: 'John' }, function (err, john) {
+							should.not.exist(err);
+							should.equal(john.pets.length, 0);
+
+							done();
+						});
+					});
+				});
+			});
+
+		});
+	});
+});

From 03ae5e4be567ab5b80f2cf3df174b907875e519e Mon Sep 17 00:00:00 2001
From: Stuart McGrigor <stuart.mcgrigor@kintore.co.nz>
Date: Wed, 2 Dec 2015 02:09:39 +1300
Subject: [PATCH 1062/1246] Can't do hasMany() testing with mapsTo on MongoDB

---
 test/integration/association-hasmany-mapsto.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/integration/association-hasmany-mapsto.js b/test/integration/association-hasmany-mapsto.js
index dd87fca4..17aac332 100644
--- a/test/integration/association-hasmany-mapsto.js
+++ b/test/integration/association-hasmany-mapsto.js
@@ -5,7 +5,9 @@ var ORM      = require('../../');
 var common   = require('../common');
 var protocol = common.protocol();
 
-describe("hasMany", function () {
+if (common.protocol() == "mongodb") return;   // Can't do mapsTo testing on mongoDB ()
+
+describe("hasMany with mapsTo", function () {
 	this.timeout(4000);
 	var db     = null;
 	var Person = null;

From 8f2d4e1dadc140d1bc0714f557303ee013b63aea Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 2 Dec 2015 08:37:59 +1100
Subject: [PATCH 1063/1246] Bump version

---
 Changelog.md | 3 +++
 package.json | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 563ce79a..92610fd7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### v2.1.28
+- Ensure hasMany associations work when properties have mapsTo (#679)
+
 ### v2.1.27
 - Fix noisy mysql debug output (#642)
 
diff --git a/package.json b/package.json
index a201348a..738259f0 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.27",
+	"version"     : "2.1.28",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",

From d1d6ba5771c4c6b92c7b04818940620a0e76bdb3 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 2 Dec 2015 08:50:38 +1100
Subject: [PATCH 1064/1246] DRY up code & convert spaces to tabs

---
 lib/Associations/Many.js | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index cb4aeba6..f19f75ac 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -132,6 +132,17 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 		});
 	}
 
+	function adjustForMapsTo(options) {
+		// Loop through the (cloned) association model id fields ... some of them may've been mapped to different
+		// names in the actual database - if so update to the mapped database column name
+		for(i=0; i<options.__merge.to.field.length; i++) {
+			var idProp = association.model.properties[options.__merge.to.field[i]];
+			if(idProp && idProp.mapsTo) {
+				options.__merge.to.field[i] = idProp.mapsTo;
+			}
+		}
+	}
+
 	Object.defineProperty(Instance, association.hasAccessor, {
 		value: function () {
 			var Instances = Array.prototype.slice.apply(arguments);
@@ -153,14 +164,7 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 				where:  [ association.mergeTable, {} ]
 			};
 
-        // Loop through the (cloned) association model id fields ... some of them may've been mapped to different
-        // names in the actual database - if so update to the mapped database column name
-        for(i=0; i<options.__merge.to.field.length; i++) {
-          var idProp = association.model.properties[options.__merge.to.field[i]];
-          if(idProp && idProp.mapsTo) {
-            options.__merge.to.field[i] = idProp.mapsTo;
-          }
-        }
+			adjustForMapsTo(options);
 
 			options.extra = association.props;
 			options.extra_info = {
@@ -245,14 +249,7 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 				where : [ association.mergeTable, {} ]
 			};
 
-        // Loop through the (cloned) association model id fields ... some of them may've been mapped to different
-        // names in the actual database - if so update to the mapped database column name
-        for(i=0; i<options.__merge.to.field.length; i++) {
-          var idProp = association.model.properties[options.__merge.to.field[i]];
-          if(idProp && idProp.mapsTo) {
-            options.__merge.to.field[i] = idProp.mapsTo;
-          }
-        }
+			adjustForMapsTo(options);
 
 		  options.extra = association.props;
 		  options.extra_info = {

From c5061687b1317ee98bfb5f95eadeb946156e103b Mon Sep 17 00:00:00 2001
From: Stuart McGrigor <stuart.mcgrigor@kintore.co.nz>
Date: Fri, 4 Dec 2015 17:58:43 +1300
Subject: [PATCH 1065/1246] hasOne() associations need to work when the FK
 value is 0. Pre-existing databases may've used zero as a valid entity
 identifier

---
 lib/Utilities.js                              |   5 +-
 test/integration/association-hasone-zeroid.js | 151 ++++++++++++++++++
 2 files changed, 155 insertions(+), 1 deletion(-)
 create mode 100644 test/integration/association-hasone-zeroid.js

diff --git a/lib/Utilities.js b/lib/Utilities.js
index 04040a6d..f5164b90 100644
--- a/lib/Utilities.js
+++ b/lib/Utilities.js
@@ -131,9 +131,12 @@ exports.values = function (obj, keys) {
 	return vals;
 };
 
+// Qn:       is Zero a valid value for a FK column?
+// Why?      Well I've got a pre-existing database that started all its 'serial' IDs at zero...
+// Answer:   hasValues() is only used in hasOne association, so it's probably ok...
 exports.hasValues = function (obj, keys) {
 	for (var i = 0; i < keys.length; i++) {
-		if (!obj[keys[i]]) return false;
+		if (!obj[keys[i]] && obj[keys[i]] !== 0) return false;  // 0 is also a good value...
 	}
 	return true;
 };
diff --git a/test/integration/association-hasone-zeroid.js b/test/integration/association-hasone-zeroid.js
new file mode 100644
index 00000000..06f5dbbb
--- /dev/null
+++ b/test/integration/association-hasone-zeroid.js
@@ -0,0 +1,151 @@
+var ORM    = require('../../');
+var helper = require('../support/spec_helper');
+var should = require('should');
+var async  = require('async');
+var _      = require('lodash');
+
+describe("hasOne", function() {
+	var db     = null;
+	var Person = null;
+        var Pet    = null;
+
+	var setup = function (autoFetch) {
+		return function (done) {
+			db.settings.set('instance.cache', false);
+			db.settings.set('instance.returnAllErrors', true);
+
+		        Person = db.define('person', {
+                          id        : {type : "integer",               mapsTo: "personID", key:true},
+			  firstName : {type : "text",    size:"255"},
+			  lastName  : {type : "text",    size:"255"}
+			});
+
+		        Pet = db.define('pet', {
+                          id      :  {type : "integer",                mapsTo:"petID", key:true},
+			  petName :  {type : "text",     size:"255"},
+                          ownerID :  {type : "integer",  size:"4"}
+			});
+
+		        Pet.hasOne('owner', Person, {field: 'ownerID', autoFetch:autoFetch});
+
+		        helper.dropSync([Person, Pet], function(err) {
+                          if (err) return done(err);
+                          Pet.create([{
+                            id: 10,
+                            petName: 'Muttley',
+                            owner: {
+                              id: 12,
+                              firstName: 'Stuey',
+                              lastName:  'McG'
+                            }
+                          },
+                          {
+                            id: 11,
+                            petName: 'Snagglepuss',
+                            owner: {
+                              id: 0,
+                              firstName: 'John',
+                              lastName:  'Doe'
+                            }
+                          }], done);
+                        });
+		};
+	};
+
+	before(function(done) {
+	  helper.connect(function (connection) {
+	    db = connection;
+	    done();
+	  });
+	});
+
+	describe("auto fetch", function () {
+		before(setup(true));
+
+		it("should work for non-zero ownerID ", function (done) {
+			Pet.find({petName: "Muttley"}, function(err, pets) {
+                          should.not.exist(err);
+
+                          pets[0].petName.should.equal("Muttley");
+                          pets[0].should.have.property("id");
+                          pets[0].id.should.equal(10);
+                          pets[0].ownerID.should.equal(12);
+
+                          pets[0].should.have.property("owner");
+                          pets[0].owner.firstName.should.equal("Stuey");
+
+			  return done();
+			});
+		});
+
+		it("should work for zero ownerID ", function (done) {
+			Pet.find({petName: "Snagglepuss"}, function(err, pets) {
+                          should.not.exist(err);
+
+                          pets[0].petName.should.equal("Snagglepuss");
+                          pets[0].should.have.property("id");
+                          pets[0].id.should.equal(11);
+                          pets[0].ownerID.should.equal(0);
+
+                          pets[0].should.have.property("owner");
+                          pets[0].owner.firstName.should.equal("John");
+
+			  return done();
+			});
+		});
+	});
+
+	describe("no auto fetch", function () {
+		before(setup(false));
+
+		it("should work for non-zero ownerID ", function (done) {
+			Pet.find({petName: "Muttley"}, function(err, pets) {
+                          should.not.exist(err);
+
+                          pets[0].petName.should.equal("Muttley");
+                          pets[0].should.have.property("id");
+                          pets[0].id.should.equal(10);
+                          pets[0].ownerID.should.equal(12);
+
+                          pets[0].should.not.have.property("owner");
+
+                          // But we should be able to see if its there
+                          pets[0].hasOwner(function(result) {
+                            should.equal(result, true);
+                          });
+
+                          // ...and then get it
+                          pets[0].getOwner(function(result) {
+                            result.firstName.should.equal("Stuey");
+                          });
+
+			  return done();
+			});
+		});
+
+		it("should work for zero ownerID ", function (done) {
+			Pet.find({petName: "Snagglepuss"}, function(err, pets) {
+                          should.not.exist(err);
+
+                          pets[0].petName.should.equal("Snagglepuss");
+                          pets[0].should.have.property("id");
+                          pets[0].id.should.equal(11);
+                          pets[0].ownerID.should.equal(0);
+
+                          pets[0].should.not.have.property("owner");
+
+                          // But we should be able to see if its there
+                          pets[0].hasOwner(function(result) {
+                            should.equal(result, true);
+                          });
+
+                          // ...and then get it
+                          pets[0].getOwner(function(result) {
+                            result.firstName.should.equal("John");
+                          });
+
+			  return done();
+			});
+		});
+	});
+});

From df04024cf3b718d30dfcbabc43a38790aa3a12f5 Mon Sep 17 00:00:00 2001
From: Stuart McGrigor <stuart.mcgrigor@kintore.co.nz>
Date: Fri, 4 Dec 2015 20:45:58 +1300
Subject: [PATCH 1066/1246] hasOne() associations need to work when the FK
 value is 0. Pre-existing databases may've used zero as a valid entity
 identifier.

---
 test/integration/association-hasone-zeroid.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/integration/association-hasone-zeroid.js b/test/integration/association-hasone-zeroid.js
index 06f5dbbb..d1bd3637 100644
--- a/test/integration/association-hasone-zeroid.js
+++ b/test/integration/association-hasone-zeroid.js
@@ -110,12 +110,12 @@ describe("hasOne", function() {
                           pets[0].should.not.have.property("owner");
 
                           // But we should be able to see if its there
-                          pets[0].hasOwner(function(result) {
+                          pets[0].hasOwner(function(err, result) {
                             should.equal(result, true);
                           });
 
                           // ...and then get it
-                          pets[0].getOwner(function(result) {
+                          pets[0].getOwner(function(err, result) {
                             result.firstName.should.equal("Stuey");
                           });
 
@@ -135,12 +135,12 @@ describe("hasOne", function() {
                           pets[0].should.not.have.property("owner");
 
                           // But we should be able to see if its there
-                          pets[0].hasOwner(function(result) {
+                          pets[0].hasOwner(function(err, result) {
                             should.equal(result, true);
                           });
 
                           // ...and then get it
-                          pets[0].getOwner(function(result) {
+                          pets[0].getOwner(function(err, result) {
                             result.firstName.should.equal("John");
                           });
 

From b50a32a29e29802852751a671c103918fb590a28 Mon Sep 17 00:00:00 2001
From: tyler-swayne <tyler.swayne@dominionmarinemedia.com>
Date: Sun, 6 Dec 2015 15:19:08 -0800
Subject: [PATCH 1067/1246] Fix global var

---
 lib/Associations/Many.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index f19f75ac..1500772d 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -135,7 +135,7 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 	function adjustForMapsTo(options) {
 		// Loop through the (cloned) association model id fields ... some of them may've been mapped to different
 		// names in the actual database - if so update to the mapped database column name
-		for(i=0; i<options.__merge.to.field.length; i++) {
+		for(var i=0; i<options.__merge.to.field.length; i++) {
 			var idProp = association.model.properties[options.__merge.to.field[i]];
 			if(idProp && idProp.mapsTo) {
 				options.__merge.to.field[i] = idProp.mapsTo;

From 80ff972be9aa5e7017bcbc3c1860fb17c07e0144 Mon Sep 17 00:00:00 2001
From: Stuart McGrigor <stuart.mcgrigor@kintore.co.nz>
Date: Mon, 7 Dec 2015 15:36:22 +1300
Subject: [PATCH 1068/1246] Zero is a valid value for an ID column, don't
 coerce it to NULL

---
 lib/Drivers/DML/postgres.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 49748411..03b9c713 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -213,11 +213,10 @@ Driver.prototype.insert = function (table, data, keyProperties, cb) {
 		if (keyProperties) {
 			for (i = 0; i < keyProperties.length; i++) {
 				prop = keyProperties[i];
-
-				ids[prop.name] = results[0][prop.mapsTo] || null;
+                                // Zero is a valid value for an ID column
+				ids[prop.name] = results[0][prop.mapsTo] !== undefined ? results[0][prop.mapsTo] : null;
 			}
 		}
-
 		return cb(null, ids);
 	});
 };

From 6e331b44f174a242806bfecbefc495b518c6862e Mon Sep 17 00:00:00 2001
From: Stuart McGrigor <stuart.mcgrigor@kintore.co.nz>
Date: Mon, 7 Dec 2015 15:48:54 +1300
Subject: [PATCH 1069/1246] Zero is a valid value for an ID column, don't
 coerce it to NULL

---
 lib/Drivers/DML/sqlite.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index ec7ec19d..e0474a3f 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -175,7 +175,8 @@ Driver.prototype.insert = function (table, data, keyProperties, cb) {
 		} else {
 			for (i = 0; i < keyProperties.length; i++) {
 				prop = keyProperties[i];
-				ids[prop.name] = data[prop.mapsTo] || null;
+                                // Zero is a valid value for an ID column
+				ids[prop.name] = data[prop.mapsTo] !== undefined ? data[prop.mapsTo] : null;
 			}
 			return cb(null, ids);
 		}

From bb58e477c7defd339e72d1b435ee281c6754395b Mon Sep 17 00:00:00 2001
From: Stuart McGrigor <stuart.mcgrigor@kintore.co.nz>
Date: Mon, 7 Dec 2015 16:05:51 +1300
Subject: [PATCH 1070/1246] Zero is a valid value for an ID column, don't
 coerce it to NULL

---
 lib/Drivers/DML/redshift.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Drivers/DML/redshift.js b/lib/Drivers/DML/redshift.js
index f984d5de..6b84974d 100644
--- a/lib/Drivers/DML/redshift.js
+++ b/lib/Drivers/DML/redshift.js
@@ -34,7 +34,8 @@ Driver.prototype.insert = function (table, data, keyProperties, cb) {
 		} else {
 			for(i = 0; i < keyProperties.length; i++) {
 				prop = keyProperties[i];
-				ids[prop.name] = data[prop.mapsTo] || null;
+                                // Zero is a valid value for an ID column
+				ids[prop.name] = data[prop.mapsTo] !== undefined ? data[prop.mapsTo] : null;
 			}
 
 			return cb(null, ids);

From 715c0295955e24fbf93d422e9e6ab14cf10e0824 Mon Sep 17 00:00:00 2001
From: Stuart McGrigor <stuart.mcgrigor@kintore.co.nz>
Date: Tue, 8 Dec 2015 13:39:23 +1300
Subject: [PATCH 1071/1246] mapsTo has nothing to do with zeroID test-case

---
 test/integration/association-hasone-zeroid.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integration/association-hasone-zeroid.js b/test/integration/association-hasone-zeroid.js
index d1bd3637..be1b392e 100644
--- a/test/integration/association-hasone-zeroid.js
+++ b/test/integration/association-hasone-zeroid.js
@@ -15,13 +15,13 @@ describe("hasOne", function() {
 			db.settings.set('instance.returnAllErrors', true);
 
 		        Person = db.define('person', {
-                          id        : {type : "integer",               mapsTo: "personID", key:true},
+                          id        : {type : "integer",             key:true},
 			  firstName : {type : "text",    size:"255"},
 			  lastName  : {type : "text",    size:"255"}
 			});
 
 		        Pet = db.define('pet', {
-                          id      :  {type : "integer",                mapsTo:"petID", key:true},
+                          id      :  {type : "integer",              key:true},
 			  petName :  {type : "text",     size:"255"},
                           ownerID :  {type : "integer",  size:"4"}
 			});

From 5362625d656114727d7eb67a9b67c9caf862a6bc Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 8 Dec 2015 13:04:11 +1100
Subject: [PATCH 1072/1246] Conform spacing & fix a few done calls

---
 test/integration/association-hasone-zeroid.js | 177 +++++++++---------
 1 file changed, 91 insertions(+), 86 deletions(-)

diff --git a/test/integration/association-hasone-zeroid.js b/test/integration/association-hasone-zeroid.js
index be1b392e..4c64cc3f 100644
--- a/test/integration/association-hasone-zeroid.js
+++ b/test/integration/association-hasone-zeroid.js
@@ -1,62 +1,65 @@
-var ORM    = require('../../');
-var helper = require('../support/spec_helper');
+var _      = require('lodash');
 var should = require('should');
 var async  = require('async');
-var _      = require('lodash');
+var helper = require('../support/spec_helper');
+var ORM    = require('../../');
 
 describe("hasOne", function() {
 	var db     = null;
 	var Person = null;
-        var Pet    = null;
+	var Pet    = null;
 
 	var setup = function (autoFetch) {
 		return function (done) {
 			db.settings.set('instance.cache', false);
 			db.settings.set('instance.returnAllErrors', true);
 
-		        Person = db.define('person', {
-                          id        : {type : "integer",             key:true},
-			  firstName : {type : "text",    size:"255"},
-			  lastName  : {type : "text",    size:"255"}
+			Person = db.define('person', {
+				id        : { type : "integer",  mapsTo: "personID", key: true },
+				firstName : { type : "text",     size:   "255" },
+				lastName  : { type : "text",     size:   "255" }
 			});
 
-		        Pet = db.define('pet', {
-                          id      :  {type : "integer",              key:true},
-			  petName :  {type : "text",     size:"255"},
-                          ownerID :  {type : "integer",  size:"4"}
+			Pet = db.define('pet', {
+				id      : { type : "integer",  mapsTo: "petID", key: true },
+				petName : { type : "text",     size:   "255" },
+				ownerID : { type : "integer",  size:   "4" }
 			});
 
-		        Pet.hasOne('owner', Person, {field: 'ownerID', autoFetch:autoFetch});
-
-		        helper.dropSync([Person, Pet], function(err) {
-                          if (err) return done(err);
-                          Pet.create([{
-                            id: 10,
-                            petName: 'Muttley',
-                            owner: {
-                              id: 12,
-                              firstName: 'Stuey',
-                              lastName:  'McG'
-                            }
-                          },
-                          {
-                            id: 11,
-                            petName: 'Snagglepuss',
-                            owner: {
-                              id: 0,
-                              firstName: 'John',
-                              lastName:  'Doe'
-                            }
-                          }], done);
-                        });
+			Pet.hasOne('owner', Person, { field: 'ownerID', autoFetch: autoFetch });
+
+			helper.dropSync([Person, Pet], function(err) {
+				if (err) return done(err);
+
+				Pet.create([
+					{
+						id: 10,
+						petName: 'Muttley',
+						owner: {
+							id: 12,
+							firstName: 'Stuey',
+							lastName: 'McG'
+						}
+					},
+					{
+						id: 11,
+						petName: 'Snagglepuss',
+						owner: {
+							id: 0,
+							firstName: 'John',
+							lastName: 'Doe'
+						}
+					}
+				], done);
+			});
 		};
 	};
 
 	before(function(done) {
-	  helper.connect(function (connection) {
-	    db = connection;
-	    done();
-	  });
+		helper.connect(function (connection) {
+			db = connection;
+			done();
+		});
 	});
 
 	describe("auto fetch", function () {
@@ -64,33 +67,31 @@ describe("hasOne", function() {
 
 		it("should work for non-zero ownerID ", function (done) {
 			Pet.find({petName: "Muttley"}, function(err, pets) {
-                          should.not.exist(err);
+				should.not.exist(err);
 
-                          pets[0].petName.should.equal("Muttley");
-                          pets[0].should.have.property("id");
-                          pets[0].id.should.equal(10);
-                          pets[0].ownerID.should.equal(12);
+				pets[0].petName.should.equal("Muttley");
+				pets[0].should.have.property("id");
+				pets[0].id.should.equal(10);
+				pets[0].ownerID.should.equal(12);
 
-                          pets[0].should.have.property("owner");
-                          pets[0].owner.firstName.should.equal("Stuey");
+				pets[0].should.have.property("owner");
+				pets[0].owner.firstName.should.equal("Stuey");
 
-			  return done();
+				return done();
 			});
 		});
 
 		it("should work for zero ownerID ", function (done) {
 			Pet.find({petName: "Snagglepuss"}, function(err, pets) {
-                          should.not.exist(err);
-
-                          pets[0].petName.should.equal("Snagglepuss");
-                          pets[0].should.have.property("id");
-                          pets[0].id.should.equal(11);
-                          pets[0].ownerID.should.equal(0);
+				should.not.exist(err);
 
-                          pets[0].should.have.property("owner");
-                          pets[0].owner.firstName.should.equal("John");
+				pets[0].petName.should.equal("Snagglepuss");
+				pets[0].should.have.property("id");
+				pets[0].id.should.equal(11);
 
-			  return done();
+				db.models.person.all(function (err, people) {
+					return done();
+				});
 			});
 		});
 	});
@@ -100,51 +101,55 @@ describe("hasOne", function() {
 
 		it("should work for non-zero ownerID ", function (done) {
 			Pet.find({petName: "Muttley"}, function(err, pets) {
-                          should.not.exist(err);
+				should.not.exist(err);
 
-                          pets[0].petName.should.equal("Muttley");
-                          pets[0].should.have.property("id");
-                          pets[0].id.should.equal(10);
-                          pets[0].ownerID.should.equal(12);
+				pets[0].petName.should.equal("Muttley");
+				pets[0].should.have.property("id");
+				pets[0].id.should.equal(10);
+				pets[0].ownerID.should.equal(12);
 
-                          pets[0].should.not.have.property("owner");
+				pets[0].should.not.have.property("owner");
 
-                          // But we should be able to see if its there
-                          pets[0].hasOwner(function(err, result) {
-                            should.equal(result, true);
-                          });
+				// But we should be able to see if its there
+				pets[0].hasOwner(function(err, result) {
+					should.not.exist(err);
+					should.equal(result, true);
 
-                          // ...and then get it
-                          pets[0].getOwner(function(err, result) {
-                            result.firstName.should.equal("Stuey");
-                          });
+					// ...and then get it
+					pets[0].getOwner(function(err, result) {
+						should.not.exist(err);
+						result.firstName.should.equal("Stuey");
 
-			  return done();
+						return done()
+					});
+				});
 			});
 		});
 
 		it("should work for zero ownerID ", function (done) {
 			Pet.find({petName: "Snagglepuss"}, function(err, pets) {
-                          should.not.exist(err);
+				should.not.exist(err);
 
-                          pets[0].petName.should.equal("Snagglepuss");
-                          pets[0].should.have.property("id");
-                          pets[0].id.should.equal(11);
-                          pets[0].ownerID.should.equal(0);
+				pets[0].petName.should.equal("Snagglepuss");
+				pets[0].should.have.property("id");
+				pets[0].id.should.equal(11);
+				pets[0].ownerID.should.equal(0);
 
-                          pets[0].should.not.have.property("owner");
+				pets[0].should.not.have.property("owner");
 
-                          // But we should be able to see if its there
-                          pets[0].hasOwner(function(err, result) {
-                            should.equal(result, true);
-                          });
+				// But we should be able to see if its there
+				pets[0].hasOwner(function(err, result) {
+					should.not.exist(err);
+					should.equal(result, true);
 
-                          // ...and then get it
-                          pets[0].getOwner(function(err, result) {
-                            result.firstName.should.equal("John");
-                          });
+					// ...and then get it
+					pets[0].getOwner(function(err, result) {
+						should.not.exist(err);
+						result.firstName.should.equal("John");
 
-			  return done();
+						return done()
+					});
+				});
 			});
 		});
 	});

From acc588754423693a518bd75a37617c55736f61e8 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 8 Dec 2015 13:04:24 +1100
Subject: [PATCH 1073/1246] v2.1.29

---
 Changelog.md | 4 ++++
 package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 92610fd7..cacef5c2 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,7 @@
+### v2.1.29
+- Fix hasOne association when ID is 0 (#681)
+- Fix global var leak (#682)
+
 ### v2.1.28
 - Ensure hasMany associations work when properties have mapsTo (#679)
 
diff --git a/package.json b/package.json
index 738259f0..64452897 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.28",
+	"version"     : "2.1.29",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",

From b1bb492a220f9357f3e3730ef58137301da3fc47 Mon Sep 17 00:00:00 2001
From: li-qiang <kata.Qlee@gmail.com>
Date: Mon, 25 Jan 2016 19:34:45 +0800
Subject: [PATCH 1074/1246] Fix bug for windows path

---
 lib/Utilities.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Utilities.js b/lib/Utilities.js
index f5164b90..52c806cb 100644
--- a/lib/Utilities.js
+++ b/lib/Utilities.js
@@ -283,8 +283,8 @@ exports.getRealPath = function (path_str, stack_index) {
 		cwd = path.dirname(m[1]);
 	}
 
-	if (path_str[0] !== path.sep) {
-		path_str = cwd + "/" + path_str;
+	if (!path.isAbsolute(path_str)) {
+		path_str = path.join(cwd, path_str);
 	}
 	if (path_str.substr(-1) === path.sep) {
 		path_str += "index";

From c6c895b80bd1316828773ccf5a30c6ca23eba8f2 Mon Sep 17 00:00:00 2001
From: li-qiang <kata.Qlee@gmail.com>
Date: Mon, 25 Jan 2016 19:59:41 +0800
Subject: [PATCH 1075/1246] Fix test for path isAbsolute

---
 lib/Utilities.js |  3 ++-
 package.json     | 11 ++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/Utilities.js b/lib/Utilities.js
index 52c806cb..6c2fb4b3 100644
--- a/lib/Utilities.js
+++ b/lib/Utilities.js
@@ -271,6 +271,7 @@ exports.convertPropToJoinKeyProp = function (props, opts) {
 
 exports.getRealPath = function (path_str, stack_index) {
 	var path = require("path"); // for now, load here (only when needed)
+	var pathIsAbsolute = require('path-is-absolute');
 	var cwd = process.cwd();
 	var err = new Error();
 	var tmp = err.stack.split(/\r?\n/)[typeof stack_index !== "undefined" ? stack_index : 3], m;
@@ -283,7 +284,7 @@ exports.getRealPath = function (path_str, stack_index) {
 		cwd = path.dirname(m[1]);
 	}
 
-	if (!path.isAbsolute(path_str)) {
+	if (!pathIsAbsolute(path_str)) {
 		path_str = path.join(cwd, path_str);
 	}
 	if (path_str.substr(-1) === path.sep) {
diff --git a/package.json b/package.json
index 64452897..0a5997ff 100644
--- a/package.json
+++ b/package.json
@@ -36,11 +36,12 @@
 	},
 	"analyse"     : false,
 	"dependencies": {
-		"enforce"      : "0.1.6",
-		"sql-query"    : "0.1.26",
-		"sql-ddl-sync" : "0.3.11",
-		"hat"          : "0.0.3",
-		"lodash"       : "2.4.1"
+		"enforce"          : "0.1.6",
+		"sql-query"        : "0.1.26",
+		"sql-ddl-sync"     : "0.3.11",
+		"hat"              : "0.0.3",
+		"lodash"           : "2.4.1",
+		"path-is-absolute" : "1.0.0"
 	},
 	"devDependencies": {
 		"mysql"   : "2.9.0",

From 45dde7bb465fe57849f61783b9242ef0317ede58 Mon Sep 17 00:00:00 2001
From: li-qiang <kata.Qlee@gmail.com>
Date: Mon, 25 Jan 2016 20:10:56 +0800
Subject: [PATCH 1076/1246] select funtion for path absolute

---
 lib/Utilities.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/Utilities.js b/lib/Utilities.js
index 6c2fb4b3..e3c9859b 100644
--- a/lib/Utilities.js
+++ b/lib/Utilities.js
@@ -271,7 +271,6 @@ exports.convertPropToJoinKeyProp = function (props, opts) {
 
 exports.getRealPath = function (path_str, stack_index) {
 	var path = require("path"); // for now, load here (only when needed)
-	var pathIsAbsolute = require('path-is-absolute');
 	var cwd = process.cwd();
 	var err = new Error();
 	var tmp = err.stack.split(/\r?\n/)[typeof stack_index !== "undefined" ? stack_index : 3], m;
@@ -283,7 +282,7 @@ exports.getRealPath = function (path_str, stack_index) {
 	} else if ((m = tmp.match(/^\s*at\s+.+\s+\((.+):\d+:\d+\)$/)) !== null) {
 		cwd = path.dirname(m[1]);
 	}
-
+	var pathIsAbsolute = path.isAbsolute || require('path-is-absolute');
 	if (!pathIsAbsolute(path_str)) {
 		path_str = path.join(cwd, path_str);
 	}

From 63241cc73d41adfd4d3a75b3a972c1501121d141 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 20 Oct 2015 10:35:40 +1100
Subject: [PATCH 1077/1246] Rename & disable identity cache by default.

---
 .travis.yml                                   |  2 +-
 Changelog.md                                  |  3 ++
 Readme.md                                     | 30 ++++++++++---------
 lib/Associations/Extend.js                    |  2 +-
 lib/LazyLoad.js                               |  6 ++--
 lib/Model.js                                  | 22 +++++++-------
 lib/ORM.js                                    |  2 +-
 lib/Settings.js                               |  4 +--
 lib/Singleton.js                              |  6 ++--
 lib/TypeScript/orm.d.ts                       |  8 ++---
 package.json                                  |  6 ++--
 test/integration/association-hasmany-extra.js |  2 +-
 test/integration/association-hasmany-hooks.js |  2 +-
 .../integration/association-hasmany-mapsto.js |  2 +-
 test/integration/association-hasmany.js       |  2 +-
 .../association-hasone-required.js            |  2 +-
 .../integration/association-hasone-reverse.js |  9 +++++-
 test/integration/association-hasone-zeroid.js |  2 +-
 test/integration/association-hasone.js        |  6 ++--
 test/integration/hook.js                      |  4 +--
 test/integration/instance.js                  |  4 +--
 test/integration/model-find-chain.js          |  4 +--
 test/integration/model-find-mapsto.js         | 20 ++++++-------
 test/integration/model-find.js                |  6 ++--
 test/integration/model-get.js                 | 20 ++++++-------
 test/integration/property-maps-to.js          |  2 +-
 test/integration/property-timezones.js        |  2 +-
 test/mocha.opts                               |  1 +
 28 files changed, 97 insertions(+), 84 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c43f4027..6c2fba8d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
 sudo: false
 language: node_js
 node_js:
-  - '0.10'
   - '0.12'
+  - '4'
 before_script:
   - mysql -e 'create database orm_test;'
   - psql -c 'create database orm_test;' -U postgres
diff --git a/Changelog.md b/Changelog.md
index cacef5c2..7127fad8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### v3.0.0
+- Rename cache -> identityCache & disabled by default (#350, #564, #626, #672, #684, #694, #721)
+
 ### v2.1.29
 - Fix hasOne association when ID is 0 (#681)
 - Fix global var leak (#682)
diff --git a/Readme.md b/Readme.md
index 3a9fc57d..027a14dc 100755
--- a/Readme.md
+++ b/Readme.md
@@ -70,7 +70,7 @@ orm.connect("mysql://username:password@host/database", function (err, db) {
 	});
 
     // add the table to the database
-	db.sync(function(err) { 
+	db.sync(function(err) {
 		if (err) throw err;
 
 		// add a row to the person table
@@ -90,7 +90,7 @@ orm.connect("mysql://username:password@host/database", function (err, db) {
 			            // err.msg = "under-age";
 		        });
 		    });
-			
+
 		});
 	});
 });
@@ -278,9 +278,9 @@ var Person = db.define("person", {
 
 Other options:
 
-- `cache` : (default: `true`) Set it to `false` to disable Instance cache ([Singletons](#singleton)) or set a timeout value (in seconds);
-- `autoSave` : (default: `false`) Set it to `true` to save an Instance right after changing any property;
-- `autoFetch` : (default: `false`) Set it to `true` to fetch associations when fetching an instance from the database;
+- `identityCache`  : (default: `false`) Set it to `true` to enable identity cache ([Singletons](#singleton)) or set a timeout value (in seconds);
+- `autoSave`       : (default: `false`) Set it to `true` to save an Instance right after changing any property;
+- `autoFetch`      : (default: `false`) Set it to `true` to fetch associations when fetching an instance from the database;
 - `autoFetchLimit` : (default: `1`) If `autoFetch` is enabled this defines how many hoops (associations of associations)
   you want it to automatically fetch.
 
@@ -514,18 +514,20 @@ db.driver.execQuery(
 )
 ```
 
-### Caching & Integrity
+### Identity pattern
+
+You can use the identity pattern (turned off by default). If enabled, multiple different queries will result in the same result - you will
+get the same object. If you have other systems that can change your database or you need to call some manual SQL queries,
+you shouldn't use this feature. It is also know to cause some problems with complex
+autofetch relationships. Use at your own risk.
 
-Model instances are cached. If multiple different queries will result in the same result, you will
-get the same object. If you have other systems that can change your database (or you're developing and need
-to make some manual changes) you should remove this feature by disabling cache. This can be done when you're
-defining the Model.
+It can be enabled/disabled per model:
 
 ```js
 var Person = db.define('person', {
-	name    : String
+	name          : String
 }, {
-	cache   : false
+	identityCache : true
 });
 ```
 
@@ -533,11 +535,11 @@ and also globally:
 
 ```js
 orm.connect('...', function(err, db) {
-  db.settings.set('instance.cache', false);
+  db.settings.set('instance.identityCache', true);
 });
 ```
 
-The cache can be configured to expire after a period of time by passing in a number instead of a
+The identity cache can be configured to expire after a period of time by passing in a number instead of a
 boolean. The number will be considered the cache timeout in seconds (you can use floating point).
 
 **Note**: One exception about Caching is that it won't be used if an instance is not saved. For example, if
diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index a6d42ac1..c08cc166 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -30,7 +30,7 @@ exports.prepare = function (db, Model, associations) {
 		}
 
 		var modelOpts = _.extend(
-			_.pick(opts, 'cache', 'autoSave', 'cascadeRemove', 'hooks', 'methods', 'validations'),
+			_.pick(opts, 'identityCache', 'autoSave', 'cascadeRemove', 'hooks', 'methods', 'validations'),
 			{
 				id        : Object.keys(association.field),
 				extension : true,
diff --git a/lib/LazyLoad.js b/lib/LazyLoad.js
index a9d0d9c8..cd4c7a58 100644
--- a/lib/LazyLoad.js
+++ b/lib/LazyLoad.js
@@ -14,7 +14,7 @@ function addLazyLoadProperty(name, Instance, Model, property) {
 			var conditions = {};
 			conditions[Model.id] = Instance[Model.id];
 
-			Model.find(conditions, { cache: false }).only(Model.id.concat(property)).first(function (err, item) {
+			Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
 				return cb(err, item ? item[property] : null);
 			});
 
@@ -27,7 +27,7 @@ function addLazyLoadProperty(name, Instance, Model, property) {
 			var conditions = {};
 			conditions[Model.id] = Instance[Model.id];
 
-			Model.find(conditions, { cache: false }).only(Model.id.concat(property)).first(function (err, item) {
+			Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
 				if (err) {
 					return cb(err);
 				}
@@ -49,7 +49,7 @@ function addLazyLoadProperty(name, Instance, Model, property) {
 			var conditions = {};
 			conditions[Model.id] = Instance[Model.id];
 
-			Model.find(conditions, { cache: false }).first(function (err, item) {
+			Model.find(conditions, { identityCache: false }).first(function (err, item) {
 				if (err) {
 					return cb(err);
 				}
diff --git a/lib/Model.js b/lib/Model.js
index c684c4d2..58966c40 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -298,8 +298,8 @@ function Model(opts) {
 			var uid = opts.driver.uid + "/" + opts.table + "/" + ids.join("/");
 
 			Singleton.get(uid, {
-				cache      : (options.hasOwnProperty("cache") ? options.cache : opts.cache),
-				save_check : opts.settings.get("instance.cacheSaveCheck")
+				identityCache : (options.hasOwnProperty("identityCache") ? options.identityCache : opts.identityCache),
+				saveCheck     : opts.settings.get("instance.identityCacheSaveCheck")
 			}, function (cb) {
 				return createInstance(data[0], {
 					uid            : uid,
@@ -365,8 +365,8 @@ function Model(opts) {
 			}
 		}
 
-		if (!options.hasOwnProperty("cache")) {
-			options.cache = opts.cache;
+		if (!options.hasOwnProperty("identityCache")) {
+			options.identityCache = opts.identityCache;
 		}
 		if (!options.hasOwnProperty("autoFetchLimit")) {
 			options.autoFetchLimit = opts.autoFetchLimit;
@@ -396,20 +396,20 @@ function Model(opts) {
 			properties   : allProperties,
 			keyProperties: keyProperties,
 			newInstance  : function (data, cb) {
-                                // We need to do the rename before we construct the UID & do the cache lookup
-                                // because the cache is loaded using propertyName rather than fieldName
-                                Utilities.renameDatastoreFieldsToPropertyNames(data, fieldToPropertyMap);
+				// We need to do the rename before we construct the UID & do the cache lookup
+				// because the cache is loaded using propertyName rather than fieldName
+				Utilities.renameDatastoreFieldsToPropertyNames(data, fieldToPropertyMap);
 
-                                // Construct UID
+				// Construct UID
 				var uid = opts.driver.uid + "/" + opts.table + (merge ? "+" + merge.from.table : "");
 				for (var i = 0; i < opts.keys.length; i++) {
 					uid += "/" + data[opts.keys[i]];
 				}
 
-                                // Now we can do the cache lookup
+				// Now we can do the cache lookup
 				Singleton.get(uid, {
-					cache      : options.cache,
-					save_check : opts.settings.get("instance.cacheSaveCheck")
+					identityCache : options.identityCache,
+					saveCheck     : opts.settings.get("instance.identityCacheSaveCheck")
 				}, function (cb) {
 					return createInstance(data, {
 						uid            : uid,
diff --git a/lib/ORM.js b/lib/ORM.js
index de819e38..254d32f0 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -231,7 +231,7 @@ ORM.prototype.define = function (name, properties, opts) {
 		properties     : properties,
 		extension      : opts.extension || false,
 		indexes        : opts.indexes || [],
-		cache          : opts.hasOwnProperty("cache") ? opts.cache : this.settings.get("instance.cache"),
+		identityCache       : opts.hasOwnProperty("identityCache") ? opts.identityCache : this.settings.get("instance.identityCache"),
 		keys           : opts.id,
 		autoSave       : opts.hasOwnProperty("autoSave") ? opts.autoSave : this.settings.get("instance.autoSave"),
 		autoFetch      : opts.hasOwnProperty("autoFetch") ? opts.autoFetch : this.settings.get("instance.autoFetch"),
diff --git a/lib/Settings.js b/lib/Settings.js
index 1fddd384..a67ab258 100644
--- a/lib/Settings.js
+++ b/lib/Settings.js
@@ -6,8 +6,8 @@ var default_settings = {
 		required                  : false
 	},
 	instance   : {
-		cache                     : true,
-		cacheSaveCheck            : true,
+		identityCache             : false,
+		identityCacheSaveCheck    : true,
 		autoSave                  : false,
 		autoFetch                 : false,
 		autoFetchLimit            : 1,
diff --git a/lib/Singleton.js b/lib/Singleton.js
index 6fbc5449..67e8507e 100644
--- a/lib/Singleton.js
+++ b/lib/Singleton.js
@@ -10,11 +10,11 @@ exports.clear = function (key) {
 };
 
 exports.get = function (key, opts, createCb, returnCb) {
-	if (opts && opts.cache === false) {
+	if (opts && opts.identityCache === false) {
 		return createCb(returnCb);
 	}
 	if (map.hasOwnProperty(key)) {
-		if (opts && opts.save_check && typeof map[key].o.saved === "function" && !map[key].o.saved()) {
+		if (opts && opts.saveCheck && typeof map[key].o.saved === "function" && !map[key].o.saved()) {
 			// if not saved, don't return it, fetch original from db
 			return createCb(returnCb);
 		} else if (map[key].t !== null && map[key].t <= Date.now()) {
@@ -29,7 +29,7 @@ exports.get = function (key, opts, createCb, returnCb) {
 
 		map[key] = { // object , timeout
 			o : value,
-			t : (opts && typeof opts.cache === "number" ? Date.now() + (opts.cache * 1000) : null)
+			t : (opts && typeof opts.identityCache === "number" ? Date.now() + (opts.identityCache * 1000) : null)
 		};
 		return returnCb(null, map[key].o);
 	});
diff --git a/lib/TypeScript/orm.d.ts b/lib/TypeScript/orm.d.ts
index 7ad22f86..941c5244 100644
--- a/lib/TypeScript/orm.d.ts
+++ b/lib/TypeScript/orm.d.ts
@@ -190,8 +190,8 @@ declare module "orm" {
         export class singleton {
             static clear(key?: string): singleton;
             static get(key, opts: {
-                cache?: any;
-                save_check?: boolean;
+                identityCache?: any;
+                saveCheck?: boolean;
             }, createCb: Function, returnCb: Function);
         }
 
@@ -206,8 +206,8 @@ declare module "orm" {
                 };
 
                 instance: {
-                    cache: boolean;
-                    cacheSaveCheck: boolean;
+                    identityCache: boolean;
+                    identityCacheSaveCheck: boolean;
                     autoSave: boolean;
                     autoFetch: boolean;
                     autoFetchLimit: number;
diff --git a/package.json b/package.json
index 0a5997ff..c9844df0 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.29",
+	"version"     : "3.0.0",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",
@@ -45,8 +45,8 @@
 	},
 	"devDependencies": {
 		"mysql"   : "2.9.0",
-		"pg"      : "4.3.0",
-		"sqlite3" : "3.0.5",
+		"pg"      : "4.4.3",
+		"sqlite3" : "3.1.0",
 		"async"   : "1.5.0",
 		"mocha"   : "2.3.3",
 		"should"  : "1.2.2",
diff --git a/test/integration/association-hasmany-extra.js b/test/integration/association-hasmany-extra.js
index 5ba99a98..5dcbeec2 100644
--- a/test/integration/association-hasmany-extra.js
+++ b/test/integration/association-hasmany-extra.js
@@ -10,7 +10,7 @@ describe("hasMany extra properties", function() {
 	var setup = function (opts) {
 		opts = opts || {};
 		return function (done) {
-			db.settings.set('instance.cache', false);
+			db.settings.set('instance.identityCache', false);
 
 			Person = db.define('person', {
 				name    : String,
diff --git a/test/integration/association-hasmany-hooks.js b/test/integration/association-hasmany-hooks.js
index 50b07e06..12b91709 100644
--- a/test/integration/association-hasmany-hooks.js
+++ b/test/integration/association-hasmany-hooks.js
@@ -9,7 +9,7 @@ describe("hasMany hooks", function() {
 
 	var setup = function (props, opts) {
 		return function (done) {
-			db.settings.set('instance.cache', false);
+			db.settings.set('instance.identityCache', false);
 
 			Person = db.define('person', {
 				name    : String,
diff --git a/test/integration/association-hasmany-mapsto.js b/test/integration/association-hasmany-mapsto.js
index 17aac332..755f33cb 100644
--- a/test/integration/association-hasmany-mapsto.js
+++ b/test/integration/association-hasmany-mapsto.js
@@ -26,7 +26,7 @@ describe("hasMany with mapsTo", function () {
 			opts = opts || {};
 
 			return function (done) {
-				db.settings.set('instance.cache', false);
+				db.settings.set('instance.identityCache', false);
 
 				Person = db.define('person', {
                                         id        : {type : "serial",  size:"8",    mapsTo: "personID", key:true},
diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
index 167d79d8..272a6882 100644
--- a/test/integration/association-hasmany.js
+++ b/test/integration/association-hasmany.js
@@ -24,7 +24,7 @@ describe("hasMany", function () {
 			opts = opts || {};
 
 			return function (done) {
-				db.settings.set('instance.cache', false);
+				db.settings.set('instance.identityCache', false);
 
 				Person = db.define('person', {
 					name    : String,
diff --git a/test/integration/association-hasone-required.js b/test/integration/association-hasone-required.js
index c5679236..2524b1cd 100644
--- a/test/integration/association-hasone-required.js
+++ b/test/integration/association-hasone-required.js
@@ -10,7 +10,7 @@ describe("hasOne", function() {
 
 	var setup = function (required) {
 		return function (done) {
-			db.settings.set('instance.cache', false);
+			db.settings.set('instance.identityCache', false);
 			db.settings.set('instance.returnAllErrors', true);
 
 			Person = db.define('person', {
diff --git a/test/integration/association-hasone-reverse.js b/test/integration/association-hasone-reverse.js
index 2dea61c1..19fb9b37 100644
--- a/test/integration/association-hasone-reverse.js
+++ b/test/integration/association-hasone-reverse.js
@@ -153,7 +153,11 @@ describe("hasOne", function () {
 
 		it("should be able to set an array of people as the owner", function (done) {
 			Person.find({ name: ["John Doe", "Jane Doe"] }, function (err, owners) {
+				should.not.exist(err);
+
 				Pet.find({ name: "Fido" }).first(function (err, Fido) {
+					should.not.exist(err);
+
 					Fido.hasOwners(function (err, has_owner) {
 						should.not.exist(err);
 						has_owner.should.be.false;
@@ -166,7 +170,10 @@ describe("hasOne", function () {
 								should(Array.isArray(owners));
 								owners.length.should.equal(2);
 
-								if (owners[0] == ownersCopy[0]) {
+								// Don't know which order they'll be in.
+								var idProp = common.protocol() == 'mongodb' ? '_id' : 'id'
+
+								if (owners[0][idProp] == ownersCopy[0][idProp]) {
 									owners[0].should.eql(ownersCopy[0]);
 									owners[1].should.eql(ownersCopy[1]);
 								} else {
diff --git a/test/integration/association-hasone-zeroid.js b/test/integration/association-hasone-zeroid.js
index 4c64cc3f..549be7f9 100644
--- a/test/integration/association-hasone-zeroid.js
+++ b/test/integration/association-hasone-zeroid.js
@@ -11,7 +11,7 @@ describe("hasOne", function() {
 
 	var setup = function (autoFetch) {
 		return function (done) {
-			db.settings.set('instance.cache', false);
+			db.settings.set('instance.identityCache', false);
 			db.settings.set('instance.returnAllErrors', true);
 
 			Person = db.define('person', {
diff --git a/test/integration/association-hasone.js b/test/integration/association-hasone.js
index 91226471..a61f477c 100644
--- a/test/integration/association-hasone.js
+++ b/test/integration/association-hasone.js
@@ -19,7 +19,7 @@ describe("hasOne", function() {
 	var setup = function (opts) {
 		opts = opts || {};
 		return function (done) {
-			db.settings.set('instance.cache', false);
+			db.settings.set('instance.identityCache', false);
 			db.settings.set('instance.returnAllErrors', true);
 			Tree  = db.define("tree",   { type:   { type: 'text'    } });
 			Stalk = db.define("stalk",  { length: { type: 'integer' } });
@@ -295,7 +295,7 @@ describe("hasOne", function() {
 
 	describe("if not passing another Model", function () {
 		it("should use same model", function (done) {
-			db.settings.set('instance.cache', false);
+			db.settings.set('instance.identityCache', false);
 			db.settings.set('instance.returnAllErrors', true);
 
 			var Person = db.define("person", {
@@ -320,7 +320,7 @@ describe("hasOne", function() {
 
 	describe("association name letter case", function () {
 		it("should be kept", function (done) {
-			db.settings.set('instance.cache', false);
+			db.settings.set('instance.identityCache', false);
 			db.settings.set('instance.returnAllErrors', true);
 
 			var Person = db.define("person", {
diff --git a/test/integration/hook.js b/test/integration/hook.js
index 28c80700..bd570bea 100644
--- a/test/integration/hook.js
+++ b/test/integration/hook.js
@@ -157,7 +157,7 @@ describe("Hook", function() {
 					items[0].name.should.equal("Jane Doe");
 
 					// ensure it was really saved
-					Person.find({ name: "Hook Worked" }, { cache: false }, 1, function (err, people) {
+					Person.find({ name: "Hook Worked" }, { identityCache: false }, 1, function (err, people) {
 						should.not.exist(err);
 						should(Array.isArray(people));
 
@@ -252,7 +252,7 @@ describe("Hook", function() {
 		        should.equal(people[0].name, "Hook Worked");
 
 				// garantee it was correctly saved on database
-				Person.find({ name: "Hook Worked" }, { cache: false }, 1, function (err, people) {
+				Person.find({ name: "Hook Worked" }, { identityCache: false }, 1, function (err, people) {
 					should.not.exist(err);
 					should(Array.isArray(people));
 
diff --git a/test/integration/instance.js b/test/integration/instance.js
index 72fe54ec..1c45382a 100644
--- a/test/integration/instance.js
+++ b/test/integration/instance.js
@@ -19,7 +19,7 @@ describe("Model instance", function() {
 				weight : { type: 'number',  required: false },
 				data   : { type: 'object',  required: false }
 			}, {
-				cache: false,
+				identityCache: false,
 				validations: {
 					age: ORM.validators.rangeNumber(0, 150)
 				}
@@ -65,7 +65,7 @@ describe("Model instance", function() {
 			item = db.define("item", {
 				name      : String
 			}, {
-				cache     : false
+				identityCache  : false
 			});
 			item.hasOne("main_item", main_item, {
 				reverse   : "items",
diff --git a/test/integration/model-find-chain.js b/test/integration/model-find-chain.js
index 7a0083c9..6b31ccc0 100644
--- a/test/integration/model-find-chain.js
+++ b/test/integration/model-find-chain.js
@@ -21,7 +21,7 @@ describe("Model.find() chaining", function() {
 			Person.hasMany("parents");
 			Person.hasOne("friend");
 
-			ORM.singleton.clear(); // clear cache
+			ORM.singleton.clear(); // clear identityCache cache
 
 			return helper.dropSync(Person, function () {
 				Person.create([{
@@ -52,7 +52,7 @@ describe("Model.find() chaining", function() {
 			Dog.hasMany("friends");
 			Dog.hasMany("family");
 
-			ORM.singleton.clear(); // clear cache
+			ORM.singleton.clear(); // clear identityCache cache
 
 			return helper.dropSync(Dog, function () {
 				Dog.create([{
diff --git a/test/integration/model-find-mapsto.js b/test/integration/model-find-mapsto.js
index ed589b96..24c3a8f6 100644
--- a/test/integration/model-find-mapsto.js
+++ b/test/integration/model-find-mapsto.js
@@ -9,13 +9,13 @@ describe("Model.pkMapTo.find()", function() {
 	var setup = function () {
 		return function (done) {
 
-                  // The fact that we've applied mapsTo to the key
-                  // property of the model - will break the cache.
+			// The fact that we've applied mapsTo to the key
+			// property of the model - will break the cache.
 
-                  // Without Stuart's little bugfix, 2nd (and subsequent) calls to find()
-                  // will return the repeats of the first obect retrieved and placed in the cache.
+			// Without Stuart's little bugfix, 2nd (and subsequent) calls to find()
+			// will return the repeats of the first obect retrieved and placed in the cache.
 			Person = db.define("person", {
-	                        personId : {type : "integer", key: true,   mapsTo: "id"},
+				personId : {type : "integer", key: true,   mapsTo: "id"},
 				name     : String,
 				surname  : String,
 				age      : Number,
@@ -24,31 +24,31 @@ describe("Model.pkMapTo.find()", function() {
 
 			return helper.dropSync(Person, function () {
 				Person.create([{
-                                        personId: 1001,
+					personId: 1001,
 					name    : "John",
 					surname : "Doe",
 					age     : 18,
 					male    : true
 				}, {
-                                        personId: 1002,
+					personId: 1002,
 					name    : "Jane",
 					surname : "Doe",
 					age     : 16,
 					male    : false
 				}, {
-                                        personId: 1003,
+					personId: 1003,
 					name    : "Jeremy",
 					surname : "Dean",
 					age     : 18,
 					male    : true
 				}, {
-                                        personId: 1004,
+					personId: 1004,
 					name    : "Jack",
 					surname : "Dean",
 					age     : 20,
 					male    : true
 				}, {
-                                        personId: 1005,
+					personId: 1005,
 					name    : "Jasmine",
 					surname : "Doe",
 					age     : 20,
diff --git a/test/integration/model-find.js b/test/integration/model-find.js
index e1f7bab2..f3edff08 100644
--- a/test/integration/model-find.js
+++ b/test/integration/model-find.js
@@ -299,9 +299,9 @@ describe("Model.find()", function() {
 		});
 	});
 
-	describe("with cache disabled", function () {
+	describe("with identityCache disabled", function () {
 		it("should not return singletons", function (done) {
-			Person.find({ name: "Jasmine" }, { cache: false }, function (err, people) {
+			Person.find({ name: "Jasmine" }, { identityCache: false }, function (err, people) {
 				should.not.exist(err);
 				people.should.be.a("object");
 				people.should.have.property("length", 1);
@@ -310,7 +310,7 @@ describe("Model.find()", function() {
 
 				people[0].surname = "Dux";
 
-				Person.find({ name: "Jasmine" }, { cache: false }, function (err, people) {
+				Person.find({ name: "Jasmine" }, { identityCache: false }, function (err, people) {
 					should.not.exist(err);
 					people.should.be.a("object");
 					people.should.have.property("length", 1);
diff --git a/test/integration/model-get.js b/test/integration/model-get.js
index 5ec7d08e..4ff195c7 100644
--- a/test/integration/model-get.js
+++ b/test/integration/model-get.js
@@ -10,20 +10,20 @@ describe("Model.get()", function() {
 	var Person = null;
 	var John;
 
-	var setup = function (cache) {
+	var setup = function (identityCache) {
 		return function (done) {
 			Person = db.define("person", {
-				name   : { type: 'text', mapsTo: 'fullname' }
+				name     : { type: 'text', mapsTo: 'fullname' }
 			}, {
-				cache  : cache,
-				methods: {
+				identityCache : identityCache,
+				methods  : {
 					UID: function () {
 						return this[Person.id];
 					}
 				}
 			});
 
-			ORM.singleton.clear(); // clear cache
+			ORM.singleton.clear(); // clear identityCache cache
 
 			return helper.dropSync(Person, function () {
 				Person.create([{
@@ -78,7 +78,7 @@ describe("Model.get()", function() {
 		});
 	});
 
-	describe("with cache", function () {
+	describe("with identityCache cache", function () {
 		before(setup(true));
 
 		it("should return item with id 1", function (done) {
@@ -123,9 +123,9 @@ describe("Model.get()", function() {
 			});
 		});
 
-		describe("changing instance.cacheSaveCheck = false", function () {
+		describe("changing instance.identityCacheSaveCheck = false", function () {
 			before(function (done) {
-				Person.settings.set("instance.cacheSaveCheck", false);
+				Person.settings.set("instance.identityCacheSaveCheck", false);
 
 				it("should return the same object with the changed name", function (done) {
 					Person.get(John[Person.id], function (err, John1) {
@@ -147,7 +147,7 @@ describe("Model.get()", function() {
 		});
 	});
 
-	describe("with no cache", function () {
+	describe("with no identityCache cache", function () {
 		before(setup(false));
 
 		describe("fetching several times", function () {
@@ -167,7 +167,7 @@ describe("Model.get()", function() {
 		});
 	});
 
-	describe("with cache = 0.5 secs", function () {
+	describe("with identityCache cache = 0.5 secs", function () {
 		before(setup(0.5));
 
 		describe("fetching again after 0.2 secs", function () {
diff --git a/test/integration/property-maps-to.js b/test/integration/property-maps-to.js
index 20f53673..849e3ac6 100644
--- a/test/integration/property-maps-to.js
+++ b/test/integration/property-maps-to.js
@@ -12,7 +12,7 @@ describe("Property.mapsTo", function() {
 	before(function (done) {
 		helper.connect(function (connection) {
 			db = connection;
-			db.settings.set('instance.cache', false);
+			db.settings.set('instance.identityCache', false);
 
 			return done();
 		});
diff --git a/test/integration/property-timezones.js b/test/integration/property-timezones.js
index 31469d3e..94491234 100644
--- a/test/integration/property-timezones.js
+++ b/test/integration/property-timezones.js
@@ -19,7 +19,7 @@ describe("Timezones", function() {
 		return function (done) {
 			helper.connect({ query: opts.query }, function (connection) {
 				db = connection;
-				db.settings.set('instance.cache', false);
+				db.settings.set('instance.identityCache', false);
 
 				Event = db.define("event", {
 					name : { type: 'text' },
diff --git a/test/mocha.opts b/test/mocha.opts
index 5ada47be..c807f3b3 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1 +1,2 @@
 --reporter spec
+--timeout 5000

From 43986463262b37e5af08cb953bafee6949d9d904 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 3 May 2016 11:37:59 +1000
Subject: [PATCH 1078/1246] Update readme

---
 Readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Readme.md b/Readme.md
index 027a14dc..95ded10a 100755
--- a/Readme.md
+++ b/Readme.md
@@ -13,9 +13,9 @@ npm install orm
 
 ## Node.js Version Support
 
-Supported: 0.8, 0.10, 0.12, iojs-1.5
+Supported: 0.12 - 4.0 +
 
-Tests are run on [Travis CI](https://travis-ci.org/) for node versions `0.10.x`, `0.12.x` and `iojs-1.5`.
+Tests are run on [Travis CI](https://travis-ci.org/)
 If you want you can run tests locally:
 
 ```sh

From 4b8e98a39070480c20d5278e104aeedb68cd628b Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 3 May 2016 12:05:08 +1000
Subject: [PATCH 1079/1246] Detail potentially breaking change in v3

---
 Changelog.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 7127fad8..958064f8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,20 @@
 ### v3.0.0
 - Rename cache -> identityCache & disabled by default (#350, #564, #626, #672, #684, #694, #721)
 
+**This is a potentially breaking change:**
+```js
+User.get(14, (err, userA) =>
+  User.get(14, (err, userB) =>
+    // v2
+    userA    == userB
+    userA.id == userB.id
+    // v3
+    userA    != userB
+    userA.id == userB.id
+  )
+)
+```
+
 ### v2.1.29
 - Fix hasOne association when ID is 0 (#681)
 - Fix global var leak (#682)

From 0376b7afb52ec9e0b1f9b97e59f8de0406d53a82 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 3 May 2016 12:08:04 +1000
Subject: [PATCH 1080/1246] Make it clearer

---
 Changelog.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 958064f8..7e615356 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,5 @@
 ### v3.0.0
-- Rename cache -> identityCache & disabled by default (#350, #564, #626, #672, #684, #694, #721)
+- Rename `cache` -> `identityCache` and **disable by default** (#350, #564, #626, #672, #684, #694, #721)
 
 **This is a potentially breaking change:**
 ```js
@@ -8,7 +8,7 @@ User.get(14, (err, userA) =>
     // v2
     userA    == userB
     userA.id == userB.id
-    // v3
+    // v3, identity cache is now disabled by default
     userA    != userB
     userA.id == userB.id
   )

From 4d3ad7d9d32574fe6591eba5d57fc6274f2a7309 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 3 May 2016 14:16:01 +1000
Subject: [PATCH 1081/1246] Update packages

---
 lib/ChainFind.js                              |  2 +-
 lib/Model.js                                  |  2 +-
 lib/Settings.js                               |  8 ++-
 package.json                                  | 18 +++----
 test/integration/association-extend.js        | 16 +++---
 test/integration/association-hasmany-extra.js |  2 +-
 test/integration/association-hasmany-hooks.js |  2 +-
 .../integration/association-hasmany-mapsto.js | 12 ++---
 test/integration/association-hasmany.js       | 10 ++--
 .../integration/association-hasone-reverse.js | 16 +++---
 test/integration/association-hasone.js        |  8 +--
 test/integration/event.js                     |  2 +-
 test/integration/hook.js                      | 50 +++++++++----------
 test/integration/model-aggregate.js           | 16 +++---
 test/integration/model-find-chain.js          | 18 +++----
 test/integration/model-find-mapsto.js         |  4 +-
 test/integration/model-find.js                | 40 +++++++--------
 test/integration/model-get.js                 | 12 ++---
 test/integration/orm-exports.js               | 36 ++++++-------
 test/integration/predefined-validators.js     |  2 +-
 test/integration/property-lazyload.js         | 20 ++++----
 test/integration/property-maps-to.js          |  4 +-
 test/integration/property-number-size.js      |  6 +--
 test/integration/settings.js                  |  4 +-
 test/integration/validation.js                | 12 ++---
 test/run.js                                   |  4 +-
 test/support/my_plugin.js                     |  6 +--
 27 files changed, 170 insertions(+), 162 deletions(-)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index f4a5cbaa..af0a3da3 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -102,7 +102,7 @@ function ChainFind(Model, opts) {
 			return this;
 		},
 		remove: function (cb) {
-			var keys = _.pluck(opts.keyProperties, 'mapsTo');
+			var keys = _.map(opts.keyProperties, 'mapsTo');
 
 			opts.driver.find(keys, opts.table, prepareConditions(), {
 				limit  : opts.limit,
diff --git a/lib/Model.js b/lib/Model.js
index 58966c40..8863c647 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -707,7 +707,7 @@ function Model(opts) {
 	}
 
 	// If no keys are defined add the default one
-	if (opts.keys.length == 0 && !_.any(opts.properties, { key: true })) {
+	if (opts.keys.length == 0 && !_.some(opts.properties, { key: true })) {
 		opts.properties[opts.settings.get("properties.primary_key")] = {
 			type: 'serial', key: true, required: false, klass: 'primary'
 		};
diff --git a/lib/Settings.js b/lib/Settings.js
index a67ab258..853a202c 100644
--- a/lib/Settings.js
+++ b/lib/Settings.js
@@ -41,7 +41,13 @@ function Settings(settings) {
 			return this;
 		},
 		get: function (key, def) {
-			return _.cloneDeep(get(key, def, settings));
+			var v = get(key, def, settings)
+
+			if (v instanceof Function) {
+				return v;
+			} else {
+				return _.cloneDeep(v);
+			}
 		},
 		unset: function () {
 			for (var i = 0; i < arguments.length; i++) {
diff --git a/package.json b/package.json
index c9844df0..d2e64341 100644
--- a/package.json
+++ b/package.json
@@ -40,18 +40,18 @@
 		"sql-query"        : "0.1.26",
 		"sql-ddl-sync"     : "0.3.11",
 		"hat"              : "0.0.3",
-		"lodash"           : "2.4.1",
+		"lodash"           : "4.11.2",
 		"path-is-absolute" : "1.0.0"
 	},
 	"devDependencies": {
-		"mysql"   : "2.9.0",
-		"pg"      : "4.4.3",
-		"sqlite3" : "3.1.0",
-		"async"   : "1.5.0",
-		"mocha"   : "2.3.3",
-		"should"  : "1.2.2",
-		"mongodb" : "1.3.19",
-		"glob"    : "5.0.15"
+		"mysql"   : "2.10.2",
+		"pg"      : "4.5.5",
+		"sqlite3" : "3.1.3",
+		"async"   : "1.5.2",
+		"mocha"   : "2.4.5",
+		"should"  : "8.3.1",
+		"mongodb" : "1.4.10",
+		"glob"    : "7.0.3"
 	},
 	"optionalDependencies": {}
 }
diff --git a/test/integration/association-extend.js b/test/integration/association-extend.js
index a14f91e5..9fe36f28 100644
--- a/test/integration/association-extend.js
+++ b/test/integration/association-extend.js
@@ -68,7 +68,7 @@ describe("Model.extendsTo()", function() {
 
 				John.removeAddress(function () {
 					John.hasAddress(function (err, hasAddress) {
-						err.should.be.a("object");
+						err.should.be.a.Object();
 						hasAddress.should.equal(false);
 
 						return done();
@@ -82,7 +82,7 @@ describe("Model.extendsTo()", function() {
 				name: "Jane"
 			});
 			Jane.hasAddress(function (err, hasAddress) {
-				err.should.be.a("object");
+				err.should.be.a.Object();
 				err.should.have.property("code", ORM.ErrorCodes.NOT_DEFINED);
 
 				return done();
@@ -99,7 +99,7 @@ describe("Model.extendsTo()", function() {
 
 				John.getAddress(function (err, Address) {
 					should.equal(err, null);
-					Address.should.be.a("object");
+					Address.should.be.a.Object();
 					Address.should.have.property("street", "Liberty");
 
 					return done();
@@ -113,7 +113,7 @@ describe("Model.extendsTo()", function() {
 
 				John.removeAddress(function () {
 					John.getAddress(function (err, Address) {
-						err.should.be.a("object");
+						err.should.be.a.Object();
 						err.should.have.property("code", ORM.ErrorCodes.NOT_FOUND);
 
 						return done();
@@ -127,7 +127,7 @@ describe("Model.extendsTo()", function() {
 				name: "Jane"
 			});
 			Jane.getAddress(function (err, Address) {
-				err.should.be.a("object");
+				err.should.be.a.Object();
 				err.should.have.property("code", ORM.ErrorCodes.NOT_DEFINED);
 
 				return done();
@@ -156,7 +156,7 @@ describe("Model.extendsTo()", function() {
 
 						John.getAddress(function (err, Address) {
 							should.equal(err, null);
-							Address.should.be.a("object");
+							Address.should.be.a.Object();
 							Address.should.have.property("street", addr.street);
 
 							PersonAddress.find({ number: 123 }).count(function (err, c) {
@@ -207,7 +207,7 @@ describe("Model.extendsTo()", function() {
 				name: "Jane"
 			});
 			Jane.removeAddress(function (err) {
-				err.should.be.a("object");
+				err.should.be.a.Object();
 				err.should.have.property("code", ORM.ErrorCodes.NOT_DEFINED);
 
 				return done();
@@ -242,7 +242,7 @@ describe("Model.extendsTo()", function() {
 			var ChainFind = Person.findByAddress({
 				number: 123
 			});
-			ChainFind.run.should.be.a("function");
+			ChainFind.run.should.be.a.Function();
 
 			return done();
 		});
diff --git a/test/integration/association-hasmany-extra.js b/test/integration/association-hasmany-extra.js
index 5dcbeec2..7d204680 100644
--- a/test/integration/association-hasmany-extra.js
+++ b/test/integration/association-hasmany-extra.js
@@ -63,7 +63,7 @@ describe("hasMany extra properties", function() {
 
 							John.pets[0].should.have.property("name");
 							John.pets[0].should.have.property("extra");
-							John.pets[0].extra.should.be.a("object");
+							John.pets[0].extra.should.be.a.Object();
 							John.pets[0].extra.should.have.property("since");
 							should(John.pets[0].extra.since instanceof Date);
 
diff --git a/test/integration/association-hasmany-hooks.js b/test/integration/association-hasmany-hooks.js
index 12b91709..7dba2dd3 100644
--- a/test/integration/association-hasmany-hooks.js
+++ b/test/integration/association-hasmany-hooks.js
@@ -69,7 +69,7 @@ describe("hasMany hooks", function() {
 		before(setup({}, {
 			hooks : {
 				beforeSave: function (next) {
-					next.should.be.a("function");
+					next.should.be.a.Function();
 					return next();
 				}
 			}
diff --git a/test/integration/association-hasmany-mapsto.js b/test/integration/association-hasmany-mapsto.js
index 755f33cb..ff307be9 100644
--- a/test/integration/association-hasmany-mapsto.js
+++ b/test/integration/association-hasmany-mapsto.js
@@ -89,7 +89,7 @@ describe("hasMany with mapsTo", function () {
 				Person.find({ firstName: "John" }).first(function (err, John) {
 					should.equal(err, null);
 
-					John.should.not.have.property("pets");
+					should.equal(John.pets, null);
 					return done();
 				});
 			});
@@ -177,11 +177,11 @@ describe("hasMany with mapsTo", function () {
 
 					var chain = people[0].getPets({ firstName: "Mutt" });
 
-					chain.should.be.a("object");
-					chain.find.should.be.a("function");
-					chain.only.should.be.a("function");
-					chain.limit.should.be.a("function");
-					chain.order.should.be.a("function");
+					chain.should.be.a.Object();
+					chain.find.should.be.a.Function();
+					chain.only.should.be.a.Function();
+					chain.limit.should.be.a.Function();
+					chain.order.should.be.a.Function();
 
 					return done();
 				});
diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
index 272a6882..c00892bb 100644
--- a/test/integration/association-hasmany.js
+++ b/test/integration/association-hasmany.js
@@ -158,11 +158,11 @@ describe("hasMany", function () {
 
 					var chain = people[0].getPets({ name: "Mutt" });
 
-					chain.should.be.a("object");
-					chain.find.should.be.a("function");
-					chain.only.should.be.a("function");
-					chain.limit.should.be.a("function");
-					chain.order.should.be.a("function");
+					chain.should.be.a.Object();
+					chain.find.should.be.a.Function();
+					chain.only.should.be.a.Function();
+					chain.limit.should.be.a.Function();
+					chain.order.should.be.a.Function();
 
 					return done();
 				});
diff --git a/test/integration/association-hasone-reverse.js b/test/integration/association-hasone-reverse.js
index 19fb9b37..6067f811 100644
--- a/test/integration/association-hasone-reverse.js
+++ b/test/integration/association-hasone-reverse.js
@@ -57,14 +57,14 @@ describe("hasOne", function () {
 			var person = Person(1);
 			var pet = Pet(1);
 
-			person.getPet.should.be.a("function");
-			person.setPet.should.be.a("function");
-			person.removePet.should.be.a("function");
-			person.hasPet.should.be.a("function");
+			person.getPet.should.be.a.Function();
+			person.setPet.should.be.a.Function();
+			person.removePet.should.be.a.Function();
+			person.hasPet.should.be.a.Function();
 
-			pet.getOwners.should.be.a("function");
-			pet.setOwners.should.be.a("function");
-			pet.hasOwners.should.be.a("function");
+			pet.getOwners.should.be.a.Function();
+			pet.setOwners.should.be.a.Function();
+			pet.hasOwners.should.be.a.Function();
 
 			return done();
 		});
@@ -234,7 +234,7 @@ describe("hasOne", function () {
 					var ChainFind = Pet.findByOwners({
 						name: "John Doe"
 					});
-					ChainFind.run.should.be.a("function");
+					ChainFind.run.should.be.a.Function();
 
 					return done();
 				});
diff --git a/test/integration/association-hasone.js b/test/integration/association-hasone.js
index a61f477c..1329c876 100644
--- a/test/integration/association-hasone.js
+++ b/test/integration/association-hasone.js
@@ -337,9 +337,9 @@ describe("hasOne", function() {
 					Person.get(person[Person.id], function (err, person) {
 						should.equal(err, null);
 
-						person.setTopParent.should.be.a("function");
-						person.removeTopParent.should.be.a("function");
-						person.hasTopParent.should.be.a("function");
+						person.setTopParent.should.be.a.Function();
+						person.removeTopParent.should.be.a.Function();
+						person.hasTopParent.should.be.a.Function();
 
 						return done();
 					});
@@ -375,7 +375,7 @@ describe("hasOne", function() {
 			var ChainFind = Leaf.findByTree({
 				type: "pine"
 			});
-			ChainFind.run.should.be.a("function");
+			ChainFind.run.should.be.a.Function();
 
 			return done();
 		});
diff --git a/test/integration/event.js b/test/integration/event.js
index f14c4830..fea1307d 100644
--- a/test/integration/event.js
+++ b/test/integration/event.js
@@ -67,7 +67,7 @@ describe("Event", function() {
 			John.on("save", function (err) {
 				triggered = true;
 
-				err.should.be.a("object");
+				err.should.be.a.Object();
 				err.should.have.property("msg", "required");
 			});
 
diff --git a/test/integration/hook.js b/test/integration/hook.js
index bd570bea..9daf5110 100644
--- a/test/integration/hook.js
+++ b/test/integration/hook.js
@@ -111,8 +111,8 @@ describe("Hook", function() {
 
 		it("should trigger before creating instance", function (done) {
 			Person.create([{ name: "John Doe" }], function () {
-				triggeredHooks.afterCreate.should.be.a("number");
-				triggeredHooks.beforeCreate.should.be.a("number");
+				triggeredHooks.afterCreate.should.be.a.Number();
+				triggeredHooks.beforeCreate.should.be.a.Number();
 				triggeredHooks.beforeCreate.should.not.be.above(triggeredHooks.afterCreate);
 
 				return done();
@@ -152,7 +152,7 @@ describe("Hook", function() {
 				Person.create([{ }], function (err, items) {
 					should.equal(err, null);
 
-					items.should.be.a("object");
+					items.should.be.a.Object();
 					items.should.have.property("length", 1);
 					items[0].name.should.equal("Jane Doe");
 
@@ -203,7 +203,7 @@ describe("Hook", function() {
 					this.timeout(500);
 
 					Person.create([{ name: "John Doe" }], function (err) {
-						err.should.be.a("object");
+						err.should.be.a.Object();
 						err.message.should.equal("beforeCreate-error");
 
 						return done();
@@ -218,8 +218,8 @@ describe("Hook", function() {
 
 		it("should trigger after creating instance", function (done) {
 			Person.create([{ name: "John Doe" }], function () {
-				triggeredHooks.afterCreate.should.be.a("number");
-				triggeredHooks.beforeCreate.should.be.a("number");
+				triggeredHooks.afterCreate.should.be.a.Number();
+				triggeredHooks.beforeCreate.should.be.a.Number();
 				triggeredHooks.afterCreate.should.not.be.below(triggeredHooks.beforeCreate);
 
 				return done();
@@ -232,8 +232,8 @@ describe("Hook", function() {
 
 		it("should trigger before saving an instance", function (done) {
 			Person.create([{ name: "John Doe" }], function () {
-				triggeredHooks.afterSave.should.be.a("number");
-				triggeredHooks.beforeSave.should.be.a("number");
+				triggeredHooks.afterSave.should.be.a.Number();
+				triggeredHooks.beforeSave.should.be.a.Number();
 				triggeredHooks.beforeSave.should.not.be.above(triggeredHooks.afterSave);
 
 				return done();
@@ -272,7 +272,7 @@ describe("Hook", function() {
 				Person.create([{ }], function (err, items) {
 					should.equal(err, null);
 
-					items.should.be.a("object");
+					items.should.be.a.Object();
 					items.should.have.property("length", 1);
 					items[0].name.should.equal("Jane Doe");
 
@@ -327,7 +327,7 @@ describe("Hook", function() {
 					this.timeout(500);
 
 					Person.create([{ name: "Jane Doe" }], function (err) {
-						err.should.be.a("object");
+						err.should.be.a.Object();
 						err.message.should.equal("beforeSave-error");
 
 						return done();
@@ -342,7 +342,7 @@ describe("Hook", function() {
 
 						John[0].name = "Jane Doe";
 						John[0].save(function (err) {
-							err.should.be.a("object");
+							err.should.be.a.Object();
 							err.message.should.equal("beforeSave-error");
 
 							return done();
@@ -360,8 +360,8 @@ describe("Hook", function() {
 			Person.create({ name: "John Doe" }, function (err, john) {
 				should.not.exist(err);
 
-				triggeredHooks.afterSave.should.be.a("number");
-				triggeredHooks.beforeSave.should.be.a("number");
+				triggeredHooks.afterSave.should.be.a.Number();
+				triggeredHooks.beforeSave.should.be.a.Number();
 				triggeredHooks.afterSave.should.not.be.below(triggeredHooks.beforeSave);
 				done();
 			});
@@ -375,8 +375,8 @@ describe("Hook", function() {
 
 				triggeredHooks = {};
 				john.save(function (err) {
-					triggeredHooks.afterSave.should.be.a("number");
-					triggeredHooks.beforeSave.should.be.a("number");
+					triggeredHooks.afterSave.should.be.a.Number();
+					triggeredHooks.beforeSave.should.be.a.Number();
 					triggeredHooks.afterSave.should.not.be.below(triggeredHooks.beforeSave);
 					done();
 				});
@@ -402,9 +402,9 @@ describe("Hook", function() {
 
 		it("should trigger before instance validation", function (done) {
 			Person.create([{ name: "John Doe" }], function () {
-				triggeredHooks.beforeValidation.should.be.a("number");
-				triggeredHooks.beforeCreate.should.be.a("number");
-				triggeredHooks.beforeSave.should.be.a("number");
+				triggeredHooks.beforeValidation.should.be.a.Number();
+				triggeredHooks.beforeCreate.should.be.a.Number();
+				triggeredHooks.beforeSave.should.be.a.Number();
 				triggeredHooks.beforeValidation.should.not.be.above(triggeredHooks.beforeCreate);
 				triggeredHooks.beforeValidation.should.not.be.above(triggeredHooks.beforeSave);
 
@@ -605,8 +605,8 @@ describe("Hook", function() {
 		it("should trigger before removing an instance", function (done) {
 			Person.create([{ name: "John Doe" }], function (err, items) {
 				items[0].remove(function () {
-					triggeredHooks.afterRemove.should.be.a("number");
-					triggeredHooks.beforeRemove.should.be.a("number");
+					triggeredHooks.afterRemove.should.be.a.Number();
+					triggeredHooks.beforeRemove.should.be.a.Number();
 					triggeredHooks.beforeRemove.should.not.be.above(triggeredHooks.afterRemove);
 
 					return done();
@@ -654,7 +654,7 @@ describe("Hook", function() {
 
 					Person.create([{ name: "John Doe" }], function (err, items) {
 						items[0].remove(function (err) {
-							err.should.be.a("object");
+							err.should.be.a.Object();
 							err.message.should.equal("beforeRemove-error");
 
 							return done();
@@ -671,8 +671,8 @@ describe("Hook", function() {
 		it("should trigger after removing an instance", function (done) {
 			Person.create([{ name: "John Doe" }], function (err, items) {
 				items[0].remove(function () {
-					triggeredHooks.afterRemove.should.be.a("number");
-					triggeredHooks.beforeRemove.should.be.a("number");
+					triggeredHooks.afterRemove.should.be.a.Number();
+					triggeredHooks.beforeRemove.should.be.a.Number();
 					triggeredHooks.afterRemove.should.not.be.below(triggeredHooks.beforeRemove);
 
 					return done();
@@ -702,13 +702,13 @@ describe("Hook", function() {
 			Person.create({ name : "John", surname : "Doe" }, function (err, John) {
 				should.equal(err, null);
 
-				triggeredHooks.afterSave.should.be.a("number");
+				triggeredHooks.afterSave.should.be.a.Number();
 				triggeredHooks.afterSave = false;
 
 				John.surname = "Dean";
 
 				setTimeout(function () {
-					triggeredHooks.afterSave.should.be.a("number");
+					triggeredHooks.afterSave.should.be.a.Number();
 
 					return done();
 				}, 200);
diff --git a/test/integration/model-aggregate.js b/test/integration/model-aggregate.js
index 1289b213..7851188e 100644
--- a/test/integration/model-aggregate.js
+++ b/test/integration/model-aggregate.js
@@ -125,7 +125,7 @@ describe("Model.aggregate()", function() {
 				should(Array.isArray(people));
 				people.length.should.be.above(0);
 
-				people[0].should.be.a("object");
+				people[0].should.be.a.Object();
 				people[0].should.have.property("id");
 				people[0].should.not.have.property("name");
 
@@ -140,7 +140,7 @@ describe("Model.aggregate()", function() {
 				should(Array.isArray(people));
 				people.length.should.be.above(0);
 
-				people[0].should.be.a("object");
+				people[0].should.be.a.Object();
 				people[0].should.have.property("id");
 				people[0].should.not.have.property("name");
 
@@ -178,7 +178,7 @@ describe("Model.aggregate()", function() {
 			Person.aggregate().distinct('name').get(function (err, names) {
 				should.equal(err, null);
 
-				names.should.be.a("object");
+				names.should.be.a.Object();
 				names.should.have.property("length", 2);
 
 				return done();
@@ -190,7 +190,7 @@ describe("Model.aggregate()", function() {
 				Person.aggregate().distinct('name').limit(1).order("name").get(function (err, names) {
 					should.equal(err, null);
 
-					names.should.be.a("object");
+					names.should.be.a.Object();
 					names.should.have.property("length", 1);
 					names[0].should.equal("Jane Doe");
 
@@ -204,7 +204,7 @@ describe("Model.aggregate()", function() {
 				Person.aggregate().distinct('name').limit(1, 1).order("name").get(function (err, names) {
 					should.equal(err, null);
 
-					names.should.be.a("object");
+					names.should.be.a.Object();
 					names.should.have.property("length", 1);
 					names[0].should.equal("John Doe");
 
@@ -221,7 +221,7 @@ describe("Model.aggregate()", function() {
 			Person.aggregate().count().groupBy('name').get(function (err, rows) {
 				should.equal(err, null);
 
-				rows.should.be.a("object");
+				rows.should.be.a.Object();
 				rows.should.have.property("length", 2);
 
 				(rows[0].count + rows[1].count).should.equal(3); // 1 + 2
@@ -237,7 +237,7 @@ describe("Model.aggregate()", function() {
 				Person.aggregate().count().groupBy('name').order('-count').get(function (err, rows) {
 					should.equal(err, null);
 
-					rows.should.be.a("object");
+					rows.should.be.a.Object();
 					rows.should.have.property("length", 2);
 
 					rows[0].count.should.equal(2);
@@ -259,7 +259,7 @@ describe("Model.aggregate()", function() {
 				should(Array.isArray(people));
 				people.length.should.be.above(0);
 
-				people[0].should.be.a("object");
+				people[0].should.be.a.Object();
 				people[0].should.have.property("total");
 
 				return done();
diff --git a/test/integration/model-find-chain.js b/test/integration/model-find-chain.js
index 6b31ccc0..21b6810e 100644
--- a/test/integration/model-find-chain.js
+++ b/test/integration/model-find-chain.js
@@ -395,9 +395,9 @@ describe("Model.find() chaining", function() {
 		it("should return a ChainInstance", function (done) {
 			var chain = Person.find().each();
 
-			chain.filter.should.be.a("function");
-			chain.sort.should.be.a("function");
-			chain.count.should.be.a("function");
+			chain.filter.should.be.a.Function();
+			chain.sort.should.be.a.Function();
+			chain.count.should.be.a.Function();
 
 			return done();
 		});
@@ -459,12 +459,12 @@ describe("Model.find() chaining", function() {
 		it("should return a ChainFind", function (done) {
 			var chain = Person.find({ age: 22 }).each();
 
-			chain.should.be.a("object");
-			chain.filter.should.be.a("function");
-			chain.sort.should.be.a("function");
-			chain.count.should.be.a("function");
-			chain.get.should.be.a("function");
-			chain.save.should.be.a("function");
+			chain.should.be.a.Object();
+			chain.filter.should.be.a.Function();
+			chain.sort.should.be.a.Function();
+			chain.count.should.be.a.Function();
+			chain.get.should.be.a.Function();
+			chain.save.should.be.a.Function();
 
 			return done();
 		});
diff --git a/test/integration/model-find-mapsto.js b/test/integration/model-find-mapsto.js
index 24c3a8f6..e87a25c1 100644
--- a/test/integration/model-find-mapsto.js
+++ b/test/integration/model-find-mapsto.js
@@ -77,7 +77,7 @@ describe("Model.pkMapTo.find()", function() {
 		it("1st find should work", function (done) {
 			Person.find({ surname: "Dean" }, function (err, people) {
 				should.not.exist(err);
-				people.should.be.a("object");
+				people.should.be.a.Object();
 				people.should.have.property("length", 2);
 				people[0].surname.should.equal("Dean");
 
@@ -87,7 +87,7 @@ describe("Model.pkMapTo.find()", function() {
 		it("2nd find should should also work", function (done) {
 			Person.find({ surname: "Doe" }, function (err, people) {
 				should.not.exist(err);
-				people.should.be.a("object");
+				people.should.be.a.Object();
 				people.should.have.property("length", 3);
 				people[0].surname.should.equal("Doe");
 
diff --git a/test/integration/model-find.js b/test/integration/model-find.js
index f3edff08..d9994670 100644
--- a/test/integration/model-find.js
+++ b/test/integration/model-find.js
@@ -64,7 +64,7 @@ describe("Model.find()", function() {
 		it("should return all items", function (done) {
 			Person.find(function (err, people) {
 				should.not.exist(err);
-				people.should.be.a("object");
+				people.should.be.a.Object();
 				people.should.have.property("length", 5);
 
 				return done();
@@ -78,7 +78,7 @@ describe("Model.find()", function() {
 		it("should use it as limit", function (done) {
 			Person.find(2, function (err, people) {
 				should.not.exist(err);
-				people.should.be.a("object");
+				people.should.be.a.Object();
 				people.should.have.property("length", 2);
 
 				return done();
@@ -92,7 +92,7 @@ describe("Model.find()", function() {
 		it("should use it as property ascending order", function (done) {
 			Person.find("age", function (err, people) {
 				should.not.exist(err);
-				people.should.be.a("object");
+				people.should.be.a.Object();
 				people.should.have.property("length", 5);
 				people[0].age.should.equal(16);
 				people[4].age.should.equal(20);
@@ -104,7 +104,7 @@ describe("Model.find()", function() {
 		it("should use it as property descending order if starting with '-'", function (done) {
 			Person.find("-age", function (err, people) {
 				should.not.exist(err);
-				people.should.be.a("object");
+				people.should.be.a.Object();
 				people.should.have.property("length", 5);
 				people[0].age.should.equal(20);
 				people[4].age.should.equal(16);
@@ -120,7 +120,7 @@ describe("Model.find()", function() {
 		it("should use it as property ascending order", function (done) {
 			Person.find([ "age" ], function (err, people) {
 				should.not.exist(err);
-				people.should.be.a("object");
+				people.should.be.a.Object();
 				people.should.have.property("length", 5);
 				people[0].age.should.equal(16);
 				people[4].age.should.equal(20);
@@ -132,7 +132,7 @@ describe("Model.find()", function() {
 		it("should use it as property descending order if starting with '-'", function (done) {
 			Person.find([ "-age" ], function (err, people) {
 				should.not.exist(err);
-				people.should.be.a("object");
+				people.should.be.a.Object();
 				people.should.have.property("length", 5);
 				people[0].age.should.equal(20);
 				people[4].age.should.equal(16);
@@ -144,7 +144,7 @@ describe("Model.find()", function() {
 		it("should use it as property descending order if element is 'Z'", function (done) {
 			Person.find([ "age", "Z" ], function (err, people) {
 				should.not.exist(err);
-				people.should.be.a("object");
+				people.should.be.a.Object();
 				people.should.have.property("length", 5);
 				people[0].age.should.equal(20);
 				people[4].age.should.equal(16);
@@ -156,7 +156,7 @@ describe("Model.find()", function() {
 		it("should accept multiple ordering", function (done) {
 			Person.find([ "age", "name", "Z" ], function (err, people) {
 				should.not.exist(err);
-				people.should.be.a("object");
+				people.should.be.a.Object();
 				people.should.have.property("length", 5);
 				people[0].age.should.equal(16);
 				people[4].age.should.equal(20);
@@ -168,7 +168,7 @@ describe("Model.find()", function() {
 		it("should accept multiple ordering using '-' instead of 'Z'", function (done) {
 			Person.find([ "age", "-name" ], function (err, people) {
 				should.not.exist(err);
-				people.should.be.a("object");
+				people.should.be.a.Object();
 				people.should.have.property("length", 5);
 				people[0].age.should.equal(16);
 				people[4].age.should.equal(20);
@@ -184,7 +184,7 @@ describe("Model.find()", function() {
 		it("should use it as conditions", function (done) {
 			Person.find({ age: 16 }, function (err, people) {
 				should.not.exist(err);
-				people.should.be.a("object");
+				people.should.be.a.Object();
 				people.should.have.property("length", 1);
 				people[0].age.should.equal(16);
 
@@ -195,7 +195,7 @@ describe("Model.find()", function() {
 		it("should accept comparison objects", function (done) {
 			Person.find({ age: ORM.gt(18) }, function (err, people) {
 				should.not.exist(err);
-				people.should.be.a("object");
+				people.should.be.a.Object();
 				people.should.have.property("length", 2);
 				people[0].age.should.equal(20);
 				people[1].age.should.equal(20);
@@ -210,7 +210,7 @@ describe("Model.find()", function() {
 			it("should use it as options", function (done) {
 				Person.find({ age: 18 }, 1, { cache: false }, function (err, people) {
 					should.not.exist(err);
-					people.should.be.a("object");
+					people.should.be.a.Object();
 					people.should.have.property("length", 1);
 					people[0].age.should.equal(18);
 
@@ -224,7 +224,7 @@ describe("Model.find()", function() {
 				it("should use it", function (done) {
 					Person.find({ age: 18 }, { limit: 1 }, function (err, people) {
 						should.not.exist(err);
-						people.should.be.a("object");
+						people.should.be.a.Object();
 						people.should.have.property("length", 1);
 						people[0].age.should.equal(18);
 
@@ -239,7 +239,7 @@ describe("Model.find()", function() {
 				it("should use it", function (done) {
 					Person.find({}, { offset: 1 }, "age", function (err, people) {
 						should.not.exist(err);
-						people.should.be.a("object");
+						people.should.be.a.Object();
 						people.should.have.property("length", 4);
 						people[0].age.should.equal(18);
 
@@ -254,7 +254,7 @@ describe("Model.find()", function() {
 				it("should use it", function (done) {
 					Person.find({ surname: "Doe" }, { order: "age" }, function (err, people) {
 						should.not.exist(err);
-						people.should.be.a("object");
+						people.should.be.a.Object();
 						people.should.have.property("length", 3);
 						people[0].age.should.equal(16);
 
@@ -265,7 +265,7 @@ describe("Model.find()", function() {
 				it("should use it and ignore previously defined order", function (done) {
 					Person.find({ surname: "Doe" }, "-age", { order: "age" }, function (err, people) {
 						should.not.exist(err);
-						people.should.be.a("object");
+						people.should.be.a.Object();
 						people.should.have.property("length", 3);
 						people[0].age.should.equal(16);
 
@@ -289,7 +289,7 @@ describe("Model.find()", function() {
 
 			Person.over18().family("Doe").run(function (err, people) {
 				should.not.exist(err);
-				people.should.be.a("object");
+				people.should.be.a.Object();
 				people.should.have.property("length", 1);
 				people[0].name.should.equal("Jasmine");
 				people[0].surname.should.equal("Doe");
@@ -303,7 +303,7 @@ describe("Model.find()", function() {
 		it("should not return singletons", function (done) {
 			Person.find({ name: "Jasmine" }, { identityCache: false }, function (err, people) {
 				should.not.exist(err);
-				people.should.be.a("object");
+				people.should.be.a.Object();
 				people.should.have.property("length", 1);
 				people[0].name.should.equal("Jasmine");
 				people[0].surname.should.equal("Doe");
@@ -312,7 +312,7 @@ describe("Model.find()", function() {
 
 				Person.find({ name: "Jasmine" }, { identityCache: false }, function (err, people) {
 					should.not.exist(err);
-					people.should.be.a("object");
+					people.should.be.a.Object();
 					people.should.have.property("length", 1);
 					people[0].name.should.equal("Jasmine");
 					people[0].surname.should.equal("Doe");
@@ -327,7 +327,7 @@ describe("Model.find()", function() {
 		it("should work exactly the same", function (done) {
 			Person.all({ surname: "Doe" }, "-age", 1, function (err, people) {
 				should.not.exist(err);
-				people.should.be.a("object");
+				people.should.be.a.Object();
 				people.should.have.property("length", 1);
 				people[0].name.should.equal("Jasmine");
 				people[0].surname.should.equal("Doe");
diff --git a/test/integration/model-get.js b/test/integration/model-get.js
index 4ff195c7..9c78f4f4 100644
--- a/test/integration/model-get.js
+++ b/test/integration/model-get.js
@@ -68,7 +68,7 @@ describe("Model.get()", function() {
 			db.driver.execQuery(sql, [Person.table], function (err, data) {
 				should.not.exist(err);
 
-				var names = _.pluck(data, protocol == 'sqlite' ? 'name' : 'column_name')
+				var names = _.map(data, protocol == 'sqlite' ? 'name' : 'column_name')
 
 				should.equal(typeof Person.properties.name, 'object');
 				should.notEqual(names.indexOf('fullname'), -1);
@@ -85,7 +85,7 @@ describe("Model.get()", function() {
 			Person.get(John[Person.id], function (err, John) {
 				should.equal(err, null);
 
-				John.should.be.a("object");
+				John.should.be.a.Object();
 				John.should.have.property(Person.id, John[Person.id]);
 				John.should.have.property("name", "John Doe");
 
@@ -97,7 +97,7 @@ describe("Model.get()", function() {
 			Person.get(John[Person.id], function (err, John) {
 				should.equal(err, null);
 
-				John.UID.should.be.a("function");
+				John.UID.should.be.a.Function();
 				John.UID().should.equal(John[Person.id]);
 
 				return done();
@@ -215,7 +215,7 @@ describe("Model.get()", function() {
 			Person.get(John[Person.id], {}, function (err, John) {
 				should.equal(err, null);
 
-				John.should.be.a("object");
+				John.should.be.a.Object();
 				John.should.have.property(Person.id, John[Person.id]);
 				John.should.have.property("name", "John Doe");
 
@@ -241,7 +241,7 @@ describe("Model.get()", function() {
 
 		it("should return an error", function (done) {
 			Person.get(999, function (err) {
-				err.should.be.a("object");
+				err.should.be.a.Object();
 				err.message.should.equal("Not found");
 
 				return done();
@@ -256,7 +256,7 @@ describe("Model.get()", function() {
 			Person.get([ John[Person.id] ], function (err, John) {
 				should.equal(err, null);
 
-				John.should.be.a("object");
+				John.should.be.a.Object();
 				John.should.have.property(Person.id, John[Person.id]);
 				John.should.have.property("name", "John Doe");
 
diff --git a/test/integration/orm-exports.js b/test/integration/orm-exports.js
index 2cd14637..35182694 100644
--- a/test/integration/orm-exports.js
+++ b/test/integration/orm-exports.js
@@ -10,40 +10,40 @@ var protocol = common.protocol();
 describe("ORM", function() {
 	describe("when loaded", function () {
 		it("should expose .express(), .use() and .connect()", function (done) {
-			ORM.express.should.a("function");
-			ORM.use.should.a("function");
-			ORM.connect.should.a("function");
+			ORM.express.should.be.a.Function();
+			ORM.use.should.be.a.Function();
+			ORM.connect.should.be.a.Function();
 
 			return done();
 		});
 
 		it("should expose default settings container", function (done) {
-			ORM.settings.should.a("object");
-			ORM.settings.get.should.a("function");
-			ORM.settings.set.should.a("function");
-			ORM.settings.unset.should.a("function");
+			ORM.settings.should.be.a.Object();
+			ORM.settings.get.should.be.a.Function();
+			ORM.settings.set.should.be.a.Function();
+			ORM.settings.unset.should.be.a.Function();
 
 			return done();
 		});
 
 		it("should expose generic Settings constructor", function (done) {
-			ORM.Settings.should.a("object");
-			ORM.Settings.Container.should.a("function");
+			ORM.Settings.should.be.a.Object();
+			ORM.Settings.Container.should.be.a.Function();
 
 			return done();
 		});
 
 		it("should expose singleton manager", function (done) {
-			ORM.singleton.should.a("object");
-			ORM.singleton.clear.should.a("function");
+			ORM.singleton.should.be.a.Object();
+			ORM.singleton.clear.should.be.a.Function();
 
 			return done();
 		});
 
 		it("should expose predefined validators", function (done) {
-			ORM.validators.should.a("object");
-			ORM.validators.rangeNumber.should.a("function");
-			ORM.validators.rangeLength.should.a("function");
+			ORM.validators.should.be.a.Object();
+			ORM.validators.rangeNumber.should.be.a.Function();
+			ORM.validators.rangeLength.should.be.a.Function();
 
 			return done();
 		});
@@ -54,10 +54,10 @@ describe("ORM.connect()", function () {
 	it("should expose .use(), .define(), .sync() and .load()", function (done) {
 		var db = ORM.connect();
 
-		db.use.should.a("function");
-		db.define.should.a("function");
-		db.sync.should.a("function");
-		db.load.should.a("function");
+		db.use.should.be.a.Function();
+		db.define.should.be.a.Function();
+		db.sync.should.be.a.Function();
+		db.load.should.be.a.Function();
 
 		return done();
 	});
diff --git a/test/integration/predefined-validators.js b/test/integration/predefined-validators.js
index cfccb3ae..632abb85 100644
--- a/test/integration/predefined-validators.js
+++ b/test/integration/predefined-validators.js
@@ -73,7 +73,7 @@ describe("Predefined Validators", function () {
 				surname : "Doe" // <-- in table already!
 			});
 			janeDoe.save(function (err) {
-				err.should.be.a("object");
+				err.should.be.a.Object();
 				err.should.have.property("property", "surname");
 				err.should.have.property("value",    "Doe");
 				err.should.have.property("msg",      "not-unique");
diff --git a/test/integration/property-lazyload.js b/test/integration/property-lazyload.js
index da6df0c8..9723063e 100644
--- a/test/integration/property-lazyload.js
+++ b/test/integration/property-lazyload.js
@@ -45,7 +45,7 @@ describe("LazyLoad properties", function() {
 			Person.find().first(function (err, John) {
 				should.equal(err, null);
 
-				John.should.be.a("object");
+				John.should.be.a.Object();
 
 				John.should.have.property("name", "John Doe");
 				John.should.have.property("photo", null);
@@ -58,10 +58,10 @@ describe("LazyLoad properties", function() {
 			Person.find().first(function (err, John) {
 				should.equal(err, null);
 
-				John.should.be.a("object");
-				John.getPhoto.should.be.a("function");
-				John.setPhoto.should.be.a("function");
-				John.removePhoto.should.be.a("function");
+				John.should.be.a.Object();
+				John.getPhoto.should.be.a.Function();
+				John.setPhoto.should.be.a.Function();
+				John.removePhoto.should.be.a.Function();
 
 				return done();
 			});
@@ -71,7 +71,7 @@ describe("LazyLoad properties", function() {
 			Person.find().first(function (err, John) {
 				should.equal(err, null);
 
-				John.should.be.a("object");
+				John.should.be.a.Object();
 
 				John.getPhoto(function (err, photo) {
 					should.equal(err, null);
@@ -86,7 +86,7 @@ describe("LazyLoad properties", function() {
 			Person.find().first(function (err, John) {
 				should.equal(err, null);
 
-				John.should.be.a("object");
+				John.should.be.a.Object();
 
 				John.setPhoto(OtherPersonPhoto, function (err) {
 					should.equal(err, null);
@@ -94,7 +94,7 @@ describe("LazyLoad properties", function() {
 					Person.find().first(function (err, John) {
 						should.equal(err, null);
 
-						John.should.be.a("object");
+						John.should.be.a.Object();
 
 						John.getPhoto(function (err, photo) {
 							should.equal(err, null);
@@ -111,7 +111,7 @@ describe("LazyLoad properties", function() {
 			Person.find().first(function (err, John) {
 				should.equal(err, null);
 
-				John.should.be.a("object");
+				John.should.be.a.Object();
 
 				John.removePhoto(function (err) {
 					should.equal(err, null);
@@ -119,7 +119,7 @@ describe("LazyLoad properties", function() {
 					Person.get(John[Person.id], function (err, John) {
 						should.equal(err, null);
 
-						John.should.be.a("object");
+						John.should.be.a.Object();
 
 						John.getPhoto(function (err, photo) {
 							should.equal(err, null);
diff --git a/test/integration/property-maps-to.js b/test/integration/property-maps-to.js
index 849e3ac6..625e7aba 100644
--- a/test/integration/property-maps-to.js
+++ b/test/integration/property-maps-to.js
@@ -117,13 +117,13 @@ describe("Property.mapsTo", function() {
 					Book.find().order("-title").all(function (err, items) {
 						should.not.exist(err);
 						should.equal(
-							_.pluck(items, 'title').join(','),
+							_.map(items, 'title').join(','),
 							"Zzz,Stuff,Quantum theory,Aaa"
 						)
 						Book.find().order("title").all(function (err, items) {
 							should.not.exist(err);
 							should.equal(
-								_.pluck(items, 'title').join(','),
+								_.map(items, 'title').join(','),
 								"Aaa,Quantum theory,Stuff,Zzz"
 							)
 							done();
diff --git a/test/integration/property-number-size.js b/test/integration/property-number-size.js
index 1b154920..80a4896b 100644
--- a/test/integration/property-number-size.js
+++ b/test/integration/property-number-size.js
@@ -84,7 +84,7 @@ if (protocol != "sqlite") {
 							return done();
 						});
 					} else {
-						err.should.be.a("object");
+						err.should.be.a.Object();
 					}
 
 					return done();
@@ -102,7 +102,7 @@ if (protocol != "sqlite") {
 							return done();
 						});
 					} else {
-						err.should.be.a("object");
+						err.should.be.a.Object();
 					}
 
 					return done();
@@ -120,7 +120,7 @@ if (protocol != "sqlite") {
 							return done();
 						});
 					} else {
-						err.should.be.a("object");
+						err.should.be.a.Object();
 					}
 
 					return done();
diff --git a/test/integration/settings.js b/test/integration/settings.js
index 4e16b357..5f8c399c 100644
--- a/test/integration/settings.js
+++ b/test/integration/settings.js
@@ -123,13 +123,13 @@ describe("Settings", function () {
 				return done();
 			});
 			it("should return an empty object for some.*", function (done) {
-				settings.get("some.*").should.be.a("object");
+				settings.get("some.*").should.be.a.Object();
 				Object.keys(settings.get("some.*")).should.have.lengthOf(0);
 
 				return done();
 			});
 			it("should return an empty object for some", function (done) {
-				settings.get("some").should.be.a("object");
+				settings.get("some").should.be.a.Object();
 				Object.keys(settings.get("some")).should.have.lengthOf(0);
 
 				return done();
diff --git a/test/integration/validation.js b/test/integration/validation.js
index 604a4c3e..6af30fa1 100644
--- a/test/integration/validation.js
+++ b/test/integration/validation.js
@@ -425,8 +425,8 @@ describe("Validations", function() {
 						property: 'name', value: 'n', msg: 'out-of-range-length', type: 'validation'
 					}));
 
-					should.deepEqual(err[1], _.extend(new Error(),{
-						property: 'height', value: '4', msg: 'out-of-range-number', type: 'validation'
+					should.deepEqual(err[1], _.extend(new Error('out-of-range-number'), {
+						property: 'height', value: 4, msg: 'out-of-range-number', type: 'validation'
 					}));
 
 					should.equal(john.id, null);
@@ -447,16 +447,16 @@ describe("Validations", function() {
 					should(Array.isArray(err));
 					should.equal(err.length, 3);
 
-					should.deepEqual(err[0], _.extend(new Error(),{
+					should.deepEqual(err[0], _.extend(new Error('required'), {
 						property: 'name', value: null, msg: 'required', type: 'validation'
 					}));
 
-					should.deepEqual(err[1], _.extend(new Error(),{
+					should.deepEqual(err[1], _.extend(new Error('undefined'), {
 						property: 'name', value: null, msg: 'undefined', type: 'validation'
 					}));
 
-					should.deepEqual(err[2], _.extend(new Error(),{
-						property: 'height', value: '4', msg: 'out-of-range-number', type: 'validation'
+					should.deepEqual(err[2], _.extend(new Error('out-of-range-number'), {
+						property: 'height', value: 4, msg: 'out-of-range-number', type: 'validation'
 					}));
 
 					should.equal(john.id, null);
diff --git a/test/run.js b/test/run.js
index 057880ae..bdf0a7e5 100644
--- a/test/run.js
+++ b/test/run.js
@@ -3,9 +3,11 @@ var glob     = require("glob");
 var path     = require("path");
 var common   = require("./common");
 var logging  = require("./logging");
+
 var location = path.normalize(path.join(__dirname, "integration", "**", "*.js"));
 var mocha    = new Mocha({
-	reporter: "progress"
+	reporter: "progress",
+	timeout: 5000
 });
 
 switch (common.hasConfig(common.protocol())) {
diff --git a/test/support/my_plugin.js b/test/support/my_plugin.js
index d75f6951..e923b939 100644
--- a/test/support/my_plugin.js
+++ b/test/support/my_plugin.js
@@ -4,9 +4,9 @@ module.exports = function MyPlugin(DB, opts) {
 
 	return {
 		define: function (Model) {
-			Model.should.be.a("function");
-			Model.id.should.be.a("object");
-			Model.id[0].should.be.a("string");
+			Model.should.be.a.Function();
+			Model.id.should.be.a.Object();
+			Model.id[0].should.be.a.String();
 
 			opts.calledDefine = true;
 		},

From c80565f166a50e55830632d17d4f2559e5cc354f Mon Sep 17 00:00:00 2001
From: Adam Sheldon <adam.sheldon@hotmail.com>
Date: Fri, 6 May 2016 11:54:55 -0700
Subject: [PATCH 1082/1246] Add flag to exclude instance properties from
 enumeration

---
 lib/Instance.js              |  2 +-
 lib/Property.js              |  7 ++++++-
 test/integration/instance.js | 19 ++++++++++++++++++-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index bfca4dea..030bbd8c 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -519,7 +519,7 @@ function Instance(Model, opts) {
 					opts.changes.push(key);
 				}
 			},
-			enumerable: true
+			enumerable: !(prop && !prop.enumerable)
 		});
 	};
 	var addInstanceExtraProperty = function (key) {
diff --git a/lib/Property.js b/lib/Property.js
index fdfc6ba4..c00375ba 100644
--- a/lib/Property.js
+++ b/lib/Property.js
@@ -40,12 +40,17 @@ exports.normalize = function (opts) {
 
 	if (KNOWN_TYPES.indexOf(opts.prop.type) === -1 && !(opts.prop.type in opts.customTypes)) {
 		throw new ORMError("Unknown property type: " + opts.prop.type, 'NO_SUPPORT');
-  }
+	}
 
 	if (!opts.prop.hasOwnProperty("required") && opts.settings.get("properties.required")) {
 		opts.prop.required = true;
 	}
 
+	// Defaults to true. Setting to false hides properties from JSON.stringify(modelInstance).
+	if (!opts.prop.hasOwnProperty("enumerable") || opts.prop.enumerable === true) {
+		opts.prop.enumerable = true;
+	}
+
 	// Defaults to true. Rational means floating point here.
 	if (opts.prop.type == "number" && opts.prop.rational === undefined) {
 		opts.prop.rational = true;
diff --git a/test/integration/instance.js b/test/integration/instance.js
index 1c45382a..882481ca 100644
--- a/test/integration/instance.js
+++ b/test/integration/instance.js
@@ -16,7 +16,8 @@ describe("Model instance", function() {
 				name   : String,
 				age    : { type: 'integer', required: false },
 				height : { type: 'integer', required: false },
-				weight : { type: 'number',  required: false },
+				weight : { type: 'number',  required: false, enumerable: true },
+				secret : { type: 'text',  required: false, enumerable: false },
 				data   : { type: 'object',  required: false }
 			}, {
 				identityCache: false,
@@ -445,5 +446,21 @@ describe("Model instance", function() {
 				});
 			}
 		});
+
+		describe("Enumerable", function () {
+			it("should not stringify properties marked as not enumerable", function (done) {
+				Person.create({ name: 'Dilbert', secret: 'dogbert', weight: 100, data: {data: 3} }, function (err, p) {
+					if (err) return done(err);
+
+					var result = JSON.parse(JSON.stringify(p));
+					should.not.exist(result.secret);
+					should.exist(result.weight);
+					should.exist(result.data);
+					should.exist(result.name);
+
+					done();
+				});
+			});
+		});
 	});
 });

From 885bdb684af784495c736920ffdae8e26f177314 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 10 May 2016 08:48:20 +1000
Subject: [PATCH 1083/1246] Version 3.1.0 - adds  to property def

---
 Changelog.md | 3 +++
 package.json | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 7e615356..b3c3f6c0 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### v3.1.0
+- Add `enumerable` flag to exclude instance properties from enumeration (#724)
+
 ### v3.0.0
 - Rename `cache` -> `identityCache` and **disable by default** (#350, #564, #626, #672, #684, #694, #721)
 
diff --git a/package.json b/package.json
index d2e64341..46d0327c 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "3.0.0",
+	"version"     : "3.1.0",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",

From dbf4a3c0bb6009ad5a32ea398bf107a10f95442b Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 6 Jun 2016 16:22:12 +1000
Subject: [PATCH 1084/1246] Link to issues in changelog

---
 Changelog.md | 324 +++++++++++++++++++++++++--------------------------
 1 file changed, 162 insertions(+), 162 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b3c3f6c0..a53fabf7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,8 +1,8 @@
 ### v3.1.0
-- Add `enumerable` flag to exclude instance properties from enumeration (#724)
+- Add `enumerable` flag to exclude instance properties from enumeration ([#724](../../issues/724))
 
 ### v3.0.0
-- Rename `cache` -> `identityCache` and **disable by default** (#350, #564, #626, #672, #684, #694, #721)
+- Rename `cache` -> `identityCache` and **disable by default** ([#350](../../issues/350), [#564](../../issues/564), [#626](../../issues/626), [#672](../../issues/672), [#684](../../issues/684), [#694](../../issues/694), [#721](../../issues/721))
 
 **This is a potentially breaking change:**
 ```js
@@ -19,92 +19,92 @@ User.get(14, (err, userA) =>
 ```
 
 ### v2.1.29
-- Fix hasOne association when ID is 0 (#681)
-- Fix global var leak (#682)
+- Fix hasOne association when ID is 0 ([#681](../../issues/681))
+- Fix global var leak ([#682](../../issues/682))
 
 ### v2.1.28
-- Ensure hasMany associations work when properties have mapsTo (#679)
+- Ensure hasMany associations work when properties have mapsTo ([#679](../../issues/679))
 
 ### v2.1.27
-- Fix noisy mysql debug output (#642)
+- Fix noisy mysql debug output ([#642](../../issues/642))
 
 ### v2.1.26
 - Add `instance.saveAssociationsByDefault` setting
 - Bump node-sql-query version to v0.1.26
 
 ### v2.1.25
-- Fix `pool` and `debug` query options boolean check (#638)
-- Add `hasOne(field: 'userId', mapsTo: 'user_id')` option (#638)
+- Fix `pool` and `debug` query options boolean check ([#638](../../issues/638))
+- Add `hasOne(field: 'userId', mapsTo: 'user_id')` option ([#638](../../issues/638))
 
 ### v2.1.24
 - Bump dependencies; Allow left/right joins in underlying db.driver.query
 
 ### v2.1.23
-- Green tests on io.js & node 0.12 (#618)
-- Don't crash on null dates if timezone is set (#618)
-- Fix wrong error when module is missing (#593)
-- Fix key field when using `mapsTo` and cache (#580)
+- Green tests on io.js & node 0.12 ([#618](../../issues/618))
+- Don't crash on null dates if timezone is set ([#618](../../issues/618))
+- Fix wrong error when module is missing ([#593](../../issues/593))
+- Fix key field when using `mapsTo` and cache ([#580](../../issues/580))
 
 ### v2.1.22
-- Fix ignorecase unique scope for hasOne property (#603)
+- Fix ignorecase unique scope for hasOne property ([#603](../../issues/603))
 
 ### v2.1.21
-- Fix mixed case uniqueness constraint on postgres (#597)
-- Fix mongo adapter association delete (#543)
-- Fix mongo ne/eq comparators for _id key (#586)
+- Fix mixed case uniqueness constraint on postgres ([#597](../../issues/597))
+- Fix mongo adapter association delete ([#543](../../issues/543))
+- Fix mongo ne/eq comparators for _id key ([#586](../../issues/586))
 
 ### v2.1.20 - 19 Nov 2014
-- Exposing dirty properties array on the instance (#575)
-- Bump node-enforce version (#562)
+- Exposing dirty properties array on the instance ([#575](../../issues/575))
+- Bump node-enforce version ([#562](../../issues/562))
 
 ### v2.1.19 - 21 Aug 2014
-- Fix Chain.find().remove() & Chain.find.count() with mapsTo keys (#530)
+- Fix Chain.find().remove() & Chain.find.count() with mapsTo keys ([#530](../../issues/530))
 - Add not_like comparator
 
 ### v2.1.18 - 29 Jul 2014
-- Add `alwaysValidate` flag (#540, #352)
-- Fix mongo hasMany wrong instance bug (#479)
-- Fix mysql index bug (dresende/node-sql-ddl-sync#19)
+- Add `alwaysValidate` flag ([#540](../../issues/540), [#352](../../issues/352))
+- Fix mongo hasMany wrong instance bug ([#479](../../issues/479))
+- Fix mysql index bug (dresende/node-sql-ddl-sync[#19](../../issues/19))
 
 ### v2.1.17 - 24 Jul 2014
 - Fix postgres & sqlite driver conversion of floats and ints.
 
 ### v2.1.16 - 15 Jul 2014
 - Fix Model.create missing properties bug
-- Add missing `var` (#523)
+- Add missing `var` ([#523](../../issues/523))
 - Fix hasOne `required: true` when `instance.returnAllErrors` is true.
   This also makes hasOne required validations messages consistent with other validation messages.
 
 ### v2.1.15 - 05 Jun 2014
-- Feature: Enable plugging in custom third-party drivers (now known as adapters) (#512)
-- Add Instance.set() so that properties of type object can have their properties set and mark model as dirty (#517)
+- Feature: Enable plugging in custom third-party drivers (now known as adapters) ([#512](../../issues/512))
+- Add Instance.set() so that properties of type object can have their properties set and mark model as dirty ([#517](../../issues/517))
 - Add Instance.markAsDirty(propName) to force a properties state to dirty/changed.
-- Enable Property.mapsTo for keys (#509)
-- Fix hasMany join tables with custom key columns (#510)
+- Enable Property.mapsTo for keys ([#509](../../issues/509))
+- Fix hasMany join tables with custom key columns ([#510](../../issues/510))
 
 ### v2.1.14 - 22 May 2014
 - Allow explicitly specifying `key: true` on properties rather than passing in an array of ids.
-- Fix Property.mapsTo (#506)
+- Fix Property.mapsTo ([#506](../../issues/506))
 
 ### v2.1.13 - 21 May 2014
 - Dont modify array passed to execQuery
 
 ### v2.1.12 - 20 May 2014
 - Add custom-type support to hasMany extra properties.
-- Fix SQLite index name collisions (#499)
+- Fix SQLite index name collisions ([#499](../../issues/499))
 
 ### v2.1.11 - 19 May 2014
 - Fix hasMany.getAccessor().count()
 
 ### v2.1.10 - 09 May 2014
-- Fix sqlite Dialect.clear - resets incremental counters (#497)
+- Fix sqlite Dialect.clear - resets incremental counters ([#497](../../issues/497))
 
 ### v2.1.9 - 06 May 2014
-- Add basic PostGIS support - (#456, #375)
-- Allow mapping model properties to differently named columns (#273, #495)
+- Add basic PostGIS support - ([#456](../../issues/456), [#375](../../issues/375))
+- Allow mapping model properties to differently named columns ([#273](../../issues/273), [#495](../../issues/495))
 
 ### v2.1.8 - 28 Apr 2014
-- Fix '.omit' (#491)
+- Fix '.omit' ([#491](../../issues/491))
 
 ### v2.1.7 - 25 Apr 2014
 - Add explicit 'integer' type to avoid confusion.
@@ -114,78 +114,78 @@ User.get(14, (err, userA) =>
 - Add '.omit' to chain find - opposite of '.only'
 
 ### v2.1.5 - 08 Apr 2014
-- Don't create indexes for primary/composite keys; they are created automatically (#484)
+- Don't create indexes for primary/composite keys; they are created automatically ([#484](../../issues/484))
 
 ### v2.1.4 - 19 Mar 2014
-- Fix TypeScript module declaration (#362)
-- Fixes reversed hasOne.getAccessor when called without callback (#267)
-- Fixes default pool value (#366)
-- Fixes erroneous misformatting of top-level $and/$or clauses (#365)
-- Fix and improve TypeScript declaration (#369)
-- Use local as default timezone, pass timezone option to Query (#325)
-- Postgres: always save object as Buffer (#378)
-- Postgres: fix queries for prop create index, and for primary keys (#377)
-- Typo in property definition (#382)
-- Implement eager loading - huge performance win (#393)
-- Make model methods defined by `defineProperty` writable so they can be mocked (#399)
-- Allow composite keys when calling remove. (#345, #358)
-- Fixed bug on like expression using MongoDB (#403)
-- Fixes pool and debug settings always true (#405)
-- Update express middleware for express.io (#413)
+- Fix TypeScript module declaration ([#362](../../issues/362))
+- Fixes reversed hasOne.getAccessor when called without callback ([#267](../../issues/267))
+- Fixes default pool value ([#366](../../issues/366))
+- Fixes erroneous misformatting of top-level $and/$or clauses ([#365](../../issues/365))
+- Fix and improve TypeScript declaration ([#369](../../issues/369))
+- Use local as default timezone, pass timezone option to Query ([#325](../../issues/325))
+- Postgres: always save object as Buffer ([#378](../../issues/378))
+- Postgres: fix queries for prop create index, and for primary keys ([#377](../../issues/377))
+- Typo in property definition ([#382](../../issues/382))
+- Implement eager loading - huge performance win ([#393](../../issues/393))
+- Make model methods defined by `defineProperty` writable so they can be mocked ([#399](../../issues/399))
+- Allow composite keys when calling remove. ([#345](../../issues/345), [#358](../../issues/358))
+- Fixed bug on like expression using MongoDB ([#403](../../issues/403))
+- Fixes pool and debug settings always true ([#405](../../issues/405))
+- Update express middleware for express.io ([#413](../../issues/413))
 - Allow HasMany.setAccessor to take an empty array
-- Fix DML if object value is null, JSON.stringify return string 'null' (#380)
-- Correct sqlite log statement (#452)
-- Make association methods writable so they can be mocked (#451)
-- Throw ORM errors rather than generic ones (#455)
-- Fix sqlite3 driver with config object on windows (#461)
-- Fix 'No associations defined' error (#398)
-- Don't modify connection object (#469)
-- Don't fire afterSave hooks when calling save with no changes (#457)
-- Fix reverse has one association findBy* (#450)
-- Auto cast hasMany extra properties with types like 'Object' (#466)
+- Fix DML if object value is null, JSON.stringify return string 'null' ([#380](../../issues/380))
+- Correct sqlite log statement ([#452](../../issues/452))
+- Make association methods writable so they can be mocked ([#451](../../issues/451))
+- Throw ORM errors rather than generic ones ([#455](../../issues/455))
+- Fix sqlite3 driver with config object on windows ([#461](../../issues/461))
+- Fix 'No associations defined' error ([#398](../../issues/398))
+- Don't modify connection object ([#469](../../issues/469))
+- Don't fire afterSave hooks when calling save with no changes ([#457](../../issues/457))
+- Fix reverse has one association findBy* ([#450](../../issues/450))
+- Auto cast hasMany extra properties with types like 'Object' ([#466](../../issues/466))
 - Add example full featured express app - AnonTXT
 
 ### v2.1.3 - 14 Oct 2013
 
-- Fixes connection strings being parsed by url module to don't forget about port :) (#355)
+- Fixes connection strings being parsed by url module to don't forget about port :) ([#355](../../issues/355))
 - Fixes tests common.getConnectionString to use common.getConfig
 - Converts indentation from spaces:2 to tabs
 - Removes unnecessary path requirement in ORM.js
-- Changes user methods to be writeable property instances (fixes #296)
-- Fixes afterAutoFetch next(err) bubling up just like afterLoad (#301)
-- Fixes cache for hasOne associations (#339)
-- Adds findByAssociation to extendsTo (#314)
-- Fixes Model.extendsTo autoFetch not working (throwing) (#323)
-- Adds hasMany hooks.beforeSave (#324)
+- Changes user methods to be writeable property instances (fixes [#296](../../issues/296))
+- Fixes afterAutoFetch next(err) bubling up just like afterLoad ([#301](../../issues/301))
+- Fixes cache for hasOne associations ([#339](../../issues/339))
+- Adds findByAssociation to extendsTo ([#314](../../issues/314))
+- Fixes Model.extendsTo autoFetch not working (throwing) ([#323](../../issues/323))
+- Adds hasMany hooks.beforeSave ([#324](../../issues/324))
 
 ### v2.1.2 - 16 Sep 2013
 
-- Fixes stack overflow on instance.save() with a reversed hasOne association (#338)
+- Fixes stack overflow on instance.save() with a reversed hasOne association ([#338](../../issues/338))
 - Reverts should dev dependency to 1.2.2 (newer version was causing problems)
 - When using postgres you can now use pg@2.6.2 (unless when connecting to Heroku - use 2.5.0)
 
 ### v2.1.1 - 13 Sep 2013
 
 - Add TypeScript interface
-- Allow custom join tables (#276)
-- Fixes stack overflow when saving auto-fetched model with relations (#279)
-- Unique validator can be scoped and case insensitive (#288)
-- Allow async express middleware (#291)
-- Allow finding by associations (#293)
-- Fix sqlite find with boolean (#292)
-- Fix `afterLoad` hook error handling (#301)
-- Allow auto-escaping for custom queries (#304)
-- Add support for custom property types (#305)
-- Allow ordering by raw sql - .orderRaw() when chaining (#308, #311)
-- Fix saving Instance.extra fields (#312)
-- Fix `NaN` handling (#310)
-- Fix incorrect SQL query (#313)
-- Deprecated `PARAM_MISSMATCH` ErrorCode in favour of correctly spelt `PARAM_MISMATCH` (#315)
-- Add promises to query chain (#316)
-- Adds a test for hasMany.delAccessor with arguments switched (#320)
-- Allow passing timezone in database connection string, local timezone is now default (#325, #303)
-- Adds ability to call db.load() with multiple files (closes #329)
-- For mysql driver, when using pool, use con.release() instead of con.end() (if defined) (closes #335)
+- Allow custom join tables ([#276](../../issues/276))
+- Fixes stack overflow when saving auto-fetched model with relations ([#279](../../issues/279))
+- Unique validator can be scoped and case insensitive ([#288](../../issues/288))
+- Allow async express middleware ([#291](../../issues/291))
+- Allow finding by associations ([#293](../../issues/293))
+- Fix sqlite find with boolean ([#292](../../issues/292))
+- Fix `afterLoad` hook error handling ([#301](../../issues/301))
+- Allow auto-escaping for custom queries ([#304](../../issues/304))
+- Add support for custom property types ([#305](../../issues/305))
+- Allow ordering by raw sql - .orderRaw() when chaining ([#308](../../issues/308), [#311](../../issues/311))
+- Fix saving Instance.extra fields ([#312](../../issues/312))
+- Fix `NaN` handling ([#310](../../issues/310))
+- Fix incorrect SQL query ([#313](../../issues/313))
+- Deprecated `PARAM_MISSMATCH` ErrorCode in favour of correctly spelt `PARAM_MISMATCH` ([#315](../../issues/315))
+- Add promises to query chain ([#316](../../issues/316))
+- Adds a test for hasMany.delAccessor with arguments switched ([#320](../../issues/320))
+- Allow passing timezone in database connection string, local timezone is now default ([#325](../../issues/325), [#303](../../issues/303))
+- Adds ability to call db.load() with multiple files (closes [#329](../../issues/329))
+- For mysql driver, when using pool, use con.release() instead of con.end() (if defined) (closes [#335](../../issues/335))
 - Passes error from afterLoad hook to ready event
 - Most errors now have a model property
 - Adds connection.pool and connection.debug settings
@@ -195,15 +195,15 @@ User.get(14, (err, userA) =>
 
 ### v2.1.0 - 3 Aug 2013
 
-- Adds License (MIT) file (closes #271)
-- Make Model.get respect Model autoFetch default value (#277)
-- Changes the way ":" is added to sqlite db paths (#270)
-- Fixes duplicated debug lines for postgres (#258)
-- Fixes not saving associations if no changes (other than associations) are made (#256)
-- Fixes autoFetch being discarded in Model.get options (closes #266)
-- Adds beforeDefine to plugins (#263)
-- Allows user to pass an object to extendsTo.setAccessor instead of an instance (detected via #250)
-- Changes autoFetch to avoid autofetching if instance is not saved (it's new!) (#242)
+- Adds License (MIT) file (closes [#271](../../issues/271))
+- Make Model.get respect Model autoFetch default value ([#277](../../issues/277))
+- Changes the way ":" is added to sqlite db paths ([#270](../../issues/270))
+- Fixes duplicated debug lines for postgres ([#258](../../issues/258))
+- Fixes not saving associations if no changes (other than associations) are made ([#256](../../issues/256))
+- Fixes autoFetch being discarded in Model.get options (closes [#266](../../issues/266))
+- Adds beforeDefine to plugins ([#263](../../issues/263))
+- Allows user to pass an object to extendsTo.setAccessor instead of an instance (detected via [#250](../../issues/250))
+- Changes autoFetch to avoid autofetching if instance is not saved (it's new!) ([#242](../../issues/242))
 - Changes validations and predefined validators to use enforce@0.1.1
 - Adds support for setting properties.association_key to be a function (name, field)
 - Passes connection settings to database drivers
@@ -212,7 +212,7 @@ User.get(14, (err, userA) =>
 - Allow passing extra options to extended models
 - Allow big text fields
 - Allow before* hooks to modify the instance
-- Fixes #226 - hasOne delAccessor not working
+- Fixes [#226](../../issues/226) - hasOne delAccessor not working
 - Adds Utilities.getRealPath to look for the real path to load based on the file where it was called from (for db.load and db.use)
 - Fixes Model.aggregate().call() to accept no arguments except function name
 - Fix problem with extendsTo and custom key types
@@ -220,20 +220,20 @@ User.get(14, (err, userA) =>
 
 ### v2.0.15 - 10 July 2013
 
-- Support for 'point' type as a property (#221)
-- .call() in aggregates for generic functions (#204)
-- Adds hook afterAutoFetch triggered after extending and auto fetching (if any) associations (#219)
+- Support for 'point' type as a property ([#221](../../issues/221))
+- .call() in aggregates for generic functions ([#204](../../issues/204))
+- Adds hook afterAutoFetch triggered after extending and auto fetching (if any) associations ([#219](../../issues/219))
 - Adds predefined validator .password()
-- Adds ability to have the afterLoad hook blocking (#219)
+- Adds ability to have the afterLoad hook blocking ([#219](../../issues/219))
 - Changes Model.create() to wait for createInstance callback instead of using the returned value
 - Fixes problem with hasOne associations for none persisted instances and autoFetch active just blocking
 - Refactored Model.hasOne() constructor to be able to mix parameters
-- Fixes reversed hasOne association on the reversed model not being correctly saved (#216)
+- Fixes reversed hasOne association on the reversed model not being correctly saved ([#216](../../issues/216))
 - Changes Model.hasMany.addAccessor to throw just like .setAccessor when no associations are passed
 - Adds ability to pass an Array to hasMany.hasAccessor and also not passing any instance to hasAccessor and have it check for any associated item
 - Exposes Model methods to change hooks after model definition
 - Fixes postgres driver not returning numbers for number columns
-- Fixes passing json object instead of instances to Model.create() associations (#216)
+- Fixes passing json object instead of instances to Model.create() associations ([#216](../../issues/216))
 - Passes Model to Instance directly, changes Instance to use Model.properties instead of opts.properties
 - Exposes Model.properties
 - Removes old Property.js throw error in favour of new one
@@ -241,18 +241,18 @@ User.get(14, (err, userA) =>
 - Avoids redefining properties in instances
 - Adds ErrorCodes.NOT_DEFINED
 - Adds db.drop() - similar to db.sync()
-- Changes hasMany.getAccessor to support order as string (closes #196)
+- Changes hasMany.getAccessor to support order as string (closes [#196](../../issues/196))
 - Handle django string formatted sqlite datetime
 - Many bug fixes
 
 ### v2.0.14 - 27 June 2013
 
-- Changes many errors to use the ErrorCodes generator (#206)
-- Changes Model.aggregate() to support multiple orders when calling .order() (#207)
+- Changes many errors to use the ErrorCodes generator ([#206](../../issues/206))
+- Changes Model.aggregate() to support multiple orders when calling .order() ([#207](../../issues/207))
 - Changes Readme.md sqlite3 version and adds warning.
 - Fix wrong import of debug output for aggregate functions
 - Fix orm when running on node v0.6 (at least) and module not found error has no code property
-- Adds model.namePrefix setting (#203)
+- Adds model.namePrefix setting ([#203](../../issues/203))
 - Fixes bug when passing an array (object) of ids but no options object
 - Only mark model as dirty if a property has _really_ changed
 - Fix hasOne infinite loop
@@ -261,9 +261,9 @@ User.get(14, (err, userA) =>
 - Fixes Model.get() when passing cache: false and model has cache: true
 - Creates Singleton.clear() to clear cache, exports singleton in orm
 - Fix required property model.save only threw a single error with returnAllErrors = true
-- Fixes some hasMany association usage of Association.id to check for real id property name (#197)
-- Changes db.load() to return value from loaded and invoked function (#194)
-- Adds possibility to add a callback to ChainFind.find() (#190)
+- Fixes some hasMany association usage of Association.id to check for real id property name ([#197](../../issues/197))
+- Changes db.load() to return value from loaded and invoked function ([#194](../../issues/194))
+- Adds possibility to add a callback to ChainFind.find() ([#190](../../issues/190))
 - Adds .findByX(...) to .hasOne("X", ...)
 - Allow db.load() to work outside of module.exports
 - Fix mysql driver for non-autoincrement key
@@ -273,24 +273,24 @@ User.get(14, (err, userA) =>
 
 ### v2.0.13 - 5 June 2013
 
-- Avoids throwing when calling db.close() without a callback and using pool in mysql (fixes #180)
-- Adds initial code to support passing associations when creating new instances (#162)
+- Avoids throwing when calling db.close() without a callback and using pool in mysql (fixes [#180](../../issues/180))
+- Adds initial code to support passing associations when creating new instances ([#162](../../issues/162))
 - Changes Model.exists() to allow array or object passing
 - Allows passing an object instead of an instance as an hasOne asssociation
-- Fixes bug introduced in 2.0.12 forcing extra properties being ignored (fixes #183)
+- Fixes bug introduced in 2.0.12 forcing extra properties being ignored (fixes [#183](../../issues/183))
 
 ### v2.0.12 - 30 May 2013
 
 - New plugin: orm-paging
-- Adds Model.one() as an alias for Model.all().limit(1) (#148)
-- Changes Model.one() to return only one instance (or null) instead of an Array (#148)
-- Allow passing a single object to Model.create() (#159)
-- Fixes passing unknown properties to new instances (fixes #178)
-- Adds AggregateFunctions.limit() (#172)
-- Checks for driver debug flag and prints debug lines in AggregateFunctions (#171)
+- Adds Model.one() as an alias for Model.all().limit(1) ([#148](../../issues/148))
+- Changes Model.one() to return only one instance (or null) instead of an Array ([#148](../../issues/148))
+- Allow passing a single object to Model.create() ([#159](../../issues/159))
+- Fixes passing unknown properties to new instances (fixes [#178](../../issues/178))
+- Adds AggregateFunctions.limit() ([#172](../../issues/172))
+- Checks for driver debug flag and prints debug lines in AggregateFunctions ([#171](../../issues/171))
 - Added Hook 'beforeValidation' prior to _all_ validations
-- Avoids JSON parsing values when they are already objects (and not string buffers) (#168)
-- Changes beforeRemove, beforeCreate, beforeSave and beforeValidation to use Hooks.wait() (sync or async hooks) (#167)
+- Avoids JSON parsing values when they are already objects (and not string buffers) ([#168](../../issues/168))
+- Changes beforeRemove, beforeCreate, beforeSave and beforeValidation to use Hooks.wait() (sync or async hooks) ([#167](../../issues/167))
 - Support specifying size of number columns
 - Many more bug fixes
 - More tests added
@@ -299,11 +299,11 @@ User.get(14, (err, userA) =>
 ### v2.0.11 - 3 May 2013
 
 - Changes orm.connect() to return an EventEmitter
-- Avoids saving an instance if a property is null and is marked as required (#142)
-- Avoids passing property validations if property is null and is not required (#142)
-- Fixes documentation where user should be used instead of username in connection options (closes #145)
+- Avoids saving an instance if a property is null and is marked as required ([#142](../../issues/142))
+- Avoids passing property validations if property is null and is not required ([#142](../../issues/142))
+- Fixes documentation where user should be used instead of username in connection options (closes [#145](../../issues/145))
 - Adds postgresql schema support
-- Fixes autoFetchLimit and cascadeRemove options not being used when set to 0 or false (fixes #144)
+- Fixes autoFetchLimit and cascadeRemove options not being used when set to 0 or false (fixes [#144](../../issues/144))
 
 ### v2.0.10 - 25 Apr 2013
 
@@ -311,28 +311,28 @@ User.get(14, (err, userA) =>
 - Adds support for -property on ChainFind.order()
 - Reduces the size of mysql driver
 - Adds initial support for multi primary key models
-- Updates DB.define() and Model.get() to support tables with multiple primary keys (#135)
+- Updates DB.define() and Model.get() to support tables with multiple primary keys ([#135](../../issues/135))
 - Creates Model.all() as alias to Model.find(), adds simple example
-- Fixes autoFetch option not being considered in Model.find() (#120)
+- Fixes autoFetch option not being considered in Model.find() ([#120](../../issues/120))
 - Adds support for chaining and rechaining with ChainFind
-- Fixes bug about connection config object not having query key (fixes #130)
-- Adds initial plugin architecture - .use() (#121)
+- Fixes bug about connection config object not having query key (fixes [#130](../../issues/130))
+- Adds initial plugin architecture - .use() ([#121](../../issues/121))
 - Fixes some bugs
 - Adds more tests
 
 ### v2.0.9 - 18 Apr 2013
 
 - Correct 'returnAllErrors' setting behaviour
-- Adds default settings properties.required = false (#110)
-- Changes instance.save() to support an hash of changes before saving (#111)
-- Adds setting connection.reconnect (default=false) to auto-reconnect (only mysql for now) (#112)
-- Adds possibility of .order() to aggregate method (#114)
-- Adds .select() aggregate function to support additional properties to be selected (#114)
-- Adds .as() aggregate function to define alias to previous function (#123)
-- Adds .distinct() aggregate function to all drivers (#123)
-- Changes model.find() queries to specify columns instead of selecting * from tables (#106)
-- Changes hasMany.addAccessor to support arrays of instances (#97)
-- Adds support for descending ordering using "-property" (#115)
+- Adds default settings properties.required = false ([#110](../../issues/110))
+- Changes instance.save() to support an hash of changes before saving ([#111](../../issues/111))
+- Adds setting connection.reconnect (default=false) to auto-reconnect (only mysql for now) ([#112](../../issues/112))
+- Adds possibility of .order() to aggregate method ([#114](../../issues/114))
+- Adds .select() aggregate function to support additional properties to be selected ([#114](../../issues/114))
+- Adds .as() aggregate function to define alias to previous function ([#123](../../issues/123))
+- Adds .distinct() aggregate function to all drivers ([#123](../../issues/123))
+- Changes model.find() queries to specify columns instead of selecting * from tables ([#106](../../issues/106))
+- Changes hasMany.addAccessor to support arrays of instances ([#97](../../issues/97))
+- Adds support for descending ordering using "-property" ([#115](../../issues/115))
 - Adds pool support to postgres driver
 - Removes postgres axomic driver
 - Updates redshift driver to use new postgres driver
@@ -344,35 +344,35 @@ User.get(14, (err, userA) =>
 ### v2.0.8 - 8 Apr 2013
 
 - Adds more aggregate functions to the several drivers
-- Adds groupBy to aggregate methods (#99)
+- Adds groupBy to aggregate methods ([#99](../../issues/99))
 - Adds possibility to use "-property" to indicate a descending order in Model.find()
 - Adds setting instance.returnAllErrors (default: true)
-- Changes hasMany.setAccessor to support passing an array of instances (#97)
-- Fixes property defaultValue not being set if property is null (closes #104)
-- Adds support for indexes on properties that are no associations (#98)
-- Adds a new option to add multi-column indexes to models (#98)
+- Changes hasMany.setAccessor to support passing an array of instances ([#97](../../issues/97))
+- Fixes property defaultValue not being set if property is null (closes [#104](../../issues/104))
+- Adds support for indexes on properties that are no associations ([#98](../../issues/98))
+- Adds a new option to add multi-column indexes to models ([#98](../../issues/98))
 - Bug fixes
 
 ### v2.0.7 - 3 Apr 2013
 
 - Fixed SQLite driver writing to console when it should not
-- Changes Express middleware to wait for connections (errored or not) before processing requests (#92)
-- Avoids loosing previously set limit (if set) on Model.fin() (#93)
+- Changes Express middleware to wait for connections (errored or not) before processing requests ([#92](../../issues/92))
+- Avoids loosing previously set limit (if set) on Model.fin() ([#93](../../issues/93))
 - Fixes hasMany getAccessor when using an Array as only argument (specific properties)
 - Adds ChainFind .last() (similar to .first())
 - Fixes hasMany acessor names to correctly convert prop_name to PropName (underscores)
-- Adds hasMany hasAcessor conditional to ChainFind (#94)
+- Adds hasMany hasAcessor conditional to ChainFind ([#94](../../issues/94))
 
 ### v2.0.6 - 22 Mar 2013
 
-- Changes orm.connect to check connection url/opts to avoid throwing some errors about missing protocol or database (#75)
+- Changes orm.connect to check connection url/opts to avoid throwing some errors about missing protocol or database ([#75](../../issues/75))
 - Hardens some validators againt null/undefined, changes match validator to avoid compiling regex everytime it's called
 - Changes back default instance properties to null instead of undefined
-- Changes Express middleware to be able to have more than one connection (#76)
-- Changes Singleton to avoid cache if save_check option is enabled and cached instance is not saved (#78)
+- Changes Express middleware to be able to have more than one connection ([#76](../../issues/76))
+- Changes Singleton to avoid cache if save_check option is enabled and cached instance is not saved ([#78](../../issues/78))
 - Adds Model.aggregate()
 - Adds 'required' option to hasOne associations
-- Changes singleton uid creation to use driver uid (#86)
+- Changes singleton uid creation to use driver uid ([#86](../../issues/86))
 - Changes Model.drop and Model.sync to be resistive to no callback
 - Changes ORM.sync() to also be resistant to no callback
 - Many bug fixes
@@ -381,33 +381,33 @@ User.get(14, (err, userA) =>
 
 - Uses sql-query for SQL query building
 - Adds initial middleware for Express
-- Moves beforeCreate to near beforeSave so people can change instance just like beforeSave (#69)
-- Fixes bug when creating Models without all data (#69)
-- Changes drivers.count() to be able to pass options (related to #68)
-- Changes postgres DDL to create ENUM types before table (#71)
+- Moves beforeCreate to near beforeSave so people can change instance just like beforeSave ([#69](../../issues/69))
+- Fixes bug when creating Models without all data ([#69](../../issues/69))
+- Changes drivers.count() to be able to pass options (related to [#68](../../issues/68))
+- Changes postgres DDL to create ENUM types before table ([#71](../../issues/71))
 - Changes hasOne.getAccessor to be able to fetch instance before association (if needed)
-- Adds support for Object property type in DDL drivers (#72)
+- Adds support for Object property type in DDL drivers ([#72](../../issues/72))
 
 ### v2.0.4 - 7 Mar 2013
 
 - Changes db.load() to behave like builtin require()
-- Moves hook beforeSave to before checking validations (#66)
+- Moves hook beforeSave to before checking validations ([#66](../../issues/66))
 - Changes postgres driver to support ssl flag and pass it to pg driver
-- Adds possibility to add order to hasMany getAccessor (#58)
+- Adds possibility to add order to hasMany getAccessor ([#58](../../issues/58))
 - Fixes hasOne reversed associations not having setAccessor
-- Adds db.ping() (#57)
+- Adds db.ping() ([#57](../../issues/57))
 - Changes db.load to avoid throwing and just create the error
 - Added "afterRemove" hook
 - Added "afterCreate" hook
-- Support Model.find({ prop: null }) (closes #59)
+- Support Model.find({ prop: null }) (closes [#59](../../issues/59))
 - Adds LIKE operator
 - Many bug fixes
 
 ### v2.0.3 - 26 Feb 2013
 
-- Fixes postgresql integer columns (#52)
-- Adds boolean support for sqlite (#50)
-- Fixes an issue where hasMany association properties were not being checked (#49)
+- Fixes postgresql integer columns ([#52](../../issues/52))
+- Adds boolean support for sqlite ([#50](../../issues/50))
+- Fixes an issue where hasMany association properties were not being checked ([#49](../../issues/49))
 - Changes hasMany associations to be able to make some call without callback
 - Makes Instances trigger beforeRemove event
 - Creates default option for instance.cascadeRemove (true)

From baafd0b2ed495b251af808018597abd740bd60a2 Mon Sep 17 00:00:00 2001
From: Matias Pizzagalli <matias.pizzagalli@wolox.com.ar>
Date: Thu, 3 Nov 2016 13:33:47 -0300
Subject: [PATCH 1085/1246] added alwaysValidate declaration.

---
 lib/Instance.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 030bbd8c..701eb2b8 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -44,7 +44,7 @@ function Instance(Model, opts) {
 		}
 	};
 	var handleValidations = function (cb) {
-		var pending = [], errors = [], required;
+		var pending = [], errors = [], required, alwaysValidate;
 
 		Hook.wait(instance, opts.hooks.beforeValidation, function (err) {
 		    var k, i;

From 9799d5b6899d0b88c6abe0950ebbe67e2cfa9a38 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Fri, 9 Dec 2016 10:49:40 +1100
Subject: [PATCH 1086/1246] Make [.find|.where|.all] synonyms & chain multiple
 times

---
 .travis.yml                          |   2 +-
 Changelog.md                         |   4 +
 Readme.md                            |   4 +-
 lib/ChainFind.js                     | 153 ++++++++++++++-------------
 lib/Model.js                         |   9 +-
 package.json                         |  20 ++--
 test/integration/model-find-chain.js |  40 +++++++
 test/integration/model-find.js       |  14 +++
 8 files changed, 153 insertions(+), 93 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6c2fba8d..2f750a20 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
 sudo: false
 language: node_js
 node_js:
-  - '0.12'
   - '4'
+  - '6'
 before_script:
   - mysql -e 'create database orm_test;'
   - psql -c 'create database orm_test;' -U postgres
diff --git a/Changelog.md b/Changelog.md
index a53fabf7..aa885f96 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,7 @@
+### v3.2.0
+- Make [.find|.where|.all] synonyms & allow them to chain multiple times
+- Update dependencies
+
 ### v3.1.0
 - Add `enumerable` flag to exclude instance properties from enumeration ([#724](../../issues/724))
 
diff --git a/Readme.md b/Readme.md
index 95ded10a..4746f1db 100755
--- a/Readme.md
+++ b/Readme.md
@@ -390,7 +390,7 @@ Person.aggregate(["age"], { country: "someCountry" }).avg("weight").groupBy("age
 
 There are more aggregate functions depending on the driver (Math functions for example).
 
-#### Chaining
+### Chaining
 
 If you prefer less complicated syntax you can chain `.find()` by not giving a callback parameter.
 
@@ -410,6 +410,8 @@ It's bad practice to manually escape SQL parameters as it's error prone and expo
 The `?` syntax takes care of escaping for you, by safely substituting the question mark in the query with the parameters provided.
 You can also chain multiple `where` clauses as needed.
 
+`.find`, `.where` & `.all` do the same thing; they are all interchangeable and chainable.
+
 You can also `order` or `orderRaw`:
 ```js
 Person.find({ age: 18 }).order('-name').all( ... );
diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index af0a3da3..814d2f87 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -18,6 +18,77 @@ function ChainFind(Model, opts) {
 		);
 	};
 
+	var chainRun = function (cb) {
+		var order, conditions;
+
+		conditions = Utilities.transformPropertyNames(
+			opts.conditions, opts.properties
+		);
+		order = Utilities.transformOrderPropertyNames(
+			opts.order, opts.properties
+		);
+
+		opts.driver.find(opts.only, opts.table, conditions, {
+			limit  : opts.limit,
+			order  : order,
+			merge  : opts.merge,
+			offset : opts.offset,
+			exists : opts.exists
+		}, function (err, data) {
+			if (err) {
+				return cb(err);
+			}
+			if (data.length === 0) {
+				return cb(null, []);
+			}
+			var pending = data.length;
+
+			var createInstance = function (idx) {
+				opts.newInstance(data[idx], function (err, instance) {
+					data[idx] = instance;
+
+					if (--pending === 0) {
+						return (opts.__eager && opts.__eager.length ? eagerLoading : cb)(null, data);
+					}
+				});
+			};
+
+			var eagerLoading = function (err, data) {
+				var pending = opts.__eager.length;
+				var idMap = {};
+				var count = 0;
+
+				var keys = _.map(data, function (instance) {
+					var key = instance[opts.keys[0]];
+					// Create the association arrays
+					for (var i = 0, association; association = opts.__eager[i]; i++) {
+						instance[association.name] = [];
+					}
+
+					idMap[key] = count++;
+					return key;
+				});
+
+				_.map(opts.__eager, function (association) {
+					opts.driver.eagerQuery(association, opts, keys, function (err, instances) {
+						for (var i = 0, instance; instance = instances[i]; i++) {
+							// Perform a parent lookup with $p, and initialize it as an instance.
+							data[idMap[instance.$p]][association.name].push(association.model(instance));
+						}
+
+						if (--pending === 0) {
+							return cb(null, data);
+						}
+					});
+				});
+			};
+
+			for (var i = 0; i < data.length; i++) {
+				createInstance(i);
+			}
+		});
+	}
+
 	var promise = null;
 	var chain = {
 		find: function () {
@@ -38,7 +109,7 @@ function ChainFind(Model, opts) {
 			}
 
 			if (cb) {
-				return this.all(cb);
+				chainRun(cb);
 			}
 			return this;
 		},
@@ -149,7 +220,8 @@ function ChainFind(Model, opts) {
 			return new ChainInstance(this, cb);
 		},
 		run: function (cb) {
-			return this.all(cb);
+			chainRun(cb);
+			return this;
 		},
 		success: function (cb) {
 			if (!promise) {
@@ -178,81 +250,10 @@ function ChainFind(Model, opts) {
 				return ~associations.indexOf(association.name);
 			});
 
-			return this;
-		},
-		all: function (cb) {
-			var order, conditions;
-
-			conditions = Utilities.transformPropertyNames(
-				opts.conditions, opts.properties
-			);
-			order = Utilities.transformOrderPropertyNames(
-				opts.order, opts.properties
-			);
-
-			opts.driver.find(opts.only, opts.table, conditions, {
-				limit  : opts.limit,
-				order  : order,
-				merge  : opts.merge,
-				offset : opts.offset,
-				exists : opts.exists
-			}, function (err, data) {
-				if (err) {
-					return cb(err);
-				}
-				if (data.length === 0) {
-					return cb(null, []);
-				}
-				var pending = data.length;
-
-				var createInstance = function (idx) {
-					opts.newInstance(data[idx], function (err, instance) {
-						data[idx] = instance;
-
-						if (--pending === 0) {
-							return (opts.__eager && opts.__eager.length ? eagerLoading : cb)(null, data);
-						}
-					});
-				};
-
-				var eagerLoading = function (err, data) {
-					var pending = opts.__eager.length;
-					var idMap = {};
-					var count = 0;
-
-					var keys = _.map(data, function (instance) {
-						var key = instance[opts.keys[0]];
-						// Create the association arrays
-						for (var i = 0, association; association = opts.__eager[i]; i++) {
-							instance[association.name] = [];
-						}
-
-						idMap[key] = count++;
-						return key;
-					});
-
-					_.map(opts.__eager, function (association) {
-						opts.driver.eagerQuery(association, opts, keys, function (err, instances) {
-							for (var i = 0, instance; instance = instances[i]; i++) {
-								// Perform a parent lookup with $p, and initialize it as an instance.
-								data[idMap[instance.$p]][association.name].push(association.model(instance));
-							}
-
-							if (--pending === 0) {
-								return cb(null, data);
-							}
-						});
-					});
-				};
-
-				for (var i = 0; i < data.length; i++) {
-					createInstance(i);
-				}
-			});
 			return this;
 		}
 	};
-	chain.where = chain.find;
+	chain.all = chain.where = chain.find;
 
 	if (opts.associations) {
 		for (var i = 0; i < opts.associations.length; i++) {
@@ -262,12 +263,12 @@ function ChainFind(Model, opts) {
 	for (var k in Model) {
 		if ([
 			"hasOne", "hasMany",
-			"drop", "sync", "get", "find", "all", "count", "clear", "create",
+			"drop", "sync", "get", "clear", "create",
 			"exists", "settings", "aggregate"
 		].indexOf(k) >= 0) {
 			continue;
 		}
-		if (typeof Model[k] !== "function") {
+		if (typeof Model[k] !== "function" || chain[k]) {
 			continue;
 		}
 
diff --git a/lib/Model.js b/lib/Model.js
index 8863c647..1fe8403c 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -426,14 +426,13 @@ function Model(opts) {
 
 		if (typeof cb !== "function") {
 			return chain;
+		} else {
+			chain.run(cb);
+			return this;
 		}
-
-		chain.run(cb);
-
-		return this;
 	};
 
-	model.all = model.find;
+	model.where = model.all = model.find;
 
 	model.one = function () {
 		var args = Array.prototype.slice.apply(arguments);
diff --git a/package.json b/package.json
index 46d0327c..9791cd9b 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "3.1.0",
+	"version"     : "3.2.0",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",
@@ -38,20 +38,20 @@
 	"dependencies": {
 		"enforce"          : "0.1.6",
 		"sql-query"        : "0.1.26",
-		"sql-ddl-sync"     : "0.3.11",
+		"sql-ddl-sync"     : "0.3.12",
 		"hat"              : "0.0.3",
-		"lodash"           : "4.11.2",
-		"path-is-absolute" : "1.0.0"
+		"lodash"           : "4.17.2",
+		"path-is-absolute" : "1.0.1"
 	},
 	"devDependencies": {
-		"mysql"   : "2.10.2",
-		"pg"      : "4.5.5",
-		"sqlite3" : "3.1.3",
+		"mysql"   : "2.12.0",
+		"pg"      : "6.1.0",
+		"sqlite3" : "3.1.8",
 		"async"   : "1.5.2",
-		"mocha"   : "2.4.5",
-		"should"  : "8.3.1",
+		"mocha"   : "3.2.0",
+		"should"  : "11.1.1",
 		"mongodb" : "1.4.10",
-		"glob"    : "7.0.3"
+		"glob"    : "7.1.1"
 	},
 	"optionalDependencies": {}
 }
diff --git a/test/integration/model-find-chain.js b/test/integration/model-find-chain.js
index 21b6810e..54b6f2a4 100644
--- a/test/integration/model-find-chain.js
+++ b/test/integration/model-find-chain.js
@@ -389,6 +389,46 @@ describe("Model.find() chaining", function() {
 		});
 	});
 
+	describe("finders should be chainable & interchangeable including", function () {
+		before(setup());
+
+		before(function (done) {
+			Person.create([
+					{ name: "Mel", surname: "Gabbs", age: 12 },
+					{ name: "Mel", surname: "Gibbs", age: 22 },
+					{ name: "Mel", surname: "Gobbs", age: 32 }
+				], function (err, items) {
+					should.not.exist(err);
+					done()
+				}
+			);
+		});
+
+		['find', 'where', 'all'].forEach(function (func) {
+			it("." + func + "()", function (done) {
+				Person[func]({ name: "Mel" })[func]({ age: ORM.gt(20) })[func](function (err, items) {
+					should.not.exist(err);
+					should.equal(items.length, 2);
+
+					should.equal(items[0].surname, "Gibbs");
+					should.equal(items[1].surname, "Gobbs");
+					done();
+				});
+			});
+		});
+
+		it("a mix", function (done) {
+			Person.all({ name: "Mel" }).where({ age: ORM.gt(20) }).find(function (err, items) {
+				should.not.exist(err);
+				should.equal(items.length, 2);
+
+				should.equal(items[0].surname, "Gibbs");
+				should.equal(items[1].surname, "Gobbs");
+				done();
+			});
+		});
+	});
+
 	describe(".each()", function () {
 		before(setup());
 
diff --git a/test/integration/model-find.js b/test/integration/model-find.js
index d9994670..e283b5cf 100644
--- a/test/integration/model-find.js
+++ b/test/integration/model-find.js
@@ -336,4 +336,18 @@ describe("Model.find()", function() {
 			});
 		});
 	});
+
+	describe("when using Model.where()", function () {
+		it("should work exactly the same", function (done) {
+			Person.where({ surname: "Doe" }, "-age", 1, function (err, people) {
+				should.not.exist(err);
+				people.should.be.a.Object();
+				people.should.have.property("length", 1);
+				people[0].name.should.equal("Jasmine");
+				people[0].surname.should.equal("Doe");
+
+				return done();
+			});
+		});
+	});
 });

From 0da4b8a5e2a64c89c2b342eaa69115d68839613a Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 19 Dec 2016 13:49:54 +1100
Subject: [PATCH 1087/1246] Rerwite some async loops using async lib

---
 lib/ChainFind.js         | 74 ++++++++++++++++++++--------------------
 lib/Model.js             | 72 ++++++++++++++++++++------------------
 package.json             |  8 ++---
 test/integration/hook.js | 24 ++++++-------
 4 files changed, 91 insertions(+), 87 deletions(-)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 814d2f87..bdf8b8eb 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -1,4 +1,5 @@
 var _             = require("lodash");
+var async         = require("async");
 var Utilities     = require("./Utilities");
 var ChainInstance = require("./ChainInstance");
 var Promise       = require("./Promise").Promise;
@@ -18,7 +19,7 @@ function ChainFind(Model, opts) {
 		);
 	};
 
-	var chainRun = function (cb) {
+	var chainRun = function (done) {
 		var order, conditions;
 
 		conditions = Utilities.transformPropertyNames(
@@ -34,58 +35,57 @@ function ChainFind(Model, opts) {
 			merge  : opts.merge,
 			offset : opts.offset,
 			exists : opts.exists
-		}, function (err, data) {
+		}, function (err, dataItems) {
 			if (err) {
-				return cb(err);
+				return done(err);
 			}
-			if (data.length === 0) {
-				return cb(null, []);
+			if (dataItems.length === 0) {
+				return done(null, []);
 			}
-			var pending = data.length;
+			var pending = dataItems.length;
 
-			var createInstance = function (idx) {
-				opts.newInstance(data[idx], function (err, instance) {
-					data[idx] = instance;
-
-					if (--pending === 0) {
-						return (opts.__eager && opts.__eager.length ? eagerLoading : cb)(null, data);
-					}
-				});
-			};
-
-			var eagerLoading = function (err, data) {
+			var eagerLoad = function (err, items) {
 				var pending = opts.__eager.length;
 				var idMap = {};
-				var count = 0;
 
-				var keys = _.map(data, function (instance) {
-					var key = instance[opts.keys[0]];
+				var keys = _.map(items, function (item, index) {
+					var key = item[opts.keys[0]];
 					// Create the association arrays
 					for (var i = 0, association; association = opts.__eager[i]; i++) {
-						instance[association.name] = [];
+						item[association.name] = [];
 					}
+					idMap[key] = index;
 
-					idMap[key] = count++;
 					return key;
 				});
 
-				_.map(opts.__eager, function (association) {
-					opts.driver.eagerQuery(association, opts, keys, function (err, instances) {
-						for (var i = 0, instance; instance = instances[i]; i++) {
-							// Perform a parent lookup with $p, and initialize it as an instance.
-							data[idMap[instance.$p]][association.name].push(association.model(instance));
-						}
-
-						if (--pending === 0) {
-							return cb(null, data);
-						}
-					});
-				});
+				async.eachSeries(opts.__eager,
+					function (association, cb) {
+						opts.driver.eagerQuery(association, opts, keys, function (err, instances) {
+							if (err) return cb(err)
+
+							for (var i = 0, instance; instance = instances[i]; i++) {
+								// Perform a parent lookup with $p, and initialize it as an instance.
+								items[idMap[instance.$p]][association.name].push(association.model(instance));
+							}
+							cb();
+						});
+					},
+					function (err) {
+						if (err) done(err);
+						else done(null, items);
+					}
+				);
 			};
 
-			for (var i = 0; i < data.length; i++) {
-				createInstance(i);
-			}
+			async.map(dataItems, opts.newInstance, function (err, items) {
+				if (err) return done(err);
+
+				var shouldEagerLoad = opts.__eager && opts.__eager.length;
+				var completeFn = shouldEagerLoad ? eagerLoad : done;
+
+				return completeFn(null, items);
+			});
 		});
 	}
 
diff --git a/lib/Model.js b/lib/Model.js
index 1fe8403c..55eeefb1 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -1,4 +1,5 @@
 var _                 = require("lodash");
+var async             = require("async");
 var ChainFind         = require("./ChainFind");
 var Instance          = require("./Instance").Instance;
 var LazyLoad          = require("./LazyLoad");
@@ -560,57 +561,60 @@ function Model(opts) {
 	};
 
 	model.create = function () {
-		var Instances = [];
-		var options = {};
-		var cb = null, idx = 0, single = false;
-		var createNext = function () {
-			if (idx >= Instances.length) {
-				return cb(null, single ? Instances[0] : Instances);
+		var itemsParams = []
+		var items       = [];
+		var options     = {};
+		var done        = null;
+		var single      = false;
+
+		for (var i = 0; i < arguments.length; i++) {
+			switch (typeof arguments[i]) {
+				case "object":
+					if ( !single && Array.isArray(arguments[i]) ) {
+						itemsParams = itemsParams.concat(arguments[i]);
+					} else if (i === 0) {
+						single = true;
+						itemsParams.push(arguments[i]);
+					} else {
+						options = arguments[i];
+					}
+					break;
+				case "function":
+					done = arguments[i];
+					break;
 			}
+		}
 
-			Instances[idx] = createInstance(Instances[idx], {
+		var iterator = function (params, index, cb) {
+			createInstance(params, {
 				is_new    : true,
 				autoSave  : opts.autoSave,
 				autoFetch : false
-			}, function (err) {
+			}, function (err, item) {
 				if (err) {
-					err.index = idx;
-					err.instance = Instances[idx];
+					err.index    = index;
+					err.instance = item;
+
 					return cb(err);
 				}
-				Instances[idx].save(function (err) {
+				item.save(function (err) {
 					if (err) {
-						err.index = idx;
-						err.instance = Instances[idx];
+						err.index    = index;
+						err.instance = item;
 
 						return cb(err);
 					}
 
-					idx += 1;
-					createNext();
+					items[index] = item;
+					cb();
 				});
 			});
 		};
 
-		for (var i = 0; i < arguments.length; i++) {
-			switch (typeof arguments[i]) {
-				case "object":
-					if ( !single && Array.isArray(arguments[i]) ) {
-						Instances = Instances.concat(arguments[i]);
-					} else if (i === 0) {
-						single = true;
-						Instances.push(arguments[i]);
-					} else {
-						options = arguments[i];
-					}
-					break;
-				case "function":
-					cb = arguments[i];
-					break;
-			}
-		}
-
-		createNext();
+		async.eachOfSeries(itemsParams, iterator, function (err) {
+			if (err) return done(err);
+			done(null, single ? items[0] : items);
+		});
 
 		return this;
 	};
diff --git a/package.json b/package.json
index 9791cd9b..3a80de07 100644
--- a/package.json
+++ b/package.json
@@ -36,18 +36,18 @@
 	},
 	"analyse"     : false,
 	"dependencies": {
+		"async"            : "2.1.4",
 		"enforce"          : "0.1.6",
-		"sql-query"        : "0.1.26",
-		"sql-ddl-sync"     : "0.3.12",
 		"hat"              : "0.0.3",
 		"lodash"           : "4.17.2",
-		"path-is-absolute" : "1.0.1"
+		"path-is-absolute" : "1.0.1",
+		"sql-query"        : "0.1.26",
+		"sql-ddl-sync"     : "0.3.12"
 	},
 	"devDependencies": {
 		"mysql"   : "2.12.0",
 		"pg"      : "6.1.0",
 		"sqlite3" : "3.1.8",
-		"async"   : "1.5.2",
 		"mocha"   : "3.2.0",
 		"should"  : "11.1.1",
 		"mongodb" : "1.4.10",
diff --git a/test/integration/hook.js b/test/integration/hook.js
index 9daf5110..2a354280 100644
--- a/test/integration/hook.js
+++ b/test/integration/hook.js
@@ -181,7 +181,7 @@ describe("Hook", function() {
 			}));
 
 			it("should wait for hook to finish", function (done) {
-				this.timeout(500);
+				this.timeout(800);
 
 				Person.create([{ name: "John Doe" }], function () {
 					beforeCreate.should.be.true;
@@ -200,7 +200,7 @@ describe("Hook", function() {
 				}));
 
 				it("should trigger error", function (done) {
-					this.timeout(500);
+					this.timeout(800);
 
 					Person.create([{ name: "John Doe" }], function (err) {
 						err.should.be.a.Object();
@@ -301,7 +301,7 @@ describe("Hook", function() {
 			}));
 
 			it("should wait for hook to finish", function (done) {
-				this.timeout(500);
+				this.timeout(800);
 
 				Person.create([{ name: "John Doe" }], function () {
 					beforeSave.should.be.true;
@@ -324,7 +324,7 @@ describe("Hook", function() {
 				}));
 
 				it("should trigger error when creating", function (done) {
-					this.timeout(500);
+					this.timeout(800);
 
 					Person.create([{ name: "Jane Doe" }], function (err) {
 						err.should.be.a.Object();
@@ -335,7 +335,7 @@ describe("Hook", function() {
 				});
 
 				it("should trigger error when saving", function (done) {
-					this.timeout(500);
+					this.timeout(800);
 
 					Person.create([{ name: "John Doe" }], function (err, John) {
 						should.equal(err, null);
@@ -429,7 +429,7 @@ describe("Hook", function() {
 
 		describe("if hook method has 1 argument", function () {
 			var beforeValidation = false;
-			this.timeout(500);
+			this.timeout(800);
 
 			before(setup({
 				beforeValidation : function (next) {
@@ -508,7 +508,7 @@ describe("Hook", function() {
 			}));
 
 			it("should wait for hook to finish", function (done) {
-				this.timeout(500);
+				this.timeout(800);
 
 				Person.create([{ name: "John Doe" }], function (err, items) {
 					afterLoad.should.be.true;
@@ -525,7 +525,7 @@ describe("Hook", function() {
 				}));
 
 				it("should return error", function (done) {
-					this.timeout(500);
+					this.timeout(800);
 
 					Person.create([{ name: "John Doe" }], function (err, items) {
 						err.should.exist;
@@ -569,7 +569,7 @@ describe("Hook", function() {
 			}));
 
 			it("should wait for hook to finish", function (done) {
-				this.timeout(500);
+				this.timeout(800);
 
 				Person.create([{ name: "John Doe" }], function (err, items) {
 					afterAutoFetch.should.be.true;
@@ -586,7 +586,7 @@ describe("Hook", function() {
 				}));
 
 				it("should return error", function (done) {
-					this.timeout(500);
+					this.timeout(800);
 
 					Person.create([{ name: "John Doe" }], function (err, items) {
 						err.should.exist;
@@ -628,7 +628,7 @@ describe("Hook", function() {
 			}));
 
 			it("should wait for hook to finish", function (done) {
-				this.timeout(500);
+				this.timeout(800);
 
 				Person.create([{ name: "John Doe" }], function (err, items) {
 					items[0].remove(function () {
@@ -650,7 +650,7 @@ describe("Hook", function() {
 				}));
 
 				it("should trigger error", function (done) {
-					this.timeout(500);
+					this.timeout(800);
 
 					Person.create([{ name: "John Doe" }], function (err, items) {
 						items[0].remove(function (err) {

From d73f00089e7e56ba8cd867048a4a291564b2418c Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 19 Dec 2016 16:51:47 +1100
Subject: [PATCH 1088/1246] Fix has many 'has' accessor failing when join table
 has duplicate entries

---
 Changelog.md                            |   3 +
 lib/Associations/Many.js                |  22 +++--
 package.json                            |   2 +-
 test/integration/association-hasmany.js | 125 +++++++++++++++++-------
 4 files changed, 106 insertions(+), 46 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index aa885f96..35983490 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### v3.2.1
+- Fix has many 'has' accessor failing when join table has duplicate entries ([#761](../../issues/761))
+
 ### v3.2.0
 - Make [.find|.where|.all] synonyms & allow them to chain multiple times
 - Update dependencies
diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 1500772d..564659ce 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -158,6 +158,7 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 				return Driver.hasMany(Model, association).has(Instance, Instances, conditions, cb);
 			}
 
+			options.autoFetchLimit = 0;
 			options.__merge = {
 				from:   { table: association.mergeTable, field: Object.keys(association.mergeAssocId) },
 				to: { table: association.model.table, field: association.model.id.slice(0) },   // clone model id
@@ -180,14 +181,17 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 				util.populateConditions(association.model, Object.keys(association.mergeAssocId), Instances[i], options.__merge.where[1], false);
 			}
 
-			association.model.find(conditions, options, function (err, instances) {
-				if (err) {
-					return cb(err);
-				}
-				if (!Instances.length) {
-					return cb(null, instances.length > 0);
-				}
-				return cb(null, instances.length == Instances.length);
+			association.model.find(conditions, options, function (err, foundItems) {
+				if (err)                  return cb(err);
+				if (_.isEmpty(Instances)) return cb(null, false);
+
+				var foundItemsIDs = _(foundItems).map('id').uniq().value();
+				var InstancesIDs  = _(Instances ).map('id').uniq().value();
+
+				var sameLength    = foundItemsIDs.length == InstancesIDs.length;
+				var sameContents = sameLength && _.isEmpty(_.difference(foundItemsIDs, InstancesIDs));
+
+				return cb(null, sameContents);
 			});
 			return this;
 		},
@@ -296,6 +300,7 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 		value: function () {
 			var Associations = [];
 			var cb = noOperation;
+
 			for (var i = 0; i < arguments.length; i++) {
 				switch (typeof arguments[i]) {
 					case "function":
@@ -350,6 +355,7 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 			var Associations = [];
 			var opts = {};
 			var cb = noOperation;
+
 			var run = function () {
 				var savedAssociations = [];
 				var saveNextAssociation = function () {
diff --git a/package.json b/package.json
index 3a80de07..1403d501 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "3.2.0",
+	"version"     : "3.2.1",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",
diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
index c00892bb..da9fe9d1 100644
--- a/test/integration/association-hasmany.js
+++ b/test/integration/association-hasmany.js
@@ -36,35 +36,53 @@ describe("hasMany", function () {
 				});
 				Person.hasMany('pets', Pet, {}, { autoFetch: opts.autoFetchPets });
 
-				helper.dropSync([ Person, Pet ], function (err) {
-					if (err) return done(err);
-					/**
-					 * John --+---> Deco
-					 *        '---> Mutt <----- Jane
-					 *
-					 * Justin
-					 */
-					Person.create([{
-						name    : "John",
-						surname : "Doe",
-						age     : 20,
-						pets    : [{
-							name    : "Deco"
-						}, {
-							name    : "Mutt"
-						}]
-					}, {
-						name    : "Jane",
-						surname : "Doe",
-						age     : 16
-					}, {
-						name    : "Justin",
-						surname : "Dean",
-						age     : 18
-					}], function (err) {
-						Person.find({ name: "Jane" }, function (err, people) {
-							Pet.find({ name: "Mutt" }, function (err, pets) {
-								people[0].addPets(pets, done);
+				helper.dropSync([ Person, Pet], function (err) {
+					should.not.exist(err);
+
+					Pet.create([{ name: "Cat" }, { name: "Dog" }], function (err) {
+						should.not.exist(err);
+
+						/**
+						 * John --+---> Deco
+						 *        '---> Mutt <----- Jane
+						 *
+						 * Justin
+						 */
+						Person.create([
+							{
+								name    : "Bob",
+								surname : "Smith",
+								age     : 30
+							},
+							{
+								name    : "John",
+								surname : "Doe",
+								age     : 20,
+								pets    : [{
+									name    : "Deco"
+								}, {
+									name    : "Mutt"
+								}]
+							}, {
+								name    : "Jane",
+								surname : "Doe",
+								age     : 16
+							}, {
+								name    : "Justin",
+								surname : "Dean",
+								age     : 18
+							}
+						], function (err) {
+							should.not.exist(err);
+
+							Person.find({ name: "Jane" }, function (err, people) {
+								should.not.exist(err);
+
+								Pet.find({ name: "Mutt" }, function (err, pets) {
+									should.not.exist(err);
+
+									people[0].addPets(pets, done);
+								});
 							});
 						});
 					});
@@ -172,17 +190,17 @@ describe("hasMany", function () {
 				Person.find({}, function (err, people) {
 					should.equal(err, null);
 
-					people[0].getPets().count(function (err, count) {
+					people[1].getPets().count(function (err, count) {
 						should.not.exist(err);
 
 						should.strictEqual(count, 2);
 
-						people[1].getPets().count(function (err, count) {
+						people[2].getPets().count(function (err, count) {
 							should.not.exist(err);
 
 							should.strictEqual(count, 1);
 
-							people[2].getPets().count(function (err, count) {
+							people[3].getPets().count(function (err, count) {
 								should.not.exist(err);
 
 								should.strictEqual(count, 0);
@@ -257,6 +275,39 @@ describe("hasMany", function () {
 					});
 				});
 			});
+
+			if (common.protocol() != "mongodb") {
+				it("should return true if join table has duplicate entries", function (done) {
+					Pet.find({ name: ["Mutt", "Deco"] }, function (err, pets) {
+						should.not.exist(err);
+						should.equal(pets.length, 2);
+
+						Person.find({ name: "John" }).first(function (err, John) {
+							should.not.exist(err);
+
+							John.hasPets(pets, function (err, hasPets) {
+								should.equal(err, null);
+								should.equal(hasPets, true);
+
+								db.driver.execQuery(
+									"INSERT INTO person_pets (person_id, pets_id) VALUES (?,?), (?,?)",
+									[John.id, pets[0].id, John.id, pets[1].id],
+									function (err) {
+										should.not.exist(err);
+
+										John.hasPets(pets, function (err, hasPets) {
+											should.equal(err, null);
+											should.equal(hasPets, true);
+
+											done()
+										});
+									}
+								);
+							});
+						});
+					});
+				});
+			}
 		});
 
 		describe("delAccessor", function () {
@@ -499,7 +550,7 @@ describe("hasMany", function () {
 					should.equal(err, null);
 					Justin.getPets(function (err, pets) {
 						should.equal(err, null);
-						should.equal(pets.length, 2);
+						should.equal(pets.length, 4);
 
 						Justin.setPets([], function (err) {
 							should.equal(err, null);
@@ -586,7 +637,7 @@ describe("hasMany", function () {
 			it("should not auto save associations which were autofetched", function (done) {
 				Pet.all(function (err, pets) {
 					should.not.exist(err);
-					should.equal(pets.length, 2);
+					should.equal(pets.length, 4);
 
 					Person.create({ name: 'Paul' }, function (err, paul) {
 						should.not.exist(err);
@@ -601,7 +652,7 @@ describe("hasMany", function () {
 								// reload paul to make sure we have 2 pets
 								Person.one({ name: 'Paul' }, function (err, paul) {
 									should.not.exist(err);
-									should.equal(paul.pets.length, 2);
+									should.equal(paul.pets.length, 4);
 
 									// Saving paul2 should NOT auto save associations and hence delete
 									// the associations we just created.
@@ -611,7 +662,7 @@ describe("hasMany", function () {
 										// let's check paul - pets should still be associated
 										Person.one({ name: 'Paul' }, function (err, paul) {
 											should.not.exist(err);
-											should.equal(paul.pets.length, 2);
+											should.equal(paul.pets.length, 4);
 
 											done();
 										});
@@ -666,7 +717,7 @@ describe("hasMany", function () {
 			Account.hasMany('emails', Email, {}, { key: opts.key });
 
 			helper.dropSync([ Email, Account ], function (err) {
-				if (err) return done(err);
+				should.not.exist(err);
 				done()
 			});
 		};

From 71f3e7362b1b05ce0af3ee02f2613bedf19338af Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 20 Dec 2016 09:55:13 +1100
Subject: [PATCH 1089/1246] Fix hasmany 'has' accessor to work with custom keys

---
 Changelog.md             |  3 +++
 lib/Associations/Many.js | 12 +++++++++---
 package.json             |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 35983490..accaffbc 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### v3.2.2
+- Fix the fix in [#761](../../issues/761) so that it works with custom keys ([#762](../../issues/762))
+
 ### v3.2.1
 - Fix has many 'has' accessor failing when join table has duplicate entries ([#761](../../issues/761))
 
diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 564659ce..29230899 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -185,10 +185,16 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 				if (err)                  return cb(err);
 				if (_.isEmpty(Instances)) return cb(null, false);
 
-				var foundItemsIDs = _(foundItems).map('id').uniq().value();
-				var InstancesIDs  = _(Instances ).map('id').uniq().value();
+				var mapKeysToString = function (item) {
+					return _.map(association.model.keys, function (k) {
+						return item[k];
+					}).join(',')
+				}
+
+				var foundItemsIDs = _(foundItems).map(mapKeysToString).uniq().value();
+				var InstancesIDs  = _(Instances ).map(mapKeysToString).uniq().value();
 
-				var sameLength    = foundItemsIDs.length == InstancesIDs.length;
+				var sameLength   = foundItemsIDs.length == InstancesIDs.length;
 				var sameContents = sameLength && _.isEmpty(_.difference(foundItemsIDs, InstancesIDs));
 
 				return cb(null, sameContents);
diff --git a/package.json b/package.json
index 1403d501..850fdd73 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "3.2.1",
+	"version"     : "3.2.2",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",

From d2c84d9720b32283d6b84bfe8a6d6c3f90f821e9 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Wed, 4 Jan 2017 10:02:56 +0000
Subject: [PATCH 1090/1246] enforce@0.1.7

This is just an update to dependencies.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 850fdd73..086646c5 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
 	"analyse"     : false,
 	"dependencies": {
 		"async"            : "2.1.4",
-		"enforce"          : "0.1.6",
+		"enforce"          : "0.1.7",
 		"hat"              : "0.0.3",
 		"lodash"           : "4.17.2",
 		"path-is-absolute" : "1.0.1",

From 25de119e1f47b532626c1591257bbd8bf5d72505 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Fri, 6 Jan 2017 12:06:54 +1100
Subject: [PATCH 1091/1246] v3.2.3

---
 Changelog.md | 3 +++
 Readme.md    | 2 +-
 package.json | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index accaffbc..a0f64151 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### v3.2.3
+- Upgrade `enforce` package to improve TLD validation ([#763](../../issues/763))
+
 ### v3.2.2
 - Fix the fix in [#761](../../issues/761) so that it works with custom keys ([#762](../../issues/762))
 
diff --git a/Readme.md b/Readme.md
index 4746f1db..e0297cb8 100755
--- a/Readme.md
+++ b/Readme.md
@@ -13,7 +13,7 @@ npm install orm
 
 ## Node.js Version Support
 
-Supported: 0.12 - 4.0 +
+Supported: 0.12 - 6.0 +
 
 Tests are run on [Travis CI](https://travis-ci.org/)
 If you want you can run tests locally:
diff --git a/package.json b/package.json
index 086646c5..d9583ac7 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "3.2.2",
+	"version"     : "3.2.3",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",

From 3cbd2e5035754534db71aa02b13bbe43082851d7 Mon Sep 17 00:00:00 2001
From: yaya <yaya@coolcto.com>
Date: Mon, 13 Mar 2017 21:37:04 +0800
Subject: [PATCH 1092/1246] fix the sqlite connect with " " in the path

---
 lib/Drivers/DML/sqlite.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index e0474a3f..a1769f2f 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -26,10 +26,11 @@ function Driver(config, connection, opts) {
 		// url.parse() as the hostname. If host is defined, assume
 		// it's the drive letter and add ":"
 		if (process.platform == "win32" && config.host && config.host.match(/^[a-z]$/i)) {
-			this.db = new sqlite3.Database(((config.host ? config.host + ":" : "") + (config.pathname || "")) || ':memory:');
+			this.db = new sqlite3.Database(decodeURIComponent((config.host ? config.host + ":" : "") + (config.pathname || "")) || ':memory:');
 		} else {
-			this.db = new sqlite3.Database(((config.host ? config.host : "") + (config.pathname || "")) || ':memory:');
+			this.db = new sqlite3.Database(decodeURIComponent((config.host ? config.host : "") + (config.pathname || "")) || ':memory:');
 		}
+
 	}
 
 	this.aggregate_functions = [ "ABS", "ROUND",

From 799119a29bcba87f9a596de8314e8570c6270fd4 Mon Sep 17 00:00:00 2001
From: Amila Welihinda <amilajack@users.noreply.github.com>
Date: Fri, 24 Mar 2017 17:41:59 -0700
Subject: [PATCH 1093/1246] Updated repo badge to svg

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index e0297cb8..e480e530 100755
--- a/Readme.md
+++ b/Readme.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://api.travis-ci.org/dresende/node-orm2.svg?branch=master)](http://travis-ci.org/dresende/node-orm2)
 [![](https://badge.fury.io/js/orm.svg)](https://npmjs.org/package/orm)
-[![](https://gemnasium.com/dresende/node-orm2.png)](https://gemnasium.com/dresende/node-orm2)
+[![](https://gemnasium.com/dresende/node-orm2.svg)](https://gemnasium.com/dresende/node-orm2)
 [![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=dresende&url=https://github.com/dresende/node-orm2&title=ORM&language=&tags=github&category=software)
 
 ## Install

From 61978fe14f26278d1ccce47e59331a27c4a797e7 Mon Sep 17 00:00:00 2001
From: Dumitru Lungu <ldimlight@gmail.com>
Date: Wed, 28 Jun 2017 16:32:59 +0300
Subject: [PATCH 1094/1246] Typo

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index e480e530..70427a3f 100755
--- a/Readme.md
+++ b/Readme.md
@@ -55,7 +55,7 @@ orm.connect("mysql://username:password@host/database", function (err, db) {
 		surname   : String,
 		age       : Number, // FLOAT
 		male      : Boolean,
-		continent : [ "Europe", "America", "Asia", "Africa", "Australia", "Antartica" ], // ENUM type
+		continent : [ "Europe", "America", "Asia", "Africa", "Australia", "Antarctica" ], // ENUM type
 		photo     : Buffer, // BLOB/BINARY
 		data      : Object // JSON encoded
 	}, {

From f835a04feb3db1a2227ff543e174b707fe0fce9c Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 18 Jul 2017 13:33:51 +1000
Subject: [PATCH 1095/1246] Update packages

---
 .travis.yml       |    1 +
 Changelog.md      |    3 +
 Readme.md         |    2 +-
 package-lock.json | 1808 +++++++++++++++++++++++++++++++++++++++++++++
 package.json      |  101 ++-
 test/common.js    |    5 +
 test/run.js       |    9 +
 7 files changed, 1891 insertions(+), 38 deletions(-)
 create mode 100644 package-lock.json

diff --git a/.travis.yml b/.travis.yml
index 2f750a20..4d1b06af 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ language: node_js
 node_js:
   - '4'
   - '6'
+  - '8'
 before_script:
   - mysql -e 'create database orm_test;'
   - psql -c 'create database orm_test;' -U postgres
diff --git a/Changelog.md b/Changelog.md
index a0f64151..0a3490dc 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### v3.2.4
+- Update dependencies
+
 ### v3.2.3
 - Upgrade `enforce` package to improve TLD validation ([#763](../../issues/763))
 
diff --git a/Readme.md b/Readme.md
index 70427a3f..4a68bbfc 100755
--- a/Readme.md
+++ b/Readme.md
@@ -28,7 +28,7 @@ npm test
 - PostgreSQL
 - Amazon Redshift
 - SQLite
-- MongoDB (beta, missing aggregation for now)
+- MongoDB (beta, node 6 or older, doesn't work with node 8. Also, missing aggregation features)
 
 ## Features
 
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000..c0832151
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,1808 @@
+{
+	"name": "orm",
+	"version": "3.2.4",
+	"lockfileVersion": 1,
+	"requires": true,
+	"dependencies": {
+		"ansi-styles": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz",
+			"integrity": "sha1-CcIC1ckX7CMYjKpcnLkXnNlUd1A=",
+			"dev": true,
+			"requires": {
+				"color-convert": "1.9.0"
+			}
+		},
+		"ap": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/ap/-/ap-0.2.0.tgz",
+			"integrity": "sha1-rglCYAspkS8NKxTsYMRejzMLYRA=",
+			"dev": true
+		},
+		"async": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
+			"integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
+			"requires": {
+				"lodash": "4.17.4"
+			}
+		},
+		"balanced-match": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+			"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+			"dev": true
+		},
+		"bignumber.js": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-3.1.2.tgz",
+			"integrity": "sha1-8725mtUmihX8HwvtL7AY4mk/4jY=",
+			"dev": true
+		},
+		"brace-expansion": {
+			"version": "1.1.8",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
+			"integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
+			"dev": true,
+			"requires": {
+				"balanced-match": "1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"browser-stdout": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz",
+			"integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=",
+			"dev": true
+		},
+		"bson": {
+			"version": "0.2.22",
+			"resolved": "https://registry.npmjs.org/bson/-/bson-0.2.22.tgz",
+			"integrity": "sha1-/NoQPybQwHTVpS1Qkn24D9ArSzk=",
+			"dev": true,
+			"requires": {
+				"nan": "1.8.4"
+			}
+		},
+		"buffer-writer": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-1.0.1.tgz",
+			"integrity": "sha1-Iqk2kB4wKa/NdUfrRIfOtpejvwg=",
+			"dev": true
+		},
+		"chalk": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz",
+			"integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==",
+			"dev": true,
+			"requires": {
+				"ansi-styles": "3.1.0",
+				"escape-string-regexp": "1.0.5",
+				"supports-color": "4.2.0"
+			}
+		},
+		"color-convert": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz",
+			"integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=",
+			"dev": true,
+			"requires": {
+				"color-name": "1.1.3"
+			}
+		},
+		"color-name": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+			"dev": true
+		},
+		"commander": {
+			"version": "2.9.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
+			"integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
+			"dev": true,
+			"requires": {
+				"graceful-readlink": "1.0.1"
+			}
+		},
+		"concat-map": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+			"dev": true
+		},
+		"core-util-is": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+			"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+			"dev": true
+		},
+		"debug": {
+			"version": "2.6.0",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz",
+			"integrity": "sha1-vFlryr52F/Edn6FTYe3tVgi4SZs=",
+			"dev": true,
+			"requires": {
+				"ms": "0.7.2"
+			}
+		},
+		"diff": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz",
+			"integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k=",
+			"dev": true
+		},
+		"enforce": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/enforce/-/enforce-0.1.7.tgz",
+			"integrity": "sha1-r3zdP6mCsuyq4GrntcJZUX0ivj8="
+		},
+		"escape-string-regexp": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+			"dev": true
+		},
+		"fs.realpath": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+			"dev": true
+		},
+		"generic-pool": {
+			"version": "2.4.3",
+			"resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.4.3.tgz",
+			"integrity": "sha1-eAw29p360FpaBF3Te+etyhGk9v8=",
+			"dev": true
+		},
+		"glob": {
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+			"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+			"dev": true,
+			"requires": {
+				"fs.realpath": "1.0.0",
+				"inflight": "1.0.6",
+				"inherits": "2.0.3",
+				"minimatch": "3.0.4",
+				"once": "1.4.0",
+				"path-is-absolute": "1.0.1"
+			}
+		},
+		"graceful-readlink": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
+			"integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
+			"dev": true
+		},
+		"growl": {
+			"version": "1.9.2",
+			"resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
+			"integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=",
+			"dev": true
+		},
+		"has-flag": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+			"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+			"dev": true
+		},
+		"hat": {
+			"version": "0.0.3",
+			"resolved": "https://registry.npmjs.org/hat/-/hat-0.0.3.tgz",
+			"integrity": "sha1-uwFKnmSzeIrtgAWRdBPU/z1QLYo="
+		},
+		"inflight": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+			"dev": true,
+			"requires": {
+				"once": "1.4.0",
+				"wrappy": "1.0.2"
+			}
+		},
+		"inherits": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+			"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+			"dev": true
+		},
+		"isarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+			"dev": true,
+			"optional": true
+		},
+		"json3": {
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
+			"integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
+			"dev": true
+		},
+		"kerberos": {
+			"version": "0.0.4",
+			"resolved": "https://registry.npmjs.org/kerberos/-/kerberos-0.0.4.tgz",
+			"integrity": "sha1-EYNmOPcpovbFuuBWp9ehWJjJunw=",
+			"dev": true,
+			"optional": true
+		},
+		"lodash": {
+			"version": "4.17.4",
+			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+			"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
+		},
+		"lodash._baseassign": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
+			"integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
+			"dev": true,
+			"requires": {
+				"lodash._basecopy": "3.0.1",
+				"lodash.keys": "3.1.2"
+			}
+		},
+		"lodash._basecopy": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+			"integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
+			"dev": true
+		},
+		"lodash._basecreate": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz",
+			"integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=",
+			"dev": true
+		},
+		"lodash._getnative": {
+			"version": "3.9.1",
+			"resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+			"integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
+			"dev": true
+		},
+		"lodash._isiterateecall": {
+			"version": "3.0.9",
+			"resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+			"integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
+			"dev": true
+		},
+		"lodash.create": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz",
+			"integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=",
+			"dev": true,
+			"requires": {
+				"lodash._baseassign": "3.2.0",
+				"lodash._basecreate": "3.0.3",
+				"lodash._isiterateecall": "3.0.9"
+			}
+		},
+		"lodash.isarguments": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+			"integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
+			"dev": true
+		},
+		"lodash.isarray": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+			"integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
+			"dev": true
+		},
+		"lodash.keys": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+			"integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
+			"dev": true,
+			"requires": {
+				"lodash._getnative": "3.9.1",
+				"lodash.isarguments": "3.1.0",
+				"lodash.isarray": "3.0.4"
+			}
+		},
+		"minimatch": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+			"dev": true,
+			"requires": {
+				"brace-expansion": "1.1.8"
+			}
+		},
+		"minimist": {
+			"version": "0.0.8",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+			"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+			"dev": true
+		},
+		"mkdirp": {
+			"version": "0.5.1",
+			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+			"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+			"dev": true,
+			"requires": {
+				"minimist": "0.0.8"
+			}
+		},
+		"mocha": {
+			"version": "3.4.2",
+			"resolved": "https://registry.npmjs.org/mocha/-/mocha-3.4.2.tgz",
+			"integrity": "sha1-0O9NMyEm2/GNDWQMmzgt1IvpdZQ=",
+			"dev": true,
+			"requires": {
+				"browser-stdout": "1.3.0",
+				"commander": "2.9.0",
+				"debug": "2.6.0",
+				"diff": "3.2.0",
+				"escape-string-regexp": "1.0.5",
+				"glob": "7.1.1",
+				"growl": "1.9.2",
+				"json3": "3.3.2",
+				"lodash.create": "3.1.1",
+				"mkdirp": "0.5.1",
+				"supports-color": "3.1.2"
+			},
+			"dependencies": {
+				"glob": {
+					"version": "7.1.1",
+					"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
+					"integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=",
+					"dev": true,
+					"requires": {
+						"fs.realpath": "1.0.0",
+						"inflight": "1.0.6",
+						"inherits": "2.0.3",
+						"minimatch": "3.0.4",
+						"once": "1.4.0",
+						"path-is-absolute": "1.0.1"
+					}
+				},
+				"has-flag": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "3.1.2",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
+					"integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=",
+					"dev": true,
+					"requires": {
+						"has-flag": "1.0.0"
+					}
+				}
+			}
+		},
+		"mongodb": {
+			"version": "1.4.10",
+			"resolved": "https://registry.npmjs.org/mongodb/-/mongodb-1.4.10.tgz",
+			"integrity": "sha1-6wEjlshB1H3GKtNicu6lUOW2l5s=",
+			"dev": true,
+			"requires": {
+				"bson": "0.2.22",
+				"kerberos": "0.0.4",
+				"readable-stream": "2.3.3"
+			}
+		},
+		"ms": {
+			"version": "0.7.2",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
+			"integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
+			"dev": true
+		},
+		"mysql": {
+			"version": "2.13.0",
+			"resolved": "https://registry.npmjs.org/mysql/-/mysql-2.13.0.tgz",
+			"integrity": "sha1-mY8fjKRuLj3XFJzpgkE2U5hqrkc=",
+			"dev": true,
+			"requires": {
+				"bignumber.js": "3.1.2",
+				"readable-stream": "1.1.14",
+				"sqlstring": "2.2.0"
+			},
+			"dependencies": {
+				"isarray": {
+					"version": "0.0.1",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "1.1.14",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+					"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+					"dev": true,
+					"requires": {
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.3",
+						"isarray": "0.0.1",
+						"string_decoder": "0.10.31"
+					}
+				},
+				"string_decoder": {
+					"version": "0.10.31",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+					"dev": true
+				}
+			}
+		},
+		"nan": {
+			"version": "1.8.4",
+			"resolved": "https://registry.npmjs.org/nan/-/nan-1.8.4.tgz",
+			"integrity": "sha1-PHa1OC6rM+RLdY0oE8qdkuk0LzQ=",
+			"dev": true
+		},
+		"object-assign": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz",
+			"integrity": "sha1-ejs9DpgGPUP0wD8uiubNUahog6A=",
+			"dev": true
+		},
+		"once": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+			"dev": true,
+			"requires": {
+				"wrappy": "1.0.2"
+			}
+		},
+		"packet-reader": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-0.3.1.tgz",
+			"integrity": "sha1-zWLmCvjX/qinBexP+ZCHHEaHHyc=",
+			"dev": true
+		},
+		"path-is-absolute": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+		},
+		"pg": {
+			"version": "6.4.1",
+			"resolved": "https://registry.npmjs.org/pg/-/pg-6.4.1.tgz",
+			"integrity": "sha1-PqvYygVoFEN8dp8X/3oMNqxwI8U=",
+			"dev": true,
+			"requires": {
+				"buffer-writer": "1.0.1",
+				"packet-reader": "0.3.1",
+				"pg-connection-string": "0.1.3",
+				"pg-pool": "1.8.0",
+				"pg-types": "1.12.0",
+				"pgpass": "1.0.2",
+				"semver": "4.3.2"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "4.3.2",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-4.3.2.tgz",
+					"integrity": "sha1-x6BxWKgL7dBSNVt3DYLWZA+AO+c=",
+					"dev": true
+				}
+			}
+		},
+		"pg-connection-string": {
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-0.1.3.tgz",
+			"integrity": "sha1-2hhHsglA5C7hSSvq9l1J2RskXfc=",
+			"dev": true
+		},
+		"pg-pool": {
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-1.8.0.tgz",
+			"integrity": "sha1-9+xzgkw3oD8Hb1G/33DjQBR8Tzc=",
+			"dev": true,
+			"requires": {
+				"generic-pool": "2.4.3",
+				"object-assign": "4.1.0"
+			}
+		},
+		"pg-types": {
+			"version": "1.12.0",
+			"resolved": "https://registry.npmjs.org/pg-types/-/pg-types-1.12.0.tgz",
+			"integrity": "sha1-itO3uJfj/UY+Yt4kGtX8ZAtKZvA=",
+			"dev": true,
+			"requires": {
+				"ap": "0.2.0",
+				"postgres-array": "1.0.2",
+				"postgres-bytea": "1.0.0",
+				"postgres-date": "1.0.3",
+				"postgres-interval": "1.1.0"
+			}
+		},
+		"pgpass": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.2.tgz",
+			"integrity": "sha1-Knu0G2BltnkH6R2hsHwYR8h3swY=",
+			"dev": true,
+			"requires": {
+				"split": "1.0.0"
+			}
+		},
+		"postgres-array": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-1.0.2.tgz",
+			"integrity": "sha1-jgsy6wO/d6XAp4UeBEHBaaJWojg=",
+			"dev": true
+		},
+		"postgres-bytea": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
+			"integrity": "sha1-AntTPAqokOJtFy1Hz5zOzFIazTU=",
+			"dev": true
+		},
+		"postgres-date": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.3.tgz",
+			"integrity": "sha1-4tiXAu/bJY/52c7g/pG9BpdSV6g=",
+			"dev": true
+		},
+		"postgres-interval": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.1.0.tgz",
+			"integrity": "sha1-EDHnusNFZBMoYq3J62xtLzqnW7Q=",
+			"dev": true,
+			"requires": {
+				"xtend": "4.0.1"
+			}
+		},
+		"process-nextick-args": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+			"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+			"dev": true,
+			"optional": true
+		},
+		"readable-stream": {
+			"version": "2.3.3",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+			"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"core-util-is": "1.0.2",
+				"inherits": "2.0.3",
+				"isarray": "1.0.0",
+				"process-nextick-args": "1.0.7",
+				"safe-buffer": "5.1.1",
+				"string_decoder": "1.0.3",
+				"util-deprecate": "1.0.2"
+			}
+		},
+		"safe-buffer": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+			"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+			"dev": true
+		},
+		"semver": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+			"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+			"dev": true
+		},
+		"should": {
+			"version": "11.2.1",
+			"resolved": "https://registry.npmjs.org/should/-/should-11.2.1.tgz",
+			"integrity": "sha1-kPVRRVUtAc/CAGZuToGKHJZw7aI=",
+			"dev": true,
+			"requires": {
+				"should-equal": "1.0.1",
+				"should-format": "3.0.3",
+				"should-type": "1.4.0",
+				"should-type-adaptors": "1.0.1",
+				"should-util": "1.0.0"
+			}
+		},
+		"should-equal": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/should-equal/-/should-equal-1.0.1.tgz",
+			"integrity": "sha1-C26VFvJgGp+wuy3MNpr6HH4gCvc=",
+			"dev": true,
+			"requires": {
+				"should-type": "1.4.0"
+			}
+		},
+		"should-format": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz",
+			"integrity": "sha1-m/yPdPo5IFxT04w01xcwPidxJPE=",
+			"dev": true,
+			"requires": {
+				"should-type": "1.4.0",
+				"should-type-adaptors": "1.0.1"
+			}
+		},
+		"should-type": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/should-type/-/should-type-1.4.0.tgz",
+			"integrity": "sha1-B1bYzoRt/QmEOmlHcZ36DUz/XPM=",
+			"dev": true
+		},
+		"should-type-adaptors": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.0.1.tgz",
+			"integrity": "sha1-7+VVPN9oz/ZuXF9RtxLcNRx3vqo=",
+			"dev": true,
+			"requires": {
+				"should-type": "1.4.0",
+				"should-util": "1.0.0"
+			}
+		},
+		"should-util": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/should-util/-/should-util-1.0.0.tgz",
+			"integrity": "sha1-yYzaN0qmsZDfi6h8mInCtNtiAGM=",
+			"dev": true
+		},
+		"split": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/split/-/split-1.0.0.tgz",
+			"integrity": "sha1-xDlc5oOrzSVLwo/h2rtuXCfc/64=",
+			"dev": true,
+			"requires": {
+				"through": "2.3.8"
+			}
+		},
+		"sql-ddl-sync": {
+			"version": "0.3.13",
+			"resolved": "https://registry.npmjs.org/sql-ddl-sync/-/sql-ddl-sync-0.3.13.tgz",
+			"integrity": "sha512-8hxYFdiwBoRySLFeBeMOiipvCJvtHcIEMuegQRqvBuOcjyhZgalv+uNlO1RIQNu/A+Jm9d8K8fTFbQYxH2KEAg==",
+			"requires": {
+				"lodash": "4.17.4"
+			}
+		},
+		"sql-query": {
+			"version": "0.1.26",
+			"resolved": "https://registry.npmjs.org/sql-query/-/sql-query-0.1.26.tgz",
+			"integrity": "sha1-yNNYvl2xxJzCBVVYuj32TlpIxEE="
+		},
+		"sqlite3": {
+			"version": "3.1.8",
+			"resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-3.1.8.tgz",
+			"integrity": "sha1-TLz5Zdi5AdGxAVy8f8QVquFX36o=",
+			"dev": true,
+			"requires": {
+				"nan": "2.4.0",
+				"node-pre-gyp": "0.6.31"
+			},
+			"dependencies": {
+				"nan": {
+					"version": "2.4.0",
+					"resolved": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz",
+					"integrity": "sha1-+zxZ1F/k7/4hXwuJD4rfbrMtIjI=",
+					"dev": true
+				},
+				"node-pre-gyp": {
+					"version": "0.6.31",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"mkdirp": "0.5.1",
+						"nopt": "3.0.6",
+						"npmlog": "4.0.0",
+						"rc": "1.1.6",
+						"request": "2.76.0",
+						"rimraf": "2.5.4",
+						"semver": "5.3.0",
+						"tar": "2.2.1",
+						"tar-pack": "3.3.0"
+					},
+					"dependencies": {
+						"mkdirp": {
+							"version": "0.5.1",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"minimist": "0.0.8"
+							},
+							"dependencies": {
+								"minimist": {
+									"version": "0.0.8",
+									"bundled": true,
+									"dev": true
+								}
+							}
+						},
+						"nopt": {
+							"version": "3.0.6",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"abbrev": "1.0.9"
+							},
+							"dependencies": {
+								"abbrev": {
+									"version": "1.0.9",
+									"bundled": true,
+									"dev": true
+								}
+							}
+						},
+						"npmlog": {
+							"version": "4.0.0",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"are-we-there-yet": "1.1.2",
+								"console-control-strings": "1.1.0",
+								"gauge": "2.6.0",
+								"set-blocking": "2.0.0"
+							},
+							"dependencies": {
+								"are-we-there-yet": {
+									"version": "1.1.2",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"delegates": "1.0.0",
+										"readable-stream": "2.1.5"
+									},
+									"dependencies": {
+										"delegates": {
+											"version": "1.0.0",
+											"bundled": true,
+											"dev": true
+										},
+										"readable-stream": {
+											"version": "2.1.5",
+											"bundled": true,
+											"dev": true,
+											"requires": {
+												"buffer-shims": "1.0.0",
+												"core-util-is": "1.0.2",
+												"inherits": "2.0.3",
+												"isarray": "1.0.0",
+												"process-nextick-args": "1.0.7",
+												"string_decoder": "0.10.31",
+												"util-deprecate": "1.0.2"
+											},
+											"dependencies": {
+												"buffer-shims": {
+													"version": "1.0.0",
+													"bundled": true,
+													"dev": true
+												},
+												"core-util-is": {
+													"version": "1.0.2",
+													"bundled": true,
+													"dev": true
+												},
+												"inherits": {
+													"version": "2.0.3",
+													"bundled": true,
+													"dev": true
+												},
+												"isarray": {
+													"version": "1.0.0",
+													"bundled": true,
+													"dev": true
+												},
+												"process-nextick-args": {
+													"version": "1.0.7",
+													"bundled": true,
+													"dev": true
+												},
+												"string_decoder": {
+													"version": "0.10.31",
+													"bundled": true,
+													"dev": true
+												},
+												"util-deprecate": {
+													"version": "1.0.2",
+													"bundled": true,
+													"dev": true
+												}
+											}
+										}
+									}
+								},
+								"console-control-strings": {
+									"version": "1.1.0",
+									"bundled": true,
+									"dev": true
+								},
+								"gauge": {
+									"version": "2.6.0",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"aproba": "1.0.4",
+										"console-control-strings": "1.1.0",
+										"has-color": "0.1.7",
+										"has-unicode": "2.0.1",
+										"object-assign": "4.1.0",
+										"signal-exit": "3.0.1",
+										"string-width": "1.0.2",
+										"strip-ansi": "3.0.1",
+										"wide-align": "1.1.0"
+									},
+									"dependencies": {
+										"aproba": {
+											"version": "1.0.4",
+											"bundled": true,
+											"dev": true
+										},
+										"has-color": {
+											"version": "0.1.7",
+											"bundled": true,
+											"dev": true
+										},
+										"has-unicode": {
+											"version": "2.0.1",
+											"bundled": true,
+											"dev": true
+										},
+										"object-assign": {
+											"version": "4.1.0",
+											"bundled": true,
+											"dev": true
+										},
+										"signal-exit": {
+											"version": "3.0.1",
+											"bundled": true,
+											"dev": true
+										},
+										"string-width": {
+											"version": "1.0.2",
+											"bundled": true,
+											"dev": true,
+											"requires": {
+												"code-point-at": "1.0.1",
+												"is-fullwidth-code-point": "1.0.0",
+												"strip-ansi": "3.0.1"
+											},
+											"dependencies": {
+												"code-point-at": {
+													"version": "1.0.1",
+													"bundled": true,
+													"dev": true,
+													"requires": {
+														"number-is-nan": "1.0.1"
+													},
+													"dependencies": {
+														"number-is-nan": {
+															"version": "1.0.1",
+															"bundled": true,
+															"dev": true
+														}
+													}
+												},
+												"is-fullwidth-code-point": {
+													"version": "1.0.0",
+													"bundled": true,
+													"dev": true,
+													"requires": {
+														"number-is-nan": "1.0.1"
+													},
+													"dependencies": {
+														"number-is-nan": {
+															"version": "1.0.1",
+															"bundled": true,
+															"dev": true
+														}
+													}
+												}
+											}
+										},
+										"strip-ansi": {
+											"version": "3.0.1",
+											"bundled": true,
+											"dev": true,
+											"requires": {
+												"ansi-regex": "2.0.0"
+											},
+											"dependencies": {
+												"ansi-regex": {
+													"version": "2.0.0",
+													"bundled": true,
+													"dev": true
+												}
+											}
+										},
+										"wide-align": {
+											"version": "1.1.0",
+											"bundled": true,
+											"dev": true,
+											"requires": {
+												"string-width": "1.0.2"
+											}
+										}
+									}
+								},
+								"set-blocking": {
+									"version": "2.0.0",
+									"bundled": true,
+									"dev": true
+								}
+							}
+						},
+						"rc": {
+							"version": "1.1.6",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"deep-extend": "0.4.1",
+								"ini": "1.3.4",
+								"minimist": "1.2.0",
+								"strip-json-comments": "1.0.4"
+							},
+							"dependencies": {
+								"deep-extend": {
+									"version": "0.4.1",
+									"bundled": true,
+									"dev": true
+								},
+								"ini": {
+									"version": "1.3.4",
+									"bundled": true,
+									"dev": true
+								},
+								"minimist": {
+									"version": "1.2.0",
+									"bundled": true,
+									"dev": true
+								},
+								"strip-json-comments": {
+									"version": "1.0.4",
+									"bundled": true,
+									"dev": true
+								}
+							}
+						},
+						"request": {
+							"version": "2.76.0",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"aws-sign2": "0.6.0",
+								"aws4": "1.5.0",
+								"caseless": "0.11.0",
+								"combined-stream": "1.0.5",
+								"extend": "3.0.0",
+								"forever-agent": "0.6.1",
+								"form-data": "2.1.1",
+								"har-validator": "2.0.6",
+								"hawk": "3.1.3",
+								"http-signature": "1.1.1",
+								"is-typedarray": "1.0.0",
+								"isstream": "0.1.2",
+								"json-stringify-safe": "5.0.1",
+								"mime-types": "2.1.12",
+								"node-uuid": "1.4.7",
+								"oauth-sign": "0.8.2",
+								"qs": "6.3.0",
+								"stringstream": "0.0.5",
+								"tough-cookie": "2.3.2",
+								"tunnel-agent": "0.4.3"
+							},
+							"dependencies": {
+								"aws-sign2": {
+									"version": "0.6.0",
+									"bundled": true,
+									"dev": true
+								},
+								"aws4": {
+									"version": "1.5.0",
+									"bundled": true,
+									"dev": true
+								},
+								"caseless": {
+									"version": "0.11.0",
+									"bundled": true,
+									"dev": true
+								},
+								"combined-stream": {
+									"version": "1.0.5",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"delayed-stream": "1.0.0"
+									},
+									"dependencies": {
+										"delayed-stream": {
+											"version": "1.0.0",
+											"bundled": true,
+											"dev": true
+										}
+									}
+								},
+								"extend": {
+									"version": "3.0.0",
+									"bundled": true,
+									"dev": true
+								},
+								"forever-agent": {
+									"version": "0.6.1",
+									"bundled": true,
+									"dev": true
+								},
+								"form-data": {
+									"version": "2.1.1",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"asynckit": "0.4.0",
+										"combined-stream": "1.0.5",
+										"mime-types": "2.1.12"
+									},
+									"dependencies": {
+										"asynckit": {
+											"version": "0.4.0",
+											"bundled": true,
+											"dev": true
+										}
+									}
+								},
+								"har-validator": {
+									"version": "2.0.6",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"chalk": "1.1.3",
+										"commander": "2.9.0",
+										"is-my-json-valid": "2.15.0",
+										"pinkie-promise": "2.0.1"
+									},
+									"dependencies": {
+										"chalk": {
+											"version": "1.1.3",
+											"bundled": true,
+											"dev": true,
+											"requires": {
+												"ansi-styles": "2.2.1",
+												"escape-string-regexp": "1.0.5",
+												"has-ansi": "2.0.0",
+												"strip-ansi": "3.0.1",
+												"supports-color": "2.0.0"
+											},
+											"dependencies": {
+												"ansi-styles": {
+													"version": "2.2.1",
+													"bundled": true,
+													"dev": true
+												},
+												"escape-string-regexp": {
+													"version": "1.0.5",
+													"bundled": true,
+													"dev": true
+												},
+												"has-ansi": {
+													"version": "2.0.0",
+													"bundled": true,
+													"dev": true,
+													"requires": {
+														"ansi-regex": "2.0.0"
+													},
+													"dependencies": {
+														"ansi-regex": {
+															"version": "2.0.0",
+															"bundled": true,
+															"dev": true
+														}
+													}
+												},
+												"strip-ansi": {
+													"version": "3.0.1",
+													"bundled": true,
+													"dev": true,
+													"requires": {
+														"ansi-regex": "2.0.0"
+													},
+													"dependencies": {
+														"ansi-regex": {
+															"version": "2.0.0",
+															"bundled": true,
+															"dev": true
+														}
+													}
+												},
+												"supports-color": {
+													"version": "2.0.0",
+													"bundled": true,
+													"dev": true
+												}
+											}
+										},
+										"commander": {
+											"version": "2.9.0",
+											"bundled": true,
+											"dev": true,
+											"requires": {
+												"graceful-readlink": "1.0.1"
+											},
+											"dependencies": {
+												"graceful-readlink": {
+													"version": "1.0.1",
+													"bundled": true,
+													"dev": true
+												}
+											}
+										},
+										"is-my-json-valid": {
+											"version": "2.15.0",
+											"bundled": true,
+											"dev": true,
+											"requires": {
+												"generate-function": "2.0.0",
+												"generate-object-property": "1.2.0",
+												"jsonpointer": "4.0.0",
+												"xtend": "4.0.1"
+											},
+											"dependencies": {
+												"generate-function": {
+													"version": "2.0.0",
+													"bundled": true,
+													"dev": true
+												},
+												"generate-object-property": {
+													"version": "1.2.0",
+													"bundled": true,
+													"dev": true,
+													"requires": {
+														"is-property": "1.0.2"
+													},
+													"dependencies": {
+														"is-property": {
+															"version": "1.0.2",
+															"bundled": true,
+															"dev": true
+														}
+													}
+												},
+												"jsonpointer": {
+													"version": "4.0.0",
+													"bundled": true,
+													"dev": true
+												},
+												"xtend": {
+													"version": "4.0.1",
+													"bundled": true,
+													"dev": true
+												}
+											}
+										},
+										"pinkie-promise": {
+											"version": "2.0.1",
+											"bundled": true,
+											"dev": true,
+											"requires": {
+												"pinkie": "2.0.4"
+											},
+											"dependencies": {
+												"pinkie": {
+													"version": "2.0.4",
+													"bundled": true,
+													"dev": true
+												}
+											}
+										}
+									}
+								},
+								"hawk": {
+									"version": "3.1.3",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"boom": "2.10.1",
+										"cryptiles": "2.0.5",
+										"hoek": "2.16.3",
+										"sntp": "1.0.9"
+									},
+									"dependencies": {
+										"boom": {
+											"version": "2.10.1",
+											"bundled": true,
+											"dev": true,
+											"requires": {
+												"hoek": "2.16.3"
+											}
+										},
+										"cryptiles": {
+											"version": "2.0.5",
+											"bundled": true,
+											"dev": true,
+											"requires": {
+												"boom": "2.10.1"
+											}
+										},
+										"hoek": {
+											"version": "2.16.3",
+											"bundled": true,
+											"dev": true
+										},
+										"sntp": {
+											"version": "1.0.9",
+											"bundled": true,
+											"dev": true,
+											"requires": {
+												"hoek": "2.16.3"
+											}
+										}
+									}
+								},
+								"http-signature": {
+									"version": "1.1.1",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"assert-plus": "0.2.0",
+										"jsprim": "1.3.1",
+										"sshpk": "1.10.1"
+									},
+									"dependencies": {
+										"assert-plus": {
+											"version": "0.2.0",
+											"bundled": true,
+											"dev": true
+										},
+										"jsprim": {
+											"version": "1.3.1",
+											"bundled": true,
+											"dev": true,
+											"requires": {
+												"extsprintf": "1.0.2",
+												"json-schema": "0.2.3",
+												"verror": "1.3.6"
+											},
+											"dependencies": {
+												"extsprintf": {
+													"version": "1.0.2",
+													"bundled": true,
+													"dev": true
+												},
+												"json-schema": {
+													"version": "0.2.3",
+													"bundled": true,
+													"dev": true
+												},
+												"verror": {
+													"version": "1.3.6",
+													"bundled": true,
+													"dev": true,
+													"requires": {
+														"extsprintf": "1.0.2"
+													}
+												}
+											}
+										},
+										"sshpk": {
+											"version": "1.10.1",
+											"bundled": true,
+											"dev": true,
+											"requires": {
+												"asn1": "0.2.3",
+												"assert-plus": "1.0.0",
+												"bcrypt-pbkdf": "1.0.0",
+												"dashdash": "1.14.0",
+												"ecc-jsbn": "0.1.1",
+												"getpass": "0.1.6",
+												"jodid25519": "1.0.2",
+												"jsbn": "0.1.0",
+												"tweetnacl": "0.14.3"
+											},
+											"dependencies": {
+												"asn1": {
+													"version": "0.2.3",
+													"bundled": true,
+													"dev": true
+												},
+												"assert-plus": {
+													"version": "1.0.0",
+													"bundled": true,
+													"dev": true
+												},
+												"bcrypt-pbkdf": {
+													"version": "1.0.0",
+													"bundled": true,
+													"dev": true,
+													"optional": true,
+													"requires": {
+														"tweetnacl": "0.14.3"
+													}
+												},
+												"dashdash": {
+													"version": "1.14.0",
+													"bundled": true,
+													"dev": true,
+													"requires": {
+														"assert-plus": "1.0.0"
+													}
+												},
+												"ecc-jsbn": {
+													"version": "0.1.1",
+													"bundled": true,
+													"dev": true,
+													"optional": true,
+													"requires": {
+														"jsbn": "0.1.0"
+													}
+												},
+												"getpass": {
+													"version": "0.1.6",
+													"bundled": true,
+													"dev": true,
+													"requires": {
+														"assert-plus": "1.0.0"
+													}
+												},
+												"jodid25519": {
+													"version": "1.0.2",
+													"bundled": true,
+													"dev": true,
+													"optional": true,
+													"requires": {
+														"jsbn": "0.1.0"
+													}
+												},
+												"jsbn": {
+													"version": "0.1.0",
+													"bundled": true,
+													"dev": true,
+													"optional": true
+												},
+												"tweetnacl": {
+													"version": "0.14.3",
+													"bundled": true,
+													"dev": true,
+													"optional": true
+												}
+											}
+										}
+									}
+								},
+								"is-typedarray": {
+									"version": "1.0.0",
+									"bundled": true,
+									"dev": true
+								},
+								"isstream": {
+									"version": "0.1.2",
+									"bundled": true,
+									"dev": true
+								},
+								"json-stringify-safe": {
+									"version": "5.0.1",
+									"bundled": true,
+									"dev": true
+								},
+								"mime-types": {
+									"version": "2.1.12",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"mime-db": "1.24.0"
+									},
+									"dependencies": {
+										"mime-db": {
+											"version": "1.24.0",
+											"bundled": true,
+											"dev": true
+										}
+									}
+								},
+								"node-uuid": {
+									"version": "1.4.7",
+									"bundled": true,
+									"dev": true
+								},
+								"oauth-sign": {
+									"version": "0.8.2",
+									"bundled": true,
+									"dev": true
+								},
+								"qs": {
+									"version": "6.3.0",
+									"bundled": true,
+									"dev": true
+								},
+								"stringstream": {
+									"version": "0.0.5",
+									"bundled": true,
+									"dev": true
+								},
+								"tough-cookie": {
+									"version": "2.3.2",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"punycode": "1.4.1"
+									},
+									"dependencies": {
+										"punycode": {
+											"version": "1.4.1",
+											"bundled": true,
+											"dev": true
+										}
+									}
+								},
+								"tunnel-agent": {
+									"version": "0.4.3",
+									"bundled": true,
+									"dev": true
+								}
+							}
+						},
+						"rimraf": {
+							"version": "2.5.4",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"glob": "7.1.1"
+							},
+							"dependencies": {
+								"glob": {
+									"version": "7.1.1",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"fs.realpath": "1.0.0",
+										"inflight": "1.0.6",
+										"inherits": "2.0.3",
+										"minimatch": "3.0.3",
+										"once": "1.4.0",
+										"path-is-absolute": "1.0.1"
+									},
+									"dependencies": {
+										"fs.realpath": {
+											"version": "1.0.0",
+											"bundled": true,
+											"dev": true
+										},
+										"inflight": {
+											"version": "1.0.6",
+											"bundled": true,
+											"dev": true,
+											"requires": {
+												"once": "1.4.0",
+												"wrappy": "1.0.2"
+											},
+											"dependencies": {
+												"wrappy": {
+													"version": "1.0.2",
+													"bundled": true,
+													"dev": true
+												}
+											}
+										},
+										"inherits": {
+											"version": "2.0.3",
+											"bundled": true,
+											"dev": true
+										},
+										"minimatch": {
+											"version": "3.0.3",
+											"bundled": true,
+											"dev": true,
+											"requires": {
+												"brace-expansion": "1.1.6"
+											},
+											"dependencies": {
+												"brace-expansion": {
+													"version": "1.1.6",
+													"bundled": true,
+													"dev": true,
+													"requires": {
+														"balanced-match": "0.4.2",
+														"concat-map": "0.0.1"
+													},
+													"dependencies": {
+														"balanced-match": {
+															"version": "0.4.2",
+															"bundled": true,
+															"dev": true
+														},
+														"concat-map": {
+															"version": "0.0.1",
+															"bundled": true,
+															"dev": true
+														}
+													}
+												}
+											}
+										},
+										"once": {
+											"version": "1.4.0",
+											"bundled": true,
+											"dev": true,
+											"requires": {
+												"wrappy": "1.0.2"
+											},
+											"dependencies": {
+												"wrappy": {
+													"version": "1.0.2",
+													"bundled": true,
+													"dev": true
+												}
+											}
+										},
+										"path-is-absolute": {
+											"version": "1.0.1",
+											"bundled": true,
+											"dev": true
+										}
+									}
+								}
+							}
+						},
+						"semver": {
+							"version": "5.3.0",
+							"bundled": true,
+							"dev": true
+						},
+						"tar": {
+							"version": "2.2.1",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"block-stream": "0.0.9",
+								"fstream": "1.0.10",
+								"inherits": "2.0.3"
+							},
+							"dependencies": {
+								"block-stream": {
+									"version": "0.0.9",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"inherits": "2.0.3"
+									}
+								},
+								"fstream": {
+									"version": "1.0.10",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"graceful-fs": "4.1.9",
+										"inherits": "2.0.3",
+										"mkdirp": "0.5.1",
+										"rimraf": "2.5.4"
+									},
+									"dependencies": {
+										"graceful-fs": {
+											"version": "4.1.9",
+											"bundled": true,
+											"dev": true
+										}
+									}
+								},
+								"inherits": {
+									"version": "2.0.3",
+									"bundled": true,
+									"dev": true
+								}
+							}
+						},
+						"tar-pack": {
+							"version": "3.3.0",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"debug": "2.2.0",
+								"fstream": "1.0.10",
+								"fstream-ignore": "1.0.5",
+								"once": "1.3.3",
+								"readable-stream": "2.1.5",
+								"rimraf": "2.5.4",
+								"tar": "2.2.1",
+								"uid-number": "0.0.6"
+							},
+							"dependencies": {
+								"debug": {
+									"version": "2.2.0",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"ms": "0.7.1"
+									},
+									"dependencies": {
+										"ms": {
+											"version": "0.7.1",
+											"bundled": true,
+											"dev": true
+										}
+									}
+								},
+								"fstream": {
+									"version": "1.0.10",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"graceful-fs": "4.1.9",
+										"inherits": "2.0.3",
+										"mkdirp": "0.5.1",
+										"rimraf": "2.5.4"
+									},
+									"dependencies": {
+										"graceful-fs": {
+											"version": "4.1.9",
+											"bundled": true,
+											"dev": true
+										},
+										"inherits": {
+											"version": "2.0.3",
+											"bundled": true,
+											"dev": true
+										}
+									}
+								},
+								"fstream-ignore": {
+									"version": "1.0.5",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"fstream": "1.0.10",
+										"inherits": "2.0.3",
+										"minimatch": "3.0.3"
+									},
+									"dependencies": {
+										"inherits": {
+											"version": "2.0.3",
+											"bundled": true,
+											"dev": true
+										},
+										"minimatch": {
+											"version": "3.0.3",
+											"bundled": true,
+											"dev": true,
+											"requires": {
+												"brace-expansion": "1.1.6"
+											},
+											"dependencies": {
+												"brace-expansion": {
+													"version": "1.1.6",
+													"bundled": true,
+													"dev": true,
+													"requires": {
+														"balanced-match": "0.4.2",
+														"concat-map": "0.0.1"
+													},
+													"dependencies": {
+														"balanced-match": {
+															"version": "0.4.2",
+															"bundled": true,
+															"dev": true
+														},
+														"concat-map": {
+															"version": "0.0.1",
+															"bundled": true,
+															"dev": true
+														}
+													}
+												}
+											}
+										}
+									}
+								},
+								"once": {
+									"version": "1.3.3",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"wrappy": "1.0.2"
+									},
+									"dependencies": {
+										"wrappy": {
+											"version": "1.0.2",
+											"bundled": true,
+											"dev": true
+										}
+									}
+								},
+								"readable-stream": {
+									"version": "2.1.5",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"buffer-shims": "1.0.0",
+										"core-util-is": "1.0.2",
+										"inherits": "2.0.3",
+										"isarray": "1.0.0",
+										"process-nextick-args": "1.0.7",
+										"string_decoder": "0.10.31",
+										"util-deprecate": "1.0.2"
+									},
+									"dependencies": {
+										"buffer-shims": {
+											"version": "1.0.0",
+											"bundled": true,
+											"dev": true
+										},
+										"core-util-is": {
+											"version": "1.0.2",
+											"bundled": true,
+											"dev": true
+										},
+										"inherits": {
+											"version": "2.0.3",
+											"bundled": true,
+											"dev": true
+										},
+										"isarray": {
+											"version": "1.0.0",
+											"bundled": true,
+											"dev": true
+										},
+										"process-nextick-args": {
+											"version": "1.0.7",
+											"bundled": true,
+											"dev": true
+										},
+										"string_decoder": {
+											"version": "0.10.31",
+											"bundled": true,
+											"dev": true
+										},
+										"util-deprecate": {
+											"version": "1.0.2",
+											"bundled": true,
+											"dev": true
+										}
+									}
+								},
+								"uid-number": {
+									"version": "0.0.6",
+									"bundled": true,
+									"dev": true
+								}
+							}
+						}
+					}
+				}
+			}
+		},
+		"sqlstring": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.2.0.tgz",
+			"integrity": "sha1-wxNcTqirzX5+50GklmqJHYak8ZE=",
+			"dev": true
+		},
+		"string_decoder": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+			"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"safe-buffer": "5.1.1"
+			}
+		},
+		"supports-color": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.0.tgz",
+			"integrity": "sha512-Ts0Mu/A1S1aZxEJNG88I4Oc9rcZSBFNac5e27yh4j2mqbhZSSzR1Ah79EYwSn9Zuh7lrlGD2cVGzw1RKGzyLSg==",
+			"dev": true,
+			"requires": {
+				"has-flag": "2.0.0"
+			}
+		},
+		"through": {
+			"version": "2.3.8",
+			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+			"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+			"dev": true
+		},
+		"util-deprecate": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+			"dev": true,
+			"optional": true
+		},
+		"wrappy": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+			"dev": true
+		},
+		"xtend": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+			"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+			"dev": true
+		}
+	}
+}
diff --git a/package.json b/package.json
index d9583ac7..2bab8ae3 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
-	"author"      : "Diogo Resende <dresende@thinkdigital.pt>",
-	"name"        : "orm",
-	"description" : "NodeJS Object-relational mapping",
-	"keywords"    : [
+	"author": "Diogo Resende <dresende@thinkdigital.pt>",
+	"name": "orm",
+	"description": "NodeJS Object-relational mapping",
+	"keywords": [
 		"orm",
 		"odm",
 		"database",
@@ -12,46 +12,73 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "3.2.3",
-	"license"     : "MIT",
-	"homepage"    : "http://dresende.github.io/node-orm2",
-	"repository"  : "http://github.com/dresende/node-orm2.git",
+	"version": "3.2.4",
+	"license": "MIT",
+	"homepage": "http://dresende.github.io/node-orm2",
+	"repository": "http://github.com/dresende/node-orm2.git",
 	"contributors": [
-		{ "name" : "Bramus Van Damme", "email" : "bramus@bram.us" },
-		{ "name" : "Lorien Gamaroff",  "email" : "lorien@gamaroff.org" },
-		{ "name" : "preslavrachev" },
-		{ "name" : "Chris Cowan",      "email" : "me@chriscowan.us" },
-		{ "name" : "Paul Dixon",       "email" : "paul.dixon@mintbridge.co.uk" },
-		{ "name" : "David Kosub" },
-		{ "name" : "Arek W",           "email" : "arek01@gmail.com" },
-		{ "name" : "Joseph Gilley",    "email" : "joe.gilley@gmail.com" },
-		{ "name" : "Benjamin Pannell", "email" : "admin@sierrasoftworks.com" }
+		{
+			"name": "Bramus Van Damme",
+			"email": "bramus@bram.us"
+		},
+		{
+			"name": "Lorien Gamaroff",
+			"email": "lorien@gamaroff.org"
+		},
+		{
+			"name": "preslavrachev"
+		},
+		{
+			"name": "Chris Cowan",
+			"email": "me@chriscowan.us"
+		},
+		{
+			"name": "Paul Dixon",
+			"email": "paul.dixon@mintbridge.co.uk"
+		},
+		{
+			"name": "David Kosub"
+		},
+		{
+			"name": "Arek W",
+			"email": "arek01@gmail.com"
+		},
+		{
+			"name": "Joseph Gilley",
+			"email": "joe.gilley@gmail.com"
+		},
+		{
+			"name": "Benjamin Pannell",
+			"email": "admin@sierrasoftworks.com"
+		}
 	],
-	"main"        : "./lib/ORM",
-	"scripts"     : {
-		"test"      : "make test"
+	"main": "./lib/ORM",
+	"scripts": {
+		"test": "make test"
 	},
-	"engines"     : {
-		"node"      : "*"
+	"engines": {
+		"node": "*"
 	},
-	"analyse"     : false,
+	"analyse": false,
 	"dependencies": {
-		"async"            : "2.1.4",
-		"enforce"          : "0.1.7",
-		"hat"              : "0.0.3",
-		"lodash"           : "4.17.2",
-		"path-is-absolute" : "1.0.1",
-		"sql-query"        : "0.1.26",
-		"sql-ddl-sync"     : "0.3.12"
+		"async": "2.5.0",
+		"enforce": "0.1.7",
+		"hat": "0.0.3",
+		"lodash": "4.17.4",
+		"path-is-absolute": "1.0.1",
+		"sql-query": "0.1.26",
+		"sql-ddl-sync": "0.3.13"
 	},
 	"devDependencies": {
-		"mysql"   : "2.12.0",
-		"pg"      : "6.1.0",
-		"sqlite3" : "3.1.8",
-		"mocha"   : "3.2.0",
-		"should"  : "11.1.1",
-		"mongodb" : "1.4.10",
-		"glob"    : "7.1.1"
+		"chalk": "2.0.1",
+		"glob": "7.1.2",
+		"mocha": "3.4.2",
+		"mongodb": "1.4.10",
+		"mysql": "2.13.0",
+		"pg": "6.4.1",
+		"semver": "5.3.0",
+		"should": "11.2.1",
+		"sqlite3": "3.1.8"
 	},
 	"optionalDependencies": {}
 }
diff --git a/test/common.js b/test/common.js
index 523d6399..3541ba4e 100644
--- a/test/common.js
+++ b/test/common.js
@@ -4,6 +4,7 @@ var async       = require('async');
 var _           = require('lodash');
 var util        = require('util');
 var querystring = require('querystring');
+var Semver      = require('semver');
 var ORM         = require('../');
 
 common.ORM = ORM;
@@ -165,3 +166,7 @@ common.retry = function (before, run, until, done, args) {
 		runNext();
 	}
 };
+
+common.nodeVersion = function () {
+	return new Semver(process.versions.node);
+}
diff --git a/test/run.js b/test/run.js
index bdf0a7e5..81f0f492 100644
--- a/test/run.js
+++ b/test/run.js
@@ -1,3 +1,4 @@
+var chalk    = require("chalk");
 var Mocha    = require("mocha");
 var glob     = require("glob");
 var path     = require("path");
@@ -22,6 +23,13 @@ switch (common.hasConfig(common.protocol())) {
 runTests();
 
 function runTests() {
+	if (common.protocol() == 'mongodb' && common.nodeVersion().major > 6) {
+		console.warn(chalk.red("MongoDB 1.x doesn't work with node 7, 8 or newer."));
+		console.warn(chalk.red("Tests will not run."));
+		console.warn(chalk.red("If you would like this to work, please submit a pull request."));
+		return;
+	}
+
 	glob.sync(location).forEach(function (file) {
 		if (!shouldRunTest(file)) return;
 		mocha.addFile(file);
@@ -43,3 +51,4 @@ function shouldRunTest(file) {
 
 	return true;
 }
+

From 6baf6658da76b2cb9f7253bc66a8f9143e089249 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 14 Aug 2017 12:16:24 +0000
Subject: [PATCH 1096/1246] Convert tabs to spaces to avoid constant linting.
 Sorry Richard Hendricks, spaces are better than tabs.

---
 lib/AggregateFunctions.js                     |  324 ++--
 lib/Associations/Extend.js                    |  426 ++---
 lib/Associations/Many.js                      |  966 +++++-----
 lib/Associations/One.js                       |  590 +++---
 lib/ChainFind.js                              |  614 +++---
 lib/ChainInstance.js                          |  170 +-
 lib/Debug.js                                  |   16 +-
 lib/Drivers/DDL/SQL.js                        |   78 +-
 lib/Drivers/DML/_shared.js                    |   48 +-
 lib/Drivers/DML/mongodb.js                    |  750 ++++----
 lib/Drivers/DML/mysql.js                      |  454 ++---
 lib/Drivers/DML/postgres.js                   |  596 +++---
 lib/Drivers/DML/redshift.js                   |   60 +-
 lib/Drivers/DML/sqlite.js                     |  590 +++---
 lib/Drivers/aliases.js                        |    6 +-
 lib/Error.js                                  |   12 +-
 lib/Express.js                                |  122 +-
 lib/Hook.js                                   |   38 +-
 lib/Instance.js                               | 1502 +++++++--------
 lib/LazyLoad.js                               |  108 +-
 lib/Model.js                                  | 1422 +++++++-------
 lib/ORM.js                                    |  604 +++---
 lib/Promise.js                                |   46 +-
 lib/Property.js                               |  110 +-
 lib/Settings.js                               |  178 +-
 lib/Singleton.js                              |   54 +-
 lib/Utilities.js                              |  532 +++---
 lib/Validators.js                             |  170 +-
 package.json                                  |  164 +-
 test/common.js                                |  270 +--
 test/config.example.js                        |   18 +-
 test/integration/association-extend.js        |  488 ++---
 test/integration/association-hasmany-extra.js |  120 +-
 test/integration/association-hasmany-hooks.js |  238 +--
 .../integration/association-hasmany-mapsto.js | 1276 ++++++-------
 test/integration/association-hasmany.js       | 1662 ++++++++---------
 .../association-hasone-required.js            |  142 +-
 .../integration/association-hasone-reverse.js |  654 +++----
 test/integration/association-hasone-zeroid.js |  296 +--
 test/integration/association-hasone.js        |  922 ++++-----
 test/integration/big.js                       |   96 +-
 test/integration/db.js                        |  456 ++---
 test/integration/drivers/postgres_spec.js     |  432 ++---
 test/integration/drivers/sqlite_spec.js       |  256 +--
 test/integration/error_spec.js                |  108 +-
 test/integration/event.js                     |  136 +-
 test/integration/hook.js                      | 1466 +++++++--------
 test/integration/instance.js                  |  924 ++++-----
 test/integration/model-aggregate.js           |  418 ++---
 test/integration/model-clear.js               |  100 +-
 test/integration/model-count.js               |  146 +-
 test/integration/model-create.js              |  242 +--
 test/integration/model-exists.js              |  198 +-
 test/integration/model-find-chain.js          | 1398 +++++++-------
 test/integration/model-find-mapsto.js         |  160 +-
 test/integration/model-find.js                |  694 +++----
 test/integration/model-get.js                 |  652 +++----
 test/integration/model-keys.js                |  210 +--
 test/integration/model-one.js                 |  200 +-
 test/integration/model-save.js                |  946 +++++-----
 test/integration/orm-exports.js               |  644 +++----
 test/integration/predefined-validators.js     |  196 +-
 test/integration/property-custom.js           |  332 ++--
 test/integration/property-lazyload.js         |  194 +-
 test/integration/property-maps-to.js          |  562 +++---
 test/integration/property-number-size.js      |  224 +--
 test/integration/property-timezones.js        |  194 +-
 test/integration/property.js                  |  188 +-
 test/integration/settings.js                  |  264 +--
 test/integration/smart-types.js               |  228 +--
 test/integration/validation.js                |  954 +++++-----
 test/logging.js                               |   28 +-
 test/run.js                                   |   60 +-
 test/support/my_plugin.js                     |   30 +-
 test/support/spec_helper.js                   |   46 +-
 test/support/spec_load.js                     |    8 +-
 test/support/spec_load_second.js              |   12 +-
 test/support/spec_load_third.js               |   12 +-
 78 files changed, 15125 insertions(+), 15125 deletions(-)

diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index 4ce0ce75..6a54d880 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -4,172 +4,172 @@ var Utilities  = require("./Utilities");
 module.exports = AggregateFunctions;
 
 function AggregateFunctions(opts) {
-	if (typeof opts.driver.getQuery !== "function") {
-		throw new ORMError('NO_SUPPORT', "This driver does not support aggregate functions");
-	}
-	if (!Array.isArray(opts.driver.aggregate_functions)) {
-		throw new ORMError('NO_SUPPORT', "This driver does not support aggregate functions");
-	}
-
-	var aggregates    = [ [] ];
-	var group_by      = null;
-	var used_distinct = false;
-
-	var appendFunction = function (fun) {
-		return function () {
-			var args = (arguments.length && Array.isArray(arguments[0]) ? arguments[0] : Array.prototype.slice.apply(arguments));
-
-			if (args.length > 0) {
-				aggregates[aggregates.length - 1].push({ f: fun, a: args, alias: aggregateAlias(fun, args) });
-				aggregates.push([]);
-			} else {
-				aggregates[aggregates.length - 1].push({ f: fun, alias: aggregateAlias(fun, args) });
-			}
-
-			if (fun === "distinct") {
-				used_distinct = true;
-			}
-
-			return proto;
-		};
-	};
-	var proto = {
-		groupBy: function () {
-			group_by = Array.prototype.slice.apply(arguments);
-			return this;
-		},
-		limit: function (offset, limit) {
-			if (typeof limit === "number") {
-				opts.limit = [ offset, limit ];
-			} else {
-				opts.limit = [ 0, offset ]; // offset = limit
-			}
-			return this;
-		},
-		order: function () {
-			opts.order = Utilities.standardizeOrder(Array.prototype.slice.apply(arguments));
-			return this;
-		},
-		select: function () {
-			if (arguments.length === 0) {
-				throw new ORMError('PARAM_MISMATCH', "When using append you must at least define one property");
-			}
-			if (Array.isArray(arguments[0])) {
-				opts.propertyList = opts.propertyList.concat(arguments[0]);
-			} else {
-				opts.propertyList = opts.propertyList.concat(Array.prototype.slice.apply(arguments));
-			}
-			return this;
-		},
-		as: function (alias) {
-			if (aggregates.length === 0 || (aggregates.length === 1 && aggregates[0].length === 0)) {
-				throw new ORMError('PARAM_MISMATCH', "No aggregate functions defined yet");
-			}
-
-			var len = aggregates.length;
-
-			aggregates[len - 1][aggregates[len - 1].length - 1].alias = alias;
-
-			return this;
-		},
-		call: function (fun, args) {
-			if (args && args.length > 0) {
-				aggregates[aggregates.length - 1].push({ f: fun, a: args, alias: aggregateAlias(fun, args) });
-				// aggregates.push([]);
-			} else {
-				aggregates[aggregates.length - 1].push({ f: fun, alias: aggregateAlias(fun, args) });
-			}
-
-			if (fun.toLowerCase() === "distinct") {
-				used_distinct = true;
-			}
-
-			return this;
-		},
-		get: function (cb) {
-			if (typeof cb !== "function") {
-				throw new ORMError('MISSING_CALLBACK', "You must pass a callback to Model.aggregate().get()");
-			}
-			if (aggregates[aggregates.length - 1].length === 0) {
-				aggregates.length -= 1;
-			}
-			if (aggregates.length === 0) {
-				throw new ORMError('PARAM_MISMATCH', "Missing aggregate functions");
-			}
-
-			var query = opts.driver.getQuery().select().from(opts.table).select(opts.propertyList);
-			var i, j;
-
-			for (i = 0; i < aggregates.length; i++) {
-				for (j = 0; j < aggregates[i].length; j++) {
-					query.fun(aggregates[i][j].f, aggregates[i][j].a, aggregates[i][j].alias);
-				}
-			}
-
-			query.where(opts.conditions);
-
-			if (group_by !== null) {
-				query.groupBy.apply(query, group_by);
-			}
-
-			if (opts.order) {
-				for (i = 0; i < opts.order.length; i++) {
-					query.order(opts.order[i][0], opts.order[i][1]);
-				}
-			}
-			if (opts.limit) {
-				query.offset(opts.limit[0]).limit(opts.limit[1]);
-			}
-
-			query = query.build();
-
-			opts.driver.execQuery(query, function (err, data) {
-				if (err) {
-					return cb(err);
-				}
-
-				if (group_by !== null) {
-					return cb(null, data);
-				}
-
-				var items = [], i;
-
-				if (used_distinct && aggregates.length === 1) {
-					for (i = 0; i < data.length; i++) {
-						items.push(data[i][Object.keys(data[i]).pop()]);
-					}
-
-					return cb(null, items);
-				}
-
-				for (i = 0; i < aggregates.length; i++) {
-					for (var j = 0; j < aggregates[i].length; j++) {
-						items.push(data[0][aggregates[i][j].alias] || null);
-					}
-				}
-
-				items.unshift(null);
-
-				return cb.apply(null, items);
-			});
-		}
-	};
-
-	for (var i = 0; i < opts.driver.aggregate_functions.length; i++) {
-		addAggregate(proto, opts.driver.aggregate_functions[i], appendFunction);
-	}
-
-	return proto;
+  if (typeof opts.driver.getQuery !== "function") {
+    throw new ORMError('NO_SUPPORT', "This driver does not support aggregate functions");
+  }
+  if (!Array.isArray(opts.driver.aggregate_functions)) {
+    throw new ORMError('NO_SUPPORT', "This driver does not support aggregate functions");
+  }
+
+  var aggregates    = [ [] ];
+  var group_by      = null;
+  var used_distinct = false;
+
+  var appendFunction = function (fun) {
+    return function () {
+      var args = (arguments.length && Array.isArray(arguments[0]) ? arguments[0] : Array.prototype.slice.apply(arguments));
+
+      if (args.length > 0) {
+        aggregates[aggregates.length - 1].push({ f: fun, a: args, alias: aggregateAlias(fun, args) });
+        aggregates.push([]);
+      } else {
+        aggregates[aggregates.length - 1].push({ f: fun, alias: aggregateAlias(fun, args) });
+      }
+
+      if (fun === "distinct") {
+        used_distinct = true;
+      }
+
+      return proto;
+    };
+  };
+  var proto = {
+    groupBy: function () {
+      group_by = Array.prototype.slice.apply(arguments);
+      return this;
+    },
+    limit: function (offset, limit) {
+      if (typeof limit === "number") {
+        opts.limit = [ offset, limit ];
+      } else {
+        opts.limit = [ 0, offset ]; // offset = limit
+      }
+      return this;
+    },
+    order: function () {
+      opts.order = Utilities.standardizeOrder(Array.prototype.slice.apply(arguments));
+      return this;
+    },
+    select: function () {
+      if (arguments.length === 0) {
+        throw new ORMError('PARAM_MISMATCH', "When using append you must at least define one property");
+      }
+      if (Array.isArray(arguments[0])) {
+        opts.propertyList = opts.propertyList.concat(arguments[0]);
+      } else {
+        opts.propertyList = opts.propertyList.concat(Array.prototype.slice.apply(arguments));
+      }
+      return this;
+    },
+    as: function (alias) {
+      if (aggregates.length === 0 || (aggregates.length === 1 && aggregates[0].length === 0)) {
+        throw new ORMError('PARAM_MISMATCH', "No aggregate functions defined yet");
+      }
+
+      var len = aggregates.length;
+
+      aggregates[len - 1][aggregates[len - 1].length - 1].alias = alias;
+
+      return this;
+    },
+    call: function (fun, args) {
+      if (args && args.length > 0) {
+        aggregates[aggregates.length - 1].push({ f: fun, a: args, alias: aggregateAlias(fun, args) });
+        // aggregates.push([]);
+      } else {
+        aggregates[aggregates.length - 1].push({ f: fun, alias: aggregateAlias(fun, args) });
+      }
+
+      if (fun.toLowerCase() === "distinct") {
+        used_distinct = true;
+      }
+
+      return this;
+    },
+    get: function (cb) {
+      if (typeof cb !== "function") {
+        throw new ORMError('MISSING_CALLBACK', "You must pass a callback to Model.aggregate().get()");
+      }
+      if (aggregates[aggregates.length - 1].length === 0) {
+        aggregates.length -= 1;
+      }
+      if (aggregates.length === 0) {
+        throw new ORMError('PARAM_MISMATCH', "Missing aggregate functions");
+      }
+
+      var query = opts.driver.getQuery().select().from(opts.table).select(opts.propertyList);
+      var i, j;
+
+      for (i = 0; i < aggregates.length; i++) {
+        for (j = 0; j < aggregates[i].length; j++) {
+          query.fun(aggregates[i][j].f, aggregates[i][j].a, aggregates[i][j].alias);
+        }
+      }
+
+      query.where(opts.conditions);
+
+      if (group_by !== null) {
+        query.groupBy.apply(query, group_by);
+      }
+
+      if (opts.order) {
+        for (i = 0; i < opts.order.length; i++) {
+          query.order(opts.order[i][0], opts.order[i][1]);
+        }
+      }
+      if (opts.limit) {
+        query.offset(opts.limit[0]).limit(opts.limit[1]);
+      }
+
+      query = query.build();
+
+      opts.driver.execQuery(query, function (err, data) {
+        if (err) {
+          return cb(err);
+        }
+
+        if (group_by !== null) {
+          return cb(null, data);
+        }
+
+        var items = [], i;
+
+        if (used_distinct && aggregates.length === 1) {
+          for (i = 0; i < data.length; i++) {
+            items.push(data[i][Object.keys(data[i]).pop()]);
+          }
+
+          return cb(null, items);
+        }
+
+        for (i = 0; i < aggregates.length; i++) {
+          for (var j = 0; j < aggregates[i].length; j++) {
+            items.push(data[0][aggregates[i][j].alias] || null);
+          }
+        }
+
+        items.unshift(null);
+
+        return cb.apply(null, items);
+      });
+    }
+  };
+
+  for (var i = 0; i < opts.driver.aggregate_functions.length; i++) {
+    addAggregate(proto, opts.driver.aggregate_functions[i], appendFunction);
+  }
+
+  return proto;
 }
 
 function addAggregate(proto, fun, builder) {
-	if (Array.isArray(fun)) {
-		proto[fun[0].toLowerCase()] = builder((fun[1] || fun[0]).toLowerCase());
-	} else {
-		proto[fun.toLowerCase()] = builder(fun.toLowerCase());
-	}
+  if (Array.isArray(fun)) {
+    proto[fun[0].toLowerCase()] = builder((fun[1] || fun[0]).toLowerCase());
+  } else {
+    proto[fun.toLowerCase()] = builder(fun.toLowerCase());
+  }
 }
 
 function aggregateAlias(fun, fields) {
-	return fun + (fields && fields.length ? "_" + fields.join("_") : "");
+  return fun + (fields && fields.length ? "_" + fields.join("_") : "");
 }
diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index c08cc166..3aaed679 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -5,232 +5,232 @@ var Singleton  = require("../Singleton");
 var util       = require("../Utilities");
 
 exports.prepare = function (db, Model, associations) {
-	Model.extendsTo = function (name, properties, opts) {
-		opts = opts || {};
-
-		var assocName = opts.name || ucfirst(name);
-		var association = {
-			name           : name,
-			table          : opts.table || (Model.table + '_' + name),
-			reversed       : opts.reversed,
-			autoFetch      : opts.autoFetch || false,
-			autoFetchLimit : opts.autoFetchLimit || 2,
-			field          : util.wrapFieldObject({
-												 field: opts.field, model: Model, altName: Model.table
-											 }) || util.formatField(Model, Model.table, false, false),
-			getAccessor    : opts.getAccessor || ("get" + assocName),
-			setAccessor    : opts.setAccessor || ("set" + assocName),
-			hasAccessor    : opts.hasAccessor || ("has" + assocName),
-			delAccessor    : opts.delAccessor || ("remove" + assocName)
-		};
-
-		var newproperties = _.cloneDeep(properties);
-		for (var k in association.field) {
-		    newproperties[k] = association.field[k];
-		}
-
-		var modelOpts = _.extend(
-			_.pick(opts, 'identityCache', 'autoSave', 'cascadeRemove', 'hooks', 'methods', 'validations'),
-			{
-				id        : Object.keys(association.field),
-				extension : true,
-			}
-		);
-
-		association.model = db.define(association.table, newproperties, modelOpts);
-		association.model.hasOne(Model.table, Model, { extension: true, field: association.field });
-
-		associations.push(association);
-
-		Model["findBy" + assocName] = function () {
-			var cb = null, conditions = null, options = {};
-
-			for (var i = 0; i < arguments.length; i++) {
-				switch (typeof arguments[i]) {
-					case "function":
-						cb = arguments[i];
-						break;
-					case "object":
-						if (conditions === null) {
-							conditions = arguments[i];
-						} else {
-							options = arguments[i];
-						}
-						break;
-				}
-			}
-
-			if (conditions === null) {
-				throw new ORMError(".findBy(" + assocName + ") is missing a conditions object", 'PARAM_MISMATCH');
-			}
-
-			options.__merge = {
-				from  : { table: association.model.table, field: Object.keys(association.field) },
-				to    : { table: Model.table, field: Model.id },
-				where : [ association.model.table, conditions ],
-				table : Model.table
-			};
-			options.extra = [];
-
-			if (typeof cb == "function") {
-				return Model.find({}, options, cb);
-			}
-			return Model.find({}, options);
-		};
-
-		return association.model;
-	};
+  Model.extendsTo = function (name, properties, opts) {
+    opts = opts || {};
+
+    var assocName = opts.name || ucfirst(name);
+    var association = {
+      name           : name,
+      table          : opts.table || (Model.table + '_' + name),
+      reversed       : opts.reversed,
+      autoFetch      : opts.autoFetch || false,
+      autoFetchLimit : opts.autoFetchLimit || 2,
+      field          : util.wrapFieldObject({
+                         field: opts.field, model: Model, altName: Model.table
+                       }) || util.formatField(Model, Model.table, false, false),
+      getAccessor    : opts.getAccessor || ("get" + assocName),
+      setAccessor    : opts.setAccessor || ("set" + assocName),
+      hasAccessor    : opts.hasAccessor || ("has" + assocName),
+      delAccessor    : opts.delAccessor || ("remove" + assocName)
+    };
+
+    var newproperties = _.cloneDeep(properties);
+    for (var k in association.field) {
+        newproperties[k] = association.field[k];
+    }
+
+    var modelOpts = _.extend(
+      _.pick(opts, 'identityCache', 'autoSave', 'cascadeRemove', 'hooks', 'methods', 'validations'),
+      {
+        id        : Object.keys(association.field),
+        extension : true,
+      }
+    );
+
+    association.model = db.define(association.table, newproperties, modelOpts);
+    association.model.hasOne(Model.table, Model, { extension: true, field: association.field });
+
+    associations.push(association);
+
+    Model["findBy" + assocName] = function () {
+      var cb = null, conditions = null, options = {};
+
+      for (var i = 0; i < arguments.length; i++) {
+        switch (typeof arguments[i]) {
+          case "function":
+            cb = arguments[i];
+            break;
+          case "object":
+            if (conditions === null) {
+              conditions = arguments[i];
+            } else {
+              options = arguments[i];
+            }
+            break;
+        }
+      }
+
+      if (conditions === null) {
+        throw new ORMError(".findBy(" + assocName + ") is missing a conditions object", 'PARAM_MISMATCH');
+      }
+
+      options.__merge = {
+        from  : { table: association.model.table, field: Object.keys(association.field) },
+        to    : { table: Model.table, field: Model.id },
+        where : [ association.model.table, conditions ],
+        table : Model.table
+      };
+      options.extra = [];
+
+      if (typeof cb == "function") {
+        return Model.find({}, options, cb);
+      }
+      return Model.find({}, options);
+    };
+
+    return association.model;
+  };
 };
 
 exports.extend = function (Model, Instance, Driver, associations, opts) {
-	for (var i = 0; i < associations.length; i++) {
-		extendInstance(Model, Instance, Driver, associations[i], opts);
-	}
+  for (var i = 0; i < associations.length; i++) {
+    extendInstance(Model, Instance, Driver, associations[i], opts);
+  }
 };
 
 exports.autoFetch = function (Instance, associations, opts, cb) {
-	if (associations.length === 0) {
-		return cb();
-	}
-
-	var pending = associations.length;
-	var autoFetchDone = function autoFetchDone() {
-		pending -= 1;
-
-		if (pending === 0) {
-			return cb();
-		}
-	};
-
-	for (var i = 0; i < associations.length; i++) {
-		autoFetchInstance(Instance, associations[i], opts, autoFetchDone);
-	}
+  if (associations.length === 0) {
+    return cb();
+  }
+
+  var pending = associations.length;
+  var autoFetchDone = function autoFetchDone() {
+    pending -= 1;
+
+    if (pending === 0) {
+      return cb();
+    }
+  };
+
+  for (var i = 0; i < associations.length; i++) {
+    autoFetchInstance(Instance, associations[i], opts, autoFetchDone);
+  }
 };
 
 function extendInstance(Model, Instance, Driver, association, opts) {
-	Object.defineProperty(Instance, association.hasAccessor, {
-		value : function (cb) {
-			if (!Instance[Model.id]) {
-			    cb(new ORMError("Instance not saved, cannot get extension", 'NOT_DEFINED', { model: Model.table }));
-			} else {
-				association.model.get(util.values(Instance, Model.id), function (err, extension) {
-					return cb(err, !err && extension ? true : false);
-				});
-			}
-			return this;
-		},
-		enumerable : false
-	});
-	Object.defineProperty(Instance, association.getAccessor, {
-		value: function (opts, cb) {
-			if (typeof opts == "function") {
-				cb = opts;
-				opts = {};
-			}
-
-			if (!Instance[Model.id]) {
-			    cb(new ORMError("Instance not saved, cannot get extension", 'NOT_DEFINED', { model: Model.table }));
-			} else {
-				association.model.get(util.values(Instance, Model.id), opts, cb);
-			}
-			return this;
-		},
-		enumerable : false
-	});
-	Object.defineProperty(Instance, association.setAccessor, {
-		value : function (Extension, cb) {
-			Instance.save(function (err) {
-				if (err) {
-					return cb(err);
-				}
-
-				Instance[association.delAccessor](function (err) {
-					if (err) {
-						return cb(err);
-					}
-
-					var fields = Object.keys(association.field);
-
-					if (!Extension.isInstance) {
-						Extension = new association.model(Extension);
-					}
-
-					for (var i = 0; i < Model.id.length; i++) {
-						Extension[fields[i]] = Instance[Model.id[i]];
-					}
-
-					Extension.save(cb);
-				});
-			});
-			return this;
-		},
-		enumerable : false
-	});
-	Object.defineProperty(Instance, association.delAccessor, {
-		value : function (cb) {
-			if (!Instance[Model.id]) {
-			    cb(new ORMError("Instance not saved, cannot get extension", 'NOT_DEFINED', { model: Model.table }));
-			} else {
-				var conditions = {};
-				var fields = Object.keys(association.field);
-
-				for (var i = 0; i < Model.id.length; i++) {
-				    conditions[fields[i]] = Instance[Model.id[i]];
-				}
-
-				association.model.find(conditions, function (err, extensions) {
-					if (err) {
-						return cb(err);
-					}
-
-					var pending = extensions.length;
-
-					for (var i = 0; i < extensions.length; i++) {
-						Singleton.clear(extensions[i].__singleton_uid());
-						extensions[i].remove(function () {
-							if (--pending === 0) {
-								return cb();
-							}
-						});
-					}
-
-					if (pending === 0) {
-						return cb();
-					}
-				});
-			}
-			return this;
-		},
-		enumerable : false
-	});
+  Object.defineProperty(Instance, association.hasAccessor, {
+    value : function (cb) {
+      if (!Instance[Model.id]) {
+          cb(new ORMError("Instance not saved, cannot get extension", 'NOT_DEFINED', { model: Model.table }));
+      } else {
+        association.model.get(util.values(Instance, Model.id), function (err, extension) {
+          return cb(err, !err && extension ? true : false);
+        });
+      }
+      return this;
+    },
+    enumerable : false
+  });
+  Object.defineProperty(Instance, association.getAccessor, {
+    value: function (opts, cb) {
+      if (typeof opts == "function") {
+        cb = opts;
+        opts = {};
+      }
+
+      if (!Instance[Model.id]) {
+          cb(new ORMError("Instance not saved, cannot get extension", 'NOT_DEFINED', { model: Model.table }));
+      } else {
+        association.model.get(util.values(Instance, Model.id), opts, cb);
+      }
+      return this;
+    },
+    enumerable : false
+  });
+  Object.defineProperty(Instance, association.setAccessor, {
+    value : function (Extension, cb) {
+      Instance.save(function (err) {
+        if (err) {
+          return cb(err);
+        }
+
+        Instance[association.delAccessor](function (err) {
+          if (err) {
+            return cb(err);
+          }
+
+          var fields = Object.keys(association.field);
+
+          if (!Extension.isInstance) {
+            Extension = new association.model(Extension);
+          }
+
+          for (var i = 0; i < Model.id.length; i++) {
+            Extension[fields[i]] = Instance[Model.id[i]];
+          }
+
+          Extension.save(cb);
+        });
+      });
+      return this;
+    },
+    enumerable : false
+  });
+  Object.defineProperty(Instance, association.delAccessor, {
+    value : function (cb) {
+      if (!Instance[Model.id]) {
+          cb(new ORMError("Instance not saved, cannot get extension", 'NOT_DEFINED', { model: Model.table }));
+      } else {
+        var conditions = {};
+        var fields = Object.keys(association.field);
+
+        for (var i = 0; i < Model.id.length; i++) {
+            conditions[fields[i]] = Instance[Model.id[i]];
+        }
+
+        association.model.find(conditions, function (err, extensions) {
+          if (err) {
+            return cb(err);
+          }
+
+          var pending = extensions.length;
+
+          for (var i = 0; i < extensions.length; i++) {
+            Singleton.clear(extensions[i].__singleton_uid());
+            extensions[i].remove(function () {
+              if (--pending === 0) {
+                return cb();
+              }
+            });
+          }
+
+          if (pending === 0) {
+            return cb();
+          }
+        });
+      }
+      return this;
+    },
+    enumerable : false
+  });
 }
 
 function autoFetchInstance(Instance, association, opts, cb) {
-	if (!Instance.saved()) {
-		return cb();
-	}
-
-	if (!opts.hasOwnProperty("autoFetchLimit") || typeof opts.autoFetchLimit == "undefined") {
-		opts.autoFetchLimit = association.autoFetchLimit;
-	}
-
-	if (opts.autoFetchLimit === 0 || (!opts.autoFetch && !association.autoFetch)) {
-		return cb();
-	}
-
-	if (Instance.isPersisted()) {
-		Instance[association.getAccessor]({ autoFetchLimit: opts.autoFetchLimit - 1 }, function (err, Assoc) {
-			if (!err) {
-				Instance[association.name] = Assoc;
-			}
-
-			return cb();
-		});
-	} else {
-		return cb();
-	}
+  if (!Instance.saved()) {
+    return cb();
+  }
+
+  if (!opts.hasOwnProperty("autoFetchLimit") || typeof opts.autoFetchLimit == "undefined") {
+    opts.autoFetchLimit = association.autoFetchLimit;
+  }
+
+  if (opts.autoFetchLimit === 0 || (!opts.autoFetch && !association.autoFetch)) {
+    return cb();
+  }
+
+  if (Instance.isPersisted()) {
+    Instance[association.getAccessor]({ autoFetchLimit: opts.autoFetchLimit - 1 }, function (err, Assoc) {
+      if (!err) {
+        Instance[association.name] = Assoc;
+      }
+
+      return cb();
+    });
+  } else {
+    return cb();
+  }
 }
 
 function ucfirst(text) {
-	return text[0].toUpperCase() + text.substr(1);
+  return text[0].toUpperCase() + text.substr(1);
 }
diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 29230899..cd5359c7 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -7,504 +7,504 @@ var ORMError            = require("../Error");
 var util                = require("../Utilities");
 
 exports.prepare = function (db, Model, associations) {
-	Model.hasMany = function () {
-		var name, makeKey, mergeId, mergeAssocId;
-		var OtherModel = Model;
-		var props = null;
-		var opts = {};
-
-		for (var i = 0; i < arguments.length; i++) {
-			switch (typeof arguments[i]) {
-				case "string":
-					name = arguments[i];
-					break;
-				case "function":
-					OtherModel = arguments[i];
-					break;
-				case "object":
-					if (props === null) {
-						props = arguments[i];
-					} else {
-						opts = arguments[i];
-					}
-					break;
-			}
-		}
-
-		if (props === null) {
-			props = {};
-		} else {
-			for (var k in props) {
-				props[k] = Property.normalize({
-					prop: props[k], name: k, customTypes: db.customTypes, settings: Model.settings
-				});
-			}
-		}
-
-		makeKey = opts.key || Settings.defaults().hasMany.key;
-
-		mergeId = util.convertPropToJoinKeyProp(
-			util.wrapFieldObject({
-				field: opts.mergeId, model: Model, altName: Model.table
-			}) ||
-			util.formatField(Model, Model.table, true, opts.reversed),
-			{ makeKey: makeKey, required: true }
-		);
-
-		mergeAssocId = util.convertPropToJoinKeyProp(
-			util.wrapFieldObject({
-				field: opts.mergeAssocId, model: OtherModel, altName: name
-			}) ||
-			util.formatField(OtherModel, name, true, opts.reversed),
-			{ makeKey: makeKey, required: true }
-		)
-
-		var assocName = opts.name || ucfirst(name);
-		var assocTemplateName = opts.accessor || assocName;
-		var association = {
-			name           : name,
-			model          : OtherModel || Model,
-			props          : props,
-			hooks          : opts.hooks || {},
-			autoFetch      : opts.autoFetch || false,
-			autoFetchLimit : opts.autoFetchLimit || 2,
-			// I'm not sure the next key is used..
-			field          : util.wrapFieldObject({
-				                 field: opts.field, model: OtherModel, altName: Model.table
-				               }) ||
-			                 util.formatField(Model, name, true, opts.reversed),
-			mergeTable     : opts.mergeTable || (Model.table + "_" + name),
-			mergeId        : mergeId,
-			mergeAssocId   : mergeAssocId,
-			getAccessor    : opts.getAccessor || ("get" + assocTemplateName),
-			setAccessor    : opts.setAccessor || ("set" + assocTemplateName),
-			hasAccessor    : opts.hasAccessor || ("has" + assocTemplateName),
-			delAccessor    : opts.delAccessor || ("remove" + assocTemplateName),
-			addAccessor    : opts.addAccessor || ("add" + assocTemplateName)
-		};
-		associations.push(association);
-
-		if (opts.reverse) {
-			OtherModel.hasMany(opts.reverse, Model, association.props, {
-				reversed       : true,
-				association    : opts.reverseAssociation,
-				mergeTable     : association.mergeTable,
-				mergeId        : association.mergeAssocId,
-				mergeAssocId   : association.mergeId,
-				field          : association.field,
-				autoFetch      : association.autoFetch,
-				autoFetchLimit : association.autoFetchLimit
-			});
-		}
-		return this;
-	};
+  Model.hasMany = function () {
+    var name, makeKey, mergeId, mergeAssocId;
+    var OtherModel = Model;
+    var props = null;
+    var opts = {};
+
+    for (var i = 0; i < arguments.length; i++) {
+      switch (typeof arguments[i]) {
+        case "string":
+          name = arguments[i];
+          break;
+        case "function":
+          OtherModel = arguments[i];
+          break;
+        case "object":
+          if (props === null) {
+            props = arguments[i];
+          } else {
+            opts = arguments[i];
+          }
+          break;
+      }
+    }
+
+    if (props === null) {
+      props = {};
+    } else {
+      for (var k in props) {
+        props[k] = Property.normalize({
+          prop: props[k], name: k, customTypes: db.customTypes, settings: Model.settings
+        });
+      }
+    }
+
+    makeKey = opts.key || Settings.defaults().hasMany.key;
+
+    mergeId = util.convertPropToJoinKeyProp(
+      util.wrapFieldObject({
+        field: opts.mergeId, model: Model, altName: Model.table
+      }) ||
+      util.formatField(Model, Model.table, true, opts.reversed),
+      { makeKey: makeKey, required: true }
+    );
+
+    mergeAssocId = util.convertPropToJoinKeyProp(
+      util.wrapFieldObject({
+        field: opts.mergeAssocId, model: OtherModel, altName: name
+      }) ||
+      util.formatField(OtherModel, name, true, opts.reversed),
+      { makeKey: makeKey, required: true }
+    )
+
+    var assocName = opts.name || ucfirst(name);
+    var assocTemplateName = opts.accessor || assocName;
+    var association = {
+      name           : name,
+      model          : OtherModel || Model,
+      props          : props,
+      hooks          : opts.hooks || {},
+      autoFetch      : opts.autoFetch || false,
+      autoFetchLimit : opts.autoFetchLimit || 2,
+      // I'm not sure the next key is used..
+      field          : util.wrapFieldObject({
+                         field: opts.field, model: OtherModel, altName: Model.table
+                       }) ||
+                       util.formatField(Model, name, true, opts.reversed),
+      mergeTable     : opts.mergeTable || (Model.table + "_" + name),
+      mergeId        : mergeId,
+      mergeAssocId   : mergeAssocId,
+      getAccessor    : opts.getAccessor || ("get" + assocTemplateName),
+      setAccessor    : opts.setAccessor || ("set" + assocTemplateName),
+      hasAccessor    : opts.hasAccessor || ("has" + assocTemplateName),
+      delAccessor    : opts.delAccessor || ("remove" + assocTemplateName),
+      addAccessor    : opts.addAccessor || ("add" + assocTemplateName)
+    };
+    associations.push(association);
+
+    if (opts.reverse) {
+      OtherModel.hasMany(opts.reverse, Model, association.props, {
+        reversed       : true,
+        association    : opts.reverseAssociation,
+        mergeTable     : association.mergeTable,
+        mergeId        : association.mergeAssocId,
+        mergeAssocId   : association.mergeId,
+        field          : association.field,
+        autoFetch      : association.autoFetch,
+        autoFetchLimit : association.autoFetchLimit
+      });
+    }
+    return this;
+  };
 };
 
 exports.extend = function (Model, Instance, Driver, associations, opts, createInstance) {
-	for (var i = 0; i < associations.length; i++) {
-		extendInstance(Model, Instance, Driver, associations[i], opts, createInstance);
-	}
+  for (var i = 0; i < associations.length; i++) {
+    extendInstance(Model, Instance, Driver, associations[i], opts, createInstance);
+  }
 };
 
 exports.autoFetch = function (Instance, associations, opts, cb) {
-	if (associations.length === 0) {
-		return cb();
-	}
-
-	var pending = associations.length;
-	var autoFetchDone = function autoFetchDone() {
-		pending -= 1;
-
-		if (pending === 0) {
-			return cb();
-		}
-	};
-
-	for (var i = 0; i < associations.length; i++) {
-		autoFetchInstance(Instance, associations[i], opts, autoFetchDone);
-	}
+  if (associations.length === 0) {
+    return cb();
+  }
+
+  var pending = associations.length;
+  var autoFetchDone = function autoFetchDone() {
+    pending -= 1;
+
+    if (pending === 0) {
+      return cb();
+    }
+  };
+
+  for (var i = 0; i < associations.length; i++) {
+    autoFetchInstance(Instance, associations[i], opts, autoFetchDone);
+  }
 };
 
 function extendInstance(Model, Instance, Driver, association, opts, createInstance) {
-	if (Model.settings.get("instance.cascadeRemove")) {
-		Instance.on("beforeRemove", function () {
-			Instance[association.delAccessor]();
-		});
-	}
-
-	function adjustForMapsTo(options) {
-		// Loop through the (cloned) association model id fields ... some of them may've been mapped to different
-		// names in the actual database - if so update to the mapped database column name
-		for(var i=0; i<options.__merge.to.field.length; i++) {
-			var idProp = association.model.properties[options.__merge.to.field[i]];
-			if(idProp && idProp.mapsTo) {
-				options.__merge.to.field[i] = idProp.mapsTo;
-			}
-		}
-	}
-
-	Object.defineProperty(Instance, association.hasAccessor, {
-		value: function () {
-			var Instances = Array.prototype.slice.apply(arguments);
-			var cb = Instances.pop();
-			var conditions = {}, options = {};
-
-			if (Instances.length) {
-				if (Array.isArray(Instances[0])) {
-					Instances = Instances[0];
-				}
-			}
-			if (Driver.hasMany) {
-				return Driver.hasMany(Model, association).has(Instance, Instances, conditions, cb);
-			}
-
-			options.autoFetchLimit = 0;
-			options.__merge = {
-				from:   { table: association.mergeTable, field: Object.keys(association.mergeAssocId) },
-				to: { table: association.model.table, field: association.model.id.slice(0) },   // clone model id
-				where:  [ association.mergeTable, {} ]
-			};
-
-			adjustForMapsTo(options);
-
-			options.extra = association.props;
-			options.extra_info = {
-				table: association.mergeTable,
-				id: util.values(Instance, Model.id),
-				id_prop: Object.keys(association.mergeId),
-				assoc_prop: Object.keys(association.mergeAssocId)
-			};
-
-			util.populateConditions(Model, Object.keys(association.mergeId), Instance, options.__merge.where[1]);
-
-			for (var i = 0; i < Instances.length; i++) {
-				util.populateConditions(association.model, Object.keys(association.mergeAssocId), Instances[i], options.__merge.where[1], false);
-			}
-
-			association.model.find(conditions, options, function (err, foundItems) {
-				if (err)                  return cb(err);
-				if (_.isEmpty(Instances)) return cb(null, false);
-
-				var mapKeysToString = function (item) {
-					return _.map(association.model.keys, function (k) {
-						return item[k];
-					}).join(',')
-				}
-
-				var foundItemsIDs = _(foundItems).map(mapKeysToString).uniq().value();
-				var InstancesIDs  = _(Instances ).map(mapKeysToString).uniq().value();
-
-				var sameLength   = foundItemsIDs.length == InstancesIDs.length;
-				var sameContents = sameLength && _.isEmpty(_.difference(foundItemsIDs, InstancesIDs));
-
-				return cb(null, sameContents);
-			});
-			return this;
-		},
-		enumerable: false,
-		writable: true
-	});
-	Object.defineProperty(Instance, association.getAccessor, {
-		value: function () {
-			var options    = {};
-			var conditions = null;
-			var order      = null;
-			var cb         = null;
-
-			for (var i = 0; i < arguments.length; i++) {
-				switch (typeof arguments[i]) {
-					case "function":
-						cb = arguments[i];
-						break;
-					case "object":
-						if (Array.isArray(arguments[i])) {
-							order = arguments[i];
-							order[0] = [ association.model.table, order[0] ];
-						} else {
-							if (conditions === null) {
-								conditions = arguments[i];
-							} else {
-								options = arguments[i];
-							}
-						}
-						break;
-					case "string":
-						if (arguments[i][0] == "-") {
-							order = [ [ association.model.table, arguments[i].substr(1) ], "Z" ];
-						} else {
-							order = [ [ association.model.table, arguments[i] ] ];
-						}
-						break;
-					case "number":
-						options.limit = arguments[i];
-						break;
-				}
-			}
-
-			if (order !== null) {
-				options.order = order;
-			}
-
-			if (conditions === null) {
-				conditions = {};
-			}
-
-			if (Driver.hasMany) {
-				return Driver.hasMany(Model, association).get(Instance, conditions, options, createInstance, cb);
-			}
-
-			options.__merge = {
-				from  : { table: association.mergeTable, field: Object.keys(association.mergeAssocId) },
-				to    : { table: association.model.table, field: association.model.id.slice(0) }, // clone model id
-				where : [ association.mergeTable, {} ]
-			};
-
-			adjustForMapsTo(options);
-
-		  options.extra = association.props;
-		  options.extra_info = {
-			   table: association.mergeTable,
-				id: util.values(Instance, Model.id),
-				id_prop: Object.keys(association.mergeId),
-				assoc_prop: Object.keys(association.mergeAssocId)
-			};
-
-			util.populateConditions(Model, Object.keys(association.mergeId), Instance, options.__merge.where[1]);
-
-			if (cb === null) {
-				return association.model.find(conditions, options);
-			}
-
-			association.model.find(conditions, options, cb);
-
-			return this;
-		},
-		enumerable: false,
-		writable: true
-	});
-	Object.defineProperty(Instance, association.setAccessor, {
-		value: function () {
-			var items = _.flatten(arguments);
-			var cb    = _.last(items) instanceof Function ? items.pop() : noOperation;
-
-			Instance[association.delAccessor](function (err) {
-				if (err) return cb(err);
-
-				if (items.length) {
-					Instance[association.addAccessor](items, cb);
-				} else {
-					cb(null);
-				}
-			});
-
-			return this;
-		},
-		enumerable: false,
-		writable: true
-	});
-	Object.defineProperty(Instance, association.delAccessor, {
-		value: function () {
-			var Associations = [];
-			var cb = noOperation;
-
-			for (var i = 0; i < arguments.length; i++) {
-				switch (typeof arguments[i]) {
-					case "function":
-						cb = arguments[i];
-						break;
-					case "object":
-						if (Array.isArray(arguments[i])) {
-							Associations = Associations.concat(arguments[i]);
-						} else if (arguments[i].isInstance) {
-							Associations.push(arguments[i]);
-						}
-						break;
-				}
-			}
-			var conditions = {};
-			var run = function () {
-				if (Driver.hasMany) {
-					return Driver.hasMany(Model, association).del(Instance, Associations, cb);
-				}
-
-				if (Associations.length === 0) {
-					return Driver.remove(association.mergeTable, conditions, cb);
-				}
-
-				for (var i = 0; i < Associations.length; i++) {
-					util.populateConditions(association.model, Object.keys(association.mergeAssocId), Associations[i], conditions, false);
-				}
-
-				Driver.remove(association.mergeTable, conditions, cb);
-			};
-
-			util.populateConditions(Model, Object.keys(association.mergeId), Instance, conditions);
-
-			if (this.saved()) {
-				run();
-			} else {
-				this.save(function (err) {
-					if (err) {
-						return cb(err);
-					}
-
-					return run();
-				});
-			}
-			return this;
-		},
-		enumerable: false,
-		writable: true
-	});
-	Object.defineProperty(Instance, association.addAccessor, {
-		value: function () {
-			var Associations = [];
-			var opts = {};
-			var cb = noOperation;
-
-			var run = function () {
-				var savedAssociations = [];
-				var saveNextAssociation = function () {
-					if (Associations.length === 0) {
-						return cb(null, savedAssociations);
-					}
-
-					var Association = Associations.pop();
-					var saveAssociation = function (err) {
-						if (err) {
-							return cb(err);
-						}
-
-						Association.save(function (err) {
-							if (err) {
-								return cb(err);
-							}
-
-							var data = {};
-
-							for (var k in opts) {
-								if (k in association.props && Driver.propertyToValue) {
-									data[k] = Driver.propertyToValue(opts[k], association.props[k]);
-								} else {
-									data[k] = opts[k];
-								}
-							}
-
-							if (Driver.hasMany) {
-								return Driver.hasMany(Model, association).add(Instance, Association, data, function (err) {
-									if (err) {
-										return cb(err);
-									}
-
-									savedAssociations.push(Association);
-
-									return saveNextAssociation();
-								});
-							}
-
-							util.populateConditions(Model, Object.keys(association.mergeId), Instance, data);
-							util.populateConditions(association.model, Object.keys(association.mergeAssocId), Association, data);
-
-							Driver.insert(association.mergeTable, data, null, function (err) {
-								if (err) {
-									return cb(err);
-								}
-
-								savedAssociations.push(Association);
-
-								return saveNextAssociation();
-							});
-						});
-					};
-
-					if (Object.keys(association.props).length) {
-						Hook.wait(Association, association.hooks.beforeSave, saveAssociation, opts);
-					} else {
-						Hook.wait(Association, association.hooks.beforeSave, saveAssociation);
-					}
-				};
-
-				return saveNextAssociation();
-			};
-
-			for (var i = 0; i < arguments.length; i++) {
-				switch (typeof arguments[i]) {
-					case "function":
-						cb = arguments[i];
-						break;
-					case "object":
-						if (Array.isArray(arguments[i])) {
-							Associations = Associations.concat(arguments[i]);
-						} else if (arguments[i].isInstance) {
-							Associations.push(arguments[i]);
-						} else {
-							opts = arguments[i];
-						}
-						break;
-				}
-			}
-
-			if (Associations.length === 0) {
-			    throw new ORMError("No associations defined", 'PARAM_MISMATCH', { model: Model.name });
-			}
-
-			if (this.saved()) {
-				run();
-			} else {
-				this.save(function (err) {
-					if (err) {
-						return cb(err);
-					}
-
-					return run();
-				});
-			}
-
-			return this;
-		},
-		enumerable: false,
-		writable: true
-	});
-
-	Object.defineProperty(Instance, association.name, {
-		get: function () {
-			return Instance.__opts.associations[association.name].value;
-		},
-		set: function (val) {
-			Instance.__opts.associations[association.name].changed = true;
-			Instance.__opts.associations[association.name].value   = val;
-		},
-		enumerable: true
-	});
+  if (Model.settings.get("instance.cascadeRemove")) {
+    Instance.on("beforeRemove", function () {
+      Instance[association.delAccessor]();
+    });
+  }
+
+  function adjustForMapsTo(options) {
+    // Loop through the (cloned) association model id fields ... some of them may've been mapped to different
+    // names in the actual database - if so update to the mapped database column name
+    for(var i=0; i<options.__merge.to.field.length; i++) {
+      var idProp = association.model.properties[options.__merge.to.field[i]];
+      if(idProp && idProp.mapsTo) {
+        options.__merge.to.field[i] = idProp.mapsTo;
+      }
+    }
+  }
+
+  Object.defineProperty(Instance, association.hasAccessor, {
+    value: function () {
+      var Instances = Array.prototype.slice.apply(arguments);
+      var cb = Instances.pop();
+      var conditions = {}, options = {};
+
+      if (Instances.length) {
+        if (Array.isArray(Instances[0])) {
+          Instances = Instances[0];
+        }
+      }
+      if (Driver.hasMany) {
+        return Driver.hasMany(Model, association).has(Instance, Instances, conditions, cb);
+      }
+
+      options.autoFetchLimit = 0;
+      options.__merge = {
+        from:   { table: association.mergeTable, field: Object.keys(association.mergeAssocId) },
+        to: { table: association.model.table, field: association.model.id.slice(0) },   // clone model id
+        where:  [ association.mergeTable, {} ]
+      };
+
+      adjustForMapsTo(options);
+
+      options.extra = association.props;
+      options.extra_info = {
+        table: association.mergeTable,
+        id: util.values(Instance, Model.id),
+        id_prop: Object.keys(association.mergeId),
+        assoc_prop: Object.keys(association.mergeAssocId)
+      };
+
+      util.populateConditions(Model, Object.keys(association.mergeId), Instance, options.__merge.where[1]);
+
+      for (var i = 0; i < Instances.length; i++) {
+        util.populateConditions(association.model, Object.keys(association.mergeAssocId), Instances[i], options.__merge.where[1], false);
+      }
+
+      association.model.find(conditions, options, function (err, foundItems) {
+        if (err)                  return cb(err);
+        if (_.isEmpty(Instances)) return cb(null, false);
+
+        var mapKeysToString = function (item) {
+          return _.map(association.model.keys, function (k) {
+            return item[k];
+          }).join(',')
+        }
+
+        var foundItemsIDs = _(foundItems).map(mapKeysToString).uniq().value();
+        var InstancesIDs  = _(Instances ).map(mapKeysToString).uniq().value();
+
+        var sameLength   = foundItemsIDs.length == InstancesIDs.length;
+        var sameContents = sameLength && _.isEmpty(_.difference(foundItemsIDs, InstancesIDs));
+
+        return cb(null, sameContents);
+      });
+      return this;
+    },
+    enumerable: false,
+    writable: true
+  });
+  Object.defineProperty(Instance, association.getAccessor, {
+    value: function () {
+      var options    = {};
+      var conditions = null;
+      var order      = null;
+      var cb         = null;
+
+      for (var i = 0; i < arguments.length; i++) {
+        switch (typeof arguments[i]) {
+          case "function":
+            cb = arguments[i];
+            break;
+          case "object":
+            if (Array.isArray(arguments[i])) {
+              order = arguments[i];
+              order[0] = [ association.model.table, order[0] ];
+            } else {
+              if (conditions === null) {
+                conditions = arguments[i];
+              } else {
+                options = arguments[i];
+              }
+            }
+            break;
+          case "string":
+            if (arguments[i][0] == "-") {
+              order = [ [ association.model.table, arguments[i].substr(1) ], "Z" ];
+            } else {
+              order = [ [ association.model.table, arguments[i] ] ];
+            }
+            break;
+          case "number":
+            options.limit = arguments[i];
+            break;
+        }
+      }
+
+      if (order !== null) {
+        options.order = order;
+      }
+
+      if (conditions === null) {
+        conditions = {};
+      }
+
+      if (Driver.hasMany) {
+        return Driver.hasMany(Model, association).get(Instance, conditions, options, createInstance, cb);
+      }
+
+      options.__merge = {
+        from  : { table: association.mergeTable, field: Object.keys(association.mergeAssocId) },
+        to    : { table: association.model.table, field: association.model.id.slice(0) }, // clone model id
+        where : [ association.mergeTable, {} ]
+      };
+
+      adjustForMapsTo(options);
+
+      options.extra = association.props;
+      options.extra_info = {
+         table: association.mergeTable,
+        id: util.values(Instance, Model.id),
+        id_prop: Object.keys(association.mergeId),
+        assoc_prop: Object.keys(association.mergeAssocId)
+      };
+
+      util.populateConditions(Model, Object.keys(association.mergeId), Instance, options.__merge.where[1]);
+
+      if (cb === null) {
+        return association.model.find(conditions, options);
+      }
+
+      association.model.find(conditions, options, cb);
+
+      return this;
+    },
+    enumerable: false,
+    writable: true
+  });
+  Object.defineProperty(Instance, association.setAccessor, {
+    value: function () {
+      var items = _.flatten(arguments);
+      var cb    = _.last(items) instanceof Function ? items.pop() : noOperation;
+
+      Instance[association.delAccessor](function (err) {
+        if (err) return cb(err);
+
+        if (items.length) {
+          Instance[association.addAccessor](items, cb);
+        } else {
+          cb(null);
+        }
+      });
+
+      return this;
+    },
+    enumerable: false,
+    writable: true
+  });
+  Object.defineProperty(Instance, association.delAccessor, {
+    value: function () {
+      var Associations = [];
+      var cb = noOperation;
+
+      for (var i = 0; i < arguments.length; i++) {
+        switch (typeof arguments[i]) {
+          case "function":
+            cb = arguments[i];
+            break;
+          case "object":
+            if (Array.isArray(arguments[i])) {
+              Associations = Associations.concat(arguments[i]);
+            } else if (arguments[i].isInstance) {
+              Associations.push(arguments[i]);
+            }
+            break;
+        }
+      }
+      var conditions = {};
+      var run = function () {
+        if (Driver.hasMany) {
+          return Driver.hasMany(Model, association).del(Instance, Associations, cb);
+        }
+
+        if (Associations.length === 0) {
+          return Driver.remove(association.mergeTable, conditions, cb);
+        }
+
+        for (var i = 0; i < Associations.length; i++) {
+          util.populateConditions(association.model, Object.keys(association.mergeAssocId), Associations[i], conditions, false);
+        }
+
+        Driver.remove(association.mergeTable, conditions, cb);
+      };
+
+      util.populateConditions(Model, Object.keys(association.mergeId), Instance, conditions);
+
+      if (this.saved()) {
+        run();
+      } else {
+        this.save(function (err) {
+          if (err) {
+            return cb(err);
+          }
+
+          return run();
+        });
+      }
+      return this;
+    },
+    enumerable: false,
+    writable: true
+  });
+  Object.defineProperty(Instance, association.addAccessor, {
+    value: function () {
+      var Associations = [];
+      var opts = {};
+      var cb = noOperation;
+
+      var run = function () {
+        var savedAssociations = [];
+        var saveNextAssociation = function () {
+          if (Associations.length === 0) {
+            return cb(null, savedAssociations);
+          }
+
+          var Association = Associations.pop();
+          var saveAssociation = function (err) {
+            if (err) {
+              return cb(err);
+            }
+
+            Association.save(function (err) {
+              if (err) {
+                return cb(err);
+              }
+
+              var data = {};
+
+              for (var k in opts) {
+                if (k in association.props && Driver.propertyToValue) {
+                  data[k] = Driver.propertyToValue(opts[k], association.props[k]);
+                } else {
+                  data[k] = opts[k];
+                }
+              }
+
+              if (Driver.hasMany) {
+                return Driver.hasMany(Model, association).add(Instance, Association, data, function (err) {
+                  if (err) {
+                    return cb(err);
+                  }
+
+                  savedAssociations.push(Association);
+
+                  return saveNextAssociation();
+                });
+              }
+
+              util.populateConditions(Model, Object.keys(association.mergeId), Instance, data);
+              util.populateConditions(association.model, Object.keys(association.mergeAssocId), Association, data);
+
+              Driver.insert(association.mergeTable, data, null, function (err) {
+                if (err) {
+                  return cb(err);
+                }
+
+                savedAssociations.push(Association);
+
+                return saveNextAssociation();
+              });
+            });
+          };
+
+          if (Object.keys(association.props).length) {
+            Hook.wait(Association, association.hooks.beforeSave, saveAssociation, opts);
+          } else {
+            Hook.wait(Association, association.hooks.beforeSave, saveAssociation);
+          }
+        };
+
+        return saveNextAssociation();
+      };
+
+      for (var i = 0; i < arguments.length; i++) {
+        switch (typeof arguments[i]) {
+          case "function":
+            cb = arguments[i];
+            break;
+          case "object":
+            if (Array.isArray(arguments[i])) {
+              Associations = Associations.concat(arguments[i]);
+            } else if (arguments[i].isInstance) {
+              Associations.push(arguments[i]);
+            } else {
+              opts = arguments[i];
+            }
+            break;
+        }
+      }
+
+      if (Associations.length === 0) {
+          throw new ORMError("No associations defined", 'PARAM_MISMATCH', { model: Model.name });
+      }
+
+      if (this.saved()) {
+        run();
+      } else {
+        this.save(function (err) {
+          if (err) {
+            return cb(err);
+          }
+
+          return run();
+        });
+      }
+
+      return this;
+    },
+    enumerable: false,
+    writable: true
+  });
+
+  Object.defineProperty(Instance, association.name, {
+    get: function () {
+      return Instance.__opts.associations[association.name].value;
+    },
+    set: function (val) {
+      Instance.__opts.associations[association.name].changed = true;
+      Instance.__opts.associations[association.name].value   = val;
+    },
+    enumerable: true
+  });
 }
 
 function autoFetchInstance(Instance, association, opts, cb) {
-	if (!Instance.saved()) {
-		return cb();
-	}
-
-	if (!opts.hasOwnProperty("autoFetchLimit") || typeof opts.autoFetchLimit == "undefined") {
-		opts.autoFetchLimit = association.autoFetchLimit;
-	}
-
-	if (opts.autoFetchLimit === 0 || (!opts.autoFetch && !association.autoFetch)) {
-		return cb();
-	}
-
-	Instance[association.getAccessor]({}, { autoFetchLimit: opts.autoFetchLimit - 1 }, function (err, Assoc) {
-		if (!err) {
-			// Set this way to prevent setting 'changed' status
-			Instance.__opts.associations[association.name].value = Assoc;
-		}
-
-		return cb();
-	});
+  if (!Instance.saved()) {
+    return cb();
+  }
+
+  if (!opts.hasOwnProperty("autoFetchLimit") || typeof opts.autoFetchLimit == "undefined") {
+    opts.autoFetchLimit = association.autoFetchLimit;
+  }
+
+  if (opts.autoFetchLimit === 0 || (!opts.autoFetch && !association.autoFetch)) {
+    return cb();
+  }
+
+  Instance[association.getAccessor]({}, { autoFetchLimit: opts.autoFetchLimit - 1 }, function (err, Assoc) {
+    if (!err) {
+      // Set this way to prevent setting 'changed' status
+      Instance.__opts.associations[association.name].value = Assoc;
+    }
+
+    return cb();
+  });
 }
 
 function ucfirst(text) {
-	return text[0].toUpperCase() + text.substr(1).replace(/_([a-z])/, function (m, l) {
-		return l.toUpperCase();
-	});
+  return text[0].toUpperCase() + text.substr(1).replace(/_([a-z])/, function (m, l) {
+    return l.toUpperCase();
+  });
 }
 
 function noOperation() {
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index df8a3a46..74098dfe 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -4,314 +4,314 @@ var ORMError   = require("../Error");
 var Accessors  = { "get": "get", "set": "set", "has": "has", "del": "remove" };
 
 exports.prepare = function (Model, associations) {
-	Model.hasOne = function () {
-		var assocName;
-		var assocTemplateName;
-		var association = {
-			name           : Model.table,
-			model          : Model,
-			reversed       : false,
-			extension      : false,
-			autoFetch      : false,
-			autoFetchLimit : 2,
-			required       : false
-		};
-
-		for (var i = 0; i < arguments.length; i++) {
-			switch (typeof arguments[i]) {
-				case "string":
-					association.name = arguments[i];
-					break;
-				case "function":
-					if (arguments[i].table) {
-						association.model = arguments[i];
-					}
-					break;
-				case "object":
-					association = _.extend(association, arguments[i]);
-					break;
-			}
-		}
-
-		assocName = ucfirst(association.name);
-		assocTemplateName = association.accessor || assocName;
-
-		if (!association.hasOwnProperty("field")) {
-			association.field = util.formatField(association.model, association.name, association.required, association.reversed);
-		} else if(!association.extension) {
-			association.field = util.wrapFieldObject({
-				field: association.field, model: Model, altName: Model.table,
-				mapsTo: association.mapsTo
-			});
-		}
-
-		util.convertPropToJoinKeyProp(association.field, {
-			makeKey: false, required: association.required
-		});
-
-		for (var k in Accessors) {
-			if (!association.hasOwnProperty(k + "Accessor")) {
-				association[k + "Accessor"] = Accessors[k] + assocTemplateName;
-			}
-		}
-
-		associations.push(association);
-		for (k in association.field) {
-			if (!association.field.hasOwnProperty(k)) {
-				continue;
-			}
-			if (!association.reversed) {
-				Model.addProperty(
-					_.extend({}, association.field[k], { klass: 'hasOne' }),
-					false
-				);
-			}
-		}
-
-		if (association.reverse) {
-			association.model.hasOne(association.reverse, Model, {
-				reversed       : true,
-				accessor       : association.reverseAccessor,
-				reverseAccessor: undefined,
-				field          : association.field,
-				autoFetch      : association.autoFetch,
-				autoFetchLimit : association.autoFetchLimit
-			});
-		}
-
-		Model["findBy" + assocTemplateName] = function () {
-			var cb = null, conditions = null, options = {};
-
-			for (var i = 0; i < arguments.length; i++) {
-				switch (typeof arguments[i]) {
-					case "function":
-						cb = arguments[i];
-						break;
-					case "object":
-						if (conditions === null) {
-							conditions = arguments[i];
-						} else {
-							options = arguments[i];
-						}
-						break;
-				}
-			}
-
-			if (conditions === null) {
-				throw new ORMError(".findBy(" + assocName + ") is missing a conditions object", 'PARAM_MISMATCH');
-			}
-
-			options.__merge = {
-				from  : { table: association.model.table, field: (association.reversed ? Object.keys(association.field) : association.model.id) },
-				to    : { table: Model.table, field: (association.reversed ? association.model.id : Object.keys(association.field) ) },
-				where : [ association.model.table, conditions ],
-				table : Model.table
-			};
-			options.extra = [];
-
-			if (typeof cb === "function") {
-				return Model.find({}, options, cb);
-			}
-			return Model.find({}, options);
-		};
-
-		return this;
-	};
+  Model.hasOne = function () {
+    var assocName;
+    var assocTemplateName;
+    var association = {
+      name           : Model.table,
+      model          : Model,
+      reversed       : false,
+      extension      : false,
+      autoFetch      : false,
+      autoFetchLimit : 2,
+      required       : false
+    };
+
+    for (var i = 0; i < arguments.length; i++) {
+      switch (typeof arguments[i]) {
+        case "string":
+          association.name = arguments[i];
+          break;
+        case "function":
+          if (arguments[i].table) {
+            association.model = arguments[i];
+          }
+          break;
+        case "object":
+          association = _.extend(association, arguments[i]);
+          break;
+      }
+    }
+
+    assocName = ucfirst(association.name);
+    assocTemplateName = association.accessor || assocName;
+
+    if (!association.hasOwnProperty("field")) {
+      association.field = util.formatField(association.model, association.name, association.required, association.reversed);
+    } else if(!association.extension) {
+      association.field = util.wrapFieldObject({
+        field: association.field, model: Model, altName: Model.table,
+        mapsTo: association.mapsTo
+      });
+    }
+
+    util.convertPropToJoinKeyProp(association.field, {
+      makeKey: false, required: association.required
+    });
+
+    for (var k in Accessors) {
+      if (!association.hasOwnProperty(k + "Accessor")) {
+        association[k + "Accessor"] = Accessors[k] + assocTemplateName;
+      }
+    }
+
+    associations.push(association);
+    for (k in association.field) {
+      if (!association.field.hasOwnProperty(k)) {
+        continue;
+      }
+      if (!association.reversed) {
+        Model.addProperty(
+          _.extend({}, association.field[k], { klass: 'hasOne' }),
+          false
+        );
+      }
+    }
+
+    if (association.reverse) {
+      association.model.hasOne(association.reverse, Model, {
+        reversed       : true,
+        accessor       : association.reverseAccessor,
+        reverseAccessor: undefined,
+        field          : association.field,
+        autoFetch      : association.autoFetch,
+        autoFetchLimit : association.autoFetchLimit
+      });
+    }
+
+    Model["findBy" + assocTemplateName] = function () {
+      var cb = null, conditions = null, options = {};
+
+      for (var i = 0; i < arguments.length; i++) {
+        switch (typeof arguments[i]) {
+          case "function":
+            cb = arguments[i];
+            break;
+          case "object":
+            if (conditions === null) {
+              conditions = arguments[i];
+            } else {
+              options = arguments[i];
+            }
+            break;
+        }
+      }
+
+      if (conditions === null) {
+        throw new ORMError(".findBy(" + assocName + ") is missing a conditions object", 'PARAM_MISMATCH');
+      }
+
+      options.__merge = {
+        from  : { table: association.model.table, field: (association.reversed ? Object.keys(association.field) : association.model.id) },
+        to    : { table: Model.table, field: (association.reversed ? association.model.id : Object.keys(association.field) ) },
+        where : [ association.model.table, conditions ],
+        table : Model.table
+      };
+      options.extra = [];
+
+      if (typeof cb === "function") {
+        return Model.find({}, options, cb);
+      }
+      return Model.find({}, options);
+    };
+
+    return this;
+  };
 };
 
 exports.extend = function (Model, Instance, Driver, associations) {
-	for (var i = 0; i < associations.length; i++) {
-		extendInstance(Model, Instance, Driver, associations[i]);
-	}
+  for (var i = 0; i < associations.length; i++) {
+    extendInstance(Model, Instance, Driver, associations[i]);
+  }
 };
 
 exports.autoFetch = function (Instance, associations, opts, cb) {
-	if (associations.length === 0) {
-		return cb();
-	}
-
-	var pending = associations.length;
-	var autoFetchDone = function autoFetchDone() {
-		pending -= 1;
-
-		if (pending === 0) {
-			return cb();
-		}
-	};
-
-	for (var i = 0; i < associations.length; i++) {
-		autoFetchInstance(Instance, associations[i], opts, autoFetchDone);
-	}
+  if (associations.length === 0) {
+    return cb();
+  }
+
+  var pending = associations.length;
+  var autoFetchDone = function autoFetchDone() {
+    pending -= 1;
+
+    if (pending === 0) {
+      return cb();
+    }
+  };
+
+  for (var i = 0; i < associations.length; i++) {
+    autoFetchInstance(Instance, associations[i], opts, autoFetchDone);
+  }
 };
 
 function extendInstance(Model, Instance, Driver, association) {
-	Object.defineProperty(Instance, association.hasAccessor, {
-		value: function (opts, cb) {
-			if (typeof opts === "function") {
-				cb = opts;
-				opts = {};
-			}
-
-			if (util.hasValues(Instance, Object.keys(association.field))) {
-				association.model.get(util.values(Instance, Object.keys(association.field)), opts, function (err, instance) {
-					return cb(err, instance ? true : false);
-				});
-			} else {
-				cb(null, false);
-			}
-
-			return this;
-		},
-		enumerable: false,
-		writable: true
-	});
-	Object.defineProperty(Instance, association.getAccessor, {
-		value: function (opts, cb) {
-			if (typeof opts === "function") {
-				cb = opts;
-				opts = {};
-			}
-
-			var saveAndReturn = function (err, Assoc) {
-				if (!err) {
-					Instance[association.name] = Assoc;
-				}
-
-				return cb(err, Assoc);
-			};
-
-			if (association.reversed) {
-				if (util.hasValues(Instance, Model.id)) {
-					if (typeof cb !== "function") {
-						return association.model.find(util.getConditions(Model, Object.keys(association.field), Instance), opts);
-					}
-					association.model.find(util.getConditions(Model, Object.keys(association.field), Instance), opts, saveAndReturn);
-				} else {
-					cb(null);
-				}
-			} else {
-				if (Instance.isShell()) {
-					Model.get(util.values(Instance, Model.id), function (err, instance) {
-						if (err || !util.hasValues(instance, Object.keys(association.field))) {
-							return cb(null);
-						}
-						association.model.get(util.values(instance, Object.keys(association.field)), opts, saveAndReturn);
-					});
-				} else if (util.hasValues(Instance, Object.keys(association.field))) {
-					association.model.get(util.values(Instance, Object.keys(association.field)), opts, saveAndReturn);
-				} else {
-					cb(null);
-				}
-			}
-
-			return this;
-		},
-		enumerable: false,
-		writable: true
-	});
-	Object.defineProperty(Instance, association.setAccessor, {
-		value: function (OtherInstance, cb) {
-			if (association.reversed) {
-				Instance.save(function (err) {
-					if (err) {
-						return cb(err);
-					}
-
-					if (!Array.isArray(OtherInstance)) {
-						util.populateConditions(Model, Object.keys(association.field), Instance, OtherInstance, true);
-
-						return OtherInstance.save({}, { saveAssociations: false }, cb);
-					}
-
-					var associations = _.clone(OtherInstance);
-
-					var saveNext = function () {
-						if (!associations.length) {
-							return cb();
-						}
-
-						var other = associations.pop();
-
-						util.populateConditions(Model, Object.keys(association.field), Instance, other, true);
-
-						other.save({}, { saveAssociations: false }, function (err) {
-							if (err) {
-								return cb(err);
-							}
-
-							saveNext();
-						});
-					};
-
-					return saveNext();
-				});
-			} else {
-				OtherInstance.save({}, { saveAssociations: false }, function (err) {
-					if (err) {
-						return cb(err);
-					}
-
-					Instance[association.name] = OtherInstance;
-
-					util.populateConditions(association.model, Object.keys(association.field), OtherInstance, Instance);
-
-					return Instance.save({}, { saveAssociations: false }, cb);
-				});
-			}
-
-			return this;
-		},
-		enumerable: false,
-		writable: true
-	});
-	if (!association.reversed) {
-		Object.defineProperty(Instance, association.delAccessor, {
-			value: function (cb) {
-				for (var k in association.field) {
-					if (association.field.hasOwnProperty(k)) {
-						Instance[k] = null;
-					}
-				}
-				Instance.save({}, { saveAssociations: false }, function (err) {
-					if (!err) {
-						delete Instance[association.name];
-					}
-
-					return cb();
-				});
-
-				return this;
-			},
-			enumerable: false,
-			writable: true
-		});
-	}
+  Object.defineProperty(Instance, association.hasAccessor, {
+    value: function (opts, cb) {
+      if (typeof opts === "function") {
+        cb = opts;
+        opts = {};
+      }
+
+      if (util.hasValues(Instance, Object.keys(association.field))) {
+        association.model.get(util.values(Instance, Object.keys(association.field)), opts, function (err, instance) {
+          return cb(err, instance ? true : false);
+        });
+      } else {
+        cb(null, false);
+      }
+
+      return this;
+    },
+    enumerable: false,
+    writable: true
+  });
+  Object.defineProperty(Instance, association.getAccessor, {
+    value: function (opts, cb) {
+      if (typeof opts === "function") {
+        cb = opts;
+        opts = {};
+      }
+
+      var saveAndReturn = function (err, Assoc) {
+        if (!err) {
+          Instance[association.name] = Assoc;
+        }
+
+        return cb(err, Assoc);
+      };
+
+      if (association.reversed) {
+        if (util.hasValues(Instance, Model.id)) {
+          if (typeof cb !== "function") {
+            return association.model.find(util.getConditions(Model, Object.keys(association.field), Instance), opts);
+          }
+          association.model.find(util.getConditions(Model, Object.keys(association.field), Instance), opts, saveAndReturn);
+        } else {
+          cb(null);
+        }
+      } else {
+        if (Instance.isShell()) {
+          Model.get(util.values(Instance, Model.id), function (err, instance) {
+            if (err || !util.hasValues(instance, Object.keys(association.field))) {
+              return cb(null);
+            }
+            association.model.get(util.values(instance, Object.keys(association.field)), opts, saveAndReturn);
+          });
+        } else if (util.hasValues(Instance, Object.keys(association.field))) {
+          association.model.get(util.values(Instance, Object.keys(association.field)), opts, saveAndReturn);
+        } else {
+          cb(null);
+        }
+      }
+
+      return this;
+    },
+    enumerable: false,
+    writable: true
+  });
+  Object.defineProperty(Instance, association.setAccessor, {
+    value: function (OtherInstance, cb) {
+      if (association.reversed) {
+        Instance.save(function (err) {
+          if (err) {
+            return cb(err);
+          }
+
+          if (!Array.isArray(OtherInstance)) {
+            util.populateConditions(Model, Object.keys(association.field), Instance, OtherInstance, true);
+
+            return OtherInstance.save({}, { saveAssociations: false }, cb);
+          }
+
+          var associations = _.clone(OtherInstance);
+
+          var saveNext = function () {
+            if (!associations.length) {
+              return cb();
+            }
+
+            var other = associations.pop();
+
+            util.populateConditions(Model, Object.keys(association.field), Instance, other, true);
+
+            other.save({}, { saveAssociations: false }, function (err) {
+              if (err) {
+                return cb(err);
+              }
+
+              saveNext();
+            });
+          };
+
+          return saveNext();
+        });
+      } else {
+        OtherInstance.save({}, { saveAssociations: false }, function (err) {
+          if (err) {
+            return cb(err);
+          }
+
+          Instance[association.name] = OtherInstance;
+
+          util.populateConditions(association.model, Object.keys(association.field), OtherInstance, Instance);
+
+          return Instance.save({}, { saveAssociations: false }, cb);
+        });
+      }
+
+      return this;
+    },
+    enumerable: false,
+    writable: true
+  });
+  if (!association.reversed) {
+    Object.defineProperty(Instance, association.delAccessor, {
+      value: function (cb) {
+        for (var k in association.field) {
+          if (association.field.hasOwnProperty(k)) {
+            Instance[k] = null;
+          }
+        }
+        Instance.save({}, { saveAssociations: false }, function (err) {
+          if (!err) {
+            delete Instance[association.name];
+          }
+
+          return cb();
+        });
+
+        return this;
+      },
+      enumerable: false,
+      writable: true
+    });
+  }
 }
 
 function autoFetchInstance(Instance, association, opts, cb) {
-	if (!Instance.saved()) {
-		return cb();
-	}
-
-	if (!opts.hasOwnProperty("autoFetchLimit") || typeof opts.autoFetchLimit === "undefined") {
-		opts.autoFetchLimit = association.autoFetchLimit;
-	}
-
-	if (opts.autoFetchLimit === 0 || (!opts.autoFetch && !association.autoFetch)) {
-		return cb();
-	}
-
-	// When we have a new non persisted instance for which the association field (eg owner_id)
-	// is set, we don't want to auto fetch anything, since `new Model(owner_id: 12)` takes no
-	// callback, and hence this lookup would complete at an arbitrary point in the future.
-	// The associated entity should probably be fetched when the instance is persisted.
-	if (Instance.isPersisted()) {
-		Instance[association.getAccessor]({ autoFetchLimit: opts.autoFetchLimit - 1 }, cb);
-	} else {
-		return cb();
-	}
+  if (!Instance.saved()) {
+    return cb();
+  }
+
+  if (!opts.hasOwnProperty("autoFetchLimit") || typeof opts.autoFetchLimit === "undefined") {
+    opts.autoFetchLimit = association.autoFetchLimit;
+  }
+
+  if (opts.autoFetchLimit === 0 || (!opts.autoFetch && !association.autoFetch)) {
+    return cb();
+  }
+
+  // When we have a new non persisted instance for which the association field (eg owner_id)
+  // is set, we don't want to auto fetch anything, since `new Model(owner_id: 12)` takes no
+  // callback, and hence this lookup would complete at an arbitrary point in the future.
+  // The associated entity should probably be fetched when the instance is persisted.
+  if (Instance.isPersisted()) {
+    Instance[association.getAccessor]({ autoFetchLimit: opts.autoFetchLimit - 1 }, cb);
+  } else {
+    return cb();
+  }
 }
 
 function ucfirst(text) {
-	return text[0].toUpperCase() + text.substr(1);
+  return text[0].toUpperCase() + text.substr(1);
 }
diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index bdf8b8eb..7959ceed 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -7,314 +7,314 @@ var Promise       = require("./Promise").Promise;
 module.exports = ChainFind;
 
 function ChainFind(Model, opts) {
-	var prepareConditions = function () {
-		return Utilities.transformPropertyNames(
-			opts.conditions, opts.properties
-		);
-	};
-
-	var prepareOrder = function () {
-		return Utilities.transformOrderPropertyNames(
-			opts.order, opts.properties
-		);
-	};
-
-	var chainRun = function (done) {
-		var order, conditions;
-
-		conditions = Utilities.transformPropertyNames(
-			opts.conditions, opts.properties
-		);
-		order = Utilities.transformOrderPropertyNames(
-			opts.order, opts.properties
-		);
-
-		opts.driver.find(opts.only, opts.table, conditions, {
-			limit  : opts.limit,
-			order  : order,
-			merge  : opts.merge,
-			offset : opts.offset,
-			exists : opts.exists
-		}, function (err, dataItems) {
-			if (err) {
-				return done(err);
-			}
-			if (dataItems.length === 0) {
-				return done(null, []);
-			}
-			var pending = dataItems.length;
-
-			var eagerLoad = function (err, items) {
-				var pending = opts.__eager.length;
-				var idMap = {};
-
-				var keys = _.map(items, function (item, index) {
-					var key = item[opts.keys[0]];
-					// Create the association arrays
-					for (var i = 0, association; association = opts.__eager[i]; i++) {
-						item[association.name] = [];
-					}
-					idMap[key] = index;
-
-					return key;
-				});
-
-				async.eachSeries(opts.__eager,
-					function (association, cb) {
-						opts.driver.eagerQuery(association, opts, keys, function (err, instances) {
-							if (err) return cb(err)
-
-							for (var i = 0, instance; instance = instances[i]; i++) {
-								// Perform a parent lookup with $p, and initialize it as an instance.
-								items[idMap[instance.$p]][association.name].push(association.model(instance));
-							}
-							cb();
-						});
-					},
-					function (err) {
-						if (err) done(err);
-						else done(null, items);
-					}
-				);
-			};
-
-			async.map(dataItems, opts.newInstance, function (err, items) {
-				if (err) return done(err);
-
-				var shouldEagerLoad = opts.__eager && opts.__eager.length;
-				var completeFn = shouldEagerLoad ? eagerLoad : done;
-
-				return completeFn(null, items);
-			});
-		});
-	}
-
-	var promise = null;
-	var chain = {
-		find: function () {
-			var cb = null;
-
-			var args = Array.prototype.slice.call(arguments);
-			opts.conditions = opts.conditions || {};
-
-			if (typeof _.last(args) === "function") {
-			    cb = args.pop();
-			}
-
-			if (typeof args[0] === "object") {
-				_.extend(opts.conditions, args[0]);
-			} else if (typeof args[0] === "string") {
-				opts.conditions.__sql = opts.conditions.__sql || [];
-				opts.conditions.__sql.push(args);
-			}
-
-			if (cb) {
-				chainRun(cb);
-			}
-			return this;
-		},
-		only: function () {
-			if (arguments.length && Array.isArray(arguments[0])) {
-				opts.only = arguments[0];
-			} else {
-				opts.only = Array.prototype.slice.apply(arguments);
-			}
-			return this;
-		},
-		omit: function () {
-			var omit = null;
-
-			if (arguments.length && Array.isArray(arguments[0])) {
-				omit = arguments[0];
-			} else {
-				omit = Array.prototype.slice.apply(arguments);
-			}
-			this.only(_.difference(Object.keys(opts.properties), omit));
-			return this;
-		},
-		limit: function (limit) {
-			opts.limit = limit;
-			return this;
-		},
-		skip: function (offset) {
-			return this.offset(offset);
-		},
-		offset: function (offset) {
-			opts.offset = offset;
-			return this;
-		},
-		order: function (property, order) {
-			if (!Array.isArray(opts.order)) {
-				opts.order = [];
-			}
-			if (property[0] === "-") {
-				opts.order.push([ property.substr(1), "Z" ]);
-			} else {
-				opts.order.push([ property, (order && order.toUpperCase() === "Z" ? "Z" : "A") ]);
-			}
-			return this;
-		},
-		orderRaw: function (str, args) {
-			if (!Array.isArray(opts.order)) {
-				opts.order = [];
-			}
-			opts.order.push([ str, args || [] ]);
-			return this;
-		},
-		count: function (cb) {
-			opts.driver.count(opts.table, prepareConditions(), {
-				merge  : opts.merge
-			}, function (err, data) {
-				if (err || data.length === 0) {
-					return cb(err);
-				}
-				return cb(null, data[0].c);
-			});
-			return this;
-		},
-		remove: function (cb) {
-			var keys = _.map(opts.keyProperties, 'mapsTo');
-
-			opts.driver.find(keys, opts.table, prepareConditions(), {
-				limit  : opts.limit,
-				order  : prepareOrder(),
-				merge  : opts.merge,
-				offset : opts.offset,
-				exists : opts.exists
-			}, function (err, data) {
-				if (err) {
-					return cb(err);
-				}
-				if (data.length === 0) {
-					return cb(null);
-				}
-
-				var ids = [], conditions = {};
-				var or;
-
-				conditions.or = [];
-
-				for (var i = 0; i < data.length; i++) {
-					or = {};
-					for (var j = 0; j < opts.keys.length; j++) {
-						or[keys[j]] = data[i][keys[j]];
-					}
-					conditions.or.push(or);
-				}
-
-				return opts.driver.remove(opts.table, conditions, cb);
-			});
-			return this;
-		},
-		first: function (cb) {
-			return this.run(function (err, items) {
-				return cb(err, items && items.length > 0 ? items[0] : null);
-			});
-		},
-		last: function (cb) {
-			return this.run(function (err, items) {
-				return cb(err, items && items.length > 0 ? items[items.length - 1] : null);
-			});
-		},
-		each: function (cb) {
-			return new ChainInstance(this, cb);
-		},
-		run: function (cb) {
-			chainRun(cb);
-			return this;
-		},
-		success: function (cb) {
-			if (!promise) {
-				promise = new Promise();
-				promise.handle(this.all);
-			}
-			return promise.success(cb);
-		},
-		fail: function (cb) {
-			if (!promise) {
-				promise = new Promise();
-				promise.handle(this.all);
-			}
-			return promise.fail(cb);
-		},
-		eager: function () {
-			// This will allow params such as ("abc", "def") or (["abc", "def"])
-			var associations = _.flatten(arguments);
-
-			// TODO: Implement eager loading for Mongo and delete this.
-			if (opts.driver.config.protocol == "mongodb:") {
-				throw new Error("MongoDB does not currently support eager loading");
-			}
-
-			opts.__eager = _.filter(opts.associations, function (association) {
-				return ~associations.indexOf(association.name);
-			});
-
-			return this;
-		}
-	};
-	chain.all = chain.where = chain.find;
-
-	if (opts.associations) {
-		for (var i = 0; i < opts.associations.length; i++) {
-			addChainMethod(chain, opts.associations[i], opts);
-		}
-	}
-	for (var k in Model) {
-		if ([
-			"hasOne", "hasMany",
-			"drop", "sync", "get", "clear", "create",
-			"exists", "settings", "aggregate"
-		].indexOf(k) >= 0) {
-			continue;
-		}
-		if (typeof Model[k] !== "function" || chain[k]) {
-			continue;
-		}
-
-		chain[k] = Model[k];
-	}
-	chain.model   = Model;
-	chain.options = opts;
-
-	return chain;
+  var prepareConditions = function () {
+    return Utilities.transformPropertyNames(
+      opts.conditions, opts.properties
+    );
+  };
+
+  var prepareOrder = function () {
+    return Utilities.transformOrderPropertyNames(
+      opts.order, opts.properties
+    );
+  };
+
+  var chainRun = function (done) {
+    var order, conditions;
+
+    conditions = Utilities.transformPropertyNames(
+      opts.conditions, opts.properties
+    );
+    order = Utilities.transformOrderPropertyNames(
+      opts.order, opts.properties
+    );
+
+    opts.driver.find(opts.only, opts.table, conditions, {
+      limit  : opts.limit,
+      order  : order,
+      merge  : opts.merge,
+      offset : opts.offset,
+      exists : opts.exists
+    }, function (err, dataItems) {
+      if (err) {
+        return done(err);
+      }
+      if (dataItems.length === 0) {
+        return done(null, []);
+      }
+      var pending = dataItems.length;
+
+      var eagerLoad = function (err, items) {
+        var pending = opts.__eager.length;
+        var idMap = {};
+
+        var keys = _.map(items, function (item, index) {
+          var key = item[opts.keys[0]];
+          // Create the association arrays
+          for (var i = 0, association; association = opts.__eager[i]; i++) {
+            item[association.name] = [];
+          }
+          idMap[key] = index;
+
+          return key;
+        });
+
+        async.eachSeries(opts.__eager,
+          function (association, cb) {
+            opts.driver.eagerQuery(association, opts, keys, function (err, instances) {
+              if (err) return cb(err)
+
+              for (var i = 0, instance; instance = instances[i]; i++) {
+                // Perform a parent lookup with $p, and initialize it as an instance.
+                items[idMap[instance.$p]][association.name].push(association.model(instance));
+              }
+              cb();
+            });
+          },
+          function (err) {
+            if (err) done(err);
+            else done(null, items);
+          }
+        );
+      };
+
+      async.map(dataItems, opts.newInstance, function (err, items) {
+        if (err) return done(err);
+
+        var shouldEagerLoad = opts.__eager && opts.__eager.length;
+        var completeFn = shouldEagerLoad ? eagerLoad : done;
+
+        return completeFn(null, items);
+      });
+    });
+  }
+
+  var promise = null;
+  var chain = {
+    find: function () {
+      var cb = null;
+
+      var args = Array.prototype.slice.call(arguments);
+      opts.conditions = opts.conditions || {};
+
+      if (typeof _.last(args) === "function") {
+          cb = args.pop();
+      }
+
+      if (typeof args[0] === "object") {
+        _.extend(opts.conditions, args[0]);
+      } else if (typeof args[0] === "string") {
+        opts.conditions.__sql = opts.conditions.__sql || [];
+        opts.conditions.__sql.push(args);
+      }
+
+      if (cb) {
+        chainRun(cb);
+      }
+      return this;
+    },
+    only: function () {
+      if (arguments.length && Array.isArray(arguments[0])) {
+        opts.only = arguments[0];
+      } else {
+        opts.only = Array.prototype.slice.apply(arguments);
+      }
+      return this;
+    },
+    omit: function () {
+      var omit = null;
+
+      if (arguments.length && Array.isArray(arguments[0])) {
+        omit = arguments[0];
+      } else {
+        omit = Array.prototype.slice.apply(arguments);
+      }
+      this.only(_.difference(Object.keys(opts.properties), omit));
+      return this;
+    },
+    limit: function (limit) {
+      opts.limit = limit;
+      return this;
+    },
+    skip: function (offset) {
+      return this.offset(offset);
+    },
+    offset: function (offset) {
+      opts.offset = offset;
+      return this;
+    },
+    order: function (property, order) {
+      if (!Array.isArray(opts.order)) {
+        opts.order = [];
+      }
+      if (property[0] === "-") {
+        opts.order.push([ property.substr(1), "Z" ]);
+      } else {
+        opts.order.push([ property, (order && order.toUpperCase() === "Z" ? "Z" : "A") ]);
+      }
+      return this;
+    },
+    orderRaw: function (str, args) {
+      if (!Array.isArray(opts.order)) {
+        opts.order = [];
+      }
+      opts.order.push([ str, args || [] ]);
+      return this;
+    },
+    count: function (cb) {
+      opts.driver.count(opts.table, prepareConditions(), {
+        merge  : opts.merge
+      }, function (err, data) {
+        if (err || data.length === 0) {
+          return cb(err);
+        }
+        return cb(null, data[0].c);
+      });
+      return this;
+    },
+    remove: function (cb) {
+      var keys = _.map(opts.keyProperties, 'mapsTo');
+
+      opts.driver.find(keys, opts.table, prepareConditions(), {
+        limit  : opts.limit,
+        order  : prepareOrder(),
+        merge  : opts.merge,
+        offset : opts.offset,
+        exists : opts.exists
+      }, function (err, data) {
+        if (err) {
+          return cb(err);
+        }
+        if (data.length === 0) {
+          return cb(null);
+        }
+
+        var ids = [], conditions = {};
+        var or;
+
+        conditions.or = [];
+
+        for (var i = 0; i < data.length; i++) {
+          or = {};
+          for (var j = 0; j < opts.keys.length; j++) {
+            or[keys[j]] = data[i][keys[j]];
+          }
+          conditions.or.push(or);
+        }
+
+        return opts.driver.remove(opts.table, conditions, cb);
+      });
+      return this;
+    },
+    first: function (cb) {
+      return this.run(function (err, items) {
+        return cb(err, items && items.length > 0 ? items[0] : null);
+      });
+    },
+    last: function (cb) {
+      return this.run(function (err, items) {
+        return cb(err, items && items.length > 0 ? items[items.length - 1] : null);
+      });
+    },
+    each: function (cb) {
+      return new ChainInstance(this, cb);
+    },
+    run: function (cb) {
+      chainRun(cb);
+      return this;
+    },
+    success: function (cb) {
+      if (!promise) {
+        promise = new Promise();
+        promise.handle(this.all);
+      }
+      return promise.success(cb);
+    },
+    fail: function (cb) {
+      if (!promise) {
+        promise = new Promise();
+        promise.handle(this.all);
+      }
+      return promise.fail(cb);
+    },
+    eager: function () {
+      // This will allow params such as ("abc", "def") or (["abc", "def"])
+      var associations = _.flatten(arguments);
+
+      // TODO: Implement eager loading for Mongo and delete this.
+      if (opts.driver.config.protocol == "mongodb:") {
+        throw new Error("MongoDB does not currently support eager loading");
+      }
+
+      opts.__eager = _.filter(opts.associations, function (association) {
+        return ~associations.indexOf(association.name);
+      });
+
+      return this;
+    }
+  };
+  chain.all = chain.where = chain.find;
+
+  if (opts.associations) {
+    for (var i = 0; i < opts.associations.length; i++) {
+      addChainMethod(chain, opts.associations[i], opts);
+    }
+  }
+  for (var k in Model) {
+    if ([
+      "hasOne", "hasMany",
+      "drop", "sync", "get", "clear", "create",
+      "exists", "settings", "aggregate"
+    ].indexOf(k) >= 0) {
+      continue;
+    }
+    if (typeof Model[k] !== "function" || chain[k]) {
+      continue;
+    }
+
+    chain[k] = Model[k];
+  }
+  chain.model   = Model;
+  chain.options = opts;
+
+  return chain;
 }
 
 function addChainMethod(chain, association, opts) {
-	chain[association.hasAccessor] = function (value) {
-		if (!opts.exists) {
-			opts.exists = [];
-		}
-		var conditions = {};
-
-		var assocIds = Object.keys(association.mergeAssocId);
-		var ids = association.model.id;
-		function mergeConditions(source) {
-			for (var i = 0; i < assocIds.length; i++) {
-				if (typeof conditions[assocIds[i]] === "undefined") {
-					conditions[assocIds[i]] = source[ids[i]];
-				} else if (Array.isArray(conditions[assocIds[i]])) {
-					conditions[assocIds[i]].push(source[ids[i]]);
-				} else {
-					conditions[assocIds[i]] = [ conditions[assocIds[i]], source[ids[i]] ];
-				}
-			}
-		}
-
-		if (Array.isArray(value)) {
-			for (var i = 0; i < value.length; i++) {
-				mergeConditions(value[i]);
-			}
-		} else {
-			mergeConditions(value);
-		}
-
-		opts.exists.push({
-			table      : association.mergeTable,
-			link       : [ Object.keys(association.mergeId), association.model.id ],
-			conditions : conditions
-		});
-
-		return chain;
-	};
+  chain[association.hasAccessor] = function (value) {
+    if (!opts.exists) {
+      opts.exists = [];
+    }
+    var conditions = {};
+
+    var assocIds = Object.keys(association.mergeAssocId);
+    var ids = association.model.id;
+    function mergeConditions(source) {
+      for (var i = 0; i < assocIds.length; i++) {
+        if (typeof conditions[assocIds[i]] === "undefined") {
+          conditions[assocIds[i]] = source[ids[i]];
+        } else if (Array.isArray(conditions[assocIds[i]])) {
+          conditions[assocIds[i]].push(source[ids[i]]);
+        } else {
+          conditions[assocIds[i]] = [ conditions[assocIds[i]], source[ids[i]] ];
+        }
+      }
+    }
+
+    if (Array.isArray(value)) {
+      for (var i = 0; i < value.length; i++) {
+        mergeConditions(value[i]);
+      }
+    } else {
+      mergeConditions(value);
+    }
+
+    opts.exists.push({
+      table      : association.mergeTable,
+      link       : [ Object.keys(association.mergeId), association.model.id ],
+      conditions : conditions
+    });
+
+    return chain;
+  };
 }
diff --git a/lib/ChainInstance.js b/lib/ChainInstance.js
index 2e55bb72..d6dba167 100644
--- a/lib/ChainInstance.js
+++ b/lib/ChainInstance.js
@@ -1,89 +1,89 @@
 module.exports = ChainInstance;
 
 function ChainInstance(chain, cb) {
-	var instances = null;
-	var loading   = false;
-	var queue     = [];
-
-	var load = function () {
-		loading = true;
-		chain.run(function (err, items) {
-			instances = items;
-
-			return next();
-		});
-	};
-	var promise = function(hwd, next) {
-		return function () {
-			if (!loading) {
-				load();
-			}
-
-			queue.push({ hwd: hwd, args: arguments });
-
-			return calls;
-		};
-	};
-	var next = function () {
-		if (queue.length === 0) return;
-
-		var item = queue.shift();
-
-		item.hwd.apply(calls, item.args);
-	};
-	var calls = {
-		filter: promise(function (cb) {
-			instances = instances.filter(cb);
-
-			return next();
-		}),
-		forEach: promise(function (cb) {
-			instances.forEach(cb);
-
-			return next();
-		}),
-		sort: promise(function (cb) {
-			instances.sort(cb);
-
-			return next();
-		}),
-		count: promise(function (cb) {
-			cb(instances.length);
-
-			return next();
-		}),
-		get: promise(function (cb) {
-			cb(instances);
-
-			return next();
-		}),
-		save: promise(function (cb) {
-			var saveNext = function (i) {
-				if (i >= instances.length) {
-					if (typeof cb === "function") {
-						cb();
-					}
-					return next();
-				}
-
-				return instances[i].save(function (err) {
-					if (err) {
-						if (typeof cb === "function") {
-							cb(err);
-						}
-						return next();
-					}
-
-					return saveNext(i + 1);
-				});
-			};
-
-			return saveNext(0);
-		})
-	};
-
-	if (typeof cb === "function") {
-		return calls.forEach(cb);
-	}
-	return calls;
+  var instances = null;
+  var loading   = false;
+  var queue     = [];
+
+  var load = function () {
+    loading = true;
+    chain.run(function (err, items) {
+      instances = items;
+
+      return next();
+    });
+  };
+  var promise = function(hwd, next) {
+    return function () {
+      if (!loading) {
+        load();
+      }
+
+      queue.push({ hwd: hwd, args: arguments });
+
+      return calls;
+    };
+  };
+  var next = function () {
+    if (queue.length === 0) return;
+
+    var item = queue.shift();
+
+    item.hwd.apply(calls, item.args);
+  };
+  var calls = {
+    filter: promise(function (cb) {
+      instances = instances.filter(cb);
+
+      return next();
+    }),
+    forEach: promise(function (cb) {
+      instances.forEach(cb);
+
+      return next();
+    }),
+    sort: promise(function (cb) {
+      instances.sort(cb);
+
+      return next();
+    }),
+    count: promise(function (cb) {
+      cb(instances.length);
+
+      return next();
+    }),
+    get: promise(function (cb) {
+      cb(instances);
+
+      return next();
+    }),
+    save: promise(function (cb) {
+      var saveNext = function (i) {
+        if (i >= instances.length) {
+          if (typeof cb === "function") {
+            cb();
+          }
+          return next();
+        }
+
+        return instances[i].save(function (err) {
+          if (err) {
+            if (typeof cb === "function") {
+              cb(err);
+            }
+            return next();
+          }
+
+          return saveNext(i + 1);
+        });
+      };
+
+      return saveNext(0);
+    })
+  };
+
+  if (typeof cb === "function") {
+    return calls.forEach(cb);
+  }
+  return calls;
 }
diff --git a/lib/Debug.js b/lib/Debug.js
index 24724d1b..f5354356 100644
--- a/lib/Debug.js
+++ b/lib/Debug.js
@@ -2,14 +2,14 @@ var util = require("util");
 var tty  = require("tty");
 
 exports.sql = function (driver, sql) {
-	var fmt;
+  var fmt;
 
-	if (tty.isatty(process.stdout)) {
-		fmt = "\033[32;1m(orm/%s) \033[34m%s\033[0m\n";
-		sql = sql.replace(/`(.+?)`/g, function (m) { return "\033[31m" + m + "\033[34m"; });
-	} else {
-		fmt = "[SQL/%s] %s\n";
-	}
+  if (tty.isatty(process.stdout)) {
+    fmt = "\033[32;1m(orm/%s) \033[34m%s\033[0m\n";
+    sql = sql.replace(/`(.+?)`/g, function (m) { return "\033[31m" + m + "\033[34m"; });
+  } else {
+    fmt = "[SQL/%s] %s\n";
+  }
 
-	process.stdout.write(util.format(fmt, driver, sql));
+  process.stdout.write(util.format(fmt, driver, sql));
 };
diff --git a/lib/Drivers/DDL/SQL.js b/lib/Drivers/DDL/SQL.js
index 1bf5e947..dfd7ec59 100644
--- a/lib/Drivers/DDL/SQL.js
+++ b/lib/Drivers/DDL/SQL.js
@@ -2,59 +2,59 @@ var _    = require("lodash");
 var Sync = require("sql-ddl-sync").Sync;
 
 exports.sync = function (opts, cb) {
-	var sync = new Sync({
-		driver  : this,
-		debug   : false//function (text) { console.log(text); }
-	});
+  var sync = new Sync({
+    driver  : this,
+    debug   : false//function (text) { console.log(text); }
+  });
 
-	var setIndex = function (p, v, k) {
-		v.index = true;
-		p[k] = v;
-	};
-	var props = {};
+  var setIndex = function (p, v, k) {
+    v.index = true;
+    p[k] = v;
+  };
+  var props = {};
 
-	if (this.customTypes) {
-		for (var k in this.customTypes) {
-			sync.defineType(k, this.customTypes[k]);
-		}
-	}
+  if (this.customTypes) {
+    for (var k in this.customTypes) {
+      sync.defineType(k, this.customTypes[k]);
+    }
+  }
 
-	sync.defineCollection(opts.table, opts.allProperties);
+  sync.defineCollection(opts.table, opts.allProperties);
 
-	for (var i = 0; i < opts.many_associations.length; i++) {
-		props = {};
+  for (var i = 0; i < opts.many_associations.length; i++) {
+    props = {};
 
-		_.merge(props, opts.many_associations[i].mergeId);
-		_.merge(props, opts.many_associations[i].mergeAssocId);
-		props = _.transform(props, setIndex);
-		_.merge(props, opts.many_associations[i].props);
+    _.merge(props, opts.many_associations[i].mergeId);
+    _.merge(props, opts.many_associations[i].mergeAssocId);
+    props = _.transform(props, setIndex);
+    _.merge(props, opts.many_associations[i].props);
 
-		sync.defineCollection(opts.many_associations[i].mergeTable, props);
-	}
+    sync.defineCollection(opts.many_associations[i].mergeTable, props);
+  }
 
-	sync.sync(cb);
+  sync.sync(cb);
 
-	return this;
+  return this;
 };
 
 exports.drop = function (opts, cb) {
-	var i, queries = [], pending;
+  var i, queries = [], pending;
 
-	queries.push("DROP TABLE IF EXISTS " + this.query.escapeId(opts.table));
+  queries.push("DROP TABLE IF EXISTS " + this.query.escapeId(opts.table));
 
-	for (i = 0; i < opts.many_associations.length; i++) {
-		queries.push("DROP TABLE IF EXISTS " + this.query.escapeId(opts.many_associations[i].mergeTable));
-	}
+  for (i = 0; i < opts.many_associations.length; i++) {
+    queries.push("DROP TABLE IF EXISTS " + this.query.escapeId(opts.many_associations[i].mergeTable));
+  }
 
-	pending = queries.length;
+  pending = queries.length;
 
-	for (i = 0; i < queries.length; i++) {
-		this.execQuery(queries[i], function (err) {
-			if (--pending === 0) {
-				return cb(err);
-			}
-		});
-	}
+  for (i = 0; i < queries.length; i++) {
+    this.execQuery(queries[i], function (err) {
+      if (--pending === 0) {
+        return cb(err);
+      }
+    });
+  }
 
-	return this;
+  return this;
 };
diff --git a/lib/Drivers/DML/_shared.js b/lib/Drivers/DML/_shared.js
index bf7fd592..9875597e 100644
--- a/lib/Drivers/DML/_shared.js
+++ b/lib/Drivers/DML/_shared.js
@@ -1,30 +1,30 @@
 
 module.exports = {
-	execQuery: function () {
-		if (arguments.length == 2) {
-			var query = arguments[0];
-			var cb    = arguments[1];
-		} else if (arguments.length == 3) {
-			var query = this.query.escape(arguments[0], arguments[1]);
-			var cb    = arguments[2];
-		}
-		return this.execSimpleQuery(query, cb);
-	},
-	eagerQuery: function (association, opts, keys, cb) {
-		var desiredKey = Object.keys(association.field);
-		var assocKey = Object.keys(association.mergeAssocId);
+  execQuery: function () {
+    if (arguments.length == 2) {
+      var query = arguments[0];
+      var cb    = arguments[1];
+    } else if (arguments.length == 3) {
+      var query = this.query.escape(arguments[0], arguments[1]);
+      var cb    = arguments[2];
+    }
+    return this.execSimpleQuery(query, cb);
+  },
+  eagerQuery: function (association, opts, keys, cb) {
+    var desiredKey = Object.keys(association.field);
+    var assocKey = Object.keys(association.mergeAssocId);
 
-		var where = {};
-		where[desiredKey] = keys;
+    var where = {};
+    where[desiredKey] = keys;
 
-		var query = this.query.select()
-			.from(association.model.table)
-			.select(opts.only)
-			.from(association.mergeTable, assocKey, opts.keys)
-			.select(desiredKey).as("$p")
-			.where(association.mergeTable, where)
-			.build();
+    var query = this.query.select()
+      .from(association.model.table)
+      .select(opts.only)
+      .from(association.mergeTable, assocKey, opts.keys)
+      .select(desiredKey).as("$p")
+      .where(association.mergeTable, where)
+      .build();
 
-		this.execSimpleQuery(query, cb);
-	}
+    this.execSimpleQuery(query, cb);
+  }
 };
diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
index 9579362d..b9d25b58 100644
--- a/lib/Drivers/DML/mongodb.js
+++ b/lib/Drivers/DML/mongodb.js
@@ -6,438 +6,438 @@ var _         = require('lodash');
 exports.Driver = Driver;
 
 function Driver(config, connection, opts) {
-	this.client = new mongodb.MongoClient();
-	this.db     = null;
-	this.config = config || {};
-	this.opts   = opts;
-
-	if (!this.config.timezone) {
-		this.config.timezone = "local";
-	}
-
-	this.opts.settings.set("properties.primary_key", "_id");
-	this.opts.settings.set("properties.association_key", function (name, field) {
-		return name + "_" + field.replace(/^_+/, '');
-	});
+  this.client = new mongodb.MongoClient();
+  this.db     = null;
+  this.config = config || {};
+  this.opts   = opts;
+
+  if (!this.config.timezone) {
+    this.config.timezone = "local";
+  }
+
+  this.opts.settings.set("properties.primary_key", "_id");
+  this.opts.settings.set("properties.association_key", function (name, field) {
+    return name + "_" + field.replace(/^_+/, '');
+  });
 }
 
 Driver.prototype.sync = function (opts, cb) {
-	this.db.createCollection(opts.table, function (err, collection) {
-		if (err) {
-			return cb(err);
-		}
-
-		var indexes = [], pending;
-
-		for (var i = 0; i < opts.one_associations.length; i++) {
-			if (opts.one_associations[i].extension) continue;
-			if (opts.one_associations[i].reversed) continue;
-
-			for (var k in opts.one_associations[i].field) {
-				indexes.push(k);
-			}
-		}
-
-		for (i = 0; i < opts.many_associations.length; i++) {
-			if (opts.many_associations[i].reversed) continue;
-
-			indexes.push(opts.many_associations[i].name);
-		}
-
-		pending = indexes.length;
-
-		for (i = 0; i < indexes.length; i++) {
-			collection.createIndex(indexes[i], function () {
-				if (--pending === 0) {
-					return cb();
-				}
-			});
-		}
-
-		if (pending === 0) {
-			return cb();
-		}
-	});
+  this.db.createCollection(opts.table, function (err, collection) {
+    if (err) {
+      return cb(err);
+    }
+
+    var indexes = [], pending;
+
+    for (var i = 0; i < opts.one_associations.length; i++) {
+      if (opts.one_associations[i].extension) continue;
+      if (opts.one_associations[i].reversed) continue;
+
+      for (var k in opts.one_associations[i].field) {
+        indexes.push(k);
+      }
+    }
+
+    for (i = 0; i < opts.many_associations.length; i++) {
+      if (opts.many_associations[i].reversed) continue;
+
+      indexes.push(opts.many_associations[i].name);
+    }
+
+    pending = indexes.length;
+
+    for (i = 0; i < indexes.length; i++) {
+      collection.createIndex(indexes[i], function () {
+        if (--pending === 0) {
+          return cb();
+        }
+      });
+    }
+
+    if (pending === 0) {
+      return cb();
+    }
+  });
 };
 
 Driver.prototype.drop = function (opts, cb) {
-	return this.db.collection(opts.table).drop(function () {
-		if (typeof cb == "function") {
-			return cb();
-		}
-	});
+  return this.db.collection(opts.table).drop(function () {
+    if (typeof cb == "function") {
+      return cb();
+    }
+  });
 };
 
 Driver.prototype.ping = function (cb) {
-	return process.nextTick(cb);
+  return process.nextTick(cb);
 };
 
 Driver.prototype.on = function (ev, cb) {
-	// if (ev == "error") {
-	// 	this.db.on("error", cb);
-	// 	this.db.on("unhandledError", cb);
-	// }
-	return this;
+  // if (ev == "error") {
+  //   this.db.on("error", cb);
+  //   this.db.on("unhandledError", cb);
+  // }
+  return this;
 };
 
 Driver.prototype.connect = function (cb) {
-	this.client.connect(this.config.href, function (err, db) {
-		if (err) {
-			return cb(err);
-		}
+  this.client.connect(this.config.href, function (err, db) {
+    if (err) {
+      return cb(err);
+    }
 
-		this.db = db;
+    this.db = db;
 
-		return cb();
-	}.bind(this));
+    return cb();
+  }.bind(this));
 };
 
 Driver.prototype.close = function (cb) {
-	if (this.db) {
-		this.db.close();
-	}
-	if (typeof cb == "function") {
-		cb();
-	}
-	return;
+  if (this.db) {
+    this.db.close();
+  }
+  if (typeof cb == "function") {
+    cb();
+  }
+  return;
 };
 
 Driver.prototype.find = function (fields, table, conditions, opts, cb) {
-	var collection = this.db.collection(table);
-
-	convertToDB(conditions, this.config.timezone);
-
-	var cursor = (fields ? collection.find(conditions, fields) : collection.find(conditions));
-
-	if (opts.order) {
-		var orders = [];
-
-		for (var i = 0; i < opts.order.length; i++) {
-			orders.push([ opts.order[i][0], (opts.order[i][1] == 'Z' ? 'desc' : 'asc') ]);
-		}
-		cursor.sort(orders);
-	}
-	if (opts.offset) {
-		cursor.skip(opts.offset);
-	}
-	if (opts.limit) {
-		cursor.limit(opts.limit);
-	}
-
-	return cursor.toArray(function (err, docs) {
-		if (err) {
-			throw err;
-			return cb(err);
-		}
-
-		var pending = 0;
-
-		for (var i = 0; i < docs.length; i++) {
-			convertFromDB(docs[i], this.config.timezone);
-			if (opts.extra && opts.extra[docs[i]._id]) {
-				docs[i] = _.merge(docs[i], _.omit(opts.extra[docs[i]._id], '_id'));
-			}
-			if (opts.createInstance) {
-				pending += 1;
-
-				docs[i] = opts.createInstance(docs[i], {
-					extra : opts.extra_props
-				}, function () {
-					if (--pending === 0) {
-						return cb(null, docs);
-					}
-				});
-			}
-		}
-
-		if (pending === 0) {
-			return cb(null, docs);
-		}
-	}.bind(this));
+  var collection = this.db.collection(table);
+
+  convertToDB(conditions, this.config.timezone);
+
+  var cursor = (fields ? collection.find(conditions, fields) : collection.find(conditions));
+
+  if (opts.order) {
+    var orders = [];
+
+    for (var i = 0; i < opts.order.length; i++) {
+      orders.push([ opts.order[i][0], (opts.order[i][1] == 'Z' ? 'desc' : 'asc') ]);
+    }
+    cursor.sort(orders);
+  }
+  if (opts.offset) {
+    cursor.skip(opts.offset);
+  }
+  if (opts.limit) {
+    cursor.limit(opts.limit);
+  }
+
+  return cursor.toArray(function (err, docs) {
+    if (err) {
+      throw err;
+      return cb(err);
+    }
+
+    var pending = 0;
+
+    for (var i = 0; i < docs.length; i++) {
+      convertFromDB(docs[i], this.config.timezone);
+      if (opts.extra && opts.extra[docs[i]._id]) {
+        docs[i] = _.merge(docs[i], _.omit(opts.extra[docs[i]._id], '_id'));
+      }
+      if (opts.createInstance) {
+        pending += 1;
+
+        docs[i] = opts.createInstance(docs[i], {
+          extra : opts.extra_props
+        }, function () {
+          if (--pending === 0) {
+            return cb(null, docs);
+          }
+        });
+      }
+    }
+
+    if (pending === 0) {
+      return cb(null, docs);
+    }
+  }.bind(this));
 };
 
 Driver.prototype.count = function (table, conditions, opts, cb) {
-	var collection = this.db.collection(table);
+  var collection = this.db.collection(table);
 
-	convertToDB(conditions, this.config.timezone);
+  convertToDB(conditions, this.config.timezone);
 
-	var cursor     = collection.find(conditions);
+  var cursor     = collection.find(conditions);
 
-	if (opts.order) {
-		var orders = [];
+  if (opts.order) {
+    var orders = [];
 
-		for (var i = 0; i < opts.order.length; i++) {
-			orders.push([ opts.order[i][0], (opts.order[i][1] == 'Z' ? 'desc' : 'asc') ]);
-		}
-		cursor.sort(orders);
-	}
-	if (opts.offset) {
-		cursor.skip(opts.offset);
-	}
-	if (opts.limit) {
-		cursor.limit(opts.limit);
-	}
+    for (var i = 0; i < opts.order.length; i++) {
+      orders.push([ opts.order[i][0], (opts.order[i][1] == 'Z' ? 'desc' : 'asc') ]);
+    }
+    cursor.sort(orders);
+  }
+  if (opts.offset) {
+    cursor.skip(opts.offset);
+  }
+  if (opts.limit) {
+    cursor.limit(opts.limit);
+  }
 
-	return cursor.count(true, function (err, count) {
-		if (err) return cb(err);
+  return cursor.count(true, function (err, count) {
+    if (err) return cb(err);
 
-		return cb(null, [{ c : count }]);
-	});
+    return cb(null, [{ c : count }]);
+  });
 };
 
 Driver.prototype.insert = function (table, data, keyProperties, cb) {
-	convertToDB(data, this.config.timezone);
-
-	return this.db.collection(table).insert(
-		data,
-		{
-			w : 1
-		},
-		function (err, docs) {
-			if (err) return cb(err);
-
-			var i, ids = {}, prop;
-
-			if (keyProperties && docs.length) {
-				for (i = 0; i < keyProperties.length; i++) {
-					prop = keyProperties[i];
-
-					if (prop.mapsTo in docs[0]) {
-						ids[prop.name] = docs[0][prop.mapsTo];
-					}
-				}
-				convertFromDB(ids, this.config.timezone);
-			}
-
-			return cb(null, ids);
-		}.bind(this)
-	);
+  convertToDB(data, this.config.timezone);
+
+  return this.db.collection(table).insert(
+    data,
+    {
+      w : 1
+    },
+    function (err, docs) {
+      if (err) return cb(err);
+
+      var i, ids = {}, prop;
+
+      if (keyProperties && docs.length) {
+        for (i = 0; i < keyProperties.length; i++) {
+          prop = keyProperties[i];
+
+          if (prop.mapsTo in docs[0]) {
+            ids[prop.name] = docs[0][prop.mapsTo];
+          }
+        }
+        convertFromDB(ids, this.config.timezone);
+      }
+
+      return cb(null, ids);
+    }.bind(this)
+  );
 };
 
 Driver.prototype.hasMany = function (Model, association) {
-	var db = this.db.collection(Model.table);
-	var driver = this;
-
-	return {
-		has: function (Instance, Associations, conditions, cb) {
-			return db.find({
-				_id : new mongodb.ObjectID(Instance[Model.id])
-			}, [ association.name ]).toArray(function (err, docs) {
-				if (err) return cb(err);
-				if (!docs.length) return cb(new Error("Not found"));
-				if (!Array.isArray(docs[0][association.name])) return cb(null, false);
-				if (!docs[0][association.name].length) return cb(null, false);
-
-				var found;
-
-				for (var i = 0; i < Associations.length; i++) {
-					found = false;
-					for (var j = 0; j < docs[0][association.name].length; j++) {
-						if (docs[0][association.name][j]._id == Associations[i][association.model.id]) {
-							found = true;
-							break;
-						}
-					}
-					if (!found) {
-						return cb(null, false);
-					}
-				}
-
-				return cb(null, true);
-			});
-		},
-		get: function (Instance, conditions, options, createInstance, cb) {
-			return db.find({
-				_id : new mongodb.ObjectID(Instance[Model.id])
-			}, [ association.name ]).toArray(function (err, docs) {
-				if (err) return cb(err);
-				if (!docs.length) return cb(new Error("Not found"));
-
-				if (!docs[0][association.name]) {
-					return cb(null, []);
-				}
-
-				var extra = {}
-				conditions._id = { $in: [] };
-
-				for (var i = 0; i < docs[0][association.name].length; i++) {
-					conditions._id.$in.push(new mongodb.ObjectID(docs[0][association.name][i]._id));
-					extra[docs[0][association.name][i]._id] = docs[0][association.name][i];
-				}
-
-				if (options.order) {
-					options.order[0] = options.order[0][1];
-				}
-
-				return association.model.find(conditions, options, function (e,docs) {
-					var i, len;
-					for (i = 0, len = docs.length; i < len; i++) {
-						if (extra.hasOwnProperty(docs[i][association.model.id])) {
-							docs[i].extra = extra[docs[i][association.model.id]];
-						}
-					}
-					cb(e, docs);
-				});
-			});
-		},
-		add: function (Instance, Association, data, cb) {
-			var push = {};
-			push[association.name] = { _id : Association[association.model.id] };
-
-			for (var k in data) {
-				push[association.name][k] = data[k];
-			}
-
-			return db.update({
-				_id    : new mongodb.ObjectID(Instance[Model.id])
-			}, {
-				$push  : push
-			}, {
-				safe   : true,
-				upsert : true
-			}, cb);
-		},
-		del: function (Instance, Associations, cb) {
-			if (Associations.length === 0) {
-				var unset = {};
-				unset[association.name] = 1;
-
-				return db.update({
-					_id    : new mongodb.ObjectID(Instance[Model.id])
-				}, {
-					$unset : unset
-				}, {
-					safe   : true,
-					upsert : true
-				}, cb);
-			}
-
-			var pull = {};
-			pull[association.name] = [];
-
-			for (var i = 0; i < Associations.length; i++) {
-				var props = {_id: Associations[i][association.model.id]};
-				
-				if (Associations[i].extra !== undefined) {
-					props = _.merge(props, _.pick(Associations[i].extra, _.keys(association.props)));
-				}
-				
-				pull[association.name].push(props);
-			}
-
-			return db.update({
-				_id      : new mongodb.ObjectID(Instance[Model.id])
-			}, {
-				$pullAll : pull
-			}, {
-				safe     : true,
-				upsert   : true
-			}, cb);
-		}
-	};
+  var db = this.db.collection(Model.table);
+  var driver = this;
+
+  return {
+    has: function (Instance, Associations, conditions, cb) {
+      return db.find({
+        _id : new mongodb.ObjectID(Instance[Model.id])
+      }, [ association.name ]).toArray(function (err, docs) {
+        if (err) return cb(err);
+        if (!docs.length) return cb(new Error("Not found"));
+        if (!Array.isArray(docs[0][association.name])) return cb(null, false);
+        if (!docs[0][association.name].length) return cb(null, false);
+
+        var found;
+
+        for (var i = 0; i < Associations.length; i++) {
+          found = false;
+          for (var j = 0; j < docs[0][association.name].length; j++) {
+            if (docs[0][association.name][j]._id == Associations[i][association.model.id]) {
+              found = true;
+              break;
+            }
+          }
+          if (!found) {
+            return cb(null, false);
+          }
+        }
+
+        return cb(null, true);
+      });
+    },
+    get: function (Instance, conditions, options, createInstance, cb) {
+      return db.find({
+        _id : new mongodb.ObjectID(Instance[Model.id])
+      }, [ association.name ]).toArray(function (err, docs) {
+        if (err) return cb(err);
+        if (!docs.length) return cb(new Error("Not found"));
+
+        if (!docs[0][association.name]) {
+          return cb(null, []);
+        }
+
+        var extra = {}
+        conditions._id = { $in: [] };
+
+        for (var i = 0; i < docs[0][association.name].length; i++) {
+          conditions._id.$in.push(new mongodb.ObjectID(docs[0][association.name][i]._id));
+          extra[docs[0][association.name][i]._id] = docs[0][association.name][i];
+        }
+
+        if (options.order) {
+          options.order[0] = options.order[0][1];
+        }
+
+        return association.model.find(conditions, options, function (e,docs) {
+          var i, len;
+          for (i = 0, len = docs.length; i < len; i++) {
+            if (extra.hasOwnProperty(docs[i][association.model.id])) {
+              docs[i].extra = extra[docs[i][association.model.id]];
+            }
+          }
+          cb(e, docs);
+        });
+      });
+    },
+    add: function (Instance, Association, data, cb) {
+      var push = {};
+      push[association.name] = { _id : Association[association.model.id] };
+
+      for (var k in data) {
+        push[association.name][k] = data[k];
+      }
+
+      return db.update({
+        _id    : new mongodb.ObjectID(Instance[Model.id])
+      }, {
+        $push  : push
+      }, {
+        safe   : true,
+        upsert : true
+      }, cb);
+    },
+    del: function (Instance, Associations, cb) {
+      if (Associations.length === 0) {
+        var unset = {};
+        unset[association.name] = 1;
+
+        return db.update({
+          _id    : new mongodb.ObjectID(Instance[Model.id])
+        }, {
+          $unset : unset
+        }, {
+          safe   : true,
+          upsert : true
+        }, cb);
+      }
+
+      var pull = {};
+      pull[association.name] = [];
+
+      for (var i = 0; i < Associations.length; i++) {
+        var props = {_id: Associations[i][association.model.id]};
+
+        if (Associations[i].extra !== undefined) {
+          props = _.merge(props, _.pick(Associations[i].extra, _.keys(association.props)));
+        }
+
+        pull[association.name].push(props);
+      }
+
+      return db.update({
+        _id      : new mongodb.ObjectID(Instance[Model.id])
+      }, {
+        $pullAll : pull
+      }, {
+        safe     : true,
+        upsert   : true
+      }, cb);
+    }
+  };
 };
 
 Driver.prototype.update = function (table, changes, conditions, cb) {
-	convertToDB(changes, this.config.timezone);
-	convertToDB(conditions, this.config.timezone);
-
-	return this.db.collection(table).update(
-		conditions,
-		{
-			$set   : changes
-		},
-		{
-			safe   : true,
-			upsert : true
-		},
-		cb
-	);
+  convertToDB(changes, this.config.timezone);
+  convertToDB(conditions, this.config.timezone);
+
+  return this.db.collection(table).update(
+    conditions,
+    {
+      $set   : changes
+    },
+    {
+      safe   : true,
+      upsert : true
+    },
+    cb
+  );
 };
 
 Driver.prototype.remove = function (table, conditions, cb) {
-	convertToDB(conditions, this.config.timezone);
+  convertToDB(conditions, this.config.timezone);
 
-	return this.db.collection(table).remove(conditions, cb);
+  return this.db.collection(table).remove(conditions, cb);
 };
 
 Driver.prototype.clear = function (table, cb) {
-	return this.db.collection(table).remove(cb);
+  return this.db.collection(table).remove(cb);
 };
 
 function convertToDB(obj, timeZone) {
-	for (var k in obj) {
-		if ([ 'and', 'or', 'not' ].indexOf(k) >= 0) {
-			for (var j = 0; j < obj[k].length; j++) {
-				convertToDB(obj[k][j], timeZone);
-			}
-			obj['$' + k] = obj[k];
-			delete obj[k];
-			continue;
-		}
-		if (Array.isArray(obj[k]) && k[0] != '$') {
-			for (var i = 0; i < obj[k].length; i++) {
-				obj[k][i] = convertToDBVal(k, obj[k][i], timeZone);
-			}
-
-			obj[k] = { $in: obj[k] };
-			continue;
-		}
-
-		obj[k] = convertToDBVal(k, obj[k], timeZone);
-	}
+  for (var k in obj) {
+    if ([ 'and', 'or', 'not' ].indexOf(k) >= 0) {
+      for (var j = 0; j < obj[k].length; j++) {
+        convertToDB(obj[k][j], timeZone);
+      }
+      obj['$' + k] = obj[k];
+      delete obj[k];
+      continue;
+    }
+    if (Array.isArray(obj[k]) && k[0] != '$') {
+      for (var i = 0; i < obj[k].length; i++) {
+        obj[k][i] = convertToDBVal(k, obj[k][i], timeZone);
+      }
+
+      obj[k] = { $in: obj[k] };
+      continue;
+    }
+
+    obj[k] = convertToDBVal(k, obj[k], timeZone);
+  }
 }
 
 function convertFromDB(obj, timezone) {
-	for (var k in obj) {
-		if (obj[k] instanceof mongodb.ObjectID) {
-			obj[k] = obj[k].toString();
-			continue;
-		}
-		if (obj[k] instanceof mongodb.Binary) {
-			obj[k] = new Buffer(obj[k].value(), "binary");
-			continue;
-		}
-	}
+  for (var k in obj) {
+    if (obj[k] instanceof mongodb.ObjectID) {
+      obj[k] = obj[k].toString();
+      continue;
+    }
+    if (obj[k] instanceof mongodb.Binary) {
+      obj[k] = new Buffer(obj[k].value(), "binary");
+      continue;
+    }
+  }
 }
 
 function convertToDBVal(key, value, timezone) {
-	if (value && typeof value.sql_comparator == "function") {
-		var val       = (key != "_id" ? value.val : new mongodb.ObjectID(value.val));
-		var comp      = value.sql_comparator();
-		var condition = {};
-
-		switch (comp) {
-			case "gt":
-			case "gte":
-			case "lt":
-			case "lte":
-			case "ne":
-				condition["$" + comp] = val;
-				break;
-			case "eq":
-				condition = val;
-				break;
-			case "between":
-				condition["$min"] = value.from;
-				condition["$max"] = value.to;
-				break;
-			case "like":
-				condition["$regex"] = value.expr.replace("%", ".*");
-				break;
-		}
-
-		return condition;
-	}
-
-	if (Buffer.isBuffer(value)) {
-		return new mongodb.Binary(value);
-	}
-
-	if (key == "_id" && typeof value == "string") {
-		value = new mongodb.ObjectID(value);
-	}
-
-	return value;
+  if (value && typeof value.sql_comparator == "function") {
+    var val       = (key != "_id" ? value.val : new mongodb.ObjectID(value.val));
+    var comp      = value.sql_comparator();
+    var condition = {};
+
+    switch (comp) {
+      case "gt":
+      case "gte":
+      case "lt":
+      case "lte":
+      case "ne":
+        condition["$" + comp] = val;
+        break;
+      case "eq":
+        condition = val;
+        break;
+      case "between":
+        condition["$min"] = value.from;
+        condition["$max"] = value.to;
+        break;
+      case "like":
+        condition["$regex"] = value.expr.replace("%", ".*");
+        break;
+    }
+
+    return condition;
+  }
+
+  if (Buffer.isBuffer(value)) {
+    return new mongodb.Binary(value);
+  }
+
+  if (key == "_id" && typeof value == "string") {
+    value = new mongodb.ObjectID(value);
+  }
+
+  return value;
 }
 
 Object.defineProperty(Driver.prototype, "isSql", {
diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index b898a4ad..ff4c801b 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -7,286 +7,286 @@ var DDL     = require("../DDL/SQL");
 exports.Driver = Driver;
 
 function Driver(config, connection, opts) {
-	this.dialect = 'mysql';
-	this.config = config || {};
-	this.opts   = opts || {};
-	this.customTypes = {};
-
-	if (!this.config.timezone) {
-		this.config.timezone = "local";
-	}
-
-	this.query  = new Query({ dialect: this.dialect, timezone: this.config.timezone });
-
-	this.reconnect(null, connection);
-
-	this.aggregate_functions = [ "ABS", "CEIL", "FLOOR", "ROUND",
-	                             "AVG", "MIN", "MAX",
-	                             "LOG", "LOG2", "LOG10", "EXP", "POWER",
-	                             "ACOS", "ASIN", "ATAN", "COS", "SIN", "TAN",
-	                             "CONV", [ "RANDOM", "RAND" ], "RADIANS", "DEGREES",
-	                             "SUM", "COUNT",
-	                             "DISTINCT"];
+  this.dialect = 'mysql';
+  this.config = config || {};
+  this.opts   = opts || {};
+  this.customTypes = {};
+
+  if (!this.config.timezone) {
+    this.config.timezone = "local";
+  }
+
+  this.query  = new Query({ dialect: this.dialect, timezone: this.config.timezone });
+
+  this.reconnect(null, connection);
+
+  this.aggregate_functions = [ "ABS", "CEIL", "FLOOR", "ROUND",
+                               "AVG", "MIN", "MAX",
+                               "LOG", "LOG2", "LOG10", "EXP", "POWER",
+                               "ACOS", "ASIN", "ATAN", "COS", "SIN", "TAN",
+                               "CONV", [ "RANDOM", "RAND" ], "RADIANS", "DEGREES",
+                               "SUM", "COUNT",
+                               "DISTINCT"];
 }
 
 _.extend(Driver.prototype, shared, DDL);
 
 Driver.prototype.ping = function (cb) {
-	this.db.ping(cb);
-	return this;
+  this.db.ping(cb);
+  return this;
 };
 
 Driver.prototype.on = function (ev, cb) {
-	if (ev == "error") {
-		this.db.on("error", cb);
-		this.db.on("unhandledError", cb);
-	}
-	return this;
+  if (ev == "error") {
+    this.db.on("error", cb);
+    this.db.on("unhandledError", cb);
+  }
+  return this;
 };
 
 Driver.prototype.connect = function (cb) {
-	if (this.opts.pool) {
-		return this.db.pool.getConnection(function (err, con) {
-			if (!err) {
-				if (con.release) {
-					con.release();
-				} else {
-					con.end();
-				}
-			}
-			return cb(err);
-		});
-	}
-	this.db.connect(cb);
+  if (this.opts.pool) {
+    return this.db.pool.getConnection(function (err, con) {
+      if (!err) {
+        if (con.release) {
+          con.release();
+        } else {
+          con.end();
+        }
+      }
+      return cb(err);
+    });
+  }
+  this.db.connect(cb);
 };
 
 Driver.prototype.reconnect = function (cb, connection) {
-	var connOpts = this.config.href || this.config;
-
-	// Prevent noisy mysql driver output
-	if (typeof connOpts == 'object') {
-		connOpts = _.omit(connOpts, 'debug');
-	}
-	if (typeof connOpts == 'string') {
-		connOpts = connOpts.replace("debug=true", "debug=false");
-	}
-
-	this.db = (connection ? connection : mysql.createConnection(connOpts));
-	if (this.opts.pool) {
-		this.db.pool = (connection ? connection : mysql.createPool(connOpts));
-	}
-	if (typeof cb == "function") {
-		this.connect(cb);
-	}
+  var connOpts = this.config.href || this.config;
+
+  // Prevent noisy mysql driver output
+  if (typeof connOpts == 'object') {
+    connOpts = _.omit(connOpts, 'debug');
+  }
+  if (typeof connOpts == 'string') {
+    connOpts = connOpts.replace("debug=true", "debug=false");
+  }
+
+  this.db = (connection ? connection : mysql.createConnection(connOpts));
+  if (this.opts.pool) {
+    this.db.pool = (connection ? connection : mysql.createPool(connOpts));
+  }
+  if (typeof cb == "function") {
+    this.connect(cb);
+  }
 };
 
 Driver.prototype.close = function (cb) {
-	if (this.opts.pool) {
-		this.db.pool.end(cb);
-	} else {
-		this.db.end(cb);
-	}
+  if (this.opts.pool) {
+    this.db.pool.end(cb);
+  } else {
+    this.db.end(cb);
+  }
 };
 
 Driver.prototype.getQuery = function () {
-	return this.query;
+  return this.query;
 };
 
 Driver.prototype.execSimpleQuery = function (query, cb) {
-	if (this.opts.debug) {
-		require("../../Debug").sql('mysql', query);
-	}
-	if (this.opts.pool) {
-		this.poolQuery(query, cb);
-	} else {
-		this.db.query(query, cb);
-	}
+  if (this.opts.debug) {
+    require("../../Debug").sql('mysql', query);
+  }
+  if (this.opts.pool) {
+    this.poolQuery(query, cb);
+  } else {
+    this.db.query(query, cb);
+  }
 };
 
 Driver.prototype.find = function (fields, table, conditions, opts, cb) {
-	var q = this.query.select()
-	                  .from(table).select(fields);
-
-	if (opts.offset) {
-		q.offset(opts.offset);
-	}
-	if (typeof opts.limit == "number") {
-		q.limit(opts.limit);
-	} else if (opts.offset) {
-		// OFFSET cannot be used without LIMIT so we use the biggest BIGINT number possible
-		q.limit('18446744073709551615');
-	}
-	if (opts.order) {
-		for (var i = 0; i < opts.order.length; i++) {
-			q.order(opts.order[i][0], opts.order[i][1]);
-		}
-	}
-
-	if (opts.merge) {
-		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field).select(opts.merge.select);
-		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
-			q = q.where(opts.merge.where[0], opts.merge.where[1], opts.merge.table || null, conditions);
-		} else {
-			q = q.where(opts.merge.table || null, conditions);
-		}
-	} else {
-		q = q.where(conditions);
-	}
-
-	if (opts.exists) {
-		for (var k in opts.exists) {
-			q.whereExists(opts.exists[k].table, table, opts.exists[k].link, opts.exists[k].conditions);
-		}
-	}
-
-	q = q.build();
-
-	this.execSimpleQuery(q, cb);
+  var q = this.query.select()
+                    .from(table).select(fields);
+
+  if (opts.offset) {
+    q.offset(opts.offset);
+  }
+  if (typeof opts.limit == "number") {
+    q.limit(opts.limit);
+  } else if (opts.offset) {
+    // OFFSET cannot be used without LIMIT so we use the biggest BIGINT number possible
+    q.limit('18446744073709551615');
+  }
+  if (opts.order) {
+    for (var i = 0; i < opts.order.length; i++) {
+      q.order(opts.order[i][0], opts.order[i][1]);
+    }
+  }
+
+  if (opts.merge) {
+    q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field).select(opts.merge.select);
+    if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
+      q = q.where(opts.merge.where[0], opts.merge.where[1], opts.merge.table || null, conditions);
+    } else {
+      q = q.where(opts.merge.table || null, conditions);
+    }
+  } else {
+    q = q.where(conditions);
+  }
+
+  if (opts.exists) {
+    for (var k in opts.exists) {
+      q.whereExists(opts.exists[k].table, table, opts.exists[k].link, opts.exists[k].conditions);
+    }
+  }
+
+  q = q.build();
+
+  this.execSimpleQuery(q, cb);
 };
 
 Driver.prototype.count = function (table, conditions, opts, cb) {
-	var q = this.query.select()
-	                  .from(table)
-	                  .count(null, 'c');
-
-	if (opts.merge) {
-		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
-		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
-			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions);
-		} else {
-			q = q.where(conditions);
-		}
-	} else {
-		q = q.where(conditions);
-	}
-
-	if (opts.exists) {
-		for (var k in opts.exists) {
-			q.whereExists(opts.exists[k].table, table, opts.exists[k].link, opts.exists[k].conditions);
-		}
-	}
-
-	q = q.build();
-
-	this.execSimpleQuery(q, cb);
+  var q = this.query.select()
+                    .from(table)
+                    .count(null, 'c');
+
+  if (opts.merge) {
+    q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
+    if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
+      q = q.where(opts.merge.where[0], opts.merge.where[1], conditions);
+    } else {
+      q = q.where(conditions);
+    }
+  } else {
+    q = q.where(conditions);
+  }
+
+  if (opts.exists) {
+    for (var k in opts.exists) {
+      q.whereExists(opts.exists[k].table, table, opts.exists[k].link, opts.exists[k].conditions);
+    }
+  }
+
+  q = q.build();
+
+  this.execSimpleQuery(q, cb);
 };
 
 Driver.prototype.insert = function (table, data, keyProperties, cb) {
-	var q = this.query.insert()
-	                  .into(table)
-	                  .set(data)
-	                  .build();
-
-	this.execSimpleQuery(q, function (err, info) {
-		if (err) return cb(err);
-
-		var i, ids = {}, prop;
-
-		if (keyProperties) {
-			if (keyProperties.length == 1 && info.hasOwnProperty("insertId") && info.insertId !== 0 ) {
-				ids[keyProperties[0].name] = info.insertId;
-			} else {
-				for(i = 0; i < keyProperties.length; i++) {
-					prop = keyProperties[i];
-					ids[prop.name] = data[prop.mapsTo];
-				}
-			}
-		}
-		return cb(null, ids);
-	});
+  var q = this.query.insert()
+                    .into(table)
+                    .set(data)
+                    .build();
+
+  this.execSimpleQuery(q, function (err, info) {
+    if (err) return cb(err);
+
+    var i, ids = {}, prop;
+
+    if (keyProperties) {
+      if (keyProperties.length == 1 && info.hasOwnProperty("insertId") && info.insertId !== 0 ) {
+        ids[keyProperties[0].name] = info.insertId;
+      } else {
+        for(i = 0; i < keyProperties.length; i++) {
+          prop = keyProperties[i];
+          ids[prop.name] = data[prop.mapsTo];
+        }
+      }
+    }
+    return cb(null, ids);
+  });
 };
 
 Driver.prototype.update = function (table, changes, conditions, cb) {
-	var q = this.query.update()
-	                  .into(table)
-	                  .set(changes)
-	                  .where(conditions)
-	                  .build();
+  var q = this.query.update()
+                    .into(table)
+                    .set(changes)
+                    .where(conditions)
+                    .build();
 
-	this.execSimpleQuery(q, cb);
+  this.execSimpleQuery(q, cb);
 };
 
 Driver.prototype.remove = function (table, conditions, cb) {
-	var q = this.query.remove()
-	                  .from(table)
-	                  .where(conditions)
-	                  .build();
+  var q = this.query.remove()
+                    .from(table)
+                    .where(conditions)
+                    .build();
 
-	this.execSimpleQuery(q, cb);
+  this.execSimpleQuery(q, cb);
 };
 
 Driver.prototype.clear = function (table, cb) {
-	var q = "TRUNCATE TABLE " + this.query.escapeId(table);
+  var q = "TRUNCATE TABLE " + this.query.escapeId(table);
 
-	this.execSimpleQuery(q, cb);
+  this.execSimpleQuery(q, cb);
 };
 
 Driver.prototype.poolQuery = function (query, cb) {
-	this.db.pool.getConnection(function (err, con) {
-		if (err) {
-			return cb(err);
-		}
-
-		con.query(query, function (err, data) {
-			if (con.release) {
-				con.release();
-			} else {
-				con.end();
-			}
-
-			return cb(err, data);
-		});
-	});
+  this.db.pool.getConnection(function (err, con) {
+    if (err) {
+      return cb(err);
+    }
+
+    con.query(query, function (err, data) {
+      if (con.release) {
+        con.release();
+      } else {
+        con.end();
+      }
+
+      return cb(err, data);
+    });
+  });
 };
 
 Driver.prototype.valueToProperty = function (value, property) {
-	var customType;
-
-	switch (property.type) {
-		case "boolean":
-			value = !!value;
-			break;
-		case "object":
-			if (typeof value == "object" && !Buffer.isBuffer(value)) {
-				break;
-			}
-			try {
-				value = JSON.parse(value);
-			} catch (e) {
-				value = null;
-			}
-			break;
-		default:
-			customType = this.customTypes[property.type];
-			if(customType && 'valueToProperty' in customType) {
-				value = customType.valueToProperty(value);
-			}
-	}
-	return value;
+  var customType;
+
+  switch (property.type) {
+    case "boolean":
+      value = !!value;
+      break;
+    case "object":
+      if (typeof value == "object" && !Buffer.isBuffer(value)) {
+        break;
+      }
+      try {
+        value = JSON.parse(value);
+      } catch (e) {
+        value = null;
+      }
+      break;
+    default:
+      customType = this.customTypes[property.type];
+      if(customType && 'valueToProperty' in customType) {
+        value = customType.valueToProperty(value);
+      }
+  }
+  return value;
 };
 
 Driver.prototype.propertyToValue = function (value, property) {
-	var customType;
-
-	switch (property.type) {
-		case "boolean":
-			value = (value) ? 1 : 0;
-			break;
-		case "object":
-			if (value !== null) {
-				value = JSON.stringify(value);
-			}
-			break;
-		case "point":
-			return function() { return 'POINT(' + value.x + ', ' + value.y + ')'; };
-			break;
-		default:
-			customType = this.customTypes[property.type];
-			if(customType && 'propertyToValue' in customType) {
-				value = customType.propertyToValue(value);
-			}
-	}
-	return value;
+  var customType;
+
+  switch (property.type) {
+    case "boolean":
+      value = (value) ? 1 : 0;
+      break;
+    case "object":
+      if (value !== null) {
+        value = JSON.stringify(value);
+      }
+      break;
+    case "point":
+      return function() { return 'POINT(' + value.x + ', ' + value.y + ')'; };
+      break;
+    default:
+      customType = this.customTypes[property.type];
+      if(customType && 'propertyToValue' in customType) {
+        value = customType.propertyToValue(value);
+      }
+  }
+  return value;
 };
 
 Object.defineProperty(Driver.prototype, "isSql", {
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 03b9c713..26bd07fc 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -7,343 +7,343 @@ var DDL     = require("../DDL/SQL");
 exports.Driver = Driver;
 
 var switchableFunctions = {
-	pool: {
-		connect: function (cb) {
-			this.db.connect(this.config, function (err, client, done) {
-				if (!err) {
-					done();
-				}
-				cb(err);
-			});
-		},
-		execSimpleQuery: function (query, cb) {
-			if (this.opts.debug) {
-				require("../../Debug").sql('postgres', query);
-			}
-			this.db.connect(this.config, function (err, client, done) {
-				if (err) {
-					return cb(err);
-				}
-
-				client.query(query, function (err, result) {
-					done();
-
-					if (err) {
-						cb(err);
-					} else {
-						cb(null, result.rows);
-					}
-				});
-			});
-			return this;
-		},
-		on: function(ev, cb) {
-			// Because `pg` is the same for all instances of this driver
-			// we can't keep adding listeners since they are never removed.
-			return this;
-		}
-	},
-	client: {
-		connect: function (cb) {
-			this.db.connect(cb);
-		},
-		execSimpleQuery: function (query, cb) {
-			if (this.opts.debug) {
-				require("../../Debug").sql('postgres', query);
-			}
-			this.db.query(query, function (err, result) {
-				if (err) {
-					cb(err);
-				} else {
-					cb(null, result.rows);
-				}
-			});
-			return this;
-		},
-		on: function(ev, cb) {
-			if (ev == "error") {
-				this.db.on("error", cb);
-			}
-			return this;
-		}
-	}
+  pool: {
+    connect: function (cb) {
+      this.db.connect(this.config, function (err, client, done) {
+        if (!err) {
+          done();
+        }
+        cb(err);
+      });
+    },
+    execSimpleQuery: function (query, cb) {
+      if (this.opts.debug) {
+        require("../../Debug").sql('postgres', query);
+      }
+      this.db.connect(this.config, function (err, client, done) {
+        if (err) {
+          return cb(err);
+        }
+
+        client.query(query, function (err, result) {
+          done();
+
+          if (err) {
+            cb(err);
+          } else {
+            cb(null, result.rows);
+          }
+        });
+      });
+      return this;
+    },
+    on: function(ev, cb) {
+      // Because `pg` is the same for all instances of this driver
+      // we can't keep adding listeners since they are never removed.
+      return this;
+    }
+  },
+  client: {
+    connect: function (cb) {
+      this.db.connect(cb);
+    },
+    execSimpleQuery: function (query, cb) {
+      if (this.opts.debug) {
+        require("../../Debug").sql('postgres', query);
+      }
+      this.db.query(query, function (err, result) {
+        if (err) {
+          cb(err);
+        } else {
+          cb(null, result.rows);
+        }
+      });
+      return this;
+    },
+    on: function(ev, cb) {
+      if (ev == "error") {
+        this.db.on("error", cb);
+      }
+      return this;
+    }
+  }
 };
 
 function Driver(config, connection, opts) {
-	var functions = switchableFunctions.client;
-
-	this.dialect = 'postgresql';
-	this.config = config || {};
-	this.opts   = opts || {};
-
-	if (!this.config.timezone) {
-		this.config.timezone = "local";
-	}
-
-	this.query  = new Query({ dialect: this.dialect, timezone: this.config.timezone });
-	this.customTypes = {};
-
-	if (connection) {
-		this.db = connection;
-	} else {
-		if (this.config.query && this.config.query.ssl) {
-			config.ssl = true;
-			this.config = _.extend(this.config, config);
-		// } else {
-		// 	this.config = _.extend(this.config, config);
-		// 	this.config = config.href || config;
-		}
-
-		pg.types.setTypeParser(20, Number);
-
-		if (opts.pool) {
-			functions = switchableFunctions.pool;
-			this.db = pg;
-		} else {
-			this.db = new pg.Client(this.config);
-		}
-	}
-
-	_.extend(this.constructor.prototype, functions);
-
-	this.aggregate_functions = [
-		"ABS", "CEIL", "FLOOR", "ROUND",
-		"AVG", "MIN", "MAX",
-		"LOG", "EXP", "POWER",
-		"ACOS", "ASIN", "ATAN", "COS", "SIN", "TAN",
-		"RANDOM", "RADIANS", "DEGREES",
-		"SUM", "COUNT",
-		"DISTINCT"
-	];
+  var functions = switchableFunctions.client;
+
+  this.dialect = 'postgresql';
+  this.config = config || {};
+  this.opts   = opts || {};
+
+  if (!this.config.timezone) {
+    this.config.timezone = "local";
+  }
+
+  this.query  = new Query({ dialect: this.dialect, timezone: this.config.timezone });
+  this.customTypes = {};
+
+  if (connection) {
+    this.db = connection;
+  } else {
+    if (this.config.query && this.config.query.ssl) {
+      config.ssl = true;
+      this.config = _.extend(this.config, config);
+    // } else {
+    //   this.config = _.extend(this.config, config);
+    //   this.config = config.href || config;
+    }
+
+    pg.types.setTypeParser(20, Number);
+
+    if (opts.pool) {
+      functions = switchableFunctions.pool;
+      this.db = pg;
+    } else {
+      this.db = new pg.Client(this.config);
+    }
+  }
+
+  _.extend(this.constructor.prototype, functions);
+
+  this.aggregate_functions = [
+    "ABS", "CEIL", "FLOOR", "ROUND",
+    "AVG", "MIN", "MAX",
+    "LOG", "EXP", "POWER",
+    "ACOS", "ASIN", "ATAN", "COS", "SIN", "TAN",
+    "RANDOM", "RADIANS", "DEGREES",
+    "SUM", "COUNT",
+    "DISTINCT"
+  ];
 }
 
 _.extend(Driver.prototype, shared, DDL);
 
 Driver.prototype.ping = function (cb) {
-	this.execSimpleQuery("SELECT * FROM pg_stat_activity LIMIT 1", function () {
-		return cb();
-	});
-	return this;
+  this.execSimpleQuery("SELECT * FROM pg_stat_activity LIMIT 1", function () {
+    return cb();
+  });
+  return this;
 };
 
 Driver.prototype.close = function (cb) {
-	this.db.end();
+  this.db.end();
 
-	if (typeof cb == "function") cb();
+  if (typeof cb == "function") cb();
 
-	return;
+  return;
 };
 
 Driver.prototype.getQuery = function () {
-	return this.query;
+  return this.query;
 };
 
 Driver.prototype.find = function (fields, table, conditions, opts, cb) {
-	var q = this.query.select().from(table).select(fields);
-
-	if (opts.offset) {
-		q.offset(opts.offset);
-	}
-	if (typeof opts.limit == "number") {
-		q.limit(opts.limit);
-	}
-	if (opts.order) {
-		for (var i = 0; i < opts.order.length; i++) {
-			q.order(opts.order[i][0], opts.order[i][1]);
-		}
-	}
-
-	if (opts.merge) {
-		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field).select(opts.merge.select);
-		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
-			q = q.where(opts.merge.where[0], opts.merge.where[1], opts.merge.table || null, conditions);
-		} else {
-			q = q.where(opts.merge.table || null, conditions);
-		}
-	} else {
-		q = q.where(conditions);
-	}
-
-	if (opts.exists) {
-		for (var k in opts.exists) {
-			q.whereExists(opts.exists[k].table, table, opts.exists[k].link, opts.exists[k].conditions);
-		}
-	}
-
-	q = q.build();
-
-	this.execSimpleQuery(q, cb);
+  var q = this.query.select().from(table).select(fields);
+
+  if (opts.offset) {
+    q.offset(opts.offset);
+  }
+  if (typeof opts.limit == "number") {
+    q.limit(opts.limit);
+  }
+  if (opts.order) {
+    for (var i = 0; i < opts.order.length; i++) {
+      q.order(opts.order[i][0], opts.order[i][1]);
+    }
+  }
+
+  if (opts.merge) {
+    q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field).select(opts.merge.select);
+    if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
+      q = q.where(opts.merge.where[0], opts.merge.where[1], opts.merge.table || null, conditions);
+    } else {
+      q = q.where(opts.merge.table || null, conditions);
+    }
+  } else {
+    q = q.where(conditions);
+  }
+
+  if (opts.exists) {
+    for (var k in opts.exists) {
+      q.whereExists(opts.exists[k].table, table, opts.exists[k].link, opts.exists[k].conditions);
+    }
+  }
+
+  q = q.build();
+
+  this.execSimpleQuery(q, cb);
 };
 
 Driver.prototype.count = function (table, conditions, opts, cb) {
-	var q = this.query.select().from(table).count(null, 'c');
-
-	if (opts.merge) {
-		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
-		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
-			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions);
-		} else {
-			q = q.where(conditions);
-		}
-	} else {
-		q = q.where(conditions);
-	}
-
-	if (opts.exists) {
-		for (var k in opts.exists) {
-			q.whereExists(opts.exists[k].table, table, opts.exists[k].link, opts.exists[k].conditions);
-		}
-	}
-
-	q = q.build();
-
-	this.execSimpleQuery(q, cb);
+  var q = this.query.select().from(table).count(null, 'c');
+
+  if (opts.merge) {
+    q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
+    if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
+      q = q.where(opts.merge.where[0], opts.merge.where[1], conditions);
+    } else {
+      q = q.where(conditions);
+    }
+  } else {
+    q = q.where(conditions);
+  }
+
+  if (opts.exists) {
+    for (var k in opts.exists) {
+      q.whereExists(opts.exists[k].table, table, opts.exists[k].link, opts.exists[k].conditions);
+    }
+  }
+
+  q = q.build();
+
+  this.execSimpleQuery(q, cb);
 };
 
 Driver.prototype.insert = function (table, data, keyProperties, cb) {
-	var q = this.query.insert().into(table).set(data).build();
+  var q = this.query.insert().into(table).set(data).build();
 
-	this.execSimpleQuery(q + " RETURNING *", function (err, results) {
-		if (err) {
-			return cb(err);
-		}
+  this.execSimpleQuery(q + " RETURNING *", function (err, results) {
+    if (err) {
+      return cb(err);
+    }
 
-		var i, ids = {}, prop;
+    var i, ids = {}, prop;
 
-		if (keyProperties) {
-			for (i = 0; i < keyProperties.length; i++) {
-				prop = keyProperties[i];
+    if (keyProperties) {
+      for (i = 0; i < keyProperties.length; i++) {
+        prop = keyProperties[i];
                                 // Zero is a valid value for an ID column
-				ids[prop.name] = results[0][prop.mapsTo] !== undefined ? results[0][prop.mapsTo] : null;
-			}
-		}
-		return cb(null, ids);
-	});
+        ids[prop.name] = results[0][prop.mapsTo] !== undefined ? results[0][prop.mapsTo] : null;
+      }
+    }
+    return cb(null, ids);
+  });
 };
 
 Driver.prototype.update = function (table, changes, conditions, cb) {
-	var q = this.query.update().into(table).set(changes).where(conditions).build();
+  var q = this.query.update().into(table).set(changes).where(conditions).build();
 
-	this.execSimpleQuery(q, cb);
+  this.execSimpleQuery(q, cb);
 };
 
 Driver.prototype.remove = function (table, conditions, cb) {
-	var q = this.query.remove().from(table).where(conditions).build();
+  var q = this.query.remove().from(table).where(conditions).build();
 
-	this.execSimpleQuery(q, cb);
+  this.execSimpleQuery(q, cb);
 };
 
 Driver.prototype.clear = function (table, cb) {
-	var q = "TRUNCATE TABLE " + this.query.escapeId(table);
+  var q = "TRUNCATE TABLE " + this.query.escapeId(table);
 
-	this.execSimpleQuery(q, cb);
+  this.execSimpleQuery(q, cb);
 };
 
 Driver.prototype.valueToProperty = function (value, property) {
-	var customType, v;
-
-	switch (property.type) {
-		case "object":
-			if (typeof value == "object" && !Buffer.isBuffer(value)) {
-				break;
-			}
-			try {
-				value = JSON.parse(value);
-			} catch (e) {
-				value = null;
-			}
-			break;
-		case "point":
-			if (typeof value == "string") {
-				var m = value.match(/\((\-?[\d\.]+)[\s,]+(\-?[\d\.]+)\)/);
-
-				if (m) {
-					value = { x : parseFloat(m[1], 10) , y : parseFloat(m[2], 10) };
-				}
-			}
-			break;
-		case "date":
-			if (_.isDate(value) && this.config.timezone && this.config.timezone != 'local') {
-				var tz = convertTimezone(this.config.timezone);
-
-				// shift local to UTC
-				value.setTime(value.getTime() - (value.getTimezoneOffset() * 60000));
-
-				if (tz !== false) {
-					// shift UTC to timezone
-					value.setTime(value.getTime() - (tz * 60000));
-				}
-			}
-			break;
-		case "number":
-			if (typeof value == 'string') {
-				switch (value.trim()) {
-					case 'Infinity':
-					case '-Infinity':
-					case 'NaN':
-						value = Number(value);
-						break;
-					default:
-						v = parseFloat(value);
-						if (Number.isFinite(v)) {
-							value = v;
-						}
-				}
-			}
-			break;
-		case "integer":
-			if (typeof value == 'string') {
-				v = parseInt(value);
-
-				if (Number.isFinite(v)) {
-					value = v;
-				}
-			}
-			break;
-		default:
-			customType = this.customTypes[property.type];
-
-			if (customType && 'valueToProperty' in customType) {
-				value = customType.valueToProperty(value);
-			}
-	}
-	return value;
+  var customType, v;
+
+  switch (property.type) {
+    case "object":
+      if (typeof value == "object" && !Buffer.isBuffer(value)) {
+        break;
+      }
+      try {
+        value = JSON.parse(value);
+      } catch (e) {
+        value = null;
+      }
+      break;
+    case "point":
+      if (typeof value == "string") {
+        var m = value.match(/\((\-?[\d\.]+)[\s,]+(\-?[\d\.]+)\)/);
+
+        if (m) {
+          value = { x : parseFloat(m[1], 10) , y : parseFloat(m[2], 10) };
+        }
+      }
+      break;
+    case "date":
+      if (_.isDate(value) && this.config.timezone && this.config.timezone != 'local') {
+        var tz = convertTimezone(this.config.timezone);
+
+        // shift local to UTC
+        value.setTime(value.getTime() - (value.getTimezoneOffset() * 60000));
+
+        if (tz !== false) {
+          // shift UTC to timezone
+          value.setTime(value.getTime() - (tz * 60000));
+        }
+      }
+      break;
+    case "number":
+      if (typeof value == 'string') {
+        switch (value.trim()) {
+          case 'Infinity':
+          case '-Infinity':
+          case 'NaN':
+            value = Number(value);
+            break;
+          default:
+            v = parseFloat(value);
+            if (Number.isFinite(v)) {
+              value = v;
+            }
+        }
+      }
+      break;
+    case "integer":
+      if (typeof value == 'string') {
+        v = parseInt(value);
+
+        if (Number.isFinite(v)) {
+          value = v;
+        }
+      }
+      break;
+    default:
+      customType = this.customTypes[property.type];
+
+      if (customType && 'valueToProperty' in customType) {
+        value = customType.valueToProperty(value);
+      }
+  }
+  return value;
 };
 
 Driver.prototype.propertyToValue = function (value, property) {
-	var customType;
-
-	switch (property.type) {
-		case "object":
-			if (value !== null && !Buffer.isBuffer(value)) {
-				value = new Buffer(JSON.stringify(value));
-			}
-			break;
-		case "date":
-			if (_.isDate(value) && this.config.timezone && this.config.timezone != 'local') {
-				var tz = convertTimezone(this.config.timezone);
-
-				// shift local to UTC
-				value.setTime(value.getTime() + (value.getTimezoneOffset() * 60000));
-				if (tz !== false) {
-					// shift UTC to timezone
-					value.setTime(value.getTime() + (tz * 60000));
-				}
-			}
-			break;
-		case "point":
-			return function () {
-				return "POINT(" + value.x + ', ' + value.y + ")";
-			};
-			break;
-		default:
-			customType = this.customTypes[property.type];
-
-			if (customType && 'propertyToValue' in customType) {
-				value = customType.propertyToValue(value);
-			}
-	}
-	return value;
+  var customType;
+
+  switch (property.type) {
+    case "object":
+      if (value !== null && !Buffer.isBuffer(value)) {
+        value = new Buffer(JSON.stringify(value));
+      }
+      break;
+    case "date":
+      if (_.isDate(value) && this.config.timezone && this.config.timezone != 'local') {
+        var tz = convertTimezone(this.config.timezone);
+
+        // shift local to UTC
+        value.setTime(value.getTime() + (value.getTimezoneOffset() * 60000));
+        if (tz !== false) {
+          // shift UTC to timezone
+          value.setTime(value.getTime() + (tz * 60000));
+        }
+      }
+      break;
+    case "point":
+      return function () {
+        return "POINT(" + value.x + ', ' + value.y + ")";
+      };
+      break;
+    default:
+      customType = this.customTypes[property.type];
+
+      if (customType && 'propertyToValue' in customType) {
+        value = customType.propertyToValue(value);
+      }
+  }
+  return value;
 };
 
 Object.defineProperty(Driver.prototype, "isSql", {
@@ -351,14 +351,14 @@ Object.defineProperty(Driver.prototype, "isSql", {
 });
 
 function convertTimezone(tz) {
-	if (tz == "Z") {
-		return 0;
-	}
+  if (tz == "Z") {
+    return 0;
+  }
 
-	var m = tz.match(/([\+\-\s])(\d\d):?(\d\d)?/);
+  var m = tz.match(/([\+\-\s])(\d\d):?(\d\d)?/);
 
-	if (m) {
-		return (m[1] == '-' ? -1 : 1) * (parseInt(m[2], 10) + ((m[3] ? parseInt(m[3], 10) : 0) / 60)) * 60;
-	}
-	return false;
+  if (m) {
+    return (m[1] == '-' ? -1 : 1) * (parseInt(m[2], 10) + ((m[3] ? parseInt(m[3], 10) : 0) / 60)) * 60;
+  }
+  return false;
 }
diff --git a/lib/Drivers/DML/redshift.js b/lib/Drivers/DML/redshift.js
index 6b84974d..7c760938 100644
--- a/lib/Drivers/DML/redshift.js
+++ b/lib/Drivers/DML/redshift.js
@@ -4,41 +4,41 @@ var postgres = require("./postgres");
 exports.Driver = Driver;
 
 function Driver(config, connection, opts) {
-	postgres.Driver.call(this, config, connection, opts);
+  postgres.Driver.call(this, config, connection, opts);
 }
 
 util.inherits(Driver, postgres.Driver);
 
 Driver.prototype.insert = function (table, data, keyProperties, cb) {
-	var q = this.query.insert()
-	                  .into(table)
-	                  .set(data)
-	                  .build();
-
-	if (this.opts.debug) {
-		require("../../Debug").sql('postgres', q);
-	}
-	this.execQuery(q, function (err, result) {
-		if (err)            return cb(err);
-		if (!keyProperties) return cb(null);
-
-		var i, ids = {}, prop;
-
-		if (keyNames.length == 1) {
-			this.execQuery("SELECT LASTVAL() AS id", function (err, results) {
-				if (err) return cb(err);
-
-				ids[keyProperties[0].name] = results[0].id || null;
-				return cb(null, ids);
-			});
-		} else {
-			for(i = 0; i < keyProperties.length; i++) {
-				prop = keyProperties[i];
+  var q = this.query.insert()
+                    .into(table)
+                    .set(data)
+                    .build();
+
+  if (this.opts.debug) {
+    require("../../Debug").sql('postgres', q);
+  }
+  this.execQuery(q, function (err, result) {
+    if (err)            return cb(err);
+    if (!keyProperties) return cb(null);
+
+    var i, ids = {}, prop;
+
+    if (keyNames.length == 1) {
+      this.execQuery("SELECT LASTVAL() AS id", function (err, results) {
+        if (err) return cb(err);
+
+        ids[keyProperties[0].name] = results[0].id || null;
+        return cb(null, ids);
+      });
+    } else {
+      for(i = 0; i < keyProperties.length; i++) {
+        prop = keyProperties[i];
                                 // Zero is a valid value for an ID column
-				ids[prop.name] = data[prop.mapsTo] !== undefined ? data[prop.mapsTo] : null;
-			}
+        ids[prop.name] = data[prop.mapsTo] !== undefined ? data[prop.mapsTo] : null;
+      }
 
-			return cb(null, ids);
-		}
-	}.bind(this));
+      return cb(null, ids);
+    }
+  }.bind(this));
 };
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index a1769f2f..67191439 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -8,349 +8,349 @@ var DDL     = require("../DDL/SQL");
 exports.Driver = Driver;
 
 function Driver(config, connection, opts) {
-	this.dialect = 'sqlite';
-	this.config = config || {};
-	this.opts   = opts || {};
-
-	if (!this.config.timezone) {
-		this.config.timezone = "local";
-	}
-
-	this.query  = new Query({ dialect: this.dialect, timezone: this.config.timezone });
-	this.customTypes = {};
-
-	if (connection) {
-		this.db = connection;
-	} else {
-		// on Windows, paths have a drive letter which is parsed by
-		// url.parse() as the hostname. If host is defined, assume
-		// it's the drive letter and add ":"
-		if (process.platform == "win32" && config.host && config.host.match(/^[a-z]$/i)) {
-			this.db = new sqlite3.Database(decodeURIComponent((config.host ? config.host + ":" : "") + (config.pathname || "")) || ':memory:');
-		} else {
-			this.db = new sqlite3.Database(decodeURIComponent((config.host ? config.host : "") + (config.pathname || "")) || ':memory:');
-		}
-
-	}
-
-	this.aggregate_functions = [ "ABS", "ROUND",
-	                             "AVG", "MIN", "MAX",
-	                             "RANDOM",
-	                             "SUM", "COUNT",
-	                             "DISTINCT" ];
+  this.dialect = 'sqlite';
+  this.config = config || {};
+  this.opts   = opts || {};
+
+  if (!this.config.timezone) {
+    this.config.timezone = "local";
+  }
+
+  this.query  = new Query({ dialect: this.dialect, timezone: this.config.timezone });
+  this.customTypes = {};
+
+  if (connection) {
+    this.db = connection;
+  } else {
+    // on Windows, paths have a drive letter which is parsed by
+    // url.parse() as the hostname. If host is defined, assume
+    // it's the drive letter and add ":"
+    if (process.platform == "win32" && config.host && config.host.match(/^[a-z]$/i)) {
+      this.db = new sqlite3.Database(decodeURIComponent((config.host ? config.host + ":" : "") + (config.pathname || "")) || ':memory:');
+    } else {
+      this.db = new sqlite3.Database(decodeURIComponent((config.host ? config.host : "") + (config.pathname || "")) || ':memory:');
+    }
+
+  }
+
+  this.aggregate_functions = [ "ABS", "ROUND",
+                               "AVG", "MIN", "MAX",
+                               "RANDOM",
+                               "SUM", "COUNT",
+                               "DISTINCT" ];
 }
 
 _.extend(Driver.prototype, shared, DDL);
 
 Driver.prototype.ping = function (cb) {
-	process.nextTick(cb);
-	return this;
+  process.nextTick(cb);
+  return this;
 };
 
 Driver.prototype.on = function (ev, cb) {
-	if (ev == "error") {
-		this.db.on("error", cb);
-	}
-	return this;
+  if (ev == "error") {
+    this.db.on("error", cb);
+  }
+  return this;
 };
 
 Driver.prototype.connect = function (cb) {
-	process.nextTick(cb);
+  process.nextTick(cb);
 };
 
 Driver.prototype.close = function (cb) {
-	this.db.close();
-	if (typeof cb == "function") process.nextTick(cb);
+  this.db.close();
+  if (typeof cb == "function") process.nextTick(cb);
 };
 
 Driver.prototype.getQuery = function () {
-	return this.query;
+  return this.query;
 };
 
 Driver.prototype.execSimpleQuery = function (query, cb) {
-	if (this.opts.debug) {
-		require("../../Debug").sql('sqlite', query);
-	}
-	this.db.all(query, cb);
+  if (this.opts.debug) {
+    require("../../Debug").sql('sqlite', query);
+  }
+  this.db.all(query, cb);
 };
 
 Driver.prototype.find = function (fields, table, conditions, opts, cb) {
-	var q = this.query.select()
-	                  .from(table).select(fields);
-
-	if (opts.offset) {
-		q.offset(opts.offset);
-	}
-	if (typeof opts.limit == "number") {
-		q.limit(opts.limit);
-	} else if (opts.offset) {
-		// OFFSET cannot be used without LIMIT so we use the biggest INTEGER number possible
-		q.limit('9223372036854775807');
-	}
-	if (opts.order) {
-		for (var i = 0; i < opts.order.length; i++) {
-			q.order(opts.order[i][0], opts.order[i][1]);
-		}
-	}
-
-	if (opts.merge) {
-		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field).select(opts.merge.select);
-		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
-			q = q.where(opts.merge.where[0], opts.merge.where[1], opts.merge.table || null, conditions);
-		} else {
-			q = q.where(opts.merge.table || null, conditions);
-		}
-	} else {
-		q = q.where(conditions);
-	}
-
-	if (opts.exists) {
-		for (var k in opts.exists) {
-			q.whereExists(opts.exists[k].table, table, opts.exists[k].link, opts.exists[k].conditions);
-		}
-	}
-
-	q = q.build();
-
-	if (this.opts.debug) {
-		require("../../Debug").sql('sqlite', q);
-	}
-	this.db.all(q, cb);
+  var q = this.query.select()
+                    .from(table).select(fields);
+
+  if (opts.offset) {
+    q.offset(opts.offset);
+  }
+  if (typeof opts.limit == "number") {
+    q.limit(opts.limit);
+  } else if (opts.offset) {
+    // OFFSET cannot be used without LIMIT so we use the biggest INTEGER number possible
+    q.limit('9223372036854775807');
+  }
+  if (opts.order) {
+    for (var i = 0; i < opts.order.length; i++) {
+      q.order(opts.order[i][0], opts.order[i][1]);
+    }
+  }
+
+  if (opts.merge) {
+    q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field).select(opts.merge.select);
+    if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
+      q = q.where(opts.merge.where[0], opts.merge.where[1], opts.merge.table || null, conditions);
+    } else {
+      q = q.where(opts.merge.table || null, conditions);
+    }
+  } else {
+    q = q.where(conditions);
+  }
+
+  if (opts.exists) {
+    for (var k in opts.exists) {
+      q.whereExists(opts.exists[k].table, table, opts.exists[k].link, opts.exists[k].conditions);
+    }
+  }
+
+  q = q.build();
+
+  if (this.opts.debug) {
+    require("../../Debug").sql('sqlite', q);
+  }
+  this.db.all(q, cb);
 };
 
 Driver.prototype.count = function (table, conditions, opts, cb) {
-	var q = this.query.select()
-	                  .from(table)
-	                  .count(null, 'c');
-
-	if (opts.merge) {
-		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
-		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
-			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions);
-		} else {
-			q = q.where(conditions);
-		}
-	} else {
-		q = q.where(conditions);
-	}
-
-	if (opts.exists) {
-		for (var k in opts.exists) {
-			q.whereExists(opts.exists[k].table, table, opts.exists[k].link, opts.exists[k].conditions);
-		}
-	}
-
-	q = q.build();
-
-	if (this.opts.debug) {
-		require("../../Debug").sql('sqlite', q);
-	}
-	this.db.all(q, cb);
+  var q = this.query.select()
+                    .from(table)
+                    .count(null, 'c');
+
+  if (opts.merge) {
+    q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
+    if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
+      q = q.where(opts.merge.where[0], opts.merge.where[1], conditions);
+    } else {
+      q = q.where(conditions);
+    }
+  } else {
+    q = q.where(conditions);
+  }
+
+  if (opts.exists) {
+    for (var k in opts.exists) {
+      q.whereExists(opts.exists[k].table, table, opts.exists[k].link, opts.exists[k].conditions);
+    }
+  }
+
+  q = q.build();
+
+  if (this.opts.debug) {
+    require("../../Debug").sql('sqlite', q);
+  }
+  this.db.all(q, cb);
 };
 
 Driver.prototype.insert = function (table, data, keyProperties, cb) {
-	var q = this.query.insert()
-	                  .into(table)
-	                  .set(data)
-	                  .build();
+  var q = this.query.insert()
+                    .into(table)
+                    .set(data)
+                    .build();
 
-	if (this.opts.debug) {
-		require("../../Debug").sql('sqlite', q);
-	}
+  if (this.opts.debug) {
+    require("../../Debug").sql('sqlite', q);
+  }
 
 
-	this.db.all(q, function (err, info) {
-		if (err)            return cb(err);
-		if (!keyProperties) return cb(null);
+  this.db.all(q, function (err, info) {
+    if (err)            return cb(err);
+    if (!keyProperties) return cb(null);
 
-		var i, ids = {}, prop;
+    var i, ids = {}, prop;
 
-		if (keyProperties.length == 1 && keyProperties[0].type == 'serial') {
-			this.db.get("SELECT last_insert_rowid() AS last_row_id", function (err, row) {
-				if (err) return cb(err);
+    if (keyProperties.length == 1 && keyProperties[0].type == 'serial') {
+      this.db.get("SELECT last_insert_rowid() AS last_row_id", function (err, row) {
+        if (err) return cb(err);
 
-				ids[keyProperties[0].name] = row.last_row_id;
+        ids[keyProperties[0].name] = row.last_row_id;
 
-				return cb(null, ids);
-			});
-		} else {
-			for (i = 0; i < keyProperties.length; i++) {
-				prop = keyProperties[i];
+        return cb(null, ids);
+      });
+    } else {
+      for (i = 0; i < keyProperties.length; i++) {
+        prop = keyProperties[i];
                                 // Zero is a valid value for an ID column
-				ids[prop.name] = data[prop.mapsTo] !== undefined ? data[prop.mapsTo] : null;
-			}
-			return cb(null, ids);
-		}
-	}.bind(this));
+        ids[prop.name] = data[prop.mapsTo] !== undefined ? data[prop.mapsTo] : null;
+      }
+      return cb(null, ids);
+    }
+  }.bind(this));
 };
 
 Driver.prototype.update = function (table, changes, conditions, cb) {
-	var q = this.query.update()
-	                  .into(table)
-	                  .set(changes)
-	                  .where(conditions)
-	                  .build();
-
-	if (this.opts.debug) {
-		require("../../Debug").sql('sqlite', q);
-	}
-	this.db.all(q, cb);
+  var q = this.query.update()
+                    .into(table)
+                    .set(changes)
+                    .where(conditions)
+                    .build();
+
+  if (this.opts.debug) {
+    require("../../Debug").sql('sqlite', q);
+  }
+  this.db.all(q, cb);
 };
 
 Driver.prototype.remove = function (table, conditions, cb) {
-	var q = this.query.remove()
-	                  .from(table)
-	                  .where(conditions)
-	                  .build();
-
-	if (this.opts.debug) {
-		require("../../Debug").sql('sqlite', q);
-	}
-	this.db.all(q, cb);
+  var q = this.query.remove()
+                    .from(table)
+                    .where(conditions)
+                    .build();
+
+  if (this.opts.debug) {
+    require("../../Debug").sql('sqlite', q);
+  }
+  this.db.all(q, cb);
 };
 
 Driver.prototype.clear = function (table, cb) {
-	var debug = this.opts.debug;
+  var debug = this.opts.debug;
 
-	this.execQuery("DELETE FROM ??", [table], function (err) {
-		if (err) return cb(err);
+  this.execQuery("DELETE FROM ??", [table], function (err) {
+    if (err) return cb(err);
 
-		this.execQuery("DELETE FROM ?? WHERE NAME = ?", ['sqlite_sequence', table], cb);
-	}.bind(this));
+    this.execQuery("DELETE FROM ?? WHERE NAME = ?", ['sqlite_sequence', table], cb);
+  }.bind(this));
 };
 
 Driver.prototype.valueToProperty = function (value, property) {
-	var v, customType;
-
-	switch (property.type) {
-		case "boolean":
-			value = !!value;
-			break;
-		case "object":
-			if (typeof value == "object" && !Buffer.isBuffer(value)) {
-				break;
-			}
-			try {
-				value = JSON.parse(value);
-			} catch (e) {
-				value = null;
-			}
-			break;
-		case "number":
-			if (typeof value == 'string') {
-				switch (value.trim()) {
-					case 'Infinity':
-					case '-Infinity':
-					case 'NaN':
-						value = Number(value);
-						break;
-					default:
-						v = parseFloat(value);
-						if (Number.isFinite(v)) {
-							value = v;
-						}
-				}
-			}
-			break;
-		case "integer":
-			if (typeof value == 'string') {
-				v = parseInt(value);
-
-				if (Number.isFinite(v)) {
-					value = v;
-				}
-			}
-			break;
-		case "date":
-			if (typeof value == 'string') {
-				if (value.indexOf('Z', value.length - 1) === -1) {
-					value = new Date(value + 'Z');
-				} else {
-					value = new Date(value);
-				}
-
-				if (this.config.timezone && this.config.timezone != 'local') {
-					var tz = convertTimezone(this.config.timezone);
-
-					// shift local to UTC
-					value.setTime(value.getTime() - (value.getTimezoneOffset() * 60000));
-					if (tz !== false) {
-						// shift UTC to timezone
-						value.setTime(value.getTime() - (tz * 60000));
-					}
-				}
-			}
-			break;
-		default:
-			customType = this.customTypes[property.type];
-			if(customType && 'valueToProperty' in customType) {
-				value = customType.valueToProperty(value);
-			}
-	}
-	return value;
+  var v, customType;
+
+  switch (property.type) {
+    case "boolean":
+      value = !!value;
+      break;
+    case "object":
+      if (typeof value == "object" && !Buffer.isBuffer(value)) {
+        break;
+      }
+      try {
+        value = JSON.parse(value);
+      } catch (e) {
+        value = null;
+      }
+      break;
+    case "number":
+      if (typeof value == 'string') {
+        switch (value.trim()) {
+          case 'Infinity':
+          case '-Infinity':
+          case 'NaN':
+            value = Number(value);
+            break;
+          default:
+            v = parseFloat(value);
+            if (Number.isFinite(v)) {
+              value = v;
+            }
+        }
+      }
+      break;
+    case "integer":
+      if (typeof value == 'string') {
+        v = parseInt(value);
+
+        if (Number.isFinite(v)) {
+          value = v;
+        }
+      }
+      break;
+    case "date":
+      if (typeof value == 'string') {
+        if (value.indexOf('Z', value.length - 1) === -1) {
+          value = new Date(value + 'Z');
+        } else {
+          value = new Date(value);
+        }
+
+        if (this.config.timezone && this.config.timezone != 'local') {
+          var tz = convertTimezone(this.config.timezone);
+
+          // shift local to UTC
+          value.setTime(value.getTime() - (value.getTimezoneOffset() * 60000));
+          if (tz !== false) {
+            // shift UTC to timezone
+            value.setTime(value.getTime() - (tz * 60000));
+          }
+        }
+      }
+      break;
+    default:
+      customType = this.customTypes[property.type];
+      if(customType && 'valueToProperty' in customType) {
+        value = customType.valueToProperty(value);
+      }
+  }
+  return value;
 };
 
 Driver.prototype.propertyToValue = function (value, property) {
-	var customType;
-
-	switch (property.type) {
-		case "boolean":
-			value = (value) ? 1 : 0;
-			break;
-		case "object":
-			if (value !== null) {
-				value = JSON.stringify(value);
-			}
-			break;
-		case "date":
-			if (this.config.query && this.config.query.strdates) {
-				if (value instanceof Date) {
-					var year = value.getUTCFullYear();
-					var month = value.getUTCMonth() + 1;
-					if (month < 10) {
-						month = '0' + month;
-					}
-					var date = value.getUTCDate();
-					if (date < 10) {
-						date = '0' + date;
-					}
-					var strdate = year + '-' + month + '-' + date;
-					if (property.time === false) {
-						value = strdate;
-						break;
-					}
-
-					var hours = value.getUTCHours();
-					if (hours < 10) {
-						hours = '0' + hours;
-					}
-					var minutes = value.getUTCMinutes();
-					if (minutes < 10) {
-						minutes = '0' + minutes;
-					}
-					var seconds = value.getUTCSeconds();
-					if (seconds < 10) {
-						seconds = '0' + seconds;
-					}
-					var millis = value.getUTCMilliseconds();
-					if (millis < 10) {
-						millis = '0' + millis;
-					}
-					if (millis < 100) {
-						millis = '0' + millis;
-					}
-					strdate += ' ' + hours + ':' + minutes + ':' + seconds + '.' + millis + '000';
-					value = strdate;
-				}
-			}
-			break;
-		default:
-			customType = this.customTypes[property.type];
-			if(customType && 'propertyToValue' in customType) {
-				value = customType.propertyToValue(value);
-			}
-	}
-	return value;
+  var customType;
+
+  switch (property.type) {
+    case "boolean":
+      value = (value) ? 1 : 0;
+      break;
+    case "object":
+      if (value !== null) {
+        value = JSON.stringify(value);
+      }
+      break;
+    case "date":
+      if (this.config.query && this.config.query.strdates) {
+        if (value instanceof Date) {
+          var year = value.getUTCFullYear();
+          var month = value.getUTCMonth() + 1;
+          if (month < 10) {
+            month = '0' + month;
+          }
+          var date = value.getUTCDate();
+          if (date < 10) {
+            date = '0' + date;
+          }
+          var strdate = year + '-' + month + '-' + date;
+          if (property.time === false) {
+            value = strdate;
+            break;
+          }
+
+          var hours = value.getUTCHours();
+          if (hours < 10) {
+            hours = '0' + hours;
+          }
+          var minutes = value.getUTCMinutes();
+          if (minutes < 10) {
+            minutes = '0' + minutes;
+          }
+          var seconds = value.getUTCSeconds();
+          if (seconds < 10) {
+            seconds = '0' + seconds;
+          }
+          var millis = value.getUTCMilliseconds();
+          if (millis < 10) {
+            millis = '0' + millis;
+          }
+          if (millis < 100) {
+            millis = '0' + millis;
+          }
+          strdate += ' ' + hours + ':' + minutes + ':' + seconds + '.' + millis + '000';
+          value = strdate;
+        }
+      }
+      break;
+    default:
+      customType = this.customTypes[property.type];
+      if(customType && 'propertyToValue' in customType) {
+        value = customType.propertyToValue(value);
+      }
+  }
+  return value;
 };
 
 Object.defineProperty(Driver.prototype, "isSql", {
@@ -358,11 +358,11 @@ Object.defineProperty(Driver.prototype, "isSql", {
 });
 
 function convertTimezone(tz) {
-	if (tz == "Z") return 0;
+  if (tz == "Z") return 0;
 
-	var m = tz.match(/([\+\-\s])(\d\d):?(\d\d)?/);
-	if (m) {
-		return (m[1] == '-' ? -1 : 1) * (parseInt(m[2], 10) + ((m[3] ? parseInt(m[3], 10) : 0) / 60)) * 60;
-	}
-	return false;
+  var m = tz.match(/([\+\-\s])(\d\d):?(\d\d)?/);
+  if (m) {
+    return (m[1] == '-' ? -1 : 1) * (parseInt(m[2], 10) + ((m[3] ? parseInt(m[3], 10) : 0) / 60)) * 60;
+  }
+  return false;
 }
diff --git a/lib/Drivers/aliases.js b/lib/Drivers/aliases.js
index 9c71d48e..0721e237 100644
--- a/lib/Drivers/aliases.js
+++ b/lib/Drivers/aliases.js
@@ -1,6 +1,6 @@
 module.exports = {
-	postgresql : "postgres",
-	pg         : "postgres",
+  postgresql : "postgres",
+  pg         : "postgres",
 
-	mongo      : "mongodb"
+  mongo      : "mongodb"
 };
diff --git a/lib/Error.js b/lib/Error.js
index 8074def8..855d97a7 100644
--- a/lib/Error.js
+++ b/lib/Error.js
@@ -15,16 +15,16 @@ function ORMError(message, code, extras) {
 
   this.message = message;
   if (code) {
-  	this.code = codes[code];
+    this.code = codes[code];
     this.literalCode = code;
     if (!this.code) {
-  		throw new Error("Invalid error code: " +  code);
-  	}
+      throw new Error("Invalid error code: " +  code);
+    }
   }
   if (extras) {
-  	for(var k in extras) {
-  		this[k] = extras[k];
-  	}
+    for(var k in extras) {
+      this[k] = extras[k];
+    }
   }
 }
 
diff --git a/lib/Express.js b/lib/Express.js
index 8851d796..84c8a514 100644
--- a/lib/Express.js
+++ b/lib/Express.js
@@ -5,71 +5,71 @@ var _pending = 0;
 var _queue   = [];
 
 module.exports = function (uri, opts) {
-	opts = opts || {};
-
-	_pending += 1;
-
-	orm.connect(uri, function (err, db) {
-		if (err) {
-			if (typeof opts.error === "function") {
-				opts.error(err);
-			} else {
-				throw err;
-			}
-
-			return checkRequestQueue();
-		}
-
-		if (Array.isArray(_db)) {
-			_db.push(db);
-		} else if (_db !== null) {
-			_db = [ _db, db ];
-		} else {
-			_db = db;
-		}
-
-		if (typeof opts.define === "function") {
-			if (opts.define.length > 2) {
-				return opts.define(db, _models, function () {
-					return checkRequestQueue();
-				});
-			}
-
-			opts.define(db, _models);
-		}
-
-		return checkRequestQueue();
-	});
-
-	return function ORM_ExpressMiddleware(req, res, next) {
-		if (!req.hasOwnProperty("models")) {
-			req.models = _models;
-			req.db     = _db;
-		}
-
-		if (next === undefined && typeof res === 'function')
-		{
-			next = res;
-		}
-
-		if (_pending > 0) {
-			_queue.push(next);
-			return;
-		}
-
-		return next();
-	};
+  opts = opts || {};
+
+  _pending += 1;
+
+  orm.connect(uri, function (err, db) {
+    if (err) {
+      if (typeof opts.error === "function") {
+        opts.error(err);
+      } else {
+        throw err;
+      }
+
+      return checkRequestQueue();
+    }
+
+    if (Array.isArray(_db)) {
+      _db.push(db);
+    } else if (_db !== null) {
+      _db = [ _db, db ];
+    } else {
+      _db = db;
+    }
+
+    if (typeof opts.define === "function") {
+      if (opts.define.length > 2) {
+        return opts.define(db, _models, function () {
+          return checkRequestQueue();
+        });
+      }
+
+      opts.define(db, _models);
+    }
+
+    return checkRequestQueue();
+  });
+
+  return function ORM_ExpressMiddleware(req, res, next) {
+    if (!req.hasOwnProperty("models")) {
+      req.models = _models;
+      req.db     = _db;
+    }
+
+    if (next === undefined && typeof res === 'function')
+    {
+      next = res;
+    }
+
+    if (_pending > 0) {
+      _queue.push(next);
+      return;
+    }
+
+    return next();
+  };
 };
 
 function checkRequestQueue() {
-	_pending -= 1;
+  _pending -= 1;
 
-	if (_pending > 0) return;
-	if (_queue.length === 0) return;
+  if (_pending > 0) return;
+  if (_queue.length === 0) return;
 
-	for (var i = 0; i < _queue.length; i++) {
-		_queue[i]();
-	}
+  for (var i = 0; i < _queue.length; i++) {
+    _queue[i]();
+  }
 
-	_queue.length = 0;
+  _queue.length = 0;
 }
diff --git a/lib/Hook.js b/lib/Hook.js
index 4ab645b1..1d74f4d8 100644
--- a/lib/Hook.js
+++ b/lib/Hook.js
@@ -1,28 +1,28 @@
 exports.trigger = function () {
-	var args = Array.prototype.slice.apply(arguments);
-	var self = args.shift();
-	var cb   = args.shift();
+  var args = Array.prototype.slice.apply(arguments);
+  var self = args.shift();
+  var cb   = args.shift();
 
-	if (typeof cb === "function") {
-		cb.apply(self, args);
-	}
+  if (typeof cb === "function") {
+    cb.apply(self, args);
+  }
 };
 
 exports.wait = function () {
-	var args = Array.prototype.slice.apply(arguments);
-	var self = args.shift();
-	var cb   = args.shift();
-	var next = args.shift();
+  var args = Array.prototype.slice.apply(arguments);
+  var self = args.shift();
+  var cb   = args.shift();
+  var next = args.shift();
 
-	args.push(next);
+  args.push(next);
 
-	if (typeof cb === "function") {
-		cb.apply(self, args);
+  if (typeof cb === "function") {
+    cb.apply(self, args);
 
-		if (cb.length < args.length) {
-			return next();
-		}
-	} else {
-		return next();
-	}
+    if (cb.length < args.length) {
+      return next();
+    }
+  } else {
+    return next();
+  }
 };
diff --git a/lib/Instance.js b/lib/Instance.js
index 701eb2b8..0858f34b 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -6,755 +6,755 @@ var enforce   = require("enforce");
 exports.Instance = Instance;
 
 function Instance(Model, opts) {
-	opts = opts || {};
-	opts.data = opts.data || {};
-	opts.extra = opts.extra || {};
-	opts.keys = opts.keys || "id";
-	opts.changes = (opts.is_new ? Object.keys(opts.data) : []);
-	opts.extrachanges = [];
-	opts.associations = {};
-	opts.originalKeyValues = {};
-
-	var instance_saving = false;
-	var events = {};
-	var instance = {};
-	var emitEvent = function () {
-		var args = Array.prototype.slice.apply(arguments);
-		var event = args.shift();
-
-		if (!events.hasOwnProperty(event)) return;
-
-		events[event].map(function (cb) {
-			cb.apply(instance, args);
-		});
-	};
-	var rememberKeys = function () {
-		var i, prop;
-
-		for(i = 0; i < opts.keyProperties.length; i++) {
-			prop = opts.keyProperties[i];
-			opts.originalKeyValues[prop.name] = opts.data[prop.name];
-		}
-	};
-	var shouldSaveAssocs = function (saveOptions) {
-		if (Model.settings.get("instance.saveAssociationsByDefault")) {
-			return saveOptions.saveAssociations !== false;
-		} else {
-			return !!saveOptions.saveAssociations;
-		}
-	};
-	var handleValidations = function (cb) {
-		var pending = [], errors = [], required, alwaysValidate;
-
-		Hook.wait(instance, opts.hooks.beforeValidation, function (err) {
-		    var k, i;
-			if (err) {
-				return saveError(cb, err);
-			}
-
-			var checks = new enforce.Enforce({
-				returnAllErrors : Model.settings.get("instance.returnAllErrors")
-			});
-
-			for (k in opts.validations) {
-				required = false;
-
-				if (Model.allProperties[k]) {
-					required = Model.allProperties[k].required;
-					alwaysValidate = Model.allProperties[k].alwaysValidate;
-				} else {
-					for (i = 0; i < opts.one_associations.length; i++) {
-						if (opts.one_associations[i].field === k) {
-							required = opts.one_associations[i].required;
-							break;
-						}
-					}
-				}
-				if (!alwaysValidate && !required && instance[k] == null) {
-					continue; // avoid validating if property is not required and is "empty"
-				}
-				for (i = 0; i < opts.validations[k].length; i++) {
-					checks.add(k, opts.validations[k][i]);
-				}
-			}
-
-			checks.context("instance", instance);
-			checks.context("model", Model);
-			checks.context("driver", opts.driver);
-
-			return checks.check(instance, cb);
-		});
-	};
-	var saveError = function (cb, err) {
-		instance_saving = false;
-
-		emitEvent("save", err, instance);
-
-		Hook.trigger(instance, opts.hooks.afterSave, false);
-
-		if (typeof cb === "function") {
-			cb(err, instance);
-		}
-	};
-	var saveInstance = function (saveOptions, cb) {
-		// what this condition means:
-		// - If the instance is in state mode
-		// - AND it's not an association that is asking it to save
-		//   -> return has already saved
-		if (instance_saving && saveOptions.saveAssociations !== false) {
-			return cb(null, instance);
-		}
-		instance_saving = true;
-
-		handleValidations(function (err) {
-			if (err) {
-				return saveError(cb, err);
-			}
-
-			if (opts.is_new) {
-				waitHooks([ "beforeCreate", "beforeSave" ], function (err) {
-					if (err) {
-						return saveError(cb, err);
-					}
-
-					return saveNew(saveOptions, getInstanceData(), cb);
-				});
-			} else {
-				waitHooks([ "beforeSave" ], function (err) {
-					if (err) {
-						return saveError(cb, err);
-					}
-
-					return savePersisted(saveOptions, getInstanceData(), cb);
-				});
-			}
-		});
-	};
-	var runAfterSaveActions = function (cb, create, err) {
-		instance_saving = false;
-
-		emitEvent("save", err, instance);
-
-		if (create) {
-			Hook.trigger(instance, opts.hooks.afterCreate, !err);
-		}
-		Hook.trigger(instance, opts.hooks.afterSave, !err);
-
-		cb();
-	};
-	var getInstanceData = function () {
-		var data = {}, prop;
-		for (var k in opts.data) {
-			if (!opts.data.hasOwnProperty(k)) continue;
-			prop = Model.allProperties[k];
-
-			if (prop) {
-				if (opts.data[k] == null &&  (prop.type == 'serial' || typeof prop.defaultValue == 'function')) {
-					continue;
-				}
-
-				if (opts.driver.propertyToValue) {
-					data[k] = opts.driver.propertyToValue(opts.data[k], prop);
-				} else {
-					data[k] = opts.data[k];
-				}
-			} else {
-				data[k] = opts.data[k];
-			}
-		}
-
-		return data;
-	};
-	var waitHooks = function (hooks, next) {
-		var nextHook = function () {
-			if (hooks.length === 0) {
-				return next();
-			}
-			Hook.wait(instance, opts.hooks[hooks.shift()], function (err) {
-				if (err) {
-					return next(err);
-				}
-
-				return nextHook();
-			});
-		};
-
-		return nextHook();
-	};
-	var saveNew = function (saveOptions, data, cb) {
-		var i, prop;
-
-		var finish = function (err) {
-			runAfterSaveActions(function () {
-				if (err) return cb(err);
-				saveInstanceExtra(cb);
-			}, true);
-		}
-
-		data = Utilities.transformPropertyNames(data, Model.allProperties);
-
-		opts.driver.insert(opts.table, data, opts.keyProperties, function (save_err, info) {
-			if (save_err) {
-				return saveError(cb, save_err);
-			}
-
-			opts.changes.length = 0;
-
-			for (i = 0; i < opts.keyProperties.length; i++) {
-				prop = opts.keyProperties[i];
-				opts.data[prop.name] = info.hasOwnProperty(prop.name) ? info[prop.name] : data[prop.name];
-			}
-			opts.is_new = false;
-			rememberKeys();
-
-			if (!shouldSaveAssocs(saveOptions)) {
-				return finish();
-			}
-
-			return saveAssociations(finish);
-		});
-	};
-	var savePersisted = function (saveOptions, data, cb) {
-		var changes = {}, conditions = {}, i, prop;
-
-		var next = function (saved) {
-			var finish = function () {
-				saveInstanceExtra(cb);
-			}
-
-			if(!saved && !shouldSaveAssocs(saveOptions)) {
-				finish();
-			} else {
-				if (!shouldSaveAssocs(saveOptions)) {
-					runAfterSaveActions(function () {
-						finish();
-					}, false);
-				} else {
-					saveAssociations(function (err, assocSaved) {
-						if (saved || assocSaved) {
-							runAfterSaveActions(function () {
-								if (err) return cb(err);
-								finish();
-							}, false, err);
-						} else {
-							finish();
-						}
-					});
-				}
-			}
-		}
-
-		if (opts.changes.length === 0) {
-			next(false);
-		} else {
-			for (i = 0; i < opts.changes.length; i++) {
-				changes[opts.changes[i]] = data[opts.changes[i]];
-			}
-			for (i = 0; i < opts.keyProperties.length; i++) {
-				prop = opts.keyProperties[i];
-				conditions[prop.mapsTo] = opts.originalKeyValues[prop.name];
-			}
-			changes = Utilities.transformPropertyNames(changes, Model.allProperties);
-
-			opts.driver.update(opts.table, changes, conditions, function (err) {
-				if (err) {
-					return saveError(cb, err);
-				}
-				opts.changes.length = 0;
-				rememberKeys();
-
-				next(true);
-			});
-		}
-	};
-	var saveAssociations = function (cb) {
-		var pending = 1, errored = false, i, j;
-		var saveAssociation = function (accessor, instances) {
-			pending += 1;
-
-			instance[accessor](instances, function (err) {
-				if (err) {
-					if (errored) return;
-
-					errored = true;
-					return cb(err, true);
-				}
-
-				if (--pending === 0) {
-					return cb(null, true);
-				}
-			});
-		};
-
-		var _saveOneAssociation = function (assoc) {
-			if (!instance[assoc.name] || typeof instance[assoc.name] !== "object") return;
-			if (assoc.reversed) {
-				// reversed hasOne associations should behave like hasMany
-				if (!Array.isArray(instance[assoc.name])) {
-					instance[assoc.name] = [ instance[assoc.name] ];
-				}
-				for (var i = 0; i < instance[assoc.name].length; i++) {
-					if (!instance[assoc.name][i].isInstance) {
-						instance[assoc.name][i] = new assoc.model(instance[assoc.name][i]);
-					}
-					saveAssociation(assoc.setAccessor, instance[assoc.name][i]);
-				}
-				return;
-			}
-			if (!instance[assoc.name].isInstance) {
-			  instance[assoc.name] = new assoc.model(instance[assoc.name]);
-			}
-
-			saveAssociation(assoc.setAccessor, instance[assoc.name]);
-		};
-
-		for (i = 0; i < opts.one_associations.length; i++) {
-			_saveOneAssociation(opts.one_associations[i]);
-		}
-
-
-		var _saveManyAssociation = function (assoc) {
-			var assocVal = instance[assoc.name];
-
-			if (!Array.isArray(assocVal)) return;
-			if (!opts.associations[assoc.name].changed) return;
-
-			for (j = 0; j < assocVal.length; j++) {
-				if (!assocVal[j].isInstance) {
-					assocVal[j] = new assoc.model(assocVal[j]);
-				}
-			}
-
-			saveAssociation(assoc.setAccessor, assocVal);
-		};
-
-		for (i = 0; i < opts.many_associations.length; i++) {
-			_saveManyAssociation(opts.many_associations[i]);
-		}
-
-		if (--pending === 0) {
-			return cb(null, false);
-		}
-	};
-	var saveInstanceExtra = function (cb) {
-		if (opts.extrachanges.length === 0) {
-			if (cb) return cb(null, instance);
-			else return;
-		}
-
-		var data = {};
-		var conditions = {};
-
-		for (var i = 0; i < opts.extrachanges.length; i++) {
-			if (!opts.data.hasOwnProperty(opts.extrachanges[i])) continue;
-
-			if (opts.extra[opts.extrachanges[i]]) {
-				data[opts.extrachanges[i]] = opts.data[opts.extrachanges[i]];
-				if (opts.driver.propertyToValue) {
-					data[opts.extrachanges[i]] = opts.driver.propertyToValue(data[opts.extrachanges[i]], opts.extra[opts.extrachanges[i]]);
-				}
-			} else {
-				data[opts.extrachanges[i]] = opts.data[opts.extrachanges[i]];
-			}
-		}
-
-		for (i = 0; i < opts.extra_info.id.length; i++) {
-			conditions[opts.extra_info.id_prop[i]] = opts.extra_info.id[i];
-			conditions[opts.extra_info.assoc_prop[i]] = opts.data[opts.keys[i]];
-		}
-
-		opts.driver.update(opts.extra_info.table, data, conditions, function (err) {
-			return cb(err);
-		});
-	};
-	var removeInstance = function (cb) {
-		if (opts.is_new) {
-			return cb(null);
-		}
-
-		var conditions = {};
-		for (var i = 0; i < opts.keys.length; i++) {
-		    conditions[opts.keys[i]] = opts.data[opts.keys[i]];
-		}
-
-		Hook.wait(instance, opts.hooks.beforeRemove, function (err) {
-			if (err) {
-				emitEvent("remove", err, instance);
-				if (typeof cb === "function") {
-					cb(err, instance);
-				}
-				return;
-			}
-
-			emitEvent("beforeRemove", instance);
-
-			opts.driver.remove(opts.table, conditions, function (err, data) {
-				Hook.trigger(instance, opts.hooks.afterRemove, !err);
-
-				emitEvent("remove", err, instance);
-
-				if (typeof cb === "function") {
-					cb(err, instance);
-				}
-
-				instance = undefined;
-			});
-		});
-	};
-	var saveInstanceProperty = function (key, value) {
-		var changes = {}, conditions = {};
-		changes[key] = value;
-
-		if (Model.properties[key]) {
-			if (opts.driver.propertyToValue) {
-				changes[key] = opts.driver.propertyToValue(changes[key], Model.properties[key]);
-			}
-		}
-
-		for (var i = 0; i < opts.keys.length; i++) {
-			conditions[opts.keys[i]] = opts.data[opts.keys[i]];
-		}
-
-		Hook.wait(instance, opts.hooks.beforeSave, function (err) {
-			if (err) {
-				Hook.trigger(instance, opts.hooks.afterSave, false);
-				emitEvent("save", err, instance);
-				return;
-			}
-
-			opts.driver.update(opts.table, changes, conditions, function (err) {
-				if (!err) {
-					opts.data[key] = value;
-				}
-				Hook.trigger(instance, opts.hooks.afterSave, !err);
-				emitEvent("save", err, instance);
-			});
-		});
-	};
-	var setInstanceProperty = function (key, value) {
-		var prop = Model.allProperties[key] || opts.extra[key];
-
-		if (prop) {
-			if ('valueToProperty' in opts.driver) {
-				value = opts.driver.valueToProperty(value, prop);
-			}
-			if (opts.data[key] !== value) {
-				opts.data[key] = value;
-				return true;
-			}
-		}
-		return false;
-	}
-
-	// ('data.a.b', 5) => opts.data.a.b = 5
-	var setPropertyByPath = function (path, value) {
-		if (typeof path == 'string') {
-			path = path.split('.');
-		} else if (!Array.isArray(path)) {
-			return;
-		}
-
-		var propName = path.shift();
-		var prop = Model.allProperties[propName] || opts.extra[propName];
-		var currKey, currObj;
-
-		if (!prop) {
-			return;
-		}
-		if (path.length == 0) {
-			instance[propName] = value;
-			return;
-		}
-		currObj = instance[propName];
-
-		while(currObj && path.length > 0 ) {
-			currKey = path.shift();
-
-			if (path.length > 0) {
-				currObj = currObj[currKey];
-			} else if (currObj[currKey] !== value) {
-				currObj[currKey] = value;
-				opts.changes.push(propName);
-			}
-		}
-	}
-
-	var addInstanceProperty = function (key) {
-		var defaultValue = null;
-		var prop = Model.allProperties[key];
-
-		// This code was first added, and then commented out in a later commit.
-		// Its presence doesn't affect tests, so I'm just gonna log if it ever gets called.
-		// If someone complains about noise, we know it does something, and figure it out then.
-		if (instance.hasOwnProperty(key)) console.log("Overwriting instance property");
-
-		if (key in opts.data) {
-			defaultValue = opts.data[key];
-		} else if (prop && 'defaultValue' in prop) {
-			defaultValue = prop.defaultValue;
-		}
-
-		setInstanceProperty(key, defaultValue);
-
-		Object.defineProperty(instance, key, {
-			get: function () {
-				return opts.data[key];
-			},
-			set: function (val) {
-				if (prop.key === true) {
-					if (prop.type == 'serial' && opts.data[key] != null) {
-						return;
-					} else {
-						opts.originalKeyValues[prop.name] = opts.data[prop.name];
-					}
-				}
-
-				if (!setInstanceProperty(key, val)) {
-					return;
-				}
-
-				if (opts.autoSave) {
-					saveInstanceProperty(key, val);
-				} else if (opts.changes.indexOf(key) === -1) {
-					opts.changes.push(key);
-				}
-			},
-			enumerable: !(prop && !prop.enumerable)
-		});
-	};
-	var addInstanceExtraProperty = function (key) {
-		if (!instance.hasOwnProperty("extra")) {
-			instance.extra = {};
-		}
-		Object.defineProperty(instance.extra, key, {
-			get: function () {
-				return opts.data[key];
-			},
-			set: function (val) {
-				setInstanceProperty(key, val);
-
-				/*if (opts.autoSave) {
-					saveInstanceProperty(key, val);
-				}*/if (opts.extrachanges.indexOf(key) === -1) {
-					opts.extrachanges.push(key);
-				}
-			},
-			enumerable: true
-		});
-	};
-
-	var i, k;
-
-	for (k in Model.allProperties) {
-		addInstanceProperty(k);
-	}
-	for (k in opts.extra) {
-		addInstanceProperty(k);
-	}
-
-	for (k in opts.methods) {
-		Object.defineProperty(instance, k, {
-			value      : opts.methods[k].bind(instance),
-			enumerable : false,
-			writable  : true
-		});
-	}
-
-	for (k in opts.extra) {
-		addInstanceExtraProperty(k);
-	}
-
-	Object.defineProperty(instance, "on", {
-		value: function (event, cb) {
-			if (!events.hasOwnProperty(event)) {
-				events[event] = [];
-			}
-			events[event].push(cb);
-
-			return this;
-		},
-		enumerable: false,
-		writable: true
-	});
-	Object.defineProperty(instance, "save", {
-		value: function () {
-			var arg = null, objCount = 0;
-			var data = {}, saveOptions = {}, cb = null;
-
-			while (arguments.length > 0) {
-				arg = Array.prototype.shift.call(arguments);
-
-				switch (typeof arg) {
-					case 'object':
-						switch (objCount) {
-							case 0:
-								data = arg;
-								break;
-							case 1:
-								saveOptions = arg;
-								break;
-						}
-						objCount++;
-						break;
-					case 'function':
-						cb = arg;
-						break;
-					default:
-					    var err = new Error("Unknown parameter type '" + (typeof arg) + "' in Instance.save()");
-					    err.model = Model.table;
-					    throw err;
-				}
-			}
-
-			for (var k in data) {
-				if (data.hasOwnProperty(k)) {
-					this[k] = data[k];
-				}
-			}
-
-			saveInstance(saveOptions, function (err) {
-				if (!cb) return;
-				if (err) return cb(err);
-
-				return cb(null, instance);
-			});
-
-			return this;
-		},
-		enumerable: false,
-		writable: true
-	});
-	Object.defineProperty(instance, "saved", {
-		value: function () {
-			return opts.changes.length === 0;
-		},
-		enumerable: false,
-		writable: true
-	});
-	Object.defineProperty(instance, "remove", {
-		value: function (cb) {
-			removeInstance(cb);
-
-			return this;
-		},
-		enumerable: false,
-		writable: true
-	});
-	Object.defineProperty(instance, "set", {
-		value: setPropertyByPath,
-		enumerable: false,
-		writable: true
-	});
-	Object.defineProperty(instance, "markAsDirty", {
-		value: function (propName) {
-			if (propName != undefined) {
-				opts.changes.push(propName);
-			}
-		},
-		enumerable: false,
-		writable: true
-	});
-	Object.defineProperty(instance, "dirtyProperties", {
-		get: function () { return opts.changes; },
-		enumerable: false
-	});
-	Object.defineProperty(instance, "isInstance", {
-		value: true,
-		enumerable: false
-	});
-	Object.defineProperty(instance, "isPersisted", {
-		value: function () {
-			return !opts.is_new;
-		},
-		enumerable: false,
-		writable: true
-	});
-	Object.defineProperty(instance, "isShell", {
-		value: function () {
-			return opts.isShell;
-		},
-		enumerable: false
-	});
-	Object.defineProperty(instance, "validate", {
-		value: function (cb) {
-			handleValidations(function (errors) {
-				cb(null, errors || false);
-			});
-		},
-		enumerable: false,
-		writable: true
-	});
-	Object.defineProperty(instance, "__singleton_uid", {
-		value: function (cb) {
-			return opts.uid;
-		},
-		enumerable: false
-	});
-	Object.defineProperty(instance, "__opts", {
-		value: opts,
-		enumerable: false
-	});
-	Object.defineProperty(instance, "model", {
-		value: function (cb) {
-			return Model;
-		},
-		enumerable: false
-	});
-
-	for (i = 0; i < opts.keyProperties.length; i++) {
-		var prop = opts.keyProperties[i];
-
-		if (!(prop.name in opts.data)) {
-			opts.changes = Object.keys(opts.data);
-			break;
-		}
-	}
-	rememberKeys();
-
-	opts.setupAssociations(instance);
-
-	for (i = 0; i < opts.one_associations.length; i++) {
-		var asc = opts.one_associations[i];
-
-		if (!asc.reversed && !asc.extension) {
-			for (k in asc.field) {
-				if (!opts.data.hasOwnProperty(k)) {
-					addInstanceProperty(k);
-				}
-			}
-		}
-
-		if (asc.name in opts.data) {
-			var d = opts.data[asc.name];
-			var mapper = function (obj) {
-				return obj.isInstance ? obj : new asc.model(obj);
-			};
-
-			if (Array.isArray(d)) {
-				instance[asc.name] = d.map(mapper);
-			} else {
-				instance[asc.name] = mapper(d);
-			}
-			delete opts.data[asc.name];
-		}
-	}
-	for (i = 0; i < opts.many_associations.length; i++) {
-		var aName = opts.many_associations[i].name;
-		opts.associations[aName] = {
-			changed: false, data: opts.many_associations[i]
-		};
-
-		if (Array.isArray(opts.data[aName])) {
-			instance[aName] = opts.data[aName];
-			delete opts.data[aName];
-		}
-	}
-
-	Hook.wait(instance, opts.hooks.afterLoad, function (err) {
-		process.nextTick(function () {
-			emitEvent("ready", err);
-		});
-	});
-
-	return instance;
+  opts = opts || {};
+  opts.data = opts.data || {};
+  opts.extra = opts.extra || {};
+  opts.keys = opts.keys || "id";
+  opts.changes = (opts.is_new ? Object.keys(opts.data) : []);
+  opts.extrachanges = [];
+  opts.associations = {};
+  opts.originalKeyValues = {};
+
+  var instance_saving = false;
+  var events = {};
+  var instance = {};
+  var emitEvent = function () {
+    var args = Array.prototype.slice.apply(arguments);
+    var event = args.shift();
+
+    if (!events.hasOwnProperty(event)) return;
+
+    events[event].map(function (cb) {
+      cb.apply(instance, args);
+    });
+  };
+  var rememberKeys = function () {
+    var i, prop;
+
+    for(i = 0; i < opts.keyProperties.length; i++) {
+      prop = opts.keyProperties[i];
+      opts.originalKeyValues[prop.name] = opts.data[prop.name];
+    }
+  };
+  var shouldSaveAssocs = function (saveOptions) {
+    if (Model.settings.get("instance.saveAssociationsByDefault")) {
+      return saveOptions.saveAssociations !== false;
+    } else {
+      return !!saveOptions.saveAssociations;
+    }
+  };
+  var handleValidations = function (cb) {
+    var pending = [], errors = [], required, alwaysValidate;
+
+    Hook.wait(instance, opts.hooks.beforeValidation, function (err) {
+        var k, i;
+      if (err) {
+        return saveError(cb, err);
+      }
+
+      var checks = new enforce.Enforce({
+        returnAllErrors : Model.settings.get("instance.returnAllErrors")
+      });
+
+      for (k in opts.validations) {
+        required = false;
+
+        if (Model.allProperties[k]) {
+          required = Model.allProperties[k].required;
+          alwaysValidate = Model.allProperties[k].alwaysValidate;
+        } else {
+          for (i = 0; i < opts.one_associations.length; i++) {
+            if (opts.one_associations[i].field === k) {
+              required = opts.one_associations[i].required;
+              break;
+            }
+          }
+        }
+        if (!alwaysValidate && !required && instance[k] == null) {
+          continue; // avoid validating if property is not required and is "empty"
+        }
+        for (i = 0; i < opts.validations[k].length; i++) {
+          checks.add(k, opts.validations[k][i]);
+        }
+      }
+
+      checks.context("instance", instance);
+      checks.context("model", Model);
+      checks.context("driver", opts.driver);
+
+      return checks.check(instance, cb);
+    });
+  };
+  var saveError = function (cb, err) {
+    instance_saving = false;
+
+    emitEvent("save", err, instance);
+
+    Hook.trigger(instance, opts.hooks.afterSave, false);
+
+    if (typeof cb === "function") {
+      cb(err, instance);
+    }
+  };
+  var saveInstance = function (saveOptions, cb) {
+    // what this condition means:
+    // - If the instance is in state mode
+    // - AND it's not an association that is asking it to save
+    //   -> return has already saved
+    if (instance_saving && saveOptions.saveAssociations !== false) {
+      return cb(null, instance);
+    }
+    instance_saving = true;
+
+    handleValidations(function (err) {
+      if (err) {
+        return saveError(cb, err);
+      }
+
+      if (opts.is_new) {
+        waitHooks([ "beforeCreate", "beforeSave" ], function (err) {
+          if (err) {
+            return saveError(cb, err);
+          }
+
+          return saveNew(saveOptions, getInstanceData(), cb);
+        });
+      } else {
+        waitHooks([ "beforeSave" ], function (err) {
+          if (err) {
+            return saveError(cb, err);
+          }
+
+          return savePersisted(saveOptions, getInstanceData(), cb);
+        });
+      }
+    });
+  };
+  var runAfterSaveActions = function (cb, create, err) {
+    instance_saving = false;
+
+    emitEvent("save", err, instance);
+
+    if (create) {
+      Hook.trigger(instance, opts.hooks.afterCreate, !err);
+    }
+    Hook.trigger(instance, opts.hooks.afterSave, !err);
+
+    cb();
+  };
+  var getInstanceData = function () {
+    var data = {}, prop;
+    for (var k in opts.data) {
+      if (!opts.data.hasOwnProperty(k)) continue;
+      prop = Model.allProperties[k];
+
+      if (prop) {
+        if (opts.data[k] == null &&  (prop.type == 'serial' || typeof prop.defaultValue == 'function')) {
+          continue;
+        }
+
+        if (opts.driver.propertyToValue) {
+          data[k] = opts.driver.propertyToValue(opts.data[k], prop);
+        } else {
+          data[k] = opts.data[k];
+        }
+      } else {
+        data[k] = opts.data[k];
+      }
+    }
+
+    return data;
+  };
+  var waitHooks = function (hooks, next) {
+    var nextHook = function () {
+      if (hooks.length === 0) {
+        return next();
+      }
+      Hook.wait(instance, opts.hooks[hooks.shift()], function (err) {
+        if (err) {
+          return next(err);
+        }
+
+        return nextHook();
+      });
+    };
+
+    return nextHook();
+  };
+  var saveNew = function (saveOptions, data, cb) {
+    var i, prop;
+
+    var finish = function (err) {
+      runAfterSaveActions(function () {
+        if (err) return cb(err);
+        saveInstanceExtra(cb);
+      }, true);
+    }
+
+    data = Utilities.transformPropertyNames(data, Model.allProperties);
+
+    opts.driver.insert(opts.table, data, opts.keyProperties, function (save_err, info) {
+      if (save_err) {
+        return saveError(cb, save_err);
+      }
+
+      opts.changes.length = 0;
+
+      for (i = 0; i < opts.keyProperties.length; i++) {
+        prop = opts.keyProperties[i];
+        opts.data[prop.name] = info.hasOwnProperty(prop.name) ? info[prop.name] : data[prop.name];
+      }
+      opts.is_new = false;
+      rememberKeys();
+
+      if (!shouldSaveAssocs(saveOptions)) {
+        return finish();
+      }
+
+      return saveAssociations(finish);
+    });
+  };
+  var savePersisted = function (saveOptions, data, cb) {
+    var changes = {}, conditions = {}, i, prop;
+
+    var next = function (saved) {
+      var finish = function () {
+        saveInstanceExtra(cb);
+      }
+
+      if(!saved && !shouldSaveAssocs(saveOptions)) {
+        finish();
+      } else {
+        if (!shouldSaveAssocs(saveOptions)) {
+          runAfterSaveActions(function () {
+            finish();
+          }, false);
+        } else {
+          saveAssociations(function (err, assocSaved) {
+            if (saved || assocSaved) {
+              runAfterSaveActions(function () {
+                if (err) return cb(err);
+                finish();
+              }, false, err);
+            } else {
+              finish();
+            }
+          });
+        }
+      }
+    }
+
+    if (opts.changes.length === 0) {
+      next(false);
+    } else {
+      for (i = 0; i < opts.changes.length; i++) {
+        changes[opts.changes[i]] = data[opts.changes[i]];
+      }
+      for (i = 0; i < opts.keyProperties.length; i++) {
+        prop = opts.keyProperties[i];
+        conditions[prop.mapsTo] = opts.originalKeyValues[prop.name];
+      }
+      changes = Utilities.transformPropertyNames(changes, Model.allProperties);
+
+      opts.driver.update(opts.table, changes, conditions, function (err) {
+        if (err) {
+          return saveError(cb, err);
+        }
+        opts.changes.length = 0;
+        rememberKeys();
+
+        next(true);
+      });
+    }
+  };
+  var saveAssociations = function (cb) {
+    var pending = 1, errored = false, i, j;
+    var saveAssociation = function (accessor, instances) {
+      pending += 1;
+
+      instance[accessor](instances, function (err) {
+        if (err) {
+          if (errored) return;
+
+          errored = true;
+          return cb(err, true);
+        }
+
+        if (--pending === 0) {
+          return cb(null, true);
+        }
+      });
+    };
+
+    var _saveOneAssociation = function (assoc) {
+      if (!instance[assoc.name] || typeof instance[assoc.name] !== "object") return;
+      if (assoc.reversed) {
+        // reversed hasOne associations should behave like hasMany
+        if (!Array.isArray(instance[assoc.name])) {
+          instance[assoc.name] = [ instance[assoc.name] ];
+        }
+        for (var i = 0; i < instance[assoc.name].length; i++) {
+          if (!instance[assoc.name][i].isInstance) {
+            instance[assoc.name][i] = new assoc.model(instance[assoc.name][i]);
+          }
+          saveAssociation(assoc.setAccessor, instance[assoc.name][i]);
+        }
+        return;
+      }
+      if (!instance[assoc.name].isInstance) {
+        instance[assoc.name] = new assoc.model(instance[assoc.name]);
+      }
+
+      saveAssociation(assoc.setAccessor, instance[assoc.name]);
+    };
+
+    for (i = 0; i < opts.one_associations.length; i++) {
+      _saveOneAssociation(opts.one_associations[i]);
+    }
+
+
+    var _saveManyAssociation = function (assoc) {
+      var assocVal = instance[assoc.name];
+
+      if (!Array.isArray(assocVal)) return;
+      if (!opts.associations[assoc.name].changed) return;
+
+      for (j = 0; j < assocVal.length; j++) {
+        if (!assocVal[j].isInstance) {
+          assocVal[j] = new assoc.model(assocVal[j]);
+        }
+      }
+
+      saveAssociation(assoc.setAccessor, assocVal);
+    };
+
+    for (i = 0; i < opts.many_associations.length; i++) {
+      _saveManyAssociation(opts.many_associations[i]);
+    }
+
+    if (--pending === 0) {
+      return cb(null, false);
+    }
+  };
+  var saveInstanceExtra = function (cb) {
+    if (opts.extrachanges.length === 0) {
+      if (cb) return cb(null, instance);
+      else return;
+    }
+
+    var data = {};
+    var conditions = {};
+
+    for (var i = 0; i < opts.extrachanges.length; i++) {
+      if (!opts.data.hasOwnProperty(opts.extrachanges[i])) continue;
+
+      if (opts.extra[opts.extrachanges[i]]) {
+        data[opts.extrachanges[i]] = opts.data[opts.extrachanges[i]];
+        if (opts.driver.propertyToValue) {
+          data[opts.extrachanges[i]] = opts.driver.propertyToValue(data[opts.extrachanges[i]], opts.extra[opts.extrachanges[i]]);
+        }
+      } else {
+        data[opts.extrachanges[i]] = opts.data[opts.extrachanges[i]];
+      }
+    }
+
+    for (i = 0; i < opts.extra_info.id.length; i++) {
+      conditions[opts.extra_info.id_prop[i]] = opts.extra_info.id[i];
+      conditions[opts.extra_info.assoc_prop[i]] = opts.data[opts.keys[i]];
+    }
+
+    opts.driver.update(opts.extra_info.table, data, conditions, function (err) {
+      return cb(err);
+    });
+  };
+  var removeInstance = function (cb) {
+    if (opts.is_new) {
+      return cb(null);
+    }
+
+    var conditions = {};
+    for (var i = 0; i < opts.keys.length; i++) {
+        conditions[opts.keys[i]] = opts.data[opts.keys[i]];
+    }
+
+    Hook.wait(instance, opts.hooks.beforeRemove, function (err) {
+      if (err) {
+        emitEvent("remove", err, instance);
+        if (typeof cb === "function") {
+          cb(err, instance);
+        }
+        return;
+      }
+
+      emitEvent("beforeRemove", instance);
+
+      opts.driver.remove(opts.table, conditions, function (err, data) {
+        Hook.trigger(instance, opts.hooks.afterRemove, !err);
+
+        emitEvent("remove", err, instance);
+
+        if (typeof cb === "function") {
+          cb(err, instance);
+        }
+
+        instance = undefined;
+      });
+    });
+  };
+  var saveInstanceProperty = function (key, value) {
+    var changes = {}, conditions = {};
+    changes[key] = value;
+
+    if (Model.properties[key]) {
+      if (opts.driver.propertyToValue) {
+        changes[key] = opts.driver.propertyToValue(changes[key], Model.properties[key]);
+      }
+    }
+
+    for (var i = 0; i < opts.keys.length; i++) {
+      conditions[opts.keys[i]] = opts.data[opts.keys[i]];
+    }
+
+    Hook.wait(instance, opts.hooks.beforeSave, function (err) {
+      if (err) {
+        Hook.trigger(instance, opts.hooks.afterSave, false);
+        emitEvent("save", err, instance);
+        return;
+      }
+
+      opts.driver.update(opts.table, changes, conditions, function (err) {
+        if (!err) {
+          opts.data[key] = value;
+        }
+        Hook.trigger(instance, opts.hooks.afterSave, !err);
+        emitEvent("save", err, instance);
+      });
+    });
+  };
+  var setInstanceProperty = function (key, value) {
+    var prop = Model.allProperties[key] || opts.extra[key];
+
+    if (prop) {
+      if ('valueToProperty' in opts.driver) {
+        value = opts.driver.valueToProperty(value, prop);
+      }
+      if (opts.data[key] !== value) {
+        opts.data[key] = value;
+        return true;
+      }
+    }
+    return false;
+  }
+
+  // ('data.a.b', 5) => opts.data.a.b = 5
+  var setPropertyByPath = function (path, value) {
+    if (typeof path == 'string') {
+      path = path.split('.');
+    } else if (!Array.isArray(path)) {
+      return;
+    }
+
+    var propName = path.shift();
+    var prop = Model.allProperties[propName] || opts.extra[propName];
+    var currKey, currObj;
+
+    if (!prop) {
+      return;
+    }
+    if (path.length == 0) {
+      instance[propName] = value;
+      return;
+    }
+    currObj = instance[propName];
+
+    while(currObj && path.length > 0 ) {
+      currKey = path.shift();
+
+      if (path.length > 0) {
+        currObj = currObj[currKey];
+      } else if (currObj[currKey] !== value) {
+        currObj[currKey] = value;
+        opts.changes.push(propName);
+      }
+    }
+  }
+
+  var addInstanceProperty = function (key) {
+    var defaultValue = null;
+    var prop = Model.allProperties[key];
+
+    // This code was first added, and then commented out in a later commit.
+    // Its presence doesn't affect tests, so I'm just gonna log if it ever gets called.
+    // If someone complains about noise, we know it does something, and figure it out then.
+    if (instance.hasOwnProperty(key)) console.log("Overwriting instance property");
+
+    if (key in opts.data) {
+      defaultValue = opts.data[key];
+    } else if (prop && 'defaultValue' in prop) {
+      defaultValue = prop.defaultValue;
+    }
+
+    setInstanceProperty(key, defaultValue);
+
+    Object.defineProperty(instance, key, {
+      get: function () {
+        return opts.data[key];
+      },
+      set: function (val) {
+        if (prop.key === true) {
+          if (prop.type == 'serial' && opts.data[key] != null) {
+            return;
+          } else {
+            opts.originalKeyValues[prop.name] = opts.data[prop.name];
+          }
+        }
+
+        if (!setInstanceProperty(key, val)) {
+          return;
+        }
+
+        if (opts.autoSave) {
+          saveInstanceProperty(key, val);
+        } else if (opts.changes.indexOf(key) === -1) {
+          opts.changes.push(key);
+        }
+      },
+      enumerable: !(prop && !prop.enumerable)
+    });
+  };
+  var addInstanceExtraProperty = function (key) {
+    if (!instance.hasOwnProperty("extra")) {
+      instance.extra = {};
+    }
+    Object.defineProperty(instance.extra, key, {
+      get: function () {
+        return opts.data[key];
+      },
+      set: function (val) {
+        setInstanceProperty(key, val);
+
+        /*if (opts.autoSave) {
+          saveInstanceProperty(key, val);
+        }*/if (opts.extrachanges.indexOf(key) === -1) {
+          opts.extrachanges.push(key);
+        }
+      },
+      enumerable: true
+    });
+  };
+
+  var i, k;
+
+  for (k in Model.allProperties) {
+    addInstanceProperty(k);
+  }
+  for (k in opts.extra) {
+    addInstanceProperty(k);
+  }
+
+  for (k in opts.methods) {
+    Object.defineProperty(instance, k, {
+      value      : opts.methods[k].bind(instance),
+      enumerable : false,
+      writable  : true
+    });
+  }
+
+  for (k in opts.extra) {
+    addInstanceExtraProperty(k);
+  }
+
+  Object.defineProperty(instance, "on", {
+    value: function (event, cb) {
+      if (!events.hasOwnProperty(event)) {
+        events[event] = [];
+      }
+      events[event].push(cb);
+
+      return this;
+    },
+    enumerable: false,
+    writable: true
+  });
+  Object.defineProperty(instance, "save", {
+    value: function () {
+      var arg = null, objCount = 0;
+      var data = {}, saveOptions = {}, cb = null;
+
+      while (arguments.length > 0) {
+        arg = Array.prototype.shift.call(arguments);
+
+        switch (typeof arg) {
+          case 'object':
+            switch (objCount) {
+              case 0:
+                data = arg;
+                break;
+              case 1:
+                saveOptions = arg;
+                break;
+            }
+            objCount++;
+            break;
+          case 'function':
+            cb = arg;
+            break;
+          default:
+              var err = new Error("Unknown parameter type '" + (typeof arg) + "' in Instance.save()");
+              err.model = Model.table;
+              throw err;
+        }
+      }
+
+      for (var k in data) {
+        if (data.hasOwnProperty(k)) {
+          this[k] = data[k];
+        }
+      }
+
+      saveInstance(saveOptions, function (err) {
+        if (!cb) return;
+        if (err) return cb(err);
+
+        return cb(null, instance);
+      });
+
+      return this;
+    },
+    enumerable: false,
+    writable: true
+  });
+  Object.defineProperty(instance, "saved", {
+    value: function () {
+      return opts.changes.length === 0;
+    },
+    enumerable: false,
+    writable: true
+  });
+  Object.defineProperty(instance, "remove", {
+    value: function (cb) {
+      removeInstance(cb);
+
+      return this;
+    },
+    enumerable: false,
+    writable: true
+  });
+  Object.defineProperty(instance, "set", {
+    value: setPropertyByPath,
+    enumerable: false,
+    writable: true
+  });
+  Object.defineProperty(instance, "markAsDirty", {
+    value: function (propName) {
+      if (propName != undefined) {
+        opts.changes.push(propName);
+      }
+    },
+    enumerable: false,
+    writable: true
+  });
+  Object.defineProperty(instance, "dirtyProperties", {
+    get: function () { return opts.changes; },
+    enumerable: false
+  });
+  Object.defineProperty(instance, "isInstance", {
+    value: true,
+    enumerable: false
+  });
+  Object.defineProperty(instance, "isPersisted", {
+    value: function () {
+      return !opts.is_new;
+    },
+    enumerable: false,
+    writable: true
+  });
+  Object.defineProperty(instance, "isShell", {
+    value: function () {
+      return opts.isShell;
+    },
+    enumerable: false
+  });
+  Object.defineProperty(instance, "validate", {
+    value: function (cb) {
+      handleValidations(function (errors) {
+        cb(null, errors || false);
+      });
+    },
+    enumerable: false,
+    writable: true
+  });
+  Object.defineProperty(instance, "__singleton_uid", {
+    value: function (cb) {
+      return opts.uid;
+    },
+    enumerable: false
+  });
+  Object.defineProperty(instance, "__opts", {
+    value: opts,
+    enumerable: false
+  });
+  Object.defineProperty(instance, "model", {
+    value: function (cb) {
+      return Model;
+    },
+    enumerable: false
+  });
+
+  for (i = 0; i < opts.keyProperties.length; i++) {
+    var prop = opts.keyProperties[i];
+
+    if (!(prop.name in opts.data)) {
+      opts.changes = Object.keys(opts.data);
+      break;
+    }
+  }
+  rememberKeys();
+
+  opts.setupAssociations(instance);
+
+  for (i = 0; i < opts.one_associations.length; i++) {
+    var asc = opts.one_associations[i];
+
+    if (!asc.reversed && !asc.extension) {
+      for (k in asc.field) {
+        if (!opts.data.hasOwnProperty(k)) {
+          addInstanceProperty(k);
+        }
+      }
+    }
+
+    if (asc.name in opts.data) {
+      var d = opts.data[asc.name];
+      var mapper = function (obj) {
+        return obj.isInstance ? obj : new asc.model(obj);
+      };
+
+      if (Array.isArray(d)) {
+        instance[asc.name] = d.map(mapper);
+      } else {
+        instance[asc.name] = mapper(d);
+      }
+      delete opts.data[asc.name];
+    }
+  }
+  for (i = 0; i < opts.many_associations.length; i++) {
+    var aName = opts.many_associations[i].name;
+    opts.associations[aName] = {
+      changed: false, data: opts.many_associations[i]
+    };
+
+    if (Array.isArray(opts.data[aName])) {
+      instance[aName] = opts.data[aName];
+      delete opts.data[aName];
+    }
+  }
+
+  Hook.wait(instance, opts.hooks.afterLoad, function (err) {
+    process.nextTick(function () {
+      emitEvent("ready", err);
+    });
+  });
+
+  return instance;
 }
diff --git a/lib/LazyLoad.js b/lib/LazyLoad.js
index cd4c7a58..48af3780 100644
--- a/lib/LazyLoad.js
+++ b/lib/LazyLoad.js
@@ -1,73 +1,73 @@
 exports.extend = function (Instance, Model, properties) {
-	for (var k in properties) {
-		if (properties[k].lazyload === true) {
-			addLazyLoadProperty(properties[k].lazyname || k, Instance, Model, k);
-		}
-	}
+  for (var k in properties) {
+    if (properties[k].lazyload === true) {
+      addLazyLoadProperty(properties[k].lazyname || k, Instance, Model, k);
+    }
+  }
 };
 
 function addLazyLoadProperty(name, Instance, Model, property) {
-	var method = ucfirst(name);
+  var method = ucfirst(name);
 
-	Object.defineProperty(Instance, "get" + method, {
-		value: function (cb) {
-			var conditions = {};
-			conditions[Model.id] = Instance[Model.id];
+  Object.defineProperty(Instance, "get" + method, {
+    value: function (cb) {
+      var conditions = {};
+      conditions[Model.id] = Instance[Model.id];
 
-			Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
-				return cb(err, item ? item[property] : null);
-			});
+      Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
+        return cb(err, item ? item[property] : null);
+      });
 
-			return this;
-		},
-		enumerable: false
-	});
-	Object.defineProperty(Instance, "remove" + method, {
-		value: function (cb) {
-			var conditions = {};
-			conditions[Model.id] = Instance[Model.id];
+      return this;
+    },
+    enumerable: false
+  });
+  Object.defineProperty(Instance, "remove" + method, {
+    value: function (cb) {
+      var conditions = {};
+      conditions[Model.id] = Instance[Model.id];
 
-			Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
-				if (err) {
-					return cb(err);
-				}
-				if (!item) {
-					return cb(null);
-				}
+      Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
+        if (err) {
+          return cb(err);
+        }
+        if (!item) {
+          return cb(null);
+        }
 
-				item[property] = null;
+        item[property] = null;
 
-				return item.save(cb);
-			});
+        return item.save(cb);
+      });
 
-			return this;
-		},
-		enumerable: false
-	});
-	Object.defineProperty(Instance, "set" + method, {
-		value: function (data, cb) {
-			var conditions = {};
-			conditions[Model.id] = Instance[Model.id];
+      return this;
+    },
+    enumerable: false
+  });
+  Object.defineProperty(Instance, "set" + method, {
+    value: function (data, cb) {
+      var conditions = {};
+      conditions[Model.id] = Instance[Model.id];
 
-			Model.find(conditions, { identityCache: false }).first(function (err, item) {
-				if (err) {
-					return cb(err);
-				}
-				if (!item) {
-					return cb(null);
-				}
+      Model.find(conditions, { identityCache: false }).first(function (err, item) {
+        if (err) {
+          return cb(err);
+        }
+        if (!item) {
+          return cb(null);
+        }
 
-				item[property] = data;
+        item[property] = data;
 
-				return item.save(cb);
-			});
+        return item.save(cb);
+      });
 
-			return this;
-		},
-		enumerable: false
-	});
+      return this;
+    },
+    enumerable: false
+  });
 }
 
 function ucfirst(text) {
-	return text[0].toUpperCase() + text.substr(1).toLowerCase();
+  return text[0].toUpperCase() + text.substr(1).toLowerCase();
 }
diff --git a/lib/Model.js b/lib/Model.js
index 55eeefb1..698d93a6 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -13,726 +13,726 @@ var Validators        = require("./Validators");
 var ORMError          = require("./Error");
 var Hook              = require("./Hook");
 var AvailableHooks    = [
-	"beforeCreate", "afterCreate",
-	"beforeSave", "afterSave",
-	"beforeValidation",
-	"beforeRemove", "afterRemove",
-	"afterLoad",
-	"afterAutoFetch"
+  "beforeCreate", "afterCreate",
+  "beforeSave", "afterSave",
+  "beforeValidation",
+  "beforeRemove", "afterRemove",
+  "afterLoad",
+  "afterAutoFetch"
 ];
 
 exports.Model = Model;
 
 function Model(opts) {
-	opts = _.defaults(opts || {}, {
-		keys: []
-	});
-	opts.keys = Array.isArray(opts.keys) ? opts.keys : [opts.keys];
-
-	var one_associations       = [];
-	var many_associations      = [];
-	var extend_associations    = [];
-	var association_properties = [];
-	var model_fields           = [];
-	var fieldToPropertyMap     = {};
-	var allProperties          = {};
-	var keyProperties          = [];
-
-	var createHookHelper = function (hook) {
-		return function (cb) {
-			if (typeof cb !== "function") {
-				delete opts.hooks[hook];
-			} else {
-				opts.hooks[hook] = cb;
-			}
-			return this;
-		};
-	};
-	var createInstance = function (data, inst_opts, cb) {
-		if (!inst_opts) {
-			inst_opts = {};
-		}
-
-		var found_assoc = false, i, k;
-
-		for (k in data) {
-			if (k === "extra_field") continue;
-			if (opts.properties.hasOwnProperty(k)) continue;
-			if (inst_opts.extra && inst_opts.extra.hasOwnProperty(k)) continue;
-			if (opts.keys.indexOf(k) >= 0) continue;
-			if (association_properties.indexOf(k) >= 0) continue;
-
-			for (i = 0; i < one_associations.length; i++) {
-				if (one_associations[i].name === k) {
-					found_assoc = true;
-					break;
-				}
-			}
-			if (!found_assoc) {
-				for (i = 0; i < many_associations.length; i++) {
-					if (many_associations[i].name === k) {
-						found_assoc = true;
-						break;
-					}
-				}
-			}
-			if (!found_assoc) {
-				delete data[k];
-			}
-		}
-
-		var assoc_opts = {
-			autoFetch      : inst_opts.autoFetch || false,
-			autoFetchLimit : inst_opts.autoFetchLimit,
-			cascadeRemove  : inst_opts.cascadeRemove
-		};
-
-		var setupAssociations = function (instance) {
-			OneAssociation.extend(model, instance, opts.driver, one_associations, assoc_opts);
-			ManyAssociation.extend(model, instance, opts.driver, many_associations, assoc_opts, createInstance);
-			ExtendAssociation.extend(model, instance, opts.driver, extend_associations, assoc_opts);
-		};
-
-		var pending  = 2, create_err = null;
-		var instance = new Instance(model, {
-			uid                    : inst_opts.uid, // singleton unique id
-			keys                   : opts.keys,
-			is_new                 : inst_opts.is_new || false,
-			isShell                : inst_opts.isShell || false,
-			data                   : data,
-			autoSave               : inst_opts.autoSave || false,
-			extra                  : inst_opts.extra,
-			extra_info             : inst_opts.extra_info,
-			driver                 : opts.driver,
-			table                  : opts.table,
-			hooks                  : opts.hooks,
-			methods                : opts.methods,
-			validations            : opts.validations,
-			one_associations       : one_associations,
-			many_associations      : many_associations,
-			extend_associations    : extend_associations,
-			association_properties : association_properties,
-			setupAssociations      : setupAssociations,
-			fieldToPropertyMap     : fieldToPropertyMap,
-			keyProperties          : keyProperties
-		});
-		instance.on("ready", function (err) {
-			if (--pending > 0) {
-				create_err = err;
-				return;
-			}
-			if (typeof cb === "function") {
-				return cb(err || create_err, instance);
-			}
-		});
-		if (model_fields !== null) {
-			LazyLoad.extend(instance, model, opts.properties);
-		}
-
-		OneAssociation.autoFetch(instance, one_associations, assoc_opts, function () {
-			ManyAssociation.autoFetch(instance, many_associations, assoc_opts, function () {
-				ExtendAssociation.autoFetch(instance, extend_associations, assoc_opts, function () {
-					Hook.wait(instance, opts.hooks.afterAutoFetch, function (err) {
-						if (--pending > 0) {
-							create_err = err;
-							return;
-						}
-						if (typeof cb === "function") {
-							return cb(err || create_err, instance);
-						}
-					});
-				});
-			});
-		});
-		return instance;
-	};
-
-	var model = function () {
-	    var instance, i;
-
-	    var data = arguments.length > 1 ? arguments : arguments[0];
-
-	    if (Array.isArray(opts.keys) && Array.isArray(data)) {
-	        if (data.length == opts.keys.length) {
-	            var data2 = {};
-	            for (i = 0; i < opts.keys.length; i++) {
-	                data2[opts.keys[i]] = data[i++];
-	            }
-
-	            return createInstance(data2, { isShell: true });
-	        }
-	        else {
-	            var err = new Error('Model requires ' + opts.keys.length + ' keys, only ' + data.length + ' were provided');
-	            err.model = opts.table;
-
-	            throw err;
-	        }
-	    }
-	    else if (typeof data === "number" || typeof data === "string") {
-	        var data2 = {};
-	        data2[opts.keys[0]] = data;
-
-	        return createInstance(data2, { isShell: true });
-	    } else if (typeof data === "undefined") {
-	        data = {};
-	    }
-
-	    var isNew = false;
-
-	    for (i = 0; i < opts.keys.length; i++) {
-	        if (!data.hasOwnProperty(opts.keys[i])) {
-	            isNew = true;
-	            break;
-	        }
-	    }
+  opts = _.defaults(opts || {}, {
+    keys: []
+  });
+  opts.keys = Array.isArray(opts.keys) ? opts.keys : [opts.keys];
+
+  var one_associations       = [];
+  var many_associations      = [];
+  var extend_associations    = [];
+  var association_properties = [];
+  var model_fields           = [];
+  var fieldToPropertyMap     = {};
+  var allProperties          = {};
+  var keyProperties          = [];
+
+  var createHookHelper = function (hook) {
+    return function (cb) {
+      if (typeof cb !== "function") {
+        delete opts.hooks[hook];
+      } else {
+        opts.hooks[hook] = cb;
+      }
+      return this;
+    };
+  };
+  var createInstance = function (data, inst_opts, cb) {
+    if (!inst_opts) {
+      inst_opts = {};
+    }
+
+    var found_assoc = false, i, k;
+
+    for (k in data) {
+      if (k === "extra_field") continue;
+      if (opts.properties.hasOwnProperty(k)) continue;
+      if (inst_opts.extra && inst_opts.extra.hasOwnProperty(k)) continue;
+      if (opts.keys.indexOf(k) >= 0) continue;
+      if (association_properties.indexOf(k) >= 0) continue;
+
+      for (i = 0; i < one_associations.length; i++) {
+        if (one_associations[i].name === k) {
+          found_assoc = true;
+          break;
+        }
+      }
+      if (!found_assoc) {
+        for (i = 0; i < many_associations.length; i++) {
+          if (many_associations[i].name === k) {
+            found_assoc = true;
+            break;
+          }
+        }
+      }
+      if (!found_assoc) {
+        delete data[k];
+      }
+    }
+
+    var assoc_opts = {
+      autoFetch      : inst_opts.autoFetch || false,
+      autoFetchLimit : inst_opts.autoFetchLimit,
+      cascadeRemove  : inst_opts.cascadeRemove
+    };
+
+    var setupAssociations = function (instance) {
+      OneAssociation.extend(model, instance, opts.driver, one_associations, assoc_opts);
+      ManyAssociation.extend(model, instance, opts.driver, many_associations, assoc_opts, createInstance);
+      ExtendAssociation.extend(model, instance, opts.driver, extend_associations, assoc_opts);
+    };
+
+    var pending  = 2, create_err = null;
+    var instance = new Instance(model, {
+      uid                    : inst_opts.uid, // singleton unique id
+      keys                   : opts.keys,
+      is_new                 : inst_opts.is_new || false,
+      isShell                : inst_opts.isShell || false,
+      data                   : data,
+      autoSave               : inst_opts.autoSave || false,
+      extra                  : inst_opts.extra,
+      extra_info             : inst_opts.extra_info,
+      driver                 : opts.driver,
+      table                  : opts.table,
+      hooks                  : opts.hooks,
+      methods                : opts.methods,
+      validations            : opts.validations,
+      one_associations       : one_associations,
+      many_associations      : many_associations,
+      extend_associations    : extend_associations,
+      association_properties : association_properties,
+      setupAssociations      : setupAssociations,
+      fieldToPropertyMap     : fieldToPropertyMap,
+      keyProperties          : keyProperties
+    });
+    instance.on("ready", function (err) {
+      if (--pending > 0) {
+        create_err = err;
+        return;
+      }
+      if (typeof cb === "function") {
+        return cb(err || create_err, instance);
+      }
+    });
+    if (model_fields !== null) {
+      LazyLoad.extend(instance, model, opts.properties);
+    }
+
+    OneAssociation.autoFetch(instance, one_associations, assoc_opts, function () {
+      ManyAssociation.autoFetch(instance, many_associations, assoc_opts, function () {
+        ExtendAssociation.autoFetch(instance, extend_associations, assoc_opts, function () {
+          Hook.wait(instance, opts.hooks.afterAutoFetch, function (err) {
+            if (--pending > 0) {
+              create_err = err;
+              return;
+            }
+            if (typeof cb === "function") {
+              return cb(err || create_err, instance);
+            }
+          });
+        });
+      });
+    });
+    return instance;
+  };
+
+  var model = function () {
+      var instance, i;
+
+      var data = arguments.length > 1 ? arguments : arguments[0];
+
+      if (Array.isArray(opts.keys) && Array.isArray(data)) {
+          if (data.length == opts.keys.length) {
+              var data2 = {};
+              for (i = 0; i < opts.keys.length; i++) {
+                  data2[opts.keys[i]] = data[i++];
+              }
+
+              return createInstance(data2, { isShell: true });
+          }
+          else {
+              var err = new Error('Model requires ' + opts.keys.length + ' keys, only ' + data.length + ' were provided');
+              err.model = opts.table;
+
+              throw err;
+          }
+      }
+      else if (typeof data === "number" || typeof data === "string") {
+          var data2 = {};
+          data2[opts.keys[0]] = data;
+
+          return createInstance(data2, { isShell: true });
+      } else if (typeof data === "undefined") {
+          data = {};
+      }
+
+      var isNew = false;
+
+      for (i = 0; i < opts.keys.length; i++) {
+          if (!data.hasOwnProperty(opts.keys[i])) {
+              isNew = true;
+              break;
+          }
+      }
 
       if (keyProperties.length != 1 || (keyProperties.length == 1 && keyProperties[0].type != 'serial')) {
         isNew = true;
       }
 
-	    return createInstance(data, {
-	        is_new: isNew,
-	        autoSave: opts.autoSave,
-	        cascadeRemove: opts.cascadeRemove
-	    });
-	};
-
-	model.allProperties = allProperties;
-	model.properties    = opts.properties;
-	model.settings      = opts.settings;
-	model.keys          = opts.keys;
-
-	model.drop = function (cb) {
-		if (arguments.length === 0) {
-			cb = function () {};
-		}
-		if (typeof opts.driver.drop === "function") {
-			opts.driver.drop({
-				table             : opts.table,
-				properties        : opts.properties,
-				one_associations  : one_associations,
-				many_associations : many_associations
-			}, cb);
-
-			return this;
-		}
-
-		return cb(new ORMError("Driver does not support Model.drop()", 'NO_SUPPORT', { model: opts.table }));
-	};
-
-	model.sync = function (cb) {
-		if (arguments.length === 0) {
-			cb = function () {};
-		}
-		if (typeof opts.driver.sync === "function") {
-			try {
-				opts.driver.sync({
-					extension           : opts.extension,
-					id                  : opts.keys,
-					table               : opts.table,
-					properties          : opts.properties,
-					allProperties       : allProperties,
-					indexes             : opts.indexes || [],
-					customTypes         : opts.db.customTypes,
-					one_associations    : one_associations,
-					many_associations   : many_associations,
-					extend_associations : extend_associations
-				}, cb);
-			} catch (e) {
-				return cb(e);
-			}
-
-			return this;
-		}
-
-		return cb(new ORMError("Driver does not support Model.sync()", 'NO_SUPPORT', { model: opts.table }));
-	};
-
-	model.get = function () {
-		var conditions = {};
-		var options    = {};
-		var ids        = Array.prototype.slice.apply(arguments);
-		var cb         = ids.pop();
-		var prop;
-
-		if (typeof cb !== "function") {
-		    throw new ORMError("Missing Model.get() callback", 'MISSING_CALLBACK', { model: opts.table });
-		}
-
-		if (typeof ids[ids.length - 1] === "object" && !Array.isArray(ids[ids.length - 1])) {
-			options = ids.pop();
-		}
-
-		if (ids.length === 1 && Array.isArray(ids[0])) {
-			ids = ids[0];
-		}
-
-		if (ids.length !== opts.keys.length) {
-		    throw new ORMError("Model.get() IDs number mismatch (" + opts.keys.length + " needed, " + ids.length + " passed)", 'PARAM_MISMATCH', { model: opts.table });
-		}
-
-		for (var i = 0; i < keyProperties.length; i++) {
-			prop = keyProperties[i];
-			conditions[prop.mapsTo] = ids[i];
-		}
-
-		if (!options.hasOwnProperty("autoFetch")) {
-			options.autoFetch = opts.autoFetch;
-		}
-		if (!options.hasOwnProperty("autoFetchLimit")) {
-			options.autoFetchLimit = opts.autoFetchLimit;
-		}
-		if (!options.hasOwnProperty("cascadeRemove")) {
-			options.cascadeRemove = opts.cascadeRemove;
-		}
-
-		opts.driver.find(model_fields, opts.table, conditions, { limit: 1 }, function (err, data) {
-			if (err) {
-				return cb(new ORMError(err.message, 'QUERY_ERROR', { originalCode: err.code }));
-			}
-			if (data.length === 0) {
-				return cb(new ORMError("Not found", 'NOT_FOUND', { model: opts.table }));
-			}
-
-			Utilities.renameDatastoreFieldsToPropertyNames(data[0], fieldToPropertyMap);
-
-			var uid = opts.driver.uid + "/" + opts.table + "/" + ids.join("/");
-
-			Singleton.get(uid, {
-				identityCache : (options.hasOwnProperty("identityCache") ? options.identityCache : opts.identityCache),
-				saveCheck     : opts.settings.get("instance.identityCacheSaveCheck")
-			}, function (cb) {
-				return createInstance(data[0], {
-					uid            : uid,
-					autoSave       : options.autoSave,
-					autoFetch      : (options.autoFetchLimit === 0 ? false : options.autoFetch),
-					autoFetchLimit : options.autoFetchLimit,
-					cascadeRemove  : options.cascadeRemove
-				}, cb);
-			}, cb);
-		});
-
-		return this;
-	};
-
-	model.find = function () {
-		var options    = {};
-		var conditions = null;
-		var cb         = null;
-		var order      = null;
-		var merge      = null;
-
-		for (var i = 0; i < arguments.length; i++) {
-			switch (typeof arguments[i]) {
-				case "number":
-					options.limit = arguments[i];
-					break;
-				case "object":
-					if (Array.isArray(arguments[i])) {
-						if (arguments[i].length > 0) {
-							order = arguments[i];
-						}
-					} else {
-						if (conditions === null) {
-							conditions = arguments[i];
-						} else {
-							if (options.hasOwnProperty("limit")) {
-								arguments[i].limit = options.limit;
-							}
-							options = arguments[i];
-
-							if (options.hasOwnProperty("__merge")) {
-								merge = options.__merge;
-								merge.select = Object.keys(options.extra);
-								delete options.__merge;
-							}
-							if (options.hasOwnProperty("order")) {
-								order = options.order;
-								delete options.order;
-							}
-						}
-					}
-					break;
-				case "function":
-					cb = arguments[i];
-					break;
-				case "string":
-					if (arguments[i][0] === "-") {
-						order = [ arguments[i].substr(1), "Z" ];
-					} else {
-						order = [ arguments[i] ];
-					}
-					break;
-			}
-		}
-
-		if (!options.hasOwnProperty("identityCache")) {
-			options.identityCache = opts.identityCache;
-		}
-		if (!options.hasOwnProperty("autoFetchLimit")) {
-			options.autoFetchLimit = opts.autoFetchLimit;
-		}
-		if (!options.hasOwnProperty("cascadeRemove")) {
-			options.cascadeRemove = opts.cascadeRemove;
-		}
-
-		if (order) {
-			order = Utilities.standardizeOrder(order);
-		}
-		if (conditions) {
-			conditions = Utilities.checkConditions(conditions, one_associations);
-		}
-
-		var chain = new ChainFind(model, {
-			only         : options.only || model_fields,
-			keys         : opts.keys,
-			table        : opts.table,
-			driver       : opts.driver,
-			conditions   : conditions,
-			associations : many_associations,
-			limit        : options.limit,
-			order        : order,
-			merge        : merge,
-			offset       : options.offset,
-			properties   : allProperties,
-			keyProperties: keyProperties,
-			newInstance  : function (data, cb) {
-				// We need to do the rename before we construct the UID & do the cache lookup
-				// because the cache is loaded using propertyName rather than fieldName
-				Utilities.renameDatastoreFieldsToPropertyNames(data, fieldToPropertyMap);
-
-				// Construct UID
-				var uid = opts.driver.uid + "/" + opts.table + (merge ? "+" + merge.from.table : "");
-				for (var i = 0; i < opts.keys.length; i++) {
-					uid += "/" + data[opts.keys[i]];
-				}
-
-				// Now we can do the cache lookup
-				Singleton.get(uid, {
-					identityCache : options.identityCache,
-					saveCheck     : opts.settings.get("instance.identityCacheSaveCheck")
-				}, function (cb) {
-					return createInstance(data, {
-						uid            : uid,
-						autoSave       : opts.autoSave,
-						autoFetch      : (options.autoFetchLimit === 0 ? false : (options.autoFetch || opts.autoFetch)),
-						autoFetchLimit : options.autoFetchLimit,
-						cascadeRemove  : options.cascadeRemove,
-						extra          : options.extra,
-						extra_info     : options.extra_info
-					}, cb);
-				}, cb);
-			}
-		});
-
-		if (typeof cb !== "function") {
-			return chain;
-		} else {
-			chain.run(cb);
-			return this;
-		}
-	};
-
-	model.where = model.all = model.find;
-
-	model.one = function () {
-		var args = Array.prototype.slice.apply(arguments);
-		var cb   = null;
-
-		// extract callback
-		for (var i = 0; i < args.length; i++) {
-			if (typeof args[i] === "function") {
-				cb = args.splice(i, 1)[0];
-				break;
-			}
-		}
-
-		if (cb === null) {
-		    throw new ORMError("Missing Model.one() callback", 'MISSING_CALLBACK', { model: opts.table });
-		}
-
-		// add limit 1
-		args.push(1);
-		args.push(function (err, results) {
-			if (err) {
-				return cb(err);
-			}
-			return cb(null, results.length ? results[0] : null);
-		});
-
-		return this.find.apply(this, args);
-	};
-
-	model.count = function () {
-		var conditions = null;
-		var cb         = null;
-
-		for (var i = 0; i < arguments.length; i++) {
-			switch (typeof arguments[i]) {
-				case "object":
-					conditions = arguments[i];
-					break;
-				case "function":
-					cb = arguments[i];
-					break;
-			}
-		}
-
-		if (typeof cb !== "function") {
-		    throw new ORMError('MISSING_CALLBACK', "Missing Model.count() callback", { model: opts.table });
-		}
-
-		if (conditions) {
-			conditions = Utilities.checkConditions(conditions, one_associations);
-		}
-
-		opts.driver.count(opts.table, conditions, {}, function (err, data) {
-			if (err || data.length === 0) {
-				return cb(err);
-			}
-			return cb(null, data[0].c);
-		});
-		return this;
-	};
-
-	model.aggregate = function () {
-		var conditions = {};
-		var propertyList = [];
-
-		for (var i = 0; i < arguments.length; i++) {
-			if (typeof arguments[i] === "object") {
-				if (Array.isArray(arguments[i])) {
-					propertyList = arguments[i];
-				} else {
-					conditions = arguments[i];
-				}
-			}
-		}
-
-		if (conditions) {
-			conditions = Utilities.checkConditions(conditions, one_associations);
-		}
-
-		return new require("./AggregateFunctions")({
-			table        : opts.table,
-			driver_name  : opts.driver_name,
-			driver       : opts.driver,
-			conditions   : conditions,
-			propertyList : propertyList,
-			properties   : allProperties
-		});
-	};
-
-	model.exists = function () {
-		var ids = Array.prototype.slice.apply(arguments);
-		var cb  = ids.pop();
-
-		if (typeof cb !== "function") {
-		    throw new ORMError("Missing Model.exists() callback", 'MISSING_CALLBACK', { model: opts.table });
-		}
-
-		var conditions = {}, i;
-
-		if (ids.length === 1 && typeof ids[0] === "object") {
-			if (Array.isArray(ids[0])) {
-				for (i = 0; i < opts.keys.length; i++) {
-					conditions[opts.keys[i]] = ids[0][i];
-				}
-			} else {
-				conditions = ids[0];
-			}
-		} else {
-			for (i = 0; i < opts.keys.length; i++) {
-				conditions[opts.keys[i]] = ids[i];
-			}
-		}
-
-		if (conditions) {
-			conditions = Utilities.checkConditions(conditions, one_associations);
-		}
-
-		opts.driver.count(opts.table, conditions, {}, function (err, data) {
-			if (err || data.length === 0) {
-				return cb(err);
-			}
-			return cb(null, data[0].c > 0);
-		});
-		return this;
-	};
-
-	model.create = function () {
-		var itemsParams = []
-		var items       = [];
-		var options     = {};
-		var done        = null;
-		var single      = false;
-
-		for (var i = 0; i < arguments.length; i++) {
-			switch (typeof arguments[i]) {
-				case "object":
-					if ( !single && Array.isArray(arguments[i]) ) {
-						itemsParams = itemsParams.concat(arguments[i]);
-					} else if (i === 0) {
-						single = true;
-						itemsParams.push(arguments[i]);
-					} else {
-						options = arguments[i];
-					}
-					break;
-				case "function":
-					done = arguments[i];
-					break;
-			}
-		}
-
-		var iterator = function (params, index, cb) {
-			createInstance(params, {
-				is_new    : true,
-				autoSave  : opts.autoSave,
-				autoFetch : false
-			}, function (err, item) {
-				if (err) {
-					err.index    = index;
-					err.instance = item;
-
-					return cb(err);
-				}
-				item.save(function (err) {
-					if (err) {
-						err.index    = index;
-						err.instance = item;
-
-						return cb(err);
-					}
-
-					items[index] = item;
-					cb();
-				});
-			});
-		};
-
-		async.eachOfSeries(itemsParams, iterator, function (err) {
-			if (err) return done(err);
-			done(null, single ? items[0] : items);
-		});
-
-		return this;
-	};
-
-	model.clear = function (cb) {
-		opts.driver.clear(opts.table, function (err) {
-			if (typeof cb === "function") cb(err);
-		});
-
-		return this;
-	};
-
-	model.prependValidation = function (key, validation) {
-		if(opts.validations.hasOwnProperty(key)) {
-			opts.validations[key].splice(0, 0, validation);
-		} else {
-			opts.validations[key] = [validation];
-		}
-	};
-
-	var currFields = {};
-
-	model.addProperty = function (propIn, options) {
-		var cType;
-		var prop = Property.normalize({
-			prop: propIn, name: (options && options.name || propIn.name),
-			customTypes: opts.db.customTypes, settings: opts.settings
-		});
-
-		// Maintains backwards compatibility
-		if (opts.keys.indexOf(k) != -1) {
-			prop.key = true;
-		} else if (prop.key) {
-			opts.keys.push(k);
-		}
-
-		if (options && options.klass) {
-			prop.klass = options.klass;
-		}
-
-		switch (prop.klass) {
-			case 'primary':
-				opts.properties[prop.name]  = prop;
-				break;
-			case 'hasOne':
-				association_properties.push(prop.name)
-				break;
-		}
-
-		allProperties[prop.name]        = prop;
-		fieldToPropertyMap[prop.mapsTo] = prop;
-
-		if (prop.required) {
-			model.prependValidation(prop.name, Validators.required());
-		}
-
-		if (prop.key && prop.klass == 'primary') {
-			keyProperties.push(prop);
-		}
-
-		if (prop.lazyload !== true && !currFields[prop.name]) {
-			currFields[prop.name] = true;
-			if ((cType = opts.db.customTypes[prop.type]) && cType.datastoreGet) {
-				model_fields.push({
-					a: prop.mapsTo, sql: cType.datastoreGet(prop, opts.db.driver.query)
-				});
-			} else {
-				model_fields.push(prop.mapsTo);
-			}
-		}
-
-		return prop;
-	};
-
-	Object.defineProperty(model, "table", {
-		value: opts.table,
-		enumerable: false
-	});
-	Object.defineProperty(model, "id", {
-		value: opts.keys,
-		enumerable: false
-	});
-	Object.defineProperty(model, "uid", {
-	    value: opts.driver.uid + "/" + opts.table + "/" + opts.keys.join("/"),
+      return createInstance(data, {
+          is_new: isNew,
+          autoSave: opts.autoSave,
+          cascadeRemove: opts.cascadeRemove
+      });
+  };
+
+  model.allProperties = allProperties;
+  model.properties    = opts.properties;
+  model.settings      = opts.settings;
+  model.keys          = opts.keys;
+
+  model.drop = function (cb) {
+    if (arguments.length === 0) {
+      cb = function () {};
+    }
+    if (typeof opts.driver.drop === "function") {
+      opts.driver.drop({
+        table             : opts.table,
+        properties        : opts.properties,
+        one_associations  : one_associations,
+        many_associations : many_associations
+      }, cb);
+
+      return this;
+    }
+
+    return cb(new ORMError("Driver does not support Model.drop()", 'NO_SUPPORT', { model: opts.table }));
+  };
+
+  model.sync = function (cb) {
+    if (arguments.length === 0) {
+      cb = function () {};
+    }
+    if (typeof opts.driver.sync === "function") {
+      try {
+        opts.driver.sync({
+          extension           : opts.extension,
+          id                  : opts.keys,
+          table               : opts.table,
+          properties          : opts.properties,
+          allProperties       : allProperties,
+          indexes             : opts.indexes || [],
+          customTypes         : opts.db.customTypes,
+          one_associations    : one_associations,
+          many_associations   : many_associations,
+          extend_associations : extend_associations
+        }, cb);
+      } catch (e) {
+        return cb(e);
+      }
+
+      return this;
+    }
+
+    return cb(new ORMError("Driver does not support Model.sync()", 'NO_SUPPORT', { model: opts.table }));
+  };
+
+  model.get = function () {
+    var conditions = {};
+    var options    = {};
+    var ids        = Array.prototype.slice.apply(arguments);
+    var cb         = ids.pop();
+    var prop;
+
+    if (typeof cb !== "function") {
+        throw new ORMError("Missing Model.get() callback", 'MISSING_CALLBACK', { model: opts.table });
+    }
+
+    if (typeof ids[ids.length - 1] === "object" && !Array.isArray(ids[ids.length - 1])) {
+      options = ids.pop();
+    }
+
+    if (ids.length === 1 && Array.isArray(ids[0])) {
+      ids = ids[0];
+    }
+
+    if (ids.length !== opts.keys.length) {
+        throw new ORMError("Model.get() IDs number mismatch (" + opts.keys.length + " needed, " + ids.length + " passed)", 'PARAM_MISMATCH', { model: opts.table });
+    }
+
+    for (var i = 0; i < keyProperties.length; i++) {
+      prop = keyProperties[i];
+      conditions[prop.mapsTo] = ids[i];
+    }
+
+    if (!options.hasOwnProperty("autoFetch")) {
+      options.autoFetch = opts.autoFetch;
+    }
+    if (!options.hasOwnProperty("autoFetchLimit")) {
+      options.autoFetchLimit = opts.autoFetchLimit;
+    }
+    if (!options.hasOwnProperty("cascadeRemove")) {
+      options.cascadeRemove = opts.cascadeRemove;
+    }
+
+    opts.driver.find(model_fields, opts.table, conditions, { limit: 1 }, function (err, data) {
+      if (err) {
+        return cb(new ORMError(err.message, 'QUERY_ERROR', { originalCode: err.code }));
+      }
+      if (data.length === 0) {
+        return cb(new ORMError("Not found", 'NOT_FOUND', { model: opts.table }));
+      }
+
+      Utilities.renameDatastoreFieldsToPropertyNames(data[0], fieldToPropertyMap);
+
+      var uid = opts.driver.uid + "/" + opts.table + "/" + ids.join("/");
+
+      Singleton.get(uid, {
+        identityCache : (options.hasOwnProperty("identityCache") ? options.identityCache : opts.identityCache),
+        saveCheck     : opts.settings.get("instance.identityCacheSaveCheck")
+      }, function (cb) {
+        return createInstance(data[0], {
+          uid            : uid,
+          autoSave       : options.autoSave,
+          autoFetch      : (options.autoFetchLimit === 0 ? false : options.autoFetch),
+          autoFetchLimit : options.autoFetchLimit,
+          cascadeRemove  : options.cascadeRemove
+        }, cb);
+      }, cb);
+    });
+
+    return this;
+  };
+
+  model.find = function () {
+    var options    = {};
+    var conditions = null;
+    var cb         = null;
+    var order      = null;
+    var merge      = null;
+
+    for (var i = 0; i < arguments.length; i++) {
+      switch (typeof arguments[i]) {
+        case "number":
+          options.limit = arguments[i];
+          break;
+        case "object":
+          if (Array.isArray(arguments[i])) {
+            if (arguments[i].length > 0) {
+              order = arguments[i];
+            }
+          } else {
+            if (conditions === null) {
+              conditions = arguments[i];
+            } else {
+              if (options.hasOwnProperty("limit")) {
+                arguments[i].limit = options.limit;
+              }
+              options = arguments[i];
+
+              if (options.hasOwnProperty("__merge")) {
+                merge = options.__merge;
+                merge.select = Object.keys(options.extra);
+                delete options.__merge;
+              }
+              if (options.hasOwnProperty("order")) {
+                order = options.order;
+                delete options.order;
+              }
+            }
+          }
+          break;
+        case "function":
+          cb = arguments[i];
+          break;
+        case "string":
+          if (arguments[i][0] === "-") {
+            order = [ arguments[i].substr(1), "Z" ];
+          } else {
+            order = [ arguments[i] ];
+          }
+          break;
+      }
+    }
+
+    if (!options.hasOwnProperty("identityCache")) {
+      options.identityCache = opts.identityCache;
+    }
+    if (!options.hasOwnProperty("autoFetchLimit")) {
+      options.autoFetchLimit = opts.autoFetchLimit;
+    }
+    if (!options.hasOwnProperty("cascadeRemove")) {
+      options.cascadeRemove = opts.cascadeRemove;
+    }
+
+    if (order) {
+      order = Utilities.standardizeOrder(order);
+    }
+    if (conditions) {
+      conditions = Utilities.checkConditions(conditions, one_associations);
+    }
+
+    var chain = new ChainFind(model, {
+      only         : options.only || model_fields,
+      keys         : opts.keys,
+      table        : opts.table,
+      driver       : opts.driver,
+      conditions   : conditions,
+      associations : many_associations,
+      limit        : options.limit,
+      order        : order,
+      merge        : merge,
+      offset       : options.offset,
+      properties   : allProperties,
+      keyProperties: keyProperties,
+      newInstance  : function (data, cb) {
+        // We need to do the rename before we construct the UID & do the cache lookup
+        // because the cache is loaded using propertyName rather than fieldName
+        Utilities.renameDatastoreFieldsToPropertyNames(data, fieldToPropertyMap);
+
+        // Construct UID
+        var uid = opts.driver.uid + "/" + opts.table + (merge ? "+" + merge.from.table : "");
+        for (var i = 0; i < opts.keys.length; i++) {
+          uid += "/" + data[opts.keys[i]];
+        }
+
+        // Now we can do the cache lookup
+        Singleton.get(uid, {
+          identityCache : options.identityCache,
+          saveCheck     : opts.settings.get("instance.identityCacheSaveCheck")
+        }, function (cb) {
+          return createInstance(data, {
+            uid            : uid,
+            autoSave       : opts.autoSave,
+            autoFetch      : (options.autoFetchLimit === 0 ? false : (options.autoFetch || opts.autoFetch)),
+            autoFetchLimit : options.autoFetchLimit,
+            cascadeRemove  : options.cascadeRemove,
+            extra          : options.extra,
+            extra_info     : options.extra_info
+          }, cb);
+        }, cb);
+      }
+    });
+
+    if (typeof cb !== "function") {
+      return chain;
+    } else {
+      chain.run(cb);
+      return this;
+    }
+  };
+
+  model.where = model.all = model.find;
+
+  model.one = function () {
+    var args = Array.prototype.slice.apply(arguments);
+    var cb   = null;
+
+    // extract callback
+    for (var i = 0; i < args.length; i++) {
+      if (typeof args[i] === "function") {
+        cb = args.splice(i, 1)[0];
+        break;
+      }
+    }
+
+    if (cb === null) {
+        throw new ORMError("Missing Model.one() callback", 'MISSING_CALLBACK', { model: opts.table });
+    }
+
+    // add limit 1
+    args.push(1);
+    args.push(function (err, results) {
+      if (err) {
+        return cb(err);
+      }
+      return cb(null, results.length ? results[0] : null);
+    });
+
+    return this.find.apply(this, args);
+  };
+
+  model.count = function () {
+    var conditions = null;
+    var cb         = null;
+
+    for (var i = 0; i < arguments.length; i++) {
+      switch (typeof arguments[i]) {
+        case "object":
+          conditions = arguments[i];
+          break;
+        case "function":
+          cb = arguments[i];
+          break;
+      }
+    }
+
+    if (typeof cb !== "function") {
+        throw new ORMError('MISSING_CALLBACK', "Missing Model.count() callback", { model: opts.table });
+    }
+
+    if (conditions) {
+      conditions = Utilities.checkConditions(conditions, one_associations);
+    }
+
+    opts.driver.count(opts.table, conditions, {}, function (err, data) {
+      if (err || data.length === 0) {
+        return cb(err);
+      }
+      return cb(null, data[0].c);
+    });
+    return this;
+  };
+
+  model.aggregate = function () {
+    var conditions = {};
+    var propertyList = [];
+
+    for (var i = 0; i < arguments.length; i++) {
+      if (typeof arguments[i] === "object") {
+        if (Array.isArray(arguments[i])) {
+          propertyList = arguments[i];
+        } else {
+          conditions = arguments[i];
+        }
+      }
+    }
+
+    if (conditions) {
+      conditions = Utilities.checkConditions(conditions, one_associations);
+    }
+
+    return new require("./AggregateFunctions")({
+      table        : opts.table,
+      driver_name  : opts.driver_name,
+      driver       : opts.driver,
+      conditions   : conditions,
+      propertyList : propertyList,
+      properties   : allProperties
+    });
+  };
+
+  model.exists = function () {
+    var ids = Array.prototype.slice.apply(arguments);
+    var cb  = ids.pop();
+
+    if (typeof cb !== "function") {
+        throw new ORMError("Missing Model.exists() callback", 'MISSING_CALLBACK', { model: opts.table });
+    }
+
+    var conditions = {}, i;
+
+    if (ids.length === 1 && typeof ids[0] === "object") {
+      if (Array.isArray(ids[0])) {
+        for (i = 0; i < opts.keys.length; i++) {
+          conditions[opts.keys[i]] = ids[0][i];
+        }
+      } else {
+        conditions = ids[0];
+      }
+    } else {
+      for (i = 0; i < opts.keys.length; i++) {
+        conditions[opts.keys[i]] = ids[i];
+      }
+    }
+
+    if (conditions) {
+      conditions = Utilities.checkConditions(conditions, one_associations);
+    }
+
+    opts.driver.count(opts.table, conditions, {}, function (err, data) {
+      if (err || data.length === 0) {
+        return cb(err);
+      }
+      return cb(null, data[0].c > 0);
+    });
+    return this;
+  };
+
+  model.create = function () {
+    var itemsParams = []
+    var items       = [];
+    var options     = {};
+    var done        = null;
+    var single      = false;
+
+    for (var i = 0; i < arguments.length; i++) {
+      switch (typeof arguments[i]) {
+        case "object":
+          if ( !single && Array.isArray(arguments[i]) ) {
+            itemsParams = itemsParams.concat(arguments[i]);
+          } else if (i === 0) {
+            single = true;
+            itemsParams.push(arguments[i]);
+          } else {
+            options = arguments[i];
+          }
+          break;
+        case "function":
+          done = arguments[i];
+          break;
+      }
+    }
+
+    var iterator = function (params, index, cb) {
+      createInstance(params, {
+        is_new    : true,
+        autoSave  : opts.autoSave,
+        autoFetch : false
+      }, function (err, item) {
+        if (err) {
+          err.index    = index;
+          err.instance = item;
+
+          return cb(err);
+        }
+        item.save(function (err) {
+          if (err) {
+            err.index    = index;
+            err.instance = item;
+
+            return cb(err);
+          }
+
+          items[index] = item;
+          cb();
+        });
+      });
+    };
+
+    async.eachOfSeries(itemsParams, iterator, function (err) {
+      if (err) return done(err);
+      done(null, single ? items[0] : items);
+    });
+
+    return this;
+  };
+
+  model.clear = function (cb) {
+    opts.driver.clear(opts.table, function (err) {
+      if (typeof cb === "function") cb(err);
+    });
+
+    return this;
+  };
+
+  model.prependValidation = function (key, validation) {
+    if(opts.validations.hasOwnProperty(key)) {
+      opts.validations[key].splice(0, 0, validation);
+    } else {
+      opts.validations[key] = [validation];
+    }
+  };
+
+  var currFields = {};
+
+  model.addProperty = function (propIn, options) {
+    var cType;
+    var prop = Property.normalize({
+      prop: propIn, name: (options && options.name || propIn.name),
+      customTypes: opts.db.customTypes, settings: opts.settings
+    });
+
+    // Maintains backwards compatibility
+    if (opts.keys.indexOf(k) != -1) {
+      prop.key = true;
+    } else if (prop.key) {
+      opts.keys.push(k);
+    }
+
+    if (options && options.klass) {
+      prop.klass = options.klass;
+    }
+
+    switch (prop.klass) {
+      case 'primary':
+        opts.properties[prop.name]  = prop;
+        break;
+      case 'hasOne':
+        association_properties.push(prop.name)
+        break;
+    }
+
+    allProperties[prop.name]        = prop;
+    fieldToPropertyMap[prop.mapsTo] = prop;
+
+    if (prop.required) {
+      model.prependValidation(prop.name, Validators.required());
+    }
+
+    if (prop.key && prop.klass == 'primary') {
+      keyProperties.push(prop);
+    }
+
+    if (prop.lazyload !== true && !currFields[prop.name]) {
+      currFields[prop.name] = true;
+      if ((cType = opts.db.customTypes[prop.type]) && cType.datastoreGet) {
+        model_fields.push({
+          a: prop.mapsTo, sql: cType.datastoreGet(prop, opts.db.driver.query)
+        });
+      } else {
+        model_fields.push(prop.mapsTo);
+      }
+    }
+
+    return prop;
+  };
+
+  Object.defineProperty(model, "table", {
+    value: opts.table,
+    enumerable: false
+  });
+  Object.defineProperty(model, "id", {
+    value: opts.keys,
+    enumerable: false
+  });
+  Object.defineProperty(model, "uid", {
+      value: opts.driver.uid + "/" + opts.table + "/" + opts.keys.join("/"),
         enumerable: false
-	});
-
-	// Standardize validations
-	for (var k in opts.validations) {
-		if (!Array.isArray(opts.validations[k])) {
-			opts.validations[k] = [ opts.validations[k] ];
-		}
-	}
-
-	// If no keys are defined add the default one
-	if (opts.keys.length == 0 && !_.some(opts.properties, { key: true })) {
-		opts.properties[opts.settings.get("properties.primary_key")] = {
-			type: 'serial', key: true, required: false, klass: 'primary'
-		};
-	}
-
-	// standardize properties
-	for (k in opts.properties) {
-		model.addProperty(opts.properties[k], { name: k, klass: 'primary' });
-	}
-
-	if (keyProperties.length == 0) {
-		throw new ORMError("Model defined without any keys", 'BAD_MODEL', { model: opts.table });
-	}
-
-	// setup hooks
-	for (k in AvailableHooks) {
-		model[AvailableHooks[k]] = createHookHelper(AvailableHooks[k]);
-	}
-
-	OneAssociation.prepare(model, one_associations);
-	ManyAssociation.prepare(opts.db, model, many_associations);
-	ExtendAssociation.prepare(opts.db, model, extend_associations);
-
-	return model;
+  });
+
+  // Standardize validations
+  for (var k in opts.validations) {
+    if (!Array.isArray(opts.validations[k])) {
+      opts.validations[k] = [ opts.validations[k] ];
+    }
+  }
+
+  // If no keys are defined add the default one
+  if (opts.keys.length == 0 && !_.some(opts.properties, { key: true })) {
+    opts.properties[opts.settings.get("properties.primary_key")] = {
+      type: 'serial', key: true, required: false, klass: 'primary'
+    };
+  }
+
+  // standardize properties
+  for (k in opts.properties) {
+    model.addProperty(opts.properties[k], { name: k, klass: 'primary' });
+  }
+
+  if (keyProperties.length == 0) {
+    throw new ORMError("Model defined without any keys", 'BAD_MODEL', { model: opts.table });
+  }
+
+  // setup hooks
+  for (k in AvailableHooks) {
+    model[AvailableHooks[k]] = createHookHelper(AvailableHooks[k]);
+  }
+
+  OneAssociation.prepare(model, one_associations);
+  ManyAssociation.prepare(opts.db, model, many_associations);
+  ExtendAssociation.prepare(opts.db, model, extend_associations);
+
+  return model;
 }
diff --git a/lib/ORM.js b/lib/ORM.js
index 254d32f0..0a8b11e2 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -32,379 +32,379 @@ exports.ErrorCodes = ORMError.codes;
 
 exports.Text = Query.Text;
 for (var k in Query.Comparators) {
-	exports[Query.Comparators[k]] = Query[Query.Comparators[k]];
+  exports[Query.Comparators[k]] = Query[Query.Comparators[k]];
 }
 
 exports.express = function () {
-	return require("./Express").apply(this, arguments);
+  return require("./Express").apply(this, arguments);
 };
 
 exports.use = function (connection, proto, opts, cb) {
-	if (DriverAliases[proto]) {
-		proto = DriverAliases[proto];
-	}
-	if (typeof opts === "function") {
-		cb = opts;
-		opts = {};
-	}
-
-	try {
-		var Driver   = adapters.get(proto);
-		var settings = new Settings.Container(exports.settings.get('*'));
-		var driver   = new Driver(null, connection, {
-			debug    : (opts.query && opts.query.debug === 'true'),
-			settings : settings
-		});
-
-		return cb(null, new ORM(proto, driver, settings));
-	} catch (ex) {
-		return cb(ex);
-	}
+  if (DriverAliases[proto]) {
+    proto = DriverAliases[proto];
+  }
+  if (typeof opts === "function") {
+    cb = opts;
+    opts = {};
+  }
+
+  try {
+    var Driver   = adapters.get(proto);
+    var settings = new Settings.Container(exports.settings.get('*'));
+    var driver   = new Driver(null, connection, {
+      debug    : (opts.query && opts.query.debug === 'true'),
+      settings : settings
+    });
+
+    return cb(null, new ORM(proto, driver, settings));
+  } catch (ex) {
+    return cb(ex);
+  }
 };
 
 exports.connect = function (opts, cb) {
-	if (arguments.length === 0 || !opts) {
-		return ORM_Error(new ORMError("CONNECTION_URL_EMPTY", 'PARAM_MISMATCH'), cb);
-	}
-	if (typeof opts == 'string') {
-		if (opts.trim().length === 0) {
-			return ORM_Error(new ORMError("CONNECTION_URL_EMPTY", 'PARAM_MISMATCH'), cb);
-		}
-		opts = url.parse(opts, true);
-	} else if (typeof opts == 'object') {
-		opts = _.cloneDeep(opts);
-	}
-
-	opts.query = opts.query || {};
-
-	for(var k in opts.query) {
-		opts.query[k] = queryParamCast(opts.query[k]);
-		opts[k] = opts.query[k];
-	}
-
-	if (!opts.database) {
-		// if (!opts.pathname) {
-		// 	return cb(new Error("CONNECTION_URL_NO_DATABASE"));
-		// }
-		opts.database = (opts.pathname ? opts.pathname.substr(1) : "");
-	}
-	if (!opts.protocol) {
-		return ORM_Error(new ORMError("CONNECTION_URL_NO_PROTOCOL", 'PARAM_MISMATCH'), cb);
-	}
-	// if (!opts.host) {
-	// 	opts.host = opts.hostname = "localhost";
-	// }
-	if (opts.auth) {
-		opts.user = opts.auth.split(":")[0];
-		opts.password = opts.auth.split(":")[1];
-	}
-	if (!opts.hasOwnProperty("user")) {
-		opts.user = "root";
-	}
-	if (!opts.hasOwnProperty("password")) {
-		opts.password = "";
-	}
-	if (opts.hasOwnProperty("hostname")) {
-		opts.host = opts.hostname;
-	}
-
-	var proto  = opts.protocol.replace(/:$/, '');
-	var db;
-	if (DriverAliases[proto]) {
-		proto = DriverAliases[proto];
-	}
-
-	try {
-		var Driver   = adapters.get(proto);
-		var settings = new Settings.Container(exports.settings.get('*'));
-		var driver   = new Driver(opts, null, {
-			debug    : 'debug' in opts.query ? opts.query.debug : settings.get("connection.debug"),
-			pool     : 'pool'  in opts.query ? opts.query.pool  : settings.get("connection.pool"),
-			settings : settings
-		});
-
-		db = new ORM(proto, driver, settings);
-
-		driver.connect(function (err) {
-			if (typeof cb === "function") {
-				if (err) {
-					return cb(err);
-				} else {
-					return cb(null, db);
-				}
-			}
-
-			db.emit("connect", err, !err ? db : null);
-		});
-	} catch (ex) {
-		if (ex.code === "MODULE_NOT_FOUND" || ex.message.indexOf('find module') > -1) {
-			return ORM_Error(new ORMError("Connection protocol not supported - have you installed the database driver for " + proto + "?", 'NO_SUPPORT'), cb);
-		}
-		return ORM_Error(ex, cb);
-	}
-
-	return db;
+  if (arguments.length === 0 || !opts) {
+    return ORM_Error(new ORMError("CONNECTION_URL_EMPTY", 'PARAM_MISMATCH'), cb);
+  }
+  if (typeof opts == 'string') {
+    if (opts.trim().length === 0) {
+      return ORM_Error(new ORMError("CONNECTION_URL_EMPTY", 'PARAM_MISMATCH'), cb);
+    }
+    opts = url.parse(opts, true);
+  } else if (typeof opts == 'object') {
+    opts = _.cloneDeep(opts);
+  }
+
+  opts.query = opts.query || {};
+
+  for(var k in opts.query) {
+    opts.query[k] = queryParamCast(opts.query[k]);
+    opts[k] = opts.query[k];
+  }
+
+  if (!opts.database) {
+    // if (!opts.pathname) {
+    //   return cb(new Error("CONNECTION_URL_NO_DATABASE"));
+    // }
+    opts.database = (opts.pathname ? opts.pathname.substr(1) : "");
+  }
+  if (!opts.protocol) {
+    return ORM_Error(new ORMError("CONNECTION_URL_NO_PROTOCOL", 'PARAM_MISMATCH'), cb);
+  }
+  // if (!opts.host) {
+  //   opts.host = opts.hostname = "localhost";
+  // }
+  if (opts.auth) {
+    opts.user = opts.auth.split(":")[0];
+    opts.password = opts.auth.split(":")[1];
+  }
+  if (!opts.hasOwnProperty("user")) {
+    opts.user = "root";
+  }
+  if (!opts.hasOwnProperty("password")) {
+    opts.password = "";
+  }
+  if (opts.hasOwnProperty("hostname")) {
+    opts.host = opts.hostname;
+  }
+
+  var proto  = opts.protocol.replace(/:$/, '');
+  var db;
+  if (DriverAliases[proto]) {
+    proto = DriverAliases[proto];
+  }
+
+  try {
+    var Driver   = adapters.get(proto);
+    var settings = new Settings.Container(exports.settings.get('*'));
+    var driver   = new Driver(opts, null, {
+      debug    : 'debug' in opts.query ? opts.query.debug : settings.get("connection.debug"),
+      pool     : 'pool'  in opts.query ? opts.query.pool  : settings.get("connection.pool"),
+      settings : settings
+    });
+
+    db = new ORM(proto, driver, settings);
+
+    driver.connect(function (err) {
+      if (typeof cb === "function") {
+        if (err) {
+          return cb(err);
+        } else {
+          return cb(null, db);
+        }
+      }
+
+      db.emit("connect", err, !err ? db : null);
+    });
+  } catch (ex) {
+    if (ex.code === "MODULE_NOT_FOUND" || ex.message.indexOf('find module') > -1) {
+      return ORM_Error(new ORMError("Connection protocol not supported - have you installed the database driver for " + proto + "?", 'NO_SUPPORT'), cb);
+    }
+    return ORM_Error(ex, cb);
+  }
+
+  return db;
 };
 
 exports.addAdapter = adapters.add;
 
 function ORM(driver_name, driver, settings) {
-	this.validators  = exports.validators;
-	this.enforce     = exports.enforce;
-	this.settings    = settings;
-	this.driver_name = driver_name;
-	this.driver      = driver;
-	this.driver.uid  = hat();
-	this.tools       = {};
-	this.models      = {};
-	this.plugins     = [];
-	this.customTypes = {};
-
-	for (var k in Query.Comparators) {
-		this.tools[Query.Comparators[k]] = Query[Query.Comparators[k]];
-	}
-
-	events.EventEmitter.call(this);
-
-	var onError = function (err) {
-		if (this.settings.get("connection.reconnect")) {
-			if (typeof this.driver.reconnect === "undefined") {
-				return this.emit("error", new ORMError("Connection lost - driver does not support reconnection", 'CONNECTION_LOST'));
-			}
-			this.driver.reconnect(function () {
-				this.driver.on("error", onError);
-			}.bind(this));
-
-			if (this.listeners("error").length === 0) {
-				// since user want auto reconnect,
-				// don't emit without listeners or it will throw
-				return;
-			}
-		}
-		this.emit("error", err);
-	}.bind(this);
-
-	driver.on("error", onError);
+  this.validators  = exports.validators;
+  this.enforce     = exports.enforce;
+  this.settings    = settings;
+  this.driver_name = driver_name;
+  this.driver      = driver;
+  this.driver.uid  = hat();
+  this.tools       = {};
+  this.models      = {};
+  this.plugins     = [];
+  this.customTypes = {};
+
+  for (var k in Query.Comparators) {
+    this.tools[Query.Comparators[k]] = Query[Query.Comparators[k]];
+  }
+
+  events.EventEmitter.call(this);
+
+  var onError = function (err) {
+    if (this.settings.get("connection.reconnect")) {
+      if (typeof this.driver.reconnect === "undefined") {
+        return this.emit("error", new ORMError("Connection lost - driver does not support reconnection", 'CONNECTION_LOST'));
+      }
+      this.driver.reconnect(function () {
+        this.driver.on("error", onError);
+      }.bind(this));
+
+      if (this.listeners("error").length === 0) {
+        // since user want auto reconnect,
+        // don't emit without listeners or it will throw
+        return;
+      }
+    }
+    this.emit("error", err);
+  }.bind(this);
+
+  driver.on("error", onError);
 }
 
 util.inherits(ORM, events.EventEmitter);
 
 ORM.prototype.use = function (plugin_const, opts) {
-	if (typeof plugin_const === "string") {
-		try {
-			plugin_const = require(Utilities.getRealPath(plugin_const));
-		} catch (e) {
-			throw e;
-		}
-	}
+  if (typeof plugin_const === "string") {
+    try {
+      plugin_const = require(Utilities.getRealPath(plugin_const));
+    } catch (e) {
+      throw e;
+    }
+  }
 
-	var plugin = new plugin_const(this, opts || {});
+  var plugin = new plugin_const(this, opts || {});
 
-	if (typeof plugin.define === "function") {
-		for (var k in this.models) {
-			plugin.define(this.models[k]);
-		}
-	}
+  if (typeof plugin.define === "function") {
+    for (var k in this.models) {
+      plugin.define(this.models[k]);
+    }
+  }
 
-	this.plugins.push(plugin);
+  this.plugins.push(plugin);
 
-	return this;
+  return this;
 };
 ORM.prototype.define = function (name, properties, opts) {
     var i;
 
-	properties = properties || {};
-	opts       = opts || {};
-
-	for (i = 0; i < this.plugins.length; i++) {
-		if (typeof this.plugins[i].beforeDefine === "function") {
-			this.plugins[i].beforeDefine(name, properties, opts);
-		}
-	}
-
-	this.models[name] = new Model({
-		db             : this,
-		settings       : this.settings,
-		driver_name    : this.driver_name,
-		driver         : this.driver,
-		table          : opts.table || opts.collection || ((this.settings.get("model.namePrefix") || "") + name),
-		properties     : properties,
-		extension      : opts.extension || false,
-		indexes        : opts.indexes || [],
-		identityCache       : opts.hasOwnProperty("identityCache") ? opts.identityCache : this.settings.get("instance.identityCache"),
-		keys           : opts.id,
-		autoSave       : opts.hasOwnProperty("autoSave") ? opts.autoSave : this.settings.get("instance.autoSave"),
-		autoFetch      : opts.hasOwnProperty("autoFetch") ? opts.autoFetch : this.settings.get("instance.autoFetch"),
-		autoFetchLimit : opts.autoFetchLimit || this.settings.get("instance.autoFetchLimit"),
-		cascadeRemove  : opts.hasOwnProperty("cascadeRemove") ? opts.cascadeRemove : this.settings.get("instance.cascadeRemove"),
-		hooks          : opts.hooks || {},
-		methods        : opts.methods || {},
-		validations    : opts.validations || {}
-	});
-
-	for (i = 0; i < this.plugins.length; i++) {
-		if (typeof this.plugins[i].define === "function") {
-			this.plugins[i].define(this.models[name], this);
-		}
-	}
-
-	return this.models[name];
+  properties = properties || {};
+  opts       = opts || {};
+
+  for (i = 0; i < this.plugins.length; i++) {
+    if (typeof this.plugins[i].beforeDefine === "function") {
+      this.plugins[i].beforeDefine(name, properties, opts);
+    }
+  }
+
+  this.models[name] = new Model({
+    db             : this,
+    settings       : this.settings,
+    driver_name    : this.driver_name,
+    driver         : this.driver,
+    table          : opts.table || opts.collection || ((this.settings.get("model.namePrefix") || "") + name),
+    properties     : properties,
+    extension      : opts.extension || false,
+    indexes        : opts.indexes || [],
+    identityCache       : opts.hasOwnProperty("identityCache") ? opts.identityCache : this.settings.get("instance.identityCache"),
+    keys           : opts.id,
+    autoSave       : opts.hasOwnProperty("autoSave") ? opts.autoSave : this.settings.get("instance.autoSave"),
+    autoFetch      : opts.hasOwnProperty("autoFetch") ? opts.autoFetch : this.settings.get("instance.autoFetch"),
+    autoFetchLimit : opts.autoFetchLimit || this.settings.get("instance.autoFetchLimit"),
+    cascadeRemove  : opts.hasOwnProperty("cascadeRemove") ? opts.cascadeRemove : this.settings.get("instance.cascadeRemove"),
+    hooks          : opts.hooks || {},
+    methods        : opts.methods || {},
+    validations    : opts.validations || {}
+  });
+
+  for (i = 0; i < this.plugins.length; i++) {
+    if (typeof this.plugins[i].define === "function") {
+      this.plugins[i].define(this.models[name], this);
+    }
+  }
+
+  return this.models[name];
 };
 ORM.prototype.defineType = function (name, opts) {
-	this.customTypes[name] = opts;
-	this.driver.customTypes[name] = opts;
-	return this;
+  this.customTypes[name] = opts;
+  this.driver.customTypes[name] = opts;
+  return this;
 };
 ORM.prototype.ping = function (cb) {
-	this.driver.ping(cb);
+  this.driver.ping(cb);
 
-	return this;
+  return this;
 };
 ORM.prototype.close = function (cb) {
-	this.driver.close(cb);
+  this.driver.close(cb);
 
-	return this;
+  return this;
 };
 ORM.prototype.load = function () {
-	var files = _.flatten(Array.prototype.slice.apply(arguments));
-	var cb    = function () {};
+  var files = _.flatten(Array.prototype.slice.apply(arguments));
+  var cb    = function () {};
 
-	if (typeof files[files.length - 1] == "function") {
-		cb = files.pop();
-	}
+  if (typeof files[files.length - 1] == "function") {
+    cb = files.pop();
+  }
 
-	var loadNext = function () {
-		if (files.length === 0) {
-			return cb();
-		}
+  var loadNext = function () {
+    if (files.length === 0) {
+      return cb();
+    }
 
-		var file = files.shift();
+    var file = files.shift();
 
-		try {
-			return require(Utilities.getRealPath(file, 4))(this, function (err) {
-				if (err) return cb(err);
+    try {
+      return require(Utilities.getRealPath(file, 4))(this, function (err) {
+        if (err) return cb(err);
 
-				return loadNext();
-			});
-		} catch (ex) {
-			return cb(ex);
-		}
-	}.bind(this);
+        return loadNext();
+      });
+    } catch (ex) {
+      return cb(ex);
+    }
+  }.bind(this);
 
-	return loadNext();
+  return loadNext();
 };
 ORM.prototype.sync = function (cb) {
-	var modelIds = Object.keys(this.models);
-	var syncNext = function () {
-		if (modelIds.length === 0) {
-			return cb();
-		}
+  var modelIds = Object.keys(this.models);
+  var syncNext = function () {
+    if (modelIds.length === 0) {
+      return cb();
+    }
 
-		var modelId = modelIds.shift();
+    var modelId = modelIds.shift();
 
-		this.models[modelId].sync(function (err) {
-			if (err) {
-				err.model = modelId;
+    this.models[modelId].sync(function (err) {
+      if (err) {
+        err.model = modelId;
 
-				return cb(err);
-			}
+        return cb(err);
+      }
 
-			return syncNext();
-		});
-	}.bind(this);
+      return syncNext();
+    });
+  }.bind(this);
 
-	if (arguments.length === 0) {
-		cb = function () {};
-	}
+  if (arguments.length === 0) {
+    cb = function () {};
+  }
 
-	syncNext();
+  syncNext();
 
-	return this;
+  return this;
 };
 ORM.prototype.drop = function (cb) {
-	var modelIds = Object.keys(this.models);
-	var dropNext = function () {
-		if (modelIds.length === 0) {
-			return cb();
-		}
+  var modelIds = Object.keys(this.models);
+  var dropNext = function () {
+    if (modelIds.length === 0) {
+      return cb();
+    }
 
-		var modelId = modelIds.shift();
+    var modelId = modelIds.shift();
 
-		this.models[modelId].drop(function (err) {
-			if (err) {
-				err.model = modelId;
+    this.models[modelId].drop(function (err) {
+      if (err) {
+        err.model = modelId;
 
-				return cb(err);
-			}
+        return cb(err);
+      }
 
-			return dropNext();
-		});
-	}.bind(this);
+      return dropNext();
+    });
+  }.bind(this);
 
-	if (arguments.length === 0) {
-		cb = function () {};
-	}
+  if (arguments.length === 0) {
+    cb = function () {};
+  }
 
-	dropNext();
+  dropNext();
 
-	return this;
+  return this;
 };
 ORM.prototype.serial = function () {
-	var chains = Array.prototype.slice.apply(arguments);
-
-	return {
-		get: function (cb) {
-			var params = [];
-			var getNext = function () {
-				if (params.length === chains.length) {
-					params.unshift(null);
-					return cb.apply(null, params);
-				}
-
-				chains[params.length].run(function (err, instances) {
-					if (err) {
-						params.unshift(err);
-						return cb.apply(null, params);
-					}
-
-					params.push(instances);
-					return getNext();
-				});
-			};
-
-			getNext();
-
-			return this;
-		}
-	};
+  var chains = Array.prototype.slice.apply(arguments);
+
+  return {
+    get: function (cb) {
+      var params = [];
+      var getNext = function () {
+        if (params.length === chains.length) {
+          params.unshift(null);
+          return cb.apply(null, params);
+        }
+
+        chains[params.length].run(function (err, instances) {
+          if (err) {
+            params.unshift(err);
+            return cb.apply(null, params);
+          }
+
+          params.push(instances);
+          return getNext();
+        });
+      };
+
+      getNext();
+
+      return this;
+    }
+  };
 };
 
 function ORM_Error(err, cb) {
-	var Emitter = new events.EventEmitter();
+  var Emitter = new events.EventEmitter();
 
-	Emitter.use = Emitter.define = Emitter.sync = Emitter.load = function () {};
+  Emitter.use = Emitter.define = Emitter.sync = Emitter.load = function () {};
 
-	if (typeof cb === "function") {
-		cb(err);
-	}
+  if (typeof cb === "function") {
+    cb(err);
+  }
 
-	process.nextTick(function () {
-		Emitter.emit("connect", err);
-	});
+  process.nextTick(function () {
+    Emitter.emit("connect", err);
+  });
 
-	return Emitter;
+  return Emitter;
 }
 
 function queryParamCast (val) {
-	if (typeof val == 'string')	{
-		switch (val) {
-			case '1':
-			case 'true':
-				return true;
-			case '0':
-			case 'false':
-				return false;
-		}
-	}
-	return val;
+  if (typeof val == 'string')  {
+    switch (val) {
+      case '1':
+      case 'true':
+        return true;
+      case '0':
+      case 'false':
+        return false;
+    }
+  }
+  return val;
 }
diff --git a/lib/Promise.js b/lib/Promise.js
index 0008adea..ae39e322 100644
--- a/lib/Promise.js
+++ b/lib/Promise.js
@@ -1,30 +1,30 @@
 exports.Promise = Promise;
 
 function Promise(opts) {
-	opts = opts || {};
+  opts = opts || {};
 
-	var success_cb = opts.success || null;
-	var fail_cb    = opts.fail    || null;
+  var success_cb = opts.success || null;
+  var fail_cb    = opts.fail    || null;
 
-	return {
-		handle: function (promise) {
-			promise(function (err) {
-				if (err) {
-					if (fail_cb) fail_cb(err);
-				} else {
-					var args = Array.prototype.slice.call(arguments, 1);
+  return {
+    handle: function (promise) {
+      promise(function (err) {
+        if (err) {
+          if (fail_cb) fail_cb(err);
+        } else {
+          var args = Array.prototype.slice.call(arguments, 1);
 
-					if (success_cb) success_cb.apply(null, args);
-				}
-			});
-		},
-		success: function (cb) {
-			success_cb = cb;
-			return this;
-		},
-		fail: function (cb) {
-			fail_cb = cb;
-			return this;
-		}
-	};
+          if (success_cb) success_cb.apply(null, args);
+        }
+      });
+    },
+    success: function (cb) {
+      success_cb = cb;
+      return this;
+    },
+    fail: function (cb) {
+      fail_cb = cb;
+      return this;
+    }
+  };
 }
diff --git a/lib/Property.js b/lib/Property.js
index c00375ba..9fb6ae78 100644
--- a/lib/Property.js
+++ b/lib/Property.js
@@ -2,70 +2,70 @@ var _        = require('lodash');
 var ORMError = require("./Error");
 
 var KNOWN_TYPES = [
-	"text",   "number", "integer", "boolean", "date", "enum", "object",
-	"binary", "point",  "serial"
+  "text",   "number", "integer", "boolean", "date", "enum", "object",
+  "binary", "point",  "serial"
 ];
 
 exports.normalize = function (opts) {
-	if (typeof opts.prop === "function") {
-		switch (opts.prop.name) {
-			case "String":
-				opts.prop = { type: "text" };
-				break;
-			case "Number":
-				opts.prop = { type: "number" };
-				break;
-			case "Boolean":
-				opts.prop = { type: "boolean" };
-				break;
-			case "Date":
-				opts.prop = { type: "date" };
-				break;
-			case "Object":
-				opts.prop = { type: "object" };
-				break;
-			case "Buffer":
-				opts.prop = { type: "binary" };
-				break;
-		}
-	} else if (typeof opts.prop === "string") {
-		var tmp = opts.prop;
-		opts.prop = {};
-		opts.prop.type = tmp;
-	} else if (Array.isArray(opts.prop)) {
-		opts.prop = { type: "enum", values: opts.prop };
-	} else {
-		opts.prop = _.cloneDeep(opts.prop);
-	}
+  if (typeof opts.prop === "function") {
+    switch (opts.prop.name) {
+      case "String":
+        opts.prop = { type: "text" };
+        break;
+      case "Number":
+        opts.prop = { type: "number" };
+        break;
+      case "Boolean":
+        opts.prop = { type: "boolean" };
+        break;
+      case "Date":
+        opts.prop = { type: "date" };
+        break;
+      case "Object":
+        opts.prop = { type: "object" };
+        break;
+      case "Buffer":
+        opts.prop = { type: "binary" };
+        break;
+    }
+  } else if (typeof opts.prop === "string") {
+    var tmp = opts.prop;
+    opts.prop = {};
+    opts.prop.type = tmp;
+  } else if (Array.isArray(opts.prop)) {
+    opts.prop = { type: "enum", values: opts.prop };
+  } else {
+    opts.prop = _.cloneDeep(opts.prop);
+  }
 
-	if (KNOWN_TYPES.indexOf(opts.prop.type) === -1 && !(opts.prop.type in opts.customTypes)) {
-		throw new ORMError("Unknown property type: " + opts.prop.type, 'NO_SUPPORT');
-	}
+  if (KNOWN_TYPES.indexOf(opts.prop.type) === -1 && !(opts.prop.type in opts.customTypes)) {
+    throw new ORMError("Unknown property type: " + opts.prop.type, 'NO_SUPPORT');
+  }
 
-	if (!opts.prop.hasOwnProperty("required") && opts.settings.get("properties.required")) {
-		opts.prop.required = true;
-	}
+  if (!opts.prop.hasOwnProperty("required") && opts.settings.get("properties.required")) {
+    opts.prop.required = true;
+  }
 
-	// Defaults to true. Setting to false hides properties from JSON.stringify(modelInstance).
-	if (!opts.prop.hasOwnProperty("enumerable") || opts.prop.enumerable === true) {
-		opts.prop.enumerable = true;
-	}
+  // Defaults to true. Setting to false hides properties from JSON.stringify(modelInstance).
+  if (!opts.prop.hasOwnProperty("enumerable") || opts.prop.enumerable === true) {
+    opts.prop.enumerable = true;
+  }
 
-	// Defaults to true. Rational means floating point here.
-	if (opts.prop.type == "number" && opts.prop.rational === undefined) {
-		opts.prop.rational = true;
-	}
+  // Defaults to true. Rational means floating point here.
+  if (opts.prop.type == "number" && opts.prop.rational === undefined) {
+    opts.prop.rational = true;
+  }
 
-	if (!('mapsTo' in opts.prop)) {
-		opts.prop.mapsTo = opts.name
-	}
+  if (!('mapsTo' in opts.prop)) {
+    opts.prop.mapsTo = opts.name
+  }
 
-	if (opts.prop.type == "number" && opts.prop.rational === false) {
-		opts.prop.type = "integer";
-		delete opts.prop.rational;
-	}
+  if (opts.prop.type == "number" && opts.prop.rational === false) {
+    opts.prop.type = "integer";
+    delete opts.prop.rational;
+  }
 
-	opts.prop.name = opts.name;
+  opts.prop.name = opts.name;
 
-	return opts.prop;
+  return opts.prop;
 };
diff --git a/lib/Settings.js b/lib/Settings.js
index 853a202c..fc5893df 100644
--- a/lib/Settings.js
+++ b/lib/Settings.js
@@ -1,114 +1,114 @@
 var _ = require('lodash');
 var default_settings = {
-	properties : {
-		primary_key               : "id",
-		association_key           : "{name}_{field}",
-		required                  : false
-	},
-	instance   : {
-		identityCache             : false,
-		identityCacheSaveCheck    : true,
-		autoSave                  : false,
-		autoFetch                 : false,
-		autoFetchLimit            : 1,
-		cascadeRemove             : true,
-		returnAllErrors           : false,
-		saveAssociationsByDefault : true
-	},
-	hasMany    : {
-		// Makes the foreign key fields a composite key
-		key                       : false
-	},
-	connection : {
-		reconnect                 : true,
-		pool                      : false,
-		debug                     : false
-	}
+  properties : {
+    primary_key               : "id",
+    association_key           : "{name}_{field}",
+    required                  : false
+  },
+  instance   : {
+    identityCache             : false,
+    identityCacheSaveCheck    : true,
+    autoSave                  : false,
+    autoFetch                 : false,
+    autoFetchLimit            : 1,
+    cascadeRemove             : true,
+    returnAllErrors           : false,
+    saveAssociationsByDefault : true
+  },
+  hasMany    : {
+    // Makes the foreign key fields a composite key
+    key                       : false
+  },
+  connection : {
+    reconnect                 : true,
+    pool                      : false,
+    debug                     : false
+  }
 };
 
 exports.Container = Settings;
 exports.defaults = function () {
-	return default_settings;
+  return default_settings;
 };
 
 function Settings(settings) {
-	this.settings = settings;
-
-	return {
-		set: function (key, value) {
-			set(key, value, settings);
-
-			return this;
-		},
-		get: function (key, def) {
-			var v = get(key, def, settings)
-
-			if (v instanceof Function) {
-				return v;
-			} else {
-				return _.cloneDeep(v);
-			}
-		},
-		unset: function () {
-			for (var i = 0; i < arguments.length; i++) {
-				if (typeof arguments[i] === "string") {
-					unset(arguments[i], settings);
-				}
-			}
-
-			return this;
-		}
-	};
+  this.settings = settings;
+
+  return {
+    set: function (key, value) {
+      set(key, value, settings);
+
+      return this;
+    },
+    get: function (key, def) {
+      var v = get(key, def, settings)
+
+      if (v instanceof Function) {
+        return v;
+      } else {
+        return _.cloneDeep(v);
+      }
+    },
+    unset: function () {
+      for (var i = 0; i < arguments.length; i++) {
+        if (typeof arguments[i] === "string") {
+          unset(arguments[i], settings);
+        }
+      }
+
+      return this;
+    }
+  };
 }
 
 function set(key, value, obj) {
-	var p = key.indexOf(".");
+  var p = key.indexOf(".");
 
-	if (p === -1) {
-		return obj[key] = value;
-	}
+  if (p === -1) {
+    return obj[key] = value;
+  }
 
-	if (!obj.hasOwnProperty(key.substr(0, p))) {
-		obj[key.substr(0, p)] = {};
-	}
+  if (!obj.hasOwnProperty(key.substr(0, p))) {
+    obj[key.substr(0, p)] = {};
+  }
 
-	return set(key.substr(p + 1), value, obj[key.substr(0, p)]);
+  return set(key.substr(p + 1), value, obj[key.substr(0, p)]);
 }
 
 function get(key, def, obj) {
-	var p = key.indexOf(".");
+  var p = key.indexOf(".");
 
-	if (p === -1) {
-		if (key === '*') {
-			return obj;
-		}
-		return obj.hasOwnProperty(key) ? obj[key] : def;
-	}
+  if (p === -1) {
+    if (key === '*') {
+      return obj;
+    }
+    return obj.hasOwnProperty(key) ? obj[key] : def;
+  }
 
-	if (!obj.hasOwnProperty(key.substr(0, p))) {
-		return def;
-	}
+  if (!obj.hasOwnProperty(key.substr(0, p))) {
+    return def;
+  }
 
-	return get(key.substr(p + 1), def, obj[key.substr(0, p)]);
+  return get(key.substr(p + 1), def, obj[key.substr(0, p)]);
 }
 
 function unset(key, obj) {
-	var p = key.indexOf(".");
-
-	if (p === -1) {
-		if (key === '*') {
-			return 'reset';
-		} else {
-			delete obj[key];
-		}
-		return;
-	}
-
-	if (!obj.hasOwnProperty(key.substr(0, p))) {
-		return;
-	}
-
-	if (unset(key.substr(p + 1), obj[key.substr(0, p)]) === 'reset') {
-		obj[key.substr(0, p)] = {};
-	}
+  var p = key.indexOf(".");
+
+  if (p === -1) {
+    if (key === '*') {
+      return 'reset';
+    } else {
+      delete obj[key];
+    }
+    return;
+  }
+
+  if (!obj.hasOwnProperty(key.substr(0, p))) {
+    return;
+  }
+
+  if (unset(key.substr(p + 1), obj[key.substr(0, p)]) === 'reset') {
+    obj[key.substr(0, p)] = {};
+  }
 }
diff --git a/lib/Singleton.js b/lib/Singleton.js
index 67e8507e..3a91e04d 100644
--- a/lib/Singleton.js
+++ b/lib/Singleton.js
@@ -1,36 +1,36 @@
 var map = {};
 
 exports.clear = function (key) {
-	if (typeof key === "string") {
-		delete map[key];
-	} else {
-		map = {};
-	}
-	return this;
+  if (typeof key === "string") {
+    delete map[key];
+  } else {
+    map = {};
+  }
+  return this;
 };
 
 exports.get = function (key, opts, createCb, returnCb) {
-	if (opts && opts.identityCache === false) {
-		return createCb(returnCb);
-	}
-	if (map.hasOwnProperty(key)) {
-		if (opts && opts.saveCheck && typeof map[key].o.saved === "function" && !map[key].o.saved()) {
-			// if not saved, don't return it, fetch original from db
-			return createCb(returnCb);
-		} else if (map[key].t !== null && map[key].t <= Date.now()) {
-			delete map[key];
-		} else  {
-			return returnCb(null, map[key].o);
-		}
-	}
+  if (opts && opts.identityCache === false) {
+    return createCb(returnCb);
+  }
+  if (map.hasOwnProperty(key)) {
+    if (opts && opts.saveCheck && typeof map[key].o.saved === "function" && !map[key].o.saved()) {
+      // if not saved, don't return it, fetch original from db
+      return createCb(returnCb);
+    } else if (map[key].t !== null && map[key].t <= Date.now()) {
+      delete map[key];
+    } else  {
+      return returnCb(null, map[key].o);
+    }
+  }
 
-	createCb(function (err, value) {
-		if (err) return returnCb(err);
+  createCb(function (err, value) {
+    if (err) return returnCb(err);
 
-		map[key] = { // object , timeout
-			o : value,
-			t : (opts && typeof opts.identityCache === "number" ? Date.now() + (opts.identityCache * 1000) : null)
-		};
-		return returnCb(null, map[key].o);
-	});
+    map[key] = { // object , timeout
+      o : value,
+      t : (opts && typeof opts.identityCache === "number" ? Date.now() + (opts.identityCache * 1000) : null)
+    };
+    return returnCb(null, map[key].o);
+  });
 };
diff --git a/lib/Utilities.js b/lib/Utilities.js
index e3c9859b..005c43a0 100644
--- a/lib/Utilities.js
+++ b/lib/Utilities.js
@@ -18,32 +18,32 @@ var _ = require('lodash')
  * ...
  */
 exports.standardizeOrder = function (order) {
-	if (typeof order === "string") {
-		if (order[0] === "-") {
-			return [ [ order.substr(1), "Z" ] ];
-		}
-		return [ [ order, "A" ] ];
-	}
-
-	var new_order = [], minus;
-
-	for (var i = 0; i < order.length; i++) {
-		minus = (order[i][0] === "-");
-
-		if (i < order.length - 1 && [ "A", "Z" ].indexOf(order[i + 1].toUpperCase()) >= 0) {
-			new_order.push([
-				(minus ? order[i].substr(1) : order[i]),
-				order[i + 1]
-			]);
-			i += 1;
-		} else if (minus) {
-			new_order.push([ order[i].substr(1), "Z" ]);
-		} else {
-			new_order.push([ order[i], "A" ]);
-		}
-	}
-
-	return new_order;
+  if (typeof order === "string") {
+    if (order[0] === "-") {
+      return [ [ order.substr(1), "Z" ] ];
+    }
+    return [ [ order, "A" ] ];
+  }
+
+  var new_order = [], minus;
+
+  for (var i = 0; i < order.length; i++) {
+    minus = (order[i][0] === "-");
+
+    if (i < order.length - 1 && [ "A", "Z" ].indexOf(order[i + 1].toUpperCase()) >= 0) {
+      new_order.push([
+        (minus ? order[i].substr(1) : order[i]),
+        order[i + 1]
+      ]);
+      i += 1;
+    } else if (minus) {
+      new_order.push([ order[i].substr(1), "Z" ]);
+    } else {
+      new_order.push([ order[i], "A" ]);
+    }
+  }
+
+  return new_order;
 };
 
 /**
@@ -56,54 +56,54 @@ exports.standardizeOrder = function (order) {
  * F) Itterate through values for the condition, only accept instances of the same type as the association
  */
 exports.checkConditions = function (conditions, one_associations) {
-	var k, i, j;
-
-	// A)
-	var associations = {};
-	for (i = 0; i < one_associations.length; i++) {
-		associations[one_associations[i].name] = one_associations[i];
-	}
-
-	for (k in conditions) {
-		// B)
-		if (!associations.hasOwnProperty(k)) continue;
-
-		// C)
-		var values = conditions[k];
-		if (!Array.isArray(values)) values = [values];
-
-		// D)
-		delete conditions[k];
-
-		// E)
-		var association_fields = Object.keys(associations[k].field);
-		var model = associations[k].model;
-
-		// F)
-		for (i = 0; i < values.length; i++) {
-			if (values[i].isInstance && values[i].model().uid === model.uid) {
-				if (association_fields.length === 1) {
-					if (typeof conditions[association_fields[0]] === 'undefined') {
-						conditions[association_fields[0]] = values[i][model.id[0]];
-					} else if(Array.isArray(conditions[association_fields[0]])) {
-						conditions[association_fields[0]].push(values[i][model.id[0]]);
-					} else {
-						conditions[association_fields[0]] = [conditions[association_fields[0]], values[i][model.id[0]]];
-					}
-				} else {
-					var _conds = {};
-					for (j = 0; j < association_fields.length; i++) {
-						_conds[association_fields[j]] = values[i][model.id[j]];
-					}
-
-					conditions.or = conditions.or || [];
-					conditions.or.push(_conds);
-				}
-			}
-		}
-	}
-
-	return conditions;
+  var k, i, j;
+
+  // A)
+  var associations = {};
+  for (i = 0; i < one_associations.length; i++) {
+    associations[one_associations[i].name] = one_associations[i];
+  }
+
+  for (k in conditions) {
+    // B)
+    if (!associations.hasOwnProperty(k)) continue;
+
+    // C)
+    var values = conditions[k];
+    if (!Array.isArray(values)) values = [values];
+
+    // D)
+    delete conditions[k];
+
+    // E)
+    var association_fields = Object.keys(associations[k].field);
+    var model = associations[k].model;
+
+    // F)
+    for (i = 0; i < values.length; i++) {
+      if (values[i].isInstance && values[i].model().uid === model.uid) {
+        if (association_fields.length === 1) {
+          if (typeof conditions[association_fields[0]] === 'undefined') {
+            conditions[association_fields[0]] = values[i][model.id[0]];
+          } else if(Array.isArray(conditions[association_fields[0]])) {
+            conditions[association_fields[0]].push(values[i][model.id[0]]);
+          } else {
+            conditions[association_fields[0]] = [conditions[association_fields[0]], values[i][model.id[0]]];
+          }
+        } else {
+          var _conds = {};
+          for (j = 0; j < association_fields.length; i++) {
+            _conds[association_fields[j]] = values[i][model.id[j]];
+          }
+
+          conditions.or = conditions.or || [];
+          conditions.or.push(_conds);
+        }
+      }
+    }
+  }
+
+  return conditions;
 };
 
 /**
@@ -111,237 +111,237 @@ exports.checkConditions = function (conditions, one_associations) {
  * using a keys array to get only specific values
  */
 exports.values = function (obj, keys) {
-	var i, k, vals = [];
-
-	if (keys) {
-		for (i = 0; i < keys.length; i++) {
-			vals.push(obj[keys[i]]);
-		}
-	} else if (Array.isArray(obj)) {
-		for (i = 0; i < obj.length; i++) {
-			vals.push(obj[i]);
-		}
-	} else {
-		for (k in obj) {
-			if (!/[0-9]+/.test(k)) {
-				vals.push(obj[k]);
-			}
-		}
-	}
-	return vals;
+  var i, k, vals = [];
+
+  if (keys) {
+    for (i = 0; i < keys.length; i++) {
+      vals.push(obj[keys[i]]);
+    }
+  } else if (Array.isArray(obj)) {
+    for (i = 0; i < obj.length; i++) {
+      vals.push(obj[i]);
+    }
+  } else {
+    for (k in obj) {
+      if (!/[0-9]+/.test(k)) {
+        vals.push(obj[k]);
+      }
+    }
+  }
+  return vals;
 };
 
 // Qn:       is Zero a valid value for a FK column?
 // Why?      Well I've got a pre-existing database that started all its 'serial' IDs at zero...
 // Answer:   hasValues() is only used in hasOne association, so it's probably ok...
 exports.hasValues = function (obj, keys) {
-	for (var i = 0; i < keys.length; i++) {
-		if (!obj[keys[i]] && obj[keys[i]] !== 0) return false;  // 0 is also a good value...
-	}
-	return true;
+  for (var i = 0; i < keys.length; i++) {
+    if (!obj[keys[i]] && obj[keys[i]] !== 0) return false;  // 0 is also a good value...
+  }
+  return true;
 };
 
 exports.populateConditions = function (model, fields, source, target, overwrite) {
-	for (var i = 0; i < model.id.length; i++) {
-		if (typeof target[fields[i]] === 'undefined' || overwrite !== false) {
-			target[fields[i]] = source[model.id[i]];
-		} else if (Array.isArray(target[fields[i]])) {
-			target[fields[i]].push(source[model.id[i]]);
-		} else {
-			target[fields[i]] = [target[fields[i]], source[model.id[i]]];
-		}
-	}
+  for (var i = 0; i < model.id.length; i++) {
+    if (typeof target[fields[i]] === 'undefined' || overwrite !== false) {
+      target[fields[i]] = source[model.id[i]];
+    } else if (Array.isArray(target[fields[i]])) {
+      target[fields[i]].push(source[model.id[i]]);
+    } else {
+      target[fields[i]] = [target[fields[i]], source[model.id[i]]];
+    }
+  }
 };
 
 exports.getConditions = function (model, fields, from) {
-	var conditions = {};
+  var conditions = {};
 
-	exports.populateConditions(model, fields, from, conditions);
+  exports.populateConditions(model, fields, from, conditions);
 
-	return conditions;
+  return conditions;
 };
 
 exports.wrapFieldObject = function (params) {
-	if (!params.field) {
-		var assoc_key = params.model.settings.get("properties.association_key");
-
-		if (typeof assoc_key === "function") {
-		    params.field = assoc_key(params.altName.toLowerCase(), params.model.id[0]);
-		} else {
-			params.field = assoc_key.replace("{name}", params.altName.toLowerCase())
-			               .replace("{field}", params.model.id[0]);
-		}
-	}
-
-	if (typeof params.field == 'object') {
-		for (var k in params.field) {
-			if (!/[0-9]+/.test(k) && params.field.hasOwnProperty(k)) {
-				return params.field;
-			}
-		}
-	}
-
-	var newObj = {}, newProp, propPreDefined, propFromKey;
-
-	propPreDefined = params.model.properties[params.field];
-	propFromKey    = params.model.properties[params.model.id[0]];
-	newProp        = { type: 'integer' };
-
-	var prop = _.cloneDeep(propPreDefined || propFromKey || newProp);
-
-	if (!propPreDefined) {
-		_.extend(prop, {
-			name: params.field, mapsTo: params.mapsTo || params.field
-		});
-	}
-
-	newObj[params.field] = prop;
-
-	return newObj;
+  if (!params.field) {
+    var assoc_key = params.model.settings.get("properties.association_key");
+
+    if (typeof assoc_key === "function") {
+        params.field = assoc_key(params.altName.toLowerCase(), params.model.id[0]);
+    } else {
+      params.field = assoc_key.replace("{name}", params.altName.toLowerCase())
+                     .replace("{field}", params.model.id[0]);
+    }
+  }
+
+  if (typeof params.field == 'object') {
+    for (var k in params.field) {
+      if (!/[0-9]+/.test(k) && params.field.hasOwnProperty(k)) {
+        return params.field;
+      }
+    }
+  }
+
+  var newObj = {}, newProp, propPreDefined, propFromKey;
+
+  propPreDefined = params.model.properties[params.field];
+  propFromKey    = params.model.properties[params.model.id[0]];
+  newProp        = { type: 'integer' };
+
+  var prop = _.cloneDeep(propPreDefined || propFromKey || newProp);
+
+  if (!propPreDefined) {
+    _.extend(prop, {
+      name: params.field, mapsTo: params.mapsTo || params.field
+    });
+  }
+
+  newObj[params.field] = prop;
+
+  return newObj;
 };
 
 exports.formatField = function (model, name, required, reversed) {
-	var fields = {}, field_opts, field_name;
-	var keys = model.id;
-	var assoc_key = model.settings.get("properties.association_key");
-
-	for (var i = 0; i < keys.length; i++) {
-		if (reversed) {
-			field_name = keys[i];
-		} else if (typeof assoc_key === "function") {
-			field_name = assoc_key(name.toLowerCase(), keys[i]);
-		} else {
-			field_name = assoc_key.replace("{name}", name.toLowerCase())
-			                      .replace("{field}", keys[i]);
-		}
-
-		if (model.properties.hasOwnProperty(keys[i])) {
-			var p = model.properties[keys[i]];
-
-			field_opts = {
-				type     : p.type || "integer",
-				size     : p.size || 4,
-				unsigned : p.unsigned || true,
-				time     : p.time || false,
-				big      : p.big || false,
-				values   : p.values || null,
-				required : required,
-				name     : field_name,
-				mapsTo   : field_name
-			};
-		} else {
-			field_opts = {
-				type     : "integer",
-				unsigned : true,
-				size     : 4,
-				required : required,
-				name     : field_name,
-				mapsTo   : field_name
-			};
-		}
-
-		fields[field_name] = field_opts;
-	}
-
-	return fields;
+  var fields = {}, field_opts, field_name;
+  var keys = model.id;
+  var assoc_key = model.settings.get("properties.association_key");
+
+  for (var i = 0; i < keys.length; i++) {
+    if (reversed) {
+      field_name = keys[i];
+    } else if (typeof assoc_key === "function") {
+      field_name = assoc_key(name.toLowerCase(), keys[i]);
+    } else {
+      field_name = assoc_key.replace("{name}", name.toLowerCase())
+                            .replace("{field}", keys[i]);
+    }
+
+    if (model.properties.hasOwnProperty(keys[i])) {
+      var p = model.properties[keys[i]];
+
+      field_opts = {
+        type     : p.type || "integer",
+        size     : p.size || 4,
+        unsigned : p.unsigned || true,
+        time     : p.time || false,
+        big      : p.big || false,
+        values   : p.values || null,
+        required : required,
+        name     : field_name,
+        mapsTo   : field_name
+      };
+    } else {
+      field_opts = {
+        type     : "integer",
+        unsigned : true,
+        size     : 4,
+        required : required,
+        name     : field_name,
+        mapsTo   : field_name
+      };
+    }
+
+    fields[field_name] = field_opts;
+  }
+
+  return fields;
 };
 
 // If the parent associations key is `serial`, the join tables
 // key should be changed to `integer`.
 exports.convertPropToJoinKeyProp = function (props, opts) {
-	var prop;
+  var prop;
 
-	for (var k in props) {
-		prop = props[k];
+  for (var k in props) {
+    prop = props[k];
 
-		prop.required = opts.required;
+    prop.required = opts.required;
 
-		if (prop.type == 'serial') {
-			prop.type = 'integer';
-		}
-		if (opts.makeKey) {
-			prop.key = true;
-		} else {
-			delete prop.key;
-		}
-	}
+    if (prop.type == 'serial') {
+      prop.type = 'integer';
+    }
+    if (opts.makeKey) {
+      prop.key = true;
+    } else {
+      delete prop.key;
+    }
+  }
 
-	return props;
+  return props;
 }
 
 exports.getRealPath = function (path_str, stack_index) {
-	var path = require("path"); // for now, load here (only when needed)
-	var cwd = process.cwd();
-	var err = new Error();
-	var tmp = err.stack.split(/\r?\n/)[typeof stack_index !== "undefined" ? stack_index : 3], m;
-
-	if ((m = tmp.match(/^\s*at\s+(.+):\d+:\d+$/)) !== null) {
-		cwd = path.dirname(m[1]);
-	} else if ((m = tmp.match(/^\s*at\s+module\.exports\s+\((.+?)\)/)) !== null) {
-		cwd = path.dirname(m[1]);
-	} else if ((m = tmp.match(/^\s*at\s+.+\s+\((.+):\d+:\d+\)$/)) !== null) {
-		cwd = path.dirname(m[1]);
-	}
-	var pathIsAbsolute = path.isAbsolute || require('path-is-absolute');
-	if (!pathIsAbsolute(path_str)) {
-		path_str = path.join(cwd, path_str);
-	}
-	if (path_str.substr(-1) === path.sep) {
-		path_str += "index";
-	}
-
-	return path_str;
+  var path = require("path"); // for now, load here (only when needed)
+  var cwd = process.cwd();
+  var err = new Error();
+  var tmp = err.stack.split(/\r?\n/)[typeof stack_index !== "undefined" ? stack_index : 3], m;
+
+  if ((m = tmp.match(/^\s*at\s+(.+):\d+:\d+$/)) !== null) {
+    cwd = path.dirname(m[1]);
+  } else if ((m = tmp.match(/^\s*at\s+module\.exports\s+\((.+?)\)/)) !== null) {
+    cwd = path.dirname(m[1]);
+  } else if ((m = tmp.match(/^\s*at\s+.+\s+\((.+):\d+:\d+\)$/)) !== null) {
+    cwd = path.dirname(m[1]);
+  }
+  var pathIsAbsolute = path.isAbsolute || require('path-is-absolute');
+  if (!pathIsAbsolute(path_str)) {
+    path_str = path.join(cwd, path_str);
+  }
+  if (path_str.substr(-1) === path.sep) {
+    path_str += "index";
+  }
+
+  return path_str;
 };
 
 exports.transformPropertyNames = function (dataIn, properties) {
-	var k, prop;
-	var dataOut = {};
-
-	for (k in dataIn) {
-		prop = properties[k];
-		if (prop) {
-			dataOut[prop.mapsTo] = dataIn[k];
-		} else {
-			dataOut[k] = dataIn[k];
-		}
-	}
-	return dataOut;
+  var k, prop;
+  var dataOut = {};
+
+  for (k in dataIn) {
+    prop = properties[k];
+    if (prop) {
+      dataOut[prop.mapsTo] = dataIn[k];
+    } else {
+      dataOut[k] = dataIn[k];
+    }
+  }
+  return dataOut;
 };
 
 exports.transformOrderPropertyNames = function (order, properties) {
-	if (!order) return order;
-
-	var i, item;
-	var newOrder = JSON.parse(JSON.stringify(order));
-
-	// Rename order properties according to mapsTo
-	for (var i = 0; i < newOrder.length; i++) {
-		item = newOrder[i];
-
-		// orderRaw
-		if (Array.isArray(item[1])) continue;
-
-		if (Array.isArray(item[0])) {
-			// order on a hasMany
-			// [ ['modelName', 'propName'], 'Z']
-			item[0][1] = properties[item[0][1]].mapsTo;
-		} else {
-			// normal order
-			item[0] = properties[item[0]].mapsTo;
-		}
-	}
-	return newOrder;
+  if (!order) return order;
+
+  var i, item;
+  var newOrder = JSON.parse(JSON.stringify(order));
+
+  // Rename order properties according to mapsTo
+  for (var i = 0; i < newOrder.length; i++) {
+    item = newOrder[i];
+
+    // orderRaw
+    if (Array.isArray(item[1])) continue;
+
+    if (Array.isArray(item[0])) {
+      // order on a hasMany
+      // [ ['modelName', 'propName'], 'Z']
+      item[0][1] = properties[item[0][1]].mapsTo;
+    } else {
+      // normal order
+      item[0] = properties[item[0]].mapsTo;
+    }
+  }
+  return newOrder;
 }
 
 exports.renameDatastoreFieldsToPropertyNames = function (data, fieldToPropertyMap) {
-	var k, prop;
-
-	for (k in data) {
-		prop = fieldToPropertyMap[k];
-		if (prop && prop.name != k) {
-			data[prop.name] = data[k];
-			delete data[k];
-		}
-	}
-	return data;
+  var k, prop;
+
+  for (k in data) {
+    prop = fieldToPropertyMap[k];
+    if (prop && prop.name != k) {
+      data[prop.name] = data[k];
+      delete data[k];
+    }
+  }
+  return data;
 }
diff --git a/lib/Validators.js b/lib/Validators.js
index 5cb94889..ec30f082 100644
--- a/lib/Validators.js
+++ b/lib/Validators.js
@@ -2,18 +2,18 @@ var enforce = require("enforce");
 var util    = require("util");
 
 var validators = {
-	required       : enforce.required,
-	notEmptyString : enforce.notEmptyString,
+  required       : enforce.required,
+  notEmptyString : enforce.notEmptyString,
 
-	rangeNumber    : enforce.ranges.number,
-	rangeLength    : enforce.ranges.length,
+  rangeNumber    : enforce.ranges.number,
+  rangeLength    : enforce.ranges.length,
 
-	insideList     : enforce.lists.inside,
-	outsideList    : enforce.lists.outside,
+  insideList     : enforce.lists.inside,
+  outsideList    : enforce.lists.outside,
 
-	password       : enforce.security.password,
+  password       : enforce.security.password,
 
-	patterns       : enforce.patterns
+  patterns       : enforce.patterns
 };
 
 
@@ -23,12 +23,12 @@ var validators = {
  * checking).
  **/
 validators.equalToProperty = function (name, msg) {
-	return function (v, next) {
-		if (v === this[name]) {
-			return next();
-		}
-		return next(msg || 'not-equal-to-property');
-	};
+  return function (v, next) {
+    if (v === this[name]) {
+      return next();
+    }
+    return next(msg || 'not-equal-to-property');
+  };
 };
 
 /**
@@ -46,77 +46,77 @@ validators.equalToProperty = function (name, msg) {
  *   scope: (Array) scope uniqueness to listed properties
  **/
 validators.unique = function () {
-	var arg, k;
-	var msg = null, opts = {};
-
-	for (k in arguments) {
-		arg = arguments[k];
-		if (typeof arg === "string") {
-			msg = arg;
-		} else if (typeof arg === "object") {
-			opts = arg;
-		}
-	}
-
-	return function (v, next, ctx) {
-		var s, scopeProp;
-
-		if (typeof v === "undefined" || v === null) {
-			return next();
-		}
-
-		//Cannot process on database engines which don't support SQL syntax
-		if (!ctx.driver.isSql) {
-			return next('not-supported');
-		}
-
-		var chain = ctx.model.find();
-
-		var chainQuery = function (prop, value) {
-			var query = null;
-
-			if (opts.ignoreCase === true && ctx.model.properties[prop] && ctx.model.properties[prop].type === 'text') {
-				query = util.format('LOWER(%s.%s) LIKE LOWER(?)',
-					ctx.driver.query.escapeId(ctx.model.table), ctx.driver.query.escapeId(prop)
-				);
-				chain.where(query, [value]);
-			} else {
-				query = {};
-				query[prop] = value;
-				chain.where(query);
-			}
-		};
-
-		var handler = function (err, records) {
-			if (err) {
-				return next();
-			}
-			if (!records || records.length === 0) {
-				return next();
-			}
-			if (records.length === 1 && records[0][ctx.model.id] === this[ctx.model.id]) {
-				return next();
-			}
-			return next(msg || 'not-unique');
-		}.bind(this);
-
-		chainQuery(ctx.property, v);
-
-		if (opts.scope) {
-			for (s in opts.scope) {
-				scopeProp = opts.scope[s];
-
-				// In SQL unique index land, NULL values are not considered equal.
-				if (typeof ctx.instance[scopeProp] == 'undefined' || ctx.instance[scopeProp] === null) {
-					return next();
-				}
-
-				chainQuery(scopeProp, ctx.instance[scopeProp]);
-			}
-		}
-
-		chain.all(handler);
-	};
+  var arg, k;
+  var msg = null, opts = {};
+
+  for (k in arguments) {
+    arg = arguments[k];
+    if (typeof arg === "string") {
+      msg = arg;
+    } else if (typeof arg === "object") {
+      opts = arg;
+    }
+  }
+
+  return function (v, next, ctx) {
+    var s, scopeProp;
+
+    if (typeof v === "undefined" || v === null) {
+      return next();
+    }
+
+    //Cannot process on database engines which don't support SQL syntax
+    if (!ctx.driver.isSql) {
+      return next('not-supported');
+    }
+
+    var chain = ctx.model.find();
+
+    var chainQuery = function (prop, value) {
+      var query = null;
+
+      if (opts.ignoreCase === true && ctx.model.properties[prop] && ctx.model.properties[prop].type === 'text') {
+        query = util.format('LOWER(%s.%s) LIKE LOWER(?)',
+          ctx.driver.query.escapeId(ctx.model.table), ctx.driver.query.escapeId(prop)
+        );
+        chain.where(query, [value]);
+      } else {
+        query = {};
+        query[prop] = value;
+        chain.where(query);
+      }
+    };
+
+    var handler = function (err, records) {
+      if (err) {
+        return next();
+      }
+      if (!records || records.length === 0) {
+        return next();
+      }
+      if (records.length === 1 && records[0][ctx.model.id] === this[ctx.model.id]) {
+        return next();
+      }
+      return next(msg || 'not-unique');
+    }.bind(this);
+
+    chainQuery(ctx.property, v);
+
+    if (opts.scope) {
+      for (s in opts.scope) {
+        scopeProp = opts.scope[s];
+
+        // In SQL unique index land, NULL values are not considered equal.
+        if (typeof ctx.instance[scopeProp] == 'undefined' || ctx.instance[scopeProp] === null) {
+          return next();
+        }
+
+        chainQuery(scopeProp, ctx.instance[scopeProp]);
+      }
+    }
+
+    chain.all(handler);
+  };
 };
 
 module.exports = validators;
diff --git a/package.json b/package.json
index 2bab8ae3..424d140a 100644
--- a/package.json
+++ b/package.json
@@ -1,84 +1,84 @@
 {
-	"author": "Diogo Resende <dresende@thinkdigital.pt>",
-	"name": "orm",
-	"description": "NodeJS Object-relational mapping",
-	"keywords": [
-		"orm",
-		"odm",
-		"database",
-		"mysql",
-		"postgres",
-		"redshift",
-		"sqlite",
-		"mongodb"
-	],
-	"version": "3.2.4",
-	"license": "MIT",
-	"homepage": "http://dresende.github.io/node-orm2",
-	"repository": "http://github.com/dresende/node-orm2.git",
-	"contributors": [
-		{
-			"name": "Bramus Van Damme",
-			"email": "bramus@bram.us"
-		},
-		{
-			"name": "Lorien Gamaroff",
-			"email": "lorien@gamaroff.org"
-		},
-		{
-			"name": "preslavrachev"
-		},
-		{
-			"name": "Chris Cowan",
-			"email": "me@chriscowan.us"
-		},
-		{
-			"name": "Paul Dixon",
-			"email": "paul.dixon@mintbridge.co.uk"
-		},
-		{
-			"name": "David Kosub"
-		},
-		{
-			"name": "Arek W",
-			"email": "arek01@gmail.com"
-		},
-		{
-			"name": "Joseph Gilley",
-			"email": "joe.gilley@gmail.com"
-		},
-		{
-			"name": "Benjamin Pannell",
-			"email": "admin@sierrasoftworks.com"
-		}
-	],
-	"main": "./lib/ORM",
-	"scripts": {
-		"test": "make test"
-	},
-	"engines": {
-		"node": "*"
-	},
-	"analyse": false,
-	"dependencies": {
-		"async": "2.5.0",
-		"enforce": "0.1.7",
-		"hat": "0.0.3",
-		"lodash": "4.17.4",
-		"path-is-absolute": "1.0.1",
-		"sql-query": "0.1.26",
-		"sql-ddl-sync": "0.3.13"
-	},
-	"devDependencies": {
-		"chalk": "2.0.1",
-		"glob": "7.1.2",
-		"mocha": "3.4.2",
-		"mongodb": "1.4.10",
-		"mysql": "2.13.0",
-		"pg": "6.4.1",
-		"semver": "5.3.0",
-		"should": "11.2.1",
-		"sqlite3": "3.1.8"
-	},
-	"optionalDependencies": {}
+  "author": "Diogo Resende <dresende@thinkdigital.pt>",
+  "name": "orm",
+  "description": "NodeJS Object-relational mapping",
+  "keywords": [
+    "orm",
+    "odm",
+    "database",
+    "mysql",
+    "postgres",
+    "redshift",
+    "sqlite",
+    "mongodb"
+  ],
+  "version": "3.2.4",
+  "license": "MIT",
+  "homepage": "http://dresende.github.io/node-orm2",
+  "repository": "http://github.com/dresende/node-orm2.git",
+  "contributors": [
+    {
+      "name": "Bramus Van Damme",
+      "email": "bramus@bram.us"
+    },
+    {
+      "name": "Lorien Gamaroff",
+      "email": "lorien@gamaroff.org"
+    },
+    {
+      "name": "preslavrachev"
+    },
+    {
+      "name": "Chris Cowan",
+      "email": "me@chriscowan.us"
+    },
+    {
+      "name": "Paul Dixon",
+      "email": "paul.dixon@mintbridge.co.uk"
+    },
+    {
+      "name": "David Kosub"
+    },
+    {
+      "name": "Arek W",
+      "email": "arek01@gmail.com"
+    },
+    {
+      "name": "Joseph Gilley",
+      "email": "joe.gilley@gmail.com"
+    },
+    {
+      "name": "Benjamin Pannell",
+      "email": "admin@sierrasoftworks.com"
+    }
+  ],
+  "main": "./lib/ORM",
+  "scripts": {
+    "test": "make test"
+  },
+  "engines": {
+    "node": "*"
+  },
+  "analyse": false,
+  "dependencies": {
+    "async": "2.5.0",
+    "enforce": "0.1.7",
+    "hat": "0.0.3",
+    "lodash": "4.17.4",
+    "path-is-absolute": "1.0.1",
+    "sql-query": "0.1.26",
+    "sql-ddl-sync": "0.3.13"
+  },
+  "devDependencies": {
+    "chalk": "2.0.1",
+    "glob": "7.1.2",
+    "mocha": "3.4.2",
+    "mongodb": "1.4.10",
+    "mysql": "2.13.0",
+    "pg": "6.4.1",
+    "semver": "5.3.0",
+    "should": "11.2.1",
+    "sqlite3": "3.1.8"
+  },
+  "optionalDependencies": {}
 }
diff --git a/test/common.js b/test/common.js
index 3541ba4e..0a6cb74b 100644
--- a/test/common.js
+++ b/test/common.js
@@ -10,163 +10,163 @@ var ORM         = require('../');
 common.ORM = ORM;
 
 common.protocol = function () {
-	return process.env.ORM_PROTOCOL;
+  return process.env.ORM_PROTOCOL;
 };
 
 common.isTravis = function() {
-	return Boolean(process.env.CI);
+  return Boolean(process.env.CI);
 };
 
 common.createConnection = function(opts, cb) {
-	ORM.connect(this.getConnectionString(opts), cb);
+  ORM.connect(this.getConnectionString(opts), cb);
 };
 
 common.hasConfig = function (proto) {
-	var config;
+  var config;
 
-	if (common.isTravis()) return 'found';
+  if (common.isTravis()) return 'found';
 
-	try {
-		config = require("./config");
-	} catch (ex) {
-		return 'not-found';
-	}
+  try {
+    config = require("./config");
+  } catch (ex) {
+    return 'not-found';
+  }
 
-	return (config.hasOwnProperty(proto) ? 'found' : 'not-defined');
+  return (config.hasOwnProperty(proto) ? 'found' : 'not-defined');
 };
 
 common.getConfig = function () {
-	if (common.isTravis()) {
-		switch (this.protocol()) {
-			case 'mysql':
-				return { user: "root", host: "localhost", database: "orm_test" };
-			case 'postgres':
-			case 'redshift':
-				return { user: "postgres", host: "localhost", database: "orm_test" };
-			case 'sqlite':
-				return {};
-			case 'mongodb':
-				return { host: "localhost", database: "test" };
-			default:
-				throw new Error("Unknown protocol");
-		}
-	} else {
-		var config = require("./config")[this.protocol()];
-		if (typeof config == "string") {
-			config = require("url").parse(config);
-		}
-		if (config.hasOwnProperty("auth")) {
-			if (config.auth.indexOf(":") >= 0) {
-				config.user = config.auth.substr(0, config.auth.indexOf(":"));
-				config.password = config.auth.substr(config.auth.indexOf(":") + 1);
-			} else {
-				config.user = config.auth;
-				config.password = "";
-			}
-		}
-		if (config.hostname) {
-			config.host = config.hostname;
-		}
-
-		return config;
-	}
+  if (common.isTravis()) {
+    switch (this.protocol()) {
+      case 'mysql':
+        return { user: "root", host: "localhost", database: "orm_test" };
+      case 'postgres':
+      case 'redshift':
+        return { user: "postgres", host: "localhost", database: "orm_test" };
+      case 'sqlite':
+        return {};
+      case 'mongodb':
+        return { host: "localhost", database: "test" };
+      default:
+        throw new Error("Unknown protocol");
+    }
+  } else {
+    var config = require("./config")[this.protocol()];
+    if (typeof config == "string") {
+      config = require("url").parse(config);
+    }
+    if (config.hasOwnProperty("auth")) {
+      if (config.auth.indexOf(":") >= 0) {
+        config.user = config.auth.substr(0, config.auth.indexOf(":"));
+        config.password = config.auth.substr(config.auth.indexOf(":") + 1);
+      } else {
+        config.user = config.auth;
+        config.password = "";
+      }
+    }
+    if (config.hostname) {
+      config.host = config.hostname;
+    }
+
+    return config;
+  }
 };
 
 common.getConnectionString = function (opts) {
-	var config   = this.getConfig();
-	var protocol = this.protocol();
-	var query;
-
-	_.defaults(config, {
-		user     : { postgres: 'postgres', redshift: 'postgres', mongodb: '' }[protocol] || 'root',
-		database : { mongodb:  'test'     }[protocol] || 'orm_test',
-		password : '',
-		host     : 'localhost',
-		pathname : '',
-		query    : {}
-	});
-	_.merge(config, opts || {});
-
-	query = querystring.stringify(config.query);
-
-	switch (protocol) {
-		case 'mysql':
-		case 'postgres':
-		case 'redshift':
-		case 'mongodb':
-			if (common.isTravis()) {
-				if (protocol == 'redshift') protocol = 'postgres';
-				return util.format("%s://%s@%s/%s?%s",
-					protocol, config.user, config.host, config.database, query
-				);
-			} else {
-				return util.format("%s://%s:%s@%s/%s?%s",
-					protocol, config.user, config.password,
-					config.host, config.database, query
-				).replace(':@','@');
-			}
-		case 'sqlite':
-			return util.format("%s://%s?%s", protocol, config.pathname, query);
-		default:
-			throw new Error("Unknown protocol " + protocol);
-	}
+  var config   = this.getConfig();
+  var protocol = this.protocol();
+  var query;
+
+  _.defaults(config, {
+    user     : { postgres: 'postgres', redshift: 'postgres', mongodb: '' }[protocol] || 'root',
+    database : { mongodb:  'test'     }[protocol] || 'orm_test',
+    password : '',
+    host     : 'localhost',
+    pathname : '',
+    query    : {}
+  });
+  _.merge(config, opts || {});
+
+  query = querystring.stringify(config.query);
+
+  switch (protocol) {
+    case 'mysql':
+    case 'postgres':
+    case 'redshift':
+    case 'mongodb':
+      if (common.isTravis()) {
+        if (protocol == 'redshift') protocol = 'postgres';
+        return util.format("%s://%s@%s/%s?%s",
+          protocol, config.user, config.host, config.database, query
+        );
+      } else {
+        return util.format("%s://%s:%s@%s/%s?%s",
+          protocol, config.user, config.password,
+          config.host, config.database, query
+        ).replace(':@','@');
+      }
+    case 'sqlite':
+      return util.format("%s://%s?%s", protocol, config.pathname, query);
+    default:
+      throw new Error("Unknown protocol " + protocol);
+  }
 };
 
 common.retry = function (before, run, until, done, args) {
-	if (typeof until === "number") {
-		var countDown = until;
-		until = function (err) {
-			if (err && --countDown > 0) return false;
-			return true;
-		};
-	}
-
-	if (typeof args === "undefined") args = [];
-
-	var handler = function (err) {
-		if (until(err)) return done.apply(this, arguments);
-		return runNext();
-	};
-
-	args.push(handler);
-
-	var runCurrent = function () {
-		if (run.length == args.length) {
-			return run.apply(this, args);
-		} else {
-			run.apply(this, args);
-			handler();
-		}
-	};
-
-	var runNext = function () {
-		try {
-			if (before.length > 0) {
-				before(function (err) {
-					if (until(err)) return done(err);
-					return runCurrent();
-				});
-			} else {
-				before();
-				runCurrent();
-			}
-		}
-		catch (e) {
-			handler(e);
-		}
-	};
-
-	if (before.length > 0) {
-		before(function (err) {
-			if (err) return done(err);
-			runNext();
-		});
-	} else {
-		before();
-		runNext();
-	}
+  if (typeof until === "number") {
+    var countDown = until;
+    until = function (err) {
+      if (err && --countDown > 0) return false;
+      return true;
+    };
+  }
+
+  if (typeof args === "undefined") args = [];
+
+  var handler = function (err) {
+    if (until(err)) return done.apply(this, arguments);
+    return runNext();
+  };
+
+  args.push(handler);
+
+  var runCurrent = function () {
+    if (run.length == args.length) {
+      return run.apply(this, args);
+    } else {
+      run.apply(this, args);
+      handler();
+    }
+  };
+
+  var runNext = function () {
+    try {
+      if (before.length > 0) {
+        before(function (err) {
+          if (until(err)) return done(err);
+          return runCurrent();
+        });
+      } else {
+        before();
+        runCurrent();
+      }
+    }
+    catch (e) {
+      handler(e);
+    }
+  };
+
+  if (before.length > 0) {
+    before(function (err) {
+      if (err) return done(err);
+      runNext();
+    });
+  } else {
+    before();
+    runNext();
+  }
 };
 
 common.nodeVersion = function () {
-	return new Semver(process.versions.node);
+  return new Semver(process.versions.node);
 }
diff --git a/test/config.example.js b/test/config.example.js
index 81c2ed8f..bb9c2d73 100644
--- a/test/config.example.js
+++ b/test/config.example.js
@@ -8,19 +8,19 @@
 // make test
 
 exports.mysql = {
-	user     : "root",
-	password : "",
-	database : "test"
+  user     : "root",
+  password : "",
+  database : "test"
 };
 exports.postgres = {
-	user     : "root",
-	password : "",
-	database : "test"
+  user     : "root",
+  password : "",
+  database : "test"
 };
 exports.redshift = {
-	user      : "root",
-	password  : "",
-	database  : "test"
+  user      : "root",
+  password  : "",
+  database  : "test"
 };
 exports.mongodb = {
     host: "localhost",
diff --git a/test/integration/association-extend.js b/test/integration/association-extend.js
index 9fe36f28..ea7a7e93 100644
--- a/test/integration/association-extend.js
+++ b/test/integration/association-extend.js
@@ -3,248 +3,248 @@ var helper   = require('../support/spec_helper');
 var ORM      = require('../../');
 
 describe("Model.extendsTo()", function() {
-	var db = null;
-	var Person = null;
-	var PersonAddress = null;
-
-	var setup = function () {
-		return function (done) {
-			Person = db.define("person", {
-				name   : String
-			});
-			PersonAddress = Person.extendsTo("address", {
-				street : String,
-				number : Number
-			});
-
-			ORM.singleton.clear();
-
-			return helper.dropSync([ Person, PersonAddress ], function () {
-				Person.create({
-					name: "John Doe"
-				}, function (err, person) {
-					should.not.exist(err);
-
-					return person.setAddress(new PersonAddress({
-						street : "Liberty",
-						number : 123
-					}), done);
-				});
-			});
-		};
-	};
-
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
-
-			return done();
-		});
-	});
-
-	after(function () {
-		return db.close();
-	});
-
-	describe("when calling hasAccessor", function () {
-		before(setup());
-
-		it("should return true if found", function (done) {
-			Person.find().first(function (err, John) {
-				should.equal(err, null);
-
-				John.hasAddress(function (err, hasAddress) {
-					should.equal(err, null);
-					hasAddress.should.equal(true);
-
-					return done();
-				});
-			});
-		});
-
-		it("should return false if not found", function (done) {
-			Person.find().first(function (err, John) {
-				should.equal(err, null);
-
-				John.removeAddress(function () {
-					John.hasAddress(function (err, hasAddress) {
-						err.should.be.a.Object();
-						hasAddress.should.equal(false);
-
-						return done();
-					});
-				});
-			});
-		});
-
-		it("should return error if instance not with an ID", function (done) {
-			var Jane = new Person({
-				name: "Jane"
-			});
-			Jane.hasAddress(function (err, hasAddress) {
-				err.should.be.a.Object();
-				err.should.have.property("code", ORM.ErrorCodes.NOT_DEFINED);
-
-				return done();
-			});
-		});
-	});
-
-	describe("when calling getAccessor", function () {
-		before(setup());
-
-		it("should return extension if found", function (done) {
-			Person.find().first(function (err, John) {
-				should.equal(err, null);
-
-				John.getAddress(function (err, Address) {
-					should.equal(err, null);
-					Address.should.be.a.Object();
-					Address.should.have.property("street", "Liberty");
-
-					return done();
-				});
-			});
-		});
-
-		it("should return error if not found", function (done) {
-			Person.find().first(function (err, John) {
-				should.equal(err, null);
-
-				John.removeAddress(function () {
-					John.getAddress(function (err, Address) {
-						err.should.be.a.Object();
-						err.should.have.property("code", ORM.ErrorCodes.NOT_FOUND);
-
-						return done();
-					});
-				});
-			});
-		});
-
-		it("should return error if instance not with an ID", function (done) {
-			var Jane = new Person({
-				name: "Jane"
-			});
-			Jane.getAddress(function (err, Address) {
-				err.should.be.a.Object();
-				err.should.have.property("code", ORM.ErrorCodes.NOT_DEFINED);
-
-				return done();
-			});
-		});
-	});
-
-	describe("when calling setAccessor", function () {
-		before(setup());
-
-		it("should remove any previous extension", function (done) {
-			Person.find().first(function (err, John) {
-				should.equal(err, null);
-
-				PersonAddress.find({ number: 123 }).count(function (err, c) {
-					should.equal(err, null);
-					c.should.equal(1);
-
-					var addr = new PersonAddress({
-						street : "4th Ave",
-						number : 4
-					});
-
-					John.setAddress(addr, function (err) {
-						should.equal(err, null);
-
-						John.getAddress(function (err, Address) {
-							should.equal(err, null);
-							Address.should.be.a.Object();
-							Address.should.have.property("street", addr.street);
-
-							PersonAddress.find({ number: 123 }).count(function (err, c) {
-								should.equal(err, null);
-								c.should.equal(0);
-
-								return done();
-							});
-						});
-					});
-				});
-			});
-		});
-	});
-
-	describe("when calling delAccessor", function () {
-		before(setup());
-
-		it("should remove any extension", function (done) {
-			Person.find().first(function (err, John) {
-				should.equal(err, null);
-
-				PersonAddress.find({ number: 123 }).count(function (err, c) {
-					should.equal(err, null);
-					c.should.equal(1);
-
-					var addr = new PersonAddress({
-						street : "4th Ave",
-						number : 4
-					});
-
-					John.removeAddress(function (err) {
-						should.equal(err, null);
-
-						PersonAddress.find({ number: 123 }).count(function (err, c) {
-							should.equal(err, null);
-							c.should.equal(0);
-
-							return done();
-						});
-					});
-				});
-			});
-		});
-
-		it("should return error if instance not with an ID", function (done) {
-			var Jane = new Person({
-				name: "Jane"
-			});
-			Jane.removeAddress(function (err) {
-				err.should.be.a.Object();
-				err.should.have.property("code", ORM.ErrorCodes.NOT_DEFINED);
-
-				return done();
-			});
-		});
-	});
-
-	describe("findBy()", function () {
-		before(setup());
-
-		it("should throw if no conditions passed", function (done) {
-			(function () {
-				Person.findByAddress(function () {});
-			}).should.throw();
-
-			return done();
-		});
-
-		it("should lookup in Model based on associated model properties", function (done) {
-			Person.findByAddress({
-				number: 123
-			}, function (err, people) {
-				should.equal(err, null);
-				should(Array.isArray(people));
-				should(people.length == 1);
-
-				return done();
-			});
-		});
-
-		it("should return a ChainFind if no callback passed", function (done) {
-			var ChainFind = Person.findByAddress({
-				number: 123
-			});
-			ChainFind.run.should.be.a.Function();
-
-			return done();
-		});
-	});
+  var db = null;
+  var Person = null;
+  var PersonAddress = null;
+
+  var setup = function () {
+    return function (done) {
+      Person = db.define("person", {
+        name   : String
+      });
+      PersonAddress = Person.extendsTo("address", {
+        street : String,
+        number : Number
+      });
+
+      ORM.singleton.clear();
+
+      return helper.dropSync([ Person, PersonAddress ], function () {
+        Person.create({
+          name: "John Doe"
+        }, function (err, person) {
+          should.not.exist(err);
+
+          return person.setAddress(new PersonAddress({
+            street : "Liberty",
+            number : 123
+          }), done);
+        });
+      });
+    };
+  };
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  describe("when calling hasAccessor", function () {
+    before(setup());
+
+    it("should return true if found", function (done) {
+      Person.find().first(function (err, John) {
+        should.equal(err, null);
+
+        John.hasAddress(function (err, hasAddress) {
+          should.equal(err, null);
+          hasAddress.should.equal(true);
+
+          return done();
+        });
+      });
+    });
+
+    it("should return false if not found", function (done) {
+      Person.find().first(function (err, John) {
+        should.equal(err, null);
+
+        John.removeAddress(function () {
+          John.hasAddress(function (err, hasAddress) {
+            err.should.be.a.Object();
+            hasAddress.should.equal(false);
+
+            return done();
+          });
+        });
+      });
+    });
+
+    it("should return error if instance not with an ID", function (done) {
+      var Jane = new Person({
+        name: "Jane"
+      });
+      Jane.hasAddress(function (err, hasAddress) {
+        err.should.be.a.Object();
+        err.should.have.property("code", ORM.ErrorCodes.NOT_DEFINED);
+
+        return done();
+      });
+    });
+  });
+
+  describe("when calling getAccessor", function () {
+    before(setup());
+
+    it("should return extension if found", function (done) {
+      Person.find().first(function (err, John) {
+        should.equal(err, null);
+
+        John.getAddress(function (err, Address) {
+          should.equal(err, null);
+          Address.should.be.a.Object();
+          Address.should.have.property("street", "Liberty");
+
+          return done();
+        });
+      });
+    });
+
+    it("should return error if not found", function (done) {
+      Person.find().first(function (err, John) {
+        should.equal(err, null);
+
+        John.removeAddress(function () {
+          John.getAddress(function (err, Address) {
+            err.should.be.a.Object();
+            err.should.have.property("code", ORM.ErrorCodes.NOT_FOUND);
+
+            return done();
+          });
+        });
+      });
+    });
+
+    it("should return error if instance not with an ID", function (done) {
+      var Jane = new Person({
+        name: "Jane"
+      });
+      Jane.getAddress(function (err, Address) {
+        err.should.be.a.Object();
+        err.should.have.property("code", ORM.ErrorCodes.NOT_DEFINED);
+
+        return done();
+      });
+    });
+  });
+
+  describe("when calling setAccessor", function () {
+    before(setup());
+
+    it("should remove any previous extension", function (done) {
+      Person.find().first(function (err, John) {
+        should.equal(err, null);
+
+        PersonAddress.find({ number: 123 }).count(function (err, c) {
+          should.equal(err, null);
+          c.should.equal(1);
+
+          var addr = new PersonAddress({
+            street : "4th Ave",
+            number : 4
+          });
+
+          John.setAddress(addr, function (err) {
+            should.equal(err, null);
+
+            John.getAddress(function (err, Address) {
+              should.equal(err, null);
+              Address.should.be.a.Object();
+              Address.should.have.property("street", addr.street);
+
+              PersonAddress.find({ number: 123 }).count(function (err, c) {
+                should.equal(err, null);
+                c.should.equal(0);
+
+                return done();
+              });
+            });
+          });
+        });
+      });
+    });
+  });
+
+  describe("when calling delAccessor", function () {
+    before(setup());
+
+    it("should remove any extension", function (done) {
+      Person.find().first(function (err, John) {
+        should.equal(err, null);
+
+        PersonAddress.find({ number: 123 }).count(function (err, c) {
+          should.equal(err, null);
+          c.should.equal(1);
+
+          var addr = new PersonAddress({
+            street : "4th Ave",
+            number : 4
+          });
+
+          John.removeAddress(function (err) {
+            should.equal(err, null);
+
+            PersonAddress.find({ number: 123 }).count(function (err, c) {
+              should.equal(err, null);
+              c.should.equal(0);
+
+              return done();
+            });
+          });
+        });
+      });
+    });
+
+    it("should return error if instance not with an ID", function (done) {
+      var Jane = new Person({
+        name: "Jane"
+      });
+      Jane.removeAddress(function (err) {
+        err.should.be.a.Object();
+        err.should.have.property("code", ORM.ErrorCodes.NOT_DEFINED);
+
+        return done();
+      });
+    });
+  });
+
+  describe("findBy()", function () {
+    before(setup());
+
+    it("should throw if no conditions passed", function (done) {
+      (function () {
+        Person.findByAddress(function () {});
+      }).should.throw();
+
+      return done();
+    });
+
+    it("should lookup in Model based on associated model properties", function (done) {
+      Person.findByAddress({
+        number: 123
+      }, function (err, people) {
+        should.equal(err, null);
+        should(Array.isArray(people));
+        should(people.length == 1);
+
+        return done();
+      });
+    });
+
+    it("should return a ChainFind if no callback passed", function (done) {
+      var ChainFind = Person.findByAddress({
+        number: 123
+      });
+      ChainFind.run.should.be.a.Function();
+
+      return done();
+    });
+  });
 });
diff --git a/test/integration/association-hasmany-extra.js b/test/integration/association-hasmany-extra.js
index 7d204680..c6be4523 100644
--- a/test/integration/association-hasmany-extra.js
+++ b/test/integration/association-hasmany-extra.js
@@ -3,78 +3,78 @@ var helper = require('../support/spec_helper');
 var ORM    = require('../../');
 
 describe("hasMany extra properties", function() {
-	var db     = null;
-	var Person = null;
-	var Pet    = null;
+  var db     = null;
+  var Person = null;
+  var Pet    = null;
 
-	var setup = function (opts) {
-		opts = opts || {};
-		return function (done) {
-			db.settings.set('instance.identityCache', false);
+  var setup = function (opts) {
+    opts = opts || {};
+    return function (done) {
+      db.settings.set('instance.identityCache', false);
 
-			Person = db.define('person', {
-				name    : String,
-			}, opts);
-			Pet = db.define('pet', {
-				name    : String
-			});
-			Person.hasMany('pets', Pet, {
-				since   : Date,
-				data    : Object
-			});
+      Person = db.define('person', {
+        name    : String,
+      }, opts);
+      Pet = db.define('pet', {
+        name    : String
+      });
+      Person.hasMany('pets', Pet, {
+        since   : Date,
+        data    : Object
+      });
 
-			return helper.dropSync([ Person, Pet ], done);
-		};
-	};
+      return helper.dropSync([ Person, Pet ], done);
+    };
+  };
 
-	before(function(done) {
-		this.timeout(4000);
+  before(function(done) {
+    this.timeout(4000);
 
-		helper.connect(function (connection) {
-			db = connection;
-			done();
-		});
-	});
+    helper.connect(function (connection) {
+      db = connection;
+      done();
+    });
+  });
 
-	describe("if passed to addAccessor", function () {
-		before(setup());
+  describe("if passed to addAccessor", function () {
+    before(setup());
 
-		it("should be added to association", function (done) {
-			Person.create([{
-				name    : "John"
-			}], function (err, people) {
-				Pet.create([{
-					name : "Deco"
-				}, {
-					name : "Mutt"
-				}], function (err, pets) {
-					var data = { adopted: true };
+    it("should be added to association", function (done) {
+      Person.create([{
+        name    : "John"
+      }], function (err, people) {
+        Pet.create([{
+          name : "Deco"
+        }, {
+          name : "Mutt"
+        }], function (err, pets) {
+          var data = { adopted: true };
 
-					people[0].addPets(pets, { since : new Date(), data: data }, function (err) {
-						should.equal(err, null);
+          people[0].addPets(pets, { since : new Date(), data: data }, function (err) {
+            should.equal(err, null);
 
-						Person.find({ name: "John" }, { autoFetch : true }).first(function (err, John) {
-							should.equal(err, null);
+            Person.find({ name: "John" }, { autoFetch : true }).first(function (err, John) {
+              should.equal(err, null);
 
-							John.should.have.property("pets");
-							should(Array.isArray(pets));
+              John.should.have.property("pets");
+              should(Array.isArray(pets));
 
-							John.pets.length.should.equal(2);
+              John.pets.length.should.equal(2);
 
-							John.pets[0].should.have.property("name");
-							John.pets[0].should.have.property("extra");
-							John.pets[0].extra.should.be.a.Object();
-							John.pets[0].extra.should.have.property("since");
-							should(John.pets[0].extra.since instanceof Date);
+              John.pets[0].should.have.property("name");
+              John.pets[0].should.have.property("extra");
+              John.pets[0].extra.should.be.a.Object();
+              John.pets[0].extra.should.have.property("since");
+              should(John.pets[0].extra.since instanceof Date);
 
-							should.equal(typeof John.pets[0].extra.data, 'object');
-							should.equal(JSON.stringify(data), JSON.stringify(John.pets[0].extra.data));
+              should.equal(typeof John.pets[0].extra.data, 'object');
+              should.equal(JSON.stringify(data), JSON.stringify(John.pets[0].extra.data));
 
-							return done();
-						});
-					});
-				});
-			});
-		});
-	});
+              return done();
+            });
+          });
+        });
+      });
+    });
+  });
 });
diff --git a/test/integration/association-hasmany-hooks.js b/test/integration/association-hasmany-hooks.js
index 7dba2dd3..9f640f04 100644
--- a/test/integration/association-hasmany-hooks.js
+++ b/test/integration/association-hasmany-hooks.js
@@ -3,123 +3,123 @@ var helper = require('../support/spec_helper');
 var ORM    = require('../../');
 
 describe("hasMany hooks", function() {
-	var db     = null;
-	var Person = null;
-	var Pet    = null;
-
-	var setup = function (props, opts) {
-		return function (done) {
-			db.settings.set('instance.identityCache', false);
-
-			Person = db.define('person', {
-				name    : String,
-			});
-			Pet = db.define('pet', {
-				name    : String
-			});
-			Person.hasMany('pets', Pet, props || {}, opts || {});
-
-			return helper.dropSync([ Person, Pet ], done);
-		};
-	};
-
-	before(function(done) {
-		helper.connect(function (connection) {
-			db = connection;
-			done();
-		});
-	});
-
-	describe("beforeSave", function () {
-		var had_extra = false;
-
-		before(setup({
-			born : Date
-		}, {
-			hooks : {
-				beforeSave: function (extra, next) {
-					had_extra = (typeof extra == "object");
-					return next();
-				}
-			}
-		}));
-
-		it("should pass extra data to hook if extra defined", function (done) {
-			Person.create({
-				name    : "John"
-			}, function (err, John) {
-				Pet.create({
-					name : "Deco"
-				}, function (err, Deco) {
-					John.addPets(Deco, function (err) {
-						should.not.exist(err);
-
-						had_extra.should.be.true;
-
-						return done();
-					});
-				});
-			});
-		});
-	});
-
-	describe("beforeSave", function () {
-		var had_extra = false;
-
-		before(setup({}, {
-			hooks : {
-				beforeSave: function (next) {
-					next.should.be.a.Function();
-					return next();
-				}
-			}
-		}));
-
-		it("should not pass extra data to hook if extra defined", function (done) {
-			Person.create({
-				name    : "John"
-			}, function (err, John) {
-				Pet.create({
-					name : "Deco"
-				}, function (err, Deco) {
-					John.addPets(Deco, function (err) {
-						should.not.exist(err);
-
-						return done();
-					});
-				});
-			});
-		});
-	});
-
-	describe("beforeSave", function () {
-		var had_extra = false;
-
-		before(setup({}, {
-			hooks : {
-				beforeSave: function (next) {
-					setTimeout(function () {
-						return next(new Error('blocked'));
-					}, 100);
-				}
-			}
-		}));
-
-		it("should block if error returned", function (done) {
-			Person.create({
-				name    : "John"
-			}, function (err, John) {
-				Pet.create({
-					name : "Deco"
-				}, function (err, Deco) {
-					John.addPets(Deco, function (err) {
-						should.exist(err);
-						err.message.should.equal('blocked');
-
-						return done();
-					});
-				});
-			});
-		});
-	});
+  var db     = null;
+  var Person = null;
+  var Pet    = null;
+
+  var setup = function (props, opts) {
+    return function (done) {
+      db.settings.set('instance.identityCache', false);
+
+      Person = db.define('person', {
+        name    : String,
+      });
+      Pet = db.define('pet', {
+        name    : String
+      });
+      Person.hasMany('pets', Pet, props || {}, opts || {});
+
+      return helper.dropSync([ Person, Pet ], done);
+    };
+  };
+
+  before(function(done) {
+    helper.connect(function (connection) {
+      db = connection;
+      done();
+    });
+  });
+
+  describe("beforeSave", function () {
+    var had_extra = false;
+
+    before(setup({
+      born : Date
+    }, {
+      hooks : {
+        beforeSave: function (extra, next) {
+          had_extra = (typeof extra == "object");
+          return next();
+        }
+      }
+    }));
+
+    it("should pass extra data to hook if extra defined", function (done) {
+      Person.create({
+        name    : "John"
+      }, function (err, John) {
+        Pet.create({
+          name : "Deco"
+        }, function (err, Deco) {
+          John.addPets(Deco, function (err) {
+            should.not.exist(err);
+
+            had_extra.should.be.true;
+
+            return done();
+          });
+        });
+      });
+    });
+  });
+
+  describe("beforeSave", function () {
+    var had_extra = false;
+
+    before(setup({}, {
+      hooks : {
+        beforeSave: function (next) {
+          next.should.be.a.Function();
+          return next();
+        }
+      }
+    }));
+
+    it("should not pass extra data to hook if extra defined", function (done) {
+      Person.create({
+        name    : "John"
+      }, function (err, John) {
+        Pet.create({
+          name : "Deco"
+        }, function (err, Deco) {
+          John.addPets(Deco, function (err) {
+            should.not.exist(err);
+
+            return done();
+          });
+        });
+      });
+    });
+  });
+
+  describe("beforeSave", function () {
+    var had_extra = false;
+
+    before(setup({}, {
+      hooks : {
+        beforeSave: function (next) {
+          setTimeout(function () {
+            return next(new Error('blocked'));
+          }, 100);
+        }
+      }
+    }));
+
+    it("should block if error returned", function (done) {
+      Person.create({
+        name    : "John"
+      }, function (err, John) {
+        Pet.create({
+          name : "Deco"
+        }, function (err, Deco) {
+          John.addPets(Deco, function (err) {
+            should.exist(err);
+            err.message.should.equal('blocked');
+
+            return done();
+          });
+        });
+      });
+    });
+  });
 });
diff --git a/test/integration/association-hasmany-mapsto.js b/test/integration/association-hasmany-mapsto.js
index ff307be9..cd0a96dc 100644
--- a/test/integration/association-hasmany-mapsto.js
+++ b/test/integration/association-hasmany-mapsto.js
@@ -8,661 +8,661 @@ var protocol = common.protocol();
 if (common.protocol() == "mongodb") return;   // Can't do mapsTo testing on mongoDB ()
 
 describe("hasMany with mapsTo", function () {
-	this.timeout(4000);
-	var db     = null;
-	var Person = null;
-	var Pet    = null;
+  this.timeout(4000);
+  var db     = null;
+  var Person = null;
+  var Pet    = null;
 
-	before(function(done) {
-		helper.connect(function (connection) {
-			db = connection;
-			done();
-		});
-	});
+  before(function(done) {
+    helper.connect(function (connection) {
+      db = connection;
+      done();
+    });
+  });
 
-	describe("normal", function () {
+  describe("normal", function () {
 
-		var setup = function (opts) {
-			opts = opts || {};
+    var setup = function (opts) {
+      opts = opts || {};
 
-			return function (done) {
-				db.settings.set('instance.identityCache', false);
+      return function (done) {
+        db.settings.set('instance.identityCache', false);
 
-				Person = db.define('person', {
+        Person = db.define('person', {
                                         id        : {type : "serial",  size:"8",    mapsTo: "personID", key:true},
-					firstName : {type : "text",    size:"255",  mapsTo: "name"},
-					lastName  : {type : "text",    size:"255",  mapsTo: "surname"},
-					ageYears  : {type : "number",  size:"8",    mapsTo: "age"}
-				});
+          firstName : {type : "text",    size:"255",  mapsTo: "name"},
+          lastName  : {type : "text",    size:"255",  mapsTo: "surname"},
+          ageYears  : {type : "number",  size:"8",    mapsTo: "age"}
+        });
 
-				Pet = db.define('pet', {
+        Pet = db.define('pet', {
                                         id      :  {type : "serial",   size:"8",    mapsTo:"petID", key:true},
-					petName :  {type : "text",     size:"255",  mapsTo: "name"}
-				});
+          petName :  {type : "text",     size:"255",  mapsTo: "name"}
+        });
 
-				Person.hasMany('pets', Pet, {},
+        Person.hasMany('pets', Pet, {},
                                                { autoFetch:  opts.autoFetchPets,
                                                  mergeTable: 'person_pet',
                                                  mergeId: 'person_id',
                                                  mergeAssocId: 'pet_id'});
 
-				helper.dropSync([ Person, Pet ], function (err) {
-					if (err) return done(err);
-					//
-					// John --+---> Deco
-					//        '---> Mutt <----- Jane
-					//
-					// Justin
-					//
-					Person.create([{
-						firstName    : "John",
-						lastName     : "Doe",
-						ageYears     : 20,
-						pets    : [{
-							petName    : "Deco"
-						}, {
-							petName    : "Mutt"
-						}]
-					}, {
-						firstName  : "Jane",
-						lastName   : "Doe",
-						ageYears   : 16
-					}, {
-						firstName : "Justin",
-						lastName  : "Dean",
-						ageYears  : 18
-					}], function (err) {
-						Person.find({ firstName: "Jane" }, function (err, people) {
-							Pet.find({ petName: "Mutt" }, function (err, pets) {
-								people[0].addPets(pets, done);
-							});
-						});
-					});
-				});
-			};
-		};
-
-		describe("getAccessor", function () {
-			before(setup());
-
-			it("should not auto-fetch associations", function (done) {
-				Person.find({ firstName: "John" }).first(function (err, John) {
-					should.equal(err, null);
-
-					should.equal(John.pets, null);
-					return done();
-				});
-			});
-
-			it("should allow to specify order as string", function (done) {
-				Person.find({ firstName: "John" }, function (err, people) {
-					should.equal(err, null);
-
-					people[0].getPets("-petName", function (err, pets) {
-						should.equal(err, null);
-
-						should(Array.isArray(pets));
-						pets.length.should.equal(2);
-						pets[0].model().should.equal(Pet);
-						pets[0].petName.should.equal("Mutt");
-						pets[1].petName.should.equal("Deco");
-
-						return done();
-					});
-				});
-			});
-
- 			it ("should return proper instance model", function(done){
- 				Person.find({ firstName: "John" }, function (err, people) {
-					people[0].getPets("-petName", function (err, pets) {
-						pets[0].model().should.equal(Pet);
-						return done();
-					});
-				});
- 			});
-
-			it("should allow to specify order as Array", function (done) {
-				Person.find({ firstName: "John" }, function (err, people) {
-					should.equal(err, null);
-
-					people[0].getPets([ "petName", "Z" ], function (err, pets) {
-						should.equal(err, null);
-
-						should(Array.isArray(pets));
-						pets.length.should.equal(2);
-						pets[0].petName.should.equal("Mutt");
-						pets[1].petName.should.equal("Deco");
-
-						return done();
-					});
-				});
-			});
-
-			it("should allow to specify a limit", function (done) {
-				Person.find({ firstName: "John" }).first(function (err, John) {
-					should.equal(err, null);
-
-					John.getPets(1, function (err, pets) {
-						should.equal(err, null);
-
-						should(Array.isArray(pets));
-						pets.length.should.equal(1);
-
-						return done();
-					});
-				});
-			});
-
-			it("should allow to specify conditions", function (done) {
-				Person.find({ firstName: "John" }).first(function (err, John) {
-					should.equal(err, null);
-
-					John.getPets({ petName: "Mutt" }, function (err, pets) {
-						should.equal(err, null);
-
-						should(Array.isArray(pets));
-						pets.length.should.equal(1);
-						pets[0].petName.should.equal("Mutt");
-
-						return done();
-					});
-				});
-			});
-
-			if (common.protocol() == "mongodb") return;
-
-			it("should return a chain if no callback defined", function (done) {
-				Person.find({ firstName: "John" }, function (err, people) {
-					should.equal(err, null);
-
-					var chain = people[0].getPets({ firstName: "Mutt" });
-
-					chain.should.be.a.Object();
-					chain.find.should.be.a.Function();
-					chain.only.should.be.a.Function();
-					chain.limit.should.be.a.Function();
-					chain.order.should.be.a.Function();
-
-					return done();
-				});
-			});
-
-			it("should allow chaining count()", function (done) {
-				Person.find({}, function (err, people) {
-					should.equal(err, null);
-
-					people[0].getPets().count(function (err, count) {
-						should.not.exist(err);
-
-						should.strictEqual(count, 2);
-
-						people[1].getPets().count(function (err, count) {
-							should.not.exist(err);
-
-							should.strictEqual(count, 1);
-
-							people[2].getPets().count(function (err, count) {
-								should.not.exist(err);
-
-								should.strictEqual(count, 0);
-
-								return done();
-							});
-						});
-					});
-				});
-			});
-		});
-
-		describe("hasAccessor", function () {
-			before(setup());
-
-			it("should return true if instance has associated item", function (done) {
-				Pet.find({ petName: "Mutt" }, function (err, pets) {
-					should.equal(err, null);
+        helper.dropSync([ Person, Pet ], function (err) {
+          if (err) return done(err);
+          //
+          // John --+---> Deco
+          //        '---> Mutt <----- Jane
+          //
+          // Justin
+          //
+          Person.create([{
+            firstName    : "John",
+            lastName     : "Doe",
+            ageYears     : 20,
+            pets    : [{
+              petName    : "Deco"
+            }, {
+              petName    : "Mutt"
+            }]
+          }, {
+            firstName  : "Jane",
+            lastName   : "Doe",
+            ageYears   : 16
+          }, {
+            firstName : "Justin",
+            lastName  : "Dean",
+            ageYears  : 18
+          }], function (err) {
+            Person.find({ firstName: "Jane" }, function (err, people) {
+              Pet.find({ petName: "Mutt" }, function (err, pets) {
+                people[0].addPets(pets, done);
+              });
+            });
+          });
+        });
+      };
+    };
+
+    describe("getAccessor", function () {
+      before(setup());
+
+      it("should not auto-fetch associations", function (done) {
+        Person.find({ firstName: "John" }).first(function (err, John) {
+          should.equal(err, null);
+
+          should.equal(John.pets, null);
+          return done();
+        });
+      });
+
+      it("should allow to specify order as string", function (done) {
+        Person.find({ firstName: "John" }, function (err, people) {
+          should.equal(err, null);
+
+          people[0].getPets("-petName", function (err, pets) {
+            should.equal(err, null);
+
+            should(Array.isArray(pets));
+            pets.length.should.equal(2);
+            pets[0].model().should.equal(Pet);
+            pets[0].petName.should.equal("Mutt");
+            pets[1].petName.should.equal("Deco");
+
+            return done();
+          });
+        });
+      });
+
+       it ("should return proper instance model", function(done){
+         Person.find({ firstName: "John" }, function (err, people) {
+          people[0].getPets("-petName", function (err, pets) {
+            pets[0].model().should.equal(Pet);
+            return done();
+          });
+        });
+       });
+
+      it("should allow to specify order as Array", function (done) {
+        Person.find({ firstName: "John" }, function (err, people) {
+          should.equal(err, null);
+
+          people[0].getPets([ "petName", "Z" ], function (err, pets) {
+            should.equal(err, null);
+
+            should(Array.isArray(pets));
+            pets.length.should.equal(2);
+            pets[0].petName.should.equal("Mutt");
+            pets[1].petName.should.equal("Deco");
+
+            return done();
+          });
+        });
+      });
+
+      it("should allow to specify a limit", function (done) {
+        Person.find({ firstName: "John" }).first(function (err, John) {
+          should.equal(err, null);
+
+          John.getPets(1, function (err, pets) {
+            should.equal(err, null);
+
+            should(Array.isArray(pets));
+            pets.length.should.equal(1);
+
+            return done();
+          });
+        });
+      });
+
+      it("should allow to specify conditions", function (done) {
+        Person.find({ firstName: "John" }).first(function (err, John) {
+          should.equal(err, null);
+
+          John.getPets({ petName: "Mutt" }, function (err, pets) {
+            should.equal(err, null);
+
+            should(Array.isArray(pets));
+            pets.length.should.equal(1);
+            pets[0].petName.should.equal("Mutt");
+
+            return done();
+          });
+        });
+      });
+
+      if (common.protocol() == "mongodb") return;
+
+      it("should return a chain if no callback defined", function (done) {
+        Person.find({ firstName: "John" }, function (err, people) {
+          should.equal(err, null);
+
+          var chain = people[0].getPets({ firstName: "Mutt" });
+
+          chain.should.be.a.Object();
+          chain.find.should.be.a.Function();
+          chain.only.should.be.a.Function();
+          chain.limit.should.be.a.Function();
+          chain.order.should.be.a.Function();
+
+          return done();
+        });
+      });
+
+      it("should allow chaining count()", function (done) {
+        Person.find({}, function (err, people) {
+          should.equal(err, null);
+
+          people[0].getPets().count(function (err, count) {
+            should.not.exist(err);
+
+            should.strictEqual(count, 2);
+
+            people[1].getPets().count(function (err, count) {
+              should.not.exist(err);
+
+              should.strictEqual(count, 1);
+
+              people[2].getPets().count(function (err, count) {
+                should.not.exist(err);
+
+                should.strictEqual(count, 0);
+
+                return done();
+              });
+            });
+          });
+        });
+      });
+    });
+
+    describe("hasAccessor", function () {
+      before(setup());
+
+      it("should return true if instance has associated item", function (done) {
+        Pet.find({ petName: "Mutt" }, function (err, pets) {
+          should.equal(err, null);
 
-					Person.find({ firstName: "Jane" }).first(function (err, Jane) {
-						should.equal(err, null);
+          Person.find({ firstName: "Jane" }).first(function (err, Jane) {
+            should.equal(err, null);
 
-						Jane.hasPets(pets[0], function (err, has_pets) {
-							should.equal(err, null);
-							has_pets.should.be.true;
-
-							return done();
-						});
-					});
-				});
-			});
-
-			it("should return true if not passing any instance and has associated items", function (done) {
-				Person.find({ firstName: "Jane" }).first(function (err, Jane) {
-					should.equal(err, null);
+            Jane.hasPets(pets[0], function (err, has_pets) {
+              should.equal(err, null);
+              has_pets.should.be.true;
+
+              return done();
+            });
+          });
+        });
+      });
+
+      it("should return true if not passing any instance and has associated items", function (done) {
+        Person.find({ firstName: "Jane" }).first(function (err, Jane) {
+          should.equal(err, null);
 
-					Jane.hasPets(function (err, has_pets) {
-						should.equal(err, null);
-						has_pets.should.be.true;
+          Jane.hasPets(function (err, has_pets) {
+            should.equal(err, null);
+            has_pets.should.be.true;
 
-						return done();
-					});
-				});
-			});
-
-			it("should return true if all passed instances are associated", function (done) {
-				Pet.find(function (err, pets) {
-					Person.find({ firstName: "John" }).first(function (err, John) {
-						should.equal(err, null);
+            return done();
+          });
+        });
+      });
+
+      it("should return true if all passed instances are associated", function (done) {
+        Pet.find(function (err, pets) {
+          Person.find({ firstName: "John" }).first(function (err, John) {
+            should.equal(err, null);
 
-						John.hasPets(pets, function (err, has_pets) {
-							should.equal(err, null);
-							has_pets.should.be.true;
-
-							return done();
-						});
-					});
-				});
-			});
-
-			it("should return false if any passed instances are not associated", function (done) {
-				Pet.find(function (err, pets) {
-					Person.find({ firstName: "Jane" }).first(function (err, Jane) {
-						should.equal(err, null);
-
-						Jane.hasPets(pets, function (err, has_pets) {
-							should.equal(err, null);
-							has_pets.should.be.false;
-
-							return done();
-						});
-					});
-				});
-			});
-		});
-
-		describe("delAccessor", function () {
-			before(setup());
-
-			it("should accept arguments in different orders", function (done) {
-				Pet.find({ petName: "Mutt" }, function (err, pets) {
-					Person.find({ firstName: "John" }, function (err, people) {
-						should.equal(err, null);
-
-						people[0].removePets(function (err) {
-							should.equal(err, null);
-
-							people[0].getPets(function (err, pets) {
-								should.equal(err, null);
-
-								should(Array.isArray(pets));
-								pets.length.should.equal(1);
-								pets[0].petName.should.equal("Deco");
-
-								return done();
-							});
-						}, pets[0]);
-					});
-				});
-			});
-		});
-
-		describe("delAccessor", function () {
-			before(setup());
-
-			it("should remove specific associations if passed", function (done) {
-				Pet.find({ petName: "Mutt" }, function (err, pets) {
-					Person.find({ firstName: "John" }, function (err, people) {
-						should.equal(err, null);
-
-						people[0].removePets(pets[0], function (err) {
-							should.equal(err, null);
-
-							people[0].getPets(function (err, pets) {
-								should.equal(err, null);
-
-								should(Array.isArray(pets));
-								pets.length.should.equal(1);
-								pets[0].petName.should.equal("Deco");
-
-								return done();
-							});
-						});
-					});
-				});
-			});
-
-			it("should remove all associations if none passed", function (done) {
-				Person.find({ firstName: "John" }).first(function (err, John) {
-					should.equal(err, null);
-
-					John.removePets(function (err) {
-						should.equal(err, null);
-
-						John.getPets(function (err, pets) {
-							should.equal(err, null);
-
-							should(Array.isArray(pets));
-							pets.length.should.equal(0);
-
-							return done();
-						});
-					});
-				});
-			});
-		});
-
-		describe("addAccessor", function () {
-			before(setup());
-
-			if (common.protocol() != "mongodb") {
-				it("might add duplicates", function (done) {
-					Pet.find({ petName: "Mutt" }, function (err, pets) {
-						Person.find({ firstName: "Jane" }, function (err, people) {
-							should.equal(err, null);
-
-							people[0].addPets(pets[0], function (err) {
-								should.equal(err, null);
-
-								people[0].getPets("petName", function (err, pets) {
-									should.equal(err, null);
-
-									should(Array.isArray(pets));
-									pets.length.should.equal(2);
-									pets[0].petName.should.equal("Mutt");
-									pets[1].petName.should.equal("Mutt");
-
-									return done();
-								});
-							});
-						});
-					});
-				});
-			}
-
-			it("should keep associations and add new ones", function (done) {
-				Pet.find({ petName: "Deco" }).first(function (err, Deco) {
-					Person.find({ firstName: "Jane" }).first(function (err, Jane) {
-						should.equal(err, null);
-
-						Jane.getPets(function (err, janesPets) {
-							should.not.exist(err);
-
-							var petsAtStart = janesPets.length;
-
-							Jane.addPets(Deco, function (err) {
-								should.equal(err, null);
-
-								Jane.getPets("petName", function (err, pets) {
-									should.equal(err, null);
-
-									should(Array.isArray(pets));
-									pets.length.should.equal(petsAtStart + 1);
-									pets[0].petName.should.equal("Deco");
-									pets[1].petName.should.equal("Mutt");
-
-									return done();
-								});
-							});
-						});
-					});
-				});
-			});
-
-			it("should accept several arguments as associations", function (done) {
-				Pet.find(function (err, pets) {
-					Person.find({ firstName: "Justin" }).first(function (err, Justin) {
-						should.equal(err, null);
-
-						Justin.addPets(pets[0], pets[1], function (err) {
-							should.equal(err, null);
-
-							Justin.getPets(function (err, pets) {
-								should.equal(err, null);
-
-								should(Array.isArray(pets));
-								pets.length.should.equal(2);
-
-								return done();
-							});
-						});
-					});
-				});
-			});
-
-			it("should accept array as list of associations", function (done) {
-				Pet.create([{ petName: 'Ruff' }, { petName: 'Spotty' }],function (err, pets) {
-					Person.find({ firstName: "Justin" }).first(function (err, Justin) {
-						should.equal(err, null);
-
-						Justin.getPets(function (err, justinsPets) {
-							should.equal(err, null);
-
-							var petCount = justinsPets.length;
-
-							Justin.addPets(pets, function (err) {
-								should.equal(err, null);
-
-								Justin.getPets(function (err, justinsPets) {
-									should.equal(err, null);
-
-									should(Array.isArray(justinsPets));
-									// Mongo doesn't like adding duplicates here, so we add new ones.
-									should.equal(justinsPets.length, petCount + 2);
-
-									return done();
-								});
-							});
-						});
-					});
-				});
-			});
-
-			it("should throw if no items passed", function (done) {
-				Person.one(function (err, person) {
-					should.equal(err, null);
-
-					(function () {
-						person.addPets(function () {});
-					}).should.throw();
-
-					return done();
-				});
-			});
-		});
-
-		describe("setAccessor", function () {
-			before(setup());
-
-			it("should accept several arguments as associations", function (done) {
-				Pet.find(function (err, pets) {
-					Person.find({ firstName: "Justin" }).first(function (err, Justin) {
-						should.equal(err, null);
-
-						Justin.setPets(pets[0], pets[1], function (err) {
-							should.equal(err, null);
-
-							Justin.getPets(function (err, pets) {
-								should.equal(err, null);
-
-								should(Array.isArray(pets));
-								pets.length.should.equal(2);
-
-								return done();
-							});
-						});
-					});
-				});
-			});
-
-			it("should accept an array of associations", function (done) {
-				Pet.find(function (err, pets) {
-					Person.find({ firstName: "Justin" }).first(function (err, Justin) {
-						should.equal(err, null);
-
-						Justin.setPets(pets, function (err) {
-							should.equal(err, null);
-
-							Justin.getPets(function (err, all_pets) {
-								should.equal(err, null);
-
-								should(Array.isArray(all_pets));
-								all_pets.length.should.equal(pets.length);
-
-								return done();
-							});
-						});
-					});
-				});
-			});
-
-			it("should remove all associations if an empty array is passed", function (done) {
-				Person.find({ firstName: "Justin" }).first(function (err, Justin) {
-					should.equal(err, null);
-					Justin.getPets(function (err, pets) {
-						should.equal(err, null);
-						should.equal(pets.length, 2);
-
-						Justin.setPets([], function (err) {
-							should.equal(err, null);
-
-							Justin.getPets(function (err, pets) {
-								should.equal(err, null);
-								should.equal(pets.length, 0);
-
-								return done();
-							});
-						});
-					});
-				});
-			});
-
-			it("clears current associations", function (done) {
-				Pet.find({ petName: "Deco" }, function (err, pets) {
-					var Deco = pets[0];
-
-					Person.find({ firstName: "Jane" }).first(function (err, Jane) {
-						should.equal(err, null);
-
-						Jane.getPets(function (err, pets) {
-							should.equal(err, null);
-
-							should(Array.isArray(pets));
-							pets.length.should.equal(1);
-							pets[0].petName.should.equal("Mutt");
-
-							Jane.setPets(Deco, function (err) {
-								should.equal(err, null);
-
-								Jane.getPets(function (err, pets) {
-									should.equal(err, null);
-
-									should(Array.isArray(pets));
-									pets.length.should.equal(1);
-									pets[0].petName.should.equal(Deco.petName);
-
-									return done();
-								});
-							});
-						});
-					});
-				});
-			});
-		});
-
-		describe("with autoFetch turned on", function () {
-			before(setup({
-				autoFetchPets : true
-			}));
-
-			it("should fetch associations", function (done) {
-				Person.find({ firstName: "John" }).first(function (err, John) {
-					should.equal(err, null);
-
-					John.should.have.property("pets");
-					should(Array.isArray(John.pets));
-					John.pets.length.should.equal(2);
-
-					return done();
-				});
-			});
-
-			it("should save existing", function (done) {
-				Person.create({ firstName: 'Bishan' }, function (err) {
-					should.not.exist(err);
-
-					Person.one({ firstName: 'Bishan' }, function (err, person) {
-						should.not.exist(err);
-
-						person.lastName = 'Dominar';
-
-						person.save(function (err) {
-							should.not.exist(err);
-
-							done();
-						});
-					});
-				});
-			});
-
-			it("should not auto save associations which were autofetched", function (done) {
-				Pet.all(function (err, pets) {
-					should.not.exist(err);
-					should.equal(pets.length, 2);
-
-					Person.create({ firstName: 'Paul' }, function (err, paul) {
-						should.not.exist(err);
-
-						Person.one({ firstName: 'Paul' }, function (err, paul2) {
-							should.not.exist(err);
-							should.equal(paul2.pets.length, 0);
-
-							paul.setPets(pets, function (err) {
-								should.not.exist(err);
-
-								// reload paul to make sure we have 2 pets
-								Person.one({ firstName: 'Paul' }, function (err, paul) {
-									should.not.exist(err);
-									should.equal(paul.pets.length, 2);
-
-									// Saving paul2 should NOT auto save associations and hence delete
-									// the associations we just created.
-									paul2.save(function (err) {
-										should.not.exist(err);
-
-										// let's check paul - pets should still be associated
-										Person.one({ firstName: 'Paul' }, function (err, paul) {
-											should.not.exist(err);
-											should.equal(paul.pets.length, 2);
-
-											done();
-										});
-									});
-								});
-							});
-						});
-					});
-				});
-			});
-
-			it("should save associations set by the user", function (done) {
-				Person.one({ firstName: 'John' }, function (err, john) {
-					should.not.exist(err);
-					should.equal(john.pets.length, 2);
-
-					john.pets = [];
-
-					john.save(function (err) {
-						should.not.exist(err);
-
-						// reload john to make sure pets were deleted
-						Person.one({ firstName: 'John' }, function (err, john) {
-							should.not.exist(err);
-							should.equal(john.pets.length, 0);
-
-							done();
-						});
-					});
-				});
-			});
-
-		});
-	});
+            John.hasPets(pets, function (err, has_pets) {
+              should.equal(err, null);
+              has_pets.should.be.true;
+
+              return done();
+            });
+          });
+        });
+      });
+
+      it("should return false if any passed instances are not associated", function (done) {
+        Pet.find(function (err, pets) {
+          Person.find({ firstName: "Jane" }).first(function (err, Jane) {
+            should.equal(err, null);
+
+            Jane.hasPets(pets, function (err, has_pets) {
+              should.equal(err, null);
+              has_pets.should.be.false;
+
+              return done();
+            });
+          });
+        });
+      });
+    });
+
+    describe("delAccessor", function () {
+      before(setup());
+
+      it("should accept arguments in different orders", function (done) {
+        Pet.find({ petName: "Mutt" }, function (err, pets) {
+          Person.find({ firstName: "John" }, function (err, people) {
+            should.equal(err, null);
+
+            people[0].removePets(function (err) {
+              should.equal(err, null);
+
+              people[0].getPets(function (err, pets) {
+                should.equal(err, null);
+
+                should(Array.isArray(pets));
+                pets.length.should.equal(1);
+                pets[0].petName.should.equal("Deco");
+
+                return done();
+              });
+            }, pets[0]);
+          });
+        });
+      });
+    });
+
+    describe("delAccessor", function () {
+      before(setup());
+
+      it("should remove specific associations if passed", function (done) {
+        Pet.find({ petName: "Mutt" }, function (err, pets) {
+          Person.find({ firstName: "John" }, function (err, people) {
+            should.equal(err, null);
+
+            people[0].removePets(pets[0], function (err) {
+              should.equal(err, null);
+
+              people[0].getPets(function (err, pets) {
+                should.equal(err, null);
+
+                should(Array.isArray(pets));
+                pets.length.should.equal(1);
+                pets[0].petName.should.equal("Deco");
+
+                return done();
+              });
+            });
+          });
+        });
+      });
+
+      it("should remove all associations if none passed", function (done) {
+        Person.find({ firstName: "John" }).first(function (err, John) {
+          should.equal(err, null);
+
+          John.removePets(function (err) {
+            should.equal(err, null);
+
+            John.getPets(function (err, pets) {
+              should.equal(err, null);
+
+              should(Array.isArray(pets));
+              pets.length.should.equal(0);
+
+              return done();
+            });
+          });
+        });
+      });
+    });
+
+    describe("addAccessor", function () {
+      before(setup());
+
+      if (common.protocol() != "mongodb") {
+        it("might add duplicates", function (done) {
+          Pet.find({ petName: "Mutt" }, function (err, pets) {
+            Person.find({ firstName: "Jane" }, function (err, people) {
+              should.equal(err, null);
+
+              people[0].addPets(pets[0], function (err) {
+                should.equal(err, null);
+
+                people[0].getPets("petName", function (err, pets) {
+                  should.equal(err, null);
+
+                  should(Array.isArray(pets));
+                  pets.length.should.equal(2);
+                  pets[0].petName.should.equal("Mutt");
+                  pets[1].petName.should.equal("Mutt");
+
+                  return done();
+                });
+              });
+            });
+          });
+        });
+      }
+
+      it("should keep associations and add new ones", function (done) {
+        Pet.find({ petName: "Deco" }).first(function (err, Deco) {
+          Person.find({ firstName: "Jane" }).first(function (err, Jane) {
+            should.equal(err, null);
+
+            Jane.getPets(function (err, janesPets) {
+              should.not.exist(err);
+
+              var petsAtStart = janesPets.length;
+
+              Jane.addPets(Deco, function (err) {
+                should.equal(err, null);
+
+                Jane.getPets("petName", function (err, pets) {
+                  should.equal(err, null);
+
+                  should(Array.isArray(pets));
+                  pets.length.should.equal(petsAtStart + 1);
+                  pets[0].petName.should.equal("Deco");
+                  pets[1].petName.should.equal("Mutt");
+
+                  return done();
+                });
+              });
+            });
+          });
+        });
+      });
+
+      it("should accept several arguments as associations", function (done) {
+        Pet.find(function (err, pets) {
+          Person.find({ firstName: "Justin" }).first(function (err, Justin) {
+            should.equal(err, null);
+
+            Justin.addPets(pets[0], pets[1], function (err) {
+              should.equal(err, null);
+
+              Justin.getPets(function (err, pets) {
+                should.equal(err, null);
+
+                should(Array.isArray(pets));
+                pets.length.should.equal(2);
+
+                return done();
+              });
+            });
+          });
+        });
+      });
+
+      it("should accept array as list of associations", function (done) {
+        Pet.create([{ petName: 'Ruff' }, { petName: 'Spotty' }],function (err, pets) {
+          Person.find({ firstName: "Justin" }).first(function (err, Justin) {
+            should.equal(err, null);
+
+            Justin.getPets(function (err, justinsPets) {
+              should.equal(err, null);
+
+              var petCount = justinsPets.length;
+
+              Justin.addPets(pets, function (err) {
+                should.equal(err, null);
+
+                Justin.getPets(function (err, justinsPets) {
+                  should.equal(err, null);
+
+                  should(Array.isArray(justinsPets));
+                  // Mongo doesn't like adding duplicates here, so we add new ones.
+                  should.equal(justinsPets.length, petCount + 2);
+
+                  return done();
+                });
+              });
+            });
+          });
+        });
+      });
+
+      it("should throw if no items passed", function (done) {
+        Person.one(function (err, person) {
+          should.equal(err, null);
+
+          (function () {
+            person.addPets(function () {});
+          }).should.throw();
+
+          return done();
+        });
+      });
+    });
+
+    describe("setAccessor", function () {
+      before(setup());
+
+      it("should accept several arguments as associations", function (done) {
+        Pet.find(function (err, pets) {
+          Person.find({ firstName: "Justin" }).first(function (err, Justin) {
+            should.equal(err, null);
+
+            Justin.setPets(pets[0], pets[1], function (err) {
+              should.equal(err, null);
+
+              Justin.getPets(function (err, pets) {
+                should.equal(err, null);
+
+                should(Array.isArray(pets));
+                pets.length.should.equal(2);
+
+                return done();
+              });
+            });
+          });
+        });
+      });
+
+      it("should accept an array of associations", function (done) {
+        Pet.find(function (err, pets) {
+          Person.find({ firstName: "Justin" }).first(function (err, Justin) {
+            should.equal(err, null);
+
+            Justin.setPets(pets, function (err) {
+              should.equal(err, null);
+
+              Justin.getPets(function (err, all_pets) {
+                should.equal(err, null);
+
+                should(Array.isArray(all_pets));
+                all_pets.length.should.equal(pets.length);
+
+                return done();
+              });
+            });
+          });
+        });
+      });
+
+      it("should remove all associations if an empty array is passed", function (done) {
+        Person.find({ firstName: "Justin" }).first(function (err, Justin) {
+          should.equal(err, null);
+          Justin.getPets(function (err, pets) {
+            should.equal(err, null);
+            should.equal(pets.length, 2);
+
+            Justin.setPets([], function (err) {
+              should.equal(err, null);
+
+              Justin.getPets(function (err, pets) {
+                should.equal(err, null);
+                should.equal(pets.length, 0);
+
+                return done();
+              });
+            });
+          });
+        });
+      });
+
+      it("clears current associations", function (done) {
+        Pet.find({ petName: "Deco" }, function (err, pets) {
+          var Deco = pets[0];
+
+          Person.find({ firstName: "Jane" }).first(function (err, Jane) {
+            should.equal(err, null);
+
+            Jane.getPets(function (err, pets) {
+              should.equal(err, null);
+
+              should(Array.isArray(pets));
+              pets.length.should.equal(1);
+              pets[0].petName.should.equal("Mutt");
+
+              Jane.setPets(Deco, function (err) {
+                should.equal(err, null);
+
+                Jane.getPets(function (err, pets) {
+                  should.equal(err, null);
+
+                  should(Array.isArray(pets));
+                  pets.length.should.equal(1);
+                  pets[0].petName.should.equal(Deco.petName);
+
+                  return done();
+                });
+              });
+            });
+          });
+        });
+      });
+    });
+
+    describe("with autoFetch turned on", function () {
+      before(setup({
+        autoFetchPets : true
+      }));
+
+      it("should fetch associations", function (done) {
+        Person.find({ firstName: "John" }).first(function (err, John) {
+          should.equal(err, null);
+
+          John.should.have.property("pets");
+          should(Array.isArray(John.pets));
+          John.pets.length.should.equal(2);
+
+          return done();
+        });
+      });
+
+      it("should save existing", function (done) {
+        Person.create({ firstName: 'Bishan' }, function (err) {
+          should.not.exist(err);
+
+          Person.one({ firstName: 'Bishan' }, function (err, person) {
+            should.not.exist(err);
+
+            person.lastName = 'Dominar';
+
+            person.save(function (err) {
+              should.not.exist(err);
+
+              done();
+            });
+          });
+        });
+      });
+
+      it("should not auto save associations which were autofetched", function (done) {
+        Pet.all(function (err, pets) {
+          should.not.exist(err);
+          should.equal(pets.length, 2);
+
+          Person.create({ firstName: 'Paul' }, function (err, paul) {
+            should.not.exist(err);
+
+            Person.one({ firstName: 'Paul' }, function (err, paul2) {
+              should.not.exist(err);
+              should.equal(paul2.pets.length, 0);
+
+              paul.setPets(pets, function (err) {
+                should.not.exist(err);
+
+                // reload paul to make sure we have 2 pets
+                Person.one({ firstName: 'Paul' }, function (err, paul) {
+                  should.not.exist(err);
+                  should.equal(paul.pets.length, 2);
+
+                  // Saving paul2 should NOT auto save associations and hence delete
+                  // the associations we just created.
+                  paul2.save(function (err) {
+                    should.not.exist(err);
+
+                    // let's check paul - pets should still be associated
+                    Person.one({ firstName: 'Paul' }, function (err, paul) {
+                      should.not.exist(err);
+                      should.equal(paul.pets.length, 2);
+
+                      done();
+                    });
+                  });
+                });
+              });
+            });
+          });
+        });
+      });
+
+      it("should save associations set by the user", function (done) {
+        Person.one({ firstName: 'John' }, function (err, john) {
+          should.not.exist(err);
+          should.equal(john.pets.length, 2);
+
+          john.pets = [];
+
+          john.save(function (err) {
+            should.not.exist(err);
+
+            // reload john to make sure pets were deleted
+            Person.one({ firstName: 'John' }, function (err, john) {
+              should.not.exist(err);
+              should.equal(john.pets.length, 0);
+
+              done();
+            });
+          });
+        });
+      });
+
+    });
+  });
 });
diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
index da9fe9d1..6695bcdf 100644
--- a/test/integration/association-hasmany.js
+++ b/test/integration/association-hasmany.js
@@ -6,835 +6,835 @@ var common   = require('../common');
 var protocol = common.protocol();
 
 describe("hasMany", function () {
-	this.timeout(4000);
-	var db     = null;
-	var Person = null;
-	var Pet    = null;
-
-	before(function(done) {
-		helper.connect(function (connection) {
-			db = connection;
-			done();
-		});
-	});
-
-	describe("normal", function () {
-
-		var setup = function (opts) {
-			opts = opts || {};
-
-			return function (done) {
-				db.settings.set('instance.identityCache', false);
-
-				Person = db.define('person', {
-					name    : String,
-					surname : String,
-					age     : Number
-				});
-				Pet = db.define('pet', {
-					name    : String
-				});
-				Person.hasMany('pets', Pet, {}, { autoFetch: opts.autoFetchPets });
-
-				helper.dropSync([ Person, Pet], function (err) {
-					should.not.exist(err);
-
-					Pet.create([{ name: "Cat" }, { name: "Dog" }], function (err) {
-						should.not.exist(err);
-
-						/**
-						 * John --+---> Deco
-						 *        '---> Mutt <----- Jane
-						 *
-						 * Justin
-						 */
-						Person.create([
-							{
-								name    : "Bob",
-								surname : "Smith",
-								age     : 30
-							},
-							{
-								name    : "John",
-								surname : "Doe",
-								age     : 20,
-								pets    : [{
-									name    : "Deco"
-								}, {
-									name    : "Mutt"
-								}]
-							}, {
-								name    : "Jane",
-								surname : "Doe",
-								age     : 16
-							}, {
-								name    : "Justin",
-								surname : "Dean",
-								age     : 18
-							}
-						], function (err) {
-							should.not.exist(err);
-
-							Person.find({ name: "Jane" }, function (err, people) {
-								should.not.exist(err);
-
-								Pet.find({ name: "Mutt" }, function (err, pets) {
-									should.not.exist(err);
-
-									people[0].addPets(pets, done);
-								});
-							});
-						});
-					});
-				});
-			};
-		};
-
-		describe("getAccessor", function () {
-			before(setup());
-
-			it("should allow to specify order as string", function (done) {
-				Person.find({ name: "John" }, function (err, people) {
-					should.equal(err, null);
-
-					people[0].getPets("-name", function (err, pets) {
-						should.equal(err, null);
-
-						should(Array.isArray(pets));
-						pets.length.should.equal(2);
-						pets[0].model().should.equal(Pet);
-						pets[0].name.should.equal("Mutt");
-						pets[1].name.should.equal("Deco");
-
-						return done();
-					});
-				});
-			});
-
- 			it ("should return proper instance model", function(done){
- 				Person.find({ name: "John" }, function (err, people) {
-					people[0].getPets("-name", function (err, pets) {
-						pets[0].model().should.equal(Pet);
-						return done();
-					});
-				});
- 			});
-
-			it("should allow to specify order as Array", function (done) {
-				Person.find({ name: "John" }, function (err, people) {
-					should.equal(err, null);
-
-					people[0].getPets([ "name", "Z" ], function (err, pets) {
-						should.equal(err, null);
-
-						should(Array.isArray(pets));
-						pets.length.should.equal(2);
-						pets[0].name.should.equal("Mutt");
-						pets[1].name.should.equal("Deco");
-
-						return done();
-					});
-				});
-			});
-
-			it("should allow to specify a limit", function (done) {
-				Person.find({ name: "John" }).first(function (err, John) {
-					should.equal(err, null);
-
-					John.getPets(1, function (err, pets) {
-						should.equal(err, null);
-
-						should(Array.isArray(pets));
-						pets.length.should.equal(1);
-
-						return done();
-					});
-				});
-			});
-
-			it("should allow to specify conditions", function (done) {
-				Person.find({ name: "John" }).first(function (err, John) {
-					should.equal(err, null);
-
-					John.getPets({ name: "Mutt" }, function (err, pets) {
-						should.equal(err, null);
-
-						should(Array.isArray(pets));
-						pets.length.should.equal(1);
-						pets[0].name.should.equal("Mutt");
-
-						return done();
-					});
-				});
-			});
-
-			if (common.protocol() == "mongodb") return;
-
-			it("should return a chain if no callback defined", function (done) {
-				Person.find({ name: "John" }, function (err, people) {
-					should.equal(err, null);
-
-					var chain = people[0].getPets({ name: "Mutt" });
-
-					chain.should.be.a.Object();
-					chain.find.should.be.a.Function();
-					chain.only.should.be.a.Function();
-					chain.limit.should.be.a.Function();
-					chain.order.should.be.a.Function();
-
-					return done();
-				});
-			});
-
-			it("should allow chaining count()", function (done) {
-				Person.find({}, function (err, people) {
-					should.equal(err, null);
-
-					people[1].getPets().count(function (err, count) {
-						should.not.exist(err);
-
-						should.strictEqual(count, 2);
-
-						people[2].getPets().count(function (err, count) {
-							should.not.exist(err);
-
-							should.strictEqual(count, 1);
-
-							people[3].getPets().count(function (err, count) {
-								should.not.exist(err);
-
-								should.strictEqual(count, 0);
-
-								return done();
-							});
-						});
-					});
-				});
-			});
-		});
-
-		describe("hasAccessor", function () {
-			before(setup());
-
-			it("should return true if instance has associated item", function (done) {
-				Pet.find({ name: "Mutt" }, function (err, pets) {
-					should.equal(err, null);
-
-					Person.find({ name: "Jane" }).first(function (err, Jane) {
-						should.equal(err, null);
-
-						Jane.hasPets(pets[0], function (err, has_pets) {
-							should.equal(err, null);
-							has_pets.should.be.true;
-
-							return done();
-						});
-					});
-				});
-			});
-
-			it("should return true if not passing any instance and has associated items", function (done) {
-				Person.find({ name: "Jane" }).first(function (err, Jane) {
-					should.equal(err, null);
-
-					Jane.hasPets(function (err, has_pets) {
-						should.equal(err, null);
-						has_pets.should.be.true;
-
-						return done();
-					});
-				});
-			});
-
-			it("should return true if all passed instances are associated", function (done) {
-				Pet.find(function (err, pets) {
-					Person.find({ name: "John" }).first(function (err, John) {
-						should.equal(err, null);
-
-						John.hasPets(pets, function (err, has_pets) {
-							should.equal(err, null);
-							has_pets.should.be.true;
-
-							return done();
-						});
-					});
-				});
-			});
-
-			it("should return false if any passed instances are not associated", function (done) {
-				Pet.find(function (err, pets) {
-					Person.find({ name: "Jane" }).first(function (err, Jane) {
-						should.equal(err, null);
-
-						Jane.hasPets(pets, function (err, has_pets) {
-							should.equal(err, null);
-							has_pets.should.be.false;
-
-							return done();
-						});
-					});
-				});
-			});
-
-			if (common.protocol() != "mongodb") {
-				it("should return true if join table has duplicate entries", function (done) {
-					Pet.find({ name: ["Mutt", "Deco"] }, function (err, pets) {
-						should.not.exist(err);
-						should.equal(pets.length, 2);
-
-						Person.find({ name: "John" }).first(function (err, John) {
-							should.not.exist(err);
-
-							John.hasPets(pets, function (err, hasPets) {
-								should.equal(err, null);
-								should.equal(hasPets, true);
-
-								db.driver.execQuery(
-									"INSERT INTO person_pets (person_id, pets_id) VALUES (?,?), (?,?)",
-									[John.id, pets[0].id, John.id, pets[1].id],
-									function (err) {
-										should.not.exist(err);
-
-										John.hasPets(pets, function (err, hasPets) {
-											should.equal(err, null);
-											should.equal(hasPets, true);
-
-											done()
-										});
-									}
-								);
-							});
-						});
-					});
-				});
-			}
-		});
-
-		describe("delAccessor", function () {
-			before(setup());
-
-			it("should accept arguments in different orders", function (done) {
-				Pet.find({ name: "Mutt" }, function (err, pets) {
-					Person.find({ name: "John" }, function (err, people) {
-						should.equal(err, null);
-
-						people[0].removePets(function (err) {
-							should.equal(err, null);
-
-							people[0].getPets(function (err, pets) {
-								should.equal(err, null);
-
-								should(Array.isArray(pets));
-								pets.length.should.equal(1);
-								pets[0].name.should.equal("Deco");
-
-								return done();
-							});
-						}, pets[0]);
-					});
-				});
-			});
-		});
-
-		describe("delAccessor", function () {
-			before(setup());
-
-			it("should remove specific associations if passed", function (done) {
-				Pet.find({ name: "Mutt" }, function (err, pets) {
-					Person.find({ name: "John" }, function (err, people) {
-						should.equal(err, null);
-
-						people[0].removePets(pets[0], function (err) {
-							should.equal(err, null);
-
-							people[0].getPets(function (err, pets) {
-								should.equal(err, null);
-
-								should(Array.isArray(pets));
-								pets.length.should.equal(1);
-								pets[0].name.should.equal("Deco");
-
-								return done();
-							});
-						});
-					});
-				});
-			});
-
-			it("should remove all associations if none passed", function (done) {
-				Person.find({ name: "John" }).first(function (err, John) {
-					should.equal(err, null);
-
-					John.removePets(function (err) {
-						should.equal(err, null);
-
-						John.getPets(function (err, pets) {
-							should.equal(err, null);
-
-							should(Array.isArray(pets));
-							pets.length.should.equal(0);
-
-							return done();
-						});
-					});
-				});
-			});
-		});
-
-		describe("addAccessor", function () {
-			before(setup());
-
-			if (common.protocol() != "mongodb") {
-				it("might add duplicates", function (done) {
-					Pet.find({ name: "Mutt" }, function (err, pets) {
-						Person.find({ name: "Jane" }, function (err, people) {
-							should.equal(err, null);
-
-							people[0].addPets(pets[0], function (err) {
-								should.equal(err, null);
-
-								people[0].getPets("name", function (err, pets) {
-									should.equal(err, null);
-
-									should(Array.isArray(pets));
-									pets.length.should.equal(2);
-									pets[0].name.should.equal("Mutt");
-									pets[1].name.should.equal("Mutt");
-
-									return done();
-								});
-							});
-						});
-					});
-				});
-			}
-
-			it("should keep associations and add new ones", function (done) {
-				Pet.find({ name: "Deco" }).first(function (err, Deco) {
-					Person.find({ name: "Jane" }).first(function (err, Jane) {
-						should.equal(err, null);
-
-						Jane.getPets(function (err, janesPets) {
-							should.not.exist(err);
-
-							var petsAtStart = janesPets.length;
-
-							Jane.addPets(Deco, function (err) {
-								should.equal(err, null);
-
-								Jane.getPets("name", function (err, pets) {
-									should.equal(err, null);
-
-									should(Array.isArray(pets));
-									pets.length.should.equal(petsAtStart + 1);
-									pets[0].name.should.equal("Deco");
-									pets[1].name.should.equal("Mutt");
-
-									return done();
-								});
-							});
-						});
-					});
-				});
-			});
-
-			it("should accept several arguments as associations", function (done) {
-				Pet.find(function (err, pets) {
-					Person.find({ name: "Justin" }).first(function (err, Justin) {
-						should.equal(err, null);
-
-						Justin.addPets(pets[0], pets[1], function (err) {
-							should.equal(err, null);
-
-							Justin.getPets(function (err, pets) {
-								should.equal(err, null);
-
-								should(Array.isArray(pets));
-								pets.length.should.equal(2);
-
-								return done();
-							});
-						});
-					});
-				});
-			});
-
-			it("should accept array as list of associations", function (done) {
-				Pet.create([{ name: 'Ruff' }, { name: 'Spotty' }],function (err, pets) {
-					Person.find({ name: "Justin" }).first(function (err, Justin) {
-						should.equal(err, null);
-
-						Justin.getPets(function (err, justinsPets) {
-							should.equal(err, null);
-
-							var petCount = justinsPets.length;
-
-							Justin.addPets(pets, function (err) {
-								should.equal(err, null);
-
-								Justin.getPets(function (err, justinsPets) {
-									should.equal(err, null);
-
-									should(Array.isArray(justinsPets));
-									// Mongo doesn't like adding duplicates here, so we add new ones.
-									should.equal(justinsPets.length, petCount + 2);
-
-									return done();
-								});
-							});
-						});
-					});
-				});
-			});
-
-			it("should throw if no items passed", function (done) {
-				Person.one(function (err, person) {
-					should.equal(err, null);
-
-					(function () {
-						person.addPets(function () {});
-					}).should.throw();
-
-					return done();
-				});
-			});
-		});
-
-		describe("setAccessor", function () {
-			before(setup());
-
-			it("should accept several arguments as associations", function (done) {
-				Pet.find(function (err, pets) {
-					Person.find({ name: "Justin" }).first(function (err, Justin) {
-						should.equal(err, null);
-
-						Justin.setPets(pets[0], pets[1], function (err) {
-							should.equal(err, null);
-
-							Justin.getPets(function (err, pets) {
-								should.equal(err, null);
-
-								should(Array.isArray(pets));
-								pets.length.should.equal(2);
-
-								return done();
-							});
-						});
-					});
-				});
-			});
-
-			it("should accept an array of associations", function (done) {
-				Pet.find(function (err, pets) {
-					Person.find({ name: "Justin" }).first(function (err, Justin) {
-						should.equal(err, null);
-
-						Justin.setPets(pets, function (err) {
-							should.equal(err, null);
-
-							Justin.getPets(function (err, all_pets) {
-								should.equal(err, null);
-
-								should(Array.isArray(all_pets));
-								all_pets.length.should.equal(pets.length);
-
-								return done();
-							});
-						});
-					});
-				});
-			});
-
-			it("should remove all associations if an empty array is passed", function (done) {
-				Person.find({ name: "Justin" }).first(function (err, Justin) {
-					should.equal(err, null);
-					Justin.getPets(function (err, pets) {
-						should.equal(err, null);
-						should.equal(pets.length, 4);
-
-						Justin.setPets([], function (err) {
-							should.equal(err, null);
-
-							Justin.getPets(function (err, pets) {
-								should.equal(err, null);
-								should.equal(pets.length, 0);
-
-								return done();
-							});
-						});
-					});
-				});
-			});
-
-			it("clears current associations", function (done) {
-				Pet.find({ name: "Deco" }, function (err, pets) {
-					var Deco = pets[0];
-
-					Person.find({ name: "Jane" }).first(function (err, Jane) {
-						should.equal(err, null);
-
-						Jane.getPets(function (err, pets) {
-							should.equal(err, null);
-
-							should(Array.isArray(pets));
-							pets.length.should.equal(1);
-							pets[0].name.should.equal("Mutt");
-
-							Jane.setPets(Deco, function (err) {
-								should.equal(err, null);
-
-								Jane.getPets(function (err, pets) {
-									should.equal(err, null);
-
-									should(Array.isArray(pets));
-									pets.length.should.equal(1);
-									pets[0].name.should.equal(Deco.name);
-
-									return done();
-								});
-							});
-						});
-					});
-				});
-			});
-		});
-
-		describe("with autoFetch turned on", function () {
-			before(setup({
-				autoFetchPets : true
-			}));
-
-			it("should fetch associations", function (done) {
-				Person.find({ name: "John" }).first(function (err, John) {
-					should.equal(err, null);
-
-					John.should.have.property("pets");
-					should(Array.isArray(John.pets));
-					John.pets.length.should.equal(2);
-
-					return done();
-				});
-			});
-
-			it("should save existing", function (done) {
-				Person.create({ name: 'Bishan' }, function (err) {
-					should.not.exist(err);
-
-					Person.one({ name: 'Bishan' }, function (err, person) {
-						should.not.exist(err);
-
-						person.surname = 'Dominar';
-
-						person.save(function (err) {
-							should.not.exist(err);
-
-							done();
-						});
-					});
-				});
-			});
-
-			it("should not auto save associations which were autofetched", function (done) {
-				Pet.all(function (err, pets) {
-					should.not.exist(err);
-					should.equal(pets.length, 4);
-
-					Person.create({ name: 'Paul' }, function (err, paul) {
-						should.not.exist(err);
-
-						Person.one({ name: 'Paul' }, function (err, paul2) {
-							should.not.exist(err);
-							should.equal(paul2.pets.length, 0);
-
-							paul.setPets(pets, function (err) {
-								should.not.exist(err);
-
-								// reload paul to make sure we have 2 pets
-								Person.one({ name: 'Paul' }, function (err, paul) {
-									should.not.exist(err);
-									should.equal(paul.pets.length, 4);
-
-									// Saving paul2 should NOT auto save associations and hence delete
-									// the associations we just created.
-									paul2.save(function (err) {
-										should.not.exist(err);
-
-										// let's check paul - pets should still be associated
-										Person.one({ name: 'Paul' }, function (err, paul) {
-											should.not.exist(err);
-											should.equal(paul.pets.length, 4);
-
-											done();
-										});
-									});
-								});
-							});
-						});
-					});
-				});
-			});
-
-			it("should save associations set by the user", function (done) {
-				Person.one({ name: 'John' }, function (err, john) {
-					should.not.exist(err);
-					should.equal(john.pets.length, 2);
-
-					john.pets = [];
-
-					john.save(function (err) {
-						should.not.exist(err);
-
-						// reload john to make sure pets were deleted
-						Person.one({ name: 'John' }, function (err, john) {
-							should.not.exist(err);
-							should.equal(john.pets.length, 0);
-
-							done();
-						});
-					});
-				});
-			});
-
-		});
-	});
-
-	if (protocol == "mongodb") return;
-
-	describe("with non-standard keys", function () {
-		var Email;
-		var Account;
-
-		setup = function (opts, done) {
-			Email = db.define('email', {
-			  text         : { type: 'text', key: true, required: true },
-			  bounced      : Boolean
-			});
-
-			Account = db.define('account', {
-			  name: String
-			});
-
-			Account.hasMany('emails', Email, {}, { key: opts.key });
-
-			helper.dropSync([ Email, Account ], function (err) {
-				should.not.exist(err);
-				done()
-			});
-		};
-
-		it("should place ids in the right place", function (done) {
-			setup({}, function (err) {
-				should.not.exist(err);
-
-				Email.create([{bounced: true, text: 'a@test.com'}, {bounced: false, text: 'z@test.com'}], function (err, emails) {
-					should.not.exist(err);
-
-					Account.create({ name: "Stuff" }, function (err, account) {
-						should.not.exist(err);
-
-						account.addEmails(emails[1], function (err) {
-							should.not.exist(err);
-
-							db.driver.execQuery("SELECT * FROM account_emails", function (err, data) {
-								should.not.exist(err);
-
-								should.equal(data[0].account_id, 1);
-								should.equal(data[0].emails_text, 'z@test.com');
-
-								done();
-							});
-						});
-					});
-				});
-			});
-		});
-
-		it("should generate correct tables", function (done) {
-			setup({}, function (err) {
-				should.not.exist(err);
-
-				var sql;
-
-				if (protocol == 'sqlite') {
-					sql = "PRAGMA table_info(?)";
-				} else {
-					sql = "SELECT column_name, data_type FROM information_schema.columns WHERE table_name = ? ORDER BY data_type";
-				}
-
-				db.driver.execQuery(sql, ['account_emails'], function (err, cols) {
-					should.not.exist(err);
-
-					if (protocol == 'sqlite') {
-						should.equal(cols[0].name, 'account_id');
-						should.equal(cols[0].type, 'INTEGER');
-						should.equal(cols[1].name, 'emails_text');
-						should.equal(cols[1].type, 'TEXT');
-					} else if (protocol == 'mysql') {
-						should.equal(cols[0].column_name, 'account_id');
-						should.equal(cols[0].data_type,   'int');
-						should.equal(cols[1].column_name, 'emails_text');
-						should.equal(cols[1].data_type,    'varchar');
-					} else if (protocol == 'postgres') {
-						should.equal(cols[0].column_name, 'account_id');
-						should.equal(cols[0].data_type,   'integer');
-						should.equal(cols[1].column_name, 'emails_text');
-						should.equal(cols[1].data_type,   'text');
-					}
-
-					done();
-				});
-			});
-		});
-
-		it("should add a composite key to the join table if requested", function (done) {
-			setup({ key: true }, function (err) {
-				should.not.exist(err);
-				var sql;
-
-				if (protocol == 'postgres' || protocol === 'redshift') {
-					sql = "" +
-						"SELECT c.column_name, c.data_type " +
-						"FROM  information_schema.table_constraints tc " +
-						"JOIN information_schema.constraint_column_usage AS ccu USING (constraint_schema, constraint_name) " +
-						"JOIN information_schema.columns AS c ON c.table_schema = tc.constraint_schema AND tc.table_name = c.table_name AND ccu.column_name = c.column_name " +
-						"WHERE constraint_type = ? AND tc.table_name = ? " +
-						"ORDER BY column_name";
-
-					db.driver.execQuery(sql, ['PRIMARY KEY', 'account_emails'], function (err, data) {
-						should.not.exist(err);
-
-						should.equal(data.length, 2);
-						should.equal(data[0].column_name, 'account_id');
-						should.equal(data[1].column_name, 'emails_text');
-
-						done()
-					});
-				} else if (protocol == 'mysql') {
-					db.driver.execQuery("SHOW KEYS FROM ?? WHERE Key_name = ?", ['account_emails', 'PRIMARY'], function (err, data) {
-						should.not.exist(err);
-
-						should.equal(data.length, 2);
-						should.equal(data[0].Column_name, 'account_id');
-						should.equal(data[0].Key_name, 'PRIMARY');
-						should.equal(data[1].Column_name, 'emails_text');
-						should.equal(data[1].Key_name, 'PRIMARY');
-
-						done();
-					});
-				} else if (protocol == 'sqlite') {
-					db.driver.execQuery("pragma table_info(??)", ['account_emails'], function (err, data) {
-						should.not.exist(err);
-
-						should.equal(data.length, 2);
-						should.equal(data[0].name, 'account_id');
-						should.equal(data[0].pk, 1);
-						should.equal(data[1].name, 'emails_text');
-						should.equal(data[1].pk, 2);
-
-						done();
-					});
-				}
-			});
-		});
-	});
+  this.timeout(4000);
+  var db     = null;
+  var Person = null;
+  var Pet    = null;
+
+  before(function(done) {
+    helper.connect(function (connection) {
+      db = connection;
+      done();
+    });
+  });
+
+  describe("normal", function () {
+
+    var setup = function (opts) {
+      opts = opts || {};
+
+      return function (done) {
+        db.settings.set('instance.identityCache', false);
+
+        Person = db.define('person', {
+          name    : String,
+          surname : String,
+          age     : Number
+        });
+        Pet = db.define('pet', {
+          name    : String
+        });
+        Person.hasMany('pets', Pet, {}, { autoFetch: opts.autoFetchPets });
+
+        helper.dropSync([ Person, Pet], function (err) {
+          should.not.exist(err);
+
+          Pet.create([{ name: "Cat" }, { name: "Dog" }], function (err) {
+            should.not.exist(err);
+
+            /**
+             * John --+---> Deco
+             *        '---> Mutt <----- Jane
+             *
+             * Justin
+             */
+            Person.create([
+              {
+                name    : "Bob",
+                surname : "Smith",
+                age     : 30
+              },
+              {
+                name    : "John",
+                surname : "Doe",
+                age     : 20,
+                pets    : [{
+                  name    : "Deco"
+                }, {
+                  name    : "Mutt"
+                }]
+              }, {
+                name    : "Jane",
+                surname : "Doe",
+                age     : 16
+              }, {
+                name    : "Justin",
+                surname : "Dean",
+                age     : 18
+              }
+            ], function (err) {
+              should.not.exist(err);
+
+              Person.find({ name: "Jane" }, function (err, people) {
+                should.not.exist(err);
+
+                Pet.find({ name: "Mutt" }, function (err, pets) {
+                  should.not.exist(err);
+
+                  people[0].addPets(pets, done);
+                });
+              });
+            });
+          });
+        });
+      };
+    };
+
+    describe("getAccessor", function () {
+      before(setup());
+
+      it("should allow to specify order as string", function (done) {
+        Person.find({ name: "John" }, function (err, people) {
+          should.equal(err, null);
+
+          people[0].getPets("-name", function (err, pets) {
+            should.equal(err, null);
+
+            should(Array.isArray(pets));
+            pets.length.should.equal(2);
+            pets[0].model().should.equal(Pet);
+            pets[0].name.should.equal("Mutt");
+            pets[1].name.should.equal("Deco");
+
+            return done();
+          });
+        });
+      });
+
+       it ("should return proper instance model", function(done){
+         Person.find({ name: "John" }, function (err, people) {
+          people[0].getPets("-name", function (err, pets) {
+            pets[0].model().should.equal(Pet);
+            return done();
+          });
+        });
+       });
+
+      it("should allow to specify order as Array", function (done) {
+        Person.find({ name: "John" }, function (err, people) {
+          should.equal(err, null);
+
+          people[0].getPets([ "name", "Z" ], function (err, pets) {
+            should.equal(err, null);
+
+            should(Array.isArray(pets));
+            pets.length.should.equal(2);
+            pets[0].name.should.equal("Mutt");
+            pets[1].name.should.equal("Deco");
+
+            return done();
+          });
+        });
+      });
+
+      it("should allow to specify a limit", function (done) {
+        Person.find({ name: "John" }).first(function (err, John) {
+          should.equal(err, null);
+
+          John.getPets(1, function (err, pets) {
+            should.equal(err, null);
+
+            should(Array.isArray(pets));
+            pets.length.should.equal(1);
+
+            return done();
+          });
+        });
+      });
+
+      it("should allow to specify conditions", function (done) {
+        Person.find({ name: "John" }).first(function (err, John) {
+          should.equal(err, null);
+
+          John.getPets({ name: "Mutt" }, function (err, pets) {
+            should.equal(err, null);
+
+            should(Array.isArray(pets));
+            pets.length.should.equal(1);
+            pets[0].name.should.equal("Mutt");
+
+            return done();
+          });
+        });
+      });
+
+      if (common.protocol() == "mongodb") return;
+
+      it("should return a chain if no callback defined", function (done) {
+        Person.find({ name: "John" }, function (err, people) {
+          should.equal(err, null);
+
+          var chain = people[0].getPets({ name: "Mutt" });
+
+          chain.should.be.a.Object();
+          chain.find.should.be.a.Function();
+          chain.only.should.be.a.Function();
+          chain.limit.should.be.a.Function();
+          chain.order.should.be.a.Function();
+
+          return done();
+        });
+      });
+
+      it("should allow chaining count()", function (done) {
+        Person.find({}, function (err, people) {
+          should.equal(err, null);
+
+          people[1].getPets().count(function (err, count) {
+            should.not.exist(err);
+
+            should.strictEqual(count, 2);
+
+            people[2].getPets().count(function (err, count) {
+              should.not.exist(err);
+
+              should.strictEqual(count, 1);
+
+              people[3].getPets().count(function (err, count) {
+                should.not.exist(err);
+
+                should.strictEqual(count, 0);
+
+                return done();
+              });
+            });
+          });
+        });
+      });
+    });
+
+    describe("hasAccessor", function () {
+      before(setup());
+
+      it("should return true if instance has associated item", function (done) {
+        Pet.find({ name: "Mutt" }, function (err, pets) {
+          should.equal(err, null);
+
+          Person.find({ name: "Jane" }).first(function (err, Jane) {
+            should.equal(err, null);
+
+            Jane.hasPets(pets[0], function (err, has_pets) {
+              should.equal(err, null);
+              has_pets.should.be.true;
+
+              return done();
+            });
+          });
+        });
+      });
+
+      it("should return true if not passing any instance and has associated items", function (done) {
+        Person.find({ name: "Jane" }).first(function (err, Jane) {
+          should.equal(err, null);
+
+          Jane.hasPets(function (err, has_pets) {
+            should.equal(err, null);
+            has_pets.should.be.true;
+
+            return done();
+          });
+        });
+      });
+
+      it("should return true if all passed instances are associated", function (done) {
+        Pet.find(function (err, pets) {
+          Person.find({ name: "John" }).first(function (err, John) {
+            should.equal(err, null);
+
+            John.hasPets(pets, function (err, has_pets) {
+              should.equal(err, null);
+              has_pets.should.be.true;
+
+              return done();
+            });
+          });
+        });
+      });
+
+      it("should return false if any passed instances are not associated", function (done) {
+        Pet.find(function (err, pets) {
+          Person.find({ name: "Jane" }).first(function (err, Jane) {
+            should.equal(err, null);
+
+            Jane.hasPets(pets, function (err, has_pets) {
+              should.equal(err, null);
+              has_pets.should.be.false;
+
+              return done();
+            });
+          });
+        });
+      });
+
+      if (common.protocol() != "mongodb") {
+        it("should return true if join table has duplicate entries", function (done) {
+          Pet.find({ name: ["Mutt", "Deco"] }, function (err, pets) {
+            should.not.exist(err);
+            should.equal(pets.length, 2);
+
+            Person.find({ name: "John" }).first(function (err, John) {
+              should.not.exist(err);
+
+              John.hasPets(pets, function (err, hasPets) {
+                should.equal(err, null);
+                should.equal(hasPets, true);
+
+                db.driver.execQuery(
+                  "INSERT INTO person_pets (person_id, pets_id) VALUES (?,?), (?,?)",
+                  [John.id, pets[0].id, John.id, pets[1].id],
+                  function (err) {
+                    should.not.exist(err);
+
+                    John.hasPets(pets, function (err, hasPets) {
+                      should.equal(err, null);
+                      should.equal(hasPets, true);
+
+                      done()
+                    });
+                  }
+                );
+              });
+            });
+          });
+        });
+      }
+    });
+
+    describe("delAccessor", function () {
+      before(setup());
+
+      it("should accept arguments in different orders", function (done) {
+        Pet.find({ name: "Mutt" }, function (err, pets) {
+          Person.find({ name: "John" }, function (err, people) {
+            should.equal(err, null);
+
+            people[0].removePets(function (err) {
+              should.equal(err, null);
+
+              people[0].getPets(function (err, pets) {
+                should.equal(err, null);
+
+                should(Array.isArray(pets));
+                pets.length.should.equal(1);
+                pets[0].name.should.equal("Deco");
+
+                return done();
+              });
+            }, pets[0]);
+          });
+        });
+      });
+    });
+
+    describe("delAccessor", function () {
+      before(setup());
+
+      it("should remove specific associations if passed", function (done) {
+        Pet.find({ name: "Mutt" }, function (err, pets) {
+          Person.find({ name: "John" }, function (err, people) {
+            should.equal(err, null);
+
+            people[0].removePets(pets[0], function (err) {
+              should.equal(err, null);
+
+              people[0].getPets(function (err, pets) {
+                should.equal(err, null);
+
+                should(Array.isArray(pets));
+                pets.length.should.equal(1);
+                pets[0].name.should.equal("Deco");
+
+                return done();
+              });
+            });
+          });
+        });
+      });
+
+      it("should remove all associations if none passed", function (done) {
+        Person.find({ name: "John" }).first(function (err, John) {
+          should.equal(err, null);
+
+          John.removePets(function (err) {
+            should.equal(err, null);
+
+            John.getPets(function (err, pets) {
+              should.equal(err, null);
+
+              should(Array.isArray(pets));
+              pets.length.should.equal(0);
+
+              return done();
+            });
+          });
+        });
+      });
+    });
+
+    describe("addAccessor", function () {
+      before(setup());
+
+      if (common.protocol() != "mongodb") {
+        it("might add duplicates", function (done) {
+          Pet.find({ name: "Mutt" }, function (err, pets) {
+            Person.find({ name: "Jane" }, function (err, people) {
+              should.equal(err, null);
+
+              people[0].addPets(pets[0], function (err) {
+                should.equal(err, null);
+
+                people[0].getPets("name", function (err, pets) {
+                  should.equal(err, null);
+
+                  should(Array.isArray(pets));
+                  pets.length.should.equal(2);
+                  pets[0].name.should.equal("Mutt");
+                  pets[1].name.should.equal("Mutt");
+
+                  return done();
+                });
+              });
+            });
+          });
+        });
+      }
+
+      it("should keep associations and add new ones", function (done) {
+        Pet.find({ name: "Deco" }).first(function (err, Deco) {
+          Person.find({ name: "Jane" }).first(function (err, Jane) {
+            should.equal(err, null);
+
+            Jane.getPets(function (err, janesPets) {
+              should.not.exist(err);
+
+              var petsAtStart = janesPets.length;
+
+              Jane.addPets(Deco, function (err) {
+                should.equal(err, null);
+
+                Jane.getPets("name", function (err, pets) {
+                  should.equal(err, null);
+
+                  should(Array.isArray(pets));
+                  pets.length.should.equal(petsAtStart + 1);
+                  pets[0].name.should.equal("Deco");
+                  pets[1].name.should.equal("Mutt");
+
+                  return done();
+                });
+              });
+            });
+          });
+        });
+      });
+
+      it("should accept several arguments as associations", function (done) {
+        Pet.find(function (err, pets) {
+          Person.find({ name: "Justin" }).first(function (err, Justin) {
+            should.equal(err, null);
+
+            Justin.addPets(pets[0], pets[1], function (err) {
+              should.equal(err, null);
+
+              Justin.getPets(function (err, pets) {
+                should.equal(err, null);
+
+                should(Array.isArray(pets));
+                pets.length.should.equal(2);
+
+                return done();
+              });
+            });
+          });
+        });
+      });
+
+      it("should accept array as list of associations", function (done) {
+        Pet.create([{ name: 'Ruff' }, { name: 'Spotty' }],function (err, pets) {
+          Person.find({ name: "Justin" }).first(function (err, Justin) {
+            should.equal(err, null);
+
+            Justin.getPets(function (err, justinsPets) {
+              should.equal(err, null);
+
+              var petCount = justinsPets.length;
+
+              Justin.addPets(pets, function (err) {
+                should.equal(err, null);
+
+                Justin.getPets(function (err, justinsPets) {
+                  should.equal(err, null);
+
+                  should(Array.isArray(justinsPets));
+                  // Mongo doesn't like adding duplicates here, so we add new ones.
+                  should.equal(justinsPets.length, petCount + 2);
+
+                  return done();
+                });
+              });
+            });
+          });
+        });
+      });
+
+      it("should throw if no items passed", function (done) {
+        Person.one(function (err, person) {
+          should.equal(err, null);
+
+          (function () {
+            person.addPets(function () {});
+          }).should.throw();
+
+          return done();
+        });
+      });
+    });
+
+    describe("setAccessor", function () {
+      before(setup());
+
+      it("should accept several arguments as associations", function (done) {
+        Pet.find(function (err, pets) {
+          Person.find({ name: "Justin" }).first(function (err, Justin) {
+            should.equal(err, null);
+
+            Justin.setPets(pets[0], pets[1], function (err) {
+              should.equal(err, null);
+
+              Justin.getPets(function (err, pets) {
+                should.equal(err, null);
+
+                should(Array.isArray(pets));
+                pets.length.should.equal(2);
+
+                return done();
+              });
+            });
+          });
+        });
+      });
+
+      it("should accept an array of associations", function (done) {
+        Pet.find(function (err, pets) {
+          Person.find({ name: "Justin" }).first(function (err, Justin) {
+            should.equal(err, null);
+
+            Justin.setPets(pets, function (err) {
+              should.equal(err, null);
+
+              Justin.getPets(function (err, all_pets) {
+                should.equal(err, null);
+
+                should(Array.isArray(all_pets));
+                all_pets.length.should.equal(pets.length);
+
+                return done();
+              });
+            });
+          });
+        });
+      });
+
+      it("should remove all associations if an empty array is passed", function (done) {
+        Person.find({ name: "Justin" }).first(function (err, Justin) {
+          should.equal(err, null);
+          Justin.getPets(function (err, pets) {
+            should.equal(err, null);
+            should.equal(pets.length, 4);
+
+            Justin.setPets([], function (err) {
+              should.equal(err, null);
+
+              Justin.getPets(function (err, pets) {
+                should.equal(err, null);
+                should.equal(pets.length, 0);
+
+                return done();
+              });
+            });
+          });
+        });
+      });
+
+      it("clears current associations", function (done) {
+        Pet.find({ name: "Deco" }, function (err, pets) {
+          var Deco = pets[0];
+
+          Person.find({ name: "Jane" }).first(function (err, Jane) {
+            should.equal(err, null);
+
+            Jane.getPets(function (err, pets) {
+              should.equal(err, null);
+
+              should(Array.isArray(pets));
+              pets.length.should.equal(1);
+              pets[0].name.should.equal("Mutt");
+
+              Jane.setPets(Deco, function (err) {
+                should.equal(err, null);
+
+                Jane.getPets(function (err, pets) {
+                  should.equal(err, null);
+
+                  should(Array.isArray(pets));
+                  pets.length.should.equal(1);
+                  pets[0].name.should.equal(Deco.name);
+
+                  return done();
+                });
+              });
+            });
+          });
+        });
+      });
+    });
+
+    describe("with autoFetch turned on", function () {
+      before(setup({
+        autoFetchPets : true
+      }));
+
+      it("should fetch associations", function (done) {
+        Person.find({ name: "John" }).first(function (err, John) {
+          should.equal(err, null);
+
+          John.should.have.property("pets");
+          should(Array.isArray(John.pets));
+          John.pets.length.should.equal(2);
+
+          return done();
+        });
+      });
+
+      it("should save existing", function (done) {
+        Person.create({ name: 'Bishan' }, function (err) {
+          should.not.exist(err);
+
+          Person.one({ name: 'Bishan' }, function (err, person) {
+            should.not.exist(err);
+
+            person.surname = 'Dominar';
+
+            person.save(function (err) {
+              should.not.exist(err);
+
+              done();
+            });
+          });
+        });
+      });
+
+      it("should not auto save associations which were autofetched", function (done) {
+        Pet.all(function (err, pets) {
+          should.not.exist(err);
+          should.equal(pets.length, 4);
+
+          Person.create({ name: 'Paul' }, function (err, paul) {
+            should.not.exist(err);
+
+            Person.one({ name: 'Paul' }, function (err, paul2) {
+              should.not.exist(err);
+              should.equal(paul2.pets.length, 0);
+
+              paul.setPets(pets, function (err) {
+                should.not.exist(err);
+
+                // reload paul to make sure we have 2 pets
+                Person.one({ name: 'Paul' }, function (err, paul) {
+                  should.not.exist(err);
+                  should.equal(paul.pets.length, 4);
+
+                  // Saving paul2 should NOT auto save associations and hence delete
+                  // the associations we just created.
+                  paul2.save(function (err) {
+                    should.not.exist(err);
+
+                    // let's check paul - pets should still be associated
+                    Person.one({ name: 'Paul' }, function (err, paul) {
+                      should.not.exist(err);
+                      should.equal(paul.pets.length, 4);
+
+                      done();
+                    });
+                  });
+                });
+              });
+            });
+          });
+        });
+      });
+
+      it("should save associations set by the user", function (done) {
+        Person.one({ name: 'John' }, function (err, john) {
+          should.not.exist(err);
+          should.equal(john.pets.length, 2);
+
+          john.pets = [];
+
+          john.save(function (err) {
+            should.not.exist(err);
+
+            // reload john to make sure pets were deleted
+            Person.one({ name: 'John' }, function (err, john) {
+              should.not.exist(err);
+              should.equal(john.pets.length, 0);
+
+              done();
+            });
+          });
+        });
+      });
+
+    });
+  });
+
+  if (protocol == "mongodb") return;
+
+  describe("with non-standard keys", function () {
+    var Email;
+    var Account;
+
+    setup = function (opts, done) {
+      Email = db.define('email', {
+        text         : { type: 'text', key: true, required: true },
+        bounced      : Boolean
+      });
+
+      Account = db.define('account', {
+        name: String
+      });
+
+      Account.hasMany('emails', Email, {}, { key: opts.key });
+
+      helper.dropSync([ Email, Account ], function (err) {
+        should.not.exist(err);
+        done()
+      });
+    };
+
+    it("should place ids in the right place", function (done) {
+      setup({}, function (err) {
+        should.not.exist(err);
+
+        Email.create([{bounced: true, text: 'a@test.com'}, {bounced: false, text: 'z@test.com'}], function (err, emails) {
+          should.not.exist(err);
+
+          Account.create({ name: "Stuff" }, function (err, account) {
+            should.not.exist(err);
+
+            account.addEmails(emails[1], function (err) {
+              should.not.exist(err);
+
+              db.driver.execQuery("SELECT * FROM account_emails", function (err, data) {
+                should.not.exist(err);
+
+                should.equal(data[0].account_id, 1);
+                should.equal(data[0].emails_text, 'z@test.com');
+
+                done();
+              });
+            });
+          });
+        });
+      });
+    });
+
+    it("should generate correct tables", function (done) {
+      setup({}, function (err) {
+        should.not.exist(err);
+
+        var sql;
+
+        if (protocol == 'sqlite') {
+          sql = "PRAGMA table_info(?)";
+        } else {
+          sql = "SELECT column_name, data_type FROM information_schema.columns WHERE table_name = ? ORDER BY data_type";
+        }
+
+        db.driver.execQuery(sql, ['account_emails'], function (err, cols) {
+          should.not.exist(err);
+
+          if (protocol == 'sqlite') {
+            should.equal(cols[0].name, 'account_id');
+            should.equal(cols[0].type, 'INTEGER');
+            should.equal(cols[1].name, 'emails_text');
+            should.equal(cols[1].type, 'TEXT');
+          } else if (protocol == 'mysql') {
+            should.equal(cols[0].column_name, 'account_id');
+            should.equal(cols[0].data_type,   'int');
+            should.equal(cols[1].column_name, 'emails_text');
+            should.equal(cols[1].data_type,    'varchar');
+          } else if (protocol == 'postgres') {
+            should.equal(cols[0].column_name, 'account_id');
+            should.equal(cols[0].data_type,   'integer');
+            should.equal(cols[1].column_name, 'emails_text');
+            should.equal(cols[1].data_type,   'text');
+          }
+
+          done();
+        });
+      });
+    });
+
+    it("should add a composite key to the join table if requested", function (done) {
+      setup({ key: true }, function (err) {
+        should.not.exist(err);
+        var sql;
+
+        if (protocol == 'postgres' || protocol === 'redshift') {
+          sql = "" +
+            "SELECT c.column_name, c.data_type " +
+            "FROM  information_schema.table_constraints tc " +
+            "JOIN information_schema.constraint_column_usage AS ccu USING (constraint_schema, constraint_name) " +
+            "JOIN information_schema.columns AS c ON c.table_schema = tc.constraint_schema AND tc.table_name = c.table_name AND ccu.column_name = c.column_name " +
+            "WHERE constraint_type = ? AND tc.table_name = ? " +
+            "ORDER BY column_name";
+
+          db.driver.execQuery(sql, ['PRIMARY KEY', 'account_emails'], function (err, data) {
+            should.not.exist(err);
+
+            should.equal(data.length, 2);
+            should.equal(data[0].column_name, 'account_id');
+            should.equal(data[1].column_name, 'emails_text');
+
+            done()
+          });
+        } else if (protocol == 'mysql') {
+          db.driver.execQuery("SHOW KEYS FROM ?? WHERE Key_name = ?", ['account_emails', 'PRIMARY'], function (err, data) {
+            should.not.exist(err);
+
+            should.equal(data.length, 2);
+            should.equal(data[0].Column_name, 'account_id');
+            should.equal(data[0].Key_name, 'PRIMARY');
+            should.equal(data[1].Column_name, 'emails_text');
+            should.equal(data[1].Key_name, 'PRIMARY');
+
+            done();
+          });
+        } else if (protocol == 'sqlite') {
+          db.driver.execQuery("pragma table_info(??)", ['account_emails'], function (err, data) {
+            should.not.exist(err);
+
+            should.equal(data.length, 2);
+            should.equal(data[0].name, 'account_id');
+            should.equal(data[0].pk, 1);
+            should.equal(data[1].name, 'emails_text');
+            should.equal(data[1].pk, 2);
+
+            done();
+          });
+        }
+      });
+    });
+  });
 });
diff --git a/test/integration/association-hasone-required.js b/test/integration/association-hasone-required.js
index 2524b1cd..cde0160b 100644
--- a/test/integration/association-hasone-required.js
+++ b/test/integration/association-hasone-required.js
@@ -5,85 +5,85 @@ var async  = require('async');
 var _      = require('lodash');
 
 describe("hasOne", function() {
-	var db     = null;
-	var Person = null;
+  var db     = null;
+  var Person = null;
 
-	var setup = function (required) {
-		return function (done) {
-			db.settings.set('instance.identityCache', false);
-			db.settings.set('instance.returnAllErrors', true);
+  var setup = function (required) {
+    return function (done) {
+      db.settings.set('instance.identityCache', false);
+      db.settings.set('instance.returnAllErrors', true);
 
-			Person = db.define('person', {
-				name     : String
-			});
-			Person.hasOne('parent', Person, {
-				required : required,
-				field    : 'parentId'
-			});
+      Person = db.define('person', {
+        name     : String
+      });
+      Person.hasOne('parent', Person, {
+        required : required,
+        field    : 'parentId'
+      });
 
-			return helper.dropSync(Person, done);
-		};
-	};
+      return helper.dropSync(Person, done);
+    };
+  };
 
-	before(function(done) {
-		helper.connect(function (connection) {
-			db = connection;
-			done();
-		});
-	});
+  before(function(done) {
+    helper.connect(function (connection) {
+      db = connection;
+      done();
+    });
+  });
 
-	describe("required", function () {
-		before(setup(true));
+  describe("required", function () {
+    before(setup(true));
 
-		it("should not accept empty association", function (done) {
-			var John = new Person({
-				name     : "John",
-				parentId : null
-			});
-			John.save(function (errors) {
-				should.exist(errors);
-				should.equal(errors.length, 1);
-				should.equal(errors[0].type,     'validation');
-				should.equal(errors[0].msg,      'required');
-				should.equal(errors[0].property, 'parentId');
-				return done();
-			});
-		});
+    it("should not accept empty association", function (done) {
+      var John = new Person({
+        name     : "John",
+        parentId : null
+      });
+      John.save(function (errors) {
+        should.exist(errors);
+        should.equal(errors.length, 1);
+        should.equal(errors[0].type,     'validation');
+        should.equal(errors[0].msg,      'required');
+        should.equal(errors[0].property, 'parentId');
+        return done();
+      });
+    });
 
-		it("should accept association", function (done) {
-			var John = new Person({
-				name     : "John",
-				parentId : 1
-			});
-			John.save(function (err) {
-				should.not.exist(err);
-				return done();
-			});
-		});
-	});
+    it("should accept association", function (done) {
+      var John = new Person({
+        name     : "John",
+        parentId : 1
+      });
+      John.save(function (err) {
+        should.not.exist(err);
+        return done();
+      });
+    });
+  });
 
-	describe("not required", function () {
-		before(setup(false));
+  describe("not required", function () {
+    before(setup(false));
 
-		it("should accept empty association", function (done) {
-			var John = new Person({
-				name : "John"
-			});
-			John.save(function (err) {
-				should.not.exist(err);
-				return done();
-			});
-		});
+    it("should accept empty association", function (done) {
+      var John = new Person({
+        name : "John"
+      });
+      John.save(function (err) {
+        should.not.exist(err);
+        return done();
+      });
+    });
 
-		it("should accept null association", function (done) {
-			var John = new Person({
-				name      : "John",
-				parent_id : null
-			});
-			John.save(function (err) {
-				should.not.exist(err);
-				return done();
-			});
-		});
-	});
+    it("should accept null association", function (done) {
+      var John = new Person({
+        name      : "John",
+        parent_id : null
+      });
+      John.save(function (err) {
+        should.not.exist(err);
+        return done();
+      });
+    });
+  });
 });
diff --git a/test/integration/association-hasone-reverse.js b/test/integration/association-hasone-reverse.js
index 6067f811..8c637924 100644
--- a/test/integration/association-hasone-reverse.js
+++ b/test/integration/association-hasone-reverse.js
@@ -6,331 +6,331 @@ var common = require('../common');
 var _ = require('lodash');
 
 describe("hasOne", function () {
-	var db = null;
-	var Person = null;
-	var Pet = null;
-
-	var setup = function () {
-		return function (done) {
-			Person = db.define('person', {
-				name: String
-			});
-			Pet = db.define('pet', {
-				name: String
-			});
-			Person.hasOne('pet', Pet, {
-				reverse: 'owners',
-				field: 'pet_id'
-			});
-
-			return helper.dropSync([Person, Pet], function () {
-				// Running in series because in-memory sqlite encounters problems
-				async.series([
-					Person.create.bind(Person, { name: "John Doe" }),
-					Person.create.bind(Person, { name: "Jane Doe" }),
-					Pet.create.bind(Pet, { name: "Deco"  }),
-					Pet.create.bind(Pet, { name: "Fido"  })
-				], done);
-			});
-		};
-	};
-
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
-			done();
-		});
-	});
-
-	describe("reverse", function () {
-		removeHookRun = false;
-
-		before(setup({
-			hooks: {
-				beforeRemove: function () {
-					removeHookRun = true;
-				}
-			}
-		}));
-
-		it("should create methods in both models", function (done) {
-			var person = Person(1);
-			var pet = Pet(1);
-
-			person.getPet.should.be.a.Function();
-			person.setPet.should.be.a.Function();
-			person.removePet.should.be.a.Function();
-			person.hasPet.should.be.a.Function();
-
-			pet.getOwners.should.be.a.Function();
-			pet.setOwners.should.be.a.Function();
-			pet.hasOwners.should.be.a.Function();
-
-			return done();
-		});
-
-		describe(".getAccessor()", function () {
-			it("should work", function (done) {
-				Person.find({ name: "John Doe" }).first(function (err, John) {
-					Pet.find({ name: "Deco" }).first(function (err, Deco) {
-						Deco.hasOwners(function (err, has_owner) {
-							should.not.exist(err);
-							has_owner.should.be.false;
-
-							Deco.setOwners(John, function (err) {
-								should.not.exist(err);
-
-								Deco.getOwners(function (err, JohnCopy) {
-									should.not.exist(err);
-									should(Array.isArray(JohnCopy));
-									John.should.eql(JohnCopy[0]);
-
-									return done();
-								});
-							});
-						});
-					});
-				});
-			});
-
-			describe("Chain", function () {
-				before(function (done) {
-					var petParams = [
-						{ name: "Hippo" },
-						{ name: "Finch", owners: [{ name: "Harold" }, { name: "Hagar" }] },
-						{ name: "Fox",   owners: [{ name: "Nelly"  }, { name: "Narnia" }] }
-					];
-
-					Pet.create(petParams, function (err, pets) {
-						should.not.exist(err);
-						should.equal(pets.length, 3);
-
-						Person.find({ name: ["Harold", "Hagar", "Nelly", "Narnia"] }, function (err, people) {
-							should.not.exist(err);
-							should.exist(people);
-							should.equal(people.length, 4);
-
-							done();
-						});
-					});
-				});
-
-				it("should be returned if no callback is passed", function (done) {
-					Pet.one(function (err, pet) {
-						should.not.exist(err);
-						should.exist(pet);
-
-						var chain = pet.getOwners();
-
-						should.equal(typeof chain,     'object');
-						should.equal(typeof chain.run, 'function');
-
-						done()
-					});
-				});
-
-				it(".remove() should not call hooks", function (done) {
-					Pet.one({ name: "Finch" }, function (err, pet) {
-						should.not.exist(err);
-						should.exist(pet);
-
-						should.equal(removeHookRun, false);
-						pet.getOwners().remove(function (err) {
-							should.not.exist(err);
-							should.equal(removeHookRun, false);
-
-							Person.find({ name: "Harold" }, function (err, items) {
-								should.not.exist(err);
-								should.equal(items.length, 0);
-								done();
-							});
-						});
-					});
-				});
-
-			});
-		});
-
-		it("should be able to set an array of people as the owner", function (done) {
-			Person.find({ name: ["John Doe", "Jane Doe"] }, function (err, owners) {
-				should.not.exist(err);
-
-				Pet.find({ name: "Fido" }).first(function (err, Fido) {
-					should.not.exist(err);
-
-					Fido.hasOwners(function (err, has_owner) {
-						should.not.exist(err);
-						has_owner.should.be.false;
-
-						Fido.setOwners(owners, function (err) {
-							should.not.exist(err);
-
-							Fido.getOwners(function (err, ownersCopy) {
-								should.not.exist(err);
-								should(Array.isArray(owners));
-								owners.length.should.equal(2);
-
-								// Don't know which order they'll be in.
-								var idProp = common.protocol() == 'mongodb' ? '_id' : 'id'
-
-								if (owners[0][idProp] == ownersCopy[0][idProp]) {
-									owners[0].should.eql(ownersCopy[0]);
-									owners[1].should.eql(ownersCopy[1]);
-								} else {
-									owners[0].should.eql(ownersCopy[1]);
-									owners[1].should.eql(ownersCopy[0]);
-								}
-
-								return done();
-							});
-						});
-					});
-				});
-			});
-		});
-
-		// broken in mongo
-		if (common.protocol() != "mongodb") {
-			describe("findBy()", function () {
-				before(setup());
-
-				before(function (done) {
-					Person.one({ name: "Jane Doe" }, function (err, jane) {
-						Pet.one({ name: "Deco" }, function (err, deco) {
-							deco.setOwners(jane, function (err) {
-								should.not.exist(err);
-								done();
-							});
-						});
-					});
-				});
-
-				it("should throw if no conditions passed", function (done) {
-					(function () {
-						Pet.findByOwners(function () {});
-					}).should.throw();
-
-					return done();
-				});
-
-				it("should lookup reverse Model based on associated model properties", function (done) {
-					Pet.findByOwners({
-						name: "Jane Doe"
-					}, function (err, pets) {
-						should.not.exist(err);
-						should.equal(Array.isArray(pets), true);
-
-						// This often fails for sqlite on travis
-						if (common.isTravis() && common.protocol() != 'sqlite') {
-							should.equal(pets.length, 1);
-							should.equal(pets[0].name, 'Deco');
-						}
-
-						return done();
-					});
-				});
-
-				it("should return a ChainFind if no callback passed", function (done) {
-					var ChainFind = Pet.findByOwners({
-						name: "John Doe"
-					});
-					ChainFind.run.should.be.a.Function();
-
-					return done();
-				});
-			});
-		}
-	});
-
-	describe("reverse find", function () {
-		it("should be able to find given an association id", function (done) {
-			common.retry(setup(), function (done) {
-				Person.find({ name: "John Doe" }).first(function (err, John) {
-					should.not.exist(err);
-					should.exist(John);
-					Pet.find({ name: "Deco" }).first(function (err, Deco) {
-						should.not.exist(err);
-						should.exist(Deco);
-						Deco.hasOwners(function (err, has_owner) {
-							should.not.exist(err);
-							has_owner.should.be.false;
-
-							Deco.setOwners(John, function (err) {
-								should.not.exist(err);
-
-								Person.find({ pet_id: Deco[Pet.id[0]] }).first(function (err, owner) {
-									should.not.exist(err);
-									should.exist(owner);
-									should.equal(owner.name, John.name);
-									done();
-								});
-
-							});
-						});
-					});
-				});
-			}, 3, done);
-		});
-
-		it("should be able to find given an association instance", function (done) {
-			common.retry(setup(), function (done) {
-				Person.find({ name: "John Doe" }).first(function (err, John) {
-					should.not.exist(err);
-					should.exist(John);
-					Pet.find({ name: "Deco" }).first(function (err, Deco) {
-						should.not.exist(err);
-						should.exist(Deco);
-						Deco.hasOwners(function (err, has_owner) {
-							should.not.exist(err);
-							has_owner.should.be.false;
-
-							Deco.setOwners(John, function (err) {
-								should.not.exist(err);
-
-								Person.find({ pet: Deco }).first(function (err, owner) {
-									should.not.exist(err);
-									should.exist(owner);
-									should.equal(owner.name, John.name);
-									done();
-								});
-
-							});
-						});
-					});
-				});
-			}, 3, done);
-		});
-
-		it("should be able to find given a number of association instances with a single primary key", function (done) {
-			common.retry(setup(), function (done) {
-				Person.find({ name: "John Doe" }).first(function (err, John) {
-					should.not.exist(err);
-					should.exist(John);
-					Pet.all(function (err, pets) {
-						should.not.exist(err);
-						should.exist(pets);
-						should.equal(pets.length, 2);
-
-						pets[0].hasOwners(function (err, has_owner) {
-							should.not.exist(err);
-							has_owner.should.be.false;
-
-							pets[0].setOwners(John, function (err) {
-								should.not.exist(err);
-
-								Person.find({ pet: pets }, function (err, owners) {
-									should.not.exist(err);
-									should.exist(owners);
-									owners.length.should.equal(1);
-
-									should.equal(owners[0].name, John.name);
-									done();
-								});
-							});
-						});
-					});
-				});
-			}, 3, done);
-		});
-	});
+  var db = null;
+  var Person = null;
+  var Pet = null;
+
+  var setup = function () {
+    return function (done) {
+      Person = db.define('person', {
+        name: String
+      });
+      Pet = db.define('pet', {
+        name: String
+      });
+      Person.hasOne('pet', Pet, {
+        reverse: 'owners',
+        field: 'pet_id'
+      });
+
+      return helper.dropSync([Person, Pet], function () {
+        // Running in series because in-memory sqlite encounters problems
+        async.series([
+          Person.create.bind(Person, { name: "John Doe" }),
+          Person.create.bind(Person, { name: "Jane Doe" }),
+          Pet.create.bind(Pet, { name: "Deco"  }),
+          Pet.create.bind(Pet, { name: "Fido"  })
+        ], done);
+      });
+    };
+  };
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+      done();
+    });
+  });
+
+  describe("reverse", function () {
+    removeHookRun = false;
+
+    before(setup({
+      hooks: {
+        beforeRemove: function () {
+          removeHookRun = true;
+        }
+      }
+    }));
+
+    it("should create methods in both models", function (done) {
+      var person = Person(1);
+      var pet = Pet(1);
+
+      person.getPet.should.be.a.Function();
+      person.setPet.should.be.a.Function();
+      person.removePet.should.be.a.Function();
+      person.hasPet.should.be.a.Function();
+
+      pet.getOwners.should.be.a.Function();
+      pet.setOwners.should.be.a.Function();
+      pet.hasOwners.should.be.a.Function();
+
+      return done();
+    });
+
+    describe(".getAccessor()", function () {
+      it("should work", function (done) {
+        Person.find({ name: "John Doe" }).first(function (err, John) {
+          Pet.find({ name: "Deco" }).first(function (err, Deco) {
+            Deco.hasOwners(function (err, has_owner) {
+              should.not.exist(err);
+              has_owner.should.be.false;
+
+              Deco.setOwners(John, function (err) {
+                should.not.exist(err);
+
+                Deco.getOwners(function (err, JohnCopy) {
+                  should.not.exist(err);
+                  should(Array.isArray(JohnCopy));
+                  John.should.eql(JohnCopy[0]);
+
+                  return done();
+                });
+              });
+            });
+          });
+        });
+      });
+
+      describe("Chain", function () {
+        before(function (done) {
+          var petParams = [
+            { name: "Hippo" },
+            { name: "Finch", owners: [{ name: "Harold" }, { name: "Hagar" }] },
+            { name: "Fox",   owners: [{ name: "Nelly"  }, { name: "Narnia" }] }
+          ];
+
+          Pet.create(petParams, function (err, pets) {
+            should.not.exist(err);
+            should.equal(pets.length, 3);
+
+            Person.find({ name: ["Harold", "Hagar", "Nelly", "Narnia"] }, function (err, people) {
+              should.not.exist(err);
+              should.exist(people);
+              should.equal(people.length, 4);
+
+              done();
+            });
+          });
+        });
+
+        it("should be returned if no callback is passed", function (done) {
+          Pet.one(function (err, pet) {
+            should.not.exist(err);
+            should.exist(pet);
+
+            var chain = pet.getOwners();
+
+            should.equal(typeof chain,     'object');
+            should.equal(typeof chain.run, 'function');
+
+            done()
+          });
+        });
+
+        it(".remove() should not call hooks", function (done) {
+          Pet.one({ name: "Finch" }, function (err, pet) {
+            should.not.exist(err);
+            should.exist(pet);
+
+            should.equal(removeHookRun, false);
+            pet.getOwners().remove(function (err) {
+              should.not.exist(err);
+              should.equal(removeHookRun, false);
+
+              Person.find({ name: "Harold" }, function (err, items) {
+                should.not.exist(err);
+                should.equal(items.length, 0);
+                done();
+              });
+            });
+          });
+        });
+
+      });
+    });
+
+    it("should be able to set an array of people as the owner", function (done) {
+      Person.find({ name: ["John Doe", "Jane Doe"] }, function (err, owners) {
+        should.not.exist(err);
+
+        Pet.find({ name: "Fido" }).first(function (err, Fido) {
+          should.not.exist(err);
+
+          Fido.hasOwners(function (err, has_owner) {
+            should.not.exist(err);
+            has_owner.should.be.false;
+
+            Fido.setOwners(owners, function (err) {
+              should.not.exist(err);
+
+              Fido.getOwners(function (err, ownersCopy) {
+                should.not.exist(err);
+                should(Array.isArray(owners));
+                owners.length.should.equal(2);
+
+                // Don't know which order they'll be in.
+                var idProp = common.protocol() == 'mongodb' ? '_id' : 'id'
+
+                if (owners[0][idProp] == ownersCopy[0][idProp]) {
+                  owners[0].should.eql(ownersCopy[0]);
+                  owners[1].should.eql(ownersCopy[1]);
+                } else {
+                  owners[0].should.eql(ownersCopy[1]);
+                  owners[1].should.eql(ownersCopy[0]);
+                }
+
+                return done();
+              });
+            });
+          });
+        });
+      });
+    });
+
+    // broken in mongo
+    if (common.protocol() != "mongodb") {
+      describe("findBy()", function () {
+        before(setup());
+
+        before(function (done) {
+          Person.one({ name: "Jane Doe" }, function (err, jane) {
+            Pet.one({ name: "Deco" }, function (err, deco) {
+              deco.setOwners(jane, function (err) {
+                should.not.exist(err);
+                done();
+              });
+            });
+          });
+        });
+
+        it("should throw if no conditions passed", function (done) {
+          (function () {
+            Pet.findByOwners(function () {});
+          }).should.throw();
+
+          return done();
+        });
+
+        it("should lookup reverse Model based on associated model properties", function (done) {
+          Pet.findByOwners({
+            name: "Jane Doe"
+          }, function (err, pets) {
+            should.not.exist(err);
+            should.equal(Array.isArray(pets), true);
+
+            // This often fails for sqlite on travis
+            if (common.isTravis() && common.protocol() != 'sqlite') {
+              should.equal(pets.length, 1);
+              should.equal(pets[0].name, 'Deco');
+            }
+
+            return done();
+          });
+        });
+
+        it("should return a ChainFind if no callback passed", function (done) {
+          var ChainFind = Pet.findByOwners({
+            name: "John Doe"
+          });
+          ChainFind.run.should.be.a.Function();
+
+          return done();
+        });
+      });
+    }
+  });
+
+  describe("reverse find", function () {
+    it("should be able to find given an association id", function (done) {
+      common.retry(setup(), function (done) {
+        Person.find({ name: "John Doe" }).first(function (err, John) {
+          should.not.exist(err);
+          should.exist(John);
+          Pet.find({ name: "Deco" }).first(function (err, Deco) {
+            should.not.exist(err);
+            should.exist(Deco);
+            Deco.hasOwners(function (err, has_owner) {
+              should.not.exist(err);
+              has_owner.should.be.false;
+
+              Deco.setOwners(John, function (err) {
+                should.not.exist(err);
+
+                Person.find({ pet_id: Deco[Pet.id[0]] }).first(function (err, owner) {
+                  should.not.exist(err);
+                  should.exist(owner);
+                  should.equal(owner.name, John.name);
+                  done();
+                });
+
+              });
+            });
+          });
+        });
+      }, 3, done);
+    });
+
+    it("should be able to find given an association instance", function (done) {
+      common.retry(setup(), function (done) {
+        Person.find({ name: "John Doe" }).first(function (err, John) {
+          should.not.exist(err);
+          should.exist(John);
+          Pet.find({ name: "Deco" }).first(function (err, Deco) {
+            should.not.exist(err);
+            should.exist(Deco);
+            Deco.hasOwners(function (err, has_owner) {
+              should.not.exist(err);
+              has_owner.should.be.false;
+
+              Deco.setOwners(John, function (err) {
+                should.not.exist(err);
+
+                Person.find({ pet: Deco }).first(function (err, owner) {
+                  should.not.exist(err);
+                  should.exist(owner);
+                  should.equal(owner.name, John.name);
+                  done();
+                });
+
+              });
+            });
+          });
+        });
+      }, 3, done);
+    });
+
+    it("should be able to find given a number of association instances with a single primary key", function (done) {
+      common.retry(setup(), function (done) {
+        Person.find({ name: "John Doe" }).first(function (err, John) {
+          should.not.exist(err);
+          should.exist(John);
+          Pet.all(function (err, pets) {
+            should.not.exist(err);
+            should.exist(pets);
+            should.equal(pets.length, 2);
+
+            pets[0].hasOwners(function (err, has_owner) {
+              should.not.exist(err);
+              has_owner.should.be.false;
+
+              pets[0].setOwners(John, function (err) {
+                should.not.exist(err);
+
+                Person.find({ pet: pets }, function (err, owners) {
+                  should.not.exist(err);
+                  should.exist(owners);
+                  owners.length.should.equal(1);
+
+                  should.equal(owners[0].name, John.name);
+                  done();
+                });
+              });
+            });
+          });
+        });
+      }, 3, done);
+    });
+  });
 });
diff --git a/test/integration/association-hasone-zeroid.js b/test/integration/association-hasone-zeroid.js
index 549be7f9..6248e5f0 100644
--- a/test/integration/association-hasone-zeroid.js
+++ b/test/integration/association-hasone-zeroid.js
@@ -5,152 +5,152 @@ var helper = require('../support/spec_helper');
 var ORM    = require('../../');
 
 describe("hasOne", function() {
-	var db     = null;
-	var Person = null;
-	var Pet    = null;
-
-	var setup = function (autoFetch) {
-		return function (done) {
-			db.settings.set('instance.identityCache', false);
-			db.settings.set('instance.returnAllErrors', true);
-
-			Person = db.define('person', {
-				id        : { type : "integer",  mapsTo: "personID", key: true },
-				firstName : { type : "text",     size:   "255" },
-				lastName  : { type : "text",     size:   "255" }
-			});
-
-			Pet = db.define('pet', {
-				id      : { type : "integer",  mapsTo: "petID", key: true },
-				petName : { type : "text",     size:   "255" },
-				ownerID : { type : "integer",  size:   "4" }
-			});
-
-			Pet.hasOne('owner', Person, { field: 'ownerID', autoFetch: autoFetch });
-
-			helper.dropSync([Person, Pet], function(err) {
-				if (err) return done(err);
-
-				Pet.create([
-					{
-						id: 10,
-						petName: 'Muttley',
-						owner: {
-							id: 12,
-							firstName: 'Stuey',
-							lastName: 'McG'
-						}
-					},
-					{
-						id: 11,
-						petName: 'Snagglepuss',
-						owner: {
-							id: 0,
-							firstName: 'John',
-							lastName: 'Doe'
-						}
-					}
-				], done);
-			});
-		};
-	};
-
-	before(function(done) {
-		helper.connect(function (connection) {
-			db = connection;
-			done();
-		});
-	});
-
-	describe("auto fetch", function () {
-		before(setup(true));
-
-		it("should work for non-zero ownerID ", function (done) {
-			Pet.find({petName: "Muttley"}, function(err, pets) {
-				should.not.exist(err);
-
-				pets[0].petName.should.equal("Muttley");
-				pets[0].should.have.property("id");
-				pets[0].id.should.equal(10);
-				pets[0].ownerID.should.equal(12);
-
-				pets[0].should.have.property("owner");
-				pets[0].owner.firstName.should.equal("Stuey");
-
-				return done();
-			});
-		});
-
-		it("should work for zero ownerID ", function (done) {
-			Pet.find({petName: "Snagglepuss"}, function(err, pets) {
-				should.not.exist(err);
-
-				pets[0].petName.should.equal("Snagglepuss");
-				pets[0].should.have.property("id");
-				pets[0].id.should.equal(11);
-
-				db.models.person.all(function (err, people) {
-					return done();
-				});
-			});
-		});
-	});
-
-	describe("no auto fetch", function () {
-		before(setup(false));
-
-		it("should work for non-zero ownerID ", function (done) {
-			Pet.find({petName: "Muttley"}, function(err, pets) {
-				should.not.exist(err);
-
-				pets[0].petName.should.equal("Muttley");
-				pets[0].should.have.property("id");
-				pets[0].id.should.equal(10);
-				pets[0].ownerID.should.equal(12);
-
-				pets[0].should.not.have.property("owner");
-
-				// But we should be able to see if its there
-				pets[0].hasOwner(function(err, result) {
-					should.not.exist(err);
-					should.equal(result, true);
-
-					// ...and then get it
-					pets[0].getOwner(function(err, result) {
-						should.not.exist(err);
-						result.firstName.should.equal("Stuey");
-
-						return done()
-					});
-				});
-			});
-		});
-
-		it("should work for zero ownerID ", function (done) {
-			Pet.find({petName: "Snagglepuss"}, function(err, pets) {
-				should.not.exist(err);
-
-				pets[0].petName.should.equal("Snagglepuss");
-				pets[0].should.have.property("id");
-				pets[0].id.should.equal(11);
-				pets[0].ownerID.should.equal(0);
-
-				pets[0].should.not.have.property("owner");
-
-				// But we should be able to see if its there
-				pets[0].hasOwner(function(err, result) {
-					should.not.exist(err);
-					should.equal(result, true);
-
-					// ...and then get it
-					pets[0].getOwner(function(err, result) {
-						should.not.exist(err);
-						result.firstName.should.equal("John");
-
-						return done()
-					});
-				});
-			});
-		});
-	});
+  var db     = null;
+  var Person = null;
+  var Pet    = null;
+
+  var setup = function (autoFetch) {
+    return function (done) {
+      db.settings.set('instance.identityCache', false);
+      db.settings.set('instance.returnAllErrors', true);
+
+      Person = db.define('person', {
+        id        : { type : "integer",  mapsTo: "personID", key: true },
+        firstName : { type : "text",     size:   "255" },
+        lastName  : { type : "text",     size:   "255" }
+      });
+
+      Pet = db.define('pet', {
+        id      : { type : "integer",  mapsTo: "petID", key: true },
+        petName : { type : "text",     size:   "255" },
+        ownerID : { type : "integer",  size:   "4" }
+      });
+
+      Pet.hasOne('owner', Person, { field: 'ownerID', autoFetch: autoFetch });
+
+      helper.dropSync([Person, Pet], function(err) {
+        if (err) return done(err);
+
+        Pet.create([
+          {
+            id: 10,
+            petName: 'Muttley',
+            owner: {
+              id: 12,
+              firstName: 'Stuey',
+              lastName: 'McG'
+            }
+          },
+          {
+            id: 11,
+            petName: 'Snagglepuss',
+            owner: {
+              id: 0,
+              firstName: 'John',
+              lastName: 'Doe'
+            }
+          }
+        ], done);
+      });
+    };
+  };
+
+  before(function(done) {
+    helper.connect(function (connection) {
+      db = connection;
+      done();
+    });
+  });
+
+  describe("auto fetch", function () {
+    before(setup(true));
+
+    it("should work for non-zero ownerID ", function (done) {
+      Pet.find({petName: "Muttley"}, function(err, pets) {
+        should.not.exist(err);
+
+        pets[0].petName.should.equal("Muttley");
+        pets[0].should.have.property("id");
+        pets[0].id.should.equal(10);
+        pets[0].ownerID.should.equal(12);
+
+        pets[0].should.have.property("owner");
+        pets[0].owner.firstName.should.equal("Stuey");
+
+        return done();
+      });
+    });
+
+    it("should work for zero ownerID ", function (done) {
+      Pet.find({petName: "Snagglepuss"}, function(err, pets) {
+        should.not.exist(err);
+
+        pets[0].petName.should.equal("Snagglepuss");
+        pets[0].should.have.property("id");
+        pets[0].id.should.equal(11);
+
+        db.models.person.all(function (err, people) {
+          return done();
+        });
+      });
+    });
+  });
+
+  describe("no auto fetch", function () {
+    before(setup(false));
+
+    it("should work for non-zero ownerID ", function (done) {
+      Pet.find({petName: "Muttley"}, function(err, pets) {
+        should.not.exist(err);
+
+        pets[0].petName.should.equal("Muttley");
+        pets[0].should.have.property("id");
+        pets[0].id.should.equal(10);
+        pets[0].ownerID.should.equal(12);
+
+        pets[0].should.not.have.property("owner");
+
+        // But we should be able to see if its there
+        pets[0].hasOwner(function(err, result) {
+          should.not.exist(err);
+          should.equal(result, true);
+
+          // ...and then get it
+          pets[0].getOwner(function(err, result) {
+            should.not.exist(err);
+            result.firstName.should.equal("Stuey");
+
+            return done()
+          });
+        });
+      });
+    });
+
+    it("should work for zero ownerID ", function (done) {
+      Pet.find({petName: "Snagglepuss"}, function(err, pets) {
+        should.not.exist(err);
+
+        pets[0].petName.should.equal("Snagglepuss");
+        pets[0].should.have.property("id");
+        pets[0].id.should.equal(11);
+        pets[0].ownerID.should.equal(0);
+
+        pets[0].should.not.have.property("owner");
+
+        // But we should be able to see if its there
+        pets[0].hasOwner(function(err, result) {
+          should.not.exist(err);
+          should.equal(result, true);
+
+          // ...and then get it
+          pets[0].getOwner(function(err, result) {
+            should.not.exist(err);
+            result.firstName.should.equal("John");
+
+            return done()
+          });
+        });
+      });
+    });
+  });
 });
diff --git a/test/integration/association-hasone.js b/test/integration/association-hasone.js
index 1329c876..bc8a5a91 100644
--- a/test/integration/association-hasone.js
+++ b/test/integration/association-hasone.js
@@ -7,465 +7,465 @@ var common   = require('../common');
 var protocol = common.protocol();
 
 describe("hasOne", function() {
-	var db    = null;
-	var Tree  = null;
-	var Stalk = null;
-	var Leaf  = null;
-	var leafId = null;
-	var treeId = null;
-	var stalkId = null;
-	var holeId  = null;
-
-	var setup = function (opts) {
-		opts = opts || {};
-		return function (done) {
-			db.settings.set('instance.identityCache', false);
-			db.settings.set('instance.returnAllErrors', true);
-			Tree  = db.define("tree",   { type:   { type: 'text'    } });
-			Stalk = db.define("stalk",  { length: { type: 'integer' } });
-			Hole  = db.define("hole",   { width:  { type: 'integer' } });
-			Leaf  = db.define("leaf", {
-				size:   { type: 'integer' },
-				holeId: { type: 'integer', mapsTo: 'hole_id' }
-			}, {
-				validations: opts.validations
-			});
-			Leaf.hasOne('tree',  Tree,  { field: 'treeId', autoFetch: !!opts.autoFetch });
-			Leaf.hasOne('stalk', Stalk, { field: 'stalkId', mapsTo: 'stalk_id' });
-			Leaf.hasOne('hole',  Hole,  { field: 'holeId' });
-
-			return helper.dropSync([Tree, Stalk, Hole, Leaf], function() {
-				Tree.create({ type: 'pine' }, function (err, tree) {
-					should.not.exist(err);
-					treeId = tree[Tree.id];
-					Leaf.create({ size: 14 }, function (err, leaf) {
-						should.not.exist(err);
-						leafId = leaf[Leaf.id];
-						leaf.setTree(tree, function (err) {
-							should.not.exist(err);
-							Stalk.create({ length: 20 }, function (err, stalk) {
-								should.not.exist(err);
-								should.exist(stalk);
-								stalkId = stalk[Stalk.id];
-								Hole.create({ width: 3 }, function (err, hole) {
-									should.not.exist(err);
-									holeId = hole.id;
-									done();
-								});
-							});
-						});
-					});
-				});
-			});
-		};
-	};
-
-	before(function(done) {
-		helper.connect(function (connection) {
-			db = connection;
-			done();
-		});
-	});
-
-	describe("accessors", function () {
-		before(setup());
-
-		it("get should get the association", function (done) {
-			Leaf.one({ size: 14 }, function (err, leaf) {
-				should.not.exist(err);
-				should.exist(leaf);
-				leaf.getTree(function (err, tree) {
-					should.not.exist(err);
-					should.exist(tree);
-					return done();
-				});
-			});
-		});
-
-		it("should return proper instance model", function (done) {
-			Leaf.one({ size: 14 }, function (err, leaf) {
-				leaf.getTree(function (err, tree) {
-					tree.model().should.equal(Tree);
-					return done();
-				});
-			});
-		});
-
-		it("get should get the association with a shell model", function (done) {
-			Leaf(leafId).getTree(function (err, tree) {
-				should.not.exist(err);
-				should.exist(tree);
-				should.equal(tree[Tree.id], treeId);
-				done();
-			});
-		});
-
-		it("has should indicate if there is an association present", function (done) {
-			Leaf.one({ size: 14 }, function (err, leaf) {
-				should.not.exist(err);
-				should.exist(leaf);
-
-				leaf.hasTree(function (err, has) {
-					should.not.exist(err);
-					should.equal(has, true);
-
-					leaf.hasStalk(function (err, has) {
-						should.not.exist(err);
-						should.equal(has, false);
-						return done();
-					});
-				});
-			});
-		});
-
-		it("set should associate another instance", function (done) {
-			Stalk.one({ length: 20 }, function (err, stalk) {
-				should.not.exist(err);
-				should.exist(stalk);
-				Leaf.one({ size: 14 }, function (err, leaf) {
-					should.not.exist(err);
-					should.exist(leaf);
-					should.not.exist(leaf.stalkId);
-					leaf.setStalk(stalk, function (err) {
-						should.not.exist(err);
-						Leaf.one({ size: 14 }, function (err, leaf) {
-							should.not.exist(err);
-							should.equal(leaf.stalkId, stalk[Stalk.id]);
-							done();
-						});
-					});
-				});
-			});
-		});
-
-		it("remove should unassociation another instance", function (done) {
-			Stalk.one({ length: 20 }, function (err, stalk) {
-				should.not.exist(err);
-				should.exist(stalk);
-				Leaf.one({ size: 14 }, function (err, leaf) {
-					should.not.exist(err);
-					should.exist(leaf);
-					should.exist(leaf.stalkId);
-					leaf.removeStalk(function (err) {
-						should.not.exist(err);
-						Leaf.one({ size: 14 }, function (err, leaf) {
-							should.not.exist(err);
-							should.equal(leaf.stalkId, null);
-							done();
-						});
-					});
-				});
-			});
-		});
-	});
-
-	[false, true].forEach(function (af) {
-		describe("with autofetch = " + af, function () {
-			before(setup({autoFetch: af}));
-
-			describe("autofetching", function() {
-				it((af ? "should" : "shouldn't") + " be done", function (done) {
-					Leaf.one({}, function (err, leaf) {
-						should.not.exist(err);
-						should.equal(typeof leaf.tree, af ? 'object' : 'undefined');
-
-						return done();
-					});
-				});
-			});
-
-			describe("associating by parent id", function () {
-				var tree = null;
-
-				before(function(done) {
-					Tree.create({type: "cyprus"},  function (err, item) {
-						should.not.exist(err);
-						tree = item;
-
-						return done();
-					});
-				});
-
-				it("should work when calling Instance.save", function (done) {
-					leaf = new Leaf({size: 4, treeId: tree[Tree.id]});
-					leaf.save(function(err, leaf) {
-						should.not.exist(err);
-
-						Leaf.get(leaf[Leaf.id], function(err, fetchedLeaf) {
-							should.not.exist(err);
-							should.exist(fetchedLeaf);
-							should.equal(fetchedLeaf.treeId, leaf.treeId);
-
-							return done();
-						});
-					});
-				});
-
-				it("should work when calling Instance.save after initially setting parentId to null", function(done) {
-					leaf = new Leaf({size: 4, treeId: null});
-					leaf.treeId = tree[Tree.id];
-					leaf.save(function(err, leaf) {
-						should.not.exist(err);
-
-						Leaf.get(leaf[Leaf.id], function(err, fetchedLeaf) {
-							should.not.exist(err);
-							should.exist(fetchedLeaf);
-							should.equal(fetchedLeaf.treeId, leaf.treeId);
-
-							return done();
-						});
-					});
-				});
-
-				it("should work when specifying parentId in the save call", function (done) {
-					leaf = new Leaf({size: 4});
-					leaf.save({ treeId: tree[Tree.id] }, function(err, leaf) {
-						should.not.exist(err);
-
-						should.exist(leaf.treeId);
-
-						Leaf.get(leaf[Leaf.id], function(err, fetchedLeaf) {
-							should.not.exist(err);
-							should.exist(fetchedLeaf);
-							should.equal(fetchedLeaf.treeId, leaf.treeId);
-
-							return done();
-						});
-					});
-				});
-
-				it("should work when calling Model.create", function (done) {
-					Leaf.create({size: 4, treeId: tree[Tree.id]}, function (err, leaf) {
-						should.not.exist(err);
-
-						Leaf.get(leaf[Leaf.id], function(err, fetchedLeaf) {
-							should.not.exist(err);
-
-							should.exist(fetchedLeaf);
-							should.equal(fetchedLeaf.treeId, leaf.treeId);
-
-							return done();
-						});
-					});
-				});
-
-				it("shouldn't cause an infinite loop when getting and saving with no changes", function (done) {
-					Leaf.get(leafId, function (err, leaf) {
-						should.not.exist(err);
-
-						leaf.save( function (err) {
-							should.not.exist(err);
-							done();
-						});
-					});
-				});
-
-				it("shouldn't cause an infinite loop when getting and saving with changes", function (done) {
-					Leaf.get(leafId, function (err, leaf) {
-						should.not.exist(err);
-
-						leaf.save({ size: 14 }, function (err) {
-							should.not.exist(err);
-							done();
-						});
-					});
-				});
-			});
-		});
-	});
-
-	describe("validations", function () {
-		before(setup({validations: { stalkId: ORM.validators.rangeNumber(undefined, 50) }}));
-
-		it("should allow validating parentId", function (done) {
-			Leaf.one({ size: 14 }, function (err, leaf) {
-				should.not.exist(err);
-				should.exist(leaf);
-
-				leaf.save({ stalkId: 51	}, function( err, item ) {
-					should(Array.isArray(err));
-					should.equal(err.length, 1);
-					should.equal(err[0].msg, 'out-of-range-number');
-
-					done();
-				});
-			});
-		});
-	});
-
-	describe("if not passing another Model", function () {
-		it("should use same model", function (done) {
-			db.settings.set('instance.identityCache', false);
-			db.settings.set('instance.returnAllErrors', true);
-
-			var Person = db.define("person", {
-				name : String
-			});
-			Person.hasOne("parent", {
-				autoFetch : true
-			});
-
-			helper.dropSync(Person, function () {
-				var child = new Person({
-					name : "Child"
-				});
-				child.setParent(new Person({ name: "Parent" }), function (err) {
-					should.equal(err, null);
-
-					return done();
-				});
-			});
-		});
-	});
-
-	describe("association name letter case", function () {
-		it("should be kept", function (done) {
-			db.settings.set('instance.identityCache', false);
-			db.settings.set('instance.returnAllErrors', true);
-
-			var Person = db.define("person", {
-				name : String
-			});
-			Person.hasOne("topParent", Person);
-
-			helper.dropSync(Person, function () {
-				Person.create({
-					name : "Child"
-				}, function (err, person) {
-					should.equal(err, null);
-
-					Person.get(person[Person.id], function (err, person) {
-						should.equal(err, null);
-
-						person.setTopParent.should.be.a.Function();
-						person.removeTopParent.should.be.a.Function();
-						person.hasTopParent.should.be.a.Function();
-
-						return done();
-					});
-				});
-			});
-		});
-	});
-
-	describe("findBy()", function () {
-		before(setup());
-
-		it("should throw if no conditions passed", function (done) {
-			(function () {
-				Leaf.findByTree(function () {});
-			}).should.throw();
-
-			return done();
-		});
-
-		it("should lookup in Model based on associated model properties", function (done) {
-			Leaf.findByTree({
-				type: "pine"
-			}, function (err, leafs) {
-				should.equal(err, null);
-				should(Array.isArray(leafs));
-				should(leafs.length == 1);
-
-				return done();
-			});
-		});
-
-		it("should return a ChainFind if no callback passed", function (done) {
-			var ChainFind = Leaf.findByTree({
-				type: "pine"
-			});
-			ChainFind.run.should.be.a.Function();
-
-			return done();
-		});
-	});
-
-	if (protocol != "mongodb") {
-		describe("mapsTo", function () {
-			describe("with `mapsTo` set via `hasOne`", function () {
-				var leaf = null;
-
-				before(setup());
-
-				before(function (done) {
-					Leaf.create({ size: 444, stalkId: stalkId, holeId: holeId }, function (err, lf) {
-						should.not.exist(err);
-						leaf = lf;
-						done();
-					});
-				});
-
-				it("should have correct fields in the DB", function (done) {
-					var sql = db.driver.query.select()
-					  .from('leaf')
-					  .select('size', 'stalk_id')
-					  .where({ size: 444 })
-					  .build();
-
-					db.driver.execQuery(sql, function (err, rows) {
-						should.not.exist(err);
-
-						should.equal(rows[0].size, 444);
-						should.equal(rows[0].stalk_id, 1);
-
-						done();
-		      });
-				});
-
-				it("should get parent", function (done) {
-					leaf.getStalk(function (err, stalk) {
-						should.not.exist(err);
-
-						should.exist(stalk);
-						should.equal(stalk.id, stalkId);
-						should.equal(stalk.length, 20);
-						done();
-					});
-				});
-			});
-
-			describe("with `mapsTo` set via property definition", function () {
-				var leaf = null;
-
-				before(setup());
-
-				before(function (done) {
-					Leaf.create({ size: 444, stalkId: stalkId, holeId: holeId }, function (err, lf) {
-						should.not.exist(err);
-						leaf = lf;
-						done();
-					});
-				});
-
-				it("should have correct fields in the DB", function (done) {
-					var sql = db.driver.query.select()
-					  .from('leaf')
-					  .select('size', 'hole_id')
-					  .where({ size: 444 })
-					  .build();
-
-					db.driver.execQuery(sql, function (err, rows) {
-						should.not.exist(err);
-
-						should.equal(rows[0].size, 444);
-						should.equal(rows[0].hole_id, 1);
-
-						done();
-		      });
-				});
-
-				it("should get parent", function (done) {
-					leaf.getHole(function (err, hole) {
-						should.not.exist(err);
-
-						should.exist(hole);
-						should.equal(hole.id, stalkId);
-						should.equal(hole.width, 3);
-						done();
-					});
-				});
-			});
-		});
-	};
+  var db    = null;
+  var Tree  = null;
+  var Stalk = null;
+  var Leaf  = null;
+  var leafId = null;
+  var treeId = null;
+  var stalkId = null;
+  var holeId  = null;
+
+  var setup = function (opts) {
+    opts = opts || {};
+    return function (done) {
+      db.settings.set('instance.identityCache', false);
+      db.settings.set('instance.returnAllErrors', true);
+      Tree  = db.define("tree",   { type:   { type: 'text'    } });
+      Stalk = db.define("stalk",  { length: { type: 'integer' } });
+      Hole  = db.define("hole",   { width:  { type: 'integer' } });
+      Leaf  = db.define("leaf", {
+        size:   { type: 'integer' },
+        holeId: { type: 'integer', mapsTo: 'hole_id' }
+      }, {
+        validations: opts.validations
+      });
+      Leaf.hasOne('tree',  Tree,  { field: 'treeId', autoFetch: !!opts.autoFetch });
+      Leaf.hasOne('stalk', Stalk, { field: 'stalkId', mapsTo: 'stalk_id' });
+      Leaf.hasOne('hole',  Hole,  { field: 'holeId' });
+
+      return helper.dropSync([Tree, Stalk, Hole, Leaf], function() {
+        Tree.create({ type: 'pine' }, function (err, tree) {
+          should.not.exist(err);
+          treeId = tree[Tree.id];
+          Leaf.create({ size: 14 }, function (err, leaf) {
+            should.not.exist(err);
+            leafId = leaf[Leaf.id];
+            leaf.setTree(tree, function (err) {
+              should.not.exist(err);
+              Stalk.create({ length: 20 }, function (err, stalk) {
+                should.not.exist(err);
+                should.exist(stalk);
+                stalkId = stalk[Stalk.id];
+                Hole.create({ width: 3 }, function (err, hole) {
+                  should.not.exist(err);
+                  holeId = hole.id;
+                  done();
+                });
+              });
+            });
+          });
+        });
+      });
+    };
+  };
+
+  before(function(done) {
+    helper.connect(function (connection) {
+      db = connection;
+      done();
+    });
+  });
+
+  describe("accessors", function () {
+    before(setup());
+
+    it("get should get the association", function (done) {
+      Leaf.one({ size: 14 }, function (err, leaf) {
+        should.not.exist(err);
+        should.exist(leaf);
+        leaf.getTree(function (err, tree) {
+          should.not.exist(err);
+          should.exist(tree);
+          return done();
+        });
+      });
+    });
+
+    it("should return proper instance model", function (done) {
+      Leaf.one({ size: 14 }, function (err, leaf) {
+        leaf.getTree(function (err, tree) {
+          tree.model().should.equal(Tree);
+          return done();
+        });
+      });
+    });
+
+    it("get should get the association with a shell model", function (done) {
+      Leaf(leafId).getTree(function (err, tree) {
+        should.not.exist(err);
+        should.exist(tree);
+        should.equal(tree[Tree.id], treeId);
+        done();
+      });
+    });
+
+    it("has should indicate if there is an association present", function (done) {
+      Leaf.one({ size: 14 }, function (err, leaf) {
+        should.not.exist(err);
+        should.exist(leaf);
+
+        leaf.hasTree(function (err, has) {
+          should.not.exist(err);
+          should.equal(has, true);
+
+          leaf.hasStalk(function (err, has) {
+            should.not.exist(err);
+            should.equal(has, false);
+            return done();
+          });
+        });
+      });
+    });
+
+    it("set should associate another instance", function (done) {
+      Stalk.one({ length: 20 }, function (err, stalk) {
+        should.not.exist(err);
+        should.exist(stalk);
+        Leaf.one({ size: 14 }, function (err, leaf) {
+          should.not.exist(err);
+          should.exist(leaf);
+          should.not.exist(leaf.stalkId);
+          leaf.setStalk(stalk, function (err) {
+            should.not.exist(err);
+            Leaf.one({ size: 14 }, function (err, leaf) {
+              should.not.exist(err);
+              should.equal(leaf.stalkId, stalk[Stalk.id]);
+              done();
+            });
+          });
+        });
+      });
+    });
+
+    it("remove should unassociation another instance", function (done) {
+      Stalk.one({ length: 20 }, function (err, stalk) {
+        should.not.exist(err);
+        should.exist(stalk);
+        Leaf.one({ size: 14 }, function (err, leaf) {
+          should.not.exist(err);
+          should.exist(leaf);
+          should.exist(leaf.stalkId);
+          leaf.removeStalk(function (err) {
+            should.not.exist(err);
+            Leaf.one({ size: 14 }, function (err, leaf) {
+              should.not.exist(err);
+              should.equal(leaf.stalkId, null);
+              done();
+            });
+          });
+        });
+      });
+    });
+  });
+
+  [false, true].forEach(function (af) {
+    describe("with autofetch = " + af, function () {
+      before(setup({autoFetch: af}));
+
+      describe("autofetching", function() {
+        it((af ? "should" : "shouldn't") + " be done", function (done) {
+          Leaf.one({}, function (err, leaf) {
+            should.not.exist(err);
+            should.equal(typeof leaf.tree, af ? 'object' : 'undefined');
+
+            return done();
+          });
+        });
+      });
+
+      describe("associating by parent id", function () {
+        var tree = null;
+
+        before(function(done) {
+          Tree.create({type: "cyprus"},  function (err, item) {
+            should.not.exist(err);
+            tree = item;
+
+            return done();
+          });
+        });
+
+        it("should work when calling Instance.save", function (done) {
+          leaf = new Leaf({size: 4, treeId: tree[Tree.id]});
+          leaf.save(function(err, leaf) {
+            should.not.exist(err);
+
+            Leaf.get(leaf[Leaf.id], function(err, fetchedLeaf) {
+              should.not.exist(err);
+              should.exist(fetchedLeaf);
+              should.equal(fetchedLeaf.treeId, leaf.treeId);
+
+              return done();
+            });
+          });
+        });
+
+        it("should work when calling Instance.save after initially setting parentId to null", function(done) {
+          leaf = new Leaf({size: 4, treeId: null});
+          leaf.treeId = tree[Tree.id];
+          leaf.save(function(err, leaf) {
+            should.not.exist(err);
+
+            Leaf.get(leaf[Leaf.id], function(err, fetchedLeaf) {
+              should.not.exist(err);
+              should.exist(fetchedLeaf);
+              should.equal(fetchedLeaf.treeId, leaf.treeId);
+
+              return done();
+            });
+          });
+        });
+
+        it("should work when specifying parentId in the save call", function (done) {
+          leaf = new Leaf({size: 4});
+          leaf.save({ treeId: tree[Tree.id] }, function(err, leaf) {
+            should.not.exist(err);
+
+            should.exist(leaf.treeId);
+
+            Leaf.get(leaf[Leaf.id], function(err, fetchedLeaf) {
+              should.not.exist(err);
+              should.exist(fetchedLeaf);
+              should.equal(fetchedLeaf.treeId, leaf.treeId);
+
+              return done();
+            });
+          });
+        });
+
+        it("should work when calling Model.create", function (done) {
+          Leaf.create({size: 4, treeId: tree[Tree.id]}, function (err, leaf) {
+            should.not.exist(err);
+
+            Leaf.get(leaf[Leaf.id], function(err, fetchedLeaf) {
+              should.not.exist(err);
+
+              should.exist(fetchedLeaf);
+              should.equal(fetchedLeaf.treeId, leaf.treeId);
+
+              return done();
+            });
+          });
+        });
+
+        it("shouldn't cause an infinite loop when getting and saving with no changes", function (done) {
+          Leaf.get(leafId, function (err, leaf) {
+            should.not.exist(err);
+
+            leaf.save( function (err) {
+              should.not.exist(err);
+              done();
+            });
+          });
+        });
+
+        it("shouldn't cause an infinite loop when getting and saving with changes", function (done) {
+          Leaf.get(leafId, function (err, leaf) {
+            should.not.exist(err);
+
+            leaf.save({ size: 14 }, function (err) {
+              should.not.exist(err);
+              done();
+            });
+          });
+        });
+      });
+    });
+  });
+
+  describe("validations", function () {
+    before(setup({validations: { stalkId: ORM.validators.rangeNumber(undefined, 50) }}));
+
+    it("should allow validating parentId", function (done) {
+      Leaf.one({ size: 14 }, function (err, leaf) {
+        should.not.exist(err);
+        should.exist(leaf);
+
+        leaf.save({ stalkId: 51  }, function( err, item ) {
+          should(Array.isArray(err));
+          should.equal(err.length, 1);
+          should.equal(err[0].msg, 'out-of-range-number');
+
+          done();
+        });
+      });
+    });
+  });
+
+  describe("if not passing another Model", function () {
+    it("should use same model", function (done) {
+      db.settings.set('instance.identityCache', false);
+      db.settings.set('instance.returnAllErrors', true);
+
+      var Person = db.define("person", {
+        name : String
+      });
+      Person.hasOne("parent", {
+        autoFetch : true
+      });
+
+      helper.dropSync(Person, function () {
+        var child = new Person({
+          name : "Child"
+        });
+        child.setParent(new Person({ name: "Parent" }), function (err) {
+          should.equal(err, null);
+
+          return done();
+        });
+      });
+    });
+  });
+
+  describe("association name letter case", function () {
+    it("should be kept", function (done) {
+      db.settings.set('instance.identityCache', false);
+      db.settings.set('instance.returnAllErrors', true);
+
+      var Person = db.define("person", {
+        name : String
+      });
+      Person.hasOne("topParent", Person);
+
+      helper.dropSync(Person, function () {
+        Person.create({
+          name : "Child"
+        }, function (err, person) {
+          should.equal(err, null);
+
+          Person.get(person[Person.id], function (err, person) {
+            should.equal(err, null);
+
+            person.setTopParent.should.be.a.Function();
+            person.removeTopParent.should.be.a.Function();
+            person.hasTopParent.should.be.a.Function();
+
+            return done();
+          });
+        });
+      });
+    });
+  });
+
+  describe("findBy()", function () {
+    before(setup());
+
+    it("should throw if no conditions passed", function (done) {
+      (function () {
+        Leaf.findByTree(function () {});
+      }).should.throw();
+
+      return done();
+    });
+
+    it("should lookup in Model based on associated model properties", function (done) {
+      Leaf.findByTree({
+        type: "pine"
+      }, function (err, leafs) {
+        should.equal(err, null);
+        should(Array.isArray(leafs));
+        should(leafs.length == 1);
+
+        return done();
+      });
+    });
+
+    it("should return a ChainFind if no callback passed", function (done) {
+      var ChainFind = Leaf.findByTree({
+        type: "pine"
+      });
+      ChainFind.run.should.be.a.Function();
+
+      return done();
+    });
+  });
+
+  if (protocol != "mongodb") {
+    describe("mapsTo", function () {
+      describe("with `mapsTo` set via `hasOne`", function () {
+        var leaf = null;
+
+        before(setup());
+
+        before(function (done) {
+          Leaf.create({ size: 444, stalkId: stalkId, holeId: holeId }, function (err, lf) {
+            should.not.exist(err);
+            leaf = lf;
+            done();
+          });
+        });
+
+        it("should have correct fields in the DB", function (done) {
+          var sql = db.driver.query.select()
+            .from('leaf')
+            .select('size', 'stalk_id')
+            .where({ size: 444 })
+            .build();
+
+          db.driver.execQuery(sql, function (err, rows) {
+            should.not.exist(err);
+
+            should.equal(rows[0].size, 444);
+            should.equal(rows[0].stalk_id, 1);
+
+            done();
+          });
+        });
+
+        it("should get parent", function (done) {
+          leaf.getStalk(function (err, stalk) {
+            should.not.exist(err);
+
+            should.exist(stalk);
+            should.equal(stalk.id, stalkId);
+            should.equal(stalk.length, 20);
+            done();
+          });
+        });
+      });
+
+      describe("with `mapsTo` set via property definition", function () {
+        var leaf = null;
+
+        before(setup());
+
+        before(function (done) {
+          Leaf.create({ size: 444, stalkId: stalkId, holeId: holeId }, function (err, lf) {
+            should.not.exist(err);
+            leaf = lf;
+            done();
+          });
+        });
+
+        it("should have correct fields in the DB", function (done) {
+          var sql = db.driver.query.select()
+            .from('leaf')
+            .select('size', 'hole_id')
+            .where({ size: 444 })
+            .build();
+
+          db.driver.execQuery(sql, function (err, rows) {
+            should.not.exist(err);
+
+            should.equal(rows[0].size, 444);
+            should.equal(rows[0].hole_id, 1);
+
+            done();
+          });
+        });
+
+        it("should get parent", function (done) {
+          leaf.getHole(function (err, hole) {
+            should.not.exist(err);
+
+            should.exist(hole);
+            should.equal(hole.id, stalkId);
+            should.equal(hole.width, 3);
+            done();
+          });
+        });
+      });
+    });
+  };
 });
diff --git a/test/integration/big.js b/test/integration/big.js
index db69ba86..2c09ebf0 100644
--- a/test/integration/big.js
+++ b/test/integration/big.js
@@ -5,52 +5,52 @@ var ORM      = require('../../');
 var common   = require('../common');
 
 describe("Big data sets", function () {
-	var db = null;
-	var Like = null;
-
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
-
-			return done();
-		});
-	});
-
-	after(function () {
-		return db.close();
-	});
-
-	// TODO: Fix
-	xdescribe("Chain.remove() with 50,000 records", function () {
-		this.timeout(60000);
-
-		before(function (done) {
-			Like = db.define("like", { t: { type: 'integer' } });
-
-			helper.dropSync(Like, function (err) {
-				should.not.exist(err);
-
-				async.times(5000, function (n, cb) {
-					db.driver.execQuery(
-						"INSERT INTO ?? (??) VALUES (?),(?),(?),(?),(?),(?),(?),(?),(?),(?)",
-						['like', 't', 1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
-						function (err) {
-							should.not.exist(err);
-							cb();
-						}
-					);
-				}, function (err) {
-					should.not.exist(err);
-					done()
-				});
-			});
-		});
-
-		it("should work", function (done) {
-			Like.find().remove(function (err) {
-				should.not.exist(err);
-				done();
-			});
-		});
-	});
+  var db = null;
+  var Like = null;
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  // TODO: Fix
+  xdescribe("Chain.remove() with 50,000 records", function () {
+    this.timeout(60000);
+
+    before(function (done) {
+      Like = db.define("like", { t: { type: 'integer' } });
+
+      helper.dropSync(Like, function (err) {
+        should.not.exist(err);
+
+        async.times(5000, function (n, cb) {
+          db.driver.execQuery(
+            "INSERT INTO ?? (??) VALUES (?),(?),(?),(?),(?),(?),(?),(?),(?),(?)",
+            ['like', 't', 1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+            function (err) {
+              should.not.exist(err);
+              cb();
+            }
+          );
+        }, function (err) {
+          should.not.exist(err);
+          done()
+        });
+      });
+    });
+
+    it("should work", function (done) {
+      Like.find().remove(function (err) {
+        should.not.exist(err);
+        done();
+      });
+    });
+  });
 });
diff --git a/test/integration/db.js b/test/integration/db.js
index 9e9f7114..8e44f1c5 100644
--- a/test/integration/db.js
+++ b/test/integration/db.js
@@ -4,290 +4,290 @@ var ORM    = require('../../');
 var common = require('../common');
 
 describe("db.use()", function () {
-	var db = null;
+  var db = null;
 
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
 
-			return done();
-		});
-	});
+      return done();
+    });
+  });
 
-	after(function () {
-		return db.close();
-	});
+  after(function () {
+    return db.close();
+  });
 
-	it("should be able to register a plugin", function (done) {
-		var MyPlugin = require("../support/my_plugin");
-		var opts     = {
-			option       : true,
-			calledDefine : false
-		};
+  it("should be able to register a plugin", function (done) {
+    var MyPlugin = require("../support/my_plugin");
+    var opts     = {
+      option       : true,
+      calledDefine : false
+    };
 
-		db.use(MyPlugin, opts);
+    db.use(MyPlugin, opts);
 
-		var MyModel = db.define("my_model", { // db.define should call plugin.define method
-			property: String
-		});
+    var MyModel = db.define("my_model", { // db.define should call plugin.define method
+      property: String
+    });
 
-		opts.calledDefine.should.be.true;
+    opts.calledDefine.should.be.true;
 
-		return done();
-	});
+    return done();
+  });
 
-	it("a plugin should be able to catch models before defining them", function (done) {
-		var MyPlugin = require("../support/my_plugin");
-		var opts     = {
-			option       : true,
-			calledDefine : false,
-			beforeDefine : function (name, props, opts) {
-				props.otherprop = Number;
-			}
-		};
+  it("a plugin should be able to catch models before defining them", function (done) {
+    var MyPlugin = require("../support/my_plugin");
+    var opts     = {
+      option       : true,
+      calledDefine : false,
+      beforeDefine : function (name, props, opts) {
+        props.otherprop = Number;
+      }
+    };
 
-		db.use(MyPlugin, opts);
+    db.use(MyPlugin, opts);
 
-		var MyModel = db.define("my_model", { // db.define should call plugin.define method
-			property: String
-		});
+    var MyModel = db.define("my_model", { // db.define should call plugin.define method
+      property: String
+    });
 
-		opts.calledDefine.should.be.true;
-		MyModel.properties.should.have.property("otherprop");
+    opts.calledDefine.should.be.true;
+    MyModel.properties.should.have.property("otherprop");
 
-		return done();
-	});
+    return done();
+  });
 
-	it("should be able to register a plugin as string", function (done) {
-		var opts     = {
-			option       : true,
-			calledDefine : false
-		};
+  it("should be able to register a plugin as string", function (done) {
+    var opts     = {
+      option       : true,
+      calledDefine : false
+    };
 
-		db.use("../support/my_plugin", opts);
+    db.use("../support/my_plugin", opts);
 
-		var MyModel = db.define("my_model", { // db.define should call plugin.define method
-			property: String
-		});
+    var MyModel = db.define("my_model", { // db.define should call plugin.define method
+      property: String
+    });
 
-		opts.calledDefine.should.be.true;
+    opts.calledDefine.should.be.true;
 
-		return done();
-	});
+    return done();
+  });
 });
 
 describe("db.define()", function() {
-	var db = null;
+  var db = null;
 
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
 
-			return done();
-		});
-	});
+      return done();
+    });
+  });
 
-	after(function () {
-		return db.close();
-	});
+  after(function () {
+    return db.close();
+  });
 
-	it("should use setting model.namePrefix as table prefix if defined", function (done) {
-		db.settings.set("model.namePrefix", "orm_");
+  it("should use setting model.namePrefix as table prefix if defined", function (done) {
+    db.settings.set("model.namePrefix", "orm_");
 
-		var Person = db.define("person", {
-			name: String
-		});
+    var Person = db.define("person", {
+      name: String
+    });
 
-		Person.table.should.equal("orm_person");
+    Person.table.should.equal("orm_person");
 
-		return done();
-	});
+    return done();
+  });
 });
 
 describe("db.load()", function () {
-	var db = null;
+  var db = null;
 
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
 
-			return done();
-		});
-	});
+      return done();
+    });
+  });
 
-	after(function () {
-		return db.close();
-	});
+  after(function () {
+    return db.close();
+  });
 
-	it("should require a file based on relative path", function (done) {
-		db.load("../support/spec_load", function () {
-			db.models.should.have.property("person");
-			db.models.should.have.property("pet");
+  it("should require a file based on relative path", function (done) {
+    db.load("../support/spec_load", function () {
+      db.models.should.have.property("person");
+      db.models.should.have.property("pet");
 
-			return done();
-		});
-	});
+      return done();
+    });
+  });
 });
 
 describe("db.load()", function () {
-	var db = null;
+  var db = null;
 
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
 
-			return done();
-		});
-	});
+      return done();
+    });
+  });
 
-	after(function () {
-		return db.close();
-	});
+  after(function () {
+    return db.close();
+  });
 
-	it("should be able to load more than one file", function (done) {
-		db.load("../support/spec_load_second", "../support/spec_load_third", function () {
-			db.models.should.have.property("person");
-			db.models.should.have.property("pet");
+  it("should be able to load more than one file", function (done) {
+    db.load("../support/spec_load_second", "../support/spec_load_third", function () {
+      db.models.should.have.property("person");
+      db.models.should.have.property("pet");
 
-			return done();
-		});
-	});
+      return done();
+    });
+  });
 });
 
 describe("db.load()", function () {
-	var db = null;
+  var db = null;
 
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
 
-			return done();
-		});
-	});
+      return done();
+    });
+  });
 
-	after(function () {
-		return db.close();
-	});
+  after(function () {
+    return db.close();
+  });
 
-	it("should be able to load more than one file passed as Array", function (done) {
-		db.load([ "../support/spec_load_second", "../support/spec_load_third" ], function () {
-			db.models.should.have.property("person");
-			db.models.should.have.property("pet");
+  it("should be able to load more than one file passed as Array", function (done) {
+    db.load([ "../support/spec_load_second", "../support/spec_load_third" ], function () {
+      db.models.should.have.property("person");
+      db.models.should.have.property("pet");
 
-			return done();
-		});
-	});
+      return done();
+    });
+  });
 });
 
 describe("db.serial()", function () {
-	var db = null;
-
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
-
-			return done();
-		});
-	});
-
-	after(function () {
-		return db.close();
-	});
-
-	it("should be able to execute chains in serial", function (done) {
-		var Person = db.define("person", {
-			name    : String,
-			surname : String
-		});
-		helper.dropSync(Person, function () {
-			Person.create([
-				{ name : "John", surname : "Doe" },
-				{ name : "Jane", surname : "Doe" }
-			], function () {
-				db.serial(
-					Person.find({ surname : "Doe" }),
-					Person.find({ name    : "John" })
-				).get(function (err, DoeFamily, JohnDoe) {
-					should.equal(err, null);
-
-					should(Array.isArray(DoeFamily));
-					should(Array.isArray(JohnDoe));
-
-					DoeFamily.length.should.equal(2);
-					JohnDoe.length.should.equal(1);
-
-					DoeFamily[0].surname.should.equal("Doe");
-					DoeFamily[1].surname.should.equal("Doe");
-
-					JohnDoe[0].name.should.equal("John");
-
-					return done();
-				});
-			});
-		});
-	});
+  var db = null;
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  it("should be able to execute chains in serial", function (done) {
+    var Person = db.define("person", {
+      name    : String,
+      surname : String
+    });
+    helper.dropSync(Person, function () {
+      Person.create([
+        { name : "John", surname : "Doe" },
+        { name : "Jane", surname : "Doe" }
+      ], function () {
+        db.serial(
+          Person.find({ surname : "Doe" }),
+          Person.find({ name    : "John" })
+        ).get(function (err, DoeFamily, JohnDoe) {
+          should.equal(err, null);
+
+          should(Array.isArray(DoeFamily));
+          should(Array.isArray(JohnDoe));
+
+          DoeFamily.length.should.equal(2);
+          JohnDoe.length.should.equal(1);
+
+          DoeFamily[0].surname.should.equal("Doe");
+          DoeFamily[1].surname.should.equal("Doe");
+
+          JohnDoe[0].name.should.equal("John");
+
+          return done();
+        });
+      });
+    });
+  });
 });
 
 describe("db.driver", function () {
-	var db = null;
-
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
-
-			var Log = db.define('log', {
-				what : { type: 'text' },
-				when : { type: 'date', time: true },
-				who  : { type: 'text' }
-			});
-
-			helper.dropSync(Log, function (err) {
-				if (err) return done(err);
-
-				Log.create([
-					{ what: "password reset", when: new Date('2013/04/07 12:33:05'), who: "jane" },
-					{ what: "user login",     when: new Date('2013/04/07 13:01:44'), who: "jane" },
-					{ what: "user logout",    when: new Date('2013/05/12 04:09:31'), who: "john" }
-				], done);
-			});
-		});
-	});
-
-	after(function () {
-		return db.close();
-	});
-
-	it("should be available", function () {
-		should.exist(db.driver);
-	});
-
-	if (common.protocol() == "mongodb") return;
-
-	describe("query", function () {
-		it("should be available", function () {
-			should.exist(db.driver.query);
-		});
-
-		describe("#execQuery", function () {
-			it("should execute sql queries", function (done) {
-				db.driver.execQuery("SELECT id FROM log", function (err, data) {
-					should.not.exist(err);
-
-					should(JSON.stringify(data) == JSON.stringify([{ id: 1 }, { id: 2 }, { id: 3 }]));
-					done();
-				});
-			});
-
-			it("should escape sql queries", function (done) {
-				var query = "SELECT log.?? FROM log WHERE log.?? LIKE ? AND log.?? > ?";
-				var args  = ['what', 'who', 'jane', 'when', new Date('2013/04/07 12:40:00')];
-				db.driver.execQuery(query, args, function (err, data) {
-					should.not.exist(err);
-
-					should(JSON.stringify(data) == JSON.stringify([{ "what": "user login" }]));
-					done();
-				});
-			});
-		});
-	});
+  var db = null;
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      var Log = db.define('log', {
+        what : { type: 'text' },
+        when : { type: 'date', time: true },
+        who  : { type: 'text' }
+      });
+
+      helper.dropSync(Log, function (err) {
+        if (err) return done(err);
+
+        Log.create([
+          { what: "password reset", when: new Date('2013/04/07 12:33:05'), who: "jane" },
+          { what: "user login",     when: new Date('2013/04/07 13:01:44'), who: "jane" },
+          { what: "user logout",    when: new Date('2013/05/12 04:09:31'), who: "john" }
+        ], done);
+      });
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  it("should be available", function () {
+    should.exist(db.driver);
+  });
+
+  if (common.protocol() == "mongodb") return;
+
+  describe("query", function () {
+    it("should be available", function () {
+      should.exist(db.driver.query);
+    });
+
+    describe("#execQuery", function () {
+      it("should execute sql queries", function (done) {
+        db.driver.execQuery("SELECT id FROM log", function (err, data) {
+          should.not.exist(err);
+
+          should(JSON.stringify(data) == JSON.stringify([{ id: 1 }, { id: 2 }, { id: 3 }]));
+          done();
+        });
+      });
+
+      it("should escape sql queries", function (done) {
+        var query = "SELECT log.?? FROM log WHERE log.?? LIKE ? AND log.?? > ?";
+        var args  = ['what', 'who', 'jane', 'when', new Date('2013/04/07 12:40:00')];
+        db.driver.execQuery(query, args, function (err, data) {
+          should.not.exist(err);
+
+          should(JSON.stringify(data) == JSON.stringify([{ "what": "user login" }]));
+          done();
+        });
+      });
+    });
+  });
 });
diff --git a/test/integration/drivers/postgres_spec.js b/test/integration/drivers/postgres_spec.js
index db84d69f..7bd8eabc 100644
--- a/test/integration/drivers/postgres_spec.js
+++ b/test/integration/drivers/postgres_spec.js
@@ -7,221 +7,221 @@ var common = require('../../common');
 if (common.protocol() != "postgres") return;
 
 describe("Postgres driver", function() {
-	describe("#valueToProperty", function () {
-		var driver = null;
-
-		beforeEach(function () {
-			driver = new Driver({}, {}, {});
-		});
-
-		describe("numbers", function () {
-			describe("floats", function () {
-				function valueToProperty (value) {
-					return driver.valueToProperty(value, { type: 'number' });
-				}
-
-				it("should pass on empty string", function () {
-					should.strictEqual(valueToProperty(''), '');
-				});
-
-				it("should pass on text", function () {
-					should.strictEqual(valueToProperty('fff'), 'fff');
-				});
-
-				it("should pass on numbers", function () {
-					should.strictEqual(valueToProperty(1.2), 1.2);
-				});
-
-				it("should parse numbers in strings", function () {
-					should.strictEqual(valueToProperty('1.2'), 1.2);
-					should.strictEqual(valueToProperty('1.200 '), 1.2);
-				});
-
-				it("should support non finite numbers", function () {
-					should.strictEqual(valueToProperty( 'Infinity'),  Infinity);
-					should.strictEqual(valueToProperty('-Infinity'), -Infinity);
-					should.strictEqual(isNaN(valueToProperty('NaN')), true);
-				});
-			});
-
-			describe("integers", function () {
-				function valueToProperty (value) {
-					return driver.valueToProperty(value, { type: 'integer' });
-				}
-
-				it("should pass on empty string", function () {
-					should.strictEqual(valueToProperty(''), '');
-				});
-
-				it("should pass on text", function () {
-					should.strictEqual(valueToProperty('fff'), 'fff');
-				});
-
-				it("should pass on non finite numbers as text", function () {
-					should.strictEqual(valueToProperty( 'Infinity'),  'Infinity');
-					should.strictEqual(valueToProperty('-Infinity'), '-Infinity');
-					should.strictEqual(valueToProperty('NaN'), 'NaN');
-				});
-
-				it("should pass on numbers", function () {
-					should.strictEqual(valueToProperty(1.2), 1.2);
-				});
-
-				it("should parse integers in strings", function () {
-					should.strictEqual(valueToProperty('1.2'), 1);
-					should.strictEqual(valueToProperty('1.200 '), 1);
-				});
-			});
-
-			describe("dates with non local timezone", function () {
-				beforeEach(function () {
-					driver = new Driver({ timezone: 'Z' }, {}, {});
-				});
-
-				function valueToProperty (value) {
-					return driver.valueToProperty(value, { type: 'date' });
-				}
-
-				it("should accept null", function () {
-					should.strictEqual(valueToProperty(null), null);
-				});
-
-				it("should work", function () {
-					should.strictEqual(_.isDate(valueToProperty(new Date())), true);
-				});
-
-				describe("calculations", function () {
-					it("should offset time, relative to timezone", function () {
-						d = new Date();
-
-						expected  = d.getTime() - d.getTimezoneOffset() * 60000;
-						converted = valueToProperty(d).getTime();
-
-						should.equal(converted, expected);
-					});
-				});
-			});
-		});
-	});
-
-	describe("#propertyToValue", function () {
-		describe("type object", function () {
-			function evaluate (input) {
-				var driver = new Driver({}, {}, {});
-				return driver.propertyToValue(input, { type: 'object' });
-			}
-
-			it("should not change null", function () {
-				should.strictEqual(evaluate(null), null);
-			});
-
-			it("should not change buffer", function () {
-				var b = new Buffer('abc');
-				should.strictEqual(evaluate(b), b);
-			});
-
-			it("should encode everything else as a Buffer", function () {
-				var input = { abc: 123 };
-				var out = evaluate(input);
-
-				should(out instanceof Buffer);
-				should.equal(JSON.stringify(input), out.toString());
-			});
-		});
-
-		describe("date", function () {
-			function evaluate (input, opts) {
-				if (!opts) opts = {};
-				var driver = new Driver(opts.config, {}, {});
-				return driver.propertyToValue(input, { type: 'date' });
-			}
-
-			it("should do nothing when timezone isn't configured", function () {
-				var input = new Date();
-				var inputStr = input.toString();
-				var out = evaluate(input);
-
-				should.strictEqual(input, out);
-				should.equal(inputStr, out.toString());
-			});
-
-			it("should work with null dates", function () {
-				should.strictEqual(evaluate(null, { config: { timezone: 'Z' }}), null);
-			});
-
-			it("should work with date objects", function () {
-				should.strictEqual(_.isDate(evaluate(new Date(), { config: { timezone: 'Z' }})), true);
-			});
-
-			describe("calculations", function () {
-				it("should offset time, relative to timezone", function () {
-					d = new Date();
-
-					expected = d.getTime() + d.getTimezoneOffset() * 60000;
-					converted = evaluate(d, { config: { timezone: 'Z' }}).getTime();
-
-					should.equal(converted, expected);
-				});
-			});
-		});
-
-		describe("type point", function () {
-			function evaluate (input) {
-				var driver = new Driver({}, {}, {});
-				return driver.propertyToValue(input, { type: 'point' });
-			}
-
-			it("should encode correctly", function () {
-				var out = evaluate({ x: 5, y: 7 });
-
-				should(out instanceof Function);
-				should.equal(out(), "POINT(5, 7)");
-			});
-		});
-
-		describe("custom type", function () {
-			var customType = {
-				propertyToValue: function (input) {
-					return input + ' QWERTY';
-				}
-			};
-
-			function evaluate (input, customTypes) {
-				var driver = new Driver({}, {}, {});
-				if (customType) {
-					for (var k in customTypes) {
-						driver.customTypes[k] = customTypes[k];
-					}
-				}
-				return driver.propertyToValue(input, { type: 'qwerty' });
-			}
-
-			it("should do custom type conversion if provided", function () {
-				var opts = { qwerty: customType };
-				var out = evaluate('f', opts);
-
-				should.equal(out, 'f QWERTY');
-			});
-
-			it("should not do custom type conversion if not provided", function () {
-				var opts = { qwerty: {} };
-				var out = evaluate('f', opts);
-
-				should.equal(out, 'f');
-			});
-		});
-
-		it("should do nothing for other types", function () {
-			function evaluate (input, type) {
-				var driver = new Driver({}, {}, {});
-				return driver.propertyToValue(input, { type: type });
-			}
-
-			should.strictEqual(evaluate('abc', { type: 'string' }), 'abc');
-			should.strictEqual(evaluate(42, { type: 'number' }), 42);
-			should.strictEqual(evaluate(undefined, { type: 'bleh' }), undefined);
-		});
-
-	});
+  describe("#valueToProperty", function () {
+    var driver = null;
+
+    beforeEach(function () {
+      driver = new Driver({}, {}, {});
+    });
+
+    describe("numbers", function () {
+      describe("floats", function () {
+        function valueToProperty (value) {
+          return driver.valueToProperty(value, { type: 'number' });
+        }
+
+        it("should pass on empty string", function () {
+          should.strictEqual(valueToProperty(''), '');
+        });
+
+        it("should pass on text", function () {
+          should.strictEqual(valueToProperty('fff'), 'fff');
+        });
+
+        it("should pass on numbers", function () {
+          should.strictEqual(valueToProperty(1.2), 1.2);
+        });
+
+        it("should parse numbers in strings", function () {
+          should.strictEqual(valueToProperty('1.2'), 1.2);
+          should.strictEqual(valueToProperty('1.200 '), 1.2);
+        });
+
+        it("should support non finite numbers", function () {
+          should.strictEqual(valueToProperty( 'Infinity'),  Infinity);
+          should.strictEqual(valueToProperty('-Infinity'), -Infinity);
+          should.strictEqual(isNaN(valueToProperty('NaN')), true);
+        });
+      });
+
+      describe("integers", function () {
+        function valueToProperty (value) {
+          return driver.valueToProperty(value, { type: 'integer' });
+        }
+
+        it("should pass on empty string", function () {
+          should.strictEqual(valueToProperty(''), '');
+        });
+
+        it("should pass on text", function () {
+          should.strictEqual(valueToProperty('fff'), 'fff');
+        });
+
+        it("should pass on non finite numbers as text", function () {
+          should.strictEqual(valueToProperty( 'Infinity'),  'Infinity');
+          should.strictEqual(valueToProperty('-Infinity'), '-Infinity');
+          should.strictEqual(valueToProperty('NaN'), 'NaN');
+        });
+
+        it("should pass on numbers", function () {
+          should.strictEqual(valueToProperty(1.2), 1.2);
+        });
+
+        it("should parse integers in strings", function () {
+          should.strictEqual(valueToProperty('1.2'), 1);
+          should.strictEqual(valueToProperty('1.200 '), 1);
+        });
+      });
+
+      describe("dates with non local timezone", function () {
+        beforeEach(function () {
+          driver = new Driver({ timezone: 'Z' }, {}, {});
+        });
+
+        function valueToProperty (value) {
+          return driver.valueToProperty(value, { type: 'date' });
+        }
+
+        it("should accept null", function () {
+          should.strictEqual(valueToProperty(null), null);
+        });
+
+        it("should work", function () {
+          should.strictEqual(_.isDate(valueToProperty(new Date())), true);
+        });
+
+        describe("calculations", function () {
+          it("should offset time, relative to timezone", function () {
+            d = new Date();
+
+            expected  = d.getTime() - d.getTimezoneOffset() * 60000;
+            converted = valueToProperty(d).getTime();
+
+            should.equal(converted, expected);
+          });
+        });
+      });
+    });
+  });
+
+  describe("#propertyToValue", function () {
+    describe("type object", function () {
+      function evaluate (input) {
+        var driver = new Driver({}, {}, {});
+        return driver.propertyToValue(input, { type: 'object' });
+      }
+
+      it("should not change null", function () {
+        should.strictEqual(evaluate(null), null);
+      });
+
+      it("should not change buffer", function () {
+        var b = new Buffer('abc');
+        should.strictEqual(evaluate(b), b);
+      });
+
+      it("should encode everything else as a Buffer", function () {
+        var input = { abc: 123 };
+        var out = evaluate(input);
+
+        should(out instanceof Buffer);
+        should.equal(JSON.stringify(input), out.toString());
+      });
+    });
+
+    describe("date", function () {
+      function evaluate (input, opts) {
+        if (!opts) opts = {};
+        var driver = new Driver(opts.config, {}, {});
+        return driver.propertyToValue(input, { type: 'date' });
+      }
+
+      it("should do nothing when timezone isn't configured", function () {
+        var input = new Date();
+        var inputStr = input.toString();
+        var out = evaluate(input);
+
+        should.strictEqual(input, out);
+        should.equal(inputStr, out.toString());
+      });
+
+      it("should work with null dates", function () {
+        should.strictEqual(evaluate(null, { config: { timezone: 'Z' }}), null);
+      });
+
+      it("should work with date objects", function () {
+        should.strictEqual(_.isDate(evaluate(new Date(), { config: { timezone: 'Z' }})), true);
+      });
+
+      describe("calculations", function () {
+        it("should offset time, relative to timezone", function () {
+          d = new Date();
+
+          expected = d.getTime() + d.getTimezoneOffset() * 60000;
+          converted = evaluate(d, { config: { timezone: 'Z' }}).getTime();
+
+          should.equal(converted, expected);
+        });
+      });
+    });
+
+    describe("type point", function () {
+      function evaluate (input) {
+        var driver = new Driver({}, {}, {});
+        return driver.propertyToValue(input, { type: 'point' });
+      }
+
+      it("should encode correctly", function () {
+        var out = evaluate({ x: 5, y: 7 });
+
+        should(out instanceof Function);
+        should.equal(out(), "POINT(5, 7)");
+      });
+    });
+
+    describe("custom type", function () {
+      var customType = {
+        propertyToValue: function (input) {
+          return input + ' QWERTY';
+        }
+      };
+
+      function evaluate (input, customTypes) {
+        var driver = new Driver({}, {}, {});
+        if (customType) {
+          for (var k in customTypes) {
+            driver.customTypes[k] = customTypes[k];
+          }
+        }
+        return driver.propertyToValue(input, { type: 'qwerty' });
+      }
+
+      it("should do custom type conversion if provided", function () {
+        var opts = { qwerty: customType };
+        var out = evaluate('f', opts);
+
+        should.equal(out, 'f QWERTY');
+      });
+
+      it("should not do custom type conversion if not provided", function () {
+        var opts = { qwerty: {} };
+        var out = evaluate('f', opts);
+
+        should.equal(out, 'f');
+      });
+    });
+
+    it("should do nothing for other types", function () {
+      function evaluate (input, type) {
+        var driver = new Driver({}, {}, {});
+        return driver.propertyToValue(input, { type: type });
+      }
+
+      should.strictEqual(evaluate('abc', { type: 'string' }), 'abc');
+      should.strictEqual(evaluate(42, { type: 'number' }), 42);
+      should.strictEqual(evaluate(undefined, { type: 'bleh' }), undefined);
+    });
+
+  });
 
 });
diff --git a/test/integration/drivers/sqlite_spec.js b/test/integration/drivers/sqlite_spec.js
index e28d67de..d0e956f7 100644
--- a/test/integration/drivers/sqlite_spec.js
+++ b/test/integration/drivers/sqlite_spec.js
@@ -7,132 +7,132 @@ var common = require('../../common');
 if (common.protocol() != "sqlite") return;
 
 describe("Sqlite driver", function() {
-	describe("#valueToProperty", function () {
-		var driver = null;
-
-		before(function () {
-			driver = new Driver({}, {}, {});
-		});
-
-		describe("numbers", function () {
-			describe("floats", function () {
-				function valueToProperty (value) {
-					return driver.valueToProperty(value, { type: 'number' });
-				}
-
-				it("should pass on empty string", function () {
-					should.strictEqual(valueToProperty(''), '');
-				});
-
-				it("should pass on text", function () {
-					should.strictEqual(valueToProperty('fff'), 'fff');
-				});
-
-				it("should pass on numbers", function () {
-					should.strictEqual(valueToProperty(1.2), 1.2);
-				});
-
-				it("should parse numbers in strings", function () {
-					should.strictEqual(valueToProperty('1.2'), 1.2);
-					should.strictEqual(valueToProperty('1.200 '), 1.2);
-				});
-
-				it("should support non finite numbers", function () {
-					should.strictEqual(valueToProperty( 'Infinity'),  Infinity);
-					should.strictEqual(valueToProperty('-Infinity'), -Infinity);
-					should.strictEqual(isNaN(valueToProperty('NaN')), true);
-				});
-			});
-
-			describe("integers", function () {
-				function valueToProperty (value) {
-					return driver.valueToProperty(value, { type: 'integer' });
-				}
-
-				it("should pass on empty string", function () {
-					should.strictEqual(valueToProperty(''), '');
-				});
-
-				it("should pass on text", function () {
-					should.strictEqual(valueToProperty('fff'), 'fff');
-				});
-
-				it("should pass on non finite numbers as text", function () {
-					should.strictEqual(valueToProperty( 'Infinity'),  'Infinity');
-					should.strictEqual(valueToProperty('-Infinity'), '-Infinity');
-					should.strictEqual(valueToProperty('NaN'), 'NaN');
-				});
-
-				it("should pass on numbers", function () {
-					should.strictEqual(valueToProperty(1.2), 1.2);
-				});
-
-				it("should parse integers in strings", function () {
-					should.strictEqual(valueToProperty('1.2'), 1);
-					should.strictEqual(valueToProperty('1.200 '), 1);
-				});
-			});
-		});
-	});
-
-	describe("db", function () {
-		var db = null;
-		var Person = null;
-
-		before(function (done) {
-			helper.connect(function (connection) {
-				db = connection;
-
-				Person = db.define("person", {
-					name: String
-				});
-
-				return helper.dropSync([ Person ], done);
-			});
-		});
-
-		after(function () {
-			return db.close();
-		});
-
-		describe("#clear", function () {
-			beforeEach(function (done) {
-				Person.create([{ name: 'John' }, { name: 'Jane' }], function (err) {
-					Person.count(function (err, count) {
-						should.not.exist(err);
-						should.equal(count, 2);
-						done();
-					});
-				});
-			});
-
-			it("should drop all items", function (done) {
-				Person.clear(function (err) {
-					should.not.exist(err);
-
-					Person.count(function (err, count) {
-						should.not.exist(err);
-						should.equal(count, 0);
-						done();
-					});
-				});
-			});
-
-			it("should reset id sequence", function (done) {
-				Person.clear(function (err) {
-					should.not.exist(err);
-					db.driver.execQuery("SELECT * FROM ?? WHERE ?? = ?", ['sqlite_sequence', 'name', Person.table], function (err, data) {
-						should.not.exist(err);
-
-						Person.create({ name: 'Bob' }, function (err, person) {
-							should.not.exist(err);
-							should.equal(person.id, 1);
-
-							done();
-						});
-					});
-				});
-			});
-		});
-	});
+  describe("#valueToProperty", function () {
+    var driver = null;
+
+    before(function () {
+      driver = new Driver({}, {}, {});
+    });
+
+    describe("numbers", function () {
+      describe("floats", function () {
+        function valueToProperty (value) {
+          return driver.valueToProperty(value, { type: 'number' });
+        }
+
+        it("should pass on empty string", function () {
+          should.strictEqual(valueToProperty(''), '');
+        });
+
+        it("should pass on text", function () {
+          should.strictEqual(valueToProperty('fff'), 'fff');
+        });
+
+        it("should pass on numbers", function () {
+          should.strictEqual(valueToProperty(1.2), 1.2);
+        });
+
+        it("should parse numbers in strings", function () {
+          should.strictEqual(valueToProperty('1.2'), 1.2);
+          should.strictEqual(valueToProperty('1.200 '), 1.2);
+        });
+
+        it("should support non finite numbers", function () {
+          should.strictEqual(valueToProperty( 'Infinity'),  Infinity);
+          should.strictEqual(valueToProperty('-Infinity'), -Infinity);
+          should.strictEqual(isNaN(valueToProperty('NaN')), true);
+        });
+      });
+
+      describe("integers", function () {
+        function valueToProperty (value) {
+          return driver.valueToProperty(value, { type: 'integer' });
+        }
+
+        it("should pass on empty string", function () {
+          should.strictEqual(valueToProperty(''), '');
+        });
+
+        it("should pass on text", function () {
+          should.strictEqual(valueToProperty('fff'), 'fff');
+        });
+
+        it("should pass on non finite numbers as text", function () {
+          should.strictEqual(valueToProperty( 'Infinity'),  'Infinity');
+          should.strictEqual(valueToProperty('-Infinity'), '-Infinity');
+          should.strictEqual(valueToProperty('NaN'), 'NaN');
+        });
+
+        it("should pass on numbers", function () {
+          should.strictEqual(valueToProperty(1.2), 1.2);
+        });
+
+        it("should parse integers in strings", function () {
+          should.strictEqual(valueToProperty('1.2'), 1);
+          should.strictEqual(valueToProperty('1.200 '), 1);
+        });
+      });
+    });
+  });
+
+  describe("db", function () {
+    var db = null;
+    var Person = null;
+
+    before(function (done) {
+      helper.connect(function (connection) {
+        db = connection;
+
+        Person = db.define("person", {
+          name: String
+        });
+
+        return helper.dropSync([ Person ], done);
+      });
+    });
+
+    after(function () {
+      return db.close();
+    });
+
+    describe("#clear", function () {
+      beforeEach(function (done) {
+        Person.create([{ name: 'John' }, { name: 'Jane' }], function (err) {
+          Person.count(function (err, count) {
+            should.not.exist(err);
+            should.equal(count, 2);
+            done();
+          });
+        });
+      });
+
+      it("should drop all items", function (done) {
+        Person.clear(function (err) {
+          should.not.exist(err);
+
+          Person.count(function (err, count) {
+            should.not.exist(err);
+            should.equal(count, 0);
+            done();
+          });
+        });
+      });
+
+      it("should reset id sequence", function (done) {
+        Person.clear(function (err) {
+          should.not.exist(err);
+          db.driver.execQuery("SELECT * FROM ?? WHERE ?? = ?", ['sqlite_sequence', 'name', Person.table], function (err, data) {
+            should.not.exist(err);
+
+            Person.create({ name: 'Bob' }, function (err, person) {
+              should.not.exist(err);
+              should.equal(person.id, 1);
+
+              done();
+            });
+          });
+        });
+      });
+    });
+  });
 });
diff --git a/test/integration/error_spec.js b/test/integration/error_spec.js
index a8281722..ba73d48d 100644
--- a/test/integration/error_spec.js
+++ b/test/integration/error_spec.js
@@ -3,58 +3,58 @@ var ORMError = require('../../lib/Error');
 var path     = require('path');
 
 describe("Error", function () {
-	describe("constructor", function () {
-		it("should inherit from native Error", function () {
-			var e = new ORMError("Test message", 'PARAM_MISMATCH');
-			should(e instanceof Error);
-		});
-
-		it("should have a valid stack", function () {
-			try {
-				throw new ORMError("Test message", 'PARAM_MISMATCH');
-			} catch (e) {
-				var stackArr = e.stack.split('\n');
-				// [0] is ''
-				should(stackArr[1].indexOf(path.join('test', 'integration', 'error_spec.js')) > 0);
-			}
-		});
-
-		it("should have the right name", function () {
-			var e = new ORMError("Test message", 'PARAM_MISMATCH');
-			should.equal(e.name, 'ORMError');
-		});
-
-		it("should throw on invalid code", function () {
-			(function () {
-				var e = new ORMError("Test message", 'FLYING_SQUIRRELS');
-			}).should.throw("Invalid error code: FLYING_SQUIRRELS");
-		});
-
-		it("should assign the code", function () {
-			var e = new ORMError("Test message", 'PARAM_MISMATCH');
-			should.equal(e.code, 6);
-		});
-
-		it("should assign literal code", function () {
-			var e = new ORMError("Test message", 'PARAM_MISMATCH');
-			should.equal(e.literalCode, 'PARAM_MISMATCH');
-		});
-
-		it("should assign extra params", function () {
-			var e = new ORMError("Test message", 'PARAM_MISMATCH', { details: "something" });
-			should.equal(e.details, "something");
-		});
-
-		it("should stringify nicely", function () {
-			var e = new ORMError("Test message", 'PARAM_MISMATCH');
-			should.equal(e.toString(), "[ORMError PARAM_MISMATCH: Test message]");
-		});
-	});
-
-	describe("codes", function () {
-		it("should be exposed", function () {
-			should.exist(ORMError.codes);
-			should.equal(ORMError.codes['NOT_FOUND'], 2);
-		});
-	});
+  describe("constructor", function () {
+    it("should inherit from native Error", function () {
+      var e = new ORMError("Test message", 'PARAM_MISMATCH');
+      should(e instanceof Error);
+    });
+
+    it("should have a valid stack", function () {
+      try {
+        throw new ORMError("Test message", 'PARAM_MISMATCH');
+      } catch (e) {
+        var stackArr = e.stack.split('\n');
+        // [0] is ''
+        should(stackArr[1].indexOf(path.join('test', 'integration', 'error_spec.js')) > 0);
+      }
+    });
+
+    it("should have the right name", function () {
+      var e = new ORMError("Test message", 'PARAM_MISMATCH');
+      should.equal(e.name, 'ORMError');
+    });
+
+    it("should throw on invalid code", function () {
+      (function () {
+        var e = new ORMError("Test message", 'FLYING_SQUIRRELS');
+      }).should.throw("Invalid error code: FLYING_SQUIRRELS");
+    });
+
+    it("should assign the code", function () {
+      var e = new ORMError("Test message", 'PARAM_MISMATCH');
+      should.equal(e.code, 6);
+    });
+
+    it("should assign literal code", function () {
+      var e = new ORMError("Test message", 'PARAM_MISMATCH');
+      should.equal(e.literalCode, 'PARAM_MISMATCH');
+    });
+
+    it("should assign extra params", function () {
+      var e = new ORMError("Test message", 'PARAM_MISMATCH', { details: "something" });
+      should.equal(e.details, "something");
+    });
+
+    it("should stringify nicely", function () {
+      var e = new ORMError("Test message", 'PARAM_MISMATCH');
+      should.equal(e.toString(), "[ORMError PARAM_MISMATCH: Test message]");
+    });
+  });
+
+  describe("codes", function () {
+    it("should be exposed", function () {
+      should.exist(ORMError.codes);
+      should.equal(ORMError.codes['NOT_FOUND'], 2);
+    });
+  });
 });
diff --git a/test/integration/event.js b/test/integration/event.js
index fea1307d..48fdf1cc 100644
--- a/test/integration/event.js
+++ b/test/integration/event.js
@@ -3,95 +3,95 @@ var helper   = require('../support/spec_helper');
 var ORM      = require('../../');
 
 describe("Event", function() {
-	var db = null;
-	var Person = null;
+  var db = null;
+  var Person = null;
 
-	var triggeredHooks = {};
+  var triggeredHooks = {};
 
-	var checkHook = function (hook) {
-		triggeredHooks[hook] = false;
+  var checkHook = function (hook) {
+    triggeredHooks[hook] = false;
 
-		return function () {
-			triggeredHooks[hook] = Date.now();
-		};
-	};
+    return function () {
+      triggeredHooks[hook] = Date.now();
+    };
+  };
 
-	var setup = function (hooks) {
-		return function (done) {
-			Person = db.define("person", {
-				name   : { type: "text", required: true }
-			});
+  var setup = function (hooks) {
+    return function (done) {
+      Person = db.define("person", {
+        name   : { type: "text", required: true }
+      });
 
-			return helper.dropSync(Person, done);
-		};
-	};
+      return helper.dropSync(Person, done);
+    };
+  };
 
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
 
-			return done();
-		});
-	});
+      return done();
+    });
+  });
 
-	after(function () {
-		return db.close();
-	});
+  after(function () {
+    return db.close();
+  });
 
-	describe("save", function () {
-		before(setup());
+  describe("save", function () {
+    before(setup());
 
-		it("should trigger when saving an instance", function (done) {
-			var triggered = false;
-			var John = new Person({
-				name : "John Doe"
-			});
+    it("should trigger when saving an instance", function (done) {
+      var triggered = false;
+      var John = new Person({
+        name : "John Doe"
+      });
 
-			John.on("save", function () {
-				triggered = true;
-			});
+      John.on("save", function () {
+        triggered = true;
+      });
 
-			triggered.should.be.false;
+      triggered.should.be.false;
 
-			John.save(function () {
-				triggered.should.be.true;
+      John.save(function () {
+        triggered.should.be.true;
 
-				return done();
-			});
-		});
+        return done();
+      });
+    });
 
-		it("should trigger when saving an instance even if it fails", function (done) {
-			var triggered = false;
-			var John = new Person();
+    it("should trigger when saving an instance even if it fails", function (done) {
+      var triggered = false;
+      var John = new Person();
 
-			John.on("save", function (err) {
-				triggered = true;
+      John.on("save", function (err) {
+        triggered = true;
 
-				err.should.be.a.Object();
-				err.should.have.property("msg", "required");
-			});
+        err.should.be.a.Object();
+        err.should.have.property("msg", "required");
+      });
 
-			triggered.should.be.false;
+      triggered.should.be.false;
 
-			John.save(function () {
-				triggered.should.be.true;
+      John.save(function () {
+        triggered.should.be.true;
 
-				return done();
-			});
-		});
+        return done();
+      });
+    });
 
-		it("should be writable for mocking", function (done) {
-			var triggered = false;
-			var John = new Person();
+    it("should be writable for mocking", function (done) {
+      var triggered = false;
+      var John = new Person();
 
-			John.on = function(event, cb) {
-				triggered = true;
-			};
-			triggered.should.be.false;
+      John.on = function(event, cb) {
+        triggered = true;
+      };
+      triggered.should.be.false;
 
-			John.on("mocked", function (err) {} );
-			triggered.should.be.true;
-			done();
-		});
-	});
+      John.on("mocked", function (err) {} );
+      triggered.should.be.true;
+      done();
+    });
+  });
 });
diff --git a/test/integration/hook.js b/test/integration/hook.js
index 2a354280..02dab9d1 100644
--- a/test/integration/hook.js
+++ b/test/integration/hook.js
@@ -5,741 +5,741 @@ var async    = require('async');
 var ORM      = require('../../');
 
 describe("Hook", function() {
-	var db = null;
-	var Person = null;
-	var triggeredHooks = {};
-	var getTimestamp; // Calling it 'getTime' causes strangeness.
-
-	getTimestamp = function () { return Date.now(); };
-	// this next lines are failing...
-	// if (process.hrtime) {
-	// 	getTimestamp = function () { return parseFloat(process.hrtime().join('.')); };
-	// } else {
-	// 	getTimestamp = function () { return Date.now(); };
-	// }
-
-	var checkHook = function (hook) {
-		triggeredHooks[hook] = false;
-
-		return function () {
-			triggeredHooks[hook] = getTimestamp();
-		};
-	};
-
-	var setup = function (hooks) {
-		if (typeof hooks == "undefined") {
-			hooks = {
-				afterCreate      : checkHook("afterCreate"),
-				beforeCreate     : checkHook("beforeCreate"),
-				afterSave        : checkHook("afterSave"),
-				beforeSave       : checkHook("beforeSave"),
-				beforeValidation : checkHook("beforeValidation"),
-				beforeRemove     : checkHook("beforeRemove"),
-				afterRemove      : checkHook("afterRemove")
-			};
-		}
-
-		return function (done) {
-			Person = db.define("person", {
-				name   : String
-			}, {
-				hooks  : hooks
-			});
-
-			Person.settings.set("instance.returnAllErrors", false);
-
-			return helper.dropSync(Person, done);
-		};
-	};
-
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
-
-			return done();
-		});
-	});
-
-	after(function () {
-		return db.close();
-	});
-
-	// there are a lot of timeouts in this suite and Travis or other test runners can
-	// have hickups that could force this suite to timeout to the default value (2 secs)
-	this.timeout(30000);
-
-	describe("after Model creation", function () {
-		before(setup({}));
-
-		it("can be changed", function (done) {
-			var triggered = false;
-
-			Person.afterCreate(function () {
-				triggered = true;
-			});
-			Person.create([{ name: "John Doe" }], function () {
-				triggered.should.be.true;
-
-				return done();
-			});
-		});
-
-		it("can be removed", function (done) {
-			var triggered = false;
-
-			Person.afterCreate(function () {
-				triggered = true;
-			});
-			Person.create([{ name: "John Doe" }], function () {
-				triggered.should.be.true;
-
-				triggered = false;
-
-				Person.afterCreate(); // clears hook
-
-				Person.create([{ name: "Jane Doe" }], function () {
-					triggered.should.be.false;
-
-					return done();
-				});
-			});
-		});
-	});
-
-	describe("beforeCreate", function () {
-		before(setup());
-
-		it("should trigger before creating instance", function (done) {
-			Person.create([{ name: "John Doe" }], function () {
-				triggeredHooks.afterCreate.should.be.a.Number();
-				triggeredHooks.beforeCreate.should.be.a.Number();
-				triggeredHooks.beforeCreate.should.not.be.above(triggeredHooks.afterCreate);
-
-				return done();
-			});
-		});
-
-		it("should allow modification of instance", function (done) {
-		    Person.beforeCreate(function (next) {
-		        this.name = "Hook Worked";
-		        next();
-		    });
-
-		    Person.create([{ }], function (err, people) {
-		        should.not.exist(err);
-		        should.exist(people);
-		        should.equal(people.length, 1);
-		        should.equal(people[0].name, "Hook Worked");
-
-		        // garantee it was correctly saved on database
-		        Person.one({ name: "Hook Worked" }, function (err, person) {
-		        	should.not.exist(err);
-		        	should.exist(person);
-
-		        	return done();
-		        });
-		    });
-		});
-
-		describe("when setting properties", function () {
-			before(setup({
-				beforeCreate : function () {
-					this.name = "Jane Doe";
-				}
-			}));
-
-			it("should not be discarded", function (done) {
-				Person.create([{ }], function (err, items) {
-					should.equal(err, null);
-
-					items.should.be.a.Object();
-					items.should.have.property("length", 1);
-					items[0].name.should.equal("Jane Doe");
-
-					// ensure it was really saved
-					Person.find({ name: "Hook Worked" }, { identityCache: false }, 1, function (err, people) {
-						should.not.exist(err);
-						should(Array.isArray(people));
-
-						return done();
-					});
-				});
-			});
-		});
-
-		describe("if hook method has 1 argument", function () {
-			var beforeCreate = false;
-
-			before(setup({
-				beforeCreate : function (next) {
-					setTimeout(function () {
-						beforeCreate = true;
-
-						return next();
-					}.bind(this), 200);
-				}
-			}));
-
-			it("should wait for hook to finish", function (done) {
-				this.timeout(800);
-
-				Person.create([{ name: "John Doe" }], function () {
-					beforeCreate.should.be.true;
-
-					return done();
-				});
-			});
-
-			describe("if hook triggers error", function () {
-				before(setup({
-					beforeCreate : function (next) {
-						setTimeout(function () {
-							return next(new Error('beforeCreate-error'));
-						}, 200);
-					}
-				}));
-
-				it("should trigger error", function (done) {
-					this.timeout(800);
-
-					Person.create([{ name: "John Doe" }], function (err) {
-						err.should.be.a.Object();
-						err.message.should.equal("beforeCreate-error");
-
-						return done();
-					});
-				});
-			});
-		});
-	});
-
-	describe("afterCreate", function () {
-		before(setup());
-
-		it("should trigger after creating instance", function (done) {
-			Person.create([{ name: "John Doe" }], function () {
-				triggeredHooks.afterCreate.should.be.a.Number();
-				triggeredHooks.beforeCreate.should.be.a.Number();
-				triggeredHooks.afterCreate.should.not.be.below(triggeredHooks.beforeCreate);
-
-				return done();
-			});
-		});
-	});
-
-	describe("beforeSave", function () {
-		before(setup());
-
-		it("should trigger before saving an instance", function (done) {
-			Person.create([{ name: "John Doe" }], function () {
-				triggeredHooks.afterSave.should.be.a.Number();
-				triggeredHooks.beforeSave.should.be.a.Number();
-				triggeredHooks.beforeSave.should.not.be.above(triggeredHooks.afterSave);
-
-				return done();
-			});
-		});
-
-		it("should allow modification of instance", function (done) {
-		    Person.beforeSave(function () {
-		        this.name = "Hook Worked";
-		    });
-
-		    Person.create([{ name: "John Doe" }], function (err, people) {
-		        should.not.exist(err);
-		        should.exist(people);
-		        should.equal(people.length, 1);
-		        should.equal(people[0].name, "Hook Worked");
-
-				// garantee it was correctly saved on database
-				Person.find({ name: "Hook Worked" }, { identityCache: false }, 1, function (err, people) {
-					should.not.exist(err);
-					should(Array.isArray(people));
-
-					return done();
-				});
-		    });
-		});
-
-		describe("when setting properties", function () {
-			before(setup({
-				beforeSave : function () {
-					this.name = "Jane Doe";
-				}
-			}));
-
-			it("should not be discarded", function (done) {
-				Person.create([{ }], function (err, items) {
-					should.equal(err, null);
-
-					items.should.be.a.Object();
-					items.should.have.property("length", 1);
-					items[0].name.should.equal("Jane Doe");
-
-					// ensure it was really saved
-					Person.get(items[0][Person.id], function (err, Item) {
-						should.equal(err, null);
-						Item.name.should.equal("Jane Doe");
-
-						return done();
-					});
-				});
-			});
-		});
-
-		describe("if hook method has 1 argument", function () {
-			var beforeSave = false;
-
-			before(setup({
-				beforeSave : function (next) {
-					setTimeout(function () {
-						beforeSave = true;
-
-						return next();
-					}.bind(this), 200);
-				}
-			}));
-
-			it("should wait for hook to finish", function (done) {
-				this.timeout(800);
-
-				Person.create([{ name: "John Doe" }], function () {
-					beforeSave.should.be.true;
-
-					return done();
-				});
-
-			});
-
-			describe("if hook triggers error", function () {
-				before(setup({
-					beforeSave : function (next) {
-						if (this.name == "John Doe") {
-							return next();
-						}
-						setTimeout(function () {
-							return next(new Error('beforeSave-error'));
-						}, 200);
-					}
-				}));
-
-				it("should trigger error when creating", function (done) {
-					this.timeout(800);
-
-					Person.create([{ name: "Jane Doe" }], function (err) {
-						err.should.be.a.Object();
-						err.message.should.equal("beforeSave-error");
-
-						return done();
-					});
-				});
-
-				it("should trigger error when saving", function (done) {
-					this.timeout(800);
-
-					Person.create([{ name: "John Doe" }], function (err, John) {
-						should.equal(err, null);
-
-						John[0].name = "Jane Doe";
-						John[0].save(function (err) {
-							err.should.be.a.Object();
-							err.message.should.equal("beforeSave-error");
-
-							return done();
-						});
-					});
-				});
-			});
-		});
-	});
-
-	describe("afterSave", function () {
-		beforeEach(setup());
-
-		it("should trigger after creating an instance", function (done) {
-			Person.create({ name: "John Doe" }, function (err, john) {
-				should.not.exist(err);
-
-				triggeredHooks.afterSave.should.be.a.Number();
-				triggeredHooks.beforeSave.should.be.a.Number();
-				triggeredHooks.afterSave.should.not.be.below(triggeredHooks.beforeSave);
-				done();
-			});
-		});
-
-		it("should trigger after saving an instance", function (done) {
-			Person.create({ name: "John Doe" }, function (err, john) {
-				should.not.exist(err);
-
-				john.name = "John Doe 2";
-
-				triggeredHooks = {};
-				john.save(function (err) {
-					triggeredHooks.afterSave.should.be.a.Number();
-					triggeredHooks.beforeSave.should.be.a.Number();
-					triggeredHooks.afterSave.should.not.be.below(triggeredHooks.beforeSave);
-					done();
-				});
-			});
-		});
-
-		it("should not trigger after saving an unchanged instance", function (done) {
-			Person.create({ name: "Edger" }, function (err, edger) {
-				should.not.exist(err);
-
-				triggeredHooks = {};
-				edger.save(function (err) {
-					should.not.exist(err);
-					should.not.exist(triggeredHooks.afterSave);
-					done();
-				});
-			});
-		});
-	});
-
-	describe("beforeValidation", function () {
-		before(setup());
-
-		it("should trigger before instance validation", function (done) {
-			Person.create([{ name: "John Doe" }], function () {
-				triggeredHooks.beforeValidation.should.be.a.Number();
-				triggeredHooks.beforeCreate.should.be.a.Number();
-				triggeredHooks.beforeSave.should.be.a.Number();
-				triggeredHooks.beforeValidation.should.not.be.above(triggeredHooks.beforeCreate);
-				triggeredHooks.beforeValidation.should.not.be.above(triggeredHooks.beforeSave);
-
-				return done();
-			});
-		});
-
-
-		it("should allow modification of instance", function (done) {
-		    Person.beforeValidation(function () {
-		        this.name = "Hook Worked";
-		    });
-
-		    Person.create([{ name: "John Doe" }], function (err, people) {
-		        should.not.exist(err);
-		        should.exist(people);
-		        should.equal(people.length, 1);
-		        should.equal(people[0].name, "Hook Worked");
-		        done();
-		    });
-		});
-
-		describe("if hook method has 1 argument", function () {
-			var beforeValidation = false;
-			this.timeout(800);
-
-			before(setup({
-				beforeValidation : function (next) {
-					setTimeout(function () {
-						beforeValidation = true;
-
-						if (!this.name) return next("Name is missing");
-
-						return next();
-					}.bind(this), 200);
-				}
-			}));
-
-			beforeEach(function () {
-				beforeValidation = false;
-			});
-
-			it("should wait for hook to finish", function (done) {
-				Person.create([{ name: "John Doe" }], function () {
-					beforeValidation.should.be.true;
-
-					return done();
-				});
-			});
-
-			it("should trigger error if hook passes an error", function (done) {
-				Person.create([{ name: "" }], function (err) {
-					beforeValidation.should.be.true;
-
-					err.should.equal("Name is missing");
-
-					return done();
-				});
-			});
-
-			it("should trigger when calling #validate", function (done) {
-				var person = new Person();
-
-				person.validate(function (err, validationErrors) {
-					beforeValidation.should.be.true;
-
-					return done();
-				});
-			});
-		});
-	});
-
-	describe("afterLoad", function () {
-		var afterLoad = false;
-
-		before(setup({
-			afterLoad: function () {
-				afterLoad = true;
-			}
-		}));
-
-		it("should trigger when defining a model", function (done) {
-			var John = new Person({ name: "John" });
-
-			afterLoad.should.be.true;
-
-			return done();
-		});
-
-		describe("if hook method has 1 argument", function () {
-			var afterLoad = false;
-
-			before(setup({
-				afterLoad : function (next) {
-					setTimeout(function () {
-						afterLoad = true;
-
-						return next();
-					}.bind(this), 200);
-				}
-			}));
-
-			it("should wait for hook to finish", function (done) {
-				this.timeout(800);
-
-				Person.create([{ name: "John Doe" }], function (err, items) {
-					afterLoad.should.be.true;
-
-					return done();
-				});
-			});
-
-			describe("if hook returns an error", function () {
-				before(setup({
-					afterLoad : function (next) {
-						return next(new Error("AFTERLOAD_FAIL"));
-					}
-				}));
-
-				it("should return error", function (done) {
-					this.timeout(800);
+  var db = null;
+  var Person = null;
+  var triggeredHooks = {};
+  var getTimestamp; // Calling it 'getTime' causes strangeness.
+
+  getTimestamp = function () { return Date.now(); };
+  // this next lines are failing...
+  // if (process.hrtime) {
+  //   getTimestamp = function () { return parseFloat(process.hrtime().join('.')); };
+  // } else {
+  //   getTimestamp = function () { return Date.now(); };
+  // }
+
+  var checkHook = function (hook) {
+    triggeredHooks[hook] = false;
+
+    return function () {
+      triggeredHooks[hook] = getTimestamp();
+    };
+  };
+
+  var setup = function (hooks) {
+    if (typeof hooks == "undefined") {
+      hooks = {
+        afterCreate      : checkHook("afterCreate"),
+        beforeCreate     : checkHook("beforeCreate"),
+        afterSave        : checkHook("afterSave"),
+        beforeSave       : checkHook("beforeSave"),
+        beforeValidation : checkHook("beforeValidation"),
+        beforeRemove     : checkHook("beforeRemove"),
+        afterRemove      : checkHook("afterRemove")
+      };
+    }
+
+    return function (done) {
+      Person = db.define("person", {
+        name   : String
+      }, {
+        hooks  : hooks
+      });
+
+      Person.settings.set("instance.returnAllErrors", false);
+
+      return helper.dropSync(Person, done);
+    };
+  };
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  // there are a lot of timeouts in this suite and Travis or other test runners can
+  // have hickups that could force this suite to timeout to the default value (2 secs)
+  this.timeout(30000);
+
+  describe("after Model creation", function () {
+    before(setup({}));
+
+    it("can be changed", function (done) {
+      var triggered = false;
+
+      Person.afterCreate(function () {
+        triggered = true;
+      });
+      Person.create([{ name: "John Doe" }], function () {
+        triggered.should.be.true;
+
+        return done();
+      });
+    });
+
+    it("can be removed", function (done) {
+      var triggered = false;
+
+      Person.afterCreate(function () {
+        triggered = true;
+      });
+      Person.create([{ name: "John Doe" }], function () {
+        triggered.should.be.true;
+
+        triggered = false;
+
+        Person.afterCreate(); // clears hook
+
+        Person.create([{ name: "Jane Doe" }], function () {
+          triggered.should.be.false;
+
+          return done();
+        });
+      });
+    });
+  });
+
+  describe("beforeCreate", function () {
+    before(setup());
+
+    it("should trigger before creating instance", function (done) {
+      Person.create([{ name: "John Doe" }], function () {
+        triggeredHooks.afterCreate.should.be.a.Number();
+        triggeredHooks.beforeCreate.should.be.a.Number();
+        triggeredHooks.beforeCreate.should.not.be.above(triggeredHooks.afterCreate);
+
+        return done();
+      });
+    });
+
+    it("should allow modification of instance", function (done) {
+        Person.beforeCreate(function (next) {
+            this.name = "Hook Worked";
+            next();
+        });
+
+        Person.create([{ }], function (err, people) {
+            should.not.exist(err);
+            should.exist(people);
+            should.equal(people.length, 1);
+            should.equal(people[0].name, "Hook Worked");
+
+            // garantee it was correctly saved on database
+            Person.one({ name: "Hook Worked" }, function (err, person) {
+              should.not.exist(err);
+              should.exist(person);
+
+              return done();
+            });
+        });
+    });
+
+    describe("when setting properties", function () {
+      before(setup({
+        beforeCreate : function () {
+          this.name = "Jane Doe";
+        }
+      }));
+
+      it("should not be discarded", function (done) {
+        Person.create([{ }], function (err, items) {
+          should.equal(err, null);
+
+          items.should.be.a.Object();
+          items.should.have.property("length", 1);
+          items[0].name.should.equal("Jane Doe");
+
+          // ensure it was really saved
+          Person.find({ name: "Hook Worked" }, { identityCache: false }, 1, function (err, people) {
+            should.not.exist(err);
+            should(Array.isArray(people));
+
+            return done();
+          });
+        });
+      });
+    });
+
+    describe("if hook method has 1 argument", function () {
+      var beforeCreate = false;
+
+      before(setup({
+        beforeCreate : function (next) {
+          setTimeout(function () {
+            beforeCreate = true;
+
+            return next();
+          }.bind(this), 200);
+        }
+      }));
+
+      it("should wait for hook to finish", function (done) {
+        this.timeout(800);
+
+        Person.create([{ name: "John Doe" }], function () {
+          beforeCreate.should.be.true;
+
+          return done();
+        });
+      });
+
+      describe("if hook triggers error", function () {
+        before(setup({
+          beforeCreate : function (next) {
+            setTimeout(function () {
+              return next(new Error('beforeCreate-error'));
+            }, 200);
+          }
+        }));
+
+        it("should trigger error", function (done) {
+          this.timeout(800);
+
+          Person.create([{ name: "John Doe" }], function (err) {
+            err.should.be.a.Object();
+            err.message.should.equal("beforeCreate-error");
+
+            return done();
+          });
+        });
+      });
+    });
+  });
+
+  describe("afterCreate", function () {
+    before(setup());
+
+    it("should trigger after creating instance", function (done) {
+      Person.create([{ name: "John Doe" }], function () {
+        triggeredHooks.afterCreate.should.be.a.Number();
+        triggeredHooks.beforeCreate.should.be.a.Number();
+        triggeredHooks.afterCreate.should.not.be.below(triggeredHooks.beforeCreate);
+
+        return done();
+      });
+    });
+  });
+
+  describe("beforeSave", function () {
+    before(setup());
+
+    it("should trigger before saving an instance", function (done) {
+      Person.create([{ name: "John Doe" }], function () {
+        triggeredHooks.afterSave.should.be.a.Number();
+        triggeredHooks.beforeSave.should.be.a.Number();
+        triggeredHooks.beforeSave.should.not.be.above(triggeredHooks.afterSave);
+
+        return done();
+      });
+    });
+
+    it("should allow modification of instance", function (done) {
+        Person.beforeSave(function () {
+            this.name = "Hook Worked";
+        });
+
+        Person.create([{ name: "John Doe" }], function (err, people) {
+            should.not.exist(err);
+            should.exist(people);
+            should.equal(people.length, 1);
+            should.equal(people[0].name, "Hook Worked");
+
+        // garantee it was correctly saved on database
+        Person.find({ name: "Hook Worked" }, { identityCache: false }, 1, function (err, people) {
+          should.not.exist(err);
+          should(Array.isArray(people));
+
+          return done();
+        });
+        });
+    });
+
+    describe("when setting properties", function () {
+      before(setup({
+        beforeSave : function () {
+          this.name = "Jane Doe";
+        }
+      }));
+
+      it("should not be discarded", function (done) {
+        Person.create([{ }], function (err, items) {
+          should.equal(err, null);
+
+          items.should.be.a.Object();
+          items.should.have.property("length", 1);
+          items[0].name.should.equal("Jane Doe");
+
+          // ensure it was really saved
+          Person.get(items[0][Person.id], function (err, Item) {
+            should.equal(err, null);
+            Item.name.should.equal("Jane Doe");
+
+            return done();
+          });
+        });
+      });
+    });
+
+    describe("if hook method has 1 argument", function () {
+      var beforeSave = false;
+
+      before(setup({
+        beforeSave : function (next) {
+          setTimeout(function () {
+            beforeSave = true;
+
+            return next();
+          }.bind(this), 200);
+        }
+      }));
+
+      it("should wait for hook to finish", function (done) {
+        this.timeout(800);
+
+        Person.create([{ name: "John Doe" }], function () {
+          beforeSave.should.be.true;
+
+          return done();
+        });
+
+      });
+
+      describe("if hook triggers error", function () {
+        before(setup({
+          beforeSave : function (next) {
+            if (this.name == "John Doe") {
+              return next();
+            }
+            setTimeout(function () {
+              return next(new Error('beforeSave-error'));
+            }, 200);
+          }
+        }));
+
+        it("should trigger error when creating", function (done) {
+          this.timeout(800);
+
+          Person.create([{ name: "Jane Doe" }], function (err) {
+            err.should.be.a.Object();
+            err.message.should.equal("beforeSave-error");
+
+            return done();
+          });
+        });
+
+        it("should trigger error when saving", function (done) {
+          this.timeout(800);
+
+          Person.create([{ name: "John Doe" }], function (err, John) {
+            should.equal(err, null);
+
+            John[0].name = "Jane Doe";
+            John[0].save(function (err) {
+              err.should.be.a.Object();
+              err.message.should.equal("beforeSave-error");
+
+              return done();
+            });
+          });
+        });
+      });
+    });
+  });
+
+  describe("afterSave", function () {
+    beforeEach(setup());
+
+    it("should trigger after creating an instance", function (done) {
+      Person.create({ name: "John Doe" }, function (err, john) {
+        should.not.exist(err);
+
+        triggeredHooks.afterSave.should.be.a.Number();
+        triggeredHooks.beforeSave.should.be.a.Number();
+        triggeredHooks.afterSave.should.not.be.below(triggeredHooks.beforeSave);
+        done();
+      });
+    });
+
+    it("should trigger after saving an instance", function (done) {
+      Person.create({ name: "John Doe" }, function (err, john) {
+        should.not.exist(err);
+
+        john.name = "John Doe 2";
+
+        triggeredHooks = {};
+        john.save(function (err) {
+          triggeredHooks.afterSave.should.be.a.Number();
+          triggeredHooks.beforeSave.should.be.a.Number();
+          triggeredHooks.afterSave.should.not.be.below(triggeredHooks.beforeSave);
+          done();
+        });
+      });
+    });
+
+    it("should not trigger after saving an unchanged instance", function (done) {
+      Person.create({ name: "Edger" }, function (err, edger) {
+        should.not.exist(err);
+
+        triggeredHooks = {};
+        edger.save(function (err) {
+          should.not.exist(err);
+          should.not.exist(triggeredHooks.afterSave);
+          done();
+        });
+      });
+    });
+  });
+
+  describe("beforeValidation", function () {
+    before(setup());
+
+    it("should trigger before instance validation", function (done) {
+      Person.create([{ name: "John Doe" }], function () {
+        triggeredHooks.beforeValidation.should.be.a.Number();
+        triggeredHooks.beforeCreate.should.be.a.Number();
+        triggeredHooks.beforeSave.should.be.a.Number();
+        triggeredHooks.beforeValidation.should.not.be.above(triggeredHooks.beforeCreate);
+        triggeredHooks.beforeValidation.should.not.be.above(triggeredHooks.beforeSave);
+
+        return done();
+      });
+    });
+
+
+    it("should allow modification of instance", function (done) {
+        Person.beforeValidation(function () {
+            this.name = "Hook Worked";
+        });
+
+        Person.create([{ name: "John Doe" }], function (err, people) {
+            should.not.exist(err);
+            should.exist(people);
+            should.equal(people.length, 1);
+            should.equal(people[0].name, "Hook Worked");
+            done();
+        });
+    });
+
+    describe("if hook method has 1 argument", function () {
+      var beforeValidation = false;
+      this.timeout(800);
+
+      before(setup({
+        beforeValidation : function (next) {
+          setTimeout(function () {
+            beforeValidation = true;
+
+            if (!this.name) return next("Name is missing");
+
+            return next();
+          }.bind(this), 200);
+        }
+      }));
+
+      beforeEach(function () {
+        beforeValidation = false;
+      });
+
+      it("should wait for hook to finish", function (done) {
+        Person.create([{ name: "John Doe" }], function () {
+          beforeValidation.should.be.true;
+
+          return done();
+        });
+      });
+
+      it("should trigger error if hook passes an error", function (done) {
+        Person.create([{ name: "" }], function (err) {
+          beforeValidation.should.be.true;
+
+          err.should.equal("Name is missing");
+
+          return done();
+        });
+      });
+
+      it("should trigger when calling #validate", function (done) {
+        var person = new Person();
+
+        person.validate(function (err, validationErrors) {
+          beforeValidation.should.be.true;
+
+          return done();
+        });
+      });
+    });
+  });
+
+  describe("afterLoad", function () {
+    var afterLoad = false;
+
+    before(setup({
+      afterLoad: function () {
+        afterLoad = true;
+      }
+    }));
+
+    it("should trigger when defining a model", function (done) {
+      var John = new Person({ name: "John" });
+
+      afterLoad.should.be.true;
+
+      return done();
+    });
+
+    describe("if hook method has 1 argument", function () {
+      var afterLoad = false;
+
+      before(setup({
+        afterLoad : function (next) {
+          setTimeout(function () {
+            afterLoad = true;
+
+            return next();
+          }.bind(this), 200);
+        }
+      }));
+
+      it("should wait for hook to finish", function (done) {
+        this.timeout(800);
+
+        Person.create([{ name: "John Doe" }], function (err, items) {
+          afterLoad.should.be.true;
+
+          return done();
+        });
+      });
+
+      describe("if hook returns an error", function () {
+        before(setup({
+          afterLoad : function (next) {
+            return next(new Error("AFTERLOAD_FAIL"));
+          }
+        }));
+
+        it("should return error", function (done) {
+          this.timeout(800);
 
-					Person.create([{ name: "John Doe" }], function (err, items) {
-						err.should.exist;
-						err.message.should.equal("AFTERLOAD_FAIL");
+          Person.create([{ name: "John Doe" }], function (err, items) {
+            err.should.exist;
+            err.message.should.equal("AFTERLOAD_FAIL");
 
-						return done();
-					});
-				});
-			});
-		});
-	});
+            return done();
+          });
+        });
+      });
+    });
+  });
 
-	describe("afterAutoFetch", function () {
-		var afterAutoFetch = false;
+  describe("afterAutoFetch", function () {
+    var afterAutoFetch = false;
 
-		before(setup({
-			afterAutoFetch: function () {
-				afterAutoFetch = true;
-			}
-		}));
-
-		it("should trigger when defining a model", function (done) {
-			var John = new Person({ name: "John" });
-
-			afterAutoFetch.should.be.true;
-
-			return done();
-		});
-
-		describe("if hook method has 1 argument", function () {
-			var afterAutoFetch = false;
-
-			before(setup({
-				afterAutoFetch : function (next) {
-					setTimeout(function () {
-						afterAutoFetch = true;
-
-						return next();
-					}.bind(this), 200);
-				}
-			}));
-
-			it("should wait for hook to finish", function (done) {
-				this.timeout(800);
-
-				Person.create([{ name: "John Doe" }], function (err, items) {
-					afterAutoFetch.should.be.true;
-
-					return done();
-				});
-			});
-
-			describe("if hook returns an error", function () {
-				before(setup({
-					afterAutoFetch : function (next) {
-						return next(new Error("AFTERAUTOFETCH_FAIL"));
-					}
-				}));
-
-				it("should return error", function (done) {
-					this.timeout(800);
-
-					Person.create([{ name: "John Doe" }], function (err, items) {
-						err.should.exist;
-						err.message.should.equal("AFTERAUTOFETCH_FAIL");
-
-						return done();
-					});
-				});
-			});
-		});
-	});
-
-	describe("beforeRemove", function () {
-		before(setup());
-
-		it("should trigger before removing an instance", function (done) {
-			Person.create([{ name: "John Doe" }], function (err, items) {
-				items[0].remove(function () {
-					triggeredHooks.afterRemove.should.be.a.Number();
-					triggeredHooks.beforeRemove.should.be.a.Number();
-					triggeredHooks.beforeRemove.should.not.be.above(triggeredHooks.afterRemove);
-
-					return done();
-				});
-			});
-		});
-
-		describe("if hook method has 1 argument", function () {
-			var beforeRemove = false;
-
-			before(setup({
-				beforeRemove : function (next) {
-					setTimeout(function () {
-						beforeRemove = true;
-
-						return next();
-					}.bind(this), 200);
-				}
-			}));
-
-			it("should wait for hook to finish", function (done) {
-				this.timeout(800);
-
-				Person.create([{ name: "John Doe" }], function (err, items) {
-					items[0].remove(function () {
-						beforeRemove.should.be.true;
-
-						return done();
-					});
-				});
-
-			});
-
-			describe("if hook triggers error", function () {
-				before(setup({
-					beforeRemove : function (next) {
-						setTimeout(function () {
-							return next(new Error('beforeRemove-error'));
-						}, 200);
-					}
-				}));
-
-				it("should trigger error", function (done) {
-					this.timeout(800);
-
-					Person.create([{ name: "John Doe" }], function (err, items) {
-						items[0].remove(function (err) {
-							err.should.be.a.Object();
-							err.message.should.equal("beforeRemove-error");
-
-							return done();
-						});
-					});
-				});
-			});
-		});
-	});
-
-	describe("afterRemove", function () {
-		before(setup());
-
-		it("should trigger after removing an instance", function (done) {
-			Person.create([{ name: "John Doe" }], function (err, items) {
-				items[0].remove(function () {
-					triggeredHooks.afterRemove.should.be.a.Number();
-					triggeredHooks.beforeRemove.should.be.a.Number();
-					triggeredHooks.afterRemove.should.not.be.below(triggeredHooks.beforeRemove);
-
-					return done();
-				});
-			});
-		});
-	});
-
-	describe("if model has autoSave", function () {
-		before(function (done) {
-			Person = db.define("person", {
-				name    : String,
-				surname : String
-			}, {
-				autoSave  : true,
-				hooks     : {
-					afterSave : checkHook("afterSave")
-				}
-			});
-
-			Person.settings.set("instance.returnAllErrors", false);
-
-			return helper.dropSync(Person, done);
-		});
-
-		it("should trigger for single property changes", function (done) {
-			Person.create({ name : "John", surname : "Doe" }, function (err, John) {
-				should.equal(err, null);
-
-				triggeredHooks.afterSave.should.be.a.Number();
-				triggeredHooks.afterSave = false;
-
-				John.surname = "Dean";
-
-				setTimeout(function () {
-					triggeredHooks.afterSave.should.be.a.Number();
-
-					return done();
-				}, 200);
-			});
-		});
-	});
-
-	describe("instance modifications", function () {
-	    before(setup({
-	        beforeValidation: function () {
-	            should.equal(this.name, "John Doe");
-	            this.name = "beforeValidation";
-	        },
-	        beforeCreate: function () {
-	            should.equal(this.name, "beforeValidation");
-	            this.name = "beforeCreate";
-	        },
-	        beforeSave: function () {
-	            should.equal(this.name, "beforeCreate");
-	            this.name = "beforeSave";
-	        }
-	    }));
-
-	    it("should propagate down hooks", function (done) {
-	        Person.create([{ name: "John Doe" }], function (err, people) {
-	            should.not.exist(err);
-	            should.exist(people);
-	            should.equal(people.length, 1);
-	            should.equal(people[0].name, "beforeSave");
-	            done();
-	        });
-	    });
-	});
+    before(setup({
+      afterAutoFetch: function () {
+        afterAutoFetch = true;
+      }
+    }));
+
+    it("should trigger when defining a model", function (done) {
+      var John = new Person({ name: "John" });
+
+      afterAutoFetch.should.be.true;
+
+      return done();
+    });
+
+    describe("if hook method has 1 argument", function () {
+      var afterAutoFetch = false;
+
+      before(setup({
+        afterAutoFetch : function (next) {
+          setTimeout(function () {
+            afterAutoFetch = true;
+
+            return next();
+          }.bind(this), 200);
+        }
+      }));
+
+      it("should wait for hook to finish", function (done) {
+        this.timeout(800);
+
+        Person.create([{ name: "John Doe" }], function (err, items) {
+          afterAutoFetch.should.be.true;
+
+          return done();
+        });
+      });
+
+      describe("if hook returns an error", function () {
+        before(setup({
+          afterAutoFetch : function (next) {
+            return next(new Error("AFTERAUTOFETCH_FAIL"));
+          }
+        }));
+
+        it("should return error", function (done) {
+          this.timeout(800);
+
+          Person.create([{ name: "John Doe" }], function (err, items) {
+            err.should.exist;
+            err.message.should.equal("AFTERAUTOFETCH_FAIL");
+
+            return done();
+          });
+        });
+      });
+    });
+  });
+
+  describe("beforeRemove", function () {
+    before(setup());
+
+    it("should trigger before removing an instance", function (done) {
+      Person.create([{ name: "John Doe" }], function (err, items) {
+        items[0].remove(function () {
+          triggeredHooks.afterRemove.should.be.a.Number();
+          triggeredHooks.beforeRemove.should.be.a.Number();
+          triggeredHooks.beforeRemove.should.not.be.above(triggeredHooks.afterRemove);
+
+          return done();
+        });
+      });
+    });
+
+    describe("if hook method has 1 argument", function () {
+      var beforeRemove = false;
+
+      before(setup({
+        beforeRemove : function (next) {
+          setTimeout(function () {
+            beforeRemove = true;
+
+            return next();
+          }.bind(this), 200);
+        }
+      }));
+
+      it("should wait for hook to finish", function (done) {
+        this.timeout(800);
+
+        Person.create([{ name: "John Doe" }], function (err, items) {
+          items[0].remove(function () {
+            beforeRemove.should.be.true;
+
+            return done();
+          });
+        });
+
+      });
+
+      describe("if hook triggers error", function () {
+        before(setup({
+          beforeRemove : function (next) {
+            setTimeout(function () {
+              return next(new Error('beforeRemove-error'));
+            }, 200);
+          }
+        }));
+
+        it("should trigger error", function (done) {
+          this.timeout(800);
+
+          Person.create([{ name: "John Doe" }], function (err, items) {
+            items[0].remove(function (err) {
+              err.should.be.a.Object();
+              err.message.should.equal("beforeRemove-error");
+
+              return done();
+            });
+          });
+        });
+      });
+    });
+  });
+
+  describe("afterRemove", function () {
+    before(setup());
+
+    it("should trigger after removing an instance", function (done) {
+      Person.create([{ name: "John Doe" }], function (err, items) {
+        items[0].remove(function () {
+          triggeredHooks.afterRemove.should.be.a.Number();
+          triggeredHooks.beforeRemove.should.be.a.Number();
+          triggeredHooks.afterRemove.should.not.be.below(triggeredHooks.beforeRemove);
+
+          return done();
+        });
+      });
+    });
+  });
+
+  describe("if model has autoSave", function () {
+    before(function (done) {
+      Person = db.define("person", {
+        name    : String,
+        surname : String
+      }, {
+        autoSave  : true,
+        hooks     : {
+          afterSave : checkHook("afterSave")
+        }
+      });
+
+      Person.settings.set("instance.returnAllErrors", false);
+
+      return helper.dropSync(Person, done);
+    });
+
+    it("should trigger for single property changes", function (done) {
+      Person.create({ name : "John", surname : "Doe" }, function (err, John) {
+        should.equal(err, null);
+
+        triggeredHooks.afterSave.should.be.a.Number();
+        triggeredHooks.afterSave = false;
+
+        John.surname = "Dean";
+
+        setTimeout(function () {
+          triggeredHooks.afterSave.should.be.a.Number();
+
+          return done();
+        }, 200);
+      });
+    });
+  });
+
+  describe("instance modifications", function () {
+      before(setup({
+          beforeValidation: function () {
+              should.equal(this.name, "John Doe");
+              this.name = "beforeValidation";
+          },
+          beforeCreate: function () {
+              should.equal(this.name, "beforeValidation");
+              this.name = "beforeCreate";
+          },
+          beforeSave: function () {
+              should.equal(this.name, "beforeCreate");
+              this.name = "beforeSave";
+          }
+      }));
+
+      it("should propagate down hooks", function (done) {
+          Person.create([{ name: "John Doe" }], function (err, people) {
+              should.not.exist(err);
+              should.exist(people);
+              should.equal(people.length, 1);
+              should.equal(people[0].name, "beforeSave");
+              done();
+          });
+      });
+  });
 });
diff --git a/test/integration/instance.js b/test/integration/instance.js
index 882481ca..829af2bd 100644
--- a/test/integration/instance.js
+++ b/test/integration/instance.js
@@ -1,466 +1,466 @@
-var should	= require('should');
-var helper	= require('../support/spec_helper');
+var should  = require('should');
+var helper  = require('../support/spec_helper');
 var common  = require('../common');
-var ORM			= require('../../');
+var ORM      = require('../../');
 
 describe("Model instance", function() {
-	var db = null;
-	var Person = null;
-	var protocol = common.protocol();
-
-	var setup = function () {
-		return function (done) {
-			db.settings.set('instance.returnAllErrors', true);
-
-			Person = db.define("person", {
-				name   : String,
-				age    : { type: 'integer', required: false },
-				height : { type: 'integer', required: false },
-				weight : { type: 'number',  required: false, enumerable: true },
-				secret : { type: 'text',  required: false, enumerable: false },
-				data   : { type: 'object',  required: false }
-			}, {
-				identityCache: false,
-				validations: {
-					age: ORM.validators.rangeNumber(0, 150)
-				}
-			});
-
-			return helper.dropSync(Person, function () {
-				Person.create([{
-					name: "Jeremy Doe"
-				}, {
-					name: "John Doe"
-				}, {
-					name: "Jane Doe"
-				}], done);
-			});
-		};
-	};
-
-	before(function (done) {
-		this.timeout(4000);
-
-		helper.connect(function (connection) {
-			db = connection;
-
-			setup()(function (err) {
-				return done();
-			});
-		});
-	});
-
-	after(function () {
-		return db.close();
-	});
-
-	describe("#save", function () {
-		var main_item, item;
-
-		before(function (done) {
-			main_item = db.define("main_item", {
-				name      : String
-			}, {
-				auteFetch : true
-			});
-			item = db.define("item", {
-				name      : String
-			}, {
-				identityCache  : false
-			});
-			item.hasOne("main_item", main_item, {
-				reverse   : "items",
-				autoFetch : true
-			});
-
-			return helper.dropSync([ main_item, item ], function () {
-				main_item.create({
-					name : "Main Item"
-				}, function (err, mainItem) {
-					item.create({
-						name : "Item"
-					}, function (err, Item) {
-						mainItem.setItems(Item, function (err) {
-							should.not.exist(err);
-
-							return done();
-						});
-					});
-				});
-			});
-		});
-
-		it("should have a saving state to avoid loops", function (done) {
-			main_item.find({ name : "Main Item" }).first(function (err, mainItem) {
-				mainItem.save({ name : "new name" }, function (err) {
-					should.not.exist(err);
-					return done();
-				});
-			});
-		});
-	});
-
-	describe("#isInstance", function () {
-		it("should always return true for instances", function (done) {
-			should.equal((new Person).isInstance, true);
-			should.equal((Person(4)).isInstance, true);
-
-			Person.find().first(function (err, item) {
-				should.not.exist(err);
-				should.equal(item.isInstance, true);
-				return done();
-			});
-		});
-
-		it("should be false for all other objects", function () {
-			should.notEqual({}.isInstance, true);
-			should.notEqual([].isInstance, true);
-		});
-	});
-
-	describe("#isPersisted", function () {
-		it("should return true for persisted instances", function (done) {
-			Person.find().first(function (err, item) {
-				should.not.exist(err);
-				should.equal(item.isPersisted(), true);
-				return done();
-			});
-		});
-
-		it("should return true for shell instances", function () {
-			should.equal(Person(4).isPersisted(), true);
-		});
-
-		it("should return false for new instances", function () {
-			should.equal((new Person).isPersisted(), false);
-		});
-
-		it("should be writable for mocking", function() {
-			var person = new Person()
-			var triggered = false;
-			person.isPersisted = function() {
-				triggered = true;
-			};
-			person.isPersisted()
-			triggered.should.be.true;
-		});
-	});
-
-	describe("#set", function () {
-		var person = null;
-		var data = null;
-
-		function clone(obj) { return JSON.parse(JSON.stringify(obj)) };
-
-		beforeEach(function (done) {
-			data = {
-				a: {
-					b: {
-						c: 3,
-						d: 4
-					}
-				},
-				e: 5
-			};
-			Person.create({ name: 'Dilbert', data: data }, function (err, p) {
-				if (err) return done(err);
-
-				person = p;
-				done();
-			});
-		});
-
-		it("should do nothing with flat paths when setting to same value", function () {
-			should.equal(person.saved(), true);
-			person.set('name', 'Dilbert');
-			should.equal(person.name, 'Dilbert');
-			should.equal(person.saved(), true);
-		});
-
-		it("should mark as dirty with flat paths when setting to different value", function () {
-			should.equal(person.saved(), true);
-			person.set('name', 'Dogbert');
-			should.equal(person.name, 'Dogbert');
-			should.equal(person.saved(), false);
-			should.equal(person.__opts.changes.join(','), 'name');
-		});
-
-		it("should do nothin with deep paths when setting to same value", function () {
-			should.equal(person.saved(), true);
-			person.set('data.e', 5);
-
-			var expected = clone(data);
-			expected.e = 5;
-
-			should.equal(JSON.stringify(person.data), JSON.stringify(expected));
-			should.equal(person.saved(), true);
-		});
-
-		it("should mark as dirty with deep paths when setting to different value", function () {
-			should.equal(person.saved(), true);
-			person.set('data.e', 6);
-
-			var expected = clone(data);
-			expected.e = 6;
-
-			should.equal(JSON.stringify(person.data), JSON.stringify(expected));
-			should.equal(person.saved(), false);
-			should.equal(person.__opts.changes.join(','), 'data');
-		});
-
-		it("should do nothing with deeper paths when setting to same value", function () {
-			should.equal(person.saved(), true);
-			person.set('data.a.b.d', 4);
-
-			var expected = clone(data);
-			expected.a.b.d = 4;
-
-			should.equal(JSON.stringify(person.data), JSON.stringify(expected));
-			should.equal(person.saved(), true);
-		});
-
-		it("should mark as dirty with deeper paths when setting to different value", function () {
-			should.equal(person.saved(), true);
-			person.set('data.a.b.d', 6);
-
-			var expected = clone(data);
-			expected.a.b.d = 6;
-
-			should.equal(JSON.stringify(person.data), JSON.stringify(expected));
-			should.equal(person.saved(), false);
-			should.equal(person.__opts.changes.join(','), 'data');
-		});
-
-		it("should mark as dirty with array path when setting to different value", function () {
-			should.equal(person.saved(), true);
-			person.set(['data', 'a', 'b', 'd'], 6);
-
-			var expected = clone(data);
-			expected.a.b.d = 6;
-
-			should.equal(JSON.stringify(person.data), JSON.stringify(expected));
-			should.equal(person.saved(), false);
-			should.equal(person.__opts.changes.join(','), 'data');
-		});
-
-		it("should do nothing with invalid paths", function () {
-			should.equal(person.saved(), true);
-			person.set('data.a.b.d.y.z', 1);
-			person.set('data.y.z', 1);
-			person.set('z', 1);
-			person.set(4, 1);
-			person.set(null, 1);
-			person.set(undefined, 1);
-			should.equal(person.saved(), true);
-		});
-	});
-
-	describe("#markAsDirty", function () {
-		var person = null;
-
-		beforeEach(function (done) {
-			Person.create({ name: 'John', age: 44, data: { a: 1 } }, function (err, p) {
-				if (err) return cb(err);
-
-				person = p;
-				done();
-			});
-		});
-
-		it("should mark individual properties as dirty", function () {
-			should.equal(person.saved(), true);
-			person.markAsDirty('name');
-			should.equal(person.saved(), false);
-			should.equal(person.__opts.changes.join(','), 'name');
-			person.markAsDirty('data');
-			should.equal(person.__opts.changes.join(','), 'name,data');
-		});
-	});
-
-	describe("#dirtyProperties", function () {
-		var person = null;
-
-		beforeEach(function (done) {
-			Person.create({ name: 'John', age: 44, data: { a: 1 } }, function (err, p) {
-				if (err) return cb(err);
-
-				person = p;
-				done();
-			});
-		});
-
-		it("should mark individual properties as dirty", function () {
-			should.equal(person.saved(), true);
-			person.markAsDirty('name');
-			person.markAsDirty('data');
-			should.equal(person.saved(), false);
-			should.equal(person.dirtyProperties.join(','), 'name,data');
-		});
-	});
-
-	describe("#isShell", function () {
-		it("should return true for shell models", function () {
-			should.equal(Person(4).isShell(), true);
-		});
-
-		it("should return false for new models", function () {
-			should.equal((new Person).isShell(), false);
-		});
-
-		it("should return false for existing models", function (done) {
-			Person.find().first(function (err, item) {
-				should.not.exist(err);
-				should.equal(item.isShell(), false);
-				return done();
-			});
-		});
-	});
-
-	describe("#validate", function () {
-		it("should return validation errors if invalid", function (done) {
-			var person = new Person({ age: -1 });
-
-			person.validate(function (err, validationErrors) {
-				should.not.exist(err);
-				should.equal(Array.isArray(validationErrors), true);
-
-				return done();
-			});
-		});
-
-		it("should return false if valid", function (done) {
-			var person = new Person({ name: 'Janette' });
-
-			person.validate(function (err, validationErrors) {
-				should.not.exist(err);
-				should.equal(validationErrors, false);
-
-				return done();
-			});
-		});
-	});
-
-	describe("properties", function () {
-		describe("Number", function () {
-			it("should be saved for valid numbers, using both save & create", function (done) {
-				var person1 = new Person({ height: 190 });
-
-				person1.save(function (err) {
-					should.not.exist(err);
-
-					Person.create({ height: 170 }, function (err, person2) {
-						should.not.exist(err);
-
-						Person.get(person1[Person.id], function (err, item) {
-							should.not.exist(err);
-							should.equal(item.height, 190);
-
-							Person.get(person2[Person.id], function (err, item) {
-								should.not.exist(err);
-								should.equal(item.height, 170);
-								done();
-							});
-						});
-					});
-				});
-			});
-
-			if (protocol == 'postgres') {
-				// Only postgres raises propper errors.
-				// Sqlite & Mysql fail silently and insert nulls.
-				it("should raise an error for NaN integers", function (done) {
-					var person = new Person({ height: NaN });
-
-					person.save(function (err) {
-						should.exist(err);
-						var msg = {
-							postgres : 'invalid input syntax for integer: "NaN"'
-						}[protocol];
-
-						should.equal(err.message, msg);
-
-						done();
-					});
-				});
-
-				it("should raise an error for Infinity integers", function (done) {
-					var person = new Person({ height: Infinity });
-
-					person.save(function (err) {
-						should.exist(err);
-						var msg = {
-							postgres : 'invalid input syntax for integer: "Infinity"'
-						}[protocol];
-
-						should.equal(err.message, msg);
-
-						done();
-					});
-				});
-
-				it("should raise an error for nonsensical integers, for both save & create", function (done) {
-					var person = new Person({ height: 'bugz' });
-
-					person.save(function (err) {
-						should.exist(err);
-						var msg = {
-							postgres : 'invalid input syntax for integer: "bugz"'
-						}[protocol];
-
-						should.equal(err.message, msg);
-
-						Person.create({ height: 'bugz' }, function (err, instance) {
-							should.exist(err);
-							should.equal(err.message, msg);
-
-							done();
-						});
-					});
-				});
-			}
-
-			if (protocol != 'mysql') {
-				// Mysql doesn't support IEEE floats (NaN, Infinity, -Infinity)
-				it("should store NaN & Infinite floats", function (done) {
-					var person = new Person({ weight: NaN });
-
-					person.save(function (err) {
-						should.not.exist(err);
-
-						Person.get(person[Person.id], function (err, person) {
-							should.not.exist(err);
-							should(isNaN(person.weight));
-
-							person.save({ weight: Infinity, name: 'black hole' }, function (err) {
-								should.not.exist(err);
-
-								Person.get(person[Person.id], function (err, person) {
-									should.not.exist(err);
-									should.strictEqual(person.weight, Infinity);
-
-									done();
-								});
-							});
-						});
-					});
-				});
-			}
-		});
-
-		describe("Enumerable", function () {
-			it("should not stringify properties marked as not enumerable", function (done) {
-				Person.create({ name: 'Dilbert', secret: 'dogbert', weight: 100, data: {data: 3} }, function (err, p) {
-					if (err) return done(err);
-
-					var result = JSON.parse(JSON.stringify(p));
-					should.not.exist(result.secret);
-					should.exist(result.weight);
-					should.exist(result.data);
-					should.exist(result.name);
-
-					done();
-				});
-			});
-		});
-	});
+  var db = null;
+  var Person = null;
+  var protocol = common.protocol();
+
+  var setup = function () {
+    return function (done) {
+      db.settings.set('instance.returnAllErrors', true);
+
+      Person = db.define("person", {
+        name   : String,
+        age    : { type: 'integer', required: false },
+        height : { type: 'integer', required: false },
+        weight : { type: 'number',  required: false, enumerable: true },
+        secret : { type: 'text',  required: false, enumerable: false },
+        data   : { type: 'object',  required: false }
+      }, {
+        identityCache: false,
+        validations: {
+          age: ORM.validators.rangeNumber(0, 150)
+        }
+      });
+
+      return helper.dropSync(Person, function () {
+        Person.create([{
+          name: "Jeremy Doe"
+        }, {
+          name: "John Doe"
+        }, {
+          name: "Jane Doe"
+        }], done);
+      });
+    };
+  };
+
+  before(function (done) {
+    this.timeout(4000);
+
+    helper.connect(function (connection) {
+      db = connection;
+
+      setup()(function (err) {
+        return done();
+      });
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  describe("#save", function () {
+    var main_item, item;
+
+    before(function (done) {
+      main_item = db.define("main_item", {
+        name      : String
+      }, {
+        auteFetch : true
+      });
+      item = db.define("item", {
+        name      : String
+      }, {
+        identityCache  : false
+      });
+      item.hasOne("main_item", main_item, {
+        reverse   : "items",
+        autoFetch : true
+      });
+
+      return helper.dropSync([ main_item, item ], function () {
+        main_item.create({
+          name : "Main Item"
+        }, function (err, mainItem) {
+          item.create({
+            name : "Item"
+          }, function (err, Item) {
+            mainItem.setItems(Item, function (err) {
+              should.not.exist(err);
+
+              return done();
+            });
+          });
+        });
+      });
+    });
+
+    it("should have a saving state to avoid loops", function (done) {
+      main_item.find({ name : "Main Item" }).first(function (err, mainItem) {
+        mainItem.save({ name : "new name" }, function (err) {
+          should.not.exist(err);
+          return done();
+        });
+      });
+    });
+  });
+
+  describe("#isInstance", function () {
+    it("should always return true for instances", function (done) {
+      should.equal((new Person).isInstance, true);
+      should.equal((Person(4)).isInstance, true);
+
+      Person.find().first(function (err, item) {
+        should.not.exist(err);
+        should.equal(item.isInstance, true);
+        return done();
+      });
+    });
+
+    it("should be false for all other objects", function () {
+      should.notEqual({}.isInstance, true);
+      should.notEqual([].isInstance, true);
+    });
+  });
+
+  describe("#isPersisted", function () {
+    it("should return true for persisted instances", function (done) {
+      Person.find().first(function (err, item) {
+        should.not.exist(err);
+        should.equal(item.isPersisted(), true);
+        return done();
+      });
+    });
+
+    it("should return true for shell instances", function () {
+      should.equal(Person(4).isPersisted(), true);
+    });
+
+    it("should return false for new instances", function () {
+      should.equal((new Person).isPersisted(), false);
+    });
+
+    it("should be writable for mocking", function() {
+      var person = new Person()
+      var triggered = false;
+      person.isPersisted = function() {
+        triggered = true;
+      };
+      person.isPersisted()
+      triggered.should.be.true;
+    });
+  });
+
+  describe("#set", function () {
+    var person = null;
+    var data = null;
+
+    function clone(obj) { return JSON.parse(JSON.stringify(obj)) };
+
+    beforeEach(function (done) {
+      data = {
+        a: {
+          b: {
+            c: 3,
+            d: 4
+          }
+        },
+        e: 5
+      };
+      Person.create({ name: 'Dilbert', data: data }, function (err, p) {
+        if (err) return done(err);
+
+        person = p;
+        done();
+      });
+    });
+
+    it("should do nothing with flat paths when setting to same value", function () {
+      should.equal(person.saved(), true);
+      person.set('name', 'Dilbert');
+      should.equal(person.name, 'Dilbert');
+      should.equal(person.saved(), true);
+    });
+
+    it("should mark as dirty with flat paths when setting to different value", function () {
+      should.equal(person.saved(), true);
+      person.set('name', 'Dogbert');
+      should.equal(person.name, 'Dogbert');
+      should.equal(person.saved(), false);
+      should.equal(person.__opts.changes.join(','), 'name');
+    });
+
+    it("should do nothin with deep paths when setting to same value", function () {
+      should.equal(person.saved(), true);
+      person.set('data.e', 5);
+
+      var expected = clone(data);
+      expected.e = 5;
+
+      should.equal(JSON.stringify(person.data), JSON.stringify(expected));
+      should.equal(person.saved(), true);
+    });
+
+    it("should mark as dirty with deep paths when setting to different value", function () {
+      should.equal(person.saved(), true);
+      person.set('data.e', 6);
+
+      var expected = clone(data);
+      expected.e = 6;
+
+      should.equal(JSON.stringify(person.data), JSON.stringify(expected));
+      should.equal(person.saved(), false);
+      should.equal(person.__opts.changes.join(','), 'data');
+    });
+
+    it("should do nothing with deeper paths when setting to same value", function () {
+      should.equal(person.saved(), true);
+      person.set('data.a.b.d', 4);
+
+      var expected = clone(data);
+      expected.a.b.d = 4;
+
+      should.equal(JSON.stringify(person.data), JSON.stringify(expected));
+      should.equal(person.saved(), true);
+    });
+
+    it("should mark as dirty with deeper paths when setting to different value", function () {
+      should.equal(person.saved(), true);
+      person.set('data.a.b.d', 6);
+
+      var expected = clone(data);
+      expected.a.b.d = 6;
+
+      should.equal(JSON.stringify(person.data), JSON.stringify(expected));
+      should.equal(person.saved(), false);
+      should.equal(person.__opts.changes.join(','), 'data');
+    });
+
+    it("should mark as dirty with array path when setting to different value", function () {
+      should.equal(person.saved(), true);
+      person.set(['data', 'a', 'b', 'd'], 6);
+
+      var expected = clone(data);
+      expected.a.b.d = 6;
+
+      should.equal(JSON.stringify(person.data), JSON.stringify(expected));
+      should.equal(person.saved(), false);
+      should.equal(person.__opts.changes.join(','), 'data');
+    });
+
+    it("should do nothing with invalid paths", function () {
+      should.equal(person.saved(), true);
+      person.set('data.a.b.d.y.z', 1);
+      person.set('data.y.z', 1);
+      person.set('z', 1);
+      person.set(4, 1);
+      person.set(null, 1);
+      person.set(undefined, 1);
+      should.equal(person.saved(), true);
+    });
+  });
+
+  describe("#markAsDirty", function () {
+    var person = null;
+
+    beforeEach(function (done) {
+      Person.create({ name: 'John', age: 44, data: { a: 1 } }, function (err, p) {
+        if (err) return cb(err);
+
+        person = p;
+        done();
+      });
+    });
+
+    it("should mark individual properties as dirty", function () {
+      should.equal(person.saved(), true);
+      person.markAsDirty('name');
+      should.equal(person.saved(), false);
+      should.equal(person.__opts.changes.join(','), 'name');
+      person.markAsDirty('data');
+      should.equal(person.__opts.changes.join(','), 'name,data');
+    });
+  });
+
+  describe("#dirtyProperties", function () {
+    var person = null;
+
+    beforeEach(function (done) {
+      Person.create({ name: 'John', age: 44, data: { a: 1 } }, function (err, p) {
+        if (err) return cb(err);
+
+        person = p;
+        done();
+      });
+    });
+
+    it("should mark individual properties as dirty", function () {
+      should.equal(person.saved(), true);
+      person.markAsDirty('name');
+      person.markAsDirty('data');
+      should.equal(person.saved(), false);
+      should.equal(person.dirtyProperties.join(','), 'name,data');
+    });
+  });
+
+  describe("#isShell", function () {
+    it("should return true for shell models", function () {
+      should.equal(Person(4).isShell(), true);
+    });
+
+    it("should return false for new models", function () {
+      should.equal((new Person).isShell(), false);
+    });
+
+    it("should return false for existing models", function (done) {
+      Person.find().first(function (err, item) {
+        should.not.exist(err);
+        should.equal(item.isShell(), false);
+        return done();
+      });
+    });
+  });
+
+  describe("#validate", function () {
+    it("should return validation errors if invalid", function (done) {
+      var person = new Person({ age: -1 });
+
+      person.validate(function (err, validationErrors) {
+        should.not.exist(err);
+        should.equal(Array.isArray(validationErrors), true);
+
+        return done();
+      });
+    });
+
+    it("should return false if valid", function (done) {
+      var person = new Person({ name: 'Janette' });
+
+      person.validate(function (err, validationErrors) {
+        should.not.exist(err);
+        should.equal(validationErrors, false);
+
+        return done();
+      });
+    });
+  });
+
+  describe("properties", function () {
+    describe("Number", function () {
+      it("should be saved for valid numbers, using both save & create", function (done) {
+        var person1 = new Person({ height: 190 });
+
+        person1.save(function (err) {
+          should.not.exist(err);
+
+          Person.create({ height: 170 }, function (err, person2) {
+            should.not.exist(err);
+
+            Person.get(person1[Person.id], function (err, item) {
+              should.not.exist(err);
+              should.equal(item.height, 190);
+
+              Person.get(person2[Person.id], function (err, item) {
+                should.not.exist(err);
+                should.equal(item.height, 170);
+                done();
+              });
+            });
+          });
+        });
+      });
+
+      if (protocol == 'postgres') {
+        // Only postgres raises propper errors.
+        // Sqlite & Mysql fail silently and insert nulls.
+        it("should raise an error for NaN integers", function (done) {
+          var person = new Person({ height: NaN });
+
+          person.save(function (err) {
+            should.exist(err);
+            var msg = {
+              postgres : 'invalid input syntax for integer: "NaN"'
+            }[protocol];
+
+            should.equal(err.message, msg);
+
+            done();
+          });
+        });
+
+        it("should raise an error for Infinity integers", function (done) {
+          var person = new Person({ height: Infinity });
+
+          person.save(function (err) {
+            should.exist(err);
+            var msg = {
+              postgres : 'invalid input syntax for integer: "Infinity"'
+            }[protocol];
+
+            should.equal(err.message, msg);
+
+            done();
+          });
+        });
+
+        it("should raise an error for nonsensical integers, for both save & create", function (done) {
+          var person = new Person({ height: 'bugz' });
+
+          person.save(function (err) {
+            should.exist(err);
+            var msg = {
+              postgres : 'invalid input syntax for integer: "bugz"'
+            }[protocol];
+
+            should.equal(err.message, msg);
+
+            Person.create({ height: 'bugz' }, function (err, instance) {
+              should.exist(err);
+              should.equal(err.message, msg);
+
+              done();
+            });
+          });
+        });
+      }
+
+      if (protocol != 'mysql') {
+        // Mysql doesn't support IEEE floats (NaN, Infinity, -Infinity)
+        it("should store NaN & Infinite floats", function (done) {
+          var person = new Person({ weight: NaN });
+
+          person.save(function (err) {
+            should.not.exist(err);
+
+            Person.get(person[Person.id], function (err, person) {
+              should.not.exist(err);
+              should(isNaN(person.weight));
+
+              person.save({ weight: Infinity, name: 'black hole' }, function (err) {
+                should.not.exist(err);
+
+                Person.get(person[Person.id], function (err, person) {
+                  should.not.exist(err);
+                  should.strictEqual(person.weight, Infinity);
+
+                  done();
+                });
+              });
+            });
+          });
+        });
+      }
+    });
+
+    describe("Enumerable", function () {
+      it("should not stringify properties marked as not enumerable", function (done) {
+        Person.create({ name: 'Dilbert', secret: 'dogbert', weight: 100, data: {data: 3} }, function (err, p) {
+          if (err) return done(err);
+
+          var result = JSON.parse(JSON.stringify(p));
+          should.not.exist(result.secret);
+          should.exist(result.weight);
+          should.exist(result.data);
+          should.exist(result.name);
+
+          done();
+        });
+      });
+    });
+  });
 });
diff --git a/test/integration/model-aggregate.js b/test/integration/model-aggregate.js
index 7851188e..2f45d912 100644
--- a/test/integration/model-aggregate.js
+++ b/test/integration/model-aggregate.js
@@ -3,275 +3,275 @@ var helper   = require('../support/spec_helper');
 var ORM      = require('../../');
 
 describe("Model.aggregate()", function() {
-	var db = null;
-	var Person = null;
-
-	var setup = function () {
-		return function (done) {
-			Person = db.define("person", {
-				name   : String
-			});
-
-			return helper.dropSync(Person, function () {
-				Person.create([{
-					id  : 1,
-					name: "John Doe"
-				}, {
-					id  : 2,
-					name: "Jane Doe"
-				}, {
-					id  : 3,
-					name: "John Doe"
-				}], done);
-			});
-		};
-	};
-
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
-
-			return done();
-		});
-	});
-
-	after(function () {
-		return db.close();
-	});
-
-	describe("with multiple methods", function () {
-		before(setup());
+  var db = null;
+  var Person = null;
+
+  var setup = function () {
+    return function (done) {
+      Person = db.define("person", {
+        name   : String
+      });
+
+      return helper.dropSync(Person, function () {
+        Person.create([{
+          id  : 1,
+          name: "John Doe"
+        }, {
+          id  : 2,
+          name: "Jane Doe"
+        }, {
+          id  : 3,
+          name: "John Doe"
+        }], done);
+      });
+    };
+  };
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  describe("with multiple methods", function () {
+    before(setup());
 
-		it("should return value for everyone of them", function (done) {
-			Person.aggregate().count('id').min('id').max('id').get(function (err, count, min, max) {
-				should.equal(err, null);
+    it("should return value for everyone of them", function (done) {
+      Person.aggregate().count('id').min('id').max('id').get(function (err, count, min, max) {
+        should.equal(err, null);
 
-				count.should.equal(3);
-				min.should.equal(1);
-				max.should.equal(3);
+        count.should.equal(3);
+        min.should.equal(1);
+        max.should.equal(3);
 
-				return done();
-			});
-		});
-	});
+        return done();
+      });
+    });
+  });
 
-	describe("with call()", function () {
-		before(setup());
+  describe("with call()", function () {
+    before(setup());
 
-		it("should accept a function", function (done) {
-			Person.aggregate().call('COUNT').get(function (err, count) {
-				should.equal(err, null);
+    it("should accept a function", function (done) {
+      Person.aggregate().call('COUNT').get(function (err, count) {
+        should.equal(err, null);
 
-				count.should.equal(3);
+        count.should.equal(3);
 
-				return done();
-			});
-		});
+        return done();
+      });
+    });
 
-		it("should accept arguments to the funciton as an Array", function (done) {
-			Person.aggregate().call('COUNT', [ 'id' ]).get(function (err, count) {
-				should.equal(err, null);
+    it("should accept arguments to the funciton as an Array", function (done) {
+      Person.aggregate().call('COUNT', [ 'id' ]).get(function (err, count) {
+        should.equal(err, null);
 
-				count.should.equal(3);
+        count.should.equal(3);
 
-				return done();
-			});
-		});
+        return done();
+      });
+    });
 
-		describe("if function is DISTINCT", function () {
-			it("should work as calling .distinct() directly", function (done) {
-				Person.aggregate().call('DISTINCT', [ 'name' ]).as('name').order('name').get(function (err, rows) {
-					should.equal(err, null);
+    describe("if function is DISTINCT", function () {
+      it("should work as calling .distinct() directly", function (done) {
+        Person.aggregate().call('DISTINCT', [ 'name' ]).as('name').order('name').get(function (err, rows) {
+          should.equal(err, null);
 
-					should(Array.isArray(rows));
-					rows.length.should.equal(2);
+          should(Array.isArray(rows));
+          rows.length.should.equal(2);
 
-					rows[0].should.equal('Jane Doe');
-					rows[1].should.equal('John Doe');
+          rows[0].should.equal('Jane Doe');
+          rows[1].should.equal('John Doe');
 
-					return done();
-				});
-			});
-		});
-	});
+          return done();
+        });
+      });
+    });
+  });
 
-	describe("with as() without previous aggregates", function () {
-		before(setup());
+  describe("with as() without previous aggregates", function () {
+    before(setup());
 
-		it("should throw", function (done) {
-			Person.aggregate().as.should.throw();
+    it("should throw", function (done) {
+      Person.aggregate().as.should.throw();
 
-			return done();
-		});
-	});
+      return done();
+    });
+  });
 
-	describe("with select() without arguments", function () {
-		before(setup());
+  describe("with select() without arguments", function () {
+    before(setup());
 
-		it("should throw", function (done) {
-			Person.aggregate().select.should.throw();
+    it("should throw", function (done) {
+      Person.aggregate().select.should.throw();
 
-			return done();
-		});
-	});
+      return done();
+    });
+  });
 
-	describe("with select() with arguments", function () {
-		before(setup());
+  describe("with select() with arguments", function () {
+    before(setup());
 
-		it("should use them as properties if 1st argument is Array", function (done) {
-			Person.aggregate().select([ 'id' ]).count('id').groupBy('id').get(function (err, people) {
-				should.equal(err, null);
+    it("should use them as properties if 1st argument is Array", function (done) {
+      Person.aggregate().select([ 'id' ]).count('id').groupBy('id').get(function (err, people) {
+        should.equal(err, null);
 
-				should(Array.isArray(people));
-				people.length.should.be.above(0);
+        should(Array.isArray(people));
+        people.length.should.be.above(0);
 
-				people[0].should.be.a.Object();
-				people[0].should.have.property("id");
-				people[0].should.not.have.property("name");
+        people[0].should.be.a.Object();
+        people[0].should.have.property("id");
+        people[0].should.not.have.property("name");
 
-				return done();
-			});
-		});
+        return done();
+      });
+    });
 
-		it("should use them as properties", function (done) {
-			Person.aggregate().select('id').count().groupBy('id').get(function (err, people) {
-				should.equal(err, null);
+    it("should use them as properties", function (done) {
+      Person.aggregate().select('id').count().groupBy('id').get(function (err, people) {
+        should.equal(err, null);
 
-				should(Array.isArray(people));
-				people.length.should.be.above(0);
+        should(Array.isArray(people));
+        people.length.should.be.above(0);
 
-				people[0].should.be.a.Object();
-				people[0].should.have.property("id");
-				people[0].should.not.have.property("name");
+        people[0].should.be.a.Object();
+        people[0].should.have.property("id");
+        people[0].should.not.have.property("name");
 
-				return done();
-			});
-		});
-	});
+        return done();
+      });
+    });
+  });
 
-	describe("with get() without callback", function () {
-		before(setup());
+  describe("with get() without callback", function () {
+    before(setup());
 
-		it("should throw", function (done) {
-			Person.aggregate().count('id').get.should.throw();
+    it("should throw", function (done) {
+      Person.aggregate().count('id').get.should.throw();
 
-			return done();
-		});
-	});
+      return done();
+    });
+  });
 
-	describe("with get() without aggregates", function () {
-		before(setup());
+  describe("with get() without aggregates", function () {
+    before(setup());
 
-		it("should throw", function (done) {
-			(function () {
-				Person.aggregate().get(function () {});
-			}).should.throw();
+    it("should throw", function (done) {
+      (function () {
+        Person.aggregate().get(function () {});
+      }).should.throw();
 
-			return done();
-		});
-	});
+      return done();
+    });
+  });
 
-	describe("with distinct()", function () {
-		before(setup());
+  describe("with distinct()", function () {
+    before(setup());
 
-		it("should return a list of distinct properties", function (done) {
-			Person.aggregate().distinct('name').get(function (err, names) {
-				should.equal(err, null);
+    it("should return a list of distinct properties", function (done) {
+      Person.aggregate().distinct('name').get(function (err, names) {
+        should.equal(err, null);
 
-				names.should.be.a.Object();
-				names.should.have.property("length", 2);
+        names.should.be.a.Object();
+        names.should.have.property("length", 2);
 
-				return done();
-			});
-		});
+        return done();
+      });
+    });
 
-		describe("with limit(1)", function () {
-			it("should return only one value", function (done) {
-				Person.aggregate().distinct('name').limit(1).order("name").get(function (err, names) {
-					should.equal(err, null);
+    describe("with limit(1)", function () {
+      it("should return only one value", function (done) {
+        Person.aggregate().distinct('name').limit(1).order("name").get(function (err, names) {
+          should.equal(err, null);
 
-					names.should.be.a.Object();
-					names.should.have.property("length", 1);
-					names[0].should.equal("Jane Doe");
+          names.should.be.a.Object();
+          names.should.have.property("length", 1);
+          names[0].should.equal("Jane Doe");
 
-					return done();
-				});
-			});
-		});
+          return done();
+        });
+      });
+    });
 
-		describe("with limit(1, 1)", function () {
-			it("should return only one value", function (done) {
-				Person.aggregate().distinct('name').limit(1, 1).order("name").get(function (err, names) {
-					should.equal(err, null);
+    describe("with limit(1, 1)", function () {
+      it("should return only one value", function (done) {
+        Person.aggregate().distinct('name').limit(1, 1).order("name").get(function (err, names) {
+          should.equal(err, null);
 
-					names.should.be.a.Object();
-					names.should.have.property("length", 1);
-					names[0].should.equal("John Doe");
+          names.should.be.a.Object();
+          names.should.have.property("length", 1);
+          names[0].should.equal("John Doe");
 
-					return done();
-				});
-			});
-		});
-	});
+          return done();
+        });
+      });
+    });
+  });
 
-	describe("with groupBy()", function () {
-		before(setup());
+  describe("with groupBy()", function () {
+    before(setup());
 
-		it("should return items grouped by property", function (done) {
-			Person.aggregate().count().groupBy('name').get(function (err, rows) {
-				should.equal(err, null);
+    it("should return items grouped by property", function (done) {
+      Person.aggregate().count().groupBy('name').get(function (err, rows) {
+        should.equal(err, null);
 
-				rows.should.be.a.Object();
-				rows.should.have.property("length", 2);
+        rows.should.be.a.Object();
+        rows.should.have.property("length", 2);
 
-				(rows[0].count + rows[1].count).should.equal(3); // 1 + 2
+        (rows[0].count + rows[1].count).should.equal(3); // 1 + 2
 
-				return done();
-			});
-		});
+        return done();
+      });
+    });
 
-		describe("with order()", function () {
-			before(setup());
+    describe("with order()", function () {
+      before(setup());
 
-			it("should order items", function (done) {
-				Person.aggregate().count().groupBy('name').order('-count').get(function (err, rows) {
-					should.equal(err, null);
+      it("should order items", function (done) {
+        Person.aggregate().count().groupBy('name').order('-count').get(function (err, rows) {
+          should.equal(err, null);
 
-					rows.should.be.a.Object();
-					rows.should.have.property("length", 2);
+          rows.should.be.a.Object();
+          rows.should.have.property("length", 2);
 
-					rows[0].count.should.equal(2);
-					rows[1].count.should.equal(1);
+          rows[0].count.should.equal(2);
+          rows[1].count.should.equal(1);
 
-					return done();
-				});
-			});
-		});
-	});
+          return done();
+        });
+      });
+    });
+  });
 
-	describe("using as()", function () {
-		before(setup());
+  describe("using as()", function () {
+    before(setup());
 
-		it("should use as an alias", function (done) {
-			Person.aggregate().count().as('total').groupBy('name').get(function (err, people) {
-				should.equal(err, null);
+    it("should use as an alias", function (done) {
+      Person.aggregate().count().as('total').groupBy('name').get(function (err, people) {
+        should.equal(err, null);
 
-				should(Array.isArray(people));
-				people.length.should.be.above(0);
+        should(Array.isArray(people));
+        people.length.should.be.above(0);
 
-				people[0].should.be.a.Object();
-				people[0].should.have.property("total");
+        people[0].should.be.a.Object();
+        people[0].should.have.property("total");
 
-				return done();
-			});
-		});
+        return done();
+      });
+    });
 
-		it("should throw if no aggregates defined", function (done) {
-			(function () {
-				Person.aggregate().as('total');
-			}).should.throw();
+    it("should throw if no aggregates defined", function (done) {
+      (function () {
+        Person.aggregate().as('total');
+      }).should.throw();
 
-			return done();
-		});
-	});
+      return done();
+    });
+  });
 });
diff --git a/test/integration/model-clear.js b/test/integration/model-clear.js
index b2acff98..52fd5b4b 100644
--- a/test/integration/model-clear.js
+++ b/test/integration/model-clear.js
@@ -3,68 +3,68 @@ var helper   = require('../support/spec_helper');
 var ORM      = require('../../');
 
 describe("Model.clear()", function() {
-	var db = null;
-	var Person = null;
+  var db = null;
+  var Person = null;
 
-	var setup = function () {
-		return function (done) {
-			Person = db.define("person", {
-				name   : String
-			});
+  var setup = function () {
+    return function (done) {
+      Person = db.define("person", {
+        name   : String
+      });
 
-			ORM.singleton.clear();
+      ORM.singleton.clear();
 
-			return helper.dropSync(Person, function () {
-				Person.create([{
-					name: "John Doe"
-				}, {
-					name: "Jane Doe"
-				}], done);
-			});
-		};
-	};
+      return helper.dropSync(Person, function () {
+        Person.create([{
+          name: "John Doe"
+        }, {
+          name: "Jane Doe"
+        }], done);
+      });
+    };
+  };
 
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
 
-			return done();
-		});
-	});
+      return done();
+    });
+  });
 
-	after(function () {
-		return db.close();
-	});
+  after(function () {
+    return db.close();
+  });
 
-	describe("with callback", function () {
-		before(setup());
+  describe("with callback", function () {
+    before(setup());
 
-		it("should call when done", function (done) {
-			Person.clear(function (err) {
-				should.equal(err, null);
+    it("should call when done", function (done) {
+      Person.clear(function (err) {
+        should.equal(err, null);
 
-				Person.find().count(function (err, count) {
-					count.should.equal(0);
+        Person.find().count(function (err, count) {
+          count.should.equal(0);
 
-					return done();
-				});
-			});
-		});
-	});
+          return done();
+        });
+      });
+    });
+  });
 
-	describe("without callback", function () {
-		before(setup());
+  describe("without callback", function () {
+    before(setup());
 
-		it("should still remove", function (done) {
-			Person.clear();
+    it("should still remove", function (done) {
+      Person.clear();
 
-			setTimeout(function () {
-				Person.find().count(function (err, count) {
-					count.should.equal(0);
+      setTimeout(function () {
+        Person.find().count(function (err, count) {
+          count.should.equal(0);
 
-					return done();
-				});
-			}, 200);
-		});
-	});
+          return done();
+        });
+      }, 200);
+    });
+  });
 });
diff --git a/test/integration/model-count.js b/test/integration/model-count.js
index 61a509a1..788196b4 100644
--- a/test/integration/model-count.js
+++ b/test/integration/model-count.js
@@ -3,77 +3,77 @@ var helper   = require('../support/spec_helper');
 var ORM      = require('../../');
 
 describe("Model.count()", function() {
-	var db = null;
-	var Person = null;
-
-	var setup = function () {
-		return function (done) {
-			Person = db.define("person", {
-				name   : String
-			});
-
-			return helper.dropSync(Person, function () {
-				Person.create([{
-					id  : 1,
-					name: "John Doe"
-				}, {
-					id  : 2,
-					name: "Jane Doe"
-				}, {
-					id  : 3,
-					name: "John Doe"
-				}], done);
-			});
-		};
-	};
-
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
-
-			return done();
-		});
-	});
-
-	after(function () {
-		return db.close();
-	});
-
-	describe("without callback", function () {
-		before(setup());
-
-		it("should throw", function (done) {
-			Person.count.should.throw();
-
-			return done();
-		});
-	});
-
-	describe("without conditions", function () {
-		before(setup());
-
-		it("should return all items in model", function (done) {
-			Person.count(function (err, count) {
-				should.equal(err, null);
-
-				count.should.equal(3);
-
-				return done();
-			});
-		});
-	});
-
-	describe("with conditions", function () {
-		before(setup());
-
-		it("should return only matching items", function (done) {
-			Person.count({ name: "John Doe" }, function (err, count) {
-				should.equal(err, null);
-
-				count.should.equal(2);
-
-				return done();
-			});
-		});
-	});
+  var db = null;
+  var Person = null;
+
+  var setup = function () {
+    return function (done) {
+      Person = db.define("person", {
+        name   : String
+      });
+
+      return helper.dropSync(Person, function () {
+        Person.create([{
+          id  : 1,
+          name: "John Doe"
+        }, {
+          id  : 2,
+          name: "Jane Doe"
+        }, {
+          id  : 3,
+          name: "John Doe"
+        }], done);
+      });
+    };
+  };
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  describe("without callback", function () {
+    before(setup());
+
+    it("should throw", function (done) {
+      Person.count.should.throw();
+
+      return done();
+    });
+  });
+
+  describe("without conditions", function () {
+    before(setup());
+
+    it("should return all items in model", function (done) {
+      Person.count(function (err, count) {
+        should.equal(err, null);
+
+        count.should.equal(3);
+
+        return done();
+      });
+    });
+  });
+
+  describe("with conditions", function () {
+    before(setup());
+
+    it("should return only matching items", function (done) {
+      Person.count({ name: "John Doe" }, function (err, count) {
+        should.equal(err, null);
+
+        count.should.equal(2);
+
+        return done();
+      });
+    });
+  });
 });
diff --git a/test/integration/model-create.js b/test/integration/model-create.js
index 99ca8659..4e2b7c37 100644
--- a/test/integration/model-create.js
+++ b/test/integration/model-create.js
@@ -3,125 +3,125 @@ var helper   = require('../support/spec_helper');
 var ORM      = require('../../');
 
 describe("Model.create()", function() {
-	var db = null;
-	var Pet = null;
-	var Person = null;
-
-	var setup = function () {
-		return function (done) {
-			Person = db.define("person", {
-				name   : String
-			});
-			Pet = db.define("pet", {
-				name   : { type: "text", defaultValue: "Mutt" }
-			});
-			Person.hasMany("pets", Pet);
-
-			return helper.dropSync([ Person, Pet ], done);
-		};
-	};
-
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
-
-			return done();
-		});
-	});
-
-	after(function () {
-		return db.close();
-	});
-
-	describe("if passing an object", function () {
-		before(setup());
-
-		it("should accept it as the only item to create", function (done) {
-			Person.create({
-				name : "John Doe"
-			}, function (err, John) {
-				should.equal(err, null);
-				John.should.have.property("name", "John Doe");
-
-				return done();
-			});
-		});
-	});
-
-	describe("if passing an array", function () {
-		before(setup());
-
-		it("should accept it as a list of items to create", function (done) {
-			Person.create([{
-				name : "John Doe"
-			}, {
-				name : "Jane Doe"
-			}], function (err, people) {
-				should.equal(err, null);
-				should(Array.isArray(people));
-
-				people.should.have.property("length", 2);
-				people[0].should.have.property("name", "John Doe");
-				people[1].should.have.property("name", "Jane Doe");
-
-				return done();
-			});
-		});
-	});
-
-	describe("if element has an association", function () {
-		before(setup());
-
-		it("should also create it or save it", function (done) {
-			Person.create({
-				name : "John Doe",
-				pets : [ new Pet({ name: "Deco" }) ]
-			}, function (err, John) {
-				should.equal(err, null);
-
-				John.should.have.property("name", "John Doe");
-
-				should(Array.isArray(John.pets));
-
-				John.pets[0].should.have.property("name", "Deco");
-				John.pets[0].should.have.property(Pet.id);
-				John.pets[0].saved().should.be.true;
-
-				return done();
-			});
-		});
-
-		it("should also create it or save it even if it's an object and not an instance", function (done) {
-			Person.create({
-				name : "John Doe",
-				pets : [ { name: "Deco" } ]
-			}, function (err, John) {
-				should.equal(err, null);
-
-				John.should.have.property("name", "John Doe");
-
-				should(Array.isArray(John.pets));
-
-				John.pets[0].should.have.property("name", "Deco");
-				John.pets[0].should.have.property(Pet.id);
-				John.pets[0].saved().should.be.true;
-
-				return done();
-			});
-		});
-	});
-
-	describe("when not passing a property", function () {
-		before(setup());
-
-		it("should use defaultValue if defined", function (done) {
-			Pet.create({}, function (err, Mutt) {
-				should.equal(err, null);
-
-				Mutt.should.have.property("name", "Mutt");
-
-				return done();
-			});
-		});
-	});
+  var db = null;
+  var Pet = null;
+  var Person = null;
+
+  var setup = function () {
+    return function (done) {
+      Person = db.define("person", {
+        name   : String
+      });
+      Pet = db.define("pet", {
+        name   : { type: "text", defaultValue: "Mutt" }
+      });
+      Person.hasMany("pets", Pet);
+
+      return helper.dropSync([ Person, Pet ], done);
+    };
+  };
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  describe("if passing an object", function () {
+    before(setup());
+
+    it("should accept it as the only item to create", function (done) {
+      Person.create({
+        name : "John Doe"
+      }, function (err, John) {
+        should.equal(err, null);
+        John.should.have.property("name", "John Doe");
+
+        return done();
+      });
+    });
+  });
+
+  describe("if passing an array", function () {
+    before(setup());
+
+    it("should accept it as a list of items to create", function (done) {
+      Person.create([{
+        name : "John Doe"
+      }, {
+        name : "Jane Doe"
+      }], function (err, people) {
+        should.equal(err, null);
+        should(Array.isArray(people));
+
+        people.should.have.property("length", 2);
+        people[0].should.have.property("name", "John Doe");
+        people[1].should.have.property("name", "Jane Doe");
+
+        return done();
+      });
+    });
+  });
+
+  describe("if element has an association", function () {
+    before(setup());
+
+    it("should also create it or save it", function (done) {
+      Person.create({
+        name : "John Doe",
+        pets : [ new Pet({ name: "Deco" }) ]
+      }, function (err, John) {
+        should.equal(err, null);
+
+        John.should.have.property("name", "John Doe");
+
+        should(Array.isArray(John.pets));
+
+        John.pets[0].should.have.property("name", "Deco");
+        John.pets[0].should.have.property(Pet.id);
+        John.pets[0].saved().should.be.true;
+
+        return done();
+      });
+    });
+
+    it("should also create it or save it even if it's an object and not an instance", function (done) {
+      Person.create({
+        name : "John Doe",
+        pets : [ { name: "Deco" } ]
+      }, function (err, John) {
+        should.equal(err, null);
+
+        John.should.have.property("name", "John Doe");
+
+        should(Array.isArray(John.pets));
+
+        John.pets[0].should.have.property("name", "Deco");
+        John.pets[0].should.have.property(Pet.id);
+        John.pets[0].saved().should.be.true;
+
+        return done();
+      });
+    });
+  });
+
+  describe("when not passing a property", function () {
+    before(setup());
+
+    it("should use defaultValue if defined", function (done) {
+      Pet.create({}, function (err, Mutt) {
+        should.equal(err, null);
+
+        Mutt.should.have.property("name", "Mutt");
+
+        return done();
+      });
+    });
+  });
 });
diff --git a/test/integration/model-exists.js b/test/integration/model-exists.js
index d6bbb164..a7c4c6d0 100644
--- a/test/integration/model-exists.js
+++ b/test/integration/model-exists.js
@@ -3,131 +3,131 @@ var helper   = require('../support/spec_helper');
 var ORM      = require('../../');
 
 describe("Model.exists()", function() {
-	var db     = null;
-	var Person = null;
-	var good_id, bad_id;
-
-	var setup = function () {
-		return function (done) {
-			Person = db.define("person", {
-				name   : String
-			});
-
-			return helper.dropSync(Person, function () {
-				Person.create([{
-					name: "Jeremy Doe"
-				}, {
-					name: "John Doe"
-				}, {
-					name: "Jane Doe"
-				}], function (err, people) {
-					good_id = people[0][Person.id];
-
-					if (typeof good_id == "number") {
-						// numeric ID
-						bad_id = good_id * 100;
-					} else {
-						// string ID, keep same length..
-						bad_id = good_id.split('').reverse().join('');
-					}
+  var db     = null;
+  var Person = null;
+  var good_id, bad_id;
+
+  var setup = function () {
+    return function (done) {
+      Person = db.define("person", {
+        name   : String
+      });
+
+      return helper.dropSync(Person, function () {
+        Person.create([{
+          name: "Jeremy Doe"
+        }, {
+          name: "John Doe"
+        }, {
+          name: "Jane Doe"
+        }], function (err, people) {
+          good_id = people[0][Person.id];
+
+          if (typeof good_id == "number") {
+            // numeric ID
+            bad_id = good_id * 100;
+          } else {
+            // string ID, keep same length..
+            bad_id = good_id.split('').reverse().join('');
+          }
 
-					return done();
-				});
-			});
-		};
-	};
+          return done();
+        });
+      });
+    };
+  };
 
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
 
-			return done();
-		});
-	});
+      return done();
+    });
+  });
 
-	after(function () {
-		return db.close();
-	});
+  after(function () {
+    return db.close();
+  });
 
-	describe("without callback", function () {
-		before(setup());
+  describe("without callback", function () {
+    before(setup());
 
-		it("should throw", function (done) {
-			Person.exists.should.throw();
+    it("should throw", function (done) {
+      Person.exists.should.throw();
 
-			return done();
-		});
-	});
+      return done();
+    });
+  });
 
-	describe("with an id", function () {
-		before(setup());
+  describe("with an id", function () {
+    before(setup());
 
-		it("should return true if found", function (done) {
-			Person.exists(good_id, function (err, exists) {
-				should.equal(err, null);
+    it("should return true if found", function (done) {
+      Person.exists(good_id, function (err, exists) {
+        should.equal(err, null);
 
-				exists.should.be.true;
+        exists.should.be.true;
 
-				return done();
-			});
-		});
+        return done();
+      });
+    });
 
-		it("should return false if not found", function (done) {
-			Person.exists(bad_id, function (err, exists) {
-				should.equal(err, null);
+    it("should return false if not found", function (done) {
+      Person.exists(bad_id, function (err, exists) {
+        should.equal(err, null);
 
-				exists.should.be.false;
+        exists.should.be.false;
 
-				return done();
-			});
-		});
-	});
+        return done();
+      });
+    });
+  });
 
-	describe("with a list of ids", function () {
-		before(setup());
+  describe("with a list of ids", function () {
+    before(setup());
 
-		it("should return true if found", function (done) {
-			Person.exists([ good_id ], function (err, exists) {
-				should.equal(err, null);
+    it("should return true if found", function (done) {
+      Person.exists([ good_id ], function (err, exists) {
+        should.equal(err, null);
 
-				exists.should.be.true;
+        exists.should.be.true;
 
-				return done();
-			});
-		});
+        return done();
+      });
+    });
 
-		it("should return false if not found", function (done) {
-			Person.exists([ bad_id ], function (err, exists) {
-				should.equal(err, null);
+    it("should return false if not found", function (done) {
+      Person.exists([ bad_id ], function (err, exists) {
+        should.equal(err, null);
 
-				exists.should.be.false;
+        exists.should.be.false;
 
-				return done();
-			});
-		});
-	});
+        return done();
+      });
+    });
+  });
 
-	describe("with a conditions object", function () {
-		before(setup());
+  describe("with a conditions object", function () {
+    before(setup());
 
-		it("should return true if found", function (done) {
-			Person.exists({ name: "John Doe" }, function (err, exists) {
-				should.equal(err, null);
+    it("should return true if found", function (done) {
+      Person.exists({ name: "John Doe" }, function (err, exists) {
+        should.equal(err, null);
 
-				exists.should.be.true;
+        exists.should.be.true;
 
-				return done();
-			});
-		});
+        return done();
+      });
+    });
 
-		it("should return false if not found", function (done) {
-			Person.exists({ name: "Jack Doe" }, function (err, exists) {
-				should.equal(err, null);
+    it("should return false if not found", function (done) {
+      Person.exists({ name: "Jack Doe" }, function (err, exists) {
+        should.equal(err, null);
 
-				exists.should.be.false;
+        exists.should.be.false;
 
-				return done();
-			});
-		});
-	});
+        return done();
+      });
+    });
+  });
 });
diff --git a/test/integration/model-find-chain.js b/test/integration/model-find-chain.js
index 54b6f2a4..438d1d3a 100644
--- a/test/integration/model-find-chain.js
+++ b/test/integration/model-find-chain.js
@@ -5,705 +5,705 @@ var ORM      = require('../../');
 var common   = require('../common');
 
 describe("Model.find() chaining", function() {
-	var db = null;
-	var Person = null;
-	var Dog = null;
-
-	var setup = function (extraOpts) {
-		if (!extraOpts) extraOpts = {};
-
-		return function (done) {
-			Person = db.define("person", {
-				name    : String,
-				surname : String,
-				age     : Number
-			}, extraOpts);
-			Person.hasMany("parents");
-			Person.hasOne("friend");
-
-			ORM.singleton.clear(); // clear identityCache cache
-
-			return helper.dropSync(Person, function () {
-				Person.create([{
-					name      : "John",
-					surname   : "Doe",
-					age       : 18,
-					friend_id : 1
-				}, {
-					name      : "Jane",
-					surname   : "Doe",
-					age       : 20,
-					friend_id : 1
-				}, {
-					name      : "Jane",
-					surname   : "Dean",
-					age       : 18,
-					friend_id : 1
-				}], done);
-			});
-		};
-	};
-
-	var setup2 = function () {
-		return function (done) {
-			Dog = db.define("dog", {
-				name: String,
-			});
-			Dog.hasMany("friends");
-			Dog.hasMany("family");
-
-			ORM.singleton.clear(); // clear identityCache cache
-
-			return helper.dropSync(Dog, function () {
-				Dog.create([{
-					name    : "Fido",
-					friends : [{ name: "Gunner" }, { name: "Chainsaw" }],
-					family  : [{ name: "Chester" }]
-				}, {
-					name    : "Thumper",
-					friends : [{ name: "Bambi" }],
-					family  : [{ name: "Princess" }, { name: "Butch" }]
-				}], done);
-			});
-		};
-	};
-
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
-
-			return done();
-		});
-	});
-
-	after(function () {
-		return db.close();
-	});
-
-	describe(".limit(N)", function () {
-		before(setup());
-
-		it("should limit results to N items", function (done) {
-			Person.find().limit(2).run(function (err, instances) {
-				should.equal(err, null);
-				instances.should.have.property("length", 2);
-
-				return done();
-			});
-		});
-	});
-
-	describe(".skip(N)", function () {
-		before(setup());
-
-		it("should skip the first N results", function (done) {
-			Person.find().skip(2).order("age").run(function (err, instances) {
-				should.equal(err, null);
-				instances.should.have.property("length", 1);
-				instances[0].age.should.equal(20);
-
-				return done();
-			});
-		});
-	});
-
-	describe(".offset(N)", function () {
-		before(setup());
-
-		it("should skip the first N results", function (done) {
-			Person.find().offset(2).order("age").run(function (err, instances) {
-				should.equal(err, null);
-				instances.should.have.property("length", 1);
-				instances[0].age.should.equal(20);
-
-				return done();
-			});
-		});
-	});
-
-	describe("order", function () {
-		before(setup());
-
-		it("('property') should order by that property ascending", function (done) {
-			Person.find().order("age").run(function (err, instances) {
-				should.equal(err, null);
-				instances.should.have.property("length", 3);
-				instances[0].age.should.equal(18);
-				instances[2].age.should.equal(20);
-
-				return done();
-			});
-		});
-
-		it("('-property') should order by that property descending", function (done) {
-			Person.find().order("-age").run(function (err, instances) {
-				should.equal(err, null);
-				instances.should.have.property("length", 3);
-				instances[0].age.should.equal(20);
-				instances[2].age.should.equal(18);
-
-				return done();
-			});
-		});
-
-		it("('property', 'Z') should order by that property descending", function (done) {
-			Person.find().order("age", "Z").run(function (err, instances) {
-				should.equal(err, null);
-				instances.should.have.property("length", 3);
-				instances[0].age.should.equal(20);
-				instances[2].age.should.equal(18);
-
-				return done();
-			});
-		});
-	});
-
-	describe("orderRaw", function () {
-		if (common.protocol() == 'mongodb') return;
-
-		before(setup());
-
-		it("should allow ordering by SQL", function (done) {
-			Person.find().orderRaw("age DESC").run(function (err, instances) {
-				should.equal(err, null);
-				instances.should.have.property("length", 3);
-				instances[0].age.should.equal(20);
-				instances[2].age.should.equal(18);
-
-				return done();
-			});
-		});
-
-		it("should allow ordering by SQL with escaping", function (done) {
-			Person.find().orderRaw("?? DESC", ['age']).run(function (err, instances) {
-				should.equal(err, null);
-				instances.should.have.property("length", 3);
-				instances[0].age.should.equal(20);
-				instances[2].age.should.equal(18);
-
-				return done();
-			});
-		});
-	});
-
-	describe("only", function () {
-		before(setup());
-
-		it("('property', ...) should return only those properties, others null", function (done) {
-			Person.find().only("age", "surname").order("-age").run(function (err, instances) {
-				should.equal(err, null);
-				instances.should.have.property("length", 3);
-				instances[0].should.have.property("age");
-				instances[0].should.have.property("surname", "Doe");
-				instances[0].should.have.property("name", null);
-
-				return done();
-			});
-		});
-
-		// This works if cache is disabled. I suspect a cache bug.
-		xit("(['property', ...]) should return only those properties, others null", function (done) {
-			Person.find().only([ "age", "surname" ]).order("-age").run(function (err, instances) {
-				should.equal(err, null);
-				instances.should.have.property("length", 3);
-				instances[0].should.have.property("age");
-				instances[0].should.have.property("surname", "Doe");
-				instances[0].should.have.property("name", null);
-
-				return done();
-			});
-		});
-	});
-
-	describe("omit", function () {
-		before(setup());
-
-		it("('property', ...) should not get these properties", function (done) {
-			Person.find().omit("age", "surname").order("-age").run(function (err, instances) {
-				should.equal(err, null);
-				instances.should.have.property("length", 3);
-				if (common.protocol() != "mongodb") {
-					should.exist(instances[0].id);
-				}
-				should.exist(instances[0].friend_id);
-				instances[0].should.have.property("age", null);
-				instances[0].should.have.property("surname", null);
-				instances[0].should.have.property("name", "Jane");
-
-				return done();
-			});
-		});
-
-		it("(['property', ...]) should not get these properties", function (done) {
-			Person.find().omit(["age", "surname"]).order("-age").run(function (err, instances) {
-				should.equal(err, null);
-				instances.should.have.property("length", 3);
-				instances[0].should.have.property("age", null);
-				instances[0].should.have.property("surname", null);
-				instances[0].should.have.property("name", "Jane");
-
-				return done();
-			});
-		});
-	});
-
-	describe(".count()", function () {
-		before(setup());
-
-		it("should return only the total number of results", function (done) {
-			Person.find().count(function (err, count) {
-				should.equal(err, null);
-				count.should.equal(3);
-
-				return done();
-			});
-		});
-	});
-
-	describe(".first()", function () {
-		before(setup());
-
-		it("should return only the first element", function (done) {
-			Person.find().order("-age").first(function (err, JaneDoe) {
-				should.equal(err, null);
-
-				JaneDoe.name.should.equal("Jane");
-				JaneDoe.surname.should.equal("Doe");
-				JaneDoe.age.should.equal(20);
-
-				return done();
-			});
-		});
-
-		it("should return null if not found", function (done) {
-			Person.find({ name: "Jack" }).first(function (err, Jack) {
-				should.equal(err, null);
-				should.equal(Jack, null);
-
-				return done();
-			});
-		});
-	});
-
-	describe(".last()", function () {
-		before(setup());
-
-		it("should return only the last element", function (done) {
-			Person.find().order("age").last(function (err, JaneDoe) {
-				should.equal(err, null);
-
-				JaneDoe.name.should.equal("Jane");
-				JaneDoe.surname.should.equal("Doe");
-				JaneDoe.age.should.equal(20);
-
-				return done();
-			});
-		});
-
-		it("should return null if not found", function (done) {
-			Person.find({ name: "Jack" }).last(function (err, Jack) {
-				should.equal(err, null);
-				should.equal(Jack, null);
-
-				return done();
-			});
-		});
-	});
-
-	describe(".find()", function () {
-		before(setup());
-
-		it("should not change find if no arguments", function (done) {
-			Person.find().find().count(function (err, count) {
-				should.equal(err, null);
-				count.should.equal(3);
-
-				return done();
-			});
-		});
-
-		it("should restrict conditions if passed", function (done) {
-			Person.find().find({ age: 18 }).count(function (err, count) {
-				should.equal(err, null);
-				count.should.equal(2);
-
-				return done();
-			});
-		});
-
-		it("should restrict conditions if passed and also be chainable", function (done) {
-			Person.find().find({ age: 18 }).find({ name: "Jane" }).count(function (err, count) {
-				should.equal(err, null);
-				count.should.equal(1);
-
-				return done();
-			});
-		});
-
-		it("should return results if passed a callback as second argument", function (done) {
-			Person.find().find({ age: 18 }, function (err, instances) {
-				should.equal(err, null);
-				instances.should.have.property("length", 2);
-
-				return done();
-			});
-		});
-
-		if (common.protocol() == "mongodb") return;
-
-		it("should allow sql where conditions", function (done) {
-			Person.find({ age: 18 }).where("LOWER(surname) LIKE 'dea%'").all(function (err, items) {
-				should.equal(err, null);
-				items.length.should.equal(1);
-
-				return done();
-			});
-		});
-
-		it("should allow sql where conditions with auto escaping", function (done) {
-			Person.find({ age: 18 }).where("LOWER(surname) LIKE ?", ['dea%']).all(function (err, items) {
-				should.equal(err, null);
-				items.length.should.equal(1);
-
-				return done();
-			});
-		});
-
-		it("should append sql where conditions", function (done) {
-			Person.find().where("LOWER(surname) LIKE ?", ['do%']).all(function (err, items) {
-				should.equal(err, null);
-				items.length.should.equal(2);
-
-				Person.find().where("LOWER(name) LIKE ?", ['jane']).all(function (err, items) {
-					should.equal(err, null);
-					items.length.should.equal(2);
-
-					Person.find().where("LOWER(surname) LIKE ?", ['do%']).where("LOWER(name) LIKE ?", ['jane']).all(function (err, items) {
-						should.equal(err, null);
-						items.length.should.equal(1);
-
-						return done();
-					});
-				});
-			});
-		});
-	});
-
-	describe("finders should be chainable & interchangeable including", function () {
-		before(setup());
-
-		before(function (done) {
-			Person.create([
-					{ name: "Mel", surname: "Gabbs", age: 12 },
-					{ name: "Mel", surname: "Gibbs", age: 22 },
-					{ name: "Mel", surname: "Gobbs", age: 32 }
-				], function (err, items) {
-					should.not.exist(err);
-					done()
-				}
-			);
-		});
-
-		['find', 'where', 'all'].forEach(function (func) {
-			it("." + func + "()", function (done) {
-				Person[func]({ name: "Mel" })[func]({ age: ORM.gt(20) })[func](function (err, items) {
-					should.not.exist(err);
-					should.equal(items.length, 2);
-
-					should.equal(items[0].surname, "Gibbs");
-					should.equal(items[1].surname, "Gobbs");
-					done();
-				});
-			});
-		});
-
-		it("a mix", function (done) {
-			Person.all({ name: "Mel" }).where({ age: ORM.gt(20) }).find(function (err, items) {
-				should.not.exist(err);
-				should.equal(items.length, 2);
-
-				should.equal(items[0].surname, "Gibbs");
-				should.equal(items[1].surname, "Gobbs");
-				done();
-			});
-		});
-	});
-
-	describe(".each()", function () {
-		before(setup());
-
-		it("should return a ChainInstance", function (done) {
-			var chain = Person.find().each();
-
-			chain.filter.should.be.a.Function();
-			chain.sort.should.be.a.Function();
-			chain.count.should.be.a.Function();
-
-			return done();
-		});
-	});
-
-	describe(".remove()", function () {
-		var hookFired = false;
-
-		before(setup({
-			hooks: {
-				beforeRemove: function () {
-					hookFired = true;
-				}
-			}
-		}));
-
-		it("should have no problems if no results found", function (done) {
-			Person.find({ age: 22 }).remove(function (err) {
-				should.equal(err, null);
-
-				Person.find().count(function (err, count) {
-					should.equal(err, null);
-
-					count.should.equal(3);
-
-					return done();
-				});
-			});
-		});
-
-		it("should remove results without calling hooks", function (done) {
-			Person.find({ age: 20 }).remove(function (err) {
-				should.equal(err, null);
-				should.equal(hookFired, false);
-
-				Person.find().count(function (err, count) {
-					should.equal(err, null);
-
-					count.should.equal(2);
-
-					return done();
-				});
-			});
-		});
-
-	});
-
-	describe(".each()", function () {
-		var hookFired = false;
-
-		before(setup({
-			hooks: {
-				beforeRemove: function () {
-					hookFired = true;
-				}
-			}
-		}));
-
-		it("should return a ChainFind", function (done) {
-			var chain = Person.find({ age: 22 }).each();
-
-			chain.should.be.a.Object();
-			chain.filter.should.be.a.Function();
-			chain.sort.should.be.a.Function();
-			chain.count.should.be.a.Function();
-			chain.get.should.be.a.Function();
-			chain.save.should.be.a.Function();
-
-			return done();
-		});
-
-		describe(".count()", function () {
-			it("should return the total filtered items", function (done) {
-				Person.find().each().filter(function (person) {
-					return (person.age > 18);
-				}).count(function (count) {
-					count.should.equal(1);
-
-					return done();
-				});
-			});
-		});
-
-		describe(".sort()", function () {
-			it("should return the items sorted using the sorted function", function (done) {
-				Person.find().each().sort(function (first, second) {
-					return (first.age < second.age);
-				}).get(function (people) {
-					should(Array.isArray(people));
-
-					people.length.should.equal(3);
-					people[0].age.should.equal(20);
-					people[2].age.should.equal(18);
-
-					return done();
-				});
-			});
-		});
-
-		describe(".save()", function () {
-			it("should save items after changes", function (done) {
-				Person.find({ surname: "Dean" }).each(function (person) {
-					person.age.should.not.equal(45);
-					person.age = 45;
-				}).save(function () {
-					Person.find({ surname: "Dean" }, function (err, people) {
-						should(Array.isArray(people));
-
-						people.length.should.equal(1);
-						people[0].age.should.equal(45);
-
-						return done();
-					});
-				});
-			});
-		});
-
-		describe("if passing a callback", function () {
-			it("should use it to .forEach()", function (done) {
-				Person.find({ surname: "Dean" }).each(function (person) {
-					person.fullName = person.name + " " + person.surname;
-				}).get(function (people) {
-					should(Array.isArray(people));
-
-					people.length.should.equal(1);
-					people[0].fullName = "Jane Dean";
-
-					return done();
-				});
-			});
-		});
-
-		// TODO: Implement
-		xit(".remove() should call hooks", function () {
-			Person.find().each().remove(function (err) {
-				should.not.exist(err);
-				should.equal(hookFired, true);
-			});
-		});
-
-		if (common.protocol() == "mongodb") return;
-
-		describe(".hasAccessor() for hasOne associations", function () {
-		    it("should be chainable", function (done) {
-				Person.find({ name: "John" }, function (err, John) {
-					should.equal(err, null);
-
-					var Justin = new Person({
-						name : "Justin",
-						age  : 45
-					});
-
-					John[0].setParents([ Justin ], function (err) {
-						should.equal(err, null);
-
-						Person.find().hasParents(Justin).all(function (err, people) {
-						    should.equal(err, null);
-
-							should(Array.isArray(people));
-
-							people.length.should.equal(1);
-							people[0].name.should.equal("John");
-
-							return done();
-						});
-					});
-				});
-			});
-		});
-	});
-
-	describe(".eager()", function () {
-		before(setup2());
-
-		// TODO: Remove this code once the Mongo eager loading is implemented
-		var isMongo = function () {
-			if (db.driver.config.protocol == "mongodb:") {
-				(function () {
-					Dog.find().eager("friends").all(function () {
-						// Should not ever run.
-					});
-				}).should.throw();
-
-				return true;
-			}
-			return false;
-		};
-
-		it("should fetch all listed associations in a single query", function (done) {
-			if (isMongo()) { return done(); };
-
-			Dog.find({ name: ["Fido", "Thumper"] }).eager("friends").all(function (err, dogs) {
-				should.equal(err, null);
-
-				should(Array.isArray(dogs));
-
-				dogs.length.should.equal(2);
-
-				dogs[0].friends.length.should.equal(2);
-				dogs[1].friends.length.should.equal(1);
-				done();
-			});
-		});
-
-		it("should be able to handle multiple associations", function (done) {
-			if (isMongo()) { return done(); };
-
-			Dog.find({ name: ["Fido", "Thumper"] }).eager("friends", "family").all(function (err, dogs) {
-				should.equal(err, null);
-
-				should(Array.isArray(dogs));
-
-				dogs.length.should.equal(2);
-
-				dogs[0].friends.length.should.equal(2);
-				dogs[0].family.length.should.equal(1);
-				dogs[1].friends.length.should.equal(1);
-				dogs[1].family.length.should.equal(2);
-				done();
-			});
-		});
-
-		it("should work with array parameters too", function (done) {
-			if (isMongo()) { return done(); };
-
-			Dog.find({ name: ["Fido", "Thumper"] }).eager(["friends", "family"]).all(function (err, dogs) {
-				should.equal(err, null);
-
-				should(Array.isArray(dogs));
-
-				dogs.length.should.equal(2);
-
-				dogs[0].friends.length.should.equal(2);
-				dogs[0].family.length.should.equal(1);
-				dogs[1].friends.length.should.equal(1);
-				dogs[1].family.length.should.equal(2);
-				done();
-			});
-		});
-	});
-
-	describe(".success()", function () {
-		before(setup());
-
-		it("should return a Promise with .fail() method", function (done) {
-			Person.find().success(function (people) {
-				should(Array.isArray(people));
-
-				return done();
-			}).fail(function (err) {
-				// never called..
-			});
-		});
-	});
+  var db = null;
+  var Person = null;
+  var Dog = null;
+
+  var setup = function (extraOpts) {
+    if (!extraOpts) extraOpts = {};
+
+    return function (done) {
+      Person = db.define("person", {
+        name    : String,
+        surname : String,
+        age     : Number
+      }, extraOpts);
+      Person.hasMany("parents");
+      Person.hasOne("friend");
+
+      ORM.singleton.clear(); // clear identityCache cache
+
+      return helper.dropSync(Person, function () {
+        Person.create([{
+          name      : "John",
+          surname   : "Doe",
+          age       : 18,
+          friend_id : 1
+        }, {
+          name      : "Jane",
+          surname   : "Doe",
+          age       : 20,
+          friend_id : 1
+        }, {
+          name      : "Jane",
+          surname   : "Dean",
+          age       : 18,
+          friend_id : 1
+        }], done);
+      });
+    };
+  };
+
+  var setup2 = function () {
+    return function (done) {
+      Dog = db.define("dog", {
+        name: String,
+      });
+      Dog.hasMany("friends");
+      Dog.hasMany("family");
+
+      ORM.singleton.clear(); // clear identityCache cache
+
+      return helper.dropSync(Dog, function () {
+        Dog.create([{
+          name    : "Fido",
+          friends : [{ name: "Gunner" }, { name: "Chainsaw" }],
+          family  : [{ name: "Chester" }]
+        }, {
+          name    : "Thumper",
+          friends : [{ name: "Bambi" }],
+          family  : [{ name: "Princess" }, { name: "Butch" }]
+        }], done);
+      });
+    };
+  };
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  describe(".limit(N)", function () {
+    before(setup());
+
+    it("should limit results to N items", function (done) {
+      Person.find().limit(2).run(function (err, instances) {
+        should.equal(err, null);
+        instances.should.have.property("length", 2);
+
+        return done();
+      });
+    });
+  });
+
+  describe(".skip(N)", function () {
+    before(setup());
+
+    it("should skip the first N results", function (done) {
+      Person.find().skip(2).order("age").run(function (err, instances) {
+        should.equal(err, null);
+        instances.should.have.property("length", 1);
+        instances[0].age.should.equal(20);
+
+        return done();
+      });
+    });
+  });
+
+  describe(".offset(N)", function () {
+    before(setup());
+
+    it("should skip the first N results", function (done) {
+      Person.find().offset(2).order("age").run(function (err, instances) {
+        should.equal(err, null);
+        instances.should.have.property("length", 1);
+        instances[0].age.should.equal(20);
+
+        return done();
+      });
+    });
+  });
+
+  describe("order", function () {
+    before(setup());
+
+    it("('property') should order by that property ascending", function (done) {
+      Person.find().order("age").run(function (err, instances) {
+        should.equal(err, null);
+        instances.should.have.property("length", 3);
+        instances[0].age.should.equal(18);
+        instances[2].age.should.equal(20);
+
+        return done();
+      });
+    });
+
+    it("('-property') should order by that property descending", function (done) {
+      Person.find().order("-age").run(function (err, instances) {
+        should.equal(err, null);
+        instances.should.have.property("length", 3);
+        instances[0].age.should.equal(20);
+        instances[2].age.should.equal(18);
+
+        return done();
+      });
+    });
+
+    it("('property', 'Z') should order by that property descending", function (done) {
+      Person.find().order("age", "Z").run(function (err, instances) {
+        should.equal(err, null);
+        instances.should.have.property("length", 3);
+        instances[0].age.should.equal(20);
+        instances[2].age.should.equal(18);
+
+        return done();
+      });
+    });
+  });
+
+  describe("orderRaw", function () {
+    if (common.protocol() == 'mongodb') return;
+
+    before(setup());
+
+    it("should allow ordering by SQL", function (done) {
+      Person.find().orderRaw("age DESC").run(function (err, instances) {
+        should.equal(err, null);
+        instances.should.have.property("length", 3);
+        instances[0].age.should.equal(20);
+        instances[2].age.should.equal(18);
+
+        return done();
+      });
+    });
+
+    it("should allow ordering by SQL with escaping", function (done) {
+      Person.find().orderRaw("?? DESC", ['age']).run(function (err, instances) {
+        should.equal(err, null);
+        instances.should.have.property("length", 3);
+        instances[0].age.should.equal(20);
+        instances[2].age.should.equal(18);
+
+        return done();
+      });
+    });
+  });
+
+  describe("only", function () {
+    before(setup());
+
+    it("('property', ...) should return only those properties, others null", function (done) {
+      Person.find().only("age", "surname").order("-age").run(function (err, instances) {
+        should.equal(err, null);
+        instances.should.have.property("length", 3);
+        instances[0].should.have.property("age");
+        instances[0].should.have.property("surname", "Doe");
+        instances[0].should.have.property("name", null);
+
+        return done();
+      });
+    });
+
+    // This works if cache is disabled. I suspect a cache bug.
+    xit("(['property', ...]) should return only those properties, others null", function (done) {
+      Person.find().only([ "age", "surname" ]).order("-age").run(function (err, instances) {
+        should.equal(err, null);
+        instances.should.have.property("length", 3);
+        instances[0].should.have.property("age");
+        instances[0].should.have.property("surname", "Doe");
+        instances[0].should.have.property("name", null);
+
+        return done();
+      });
+    });
+  });
+
+  describe("omit", function () {
+    before(setup());
+
+    it("('property', ...) should not get these properties", function (done) {
+      Person.find().omit("age", "surname").order("-age").run(function (err, instances) {
+        should.equal(err, null);
+        instances.should.have.property("length", 3);
+        if (common.protocol() != "mongodb") {
+          should.exist(instances[0].id);
+        }
+        should.exist(instances[0].friend_id);
+        instances[0].should.have.property("age", null);
+        instances[0].should.have.property("surname", null);
+        instances[0].should.have.property("name", "Jane");
+
+        return done();
+      });
+    });
+
+    it("(['property', ...]) should not get these properties", function (done) {
+      Person.find().omit(["age", "surname"]).order("-age").run(function (err, instances) {
+        should.equal(err, null);
+        instances.should.have.property("length", 3);
+        instances[0].should.have.property("age", null);
+        instances[0].should.have.property("surname", null);
+        instances[0].should.have.property("name", "Jane");
+
+        return done();
+      });
+    });
+  });
+
+  describe(".count()", function () {
+    before(setup());
+
+    it("should return only the total number of results", function (done) {
+      Person.find().count(function (err, count) {
+        should.equal(err, null);
+        count.should.equal(3);
+
+        return done();
+      });
+    });
+  });
+
+  describe(".first()", function () {
+    before(setup());
+
+    it("should return only the first element", function (done) {
+      Person.find().order("-age").first(function (err, JaneDoe) {
+        should.equal(err, null);
+
+        JaneDoe.name.should.equal("Jane");
+        JaneDoe.surname.should.equal("Doe");
+        JaneDoe.age.should.equal(20);
+
+        return done();
+      });
+    });
+
+    it("should return null if not found", function (done) {
+      Person.find({ name: "Jack" }).first(function (err, Jack) {
+        should.equal(err, null);
+        should.equal(Jack, null);
+
+        return done();
+      });
+    });
+  });
+
+  describe(".last()", function () {
+    before(setup());
+
+    it("should return only the last element", function (done) {
+      Person.find().order("age").last(function (err, JaneDoe) {
+        should.equal(err, null);
+
+        JaneDoe.name.should.equal("Jane");
+        JaneDoe.surname.should.equal("Doe");
+        JaneDoe.age.should.equal(20);
+
+        return done();
+      });
+    });
+
+    it("should return null if not found", function (done) {
+      Person.find({ name: "Jack" }).last(function (err, Jack) {
+        should.equal(err, null);
+        should.equal(Jack, null);
+
+        return done();
+      });
+    });
+  });
+
+  describe(".find()", function () {
+    before(setup());
+
+    it("should not change find if no arguments", function (done) {
+      Person.find().find().count(function (err, count) {
+        should.equal(err, null);
+        count.should.equal(3);
+
+        return done();
+      });
+    });
+
+    it("should restrict conditions if passed", function (done) {
+      Person.find().find({ age: 18 }).count(function (err, count) {
+        should.equal(err, null);
+        count.should.equal(2);
+
+        return done();
+      });
+    });
+
+    it("should restrict conditions if passed and also be chainable", function (done) {
+      Person.find().find({ age: 18 }).find({ name: "Jane" }).count(function (err, count) {
+        should.equal(err, null);
+        count.should.equal(1);
+
+        return done();
+      });
+    });
+
+    it("should return results if passed a callback as second argument", function (done) {
+      Person.find().find({ age: 18 }, function (err, instances) {
+        should.equal(err, null);
+        instances.should.have.property("length", 2);
+
+        return done();
+      });
+    });
+
+    if (common.protocol() == "mongodb") return;
+
+    it("should allow sql where conditions", function (done) {
+      Person.find({ age: 18 }).where("LOWER(surname) LIKE 'dea%'").all(function (err, items) {
+        should.equal(err, null);
+        items.length.should.equal(1);
+
+        return done();
+      });
+    });
+
+    it("should allow sql where conditions with auto escaping", function (done) {
+      Person.find({ age: 18 }).where("LOWER(surname) LIKE ?", ['dea%']).all(function (err, items) {
+        should.equal(err, null);
+        items.length.should.equal(1);
+
+        return done();
+      });
+    });
+
+    it("should append sql where conditions", function (done) {
+      Person.find().where("LOWER(surname) LIKE ?", ['do%']).all(function (err, items) {
+        should.equal(err, null);
+        items.length.should.equal(2);
+
+        Person.find().where("LOWER(name) LIKE ?", ['jane']).all(function (err, items) {
+          should.equal(err, null);
+          items.length.should.equal(2);
+
+          Person.find().where("LOWER(surname) LIKE ?", ['do%']).where("LOWER(name) LIKE ?", ['jane']).all(function (err, items) {
+            should.equal(err, null);
+            items.length.should.equal(1);
+
+            return done();
+          });
+        });
+      });
+    });
+  });
+
+  describe("finders should be chainable & interchangeable including", function () {
+    before(setup());
+
+    before(function (done) {
+      Person.create([
+          { name: "Mel", surname: "Gabbs", age: 12 },
+          { name: "Mel", surname: "Gibbs", age: 22 },
+          { name: "Mel", surname: "Gobbs", age: 32 }
+        ], function (err, items) {
+          should.not.exist(err);
+          done()
+        }
+      );
+    });
+
+    ['find', 'where', 'all'].forEach(function (func) {
+      it("." + func + "()", function (done) {
+        Person[func]({ name: "Mel" })[func]({ age: ORM.gt(20) })[func](function (err, items) {
+          should.not.exist(err);
+          should.equal(items.length, 2);
+
+          should.equal(items[0].surname, "Gibbs");
+          should.equal(items[1].surname, "Gobbs");
+          done();
+        });
+      });
+    });
+
+    it("a mix", function (done) {
+      Person.all({ name: "Mel" }).where({ age: ORM.gt(20) }).find(function (err, items) {
+        should.not.exist(err);
+        should.equal(items.length, 2);
+
+        should.equal(items[0].surname, "Gibbs");
+        should.equal(items[1].surname, "Gobbs");
+        done();
+      });
+    });
+  });
+
+  describe(".each()", function () {
+    before(setup());
+
+    it("should return a ChainInstance", function (done) {
+      var chain = Person.find().each();
+
+      chain.filter.should.be.a.Function();
+      chain.sort.should.be.a.Function();
+      chain.count.should.be.a.Function();
+
+      return done();
+    });
+  });
+
+  describe(".remove()", function () {
+    var hookFired = false;
+
+    before(setup({
+      hooks: {
+        beforeRemove: function () {
+          hookFired = true;
+        }
+      }
+    }));
+
+    it("should have no problems if no results found", function (done) {
+      Person.find({ age: 22 }).remove(function (err) {
+        should.equal(err, null);
+
+        Person.find().count(function (err, count) {
+          should.equal(err, null);
+
+          count.should.equal(3);
+
+          return done();
+        });
+      });
+    });
+
+    it("should remove results without calling hooks", function (done) {
+      Person.find({ age: 20 }).remove(function (err) {
+        should.equal(err, null);
+        should.equal(hookFired, false);
+
+        Person.find().count(function (err, count) {
+          should.equal(err, null);
+
+          count.should.equal(2);
+
+          return done();
+        });
+      });
+    });
+
+  });
+
+  describe(".each()", function () {
+    var hookFired = false;
+
+    before(setup({
+      hooks: {
+        beforeRemove: function () {
+          hookFired = true;
+        }
+      }
+    }));
+
+    it("should return a ChainFind", function (done) {
+      var chain = Person.find({ age: 22 }).each();
+
+      chain.should.be.a.Object();
+      chain.filter.should.be.a.Function();
+      chain.sort.should.be.a.Function();
+      chain.count.should.be.a.Function();
+      chain.get.should.be.a.Function();
+      chain.save.should.be.a.Function();
+
+      return done();
+    });
+
+    describe(".count()", function () {
+      it("should return the total filtered items", function (done) {
+        Person.find().each().filter(function (person) {
+          return (person.age > 18);
+        }).count(function (count) {
+          count.should.equal(1);
+
+          return done();
+        });
+      });
+    });
+
+    describe(".sort()", function () {
+      it("should return the items sorted using the sorted function", function (done) {
+        Person.find().each().sort(function (first, second) {
+          return (first.age < second.age);
+        }).get(function (people) {
+          should(Array.isArray(people));
+
+          people.length.should.equal(3);
+          people[0].age.should.equal(20);
+          people[2].age.should.equal(18);
+
+          return done();
+        });
+      });
+    });
+
+    describe(".save()", function () {
+      it("should save items after changes", function (done) {
+        Person.find({ surname: "Dean" }).each(function (person) {
+          person.age.should.not.equal(45);
+          person.age = 45;
+        }).save(function () {
+          Person.find({ surname: "Dean" }, function (err, people) {
+            should(Array.isArray(people));
+
+            people.length.should.equal(1);
+            people[0].age.should.equal(45);
+
+            return done();
+          });
+        });
+      });
+    });
+
+    describe("if passing a callback", function () {
+      it("should use it to .forEach()", function (done) {
+        Person.find({ surname: "Dean" }).each(function (person) {
+          person.fullName = person.name + " " + person.surname;
+        }).get(function (people) {
+          should(Array.isArray(people));
+
+          people.length.should.equal(1);
+          people[0].fullName = "Jane Dean";
+
+          return done();
+        });
+      });
+    });
+
+    // TODO: Implement
+    xit(".remove() should call hooks", function () {
+      Person.find().each().remove(function (err) {
+        should.not.exist(err);
+        should.equal(hookFired, true);
+      });
+    });
+
+    if (common.protocol() == "mongodb") return;
+
+    describe(".hasAccessor() for hasOne associations", function () {
+        it("should be chainable", function (done) {
+        Person.find({ name: "John" }, function (err, John) {
+          should.equal(err, null);
+
+          var Justin = new Person({
+            name : "Justin",
+            age  : 45
+          });
+
+          John[0].setParents([ Justin ], function (err) {
+            should.equal(err, null);
+
+            Person.find().hasParents(Justin).all(function (err, people) {
+                should.equal(err, null);
+
+              should(Array.isArray(people));
+
+              people.length.should.equal(1);
+              people[0].name.should.equal("John");
+
+              return done();
+            });
+          });
+        });
+      });
+    });
+  });
+
+  describe(".eager()", function () {
+    before(setup2());
+
+    // TODO: Remove this code once the Mongo eager loading is implemented
+    var isMongo = function () {
+      if (db.driver.config.protocol == "mongodb:") {
+        (function () {
+          Dog.find().eager("friends").all(function () {
+            // Should not ever run.
+          });
+        }).should.throw();
+
+        return true;
+      }
+      return false;
+    };
+
+    it("should fetch all listed associations in a single query", function (done) {
+      if (isMongo()) { return done(); };
+
+      Dog.find({ name: ["Fido", "Thumper"] }).eager("friends").all(function (err, dogs) {
+        should.equal(err, null);
+
+        should(Array.isArray(dogs));
+
+        dogs.length.should.equal(2);
+
+        dogs[0].friends.length.should.equal(2);
+        dogs[1].friends.length.should.equal(1);
+        done();
+      });
+    });
+
+    it("should be able to handle multiple associations", function (done) {
+      if (isMongo()) { return done(); };
+
+      Dog.find({ name: ["Fido", "Thumper"] }).eager("friends", "family").all(function (err, dogs) {
+        should.equal(err, null);
+
+        should(Array.isArray(dogs));
+
+        dogs.length.should.equal(2);
+
+        dogs[0].friends.length.should.equal(2);
+        dogs[0].family.length.should.equal(1);
+        dogs[1].friends.length.should.equal(1);
+        dogs[1].family.length.should.equal(2);
+        done();
+      });
+    });
+
+    it("should work with array parameters too", function (done) {
+      if (isMongo()) { return done(); };
+
+      Dog.find({ name: ["Fido", "Thumper"] }).eager(["friends", "family"]).all(function (err, dogs) {
+        should.equal(err, null);
+
+        should(Array.isArray(dogs));
+
+        dogs.length.should.equal(2);
+
+        dogs[0].friends.length.should.equal(2);
+        dogs[0].family.length.should.equal(1);
+        dogs[1].friends.length.should.equal(1);
+        dogs[1].family.length.should.equal(2);
+        done();
+      });
+    });
+  });
+
+  describe(".success()", function () {
+    before(setup());
+
+    it("should return a Promise with .fail() method", function (done) {
+      Person.find().success(function (people) {
+        should(Array.isArray(people));
+
+        return done();
+      }).fail(function (err) {
+        // never called..
+      });
+    });
+  });
 
-	describe(".fail()", function () {
-		before(setup());
+  describe(".fail()", function () {
+    before(setup());
 
-		it("should return a Promise with .success() method", function (done) {
-			Person.find().fail(function (err) {
-				// never called..
-			}).success(function (people) {
-				should(Array.isArray(people));
-
-				return done();
-			});
-		});
-	});
+    it("should return a Promise with .success() method", function (done) {
+      Person.find().fail(function (err) {
+        // never called..
+      }).success(function (people) {
+        should(Array.isArray(people));
+
+        return done();
+      });
+    });
+  });
 });
diff --git a/test/integration/model-find-mapsto.js b/test/integration/model-find-mapsto.js
index e87a25c1..1986d690 100644
--- a/test/integration/model-find-mapsto.js
+++ b/test/integration/model-find-mapsto.js
@@ -3,96 +3,96 @@ var helper   = require('../support/spec_helper');
 var ORM      = require('../../');
 
 describe("Model.pkMapTo.find()", function() {
-	var db = null;
-	var Person = null;
+  var db = null;
+  var Person = null;
 
-	var setup = function () {
-		return function (done) {
+  var setup = function () {
+    return function (done) {
 
-			// The fact that we've applied mapsTo to the key
-			// property of the model - will break the cache.
+      // The fact that we've applied mapsTo to the key
+      // property of the model - will break the cache.
 
-			// Without Stuart's little bugfix, 2nd (and subsequent) calls to find()
-			// will return the repeats of the first obect retrieved and placed in the cache.
-			Person = db.define("person", {
-				personId : {type : "integer", key: true,   mapsTo: "id"},
-				name     : String,
-				surname  : String,
-				age      : Number,
-				male     : Boolean
-			});
+      // Without Stuart's little bugfix, 2nd (and subsequent) calls to find()
+      // will return the repeats of the first obect retrieved and placed in the cache.
+      Person = db.define("person", {
+        personId : {type : "integer", key: true,   mapsTo: "id"},
+        name     : String,
+        surname  : String,
+        age      : Number,
+        male     : Boolean
+      });
 
-			return helper.dropSync(Person, function () {
-				Person.create([{
-					personId: 1001,
-					name    : "John",
-					surname : "Doe",
-					age     : 18,
-					male    : true
-				}, {
-					personId: 1002,
-					name    : "Jane",
-					surname : "Doe",
-					age     : 16,
-					male    : false
-				}, {
-					personId: 1003,
-					name    : "Jeremy",
-					surname : "Dean",
-					age     : 18,
-					male    : true
-				}, {
-					personId: 1004,
-					name    : "Jack",
-					surname : "Dean",
-					age     : 20,
-					male    : true
-				}, {
-					personId: 1005,
-					name    : "Jasmine",
-					surname : "Doe",
-					age     : 20,
-					male    : false
-				}], done);
-			});
-		};
-	};
+      return helper.dropSync(Person, function () {
+        Person.create([{
+          personId: 1001,
+          name    : "John",
+          surname : "Doe",
+          age     : 18,
+          male    : true
+        }, {
+          personId: 1002,
+          name    : "Jane",
+          surname : "Doe",
+          age     : 16,
+          male    : false
+        }, {
+          personId: 1003,
+          name    : "Jeremy",
+          surname : "Dean",
+          age     : 18,
+          male    : true
+        }, {
+          personId: 1004,
+          name    : "Jack",
+          surname : "Dean",
+          age     : 20,
+          male    : true
+        }, {
+          personId: 1005,
+          name    : "Jasmine",
+          surname : "Doe",
+          age     : 20,
+          male    : false
+        }], done);
+      });
+    };
+  };
 
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
 
-			return done();
-		});
-	});
+      return done();
+    });
+  });
 
-	after(function () {
-		return db.close();
-	});
+  after(function () {
+    return db.close();
+  });
 
 
-	describe("Cache should work with mapped key field", function () {
-		before(setup());
+  describe("Cache should work with mapped key field", function () {
+    before(setup());
 
-		it("1st find should work", function (done) {
-			Person.find({ surname: "Dean" }, function (err, people) {
-				should.not.exist(err);
-				people.should.be.a.Object();
-				people.should.have.property("length", 2);
-				people[0].surname.should.equal("Dean");
+    it("1st find should work", function (done) {
+      Person.find({ surname: "Dean" }, function (err, people) {
+        should.not.exist(err);
+        people.should.be.a.Object();
+        people.should.have.property("length", 2);
+        people[0].surname.should.equal("Dean");
 
-				return done();
-			});
-		});
-		it("2nd find should should also work", function (done) {
-			Person.find({ surname: "Doe" }, function (err, people) {
-				should.not.exist(err);
-				people.should.be.a.Object();
-				people.should.have.property("length", 3);
-				people[0].surname.should.equal("Doe");
+        return done();
+      });
+    });
+    it("2nd find should should also work", function (done) {
+      Person.find({ surname: "Doe" }, function (err, people) {
+        should.not.exist(err);
+        people.should.be.a.Object();
+        people.should.have.property("length", 3);
+        people[0].surname.should.equal("Doe");
 
-				return done();
-			});
-		});
-	});
+        return done();
+      });
+    });
+  });
 });
diff --git a/test/integration/model-find.js b/test/integration/model-find.js
index e283b5cf..00f6fd8c 100644
--- a/test/integration/model-find.js
+++ b/test/integration/model-find.js
@@ -3,351 +3,351 @@ var helper   = require('../support/spec_helper');
 var ORM      = require('../../');
 
 describe("Model.find()", function() {
-	var db = null;
-	var Person = null;
-
-	var setup = function () {
-		return function (done) {
-			Person = db.define("person", {
-				name    : String,
-				surname : String,
-				age     : Number,
-				male    : Boolean
-			});
-
-			return helper.dropSync(Person, function () {
-				Person.create([{
-					name    : "John",
-					surname : "Doe",
-					age     : 18,
-					male    : true
-				}, {
-					name    : "Jane",
-					surname : "Doe",
-					age     : 16,
-					male    : false
-				}, {
-					name    : "Jeremy",
-					surname : "Dean",
-					age     : 18,
-					male    : true
-				}, {
-					name    : "Jack",
-					surname : "Dean",
-					age     : 20,
-					male    : true
-				}, {
-					name    : "Jasmine",
-					surname : "Doe",
-					age     : 20,
-					male    : false
-				}], done);
-			});
-		};
-	};
-
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
-
-			return done();
-		});
-	});
-
-	after(function () {
-		return db.close();
-	});
-
-	describe("without arguments", function () {
-		before(setup());
-
-		it("should return all items", function (done) {
-			Person.find(function (err, people) {
-				should.not.exist(err);
-				people.should.be.a.Object();
-				people.should.have.property("length", 5);
-
-				return done();
-			});
-		});
-	});
-
-	describe("with a number as argument", function () {
-		before(setup());
-
-		it("should use it as limit", function (done) {
-			Person.find(2, function (err, people) {
-				should.not.exist(err);
-				people.should.be.a.Object();
-				people.should.have.property("length", 2);
-
-				return done();
-			});
-		});
-	});
-
-	describe("with a string argument", function () {
-		before(setup());
-
-		it("should use it as property ascending order", function (done) {
-			Person.find("age", function (err, people) {
-				should.not.exist(err);
-				people.should.be.a.Object();
-				people.should.have.property("length", 5);
-				people[0].age.should.equal(16);
-				people[4].age.should.equal(20);
-
-				return done();
-			});
-		});
-
-		it("should use it as property descending order if starting with '-'", function (done) {
-			Person.find("-age", function (err, people) {
-				should.not.exist(err);
-				people.should.be.a.Object();
-				people.should.have.property("length", 5);
-				people[0].age.should.equal(20);
-				people[4].age.should.equal(16);
-
-				return done();
-			});
-		});
-	});
-
-	describe("with an Array as argument", function () {
-		before(setup());
-
-		it("should use it as property ascending order", function (done) {
-			Person.find([ "age" ], function (err, people) {
-				should.not.exist(err);
-				people.should.be.a.Object();
-				people.should.have.property("length", 5);
-				people[0].age.should.equal(16);
-				people[4].age.should.equal(20);
-
-				return done();
-			});
-		});
-
-		it("should use it as property descending order if starting with '-'", function (done) {
-			Person.find([ "-age" ], function (err, people) {
-				should.not.exist(err);
-				people.should.be.a.Object();
-				people.should.have.property("length", 5);
-				people[0].age.should.equal(20);
-				people[4].age.should.equal(16);
-
-				return done();
-			});
-		});
-
-		it("should use it as property descending order if element is 'Z'", function (done) {
-			Person.find([ "age", "Z" ], function (err, people) {
-				should.not.exist(err);
-				people.should.be.a.Object();
-				people.should.have.property("length", 5);
-				people[0].age.should.equal(20);
-				people[4].age.should.equal(16);
-
-				return done();
-			});
-		});
-
-		it("should accept multiple ordering", function (done) {
-			Person.find([ "age", "name", "Z" ], function (err, people) {
-				should.not.exist(err);
-				people.should.be.a.Object();
-				people.should.have.property("length", 5);
-				people[0].age.should.equal(16);
-				people[4].age.should.equal(20);
-
-				return done();
-			});
-		});
-
-		it("should accept multiple ordering using '-' instead of 'Z'", function (done) {
-			Person.find([ "age", "-name" ], function (err, people) {
-				should.not.exist(err);
-				people.should.be.a.Object();
-				people.should.have.property("length", 5);
-				people[0].age.should.equal(16);
-				people[4].age.should.equal(20);
-
-				return done();
-			});
-		});
-	});
-
-	describe("with an Object as argument", function () {
-		before(setup());
-
-		it("should use it as conditions", function (done) {
-			Person.find({ age: 16 }, function (err, people) {
-				should.not.exist(err);
-				people.should.be.a.Object();
-				people.should.have.property("length", 1);
-				people[0].age.should.equal(16);
-
-				return done();
-			});
-		});
-
-		it("should accept comparison objects", function (done) {
-			Person.find({ age: ORM.gt(18) }, function (err, people) {
-				should.not.exist(err);
-				people.should.be.a.Object();
-				people.should.have.property("length", 2);
-				people[0].age.should.equal(20);
-				people[1].age.should.equal(20);
-
-				return done();
-			});
-		});
-
-		describe("with another Object as argument", function () {
-			before(setup());
-
-			it("should use it as options", function (done) {
-				Person.find({ age: 18 }, 1, { cache: false }, function (err, people) {
-					should.not.exist(err);
-					people.should.be.a.Object();
-					people.should.have.property("length", 1);
-					people[0].age.should.equal(18);
-
-					return done();
-				});
-			});
-
-			describe("if a limit is passed", function () {
-				before(setup());
-
-				it("should use it", function (done) {
-					Person.find({ age: 18 }, { limit: 1 }, function (err, people) {
-						should.not.exist(err);
-						people.should.be.a.Object();
-						people.should.have.property("length", 1);
-						people[0].age.should.equal(18);
-
-						return done();
-					});
-				});
-			});
-
-			describe("if an offset is passed", function () {
-				before(setup());
-
-				it("should use it", function (done) {
-					Person.find({}, { offset: 1 }, "age", function (err, people) {
-						should.not.exist(err);
-						people.should.be.a.Object();
-						people.should.have.property("length", 4);
-						people[0].age.should.equal(18);
-
-						return done();
-					});
-				});
-			});
-
-			describe("if an order is passed", function () {
-				before(setup());
-
-				it("should use it", function (done) {
-					Person.find({ surname: "Doe" }, { order: "age" }, function (err, people) {
-						should.not.exist(err);
-						people.should.be.a.Object();
-						people.should.have.property("length", 3);
-						people[0].age.should.equal(16);
-
-						return done();
-					});
-				});
-
-				it("should use it and ignore previously defined order", function (done) {
-					Person.find({ surname: "Doe" }, "-age", { order: "age" }, function (err, people) {
-						should.not.exist(err);
-						people.should.be.a.Object();
-						people.should.have.property("length", 3);
-						people[0].age.should.equal(16);
-
-						return done();
-					});
-				});
-			});
-		});
-	});
-
-	describe("if defined static methods", function () {
-		before(setup());
-
-		it("should be rechainable", function (done) {
-			Person.over18 = function () {
-				return this.find({ age: ORM.gt(18) });
-			};
-			Person.family = function (family) {
-				return this.find({ surname: family });
-			};
-
-			Person.over18().family("Doe").run(function (err, people) {
-				should.not.exist(err);
-				people.should.be.a.Object();
-				people.should.have.property("length", 1);
-				people[0].name.should.equal("Jasmine");
-				people[0].surname.should.equal("Doe");
-
-				return done();
-			});
-		});
-	});
-
-	describe("with identityCache disabled", function () {
-		it("should not return singletons", function (done) {
-			Person.find({ name: "Jasmine" }, { identityCache: false }, function (err, people) {
-				should.not.exist(err);
-				people.should.be.a.Object();
-				people.should.have.property("length", 1);
-				people[0].name.should.equal("Jasmine");
-				people[0].surname.should.equal("Doe");
-
-				people[0].surname = "Dux";
-
-				Person.find({ name: "Jasmine" }, { identityCache: false }, function (err, people) {
-					should.not.exist(err);
-					people.should.be.a.Object();
-					people.should.have.property("length", 1);
-					people[0].name.should.equal("Jasmine");
-					people[0].surname.should.equal("Doe");
-
-					return done();
-				});
-			});
-		});
-	});
-
-	describe("when using Model.all()", function () {
-		it("should work exactly the same", function (done) {
-			Person.all({ surname: "Doe" }, "-age", 1, function (err, people) {
-				should.not.exist(err);
-				people.should.be.a.Object();
-				people.should.have.property("length", 1);
-				people[0].name.should.equal("Jasmine");
-				people[0].surname.should.equal("Doe");
-
-				return done();
-			});
-		});
-	});
-
-	describe("when using Model.where()", function () {
-		it("should work exactly the same", function (done) {
-			Person.where({ surname: "Doe" }, "-age", 1, function (err, people) {
-				should.not.exist(err);
-				people.should.be.a.Object();
-				people.should.have.property("length", 1);
-				people[0].name.should.equal("Jasmine");
-				people[0].surname.should.equal("Doe");
-
-				return done();
-			});
-		});
-	});
+  var db = null;
+  var Person = null;
+
+  var setup = function () {
+    return function (done) {
+      Person = db.define("person", {
+        name    : String,
+        surname : String,
+        age     : Number,
+        male    : Boolean
+      });
+
+      return helper.dropSync(Person, function () {
+        Person.create([{
+          name    : "John",
+          surname : "Doe",
+          age     : 18,
+          male    : true
+        }, {
+          name    : "Jane",
+          surname : "Doe",
+          age     : 16,
+          male    : false
+        }, {
+          name    : "Jeremy",
+          surname : "Dean",
+          age     : 18,
+          male    : true
+        }, {
+          name    : "Jack",
+          surname : "Dean",
+          age     : 20,
+          male    : true
+        }, {
+          name    : "Jasmine",
+          surname : "Doe",
+          age     : 20,
+          male    : false
+        }], done);
+      });
+    };
+  };
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  describe("without arguments", function () {
+    before(setup());
+
+    it("should return all items", function (done) {
+      Person.find(function (err, people) {
+        should.not.exist(err);
+        people.should.be.a.Object();
+        people.should.have.property("length", 5);
+
+        return done();
+      });
+    });
+  });
+
+  describe("with a number as argument", function () {
+    before(setup());
+
+    it("should use it as limit", function (done) {
+      Person.find(2, function (err, people) {
+        should.not.exist(err);
+        people.should.be.a.Object();
+        people.should.have.property("length", 2);
+
+        return done();
+      });
+    });
+  });
+
+  describe("with a string argument", function () {
+    before(setup());
+
+    it("should use it as property ascending order", function (done) {
+      Person.find("age", function (err, people) {
+        should.not.exist(err);
+        people.should.be.a.Object();
+        people.should.have.property("length", 5);
+        people[0].age.should.equal(16);
+        people[4].age.should.equal(20);
+
+        return done();
+      });
+    });
+
+    it("should use it as property descending order if starting with '-'", function (done) {
+      Person.find("-age", function (err, people) {
+        should.not.exist(err);
+        people.should.be.a.Object();
+        people.should.have.property("length", 5);
+        people[0].age.should.equal(20);
+        people[4].age.should.equal(16);
+
+        return done();
+      });
+    });
+  });
+
+  describe("with an Array as argument", function () {
+    before(setup());
+
+    it("should use it as property ascending order", function (done) {
+      Person.find([ "age" ], function (err, people) {
+        should.not.exist(err);
+        people.should.be.a.Object();
+        people.should.have.property("length", 5);
+        people[0].age.should.equal(16);
+        people[4].age.should.equal(20);
+
+        return done();
+      });
+    });
+
+    it("should use it as property descending order if starting with '-'", function (done) {
+      Person.find([ "-age" ], function (err, people) {
+        should.not.exist(err);
+        people.should.be.a.Object();
+        people.should.have.property("length", 5);
+        people[0].age.should.equal(20);
+        people[4].age.should.equal(16);
+
+        return done();
+      });
+    });
+
+    it("should use it as property descending order if element is 'Z'", function (done) {
+      Person.find([ "age", "Z" ], function (err, people) {
+        should.not.exist(err);
+        people.should.be.a.Object();
+        people.should.have.property("length", 5);
+        people[0].age.should.equal(20);
+        people[4].age.should.equal(16);
+
+        return done();
+      });
+    });
+
+    it("should accept multiple ordering", function (done) {
+      Person.find([ "age", "name", "Z" ], function (err, people) {
+        should.not.exist(err);
+        people.should.be.a.Object();
+        people.should.have.property("length", 5);
+        people[0].age.should.equal(16);
+        people[4].age.should.equal(20);
+
+        return done();
+      });
+    });
+
+    it("should accept multiple ordering using '-' instead of 'Z'", function (done) {
+      Person.find([ "age", "-name" ], function (err, people) {
+        should.not.exist(err);
+        people.should.be.a.Object();
+        people.should.have.property("length", 5);
+        people[0].age.should.equal(16);
+        people[4].age.should.equal(20);
+
+        return done();
+      });
+    });
+  });
+
+  describe("with an Object as argument", function () {
+    before(setup());
+
+    it("should use it as conditions", function (done) {
+      Person.find({ age: 16 }, function (err, people) {
+        should.not.exist(err);
+        people.should.be.a.Object();
+        people.should.have.property("length", 1);
+        people[0].age.should.equal(16);
+
+        return done();
+      });
+    });
+
+    it("should accept comparison objects", function (done) {
+      Person.find({ age: ORM.gt(18) }, function (err, people) {
+        should.not.exist(err);
+        people.should.be.a.Object();
+        people.should.have.property("length", 2);
+        people[0].age.should.equal(20);
+        people[1].age.should.equal(20);
+
+        return done();
+      });
+    });
+
+    describe("with another Object as argument", function () {
+      before(setup());
+
+      it("should use it as options", function (done) {
+        Person.find({ age: 18 }, 1, { cache: false }, function (err, people) {
+          should.not.exist(err);
+          people.should.be.a.Object();
+          people.should.have.property("length", 1);
+          people[0].age.should.equal(18);
+
+          return done();
+        });
+      });
+
+      describe("if a limit is passed", function () {
+        before(setup());
+
+        it("should use it", function (done) {
+          Person.find({ age: 18 }, { limit: 1 }, function (err, people) {
+            should.not.exist(err);
+            people.should.be.a.Object();
+            people.should.have.property("length", 1);
+            people[0].age.should.equal(18);
+
+            return done();
+          });
+        });
+      });
+
+      describe("if an offset is passed", function () {
+        before(setup());
+
+        it("should use it", function (done) {
+          Person.find({}, { offset: 1 }, "age", function (err, people) {
+            should.not.exist(err);
+            people.should.be.a.Object();
+            people.should.have.property("length", 4);
+            people[0].age.should.equal(18);
+
+            return done();
+          });
+        });
+      });
+
+      describe("if an order is passed", function () {
+        before(setup());
+
+        it("should use it", function (done) {
+          Person.find({ surname: "Doe" }, { order: "age" }, function (err, people) {
+            should.not.exist(err);
+            people.should.be.a.Object();
+            people.should.have.property("length", 3);
+            people[0].age.should.equal(16);
+
+            return done();
+          });
+        });
+
+        it("should use it and ignore previously defined order", function (done) {
+          Person.find({ surname: "Doe" }, "-age", { order: "age" }, function (err, people) {
+            should.not.exist(err);
+            people.should.be.a.Object();
+            people.should.have.property("length", 3);
+            people[0].age.should.equal(16);
+
+            return done();
+          });
+        });
+      });
+    });
+  });
+
+  describe("if defined static methods", function () {
+    before(setup());
+
+    it("should be rechainable", function (done) {
+      Person.over18 = function () {
+        return this.find({ age: ORM.gt(18) });
+      };
+      Person.family = function (family) {
+        return this.find({ surname: family });
+      };
+
+      Person.over18().family("Doe").run(function (err, people) {
+        should.not.exist(err);
+        people.should.be.a.Object();
+        people.should.have.property("length", 1);
+        people[0].name.should.equal("Jasmine");
+        people[0].surname.should.equal("Doe");
+
+        return done();
+      });
+    });
+  });
+
+  describe("with identityCache disabled", function () {
+    it("should not return singletons", function (done) {
+      Person.find({ name: "Jasmine" }, { identityCache: false }, function (err, people) {
+        should.not.exist(err);
+        people.should.be.a.Object();
+        people.should.have.property("length", 1);
+        people[0].name.should.equal("Jasmine");
+        people[0].surname.should.equal("Doe");
+
+        people[0].surname = "Dux";
+
+        Person.find({ name: "Jasmine" }, { identityCache: false }, function (err, people) {
+          should.not.exist(err);
+          people.should.be.a.Object();
+          people.should.have.property("length", 1);
+          people[0].name.should.equal("Jasmine");
+          people[0].surname.should.equal("Doe");
+
+          return done();
+        });
+      });
+    });
+  });
+
+  describe("when using Model.all()", function () {
+    it("should work exactly the same", function (done) {
+      Person.all({ surname: "Doe" }, "-age", 1, function (err, people) {
+        should.not.exist(err);
+        people.should.be.a.Object();
+        people.should.have.property("length", 1);
+        people[0].name.should.equal("Jasmine");
+        people[0].surname.should.equal("Doe");
+
+        return done();
+      });
+    });
+  });
+
+  describe("when using Model.where()", function () {
+    it("should work exactly the same", function (done) {
+      Person.where({ surname: "Doe" }, "-age", 1, function (err, people) {
+        should.not.exist(err);
+        people.should.be.a.Object();
+        people.should.have.property("length", 1);
+        people[0].name.should.equal("Jasmine");
+        people[0].surname.should.equal("Doe");
+
+        return done();
+      });
+    });
+  });
 });
diff --git a/test/integration/model-get.js b/test/integration/model-get.js
index 9c78f4f4..3bcffc78 100644
--- a/test/integration/model-get.js
+++ b/test/integration/model-get.js
@@ -6,337 +6,337 @@ var ORM      = require('../../');
 var protocol = common.protocol();
 
 describe("Model.get()", function() {
-	var db     = null;
-	var Person = null;
-	var John;
-
-	var setup = function (identityCache) {
-		return function (done) {
-			Person = db.define("person", {
-				name     : { type: 'text', mapsTo: 'fullname' }
-			}, {
-				identityCache : identityCache,
-				methods  : {
-					UID: function () {
-						return this[Person.id];
-					}
-				}
-			});
-
-			ORM.singleton.clear(); // clear identityCache cache
-
-			return helper.dropSync(Person, function () {
-				Person.create([{
-					name: "John Doe"
-				}, {
-					name: "Jane Doe"
-				}], function (err, people) {
-					John = people[0];
+  var db     = null;
+  var Person = null;
+  var John;
+
+  var setup = function (identityCache) {
+    return function (done) {
+      Person = db.define("person", {
+        name     : { type: 'text', mapsTo: 'fullname' }
+      }, {
+        identityCache : identityCache,
+        methods  : {
+          UID: function () {
+            return this[Person.id];
+          }
+        }
+      });
+
+      ORM.singleton.clear(); // clear identityCache cache
+
+      return helper.dropSync(Person, function () {
+        Person.create([{
+          name: "John Doe"
+        }, {
+          name: "Jane Doe"
+        }], function (err, people) {
+          John = people[0];
 
-					return done();
-				});
-			});
-		};
-	};
+          return done();
+        });
+      });
+    };
+  };
 
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
-
-			return done();
-		});
-	});
-
-	after(function () {
-		return db.close();
-	});
-
-	describe("mapsTo", function () {
-		if (protocol == 'mongodb') return;
-
-		before(setup(true));
-
-		it("should create the table with a different column name than property name", function (done) {
-			var sql;
-
-			if (protocol == 'sqlite') {
-				sql = "PRAGMA table_info(?)";
-			} else {
-				sql = "SELECT column_name FROM information_schema.columns WHERE table_name = ?";
-			}
-
-			db.driver.execQuery(sql, [Person.table], function (err, data) {
-				should.not.exist(err);
-
-				var names = _.map(data, protocol == 'sqlite' ? 'name' : 'column_name')
-
-				should.equal(typeof Person.properties.name, 'object');
-				should.notEqual(names.indexOf('fullname'), -1);
-
-				done();
-			});
-		});
-	});
-
-	describe("with identityCache cache", function () {
-		before(setup(true));
-
-		it("should return item with id 1", function (done) {
-			Person.get(John[Person.id], function (err, John) {
-				should.equal(err, null);
-
-				John.should.be.a.Object();
-				John.should.have.property(Person.id, John[Person.id]);
-				John.should.have.property("name", "John Doe");
-
-				return done();
-			});
-		});
-
-		it("should have an UID method", function (done) {
-			Person.get(John[Person.id], function (err, John) {
-				should.equal(err, null);
-
-				John.UID.should.be.a.Function();
-				John.UID().should.equal(John[Person.id]);
-
-				return done();
-			});
-		});
-
-		describe("changing name and getting id 1 again", function () {
-			it("should return the original object with unchanged name", function (done) {
-				Person.get(John[Person.id], function (err, John1) {
-					should.equal(err, null);
-
-					John1.name = "James";
-
-					Person.get(John[Person.id], function (err, John2) {
-						should.equal(err, null);
-
-						John1[Person.id].should.equal(John2[Person.id]);
-						John2.name.should.equal("John Doe");
-
-						return done();
-					});
-				});
-			});
-		});
-
-		describe("changing instance.identityCacheSaveCheck = false", function () {
-			before(function (done) {
-				Person.settings.set("instance.identityCacheSaveCheck", false);
-
-				it("should return the same object with the changed name", function (done) {
-					Person.get(John[Person.id], function (err, John1) {
-						should.equal(err, null);
-
-						John1.name = "James";
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  describe("mapsTo", function () {
+    if (protocol == 'mongodb') return;
+
+    before(setup(true));
+
+    it("should create the table with a different column name than property name", function (done) {
+      var sql;
+
+      if (protocol == 'sqlite') {
+        sql = "PRAGMA table_info(?)";
+      } else {
+        sql = "SELECT column_name FROM information_schema.columns WHERE table_name = ?";
+      }
+
+      db.driver.execQuery(sql, [Person.table], function (err, data) {
+        should.not.exist(err);
+
+        var names = _.map(data, protocol == 'sqlite' ? 'name' : 'column_name')
+
+        should.equal(typeof Person.properties.name, 'object');
+        should.notEqual(names.indexOf('fullname'), -1);
+
+        done();
+      });
+    });
+  });
+
+  describe("with identityCache cache", function () {
+    before(setup(true));
+
+    it("should return item with id 1", function (done) {
+      Person.get(John[Person.id], function (err, John) {
+        should.equal(err, null);
+
+        John.should.be.a.Object();
+        John.should.have.property(Person.id, John[Person.id]);
+        John.should.have.property("name", "John Doe");
+
+        return done();
+      });
+    });
+
+    it("should have an UID method", function (done) {
+      Person.get(John[Person.id], function (err, John) {
+        should.equal(err, null);
+
+        John.UID.should.be.a.Function();
+        John.UID().should.equal(John[Person.id]);
+
+        return done();
+      });
+    });
+
+    describe("changing name and getting id 1 again", function () {
+      it("should return the original object with unchanged name", function (done) {
+        Person.get(John[Person.id], function (err, John1) {
+          should.equal(err, null);
+
+          John1.name = "James";
+
+          Person.get(John[Person.id], function (err, John2) {
+            should.equal(err, null);
+
+            John1[Person.id].should.equal(John2[Person.id]);
+            John2.name.should.equal("John Doe");
+
+            return done();
+          });
+        });
+      });
+    });
+
+    describe("changing instance.identityCacheSaveCheck = false", function () {
+      before(function (done) {
+        Person.settings.set("instance.identityCacheSaveCheck", false);
+
+        it("should return the same object with the changed name", function (done) {
+          Person.get(John[Person.id], function (err, John1) {
+            should.equal(err, null);
+
+            John1.name = "James";
 
-						Person.get(John[Person.id], function (err, John2) {
-							should.equal(err, null);
+            Person.get(John[Person.id], function (err, John2) {
+              should.equal(err, null);
 
-							John1[Person.id].should.equal(John2[Person.id]);
-							John2.name.should.equal("James");
+              John1[Person.id].should.equal(John2[Person.id]);
+              John2.name.should.equal("James");
 
-							return done();
-						});
-					});
-				});
-			});
-		});
-	});
+              return done();
+            });
+          });
+        });
+      });
+    });
+  });
 
-	describe("with no identityCache cache", function () {
-		before(setup(false));
+  describe("with no identityCache cache", function () {
+    before(setup(false));
 
-		describe("fetching several times", function () {
-			it("should return different objects", function (done) {
-				Person.get(John[Person.id], function (err, John1) {
-					should.equal(err, null);
-					Person.get(John[Person.id], function (err, John2) {
-						should.equal(err, null);
-
-						John1[Person.id].should.equal(John2[Person.id]);
-						John1.should.not.equal(John2);
-
-						return done();
-					});
-				});
-			});
-		});
-	});
-
-	describe("with identityCache cache = 0.5 secs", function () {
-		before(setup(0.5));
-
-		describe("fetching again after 0.2 secs", function () {
-			it("should return same objects", function (done) {
-				Person.get(John[Person.id], function (err, John1) {
-					should.equal(err, null);
-
-					setTimeout(function () {
-						Person.get(John[Person.id], function (err, John2) {
-							should.equal(err, null);
-
-							John1[Person.id].should.equal(John2[Person.id]);
-							John1.should.equal(John2);
-
-							return done();
-						});
-					}, 200);
-				});
-			});
-		});
-
-		describe("fetching again after 0.7 secs", function () {
-			it("should return different objects", function (done) {
-				Person.get(John[Person.id], function (err, John1) {
-					should.equal(err, null);
-
-					setTimeout(function () {
-						Person.get(John[Person.id], function (err, John2) {
-							should.equal(err, null);
-
-							John1.should.not.equal(John2);
-
-							return done();
-						});
-					}, 700);
-				});
-			});
-		});
-	});
-
-	describe("with empty object as options", function () {
-		before(setup());
-
-		it("should return item with id 1 like previously", function (done) {
-			Person.get(John[Person.id], {}, function (err, John) {
-				should.equal(err, null);
-
-				John.should.be.a.Object();
-				John.should.have.property(Person.id, John[Person.id]);
-				John.should.have.property("name", "John Doe");
-
-				return done();
-			});
-		});
-	});
-
-	describe("without callback", function () {
-		before(setup(true));
-
-		it("should throw", function (done) {
-			(function () {
-				Person.get(John[Person.id]);
-			}).should.throw();
-
-			return done();
-		});
-	});
-
-	describe("when not found", function () {
-		before(setup(true));
-
-		it("should return an error", function (done) {
-			Person.get(999, function (err) {
-				err.should.be.a.Object();
-				err.message.should.equal("Not found");
-
-				return done();
-			});
-		});
-	});
-
-	describe("if passed an Array with ids", function () {
-		before(setup(true));
-
-		it("should accept and try to fetch", function (done) {
-			Person.get([ John[Person.id] ], function (err, John) {
-				should.equal(err, null);
-
-				John.should.be.a.Object();
-				John.should.have.property(Person.id, John[Person.id]);
-				John.should.have.property("name", "John Doe");
-
-				return done();
-			});
-		});
-	});
-
-	describe("if passed a wrong number of ids", function () {
-		before(setup(true));
-
-		it("should throw", function (done) {
-			(function () {
-				Person.get(1, 2, function () {});
-			}).should.throw();
-
-			return done();
-		});
-	});
-
-	describe("if primary key name is changed", function () {
-		before(function (done) {
-			Person = db.define("person", {
-				name : String
-			});
-
-			ORM.singleton.clear();
-
-			return helper.dropSync(Person, function () {
-				Person.create([{
-					name : "John Doe"
-				}, {
-					name : "Jane Doe"
-				}], done);
-			});
-		});
-
-		it("should search by key name and not 'id'", function (done) {
-			db.settings.set('properties.primary_key', 'name');
-
-			var OtherPerson = db.define("person", {
-				id : Number
-			});
-
-			OtherPerson.get("Jane Doe", function (err, person) {
-				should.equal(err, null);
-
-				person.name.should.equal("Jane Doe");
-
-				return done();
-			});
-		});
-	});
-
-	describe("with a point property type", function() {
-		if (common.protocol() == 'sqlite' || common.protocol() == 'mongodb') return;
-
-		it("should deserialize the point to an array", function (done) {
-			db.settings.set('properties.primary_key', 'id');
-
-			Person = db.define("person", {
-				name     : String,
-				location : { type: "point" }
-			});
-
-			ORM.singleton.clear();
-
-			return helper.dropSync(Person, function () {
-				Person.create({
-					name     : "John Doe",
-					location : { x : 51.5177, y : -0.0968 }
-				}, function (err, person) {
-					should.equal(err, null);
-
-					person.location.should.be.an.instanceOf(Object);
-					person.location.should.have.property('x', 51.5177);
-					person.location.should.have.property('y', -0.0968);
-					return done();
-				});
-			});
-		});
-	});
+    describe("fetching several times", function () {
+      it("should return different objects", function (done) {
+        Person.get(John[Person.id], function (err, John1) {
+          should.equal(err, null);
+          Person.get(John[Person.id], function (err, John2) {
+            should.equal(err, null);
+
+            John1[Person.id].should.equal(John2[Person.id]);
+            John1.should.not.equal(John2);
+
+            return done();
+          });
+        });
+      });
+    });
+  });
+
+  describe("with identityCache cache = 0.5 secs", function () {
+    before(setup(0.5));
+
+    describe("fetching again after 0.2 secs", function () {
+      it("should return same objects", function (done) {
+        Person.get(John[Person.id], function (err, John1) {
+          should.equal(err, null);
+
+          setTimeout(function () {
+            Person.get(John[Person.id], function (err, John2) {
+              should.equal(err, null);
+
+              John1[Person.id].should.equal(John2[Person.id]);
+              John1.should.equal(John2);
+
+              return done();
+            });
+          }, 200);
+        });
+      });
+    });
+
+    describe("fetching again after 0.7 secs", function () {
+      it("should return different objects", function (done) {
+        Person.get(John[Person.id], function (err, John1) {
+          should.equal(err, null);
+
+          setTimeout(function () {
+            Person.get(John[Person.id], function (err, John2) {
+              should.equal(err, null);
+
+              John1.should.not.equal(John2);
+
+              return done();
+            });
+          }, 700);
+        });
+      });
+    });
+  });
+
+  describe("with empty object as options", function () {
+    before(setup());
+
+    it("should return item with id 1 like previously", function (done) {
+      Person.get(John[Person.id], {}, function (err, John) {
+        should.equal(err, null);
+
+        John.should.be.a.Object();
+        John.should.have.property(Person.id, John[Person.id]);
+        John.should.have.property("name", "John Doe");
+
+        return done();
+      });
+    });
+  });
+
+  describe("without callback", function () {
+    before(setup(true));
+
+    it("should throw", function (done) {
+      (function () {
+        Person.get(John[Person.id]);
+      }).should.throw();
+
+      return done();
+    });
+  });
+
+  describe("when not found", function () {
+    before(setup(true));
+
+    it("should return an error", function (done) {
+      Person.get(999, function (err) {
+        err.should.be.a.Object();
+        err.message.should.equal("Not found");
+
+        return done();
+      });
+    });
+  });
+
+  describe("if passed an Array with ids", function () {
+    before(setup(true));
+
+    it("should accept and try to fetch", function (done) {
+      Person.get([ John[Person.id] ], function (err, John) {
+        should.equal(err, null);
+
+        John.should.be.a.Object();
+        John.should.have.property(Person.id, John[Person.id]);
+        John.should.have.property("name", "John Doe");
+
+        return done();
+      });
+    });
+  });
+
+  describe("if passed a wrong number of ids", function () {
+    before(setup(true));
+
+    it("should throw", function (done) {
+      (function () {
+        Person.get(1, 2, function () {});
+      }).should.throw();
+
+      return done();
+    });
+  });
+
+  describe("if primary key name is changed", function () {
+    before(function (done) {
+      Person = db.define("person", {
+        name : String
+      });
+
+      ORM.singleton.clear();
+
+      return helper.dropSync(Person, function () {
+        Person.create([{
+          name : "John Doe"
+        }, {
+          name : "Jane Doe"
+        }], done);
+      });
+    });
+
+    it("should search by key name and not 'id'", function (done) {
+      db.settings.set('properties.primary_key', 'name');
+
+      var OtherPerson = db.define("person", {
+        id : Number
+      });
+
+      OtherPerson.get("Jane Doe", function (err, person) {
+        should.equal(err, null);
+
+        person.name.should.equal("Jane Doe");
+
+        return done();
+      });
+    });
+  });
+
+  describe("with a point property type", function() {
+    if (common.protocol() == 'sqlite' || common.protocol() == 'mongodb') return;
+
+    it("should deserialize the point to an array", function (done) {
+      db.settings.set('properties.primary_key', 'id');
+
+      Person = db.define("person", {
+        name     : String,
+        location : { type: "point" }
+      });
+
+      ORM.singleton.clear();
+
+      return helper.dropSync(Person, function () {
+        Person.create({
+          name     : "John Doe",
+          location : { x : 51.5177, y : -0.0968 }
+        }, function (err, person) {
+          should.equal(err, null);
+
+          person.location.should.be.an.instanceOf(Object);
+          person.location.should.have.property('x', 51.5177);
+          person.location.should.have.property('y', -0.0968);
+          return done();
+        });
+      });
+    });
+  });
 });
diff --git a/test/integration/model-keys.js b/test/integration/model-keys.js
index 70ff070d..e09bc7f2 100644
--- a/test/integration/model-keys.js
+++ b/test/integration/model-keys.js
@@ -3,109 +3,109 @@ var helper   = require('../support/spec_helper');
 var ORM      = require('../../');
 
 describe("Model keys option", function() {
-	var db = null;
-
-	before(function (done) {
-		this.timeout(4000);
-
-		helper.connect(function (connection) {
-			db = connection;
-
-			return done();
-		});
-	});
-
-	after(function () {
-		return db.close();
-	});
-
-	describe("if model id is a property", function () {
-		var Person = null;
-
-		before(function (done) {
-			Person = db.define("person", {
-				uid     : String,
-				name    : String,
-				surname : String
-			}, {
-				id      : "uid"
-			});
-
-			return helper.dropSync(Person, done);
-		});
-
-		it("should not auto increment IDs", function (done) {
-			Person.create({
-				uid     : "john-doe",
-				name    : "John",
-				surname : "Doe"
-			}, function (err, JohnDoe) {
-				should.equal(err, null);
-
-				JohnDoe.uid.should.equal("john-doe");
-				JohnDoe.should.not.have.property("id");
-
-				return done();
-			});
-		});
-	});
-
-	describe("if model defines several keys", function () {
-		var DoorAccessHistory = null;
-
-		before(function (done) {
-			DoorAccessHistory = db.define("door_access_history", {
-				year   : { type: 'integer' },
-				month  : { type: 'integer' },
-				day    : { type: 'integer' },
-				user   : String,
-				action : [ "in", "out" ]
-			}, {
-				id   : [ "year", "month", "day" ]
-			});
-
-			return helper.dropSync(DoorAccessHistory, function () {
-				DoorAccessHistory.create([
-					{ year: 2013, month: 7, day : 11, user : "dresende", action : "in" },
-					{ year: 2013, month: 7, day : 12, user : "dresende", action : "out" }
-				], done);
-			});
-		});
-
-		it("should make possible to get instances based on all keys", function (done) {
-			DoorAccessHistory.get(2013, 7, 11, function (err, HistoryItem) {
-				should.equal(err, null);
-
-				HistoryItem.year.should.equal(2013);
-				HistoryItem.month.should.equal(7);
-				HistoryItem.day.should.equal(11);
-				HistoryItem.user.should.equal("dresende");
-				HistoryItem.action.should.equal("in");
-
-				return done();
-			})
-		});
-
-		it("should make possible to remove instances based on all keys", function (done) {
-			DoorAccessHistory.get(2013, 7, 12, function (err, HistoryItem) {
-				should.equal(err, null);
-
-				HistoryItem.remove(function (err) {
-					should.equal(err, null);
-
-					DoorAccessHistory.get(2013, 7, 12, function (err) {
-						err.should.have.property("code", ORM.ErrorCodes.NOT_FOUND);
-
-						DoorAccessHistory.exists(2013, 7, 12, function (err, exists) {
-							should.equal(err, null);
-
-							exists.should.be.false;
-
-							return done();
-						});
-					});
-				});
-			})
-		});
-	});
+  var db = null;
+
+  before(function (done) {
+    this.timeout(4000);
+
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  describe("if model id is a property", function () {
+    var Person = null;
+
+    before(function (done) {
+      Person = db.define("person", {
+        uid     : String,
+        name    : String,
+        surname : String
+      }, {
+        id      : "uid"
+      });
+
+      return helper.dropSync(Person, done);
+    });
+
+    it("should not auto increment IDs", function (done) {
+      Person.create({
+        uid     : "john-doe",
+        name    : "John",
+        surname : "Doe"
+      }, function (err, JohnDoe) {
+        should.equal(err, null);
+
+        JohnDoe.uid.should.equal("john-doe");
+        JohnDoe.should.not.have.property("id");
+
+        return done();
+      });
+    });
+  });
+
+  describe("if model defines several keys", function () {
+    var DoorAccessHistory = null;
+
+    before(function (done) {
+      DoorAccessHistory = db.define("door_access_history", {
+        year   : { type: 'integer' },
+        month  : { type: 'integer' },
+        day    : { type: 'integer' },
+        user   : String,
+        action : [ "in", "out" ]
+      }, {
+        id   : [ "year", "month", "day" ]
+      });
+
+      return helper.dropSync(DoorAccessHistory, function () {
+        DoorAccessHistory.create([
+          { year: 2013, month: 7, day : 11, user : "dresende", action : "in" },
+          { year: 2013, month: 7, day : 12, user : "dresende", action : "out" }
+        ], done);
+      });
+    });
+
+    it("should make possible to get instances based on all keys", function (done) {
+      DoorAccessHistory.get(2013, 7, 11, function (err, HistoryItem) {
+        should.equal(err, null);
+
+        HistoryItem.year.should.equal(2013);
+        HistoryItem.month.should.equal(7);
+        HistoryItem.day.should.equal(11);
+        HistoryItem.user.should.equal("dresende");
+        HistoryItem.action.should.equal("in");
+
+        return done();
+      })
+    });
+
+    it("should make possible to remove instances based on all keys", function (done) {
+      DoorAccessHistory.get(2013, 7, 12, function (err, HistoryItem) {
+        should.equal(err, null);
+
+        HistoryItem.remove(function (err) {
+          should.equal(err, null);
+
+          DoorAccessHistory.get(2013, 7, 12, function (err) {
+            err.should.have.property("code", ORM.ErrorCodes.NOT_FOUND);
+
+            DoorAccessHistory.exists(2013, 7, 12, function (err, exists) {
+              should.equal(err, null);
+
+              exists.should.be.false;
+
+              return done();
+            });
+          });
+        });
+      })
+    });
+  });
 });
diff --git a/test/integration/model-one.js b/test/integration/model-one.js
index b2bbcaa3..0ed6e153 100644
--- a/test/integration/model-one.js
+++ b/test/integration/model-one.js
@@ -3,104 +3,104 @@ var helper   = require('../support/spec_helper');
 var ORM      = require('../../');
 
 describe("Model.one()", function() {
-	var db = null;
-	var Person = null;
-
-	var setup = function () {
-		return function (done) {
-			Person = db.define("person", {
-				name   : String
-			});
-
-			return helper.dropSync(Person, function () {
-				Person.create([{
-					id  : 1,
-					name: "Jeremy Doe"
-				}, {
-					id  : 2,
-					name: "John Doe"
-				}, {
-					id  : 3,
-					name: "Jane Doe"
-				}], done);
-			});
-		};
-	};
-
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
-
-			return done();
-		});
-	});
-
-	after(function () {
-		return db.close();
-	});
-
-	describe("without arguments", function () {
-		before(setup());
-
-		it("should return first item in model", function (done) {
-			Person.one(function (err, person) {
-				should.equal(err, null);
-
-				person.name.should.equal("Jeremy Doe");
-
-				return done();
-			});
-		});
-	});
-
-	describe("without callback", function () {
-		before(setup());
-
-		it("should throw", function (done) {
-			Person.one.should.throw();
-
-			return done();
-		});
-	});
-
-	describe("with order", function () {
-		before(setup());
-
-		it("should return first item in model based on order", function (done) {
-			Person.one("-name", function (err, person) {
-				should.equal(err, null);
-
-				person.name.should.equal("John Doe");
-
-				return done();
-			});
-		});
-	});
-
-	describe("with conditions", function () {
-		before(setup());
-
-		it("should return first item in model based on conditions", function (done) {
-			Person.one({ name: "Jane Doe" }, function (err, person) {
-				should.equal(err, null);
-
-				person.name.should.equal("Jane Doe");
-
-				return done();
-			});
-		});
-
-		describe("if no match", function () {
-			before(setup());
-
-			it("should return null", function (done) {
-				Person.one({ name: "Jack Doe" }, function (err, person) {
-					should.equal(err, null);
-					should.equal(person, null);
-
-					return done();
-				});
-			});
-		});
-	});
+  var db = null;
+  var Person = null;
+
+  var setup = function () {
+    return function (done) {
+      Person = db.define("person", {
+        name   : String
+      });
+
+      return helper.dropSync(Person, function () {
+        Person.create([{
+          id  : 1,
+          name: "Jeremy Doe"
+        }, {
+          id  : 2,
+          name: "John Doe"
+        }, {
+          id  : 3,
+          name: "Jane Doe"
+        }], done);
+      });
+    };
+  };
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  describe("without arguments", function () {
+    before(setup());
+
+    it("should return first item in model", function (done) {
+      Person.one(function (err, person) {
+        should.equal(err, null);
+
+        person.name.should.equal("Jeremy Doe");
+
+        return done();
+      });
+    });
+  });
+
+  describe("without callback", function () {
+    before(setup());
+
+    it("should throw", function (done) {
+      Person.one.should.throw();
+
+      return done();
+    });
+  });
+
+  describe("with order", function () {
+    before(setup());
+
+    it("should return first item in model based on order", function (done) {
+      Person.one("-name", function (err, person) {
+        should.equal(err, null);
+
+        person.name.should.equal("John Doe");
+
+        return done();
+      });
+    });
+  });
+
+  describe("with conditions", function () {
+    before(setup());
+
+    it("should return first item in model based on conditions", function (done) {
+      Person.one({ name: "Jane Doe" }, function (err, person) {
+        should.equal(err, null);
+
+        person.name.should.equal("Jane Doe");
+
+        return done();
+      });
+    });
+
+    describe("if no match", function () {
+      before(setup());
+
+      it("should return null", function (done) {
+        Person.one({ name: "Jack Doe" }, function (err, person) {
+          should.equal(err, null);
+          should.equal(person, null);
+
+          return done();
+        });
+      });
+    });
+  });
 });
diff --git a/test/integration/model-save.js b/test/integration/model-save.js
index 1dfcf94e..30d48cf6 100644
--- a/test/integration/model-save.js
+++ b/test/integration/model-save.js
@@ -4,477 +4,477 @@ var common   = require('../common');
 var ORM      = require('../../');
 
 describe("Model.save()", function() {
-	var db = null;
-	var Person = null;
-
-	var setup = function (nameDefinition, opts) {
-		opts = opts || {};
-
-		return function (done) {
-			Person = db.define("person", {
-				name   : nameDefinition || String
-			}, opts || {});
-
-			Person.hasOne("parent", Person, opts.hasOneOpts);
-			if ('saveAssociationsByDefault' in opts) {
-				Person.settings.set(
-					'instance.saveAssociationsByDefault', opts.saveAssociationsByDefault
-				);
-			}
-
-			return helper.dropSync(Person, done);
-		};
-	};
-
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
-
-			return done();
-		});
-	});
-
-	after(function () {
-		return db.close();
-	});
-
-	describe("if properties have default values", function () {
-		before(setup({ type: "text", defaultValue: "John" }));
-
-		it("should use it if not defined", function (done) {
-			var John = new Person();
-
-			John.save(function (err) {
-				should.equal(err, null);
-				John.name.should.equal("John");
-
-				return done();
-			});
-		});
-	});
-
-	describe("with callback", function () {
-		before(setup());
-
-		it("should save item and return id", function (done) {
-			var John = new Person({
-				name: "John"
-			});
-			John.save(function (err) {
-				should.equal(err, null);
-				should.exist(John[Person.id]);
-
-				Person.get(John[Person.id], function (err, JohnCopy) {
-					should.equal(err, null);
-
-					JohnCopy[Person.id].should.equal(John[Person.id]);
-					JohnCopy.name.should.equal(John.name);
-
-					return done();
-				});
-			});
-		});
-	});
-
-	describe("without callback", function () {
-		before(setup());
-
-		it("should still save item and return id", function (done) {
-			var John = new Person({
-				name: "John"
-			});
-			John.save();
-			John.on("save", function (err) {
-				should.equal(err, null);
-				should.exist(John[Person.id]);
-
-				Person.get(John[Person.id], function (err, JohnCopy) {
-					should.equal(err, null);
-
-					JohnCopy[Person.id].should.equal(John[Person.id]);
-					JohnCopy.name.should.equal(John.name);
-
-					return done();
-				});
-			});
-		});
-	});
-
-	describe("with properties object", function () {
-		before(setup());
-
-		it("should update properties, save item and return id", function (done) {
-			var John = new Person({
-				name: "Jane"
-			});
-			John.save({ name: "John" }, function (err) {
-				should.equal(err, null);
-				should.exist(John[Person.id]);
-				John.name.should.equal("John");
-
-				Person.get(John[Person.id], function (err, JohnCopy) {
-					should.equal(err, null);
-
-					JohnCopy[Person.id].should.equal(John[Person.id]);
-					JohnCopy.name.should.equal(John.name);
-
-					return done();
-				});
-			});
-		});
-	});
-
-	describe("with unknown argument type", function () {
-		before(setup());
-
-		it("should should throw", function (done) {
-			var John = new Person({
-				name: "Jane"
-			});
-			(function () {
-				John.save("will-fail");
-			}).should.throw();
-
-			return done();
-		});
-	});
-
-	describe("if passed an association instance", function () {
-		before(setup());
-
-		it("should save association first and then save item and return id", function (done) {
-			var Jane = new Person({
-				name  : "Jane"
-			});
-			var John = new Person({
-				name  : "John",
-				parent: Jane
-			});
-			John.save(function (err) {
-				should.equal(err, null);
-				John.saved().should.be.true;
-				Jane.saved().should.be.true;
-
-				should.exist(John[Person.id]);
-				should.exist(Jane[Person.id]);
-
-				return done();
-			});
-		});
-	});
-
-	describe("if passed an association object", function () {
-		before(setup());
-
-		it("should save association first and then save item and return id", function (done) {
-			var John = new Person({
-				name  : "John",
-				parent: {
-					name  : "Jane"
-				}
-			});
-			John.save(function (err) {
-				should.equal(err, null);
-				John.saved().should.be.true;
-				John.parent.saved().should.be.true;
-
-				should.exist(John[Person.id]);
-				should.exist(John.parent[Person.id]);
-				should.equal(John.parent.name, "Jane");
-
-				return done();
-			});
-		});
-	});
-
-	describe("if autoSave is on", function () {
-		before(setup(null, { autoSave: true }));
-
-		it("should save the instance as soon as a property is changed", function (done) {
-			var John = new Person({
-				name : "Jhon"
-			});
-			John.save(function (err) {
-				should.equal(err, null);
-
-				John.on("save", function () {
-					return done();
-				});
-
-				John.name = "John";
-			});
-		});
-	});
-
-	describe("with saveAssociations", function () {
-		var afterSaveCalled = false;
-
-		if (common.protocol() == 'mongodb') return;
-
-		describe("default on in settings", function () {
-			beforeEach(function (done) {
-				function afterSave () {
-					afterSaveCalled = true;
-				}
-				var hooks = { afterSave: afterSave };
-
-				setup(null, { hooks: hooks, cache: false, hasOneOpts: { autoFetch: true } })(function (err) {
-					should.not.exist(err);
-
-					Person.create({ name: 'Olga' }, function (err, olga) {
-						should.not.exist(err);
-
-						should.exist(olga);
-						Person.create({ name: 'Hagar', parent_id: olga.id }, function (err, hagar) {
-							should.not.exist(err);
-							should.exist(hagar);
-							afterSaveCalled = false;
-							done();
-						});
-					});
-				});
-			});
-
-			it("should be on", function () {
-				should.equal(Person.settings.get('instance.saveAssociationsByDefault'), true);
-			});
-
-			it("off should not save associations but save itself", function (done) {
-				Person.one({ name: 'Hagar' }, function (err, hagar) {
-					should.not.exist(err);
-					should.exist(hagar.parent);
-
-					hagar.parent.name = 'Olga2';
-					hagar.save({name: 'Hagar2'}, { saveAssociations: false }, function (err) {
-						should.not.exist(err);
-						should.equal(afterSaveCalled, true);
-
-						Person.get(hagar.parent.id, function (err, olga) {
-							should.not.exist(err);
-							should.equal(olga.name, 'Olga');
-							done();
-						});
-					});
-				});
-			});
-
-			it("off should not save associations or itself if there are no changes", function (done) {
-				Person.one({ name: 'Hagar' }, function (err, hagar) {
-					should.not.exist(err);
-
-					hagar.save({}, { saveAssociations: false }, function (err) {
-						should.not.exist(err);
-						should.equal(afterSaveCalled, false);
-
-						Person.get(hagar.parent.id, function (err, olga) {
-							should.not.exist(err);
-							should.equal(olga.name, 'Olga');
-							done();
-						});
-					});
-				});
-			});
-
-			it("unspecified should save associations and itself", function (done) {
-				Person.one({ name: 'Hagar' }, function (err, hagar) {
-					should.not.exist(err);
-					should.exist(hagar.parent);
-
-					hagar.parent.name = 'Olga2';
-					hagar.save({name: 'Hagar2'}, function (err) {
-						should.not.exist(err);
-
-						Person.get(hagar.parent.id, function (err, olga) {
-							should.not.exist(err);
-							should.equal(olga.name, 'Olga2');
-
-							Person.get(hagar.id, function (err, person) {
-								should.not.exist(err);
-								should.equal(person.name, 'Hagar2');
-
-								done();
-							});
-						});
-					});
-				});
-			});
-
-			it("on should save associations and itself", function (done) {
-				Person.one({ name: 'Hagar' }, function (err, hagar) {
-					should.not.exist(err);
-					should.exist(hagar.parent);
-
-					hagar.parent.name = 'Olga2';
-					hagar.save({name: 'Hagar2'}, { saveAssociations: true }, function (err) {
-						should.not.exist(err);
-
-						Person.get(hagar.parent.id, function (err, olga) {
-							should.not.exist(err);
-							should.equal(olga.name, 'Olga2');
-
-							Person.get(hagar.id, function (err, person) {
-								should.not.exist(err);
-								should.equal(person.name, 'Hagar2');
-
-								done();
-							});
-						});
-					});
-				});
-			});
-		});
-
-		describe("turned off in settings", function () {
-			beforeEach(function (done) {
-				function afterSave () {
-					afterSaveCalled = true;
-				}
-				var hooks = { afterSave: afterSave };
-
-				setup(null, {
-					hooks: hooks, cache: false, hasOneOpts: { autoFetch: true },
-					saveAssociationsByDefault: false
-				})(function (err) {
-					should.not.exist(err);
-
-					Person.create({ name: 'Olga' }, function (err, olga) {
-						should.not.exist(err);
-
-						should.exist(olga);
-						Person.create({ name: 'Hagar', parent_id: olga.id }, function (err, hagar) {
-							should.not.exist(err);
-							should.exist(hagar);
-							afterSaveCalled = false;
-							done();
-						});
-					});
-				});
-			});
-
-			it("should be off", function () {
-				should.equal(Person.settings.get('instance.saveAssociationsByDefault'), false);
-			});
-
-			it("unspecified should not save associations but save itself", function (done) {
-				Person.one({ name: 'Hagar' }, function (err, hagar) {
-					should.not.exist(err);
-					should.exist(hagar.parent);
-
-					hagar.parent.name = 'Olga2';
-					hagar.save({ name: 'Hagar2' }, function (err) {
-						should.not.exist(err);
-
-						Person.get(hagar.parent.id, function (err, olga) {
-							should.not.exist(err);
-							should.equal(olga.name, 'Olga');
-
-							Person.get(hagar.id, function (err, person) {
-								should.not.exist(err);
-								should.equal(person.name, 'Hagar2');
-
-								done();
-							});
-						});
-					});
-				});
-			});
-
-			it("off should not save associations but save itself", function (done) {
-				Person.one({ name: 'Hagar' }, function (err, hagar) {
-					should.not.exist(err);
-					should.exist(hagar.parent);
-
-					hagar.parent.name = 'Olga2';
-					hagar.save({ name: 'Hagar2' }, { saveAssociations: false }, function (err) {
-						should.not.exist(err);
-						should.equal(afterSaveCalled, true);
-
-						Person.get(hagar.parent.id, function (err, olga) {
-							should.not.exist(err);
-							should.equal(olga.name, 'Olga');
-							done();
-						});
-					});
-				});
-			});
-
-			it("on should save associations and itself", function (done) {
-				Person.one({ name: 'Hagar' }, function (err, hagar) {
-					should.not.exist(err);
-					should.exist(hagar.parent);
-
-					hagar.parent.name = 'Olga2';
-					hagar.save({ name: 'Hagar2' }, { saveAssociations: true }, function (err) {
-						should.not.exist(err);
-
-						Person.get(hagar.parent.id, function (err, olga) {
-							should.not.exist(err);
-							should.equal(olga.name, 'Olga2');
-
-							Person.get(hagar.id, function (err, person) {
-								should.not.exist(err);
-								should.equal(person.name, 'Hagar2');
-
-								done();
-							});
-						});
-					});
-				});
-			});
-		});
-	});
-
-	describe("with a point property", function () {
-		if (common.protocol() == 'sqlite' || common.protocol() == 'mongodb') return;
-
-		it("should save the instance as a geospatial point", function (done) {
-			setup({ type: "point" }, null)(function () {
-				var John = new Person({
-					name: { x: 51.5177, y: -0.0968 }
-				});
-				John.save(function (err) {
-					should.equal(err, null);
-
-					John.name.should.be.an.instanceOf(Object);
-					John.name.should.have.property('x', 51.5177);
-					John.name.should.have.property('y', -0.0968);
-					return done();
-				});
-			});
-		});
-	});
-
-	describe("mockable", function() {
-		before(setup());
-
-		it("save should be writable", function(done) {
-			var John = new Person({
-				name: "John"
-			});
-			var saveCalled = false;
-			John.save = function(cb) {
-				saveCalled = true;
-				cb(null);
-			};
-			John.save(function(err) {
-				should.equal(saveCalled,true);
-				return done();
-			});
-		});
-
-		it("saved should be writable", function(done) {
-			var John = new Person({
-				name: "John"
-			});
-			var savedCalled = false;
-			John.saved = function() {
-				savedCalled = true;
-				return true;
-			};
-
-			John.saved()
-			savedCalled.should.be.true;
-			done();
-		})
-	});
+  var db = null;
+  var Person = null;
+
+  var setup = function (nameDefinition, opts) {
+    opts = opts || {};
+
+    return function (done) {
+      Person = db.define("person", {
+        name   : nameDefinition || String
+      }, opts || {});
+
+      Person.hasOne("parent", Person, opts.hasOneOpts);
+      if ('saveAssociationsByDefault' in opts) {
+        Person.settings.set(
+          'instance.saveAssociationsByDefault', opts.saveAssociationsByDefault
+        );
+      }
+
+      return helper.dropSync(Person, done);
+    };
+  };
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  describe("if properties have default values", function () {
+    before(setup({ type: "text", defaultValue: "John" }));
+
+    it("should use it if not defined", function (done) {
+      var John = new Person();
+
+      John.save(function (err) {
+        should.equal(err, null);
+        John.name.should.equal("John");
+
+        return done();
+      });
+    });
+  });
+
+  describe("with callback", function () {
+    before(setup());
+
+    it("should save item and return id", function (done) {
+      var John = new Person({
+        name: "John"
+      });
+      John.save(function (err) {
+        should.equal(err, null);
+        should.exist(John[Person.id]);
+
+        Person.get(John[Person.id], function (err, JohnCopy) {
+          should.equal(err, null);
+
+          JohnCopy[Person.id].should.equal(John[Person.id]);
+          JohnCopy.name.should.equal(John.name);
+
+          return done();
+        });
+      });
+    });
+  });
+
+  describe("without callback", function () {
+    before(setup());
+
+    it("should still save item and return id", function (done) {
+      var John = new Person({
+        name: "John"
+      });
+      John.save();
+      John.on("save", function (err) {
+        should.equal(err, null);
+        should.exist(John[Person.id]);
+
+        Person.get(John[Person.id], function (err, JohnCopy) {
+          should.equal(err, null);
+
+          JohnCopy[Person.id].should.equal(John[Person.id]);
+          JohnCopy.name.should.equal(John.name);
+
+          return done();
+        });
+      });
+    });
+  });
+
+  describe("with properties object", function () {
+    before(setup());
+
+    it("should update properties, save item and return id", function (done) {
+      var John = new Person({
+        name: "Jane"
+      });
+      John.save({ name: "John" }, function (err) {
+        should.equal(err, null);
+        should.exist(John[Person.id]);
+        John.name.should.equal("John");
+
+        Person.get(John[Person.id], function (err, JohnCopy) {
+          should.equal(err, null);
+
+          JohnCopy[Person.id].should.equal(John[Person.id]);
+          JohnCopy.name.should.equal(John.name);
+
+          return done();
+        });
+      });
+    });
+  });
+
+  describe("with unknown argument type", function () {
+    before(setup());
+
+    it("should should throw", function (done) {
+      var John = new Person({
+        name: "Jane"
+      });
+      (function () {
+        John.save("will-fail");
+      }).should.throw();
+
+      return done();
+    });
+  });
+
+  describe("if passed an association instance", function () {
+    before(setup());
+
+    it("should save association first and then save item and return id", function (done) {
+      var Jane = new Person({
+        name  : "Jane"
+      });
+      var John = new Person({
+        name  : "John",
+        parent: Jane
+      });
+      John.save(function (err) {
+        should.equal(err, null);
+        John.saved().should.be.true;
+        Jane.saved().should.be.true;
+
+        should.exist(John[Person.id]);
+        should.exist(Jane[Person.id]);
+
+        return done();
+      });
+    });
+  });
+
+  describe("if passed an association object", function () {
+    before(setup());
+
+    it("should save association first and then save item and return id", function (done) {
+      var John = new Person({
+        name  : "John",
+        parent: {
+          name  : "Jane"
+        }
+      });
+      John.save(function (err) {
+        should.equal(err, null);
+        John.saved().should.be.true;
+        John.parent.saved().should.be.true;
+
+        should.exist(John[Person.id]);
+        should.exist(John.parent[Person.id]);
+        should.equal(John.parent.name, "Jane");
+
+        return done();
+      });
+    });
+  });
+
+  describe("if autoSave is on", function () {
+    before(setup(null, { autoSave: true }));
+
+    it("should save the instance as soon as a property is changed", function (done) {
+      var John = new Person({
+        name : "Jhon"
+      });
+      John.save(function (err) {
+        should.equal(err, null);
+
+        John.on("save", function () {
+          return done();
+        });
+
+        John.name = "John";
+      });
+    });
+  });
+
+  describe("with saveAssociations", function () {
+    var afterSaveCalled = false;
+
+    if (common.protocol() == 'mongodb') return;
+
+    describe("default on in settings", function () {
+      beforeEach(function (done) {
+        function afterSave () {
+          afterSaveCalled = true;
+        }
+        var hooks = { afterSave: afterSave };
+
+        setup(null, { hooks: hooks, cache: false, hasOneOpts: { autoFetch: true } })(function (err) {
+          should.not.exist(err);
+
+          Person.create({ name: 'Olga' }, function (err, olga) {
+            should.not.exist(err);
+
+            should.exist(olga);
+            Person.create({ name: 'Hagar', parent_id: olga.id }, function (err, hagar) {
+              should.not.exist(err);
+              should.exist(hagar);
+              afterSaveCalled = false;
+              done();
+            });
+          });
+        });
+      });
+
+      it("should be on", function () {
+        should.equal(Person.settings.get('instance.saveAssociationsByDefault'), true);
+      });
+
+      it("off should not save associations but save itself", function (done) {
+        Person.one({ name: 'Hagar' }, function (err, hagar) {
+          should.not.exist(err);
+          should.exist(hagar.parent);
+
+          hagar.parent.name = 'Olga2';
+          hagar.save({name: 'Hagar2'}, { saveAssociations: false }, function (err) {
+            should.not.exist(err);
+            should.equal(afterSaveCalled, true);
+
+            Person.get(hagar.parent.id, function (err, olga) {
+              should.not.exist(err);
+              should.equal(olga.name, 'Olga');
+              done();
+            });
+          });
+        });
+      });
+
+      it("off should not save associations or itself if there are no changes", function (done) {
+        Person.one({ name: 'Hagar' }, function (err, hagar) {
+          should.not.exist(err);
+
+          hagar.save({}, { saveAssociations: false }, function (err) {
+            should.not.exist(err);
+            should.equal(afterSaveCalled, false);
+
+            Person.get(hagar.parent.id, function (err, olga) {
+              should.not.exist(err);
+              should.equal(olga.name, 'Olga');
+              done();
+            });
+          });
+        });
+      });
+
+      it("unspecified should save associations and itself", function (done) {
+        Person.one({ name: 'Hagar' }, function (err, hagar) {
+          should.not.exist(err);
+          should.exist(hagar.parent);
+
+          hagar.parent.name = 'Olga2';
+          hagar.save({name: 'Hagar2'}, function (err) {
+            should.not.exist(err);
+
+            Person.get(hagar.parent.id, function (err, olga) {
+              should.not.exist(err);
+              should.equal(olga.name, 'Olga2');
+
+              Person.get(hagar.id, function (err, person) {
+                should.not.exist(err);
+                should.equal(person.name, 'Hagar2');
+
+                done();
+              });
+            });
+          });
+        });
+      });
+
+      it("on should save associations and itself", function (done) {
+        Person.one({ name: 'Hagar' }, function (err, hagar) {
+          should.not.exist(err);
+          should.exist(hagar.parent);
+
+          hagar.parent.name = 'Olga2';
+          hagar.save({name: 'Hagar2'}, { saveAssociations: true }, function (err) {
+            should.not.exist(err);
+
+            Person.get(hagar.parent.id, function (err, olga) {
+              should.not.exist(err);
+              should.equal(olga.name, 'Olga2');
+
+              Person.get(hagar.id, function (err, person) {
+                should.not.exist(err);
+                should.equal(person.name, 'Hagar2');
+
+                done();
+              });
+            });
+          });
+        });
+      });
+    });
+
+    describe("turned off in settings", function () {
+      beforeEach(function (done) {
+        function afterSave () {
+          afterSaveCalled = true;
+        }
+        var hooks = { afterSave: afterSave };
+
+        setup(null, {
+          hooks: hooks, cache: false, hasOneOpts: { autoFetch: true },
+          saveAssociationsByDefault: false
+        })(function (err) {
+          should.not.exist(err);
+
+          Person.create({ name: 'Olga' }, function (err, olga) {
+            should.not.exist(err);
+
+            should.exist(olga);
+            Person.create({ name: 'Hagar', parent_id: olga.id }, function (err, hagar) {
+              should.not.exist(err);
+              should.exist(hagar);
+              afterSaveCalled = false;
+              done();
+            });
+          });
+        });
+      });
+
+      it("should be off", function () {
+        should.equal(Person.settings.get('instance.saveAssociationsByDefault'), false);
+      });
+
+      it("unspecified should not save associations but save itself", function (done) {
+        Person.one({ name: 'Hagar' }, function (err, hagar) {
+          should.not.exist(err);
+          should.exist(hagar.parent);
+
+          hagar.parent.name = 'Olga2';
+          hagar.save({ name: 'Hagar2' }, function (err) {
+            should.not.exist(err);
+
+            Person.get(hagar.parent.id, function (err, olga) {
+              should.not.exist(err);
+              should.equal(olga.name, 'Olga');
+
+              Person.get(hagar.id, function (err, person) {
+                should.not.exist(err);
+                should.equal(person.name, 'Hagar2');
+
+                done();
+              });
+            });
+          });
+        });
+      });
+
+      it("off should not save associations but save itself", function (done) {
+        Person.one({ name: 'Hagar' }, function (err, hagar) {
+          should.not.exist(err);
+          should.exist(hagar.parent);
+
+          hagar.parent.name = 'Olga2';
+          hagar.save({ name: 'Hagar2' }, { saveAssociations: false }, function (err) {
+            should.not.exist(err);
+            should.equal(afterSaveCalled, true);
+
+            Person.get(hagar.parent.id, function (err, olga) {
+              should.not.exist(err);
+              should.equal(olga.name, 'Olga');
+              done();
+            });
+          });
+        });
+      });
+
+      it("on should save associations and itself", function (done) {
+        Person.one({ name: 'Hagar' }, function (err, hagar) {
+          should.not.exist(err);
+          should.exist(hagar.parent);
+
+          hagar.parent.name = 'Olga2';
+          hagar.save({ name: 'Hagar2' }, { saveAssociations: true }, function (err) {
+            should.not.exist(err);
+
+            Person.get(hagar.parent.id, function (err, olga) {
+              should.not.exist(err);
+              should.equal(olga.name, 'Olga2');
+
+              Person.get(hagar.id, function (err, person) {
+                should.not.exist(err);
+                should.equal(person.name, 'Hagar2');
+
+                done();
+              });
+            });
+          });
+        });
+      });
+    });
+  });
+
+  describe("with a point property", function () {
+    if (common.protocol() == 'sqlite' || common.protocol() == 'mongodb') return;
+
+    it("should save the instance as a geospatial point", function (done) {
+      setup({ type: "point" }, null)(function () {
+        var John = new Person({
+          name: { x: 51.5177, y: -0.0968 }
+        });
+        John.save(function (err) {
+          should.equal(err, null);
+
+          John.name.should.be.an.instanceOf(Object);
+          John.name.should.have.property('x', 51.5177);
+          John.name.should.have.property('y', -0.0968);
+          return done();
+        });
+      });
+    });
+  });
+
+  describe("mockable", function() {
+    before(setup());
+
+    it("save should be writable", function(done) {
+      var John = new Person({
+        name: "John"
+      });
+      var saveCalled = false;
+      John.save = function(cb) {
+        saveCalled = true;
+        cb(null);
+      };
+      John.save(function(err) {
+        should.equal(saveCalled,true);
+        return done();
+      });
+    });
+
+    it("saved should be writable", function(done) {
+      var John = new Person({
+        name: "John"
+      });
+      var savedCalled = false;
+      John.saved = function() {
+        savedCalled = true;
+        return true;
+      };
+
+      John.saved()
+      savedCalled.should.be.true;
+      done();
+    })
+  });
 });
diff --git a/test/integration/orm-exports.js b/test/integration/orm-exports.js
index 35182694..9b66b1c1 100644
--- a/test/integration/orm-exports.js
+++ b/test/integration/orm-exports.js
@@ -8,342 +8,342 @@ var common   = require('../common');
 var protocol = common.protocol();
 
 describe("ORM", function() {
-	describe("when loaded", function () {
-		it("should expose .express(), .use() and .connect()", function (done) {
-			ORM.express.should.be.a.Function();
-			ORM.use.should.be.a.Function();
-			ORM.connect.should.be.a.Function();
-
-			return done();
-		});
-
-		it("should expose default settings container", function (done) {
-			ORM.settings.should.be.a.Object();
-			ORM.settings.get.should.be.a.Function();
-			ORM.settings.set.should.be.a.Function();
-			ORM.settings.unset.should.be.a.Function();
-
-			return done();
-		});
-
-		it("should expose generic Settings constructor", function (done) {
-			ORM.Settings.should.be.a.Object();
-			ORM.Settings.Container.should.be.a.Function();
-
-			return done();
-		});
-
-		it("should expose singleton manager", function (done) {
-			ORM.singleton.should.be.a.Object();
-			ORM.singleton.clear.should.be.a.Function();
-
-			return done();
-		});
-
-		it("should expose predefined validators", function (done) {
-			ORM.validators.should.be.a.Object();
-			ORM.validators.rangeNumber.should.be.a.Function();
-			ORM.validators.rangeLength.should.be.a.Function();
-
-			return done();
-		});
-	});
+  describe("when loaded", function () {
+    it("should expose .express(), .use() and .connect()", function (done) {
+      ORM.express.should.be.a.Function();
+      ORM.use.should.be.a.Function();
+      ORM.connect.should.be.a.Function();
+
+      return done();
+    });
+
+    it("should expose default settings container", function (done) {
+      ORM.settings.should.be.a.Object();
+      ORM.settings.get.should.be.a.Function();
+      ORM.settings.set.should.be.a.Function();
+      ORM.settings.unset.should.be.a.Function();
+
+      return done();
+    });
+
+    it("should expose generic Settings constructor", function (done) {
+      ORM.Settings.should.be.a.Object();
+      ORM.Settings.Container.should.be.a.Function();
+
+      return done();
+    });
+
+    it("should expose singleton manager", function (done) {
+      ORM.singleton.should.be.a.Object();
+      ORM.singleton.clear.should.be.a.Function();
+
+      return done();
+    });
+
+    it("should expose predefined validators", function (done) {
+      ORM.validators.should.be.a.Object();
+      ORM.validators.rangeNumber.should.be.a.Function();
+      ORM.validators.rangeLength.should.be.a.Function();
+
+      return done();
+    });
+  });
 });
 
 describe("ORM.connect()", function () {
-	it("should expose .use(), .define(), .sync() and .load()", function (done) {
-		var db = ORM.connect();
+  it("should expose .use(), .define(), .sync() and .load()", function (done) {
+    var db = ORM.connect();
 
-		db.use.should.be.a.Function();
-		db.define.should.be.a.Function();
-		db.sync.should.be.a.Function();
-		db.load.should.be.a.Function();
-
-		return done();
-	});
+    db.use.should.be.a.Function();
+    db.define.should.be.a.Function();
+    db.sync.should.be.a.Function();
+    db.load.should.be.a.Function();
+
+    return done();
+  });
 
-	it("should emit an error if no url is passed", function (done) {
-		var db = ORM.connect();
-
-		db.on("connect", function (err) {
-			err.message.should.equal("CONNECTION_URL_EMPTY");
-
-			return done();
-		});
-	});
-
-	it("should allow protocol alias", function (done) {
-		var db = ORM.connect("pg://127.0.0.2");
-
-		db.once("connect", function (err) {
-			should.exist(err);
-			err.message.should.not.equal("CONNECTION_PROTOCOL_NOT_SUPPORTED");
-
-			return done();
-		});
-	});
-
-	it("should emit an error if empty url is passed", function (done) {
-		var db = ORM.connect("");
-
-		db.on("connect", function (err) {
-			err.message.should.equal("CONNECTION_URL_EMPTY");
-
-			return done();
-		});
-	});
-
-	it("should emit an error if empty url (with only spaces) is passed", function (done) {
-		var db = ORM.connect("   ");
-
-		db.on("connect", function (err) {
-			err.message.should.equal("CONNECTION_URL_EMPTY");
-
-			return done();
-		});
-	});
-
-	it("should emit an error if no protocol is passed", function (done) {
-		var db = ORM.connect("user@db");
-
-		db.on("connect", function (err) {
-			err.message.should.equal("CONNECTION_URL_NO_PROTOCOL");
-
-			return done();
-		});
-	});
-
-	it("should emit an error if unknown protocol is passed", function (done) {
-		var db = ORM.connect("unknown://db");
-
-		db.on("connect", function (err) {
-			should.equal(err.literalCode, 'NO_SUPPORT');
-			should.equal(
-				err.message,
-				"Connection protocol not supported - have you installed the database driver for unknown?"
-			);
-
-			return done();
-		});
-	});
-
-	it("should emit an error if cannot connect", function (done) {
-		var db = ORM.connect("mysql://fakeuser:nopassword@127.0.0.1/unknowndb");
-
-		db.on("connect", function (err) {
-			should.exist(err);
-			should.equal(err.message.indexOf("Connection protocol not supported"), -1);
-			err.message.should.not.equal("CONNECTION_URL_NO_PROTOCOL");
-			err.message.should.not.equal("CONNECTION_URL_EMPTY");
-
-			return done();
-		});
-	});
-
-	it("should emit valid error if exception being thrown during connection try", function (done) {
-		var testConfig = {
-			protocol : 'mongodb',
-			href     : 'unknownhost',
-			database : 'unknowndb',
-			user     : '',
-			password : ''
-		},
-		db = ORM.connect(testConfig);
-
-		db.on("connect", function (err) {
-			should.exist(err);
-			should.equal(err.message.indexOf("Connection protocol not supported"), -1);
-			err.message.should.not.equal("CONNECTION_URL_NO_PROTOCOL");
-			err.message.should.not.equal("CONNECTION_URL_EMPTY");
-
-			return done();
-		});
-	});
-
-	it("should not modify connection opts", function (done) {
-		var opts = {
-			protocol : 'mysql',
-			user     : 'notauser',
-			password : "wrong password",
-			query    : { pool: true, debug: true }
-		};
-
-		var expected = JSON.stringify(opts);
-
-		ORM.connect(opts, function (err, db) {
-			should.equal(
-				JSON.stringify(opts),
-				expected
-			);
-			done();
-		});
-	});
-
-	it("should emit no error if ok", function (done) {
-		var db = ORM.connect(common.getConnectionString());
-
-		db.on("connect", function (err) {
-			should.not.exist(err);
-
-			return done();
-		});
-	});
-
-	describe("if no connection error", function () {
-		var db = null;
-
-		before(function (done) {
-			helper.connect(function (connection) {
-				db = connection;
-
-				return done();
-			});
-		});
-
-		after(function () {
-			return db.close();
-		});
-
-		it("should be able to ping the server", function (done) {
-			db.ping(function () {
-				return done();
-			});
-		});
-	});
-
-	describe("if callback is passed", function (done) {
-		it("should return an error if empty url is passed", function (done) {
-			ORM.connect("", function (err) {
-				err.message.should.equal("CONNECTION_URL_EMPTY");
-
-				return done();
-			});
-		});
-
-		it("should return an error if no protocol is passed", function (done) {
-			ORM.connect("user@db", function (err) {
-				err.message.should.equal("CONNECTION_URL_NO_PROTOCOL");
-
-				return done();
-			});
-		});
-
-		it("should return an error if unknown protocol is passed", function (done) {
-			ORM.connect("unknown://db", function (err) {
-				should.equal(err.literalCode, 'NO_SUPPORT');
-				should.equal(
-					err.message,
-					"Connection protocol not supported - have you installed the database driver for unknown?"
-				);
-
-				return done();
-			});
-		});
-	});
-
-	if (protocol != 'mongodb') {
-		describe("query options", function () {
-			it("should understand pool `'false'` from query string", function (done) {
-				var connString = common.getConnectionString() + "debug=false&pool=false";
-				ORM.connect(connString, function (err, db) {
-					should.not.exist(err);
-					should.strictEqual(db.driver.opts.pool,  false);
-					should.strictEqual(db.driver.opts.debug, false);
-					done();
-				});
-			});
-
-			it("should understand pool `'0'` from query string", function (done) {
-				var connString = common.getConnectionString() + "debug=0&pool=0";
-				ORM.connect(connString, function (err, db) {
-					should.not.exist(err);
-					should.strictEqual(db.driver.opts.pool,  false);
-					should.strictEqual(db.driver.opts.debug, false);
-					done();
-				});
-			});
-
-			it("should understand pool `'true'` from query string", function (done) {
-				var connString = common.getConnectionString() + "debug=true&pool=true";
-				ORM.connect(connString, function (err, db) {
-					should.not.exist(err);
-					should.strictEqual(db.driver.opts.pool,  true);
-					should.strictEqual(db.driver.opts.debug, true);
-					done();
-				});
-			});
-
-			it("should understand pool `'1'` from query string", function (done) {
-				var connString = common.getConnectionString() + "debug=1&pool=1";
-				ORM.connect(connString, function (err, db) {
-					should.not.exist(err);
-					should.strictEqual(db.driver.opts.pool,  true);
-					should.strictEqual(db.driver.opts.debug, true);
-					done();
-				});
-			});
-
-			it("should understand pool `true` from query options", function (done) {
-				var connOpts = _.extend(common.getConfig(), {
-					protocol: common.protocol(),
-					query: {
-					  pool: true, debug: true
-					}
-				});
-				ORM.connect(connOpts, function (err, db) {
-					should.not.exist(err);
-					should.strictEqual(db.driver.opts.pool,  true);
-					should.strictEqual(db.driver.opts.debug, true);
-					done();
-				});
-			});
-
-			it("should understand pool `false` from query options", function (done) {
-				var connOpts = _.extend(common.getConfig(), {
-					protocol: common.protocol(),
-					query: {
-					  pool: false, debug: false
-					}
-				});
-				ORM.connect(connOpts, function (err, db) {
-					should.not.exist(err);
-					should.strictEqual(db.driver.opts.pool,  false);
-					should.strictEqual(db.driver.opts.debug, false);
-					done();
-				});
-			});
-		});
-	}
+  it("should emit an error if no url is passed", function (done) {
+    var db = ORM.connect();
+
+    db.on("connect", function (err) {
+      err.message.should.equal("CONNECTION_URL_EMPTY");
+
+      return done();
+    });
+  });
+
+  it("should allow protocol alias", function (done) {
+    var db = ORM.connect("pg://127.0.0.2");
+
+    db.once("connect", function (err) {
+      should.exist(err);
+      err.message.should.not.equal("CONNECTION_PROTOCOL_NOT_SUPPORTED");
+
+      return done();
+    });
+  });
+
+  it("should emit an error if empty url is passed", function (done) {
+    var db = ORM.connect("");
+
+    db.on("connect", function (err) {
+      err.message.should.equal("CONNECTION_URL_EMPTY");
+
+      return done();
+    });
+  });
+
+  it("should emit an error if empty url (with only spaces) is passed", function (done) {
+    var db = ORM.connect("   ");
+
+    db.on("connect", function (err) {
+      err.message.should.equal("CONNECTION_URL_EMPTY");
+
+      return done();
+    });
+  });
+
+  it("should emit an error if no protocol is passed", function (done) {
+    var db = ORM.connect("user@db");
+
+    db.on("connect", function (err) {
+      err.message.should.equal("CONNECTION_URL_NO_PROTOCOL");
+
+      return done();
+    });
+  });
+
+  it("should emit an error if unknown protocol is passed", function (done) {
+    var db = ORM.connect("unknown://db");
+
+    db.on("connect", function (err) {
+      should.equal(err.literalCode, 'NO_SUPPORT');
+      should.equal(
+        err.message,
+        "Connection protocol not supported - have you installed the database driver for unknown?"
+      );
+
+      return done();
+    });
+  });
+
+  it("should emit an error if cannot connect", function (done) {
+    var db = ORM.connect("mysql://fakeuser:nopassword@127.0.0.1/unknowndb");
+
+    db.on("connect", function (err) {
+      should.exist(err);
+      should.equal(err.message.indexOf("Connection protocol not supported"), -1);
+      err.message.should.not.equal("CONNECTION_URL_NO_PROTOCOL");
+      err.message.should.not.equal("CONNECTION_URL_EMPTY");
+
+      return done();
+    });
+  });
+
+  it("should emit valid error if exception being thrown during connection try", function (done) {
+    var testConfig = {
+      protocol : 'mongodb',
+      href     : 'unknownhost',
+      database : 'unknowndb',
+      user     : '',
+      password : ''
+    },
+    db = ORM.connect(testConfig);
+
+    db.on("connect", function (err) {
+      should.exist(err);
+      should.equal(err.message.indexOf("Connection protocol not supported"), -1);
+      err.message.should.not.equal("CONNECTION_URL_NO_PROTOCOL");
+      err.message.should.not.equal("CONNECTION_URL_EMPTY");
+
+      return done();
+    });
+  });
+
+  it("should not modify connection opts", function (done) {
+    var opts = {
+      protocol : 'mysql',
+      user     : 'notauser',
+      password : "wrong password",
+      query    : { pool: true, debug: true }
+    };
+
+    var expected = JSON.stringify(opts);
+
+    ORM.connect(opts, function (err, db) {
+      should.equal(
+        JSON.stringify(opts),
+        expected
+      );
+      done();
+    });
+  });
+
+  it("should emit no error if ok", function (done) {
+    var db = ORM.connect(common.getConnectionString());
+
+    db.on("connect", function (err) {
+      should.not.exist(err);
+
+      return done();
+    });
+  });
+
+  describe("if no connection error", function () {
+    var db = null;
+
+    before(function (done) {
+      helper.connect(function (connection) {
+        db = connection;
+
+        return done();
+      });
+    });
+
+    after(function () {
+      return db.close();
+    });
+
+    it("should be able to ping the server", function (done) {
+      db.ping(function () {
+        return done();
+      });
+    });
+  });
+
+  describe("if callback is passed", function (done) {
+    it("should return an error if empty url is passed", function (done) {
+      ORM.connect("", function (err) {
+        err.message.should.equal("CONNECTION_URL_EMPTY");
+
+        return done();
+      });
+    });
+
+    it("should return an error if no protocol is passed", function (done) {
+      ORM.connect("user@db", function (err) {
+        err.message.should.equal("CONNECTION_URL_NO_PROTOCOL");
+
+        return done();
+      });
+    });
+
+    it("should return an error if unknown protocol is passed", function (done) {
+      ORM.connect("unknown://db", function (err) {
+        should.equal(err.literalCode, 'NO_SUPPORT');
+        should.equal(
+          err.message,
+          "Connection protocol not supported - have you installed the database driver for unknown?"
+        );
+
+        return done();
+      });
+    });
+  });
+
+  if (protocol != 'mongodb') {
+    describe("query options", function () {
+      it("should understand pool `'false'` from query string", function (done) {
+        var connString = common.getConnectionString() + "debug=false&pool=false";
+        ORM.connect(connString, function (err, db) {
+          should.not.exist(err);
+          should.strictEqual(db.driver.opts.pool,  false);
+          should.strictEqual(db.driver.opts.debug, false);
+          done();
+        });
+      });
+
+      it("should understand pool `'0'` from query string", function (done) {
+        var connString = common.getConnectionString() + "debug=0&pool=0";
+        ORM.connect(connString, function (err, db) {
+          should.not.exist(err);
+          should.strictEqual(db.driver.opts.pool,  false);
+          should.strictEqual(db.driver.opts.debug, false);
+          done();
+        });
+      });
+
+      it("should understand pool `'true'` from query string", function (done) {
+        var connString = common.getConnectionString() + "debug=true&pool=true";
+        ORM.connect(connString, function (err, db) {
+          should.not.exist(err);
+          should.strictEqual(db.driver.opts.pool,  true);
+          should.strictEqual(db.driver.opts.debug, true);
+          done();
+        });
+      });
+
+      it("should understand pool `'1'` from query string", function (done) {
+        var connString = common.getConnectionString() + "debug=1&pool=1";
+        ORM.connect(connString, function (err, db) {
+          should.not.exist(err);
+          should.strictEqual(db.driver.opts.pool,  true);
+          should.strictEqual(db.driver.opts.debug, true);
+          done();
+        });
+      });
+
+      it("should understand pool `true` from query options", function (done) {
+        var connOpts = _.extend(common.getConfig(), {
+          protocol: common.protocol(),
+          query: {
+            pool: true, debug: true
+          }
+        });
+        ORM.connect(connOpts, function (err, db) {
+          should.not.exist(err);
+          should.strictEqual(db.driver.opts.pool,  true);
+          should.strictEqual(db.driver.opts.debug, true);
+          done();
+        });
+      });
+
+      it("should understand pool `false` from query options", function (done) {
+        var connOpts = _.extend(common.getConfig(), {
+          protocol: common.protocol(),
+          query: {
+            pool: false, debug: false
+          }
+        });
+        ORM.connect(connOpts, function (err, db) {
+          should.not.exist(err);
+          should.strictEqual(db.driver.opts.pool,  false);
+          should.strictEqual(db.driver.opts.debug, false);
+          done();
+        });
+      });
+    });
+  }
 });
 
 describe("ORM.use()", function () {
-	it("should be able to use an established connection", function (done) {
-		var db = new sqlite.Database(':memory:');
+  it("should be able to use an established connection", function (done) {
+    var db = new sqlite.Database(':memory:');
 
-		ORM.use(db, "sqlite", function (err) {
-			should.not.exist(err);
+    ORM.use(db, "sqlite", function (err) {
+      should.not.exist(err);
 
-			return done();
-		});
-	});
+      return done();
+    });
+  });
 
-	it("should be accept protocol alias", function (done) {
-		var db = new pg.Client();
+  it("should be accept protocol alias", function (done) {
+    var db = new pg.Client();
 
-		ORM.use(db, "pg", function (err) {
-			should.equal(err, null);
+    ORM.use(db, "pg", function (err) {
+      should.equal(err, null);
 
-			return done();
-		});
-	});
+      return done();
+    });
+  });
 
-	it("should return an error in callback if protocol not supported", function (done) {
-		var db = new pg.Client();
+  it("should return an error in callback if protocol not supported", function (done) {
+    var db = new pg.Client();
 
-		ORM.use(db, "unknowndriver", function (err) {
-			should.exist(err);
+    ORM.use(db, "unknowndriver", function (err) {
+      should.exist(err);
 
-			return done();
-		});
-	});
+      return done();
+    });
+  });
 });
diff --git a/test/integration/predefined-validators.js b/test/integration/predefined-validators.js
index 632abb85..688a19f4 100644
--- a/test/integration/predefined-validators.js
+++ b/test/integration/predefined-validators.js
@@ -6,108 +6,108 @@ var protocol = common.protocol().toLowerCase();
 var undef      = undefined;
 
 function checkValidation(done, expected) {
-	return function (returned) {
-		should.equal(returned, expected);
+  return function (returned) {
+    should.equal(returned, expected);
 
-		return done();
-	};
+    return done();
+  };
 }
 
 describe("Predefined Validators", function () {
 
-	describe("equalToProperty('name')", function () {
-		it("should pass if equal", function (done) {
-			validators.equalToProperty('name').call({ name: "John Doe" }, 'John Doe', checkValidation(done));
-		});
-		it("should not pass if not equal", function (done) {
-			validators.equalToProperty('name').call({ name: "John" }, 'John Doe', checkValidation(done, 'not-equal-to-property'));
-		});
-		it("should not pass even if equal to other property", function (done) {
-			validators.equalToProperty('name').call({ surname: "John Doe" }, 'John Doe', checkValidation(done, 'not-equal-to-property'));
-		});
-	});
-
-	describe("unique()", function () {
-	    if (protocol === "mongodb") return;
-
-		var db = null;
-		var Person = null;
-
-		var setup = function () {
-			return function (done) {
-				Person = db.define("person", {
-					name    : String,
-					surname : String
-				}, {
-					validations: {
-						surname: validators.unique()
-					}
-				});
-
-				Person.settings.set("instance.returnAllErrors", false);
-
-				return helper.dropSync(Person, function () {
-					Person.create([{
-						name    : "John",
-						surname : "Doe"
-					}], done);
-				});
-			};
-		};
-
-		before(function (done) {
-			helper.connect(function (connection) {
-				db = connection;
-
-				return setup()(done);
-			});
-		});
-
-		after(function () {
-			return db.close();
-		});
-
-		it("should not pass if more elements with that property exist", function (done) {
-			var janeDoe = new Person({
-				name    : "Jane",
-				surname : "Doe" // <-- in table already!
-			});
-			janeDoe.save(function (err) {
-				err.should.be.a.Object();
-				err.should.have.property("property", "surname");
-				err.should.have.property("value",    "Doe");
-				err.should.have.property("msg",      "not-unique");
-
-				return done();
-			});
-		});
-
-		it("should pass if no more elements with that property exist", function (done) {
-			var janeDean = new Person({
-				name    : "Jane",
-				surname : "Dean" // <-- not in table
-			});
-			janeDean.save(function (err) {
-				should.equal(err, null);
-
-				return done();
-			});
-		});
-
-		it("should pass if resaving the same instance", function (done) {
-			Person.find({ name: "John", surname: "Doe" }, function (err, Johns) {
-				should.equal(err, null);
-				Johns.should.have.property("length", 1);
-
-				Johns[0].surname = "Doe"; // forcing resave
-
-				Johns[0].save(function (err) {
-					should.equal(err, null);
-
-					return done();
-				});
-			});
-		});
-	});
+  describe("equalToProperty('name')", function () {
+    it("should pass if equal", function (done) {
+      validators.equalToProperty('name').call({ name: "John Doe" }, 'John Doe', checkValidation(done));
+    });
+    it("should not pass if not equal", function (done) {
+      validators.equalToProperty('name').call({ name: "John" }, 'John Doe', checkValidation(done, 'not-equal-to-property'));
+    });
+    it("should not pass even if equal to other property", function (done) {
+      validators.equalToProperty('name').call({ surname: "John Doe" }, 'John Doe', checkValidation(done, 'not-equal-to-property'));
+    });
+  });
+
+  describe("unique()", function () {
+      if (protocol === "mongodb") return;
+
+    var db = null;
+    var Person = null;
+
+    var setup = function () {
+      return function (done) {
+        Person = db.define("person", {
+          name    : String,
+          surname : String
+        }, {
+          validations: {
+            surname: validators.unique()
+          }
+        });
+
+        Person.settings.set("instance.returnAllErrors", false);
+
+        return helper.dropSync(Person, function () {
+          Person.create([{
+            name    : "John",
+            surname : "Doe"
+          }], done);
+        });
+      };
+    };
+
+    before(function (done) {
+      helper.connect(function (connection) {
+        db = connection;
+
+        return setup()(done);
+      });
+    });
+
+    after(function () {
+      return db.close();
+    });
+
+    it("should not pass if more elements with that property exist", function (done) {
+      var janeDoe = new Person({
+        name    : "Jane",
+        surname : "Doe" // <-- in table already!
+      });
+      janeDoe.save(function (err) {
+        err.should.be.a.Object();
+        err.should.have.property("property", "surname");
+        err.should.have.property("value",    "Doe");
+        err.should.have.property("msg",      "not-unique");
+
+        return done();
+      });
+    });
+
+    it("should pass if no more elements with that property exist", function (done) {
+      var janeDean = new Person({
+        name    : "Jane",
+        surname : "Dean" // <-- not in table
+      });
+      janeDean.save(function (err) {
+        should.equal(err, null);
+
+        return done();
+      });
+    });
+
+    it("should pass if resaving the same instance", function (done) {
+      Person.find({ name: "John", surname: "Doe" }, function (err, Johns) {
+        should.equal(err, null);
+        Johns.should.have.property("length", 1);
+
+        Johns[0].surname = "Doe"; // forcing resave
+
+        Johns[0].save(function (err) {
+          should.equal(err, null);
+
+          return done();
+        });
+      });
+    });
+  });
 
 });
diff --git a/test/integration/property-custom.js b/test/integration/property-custom.js
index 96978ccd..ca8bf64e 100644
--- a/test/integration/property-custom.js
+++ b/test/integration/property-custom.js
@@ -4,171 +4,171 @@ var common   = require('../common');
 var ORM      = require('../../');
 
 describe("custom types", function() {
-	if (common.protocol() == 'mongodb') return;
-
-	var db = null;
-
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
-
-			done();
-		});
-	});
-
-	after(function () {
-		db.close();
-	});
-
-	describe("simple", function () {
-		var LottoTicket = null;
-
-		before(function (done) {
-			db.defineType('numberArray', {
-				datastoreType: function(prop) {
-					return 'TEXT'
-				},
-				valueToProperty: function(value, prop) {
-					if (Array.isArray(value)) {
-						return value;
-					} else {
-						return value.split(',').map(function (v) {
-							return Number(v);
-						});
-					}
-				},
-				propertyToValue: function(value, prop) {
-					return value.join(',')
-				}
-			});
-
-			LottoTicket = db.define('lotto_ticket', {
-				numbers: { type: 'numberArray' }
-			});
-
-			return helper.dropSync(LottoTicket, done);
-		});
-
-		it("should create the table", function () {
-			should(true);
-		});
-
-		it("should store data in the table", function (done) {
-			var ticket = new LottoTicket({ numbers: [4,23,6,45,9,12,3,29] });
-
-			ticket.save(function (err) {
-				should.not.exist(err);
-
-				LottoTicket.find().all(function (err, items) {
-					should.not.exist(err);
-					should.equal(items.length, 1);
-					should(Array.isArray(items[0].numbers));
-
-					[4,23,6,45,9,12,3,29].should.eql(items[0].numbers);
-
-					done();
-				});
-			});
-		});
-
-		describe("hasMany extra properties", function () {
-			it("should work", function (done) {
-				db.defineType('customDate', {
-			    datastoreType: function (prop) {
-			      return 'TEXT';
-			    }
-			  });
-				var Person = db.define('person', {
-					name    : String,
-					surname : String,
-					age     : Number
-				});
-				var Pet = db.define('pet', {
-					name    : String
-				});
-				Person.hasMany('pets', Pet, { date: { type: 'customDate' } }, { autoFetch: true });
-
-				return helper.dropSync([ Person, Pet ], function (err) {
-					should.not.exist(err);
-
-					Person.create({
-						name    : "John",
-						surname : "Doe",
-						age     : 20
-					}, function (err, person) {
-						should.not.exist(err);
-
-						Pet.create({ name: 'Fido' }, function (err, pet) {
-							should.not.exist(err);
-
-							person.addPets(pet, { date: '2014-05-20' }, function (err) {
-								should.not.exist(err);
-
-								Person.get(person.id, function (err, freshPerson) {
-									should.not.exist(err);
-									should.equal(freshPerson.pets.length, 1);
-									should.equal(freshPerson.pets[0].extra.date, '2014-05-20');
-									done();
-								});
-							});
-						});
-					});
-				});
-			});
-		});
-	});
-
-	describe("complex", function () {
-		var WonkyTotal = null;
-
-		before(function (done) {
-			db.defineType('wonkyNumber', {
-				datastoreType: function (prop) {
-					return 'INTEGER';
-				},
-				datastoreGet: function (prop, helper) {
-					return helper.escape('?? - 1', [prop.mapsTo]);
-				},
-				valueToProperty: function (value, prop) {
-					return value + 7;
-				},
-				propertyToValue: function (value, prop) {
-					if (value == null) {
-						return value;
-					} else {
-						return function (helper) {
-							return helper.escape('(? - 2)', [value]);
-						};
-					}
-				}
-			});
-
-			WonkyTotal = db.define('wonky', {
-				name:  String,
-				total: { type: 'wonkyNumber', mapsTo: 'blah_total' }
-			});
-
-			return helper.dropSync(WonkyTotal, done);
-		});
-
-		it("should store wonky total in a differently named field", function (done) {
-			var item = new WonkyTotal();
-
-			item.name  = "cabbages";
-			item.total = 8;
-
-			item.save(function (err) {
-				should.not.exist(err);
-				should.equal(item.total, 15);
-
-				WonkyTotal.get(item.id, function (err, item) {
-					should.not.exist(err);
-					should.equal(item.total, 19); // (15 - 2) - 1 + 7
-
-					done();
-				});
-			});
-		});
-	});
+  if (common.protocol() == 'mongodb') return;
+
+  var db = null;
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      done();
+    });
+  });
+
+  after(function () {
+    db.close();
+  });
+
+  describe("simple", function () {
+    var LottoTicket = null;
+
+    before(function (done) {
+      db.defineType('numberArray', {
+        datastoreType: function(prop) {
+          return 'TEXT'
+        },
+        valueToProperty: function(value, prop) {
+          if (Array.isArray(value)) {
+            return value;
+          } else {
+            return value.split(',').map(function (v) {
+              return Number(v);
+            });
+          }
+        },
+        propertyToValue: function(value, prop) {
+          return value.join(',')
+        }
+      });
+
+      LottoTicket = db.define('lotto_ticket', {
+        numbers: { type: 'numberArray' }
+      });
+
+      return helper.dropSync(LottoTicket, done);
+    });
+
+    it("should create the table", function () {
+      should(true);
+    });
+
+    it("should store data in the table", function (done) {
+      var ticket = new LottoTicket({ numbers: [4,23,6,45,9,12,3,29] });
+
+      ticket.save(function (err) {
+        should.not.exist(err);
+
+        LottoTicket.find().all(function (err, items) {
+          should.not.exist(err);
+          should.equal(items.length, 1);
+          should(Array.isArray(items[0].numbers));
+
+          [4,23,6,45,9,12,3,29].should.eql(items[0].numbers);
+
+          done();
+        });
+      });
+    });
+
+    describe("hasMany extra properties", function () {
+      it("should work", function (done) {
+        db.defineType('customDate', {
+          datastoreType: function (prop) {
+            return 'TEXT';
+          }
+        });
+        var Person = db.define('person', {
+          name    : String,
+          surname : String,
+          age     : Number
+        });
+        var Pet = db.define('pet', {
+          name    : String
+        });
+        Person.hasMany('pets', Pet, { date: { type: 'customDate' } }, { autoFetch: true });
+
+        return helper.dropSync([ Person, Pet ], function (err) {
+          should.not.exist(err);
+
+          Person.create({
+            name    : "John",
+            surname : "Doe",
+            age     : 20
+          }, function (err, person) {
+            should.not.exist(err);
+
+            Pet.create({ name: 'Fido' }, function (err, pet) {
+              should.not.exist(err);
+
+              person.addPets(pet, { date: '2014-05-20' }, function (err) {
+                should.not.exist(err);
+
+                Person.get(person.id, function (err, freshPerson) {
+                  should.not.exist(err);
+                  should.equal(freshPerson.pets.length, 1);
+                  should.equal(freshPerson.pets[0].extra.date, '2014-05-20');
+                  done();
+                });
+              });
+            });
+          });
+        });
+      });
+    });
+  });
+
+  describe("complex", function () {
+    var WonkyTotal = null;
+
+    before(function (done) {
+      db.defineType('wonkyNumber', {
+        datastoreType: function (prop) {
+          return 'INTEGER';
+        },
+        datastoreGet: function (prop, helper) {
+          return helper.escape('?? - 1', [prop.mapsTo]);
+        },
+        valueToProperty: function (value, prop) {
+          return value + 7;
+        },
+        propertyToValue: function (value, prop) {
+          if (value == null) {
+            return value;
+          } else {
+            return function (helper) {
+              return helper.escape('(? - 2)', [value]);
+            };
+          }
+        }
+      });
+
+      WonkyTotal = db.define('wonky', {
+        name:  String,
+        total: { type: 'wonkyNumber', mapsTo: 'blah_total' }
+      });
+
+      return helper.dropSync(WonkyTotal, done);
+    });
+
+    it("should store wonky total in a differently named field", function (done) {
+      var item = new WonkyTotal();
+
+      item.name  = "cabbages";
+      item.total = 8;
+
+      item.save(function (err) {
+        should.not.exist(err);
+        should.equal(item.total, 15);
+
+        WonkyTotal.get(item.id, function (err, item) {
+          should.not.exist(err);
+          should.equal(item.total, 19); // (15 - 2) - 1 + 7
+
+          done();
+        });
+      });
+    });
+  });
 
 });
diff --git a/test/integration/property-lazyload.js b/test/integration/property-lazyload.js
index 9723063e..3149eaa0 100644
--- a/test/integration/property-lazyload.js
+++ b/test/integration/property-lazyload.js
@@ -3,133 +3,133 @@ var helper   = require('../support/spec_helper');
 var ORM      = require('../../');
 
 describe("LazyLoad properties", function() {
-	var db = null;
-	var Person = null;
-	var PersonPhoto = new Buffer(1024); // fake photo
-	var OtherPersonPhoto = new Buffer(1024); // other fake photo
+  var db = null;
+  var Person = null;
+  var PersonPhoto = new Buffer(1024); // fake photo
+  var OtherPersonPhoto = new Buffer(1024); // other fake photo
 
-	var setup = function () {
-		return function (done) {
-			Person = db.define("person", {
-				name   : String,
-				photo  : { type: "binary", lazyload: true }
-			});
+  var setup = function () {
+    return function (done) {
+      Person = db.define("person", {
+        name   : String,
+        photo  : { type: "binary", lazyload: true }
+      });
 
-			ORM.singleton.clear();
+      ORM.singleton.clear();
 
-			return helper.dropSync(Person, function () {
-				Person.create({
-					name  : "John Doe",
-					photo : PersonPhoto
-				}, done);
-			});
-		};
-	};
+      return helper.dropSync(Person, function () {
+        Person.create({
+          name  : "John Doe",
+          photo : PersonPhoto
+        }, done);
+      });
+    };
+  };
 
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
 
-			return done();
-		});
-	});
+      return done();
+    });
+  });
 
-	after(function () {
-		return db.close();
-	});
+  after(function () {
+    return db.close();
+  });
 
-	describe("when defined", function () {
-		before(setup());
+  describe("when defined", function () {
+    before(setup());
 
-		it("should not be available when fetching an instance", function (done) {
-			Person.find().first(function (err, John) {
-				should.equal(err, null);
+    it("should not be available when fetching an instance", function (done) {
+      Person.find().first(function (err, John) {
+        should.equal(err, null);
 
-				John.should.be.a.Object();
+        John.should.be.a.Object();
 
-				John.should.have.property("name", "John Doe");
-				John.should.have.property("photo", null);
+        John.should.have.property("name", "John Doe");
+        John.should.have.property("photo", null);
 
-				return done();
-			});
-		});
+        return done();
+      });
+    });
 
-		it("should have apropriate accessors", function (done) {
-			Person.find().first(function (err, John) {
-				should.equal(err, null);
+    it("should have apropriate accessors", function (done) {
+      Person.find().first(function (err, John) {
+        should.equal(err, null);
 
-				John.should.be.a.Object();
-				John.getPhoto.should.be.a.Function();
-				John.setPhoto.should.be.a.Function();
-				John.removePhoto.should.be.a.Function();
+        John.should.be.a.Object();
+        John.getPhoto.should.be.a.Function();
+        John.setPhoto.should.be.a.Function();
+        John.removePhoto.should.be.a.Function();
 
-				return done();
-			});
-		});
+        return done();
+      });
+    });
 
-		it("getAccessor should return property", function (done) {
-			Person.find().first(function (err, John) {
-				should.equal(err, null);
+    it("getAccessor should return property", function (done) {
+      Person.find().first(function (err, John) {
+        should.equal(err, null);
 
-				John.should.be.a.Object();
+        John.should.be.a.Object();
 
-				John.getPhoto(function (err, photo) {
-					should.equal(err, null);
-					photo.toString().should.equal(PersonPhoto.toString());
+        John.getPhoto(function (err, photo) {
+          should.equal(err, null);
+          photo.toString().should.equal(PersonPhoto.toString());
 
-					return done();
-				});
-			});
-		});
+          return done();
+        });
+      });
+    });
 
-		it("setAccessor should change property", function (done) {
-			Person.find().first(function (err, John) {
-				should.equal(err, null);
+    it("setAccessor should change property", function (done) {
+      Person.find().first(function (err, John) {
+        should.equal(err, null);
 
-				John.should.be.a.Object();
+        John.should.be.a.Object();
 
-				John.setPhoto(OtherPersonPhoto, function (err) {
-					should.equal(err, null);
+        John.setPhoto(OtherPersonPhoto, function (err) {
+          should.equal(err, null);
 
-					Person.find().first(function (err, John) {
-						should.equal(err, null);
+          Person.find().first(function (err, John) {
+            should.equal(err, null);
 
-						John.should.be.a.Object();
+            John.should.be.a.Object();
 
-						John.getPhoto(function (err, photo) {
-							should.equal(err, null);
-							photo.toString().should.equal(OtherPersonPhoto.toString());
+            John.getPhoto(function (err, photo) {
+              should.equal(err, null);
+              photo.toString().should.equal(OtherPersonPhoto.toString());
 
-							return done();
-						});
-					});
-				});
-			});
-		});
+              return done();
+            });
+          });
+        });
+      });
+    });
 
-		it("removeAccessor should change property", function (done) {
-			Person.find().first(function (err, John) {
-				should.equal(err, null);
+    it("removeAccessor should change property", function (done) {
+      Person.find().first(function (err, John) {
+        should.equal(err, null);
 
-				John.should.be.a.Object();
+        John.should.be.a.Object();
 
-				John.removePhoto(function (err) {
-					should.equal(err, null);
+        John.removePhoto(function (err) {
+          should.equal(err, null);
 
-					Person.get(John[Person.id], function (err, John) {
-						should.equal(err, null);
+          Person.get(John[Person.id], function (err, John) {
+            should.equal(err, null);
 
-						John.should.be.a.Object();
+            John.should.be.a.Object();
 
-						John.getPhoto(function (err, photo) {
-							should.equal(err, null);
-							should.equal(photo, null);
+            John.getPhoto(function (err, photo) {
+              should.equal(err, null);
+              should.equal(photo, null);
 
-							return done();
-						});
-					});
-				});
-			});
-		});
-	});
+              return done();
+            });
+          });
+        });
+      });
+    });
+  });
 });
diff --git a/test/integration/property-maps-to.js b/test/integration/property-maps-to.js
index 625e7aba..be425a91 100644
--- a/test/integration/property-maps-to.js
+++ b/test/integration/property-maps-to.js
@@ -7,285 +7,285 @@ var ORM      = require('../../');
 if (common.protocol() == "mongodb") return;
 
 describe("Property.mapsTo", function() {
-	var db = null;
-
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
-			db.settings.set('instance.identityCache', false);
-
-			return done();
-		});
-	});
-
-	after(function () {
-		return db.close();
-	});
-
-	describe("normal", function () {
-		var Book = null;
-		var id1 = null, id2 = null;
-
-		before(function (done) {
-			Book = db.define("book", {
-				title: { type: 'text', mapsTo: 'book_title', required: true },
-				pages: { type: 'integer', required: false }
-			});
-			return helper.dropSync(Book, done);
-		});
-
-		it("should create", function (done) {
-			Book.create({ title: "History of the wheel", pages: 297 }, function (err, book) {
-				should.not.exist(err);
-				should.exist(book);
-				should.equal(book.title, "History of the wheel");
-				id1 = book.id;
-
-				done()
-			});
-		});
-
-		it("should save new", function (done) {
-			book = new Book({ title: "Stuff", pages: 33 })
-			book.save(function (err, book) {
-				should.not.exist(err);
-				should.exist(book);
-				should.equal(book.title, "Stuff");
-				id2 = book.id;
-
-				done()
-			});
-		});
-
-		it("should get book1", function (done) {
-			Book.get(id1, function (err, book) {
-				should.not.exist(err);
-				should.exist(book);
-				should.equal(book.title, "History of the wheel");
-				done();
-			});
-		});
-
-		it("should get book2", function (done) {
-			Book.get(id2, function (err, book) {
-				should.not.exist(err);
-				should.exist(book);
-				should.equal(book.title, "Stuff");
-				done();
-			});
-		});
-
-		it("should find", function (done) {
-			Book.one({ title: "History of the wheel" }, function (err, book) {
-				should.not.exist(err);
-				should.exist(book);
-				should.equal(book.title, "History of the wheel");
-				done();
-			});
-		});
-
-		it("should update", function (done) {
-			Book.one(function (err, book) {
-				should.not.exist(err);
-				should.exist(book);
-				should.equal(book.title, "History of the wheel");
-
-				book.title = "Quantum theory";
-				book.pages = 5;
-
-				book.save(function (err) {
-					should.not.exist(err);
-					should.equal(book.title, "Quantum theory");
-
-					Book.get(book.id, function (err, freshBook) {
-						should.not.exist(err);
-						should.exist(freshBook);
-						should.equal(book.title, "Quantum theory");
-						done();
-					});
-				});
-			});
-		});
-
-		it("should order", function (done) {
-			Book.create({ title: "Zzz", pages: 2 }, function (err) {
-				should.not.exist(err);
-
-				Book.create({ title: "Aaa", pages: 3 }, function (err) {
-					should.not.exist(err);
-
-					Book.find().order("-title").all(function (err, items) {
-						should.not.exist(err);
-						should.equal(
-							_.map(items, 'title').join(','),
-							"Zzz,Stuff,Quantum theory,Aaa"
-						)
-						Book.find().order("title").all(function (err, items) {
-							should.not.exist(err);
-							should.equal(
-								_.map(items, 'title').join(','),
-								"Aaa,Quantum theory,Stuff,Zzz"
-							)
-							done();
-						});
-					});
-				});
-			});
-		});
-	});
-
-	describe("keys", function () {
-		var Person = null;
-		var id1 = null, id2 = null;
-
-		before(function (done) {
-			Person = db.define("person", {
-				firstName: { type: 'text', mapsTo: 'first_name', key: true },
-				lastName:  { type: 'text', mapsTo: 'last_name',  key: true },
-				age:       { type: 'integer' }
-			});
-
-			return helper.dropSync(Person, done);
-		});
-
-		it("should throw an error if invalid keys are specified", function () {
-			(function () {
-				db.define("blah", {
-					name: { type: 'text' }
-				}, {
-					id: ['banana']
-				});
-			}).should.throw("Model defined without any keys");
-		});
-
-		it("should create", function (done) {
-			Person.create({ firstName: 'John', lastName: 'Smith', age: 48 }, function (err, person) {
-				should.not.exist(err);
-				should.exist(person);
-				should.equal(person.firstName, 'John');
-				should.equal(person.lastName,  'Smith');
-				id1 = [person.firstName, person.lastName];
-
-				done()
-			});
-		});
-
-		it("should save new", function (done) {
-			person = new Person({ firstName: 'Jane', lastName: 'Doe', age: 50 });
-
-			person.save(function (err) {
-				should.not.exist(err);
-				should.exist(person);
-				should.equal(person.firstName, 'Jane');
-				should.equal(person.lastName,  'Doe');
-				id2 = [person.firstName, person.lastName];
-
-				done()
-			});
-		});
-
-		it("should get person1", function (done) {
-			Person.get(id1[0], id1[1], function (err, person) {
-				should.not.exist(err);
-				should.exist(person);
-				should.equal(person.firstName, 'John');
-				should.equal(person.lastName,  'Smith');
-				done();
-			});
-		});
-
-		it("should get person2", function (done) {
-			Person.get(id2[0], id2[1], function (err, person) {
-				should.not.exist(err);
-				should.exist(person);
-				should.equal(person.firstName, 'Jane');
-				should.equal(person.lastName,  'Doe');
-				done();
-			});
-		});
-
-		it("should find", function (done) {
-			Person.one({ firstName: 'Jane' }, function (err, person) {
-				should.not.exist(err);
-				should.exist(person);
-				should.equal(person.firstName, 'Jane');
-				should.equal(person.lastName,  'Doe');
-				done();
-			});
-		});
-
-		it("should update", function (done) {
-			Person.one({ firstName: 'Jane' }, function (err, person) {
-				should.not.exist(err);
-				should.exist(person);
-
-				person.firstName = 'Jeniffer';
-				person.save(function (err) {
-					should.not.exist(err);
-
-					should.equal(person.firstName, 'Jeniffer');
-					should.equal(person.lastName,  'Doe');
-
-					Person.get(person.firstName, person.lastName, function (err, freshPerson) {
-						should.not.exist(err);
-						should.exist(freshPerson);
-
-						should.equal(freshPerson.firstName, 'Jeniffer');
-						should.equal(freshPerson.lastName,  'Doe');
-
-						freshPerson.lastName = 'Dee';
-						freshPerson.save(function (err) {
-							should.not.exist(err);
-
-							should.equal(freshPerson.firstName, 'Jeniffer');
-							should.equal(freshPerson.lastName,  'Dee');
-
-							Person.get(freshPerson.firstName, freshPerson.lastName, function (err, jennifer) {
-								should.not.exist(err);
-
-								should.equal(jennifer.firstName, 'Jeniffer');
-								should.equal(jennifer.lastName,  'Dee');
-
-								done();
-							});
-						});
-					});
-				});
-			});
-		});
-
-		it("should count", function (done) {
-			Person.create({ firstName: 'Greg', lastName: 'McDoofus', age: 30 }, function (err, person) {
-				should.not.exist(err);
-
-				Person.find({ firstName: 'Greg', lastName: 'McDoofus' }).count(function (err, count) {
-					should.not.exist(err);
-					should.equal(count, 1);
-					done();
-				});
-			});
-		});
-
-		it("should chain delete", function (done) {
-			Person.create({ firstName: 'Alfred', lastName: 'McDoogle', age: 50 }, function (err, person) {
-				should.not.exist(err);
-
-				Person.find({ firstName: 'Alfred', lastName: 'McDoogle' }).count(function (err, count) {
-					should.not.exist(err);
-					should.equal(count, 1);
-
-					Person.find({ firstName: 'Alfred', lastName: 'McDoogle' }).remove(function (err) {
-						should.not.exist(err);
-
-						Person.find({ firstName: 'Alfred', lastName: 'McDoogle' }).count(function (err, count) {
-							should.not.exist(err);
-							should.equal(count, 0);
-
-							done()
-						});
-					});
-				});
-			});
-		});
-	});
+  var db = null;
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+      db.settings.set('instance.identityCache', false);
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  describe("normal", function () {
+    var Book = null;
+    var id1 = null, id2 = null;
+
+    before(function (done) {
+      Book = db.define("book", {
+        title: { type: 'text', mapsTo: 'book_title', required: true },
+        pages: { type: 'integer', required: false }
+      });
+      return helper.dropSync(Book, done);
+    });
+
+    it("should create", function (done) {
+      Book.create({ title: "History of the wheel", pages: 297 }, function (err, book) {
+        should.not.exist(err);
+        should.exist(book);
+        should.equal(book.title, "History of the wheel");
+        id1 = book.id;
+
+        done()
+      });
+    });
+
+    it("should save new", function (done) {
+      book = new Book({ title: "Stuff", pages: 33 })
+      book.save(function (err, book) {
+        should.not.exist(err);
+        should.exist(book);
+        should.equal(book.title, "Stuff");
+        id2 = book.id;
+
+        done()
+      });
+    });
+
+    it("should get book1", function (done) {
+      Book.get(id1, function (err, book) {
+        should.not.exist(err);
+        should.exist(book);
+        should.equal(book.title, "History of the wheel");
+        done();
+      });
+    });
+
+    it("should get book2", function (done) {
+      Book.get(id2, function (err, book) {
+        should.not.exist(err);
+        should.exist(book);
+        should.equal(book.title, "Stuff");
+        done();
+      });
+    });
+
+    it("should find", function (done) {
+      Book.one({ title: "History of the wheel" }, function (err, book) {
+        should.not.exist(err);
+        should.exist(book);
+        should.equal(book.title, "History of the wheel");
+        done();
+      });
+    });
+
+    it("should update", function (done) {
+      Book.one(function (err, book) {
+        should.not.exist(err);
+        should.exist(book);
+        should.equal(book.title, "History of the wheel");
+
+        book.title = "Quantum theory";
+        book.pages = 5;
+
+        book.save(function (err) {
+          should.not.exist(err);
+          should.equal(book.title, "Quantum theory");
+
+          Book.get(book.id, function (err, freshBook) {
+            should.not.exist(err);
+            should.exist(freshBook);
+            should.equal(book.title, "Quantum theory");
+            done();
+          });
+        });
+      });
+    });
+
+    it("should order", function (done) {
+      Book.create({ title: "Zzz", pages: 2 }, function (err) {
+        should.not.exist(err);
+
+        Book.create({ title: "Aaa", pages: 3 }, function (err) {
+          should.not.exist(err);
+
+          Book.find().order("-title").all(function (err, items) {
+            should.not.exist(err);
+            should.equal(
+              _.map(items, 'title').join(','),
+              "Zzz,Stuff,Quantum theory,Aaa"
+            )
+            Book.find().order("title").all(function (err, items) {
+              should.not.exist(err);
+              should.equal(
+                _.map(items, 'title').join(','),
+                "Aaa,Quantum theory,Stuff,Zzz"
+              )
+              done();
+            });
+          });
+        });
+      });
+    });
+  });
+
+  describe("keys", function () {
+    var Person = null;
+    var id1 = null, id2 = null;
+
+    before(function (done) {
+      Person = db.define("person", {
+        firstName: { type: 'text', mapsTo: 'first_name', key: true },
+        lastName:  { type: 'text', mapsTo: 'last_name',  key: true },
+        age:       { type: 'integer' }
+      });
+
+      return helper.dropSync(Person, done);
+    });
+
+    it("should throw an error if invalid keys are specified", function () {
+      (function () {
+        db.define("blah", {
+          name: { type: 'text' }
+        }, {
+          id: ['banana']
+        });
+      }).should.throw("Model defined without any keys");
+    });
+
+    it("should create", function (done) {
+      Person.create({ firstName: 'John', lastName: 'Smith', age: 48 }, function (err, person) {
+        should.not.exist(err);
+        should.exist(person);
+        should.equal(person.firstName, 'John');
+        should.equal(person.lastName,  'Smith');
+        id1 = [person.firstName, person.lastName];
+
+        done()
+      });
+    });
+
+    it("should save new", function (done) {
+      person = new Person({ firstName: 'Jane', lastName: 'Doe', age: 50 });
+
+      person.save(function (err) {
+        should.not.exist(err);
+        should.exist(person);
+        should.equal(person.firstName, 'Jane');
+        should.equal(person.lastName,  'Doe');
+        id2 = [person.firstName, person.lastName];
+
+        done()
+      });
+    });
+
+    it("should get person1", function (done) {
+      Person.get(id1[0], id1[1], function (err, person) {
+        should.not.exist(err);
+        should.exist(person);
+        should.equal(person.firstName, 'John');
+        should.equal(person.lastName,  'Smith');
+        done();
+      });
+    });
+
+    it("should get person2", function (done) {
+      Person.get(id2[0], id2[1], function (err, person) {
+        should.not.exist(err);
+        should.exist(person);
+        should.equal(person.firstName, 'Jane');
+        should.equal(person.lastName,  'Doe');
+        done();
+      });
+    });
+
+    it("should find", function (done) {
+      Person.one({ firstName: 'Jane' }, function (err, person) {
+        should.not.exist(err);
+        should.exist(person);
+        should.equal(person.firstName, 'Jane');
+        should.equal(person.lastName,  'Doe');
+        done();
+      });
+    });
+
+    it("should update", function (done) {
+      Person.one({ firstName: 'Jane' }, function (err, person) {
+        should.not.exist(err);
+        should.exist(person);
+
+        person.firstName = 'Jeniffer';
+        person.save(function (err) {
+          should.not.exist(err);
+
+          should.equal(person.firstName, 'Jeniffer');
+          should.equal(person.lastName,  'Doe');
+
+          Person.get(person.firstName, person.lastName, function (err, freshPerson) {
+            should.not.exist(err);
+            should.exist(freshPerson);
+
+            should.equal(freshPerson.firstName, 'Jeniffer');
+            should.equal(freshPerson.lastName,  'Doe');
+
+            freshPerson.lastName = 'Dee';
+            freshPerson.save(function (err) {
+              should.not.exist(err);
+
+              should.equal(freshPerson.firstName, 'Jeniffer');
+              should.equal(freshPerson.lastName,  'Dee');
+
+              Person.get(freshPerson.firstName, freshPerson.lastName, function (err, jennifer) {
+                should.not.exist(err);
+
+                should.equal(jennifer.firstName, 'Jeniffer');
+                should.equal(jennifer.lastName,  'Dee');
+
+                done();
+              });
+            });
+          });
+        });
+      });
+    });
+
+    it("should count", function (done) {
+      Person.create({ firstName: 'Greg', lastName: 'McDoofus', age: 30 }, function (err, person) {
+        should.not.exist(err);
+
+        Person.find({ firstName: 'Greg', lastName: 'McDoofus' }).count(function (err, count) {
+          should.not.exist(err);
+          should.equal(count, 1);
+          done();
+        });
+      });
+    });
+
+    it("should chain delete", function (done) {
+      Person.create({ firstName: 'Alfred', lastName: 'McDoogle', age: 50 }, function (err, person) {
+        should.not.exist(err);
+
+        Person.find({ firstName: 'Alfred', lastName: 'McDoogle' }).count(function (err, count) {
+          should.not.exist(err);
+          should.equal(count, 1);
+
+          Person.find({ firstName: 'Alfred', lastName: 'McDoogle' }).remove(function (err) {
+            should.not.exist(err);
+
+            Person.find({ firstName: 'Alfred', lastName: 'McDoogle' }).count(function (err, count) {
+              should.not.exist(err);
+              should.equal(count, 0);
+
+              done()
+            });
+          });
+        });
+      });
+    });
+  });
 });
diff --git a/test/integration/property-number-size.js b/test/integration/property-number-size.js
index 80a4896b..b4b3e2dd 100644
--- a/test/integration/property-number-size.js
+++ b/test/integration/property-number-size.js
@@ -13,119 +13,119 @@ function round(num, points) {
 }
 
 function fuzzyEql(num1, num2) {
-	return round(num1 / num2, 3) == 1;
+  return round(num1 / num2, 3) == 1;
 }
 
 if (protocol != "sqlite") {
-	describe("Number Properties", function() {
-		var db = null;
-		var NumberSize = null;
-		var NumberData = {
-			int2   : 32700,
-			int4   : 2147483000,
-			int8   : 2251799813685248,
-			float4 : 1 * Math.pow(10, 36),
-			float8 : 1 * Math.pow(10, 306)
-		};
-
-		var setup = function () {
-			return function (done) {
-				NumberSize = db.define("number_size", {
-					int2   : { type: 'integer', size: 2 },
-					int4   : { type: 'integer', size: 4 },
-					int8   : { type: 'integer', size: 8 },
-					float4 : { type: 'number',  size: 4 },
-					float8 : { type: 'number',  size: 8 }
-				});
-
-				return helper.dropSync(NumberSize, function () {
-					NumberSize.create(NumberData, done);
-				});
-			};
-		};
-
-		before(function (done) {
-			helper.connect(function (connection) {
-				db = connection;
-
-				return done();
-			});
-		});
-
-		after(function () {
-			return db.close();
-		});
-
-		describe("when storing", function () {
-			before(setup());
-
-			it("should be able to store near MAX sized values for each field", function (done) {
-				NumberSize.one(function (err, Item) {
-					should.equal(err, null);
-
-					should(fuzzyEql(Item.int2,   NumberData.int2));
-					should(fuzzyEql(Item.int4,   NumberData.int4));
-					should(fuzzyEql(Item.int8,   NumberData.int8));
-					should(fuzzyEql(Item.float4, NumberData.float4));
-					should(fuzzyEql(Item.float8, NumberData.float8));
-
-					return done();
-				});
-			});
-
-			it("should not be able to store int2 values which are too large", function (done) {
-				NumberSize.create({ int2 : NumberData.int4 }, function (err, item) {
-					if (protocol == "mysql") {
-						should.equal(err, null);
-
-						return NumberSize.get(item.id, function (err, item) {
-							should(!fuzzyEql(item.int2, NumberData.int4));
-
-							return done();
-						});
-					} else {
-						err.should.be.a.Object();
-					}
-
-					return done();
-				});
-			});
-
-			it("should not be able to store int4 values which are too large", function (done) {
-				NumberSize.create({ int4 : NumberData.int8 }, function (err, item) {
-					if (protocol == "mysql") {
-						should.equal(err, null);
-
-						return NumberSize.get(item.id, function (err, item) {
-							should(!fuzzyEql(item.int4, NumberData.int8));
-
-							return done();
-						});
-					} else {
-						err.should.be.a.Object();
-					}
-
-					return done();
-				});
-			});
-
-			it("should not be able to store float4 values which are too large", function (done) {
-				NumberSize.create({ float4 : NumberData.float8 }, function (err, item) {
-					if (protocol == "mysql") {
-						should.equal(err, null);
-
-						return NumberSize.get(item.id, function (err, item) {
-							should(!fuzzyEql(item.float4, NumberData.float8));
-
-							return done();
-						});
-					} else {
-						err.should.be.a.Object();
-					}
-
-					return done();
-				});
-			});
-		});
-	});
+  describe("Number Properties", function() {
+    var db = null;
+    var NumberSize = null;
+    var NumberData = {
+      int2   : 32700,
+      int4   : 2147483000,
+      int8   : 2251799813685248,
+      float4 : 1 * Math.pow(10, 36),
+      float8 : 1 * Math.pow(10, 306)
+    };
+
+    var setup = function () {
+      return function (done) {
+        NumberSize = db.define("number_size", {
+          int2   : { type: 'integer', size: 2 },
+          int4   : { type: 'integer', size: 4 },
+          int8   : { type: 'integer', size: 8 },
+          float4 : { type: 'number',  size: 4 },
+          float8 : { type: 'number',  size: 8 }
+        });
+
+        return helper.dropSync(NumberSize, function () {
+          NumberSize.create(NumberData, done);
+        });
+      };
+    };
+
+    before(function (done) {
+      helper.connect(function (connection) {
+        db = connection;
+
+        return done();
+      });
+    });
+
+    after(function () {
+      return db.close();
+    });
+
+    describe("when storing", function () {
+      before(setup());
+
+      it("should be able to store near MAX sized values for each field", function (done) {
+        NumberSize.one(function (err, Item) {
+          should.equal(err, null);
+
+          should(fuzzyEql(Item.int2,   NumberData.int2));
+          should(fuzzyEql(Item.int4,   NumberData.int4));
+          should(fuzzyEql(Item.int8,   NumberData.int8));
+          should(fuzzyEql(Item.float4, NumberData.float4));
+          should(fuzzyEql(Item.float8, NumberData.float8));
+
+          return done();
+        });
+      });
+
+      it("should not be able to store int2 values which are too large", function (done) {
+        NumberSize.create({ int2 : NumberData.int4 }, function (err, item) {
+          if (protocol == "mysql") {
+            should.equal(err, null);
+
+            return NumberSize.get(item.id, function (err, item) {
+              should(!fuzzyEql(item.int2, NumberData.int4));
+
+              return done();
+            });
+          } else {
+            err.should.be.a.Object();
+          }
+
+          return done();
+        });
+      });
+
+      it("should not be able to store int4 values which are too large", function (done) {
+        NumberSize.create({ int4 : NumberData.int8 }, function (err, item) {
+          if (protocol == "mysql") {
+            should.equal(err, null);
+
+            return NumberSize.get(item.id, function (err, item) {
+              should(!fuzzyEql(item.int4, NumberData.int8));
+
+              return done();
+            });
+          } else {
+            err.should.be.a.Object();
+          }
+
+          return done();
+        });
+      });
+
+      it("should not be able to store float4 values which are too large", function (done) {
+        NumberSize.create({ float4 : NumberData.float8 }, function (err, item) {
+          if (protocol == "mysql") {
+            should.equal(err, null);
+
+            return NumberSize.get(item.id, function (err, item) {
+              should(!fuzzyEql(item.float4, NumberData.float8));
+
+              return done();
+            });
+          } else {
+            err.should.be.a.Object();
+          }
+
+          return done();
+        });
+      });
+    });
+  });
 }
diff --git a/test/integration/property-timezones.js b/test/integration/property-timezones.js
index 94491234..88fea8c7 100644
--- a/test/integration/property-timezones.js
+++ b/test/integration/property-timezones.js
@@ -5,104 +5,104 @@ var ORM      = require('../../');
 
 if (common.protocol() == "mongodb") return;
 if (common.protocol() == "sqlite" && !common.getConfig().pathname) {
-	// sqlite needs a pathname for this test (because of reconnecting)
-	// if using memory, when disconnecting everything is lost and this
-	// test needs it
-	return;
+  // sqlite needs a pathname for this test (because of reconnecting)
+  // if using memory, when disconnecting everything is lost and this
+  // test needs it
+  return;
 }
 
 describe("Timezones", function() {
-	var db    = null;
-	var Event = null;
-
-	var setup = function (opts) {
-		return function (done) {
-			helper.connect({ query: opts.query }, function (connection) {
-				db = connection;
-				db.settings.set('instance.identityCache', false);
-
-				Event = db.define("event", {
-					name : { type: 'text' },
-					when : { type: 'date', time: true }
-				});
-
-				if (opts.sync) {
-					return helper.dropSync(Event, done);
-				} else {
-					return done();
-				}
-			});
-		};
-	};
-
-	describe("specified", function () {
-		var a, zones = [ 'local', '-0734'/*, '+11:22'*/ ];
-
-		for (a = 0; a < zones.length; a++ ) {
-			describe(zones[a], function () {
-				before(setup({ sync: true, query: { timezone: zones[a] } }));
-
-				after(function () {
-					return db.close();
-				});
-
-				it("should get back the same date that was stored", function (done) {
-					var when = new Date(2013, 12, 5, 5, 34, 27);
-
-					Event.create({ name: "raid fridge", when: when }, function (err) {
-						should.not.exist(err);
-
-						Event.one({ name: "raid fridge" }, function (err, item) {
-							should.not.exist(err);
-							item.when.should.eql(when);
-
-							return done();
-						});
-					});
-				});
-			});
-		}
-	});
-
-	describe("different for each connection", function () {
-		before(setup({
-			sync  : true,
-			query : { timezone: '+0200' }
-		}));
-
-		after(function () {
-			return db.close();
-		});
-
-		// This isn't consistent accross drivers. Needs more thinking and investigation.
-		it("should get back a correctly offset time", function (done) {
-			var when = new Date(2013, 12, 5, 5, 34, 27);
-
-			Event.create({ name: "raid fridge", when: when }, function (err, new_event) {
-				should.not.exist(err);
-
-				Event.one({ name: "raid fridge" }, function (err, item) {
-					should.not.exist(err);
-					new_event.should.not.equal(item); // new_event was not cached
-					should.equal(new_event.when.toISOString(), item.when.toISOString());
-
-					db.close(function () {
-						setup({
-							sync  : false, // don't recreate table, don't want to loose previous value
-							query : { timezone: '+0400' }
-						})(function () {
-							Event.one({ name: "raid fridge" }, function (err, item) {
-								var expected = new Date(2013, 12, 5, 3, 34, 27);
-
-								should.not.exist(err);
-								item.when.should.eql(expected);
-
-								return done();
-							});
-						});
-					});
-				});
-			});
-		});
-	});
+  var db    = null;
+  var Event = null;
+
+  var setup = function (opts) {
+    return function (done) {
+      helper.connect({ query: opts.query }, function (connection) {
+        db = connection;
+        db.settings.set('instance.identityCache', false);
+
+        Event = db.define("event", {
+          name : { type: 'text' },
+          when : { type: 'date', time: true }
+        });
+
+        if (opts.sync) {
+          return helper.dropSync(Event, done);
+        } else {
+          return done();
+        }
+      });
+    };
+  };
+
+  describe("specified", function () {
+    var a, zones = [ 'local', '-0734'/*, '+11:22'*/ ];
+
+    for (a = 0; a < zones.length; a++ ) {
+      describe(zones[a], function () {
+        before(setup({ sync: true, query: { timezone: zones[a] } }));
+
+        after(function () {
+          return db.close();
+        });
+
+        it("should get back the same date that was stored", function (done) {
+          var when = new Date(2013, 12, 5, 5, 34, 27);
+
+          Event.create({ name: "raid fridge", when: when }, function (err) {
+            should.not.exist(err);
+
+            Event.one({ name: "raid fridge" }, function (err, item) {
+              should.not.exist(err);
+              item.when.should.eql(when);
+
+              return done();
+            });
+          });
+        });
+      });
+    }
+  });
+
+  describe("different for each connection", function () {
+    before(setup({
+      sync  : true,
+      query : { timezone: '+0200' }
+    }));
+
+    after(function () {
+      return db.close();
+    });
+
+    // This isn't consistent accross drivers. Needs more thinking and investigation.
+    it("should get back a correctly offset time", function (done) {
+      var when = new Date(2013, 12, 5, 5, 34, 27);
+
+      Event.create({ name: "raid fridge", when: when }, function (err, new_event) {
+        should.not.exist(err);
+
+        Event.one({ name: "raid fridge" }, function (err, item) {
+          should.not.exist(err);
+          new_event.should.not.equal(item); // new_event was not cached
+          should.equal(new_event.when.toISOString(), item.when.toISOString());
+
+          db.close(function () {
+            setup({
+              sync  : false, // don't recreate table, don't want to loose previous value
+              query : { timezone: '+0400' }
+            })(function () {
+              Event.one({ name: "raid fridge" }, function (err, item) {
+                var expected = new Date(2013, 12, 5, 3, 34, 27);
+
+                should.not.exist(err);
+                item.when.should.eql(expected);
+
+                return done();
+              });
+            });
+          });
+        });
+      });
+    });
+  });
 });
diff --git a/test/integration/property.js b/test/integration/property.js
index cc77ec43..61c82929 100644
--- a/test/integration/property.js
+++ b/test/integration/property.js
@@ -3,104 +3,104 @@ var ORM      = require("../..");
 var Property = ORM.Property;
 
 describe("Property", function () {
-	it("passing String should return type: 'text'", function (done) {
-		Property.normalize(
-			{ prop: String, customTypes: {}, settings: ORM.settings, name: 'abc' }
-		).type.should.equal("text");
-
-		return done();
-	});
-	it("passing Number should return type: 'number'", function (done) {
-		Property.normalize(
-			{ prop: Number, customTypes: {}, settings: ORM.settings, name: 'abc' }
-		).type.should.equal("number");
-
-		return done();
-	});
-	it("passing deprecated rational: false number should return type: 'integer'", function (done) {
-		Property.normalize(
-			{ prop: {type: 'number', rational: false}, customTypes: {}, settings: ORM.settings, name: 'abc'}
-		).type.should.equal("integer");
-
-		return done();
-	});
-
-	it("passing Boolean should return type: 'boolean'", function (done) {
-		Property.normalize(
-			{ prop: Boolean, customTypes: {}, settings: ORM.settings, name: 'abc' }
-		).type.should.equal("boolean");
-
-		return done();
-	});
-	it("passing Date should return type: 'date'", function (done) {
-		Property.normalize(
-			{ prop: Date, customTypes: {}, settings: ORM.settings, name: 'abc' }
-		).type.should.equal("date");
-
-		return done();
-	});
-	it("passing Object should return type: 'object'", function (done) {
-		Property.normalize(
-			{ prop: Object, customTypes: {}, settings: ORM.settings, name: 'abc' }
-		).type.should.equal("object");
-
-		return done();
-	});
-	it("passing Buffer should return type: 'binary'", function (done) {
-		Property.normalize(
-			{ prop: Buffer, customTypes: {}, settings: ORM.settings, name: 'abc' }
-		).type.should.equal("binary");
-
-		return done();
-	});
-	it("passing an Array of items should return type: 'enum' with list of items", function (done) {
-		var prop = Property.normalize(
-			{ prop: [1, 2, 3], customTypes: {}, settings: ORM.settings, name: 'abc' }
-		)
-
-		prop.type.should.equal("enum");
-		prop.values.should.have.property("length", 3);
-
-		return done();
-	});
-	describe("passing a string type", function () {
-		it("should return type: <type>", function (done) {
-			Property.normalize(
-				{ prop: "text", customTypes: {}, settings: ORM.settings, name: 'abc' }
-			).type.should.equal("text");
-
-			return done();
-		});
+  it("passing String should return type: 'text'", function (done) {
+    Property.normalize(
+      { prop: String, customTypes: {}, settings: ORM.settings, name: 'abc' }
+    ).type.should.equal("text");
+
+    return done();
+  });
+  it("passing Number should return type: 'number'", function (done) {
+    Property.normalize(
+      { prop: Number, customTypes: {}, settings: ORM.settings, name: 'abc' }
+    ).type.should.equal("number");
+
+    return done();
+  });
+  it("passing deprecated rational: false number should return type: 'integer'", function (done) {
+    Property.normalize(
+      { prop: {type: 'number', rational: false}, customTypes: {}, settings: ORM.settings, name: 'abc'}
+    ).type.should.equal("integer");
+
+    return done();
+  });
+
+  it("passing Boolean should return type: 'boolean'", function (done) {
+    Property.normalize(
+      { prop: Boolean, customTypes: {}, settings: ORM.settings, name: 'abc' }
+    ).type.should.equal("boolean");
+
+    return done();
+  });
+  it("passing Date should return type: 'date'", function (done) {
+    Property.normalize(
+      { prop: Date, customTypes: {}, settings: ORM.settings, name: 'abc' }
+    ).type.should.equal("date");
+
+    return done();
+  });
+  it("passing Object should return type: 'object'", function (done) {
+    Property.normalize(
+      { prop: Object, customTypes: {}, settings: ORM.settings, name: 'abc' }
+    ).type.should.equal("object");
+
+    return done();
+  });
+  it("passing Buffer should return type: 'binary'", function (done) {
+    Property.normalize(
+      { prop: Buffer, customTypes: {}, settings: ORM.settings, name: 'abc' }
+    ).type.should.equal("binary");
+
+    return done();
+  });
+  it("passing an Array of items should return type: 'enum' with list of items", function (done) {
+    var prop = Property.normalize(
+      { prop: [1, 2, 3], customTypes: {}, settings: ORM.settings, name: 'abc' }
+    )
+
+    prop.type.should.equal("enum");
+    prop.values.should.have.property("length", 3);
+
+    return done();
+  });
+  describe("passing a string type", function () {
+    it("should return type: <type>", function (done) {
+      Property.normalize(
+        { prop: "text", customTypes: {}, settings: ORM.settings, name: 'abc' }
+      ).type.should.equal("text");
+
+      return done();
+    });
     it("should accept: 'point'", function (done) {
       Property.normalize(
-				{ prop: "point", customTypes: {}, settings: ORM.settings, name: 'abc' }
-			).type.should.equal("point");
+        { prop: "point", customTypes: {}, settings: ORM.settings, name: 'abc' }
+      ).type.should.equal("point");
 
       return done();
     });
 
-		describe("if not valid", function () {
-			it("should throw", function (done) {
-				(function () {
-					Property.normalize(
-						{ prop: "string", customTypes: {}, settings: ORM.settings, name: 'abc' }
-					)
-				}).should.throw();
-
-				return done();
-			});
-		});
-	});
-	it("should not modify the original property object", function (done) {
-		var original = { type: 'text', required: true };
-
-		var normalized = Property.normalize(
-			{ prop: original, customTypes: {}, settings: ORM.settings, name: 'abc' }
-		);
-
-		original.test = 3;
-		should.strictEqual(normalized.test, undefined);
-
-		return done();
-	});
+    describe("if not valid", function () {
+      it("should throw", function (done) {
+        (function () {
+          Property.normalize(
+            { prop: "string", customTypes: {}, settings: ORM.settings, name: 'abc' }
+          )
+        }).should.throw();
+
+        return done();
+      });
+    });
+  });
+  it("should not modify the original property object", function (done) {
+    var original = { type: 'text', required: true };
+
+    var normalized = Property.normalize(
+      { prop: original, customTypes: {}, settings: ORM.settings, name: 'abc' }
+    );
+
+    original.test = 3;
+    should.strictEqual(normalized.test, undefined);
+
+    return done();
+  });
 });
diff --git a/test/integration/settings.js b/test/integration/settings.js
index 5f8c399c..29dcd6c6 100644
--- a/test/integration/settings.js
+++ b/test/integration/settings.js
@@ -4,136 +4,136 @@ var ORM      = require('../../');
 var Settings = ORM.Settings;
 
 describe("Settings", function () {
-	describe("changed on connection instance", function() {
-		it("should not change global defaults", function (done) {
-			var setting = 'instance.returnAllErrors';
-			var defaultValue = ORM.settings.get(setting);
-
-			helper.connect(function (db) {
-				db.settings.set(setting, !defaultValue);
-				db.close();
-
-				helper.connect(function (db) {
-					db.settings.get(setting).should.equal(defaultValue);
-					db.close();
-					done();
-				});
-			});
-		});
-	});
-
-	describe("#get", function () {
-		var settings, returned;
-
-		beforeEach(function () {
-			settings = new Settings.Container({ a: [1,2] });
-			returned = null;
-		});
-
-		it("should clone everything it returns", function () {
-			returned = settings.get('*');
-			returned.a = 123;
-
-			settings.get('a').should.eql([1,2]);
-		});
-
-		it("should deep clone everything it returns", function () {
-			returned = settings.get('*');
-			returned.a.push(3);
-
-			settings.get('a').should.eql([1,2]);
-		});
-	});
-
-	describe("manipulating:", function () {
-		var testFunction = function testFunction() {
-			return "test";
-		};
-		var settings = new Settings.Container({});
-
-		describe("some.sub.object = 123.45", function () {
-			before(function (done) {
-				settings.set("some.sub.object", 123.45);
-				return done();
-			});
-
-			it("should be 123.45", function (done) {
-				settings.get("some.sub.object").should.equal(123.45);
-
-				return done();
-			});
-		});
-
-		describe("some....object = testFunction", function () {
-			before(function (done) {
-				settings.set("some....object", testFunction);
-				return done();
-			});
-
-			it("should be testFunction", function (done) {
-				settings.get("some....object").should.equal(testFunction);
-
-				return done();
-			});
-		});
-
-		describe("not setting some.unknown.object", function () {
-			it("should be undefined", function (done) {
-				should.equal(settings.get("some.unknown.object"), undefined);
-
-				return done();
-			});
-		});
-
-		describe("unsetting some.sub.object", function () {
-			before(function (done) {
-				settings.unset("some.sub.object");
-				return done();
-			});
-
-			it("should be undefined", function (done) {
-				should.equal(settings.get("some.sub.object"), undefined);
-
-				return done();
-			});
-		});
-
-		describe("unsetting some....object", function () {
-			before(function (done) {
-				settings.unset("some....object");
-				return done();
-			});
-
-			it("should be undefined", function (done) {
-				should.equal(settings.get("some....object"), undefined);
-
-				return done();
-			});
-		});
-
-		describe("unsetting some.*", function () {
-			before(function (done) {
-				settings.unset("some.*");
-				return done();
-			});
-
-			it("should return undefined for any 'some' sub-element", function (done) {
-				should.equal(settings.get("some.other.stuff"), undefined);
-
-				return done();
-			});
-			it("should return an empty object for some.*", function (done) {
-				settings.get("some.*").should.be.a.Object();
-				Object.keys(settings.get("some.*")).should.have.lengthOf(0);
-
-				return done();
-			});
-			it("should return an empty object for some", function (done) {
-				settings.get("some").should.be.a.Object();
-				Object.keys(settings.get("some")).should.have.lengthOf(0);
-
-				return done();
-			});
-		});
-	});
+  describe("changed on connection instance", function() {
+    it("should not change global defaults", function (done) {
+      var setting = 'instance.returnAllErrors';
+      var defaultValue = ORM.settings.get(setting);
+
+      helper.connect(function (db) {
+        db.settings.set(setting, !defaultValue);
+        db.close();
+
+        helper.connect(function (db) {
+          db.settings.get(setting).should.equal(defaultValue);
+          db.close();
+          done();
+        });
+      });
+    });
+  });
+
+  describe("#get", function () {
+    var settings, returned;
+
+    beforeEach(function () {
+      settings = new Settings.Container({ a: [1,2] });
+      returned = null;
+    });
+
+    it("should clone everything it returns", function () {
+      returned = settings.get('*');
+      returned.a = 123;
+
+      settings.get('a').should.eql([1,2]);
+    });
+
+    it("should deep clone everything it returns", function () {
+      returned = settings.get('*');
+      returned.a.push(3);
+
+      settings.get('a').should.eql([1,2]);
+    });
+  });
+
+  describe("manipulating:", function () {
+    var testFunction = function testFunction() {
+      return "test";
+    };
+    var settings = new Settings.Container({});
+
+    describe("some.sub.object = 123.45", function () {
+      before(function (done) {
+        settings.set("some.sub.object", 123.45);
+        return done();
+      });
+
+      it("should be 123.45", function (done) {
+        settings.get("some.sub.object").should.equal(123.45);
+
+        return done();
+      });
+    });
+
+    describe("some....object = testFunction", function () {
+      before(function (done) {
+        settings.set("some....object", testFunction);
+        return done();
+      });
+
+      it("should be testFunction", function (done) {
+        settings.get("some....object").should.equal(testFunction);
+
+        return done();
+      });
+    });
+
+    describe("not setting some.unknown.object", function () {
+      it("should be undefined", function (done) {
+        should.equal(settings.get("some.unknown.object"), undefined);
+
+        return done();
+      });
+    });
+
+    describe("unsetting some.sub.object", function () {
+      before(function (done) {
+        settings.unset("some.sub.object");
+        return done();
+      });
+
+      it("should be undefined", function (done) {
+        should.equal(settings.get("some.sub.object"), undefined);
+
+        return done();
+      });
+    });
+
+    describe("unsetting some....object", function () {
+      before(function (done) {
+        settings.unset("some....object");
+        return done();
+      });
+
+      it("should be undefined", function (done) {
+        should.equal(settings.get("some....object"), undefined);
+
+        return done();
+      });
+    });
+
+    describe("unsetting some.*", function () {
+      before(function (done) {
+        settings.unset("some.*");
+        return done();
+      });
+
+      it("should return undefined for any 'some' sub-element", function (done) {
+        should.equal(settings.get("some.other.stuff"), undefined);
+
+        return done();
+      });
+      it("should return an empty object for some.*", function (done) {
+        settings.get("some.*").should.be.a.Object();
+        Object.keys(settings.get("some.*")).should.have.lengthOf(0);
+
+        return done();
+      });
+      it("should return an empty object for some", function (done) {
+        settings.get("some").should.be.a.Object();
+        Object.keys(settings.get("some")).should.have.lengthOf(0);
+
+        return done();
+      });
+    });
+  });
 });
diff --git a/test/integration/smart-types.js b/test/integration/smart-types.js
index 7445411d..d7b1d125 100644
--- a/test/integration/smart-types.js
+++ b/test/integration/smart-types.js
@@ -4,130 +4,130 @@ var ORM      = require('../../');
 
 describe("Smart types", function () {
     this.timeout(0);
-	var db = null;
-	var User = null;
-	var Profile = null;
-	var Post = null;
-	var Group = null;
-
-	var setup = function () {
-		return function (done) {
-		    User = db.define("user", {
-		        username: { type: 'text', size: 64 },
+  var db = null;
+  var User = null;
+  var Profile = null;
+  var Post = null;
+  var Group = null;
+
+  var setup = function () {
+    return function (done) {
+        User = db.define("user", {
+            username: { type: 'text', size: 64 },
                 password: { type: 'text', size: 128 }
-		    }, {
+        }, {
                 id: 'username'
-		    });
+        });
 
-		    Profile = User.extendsTo("profile", {
-		        firstname: String,
+        Profile = User.extendsTo("profile", {
+            firstname: String,
                 lastname: String
-		    }, {
-		        reverse: 'user',
+        }, {
+            reverse: 'user',
                 required: true
-		    });
+        });
 
-		    Group = db.define("group", {
-		        name: { type: 'text', size: 64 }
-		    }, {
+        Group = db.define("group", {
+            name: { type: 'text', size: 64 }
+        }, {
                 id: 'name'
-		    });
-		    Group.hasMany('users', User, {}, {
+        });
+        Group.hasMany('users', User, {}, {
                 reverse: 'groups'
-		    });
+        });
 
-		    Post = db.define("post", {
+        Post = db.define("post", {
                 content: String
-		    }, {
+        }, {
 
-		    });
-		    Post.hasOne('user', User, {
+        });
+        Post.hasOne('user', User, {
                 reverse: 'posts'
-		    });
-
-			ORM.singleton.clear();
-			return helper.dropSync([ User, Profile, Group, Post ], function () {
-			    User.create({
-			        username: 'billy',
-			        password: 'hashed password'
-			    }, function (err, billy) {
-			        should.not.exist(err);
-			        billy.setProfile(new Profile({ firstname: 'William', lastname: 'Franklin' }), function (err, profile) {
-			            should.not.exist(err);
-			            billy.addGroups([new Group({ name: 'admins' }), new Group({ name: 'developers' })], function (err, groups) {
-			                should.not.exist(err);
-			                billy.setPosts(new Post({content: 'Hello world!'}), function(err, posts) {
-			                    should.not.exist(err);
-			                    done();
-			                });
-			            });
-			        });
-			    });
-			});
-		};
-	};
-
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
-
-			return done();
-		});
-	});
-
-	after(function () {
-		return db.close();
-	});
-
-	describe("extends", function () {
-		before(setup());
-
-		it("should be able to get extendsTo with custom id", function (done) {
-		    User.get('billy', function (err, billy) {
-		        should.not.exist(err);
-		        should.exist(billy);
-
-		        billy.getProfile(function (err, profile) {
-		            should.not.exist(err);
-		            should.exist(profile);
-		            should.equal(profile.firstname, 'William');
-		            should.equal(profile.lastname, 'Franklin');
-
-		            done();
-		        });
-		    });
-		});
-
-		it("should be able to get hasOne with custom id", function (done) {
-		    User.get('billy', function (err, billy) {
-		        should.not.exist(err);
-		        should.exist(billy);
-
-		        billy.getPosts(function (err, posts) {
-		            should.not.exist(err);
-		            should.exist(posts);
-		            should.equal(posts.length, 1);
-		            should.equal(posts[0].content, 'Hello world!');
-
-		            done();
-		        });
-		    });
-		});
-
-		it("should be able to get hasMany with custom id", function (done) {
-		    User.get('billy', function (err, billy) {
-		        should.not.exist(err);
-		        should.exist(billy);
-
-		        billy.getGroups(function (err, groups) {
-		            should.not.exist(err);
-		            should.exist(groups);
-		            should.equal(groups.length, 2);
-
-		            done();
-		        });
-		    });
-		});
-
-	});
+        });
+
+      ORM.singleton.clear();
+      return helper.dropSync([ User, Profile, Group, Post ], function () {
+          User.create({
+              username: 'billy',
+              password: 'hashed password'
+          }, function (err, billy) {
+              should.not.exist(err);
+              billy.setProfile(new Profile({ firstname: 'William', lastname: 'Franklin' }), function (err, profile) {
+                  should.not.exist(err);
+                  billy.addGroups([new Group({ name: 'admins' }), new Group({ name: 'developers' })], function (err, groups) {
+                      should.not.exist(err);
+                      billy.setPosts(new Post({content: 'Hello world!'}), function(err, posts) {
+                          should.not.exist(err);
+                          done();
+                      });
+                  });
+              });
+          });
+      });
+    };
+  };
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  describe("extends", function () {
+    before(setup());
+
+    it("should be able to get extendsTo with custom id", function (done) {
+        User.get('billy', function (err, billy) {
+            should.not.exist(err);
+            should.exist(billy);
+
+            billy.getProfile(function (err, profile) {
+                should.not.exist(err);
+                should.exist(profile);
+                should.equal(profile.firstname, 'William');
+                should.equal(profile.lastname, 'Franklin');
+
+                done();
+            });
+        });
+    });
+
+    it("should be able to get hasOne with custom id", function (done) {
+        User.get('billy', function (err, billy) {
+            should.not.exist(err);
+            should.exist(billy);
+
+            billy.getPosts(function (err, posts) {
+                should.not.exist(err);
+                should.exist(posts);
+                should.equal(posts.length, 1);
+                should.equal(posts[0].content, 'Hello world!');
+
+                done();
+            });
+        });
+    });
+
+    it("should be able to get hasMany with custom id", function (done) {
+        User.get('billy', function (err, billy) {
+            should.not.exist(err);
+            should.exist(billy);
+
+            billy.getGroups(function (err, groups) {
+                should.not.exist(err);
+                should.exist(groups);
+                should.equal(groups.length, 2);
+
+                done();
+            });
+        });
+    });
+
+  });
 });
diff --git a/test/integration/validation.js b/test/integration/validation.js
index 6af30fa1..909b5253 100644
--- a/test/integration/validation.js
+++ b/test/integration/validation.js
@@ -7,484 +7,484 @@ var protocol = common.protocol().toLowerCase();
 var ORM      = require('../../');
 
 describe("Validations", function() {
-	var db = null;
-	var Person = null;
-	var Person2 = null;
-
-	var setup = function (returnAll, required) {
-		return function (done) {
-			db.settings.set('properties.required',      required);
-			db.settings.set('instance.returnAllErrors', returnAll);
-
-			Person = db.define("person", {
-				name:   { type: 'text'   },
-				height: { type: 'number' },
-			}, {
-				validations: {
-					name:   ORM.validators.rangeLength(3, 30),
-					height: ORM.validators.rangeNumber(0.1, 3.0)
-				}
-			});
-
-			return helper.dropSync(Person, done);
-		};
-	};
-
-	notNull = function(val, next, data) {
-		if (val != null) {
-			return next('notnull');
-		}
-		return next();
-	};
-	var setupAlwaysValidate = function () {
-		return function (done) {
-			Person2 = db.define("person2", {
-				name:   { type: 'text'   },
-				mustbenull: { type: 'text', required:false, alwaysValidate: true }
-				, canbenull: { type: 'text', required:false }
-			}, {
-				validations: {
-					name:   ORM.validators.rangeLength(3, 30),
-					mustbenull: notNull,
-					canbenull: notNull
-				}
-			});
-			return helper.dropSync(Person2, done);
-		};
-	};
-
-	before(function (done) {
-		helper.connect(function (connection) {
-			db = connection;
-			done();
-		});
-	});
-
-	after(function () {
-		db.close();
-	});
-
-
-	describe("alwaysValidate", function () {
-		before(setupAlwaysValidate());
-
-		it("I want to see it fail first (the absence of evidence)", function(done) {
-			var rachel = new Person2({name: 'rachel', canbenull:null, mustbenull:null});
-			rachel.save(function (err) {
-				should.not.exist(err);
-				return done();
-			});
-		});
-
-		it("then it should work", function(done) {
-			var tom = new Person2({name: 'tom', canbenull:null, mustbenull:'notnull'});
-			tom.save(function (err) {
-				should.exist(err);
-				should.equal(typeof err,   "object");
-				should.equal(err.property, "mustbenull");
-				should.equal(err.msg,      "notnull");
-				should.equal(err.type,     "validation");
-				should.equal(tom.id,      null);
-				return done();
-			});
-		});
-	});
-
-	describe("predefined", function () {
-		before(setup(false, false));
-
-		it("should work", function(done) {
-			var john = new Person({name: 'fdhdjendfjkdfhshdfhakdfjajhfdjhbfgk'});
-
-			john.save(function (err) {
-				should.equal(typeof err,   "object");
-				should.equal(err.property, "name");
-				should.equal(err.value,    "fdhdjendfjkdfhshdfhakdfjajhfdjhbfgk");
-				should.equal(err.msg,      "out-of-range-length");
-				should.equal(err.type,     "validation");
-				should.equal(john.id,      null);
-
-				return done();
-			});
-		});
-
-		describe("unique", function () {
-			if (protocol === "mongodb") return;
-
-			var Product = null, Supplier = null;
-
-			var setupUnique = function (ignoreCase, scope, msg) {
-				return function (done) {
-					Supplier = db.define("supplier", {
-						name     : String
+  var db = null;
+  var Person = null;
+  var Person2 = null;
+
+  var setup = function (returnAll, required) {
+    return function (done) {
+      db.settings.set('properties.required',      required);
+      db.settings.set('instance.returnAllErrors', returnAll);
+
+      Person = db.define("person", {
+        name:   { type: 'text'   },
+        height: { type: 'number' },
+      }, {
+        validations: {
+          name:   ORM.validators.rangeLength(3, 30),
+          height: ORM.validators.rangeNumber(0.1, 3.0)
+        }
+      });
+
+      return helper.dropSync(Person, done);
+    };
+  };
+
+  notNull = function(val, next, data) {
+    if (val != null) {
+      return next('notnull');
+    }
+    return next();
+  };
+  var setupAlwaysValidate = function () {
+    return function (done) {
+      Person2 = db.define("person2", {
+        name:   { type: 'text'   },
+        mustbenull: { type: 'text', required:false, alwaysValidate: true }
+        , canbenull: { type: 'text', required:false }
+      }, {
+        validations: {
+          name:   ORM.validators.rangeLength(3, 30),
+          mustbenull: notNull,
+          canbenull: notNull
+        }
+      });
+      return helper.dropSync(Person2, done);
+    };
+  };
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+      done();
+    });
+  });
+
+  after(function () {
+    db.close();
+  });
+
+
+  describe("alwaysValidate", function () {
+    before(setupAlwaysValidate());
+
+    it("I want to see it fail first (the absence of evidence)", function(done) {
+      var rachel = new Person2({name: 'rachel', canbenull:null, mustbenull:null});
+      rachel.save(function (err) {
+        should.not.exist(err);
+        return done();
+      });
+    });
+
+    it("then it should work", function(done) {
+      var tom = new Person2({name: 'tom', canbenull:null, mustbenull:'notnull'});
+      tom.save(function (err) {
+        should.exist(err);
+        should.equal(typeof err,   "object");
+        should.equal(err.property, "mustbenull");
+        should.equal(err.msg,      "notnull");
+        should.equal(err.type,     "validation");
+        should.equal(tom.id,      null);
+        return done();
+      });
+    });
+  });
+
+  describe("predefined", function () {
+    before(setup(false, false));
+
+    it("should work", function(done) {
+      var john = new Person({name: 'fdhdjendfjkdfhshdfhakdfjajhfdjhbfgk'});
+
+      john.save(function (err) {
+        should.equal(typeof err,   "object");
+        should.equal(err.property, "name");
+        should.equal(err.value,    "fdhdjendfjkdfhshdfhakdfjajhfdjhbfgk");
+        should.equal(err.msg,      "out-of-range-length");
+        should.equal(err.type,     "validation");
+        should.equal(john.id,      null);
+
+        return done();
+      });
+    });
+
+    describe("unique", function () {
+      if (protocol === "mongodb") return;
+
+      var Product = null, Supplier = null;
+
+      var setupUnique = function (ignoreCase, scope, msg) {
+        return function (done) {
+          Supplier = db.define("supplier", {
+            name     : String
                     }, {
-						cache: false
-					});
-					helper.dropSync(Supplier, function(err){
-						if (err) {
-							return done(err);
-						}
-
-						Product = db.define("productUnique", {
-							instock  : { type: 'boolean', required: true, defaultValue: false },
-							name     : String,
-							category : String
-						}, {
-							cache: false,
-							validations: {
-								name      : ORM.validators.unique({ ignoreCase: ignoreCase, scope: scope }, msg),
-								instock   : ORM.validators.required(),
-								productId : ORM.validators.unique() // this must be straight after a required & validated row.
-							}
-						});
-				        Product.hasOne('supplier',  Supplier,  { field: 'supplierId' });
-
-						return helper.dropSync(Product, done);
-					});
-				};
-			};
-
-			describe("simple", function () {
-				before(setupUnique(false, false));
-
-				it("should return validation error for duplicate name", function (done) {
-					Product.create({name: 'fork'}, function (err, product) {
-						should.not.exist(err);
-
-						Product.create({name: 'fork'}, function (err, product) {
-							should.exist(err);
-
-							return done();
-						});
-					});
-				});
-
-				it("should pass with different names", function (done) {
-					Product.create({name: 'spatula'}, function (err, product) {
-						should.not.exist(err);
-
-						Product.create({name: 'plate'}, function (err, product) {
-							should.not.exist(err);
-
-							return done();
-						});
-					});
-				});
-
-				// Technically this is covered by the tests above, but I'm putting it here for clarity's sake. 3 HOURS WASTED *sigh.
-				it("should not leak required state from previous validation for association properties [regression test]", function (done) {
-					Product.create({ name: 'pencil', productId: null}, function (err, product) {
-						should.not.exist(err);
-
-						Product.create({ name: 'pencilcase', productId: null }, function (err, product) {
-							should.not.exist(err);
-
-							return done();
-						});
-					});
-				});
-			});
-
-			describe("scope", function () {
-				describe("to other property", function () {
-
-					before(setupUnique(true, ['category']));
-
-					it("should return validation error if other property also matches", function(done) {
-						Product.create({name: 'red', category: 'chair'}, function (err, product) {
-							should.not.exist(err);
-
-							Product.create({name: 'red', category: 'chair'}, function (err, product) {
-								should.exist(err);
-								should.equal(err.msg, 'not-unique');
-
-								return done();
-							});
-						});
-					});
-
-					it("should pass if other property is different", function (done) {
-						Product.create({name: 'blue', category: 'chair'}, function (err, product) {
-							should.not.exist(err);
-
-							Product.create({name: 'blue', category: 'pen'}, function (err, product) {
-								should.not.exist(err);
-
-								return done();
-							});
-						});
-					});
-
-					// In SQL unique index land, NULL values are not considered equal.
-					it("should pass if other property is null", function (done) {
-						Product.create({name: 'blue', category: null}, function (err, product) {
-							should.not.exist(err);
-
-							Product.create({name: 'blue', category: null}, function (err, product) {
-								should.not.exist(err);
-
-								return done();
-							});
-						});
-					});
-				});
-
-				describe("to hasOne property", function () {
-					firstId = secondId = null;
-
-					before(function(done){
-						setupUnique(true, ['supplierId'])(function(err) {
-							should.not.exist(err);
-							Supplier.create({name: 'first'}, function (err, supplier) {
-								should.not.exist(err);
-
-								firstId = supplier.id;
-
-								Supplier.create({name: 'second'}, function (err, supplier) {
-									should.not.exist(err);
-
-									secondId = supplier.id;
-									done();
-								});
-							});
-						});
-					});
-
-					it("should return validation error if hasOne property also matches", function(done) {
-						Product.create({name: 'red', supplierId: firstId}, function (err, product) {
-							should.not.exist(err);
-
-							Product.create({name: 'red', supplierId: firstId}, function (err, product) {
-								should.exist(err);
-								should.equal(err.msg, 'not-unique');
-
-								return done();
-							});
-						});
-					});
-
-					it("should pass if hasOne property is different", function (done) {
-						Product.create({name: 'blue', supplierId: firstId}, function (err, product) {
-							should.not.exist(err);
-
-							Product.create({name: 'blue', supplierId: secondId}, function (err, product) {
-								should.not.exist(err);
-
-								return done();
-							});
-						});
-					});
-
-					// In SQL unique index land, NULL values are not considered equal.
-					it("should pass if other property is null", function (done) {
-						Product.create({name: 'blue', category: null}, function (err, product) {
-							should.not.exist(err);
-
-							Product.create({name: 'blue', category: null}, function (err, product) {
-								should.not.exist(err);
-
-								return done();
-							});
-						});
-					});
-				});
-			});
-
-			describe("ignoreCase", function () {
-				if (protocol != 'mysql') {
-					it("false should do a case sensitive comparison", function (done) {
-						setupUnique(false, false)(function (err) {
-							should.not.exist(err);
-
-							Product.create({name: 'spork'}, function (err, product) {
-								should.not.exist(err);
-
-								Product.create({name: 'spOrk'}, function (err, product) {
-									should.not.exist(err);
-
-									return done();
-								});
-							});
-						});
-					});
-				}
-
-				it("true should do a case insensitive comparison", function (done) {
-					setupUnique(true, false)(function (err) {
-						should.not.exist(err);
-
-						Product.create({name: 'stapler'}, function (err, product) {
-							should.not.exist(err);
-
-							Product.create({name: 'staplER'}, function (err, product) {
-								should.exist(err);
-								should.equal(err.msg, 'not-unique');
-
-								return done();
-							});
-						});
-					});
-				});
-
-				it("true should do a case insensitive comparison on scoped properties too", function (done) {
-					setupUnique(true, ['category'], "name already taken for this category")(function (err) {
-						should.not.exist(err);
-
-						Product.create({name: 'black', category: 'pen'}, function (err, product) {
-							should.not.exist(err);
-
-							Product.create({name: 'Black', category: 'Pen'}, function (err, product) {
-								should.exist(err);
-								should.equal(err.msg, "name already taken for this category");
-
-								return done();
-							});
-						});
-					});
-				});
-
-			});
-		});
-	});
-
-	describe("instance.returnAllErrors = false", function() {
-		describe("properties.required = false", function() {
-			before(setup(false, false));
-
-			it("should save when properties are null", function(done) {
-				var john = new Person();
-
-				john.save(function (err) {
-					should.equal(err, null);
-					should.exist(john[Person.id]);
-
-					return done();
-				});
-			});
-
-			it("shouldn't save when a property is invalid", function(done) {
-				var john = new Person({ height: 4 });
-
-				john.save(function (err) {
-					should.notEqual(err, null);
-					should.equal(err.property, 'height');
-					should.equal(err.value,     4);
-					should.equal(err.msg,      'out-of-range-number');
-					should.equal(err.type,     'validation');
-					should.equal(john.id,      null);
-
-					return done();
-				});
-			});
-		});
-
-		describe("properties.required = true", function() {
-			before(setup(false, true));
-
-			it("should not save when properties are null", function(done) {
-				var john = new Person();
-
-				john.save(function (err) {
-					should.notEqual(err, null);
-					should.equal(john.id, null);
-
-					return done();
-				});
-			});
-
-			it("should return a required error when the first property is blank", function(done) {
-				var john = new Person({ height: 4 });
-
-				john.save(function (err) {
-					should.notEqual(err, null);
-					should.equal(err.property, 'name');
-					should.equal(err.value,    null);
-					should.equal(err.msg,      'required');
-					should.equal(err.type,     'validation');
-					should.equal(john.id,      null);
-
-					return done();
-				});
-			});
-		});
-	});
-
-	describe("instance.returnAllErrors = true", function() {
-		describe("properties.required = false", function() {
-			before(setup(true, false));
-
-			it("should return all errors when a property is invalid", function(done) {
-				var john = new Person({ name: 'n', height: 4 });
-
-				john.save(function (err) {
-					should.notEqual(err, null);
-					should(Array.isArray(err));
-					should.equal(err.length, 2);
-
-					should.deepEqual(err[0], _.extend(new Error('out-of-range-length'), {
-						property: 'name', value: 'n', msg: 'out-of-range-length', type: 'validation'
-					}));
-
-					should.deepEqual(err[1], _.extend(new Error('out-of-range-number'), {
-						property: 'height', value: 4, msg: 'out-of-range-number', type: 'validation'
-					}));
-
-					should.equal(john.id, null);
-
-					return done();
-				});
-			});
-		});
-
-		describe("properties.required = true", function() {
-			before(setup(true, true));
-
-			it("should return required and user specified validation errors", function(done) {
-				var john = new Person({ height: 4 });
-
-				john.save(function (err) {
-					should.notEqual(err, null);
-					should(Array.isArray(err));
-					should.equal(err.length, 3);
-
-					should.deepEqual(err[0], _.extend(new Error('required'), {
-						property: 'name', value: null, msg: 'required', type: 'validation'
-					}));
-
-					should.deepEqual(err[1], _.extend(new Error('undefined'), {
-						property: 'name', value: null, msg: 'undefined', type: 'validation'
-					}));
-
-					should.deepEqual(err[2], _.extend(new Error('out-of-range-number'), {
-						property: 'height', value: 4, msg: 'out-of-range-number', type: 'validation'
-					}));
-
-					should.equal(john.id, null);
-
-					return done();
-				});
-			});
-		});
-	});
-
-	describe("mockable", function() {
-		before(setup());
-
-		it("validate should be writable", function(done) {
-			var John = new Person({
-				name: "John"
-			});
-			var validateCalled = false;
-			John.validate = function(cb) {
-				validateCalled = true;
-				cb(null);
-			};
-			John.validate(function(err) {
-				should.equal(validateCalled,true);
-				return done();
-			});
-		});
-	});
+            cache: false
+          });
+          helper.dropSync(Supplier, function(err){
+            if (err) {
+              return done(err);
+            }
+
+            Product = db.define("productUnique", {
+              instock  : { type: 'boolean', required: true, defaultValue: false },
+              name     : String,
+              category : String
+            }, {
+              cache: false,
+              validations: {
+                name      : ORM.validators.unique({ ignoreCase: ignoreCase, scope: scope }, msg),
+                instock   : ORM.validators.required(),
+                productId : ORM.validators.unique() // this must be straight after a required & validated row.
+              }
+            });
+                Product.hasOne('supplier',  Supplier,  { field: 'supplierId' });
+
+            return helper.dropSync(Product, done);
+          });
+        };
+      };
+
+      describe("simple", function () {
+        before(setupUnique(false, false));
+
+        it("should return validation error for duplicate name", function (done) {
+          Product.create({name: 'fork'}, function (err, product) {
+            should.not.exist(err);
+
+            Product.create({name: 'fork'}, function (err, product) {
+              should.exist(err);
+
+              return done();
+            });
+          });
+        });
+
+        it("should pass with different names", function (done) {
+          Product.create({name: 'spatula'}, function (err, product) {
+            should.not.exist(err);
+
+            Product.create({name: 'plate'}, function (err, product) {
+              should.not.exist(err);
+
+              return done();
+            });
+          });
+        });
+
+        // Technically this is covered by the tests above, but I'm putting it here for clarity's sake. 3 HOURS WASTED *sigh.
+        it("should not leak required state from previous validation for association properties [regression test]", function (done) {
+          Product.create({ name: 'pencil', productId: null}, function (err, product) {
+            should.not.exist(err);
+
+            Product.create({ name: 'pencilcase', productId: null }, function (err, product) {
+              should.not.exist(err);
+
+              return done();
+            });
+          });
+        });
+      });
+
+      describe("scope", function () {
+        describe("to other property", function () {
+
+          before(setupUnique(true, ['category']));
+
+          it("should return validation error if other property also matches", function(done) {
+            Product.create({name: 'red', category: 'chair'}, function (err, product) {
+              should.not.exist(err);
+
+              Product.create({name: 'red', category: 'chair'}, function (err, product) {
+                should.exist(err);
+                should.equal(err.msg, 'not-unique');
+
+                return done();
+              });
+            });
+          });
+
+          it("should pass if other property is different", function (done) {
+            Product.create({name: 'blue', category: 'chair'}, function (err, product) {
+              should.not.exist(err);
+
+              Product.create({name: 'blue', category: 'pen'}, function (err, product) {
+                should.not.exist(err);
+
+                return done();
+              });
+            });
+          });
+
+          // In SQL unique index land, NULL values are not considered equal.
+          it("should pass if other property is null", function (done) {
+            Product.create({name: 'blue', category: null}, function (err, product) {
+              should.not.exist(err);
+
+              Product.create({name: 'blue', category: null}, function (err, product) {
+                should.not.exist(err);
+
+                return done();
+              });
+            });
+          });
+        });
+
+        describe("to hasOne property", function () {
+          firstId = secondId = null;
+
+          before(function(done){
+            setupUnique(true, ['supplierId'])(function(err) {
+              should.not.exist(err);
+              Supplier.create({name: 'first'}, function (err, supplier) {
+                should.not.exist(err);
+
+                firstId = supplier.id;
+
+                Supplier.create({name: 'second'}, function (err, supplier) {
+                  should.not.exist(err);
+
+                  secondId = supplier.id;
+                  done();
+                });
+              });
+            });
+          });
+
+          it("should return validation error if hasOne property also matches", function(done) {
+            Product.create({name: 'red', supplierId: firstId}, function (err, product) {
+              should.not.exist(err);
+
+              Product.create({name: 'red', supplierId: firstId}, function (err, product) {
+                should.exist(err);
+                should.equal(err.msg, 'not-unique');
+
+                return done();
+              });
+            });
+          });
+
+          it("should pass if hasOne property is different", function (done) {
+            Product.create({name: 'blue', supplierId: firstId}, function (err, product) {
+              should.not.exist(err);
+
+              Product.create({name: 'blue', supplierId: secondId}, function (err, product) {
+                should.not.exist(err);
+
+                return done();
+              });
+            });
+          });
+
+          // In SQL unique index land, NULL values are not considered equal.
+          it("should pass if other property is null", function (done) {
+            Product.create({name: 'blue', category: null}, function (err, product) {
+              should.not.exist(err);
+
+              Product.create({name: 'blue', category: null}, function (err, product) {
+                should.not.exist(err);
+
+                return done();
+              });
+            });
+          });
+        });
+      });
+
+      describe("ignoreCase", function () {
+        if (protocol != 'mysql') {
+          it("false should do a case sensitive comparison", function (done) {
+            setupUnique(false, false)(function (err) {
+              should.not.exist(err);
+
+              Product.create({name: 'spork'}, function (err, product) {
+                should.not.exist(err);
+
+                Product.create({name: 'spOrk'}, function (err, product) {
+                  should.not.exist(err);
+
+                  return done();
+                });
+              });
+            });
+          });
+        }
+
+        it("true should do a case insensitive comparison", function (done) {
+          setupUnique(true, false)(function (err) {
+            should.not.exist(err);
+
+            Product.create({name: 'stapler'}, function (err, product) {
+              should.not.exist(err);
+
+              Product.create({name: 'staplER'}, function (err, product) {
+                should.exist(err);
+                should.equal(err.msg, 'not-unique');
+
+                return done();
+              });
+            });
+          });
+        });
+
+        it("true should do a case insensitive comparison on scoped properties too", function (done) {
+          setupUnique(true, ['category'], "name already taken for this category")(function (err) {
+            should.not.exist(err);
+
+            Product.create({name: 'black', category: 'pen'}, function (err, product) {
+              should.not.exist(err);
+
+              Product.create({name: 'Black', category: 'Pen'}, function (err, product) {
+                should.exist(err);
+                should.equal(err.msg, "name already taken for this category");
+
+                return done();
+              });
+            });
+          });
+        });
+
+      });
+    });
+  });
+
+  describe("instance.returnAllErrors = false", function() {
+    describe("properties.required = false", function() {
+      before(setup(false, false));
+
+      it("should save when properties are null", function(done) {
+        var john = new Person();
+
+        john.save(function (err) {
+          should.equal(err, null);
+          should.exist(john[Person.id]);
+
+          return done();
+        });
+      });
+
+      it("shouldn't save when a property is invalid", function(done) {
+        var john = new Person({ height: 4 });
+
+        john.save(function (err) {
+          should.notEqual(err, null);
+          should.equal(err.property, 'height');
+          should.equal(err.value,     4);
+          should.equal(err.msg,      'out-of-range-number');
+          should.equal(err.type,     'validation');
+          should.equal(john.id,      null);
+
+          return done();
+        });
+      });
+    });
+
+    describe("properties.required = true", function() {
+      before(setup(false, true));
+
+      it("should not save when properties are null", function(done) {
+        var john = new Person();
+
+        john.save(function (err) {
+          should.notEqual(err, null);
+          should.equal(john.id, null);
+
+          return done();
+        });
+      });
+
+      it("should return a required error when the first property is blank", function(done) {
+        var john = new Person({ height: 4 });
+
+        john.save(function (err) {
+          should.notEqual(err, null);
+          should.equal(err.property, 'name');
+          should.equal(err.value,    null);
+          should.equal(err.msg,      'required');
+          should.equal(err.type,     'validation');
+          should.equal(john.id,      null);
+
+          return done();
+        });
+      });
+    });
+  });
+
+  describe("instance.returnAllErrors = true", function() {
+    describe("properties.required = false", function() {
+      before(setup(true, false));
+
+      it("should return all errors when a property is invalid", function(done) {
+        var john = new Person({ name: 'n', height: 4 });
+
+        john.save(function (err) {
+          should.notEqual(err, null);
+          should(Array.isArray(err));
+          should.equal(err.length, 2);
+
+          should.deepEqual(err[0], _.extend(new Error('out-of-range-length'), {
+            property: 'name', value: 'n', msg: 'out-of-range-length', type: 'validation'
+          }));
+
+          should.deepEqual(err[1], _.extend(new Error('out-of-range-number'), {
+            property: 'height', value: 4, msg: 'out-of-range-number', type: 'validation'
+          }));
+
+          should.equal(john.id, null);
+
+          return done();
+        });
+      });
+    });
+
+    describe("properties.required = true", function() {
+      before(setup(true, true));
+
+      it("should return required and user specified validation errors", function(done) {
+        var john = new Person({ height: 4 });
+
+        john.save(function (err) {
+          should.notEqual(err, null);
+          should(Array.isArray(err));
+          should.equal(err.length, 3);
+
+          should.deepEqual(err[0], _.extend(new Error('required'), {
+            property: 'name', value: null, msg: 'required', type: 'validation'
+          }));
+
+          should.deepEqual(err[1], _.extend(new Error('undefined'), {
+            property: 'name', value: null, msg: 'undefined', type: 'validation'
+          }));
+
+          should.deepEqual(err[2], _.extend(new Error('out-of-range-number'), {
+            property: 'height', value: 4, msg: 'out-of-range-number', type: 'validation'
+          }));
+
+          should.equal(john.id, null);
+
+          return done();
+        });
+      });
+    });
+  });
+
+  describe("mockable", function() {
+    before(setup());
+
+    it("validate should be writable", function(done) {
+      var John = new Person({
+        name: "John"
+      });
+      var validateCalled = false;
+      John.validate = function(cb) {
+        validateCalled = true;
+        cb(null);
+      };
+      John.validate(function(err) {
+        should.equal(validateCalled,true);
+        return done();
+      });
+    });
+  });
 
 
 });
diff --git a/test/logging.js b/test/logging.js
index 906f51ad..c4fd4133 100644
--- a/test/logging.js
+++ b/test/logging.js
@@ -4,26 +4,26 @@ exports.info = buildMethod(process.stdout, "[i]", 34);
 exports.error = buildMethod(process.stderr, "[!]", 31);
 
 function buildMethod(stream, prefix, color) {
-	return function () {
-		var params = Array.prototype.slice.apply(arguments);
-		var text   = params.shift();
+  return function () {
+    var params = Array.prototype.slice.apply(arguments);
+    var text   = params.shift();
 
-		return printTo(stream, prefix + " ", color, text, params);
-	};
+    return printTo(stream, prefix + " ", color, text, params);
+  };
 }
 
 function printTo(stream, prefix, color, text, params) {
-	params.unshift(text);
-	text = util.format.apply(util, params);
+  params.unshift(text);
+  text = util.format.apply(util, params);
 
-	stream.write(printColor(color, true) + prefix + printColor(color) + text.replace(/\*\*(.+?)\*\*/, function (m, t) {
-		return printColor(color, true) + t + printColor(color);
-	}) + printColor(null) + "\n");
+  stream.write(printColor(color, true) + prefix + printColor(color) + text.replace(/\*\*(.+?)\*\*/, function (m, t) {
+    return printColor(color, true) + t + printColor(color);
+  }) + printColor(null) + "\n");
 }
 
 function printColor(color, bold) {
-	if (color === null) {
-		return "\033[0m";
-	}
-	return "\033[" + (bold ? "1" : "0") + ";" + color + "m";
+  if (color === null) {
+    return "\033[0m";
+  }
+  return "\033[" + (bold ? "1" : "0") + ";" + color + "m";
 }
diff --git a/test/run.js b/test/run.js
index 81f0f492..9b74c732 100644
--- a/test/run.js
+++ b/test/run.js
@@ -7,48 +7,48 @@ var logging  = require("./logging");
 
 var location = path.normalize(path.join(__dirname, "integration", "**", "*.js"));
 var mocha    = new Mocha({
-	reporter: "progress",
-	timeout: 5000
+  reporter: "progress",
+  timeout: 5000
 });
 
 switch (common.hasConfig(common.protocol())) {
-	case 'not-defined':
-		logging.error("There's no configuration for protocol **%s**", common.protocol());
-		process.exit(0);
-	case 'not-found':
-		logging.error("**test/config.js** missing. Take a look at **test/config.example.js**");
-		process.exit(0);
+  case 'not-defined':
+    logging.error("There's no configuration for protocol **%s**", common.protocol());
+    process.exit(0);
+  case 'not-found':
+    logging.error("**test/config.js** missing. Take a look at **test/config.example.js**");
+    process.exit(0);
 }
 
 runTests();
 
 function runTests() {
-	if (common.protocol() == 'mongodb' && common.nodeVersion().major > 6) {
-		console.warn(chalk.red("MongoDB 1.x doesn't work with node 7, 8 or newer."));
-		console.warn(chalk.red("Tests will not run."));
-		console.warn(chalk.red("If you would like this to work, please submit a pull request."));
-		return;
-	}
-
-	glob.sync(location).forEach(function (file) {
-		if (!shouldRunTest(file)) return;
-		mocha.addFile(file);
-	});
-
-	logging.info("Testing **%s**", common.getConnectionString());
-
-	mocha.run(function (failures) {
-		process.exit(failures);
-	});
+  if (common.protocol() == 'mongodb' && common.nodeVersion().major > 6) {
+    console.warn(chalk.red("MongoDB 1.x doesn't work with node 7, 8 or newer."));
+    console.warn(chalk.red("Tests will not run."));
+    console.warn(chalk.red("If you would like this to work, please submit a pull request."));
+    return;
+  }
+
+  glob.sync(location).forEach(function (file) {
+    if (!shouldRunTest(file)) return;
+    mocha.addFile(file);
+  });
+
+  logging.info("Testing **%s**", common.getConnectionString());
+
+  mocha.run(function (failures) {
+    process.exit(failures);
+  });
 }
 
 function shouldRunTest(file) {
-	var name  = path.basename(file).slice(0, -3)
-	var proto = common.protocol();
-	var exclude = ['model-aggregate','property-number-size','smart-types'];
+  var name  = path.basename(file).slice(0, -3)
+  var proto = common.protocol();
+  var exclude = ['model-aggregate','property-number-size','smart-types'];
 
-	if (proto == "mongodb" && exclude.indexOf(name) >= 0) return false;
+  if (proto == "mongodb" && exclude.indexOf(name) >= 0) return false;
 
-	return true;
+  return true;
 }
 
diff --git a/test/support/my_plugin.js b/test/support/my_plugin.js
index e923b939..752b1f1f 100644
--- a/test/support/my_plugin.js
+++ b/test/support/my_plugin.js
@@ -1,19 +1,19 @@
 module.exports = function MyPlugin(DB, opts) {
-	opts.option.should.be.true;
-	opts.calledDefine.should.be.false;
+  opts.option.should.be.true;
+  opts.calledDefine.should.be.false;
 
-	return {
-		define: function (Model) {
-			Model.should.be.a.Function();
-			Model.id.should.be.a.Object();
-			Model.id[0].should.be.a.String();
+  return {
+    define: function (Model) {
+      Model.should.be.a.Function();
+      Model.id.should.be.a.Object();
+      Model.id[0].should.be.a.String();
 
-			opts.calledDefine = true;
-		},
-		beforeDefine: function (model_name, model_props, model_opts) {
-			if (opts.beforeDefine) {
-				opts.beforeDefine(model_name, model_props, model_opts);
-			}
-		}
-	};
+      opts.calledDefine = true;
+    },
+    beforeDefine: function (model_name, model_props, model_opts) {
+      if (opts.beforeDefine) {
+        opts.beforeDefine(model_name, model_props, model_opts);
+      }
+    }
+  };
 };
diff --git a/test/support/spec_helper.js b/test/support/spec_helper.js
index 69131c48..79f49e80 100644
--- a/test/support/spec_helper.js
+++ b/test/support/spec_helper.js
@@ -3,33 +3,33 @@ var async  = require('async');
 var should = require('should');
 
 module.exports.connect = function(cb) {
-	var opts = {};
+  var opts = {};
 
-	if (1 in arguments) {
-		opts = arguments[0];
-		cb   = arguments[1];
-	}
-	common.createConnection(opts, function (err, conn) {
-		if (err) throw err;
-		cb(conn);
-	});
+  if (1 in arguments) {
+    opts = arguments[0];
+    cb   = arguments[1];
+  }
+  common.createConnection(opts, function (err, conn) {
+    if (err) throw err;
+    cb(conn);
+  });
 };
 
 module.exports.dropSync = function (models, done) {
-	if (!Array.isArray(models)) {
-		models = [models];
-	}
+  if (!Array.isArray(models)) {
+    models = [models];
+  }
 
-	async.eachSeries(models, function (item, cb) {
-		item.drop(function (err) {
-			if (err) throw err;
+  async.eachSeries(models, function (item, cb) {
+    item.drop(function (err) {
+      if (err) throw err;
 
-			item.sync(cb);
-		});
-	}, function (err) {
-		if (common.protocol() != 'sqlite') {
-			if (err) throw err;
-		}
-		done(err);
-	});
+      item.sync(cb);
+    });
+  }, function (err) {
+    if (common.protocol() != 'sqlite') {
+      if (err) throw err;
+    }
+    done(err);
+  });
 };
diff --git a/test/support/spec_load.js b/test/support/spec_load.js
index 7fd5c109..2585563f 100644
--- a/test/support/spec_load.js
+++ b/test/support/spec_load.js
@@ -1,7 +1,7 @@
 module.exports = function (db, cb) {
-	db.define("person", {
-		name : String
-	});
+  db.define("person", {
+    name : String
+  });
 
-	return db.load("./spec_load_second", cb);
+  return db.load("./spec_load_second", cb);
 };
diff --git a/test/support/spec_load_second.js b/test/support/spec_load_second.js
index 6f54edc8..cba30b5a 100644
--- a/test/support/spec_load_second.js
+++ b/test/support/spec_load_second.js
@@ -1,9 +1,9 @@
 module.exports = function (db, cb) {
-	db.define("pet", {
-		name : String
-	});
+  db.define("pet", {
+    name : String
+  });
 
-	setTimeout(function () {
-		return cb();
-	}, 200);
+  setTimeout(function () {
+    return cb();
+  }, 200);
 };
diff --git a/test/support/spec_load_third.js b/test/support/spec_load_third.js
index 42b9b298..c3a2d467 100644
--- a/test/support/spec_load_third.js
+++ b/test/support/spec_load_third.js
@@ -1,9 +1,9 @@
 module.exports = function (db, cb) {
-	db.define("person", {
-		name : String
-	});
+  db.define("person", {
+    name : String
+  });
 
-	setTimeout(function () {
-		return cb();
-	}, 200);
+  setTimeout(function () {
+    return cb();
+  }, 200);
 };

From c894a7d705d84f2bd66e1be1b7bcc85e6be87ef9 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 14 Aug 2017 12:29:40 +0000
Subject: [PATCH 1097/1246] Set global mocha timeout to 10 seconds

---
 test/integration/association-hasmany-extra.js |  2 --
 .../integration/association-hasmany-mapsto.js |  1 -
 test/integration/association-hasmany.js       |  1 -
 test/integration/hook.js                      | 27 -------------------
 test/integration/instance.js                  |  2 --
 test/integration/model-keys.js                |  2 --
 test/integration/smart-types.js               |  1 -
 test/mocha.opts                               |  2 +-
 test/run.js                                   |  2 +-
 9 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/test/integration/association-hasmany-extra.js b/test/integration/association-hasmany-extra.js
index c6be4523..5b8606d9 100644
--- a/test/integration/association-hasmany-extra.js
+++ b/test/integration/association-hasmany-extra.js
@@ -28,8 +28,6 @@ describe("hasMany extra properties", function() {
   };
 
   before(function(done) {
-    this.timeout(4000);
-
     helper.connect(function (connection) {
       db = connection;
       done();
diff --git a/test/integration/association-hasmany-mapsto.js b/test/integration/association-hasmany-mapsto.js
index cd0a96dc..1502d32b 100644
--- a/test/integration/association-hasmany-mapsto.js
+++ b/test/integration/association-hasmany-mapsto.js
@@ -8,7 +8,6 @@ var protocol = common.protocol();
 if (common.protocol() == "mongodb") return;   // Can't do mapsTo testing on mongoDB ()
 
 describe("hasMany with mapsTo", function () {
-  this.timeout(4000);
   var db     = null;
   var Person = null;
   var Pet    = null;
diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
index 6695bcdf..f4bc3fad 100644
--- a/test/integration/association-hasmany.js
+++ b/test/integration/association-hasmany.js
@@ -6,7 +6,6 @@ var common   = require('../common');
 var protocol = common.protocol();
 
 describe("hasMany", function () {
-  this.timeout(4000);
   var db     = null;
   var Person = null;
   var Pet    = null;
diff --git a/test/integration/hook.js b/test/integration/hook.js
index 02dab9d1..596dce3f 100644
--- a/test/integration/hook.js
+++ b/test/integration/hook.js
@@ -64,10 +64,6 @@ describe("Hook", function() {
     return db.close();
   });
 
-  // there are a lot of timeouts in this suite and Travis or other test runners can
-  // have hickups that could force this suite to timeout to the default value (2 secs)
-  this.timeout(30000);
-
   describe("after Model creation", function () {
     before(setup({}));
 
@@ -181,8 +177,6 @@ describe("Hook", function() {
       }));
 
       it("should wait for hook to finish", function (done) {
-        this.timeout(800);
-
         Person.create([{ name: "John Doe" }], function () {
           beforeCreate.should.be.true;
 
@@ -200,8 +194,6 @@ describe("Hook", function() {
         }));
 
         it("should trigger error", function (done) {
-          this.timeout(800);
-
           Person.create([{ name: "John Doe" }], function (err) {
             err.should.be.a.Object();
             err.message.should.equal("beforeCreate-error");
@@ -301,8 +293,6 @@ describe("Hook", function() {
       }));
 
       it("should wait for hook to finish", function (done) {
-        this.timeout(800);
-
         Person.create([{ name: "John Doe" }], function () {
           beforeSave.should.be.true;
 
@@ -324,8 +314,6 @@ describe("Hook", function() {
         }));
 
         it("should trigger error when creating", function (done) {
-          this.timeout(800);
-
           Person.create([{ name: "Jane Doe" }], function (err) {
             err.should.be.a.Object();
             err.message.should.equal("beforeSave-error");
@@ -335,8 +323,6 @@ describe("Hook", function() {
         });
 
         it("should trigger error when saving", function (done) {
-          this.timeout(800);
-
           Person.create([{ name: "John Doe" }], function (err, John) {
             should.equal(err, null);
 
@@ -429,7 +415,6 @@ describe("Hook", function() {
 
     describe("if hook method has 1 argument", function () {
       var beforeValidation = false;
-      this.timeout(800);
 
       before(setup({
         beforeValidation : function (next) {
@@ -508,8 +493,6 @@ describe("Hook", function() {
       }));
 
       it("should wait for hook to finish", function (done) {
-        this.timeout(800);
-
         Person.create([{ name: "John Doe" }], function (err, items) {
           afterLoad.should.be.true;
 
@@ -525,8 +508,6 @@ describe("Hook", function() {
         }));
 
         it("should return error", function (done) {
-          this.timeout(800);
-
           Person.create([{ name: "John Doe" }], function (err, items) {
             err.should.exist;
             err.message.should.equal("AFTERLOAD_FAIL");
@@ -569,8 +550,6 @@ describe("Hook", function() {
       }));
 
       it("should wait for hook to finish", function (done) {
-        this.timeout(800);
-
         Person.create([{ name: "John Doe" }], function (err, items) {
           afterAutoFetch.should.be.true;
 
@@ -586,8 +565,6 @@ describe("Hook", function() {
         }));
 
         it("should return error", function (done) {
-          this.timeout(800);
-
           Person.create([{ name: "John Doe" }], function (err, items) {
             err.should.exist;
             err.message.should.equal("AFTERAUTOFETCH_FAIL");
@@ -628,8 +605,6 @@ describe("Hook", function() {
       }));
 
       it("should wait for hook to finish", function (done) {
-        this.timeout(800);
-
         Person.create([{ name: "John Doe" }], function (err, items) {
           items[0].remove(function () {
             beforeRemove.should.be.true;
@@ -650,8 +625,6 @@ describe("Hook", function() {
         }));
 
         it("should trigger error", function (done) {
-          this.timeout(800);
-
           Person.create([{ name: "John Doe" }], function (err, items) {
             items[0].remove(function (err) {
               err.should.be.a.Object();
diff --git a/test/integration/instance.js b/test/integration/instance.js
index 829af2bd..ae9cacf1 100644
--- a/test/integration/instance.js
+++ b/test/integration/instance.js
@@ -39,8 +39,6 @@ describe("Model instance", function() {
   };
 
   before(function (done) {
-    this.timeout(4000);
-
     helper.connect(function (connection) {
       db = connection;
 
diff --git a/test/integration/model-keys.js b/test/integration/model-keys.js
index e09bc7f2..5d97e18c 100644
--- a/test/integration/model-keys.js
+++ b/test/integration/model-keys.js
@@ -6,8 +6,6 @@ describe("Model keys option", function() {
   var db = null;
 
   before(function (done) {
-    this.timeout(4000);
-
     helper.connect(function (connection) {
       db = connection;
 
diff --git a/test/integration/smart-types.js b/test/integration/smart-types.js
index d7b1d125..d70d7118 100644
--- a/test/integration/smart-types.js
+++ b/test/integration/smart-types.js
@@ -3,7 +3,6 @@ var helper   = require('../support/spec_helper');
 var ORM      = require('../../');
 
 describe("Smart types", function () {
-    this.timeout(0);
   var db = null;
   var User = null;
   var Profile = null;
diff --git a/test/mocha.opts b/test/mocha.opts
index c807f3b3..873f95ca 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1,2 +1,2 @@
 --reporter spec
---timeout 5000
+--timeout 10000
diff --git a/test/run.js b/test/run.js
index 9b74c732..92a97fcc 100644
--- a/test/run.js
+++ b/test/run.js
@@ -8,7 +8,7 @@ var logging  = require("./logging");
 var location = path.normalize(path.join(__dirname, "integration", "**", "*.js"));
 var mocha    = new Mocha({
   reporter: "progress",
-  timeout: 5000
+  timeout: 10000
 });
 
 switch (common.hasConfig(common.protocol())) {

From 42434769c6d431d8edd68e1bf35f779d25794d61 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 11 Sep 2017 09:14:27 +0000
Subject: [PATCH 1098/1246] Make 'ORM.prototype.load' code more readable

---
 lib/ORM.js             | 45 +++++++++++++++++---------------
 test/integration/db.js | 58 ++++++++++++------------------------------
 2 files changed, 40 insertions(+), 63 deletions(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index 0a8b11e2..4683f2ea 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -1,19 +1,21 @@
-var util           = require("util");
+var _              = require("lodash");
+var async          = require("async");
+var enforce        = require("enforce");
 var events         = require("events");
-var url            = require("url");
 var hat            = require("hat");
 var Query          = require("sql-query");
-var enforce        = require("enforce");
-var _              = require("lodash");
+var url            = require("url");
+var util           = require("util");
 
-var Model          = require("./Model").Model;
-var DriverAliases  = require("./Drivers/aliases");
 var adapters       = require("./Adapters");
+var DriverAliases  = require("./Drivers/aliases");
+var ORMError       = require("./Error");
+var Model          = require("./Model").Model;
 var Settings       = require("./Settings");
 var Singleton      = require("./Singleton");
-var ORMError       = require("./Error");
 var Utilities      = require("./Utilities");
 
+
 // Deprecated, use enforce
 exports.validators = require("./Validators");
 
@@ -267,31 +269,32 @@ ORM.prototype.close = function (cb) {
 };
 ORM.prototype.load = function () {
   var files = _.flatten(Array.prototype.slice.apply(arguments));
+  var self  = this;
   var cb    = function () {};
 
   if (typeof files[files.length - 1] == "function") {
     cb = files.pop();
   }
 
-  var loadNext = function () {
-    if (files.length === 0) {
-      return cb();
-    }
+  var filesWithPath = [];
 
-    var file = files.shift();
+  // Due to intricacies of `Utilities.getRealPath` the following
+  // code has to look as it does.
+  for(var a = 0; a < files.length; a++) {
+    filesWithPath.push(function () {
+      return Utilities.getRealPath(files[a], 4)
+    }());
+  }
 
+  var iterator = function (filePath, cb) {
     try {
-      return require(Utilities.getRealPath(file, 4))(this, function (err) {
-        if (err) return cb(err);
-
-        return loadNext();
-      });
-    } catch (ex) {
-      return cb(ex);
+      require(filePath)(self, cb);
+    } catch (err) {
+      return cb(err)
     }
-  }.bind(this);
+  };
 
-  return loadNext();
+  async.eachSeries(filesWithPath, iterator, cb);
 };
 ORM.prototype.sync = function (cb) {
   var modelIds = Object.keys(this.models);
diff --git a/test/integration/db.js b/test/integration/db.js
index 8e44f1c5..d0f4c793 100644
--- a/test/integration/db.js
+++ b/test/integration/db.js
@@ -107,74 +107,48 @@ describe("db.define()", function() {
 describe("db.load()", function () {
   var db = null;
 
-  before(function (done) {
+  beforeEach(function (done) {
     helper.connect(function (connection) {
       db = connection;
 
-      return done();
+      done();
     });
   });
 
-  after(function () {
-    return db.close();
+  afterEach(function () {
+    db.close();
   });
 
   it("should require a file based on relative path", function (done) {
-    db.load("../support/spec_load", function () {
+    db.load("../support/spec_load", function (err) {
+      should.not.exist(err);
+
       db.models.should.have.property("person");
       db.models.should.have.property("pet");
 
-      return done();
+      done();
     });
   });
-});
-
-describe("db.load()", function () {
-  var db = null;
-
-  before(function (done) {
-    helper.connect(function (connection) {
-      db = connection;
-
-      return done();
-    });
-  });
-
-  after(function () {
-    return db.close();
-  });
 
   it("should be able to load more than one file", function (done) {
-    db.load("../support/spec_load_second", "../support/spec_load_third", function () {
+    db.load("../support/spec_load_second", "../support/spec_load_third", function (err) {
+      should.not.exist(err);
+
       db.models.should.have.property("person");
       db.models.should.have.property("pet");
 
-      return done();
+      done();
     });
   });
-});
-
-describe("db.load()", function () {
-  var db = null;
-
-  before(function (done) {
-    helper.connect(function (connection) {
-      db = connection;
-
-      return done();
-    });
-  });
-
-  after(function () {
-    return db.close();
-  });
 
   it("should be able to load more than one file passed as Array", function (done) {
-    db.load([ "../support/spec_load_second", "../support/spec_load_third" ], function () {
+    db.load([ "../support/spec_load_second", "../support/spec_load_third" ], function (err) {
+      should.not.exist(err);
+
       db.models.should.have.property("person");
       db.models.should.have.property("pet");
 
-      return done();
+      done();
     });
   });
 });

From 371ce944f5b2d3a0e0d23002ffd938deadb99fd9 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Mon, 21 Aug 2017 18:07:38 +0300
Subject: [PATCH 1099/1246] add Promise support for connect, now connectAsync
 use promises

---
 lib/LazyLoad.js                 |  14 ++
 lib/ORM.js                      |  99 +++++++++-----
 package-lock.json               |   5 +
 package.json                    |   7 +-
 test/config.example.js          |  29 ----
 test/integration/db.js          |   4 +
 test/integration/orm-exports.js | 228 +++++++++++++++++++++++++++++++-
 7 files changed, 319 insertions(+), 67 deletions(-)
 delete mode 100644 test/config.example.js

diff --git a/lib/LazyLoad.js b/lib/LazyLoad.js
index 48af3780..f6322862 100644
--- a/lib/LazyLoad.js
+++ b/lib/LazyLoad.js
@@ -22,6 +22,20 @@ function addLazyLoadProperty(name, Instance, Model, property) {
     },
     enumerable: false
   });
+
+  Object.defineProperty(Instance, "getAsync" + method, {
+    value: function () {
+      var conditions = {};
+      conditions[Model.id] = Instance[Model.id];
+
+      Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
+        return cb(err, item ? item[property] : null);
+      });
+
+      return this;
+    },
+    enumerable: false
+  });
   Object.defineProperty(Instance, "remove" + method, {
     value: function (cb) {
       var conditions = {};
diff --git a/lib/ORM.js b/lib/ORM.js
index 4683f2ea..8515becd 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -3,9 +3,12 @@ var async          = require("async");
 var enforce        = require("enforce");
 var events         = require("events");
 var hat            = require("hat");
+var Promise        = require('bluebird');
 var Query          = require("sql-query");
 var url            = require("url");
 var util           = require("util");
+var enforce        = require("enforce");
+var _              = require("lodash");
 
 var adapters       = require("./Adapters");
 var DriverAliases  = require("./Drivers/aliases");
@@ -32,39 +35,7 @@ exports.Property   = require("./Property");
 exports.Settings   = Settings;
 exports.ErrorCodes = ORMError.codes;
 
-exports.Text = Query.Text;
-for (var k in Query.Comparators) {
-  exports[Query.Comparators[k]] = Query[Query.Comparators[k]];
-}
-
-exports.express = function () {
-  return require("./Express").apply(this, arguments);
-};
-
-exports.use = function (connection, proto, opts, cb) {
-  if (DriverAliases[proto]) {
-    proto = DriverAliases[proto];
-  }
-  if (typeof opts === "function") {
-    cb = opts;
-    opts = {};
-  }
-
-  try {
-    var Driver   = adapters.get(proto);
-    var settings = new Settings.Container(exports.settings.get('*'));
-    var driver   = new Driver(null, connection, {
-      debug    : (opts.query && opts.query.debug === 'true'),
-      settings : settings
-    });
-
-    return cb(null, new ORM(proto, driver, settings));
-  } catch (ex) {
-    return cb(ex);
-  }
-};
-
-exports.connect = function (opts, cb) {
+var connect = function (opts, cb) {
   if (arguments.length === 0 || !opts) {
     return ORM_Error(new ORMError("CONNECTION_URL_EMPTY", 'PARAM_MISMATCH'), cb);
   }
@@ -148,6 +119,56 @@ exports.connect = function (opts, cb) {
   return db;
 };
 
+exports.Text = Query.Text;
+for (var k in Query.Comparators) {
+  exports[Query.Comparators[k]] = Query[Query.Comparators[k]];
+}
+
+exports.express = function () {
+  return require("./Express").apply(this, arguments);
+};
+
+exports.use = function (connection, proto, opts, cb) {
+  if (DriverAliases[proto]) {
+    proto = DriverAliases[proto];
+  }
+  if (typeof opts === "function") {
+    cb = opts;
+    opts = {};
+  }
+
+  try {
+    var Driver   = adapters.get(proto);
+    var settings = new Settings.Container(exports.settings.get('*'));
+    var driver   = new Driver(null, connection, {
+      debug    : (opts.query && opts.query.debug === 'true'),
+      settings : settings
+    });
+
+    return cb(null, new ORM(proto, driver, settings));
+  } catch (ex) {
+    return cb(ex);
+  }
+};
+
+/**
+ *
+ * @param opts
+ */
+exports.connectAsync = function (opts) {
+  return new Promise(function (resolve, reject) {
+    var cb = function (resolve, reject) {
+      return function (err, data) {
+        if (err !== null) {
+          reject(err);
+        }
+        resolve(data);
+      }
+    };
+    connect(opts, cb(resolve, reject));
+  });
+};
+
 exports.addAdapter = adapters.add;
 
 function ORM(driver_name, driver, settings) {
@@ -296,6 +317,9 @@ ORM.prototype.load = function () {
 
   async.eachSeries(filesWithPath, iterator, cb);
 };
+
+
+
 ORM.prototype.sync = function (cb) {
   var modelIds = Object.keys(this.models);
   var syncNext = function () {
@@ -324,6 +348,13 @@ ORM.prototype.sync = function (cb) {
 
   return this;
 };
+
+ORM.prototype.dropAsync = function () {
+  return Promise.each(this.models, function (model) {
+    console.log(model.drop);
+  })
+};
+
 ORM.prototype.drop = function (cb) {
   var modelIds = Object.keys(this.models);
   var dropNext = function () {
@@ -411,3 +442,5 @@ function queryParamCast (val) {
   }
   return val;
 }
+
+exports.connect = connect;
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index c0832151..79fccedc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -39,6 +39,11 @@
 			"integrity": "sha1-8725mtUmihX8HwvtL7AY4mk/4jY=",
 			"dev": true
 		},
+		"bluebird": {
+			"version": "3.5.0",
+			"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
+			"integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw="
+		},
 		"brace-expansion": {
 			"version": "1.1.8",
 			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
diff --git a/package.json b/package.json
index 424d140a..481cfe63 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
   ],
   "main": "./lib/ORM",
   "scripts": {
-    "test": "make test"
+    "test": "ORM_PROTOCOL=postgres make test"
   },
   "engines": {
     "node": "*"
@@ -62,12 +62,13 @@
   "analyse": false,
   "dependencies": {
     "async": "2.5.0",
+    "bluebird": "^3.5.0",
     "enforce": "0.1.7",
     "hat": "0.0.3",
     "lodash": "4.17.4",
     "path-is-absolute": "1.0.1",
-    "sql-query": "0.1.26",
-    "sql-ddl-sync": "0.3.13"
+    "sql-ddl-sync": "0.3.13",
+    "sql-query": "0.1.26"
   },
   "devDependencies": {
     "chalk": "2.0.1",
diff --git a/test/config.example.js b/test/config.example.js
deleted file mode 100644
index bb9c2d73..00000000
--- a/test/config.example.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// To test, rename this file to config.js and update
-// the following configuration
-//
-// To run a single driver, go to root folder and do (mysql example):
-// ORM_PROTOCOL=mysql node test/run
-//
-// To run all drivers:
-// make test
-
-exports.mysql = {
-  user     : "root",
-  password : "",
-  database : "test"
-};
-exports.postgres = {
-  user     : "root",
-  password : "",
-  database : "test"
-};
-exports.redshift = {
-  user      : "root",
-  password  : "",
-  database  : "test"
-};
-exports.mongodb = {
-    host: "localhost",
-    database: "test"
-};
-exports.sqlite = { }; // uses in-memory database
diff --git a/test/integration/db.js b/test/integration/db.js
index d0f4c793..da72e113 100644
--- a/test/integration/db.js
+++ b/test/integration/db.js
@@ -18,6 +18,10 @@ describe("db.use()", function () {
     return db.close();
   });
 
+  it.only('~!_!-!!_!~-~_~_-_-', function () {
+    console.log(db.dropAsync);
+  });
+
   it("should be able to register a plugin", function (done) {
     var MyPlugin = require("../support/my_plugin");
     var opts     = {
diff --git a/test/integration/orm-exports.js b/test/integration/orm-exports.js
index 9b66b1c1..fb7be6c7 100644
--- a/test/integration/orm-exports.js
+++ b/test/integration/orm-exports.js
@@ -50,6 +50,229 @@ describe("ORM", function() {
   });
 });
 
+describe('ORM.connectAsync()', function () {
+  it('should be a function', function () {
+    ORM.connectAsync.should.be.a.Function()
+  });
+
+  it('should throw error with correct message when protocol not supported', function () {
+    ORM.connectAsync("pg://127.0.0.6")
+      .then(function () {
+        done('Fail.');
+      })
+      .catch(function () {
+        should.exist(err);
+        err.message.should.not.equal("CONNECTION_PROTOCOL_NOT_SUPPORTED");
+        done();
+      });
+  });
+
+  it('should throw error with correct message when connection URL doesn\'t exist', function (done) {
+    ORM.connectAsync()
+      .then(function () {
+        done('Fail')
+      })
+      .catch(function (err) {
+        err.message.should.equal("CONNECTION_URL_EMPTY");
+        done();
+      });
+  });
+
+  it("should throw error when passed empty string like connection URL", function (done) {
+    ORM.connectAsync("")
+      .then(function () {
+        done('Fail');
+      })
+      .catch(function (err) {
+        err.message.should.equal("CONNECTION_URL_EMPTY");
+        done()
+      });
+  });
+
+  it("should throw error when passed string with spaces only", function (done) {
+    ORM.connectAsync("    ")
+      .then(function () {
+        done('Fail');
+      })
+      .catch(function (err) {
+        err.message.should.equal("CONNECTION_URL_EMPTY");
+        done()
+      });
+  });
+
+  it("should throw error when passed invalid protocol", function (done) {
+    ORM.connectAsync("user@db")
+      .then(function () {
+        done('Fail');
+      })
+      .catch(function (err) {
+        err.message.should.equal("CONNECTION_URL_NO_PROTOCOL");
+        done()
+      });
+  });
+
+  it("should throw error when passed unknown protocol", function (done) {
+    ORM.connectAsync("unknown://db")
+      .then(function () {
+        done('Fail');
+      })
+      .catch(function (err) {
+        should.equal(err.literalCode, 'NO_SUPPORT');
+        should.equal(
+          err.message,
+          "Connection protocol not supported - have you installed the database driver for unknown?"
+        );
+        done()
+      });
+  });
+
+  it("should throw error when passed invalid connection db link", function (done) {
+    ORM.connectAsync("mysql://fakeuser:nopassword@127.0.0.1/unknowndb")
+      .then(function () {
+        done('Fail');
+      })
+      .catch(function (err) {
+        should.exist(err);
+        should.equal(err.message.indexOf("Connection protocol not supported"), -1);
+        err.message.should.not.equal("CONNECTION_URL_NO_PROTOCOL");
+        err.message.should.not.equal("CONNECTION_URL_EMPTY");
+        done()
+      });
+  });
+
+  it("should do not mutate opts", function (done) {
+    var opts = {
+      protocol : 'mysql',
+      user     : 'notauser',
+      password : "wrong password",
+      query    : { pool: true, debug: true }
+    };
+
+    var expected = JSON.stringify(opts);
+
+    ORM.connectAsync(opts)
+      .then(function () {
+        done('Fail');
+      })
+      .catch(function () {
+        should.equal(
+          JSON.stringify(opts),
+          expected
+        );
+        done();
+      });
+  });
+
+  it("should pass successful when opts is OK!", function (done) {
+    ORM.connectAsync(common.getConnectionString())
+      .then(function (db) {
+        should.exist(db);
+
+        db.use.should.be.a.Function();
+        db.define.should.be.a.Function();
+        db.sync.should.be.a.Function();
+        db.load.should.be.a.Function();
+
+        done();
+      })
+      .catch(function (err) {
+        done(err);
+      });
+  });
+
+  describe('POOL via connectAsync', function () {
+    if (protocol !== 'mongodb') {
+      it("should understand pool `'false'` from query string", function (done) {
+        var connString = common.getConnectionString() + "debug=false&pool=false";
+        ORM.connectAsync(connString)
+          .then(function (db) {
+            should.strictEqual(db.driver.opts.pool,  false);
+            should.strictEqual(db.driver.opts.debug, false);
+            done();
+          })
+          .catch(function (err) {
+            done(err);
+          });
+      });
+
+      it("should understand pool `'0'` from query string", function (done) {
+        var connString = common.getConnectionString() + "debug=0&pool=0";
+        ORM.connectAsync(connString)
+          .then(function (db) {
+            should.strictEqual(db.driver.opts.pool,  false);
+            should.strictEqual(db.driver.opts.debug, false);
+            done();
+          })
+          .catch(function (err) {
+            done(err);
+          });
+      });
+
+      it("should understand pool `'true'` from query string", function (done) {
+        var connString = common.getConnectionString() + "debug=true&pool=true";
+        ORM.connectAsync(connString)
+          .then(function (db) {
+            should.strictEqual(db.driver.opts.pool,  true);
+            should.strictEqual(db.driver.opts.debug, true);
+            done();
+          })
+          .catch(function (err) {
+            done(err);
+          });
+      });
+
+      it("should understand pool `'true'` from query string", function (done) {
+        var connString = common.getConnectionString() + "debug=1&pool=1";
+        ORM.connectAsync(connString)
+          .then(function (db) {
+            should.strictEqual(db.driver.opts.pool,  true);
+            should.strictEqual(db.driver.opts.debug, true);
+            done();
+          })
+          .catch(function (err) {
+            done(err);
+          });
+      });
+
+      it("should understand pool `'true'` from query string", function (done) {
+        var connOpts = _.extend(common.getConfig(), {
+          protocol: common.protocol(),
+          query: {
+            pool: true, debug: true
+          }
+        });
+        ORM.connectAsync(connOpts)
+          .then(function (db) {
+            should.strictEqual(db.driver.opts.pool,  true);
+            should.strictEqual(db.driver.opts.debug, true);
+            done();
+          })
+          .catch(function (err) {
+            done(err);
+          });
+      });
+
+      it("should understand pool `false` from query options", function (done) {
+        var connOpts = _.extend(common.getConfig(), {
+          protocol: common.protocol(),
+          query: {
+            pool: false, debug: false
+          }
+        });
+        ORM.connectAsync(connOpts)
+          .then(function (db) {
+            should.strictEqual(db.driver.opts.pool,  false);
+            should.strictEqual(db.driver.opts.debug, false);
+            done();
+          })
+          .catch(function (err) {
+            done(err);
+          });
+      });
+    }
+  });
+});
+
 describe("ORM.connect()", function () {
   it("should expose .use(), .define(), .sync() and .load()", function (done) {
     var db = ORM.connect();
@@ -72,8 +295,9 @@ describe("ORM.connect()", function () {
     });
   });
 
-  it("should allow protocol alias", function (done) {
-    var db = ORM.connect("pg://127.0.0.2");
+  it.skip("should allow protocol alias", function (done) {
+    this.timeout(60000);
+    var db = ORM.connect("pg://127.0.0.6");
 
     db.once("connect", function (err) {
       should.exist(err);

From 5d358a02bbca221a5ea39f7280b736824b9bf440 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Tue, 22 Aug 2017 12:54:29 +0300
Subject: [PATCH 1100/1246] add dropAsync and syncPromise, add test coverage
 for this methods

---
 lib/ORM.js                      |  31 +-
 package-lock.json               |  90 +++-
 package.json                    |   1 +
 test/integration/db.js          | 392 ++++++++-------
 test/integration/orm-exports.js | 844 ++++++++++++++++----------------
 5 files changed, 754 insertions(+), 604 deletions(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index 8515becd..8d37bb24 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -49,7 +49,6 @@ var connect = function (opts, cb) {
   }
 
   opts.query = opts.query || {};
-
   for(var k in opts.query) {
     opts.query[k] = queryParamCast(opts.query[k]);
     opts[k] = opts.query[k];
@@ -156,6 +155,7 @@ exports.use = function (connection, proto, opts, cb) {
  * @param opts
  */
 exports.connectAsync = function (opts) {
+  var options = _.cloneDeep(opts);
   return new Promise(function (resolve, reject) {
     var cb = function (resolve, reject) {
       return function (err, data) {
@@ -165,7 +165,7 @@ exports.connectAsync = function (opts) {
         resolve(data);
       }
     };
-    connect(opts, cb(resolve, reject));
+    connect(options, cb(resolve, reject));
   });
 };
 
@@ -318,7 +318,21 @@ ORM.prototype.load = function () {
   async.eachSeries(filesWithPath, iterator, cb);
 };
 
-
+ORM.prototype.syncPromise = function () {
+  var self = this;
+  var modelIds = Object.keys(this.models);
+  return Promise.each(modelIds, function (id) {
+    return new Promise(function (resolve, reject) {
+      self.models[id].sync(function (err) {
+        if (err) {
+          err.model = id;
+          reject(err);
+        }
+        resolve(id);
+      });
+    });
+  })
+};
 
 ORM.prototype.sync = function (cb) {
   var modelIds = Object.keys(this.models);
@@ -350,8 +364,15 @@ ORM.prototype.sync = function (cb) {
 };
 
 ORM.prototype.dropAsync = function () {
-  return Promise.each(this.models, function (model) {
-    console.log(model.drop);
+  var self = this;
+  var modelIds = Object.keys(this.models);
+  return Promise.each(modelIds, function (id) {
+    return new Promise(function (resolve, reject) {
+      self.models[id].drop(function (err, data) {
+        if (err) reject(err);
+        resolve(data);
+      });
+    });
   })
 };
 
diff --git a/package-lock.json b/package-lock.json
index 79fccedc..b1760b04 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -134,8 +134,7 @@
 		"diff": {
 			"version": "3.2.0",
 			"resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz",
-			"integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k=",
-			"dev": true
+			"integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k="
 		},
 		"enforce": {
 			"version": "0.1.7",
@@ -148,6 +147,14 @@
 			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
 			"dev": true
 		},
+		"formatio": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/formatio/-/formatio-1.2.0.tgz",
+			"integrity": "sha1-87IWfZBoxGmKjVH092CjmlTYGOs=",
+			"requires": {
+				"samsam": "1.2.1"
+			}
+		},
 		"fs.realpath": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -226,6 +233,11 @@
 			"integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
 			"dev": true
 		},
+		"just-extend": {
+			"version": "1.1.22",
+			"resolved": "https://registry.npmjs.org/just-extend/-/just-extend-1.1.22.tgz",
+			"integrity": "sha1-MzCvdWyralQnAMZLLk5KoGLVL/8="
+		},
 		"kerberos": {
 			"version": "0.0.4",
 			"resolved": "https://registry.npmjs.org/kerberos/-/kerberos-0.0.4.tgz",
@@ -306,6 +318,11 @@
 				"lodash.isarray": "3.0.4"
 			}
 		},
+		"lolex": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/lolex/-/lolex-2.1.2.tgz",
+			"integrity": "sha1-JpS5U8nqTQE+W4v7qJHJkQJbJik="
+		},
 		"minimatch": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -440,6 +457,29 @@
 			"integrity": "sha1-PHa1OC6rM+RLdY0oE8qdkuk0LzQ=",
 			"dev": true
 		},
+		"native-promise-only": {
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz",
+			"integrity": "sha1-IKMYwwy0X3H+et+/eyHJnBRy7xE="
+		},
+		"nise": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/nise/-/nise-1.0.1.tgz",
+			"integrity": "sha1-DakrEKhU6XwPSW9sKEWjASgLPu8=",
+			"requires": {
+				"formatio": "1.2.0",
+				"just-extend": "1.1.22",
+				"lolex": "1.6.0",
+				"path-to-regexp": "1.7.0"
+			},
+			"dependencies": {
+				"lolex": {
+					"version": "1.6.0",
+					"resolved": "https://registry.npmjs.org/lolex/-/lolex-1.6.0.tgz",
+					"integrity": "sha1-OpoCg0UqR9dDnnJzG54H1zhuSfY="
+				}
+			}
+		},
 		"object-assign": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz",
@@ -466,6 +506,21 @@
 			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
 			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
 		},
+		"path-to-regexp": {
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
+			"integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=",
+			"requires": {
+				"isarray": "0.0.1"
+			},
+			"dependencies": {
+				"isarray": {
+					"version": "0.0.1",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+				}
+			}
+		},
 		"pg": {
 			"version": "6.4.1",
 			"resolved": "https://registry.npmjs.org/pg/-/pg-6.4.1.tgz",
@@ -583,6 +638,11 @@
 			"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
 			"dev": true
 		},
+		"samsam": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/samsam/-/samsam-1.2.1.tgz",
+			"integrity": "sha1-7dOQk6MYQ3DLhZJDsr3yVefY6mc="
+		},
 		"semver": {
 			"version": "5.3.0",
 			"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
@@ -643,6 +703,22 @@
 			"integrity": "sha1-yYzaN0qmsZDfi6h8mInCtNtiAGM=",
 			"dev": true
 		},
+		"sinon": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/sinon/-/sinon-3.2.1.tgz",
+			"integrity": "sha512-KY3OLOWpek/I4NGAMHetuutVgS2aRgMR5g5/1LSYvPJ3qo2BopIvk3esFztPxF40RWf/NNNJzdFPriSkXUVK3A==",
+			"requires": {
+				"diff": "3.2.0",
+				"formatio": "1.2.0",
+				"lolex": "2.1.2",
+				"native-promise-only": "0.8.1",
+				"nise": "1.0.1",
+				"path-to-regexp": "1.7.0",
+				"samsam": "1.2.1",
+				"text-encoding": "0.6.4",
+				"type-detect": "4.0.3"
+			}
+		},
 		"split": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/split/-/split-1.0.0.tgz",
@@ -1784,12 +1860,22 @@
 				"has-flag": "2.0.0"
 			}
 		},
+		"text-encoding": {
+			"version": "0.6.4",
+			"resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz",
+			"integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk="
+		},
 		"through": {
 			"version": "2.3.8",
 			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
 			"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
 			"dev": true
 		},
+		"type-detect": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.3.tgz",
+			"integrity": "sha1-Dj8mcLRAmbC0bChNE2p+9Jx0wuo="
+		},
 		"util-deprecate": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
diff --git a/package.json b/package.json
index 481cfe63..faae57a6 100644
--- a/package.json
+++ b/package.json
@@ -67,6 +67,7 @@
     "hat": "0.0.3",
     "lodash": "4.17.4",
     "path-is-absolute": "1.0.1",
+    "sinon": "^3.2.1",
     "sql-ddl-sync": "0.3.13",
     "sql-query": "0.1.26"
   },
diff --git a/test/integration/db.js b/test/integration/db.js
index da72e113..8546e3c6 100644
--- a/test/integration/db.js
+++ b/test/integration/db.js
@@ -1,12 +1,12 @@
 var should = require('should');
 var helper = require('../support/spec_helper');
-var ORM    = require('../../');
+var sinon = require('sinon');
 var common = require('../common');
+var _ = require('lodash');
 
-describe("db.use()", function () {
+describe('DB', function () {
   var db = null;
-
-  before(function (done) {
+  beforeEach(function (done) {
     helper.connect(function (connection) {
       db = connection;
 
@@ -14,256 +14,276 @@ describe("db.use()", function () {
     });
   });
 
-  after(function () {
+  afterEach(function () {
     return db.close();
   });
 
-  it.only('~!_!-!!_!~-~_~_-_-', function () {
-    console.log(db.dropAsync);
-  });
-
-  it("should be able to register a plugin", function (done) {
-    var MyPlugin = require("../support/my_plugin");
-    var opts     = {
-      option       : true,
-      calledDefine : false
-    };
-
-    db.use(MyPlugin, opts);
-
-    var MyModel = db.define("my_model", { // db.define should call plugin.define method
-      property: String
+  describe('db.syncPromise()', function () {
+    it('should call sync method from model, and return array with model id', function (done) {
+      db.define("my_model", {
+        property: String
+      });
+      var syncStub = sinon.stub(db.models['my_model'], 'sync').callsFake(function (cb) { cb(null, {}) });
+      db.dropAsync()
+        .then(function (data) {
+          syncStub.calledOnce.should.be.true;
+          data.should.be.Array;
+          should.equal(data[0], 'my_model');
+          done();
+        })
+        .catch(function (err) {
+          done(err)
+        });
+      syncStub.restore();
     });
 
-    opts.calledDefine.should.be.true;
-
-    return done();
-  });
-
-  it("a plugin should be able to catch models before defining them", function (done) {
-    var MyPlugin = require("../support/my_plugin");
-    var opts     = {
-      option       : true,
-      calledDefine : false,
-      beforeDefine : function (name, props, opts) {
-        props.otherprop = Number;
-      }
-    };
-
-    db.use(MyPlugin, opts);
-
-    var MyModel = db.define("my_model", { // db.define should call plugin.define method
-      property: String
+    it('should return an empty array when no model created', function (done) {
+      db.dropAsync()
+        .then(function (data) {
+          data.should.be.Array;
+          should.equal(_.isEmpty(data), true);
+          done()
+        })
+        .catch(function (err) {
+          done(err)
+        })
     });
-
-    opts.calledDefine.should.be.true;
-    MyModel.properties.should.have.property("otherprop");
-
-    return done();
   });
 
-  it("should be able to register a plugin as string", function (done) {
-    var opts     = {
-      option       : true,
-      calledDefine : false
-    };
-
-    db.use("../support/my_plugin", opts);
+  describe("db.dropAsync()", function () {
+    it('should call drop method from model, and return array with model id', function (done) {
+      db.define("my_model", {
+        property: String
+      });
+      var dropStub = sinon.stub(db.models['my_model'], 'drop').callsFake(function (cb) { cb(null, {}) });
+      db.dropAsync()
+        .then(function (data) {
+          dropStub.calledOnce.should.be.true;
+          data.should.be.Array;
+          should.equal(data[0], 'my_model');
+          done();
+        })
+        .catch(function (err) {
+          done(err)
+        });
+      dropStub.restore();
+    });
 
-    var MyModel = db.define("my_model", { // db.define should call plugin.define method
-      property: String
+    it('should return an empty array when no model created', function (done) {
+      db.dropAsync()
+        .then(function (data) {
+          data.should.be.Array;
+          should.equal(_.isEmpty(data), true);
+          done()
+        })
+        .catch(function (err) {
+          done(err)
+        })
     });
+  });
 
-    opts.calledDefine.should.be.true;
+  describe("db.use()", function () {
+    it("should be able to register a plugin", function (done) {
+      var MyPlugin = require("../support/my_plugin");
+      var opts     = {
+        option       : true,
+        calledDefine : false
+      };
 
-    return done();
-  });
-});
+      db.use(MyPlugin, opts);
 
-describe("db.define()", function() {
-  var db = null;
+      var MyModel = db.define("my_model", { // db.define should call plugin.define method
+        property: String
+      });
 
-  before(function (done) {
-    helper.connect(function (connection) {
-      db = connection;
+      opts.calledDefine.should.be.true;
 
       return done();
     });
-  });
 
-  after(function () {
-    return db.close();
-  });
+    it("a plugin should be able to catch models before defining them", function (done) {
+      var MyPlugin = require("../support/my_plugin");
+      var opts     = {
+        option       : true,
+        calledDefine : false,
+        beforeDefine : function (name, props, opts) {
+          props.otherprop = Number;
+        }
+      };
+
+      db.use(MyPlugin, opts);
+
+      var MyModel = db.define("my_model", { // db.define should call plugin.define method
+        property: String
+      });
 
-  it("should use setting model.namePrefix as table prefix if defined", function (done) {
-    db.settings.set("model.namePrefix", "orm_");
+      opts.calledDefine.should.be.true;
+      MyModel.properties.should.have.property("otherprop");
 
-    var Person = db.define("person", {
-      name: String
+      done();
     });
 
-    Person.table.should.equal("orm_person");
+    it("should be able to register a plugin as string", function (done) {
+      var opts     = {
+        option       : true,
+        calledDefine : false
+      };
 
-    return done();
-  });
-});
+      db.use("../support/my_plugin", opts);
 
-describe("db.load()", function () {
-  var db = null;
+      var MyModel = db.define("my_model", { // db.define should call plugin.define method
+        property: String
+      });
 
-  beforeEach(function (done) {
-    helper.connect(function (connection) {
-      db = connection;
+      opts.calledDefine.should.be.true;
 
-      done();
+      return done();
     });
   });
 
-  afterEach(function () {
-    db.close();
-  });
+  describe("db.define()", function() {
+    it("should use setting model.namePrefix as table prefix if defined", function (done) {
+      db.settings.set("model.namePrefix", "orm_");
 
-  it("should require a file based on relative path", function (done) {
-    db.load("../support/spec_load", function (err) {
-      should.not.exist(err);
+      var Person = db.define("person", {
+        name: String
+      });
 
-      db.models.should.have.property("person");
-      db.models.should.have.property("pet");
+      Person.table.should.equal("orm_person");
 
-      done();
+      return done();
     });
   });
 
-  it("should be able to load more than one file", function (done) {
-    db.load("../support/spec_load_second", "../support/spec_load_third", function (err) {
-      should.not.exist(err);
+  describe("db.load()", function () {
+    it("should require a file based on relative path", function (done) {
+      db.load("../support/spec_load", function (err) {
+        should.not.exist(err);
 
-      db.models.should.have.property("person");
-      db.models.should.have.property("pet");
+        db.models.should.have.property("person");
+        db.models.should.have.property("pet");
 
-      done();
+        return done();
+      });
     });
-  });
 
-  it("should be able to load more than one file passed as Array", function (done) {
-    db.load([ "../support/spec_load_second", "../support/spec_load_third" ], function (err) {
-      should.not.exist(err);
+    it("should be able to load more than one file", function (done) {
+      db.load("../support/spec_load_second", "../support/spec_load_third", function (err) {
+        should.not.exist(err);
 
-      db.models.should.have.property("person");
-      db.models.should.have.property("pet");
+        db.models.should.have.property("person");
+        db.models.should.have.property("pet");
 
-      done();
+        return done();
+      });
     });
-  });
-});
 
-describe("db.serial()", function () {
-  var db = null;
+    it("should be able to load more than one file passed as Array", function (done) {
+      db.load([ "../support/spec_load_second", "../support/spec_load_third" ], function (err) {
+        should.not.exist(err);
 
-  before(function (done) {
-    helper.connect(function (connection) {
-      db = connection;
+        db.models.should.have.property("person");
+        db.models.should.have.property("pet");
 
-      return done();
+        return done();
+      });
     });
   });
 
-  after(function () {
-    return db.close();
-  });
-
-  it("should be able to execute chains in serial", function (done) {
-    var Person = db.define("person", {
-      name    : String,
-      surname : String
-    });
-    helper.dropSync(Person, function () {
-      Person.create([
-        { name : "John", surname : "Doe" },
-        { name : "Jane", surname : "Doe" }
-      ], function () {
-        db.serial(
-          Person.find({ surname : "Doe" }),
-          Person.find({ name    : "John" })
-        ).get(function (err, DoeFamily, JohnDoe) {
-          should.equal(err, null);
-
-          should(Array.isArray(DoeFamily));
-          should(Array.isArray(JohnDoe));
-
-          DoeFamily.length.should.equal(2);
-          JohnDoe.length.should.equal(1);
-
-          DoeFamily[0].surname.should.equal("Doe");
-          DoeFamily[1].surname.should.equal("Doe");
-
-          JohnDoe[0].name.should.equal("John");
-
-          return done();
+  describe("db.serial()", function () {
+    it("should be able to execute chains in serial", function (done) {
+      var Person = db.define("person", {
+        name    : String,
+        surname : String
+      });
+      helper.dropSync(Person, function () {
+        Person.create([
+          { name : "John", surname : "Doe" },
+          { name : "Jane", surname : "Doe" }
+        ], function () {
+          db.serial(
+            Person.find({ surname : "Doe" }),
+            Person.find({ name    : "John" })
+          ).get(function (err, DoeFamily, JohnDoe) {
+            should.equal(err, null);
+
+            should(Array.isArray(DoeFamily));
+            should(Array.isArray(JohnDoe));
+
+            DoeFamily.length.should.equal(2);
+            JohnDoe.length.should.equal(1);
+
+            DoeFamily[0].surname.should.equal("Doe");
+            DoeFamily[1].surname.should.equal("Doe");
+
+            JohnDoe[0].name.should.equal("John");
+
+            return done();
+          });
         });
       });
     });
   });
-});
 
-describe("db.driver", function () {
-  var db = null;
+  describe("db.driver", function () {
+    var db = null;
 
-  before(function (done) {
-    helper.connect(function (connection) {
-      db = connection;
+    before(function (done) {
+      helper.connect(function (connection) {
+        db = connection;
 
-      var Log = db.define('log', {
-        what : { type: 'text' },
-        when : { type: 'date', time: true },
-        who  : { type: 'text' }
-      });
+        var Log = db.define('log', {
+          what : { type: 'text' },
+          when : { type: 'date', time: true },
+          who  : { type: 'text' }
+        });
 
-      helper.dropSync(Log, function (err) {
-        if (err) return done(err);
+        helper.dropSync(Log, function (err) {
+          if (err) return done(err);
 
-        Log.create([
-          { what: "password reset", when: new Date('2013/04/07 12:33:05'), who: "jane" },
-          { what: "user login",     when: new Date('2013/04/07 13:01:44'), who: "jane" },
-          { what: "user logout",    when: new Date('2013/05/12 04:09:31'), who: "john" }
-        ], done);
+          Log.create([
+            { what: "password reset", when: new Date('2013/04/07 12:33:05'), who: "jane" },
+            { what: "user login",     when: new Date('2013/04/07 13:01:44'), who: "jane" },
+            { what: "user logout",    when: new Date('2013/05/12 04:09:31'), who: "john" }
+          ], done);
+        });
       });
     });
-  });
 
-  after(function () {
-    return db.close();
-  });
-
-  it("should be available", function () {
-    should.exist(db.driver);
-  });
-
-  if (common.protocol() == "mongodb") return;
+    after(function () {
+      return db.close();
+    });
 
-  describe("query", function () {
     it("should be available", function () {
-      should.exist(db.driver.query);
+      should.exist(db.driver);
     });
 
-    describe("#execQuery", function () {
-      it("should execute sql queries", function (done) {
-        db.driver.execQuery("SELECT id FROM log", function (err, data) {
-          should.not.exist(err);
+    if (common.protocol() == "mongodb") return;
 
-          should(JSON.stringify(data) == JSON.stringify([{ id: 1 }, { id: 2 }, { id: 3 }]));
-          done();
-        });
+    describe("query", function () {
+      it("should be available", function () {
+        should.exist(db.driver.query);
       });
 
-      it("should escape sql queries", function (done) {
-        var query = "SELECT log.?? FROM log WHERE log.?? LIKE ? AND log.?? > ?";
-        var args  = ['what', 'who', 'jane', 'when', new Date('2013/04/07 12:40:00')];
-        db.driver.execQuery(query, args, function (err, data) {
-          should.not.exist(err);
+      describe("#execQuery", function () {
+        it("should execute sql queries", function (done) {
+          db.driver.execQuery("SELECT id FROM log", function (err, data) {
+            should.not.exist(err);
 
-          should(JSON.stringify(data) == JSON.stringify([{ "what": "user login" }]));
-          done();
+            should(JSON.stringify(data) == JSON.stringify([{ id: 1 }, { id: 2 }, { id: 3 }]));
+            done();
+          });
+        });
+
+        it("should escape sql queries", function (done) {
+          var query = "SELECT log.?? FROM log WHERE log.?? LIKE ? AND log.?? > ?";
+          var args  = ['what', 'who', 'jane', 'when', new Date('2013/04/07 12:40:00')];
+          db.driver.execQuery(query, args, function (err, data) {
+            should.not.exist(err);
+
+            should(JSON.stringify(data) == JSON.stringify([{ "what": "user login" }]));
+            done();
+          });
         });
       });
     });
diff --git a/test/integration/orm-exports.js b/test/integration/orm-exports.js
index fb7be6c7..852967cc 100644
--- a/test/integration/orm-exports.js
+++ b/test/integration/orm-exports.js
@@ -48,526 +48,548 @@ describe("ORM", function() {
       return done();
     });
   });
-});
-
-describe('ORM.connectAsync()', function () {
-  it('should be a function', function () {
-    ORM.connectAsync.should.be.a.Function()
-  });
+  describe('ORM.connectAsync()', function () {
+    it('should be a function', function () {
+      ORM.connectAsync.should.be.a.Function()
+    });
 
-  it('should throw error with correct message when protocol not supported', function () {
-    ORM.connectAsync("pg://127.0.0.6")
-      .then(function () {
-        done('Fail.');
-      })
-      .catch(function () {
-        should.exist(err);
-        err.message.should.not.equal("CONNECTION_PROTOCOL_NOT_SUPPORTED");
-        done();
-      });
-  });
+    it('should throw error with correct message when protocol not supported', function () {
+      ORM.connectAsync("pg://127.0.0.6")
+        .then(function () {
+          done('Fail.');
+        })
+        .catch(function () {
+          should.exist(err);
+          err.message.should.not.equal("CONNECTION_PROTOCOL_NOT_SUPPORTED");
+          done();
+        });
+    });
 
-  it('should throw error with correct message when connection URL doesn\'t exist', function (done) {
-    ORM.connectAsync()
-      .then(function () {
-        done('Fail')
-      })
-      .catch(function (err) {
-        err.message.should.equal("CONNECTION_URL_EMPTY");
-        done();
-      });
-  });
+    it('should throw error with correct message when connection URL doesn\'t exist', function (done) {
+      ORM.connectAsync()
+        .then(function () {
+          done('Fail')
+        })
+        .catch(function (err) {
+          err.message.should.equal("CONNECTION_URL_EMPTY");
+          done();
+        });
+    });
 
-  it("should throw error when passed empty string like connection URL", function (done) {
-    ORM.connectAsync("")
-      .then(function () {
-        done('Fail');
-      })
-      .catch(function (err) {
-        err.message.should.equal("CONNECTION_URL_EMPTY");
-        done()
-      });
-  });
+    it("should throw error when passed empty string like connection URL", function (done) {
+      ORM.connectAsync("")
+        .then(function () {
+          done('Fail');
+        })
+        .catch(function (err) {
+          err.message.should.equal("CONNECTION_URL_EMPTY");
+          done()
+        });
+    });
 
-  it("should throw error when passed string with spaces only", function (done) {
-    ORM.connectAsync("    ")
-      .then(function () {
-        done('Fail');
-      })
-      .catch(function (err) {
-        err.message.should.equal("CONNECTION_URL_EMPTY");
-        done()
-      });
-  });
+    it("should throw error when passed string with spaces only", function (done) {
+      ORM.connectAsync("    ")
+        .then(function () {
+          done('Fail');
+        })
+        .catch(function (err) {
+          err.message.should.equal("CONNECTION_URL_EMPTY");
+          done()
+        });
+    });
 
-  it("should throw error when passed invalid protocol", function (done) {
-    ORM.connectAsync("user@db")
-      .then(function () {
-        done('Fail');
-      })
-      .catch(function (err) {
-        err.message.should.equal("CONNECTION_URL_NO_PROTOCOL");
-        done()
-      });
-  });
+    it("should throw error when passed invalid protocol", function (done) {
+      ORM.connectAsync("user@db")
+        .then(function () {
+          done('Fail');
+        })
+        .catch(function (err) {
+          err.message.should.equal("CONNECTION_URL_NO_PROTOCOL");
+          done()
+        });
+    });
 
-  it("should throw error when passed unknown protocol", function (done) {
-    ORM.connectAsync("unknown://db")
-      .then(function () {
-        done('Fail');
-      })
-      .catch(function (err) {
-        should.equal(err.literalCode, 'NO_SUPPORT');
-        should.equal(
-          err.message,
-          "Connection protocol not supported - have you installed the database driver for unknown?"
-        );
-        done()
-      });
-  });
+    it("should throw error when passed unknown protocol", function (done) {
+      ORM.connectAsync("unknown://db")
+        .then(function () {
+          done('Fail');
+        })
+        .catch(function (err) {
+          should.equal(err.literalCode, 'NO_SUPPORT');
+          should.equal(
+            err.message,
+            "Connection protocol not supported - have you installed the database driver for unknown?"
+          );
+          done()
+        });
+    });
 
-  it("should throw error when passed invalid connection db link", function (done) {
-    ORM.connectAsync("mysql://fakeuser:nopassword@127.0.0.1/unknowndb")
-      .then(function () {
-        done('Fail');
-      })
-      .catch(function (err) {
-        should.exist(err);
-        should.equal(err.message.indexOf("Connection protocol not supported"), -1);
-        err.message.should.not.equal("CONNECTION_URL_NO_PROTOCOL");
-        err.message.should.not.equal("CONNECTION_URL_EMPTY");
-        done()
-      });
-  });
+    it("should throw error when passed invalid connection db link", function (done) {
+      ORM.connectAsync("mysql://fakeuser:nopassword@127.0.0.1/unknowndb")
+        .then(function () {
+          done('Fail');
+        })
+        .catch(function (err) {
+          should.exist(err);
+          should.equal(err.message.indexOf("Connection protocol not supported"), -1);
+          err.message.should.not.equal("CONNECTION_URL_NO_PROTOCOL");
+          err.message.should.not.equal("CONNECTION_URL_EMPTY");
+          done()
+        });
+    });
 
-  it("should do not mutate opts", function (done) {
-    var opts = {
-      protocol : 'mysql',
-      user     : 'notauser',
-      password : "wrong password",
-      query    : { pool: true, debug: true }
-    };
-
-    var expected = JSON.stringify(opts);
-
-    ORM.connectAsync(opts)
-      .then(function () {
-        done('Fail');
-      })
-      .catch(function () {
-        should.equal(
-          JSON.stringify(opts),
-          expected
-        );
-        done();
-      });
-  });
+    it("should do not mutate opts", function (done) {
+      var opts = {
+        protocol : 'mysql',
+        user     : 'notauser',
+        password : "wrong password",
+        query    : { pool: true, debug: true }
+      };
+
+      var expected = JSON.stringify(opts);
+
+      ORM.connectAsync(opts)
+        .then(function () {
+          done('Fail');
+        })
+        .catch(function () {
+          should.equal(
+            JSON.stringify(opts),
+            expected
+          );
+          done();
+        });
+    });
 
-  it("should pass successful when opts is OK!", function (done) {
-    ORM.connectAsync(common.getConnectionString())
-      .then(function (db) {
-        should.exist(db);
+    it("should pass successful when opts is OK!", function (done) {
+      ORM.connectAsync(common.getConnectionString())
+        .then(function (db) {
+          should.exist(db);
 
-        db.use.should.be.a.Function();
-        db.define.should.be.a.Function();
-        db.sync.should.be.a.Function();
-        db.load.should.be.a.Function();
+          db.use.should.be.a.Function();
+          db.define.should.be.a.Function();
+          db.sync.should.be.a.Function();
+          db.load.should.be.a.Function();
 
-        done();
-      })
-      .catch(function (err) {
-        done(err);
-      });
-  });
+          done();
+        })
+        .catch(function (err) {
+          done(err);
+        });
+    });
 
-  describe('POOL via connectAsync', function () {
-    if (protocol !== 'mongodb') {
-      it("should understand pool `'false'` from query string", function (done) {
-        var connString = common.getConnectionString() + "debug=false&pool=false";
-        ORM.connectAsync(connString)
-          .then(function (db) {
-            should.strictEqual(db.driver.opts.pool,  false);
-            should.strictEqual(db.driver.opts.debug, false);
-            done();
-          })
-          .catch(function (err) {
-            done(err);
-          });
-      });
+    describe('POOL via connectAsync', function () {
+      var connStr = null;
 
-      it("should understand pool `'0'` from query string", function (done) {
-        var connString = common.getConnectionString() + "debug=0&pool=0";
-        ORM.connectAsync(connString)
-          .then(function (db) {
-            should.strictEqual(db.driver.opts.pool,  false);
-            should.strictEqual(db.driver.opts.debug, false);
-            done();
-          })
-          .catch(function (err) {
-            done(err);
-          });
+      beforeEach(function () {
+        connStr = common.getConnectionString();
       });
 
-      it("should understand pool `'true'` from query string", function (done) {
-        var connString = common.getConnectionString() + "debug=true&pool=true";
-        ORM.connectAsync(connString)
-          .then(function (db) {
-            should.strictEqual(db.driver.opts.pool,  true);
-            should.strictEqual(db.driver.opts.debug, true);
-            done();
-          })
-          .catch(function (err) {
-            done(err);
-          });
+      afterEach(function () {
+        connStr = null
       });
 
-      it("should understand pool `'true'` from query string", function (done) {
-        var connString = common.getConnectionString() + "debug=1&pool=1";
-        ORM.connectAsync(connString)
-          .then(function (db) {
-            should.strictEqual(db.driver.opts.pool,  true);
-            should.strictEqual(db.driver.opts.debug, true);
-            done();
-          })
-          .catch(function (err) {
-            done(err);
-          });
-      });
+      if (protocol !== 'mongodb') {
+        it("should understand pool `'false'` from query string", function (done) {
+          var connString = connStr + "debug=false&pool=false";
+          ORM.connectAsync(connString)
+            .then(function (db) {
+              should.strictEqual(db.driver.opts.pool,  false);
+              should.strictEqual(db.driver.opts.debug, false);
+              done();
+            })
+            .catch(function (err) {
+              done(err);
+            });
+        });
 
-      it("should understand pool `'true'` from query string", function (done) {
-        var connOpts = _.extend(common.getConfig(), {
-          protocol: common.protocol(),
-          query: {
-            pool: true, debug: true
-          }
+        it("should understand pool `'0'` from query string", function (done) {
+          var connString = connStr + "debug=0&pool=0";
+          ORM.connectAsync(connString)
+            .then(function (db) {
+              should.strictEqual(db.driver.opts.pool,  false);
+              should.strictEqual(db.driver.opts.debug, false);
+              done();
+            })
+            .catch(function (err) {
+              done(err);
+            });
         });
-        ORM.connectAsync(connOpts)
-          .then(function (db) {
-            should.strictEqual(db.driver.opts.pool,  true);
-            should.strictEqual(db.driver.opts.debug, true);
-            done();
-          })
-          .catch(function (err) {
-            done(err);
-          });
-      });
 
-      it("should understand pool `false` from query options", function (done) {
-        var connOpts = _.extend(common.getConfig(), {
-          protocol: common.protocol(),
-          query: {
-            pool: false, debug: false
-          }
+        it("should understand pool `'true'` from query string", function (done) {
+          var connString = connStr + "debug=true&pool=true";
+          ORM.connectAsync(connString)
+            .then(function (db) {
+              should.strictEqual(db.driver.opts.pool,  true);
+              should.strictEqual(db.driver.opts.debug, true);
+              done();
+            })
+            .catch(function (err) {
+              done(err);
+            });
         });
-        ORM.connectAsync(connOpts)
-          .then(function (db) {
-            should.strictEqual(db.driver.opts.pool,  false);
-            should.strictEqual(db.driver.opts.debug, false);
-            done();
-          })
-          .catch(function (err) {
-            done(err);
-          });
-      });
-    }
-  });
-});
 
-describe("ORM.connect()", function () {
-  it("should expose .use(), .define(), .sync() and .load()", function (done) {
-    var db = ORM.connect();
+        it("should understand pool `'true'` from query string", function (done) {
+          var connString = connStr + "debug=1&pool=1";
+          ORM.connectAsync(connString)
+            .then(function (db) {
+              should.strictEqual(db.driver.opts.pool,  true);
+              should.strictEqual(db.driver.opts.debug, true);
+              done();
+            })
+            .catch(function (err) {
+              done(err);
+            });
+        });
 
-    db.use.should.be.a.Function();
-    db.define.should.be.a.Function();
-    db.sync.should.be.a.Function();
-    db.load.should.be.a.Function();
+        it("should understand pool `'true'` from query string", function (done) {
+          var connCopy = _.cloneDeep(common.getConfig());
+          var connOpts = _.extend(connCopy, {
+            protocol: common.protocol(),
+            query: {
+              pool: true, debug: true
+            }
+          });
+          ORM.connectAsync(connOpts)
+            .then(function (db) {
+              should.strictEqual(db.driver.opts.pool,  true);
+              should.strictEqual(db.driver.opts.debug, true);
+              done();
+            })
+            .catch(function (err) {
+              done(err);
+            });
+        });
 
-    return done();
+        it("should understand pool `false` from query options", function (done) {
+          var connCopy = _.cloneDeep(common.getConfig());
+          var connOpts = _.extend(connCopy, {
+            protocol: common.protocol(),
+            query: {
+              pool: false, debug: false
+            }
+          });
+          ORM.connectAsync(connOpts)
+            .then(function (db) {
+              should.strictEqual(db.driver.opts.pool,  false);
+              should.strictEqual(db.driver.opts.debug, false);
+              done();
+            })
+            .catch(function (err) {
+              done(err);
+            });
+        });
+      }
+    });
   });
 
-  it("should emit an error if no url is passed", function (done) {
-    var db = ORM.connect();
+  describe("ORM.connect()", function () {
+    it("should expose .use(), .define(), .sync() and .load()", function (done) {
+      var db = ORM.connect();
 
-    db.on("connect", function (err) {
-      err.message.should.equal("CONNECTION_URL_EMPTY");
+      db.use.should.be.a.Function();
+      db.define.should.be.a.Function();
+      db.sync.should.be.a.Function();
+      db.load.should.be.a.Function();
 
       return done();
     });
-  });
 
-  it.skip("should allow protocol alias", function (done) {
-    this.timeout(60000);
-    var db = ORM.connect("pg://127.0.0.6");
+    it("should emit an error if no url is passed", function (done) {
+      var db = ORM.connect();
 
-    db.once("connect", function (err) {
-      should.exist(err);
-      err.message.should.not.equal("CONNECTION_PROTOCOL_NOT_SUPPORTED");
+      db.on("connect", function (err) {
+        err.message.should.equal("CONNECTION_URL_EMPTY");
 
-      return done();
+        return done();
+      });
     });
-  });
 
-  it("should emit an error if empty url is passed", function (done) {
-    var db = ORM.connect("");
+    it.skip("should allow protocol alias", function (done) {
+      this.timeout(60000);
+      var db = ORM.connect("pg://127.0.0.6");
 
-    db.on("connect", function (err) {
-      err.message.should.equal("CONNECTION_URL_EMPTY");
+      db.once("connect", function (err) {
+        should.exist(err);
+        err.message.should.not.equal("CONNECTION_PROTOCOL_NOT_SUPPORTED");
 
-      return done();
+        return done();
+      });
     });
-  });
 
-  it("should emit an error if empty url (with only spaces) is passed", function (done) {
-    var db = ORM.connect("   ");
+    it("should emit an error if empty url is passed", function (done) {
+      var db = ORM.connect("");
 
-    db.on("connect", function (err) {
-      err.message.should.equal("CONNECTION_URL_EMPTY");
+      db.on("connect", function (err) {
+        err.message.should.equal("CONNECTION_URL_EMPTY");
 
-      return done();
+        return done();
+      });
     });
-  });
 
-  it("should emit an error if no protocol is passed", function (done) {
-    var db = ORM.connect("user@db");
+    it("should emit an error if empty url (with only spaces) is passed", function (done) {
+      var db = ORM.connect("   ");
 
-    db.on("connect", function (err) {
-      err.message.should.equal("CONNECTION_URL_NO_PROTOCOL");
+      db.on("connect", function (err) {
+        err.message.should.equal("CONNECTION_URL_EMPTY");
 
-      return done();
+        return done();
+      });
     });
-  });
 
-  it("should emit an error if unknown protocol is passed", function (done) {
-    var db = ORM.connect("unknown://db");
+    it("should emit an error if no protocol is passed", function (done) {
+      var db = ORM.connect("user@db");
 
-    db.on("connect", function (err) {
-      should.equal(err.literalCode, 'NO_SUPPORT');
-      should.equal(
-        err.message,
-        "Connection protocol not supported - have you installed the database driver for unknown?"
-      );
+      db.on("connect", function (err) {
+        err.message.should.equal("CONNECTION_URL_NO_PROTOCOL");
 
-      return done();
+        return done();
+      });
     });
-  });
 
-  it("should emit an error if cannot connect", function (done) {
-    var db = ORM.connect("mysql://fakeuser:nopassword@127.0.0.1/unknowndb");
+    it("should emit an error if unknown protocol is passed", function (done) {
+      var db = ORM.connect("unknown://db");
 
-    db.on("connect", function (err) {
-      should.exist(err);
-      should.equal(err.message.indexOf("Connection protocol not supported"), -1);
-      err.message.should.not.equal("CONNECTION_URL_NO_PROTOCOL");
-      err.message.should.not.equal("CONNECTION_URL_EMPTY");
+      db.on("connect", function (err) {
+        should.equal(err.literalCode, 'NO_SUPPORT');
+        should.equal(
+          err.message,
+          "Connection protocol not supported - have you installed the database driver for unknown?"
+        );
 
-      return done();
+        return done();
+      });
     });
-  });
 
-  it("should emit valid error if exception being thrown during connection try", function (done) {
-    var testConfig = {
-      protocol : 'mongodb',
-      href     : 'unknownhost',
-      database : 'unknowndb',
-      user     : '',
-      password : ''
-    },
-    db = ORM.connect(testConfig);
-
-    db.on("connect", function (err) {
-      should.exist(err);
-      should.equal(err.message.indexOf("Connection protocol not supported"), -1);
-      err.message.should.not.equal("CONNECTION_URL_NO_PROTOCOL");
-      err.message.should.not.equal("CONNECTION_URL_EMPTY");
+    it("should emit an error if cannot connect", function (done) {
+      var db = ORM.connect("mysql://fakeuser:nopassword@127.0.0.1/unknowndb");
 
-      return done();
-    });
-  });
+      db.on("connect", function (err) {
+        should.exist(err);
+        should.equal(err.message.indexOf("Connection protocol not supported"), -1);
+        err.message.should.not.equal("CONNECTION_URL_NO_PROTOCOL");
+        err.message.should.not.equal("CONNECTION_URL_EMPTY");
 
-  it("should not modify connection opts", function (done) {
-    var opts = {
-      protocol : 'mysql',
-      user     : 'notauser',
-      password : "wrong password",
-      query    : { pool: true, debug: true }
-    };
+        return done();
+      });
+    });
 
-    var expected = JSON.stringify(opts);
+    it("should emit valid error if exception being thrown during connection try", function (done) {
+      var testConfig = {
+          protocol : 'mongodb',
+          href     : 'unknownhost',
+          database : 'unknowndb',
+          user     : '',
+          password : ''
+        },
+        db = ORM.connect(testConfig);
+
+      db.on("connect", function (err) {
+        should.exist(err);
+        should.equal(err.message.indexOf("Connection protocol not supported"), -1);
+        err.message.should.not.equal("CONNECTION_URL_NO_PROTOCOL");
+        err.message.should.not.equal("CONNECTION_URL_EMPTY");
 
-    ORM.connect(opts, function (err, db) {
-      should.equal(
-        JSON.stringify(opts),
-        expected
-      );
-      done();
+        return done();
+      });
     });
-  });
 
-  it("should emit no error if ok", function (done) {
-    var db = ORM.connect(common.getConnectionString());
+    it("should not modify connection opts", function (done) {
+      var opts = {
+        protocol : 'mysql',
+        user     : 'notauser',
+        password : "wrong password",
+        query    : { pool: true, debug: true }
+      };
 
-    db.on("connect", function (err) {
-      should.not.exist(err);
+      var expected = JSON.stringify(opts);
 
-      return done();
+      ORM.connect(opts, function (err, db) {
+        should.equal(
+          JSON.stringify(opts),
+          expected
+        );
+        done();
+      });
     });
-  });
 
-  describe("if no connection error", function () {
-    var db = null;
+    it("should emit no error if ok", function (done) {
+      var db = ORM.connect(common.getConnectionString());
 
-    before(function (done) {
-      helper.connect(function (connection) {
-        db = connection;
+      db.on("connect", function (err) {
+        should.not.exist(err);
 
         return done();
       });
     });
 
-    after(function () {
-      return db.close();
-    });
+    describe("if no connection error", function () {
+      var db = null;
 
-    it("should be able to ping the server", function (done) {
-      db.ping(function () {
-        return done();
+      before(function (done) {
+        helper.connect(function (connection) {
+          db = connection;
+
+          return done();
+        });
       });
-    });
-  });
 
-  describe("if callback is passed", function (done) {
-    it("should return an error if empty url is passed", function (done) {
-      ORM.connect("", function (err) {
-        err.message.should.equal("CONNECTION_URL_EMPTY");
+      after(function () {
+        return db.close();
+      });
 
-        return done();
+      it("should be able to ping the server", function (done) {
+        db.ping(function () {
+          return done();
+        });
       });
     });
 
-    it("should return an error if no protocol is passed", function (done) {
-      ORM.connect("user@db", function (err) {
-        err.message.should.equal("CONNECTION_URL_NO_PROTOCOL");
+    describe("if callback is passed", function (done) {
+      it("should return an error if empty url is passed", function (done) {
+        ORM.connect("", function (err) {
+          err.message.should.equal("CONNECTION_URL_EMPTY");
 
-        return done();
+          return done();
+        });
       });
-    });
 
-    it("should return an error if unknown protocol is passed", function (done) {
-      ORM.connect("unknown://db", function (err) {
-        should.equal(err.literalCode, 'NO_SUPPORT');
-        should.equal(
-          err.message,
-          "Connection protocol not supported - have you installed the database driver for unknown?"
-        );
+      it("should return an error if no protocol is passed", function (done) {
+        ORM.connect("user@db", function (err) {
+          err.message.should.equal("CONNECTION_URL_NO_PROTOCOL");
 
-        return done();
+          return done();
+        });
       });
-    });
-  });
 
-  if (protocol != 'mongodb') {
-    describe("query options", function () {
-      it("should understand pool `'false'` from query string", function (done) {
-        var connString = common.getConnectionString() + "debug=false&pool=false";
-        ORM.connect(connString, function (err, db) {
-          should.not.exist(err);
-          should.strictEqual(db.driver.opts.pool,  false);
-          should.strictEqual(db.driver.opts.debug, false);
-          done();
+      it("should return an error if unknown protocol is passed", function (done) {
+        ORM.connect("unknown://db", function (err) {
+          should.equal(err.literalCode, 'NO_SUPPORT');
+          should.equal(
+            err.message,
+            "Connection protocol not supported - have you installed the database driver for unknown?"
+          );
+
+          return done();
         });
       });
+    });
 
-      it("should understand pool `'0'` from query string", function (done) {
-        var connString = common.getConnectionString() + "debug=0&pool=0";
-        ORM.connect(connString, function (err, db) {
-          should.not.exist(err);
-          should.strictEqual(db.driver.opts.pool,  false);
-          should.strictEqual(db.driver.opts.debug, false);
-          done();
+    if (protocol !== 'mongodb') {
+      describe("query options", function () {
+        var connStr = null;
+
+        beforeEach(function () {
+          connStr = common.getConnectionString();
         });
-      });
 
-      it("should understand pool `'true'` from query string", function (done) {
-        var connString = common.getConnectionString() + "debug=true&pool=true";
-        ORM.connect(connString, function (err, db) {
-          should.not.exist(err);
-          should.strictEqual(db.driver.opts.pool,  true);
-          should.strictEqual(db.driver.opts.debug, true);
-          done();
+        afterEach(function () {
+          connStr = null
+        });
+        it("should understand pool `'false'` from query string", function (done) {
+          var connString = connStr + "debug=false&pool=false";
+          ORM.connect(connString, function (err, db) {
+            should.not.exist(err);
+            should.strictEqual(db.driver.opts.pool,  false);
+            should.strictEqual(db.driver.opts.debug, false);
+            done();
+          });
         });
-      });
 
-      it("should understand pool `'1'` from query string", function (done) {
-        var connString = common.getConnectionString() + "debug=1&pool=1";
-        ORM.connect(connString, function (err, db) {
-          should.not.exist(err);
-          should.strictEqual(db.driver.opts.pool,  true);
-          should.strictEqual(db.driver.opts.debug, true);
-          done();
+        it("should understand pool `'0'` from query string", function (done) {
+          var connString = connStr + "debug=0&pool=0";
+          ORM.connect(connString, function (err, db) {
+            should.not.exist(err);
+            should.strictEqual(db.driver.opts.pool,  false);
+            should.strictEqual(db.driver.opts.debug, false);
+            done();
+          });
         });
-      });
 
-      it("should understand pool `true` from query options", function (done) {
-        var connOpts = _.extend(common.getConfig(), {
-          protocol: common.protocol(),
-          query: {
-            pool: true, debug: true
-          }
+        it("should understand pool `'true'` from query string", function (done) {
+          var connString = connStr + "debug=true&pool=true";
+          ORM.connect(connString, function (err, db) {
+            should.not.exist(err);
+            should.strictEqual(db.driver.opts.pool,  true);
+            should.strictEqual(db.driver.opts.debug, true);
+            done();
+          });
         });
-        ORM.connect(connOpts, function (err, db) {
-          should.not.exist(err);
-          should.strictEqual(db.driver.opts.pool,  true);
-          should.strictEqual(db.driver.opts.debug, true);
-          done();
+
+        it("should understand pool `'1'` from query string", function (done) {
+          var connString = connStr + "debug=1&pool=1";
+          ORM.connect(connString, function (err, db) {
+            should.not.exist(err);
+            should.strictEqual(db.driver.opts.pool,  true);
+            should.strictEqual(db.driver.opts.debug, true);
+            done();
+          });
         });
-      });
 
-      it("should understand pool `false` from query options", function (done) {
-        var connOpts = _.extend(common.getConfig(), {
-          protocol: common.protocol(),
-          query: {
-            pool: false, debug: false
-          }
+        it("should understand pool `true` from query options", function (done) {
+          var connCopy = _.cloneDeep(common.getConfig());
+          var connOpts = _.extend(connCopy, {
+            protocol: common.protocol(),
+            query: {
+              pool: true, debug: true
+            }
+          });
+          ORM.connect(connOpts, function (err, db) {
+            should.not.exist(err);
+            should.strictEqual(db.driver.opts.pool,  true);
+            should.strictEqual(db.driver.opts.debug, true);
+            done();
+          });
         });
-        ORM.connect(connOpts, function (err, db) {
-          should.not.exist(err);
-          should.strictEqual(db.driver.opts.pool,  false);
-          should.strictEqual(db.driver.opts.debug, false);
-          done();
+
+        it("should understand pool `false` from query options", function (done) {
+          var connCopy = _.cloneDeep(common.getConfig());
+          var connOpts = _.extend(connCopy, {
+            protocol: common.protocol(),
+            query: {
+              pool: false, debug: false
+            }
+          });
+          ORM.connect(connOpts, function (err, db) {
+            should.not.exist(err);
+            should.strictEqual(db.driver.opts.pool,  false);
+            should.strictEqual(db.driver.opts.debug, false);
+            done();
+          });
         });
       });
-    });
-  }
-});
+    }
+  });
 
-describe("ORM.use()", function () {
-  it("should be able to use an established connection", function (done) {
-    var db = new sqlite.Database(':memory:');
+  describe("ORM.use()", function () {
+    it("should be able to use an established connection", function (done) {
+      var db = new sqlite.Database(':memory:');
 
-    ORM.use(db, "sqlite", function (err) {
-      should.not.exist(err);
+      ORM.use(db, "sqlite", function (err) {
+        should.not.exist(err);
 
-      return done();
+        return done();
+      });
     });
-  });
 
-  it("should be accept protocol alias", function (done) {
-    var db = new pg.Client();
+    it("should be accept protocol alias", function (done) {
+      var db = new pg.Client();
 
-    ORM.use(db, "pg", function (err) {
-      should.equal(err, null);
+      ORM.use(db, "pg", function (err) {
+        should.equal(err, null);
 
-      return done();
+        return done();
+      });
     });
-  });
 
-  it("should return an error in callback if protocol not supported", function (done) {
-    var db = new pg.Client();
+    it("should return an error in callback if protocol not supported", function (done) {
+      var db = new pg.Client();
 
-    ORM.use(db, "unknowndriver", function (err) {
-      should.exist(err);
+      ORM.use(db, "unknowndriver", function (err) {
+        should.exist(err);
 
-      return done();
+        return done();
+      });
     });
   });
-});
+});
\ No newline at end of file

From 7c01df480530aa4f5eaaf3800dc4ce8916460e09 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Tue, 22 Aug 2017 13:03:08 +0300
Subject: [PATCH 1101/1246] fix code dublication error

---
 lib/LazyLoad.js | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/lib/LazyLoad.js b/lib/LazyLoad.js
index f6322862..48af3780 100644
--- a/lib/LazyLoad.js
+++ b/lib/LazyLoad.js
@@ -22,20 +22,6 @@ function addLazyLoadProperty(name, Instance, Model, property) {
     },
     enumerable: false
   });
-
-  Object.defineProperty(Instance, "getAsync" + method, {
-    value: function () {
-      var conditions = {};
-      conditions[Model.id] = Instance[Model.id];
-
-      Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
-        return cb(err, item ? item[property] : null);
-      });
-
-      return this;
-    },
-    enumerable: false
-  });
   Object.defineProperty(Instance, "remove" + method, {
     value: function (cb) {
       var conditions = {};

From 29d7ff1c93f90d55a6c9485ac9324c81051b6f6c Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Tue, 22 Aug 2017 13:13:18 +0300
Subject: [PATCH 1102/1246] remove env var from pkg json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index faae57a6..511c8787 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
   ],
   "main": "./lib/ORM",
   "scripts": {
-    "test": "ORM_PROTOCOL=postgres make test"
+    "test": "make test"
   },
   "engines": {
     "node": "*"

From 959faed243bc3b4f6c69165ab6bec03779d3966c Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Tue, 22 Aug 2017 13:50:07 +0300
Subject: [PATCH 1103/1246] fix after review

---
 lib/ORM.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index 8d37bb24..410fb0de 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -159,7 +159,7 @@ exports.connectAsync = function (opts) {
   return new Promise(function (resolve, reject) {
     var cb = function (resolve, reject) {
       return function (err, data) {
-        if (err !== null) {
+        if (err) {
           reject(err);
         }
         resolve(data);

From 9f2f2989a5962963d37a7039a6dfd2a9a8c85b42 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Tue, 22 Aug 2017 17:54:29 +0300
Subject: [PATCH 1104/1246] restore example file, fix after review

---
 lib/ORM.js             |  4 +---
 test/config.example.js | 29 +++++++++++++++++++++++++++++
 test/integration/db.js |  8 ++++----
 3 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 test/config.example.js

diff --git a/lib/ORM.js b/lib/ORM.js
index 410fb0de..08ef4352 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -1,14 +1,12 @@
 var _              = require("lodash");
 var async          = require("async");
+var Promise        = require('bluebird');
 var enforce        = require("enforce");
 var events         = require("events");
 var hat            = require("hat");
-var Promise        = require('bluebird');
 var Query          = require("sql-query");
 var url            = require("url");
 var util           = require("util");
-var enforce        = require("enforce");
-var _              = require("lodash");
 
 var adapters       = require("./Adapters");
 var DriverAliases  = require("./Drivers/aliases");
diff --git a/test/config.example.js b/test/config.example.js
new file mode 100644
index 00000000..bb9c2d73
--- /dev/null
+++ b/test/config.example.js
@@ -0,0 +1,29 @@
+// To test, rename this file to config.js and update
+// the following configuration
+//
+// To run a single driver, go to root folder and do (mysql example):
+// ORM_PROTOCOL=mysql node test/run
+//
+// To run all drivers:
+// make test
+
+exports.mysql = {
+  user     : "root",
+  password : "",
+  database : "test"
+};
+exports.postgres = {
+  user     : "root",
+  password : "",
+  database : "test"
+};
+exports.redshift = {
+  user      : "root",
+  password  : "",
+  database  : "test"
+};
+exports.mongodb = {
+    host: "localhost",
+    database: "test"
+};
+exports.sqlite = { }; // uses in-memory database
diff --git a/test/integration/db.js b/test/integration/db.js
index 8546e3c6..ed5e3e78 100644
--- a/test/integration/db.js
+++ b/test/integration/db.js
@@ -1,8 +1,8 @@
 var should = require('should');
 var helper = require('../support/spec_helper');
-var sinon = require('sinon');
+var sinon  = require('sinon');
 var common = require('../common');
-var _ = require('lodash');
+var _      = require('lodash');
 
 describe('DB', function () {
   var db = null;
@@ -37,7 +37,7 @@ describe('DB', function () {
       syncStub.restore();
     });
 
-    it('should return an empty array when no model created', function (done) {
+    it('should return an empty array when no model is created', function (done) {
       db.dropAsync()
         .then(function (data) {
           data.should.be.Array;
@@ -51,7 +51,7 @@ describe('DB', function () {
   });
 
   describe("db.dropAsync()", function () {
-    it('should call drop method from model, and return array with model id', function (done) {
+    it('should call the model drop method and return an array with a model id', function (done) {
       db.define("my_model", {
         property: String
       });

From 59dc1af430afcb36797c3a37e644d061ba1b2f45 Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Tue, 22 Aug 2017 18:04:24 +0300
Subject: [PATCH 1105/1246] LazyLoad should return Promise

---
 lib/LazyLoad.js | 199 ++++++++++++++++++++++++++++++++++--------------
 1 file changed, 141 insertions(+), 58 deletions(-)

diff --git a/lib/LazyLoad.js b/lib/LazyLoad.js
index 48af3780..cd3663d5 100644
--- a/lib/LazyLoad.js
+++ b/lib/LazyLoad.js
@@ -1,73 +1,156 @@
+var Promise = require("bluebird");
+
 exports.extend = function (Instance, Model, properties) {
-  for (var k in properties) {
-    if (properties[k].lazyload === true) {
-      addLazyLoadProperty(properties[k].lazyname || k, Instance, Model, k);
+    for (var k in properties) {
+        if (properties[k].lazyload === true) {
+            addLazyLoadProperty(properties[k].lazyname || k, Instance, Model, k);
+        }
     }
-  }
 };
 
-function addLazyLoadProperty(name, Instance, Model, property) {
-  var method = ucfirst(name);
-
-  Object.defineProperty(Instance, "get" + method, {
-    value: function (cb) {
-      var conditions = {};
-      conditions[Model.id] = Instance[Model.id];
-
-      Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
-        return cb(err, item ? item[property] : null);
-      });
-
-      return this;
-    },
-    enumerable: false
-  });
-  Object.defineProperty(Instance, "remove" + method, {
-    value: function (cb) {
-      var conditions = {};
-      conditions[Model.id] = Instance[Model.id];
-
-      Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
-        if (err) {
-          return cb(err);
-        }
-        if (!item) {
-          return cb(null);
+exports.extendAsync = function (Instance, Model, properties) {
+    // TODO:
+    for (var k in properties) {
+        if (properties[k].lazyload) {
+            addLazyLoadPropertyAsync(properties[k].lazyname || k, Instance, Model, k);
         }
+    }
+};
 
-        item[property] = null;
+function addLazyLoadPropertyAsync(name, Instance, Model, property) {
+    var method = ucfirst(name);
+    Object.defineProperty(Instance, "get" + method, {
+        value: function () {
+            return new Promise (function (resolve, reject) {
+                var conditions = {};
+                conditions[Model.id] = Instance[Model.id];
 
-        return item.save(cb);
-      });
+                Model.find(conditions, {identityCache: false}).only(Model.id.concat(property)).first(function (err, item) {
+                    if (err) {
+                        return reject (err);
+                    }
+                    resolve(item ? item[property] : null);
+                });
 
-      return this;
-    },
-    enumerable: false
-  });
-  Object.defineProperty(Instance, "set" + method, {
-    value: function (data, cb) {
-      var conditions = {};
-      conditions[Model.id] = Instance[Model.id];
+            });
+            // return this;
+        },
+        enumerable: false
+    });
 
-      Model.find(conditions, { identityCache: false }).first(function (err, item) {
-        if (err) {
-          return cb(err);
-        }
-        if (!item) {
-          return cb(null);
-        }
+    Object.defineProperty(Instance, "remove" + method, {
+        value: function () {
+            return new Promise (function (resolve, reject) {
+                var conditions = {};
+                conditions[Model.id] = Instance[Model.id];
 
-        item[property] = data;
+                Model.find(conditions, {identityCache: false}).only(Model.id.concat(property)).first(function (err, item) {
+                    if (err) {
+                        return reject(err);
+                    }
+                    if (!item) {
+                        return reject(null);
+                    }
 
-        return item.save(cb);
-      });
+                    item[property] = null;
+
+                    return item.save(resolve);
+                });
+
+                // return this;
+            });
+        },
+        enumerable: false
+    });
+    Object.defineProperty(Instance, "set" + method, {
+        value: function (data) {
+            return new Promise (function (resolve, reject) {
+                var conditions = {};
+                conditions[Model.id] = Instance[Model.id];
+
+                Model.find(conditions, {identityCache: false}).first(function (err, item) {
+                    if (err) {
+                        return reject(err);
+                    }
+                    if (!item) {
+                        return reject(null);
+                    }
+
+                    item[property] = data;
+
+                    return item.save(resolve);
+                });
+
+                // return this;
+            });
+        },
+        enumerable: false
+    });
+};
 
-      return this;
-    },
-    enumerable: false
-  });
+function addLazyLoadProperty(name, Instance, Model, property) {
+    var method = ucfirst(name);
+
+    Object.defineProperty(Instance, "get" + method, {
+        value: function (cb) {
+            var conditions = {};
+            conditions[Model.id] = Instance[Model.id];
+
+            Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
+                return cb(err, item ? item[property] : null);
+            });
+
+            // return this;
+        },
+        enumerable: false
+    });
+
+    Object.defineProperty(Instance, "remove" + method, {
+        value: function (cb) {
+            var conditions = {};
+            conditions[Model.id] = Instance[Model.id];
+
+            Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
+                if (err) {
+                    return cb(err);
+                }
+                if (!item) {
+                    return cb(null);
+                }
+
+                item[property] = null;
+
+                return item.save(cb);
+            });
+
+            return this;
+        },
+        enumerable: false
+    });
+    Object.defineProperty(Instance, "set" + method, {
+        value: function (data, cb) {
+            var conditions = {};
+            conditions[Model.id] = Instance[Model.id];
+
+            Model.find(conditions, { identityCache: false }).first(function (err, item) {
+                if (err) {
+                    return cb(err);
+                }
+                if (!item) {
+                    return cb(null);
+                }
+
+                item[property] = data;
+
+                return item.save(cb);
+            });
+
+            return this;
+        },
+        enumerable: false
+    });
 }
 
 function ucfirst(text) {
-  return text[0].toUpperCase() + text.substr(1).toLowerCase();
-}
+    return text[0].toUpperCase() + text.substr(1).toLowerCase();
+}
\ No newline at end of file

From 5dddc625b8b39d8077260760b346188196fe2f8d Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Wed, 23 Aug 2017 12:39:55 +0300
Subject: [PATCH 1106/1246] addLazyLoadProperty function could add async
 methods to the Instance

---
 lib/LazyLoad.js | 149 ++++++++++++++++++++----------------------------
 1 file changed, 62 insertions(+), 87 deletions(-)

diff --git a/lib/LazyLoad.js b/lib/LazyLoad.js
index cd3663d5..77f0daf0 100644
--- a/lib/LazyLoad.js
+++ b/lib/LazyLoad.js
@@ -8,107 +8,26 @@ exports.extend = function (Instance, Model, properties) {
     }
 };
 
-exports.extendAsync = function (Instance, Model, properties) {
-    // TODO:
-    for (var k in properties) {
-        if (properties[k].lazyload) {
-            addLazyLoadPropertyAsync(properties[k].lazyname || k, Instance, Model, k);
-        }
-    }
-};
-
-function addLazyLoadPropertyAsync(name, Instance, Model, property) {
-    var method = ucfirst(name);
-    Object.defineProperty(Instance, "get" + method, {
-        value: function () {
-            return new Promise (function (resolve, reject) {
-                var conditions = {};
-                conditions[Model.id] = Instance[Model.id];
-
-                Model.find(conditions, {identityCache: false}).only(Model.id.concat(property)).first(function (err, item) {
-                    if (err) {
-                        return reject (err);
-                    }
-                    resolve(item ? item[property] : null);
-                });
-
-            });
-            // return this;
-        },
-        enumerable: false
-    });
-
-    Object.defineProperty(Instance, "remove" + method, {
-        value: function () {
-            return new Promise (function (resolve, reject) {
-                var conditions = {};
-                conditions[Model.id] = Instance[Model.id];
-
-                Model.find(conditions, {identityCache: false}).only(Model.id.concat(property)).first(function (err, item) {
-                    if (err) {
-                        return reject(err);
-                    }
-                    if (!item) {
-                        return reject(null);
-                    }
-
-                    item[property] = null;
-
-                    return item.save(resolve);
-                });
-
-                // return this;
-            });
-        },
-        enumerable: false
-    });
-    Object.defineProperty(Instance, "set" + method, {
-        value: function (data) {
-            return new Promise (function (resolve, reject) {
-                var conditions = {};
-                conditions[Model.id] = Instance[Model.id];
-
-                Model.find(conditions, {identityCache: false}).first(function (err, item) {
-                    if (err) {
-                        return reject(err);
-                    }
-                    if (!item) {
-                        return reject(null);
-                    }
-
-                    item[property] = data;
-
-                    return item.save(resolve);
-                });
-
-                // return this;
-            });
-        },
-        enumerable: false
-    });
-};
-
 function addLazyLoadProperty(name, Instance, Model, property) {
     var method = ucfirst(name);
 
+    var conditions = {};
+    conditions[Model.id] = Instance[Model.id];
+
     Object.defineProperty(Instance, "get" + method, {
         value: function (cb) {
-            var conditions = {};
-            conditions[Model.id] = Instance[Model.id];
 
             Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
                 return cb(err, item ? item[property] : null);
             });
 
-            // return this;
+            return this;
         },
         enumerable: false
     });
 
     Object.defineProperty(Instance, "remove" + method, {
         value: function (cb) {
-            var conditions = {};
-            conditions[Model.id] = Instance[Model.id];
 
             Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
                 if (err) {
@@ -127,10 +46,9 @@ function addLazyLoadProperty(name, Instance, Model, property) {
         },
         enumerable: false
     });
+
     Object.defineProperty(Instance, "set" + method, {
         value: function (data, cb) {
-            var conditions = {};
-            conditions[Model.id] = Instance[Model.id];
 
             Model.find(conditions, { identityCache: false }).first(function (err, item) {
                 if (err) {
@@ -149,6 +67,63 @@ function addLazyLoadProperty(name, Instance, Model, property) {
         },
         enumerable: false
     });
+
+    Object.defineProperty(Instance, "get" + method + 'Async', {
+        value: function () {
+            return new Promise (function (resolve, reject) {
+                Model.find(conditions, {identityCache: false}).only(Model.id.concat(property)).first(function (err, item) {
+                    if (err) {
+                        return reject (err);
+                    }
+                    resolve(item ? item[property] : null);
+                });
+            });
+        },
+        enumerable: false
+    });
+
+    Object.defineProperty(Instance, "remove" + method + 'Async', {
+        value: function () {
+            return new Promise (function (resolve, reject) {
+                Model.find(conditions, {identityCache: false}).only(Model.id.concat(property)).first(function (err, item) {
+                    if (err) {
+                        return reject(err);
+                    }
+
+                    if (!item) {
+                        return reject(null);
+                    }
+
+                    item[property] = null;
+                    return item.save(function (err, data) { //TODO: change save() to async
+                        if (err) return reject(err);
+                        return resolve(data);
+                    });
+                });
+            });
+        },
+        enumerable: false
+    });
+
+    Object.defineProperty(Instance, "set" + method + 'Async', {
+        value: function (data) {
+            return new Promise (function (resolve, reject) {
+                Model.find(conditions, {identityCache: false}).first(function (err, item) {
+                    if (err) return reject(err);
+
+                    if (!item) return resolve(null);
+
+                    item[property] = data;
+
+                    return item.save(function (err, data) { //TODO: change save() to async
+                        if (err) return reject(err);
+                        return resolve(data);
+                    });
+                });
+            });
+        },
+        enumerable: false
+    });
 }
 
 function ucfirst(text) {

From ef15df3160c571c7dba813b3fa01582c81efc9a0 Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Wed, 23 Aug 2017 14:52:24 +0300
Subject: [PATCH 1107/1246] integraion tests updated

---
 test/integration/property-lazyload.js | 87 +++++++++++++++++++++++----
 1 file changed, 75 insertions(+), 12 deletions(-)

diff --git a/test/integration/property-lazyload.js b/test/integration/property-lazyload.js
index 3149eaa0..6ce3398c 100644
--- a/test/integration/property-lazyload.js
+++ b/test/integration/property-lazyload.js
@@ -59,9 +59,13 @@ describe("LazyLoad properties", function() {
         should.equal(err, null);
 
         John.should.be.a.Object();
+
         John.getPhoto.should.be.a.Function();
         John.setPhoto.should.be.a.Function();
         John.removePhoto.should.be.a.Function();
+        John.getPhotoAsync.should.be.a.Function();
+        John.setPhotoAsync.should.be.a.Function();
+        John.removePhotoAsync.should.be.a.Function();
 
         return done();
       });
@@ -82,10 +86,23 @@ describe("LazyLoad properties", function() {
       });
     });
 
-    it("setAccessor should change property", function (done) {
+    it("promise-based getAccessor should return property", function (done) {
       Person.find().first(function (err, John) {
         should.equal(err, null);
+        John.should.be.a.Object();
+        John.getPhotoAsync()
+          .then(function (photo) {
+            photo.toString().should.equal(PersonPhoto.toString());
+            done();
+          }).catch(function(err) {
+            if (err) done(err);
+          });
+      });
+    });
 
+    it("setAccessor should change property", function (done) {
+      Person.find().first(function (err, John) {
+        should.equal(err, null);
         John.should.be.a.Object();
 
         John.setPhoto(OtherPersonPhoto, function (err) {
@@ -93,13 +110,11 @@ describe("LazyLoad properties", function() {
 
           Person.find().first(function (err, John) {
             should.equal(err, null);
-
             John.should.be.a.Object();
 
             John.getPhoto(function (err, photo) {
               should.equal(err, null);
               photo.toString().should.equal(OtherPersonPhoto.toString());
-
               return done();
             });
           });
@@ -107,26 +122,74 @@ describe("LazyLoad properties", function() {
       });
     });
 
+    it("promise-based setAccessor should change property", function (done) {
+      Person.find().first(function (err, John) {
+        should.equal(err, null);
+        John.should.be.a.Object();
+
+        John.setPhotoAsync(OtherPersonPhoto)
+          .then(function (johnPhotoUpdated) {
+            johnPhotoUpdated.should.be.a.Object();
+
+            Person.find().first(function (err, John) {
+              should.equal(err, null);
+              John.should.be.a.Object();
+
+              John.getPhotoAsync()
+                .then(function (photo) {
+                  should.equal(err, null);
+                  photo.toString().should.equal(OtherPersonPhoto.toString());
+                  done();
+                }).catch(function (err) {
+                  if (err) done(err);
+                });
+            });
+          });
+      });
+    });
+
     it("removeAccessor should change property", function (done) {
       Person.find().first(function (err, John) {
         should.equal(err, null);
+          John.should.be.a.Object();
+
+          John.removePhoto(function (err) {
+            should.equal(err, null);
+
+            Person.get(John[Person.id], function (err, John) {
+              should.equal(err, null);
+              John.should.be.a.Object();
+
+              John.getPhoto(function (err, photo) {
+                should.equal(err, null);
+                should.equal(photo, null);
+
+                return done();
+              });
+            });
+          });
+        });
+    });
 
+    it("promise-based removeAccessor should change property", function (done) {
+      Person.find().first(function (err, John) {
+        should.equal(err, null);
         John.should.be.a.Object();
 
-        John.removePhoto(function (err) {
+        John.removePhotoAsync().then(function () {
           should.equal(err, null);
-
           Person.get(John[Person.id], function (err, John) {
             should.equal(err, null);
-
             John.should.be.a.Object();
 
-            John.getPhoto(function (err, photo) {
-              should.equal(err, null);
-              should.equal(photo, null);
-
-              return done();
-            });
+            John.getPhotoAsync()
+              .then(function (photo) {
+                should.equal(err, null);
+                should.equal(photo, null);
+                done();
+              }).catch(function (err) {
+                if (err) done(err);
+              });
           });
         });
       });

From 62dcd08e7a2947aea8937ea839513fb5e957b780 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Wed, 23 Aug 2017 15:09:33 +0300
Subject: [PATCH 1108/1246] add pingAsync and connectAsync methods, add test
 for it, update README.md

---
 Readme.md                       |  5 +++++
 lib/ORM.js                      | 34 +++++++++++++++++++++++++++------
 test/integration/orm-exports.js |  7 +++++++
 3 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/Readme.md b/Readme.md
index 4a68bbfc..1360fc2e 100755
--- a/Readme.md
+++ b/Readme.md
@@ -98,6 +98,11 @@ orm.connect("mysql://username:password@host/database", function (err, db) {
 
 ## Promises
 
+The methods what has Async like a postfix, like example `connectAsync` 
+can apply the same arguments as a original method but return a promise. 
+Exclusion method `sync` they called `syncPromise`.
+More details [wiki](linkToWikiHere). // TODO add link to wiki where described async methods.
+
 You can use the [promise enabled wrapper library](https://github.com/rafaelkaufmann/q-orm).
 
 
diff --git a/lib/ORM.js b/lib/ORM.js
index 08ef4352..85a230ee 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -158,9 +158,9 @@ exports.connectAsync = function (opts) {
     var cb = function (resolve, reject) {
       return function (err, data) {
         if (err) {
-          reject(err);
+          return reject(err);
         }
-        resolve(data);
+        return resolve(data);
       }
     };
     connect(options, cb(resolve, reject));
@@ -271,11 +271,33 @@ ORM.prototype.define = function (name, properties, opts) {
 
   return this.models[name];
 };
+
 ORM.prototype.defineType = function (name, opts) {
   this.customTypes[name] = opts;
   this.driver.customTypes[name] = opts;
   return this;
 };
+
+ORM.prototype.pingAsync = function () {
+  const self = this;
+  return new Promise(function (resolve, reject) {
+    self.driver.ping(function (err, data) {
+      if (err) return reject(err);
+      return resolve(data);
+    });
+  });
+};
+
+ORM.prototype.closeAsync = function () {
+  const self = this;
+  return new Promise(function (resolve, reject) {
+    self.driver.close(function (err, data) {
+      if (err) return reject(err);
+      return resolve(data);
+    });
+  });
+};
+
 ORM.prototype.ping = function (cb) {
   this.driver.ping(cb);
 
@@ -324,9 +346,9 @@ ORM.prototype.syncPromise = function () {
       self.models[id].sync(function (err) {
         if (err) {
           err.model = id;
-          reject(err);
+          return reject(err);
         }
-        resolve(id);
+        return resolve(id);
       });
     });
   })
@@ -367,8 +389,8 @@ ORM.prototype.dropAsync = function () {
   return Promise.each(modelIds, function (id) {
     return new Promise(function (resolve, reject) {
       self.models[id].drop(function (err, data) {
-        if (err) reject(err);
-        resolve(data);
+        if (err) return reject(err);
+        return resolve(data);
       });
     });
   })
diff --git a/test/integration/orm-exports.js b/test/integration/orm-exports.js
index 852967cc..dd5ba615 100644
--- a/test/integration/orm-exports.js
+++ b/test/integration/orm-exports.js
@@ -443,6 +443,13 @@ describe("ORM", function() {
           return done();
         });
       });
+
+      it("should be able to pingAsync the server", function (done) {
+        db.pingAsync()
+          .then(function () {
+            return done();
+          });
+      });
     });
 
     describe("if callback is passed", function (done) {

From 97f22810a1ac19bcdee3861224a5ad1d8a43e7fe Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Wed, 23 Aug 2017 15:40:13 +0300
Subject: [PATCH 1109/1246] Fixes for PR comments

---
 lib/LazyLoad.js                       | 234 +++++++++++++-------------
 test/integration/property-lazyload.js |   6 +-
 2 files changed, 117 insertions(+), 123 deletions(-)

diff --git a/lib/LazyLoad.js b/lib/LazyLoad.js
index 77f0daf0..95881d46 100644
--- a/lib/LazyLoad.js
+++ b/lib/LazyLoad.js
@@ -1,131 +1,125 @@
 var Promise = require("bluebird");
 
 exports.extend = function (Instance, Model, properties) {
-    for (var k in properties) {
-        if (properties[k].lazyload === true) {
-            addLazyLoadProperty(properties[k].lazyname || k, Instance, Model, k);
-        }
+  for (var k in properties) {
+    if (properties[k].lazyload === true) {
+      addLazyLoadProperty(properties[k].lazyname || k, Instance, Model, k);
     }
+  }
 };
 
 function addLazyLoadProperty(name, Instance, Model, property) {
-    var method = ucfirst(name);
-
-    var conditions = {};
-    conditions[Model.id] = Instance[Model.id];
-
-    Object.defineProperty(Instance, "get" + method, {
-        value: function (cb) {
-
-            Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
-                return cb(err, item ? item[property] : null);
-            });
-
-            return this;
-        },
-        enumerable: false
-    });
-
-    Object.defineProperty(Instance, "remove" + method, {
-        value: function (cb) {
-
-            Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
-                if (err) {
-                    return cb(err);
-                }
-                if (!item) {
-                    return cb(null);
-                }
-
-                item[property] = null;
-
-                return item.save(cb);
-            });
-
-            return this;
-        },
-        enumerable: false
-    });
-
-    Object.defineProperty(Instance, "set" + method, {
-        value: function (data, cb) {
-
-            Model.find(conditions, { identityCache: false }).first(function (err, item) {
-                if (err) {
-                    return cb(err);
-                }
-                if (!item) {
-                    return cb(null);
-                }
-
-                item[property] = data;
-
-                return item.save(cb);
-            });
-
-            return this;
-        },
-        enumerable: false
-    });
-
-    Object.defineProperty(Instance, "get" + method + 'Async', {
-        value: function () {
-            return new Promise (function (resolve, reject) {
-                Model.find(conditions, {identityCache: false}).only(Model.id.concat(property)).first(function (err, item) {
-                    if (err) {
-                        return reject (err);
-                    }
-                    resolve(item ? item[property] : null);
-                });
-            });
-        },
-        enumerable: false
-    });
-
-    Object.defineProperty(Instance, "remove" + method + 'Async', {
-        value: function () {
-            return new Promise (function (resolve, reject) {
-                Model.find(conditions, {identityCache: false}).only(Model.id.concat(property)).first(function (err, item) {
-                    if (err) {
-                        return reject(err);
-                    }
-
-                    if (!item) {
-                        return reject(null);
-                    }
-
-                    item[property] = null;
-                    return item.save(function (err, data) { //TODO: change save() to async
-                        if (err) return reject(err);
-                        return resolve(data);
-                    });
-                });
-            });
-        },
-        enumerable: false
-    });
-
-    Object.defineProperty(Instance, "set" + method + 'Async', {
-        value: function (data) {
-            return new Promise (function (resolve, reject) {
-                Model.find(conditions, {identityCache: false}).first(function (err, item) {
-                    if (err) return reject(err);
-
-                    if (!item) return resolve(null);
-
-                    item[property] = data;
-
-                    return item.save(function (err, data) { //TODO: change save() to async
-                        if (err) return reject(err);
-                        return resolve(data);
-                    });
-                });
-            });
-        },
-        enumerable: false
-    });
+  var method = ucfirst(name);
+
+  var conditions = {};
+  conditions[Model.id] = Instance[Model.id];
+
+  Object.defineProperty(Instance, "get" + method, {
+    value: function (cb) {
+
+      Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
+        return cb(err, item ? item[property] : null);
+      });
+
+      return this;
+    },
+    enumerable: false
+  });
+
+  Object.defineProperty(Instance, "remove" + method, {
+    value: function (cb) {
+
+      Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
+        if (err) {
+          return cb(err);
+        }
+        if (!item) {
+          return cb(null);
+        }
+
+        item[property] = null;
+
+        return item.save(cb);
+      });
+
+      return this;
+    },
+    enumerable: false
+  });
+
+  Object.defineProperty(Instance, "set" + method, {
+    value: function (data, cb) {
+
+      Model.find(conditions, { identityCache: false }).first(function (err, item) {
+        if (err) {
+          return cb(err);
+        }
+        if (!item) {
+          return cb(null);
+        }
+
+        item[property] = data;
+
+        return item.save(cb);
+      });
+
+      return this;
+    },
+    enumerable: false
+  });
+
+  Object.defineProperty(Instance, "get" + method + 'Async', {
+    value: function () {
+      return new Promise (function (resolve, reject) {
+        Model.find(conditions, {identityCache: false}).only(Model.id.concat(property)).first(function (err, item) {
+          if (err) return reject (err);
+          return resolve(item ? item[property] : null);
+        });
+      });
+    },
+    enumerable: false
+  });
+
+  Object.defineProperty(Instance, "remove" + method + 'Async', {
+    value: function () {
+      return new Promise (function (resolve, reject) {
+        Model.find(conditions, {identityCache: false}).only(Model.id.concat(property)).first(function (err, item) {
+          if (err) return reject(err);
+
+          if (!item) return resolve(null);
+
+          item[property] = null;
+          return item.save(function (err, data) { //TODO: change save() to async
+            if (err) return reject(err);
+            return resolve(data);
+          });
+        });
+      });
+    },
+    enumerable: false
+  });
+
+  Object.defineProperty(Instance, "set" + method + 'Async', {
+    value: function (data) {
+      return new Promise (function (resolve, reject) {
+        Model.find(conditions, {identityCache: false}).first(function (err, item) {
+          if (err) return reject(err);
+
+          if (!item) return resolve(null);
+
+          item[property] = data;
+
+          return item.save(function (err, data) { //TODO: change save() to async
+            if (err) return reject(err);
+            return resolve(data);
+          });
+        });
+      });
+    },
+    enumerable: false
+  });
 }
 
 function ucfirst(text) {
-    return text[0].toUpperCase() + text.substr(1).toLowerCase();
+  return text[0].toUpperCase() + text.substr(1).toLowerCase();
 }
\ No newline at end of file
diff --git a/test/integration/property-lazyload.js b/test/integration/property-lazyload.js
index 6ce3398c..0b146be0 100644
--- a/test/integration/property-lazyload.js
+++ b/test/integration/property-lazyload.js
@@ -95,7 +95,7 @@ describe("LazyLoad properties", function() {
             photo.toString().should.equal(PersonPhoto.toString());
             done();
           }).catch(function(err) {
-            if (err) done(err);
+            done(err);
           });
       });
     });
@@ -141,7 +141,7 @@ describe("LazyLoad properties", function() {
                   photo.toString().should.equal(OtherPersonPhoto.toString());
                   done();
                 }).catch(function (err) {
-                  if (err) done(err);
+                  done(err);
                 });
             });
           });
@@ -188,7 +188,7 @@ describe("LazyLoad properties", function() {
                 should.equal(photo, null);
                 done();
               }).catch(function (err) {
-                if (err) done(err);
+                done(err);
               });
           });
         });

From 6d95a05bc3c2cfab19793183692d33eefb790e28 Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Tue, 29 Aug 2017 15:33:42 +0300
Subject: [PATCH 1110/1246] Async methods will use promisify instead new
 Promise

---
 lib/LazyLoad.js | 74 ++++++++++++++++++++++++++-----------------------
 1 file changed, 39 insertions(+), 35 deletions(-)

diff --git a/lib/LazyLoad.js b/lib/LazyLoad.js
index 95881d46..9c07110d 100644
--- a/lib/LazyLoad.js
+++ b/lib/LazyLoad.js
@@ -1,6 +1,6 @@
 var Promise = require("bluebird");
 
-exports.extend = function (Instance, Model, properties) {
+var extend = function (Instance, Model, properties) {
   for (var k in properties) {
     if (properties[k].lazyload === true) {
       addLazyLoadProperty(properties[k].lazyname || k, Instance, Model, k);
@@ -69,57 +69,61 @@ function addLazyLoadProperty(name, Instance, Model, property) {
   });
 
   Object.defineProperty(Instance, "get" + method + 'Async', {
-    value: function () {
-      return new Promise (function (resolve, reject) {
-        Model.find(conditions, {identityCache: false}).only(Model.id.concat(property)).first(function (err, item) {
-          if (err) return reject (err);
-          return resolve(item ? item[property] : null);
-        });
+    value: Promise.promisify(function (cb) {
+      Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
+        return cb(err, item ? item[property] : null);
       });
-    },
+
+      return this;
+    }),
     enumerable: false
   });
 
   Object.defineProperty(Instance, "remove" + method + 'Async', {
-    value: function () {
-      return new Promise (function (resolve, reject) {
-        Model.find(conditions, {identityCache: false}).only(Model.id.concat(property)).first(function (err, item) {
-          if (err) return reject(err);
-
-          if (!item) return resolve(null);
-
-          item[property] = null;
-          return item.save(function (err, data) { //TODO: change save() to async
-            if (err) return reject(err);
-            return resolve(data);
-          });
-        });
+    value: Promise.promisify(function (cb) {
+
+      Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
+        if (err) {
+          return cb(err);
+        }
+        if (!item) {
+          return cb(null);
+        }
+
+        item[property] = null;
+
+        return item.save(cb);
       });
-    },
+
+      return this;
+    }),
     enumerable: false
   });
 
   Object.defineProperty(Instance, "set" + method + 'Async', {
-    value: function (data) {
-      return new Promise (function (resolve, reject) {
-        Model.find(conditions, {identityCache: false}).first(function (err, item) {
-          if (err) return reject(err);
+    value: Promise.promisify(function (data, cb) {
 
-          if (!item) return resolve(null);
+      Model.find(conditions, { identityCache: false }).first(function (err, item) {
+        if (err) {
+          return cb(err);
+        }
+        if (!item) {
+          return cb(null);
+        }
 
-          item[property] = data;
+        item[property] = data;
 
-          return item.save(function (err, data) { //TODO: change save() to async
-            if (err) return reject(err);
-            return resolve(data);
-          });
-        });
+        return item.save(cb);
       });
-    },
+
+      return this;
+    }),
     enumerable: false
   });
 }
 
 function ucfirst(text) {
   return text[0].toUpperCase() + text.substr(1).toLowerCase();
-}
\ No newline at end of file
+}
+
+exports.extend = extend;
\ No newline at end of file

From 5861ad7c6b199592e764b2028566c4a21f9eb485 Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Wed, 30 Aug 2017 12:04:53 +0300
Subject: [PATCH 1111/1246] Remove code duplicates in promisify methods

---
 lib/LazyLoad.js | 44 +++-----------------------------------------
 1 file changed, 3 insertions(+), 41 deletions(-)

diff --git a/lib/LazyLoad.js b/lib/LazyLoad.js
index 9c07110d..c5d4ca96 100644
--- a/lib/LazyLoad.js
+++ b/lib/LazyLoad.js
@@ -69,55 +69,17 @@ function addLazyLoadProperty(name, Instance, Model, property) {
   });
 
   Object.defineProperty(Instance, "get" + method + 'Async', {
-    value: Promise.promisify(function (cb) {
-      Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
-        return cb(err, item ? item[property] : null);
-      });
-
-      return this;
-    }),
+    value: Promise.promisify(Instance['get'+ method]),
     enumerable: false
   });
 
   Object.defineProperty(Instance, "remove" + method + 'Async', {
-    value: Promise.promisify(function (cb) {
-
-      Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
-        if (err) {
-          return cb(err);
-        }
-        if (!item) {
-          return cb(null);
-        }
-
-        item[property] = null;
-
-        return item.save(cb);
-      });
-
-      return this;
-    }),
+    value: Promise.promisify(Instance['remove'+ method]),
     enumerable: false
   });
 
   Object.defineProperty(Instance, "set" + method + 'Async', {
-    value: Promise.promisify(function (data, cb) {
-
-      Model.find(conditions, { identityCache: false }).first(function (err, item) {
-        if (err) {
-          return cb(err);
-        }
-        if (!item) {
-          return cb(null);
-        }
-
-        item[property] = data;
-
-        return item.save(cb);
-      });
-
-      return this;
-    }),
+    value: Promise.promisify(Instance['set'+ method]),
     enumerable: false
   });
 }

From c05863d79dc0d695a4c3c7b62132de7aa371ec93 Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Wed, 30 Aug 2017 14:08:06 +0300
Subject: [PATCH 1112/1246] Optimized functions names. Added Async prefix in
 Settings file

---
 lib/LazyLoad.js | 36 ++++++++++++++++++++++++++----------
 lib/Settings.js |  3 ++-
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/lib/LazyLoad.js b/lib/LazyLoad.js
index c5d4ca96..88cdff67 100644
--- a/lib/LazyLoad.js
+++ b/lib/LazyLoad.js
@@ -1,4 +1,5 @@
-var Promise = require("bluebird");
+var Promise  = require("bluebird");
+var Settings = require("./Settings");
 
 var extend = function (Instance, Model, properties) {
   for (var k in properties) {
@@ -10,11 +11,26 @@ var extend = function (Instance, Model, properties) {
 
 function addLazyLoadProperty(name, Instance, Model, property) {
   var method = ucfirst(name);
+  var promiseFunctionPrefix = Settings.defaults().promiseFunctionPrefix;
+  var funcNamesObj = {
+    get: {
+      callbackFuncName: "get" + method,
+      promiseFuncName: "get" + method + promiseFunctionPrefix
+    },
+    remove: {
+      callbackFuncName: "remove" + method,
+      promiseFuncName: "remove" + method + promiseFunctionPrefix
+    },
+    set: {
+      callbackFuncName: "set" + method,
+      promiseFuncName: "set" + method + promiseFunctionPrefix
+    }
+  }
 
   var conditions = {};
   conditions[Model.id] = Instance[Model.id];
 
-  Object.defineProperty(Instance, "get" + method, {
+  Object.defineProperty(Instance, funcNamesObj.get['callbackFuncName'], {
     value: function (cb) {
 
       Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
@@ -26,7 +42,7 @@ function addLazyLoadProperty(name, Instance, Model, property) {
     enumerable: false
   });
 
-  Object.defineProperty(Instance, "remove" + method, {
+  Object.defineProperty(Instance, funcNamesObj.remove['callbackFuncName'], {
     value: function (cb) {
 
       Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
@@ -47,7 +63,7 @@ function addLazyLoadProperty(name, Instance, Model, property) {
     enumerable: false
   });
 
-  Object.defineProperty(Instance, "set" + method, {
+  Object.defineProperty(Instance, funcNamesObj.set['callbackFuncName'], {
     value: function (data, cb) {
 
       Model.find(conditions, { identityCache: false }).first(function (err, item) {
@@ -68,18 +84,18 @@ function addLazyLoadProperty(name, Instance, Model, property) {
     enumerable: false
   });
 
-  Object.defineProperty(Instance, "get" + method + 'Async', {
-    value: Promise.promisify(Instance['get'+ method]),
+  Object.defineProperty(Instance, funcNamesObj.get['promiseFuncName'], {
+    value: Promise.promisify(Instance[funcNamesObj.get['callbackFuncName']]),
     enumerable: false
   });
 
-  Object.defineProperty(Instance, "remove" + method + 'Async', {
-    value: Promise.promisify(Instance['remove'+ method]),
+  Object.defineProperty(Instance, funcNamesObj.remove['promiseFuncName'], {
+    value: Promise.promisify(Instance[funcNamesObj.remove['callbackFuncName']]),
     enumerable: false
   });
 
-  Object.defineProperty(Instance, "set" + method + 'Async', {
-    value: Promise.promisify(Instance['set'+ method]),
+  Object.defineProperty(Instance, funcNamesObj.set['promiseFuncName'], {
+    value: Promise.promisify(Instance[funcNamesObj.set['callbackFuncName']]),
     enumerable: false
   });
 }
diff --git a/lib/Settings.js b/lib/Settings.js
index fc5893df..7af076cf 100644
--- a/lib/Settings.js
+++ b/lib/Settings.js
@@ -23,7 +23,8 @@ var default_settings = {
     reconnect                 : true,
     pool                      : false,
     debug                     : false
-  }
+  },
+  promiseFunctionPrefix       : 'Async'
 };
 
 exports.Container = Settings;

From c146c455950b4cb02d6ddf31cfec6bf659de44ca Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Wed, 30 Aug 2017 14:38:13 +0300
Subject: [PATCH 1113/1246] Changed properties names in funcNamesObj and
 Settings.defaults

---
 lib/LazyLoad.js | 32 ++++++++++++++++----------------
 lib/Settings.js |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/lib/LazyLoad.js b/lib/LazyLoad.js
index 88cdff67..4ac66e00 100644
--- a/lib/LazyLoad.js
+++ b/lib/LazyLoad.js
@@ -11,26 +11,26 @@ var extend = function (Instance, Model, properties) {
 
 function addLazyLoadProperty(name, Instance, Model, property) {
   var method = ucfirst(name);
-  var promiseFunctionPrefix = Settings.defaults().promiseFunctionPrefix;
+  var promiseFunctionPostfix = Settings.defaults().promiseFunctionPostfix;
   var funcNamesObj = {
     get: {
-      callbackFuncName: "get" + method,
-      promiseFuncName: "get" + method + promiseFunctionPrefix
+      callback : "get" + method,
+      promise  : "get" + method + promiseFunctionPostfix
     },
     remove: {
-      callbackFuncName: "remove" + method,
-      promiseFuncName: "remove" + method + promiseFunctionPrefix
+      callback : "remove" + method,
+      promise  : "remove" + method + promiseFunctionPostfix
     },
     set: {
-      callbackFuncName: "set" + method,
-      promiseFuncName: "set" + method + promiseFunctionPrefix
+      callback : "set" + method,
+      promise  : "set" + method + promiseFunctionPostfix
     }
   }
 
   var conditions = {};
   conditions[Model.id] = Instance[Model.id];
 
-  Object.defineProperty(Instance, funcNamesObj.get['callbackFuncName'], {
+  Object.defineProperty(Instance, funcNamesObj.get['callback'], {
     value: function (cb) {
 
       Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
@@ -42,7 +42,7 @@ function addLazyLoadProperty(name, Instance, Model, property) {
     enumerable: false
   });
 
-  Object.defineProperty(Instance, funcNamesObj.remove['callbackFuncName'], {
+  Object.defineProperty(Instance, funcNamesObj.remove['callback'], {
     value: function (cb) {
 
       Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
@@ -63,7 +63,7 @@ function addLazyLoadProperty(name, Instance, Model, property) {
     enumerable: false
   });
 
-  Object.defineProperty(Instance, funcNamesObj.set['callbackFuncName'], {
+  Object.defineProperty(Instance, funcNamesObj.set['callback'], {
     value: function (data, cb) {
 
       Model.find(conditions, { identityCache: false }).first(function (err, item) {
@@ -84,18 +84,18 @@ function addLazyLoadProperty(name, Instance, Model, property) {
     enumerable: false
   });
 
-  Object.defineProperty(Instance, funcNamesObj.get['promiseFuncName'], {
-    value: Promise.promisify(Instance[funcNamesObj.get['callbackFuncName']]),
+  Object.defineProperty(Instance, funcNamesObj.get['promise'], {
+    value: Promise.promisify(Instance[funcNamesObj.get['callback']]),
     enumerable: false
   });
 
-  Object.defineProperty(Instance, funcNamesObj.remove['promiseFuncName'], {
-    value: Promise.promisify(Instance[funcNamesObj.remove['callbackFuncName']]),
+  Object.defineProperty(Instance, funcNamesObj.remove['promise'], {
+    value: Promise.promisify(Instance[funcNamesObj.remove['callback']]),
     enumerable: false
   });
 
-  Object.defineProperty(Instance, funcNamesObj.set['promiseFuncName'], {
-    value: Promise.promisify(Instance[funcNamesObj.set['callbackFuncName']]),
+  Object.defineProperty(Instance, funcNamesObj.set['promise'], {
+    value: Promise.promisify(Instance[funcNamesObj.set['callback']]),
     enumerable: false
   });
 }
diff --git a/lib/Settings.js b/lib/Settings.js
index 7af076cf..500cfc5a 100644
--- a/lib/Settings.js
+++ b/lib/Settings.js
@@ -24,7 +24,7 @@ var default_settings = {
     pool                      : false,
     debug                     : false
   },
-  promiseFunctionPrefix       : 'Async'
+  promiseFunctionPostfix       : 'Async'
 };
 
 exports.Container = Settings;

From 40b431504ac975f70231eb38d44d072c0288b29a Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Wed, 30 Aug 2017 14:43:28 +0300
Subject: [PATCH 1114/1246] Renamed funcNamesObj on functionNames

---
 lib/LazyLoad.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/LazyLoad.js b/lib/LazyLoad.js
index 4ac66e00..7a888c04 100644
--- a/lib/LazyLoad.js
+++ b/lib/LazyLoad.js
@@ -12,7 +12,7 @@ var extend = function (Instance, Model, properties) {
 function addLazyLoadProperty(name, Instance, Model, property) {
   var method = ucfirst(name);
   var promiseFunctionPostfix = Settings.defaults().promiseFunctionPostfix;
-  var funcNamesObj = {
+  var functionNames = {
     get: {
       callback : "get" + method,
       promise  : "get" + method + promiseFunctionPostfix
@@ -30,7 +30,7 @@ function addLazyLoadProperty(name, Instance, Model, property) {
   var conditions = {};
   conditions[Model.id] = Instance[Model.id];
 
-  Object.defineProperty(Instance, funcNamesObj.get['callback'], {
+  Object.defineProperty(Instance, functionNames.get['callback'], {
     value: function (cb) {
 
       Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
@@ -42,7 +42,7 @@ function addLazyLoadProperty(name, Instance, Model, property) {
     enumerable: false
   });
 
-  Object.defineProperty(Instance, funcNamesObj.remove['callback'], {
+  Object.defineProperty(Instance, functionNames.remove['callback'], {
     value: function (cb) {
 
       Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
@@ -63,7 +63,7 @@ function addLazyLoadProperty(name, Instance, Model, property) {
     enumerable: false
   });
 
-  Object.defineProperty(Instance, funcNamesObj.set['callback'], {
+  Object.defineProperty(Instance, functionNames.set['callback'], {
     value: function (data, cb) {
 
       Model.find(conditions, { identityCache: false }).first(function (err, item) {
@@ -84,18 +84,18 @@ function addLazyLoadProperty(name, Instance, Model, property) {
     enumerable: false
   });
 
-  Object.defineProperty(Instance, funcNamesObj.get['promise'], {
-    value: Promise.promisify(Instance[funcNamesObj.get['callback']]),
+  Object.defineProperty(Instance, functionNames.get['promise'], {
+    value: Promise.promisify(Instance[functionNames.get['callback']]),
     enumerable: false
   });
 
-  Object.defineProperty(Instance, funcNamesObj.remove['promise'], {
-    value: Promise.promisify(Instance[funcNamesObj.remove['callback']]),
+  Object.defineProperty(Instance, functionNames.remove['promise'], {
+    value: Promise.promisify(Instance[functionNames.remove['callback']]),
     enumerable: false
   });
 
-  Object.defineProperty(Instance, funcNamesObj.set['promise'], {
-    value: Promise.promisify(Instance[funcNamesObj.set['callback']]),
+  Object.defineProperty(Instance, functionNames.set['promise'], {
+    value: Promise.promisify(Instance[functionNames.set['callback']]),
     enumerable: false
   });
 }

From ae5519db6f2bdfe6f73cff12a77e912989017e14 Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Wed, 30 Aug 2017 15:00:54 +0300
Subject: [PATCH 1115/1246] Changed promiseFunctionPostfix value. Also small
 fixes

---
 lib/LazyLoad.js | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/lib/LazyLoad.js b/lib/LazyLoad.js
index 7a888c04..e6a39a1c 100644
--- a/lib/LazyLoad.js
+++ b/lib/LazyLoad.js
@@ -1,5 +1,4 @@
 var Promise  = require("bluebird");
-var Settings = require("./Settings");
 
 var extend = function (Instance, Model, properties) {
   for (var k in properties) {
@@ -11,7 +10,7 @@ var extend = function (Instance, Model, properties) {
 
 function addLazyLoadProperty(name, Instance, Model, property) {
   var method = ucfirst(name);
-  var promiseFunctionPostfix = Settings.defaults().promiseFunctionPostfix;
+  var promiseFunctionPostfix = Model.settings.get('promiseFunctionPostfix');
   var functionNames = {
     get: {
       callback : "get" + method,
@@ -30,7 +29,7 @@ function addLazyLoadProperty(name, Instance, Model, property) {
   var conditions = {};
   conditions[Model.id] = Instance[Model.id];
 
-  Object.defineProperty(Instance, functionNames.get['callback'], {
+  Object.defineProperty(Instance, functionNames.get.callback, {
     value: function (cb) {
 
       Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
@@ -42,7 +41,7 @@ function addLazyLoadProperty(name, Instance, Model, property) {
     enumerable: false
   });
 
-  Object.defineProperty(Instance, functionNames.remove['callback'], {
+  Object.defineProperty(Instance, functionNames.remove.callback, {
     value: function (cb) {
 
       Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
@@ -63,7 +62,7 @@ function addLazyLoadProperty(name, Instance, Model, property) {
     enumerable: false
   });
 
-  Object.defineProperty(Instance, functionNames.set['callback'], {
+  Object.defineProperty(Instance, functionNames.set.callback, {
     value: function (data, cb) {
 
       Model.find(conditions, { identityCache: false }).first(function (err, item) {
@@ -84,18 +83,18 @@ function addLazyLoadProperty(name, Instance, Model, property) {
     enumerable: false
   });
 
-  Object.defineProperty(Instance, functionNames.get['promise'], {
-    value: Promise.promisify(Instance[functionNames.get['callback']]),
+  Object.defineProperty(Instance, functionNames.get.promise, {
+    value: Promise.promisify(Instance[functionNames.get.callback]),
     enumerable: false
   });
 
-  Object.defineProperty(Instance, functionNames.remove['promise'], {
-    value: Promise.promisify(Instance[functionNames.remove['callback']]),
+  Object.defineProperty(Instance, functionNames.remove.promise, {
+    value: Promise.promisify(Instance[functionNames.remove.callback]),
     enumerable: false
   });
 
-  Object.defineProperty(Instance, functionNames.set['promise'], {
-    value: Promise.promisify(Instance[functionNames.set['callback']]),
+  Object.defineProperty(Instance, functionNames.set.promise, {
+    value: Promise.promisify(Instance[functionNames.set.callback]),
     enumerable: false
   });
 }

From 5c4b67bc78cccc147a2dffa91b48840ab52ade22 Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Mon, 28 Aug 2017 18:16:57 +0300
Subject: [PATCH 1116/1246] Add promise support to association extend

---
 lib/Associations/Extend.js             | 154 ++++++++++++++++++++++-
 test/integration/association-extend.js | 164 ++++++++++++++++++++++++-
 2 files changed, 314 insertions(+), 4 deletions(-)

diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index 3aaed679..e17b65db 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -3,9 +3,10 @@ var ORMError   = require("../Error");
 var Settings   = require("../Settings");
 var Singleton  = require("../Singleton");
 var util       = require("../Utilities");
+var Promise    = require("bluebird");
 
 exports.prepare = function (db, Model, associations) {
-  Model.extendsTo = function (name, properties, opts) {
+  Model.extendsTo = function (name, properties, opts) { // TODO: extendsTo and find methods should be changed to Async
     opts = opts || {};
 
     var assocName = opts.name || ucfirst(name);
@@ -107,11 +108,33 @@ exports.autoFetch = function (Instance, associations, opts, cb) {
   }
 };
 
+exports.autoFetchAsync = function (Instance, associations, opts) {
+  return new Promise (function (resolve, reject) {
+
+    if (associations.length === 0) {
+      return reject();
+    }
+
+    var pending = associations.length;
+    var autoFetchDone = function autoFetchDone() {
+        pending -= 1;
+
+        if (pending === 0) {
+          return resolve();
+        }
+    };
+
+    associations.forEach(function (association) {
+      autoFetchInstanceAsync(Instance, association, opts, autoFetchDone);
+    });
+  });
+};
+
 function extendInstance(Model, Instance, Driver, association, opts) {
   Object.defineProperty(Instance, association.hasAccessor, {
     value : function (cb) {
       if (!Instance[Model.id]) {
-          cb(new ORMError("Instance not saved, cannot get extension", 'NOT_DEFINED', { model: Model.table }));
+        cb(new ORMError("Instance not saved, cannot get extension", 'NOT_DEFINED', { model: Model.table }));
       } else {
         association.model.get(util.values(Instance, Model.id), function (err, extension) {
           return cb(err, !err && extension ? true : false);
@@ -129,7 +152,7 @@ function extendInstance(Model, Instance, Driver, association, opts) {
       }
 
       if (!Instance[Model.id]) {
-          cb(new ORMError("Instance not saved, cannot get extension", 'NOT_DEFINED', { model: Model.table }));
+        cb(new ORMError("Instance not saved, cannot get extension", 'NOT_DEFINED', { model: Model.table }));
       } else {
         association.model.get(util.values(Instance, Model.id), opts, cb);
       }
@@ -203,6 +226,106 @@ function extendInstance(Model, Instance, Driver, association, opts) {
     },
     enumerable : false
   });
+  Object.defineProperty(Instance, association.hasAccessor + 'Async', {
+    value : function () {
+      return new Promise (function(resolve, reject) {
+        if (!Instance[Model.id]) {
+          return reject(new ORMError("Instance not saved, cannot get extension", 'NOT_DEFINED', { model: Model.table }));
+        } else {
+          association.model.get(util.values(Instance, Model.id), function (err, extension) {
+            if (err) return reject(err);
+            return resolve(!err && extension ? true : false);
+          });
+        }
+      });
+    },
+    enumerable : false
+  });
+  Object.defineProperty(Instance, association.getAccessor + 'Async', {
+    value: function (opts) {
+      return new Promise (function(resolve, reject) {
+
+        if (typeof opts == "function") {
+          var callbackData = opts;
+          opts = {};
+        }
+
+        if (!Instance[Model.id]) {
+          return reject(new ORMError("Instance not saved, cannot get extension", 'NOT_DEFINED', { model: Model.table }));
+        } else {
+          association.model.get(util.values(Instance, Model.id), opts, function(err, result) {
+            if (err) return reject(err);
+            if (callbackData) return resolve(callbackData);
+            return resolve(result);
+          });
+        }
+      });
+    },
+    enumerable : false
+  });
+  Object.defineProperty(Instance, association.setAccessor + 'Async', {
+    value : function (Extension) {
+      return new Promise (function(resolve, reject){
+        Instance.save(function (err) { //TODO: change save() to async
+          if (err) return reject(err);
+
+          Instance[association.delAccessor](function (err) {
+            if (err) return reject(err);
+
+            var fields = Object.keys(association.field);
+
+            if (!Extension.isInstance) {
+              Extension = new association.model(Extension);
+            }
+
+            for (var i = 0; i < Model.id.length; i++) {
+              Extension[fields[i]] = Instance[Model.id[i]];
+            }
+
+            Extension.save(function(err, result) {
+              if (err) return reject(err);
+              return resolve(result);
+            });
+          });
+        });
+      });
+    },
+    enumerable : false
+  });
+  Object.defineProperty(Instance, association.delAccessor + 'Async', {
+    value : function () {
+      return new Promise (function(resolve, reject) {
+        if (!Instance[Model.id]) {
+          return reject(new ORMError("Instance not saved, cannot get extension", 'NOT_DEFINED', { model: Model.table }));
+        } else {
+          var conditions = {};
+          var fields = Object.keys(association.field);
+
+          for (var i = 0; i < Model.id.length; i++) {
+            conditions[fields[i]] = Instance[Model.id[i]];
+          }
+
+          association.model.find(conditions, function (err, extensions) {
+            if (err) return reject(err);
+
+            var pending = extensions.length;
+
+            for (var i = 0; i < extensions.length; i++) {
+              Singleton.clear(extensions[i].__singleton_uid());
+              extensions[i].remove(function () {
+                if (--pending === 0) {
+                  return resolve();
+                }
+              });
+            }
+
+            if (pending === 0) return resolve();
+          });
+        }
+      });
+    },
+    enumerable : false
+  });
 }
 
 function autoFetchInstance(Instance, association, opts, cb) {
@@ -231,6 +354,31 @@ function autoFetchInstance(Instance, association, opts, cb) {
   }
 }
 
+function autoFetchInstanceAsync(Instance, association, opts) {
+  return new Promise (function(resolve, reject) {
+    if (!Instance.saved()) return resolve();
+
+    if (!opts.hasOwnProperty("autoFetchLimit") || !opts.autoFetchLimit) {
+      opts.autoFetchLimit = association.autoFetchLimit;
+    }
+
+    if (opts.autoFetchLimit === 0 || (!opts.autoFetch && !association.autoFetch)) return resolve();
+
+    if (Instance.isPersisted()) {
+      Instance[association.getAccessor]({ autoFetchLimit: opts.autoFetchLimit - 1 }, function (err, Assoc) {
+        if (!err) {
+          Instance[association.name] = Assoc;
+          return resolve();
+        }
+
+        return reject();
+      });
+    } else {
+      return resolve();
+    }
+  });
+}
+
 function ucfirst(text) {
   return text[0].toUpperCase() + text.substr(1);
 }
diff --git a/test/integration/association-extend.js b/test/integration/association-extend.js
index ea7a7e93..7bf0dd22 100644
--- a/test/integration/association-extend.js
+++ b/test/integration/association-extend.js
@@ -215,7 +215,169 @@ describe("Model.extendsTo()", function() {
     });
   });
 
-  describe("findBy()", function () {
+  describe("when calling hasAccessor + Async", function () {
+    before(setup());
+
+    it("should return true if found", function (done) {
+      Person.find().first(function (err, John) {
+        should.equal(err, null);
+
+        John.hasAddressAsync().then(function (hasAddress) {
+          should.equal(err, null);
+          hasAddress.should.equal(true);
+
+          done();
+        }).catch(function(err){
+          done(err);
+        });
+      });
+    });
+
+    it("should return false if not found", function (done) {
+      Person.find().first(function (err, John) {
+        should.equal(err, null);
+        John.removeAddressAsync().then(function(){
+          John.hasAddressAsync().then(function (hasAddress) {
+          }).catch(function(err) {
+            err.should.be.a.Object();
+            done();
+          });
+        });
+      });
+    });
+
+    it("should return error if instance not with an ID", function (done) {
+      var Jane = new Person({
+        name: "Jane"
+      });
+      Jane.hasAddressAsync().catch(function(err) {
+        err.should.be.a.Object();
+        err.should.have.property("code", ORM.ErrorCodes.NOT_DEFINED);
+        done();
+      });
+    });
+  });
+
+  describe("when calling getAccessor + Async", function () {
+    before(setup());
+
+    it("should return extension if found", function (done) {
+      Person.find().first(function (err, John) {
+        should.equal(err, null);
+
+        John.getAddressAsync(John).then(function (Address) {
+          Address.should.be.a.Object();
+          Address.should.have.property("street", "Liberty");
+          done();
+        }).catch(function (err) {
+          done(err);
+        });
+      });
+    });
+
+    it("should return error if not found", function (done) {
+      Person.find().first(function (err, John) {
+        should.equal(err, null);
+        John.removeAddressAsync().then(function () {
+          John.getAddressAsync(John).catch(function(err){
+            err.should.be.a.Object();
+            err.should.have.property("code", ORM.ErrorCodes.NOT_FOUND);
+            done();
+          });
+        });
+      });
+    });
+
+    it("should return error if instance not with an ID", function (done) {
+      var Jane = new Person({
+        name: "Jane"
+      });
+      Jane.getAddressAsync().catch(function(err) {
+        err.should.be.a.Object();
+        err.should.have.property("code", ORM.ErrorCodes.NOT_DEFINED);
+        done();
+      });
+    });
+  });
+
+  describe("when calling setAccessor + Async", function () {
+    before(setup());
+
+    it("should remove any previous extension", function (done) {
+      Person.find().first(function (err, John) {
+        should.equal(err, null);
+
+        PersonAddress.find({ number: 123 }).count(function (err, c) {
+          should.equal(err, null);
+          c.should.equal(1);
+
+          var addr = new PersonAddress({
+            street : "4th Ave",
+            number : 4
+          });
+
+          John.setAddressAsync(addr).then(function () {
+            John.getAddressAsync(addr).then(function (Address) {
+              Address.should.be.a.Object();
+              Address.should.have.property("street", addr.street);
+              PersonAddress.find({ number: 123 }).count(function (err, c) {
+                should.equal(err, null);
+                c.should.equal(0);
+                 done();
+              });
+            });
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+    });
+  });
+
+  describe("when calling delAccessor + Async", function () {
+    before(setup());
+
+    it("should remove any extension", function (done) {
+      Person.find().first(function (err, John) {
+        should.equal(err, null);
+
+        PersonAddress.find({ number: 123 }).count(function (err, c) {
+          should.equal(err, null);
+          c.should.equal(1);
+
+          var addr = new PersonAddress({
+            street : "4th Ave",
+            number : 4
+          });
+
+          John.removeAddressAsync(addr).then(function () {
+
+            PersonAddress.find({ number: 123 }).count(function (err, c) {
+              should.equal(err, null);
+              c.should.equal(0);
+
+              done();
+            });
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+    });
+
+    it("should return error if instance not with an ID", function (done) {
+      var Jane = new Person({
+        name: "Jane"
+      });
+      Jane.removeAddressAsync().catch(function(err) {
+        err.should.be.a.Object();
+        err.should.have.property("code", ORM.ErrorCodes.NOT_DEFINED);
+        done();
+      });
+    });
+  });
+
+  describe("findBy()", function () { // TODO: make async after Models method include async support
     before(setup());
 
     it("should throw if no conditions passed", function (done) {

From 1eab7e0f4204b0b4d97c4d503775007c22f75c4b Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Tue, 29 Aug 2017 14:09:06 +0300
Subject: [PATCH 1117/1246] Part of Async methods for Association many

---
 lib/Associations/Many.js                | 157 +++++++++++++++++++++++-
 test/integration/association-hasmany.js |  40 +++++-
 2 files changed, 194 insertions(+), 3 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index cd5359c7..f1c26d15 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -145,6 +145,7 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 
   Object.defineProperty(Instance, association.hasAccessor, {
     value: function () {
+      console.log(arguments)
       var Instances = Array.prototype.slice.apply(arguments);
       var cb = Instances.pop();
       var conditions = {}, options = {};
@@ -181,6 +182,7 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
         util.populateConditions(association.model, Object.keys(association.mergeAssocId), Instances[i], options.__merge.where[1], false);
       }
 
+      console.log('hasAccessor Instances: ' + Instances)
       association.model.find(conditions, options, function (err, foundItems) {
         if (err)                  return cb(err);
         if (_.isEmpty(Instances)) return cb(null, false);
@@ -204,6 +206,7 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
     enumerable: false,
     writable: true
   });
+
   Object.defineProperty(Instance, association.getAccessor, {
     value: function () {
       var options    = {};
@@ -263,7 +266,7 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 
       options.extra = association.props;
       options.extra_info = {
-         table: association.mergeTable,
+        table: association.mergeTable,
         id: util.values(Instance, Model.id),
         id_prop: Object.keys(association.mergeId),
         assoc_prop: Object.keys(association.mergeAssocId)
@@ -282,6 +285,7 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
     enumerable: false,
     writable: true
   });
+
   Object.defineProperty(Instance, association.setAccessor, {
     value: function () {
       var items = _.flatten(arguments);
@@ -476,6 +480,157 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
     },
     enumerable: true
   });
+
+  Object.defineProperty(Instance, association.hasAccessor + 'Async', {
+    value: function () {
+      var Instances = Array.prototype.slice.apply(arguments);
+      var conditions = {}, options = {};
+      return new Promise (function(resolve, reject) {
+        if (Instances.length) {
+          if (Array.isArray(Instances[0])) {
+            Instances = Instances[0];
+          }
+        }
+        if (Driver.hasMany) {
+          return Driver.hasMany(Model, association).has(Instance, Instances, conditions, function(err, result) {
+            if (err) return reject (err);
+            return resolve(result);
+          });
+        }
+
+        options.autoFetchLimit = 0;
+        options.__merge = {
+          from:   { table: association.mergeTable, field: Object.keys(association.mergeAssocId) },
+          to: { table: association.model.table, field: association.model.id.slice(0) },   // clone model id
+          where:  [ association.mergeTable, {} ]
+        };
+
+        adjustForMapsTo(options);
+
+        options.extra = association.props;
+        options.extra_info = {
+          table: association.mergeTable,
+          id: util.values(Instance, Model.id),
+          id_prop: Object.keys(association.mergeId),
+          assoc_prop: Object.keys(association.mergeAssocId)
+        };
+
+        util.populateConditions(Model, Object.keys(association.mergeId), Instance, options.__merge.where[1]);
+
+        for (var i = 0; i < Instances.length; i++) {
+          util.populateConditions(association.model, Object.keys(association.mergeAssocId), Instances[i], options.__merge.where[1], false);
+        }
+
+        association.model.find(conditions, options, function (err, foundItems) {
+          if (err) return reject(err);
+          if (_.isEmpty(Instances)) return resolve(false);
+
+          var mapKeysToString = function (item) {
+            return _.map(association.model.keys, function (k) {
+              return item[k];
+            }).join(',')
+          }
+
+          var foundItemsIDs = _(foundItems).map(mapKeysToString).uniq().value();
+          var InstancesIDs  = _(Instances ).map(mapKeysToString).uniq().value();
+
+          var sameLength   = foundItemsIDs.length == InstancesIDs.length;
+          var sameContents = sameLength && _.isEmpty(_.difference(foundItemsIDs, InstancesIDs));
+
+          return resolve(sameContents);
+        });
+      });
+    },
+    enumerable: false,
+    writable: true
+  });
+
+  Object.defineProperty(Instance, association.getAccessor + 'Async', {
+    value: function () {
+      var options = {};
+      var conditions = null;
+      var order = null;
+      var cb = null;
+
+      return new Promise (function (resolve, reject) {
+        for (var i = 0; i < arguments.length; i++) {
+          switch (typeof arguments[i]) {
+            case "function":
+              cb = arguments[i];
+              break;
+            case "object":
+              if (Array.isArray(arguments[i])) {
+                order = arguments[i];
+                order[0] = [association.model.table, order[0]];
+              } else {
+                if (conditions === null) {
+                  conditions = arguments[i];
+                } else {
+                  options = arguments[i];
+                }
+              }
+              break;
+            case "string":
+              if (arguments[i][0] == "-") {
+                order = [[association.model.table, arguments[i].substr(1)], "Z"];
+              } else {
+                order = [[association.model.table, arguments[i]]];
+              }
+              break;
+            case "number":
+              options.limit = arguments[i];
+              break;
+          }
+        }
+
+        if (order !== null) {
+          options.order = order;
+        }
+
+        if (conditions === null) {
+          conditions = {};
+        }
+
+        if (Driver.hasMany) {
+          return Driver.hasMany(Model, association).get(Instance, conditions, options, createInstance, function (err, result){
+            if (err) return reject(err);
+            return resolve(result);
+          });
+        }
+
+        options.__merge = {
+          from: {table: association.mergeTable, field: Object.keys(association.mergeAssocId)},
+          to: {table: association.model.table, field: association.model.id.slice(0)}, // clone model id
+          where: [association.mergeTable, {}]
+        };
+
+        adjustForMapsTo(options);
+
+        options.extra = association.props;
+        options.extra_info = {
+          table: association.mergeTable,
+          id: util.values(Instance, Model.id),
+          id_prop: Object.keys(association.mergeId),
+          assoc_prop: Object.keys(association.mergeAssocId)
+        };
+
+        util.populateConditions(Model, Object.keys(association.mergeId), Instance, options.__merge.where[1]);
+        cb = null;
+        if (cb === null) {
+          console.log(association.model.find(conditions, options))
+          return association.model.find(conditions, options);
+        }
+
+        association.model.find(conditions, options, function(err, result) {
+          if (err) return reject(err);
+          return resolve (result);
+        });
+      });
+    },
+    enumerable: false,
+    writable: true
+  });
+
 }
 
 function autoFetchInstance(Instance, association, opts, cb) {
diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
index f4bc3fad..da64ccd1 100644
--- a/test/integration/association-hasmany.js
+++ b/test/integration/association-hasmany.js
@@ -224,7 +224,8 @@ describe("hasMany", function () {
 
             Jane.hasPets(pets[0], function (err, has_pets) {
               should.equal(err, null);
-              has_pets.should.be.true;
+              console.log(has_pets)
+              has_pets.should.equal(true);
 
               return done();
             });
@@ -232,19 +233,54 @@ describe("hasMany", function () {
         });
       });
 
-      it("should return true if not passing any instance and has associated items", function (done) {
+      it("should return true if instance has associated item", function (done) {
+        Pet.find({ name: "Mutt" }, function (err, pets) {
+          should.equal(err, null);
+
+          Person.find({ name: "Jane" }).first(function (err, Jane) {
+            should.equal(err, null);
+
+            Jane.hasPetsAsync(pets[0]).then(function (has_pets) {
+              // should.equal(err, null);
+              console.log(has_pets)
+              has_pets.should.equal(true);
+              // console.log(has_pets)
+              done();
+            }).catch(function(err){
+              done(err);
+            });
+          });
+        });
+      });
+
+      it.only("should return true if not passing any instance and has associated items", function (done) {
         Person.find({ name: "Jane" }).first(function (err, Jane) {
           should.equal(err, null);
 
           Jane.hasPets(function (err, has_pets) {
             should.equal(err, null);
+            console.log('has_pets: ' + has_pets)
             has_pets.should.be.true;
+            // has_pets.should.equal(true);
 
             return done();
           });
         });
       });
 
+      it("should return true if not passing any instance and has associated items (promise-based)", function (done) {
+        Person.find({ name: "Jane" }).first(function (err, Jane) {
+          should.equal(err, null);
+
+          Jane.hasPetsAsync().then(function (has_pets) {
+            has_pets.should.equal(true);
+            done();
+          }).catch(function(err){
+            done(err);
+          });
+        });
+      });
+
       it("should return true if all passed instances are associated", function (done) {
         Pet.find(function (err, pets) {
           Person.find({ name: "John" }).first(function (err, John) {

From dee47043121ae0e20c8aa2985f2a0e20425535e2 Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Tue, 29 Aug 2017 16:43:32 +0300
Subject: [PATCH 1118/1246] Added promisify instead new Promises for Extend
 Associations. Revert some changes from tests

---
 lib/Associations/Extend.js              | 191 +++++++++---------------
 lib/Associations/Many.js                |   3 -
 test/integration/association-extend.js  |   2 +-
 test/integration/association-hasmany.js |  14 +-
 4 files changed, 74 insertions(+), 136 deletions(-)

diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index e17b65db..b6c006f0 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -108,28 +108,6 @@ exports.autoFetch = function (Instance, associations, opts, cb) {
   }
 };
 
-exports.autoFetchAsync = function (Instance, associations, opts) {
-  return new Promise (function (resolve, reject) {
-
-    if (associations.length === 0) {
-      return reject();
-    }
-
-    var pending = associations.length;
-    var autoFetchDone = function autoFetchDone() {
-        pending -= 1;
-
-        if (pending === 0) {
-          return resolve();
-        }
-    };
-
-    associations.forEach(function (association) {
-      autoFetchInstanceAsync(Instance, association, opts, autoFetchDone);
-    });
-  });
-};
-
 function extendInstance(Model, Instance, Driver, association, opts) {
   Object.defineProperty(Instance, association.hasAccessor, {
     value : function (cb) {
@@ -227,103 +205,97 @@ function extendInstance(Model, Instance, Driver, association, opts) {
     enumerable : false
   });
   Object.defineProperty(Instance, association.hasAccessor + 'Async', {
-    value : function () {
-      return new Promise (function(resolve, reject) {
-        if (!Instance[Model.id]) {
-          return reject(new ORMError("Instance not saved, cannot get extension", 'NOT_DEFINED', { model: Model.table }));
-        } else {
-          association.model.get(util.values(Instance, Model.id), function (err, extension) {
-            if (err) return reject(err);
-            return resolve(!err && extension ? true : false);
-          });
-        }
-      });
-    },
+    value : Promise.promisify(function (cb) {
+      if (!Instance[Model.id]) {
+        cb(new ORMError("Instance not saved, cannot get extension", 'NOT_DEFINED', { model: Model.table }));
+      } else {
+        association.model.get(util.values(Instance, Model.id), function (err, extension) {
+          return cb(err, !err && extension ? true : false);
+        });
+      }
+      return this;
+    }),
     enumerable : false
   });
   Object.defineProperty(Instance, association.getAccessor + 'Async', {
-    value: function (opts) {
-      return new Promise (function(resolve, reject) {
-
-        if (typeof opts == "function") {
-          var callbackData = opts;
-          opts = {};
-        }
+    value: Promise.promisify(function (opts, cb) {
+      if (typeof opts == "function") {
+        cb = opts;
+        opts = {};
+      }
 
-        if (!Instance[Model.id]) {
-          return reject(new ORMError("Instance not saved, cannot get extension", 'NOT_DEFINED', { model: Model.table }));
-        } else {
-          association.model.get(util.values(Instance, Model.id), opts, function(err, result) {
-            if (err) return reject(err);
-            if (callbackData) return resolve(callbackData);
-            return resolve(result);
-          });
-        }
-      });
-    },
+      if (!Instance[Model.id]) {
+        cb(new ORMError("Instance not saved, cannot get extension", 'NOT_DEFINED', { model: Model.table }));
+      } else {
+        association.model.get(util.values(Instance, Model.id), opts, cb);
+      }
+      return this;
+    }),
     enumerable : false
   });
   Object.defineProperty(Instance, association.setAccessor + 'Async', {
-    value : function (Extension) {
-      return new Promise (function(resolve, reject){
-        Instance.save(function (err) { //TODO: change save() to async
-          if (err) return reject(err);
+    value : Promise.promisify(function (Extension, cb) {
+      Instance.save(function (err) {
+        if (err) {
+          return cb(err);
+        }
 
-          Instance[association.delAccessor](function (err) {
-            if (err) return reject(err);
+        Instance[association.delAccessor](function (err) {
+          if (err) {
+            return cb(err);
+          }
 
-            var fields = Object.keys(association.field);
+          var fields = Object.keys(association.field);
 
-            if (!Extension.isInstance) {
-              Extension = new association.model(Extension);
-            }
+          if (!Extension.isInstance) {
+            Extension = new association.model(Extension);
+          }
 
-            for (var i = 0; i < Model.id.length; i++) {
-              Extension[fields[i]] = Instance[Model.id[i]];
-            }
+          for (var i = 0; i < Model.id.length; i++) {
+            Extension[fields[i]] = Instance[Model.id[i]];
+          }
 
-            Extension.save(function(err, result) {
-              if (err) return reject(err);
-              return resolve(result);
-            });
-          });
+          Extension.save(cb);
         });
       });
-    },
+      return this;
+    }),
     enumerable : false
   });
   Object.defineProperty(Instance, association.delAccessor + 'Async', {
-    value : function () {
-      return new Promise (function(resolve, reject) {
-        if (!Instance[Model.id]) {
-          return reject(new ORMError("Instance not saved, cannot get extension", 'NOT_DEFINED', { model: Model.table }));
-        } else {
-          var conditions = {};
-          var fields = Object.keys(association.field);
+    value : Promise.promisify(function (cb) {
+      if (!Instance[Model.id]) {
+        cb(new ORMError("Instance not saved, cannot get extension", 'NOT_DEFINED', { model: Model.table }));
+      } else {
+        var conditions = {};
+        var fields = Object.keys(association.field);
 
-          for (var i = 0; i < Model.id.length; i++) {
-            conditions[fields[i]] = Instance[Model.id[i]];
-          }
+        for (var i = 0; i < Model.id.length; i++) {
+          conditions[fields[i]] = Instance[Model.id[i]];
+        }
 
-          association.model.find(conditions, function (err, extensions) {
-            if (err) return reject(err);
+        association.model.find(conditions, function (err, extensions) {
+          if (err) {
+            return cb(err);
+          }
 
-            var pending = extensions.length;
+          var pending = extensions.length;
 
-            for (var i = 0; i < extensions.length; i++) {
-              Singleton.clear(extensions[i].__singleton_uid());
-              extensions[i].remove(function () {
-                if (--pending === 0) {
-                  return resolve();
-                }
-              });
-            }
+          for (var i = 0; i < extensions.length; i++) {
+            Singleton.clear(extensions[i].__singleton_uid());
+            extensions[i].remove(function () {
+              if (--pending === 0) {
+                return cb();
+              }
+            });
+          }
 
-            if (pending === 0) return resolve();
-          });
-        }
-      });
-    },
+          if (pending === 0) {
+            return cb();
+          }
+        });
+      }
+    }),
     enumerable : false
   });
 }
@@ -354,31 +326,6 @@ function autoFetchInstance(Instance, association, opts, cb) {
   }
 }
 
-function autoFetchInstanceAsync(Instance, association, opts) {
-  return new Promise (function(resolve, reject) {
-    if (!Instance.saved()) return resolve();
-
-    if (!opts.hasOwnProperty("autoFetchLimit") || !opts.autoFetchLimit) {
-      opts.autoFetchLimit = association.autoFetchLimit;
-    }
-
-    if (opts.autoFetchLimit === 0 || (!opts.autoFetch && !association.autoFetch)) return resolve();
-
-    if (Instance.isPersisted()) {
-      Instance[association.getAccessor]({ autoFetchLimit: opts.autoFetchLimit - 1 }, function (err, Assoc) {
-        if (!err) {
-          Instance[association.name] = Assoc;
-          return resolve();
-        }
-
-        return reject();
-      });
-    } else {
-      return resolve();
-    }
-  });
-}
-
 function ucfirst(text) {
   return text[0].toUpperCase() + text.substr(1);
 }
diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index f1c26d15..e455809a 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -145,7 +145,6 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 
   Object.defineProperty(Instance, association.hasAccessor, {
     value: function () {
-      console.log(arguments)
       var Instances = Array.prototype.slice.apply(arguments);
       var cb = Instances.pop();
       var conditions = {}, options = {};
@@ -182,7 +181,6 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
         util.populateConditions(association.model, Object.keys(association.mergeAssocId), Instances[i], options.__merge.where[1], false);
       }
 
-      console.log('hasAccessor Instances: ' + Instances)
       association.model.find(conditions, options, function (err, foundItems) {
         if (err)                  return cb(err);
         if (_.isEmpty(Instances)) return cb(null, false);
@@ -617,7 +615,6 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
         util.populateConditions(Model, Object.keys(association.mergeId), Instance, options.__merge.where[1]);
         cb = null;
         if (cb === null) {
-          console.log(association.model.find(conditions, options))
           return association.model.find(conditions, options);
         }
 
diff --git a/test/integration/association-extend.js b/test/integration/association-extend.js
index 7bf0dd22..d5c43da6 100644
--- a/test/integration/association-extend.js
+++ b/test/integration/association-extend.js
@@ -350,7 +350,7 @@ describe("Model.extendsTo()", function() {
             number : 4
           });
 
-          John.removeAddressAsync(addr).then(function () {
+          John.removeAddressAsync().then(function () {
 
             PersonAddress.find({ number: 123 }).count(function (err, c) {
               should.equal(err, null);
diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
index da64ccd1..ddeedde1 100644
--- a/test/integration/association-hasmany.js
+++ b/test/integration/association-hasmany.js
@@ -224,8 +224,7 @@ describe("hasMany", function () {
 
             Jane.hasPets(pets[0], function (err, has_pets) {
               should.equal(err, null);
-              console.log(has_pets)
-              has_pets.should.equal(true);
+              has_pets.should.be.true;
 
               return done();
             });
@@ -241,10 +240,7 @@ describe("hasMany", function () {
             should.equal(err, null);
 
             Jane.hasPetsAsync(pets[0]).then(function (has_pets) {
-              // should.equal(err, null);
-              console.log(has_pets)
-              has_pets.should.equal(true);
-              // console.log(has_pets)
+              has_pets.should.be.true;
               done();
             }).catch(function(err){
               done(err);
@@ -253,15 +249,13 @@ describe("hasMany", function () {
         });
       });
 
-      it.only("should return true if not passing any instance and has associated items", function (done) {
+      it("should return true if not passing any instance and has associated items", function (done) {
         Person.find({ name: "Jane" }).first(function (err, Jane) {
           should.equal(err, null);
 
           Jane.hasPets(function (err, has_pets) {
             should.equal(err, null);
-            console.log('has_pets: ' + has_pets)
             has_pets.should.be.true;
-            // has_pets.should.equal(true);
 
             return done();
           });
@@ -273,7 +267,7 @@ describe("hasMany", function () {
           should.equal(err, null);
 
           Jane.hasPetsAsync().then(function (has_pets) {
-            has_pets.should.equal(true);
+            has_pets.should.be.true;
             done();
           }).catch(function(err){
             done(err);

From 0a08c6f1b48aacbe94928bc8532e2fb6ed886a78 Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Thu, 31 Aug 2017 11:04:26 +0300
Subject: [PATCH 1119/1246] Added promisify to Manu and One Associations

---
 lib/Associations/Extend.js              | 120 +++---------
 lib/Associations/Many.js                | 165 +++-------------
 lib/Associations/One.js                 |  26 +++
 test/integration/association-hasmany.js | 242 ++++++++++++++++++++++++
 4 files changed, 319 insertions(+), 234 deletions(-)

diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index b6c006f0..e80b425c 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -6,23 +6,23 @@ var util       = require("../Utilities");
 var Promise    = require("bluebird");
 
 exports.prepare = function (db, Model, associations) {
-  Model.extendsTo = function (name, properties, opts) { // TODO: extendsTo and find methods should be changed to Async
+  Model.extendsTo = function (name, properties, opts) {
     opts = opts || {};
 
     var assocName = opts.name || ucfirst(name);
     var association = {
-      name           : name,
-      table          : opts.table || (Model.table + '_' + name),
-      reversed       : opts.reversed,
-      autoFetch      : opts.autoFetch || false,
-      autoFetchLimit : opts.autoFetchLimit || 2,
-      field          : util.wrapFieldObject({
-                         field: opts.field, model: Model, altName: Model.table
-                       }) || util.formatField(Model, Model.table, false, false),
-      getAccessor    : opts.getAccessor || ("get" + assocName),
-      setAccessor    : opts.setAccessor || ("set" + assocName),
-      hasAccessor    : opts.hasAccessor || ("has" + assocName),
-      delAccessor    : opts.delAccessor || ("remove" + assocName)
+      name             : name,
+      table            : opts.table || (Model.table + '_' + name),
+      reversed         : opts.reversed,
+      autoFetch        : opts.autoFetch || false,
+      autoFetchLimit   : opts.autoFetchLimit || 2,
+      field            : util.wrapFieldObject({
+                           field: opts.field, model: Model, altName: Model.table
+                         }) || util.formatField(Model, Model.table, false, false),
+      getAccessor      : opts.getAccessor || ("get" + assocName),
+      setAccessor      : opts.setAccessor || ("set" + assocName),
+      hasAccessor      : opts.hasAccessor || ("has" + assocName),
+      delAccessor      : opts.delAccessor || ("remove" + assocName)
     };
 
     var newproperties = _.cloneDeep(properties);
@@ -109,6 +109,8 @@ exports.autoFetch = function (Instance, associations, opts, cb) {
 };
 
 function extendInstance(Model, Instance, Driver, association, opts) {
+  var promiseFunctionPostfix = Model.settings.get('promiseFunctionPostfix');
+
   Object.defineProperty(Instance, association.hasAccessor, {
     value : function (cb) {
       if (!Instance[Model.id]) {
@@ -204,98 +206,24 @@ function extendInstance(Model, Instance, Driver, association, opts) {
     },
     enumerable : false
   });
-  Object.defineProperty(Instance, association.hasAccessor + 'Async', {
-    value : Promise.promisify(function (cb) {
-      if (!Instance[Model.id]) {
-        cb(new ORMError("Instance not saved, cannot get extension", 'NOT_DEFINED', { model: Model.table }));
-      } else {
-        association.model.get(util.values(Instance, Model.id), function (err, extension) {
-          return cb(err, !err && extension ? true : false);
-        });
-      }
-      return this;
-    }),
+
+  Object.defineProperty(Instance, association.hasAccessor + promiseFunctionPostfix, {
+    value : Promise.promisify(Instance[association.hasAccessor]),
     enumerable : false
   });
-  Object.defineProperty(Instance, association.getAccessor + 'Async', {
-    value: Promise.promisify(function (opts, cb) {
-      if (typeof opts == "function") {
-        cb = opts;
-        opts = {};
-      }
 
-      if (!Instance[Model.id]) {
-        cb(new ORMError("Instance not saved, cannot get extension", 'NOT_DEFINED', { model: Model.table }));
-      } else {
-        association.model.get(util.values(Instance, Model.id), opts, cb);
-      }
-      return this;
-    }),
+  Object.defineProperty(Instance, association.getAccessor + promiseFunctionPostfix, {
+    value: Promise.promisify(Instance[association.getAccessor]),
     enumerable : false
   });
-  Object.defineProperty(Instance, association.setAccessor + 'Async', {
-    value : Promise.promisify(function (Extension, cb) {
-      Instance.save(function (err) {
-        if (err) {
-          return cb(err);
-        }
-
-        Instance[association.delAccessor](function (err) {
-          if (err) {
-            return cb(err);
-          }
-
-          var fields = Object.keys(association.field);
-
-          if (!Extension.isInstance) {
-            Extension = new association.model(Extension);
-          }
-
-          for (var i = 0; i < Model.id.length; i++) {
-            Extension[fields[i]] = Instance[Model.id[i]];
-          }
 
-          Extension.save(cb);
-        });
-      });
-      return this;
-    }),
+  Object.defineProperty(Instance, association.setAccessor + promiseFunctionPostfix, {
+    value : Promise.promisify(Instance[association.setAccessor]),
     enumerable : false
   });
-  Object.defineProperty(Instance, association.delAccessor + 'Async', {
-    value : Promise.promisify(function (cb) {
-      if (!Instance[Model.id]) {
-        cb(new ORMError("Instance not saved, cannot get extension", 'NOT_DEFINED', { model: Model.table }));
-      } else {
-        var conditions = {};
-        var fields = Object.keys(association.field);
-
-        for (var i = 0; i < Model.id.length; i++) {
-          conditions[fields[i]] = Instance[Model.id[i]];
-        }
-
-        association.model.find(conditions, function (err, extensions) {
-          if (err) {
-            return cb(err);
-          }
-
-          var pending = extensions.length;
-
-          for (var i = 0; i < extensions.length; i++) {
-            Singleton.clear(extensions[i].__singleton_uid());
-            extensions[i].remove(function () {
-              if (--pending === 0) {
-                return cb();
-              }
-            });
-          }
 
-          if (pending === 0) {
-            return cb();
-          }
-        });
-      }
-    }),
+  Object.defineProperty(Instance, association.delAccessor + promiseFunctionPostfix, {
+    value : Promise.promisify(Instance[association.delAccessor]),
     enumerable : false
   });
 }
diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index e455809a..e7529254 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -5,6 +5,7 @@ var Settings            = require("../Settings");
 var Property            = require("../Property");
 var ORMError            = require("../Error");
 var util                = require("../Utilities");
+var Promise             = require("bluebird");
 
 exports.prepare = function (db, Model, associations) {
   Model.hasMany = function () {
@@ -61,6 +62,7 @@ exports.prepare = function (db, Model, associations) {
 
     var assocName = opts.name || ucfirst(name);
     var assocTemplateName = opts.accessor || assocName;
+
     var association = {
       name           : name,
       model          : OtherModel || Model,
@@ -80,7 +82,8 @@ exports.prepare = function (db, Model, associations) {
       setAccessor    : opts.setAccessor || ("set" + assocTemplateName),
       hasAccessor    : opts.hasAccessor || ("has" + assocTemplateName),
       delAccessor    : opts.delAccessor || ("remove" + assocTemplateName),
-      addAccessor    : opts.addAccessor || ("add" + assocTemplateName)
+      addAccessor    : opts.addAccessor || ("add" + assocTemplateName),
+      hasAccessorAsync    : opts.hasAccessorAsync || ("has" + assocTemplateName + 'Async')
     };
     associations.push(association);
 
@@ -126,6 +129,8 @@ exports.autoFetch = function (Instance, associations, opts, cb) {
 };
 
 function extendInstance(Model, Instance, Driver, association, opts, createInstance) {
+  var promiseFunctionPostfix = Model.settings.get('promiseFunctionPostfix');
+
   if (Model.settings.get("instance.cascadeRemove")) {
     Instance.on("beforeRemove", function () {
       Instance[association.delAccessor]();
@@ -358,6 +363,7 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
     enumerable: false,
     writable: true
   });
+
   Object.defineProperty(Instance, association.addAccessor, {
     value: function () {
       var Associations = [];
@@ -479,151 +485,34 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
     enumerable: true
   });
 
-  Object.defineProperty(Instance, association.hasAccessor + 'Async', {
-    value: function () {
-      var Instances = Array.prototype.slice.apply(arguments);
-      var conditions = {}, options = {};
-      return new Promise (function(resolve, reject) {
-        if (Instances.length) {
-          if (Array.isArray(Instances[0])) {
-            Instances = Instances[0];
-          }
-        }
-        if (Driver.hasMany) {
-          return Driver.hasMany(Model, association).has(Instance, Instances, conditions, function(err, result) {
-            if (err) return reject (err);
-            return resolve(result);
-          });
-        }
-
-        options.autoFetchLimit = 0;
-        options.__merge = {
-          from:   { table: association.mergeTable, field: Object.keys(association.mergeAssocId) },
-          to: { table: association.model.table, field: association.model.id.slice(0) },   // clone model id
-          where:  [ association.mergeTable, {} ]
-        };
-
-        adjustForMapsTo(options);
-
-        options.extra = association.props;
-        options.extra_info = {
-          table: association.mergeTable,
-          id: util.values(Instance, Model.id),
-          id_prop: Object.keys(association.mergeId),
-          assoc_prop: Object.keys(association.mergeAssocId)
-        };
-
-        util.populateConditions(Model, Object.keys(association.mergeId), Instance, options.__merge.where[1]);
-
-        for (var i = 0; i < Instances.length; i++) {
-          util.populateConditions(association.model, Object.keys(association.mergeAssocId), Instances[i], options.__merge.where[1], false);
-        }
-
-        association.model.find(conditions, options, function (err, foundItems) {
-          if (err) return reject(err);
-          if (_.isEmpty(Instances)) return resolve(false);
-
-          var mapKeysToString = function (item) {
-            return _.map(association.model.keys, function (k) {
-              return item[k];
-            }).join(',')
-          }
-
-          var foundItemsIDs = _(foundItems).map(mapKeysToString).uniq().value();
-          var InstancesIDs  = _(Instances ).map(mapKeysToString).uniq().value();
-
-          var sameLength   = foundItemsIDs.length == InstancesIDs.length;
-          var sameContents = sameLength && _.isEmpty(_.difference(foundItemsIDs, InstancesIDs));
+  console.log(association.hasAccessor + promiseFunctionPostfix)
 
-          return resolve(sameContents);
-        });
-      });
-    },
+  Object.defineProperty(Instance, association.hasAccessor + promiseFunctionPostfix, {
+    value: Promise.promisify(Instance[association.hasAccessor]),
     enumerable: false,
     writable: true
   });
 
-  Object.defineProperty(Instance, association.getAccessor + 'Async', {
-    value: function () {
-      var options = {};
-      var conditions = null;
-      var order = null;
-      var cb = null;
-
-      return new Promise (function (resolve, reject) {
-        for (var i = 0; i < arguments.length; i++) {
-          switch (typeof arguments[i]) {
-            case "function":
-              cb = arguments[i];
-              break;
-            case "object":
-              if (Array.isArray(arguments[i])) {
-                order = arguments[i];
-                order[0] = [association.model.table, order[0]];
-              } else {
-                if (conditions === null) {
-                  conditions = arguments[i];
-                } else {
-                  options = arguments[i];
-                }
-              }
-              break;
-            case "string":
-              if (arguments[i][0] == "-") {
-                order = [[association.model.table, arguments[i].substr(1)], "Z"];
-              } else {
-                order = [[association.model.table, arguments[i]]];
-              }
-              break;
-            case "number":
-              options.limit = arguments[i];
-              break;
-          }
-        }
-
-        if (order !== null) {
-          options.order = order;
-        }
-
-        if (conditions === null) {
-          conditions = {};
-        }
-
-        if (Driver.hasMany) {
-          return Driver.hasMany(Model, association).get(Instance, conditions, options, createInstance, function (err, result){
-            if (err) return reject(err);
-            return resolve(result);
-          });
-        }
-
-        options.__merge = {
-          from: {table: association.mergeTable, field: Object.keys(association.mergeAssocId)},
-          to: {table: association.model.table, field: association.model.id.slice(0)}, // clone model id
-          where: [association.mergeTable, {}]
-        };
-
-        adjustForMapsTo(options);
+  Object.defineProperty(Instance, association.getAccessor + promiseFunctionPostfix, {
+    value: Promise.promisify(Instance[association.getAccessor]),
+    enumerable: false,
+    writable: true
+  });
 
-        options.extra = association.props;
-        options.extra_info = {
-          table: association.mergeTable,
-          id: util.values(Instance, Model.id),
-          id_prop: Object.keys(association.mergeId),
-          assoc_prop: Object.keys(association.mergeAssocId)
-        };
+  Object.defineProperty(Instance, association.setAccessor + promiseFunctionPostfix, {
+    value: Promise.promisify(Instance[association.setAccessor]),
+    enumerable: false,
+    writable: true
+  });
 
-        util.populateConditions(Model, Object.keys(association.mergeId), Instance, options.__merge.where[1]);
-        cb = null;
-        if (cb === null) {
-          return association.model.find(conditions, options);
-        }
+  Object.defineProperty(Instance, association.delAccessor + promiseFunctionPostfix, {
+    value: Promise.promisify(Instance[association.delAccessor]),
+    enumerable: false,
+    writable: true
+  });
 
-        association.model.find(conditions, options, function(err, result) {
-          if (err) return reject(err);
-          return resolve (result);
-        });
-      });
-    },
+  Object.defineProperty(Instance, association.addAccessor + promiseFunctionPostfix, {
+    value: Promise.promisify(Instance[association.addAccessor]),
     enumerable: false,
     writable: true
   });
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index 74098dfe..48a48872 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -2,6 +2,7 @@ var _          = require("lodash");
 var util       = require("../Utilities");
 var ORMError   = require("../Error");
 var Accessors  = { "get": "get", "set": "set", "has": "has", "del": "remove" };
+var Promise    = require("bluebird");
 
 exports.prepare = function (Model, associations) {
   Model.hasOne = function () {
@@ -145,6 +146,7 @@ exports.autoFetch = function (Instance, associations, opts, cb) {
 };
 
 function extendInstance(Model, Instance, Driver, association) {
+  var promiseFunctionPostfix = Model.settings.get('promiseFunctionPostfix');
   Object.defineProperty(Instance, association.hasAccessor, {
     value: function (opts, cb) {
       if (typeof opts === "function") {
@@ -285,7 +287,31 @@ function extendInstance(Model, Instance, Driver, association) {
       enumerable: false,
       writable: true
     });
+
+    Object.defineProperty(Instance, association.delAccessor + promiseFunctionPostfix, {
+      value: Promise.promisify(Instance[association.delAccessor]),
+      enumerable: false,
+      writable: true
+    });
   }
+
+  Object.defineProperty(Instance, association.hasAccessor + promiseFunctionPostfix, {
+    value: Promise.promisify(Instance[association.hasAccessor]),
+    enumerable: false,
+    writable: true
+  });
+
+  Object.defineProperty(Instance, association.getAccessor + promiseFunctionPostfix, {
+    value: Promise.promisify(Instance[association.getAccessor]),
+    enumerable: false,
+    writable: true
+  });
+
+  Object.defineProperty(Instance, association.setAccessor + promiseFunctionPostfix, {
+    value: Promise.promisify(Instance[association.setAccessor]),
+    enumerable: false,
+    writable: true
+  });
 }
 
 function autoFetchInstance(Instance, association, opts, cb) {
diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
index ddeedde1..6dcd7282 100644
--- a/test/integration/association-hasmany.js
+++ b/test/integration/association-hasmany.js
@@ -290,6 +290,22 @@ describe("hasMany", function () {
         });
       });
 
+      it("should return true if all passed instances are associated (promise-based)", function (done) {
+        Pet.find(function (err, pets) {
+          Person.find({ name: "John" }).first(function (err, John) {
+            should.equal(err, null);
+
+            John.hasPetsAsync(pets).then(function (has_pets) {
+              should.equal(err, null);
+              has_pets.should.be.true;
+              done();
+            }).catch(function(err){
+              done(err);
+            });
+          });
+        });
+      });
+
       it("should return false if any passed instances are not associated", function (done) {
         Pet.find(function (err, pets) {
           Person.find({ name: "Jane" }).first(function (err, Jane) {
@@ -305,6 +321,23 @@ describe("hasMany", function () {
         });
       });
 
+      it("should return false if any passed instances are not associated (promise-based)", function (done) {
+        Pet.find(function (err, pets) {
+          Person.find({ name: "Jane" }).first(function (err, Jane) {
+            should.equal(err, null);
+
+            Jane.hasPetsAsync(pets).then(function (has_pets) {
+              should.equal(err, null);
+              has_pets.should.be.false;
+
+              done();
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      });
+
       if (common.protocol() != "mongodb") {
         it("should return true if join table has duplicate entries", function (done) {
           Pet.find({ name: ["Mutt", "Deco"] }, function (err, pets) {
@@ -336,6 +369,37 @@ describe("hasMany", function () {
             });
           });
         });
+        it("should return true if join table has duplicate entries (promise-based)", function (done) {
+          Pet.find({ name: ["Mutt", "Deco"] }, function (err, pets) {
+            should.not.exist(err);
+            should.equal(pets.length, 2);
+
+            Person.find({ name: "John" }).first(function (err, John) {
+              should.not.exist(err);
+
+              John.hasPetsAsync(pets).then(function (hasPets) {
+                should.equal(hasPets, true);
+
+                db.driver.execQuery(
+                  "INSERT INTO person_pets (person_id, pets_id) VALUES (?,?), (?,?)",
+                  [John.id, pets[0].id, John.id, pets[1].id],
+                  function (err) {
+                    should.not.exist(err);
+
+                    John.hasPetsAsync(pets).then(function (hasPets) {
+                      should.equal(hasPets, true);
+                      done();
+                    }).catch(function(err){
+                      done(err);
+                    });
+                  }
+                );
+              }).catch(function(err){
+                done(err);
+              });
+            });
+          });
+        });
       }
     });
 
@@ -363,6 +427,29 @@ describe("hasMany", function () {
           });
         });
       });
+
+      it("should accept arguments in different orders (promise-based)", function (done) {
+        Pet.find({ name: "Mutt" }, function (err, pets) {
+          Person.find({ name: "John" }, function (err, people) {
+            should.equal(err, null);
+
+            people[0].removePetsAsync(pets[0]).then(function () {
+
+              people[0].getPetsAsync().then(function (pets) {
+                should(Array.isArray(pets));
+                pets.length.should.equal(1);
+                pets[0].name.should.equal("Deco");
+
+                done();
+              }).catch(function(err){
+                done(err);
+              });
+            }).catch(function(err){
+              done(err);
+            });
+          });
+        });
+      });
     });
 
     describe("delAccessor", function () {
@@ -390,6 +477,29 @@ describe("hasMany", function () {
         });
       });
 
+      it("should remove specific associations if passed (promise-based)", function (done) {
+        Pet.find({ name: "Mutt" }, function (err, pets) {
+          Person.find({ name: "John" }, function (err, people) {
+            should.equal(err, null);
+
+            people[0].removePetsAsync(pets[0]).then(function () {
+              people[0].getPetsAsync().then(function (pets) {
+
+                should(Array.isArray(pets));
+                pets.length.should.equal(1);
+                pets[0].name.should.equal("Deco");
+
+                done();
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      });
+
       it("should remove all associations if none passed", function (done) {
         Person.find({ name: "John" }).first(function (err, John) {
           should.equal(err, null);
@@ -408,6 +518,26 @@ describe("hasMany", function () {
           });
         });
       });
+
+      it("should remove all associations if none passed (promise-based)", function (done) {
+        Person.find({ name: "John" }).first(function (err, John) {
+          should.equal(err, null);
+
+          John.removePetsAsync().then(function () {
+            John.getPetsAsync().then(function (pets) {
+
+              should(Array.isArray(pets));
+              pets.length.should.equal(0);
+
+              done();
+            }).catch(function(err) {
+              done(err);
+            });
+          }).catch(function(err){
+            done(err);
+          });
+        });
+      });
     });
 
     describe("addAccessor", function () {
@@ -529,6 +659,118 @@ describe("hasMany", function () {
       });
     });
 
+    describe("addAccessorAsync", function () {
+      before(setup());
+
+      if (common.protocol() != "mongodb") {
+
+        it("might add duplicates (promise-based)", function (done) {
+          Pet.find({ name: "Mutt" }, function (err, pets) {
+            Person.find({ name: "Jane" }, function (err, people) {
+              should.equal(err, null);
+
+              people[0].addPetsAsync(pets[0]).then(function () {
+                people[0].getPetsAsync("name").then(function (pets) {
+
+                  should(Array.isArray(pets));
+                  pets.length.should.equal(2);
+                  pets[0].name.should.equal("Mutt");
+                  pets[1].name.should.equal("Mutt");
+
+                  done();
+                }).catch(function(err){
+                  done(err);
+                });
+              }).catch(function(err){
+                done(err);
+              });
+            });
+          });
+        });
+      }
+
+      it("should keep associations and add new ones (promise-based)", function (done) {
+        Pet.find({ name: "Deco" }).first(function (err, Deco) {
+          Person.find({ name: "Jane" }).first(function (err, Jane) {
+            should.equal(err, null);
+
+            Jane.getPets(function (err, janesPets) {
+              should.not.exist(err);
+
+              var petsAtStart = janesPets.length;
+
+              Jane.addPets(Deco, function (err) {
+                should.equal(err, null);
+
+                Jane.getPets("name", function (err, pets) {
+                  should.equal(err, null);
+
+                  should(Array.isArray(pets));
+                  pets.length.should.equal(petsAtStart + 1);
+                  pets[0].name.should.equal("Deco");
+                  pets[1].name.should.equal("Mutt");
+
+                  return done();
+                });
+              });
+            });
+          });
+        });
+      });
+
+      it("should accept several arguments as associations (promise-based)", function (done) {
+        Pet.find(function (err, pets) {
+          Person.find({ name: "Justin" }).first(function (err, Justin) {
+            should.equal(err, null);
+
+            Justin.addPetsAsync(pets[0], pets[1]).then(function () {
+              Justin.getPetsAsync().then(function (pets) {
+
+                should(Array.isArray(pets));
+                pets.length.should.equal(2);
+
+                done();
+              }).catch(function(err){
+                done(err);
+              });
+            }).catch(function(err){
+              done(err);
+            });
+          });
+        });
+      });
+
+      it("should accept array as list of associations (promise-based)", function (done) {
+        Pet.create([{ name: 'Ruff' }, { name: 'Spotty' }],function (err, pets) {
+          Person.find({ name: "Justin" }).first(function (err, Justin) {
+            should.equal(err, null);
+
+            Justin.getPetsAsync().then(function (justinsPets) {
+
+              var petCount = justinsPets.length;
+
+              Justin.addPetsAsync(pets).then(function () {
+
+                Justin.getPets(function (err, justinsPets) {
+                  should.equal(err, null);
+
+                  should(Array.isArray(justinsPets));
+                  // Mongo doesn't like adding duplicates here, so we add new ones.
+                  should.equal(justinsPets.length, petCount + 2);
+
+                  done();
+                });
+              }).catch(function(err){
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      });
+    });
+
     describe("setAccessor", function () {
       before(setup());
 

From 607675e7e15e1441418b153e138d30a6131f1e87 Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Thu, 31 Aug 2017 16:14:34 +0300
Subject: [PATCH 1120/1246] Added changes to Associations Many. Created tests
 for Associations Many and One

---
 lib/Associations/Many.js                      |  10 +-
 test/integration/association-hasmany-extra.js |  43 +
 test/integration/association-hasmany-hooks.js |  94 +++
 .../integration/association-hasmany-mapsto.js | 534 ++++++++++++
 test/integration/association-hasmany.js       | 778 ++++++++++++------
 .../integration/association-hasone-reverse.js | 165 ++++
 test/integration/association-hasone-zeroid.js |  42 +-
 test/integration/association-hasone.js        | 183 ++++
 8 files changed, 1596 insertions(+), 253 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index e7529254..c6472ae5 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -9,6 +9,7 @@ var Promise             = require("bluebird");
 
 exports.prepare = function (db, Model, associations) {
   Model.hasMany = function () {
+    var promiseFunctionPostfix = Model.settings.get('promiseFunctionPostfix');
     var name, makeKey, mergeId, mergeAssocId;
     var OtherModel = Model;
     var props = null;
@@ -83,7 +84,12 @@ exports.prepare = function (db, Model, associations) {
       hasAccessor    : opts.hasAccessor || ("has" + assocTemplateName),
       delAccessor    : opts.delAccessor || ("remove" + assocTemplateName),
       addAccessor    : opts.addAccessor || ("add" + assocTemplateName),
-      hasAccessorAsync    : opts.hasAccessorAsync || ("has" + assocTemplateName + 'Async')
+
+      getAccessorAsync : opts.getAccessor + promiseFunctionPostfix || ("get" + assocTemplateName + promiseFunctionPostfix),
+      setAccessorAsync : opts.setAccessor + promiseFunctionPostfix || ("set" + assocTemplateName + promiseFunctionPostfix),
+      hasAccessorAsync : opts.hasAccessor + promiseFunctionPostfix || ("has" + assocTemplateName + promiseFunctionPostfix),
+      delAccessorAsync : opts.delAccessor + promiseFunctionPostfix || ("remove" + assocTemplateName + promiseFunctionPostfix),
+      addAccessorAsync : opts.addAccessor + promiseFunctionPostfix || ("add" + assocTemplateName + promiseFunctionPostfix)
     };
     associations.push(association);
 
@@ -485,8 +491,6 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
     enumerable: true
   });
 
-  console.log(association.hasAccessor + promiseFunctionPostfix)
-
   Object.defineProperty(Instance, association.hasAccessor + promiseFunctionPostfix, {
     value: Promise.promisify(Instance[association.hasAccessor]),
     enumerable: false,
diff --git a/test/integration/association-hasmany-extra.js b/test/integration/association-hasmany-extra.js
index 5b8606d9..3d04bb25 100644
--- a/test/integration/association-hasmany-extra.js
+++ b/test/integration/association-hasmany-extra.js
@@ -75,4 +75,47 @@ describe("hasMany extra properties", function() {
       });
     });
   });
+
+  describe("if passed to addAccessorAsync", function () {
+    before(setup());
+
+    it("should be added to association", function (done) {
+      Person.create([{
+        name    : "John"
+      }], function (err, people) {
+        Pet.create([{
+          name : "Deco"
+        }, {
+          name : "Mutt"
+        }], function (err, pets) {
+          var data = { adopted: true };
+
+          people[0].addPetsAsync(pets, { since : new Date(), data: data }).then(function () {
+
+            Person.find({ name: "John" }, { autoFetch : true }).first(function (err, John) {
+              should.equal(err, null);
+
+              John.should.have.property("pets");
+              should(Array.isArray(pets));
+
+              John.pets.length.should.equal(2);
+
+              John.pets[0].should.have.property("name");
+              John.pets[0].should.have.property("extra");
+              John.pets[0].extra.should.be.a.Object();
+              John.pets[0].extra.should.have.property("since");
+              should(John.pets[0].extra.since instanceof Date);
+
+              should.equal(typeof John.pets[0].extra.data, 'object');
+              should.equal(JSON.stringify(data), JSON.stringify(John.pets[0].extra.data));
+
+              done();
+            });
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+    });
+  });
 });
diff --git a/test/integration/association-hasmany-hooks.js b/test/integration/association-hasmany-hooks.js
index 9f640f04..54bbf504 100644
--- a/test/integration/association-hasmany-hooks.js
+++ b/test/integration/association-hasmany-hooks.js
@@ -122,4 +122,98 @@ describe("hasMany hooks", function() {
       });
     });
   });
+
+  describe("beforeSaveAsync", function () {
+    var had_extra = false;
+
+    before(setup({
+      born : Date
+    }, {
+      hooks : {
+        beforeSave: function (extra, next) {
+          had_extra = (typeof extra == "object");
+          return next();
+        }
+      }
+    }));
+
+    it("should pass extra data to hook if extra defined", function (done) {
+      Person.create({
+        name    : "John"
+      }, function (err, John) {
+        Pet.create({
+          name : "Deco"
+        }, function (err, Deco) {
+          John.addPetsAsync(Deco).then(function () {
+            should.not.exist(err);
+
+            had_extra.should.equal(true);
+
+            done();
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+    });
+  });
+
+  describe("beforeSaveAsync", function () {
+    var had_extra = false;
+
+    before(setup({}, {
+      hooks : {
+        beforeSave: function (next) {
+          next.should.be.a.Function();
+          return next();
+        }
+      }
+    }));
+
+    it("should not pass extra data to hook if extra defined", function (done) {
+      Person.create({
+        name    : "John"
+      }, function (err, John) {
+        Pet.create({
+          name : "Deco"
+        }, function (err, Deco) {
+          John.addPetsAsync(Deco).then(function () {
+            done();
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+    });
+  });
+
+  describe("beforeSaveAsync", function () {
+    var had_extra = false;
+
+    before(setup({}, {
+      hooks : {
+        beforeSave: function (next) {
+          setTimeout(function () {
+            return next(new Error('blocked'));
+          }, 100);
+        }
+      }
+    }));
+
+    it("should block if error returned", function (done) {
+      Person.create({
+        name    : "John"
+      }, function (err, John) {
+        Pet.create({
+          name : "Deco"
+        }, function (err, Deco) {
+          John.addPetsAsync(Deco).catch(function(err) {
+            should.exist(err);
+            err.message.should.equal('blocked');
+            done()
+          });
+        });
+      });
+    });
+  });
 });
diff --git a/test/integration/association-hasmany-mapsto.js b/test/integration/association-hasmany-mapsto.js
index 1502d32b..5e265fe5 100644
--- a/test/integration/association-hasmany-mapsto.js
+++ b/test/integration/association-hasmany-mapsto.js
@@ -663,5 +663,539 @@ describe("hasMany with mapsTo", function () {
       });
 
     });
+
+    describe("getAccessorAsync", function () {
+      before(setup());
+
+      it("should allow to specify order as string", function (done) {
+        Person.find({ firstName: "John" }, function (err, people) {
+          should.equal(err, null);
+
+          people[0].getPetsAsync("-petName").then(function (pets) {
+
+            should(Array.isArray(pets));
+            pets.length.should.equal(2);
+            pets[0].model().should.equal(Pet);
+            pets[0].petName.should.equal("Mutt");
+            pets[1].petName.should.equal("Deco");
+
+            done();
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+
+      it ("should return proper instance model", function(done){
+        Person.find({ firstName: "John" }, function (err, people) {
+          people[0].getPetsAsync("-petName").then(function (pets) {
+            pets[0].model().should.equal(Pet);
+            done();
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+
+      it("should allow to specify order as Array", function (done) {
+        Person.find({ firstName: "John" }, function (err, people) {
+          should.equal(err, null);
+
+          people[0].getPetsAsync([ "petName", "Z" ]).then(function (pets) {
+
+            should(Array.isArray(pets));
+            pets.length.should.equal(2);
+            pets[0].petName.should.equal("Mutt");
+            pets[1].petName.should.equal("Deco");
+
+            done();
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+
+      it("should allow to specify a limit", function (done) {
+        Person.find({ firstName: "John" }).first(function (err, John) {
+          should.equal(err, null);
+
+          John.getPetsAsync(1).then(function (pets) {
+            should(Array.isArray(pets));
+            pets.length.should.equal(1);
+
+            done();
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+
+      it("should allow to specify conditions", function (done) {
+        Person.find({ firstName: "John" }).first(function (err, John) {
+          should.equal(err, null);
+
+          John.getPetsAsync({ petName: "Mutt" }).then(function (pets) {
+            should(Array.isArray(pets));
+            pets.length.should.equal(1);
+            pets[0].petName.should.equal("Mutt");
+
+            done();
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+
+      if (common.protocol() == "mongodb") return;
+
+      it("should allow chaining count()", function (done) {
+        Person.find({}, function (err, people) {
+          should.equal(err, null);
+
+          people[0].getPetsAsync().then(function (count) {
+
+            should.strictEqual(count.length, 2);
+
+            people[1].getPetsAsync().then(function (count) {
+
+              should.strictEqual(count.length, 1);
+
+              people[2].getPetsAsync().then(function (count) {
+
+                should.strictEqual(count.length, 0);
+
+                done();
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+    });
+
+    describe("hasAccessorAsync", function () {
+      before(setup());
+
+      it("should return true if instance has associated item", function (done) {
+        Pet.find({ petName: "Mutt" }, function (err, pets) {
+          should.equal(err, null);
+
+          Person.find({ firstName: "Jane" }).first(function (err, Jane) {
+            should.equal(err, null);
+
+            Jane.hasPetsAsync(pets[0]).then(function (has_pets) {
+              has_pets.should.equal(true);
+
+              done();
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      });
+
+      it("should return true if not passing any instance and has associated items", function (done) {
+        Person.find({ firstName: "Jane" }).first(function (err, Jane) {
+          should.equal(err, null);
+
+          Jane.hasPetsAsync().then(function (has_pets) {
+            has_pets.should.be.true;
+
+            done();
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+
+      it("should return true if all passed instances are associated", function (done) {
+        Pet.find(function (err, pets) {
+          Person.find({ firstName: "John" }).first(function (err, John) {
+            should.equal(err, null);
+
+            John.hasPetsAsync(pets).then(function (has_pets) {
+              has_pets.should.be.true;
+
+              done();
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      });
+
+      it("should return false if any passed instances are not associated", function (done) {
+        Pet.find(function (err, pets) {
+          Person.find({ firstName: "Jane" }).first(function (err, Jane) {
+            should.equal(err, null);
+
+            Jane.hasPetsAsync(pets).then(function (has_pets) {
+              has_pets.should.be.false;
+
+              done();
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      });
+    });
+
+    describe("delAccessorAsync", function () {
+      before(setup());
+
+      it("should accept arguments in different orders", function (done) {
+        Pet.find({ petName: "Mutt" }, function (err, pets) {
+          Person.find({ firstName: "John" }, function (err, people) {
+            should.equal(err, null);
+
+            people[0].removePetsAsync(pets[0]).then(function () {
+
+              people[0].getPetsAsync().then(function (pets) {
+
+                should(Array.isArray(pets));
+                pets.length.should.equal(1);
+                pets[0].petName.should.equal("Deco");
+
+                done();
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      });
+    });
+
+    describe("delAccessorAsync", function () {
+      before(setup());
+
+      it("should remove specific associations if passed", function (done) {
+        Pet.find({ petName: "Mutt" }, function (err, pets) {
+          Person.find({ firstName: "John" }, function (err, people) {
+            should.equal(err, null);
+
+            people[0].removePetsAsync(pets[0]).then(function () {
+
+              people[0].getPetsAsync().then(function (pets) {
+
+                should(Array.isArray(pets));
+                pets.length.should.equal(1);
+                pets[0].petName.should.equal("Deco");
+
+                done();
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      });
+
+      it("should remove all associations if none passed", function (done) {
+        Person.find({ firstName: "John" }).first(function (err, John) {
+          should.equal(err, null);
+
+          John.removePetsAsync().then(function () {
+
+            John.getPetsAsync().then(function (pets) {
+
+              should(Array.isArray(pets));
+              pets.length.should.equal(0);
+
+              done();
+            }).catch(function(err) {
+              done(err);
+            });
+          }).catch(function(err){
+            done(err);
+          });
+        });
+      });
+    });
+
+    describe("addAccessorAsync", function () {
+      before(setup());
+
+      if (common.protocol() != "mongodb") {
+        it("might add duplicates", function (done) {
+          Pet.find({ petName: "Mutt" }, function (err, pets) {
+            Person.find({ firstName: "Jane" }, function (err, people) {
+              should.equal(err, null);
+
+              people[0].addPetsAsync(pets[0]).then(function () {
+
+                people[0].getPetsAsync("petName").then(function (pets) {
+
+                  should(Array.isArray(pets));
+                  pets.length.should.equal(2);
+                  pets[0].petName.should.equal("Mutt");
+                  pets[1].petName.should.equal("Mutt");
+
+                  done();
+                }).catch(function(err) {
+                  done(err);
+                });
+              }).catch(function(err) {
+                done(err);
+              });
+            });
+          });
+        });
+      }
+
+      it("should keep associations and add new ones", function (done) {
+        Pet.find({ petName: "Deco" }).first(function (err, Deco) {
+          Person.find({ firstName: "Jane" }).first(function (err, Jane) {
+            should.equal(err, null);
+
+            Jane.getPetsAsync().then(function (janesPets) {
+
+              var petsAtStart = janesPets.length;
+
+              Jane.addPetsAsync(Deco).then(function () {
+                Jane.getPetsAsync("petName").then(function (pets) {
+
+                  should(Array.isArray(pets));
+                  pets.length.should.equal(petsAtStart + 1);
+                  pets[0].petName.should.equal("Deco");
+                  pets[1].petName.should.equal("Mutt");
+
+                  done();
+                });
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      });
+
+      it("should accept several arguments as associations", function (done) {
+        Pet.find(function (err, pets) {
+          Person.find({ firstName: "Justin" }).first(function (err, Justin) {
+            should.equal(err, null);
+
+            Justin.addPetsAsync(pets[0], pets[1]).then(function () {
+              Justin.getPetsAsync().then(function (pets) {
+
+                should(Array.isArray(pets));
+                pets.length.should.equal(2);
+
+                done();
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      });
+
+      it("should accept array as list of associations", function (done) {
+        Pet.create([{ petName: 'Ruff' }, { petName: 'Spotty' }],function (err, pets) {
+          Person.find({ firstName: "Justin" }).first(function (err, Justin) {
+            should.equal(err, null);
+
+            Justin.getPetsAsync().then(function (justinsPets) {
+
+              var petCount = justinsPets.length;
+
+              Justin.addPetsAsync(pets).then(function () {
+                Justin.getPetsAsync().then(function (justinsPets) {
+
+                  should(Array.isArray(justinsPets));
+                  // Mongo doesn't like adding duplicates here, so we add new ones.
+                  should.equal(justinsPets.length, petCount + 2);
+
+                  done();
+                }).catch(function(err) {
+                  done(err);
+                });
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      });
+
+      it("should throw if no items passed", function (done) {
+        Person.one(function (err, person) {
+          should.equal(err, null);
+            person.addPetsAsync().catch(function(err) {
+              should.exists(err);
+              done();
+            });
+        });
+      });
+    });
+
+    describe("setAccessorAsync", function () {
+      before(setup());
+
+      it("should accept several arguments as associations", function (done) {
+        Pet.find(function (err, pets) {
+          Person.find({ firstName: "Justin" }).first(function (err, Justin) {
+            should.equal(err, null);
+
+            Justin.setPetsAsync(pets[0], pets[1]).then(function () {
+
+              Justin.getPetsAsync().then(function (pets) {
+
+                should(Array.isArray(pets));
+                pets.length.should.equal(2);
+
+                done();
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      });
+
+      it("should accept an array of associations", function (done) {
+        Pet.find(function (err, pets) {
+          Person.find({ firstName: "Justin" }).first(function (err, Justin) {
+            should.equal(err, null);
+
+            Justin.setPetsAsync(pets).then(function () {
+              Justin.getPetsAsync().then(function (all_pets) {
+
+                should(Array.isArray(all_pets));
+                all_pets.length.should.equal(pets.length);
+
+                done();
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      });
+
+      it("should remove all associations if an empty array is passed", function (done) {
+        Person.find({ firstName: "Justin" }).first(function (err, Justin) {
+          should.equal(err, null);
+          Justin.getPetsAsync().then(function (pets) {
+            should.equal(pets.length, 2);
+
+            Justin.setPetsAsync([]).then(function () {
+              Justin.getPetsAsync().then(function (pets) {
+                should.equal(pets.length, 0);
+
+                done();
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      });
+
+      it("clears current associations", function (done) {
+        Pet.find({ petName: "Deco" }, function (err, pets) {
+          var Deco = pets[0];
+
+          Person.find({ firstName: "Jane" }).first(function (err, Jane) {
+            should.equal(err, null);
+
+            Jane.getPetsAsync().then(function (pets) {
+
+              should(Array.isArray(pets));
+              pets.length.should.equal(1);
+              pets[0].petName.should.equal("Mutt");
+
+              Jane.setPetsAsync(Deco).then(function () {
+                Jane.getPetsAsync().then(function (pets) {
+
+                  should(Array.isArray(pets));
+                  pets.length.should.equal(1);
+                  pets[0].petName.should.equal(Deco.petName);
+
+                  done();
+                }).catch(function(err) {
+                  done(err);
+                });
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      });
+    });
+
+    describe("with autoFetch turned on (promised-based test)", function () {
+      before(setup({
+        autoFetchPets : true
+      }));
+
+      it("should not auto save associations which were autofetched", function (done) {
+        Pet.all(function (err, pets) {
+          should.not.exist(err);
+          should.equal(pets.length, 2);
+
+          Person.create({ firstName: 'Paul' }, function (err, paul) {
+            should.not.exist(err);
+
+            Person.one({ firstName: 'Paul' }, function (err, paul2) {
+              should.not.exist(err);
+              should.equal(paul2.pets.length, 0);
+
+              paul.setPetsAsync(pets).then(function () {
+                should.not.exist(err);
+
+                // reload paul to make sure we have 2 pets
+                Person.one({ firstName: 'Paul' }, function (err, paul) {
+                  should.not.exist(err);
+                  should.equal(paul.pets.length, 2);
+
+                  // Saving paul2 should NOT auto save associations and hence delete
+                  // the associations we just created.
+                  paul2.save(function (err) {
+                    should.not.exist(err);
+
+                    // let's check paul - pets should still be associated
+                    Person.one({ firstName: 'Paul' }, function (err, paul) {
+                      should.not.exist(err);
+                      should.equal(paul.pets.length, 2);
+
+                      done();
+                    });
+                  });
+                });
+              }).catch(function(err) {
+                done(err);
+              });
+            });
+          });
+        });
+      });
+
+    });
   });
 });
diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
index 6dcd7282..226f00ec 100644
--- a/test/integration/association-hasmany.js
+++ b/test/integration/association-hasmany.js
@@ -232,23 +232,6 @@ describe("hasMany", function () {
         });
       });
 
-      it("should return true if instance has associated item", function (done) {
-        Pet.find({ name: "Mutt" }, function (err, pets) {
-          should.equal(err, null);
-
-          Person.find({ name: "Jane" }).first(function (err, Jane) {
-            should.equal(err, null);
-
-            Jane.hasPetsAsync(pets[0]).then(function (has_pets) {
-              has_pets.should.be.true;
-              done();
-            }).catch(function(err){
-              done(err);
-            });
-          });
-        });
-      });
-
       it("should return true if not passing any instance and has associated items", function (done) {
         Person.find({ name: "Jane" }).first(function (err, Jane) {
           should.equal(err, null);
@@ -262,19 +245,6 @@ describe("hasMany", function () {
         });
       });
 
-      it("should return true if not passing any instance and has associated items (promise-based)", function (done) {
-        Person.find({ name: "Jane" }).first(function (err, Jane) {
-          should.equal(err, null);
-
-          Jane.hasPetsAsync().then(function (has_pets) {
-            has_pets.should.be.true;
-            done();
-          }).catch(function(err){
-            done(err);
-          });
-        });
-      });
-
       it("should return true if all passed instances are associated", function (done) {
         Pet.find(function (err, pets) {
           Person.find({ name: "John" }).first(function (err, John) {
@@ -290,22 +260,6 @@ describe("hasMany", function () {
         });
       });
 
-      it("should return true if all passed instances are associated (promise-based)", function (done) {
-        Pet.find(function (err, pets) {
-          Person.find({ name: "John" }).first(function (err, John) {
-            should.equal(err, null);
-
-            John.hasPetsAsync(pets).then(function (has_pets) {
-              should.equal(err, null);
-              has_pets.should.be.true;
-              done();
-            }).catch(function(err){
-              done(err);
-            });
-          });
-        });
-      });
-
       it("should return false if any passed instances are not associated", function (done) {
         Pet.find(function (err, pets) {
           Person.find({ name: "Jane" }).first(function (err, Jane) {
@@ -321,23 +275,6 @@ describe("hasMany", function () {
         });
       });
 
-      it("should return false if any passed instances are not associated (promise-based)", function (done) {
-        Pet.find(function (err, pets) {
-          Person.find({ name: "Jane" }).first(function (err, Jane) {
-            should.equal(err, null);
-
-            Jane.hasPetsAsync(pets).then(function (has_pets) {
-              should.equal(err, null);
-              has_pets.should.be.false;
-
-              done();
-            }).catch(function(err) {
-              done(err);
-            });
-          });
-        });
-      });
-
       if (common.protocol() != "mongodb") {
         it("should return true if join table has duplicate entries", function (done) {
           Pet.find({ name: ["Mutt", "Deco"] }, function (err, pets) {
@@ -428,33 +365,6 @@ describe("hasMany", function () {
         });
       });
 
-      it("should accept arguments in different orders (promise-based)", function (done) {
-        Pet.find({ name: "Mutt" }, function (err, pets) {
-          Person.find({ name: "John" }, function (err, people) {
-            should.equal(err, null);
-
-            people[0].removePetsAsync(pets[0]).then(function () {
-
-              people[0].getPetsAsync().then(function (pets) {
-                should(Array.isArray(pets));
-                pets.length.should.equal(1);
-                pets[0].name.should.equal("Deco");
-
-                done();
-              }).catch(function(err){
-                done(err);
-              });
-            }).catch(function(err){
-              done(err);
-            });
-          });
-        });
-      });
-    });
-
-    describe("delAccessor", function () {
-      before(setup());
-
       it("should remove specific associations if passed", function (done) {
         Pet.find({ name: "Mutt" }, function (err, pets) {
           Person.find({ name: "John" }, function (err, people) {
@@ -477,29 +387,6 @@ describe("hasMany", function () {
         });
       });
 
-      it("should remove specific associations if passed (promise-based)", function (done) {
-        Pet.find({ name: "Mutt" }, function (err, pets) {
-          Person.find({ name: "John" }, function (err, people) {
-            should.equal(err, null);
-
-            people[0].removePetsAsync(pets[0]).then(function () {
-              people[0].getPetsAsync().then(function (pets) {
-
-                should(Array.isArray(pets));
-                pets.length.should.equal(1);
-                pets[0].name.should.equal("Deco");
-
-                done();
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
-          });
-        });
-      });
-
       it("should remove all associations if none passed", function (done) {
         Person.find({ name: "John" }).first(function (err, John) {
           should.equal(err, null);
@@ -518,26 +405,6 @@ describe("hasMany", function () {
           });
         });
       });
-
-      it("should remove all associations if none passed (promise-based)", function (done) {
-        Person.find({ name: "John" }).first(function (err, John) {
-          should.equal(err, null);
-
-          John.removePetsAsync().then(function () {
-            John.getPetsAsync().then(function (pets) {
-
-              should(Array.isArray(pets));
-              pets.length.should.equal(0);
-
-              done();
-            }).catch(function(err) {
-              done(err);
-            });
-          }).catch(function(err){
-            done(err);
-          });
-        });
-      });
     });
 
     describe("addAccessor", function () {
@@ -659,118 +526,6 @@ describe("hasMany", function () {
       });
     });
 
-    describe("addAccessorAsync", function () {
-      before(setup());
-
-      if (common.protocol() != "mongodb") {
-
-        it("might add duplicates (promise-based)", function (done) {
-          Pet.find({ name: "Mutt" }, function (err, pets) {
-            Person.find({ name: "Jane" }, function (err, people) {
-              should.equal(err, null);
-
-              people[0].addPetsAsync(pets[0]).then(function () {
-                people[0].getPetsAsync("name").then(function (pets) {
-
-                  should(Array.isArray(pets));
-                  pets.length.should.equal(2);
-                  pets[0].name.should.equal("Mutt");
-                  pets[1].name.should.equal("Mutt");
-
-                  done();
-                }).catch(function(err){
-                  done(err);
-                });
-              }).catch(function(err){
-                done(err);
-              });
-            });
-          });
-        });
-      }
-
-      it("should keep associations and add new ones (promise-based)", function (done) {
-        Pet.find({ name: "Deco" }).first(function (err, Deco) {
-          Person.find({ name: "Jane" }).first(function (err, Jane) {
-            should.equal(err, null);
-
-            Jane.getPets(function (err, janesPets) {
-              should.not.exist(err);
-
-              var petsAtStart = janesPets.length;
-
-              Jane.addPets(Deco, function (err) {
-                should.equal(err, null);
-
-                Jane.getPets("name", function (err, pets) {
-                  should.equal(err, null);
-
-                  should(Array.isArray(pets));
-                  pets.length.should.equal(petsAtStart + 1);
-                  pets[0].name.should.equal("Deco");
-                  pets[1].name.should.equal("Mutt");
-
-                  return done();
-                });
-              });
-            });
-          });
-        });
-      });
-
-      it("should accept several arguments as associations (promise-based)", function (done) {
-        Pet.find(function (err, pets) {
-          Person.find({ name: "Justin" }).first(function (err, Justin) {
-            should.equal(err, null);
-
-            Justin.addPetsAsync(pets[0], pets[1]).then(function () {
-              Justin.getPetsAsync().then(function (pets) {
-
-                should(Array.isArray(pets));
-                pets.length.should.equal(2);
-
-                done();
-              }).catch(function(err){
-                done(err);
-              });
-            }).catch(function(err){
-              done(err);
-            });
-          });
-        });
-      });
-
-      it("should accept array as list of associations (promise-based)", function (done) {
-        Pet.create([{ name: 'Ruff' }, { name: 'Spotty' }],function (err, pets) {
-          Person.find({ name: "Justin" }).first(function (err, Justin) {
-            should.equal(err, null);
-
-            Justin.getPetsAsync().then(function (justinsPets) {
-
-              var petCount = justinsPets.length;
-
-              Justin.addPetsAsync(pets).then(function () {
-
-                Justin.getPets(function (err, justinsPets) {
-                  should.equal(err, null);
-
-                  should(Array.isArray(justinsPets));
-                  // Mongo doesn't like adding duplicates here, so we add new ones.
-                  should.equal(justinsPets.length, petCount + 2);
-
-                  done();
-                });
-              }).catch(function(err){
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
-          });
-        });
-      });
-    });
-
     describe("setAccessor", function () {
       before(setup());
 
@@ -870,6 +625,539 @@ describe("hasMany", function () {
       });
     });
 
+    describe("getAccessorAsync", function () {
+      before(setup());
+
+      it("should allow to specify order as string", function (done) {
+        Person.find({ name: "John" }, function (err, people) {
+          should.equal(err, null);
+
+          people[0].getPetsAsync("-name").then(function (pets) {
+
+            should(Array.isArray(pets));
+            pets.length.should.equal(2);
+            pets[0].model().should.equal(Pet);
+            pets[0].name.should.equal("Mutt");
+            pets[1].name.should.equal("Deco");
+
+            done();
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+
+      it ("should return proper instance model", function(done){
+        Person.find({ name: "John" }, function (err, people) {
+          people[0].getPetsAsync("-name").then(function (pets) {
+            pets[0].model().should.equal(Pet);
+            done();
+          }).catch(function(err) {
+            done(err);
+          })
+        });
+      });
+
+      it("should allow to specify order as Array", function (done) {
+        Person.find({ name: "John" }, function (err, people) {
+          should.equal(err, null);
+
+          people[0].getPetsAsync([ "name", "Z" ]).then(function (pets) {
+
+            should(Array.isArray(pets));
+            pets.length.should.equal(2);
+            pets[0].name.should.equal("Mutt");
+            pets[1].name.should.equal("Deco");
+
+            done();
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+
+      it("should allow to specify a limit", function (done) {
+        Person.find({ name: "John" }).first(function (err, John) {
+          should.equal(err, null);
+
+          John.getPetsAsync(1).then(function (pets) {
+            should(Array.isArray(pets));
+            pets.length.should.equal(1);
+
+            done();
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+
+      it("should allow to specify conditions", function (done) {
+        Person.find({ name: "John" }).first(function (err, John) {
+          should.equal(err, null);
+
+          John.getPetsAsync({ name: "Mutt" }).then(function (pets) {
+
+            should(Array.isArray(pets));
+            pets.length.should.equal(1);
+            pets[0].name.should.equal("Mutt");
+
+            done();
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+
+      if (common.protocol() == "mongodb") return;
+
+      it("should allow chaining count()", function (done) {
+        Person.find({}, function (err, people) {
+          should.equal(err, null);
+
+          people[1].getPetsAsync().then(function (count) {
+            should.strictEqual(count.length, 2);
+
+            people[2].getPetsAsync().then(function (count) {
+
+              should.strictEqual(count.length, 1);
+
+              people[3].getPetsAsync().then(function (count) {
+
+                should.strictEqual(count.length, 0);
+
+                done();
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          }).catch(function(err){
+            done(err);
+          });
+        });
+      });
+    });
+
+    describe("hasAccessorAsync", function () {
+      before(setup());
+
+      it("should return true if instance has associated item", function (done) {
+        Pet.find({ name: "Mutt" }, function (err, pets) {
+          should.equal(err, null);
+
+          Person.find({ name: "Jane" }).first(function (err, Jane) {
+            should.equal(err, null);
+
+            Jane.hasPetsAsync(pets[0]).then(function (has_pets) {
+              has_pets.should.be.true;
+              done();
+            }).catch(function(err){
+              done(err);
+            });
+          });
+        });
+      });
+
+      it("should return true if not passing any instance and has associated items", function (done) {
+        Person.find({ name: "Jane" }).first(function (err, Jane) {
+          should.equal(err, null);
+
+          Jane.hasPetsAsync().then(function (has_pets) {
+            has_pets.should.be.true;
+            done();
+          }).catch(function(err){
+            done(err);
+          });
+        });
+      });
+
+      it("should return true if all passed instances are associated", function (done) {
+        Pet.find(function (err, pets) {
+          Person.find({ name: "John" }).first(function (err, John) {
+            should.equal(err, null);
+
+            John.hasPetsAsync(pets).then(function (has_pets) {
+              should.equal(err, null);
+              has_pets.should.be.true;
+              done();
+            }).catch(function(err){
+              done(err);
+            });
+          });
+        });
+      });
+
+      it("should return false if any passed instances are not associated", function (done) {
+        Pet.find(function (err, pets) {
+          Person.find({ name: "Jane" }).first(function (err, Jane) {
+            should.equal(err, null);
+
+            Jane.hasPetsAsync(pets).then(function (has_pets) {
+              should.equal(err, null);
+              has_pets.should.be.false;
+
+              done();
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      });
+
+      if (common.protocol() != "mongodb") {
+        it("should return true if join table has duplicate entries", function (done) {
+          Pet.find({ name: ["Mutt", "Deco"] }, function (err, pets) {
+            should.not.exist(err);
+            should.equal(pets.length, 2);
+
+            Person.find({ name: "John" }).first(function (err, John) {
+              should.not.exist(err);
+
+              John.hasPets(pets, function (err, hasPets) {
+                should.equal(err, null);
+                should.equal(hasPets, true);
+
+                db.driver.execQuery(
+                  "INSERT INTO person_pets (person_id, pets_id) VALUES (?,?), (?,?)",
+                  [John.id, pets[0].id, John.id, pets[1].id],
+                  function (err) {
+                    should.not.exist(err);
+
+                    John.hasPets(pets, function (err, hasPets) {
+                      should.equal(err, null);
+                      should.equal(hasPets, true);
+
+                      done()
+                    });
+                  }
+                );
+              });
+            });
+          });
+        });
+        it("should return true if join table has duplicate entries (promise-based)", function (done) {
+          Pet.find({ name: ["Mutt", "Deco"] }, function (err, pets) {
+            should.not.exist(err);
+            should.equal(pets.length, 2);
+
+            Person.find({ name: "John" }).first(function (err, John) {
+              should.not.exist(err);
+
+              John.hasPetsAsync(pets).then(function (hasPets) {
+                should.equal(hasPets, true);
+
+                db.driver.execQuery(
+                  "INSERT INTO person_pets (person_id, pets_id) VALUES (?,?), (?,?)",
+                  [John.id, pets[0].id, John.id, pets[1].id],
+                  function (err) {
+                    should.not.exist(err);
+
+                    John.hasPetsAsync(pets).then(function (hasPets) {
+                      should.equal(hasPets, true);
+                      done();
+                    }).catch(function(err){
+                      done(err);
+                    });
+                  }
+                );
+              }).catch(function(err){
+                done(err);
+              });
+            });
+          });
+        });
+      }
+    });
+
+    describe("delAccessorAsync", function () {
+      before(setup());
+
+      it("should accept arguments in different orders", function (done) {
+        Pet.find({ name: "Mutt" }, function (err, pets) {
+          Person.find({ name: "John" }, function (err, people) {
+            should.equal(err, null);
+
+            people[0].removePetsAsync(pets[0]).then(function () {
+              people[0].getPetsAsync().then(function (pets) {
+
+                should(Array.isArray(pets));
+                pets.length.should.equal(1);
+                pets[0].name.should.equal("Deco");
+
+                return done();
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      });
+
+      it("should remove specific associations if passed", function (done) {
+        Pet.find({ name: "Mutt" }, function (err, pets) {
+          Person.find({ name: "John" }, function (err, people) {
+            should.equal(err, null);
+
+            people[0].removePetsAsync(pets[0]).then(function () {
+              people[0].getPetsAsync().then(function (pets) {
+                should(Array.isArray(pets));
+                pets.length.should.equal(1);
+                pets[0].name.should.equal("Deco");
+
+                done();
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      });
+
+      it("should remove all associations if none passed", function (done) {
+        Person.find({ name: "John" }).first(function (err, John) {
+          should.equal(err, null);
+
+          John.removePetsAsync().then(function () {
+            John.getPetsAsync().then(function (pets) {
+
+              should(Array.isArray(pets));
+              pets.length.should.equal(0);
+
+              done();
+            }).catch(function(err) {
+              done(err);
+            });
+          }).catch(function(err){
+            done(err);
+          });
+        });
+      });
+    });
+
+    describe("addAccessorAsync", function () {
+      before(setup());
+
+      if (common.protocol() != "mongodb") {
+
+        it("might add duplicates (promise-based)", function (done) {
+          Pet.find({ name: "Mutt" }, function (err, pets) {
+            Person.find({ name: "Jane" }, function (err, people) {
+              should.equal(err, null);
+
+              people[0].addPetsAsync(pets[0]).then(function () {
+                people[0].getPetsAsync("name").then(function (pets) {
+
+                  should(Array.isArray(pets));
+                  pets.length.should.equal(2);
+                  pets[0].name.should.equal("Mutt");
+                  pets[1].name.should.equal("Mutt");
+
+                  done();
+                }).catch(function(err){
+                  done(err);
+                });
+              }).catch(function(err){
+                done(err);
+              });
+            });
+          });
+        });
+      }
+
+      it("should keep associations and add new ones", function (done) {
+        Pet.find({ name: "Deco" }).first(function (err, Deco) {
+          Person.find({ name: "Jane" }).first(function (err, Jane) {
+            should.equal(err, null);
+
+            Jane.getPetsAsync().then(function (janesPets) {
+              should.not.exist(err);
+
+              var petsAtStart = janesPets.length;
+
+              Jane.addPetsAsync(Deco).then(function () {
+                Jane.getPetsAsync("name").then(function (pets) {
+                  should(Array.isArray(pets));
+                  pets.length.should.equal(petsAtStart + 1);
+                  pets[0].name.should.equal("Deco");
+                  pets[1].name.should.equal("Mutt");
+
+                  done();
+                }).catch(function(err) {
+                  done(err);
+                });
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err){
+              done(err);
+            });
+          });
+        });
+      });
+
+      it("should accept several arguments as associations (promise-based)", function (done) {
+        Pet.find(function (err, pets) {
+          Person.find({ name: "Justin" }).first(function (err, Justin) {
+            should.equal(err, null);
+
+            Justin.addPetsAsync(pets[0], pets[1]).then(function () {
+              Justin.getPetsAsync().then(function (pets) {
+
+                should(Array.isArray(pets));
+                pets.length.should.equal(2);
+
+                done();
+              }).catch(function(err){
+                done(err);
+              });
+            }).catch(function(err){
+              done(err);
+            });
+          });
+        });
+      });
+
+      it("should accept array as list of associations (promise-based)", function (done) {
+        Pet.create([{ name: 'Ruff' }, { name: 'Spotty' }],function (err, pets) {
+          Person.find({ name: "Justin" }).first(function (err, Justin) {
+            should.equal(err, null);
+
+            Justin.getPetsAsync().then(function (justinsPets) {
+
+              var petCount = justinsPets.length;
+
+              Justin.addPetsAsync(pets).then(function () {
+
+                Justin.getPetsAsync().then(function (justinsPets) {
+
+                  should(Array.isArray(justinsPets));
+                  // Mongo doesn't like adding duplicates here, so we add new ones.
+                  should.equal(justinsPets.length, petCount + 2);
+
+                  done();
+                });
+              }).catch(function(err){
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      });
+    });
+
+    describe("setAccessorAsync", function () {
+      before(setup());
+
+      it("should accept several arguments as associations", function (done) {
+        Pet.find(function (err, pets) {
+          Person.find({ name: "Justin" }).first(function (err, Justin) {
+            should.equal(err, null);
+
+            Justin.setPetsAsync(pets[0], pets[1]).then(function () {
+              Justin.getPetsAsync().then(function (pets) {
+
+                should(Array.isArray(pets));
+                pets.length.should.equal(2);
+
+                done();
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function (err) {
+              done(err);
+            });
+          });
+        });
+      });
+
+      it("should accept an array of associations", function (done) {
+        Pet.find(function (err, pets) {
+          Person.find({ name: "Justin" }).first(function (err, Justin) {
+            should.equal(err, null);
+
+            Justin.setPetsAsync(pets).then(function () {
+              Justin.getPetsAsync().then(function (all_pets) {
+                should(Array.isArray(all_pets));
+                all_pets.length.should.equal(pets.length);
+
+                done();
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      });
+
+      it("should remove all associations if an empty array is passed", function (done) {
+        Person.find({ name: "Justin" }).first(function (err, Justin) {
+          should.equal(err, null);
+          Justin.getPetsAsync().then(function (pets) {
+            should.equal(pets.length, 4);
+
+            Justin.setPetsAsync([]).then(function () {
+
+              Justin.getPetsAsync().then(function (pets) {
+                should.equal(pets.length, 0);
+
+                done();
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+
+      it("clears current associations", function (done) {
+        Pet.find({ name: "Deco" }, function (err, pets) {
+          var Deco = pets[0];
+
+          Person.find({ name: "Jane" }).first(function (err, Jane) {
+            should.equal(err, null);
+
+            Jane.getPetsAsync().then(function (pets) {
+
+              should(Array.isArray(pets));
+              pets.length.should.equal(1);
+              pets[0].name.should.equal("Mutt");
+
+              Jane.setPetsAsync(Deco).then(function () {
+
+                Jane.getPetsAsync().then(function (pets) {
+
+                  should(Array.isArray(pets));
+                  pets.length.should.equal(1);
+                  pets[0].name.should.equal(Deco.name);
+
+                  done();
+                }).catch(function(err) {
+                  done(err);
+                });
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      });
+    });
+
     describe("with autoFetch turned on", function () {
       before(setup({
         autoFetchPets : true
diff --git a/test/integration/association-hasone-reverse.js b/test/integration/association-hasone-reverse.js
index 8c637924..dd0b8362 100644
--- a/test/integration/association-hasone-reverse.js
+++ b/test/integration/association-hasone-reverse.js
@@ -93,6 +93,32 @@ describe("hasOne", function () {
         });
       });
 
+      it("should work (promise-based)", function (done) {
+        Person.find({ name: "John Doe" }).first(function (err, John) {
+          Pet.find({ name: "Deco" }).first(function (err, Deco) {
+            Deco.hasOwnersAsync().then(function (has_owner) {
+              has_owner.should.equal(false);
+
+              Deco.setOwnersAsync(John).then(function () {
+                Deco.getOwnersAsync().then(function (JohnCopy) {
+
+                  should(Array.isArray(JohnCopy));
+                  John.should.eql(JohnCopy[0]);
+
+                  done();
+                }).catch(function(err) {
+                  done(err);
+                });
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      });
+
       describe("Chain", function () {
         before(function (done) {
           var petParams = [
@@ -189,6 +215,47 @@ describe("hasOne", function () {
       });
     });
 
+    it("should be able to set an array of people as the owner (promise-based test)", function (done) {
+      Person.find({ name: ["John Doe", "Jane Doe"] }, function (err, owners) {
+        should.not.exist(err);
+
+        Pet.find({ name: "Fido" }).first(function (err, Fido) {
+          should.not.exist(err);
+
+          Fido.hasOwnersAsync().then(function (has_owner) {
+            has_owner.should.equal(false);
+
+            Fido.setOwnersAsync(owners).then(function () {
+
+              Fido.getOwnersAsync().then(function (ownersCopy) {
+                should(Array.isArray(owners));
+                owners.length.should.equal(2);
+
+                // Don't know which order they'll be in.
+                var idProp = common.protocol() == 'mongodb' ? '_id' : 'id'
+
+                if (owners[0][idProp] == ownersCopy[0][idProp]) {
+                  owners[0].should.eql(ownersCopy[0]);
+                  owners[1].should.eql(ownersCopy[1]);
+                } else {
+                  owners[0].should.eql(ownersCopy[1]);
+                  owners[1].should.eql(ownersCopy[0]);
+                }
+
+                done();
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+    });
+
     // broken in mongo
     if (common.protocol() != "mongodb") {
       describe("findBy()", function () {
@@ -333,4 +400,102 @@ describe("hasOne", function () {
       }, 3, done);
     });
   });
+
+  describe("reverse find (promise-based)", function () {
+    it("should be able to find given an association id", function (done) {
+      common.retry(setup(), function (done) {
+        Person.find({ name: "John Doe" }).first(function (err, John) {
+          should.not.exist(err);
+          should.exist(John);
+          Pet.find({ name: "Deco" }).first(function (err, Deco) {
+            should.not.exist(err);
+            should.exist(Deco);
+            Deco.hasOwnersAsync().then(function (has_owner) {
+              has_owner.should.equal(false);
+
+              Deco.setOwnersAsync(John).then(function () {
+
+                Person.find({ pet_id: Deco[Pet.id[0]] }).first(function (err, owner) {
+                  should.not.exist(err);
+                  should.exist(owner);
+                  should.equal(owner.name, John.name);
+                  done();
+                });
+
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      }, 3, done);
+    });
+
+    it("should be able to find given an association instance", function (done) {
+      common.retry(setup(), function (done) {
+        Person.find({ name: "John Doe" }).first(function (err, John) {
+          should.not.exist(err);
+          should.exist(John);
+          Pet.find({ name: "Deco" }).first(function (err, Deco) {
+            should.not.exist(err);
+            should.exist(Deco);
+            Deco.hasOwnersAsync().then(function (has_owner) {
+              has_owner.should.equal(false);
+
+              Deco.setOwnersAsync(John).then(function () {
+
+                Person.find({ pet: Deco }).first(function (err, owner) {
+                  should.not.exist(err);
+                  should.exist(owner);
+                  should.equal(owner.name, John.name);
+                  done();
+                });
+
+              }).catch(function(err) {
+                done(err);
+              });
+            }).done(function(err) {
+              done(err);
+            });
+          });
+        });
+      }, 3, done);
+    });
+
+    it("should be able to find given a number of association instances with a single primary key", function (done) {
+      common.retry(setup(), function (done) {
+        Person.find({ name: "John Doe" }).first(function (err, John) {
+          should.not.exist(err);
+          should.exist(John);
+          Pet.all(function (err, pets) {
+            should.not.exist(err);
+            should.exist(pets);
+            should.equal(pets.length, 2);
+
+            pets[0].hasOwnersAsync().then(function (has_owner) {
+              has_owner.should.equal(false);
+
+              pets[0].setOwnersAsync(John).then(function () {
+
+                Person.find({ pet: pets }, function (err, owners) {
+                  should.not.exist(err);
+                  should.exist(owners);
+                  owners.length.should.equal(1);
+
+                  should.equal(owners[0].name, John.name);
+                  done();
+                });
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      }, 3, done);
+    });
+  });
 });
diff --git a/test/integration/association-hasone-zeroid.js b/test/integration/association-hasone-zeroid.js
index 6248e5f0..17296866 100644
--- a/test/integration/association-hasone-zeroid.js
+++ b/test/integration/association-hasone-zeroid.js
@@ -126,7 +126,36 @@ describe("hasOne", function() {
       });
     });
 
-    it("should work for zero ownerID ", function (done) {
+    it("should work for non-zero ownerID (promise-based)", function (done) {
+      Pet.find({petName: "Muttley"}, function(err, pets) {
+        should.not.exist(err);
+
+        pets[0].petName.should.equal("Muttley");
+        pets[0].should.have.property("id");
+        pets[0].id.should.equal(10);
+        pets[0].ownerID.should.equal(12);
+
+        pets[0].should.not.have.property("owner");
+
+        // But we should be able to see if its there
+        pets[0].hasOwnerAsync().then(function(result) {
+          should.equal(result, true);
+
+          // ...and then get it
+          pets[0].getOwnerAsync().then(function(result) {
+            result.firstName.should.equal("Stuey");
+
+            done()
+          }).catch(function(err) {
+            done(err);
+          });
+        }).catch(function(err) {
+          done(err);
+        });
+      });
+    });
+
+    it("should work for zero ownerID (promise-based)", function (done) {
       Pet.find({petName: "Snagglepuss"}, function(err, pets) {
         should.not.exist(err);
 
@@ -138,17 +167,20 @@ describe("hasOne", function() {
         pets[0].should.not.have.property("owner");
 
         // But we should be able to see if its there
-        pets[0].hasOwner(function(err, result) {
-          should.not.exist(err);
+        pets[0].hasOwnerAsync().then(function(result) {
           should.equal(result, true);
 
           // ...and then get it
-          pets[0].getOwner(function(err, result) {
+          pets[0].getOwnerAsync().then(function(result) {
             should.not.exist(err);
             result.firstName.should.equal("John");
 
-            return done()
+            done()
+          }).catch(function(err) {
+            done(err);
           });
+        }).catch(function(err) {
+          done(err);
         });
       });
     });
diff --git a/test/integration/association-hasone.js b/test/integration/association-hasone.js
index bc8a5a91..75455bf1 100644
--- a/test/integration/association-hasone.js
+++ b/test/integration/association-hasone.js
@@ -468,4 +468,187 @@ describe("hasOne", function() {
       });
     });
   };
+
+  describe("accessors (promise-based)", function () {
+    before(setup());
+
+    it("get should get the association", function (done) {
+      Leaf.one({ size: 14 }, function (err, leaf) {
+        should.not.exist(err);
+        should.exist(leaf);
+        leaf.getTreeAsync().then(function (tree) {
+          should.not.exist(err);
+          should.exist(tree);
+          done();
+        }).catch(function(err) {
+          done(err);
+        });
+      });
+    });
+
+    it("should return proper instance model", function (done) {
+      Leaf.one({ size: 14 }, function (err, leaf) {
+        leaf.getTreeAsync().then(function (tree) {
+          tree.model().should.equal(Tree);
+          done();
+        }).catch(function(err) {
+          done(err);
+        });
+      });
+    });
+
+    it("get should get the association with a shell model", function (done) {
+      Leaf(leafId).getTreeAsync().then(function (tree) {
+        should.exist(tree);
+        should.equal(tree[Tree.id], treeId);
+        done();
+      }).catch(function(err) {
+        done(err);
+      });
+    });
+
+    it("has should indicate if there is an association present", function (done) {
+      Leaf.one({ size: 14 }, function (err, leaf) {
+        should.not.exist(err);
+        should.exist(leaf);
+
+        leaf.hasTreeAsync().then(function (has) {
+          should.equal(has, true);
+
+          leaf.hasStalkAsync().then(function (has) {
+            should.equal(has, false);
+            done();
+          }).catch(function(err) {
+            done(err);
+          });
+        }).catch(function(err) {
+          done(err);
+        });
+      });
+    });
+
+    it("set should associate another instance", function (done) {
+      Stalk.one({ length: 20 }, function (err, stalk) {
+        should.not.exist(err);
+        should.exist(stalk);
+        Leaf.one({ size: 14 }, function (err, leaf) {
+          should.not.exist(err);
+          should.exist(leaf);
+          should.not.exist(leaf.stalkId);
+          leaf.setStalkAsync(stalk).then(function () {
+            Leaf.one({ size: 14 }, function (err, leaf) {
+              should.not.exist(err);
+              should.equal(leaf.stalkId, stalk[Stalk.id]);
+              done();
+            });
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+    });
+
+    it("remove should unassociation another instance", function (done) {
+      Stalk.one({ length: 20 }, function (err, stalk) {
+        should.not.exist(err);
+        should.exist(stalk);
+        Leaf.one({ size: 14 }, function (err, leaf) {
+          should.not.exist(err);
+          should.exist(leaf);
+          should.exist(leaf.stalkId);
+          leaf.removeStalkAsync(function () {
+            Leaf.one({ size: 14 }, function (err, leaf) {
+              should.not.exist(err);
+              should.equal(leaf.stalkId, null);
+              done();
+            });
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+    });
+  });
+
+  describe("if not passing another Model (promise-based test)", function () {
+    it("should use same model", function (done) {
+      db.settings.set('instance.identityCache', false);
+      db.settings.set('instance.returnAllErrors', true);
+
+      var Person = db.define("person", {
+        name : String
+      });
+      Person.hasOne("parent", {
+        autoFetch : true
+      });
+
+      helper.dropSync(Person, function () {
+        var child = new Person({
+          name : "Child"
+        });
+        child.setParentAsync(new Person({ name: "Parent" })).then(function () {
+          done();
+        }).catch(function(err) {
+          done(err);
+        });
+      });
+    });
+  });
+
+  if (protocol != "mongodb") {
+    describe("mapsTo (promise-based tests)", function () {
+      describe("with `mapsTo` set via `hasOne`", function () {
+        var leaf = null;
+
+        before(setup());
+
+        before(function (done) {
+          Leaf.create({ size: 444, stalkId: stalkId, holeId: holeId }, function (err, lf) {
+            should.not.exist(err);
+            leaf = lf;
+            done();
+          });
+        });
+
+        it("should get parent", function (done) {
+          leaf.getStalkAsync().then(function (stalk) {
+
+            should.exist(stalk);
+            should.equal(stalk.id, stalkId);
+            should.equal(stalk.length, 20);
+            done();
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+
+      describe("with `mapsTo` set via property definition", function () {
+        var leaf = null;
+
+        before(setup());
+
+        before(function (done) {
+          Leaf.create({ size: 444, stalkId: stalkId, holeId: holeId }, function (err, lf) {
+            should.not.exist(err);
+            leaf = lf;
+            done();
+          });
+        });
+
+        it("should get parent", function (done) {
+          leaf.getHoleAsync().then(function (hole) {
+
+            should.exist(hole);
+            should.equal(hole.id, stalkId);
+            should.equal(hole.width, 3);
+            done();
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+    });
+  };
+
 });

From 8d4958241371778dd816880a59ee03b0a902895d Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Fri, 1 Sep 2017 11:04:08 +0300
Subject: [PATCH 1121/1246] Fixed indentation in Extend.js file

---
 lib/Associations/Extend.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index e80b425c..51eae7ac 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -11,18 +11,18 @@ exports.prepare = function (db, Model, associations) {
 
     var assocName = opts.name || ucfirst(name);
     var association = {
-      name             : name,
-      table            : opts.table || (Model.table + '_' + name),
-      reversed         : opts.reversed,
-      autoFetch        : opts.autoFetch || false,
-      autoFetchLimit   : opts.autoFetchLimit || 2,
-      field            : util.wrapFieldObject({
-                           field: opts.field, model: Model, altName: Model.table
-                         }) || util.formatField(Model, Model.table, false, false),
-      getAccessor      : opts.getAccessor || ("get" + assocName),
-      setAccessor      : opts.setAccessor || ("set" + assocName),
-      hasAccessor      : opts.hasAccessor || ("has" + assocName),
-      delAccessor      : opts.delAccessor || ("remove" + assocName)
+      name           : name,
+      table          : opts.table || (Model.table + '_' + name),
+      reversed       : opts.reversed,
+      autoFetch      : opts.autoFetch || false,
+      autoFetchLimit : opts.autoFetchLimit || 2,
+      field          : util.wrapFieldObject({
+                         field: opts.field, model: Model, altName: Model.table
+                       }) || util.formatField(Model, Model.table, false, false),
+      getAccessor    : opts.getAccessor || ("get" + assocName),
+      setAccessor    : opts.setAccessor || ("set" + assocName),
+      hasAccessor    : opts.hasAccessor || ("has" + assocName),
+      delAccessor    : opts.delAccessor || ("remove" + assocName)
     };
 
     var newproperties = _.cloneDeep(properties);

From 60ff735ffe0747a419a1463a61a048718e380878 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Mon, 4 Sep 2017 11:44:24 +0300
Subject: [PATCH 1122/1246] apply Promise.promisify for callbacks
 transformation, replace tests for this.

---
 lib/ORM.js             | 46 +++++-------------------------------------
 test/integration/db.js | 14 ++++---------
 2 files changed, 9 insertions(+), 51 deletions(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index 85a230ee..d7dc5e84 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -153,18 +153,7 @@ exports.use = function (connection, proto, opts, cb) {
  * @param opts
  */
 exports.connectAsync = function (opts) {
-  var options = _.cloneDeep(opts);
-  return new Promise(function (resolve, reject) {
-    var cb = function (resolve, reject) {
-      return function (err, data) {
-        if (err) {
-          return reject(err);
-        }
-        return resolve(data);
-      }
-    };
-    connect(options, cb(resolve, reject));
-  });
+  return Promise.promisify(connect)(opts);
 };
 
 exports.addAdapter = adapters.add;
@@ -279,23 +268,11 @@ ORM.prototype.defineType = function (name, opts) {
 };
 
 ORM.prototype.pingAsync = function () {
-  const self = this;
-  return new Promise(function (resolve, reject) {
-    self.driver.ping(function (err, data) {
-      if (err) return reject(err);
-      return resolve(data);
-    });
-  });
+  return Promise.promisify(this.ping, { context: this })();
 };
 
 ORM.prototype.closeAsync = function () {
-  const self = this;
-  return new Promise(function (resolve, reject) {
-    self.driver.close(function (err, data) {
-      if (err) return reject(err);
-      return resolve(data);
-    });
-  });
+  return Promise.promisify(this.driver.close, { context: this })();
 };
 
 ORM.prototype.ping = function (cb) {
@@ -342,15 +319,7 @@ ORM.prototype.syncPromise = function () {
   var self = this;
   var modelIds = Object.keys(this.models);
   return Promise.each(modelIds, function (id) {
-    return new Promise(function (resolve, reject) {
-      self.models[id].sync(function (err) {
-        if (err) {
-          err.model = id;
-          return reject(err);
-        }
-        return resolve(id);
-      });
-    });
+    return Promise.promisify(self.models[id].sync, { context: self })();
   })
 };
 
@@ -387,12 +356,7 @@ ORM.prototype.dropAsync = function () {
   var self = this;
   var modelIds = Object.keys(this.models);
   return Promise.each(modelIds, function (id) {
-    return new Promise(function (resolve, reject) {
-      self.models[id].drop(function (err, data) {
-        if (err) return reject(err);
-        return resolve(data);
-      });
-    });
+    return Promise.promisify(self.models[id].drop, { context: self })();
   })
 };
 
diff --git a/test/integration/db.js b/test/integration/db.js
index ed5e3e78..14bbb8cf 100644
--- a/test/integration/db.js
+++ b/test/integration/db.js
@@ -19,14 +19,12 @@ describe('DB', function () {
   });
 
   describe('db.syncPromise()', function () {
-    it('should call sync method from model, and return array with model id', function (done) {
+    it('should return array with model id', function (done) {
       db.define("my_model", {
         property: String
       });
-      var syncStub = sinon.stub(db.models['my_model'], 'sync').callsFake(function (cb) { cb(null, {}) });
-      db.dropAsync()
+      db.syncPromise()
         .then(function (data) {
-          syncStub.calledOnce.should.be.true;
           data.should.be.Array;
           should.equal(data[0], 'my_model');
           done();
@@ -34,11 +32,10 @@ describe('DB', function () {
         .catch(function (err) {
           done(err)
         });
-      syncStub.restore();
     });
 
     it('should return an empty array when no model is created', function (done) {
-      db.dropAsync()
+      db.syncPromise()
         .then(function (data) {
           data.should.be.Array;
           should.equal(_.isEmpty(data), true);
@@ -51,14 +48,12 @@ describe('DB', function () {
   });
 
   describe("db.dropAsync()", function () {
-    it('should call the model drop method and return an array with a model id', function (done) {
+    it('should return an array with a model id', function (done) {
       db.define("my_model", {
         property: String
       });
-      var dropStub = sinon.stub(db.models['my_model'], 'drop').callsFake(function (cb) { cb(null, {}) });
       db.dropAsync()
         .then(function (data) {
-          dropStub.calledOnce.should.be.true;
           data.should.be.Array;
           should.equal(data[0], 'my_model');
           done();
@@ -66,7 +61,6 @@ describe('DB', function () {
         .catch(function (err) {
           done(err)
         });
-      dropStub.restore();
     });
 
     it('should return an empty array when no model created', function (done) {

From d03fe82caa647a3435c5ff574d9b6bf5ac5b54ff Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Mon, 4 Sep 2017 13:03:34 +0300
Subject: [PATCH 1123/1246] closeAsync and pingAsync generates directly from
 ORM.prototype

---
 lib/ORM.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index d7dc5e84..bee24dca 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -267,24 +267,22 @@ ORM.prototype.defineType = function (name, opts) {
   return this;
 };
 
-ORM.prototype.pingAsync = function () {
-  return Promise.promisify(this.ping, { context: this })();
-};
-
-ORM.prototype.closeAsync = function () {
-  return Promise.promisify(this.driver.close, { context: this })();
-};
-
 ORM.prototype.ping = function (cb) {
   this.driver.ping(cb);
 
   return this;
 };
+
+ORM.prototype.pingAsync = Promise.promisify(ORM.prototype.ping);
+
 ORM.prototype.close = function (cb) {
   this.driver.close(cb);
 
   return this;
 };
+
+ORM.prototype.closeAsync = Promise.promisify(ORM.prototype.close);
+
 ORM.prototype.load = function () {
   var files = _.flatten(Array.prototype.slice.apply(arguments));
   var self  = this;

From b8a7f9bcdf86f04900846d3e7c1a764f476d1cf8 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Mon, 4 Sep 2017 14:34:26 +0300
Subject: [PATCH 1124/1246] fix after review

---
 lib/ORM.js             | 36 ++++++++++++-----------------
 test/integration/db.js | 52 ++++++++++++++++--------------------------
 2 files changed, 35 insertions(+), 53 deletions(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index bee24dca..5cee3f1c 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -16,6 +16,8 @@ var Settings       = require("./Settings");
 var Singleton      = require("./Singleton");
 var Utilities      = require("./Utilities");
 
+var OPTS_TYPE_STRING = 'string';
+var OPTS_TYPE_OBJ = 'object';
 
 // Deprecated, use enforce
 exports.validators = require("./Validators");
@@ -33,16 +35,21 @@ exports.Property   = require("./Property");
 exports.Settings   = Settings;
 exports.ErrorCodes = ORMError.codes;
 
+var optsChecker = function (opts) {
+  return [OPTS_TYPE_STRING, OPTS_TYPE_OBJ].some(function (element) { return typeof(opts) === element })
+};
+
 var connect = function (opts, cb) {
-  if (arguments.length === 0 || !opts) {
+  if (arguments.length === 0 || !opts || !optsChecker(opts)) {
+    cb = typeof(cb) !== 'function' ? opts : cb;
     return ORM_Error(new ORMError("CONNECTION_URL_EMPTY", 'PARAM_MISMATCH'), cb);
   }
-  if (typeof opts == 'string') {
+  if (typeof opts === 'string') {
     if (opts.trim().length === 0) {
       return ORM_Error(new ORMError("CONNECTION_URL_EMPTY", 'PARAM_MISMATCH'), cb);
     }
     opts = url.parse(opts, true);
-  } else if (typeof opts == 'object') {
+  } else if (typeof opts === 'object') {
     opts = _.cloneDeep(opts);
   }
 
@@ -152,9 +159,7 @@ exports.use = function (connection, proto, opts, cb) {
  *
  * @param opts
  */
-exports.connectAsync = function (opts) {
-  return Promise.promisify(connect)(opts);
-};
+exports.connectAsync = Promise.promisify(connect);
 
 exports.addAdapter = adapters.add;
 
@@ -313,14 +318,6 @@ ORM.prototype.load = function () {
   async.eachSeries(filesWithPath, iterator, cb);
 };
 
-ORM.prototype.syncPromise = function () {
-  var self = this;
-  var modelIds = Object.keys(this.models);
-  return Promise.each(modelIds, function (id) {
-    return Promise.promisify(self.models[id].sync, { context: self })();
-  })
-};
-
 ORM.prototype.sync = function (cb) {
   var modelIds = Object.keys(this.models);
   var syncNext = function () {
@@ -350,13 +347,7 @@ ORM.prototype.sync = function (cb) {
   return this;
 };
 
-ORM.prototype.dropAsync = function () {
-  var self = this;
-  var modelIds = Object.keys(this.models);
-  return Promise.each(modelIds, function (id) {
-    return Promise.promisify(self.models[id].drop, { context: self })();
-  })
-};
+ORM.prototype.syncPromise = Promise.promisify(ORM.prototype.sync);
 
 ORM.prototype.drop = function (cb) {
   var modelIds = Object.keys(this.models);
@@ -386,6 +377,9 @@ ORM.prototype.drop = function (cb) {
 
   return this;
 };
+
+ORM.prototype.dropAsync = Promise.promisify(ORM.prototype.drop);
+
 ORM.prototype.serial = function () {
   var chains = Array.prototype.slice.apply(arguments);
 
diff --git a/test/integration/db.js b/test/integration/db.js
index 14bbb8cf..597907d8 100644
--- a/test/integration/db.js
+++ b/test/integration/db.js
@@ -19,61 +19,49 @@ describe('DB', function () {
   });
 
   describe('db.syncPromise()', function () {
-    it('should return array with model id', function (done) {
+    it('should call sync for each model', function (done) {
       db.define("my_model", {
         property: String
       });
+      db.define("my_model2", {
+        property: String
+      });
+      var syncStub = sinon.stub(db.models['my_model'], 'sync').callsFake(function (cb) { cb(null, {}) });
+      var syncStub2 = sinon.stub(db.models['my_model2'], 'sync').callsFake(function (cb) { cb(null, {}) });
       db.syncPromise()
-        .then(function (data) {
-          data.should.be.Array;
-          should.equal(data[0], 'my_model');
+        .then(function () {
+          should.equal(syncStub.calledOnce, true);
+          should.equal(syncStub2.calledOnce, true);
           done();
         })
         .catch(function (err) {
           done(err)
         });
     });
-
-    it('should return an empty array when no model is created', function (done) {
-      db.syncPromise()
-        .then(function (data) {
-          data.should.be.Array;
-          should.equal(_.isEmpty(data), true);
-          done()
-        })
-        .catch(function (err) {
-          done(err)
-        })
-    });
   });
 
   describe("db.dropAsync()", function () {
-    it('should return an array with a model id', function (done) {
+    it('should should call drop for each model', function (done) {
       db.define("my_model", {
         property: String
       });
+
+      db.define("my_model2", {
+        property: String
+      });
+
+      var dropStub = sinon.stub(db.models['my_model'], 'drop').callsFake(function (cb) { cb(null, {}) });
+      var dropStub2 = sinon.stub(db.models['my_model2'], 'drop').callsFake(function (cb) { cb(null, {}) });
       db.dropAsync()
-        .then(function (data) {
-          data.should.be.Array;
-          should.equal(data[0], 'my_model');
+        .then(function () {
+          should.equal(dropStub.calledOnce, true);
+          should.equal(dropStub2.calledOnce, true);
           done();
         })
         .catch(function (err) {
           done(err)
         });
     });
-
-    it('should return an empty array when no model created', function (done) {
-      db.dropAsync()
-        .then(function (data) {
-          data.should.be.Array;
-          should.equal(_.isEmpty(data), true);
-          done()
-        })
-        .catch(function (err) {
-          done(err)
-        })
-    });
   });
 
   describe("db.use()", function () {

From 9bfd7c8074511e86637fb5a075e4c1224ab2a65b Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Tue, 22 Aug 2017 17:18:26 +0300
Subject: [PATCH 1125/1246] create eagerQueryAsync, execQueryAsync -> return a
 Promise

---
 lib/Drivers/DML/_shared.js  | 47 ++++++++++++++++++++++++++++++++++++-
 lib/Drivers/DML/mysql.js    | 21 +++++++++++++++++
 lib/Drivers/DML/postgres.js | 18 ++++++++++++++
 lib/Drivers/DML/sqlite.js   | 14 +++++++++++
 4 files changed, 99 insertions(+), 1 deletion(-)

diff --git a/lib/Drivers/DML/_shared.js b/lib/Drivers/DML/_shared.js
index 9875597e..1c508e7e 100644
--- a/lib/Drivers/DML/_shared.js
+++ b/lib/Drivers/DML/_shared.js
@@ -1,3 +1,21 @@
+var Promise = require('bluebird');
+
+var build = function (association, opts, keys) {
+  var desiredKey = Object.keys(association.field);
+  var assocKey = Object.keys(association.mergeAssocId);
+
+  var where = {};
+  where[desiredKey] = keys;
+
+  var query = this.query.select()
+    .from(association.model.table)
+    .select(opts.only)
+    .from(association.mergeTable, assocKey, opts.keys)
+    .select(desiredKey).as("$p")
+    .where(association.mergeTable, where)
+    .build();
+  return query;
+};
 
 module.exports = {
   execQuery: function () {
@@ -10,7 +28,18 @@ module.exports = {
     }
     return this.execSimpleQuery(query, cb);
   },
-  eagerQuery: function (association, opts, keys, cb) {
+
+  execQueryAsync: function () {
+    var args = arguments;
+    if (args.length === 1) {
+      var query = args[0];
+    } else if (args.length === 2) {
+      var query = this.query.escape(args[0], args[1]);
+    }
+    return this.execSimpleQueryAsync(query);
+  },
+
+  eagerQueryAsync: function (association, opts, keys) {
     var desiredKey = Object.keys(association.field);
     var assocKey = Object.keys(association.mergeAssocId);
 
@@ -24,7 +53,23 @@ module.exports = {
       .select(desiredKey).as("$p")
       .where(association.mergeTable, where)
       .build();
+    return this.execSimpleQueryAsync(query);
+  },
+
+  eagerQuery: function (association, opts, keys, cb) {
+    var desiredKey = Object.keys(association.field);
+    var assocKey = Object.keys(association.mergeAssocId);
+
+    var where = {};
+    where[desiredKey] = keys;
 
+    var query = this.query.select()
+      .from(association.model.table)
+      .select(opts.only)
+      .from(association.mergeTable, assocKey, opts.keys)
+      .select(desiredKey).as("$p")
+      .where(association.mergeTable, where)
+      .build();
     this.execSimpleQuery(query, cb);
   }
 };
diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index ff4c801b..8719f345 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -3,6 +3,7 @@ var mysql   = require("mysql");
 var Query   = require("sql-query").Query;
 var shared  = require("./_shared");
 var DDL     = require("../DDL/SQL");
+var Promise     = require("bluebird");
 
 exports.Driver = Driver;
 
@@ -92,7 +93,27 @@ Driver.prototype.getQuery = function () {
   return this.query;
 };
 
+Driver.prototype.execSimpleQueryAsync = function (query) {
+  const cb = function (resolve, reject) {
+    return function (err, data) {
+      if (err) reject(err);
+      resolve(data);
+    }
+  };
+  return new Promise(function (resolve, reject) {
+    if (this.opts.debug) {
+      require("../../Debug").sql('mysql', query);
+    }
+    if (this.opts.pool) {
+      this.poolQuery(query, cb(resolve, reject));
+    } else {
+      this.db.query(query, cb(resolve, reject));
+    }
+  });
+};
+
 Driver.prototype.execSimpleQuery = function (query, cb) {
+
   if (this.opts.debug) {
     require("../../Debug").sql('mysql', query);
   }
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 26bd07fc..ad0b26cb 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -3,6 +3,7 @@ var pg      = require("pg");
 var Query   = require("sql-query").Query;
 var shared  = require("./_shared");
 var DDL     = require("../DDL/SQL");
+var Promise = require("bluebird");
 
 exports.Driver = Driver;
 
@@ -16,6 +17,23 @@ var switchableFunctions = {
         cb(err);
       });
     },
+    execSimpleQueryAsync: function (query) {
+      return new Promise(function (resolve, reject) {
+        if (this.opts.debug) {
+          require("../../Debug").sql('postgres', query);
+        }
+        this.db.connect(this.config, function (err, client, done) {
+          if (err) return reject(err);
+
+          client.query(query, function (err, result) {
+            done();
+
+            if (err) reject(err);
+            resolve(result.rows);
+          });
+        });
+      });
+    },
     execSimpleQuery: function (query, cb) {
       if (this.opts.debug) {
         require("../../Debug").sql('postgres', query);
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 67191439..8569fa28 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -4,6 +4,7 @@ var sqlite3 = require("sqlite3");
 var Query   = require("sql-query").Query;
 var shared  = require("./_shared");
 var DDL     = require("../DDL/SQL");
+var Promise     = require("bluebird");
 
 exports.Driver = Driver;
 
@@ -67,6 +68,19 @@ Driver.prototype.getQuery = function () {
   return this.query;
 };
 
+Driver.prototype.execSimpleQueryAsync = function (query) {
+  return new Promise(function (resolve, reject) {
+    if (this.opts.debug) {
+      require("../../Debug").sql('sqlite', query);
+    }
+    this.db.all(query, function (err, data) {
+      if (err) reject(err);
+
+      resolve(data);
+    });
+  });
+};
+
 Driver.prototype.execSimpleQuery = function (query, cb) {
   if (this.opts.debug) {
     require("../../Debug").sql('sqlite', query);

From 9a9d771391244951d9297df46665710b41185bdb Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Wed, 23 Aug 2017 15:55:31 +0300
Subject: [PATCH 1126/1246] remove code , change if statement in execQueryAsync

---
 lib/Drivers/DML/_shared.js | 41 ++++++++++----------------------------
 1 file changed, 10 insertions(+), 31 deletions(-)

diff --git a/lib/Drivers/DML/_shared.js b/lib/Drivers/DML/_shared.js
index 1c508e7e..bf8526a9 100644
--- a/lib/Drivers/DML/_shared.js
+++ b/lib/Drivers/DML/_shared.js
@@ -30,46 +30,25 @@ module.exports = {
   },
 
   execQueryAsync: function () {
-    var args = arguments;
-    if (args.length === 1) {
-      var query = args[0];
-    } else if (args.length === 2) {
-      var query = this.query.escape(args[0], args[1]);
+    var query = null;
+    if (arguments.length === 1) {
+      query = arguments[0];
+    } else if (arguments.length === 2) {
+      query = this.query.escape(arguments[0], arguments[1]);
     }
+
+    if (!query) throw new Error('No query provided.');
+
     return this.execSimpleQueryAsync(query);
   },
 
   eagerQueryAsync: function (association, opts, keys) {
-    var desiredKey = Object.keys(association.field);
-    var assocKey = Object.keys(association.mergeAssocId);
-
-    var where = {};
-    where[desiredKey] = keys;
-
-    var query = this.query.select()
-      .from(association.model.table)
-      .select(opts.only)
-      .from(association.mergeTable, assocKey, opts.keys)
-      .select(desiredKey).as("$p")
-      .where(association.mergeTable, where)
-      .build();
+    var query = build.apply(this, [association, opts, keys]);
     return this.execSimpleQueryAsync(query);
   },
 
   eagerQuery: function (association, opts, keys, cb) {
-    var desiredKey = Object.keys(association.field);
-    var assocKey = Object.keys(association.mergeAssocId);
-
-    var where = {};
-    where[desiredKey] = keys;
-
-    var query = this.query.select()
-      .from(association.model.table)
-      .select(opts.only)
-      .from(association.mergeTable, assocKey, opts.keys)
-      .select(desiredKey).as("$p")
-      .where(association.mergeTable, where)
-      .build();
+    var query = build.apply(this, [association, opts, keys]);
     this.execSimpleQuery(query, cb);
   }
 };

From 2547a14bb9da2a769a7e9e62cfde7b72718fefa5 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Wed, 23 Aug 2017 15:59:09 +0300
Subject: [PATCH 1127/1246] remove Promise variable, align Promise declaration

---
 lib/Drivers/DML/_shared.js | 2 --
 lib/Drivers/DML/sqlite.js  | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/Drivers/DML/_shared.js b/lib/Drivers/DML/_shared.js
index bf8526a9..1dea9bb0 100644
--- a/lib/Drivers/DML/_shared.js
+++ b/lib/Drivers/DML/_shared.js
@@ -1,5 +1,3 @@
-var Promise = require('bluebird');
-
 var build = function (association, opts, keys) {
   var desiredKey = Object.keys(association.field);
   var assocKey = Object.keys(association.mergeAssocId);
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 8569fa28..8de6d6c5 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -4,7 +4,7 @@ var sqlite3 = require("sqlite3");
 var Query   = require("sql-query").Query;
 var shared  = require("./_shared");
 var DDL     = require("../DDL/SQL");
-var Promise     = require("bluebird");
+var Promise = require("bluebird");
 
 exports.Driver = Driver;
 

From 6ced67033690dd0b7fe04d5c3eb3e7f2fd10f9fb Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Mon, 4 Sep 2017 14:57:21 +0300
Subject: [PATCH 1128/1246] transform callbacks use promisify

---
 lib/Drivers/DML/_shared.js  | 58 ++++++++++++++++---------------------
 lib/Drivers/DML/mysql.js    | 19 ------------
 lib/Drivers/DML/postgres.js | 17 -----------
 lib/Drivers/DML/sqlite.js   | 13 ---------
 4 files changed, 25 insertions(+), 82 deletions(-)

diff --git a/lib/Drivers/DML/_shared.js b/lib/Drivers/DML/_shared.js
index 1dea9bb0..3fdb4d3b 100644
--- a/lib/Drivers/DML/_shared.js
+++ b/lib/Drivers/DML/_shared.js
@@ -1,3 +1,5 @@
+var Promise = require('bluebird');
+
 var build = function (association, opts, keys) {
   var desiredKey = Object.keys(association.field);
   var assocKey = Object.keys(association.mergeAssocId);
@@ -15,38 +17,28 @@ var build = function (association, opts, keys) {
   return query;
 };
 
-module.exports = {
-  execQuery: function () {
-    if (arguments.length == 2) {
-      var query = arguments[0];
-      var cb    = arguments[1];
-    } else if (arguments.length == 3) {
-      var query = this.query.escape(arguments[0], arguments[1]);
-      var cb    = arguments[2];
-    }
-    return this.execSimpleQuery(query, cb);
-  },
-
-  execQueryAsync: function () {
-    var query = null;
-    if (arguments.length === 1) {
-      query = arguments[0];
-    } else if (arguments.length === 2) {
-      query = this.query.escape(arguments[0], arguments[1]);
-    }
-
-    if (!query) throw new Error('No query provided.');
-
-    return this.execSimpleQueryAsync(query);
-  },
-
-  eagerQueryAsync: function (association, opts, keys) {
-    var query = build.apply(this, [association, opts, keys]);
-    return this.execSimpleQueryAsync(query);
-  },
-
-  eagerQuery: function (association, opts, keys, cb) {
-    var query = build.apply(this, [association, opts, keys]);
-    this.execSimpleQuery(query, cb);
+var execQuery = function () {
+  if (arguments.length == 2) {
+    var query = arguments[0];
+    var cb    = arguments[1];
+  } else if (arguments.length == 3) {
+    var query = this.query.escape(arguments[0], arguments[1]);
+    var cb    = arguments[2];
   }
+  return this.execSimpleQuery(query, cb);
+};
+
+var eagerQuery = function (association, opts, keys, cb) {
+  var query = build.apply(this, [association, opts, keys]);
+  this.execSimpleQuery(query, cb);
+};
+
+module.exports = {
+  execQuery: execQuery,
+
+  eagerQuery: eagerQuery,
+
+  execQueryAsync: Promise.promisify(execQuery),
+
+  eagerQueryAsync: Promise.promisify(eagerQuery)
 };
diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 8719f345..fbde3671 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -93,25 +93,6 @@ Driver.prototype.getQuery = function () {
   return this.query;
 };
 
-Driver.prototype.execSimpleQueryAsync = function (query) {
-  const cb = function (resolve, reject) {
-    return function (err, data) {
-      if (err) reject(err);
-      resolve(data);
-    }
-  };
-  return new Promise(function (resolve, reject) {
-    if (this.opts.debug) {
-      require("../../Debug").sql('mysql', query);
-    }
-    if (this.opts.pool) {
-      this.poolQuery(query, cb(resolve, reject));
-    } else {
-      this.db.query(query, cb(resolve, reject));
-    }
-  });
-};
-
 Driver.prototype.execSimpleQuery = function (query, cb) {
 
   if (this.opts.debug) {
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index ad0b26cb..5df316ef 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -17,23 +17,6 @@ var switchableFunctions = {
         cb(err);
       });
     },
-    execSimpleQueryAsync: function (query) {
-      return new Promise(function (resolve, reject) {
-        if (this.opts.debug) {
-          require("../../Debug").sql('postgres', query);
-        }
-        this.db.connect(this.config, function (err, client, done) {
-          if (err) return reject(err);
-
-          client.query(query, function (err, result) {
-            done();
-
-            if (err) reject(err);
-            resolve(result.rows);
-          });
-        });
-      });
-    },
     execSimpleQuery: function (query, cb) {
       if (this.opts.debug) {
         require("../../Debug").sql('postgres', query);
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 8de6d6c5..f36220de 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -68,19 +68,6 @@ Driver.prototype.getQuery = function () {
   return this.query;
 };
 
-Driver.prototype.execSimpleQueryAsync = function (query) {
-  return new Promise(function (resolve, reject) {
-    if (this.opts.debug) {
-      require("../../Debug").sql('sqlite', query);
-    }
-    this.db.all(query, function (err, data) {
-      if (err) reject(err);
-
-      resolve(data);
-    });
-  });
-};
-
 Driver.prototype.execSimpleQuery = function (query, cb) {
   if (this.opts.debug) {
     require("../../Debug").sql('sqlite', query);

From ad485a2ed8ddf07eb78f629c3e6779415932bca0 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Mon, 4 Sep 2017 14:58:47 +0300
Subject: [PATCH 1129/1246] remove unnecessary variables

---
 lib/Drivers/DML/mysql.js    | 1 -
 lib/Drivers/DML/postgres.js | 1 -
 test/integration/db.js      | 1 -
 3 files changed, 3 deletions(-)

diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index fbde3671..095b3f40 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -3,7 +3,6 @@ var mysql   = require("mysql");
 var Query   = require("sql-query").Query;
 var shared  = require("./_shared");
 var DDL     = require("../DDL/SQL");
-var Promise     = require("bluebird");
 
 exports.Driver = Driver;
 
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 5df316ef..26bd07fc 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -3,7 +3,6 @@ var pg      = require("pg");
 var Query   = require("sql-query").Query;
 var shared  = require("./_shared");
 var DDL     = require("../DDL/SQL");
-var Promise = require("bluebird");
 
 exports.Driver = Driver;
 
diff --git a/test/integration/db.js b/test/integration/db.js
index 597907d8..a29b5bff 100644
--- a/test/integration/db.js
+++ b/test/integration/db.js
@@ -2,7 +2,6 @@ var should = require('should');
 var helper = require('../support/spec_helper');
 var sinon  = require('sinon');
 var common = require('../common');
-var _      = require('lodash');
 
 describe('DB', function () {
   var db = null;

From 377b1cf0d104f85be41b65b248b9f69c2c48165e Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Mon, 4 Sep 2017 15:44:38 +0300
Subject: [PATCH 1130/1246] Promisify support in save, validate, remove

---
 lib/Instance.js | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/lib/Instance.js b/lib/Instance.js
index 0858f34b..42983a1a 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -15,6 +15,22 @@ function Instance(Model, opts) {
   opts.associations = {};
   opts.originalKeyValues = {};
 
+  var promiseFunctionPostfix = Model.settings.get('promiseFunctionPostfix');
+  var instanceFuncNames = {
+    save: {
+      callback: 'save',
+      promise: 'save' + promiseFunctionPostfix
+    },
+    remove: {
+      callback: 'save',
+      promise: 'save' + promiseFunctionPostfix
+    },
+    validate: {
+      callback: 'save',
+      promise: 'save' + promiseFunctionPostfix
+    }
+  }
+
   var instance_saving = false;
   var events = {};
   var instance = {};
@@ -701,6 +717,22 @@ function Instance(Model, opts) {
     enumerable: false
   });
 
+  Object.defineProperty(instance, instanceFuncNames.save.promise, {
+    value: Promise.promisify(instanceFuncNames.save.callback),
+    enumerable: false,
+    writable: true
+  });
+  Object.defineProperty(instance, instanceFuncNames.remove.promise, {
+    value: Promise.promisify(instanceFuncNames.remove.callback),
+    enumerable: false,
+    writable: true
+  });
+  Object.defineProperty(instance, instanceFuncNames.validate.promise, {
+    value: Promise.promisify(instanceFuncNames.validate.callback),
+    enumerable: false,
+    writable: true
+  });
+
   for (i = 0; i < opts.keyProperties.length; i++) {
     var prop = opts.keyProperties[i];
 

From f050b08c4966e48766819918adcdb8c045e1f681 Mon Sep 17 00:00:00 2001
From: Yevheniy Miropolets <yevheniy.miropolets@gmail.com>
Date: Mon, 4 Sep 2017 16:04:57 +0300
Subject: [PATCH 1131/1246] Add Promise support for get aggregation. Add tests
 for getAsync.

---
 lib/AggregateFunctions.js           |   3 +
 test/config.example.js              |   4 +-
 test/integration/model-aggregate.js | 208 ++++++++++++++++++++++++++++
 3 files changed, 213 insertions(+), 2 deletions(-)

diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index 6a54d880..664945c2 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -1,5 +1,6 @@
 var ORMError   = require("./Error");
 var Utilities  = require("./Utilities");
+var Promise = require('bluebird');
 
 module.exports = AggregateFunctions;
 
@@ -155,6 +156,8 @@ function AggregateFunctions(opts) {
     }
   };
 
+  proto.getAsync = Promise.promisify(proto.get);
+
   for (var i = 0; i < opts.driver.aggregate_functions.length; i++) {
     addAggregate(proto, opts.driver.aggregate_functions[i], appendFunction);
   }
diff --git a/test/config.example.js b/test/config.example.js
index bb9c2d73..0d9c232b 100644
--- a/test/config.example.js
+++ b/test/config.example.js
@@ -13,8 +13,8 @@ exports.mysql = {
   database : "test"
 };
 exports.postgres = {
-  user     : "root",
-  password : "",
+  user     : "postgres",
+  password : "1111",
   database : "test"
 };
 exports.redshift = {
diff --git a/test/integration/model-aggregate.js b/test/integration/model-aggregate.js
index 2f45d912..5a10fc61 100644
--- a/test/integration/model-aggregate.js
+++ b/test/integration/model-aggregate.js
@@ -95,6 +95,49 @@ describe("Model.aggregate()", function() {
     });
   });
 
+  describe("with call() (using getAsync)", function () {
+    before(setup());
+
+    it("should accept a function", function (done) {
+      Person.aggregate().call('COUNT').getAsync()
+        .then(function (count) {
+          count.should.equal(3);
+          return done();
+        })
+        .catch(function(err) {
+          done(err);
+        })
+    });
+
+    it("should accept arguments to the function as an Array", function (done) {
+      Person.aggregate().call('COUNT', [ 'id' ]).getAsync()
+        .then(function (count) {
+          count.should.equal(3);
+          return done();
+        })
+        .catch(function(err) {
+          done(err);
+        });
+    });
+
+    describe("if function is DISTINCT", function () {
+      it("should work as calling .distinct() directly", function (done) {
+        Person.aggregate().call('DISTINCT', [ 'name' ]).as('name').order('name').getAsync()
+          .then(function (rows) {
+            should(Array.isArray(rows));
+            rows.length.should.equal(2);
+
+            rows[0].should.equal('Jane Doe');
+            rows[1].should.equal('John Doe');
+
+            return done();
+          }).catch(function(err) {
+            done(err);
+          });
+      });
+    });
+  });
+
   describe("with as() without previous aggregates", function () {
     before(setup());
 
@@ -149,6 +192,46 @@ describe("Model.aggregate()", function() {
     });
   });
 
+  describe("with select() with arguments (using getAsync)", function () {
+    before(setup());
+
+    it("should use them as properties if 1st argument is Array", function (done) {
+      Person.aggregate().select([ 'id' ]).count('id').groupBy('id').getAsync()
+        .then(function (people) {
+
+          should(Array.isArray(people));
+          people.length.should.be.above(0);
+
+          people[0].should.be.a.Object();
+          people[0].should.have.property("id");
+          people[0].should.not.have.property("name");
+
+          return done();
+        })
+        .catch(function(err) {
+          done(err);
+        });
+    });
+
+    it("should use them as properties", function (done) {
+      Person.aggregate().select('id').count().groupBy('id').getAsync()
+        .then(function (people) {
+
+          should(Array.isArray(people));
+          people.length.should.be.above(0);
+
+          people[0].should.be.a.Object();
+          people[0].should.have.property("id");
+          people[0].should.not.have.property("name");
+
+          return done();
+        })
+        .catch(function(err) {
+          done(err);
+        });
+    });
+  });
+
   describe("with get() without callback", function () {
     before(setup());
 
@@ -171,6 +254,17 @@ describe("Model.aggregate()", function() {
     });
   });
 
+  describe("with getAsync() without aggregates", function () {
+    before(setup());
+
+    it("should reject", function (done) {
+        Person.aggregate().getAsync().catch(function(err) {
+           should.ok(err);
+           done();
+        });
+    });
+  });
+
   describe("with distinct()", function () {
     before(setup());
 
@@ -214,6 +308,56 @@ describe("Model.aggregate()", function() {
     });
   });
 
+  describe("with distinct() (using getAsync)", function () {
+    before(setup());
+
+    it("should return a list of distinct properties", function (done) {
+      Person.aggregate().distinct('name').getAsync()
+        .then(function (names) {
+
+          names.should.be.a.Object();
+          names.should.have.property("length", 2);
+
+          return done();
+        })
+        .catch(function(err) {
+          done(err);
+        });
+    });
+
+    describe("with limit(1)", function () {
+      it("should return only one value", function (done) {
+        Person.aggregate().distinct('name').limit(1).order("name").getAsync()
+          .then(function (names) {
+            names.should.be.a.Object();
+            names.should.have.property("length", 1);
+            names[0].should.equal("Jane Doe");
+
+            return done();
+          })
+          .catch(function(err) {
+            done(err);
+          })
+      });
+    });
+
+    describe("with limit(1, 1)", function () {
+      it("should return only one value", function (done) {
+        Person.aggregate().distinct('name').limit(1, 1).order("name").getAsync()
+          .then(function (names) {
+            names.should.be.a.Object();
+            names.should.have.property("length", 1);
+            names[0].should.equal("John Doe");
+
+            return done();
+          })
+          .catch(function(err) {
+            done(err);
+          })
+      });
+    });
+  });
+
   describe("with groupBy()", function () {
     before(setup());
 
@@ -249,6 +393,47 @@ describe("Model.aggregate()", function() {
     });
   });
 
+  describe("with groupBy() (using getAsync)", function () {
+    before(setup());
+
+    it("should return items grouped by property", function (done) {
+      Person.aggregate().count().groupBy('name').getAsync()
+        .then(function (rows) {
+
+          rows.should.be.a.Object();
+          rows.should.have.property("length", 2);
+
+          (rows[0].count + rows[1].count).should.equal(3); // 1 + 2
+
+          return done();
+        })
+        .catch(function(err) {
+          done(err);
+        });
+    });
+
+    describe("with order()", function () {
+      before(setup());
+
+      it("should order items", function (done) {
+        Person.aggregate().count().groupBy('name').order('-count').getAsync()
+          .then(function (rows) {
+
+            rows.should.be.a.Object();
+            rows.should.have.property("length", 2);
+
+            rows[0].count.should.equal(2);
+            rows[1].count.should.equal(1);
+
+            return done();
+          })
+          .catch(function(err) {
+            done(err);
+          })
+      });
+    });
+  });
+
   describe("using as()", function () {
     before(setup());
 
@@ -274,4 +459,27 @@ describe("Model.aggregate()", function() {
       return done();
     });
   });
+
+  describe("using as() (with getAsync)", function () {
+    before(setup());
+
+    it("should use as an alias", function (done) {
+      Person.aggregate().count().as('total').groupBy('name').getAsync()
+        .then(function (people) {
+
+          should(Array.isArray(people));
+          people.length.should.be.above(0);
+
+          people[0].should.be.a.Object();
+          people[0].should.have.property("total");
+
+          return done();
+        })
+        .catch(function (err) {
+          done(err);
+        })
+    });
+
+  });
+
 });

From d1237feb42a1a3c2e29b28ce7d754298f70895de Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Mon, 4 Sep 2017 16:06:39 +0300
Subject: [PATCH 1132/1246] add tests

---
 lib/Drivers/DML/_shared.js |  28 ++++-----
 test/integration/db.js     | 119 +++++++++++++++++++++++++++++++++++--
 2 files changed, 127 insertions(+), 20 deletions(-)

diff --git a/lib/Drivers/DML/_shared.js b/lib/Drivers/DML/_shared.js
index 3fdb4d3b..e12a0055 100644
--- a/lib/Drivers/DML/_shared.js
+++ b/lib/Drivers/DML/_shared.js
@@ -1,6 +1,17 @@
 var Promise = require('bluebird');
 
-var build = function (association, opts, keys) {
+var execQuery = function () {
+  if (arguments.length == 2) {
+    var query = arguments[0];
+    var cb    = arguments[1];
+  } else if (arguments.length == 3) {
+    var query = this.query.escape(arguments[0], arguments[1]);
+    var cb    = arguments[2];
+  }
+  return this.execSimpleQuery(query, cb);
+};
+
+var eagerQuery = function (association, opts, keys, cb) {
   var desiredKey = Object.keys(association.field);
   var assocKey = Object.keys(association.mergeAssocId);
 
@@ -14,22 +25,7 @@ var build = function (association, opts, keys) {
     .select(desiredKey).as("$p")
     .where(association.mergeTable, where)
     .build();
-  return query;
-};
 
-var execQuery = function () {
-  if (arguments.length == 2) {
-    var query = arguments[0];
-    var cb    = arguments[1];
-  } else if (arguments.length == 3) {
-    var query = this.query.escape(arguments[0], arguments[1]);
-    var cb    = arguments[2];
-  }
-  return this.execSimpleQuery(query, cb);
-};
-
-var eagerQuery = function (association, opts, keys, cb) {
-  var query = build.apply(this, [association, opts, keys]);
   this.execSimpleQuery(query, cb);
 };
 
diff --git a/test/integration/db.js b/test/integration/db.js
index a29b5bff..3b5284cd 100644
--- a/test/integration/db.js
+++ b/test/integration/db.js
@@ -25,8 +25,12 @@ describe('DB', function () {
       db.define("my_model2", {
         property: String
       });
-      var syncStub = sinon.stub(db.models['my_model'], 'sync').callsFake(function (cb) { cb(null, {}) });
-      var syncStub2 = sinon.stub(db.models['my_model2'], 'sync').callsFake(function (cb) { cb(null, {}) });
+      var syncStub = sinon.stub(db.models['my_model'], 'sync').callsFake(function (cb) {
+        cb(null, {})
+      });
+      var syncStub2 = sinon.stub(db.models['my_model2'], 'sync').callsFake(function (cb) {
+        cb(null, {})
+      });
       db.syncPromise()
         .then(function () {
           should.equal(syncStub.calledOnce, true);
@@ -49,8 +53,12 @@ describe('DB', function () {
         property: String
       });
 
-      var dropStub = sinon.stub(db.models['my_model'], 'drop').callsFake(function (cb) { cb(null, {}) });
-      var dropStub2 = sinon.stub(db.models['my_model2'], 'drop').callsFake(function (cb) { cb(null, {}) });
+      var dropStub = sinon.stub(db.models['my_model'], 'drop').callsFake(function (cb) {
+        cb(null, {})
+      });
+      var dropStub2 = sinon.stub(db.models['my_model2'], 'drop').callsFake(function (cb) {
+        cb(null, {})
+      });
       db.dropAsync()
         .then(function () {
           should.equal(dropStub.calledOnce, true);
@@ -246,6 +254,109 @@ describe('DB', function () {
         should.exist(db.driver.query);
       });
 
+      describe('#execQueryAsync', function () {
+        it('should execute sql queries', function (done) {
+          db.driver.execQueryAsync('SELECT id FROM log')
+            .then(function (data) {
+              should(JSON.stringify(data) == JSON.stringify([{ id: 1 }, { id: 2 }, { id: 3 }]));
+              done()
+            })
+            .catch(function (err) {
+              done(err);
+            });
+        });
+
+        it("should escape sql queries", function (done) {
+          var query = "SELECT log.?? FROM log WHERE log.?? LIKE ? AND log.?? > ?";
+          var args = ['what', 'who', 'jane', 'when', new Date('2013/04/07 12:40:00')];
+          db.driver.execQueryAsync(query, args)
+            .then(function (data) {
+              should(JSON.stringify(data) == JSON.stringify([{ "what": "user login" }]));
+              done();
+            })
+            .catch(function (err) {
+              done(err);
+            });
+        });
+      });
+
+      describe('#eagerQuery', function () {
+        var fixture = {
+          association: {
+            model: {
+              table: 'dog'
+            },
+            field: {
+              dog_id: {
+                type: 'serial',
+                key: true,
+                required: false,
+                klass: 'primary',
+                enumerable: true,
+                mapsTo: 'dog_id',
+                name: 'dog_id'
+              }
+            },
+            mergeAssocId: {
+              family_id: {
+                type: 'integer',
+                required: true,
+                klass: 'primary',
+                enumerable: true,
+                mapsTo: 'family_id',
+                name: 'family_id'
+              }
+            },
+            mergeTable: 'dog_family',
+          },
+          opts: {
+            only: ['name', 'id'],
+            keys: ['id'],
+          },
+          expectedQuery: 'SELECT "t1"."name", "t1"."id", "t2"."dog_id" AS "$p" FROM "dog" "t1" JOIN "dog_family" "t2" ON "t2"."family_id" = "t1"."id" WHERE "t2"."dog_id" IN (1, 5)'
+        };
+
+        describe('cb', function () {
+          it('should build correct query', function (done) {
+            var execSimpleQueryStub = sinon.stub(db.driver, 'execSimpleQuery')
+              .callsFake(function (q, cb) {
+                cb();
+              });
+
+            db.driver.eagerQuery(fixture.association, fixture.opts, [ 1, 5 ], function (err, data) {
+              if (err) {
+                execSimpleQueryStub.restore();
+                done(err);
+              }
+              should.equal(execSimpleQueryStub.calledOnce, true);
+              should.equal(execSimpleQueryStub.calledWith(fixture.expectedQuery), true);
+              execSimpleQueryStub.restore();
+              done();
+            });
+          });
+        });
+
+        describe('async', function () {
+          it('should build correct query', function (done) {
+            var execSimpleQueryStub = sinon.stub(db.driver, 'execSimpleQuery')
+              .callsFake(function (q, cb) {
+                cb();
+              });
+            db.driver.eagerQueryAsync(fixture.association, fixture.opts, [ 1, 5 ])
+              .then(function () {
+                should.equal(execSimpleQueryStub.calledOnce, true);
+                should.equal(execSimpleQueryStub.calledWith(fixture.expectedQuery), true);
+                execSimpleQueryStub.restore();
+                done();
+              })
+              .catch(function (err) {
+                execSimpleQueryStub.restore();
+                done(err);
+              });
+          });
+        });
+      });
+
       describe("#execQuery", function () {
         it("should execute sql queries", function (done) {
           db.driver.execQuery("SELECT id FROM log", function (err, data) {

From 3511ad702e760c25065fe15701affd44f91cfeb8 Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Mon, 4 Sep 2017 17:08:41 +0300
Subject: [PATCH 1133/1246] Optimized function names. Tests created

---
 lib/Instance.js              |  82 ++++++++++-----
 test/integration/instance.js | 188 ++++++++++++++++++++++++++++++++++-
 2 files changed, 245 insertions(+), 25 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index 42983a1a..a1046fb0 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -2,6 +2,7 @@ var Utilities = require("./Utilities");
 var Property  = require("./Property");
 var Hook      = require("./Hook");
 var enforce   = require("enforce");
+var Promise   = require("bluebird");
 
 exports.Instance = Instance;
 
@@ -18,18 +19,51 @@ function Instance(Model, opts) {
   var promiseFunctionPostfix = Model.settings.get('promiseFunctionPostfix');
   var instanceFuncNames = {
     save: {
-      callback: 'save',
-      promise: 'save' + promiseFunctionPostfix
+      callback : 'save',
+      promise  : 'save' + promiseFunctionPostfix
     },
     remove: {
-      callback: 'save',
-      promise: 'save' + promiseFunctionPostfix
+      callback : 'remove',
+      promise  : 'remove' + promiseFunctionPostfix
     },
     validate: {
-      callback: 'save',
-      promise: 'save' + promiseFunctionPostfix
+      callback : 'validate',
+      promise  : 'validate' + promiseFunctionPostfix
+    },
+    on: {
+      callback: 'on'
+    },
+    saved: {
+      callback: 'saved'
+    },
+    set: {
+      callback: 'set'
+    },
+    markAsDirty: {
+      callback: 'markAsDirty'
+    },
+    dirtyProperties: {
+      callback: 'dirtyProperties'
+    },
+    isInstance: {
+      callback: 'isInstance'
+    },
+    isPersisted: {
+      callback: 'isPersisted'
+    },
+    isShell: {
+      callback: 'isShell'
+    },
+    __singleton_uid: {
+      callback: '__singleton_uid'
+    },
+    __opts: {
+      callback: '__opts'
+    },
+    model: {
+      callback: 'model'
     }
-  }
+  };
 
   var instance_saving = false;
   var events = {};
@@ -580,7 +614,7 @@ function Instance(Model, opts) {
     addInstanceExtraProperty(k);
   }
 
-  Object.defineProperty(instance, "on", {
+  Object.defineProperty(instance, instanceFuncNames.on.callback, {
     value: function (event, cb) {
       if (!events.hasOwnProperty(event)) {
         events[event] = [];
@@ -592,7 +626,7 @@ function Instance(Model, opts) {
     enumerable: false,
     writable: true
   });
-  Object.defineProperty(instance, "save", {
+  Object.defineProperty(instance, instanceFuncNames.save.callback, {
     value: function () {
       var arg = null, objCount = 0;
       var data = {}, saveOptions = {}, cb = null;
@@ -640,14 +674,14 @@ function Instance(Model, opts) {
     enumerable: false,
     writable: true
   });
-  Object.defineProperty(instance, "saved", {
+  Object.defineProperty(instance, instanceFuncNames.saved.callback, {
     value: function () {
       return opts.changes.length === 0;
     },
     enumerable: false,
     writable: true
   });
-  Object.defineProperty(instance, "remove", {
+  Object.defineProperty(instance, instanceFuncNames.remove.callback, {
     value: function (cb) {
       removeInstance(cb);
 
@@ -656,12 +690,12 @@ function Instance(Model, opts) {
     enumerable: false,
     writable: true
   });
-  Object.defineProperty(instance, "set", {
+  Object.defineProperty(instance, instanceFuncNames.set.callback, {
     value: setPropertyByPath,
     enumerable: false,
     writable: true
   });
-  Object.defineProperty(instance, "markAsDirty", {
+  Object.defineProperty(instance, instanceFuncNames.markAsDirty.callback, {
     value: function (propName) {
       if (propName != undefined) {
         opts.changes.push(propName);
@@ -670,28 +704,28 @@ function Instance(Model, opts) {
     enumerable: false,
     writable: true
   });
-  Object.defineProperty(instance, "dirtyProperties", {
+  Object.defineProperty(instance, instanceFuncNames.dirtyProperties.callback, {
     get: function () { return opts.changes; },
     enumerable: false
   });
-  Object.defineProperty(instance, "isInstance", {
+  Object.defineProperty(instance, instanceFuncNames.isInstance.callback, {
     value: true,
     enumerable: false
   });
-  Object.defineProperty(instance, "isPersisted", {
+  Object.defineProperty(instance, instanceFuncNames.isPersisted.callback, {
     value: function () {
       return !opts.is_new;
     },
     enumerable: false,
     writable: true
   });
-  Object.defineProperty(instance, "isShell", {
+  Object.defineProperty(instance, instanceFuncNames.isShell.callback, {
     value: function () {
       return opts.isShell;
     },
     enumerable: false
   });
-  Object.defineProperty(instance, "validate", {
+  Object.defineProperty(instance, instanceFuncNames.validate.callback, {
     value: function (cb) {
       handleValidations(function (errors) {
         cb(null, errors || false);
@@ -700,17 +734,17 @@ function Instance(Model, opts) {
     enumerable: false,
     writable: true
   });
-  Object.defineProperty(instance, "__singleton_uid", {
+  Object.defineProperty(instance, instanceFuncNames.__singleton_uid.callback, {
     value: function (cb) {
       return opts.uid;
     },
     enumerable: false
   });
-  Object.defineProperty(instance, "__opts", {
+  Object.defineProperty(instance, instanceFuncNames.__opts.callback, {
     value: opts,
     enumerable: false
   });
-  Object.defineProperty(instance, "model", {
+  Object.defineProperty(instance, instanceFuncNames.model.callback, {
     value: function (cb) {
       return Model;
     },
@@ -718,17 +752,17 @@ function Instance(Model, opts) {
   });
 
   Object.defineProperty(instance, instanceFuncNames.save.promise, {
-    value: Promise.promisify(instanceFuncNames.save.callback),
+    value: Promise.promisify(instance[instanceFuncNames.save.callback]),
     enumerable: false,
     writable: true
   });
   Object.defineProperty(instance, instanceFuncNames.remove.promise, {
-    value: Promise.promisify(instanceFuncNames.remove.callback),
+    value: Promise.promisify(instance[instanceFuncNames.remove.callback]),
     enumerable: false,
     writable: true
   });
   Object.defineProperty(instance, instanceFuncNames.validate.promise, {
-    value: Promise.promisify(instanceFuncNames.validate.callback),
+    value: Promise.promisify(instance[instanceFuncNames.validate.callback]),
     enumerable: false,
     writable: true
   });
diff --git a/test/integration/instance.js b/test/integration/instance.js
index ae9cacf1..4450c045 100644
--- a/test/integration/instance.js
+++ b/test/integration/instance.js
@@ -96,6 +96,16 @@ describe("Model instance", function() {
         });
       });
     });
+
+    it("should have a saving state to avoid loops (promise-based)", function (done) {
+      main_item.find({ name : "new name" }).first(function (err, mainItem) {
+        mainItem.saveAsync({ name : "new name test" }).then(function () {
+          done();
+        }).catch(function(err) {
+          done(err);
+        });
+      });
+    });
   });
 
   describe("#isInstance", function () {
@@ -336,16 +346,62 @@ describe("Model instance", function() {
         return done();
       });
     });
+
+    it("should return validation errors if invalid (promise-based)", function (done) {
+      var person = new Person({ age: -1 });
+
+      person.validateAsync().then(function (validationErrors) {
+        should.equal(Array.isArray(validationErrors), true);
+
+        done();
+      }).catch(function(err) {
+        done(err);
+      });
+    });
+
+    it("should return false if valid (promise-based)", function (done) {
+      var person = new Person({ name: 'Janette' });
+
+      person.validateAsync().then(function (validationErrors) {
+        should.equal(validationErrors, false);
+
+        done();
+      }).catch(function(err) {
+        done(err);
+      });
+    });
   });
 
   describe("properties", function () {
     describe("Number", function () {
       it("should be saved for valid numbers, using both save & create", function (done) {
-        var person1 = new Person({ height: 190 });
+        var person1 = new Person({height: 190});
 
         person1.save(function (err) {
           should.not.exist(err);
 
+          Person.create({height: 170}, function (err, person2) {
+            should.not.exist(err);
+
+            Person.get(person1[Person.id], function (err, item) {
+              should.not.exist(err);
+              should.equal(item.height, 190);
+
+              Person.get(person2[Person.id], function (err, item) {
+                should.not.exist(err);
+                should.equal(item.height, 170);
+                done();
+              });
+            });
+          });
+        });
+      });
+
+      it("should be saved for valid numbers, using both save & create (promise-based)", function (done) {
+        var person1 = new Person({ height: 190 });
+
+        person1.saveAsync().then(function () {
+
           Person.create({ height: 170 }, function (err, person2) {
             should.not.exist(err);
 
@@ -356,10 +412,13 @@ describe("Model instance", function() {
               Person.get(person2[Person.id], function (err, item) {
                 should.not.exist(err);
                 should.equal(item.height, 170);
+
                 done();
               });
             });
           });
+        }).catch(function(err) {
+          done(err);
         });
       });
 
@@ -415,6 +474,55 @@ describe("Model instance", function() {
             });
           });
         });
+
+        it("should raise an error for NaN integers (promise-based)", function (done) {
+          var person = new Person({ height: NaN });
+
+          person.saveAsync().catch(function(err) {
+            var msg = {
+              postgres : 'invalid input syntax for integer: "NaN"'
+            }[protocol];
+
+            should.equal(err.message, msg);
+
+            done();
+          });
+        });
+
+        it("should raise an error for Infinity integers (promise-based)", function (done) {
+          var person = new Person({ height: Infinity });
+
+          person.saveAsync().catch(function (err) {
+            should.exist(err);
+            var msg = {
+              postgres : 'invalid input syntax for integer: "Infinity"'
+            }[protocol];
+
+            should.equal(err.message, msg);
+
+            done();
+          });
+        });
+
+        it("should raise an error for nonsensical integers, for both save & create (promise-based)", function (done) {
+          var person = new Person({ height: 'bugz' });
+
+          person.saveAsync().catch(function (err) {
+            should.exist(err);
+            var msg = {
+              postgres : 'invalid input syntax for integer: "bugz"'
+            }[protocol];
+
+            should.equal(err.message, msg);
+
+            Person.create({ height: 'bugz' }, function (err, instance) {
+              should.exist(err);
+              should.equal(err.message, msg);
+
+              done();
+            });
+          });
+        });
       }
 
       if (protocol != 'mysql') {
@@ -442,6 +550,31 @@ describe("Model instance", function() {
             });
           });
         });
+
+        it("should store NaN & Infinite floats (promise-based)", function (done) {
+          var person = new Person({ weight: NaN });
+
+          person.saveAsync().then(function () {
+
+            Person.get(person[Person.id], function (err, person) {
+              should.not.exist(err);
+              should(isNaN(person.weight));
+
+              person.saveAsync({ weight: Infinity, name: 'black hole' }).then(function () {
+                Person.get(person[Person.id], function (err, person) {
+                  should.not.exist(err);
+                  should.strictEqual(person.weight, Infinity);
+
+                  done();
+                });
+              }).catch(function(err) {
+                done(err);
+              });
+            });
+          }).catch(function(err) {
+            done(err);
+          });
+        });
       }
     });
 
@@ -460,5 +593,58 @@ describe("Model instance", function() {
         });
       });
     });
+
+    describe("#removeAsync", function () {
+      var main_item, item;
+
+      before(function (done) {
+        main_item = db.define("main_item", {
+          name      : String
+        }, {
+          auteFetch : true
+        });
+        item = db.define("item", {
+          name      : String
+        }, {
+          identityCache  : false
+        });
+        item.hasOne("main_item", main_item, {
+          reverse   : "items",
+          autoFetch : true
+        });
+
+        return helper.dropSync([ main_item, item ], function () {
+          main_item.create({
+            name : "Main Item"
+          }, function (err, mainItem) {
+            item.create({
+              name : "Item"
+            }, function (err, Item) {
+              mainItem.setItems(Item, function (err) {
+                should.not.exist(err);
+
+                return done();
+              });
+            });
+          });
+        });
+      });
+
+      it("should delete an item and send an error", function (done) {
+        main_item.find({ name : "Main Item" }).first(function (err, mainItem) {
+          mainItem.removeAsync().then(function () {
+            main_item.find({ name : "Main Item" }).first(function (err, itemFound) {
+              if (err && !itemFound) {
+                done();
+              }
+
+              done(err);
+            });
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+    });
   });
 });

From 03c47ce7a70f946fb8d44670207b1a25fdf968b4 Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Mon, 4 Sep 2017 17:25:34 +0300
Subject: [PATCH 1134/1246] Resolved PR comments

---
 lib/Instance.js | 89 ++++++++++++-------------------------------------
 1 file changed, 21 insertions(+), 68 deletions(-)

diff --git a/lib/Instance.js b/lib/Instance.js
index a1046fb0..376cbc61 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -17,54 +17,6 @@ function Instance(Model, opts) {
   opts.originalKeyValues = {};
 
   var promiseFunctionPostfix = Model.settings.get('promiseFunctionPostfix');
-  var instanceFuncNames = {
-    save: {
-      callback : 'save',
-      promise  : 'save' + promiseFunctionPostfix
-    },
-    remove: {
-      callback : 'remove',
-      promise  : 'remove' + promiseFunctionPostfix
-    },
-    validate: {
-      callback : 'validate',
-      promise  : 'validate' + promiseFunctionPostfix
-    },
-    on: {
-      callback: 'on'
-    },
-    saved: {
-      callback: 'saved'
-    },
-    set: {
-      callback: 'set'
-    },
-    markAsDirty: {
-      callback: 'markAsDirty'
-    },
-    dirtyProperties: {
-      callback: 'dirtyProperties'
-    },
-    isInstance: {
-      callback: 'isInstance'
-    },
-    isPersisted: {
-      callback: 'isPersisted'
-    },
-    isShell: {
-      callback: 'isShell'
-    },
-    __singleton_uid: {
-      callback: '__singleton_uid'
-    },
-    __opts: {
-      callback: '__opts'
-    },
-    model: {
-      callback: 'model'
-    }
-  };
-
   var instance_saving = false;
   var events = {};
   var instance = {};
@@ -614,7 +566,7 @@ function Instance(Model, opts) {
     addInstanceExtraProperty(k);
   }
 
-  Object.defineProperty(instance, instanceFuncNames.on.callback, {
+  Object.defineProperty(instance, "on", {
     value: function (event, cb) {
       if (!events.hasOwnProperty(event)) {
         events[event] = [];
@@ -626,7 +578,7 @@ function Instance(Model, opts) {
     enumerable: false,
     writable: true
   });
-  Object.defineProperty(instance, instanceFuncNames.save.callback, {
+  Object.defineProperty(instance, "save", {
     value: function () {
       var arg = null, objCount = 0;
       var data = {}, saveOptions = {}, cb = null;
@@ -674,14 +626,14 @@ function Instance(Model, opts) {
     enumerable: false,
     writable: true
   });
-  Object.defineProperty(instance, instanceFuncNames.saved.callback, {
+  Object.defineProperty(instance, "saved", {
     value: function () {
       return opts.changes.length === 0;
     },
     enumerable: false,
     writable: true
   });
-  Object.defineProperty(instance, instanceFuncNames.remove.callback, {
+  Object.defineProperty(instance, "remove", {
     value: function (cb) {
       removeInstance(cb);
 
@@ -690,12 +642,12 @@ function Instance(Model, opts) {
     enumerable: false,
     writable: true
   });
-  Object.defineProperty(instance, instanceFuncNames.set.callback, {
+  Object.defineProperty(instance, "set", {
     value: setPropertyByPath,
     enumerable: false,
     writable: true
   });
-  Object.defineProperty(instance, instanceFuncNames.markAsDirty.callback, {
+  Object.defineProperty(instance, "markAsDirty", {
     value: function (propName) {
       if (propName != undefined) {
         opts.changes.push(propName);
@@ -704,28 +656,28 @@ function Instance(Model, opts) {
     enumerable: false,
     writable: true
   });
-  Object.defineProperty(instance, instanceFuncNames.dirtyProperties.callback, {
+  Object.defineProperty(instance, "dirtyProperties", {
     get: function () { return opts.changes; },
     enumerable: false
   });
-  Object.defineProperty(instance, instanceFuncNames.isInstance.callback, {
+  Object.defineProperty(instance, "isInstance", {
     value: true,
     enumerable: false
   });
-  Object.defineProperty(instance, instanceFuncNames.isPersisted.callback, {
+  Object.defineProperty(instance, "isPersisted", {
     value: function () {
       return !opts.is_new;
     },
     enumerable: false,
     writable: true
   });
-  Object.defineProperty(instance, instanceFuncNames.isShell.callback, {
+  Object.defineProperty(instance, "isShell", {
     value: function () {
       return opts.isShell;
     },
     enumerable: false
   });
-  Object.defineProperty(instance, instanceFuncNames.validate.callback, {
+  Object.defineProperty(instance, "validate", {
     value: function (cb) {
       handleValidations(function (errors) {
         cb(null, errors || false);
@@ -734,35 +686,36 @@ function Instance(Model, opts) {
     enumerable: false,
     writable: true
   });
-  Object.defineProperty(instance, instanceFuncNames.__singleton_uid.callback, {
+  Object.defineProperty(instance, "__singleton_uid", {
     value: function (cb) {
       return opts.uid;
     },
     enumerable: false
   });
-  Object.defineProperty(instance, instanceFuncNames.__opts.callback, {
+  Object.defineProperty(instance, "__opts", {
     value: opts,
     enumerable: false
   });
-  Object.defineProperty(instance, instanceFuncNames.model.callback, {
+  Object.defineProperty(instance, "model", {
     value: function (cb) {
       return Model;
     },
     enumerable: false
   });
 
-  Object.defineProperty(instance, instanceFuncNames.save.promise, {
-    value: Promise.promisify(instance[instanceFuncNames.save.callback]),
+  Object.defineProperty(instance, 'save' + promiseFunctionPostfix, {
+    value: Promise.promisify(instance['save']),
     enumerable: false,
     writable: true
   });
-  Object.defineProperty(instance, instanceFuncNames.remove.promise, {
-    value: Promise.promisify(instance[instanceFuncNames.remove.callback]),
+  Object.defineProperty(instance, 'remove' + promiseFunctionPostfix, {
+    value: Promise.promisify(instance['remove']),
     enumerable: false,
     writable: true
   });
-  Object.defineProperty(instance, instanceFuncNames.validate.promise, {
-    value: Promise.promisify(instance[instanceFuncNames.validate.callback]),
+
+  Object.defineProperty(instance, 'validate' + promiseFunctionPostfix, {
+    value: Promise.promisify(instance['validate']),
     enumerable: false,
     writable: true
   });

From 33fd97cb2c6488a6ed48fadfe801803162471a15 Mon Sep 17 00:00:00 2001
From: Yevheniy Miropolets <yevheniy.miropolets@gmail.com>
Date: Mon, 4 Sep 2017 17:28:45 +0300
Subject: [PATCH 1135/1246] redo getAsync function to resolve array of
 arguments fix tests fot getAsync function

---
 lib/AggregateFunctions.js           | 14 +++++-
 test/integration/model-aggregate.js | 67 +++++++++++++++++++----------
 2 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index 664945c2..560aca6a 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -1,6 +1,6 @@
 var ORMError   = require("./Error");
 var Utilities  = require("./Utilities");
-var Promise = require('bluebird');
+var Promise    = require('bluebird');
 
 module.exports = AggregateFunctions;
 
@@ -156,7 +156,17 @@ function AggregateFunctions(opts) {
     }
   };
 
-  proto.getAsync = Promise.promisify(proto.get);
+  proto.getAsync = function () {
+    return new Promise(function(resolve, reject) {
+      proto.get(function () {
+        if (arguments[0]!== null) {
+          return reject(arguments[0]);
+        } else {
+          resolve(Array.from(arguments).slice(1));
+        }
+      })
+    });
+  };
 
   for (var i = 0; i < opts.driver.aggregate_functions.length; i++) {
     addAggregate(proto, opts.driver.aggregate_functions[i], appendFunction);
diff --git a/test/integration/model-aggregate.js b/test/integration/model-aggregate.js
index 5a10fc61..1a4a40bb 100644
--- a/test/integration/model-aggregate.js
+++ b/test/integration/model-aggregate.js
@@ -55,7 +55,25 @@ describe("Model.aggregate()", function() {
     });
   });
 
-  describe("with call()", function () {
+
+
+  describe("with multiple methods using getAsync", function () {
+    before(setup());
+
+    it("should return value for everyone of them with getAsync", function (done) {
+      Person.aggregate().count('id').min('id').max('id').getAsync()
+        .then(function(results) {
+
+          results[0].should.equal(3);
+          results[1].should.equal(1);
+          results[2].should.equal(3);
+
+          return done();
+        });
+    });
+  });
+
+    describe("with call()", function () {
     before(setup());
 
     it("should accept a function", function (done) {
@@ -100,7 +118,8 @@ describe("Model.aggregate()", function() {
 
     it("should accept a function", function (done) {
       Person.aggregate().call('COUNT').getAsync()
-        .then(function (count) {
+        .then(function (results) {
+          var count  = results[0];
           count.should.equal(3);
           return done();
         })
@@ -111,7 +130,8 @@ describe("Model.aggregate()", function() {
 
     it("should accept arguments to the function as an Array", function (done) {
       Person.aggregate().call('COUNT', [ 'id' ]).getAsync()
-        .then(function (count) {
+        .then(function (results) {
+          var count = results[0];
           count.should.equal(3);
           return done();
         })
@@ -123,7 +143,8 @@ describe("Model.aggregate()", function() {
     describe("if function is DISTINCT", function () {
       it("should work as calling .distinct() directly", function (done) {
         Person.aggregate().call('DISTINCT', [ 'name' ]).as('name').order('name').getAsync()
-          .then(function (rows) {
+          .then(function (results) {
+            var rows = results[0];
             should(Array.isArray(rows));
             rows.length.should.equal(2);
 
@@ -197,8 +218,8 @@ describe("Model.aggregate()", function() {
 
     it("should use them as properties if 1st argument is Array", function (done) {
       Person.aggregate().select([ 'id' ]).count('id').groupBy('id').getAsync()
-        .then(function (people) {
-
+        .then(function (results) {
+          var people = results[0];
           should(Array.isArray(people));
           people.length.should.be.above(0);
 
@@ -215,8 +236,8 @@ describe("Model.aggregate()", function() {
 
     it("should use them as properties", function (done) {
       Person.aggregate().select('id').count().groupBy('id').getAsync()
-        .then(function (people) {
-
+        .then(function (results) {
+          var people = results[0];
           should(Array.isArray(people));
           people.length.should.be.above(0);
 
@@ -313,8 +334,8 @@ describe("Model.aggregate()", function() {
 
     it("should return a list of distinct properties", function (done) {
       Person.aggregate().distinct('name').getAsync()
-        .then(function (names) {
-
+        .then(function (results) {
+          var names = results[0];
           names.should.be.a.Object();
           names.should.have.property("length", 2);
 
@@ -328,7 +349,8 @@ describe("Model.aggregate()", function() {
     describe("with limit(1)", function () {
       it("should return only one value", function (done) {
         Person.aggregate().distinct('name').limit(1).order("name").getAsync()
-          .then(function (names) {
+          .then(function (results) {
+            var names = results[0];
             names.should.be.a.Object();
             names.should.have.property("length", 1);
             names[0].should.equal("Jane Doe");
@@ -337,14 +359,15 @@ describe("Model.aggregate()", function() {
           })
           .catch(function(err) {
             done(err);
-          })
+          });
       });
     });
 
     describe("with limit(1, 1)", function () {
       it("should return only one value", function (done) {
         Person.aggregate().distinct('name').limit(1, 1).order("name").getAsync()
-          .then(function (names) {
+          .then(function (results) {
+            var names = results[0];
             names.should.be.a.Object();
             names.should.have.property("length", 1);
             names[0].should.equal("John Doe");
@@ -353,7 +376,7 @@ describe("Model.aggregate()", function() {
           })
           .catch(function(err) {
             done(err);
-          })
+          });
       });
     });
   });
@@ -398,8 +421,8 @@ describe("Model.aggregate()", function() {
 
     it("should return items grouped by property", function (done) {
       Person.aggregate().count().groupBy('name').getAsync()
-        .then(function (rows) {
-
+        .then(function (results) {
+          var rows = results[0];
           rows.should.be.a.Object();
           rows.should.have.property("length", 2);
 
@@ -417,8 +440,8 @@ describe("Model.aggregate()", function() {
 
       it("should order items", function (done) {
         Person.aggregate().count().groupBy('name').order('-count').getAsync()
-          .then(function (rows) {
-
+          .then(function (results) {
+            var rows = results[0];
             rows.should.be.a.Object();
             rows.should.have.property("length", 2);
 
@@ -429,7 +452,7 @@ describe("Model.aggregate()", function() {
           })
           .catch(function(err) {
             done(err);
-          })
+          });
       });
     });
   });
@@ -465,8 +488,8 @@ describe("Model.aggregate()", function() {
 
     it("should use as an alias", function (done) {
       Person.aggregate().count().as('total').groupBy('name').getAsync()
-        .then(function (people) {
-
+        .then(function (results) {
+          var people = results[0];
           should(Array.isArray(people));
           people.length.should.be.above(0);
 
@@ -477,7 +500,7 @@ describe("Model.aggregate()", function() {
         })
         .catch(function (err) {
           done(err);
-        })
+        });
     });
 
   });

From 9e335a17f0bd3ad6372aa46f9d9f8abdfac6a14f Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Mon, 4 Sep 2017 17:34:11 +0300
Subject: [PATCH 1136/1246] Resolve PR comments: added spaces after brackets

---
 test/integration/instance.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integration/instance.js b/test/integration/instance.js
index 4450c045..876f0d6b 100644
--- a/test/integration/instance.js
+++ b/test/integration/instance.js
@@ -375,12 +375,12 @@ describe("Model instance", function() {
   describe("properties", function () {
     describe("Number", function () {
       it("should be saved for valid numbers, using both save & create", function (done) {
-        var person1 = new Person({height: 190});
+        var person1 = new Person({ height: 190 });
 
         person1.save(function (err) {
           should.not.exist(err);
 
-          Person.create({height: 170}, function (err, person2) {
+          Person.create({ height: 170 }, function (err, person2) {
             should.not.exist(err);
 
             Person.get(person1[Person.id], function (err, item) {

From 35895c05b968c0c35eed774d4eb8db505522e309 Mon Sep 17 00:00:00 2001
From: Yevheniy Miropolets <yevheniy.miropolets@gmail.com>
Date: Mon, 4 Sep 2017 17:48:28 +0300
Subject: [PATCH 1137/1246] revert unneeded changes

---
 test/config.example.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/config.example.js b/test/config.example.js
index 0d9c232b..bb9c2d73 100644
--- a/test/config.example.js
+++ b/test/config.example.js
@@ -13,8 +13,8 @@ exports.mysql = {
   database : "test"
 };
 exports.postgres = {
-  user     : "postgres",
-  password : "1111",
+  user     : "root",
+  password : "",
   database : "test"
 };
 exports.redshift = {

From 0c325868ab6a8a9d1d3c62fb7360649d8bc863a2 Mon Sep 17 00:00:00 2001
From: Yevheniy Miropolets <yevheniy.miropolets@gmail.com>
Date: Tue, 5 Sep 2017 10:40:30 +0300
Subject: [PATCH 1138/1246] fix getAsync function

---
 lib/AggregateFunctions.js           | 6 +++---
 test/integration/model-aggregate.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js
index 560aca6a..f2842dfc 100644
--- a/lib/AggregateFunctions.js
+++ b/lib/AggregateFunctions.js
@@ -1,6 +1,6 @@
 var ORMError   = require("./Error");
 var Utilities  = require("./Utilities");
-var Promise    = require('bluebird');
+var Promise    = require("bluebird");
 
 module.exports = AggregateFunctions;
 
@@ -159,12 +159,12 @@ function AggregateFunctions(opts) {
   proto.getAsync = function () {
     return new Promise(function(resolve, reject) {
       proto.get(function () {
-        if (arguments[0]!== null) {
+        if (arguments[0]) {
           return reject(arguments[0]);
         } else {
           resolve(Array.from(arguments).slice(1));
         }
-      })
+      });
     });
   };
 
diff --git a/test/integration/model-aggregate.js b/test/integration/model-aggregate.js
index 1a4a40bb..2302e52a 100644
--- a/test/integration/model-aggregate.js
+++ b/test/integration/model-aggregate.js
@@ -73,7 +73,7 @@ describe("Model.aggregate()", function() {
     });
   });
 
-    describe("with call()", function () {
+  describe("with call()", function () {
     before(setup());
 
     it("should accept a function", function (done) {

From c6aceb0c9a58898fc05ca1c1f12eaf9060ee1fba Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Tue, 5 Sep 2017 12:22:20 +0300
Subject: [PATCH 1139/1246] Add runAsync method for promise support. Create
 async tests

---
 lib/ChainFind.js                     |   4 +
 test/integration/model-find-chain.js | 146 ++++++++++++++++++++++++++-
 2 files changed, 149 insertions(+), 1 deletion(-)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 7959ceed..230679c7 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -3,6 +3,7 @@ var async         = require("async");
 var Utilities     = require("./Utilities");
 var ChainInstance = require("./ChainInstance");
 var Promise       = require("./Promise").Promise;
+var Bluebird      = require("bluebird");
 
 module.exports = ChainFind;
 
@@ -89,6 +90,8 @@ function ChainFind(Model, opts) {
     });
   }
 
+  var chainRunAsync = Bluebird.promisify(chainRun);
+
   var promise = null;
   var chain = {
     find: function () {
@@ -223,6 +226,7 @@ function ChainFind(Model, opts) {
       chainRun(cb);
       return this;
     },
+    runAsync: chainRunAsync,
     success: function (cb) {
       if (!promise) {
         promise = new Promise();
diff --git a/test/integration/model-find-chain.js b/test/integration/model-find-chain.js
index 438d1d3a..6c5f7498 100644
--- a/test/integration/model-find-chain.js
+++ b/test/integration/model-find-chain.js
@@ -91,6 +91,15 @@ describe("Model.find() chaining", function() {
         return done();
       });
     });
+    it("should limit results to N items (promise-based)", function (done) {
+      Person.find().limit(2).runAsync().then(function (instances) {
+        instances.should.have.property("length", 2);
+
+        done();
+      }).catch(function(err) {
+        done(err);
+      });
+    });
   });
 
   describe(".skip(N)", function () {
@@ -105,6 +114,16 @@ describe("Model.find() chaining", function() {
         return done();
       });
     });
+    it("should skip the first N results (promise-based)", function (done) {
+      Person.find().skip(2).order("age").runAsync().then(function (instances) {
+        instances.should.have.property("length", 1);
+        instances[0].age.should.equal(20);
+
+        done();
+      }).catch(function(err) {
+        done(err);
+      });
+    });
   });
 
   describe(".offset(N)", function () {
@@ -119,6 +138,16 @@ describe("Model.find() chaining", function() {
         return done();
       });
     });
+    it("should skip the first N results (promise-based)", function (done) {
+      Person.find().offset(2).order("age").runAsync().then(function (instances) {
+        instances.should.have.property("length", 1);
+        instances[0].age.should.equal(20);
+
+        done();
+      }).catch(function(err) {
+        done(err);
+      });
+    });
   });
 
   describe("order", function () {
@@ -135,6 +164,18 @@ describe("Model.find() chaining", function() {
       });
     });
 
+    it("('property') should order by that property ascending (promise-based)", function (done) {
+      Person.find().order("age").runAsync().then(function (instances) {
+        instances.should.have.property("length", 3);
+        instances[0].age.should.equal(18);
+        instances[2].age.should.equal(20);
+
+        done();
+      }).catch(function(err) {
+        done(err);
+      });
+    });
+
     it("('-property') should order by that property descending", function (done) {
       Person.find().order("-age").run(function (err, instances) {
         should.equal(err, null);
@@ -146,6 +187,18 @@ describe("Model.find() chaining", function() {
       });
     });
 
+    it("('-property') should order by that property descending (promise-based)", function (done) {
+      Person.find().order("-age").runAsync().then(function (instances) {
+        instances.should.have.property("length", 3);
+        instances[0].age.should.equal(20);
+        instances[2].age.should.equal(18);
+
+        done();
+      }).catch(function(err) {
+        done(err);
+      });
+    });
+
     it("('property', 'Z') should order by that property descending", function (done) {
       Person.find().order("age", "Z").run(function (err, instances) {
         should.equal(err, null);
@@ -156,6 +209,18 @@ describe("Model.find() chaining", function() {
         return done();
       });
     });
+
+    it("('property', 'Z') should order by that property descending (promise-based)", function (done) {
+      Person.find().order("age", "Z").runAsync().then(function (instances) {
+        instances.should.have.property("length", 3);
+        instances[0].age.should.equal(20);
+        instances[2].age.should.equal(18);
+
+        done();
+      }).catch(function(err) {
+        done(err);
+      });
+    });
   });
 
   describe("orderRaw", function () {
@@ -174,6 +239,18 @@ describe("Model.find() chaining", function() {
       });
     });
 
+    it("should allow ordering by SQL (promise-based)", function (done) {
+      Person.find().orderRaw("age DESC").runAsync().then(function (instances) {
+        instances.should.have.property("length", 3);
+        instances[0].age.should.equal(20);
+        instances[2].age.should.equal(18);
+
+        done();
+      }).catch(function(err) {
+        done(err);
+      });
+    });
+
     it("should allow ordering by SQL with escaping", function (done) {
       Person.find().orderRaw("?? DESC", ['age']).run(function (err, instances) {
         should.equal(err, null);
@@ -184,6 +261,18 @@ describe("Model.find() chaining", function() {
         return done();
       });
     });
+
+    it("should allow ordering by SQL with escaping (promise-based)", function (done) {
+      Person.find().orderRaw("?? DESC", ['age']).runAsync().then(function (instances) {
+        instances.should.have.property("length", 3);
+        instances[0].age.should.equal(20);
+        instances[2].age.should.equal(18);
+
+        done();
+      }).catch(function(err) {
+        done(err);
+      });
+    });
   });
 
   describe("only", function () {
@@ -201,8 +290,21 @@ describe("Model.find() chaining", function() {
       });
     });
 
+    it("('property', ...) should return only those properties, others null (promise-based)", function (done) {
+      Person.find().only("age", "surname").order("-age").runAsync().then(function (instances) {
+        instances.should.have.property("length", 3);
+        instances[0].should.have.property("age");
+        instances[0].should.have.property("surname", "Doe");
+        instances[0].should.have.property("name", null);
+
+        done();
+      }).catch(function(err){
+        done(err);
+      });
+    });
+
     // This works if cache is disabled. I suspect a cache bug.
-    xit("(['property', ...]) should return only those properties, others null", function (done) {
+    it("(['property', ...]) should return only those properties, others null", function (done) {
       Person.find().only([ "age", "surname" ]).order("-age").run(function (err, instances) {
         should.equal(err, null);
         instances.should.have.property("length", 3);
@@ -213,6 +315,18 @@ describe("Model.find() chaining", function() {
         return done();
       });
     });
+    it("(['property', ...]) should return only those properties, others null (promise-based)", function (done) {
+      Person.find().only([ "age", "surname" ]).order("-age").runAsync().then(function (instances) {
+        instances.should.have.property("length", 3);
+        instances[0].should.have.property("age");
+        instances[0].should.have.property("surname", "Doe");
+        instances[0].should.have.property("name", null);
+
+        done();
+      }).catch(function(err) {
+        done(err);
+      });
+    });
   });
 
   describe("omit", function () {
@@ -234,6 +348,23 @@ describe("Model.find() chaining", function() {
       });
     });
 
+    it("('property', ...) should not get these properties (promise-based)", function (done) {
+      Person.find().omit("age", "surname").order("-age").runAsync().then(function (instances) {
+        instances.should.have.property("length", 3);
+        if (common.protocol() != "mongodb") {
+          should.exist(instances[0].id);
+        }
+        should.exist(instances[0].friend_id);
+        instances[0].should.have.property("age", null);
+        instances[0].should.have.property("surname", null);
+        instances[0].should.have.property("name", "Jane");
+
+        done();
+      }).catch(function(err) {
+        done(err);
+      });
+    });
+
     it("(['property', ...]) should not get these properties", function (done) {
       Person.find().omit(["age", "surname"]).order("-age").run(function (err, instances) {
         should.equal(err, null);
@@ -245,6 +376,19 @@ describe("Model.find() chaining", function() {
         return done();
       });
     });
+
+    it("(['property', ...]) should not get these properties (promise-based)", function (done) {
+      Person.find().omit(["age", "surname"]).order("-age").runAsync().then(function (instances) {
+        instances.should.have.property("length", 3);
+        instances[0].should.have.property("age", null);
+        instances[0].should.have.property("surname", null);
+        instances[0].should.have.property("name", "Jane");
+
+        done();
+      }).catch(function(err) {
+        done(err);
+      });
+    });
   });
 
   describe(".count()", function () {

From 6f7d531e890ed682ca6d1d107f324c2ce4ac1cfb Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Tue, 5 Sep 2017 13:23:07 +0300
Subject: [PATCH 1140/1246] add clearAsync, createAsync, getAsync and test for
 it

---
 lib/Model.js                          |   9 +-
 test/integration/model-clearAsync.js  |  69 +++++++
 test/integration/model-createAsync.js | 133 +++++++++++++
 test/integration/model-get.js         |  22 +--
 test/integration/model-getAsync.js    | 266 ++++++++++++++++++++++++++
 5 files changed, 487 insertions(+), 12 deletions(-)
 create mode 100644 test/integration/model-clearAsync.js
 create mode 100644 test/integration/model-createAsync.js
 create mode 100644 test/integration/model-getAsync.js

diff --git a/lib/Model.js b/lib/Model.js
index 698d93a6..ab34f9dc 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -12,6 +12,7 @@ var Utilities         = require("./Utilities");
 var Validators        = require("./Validators");
 var ORMError          = require("./Error");
 var Hook              = require("./Hook");
+var Promise           = require("bluebird");
 var AvailableHooks    = [
   "beforeCreate", "afterCreate",
   "beforeSave", "afterSave",
@@ -315,6 +316,8 @@ function Model(opts) {
     return this;
   };
 
+  model.getAsync = Promise.promisify(model.get);
+
   model.find = function () {
     var options    = {};
     var conditions = null;
@@ -561,7 +564,7 @@ function Model(opts) {
   };
 
   model.create = function () {
-    var itemsParams = []
+    var itemsParams = [];
     var items       = [];
     var options     = {};
     var done        = null;
@@ -619,6 +622,8 @@ function Model(opts) {
     return this;
   };
 
+  model.createAsync = Promise.promisify(model.create);
+
   model.clear = function (cb) {
     opts.driver.clear(opts.table, function (err) {
       if (typeof cb === "function") cb(err);
@@ -627,6 +632,8 @@ function Model(opts) {
     return this;
   };
 
+  model.clearAsync = Promise.promisify(model.clear);
+
   model.prependValidation = function (key, validation) {
     if(opts.validations.hasOwnProperty(key)) {
       opts.validations[key].splice(0, 0, validation);
diff --git a/test/integration/model-clearAsync.js b/test/integration/model-clearAsync.js
new file mode 100644
index 00000000..5a6c34a4
--- /dev/null
+++ b/test/integration/model-clearAsync.js
@@ -0,0 +1,69 @@
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var ORM      = require('../../');
+
+describe("Model.clearAsync()", function() {
+  var db = null;
+  var Person = null;
+
+  var setup = function () {
+    return function (done) {
+      Person = db.define("person", {
+        name   : String
+      });
+
+      ORM.singleton.clear();
+
+      return helper.dropSync(Person, function () {
+        Person.create([{
+          name: "John Doe"
+        }, {
+          name: "Jane Doe"
+        }], done);
+      });
+    };
+  };
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  describe("with callback", function () {
+    before(setup());
+
+    it("should call when done", function (done) {
+      Person.clearAsync()
+        .then(function () {
+          Person.find().count(function (err, count) {
+            count.should.equal(0);
+
+            return done();
+          });
+        });
+    });
+  });
+
+  describe("without callback", function () {
+    before(setup());
+
+    it("should still remove", function (done) {
+      Person.clearAsync();
+
+      setTimeout(function () {
+        Person.find().count(function (err, count) {
+          count.should.equal(0);
+
+          return done();
+        });
+      }, 200);
+    });
+  });
+});
diff --git a/test/integration/model-createAsync.js b/test/integration/model-createAsync.js
new file mode 100644
index 00000000..5e3371d8
--- /dev/null
+++ b/test/integration/model-createAsync.js
@@ -0,0 +1,133 @@
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+
+describe("Model.createAsync()", function() {
+  var db = null;
+  var Pet = null;
+  var Person = null;
+
+  var setup = function () {
+    return function (done) {
+      Person = db.define("person", {
+        name   : String
+      });
+      Pet = db.define("pet", {
+        name   : { type: "text", defaultValue: "Mutt" }
+      });
+      Person.hasMany("pets", Pet);
+
+      return helper.dropSync([ Person, Pet ], done);
+    };
+  };
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  describe("if passing an object", function () {
+    before(setup());
+
+    it("should accept it as the only item to create", function (done) {
+      Person.createAsync({
+        name : "John Doe"
+      })
+        .then(function (John) {
+          John.should.have.property("name", "John Doe");
+          done();
+        })
+        .catch(function (err) {
+          done(err);
+        });
+    });
+  });
+
+  describe("if passing an array", function () {
+    before(setup());
+
+    it("should accept it as a list of items to create", function (done) {
+      Person.createAsync([{
+        name : "John Doe"
+      }, {
+        name : "Jane Doe"
+      }])
+        .then(function (people) {
+          should(Array.isArray(people));
+
+          people.should.have.property("length", 2);
+          people[0].should.have.property("name", "John Doe");
+          people[1].should.have.property("name", "Jane Doe");
+          done();
+        })
+        .catch(function (err) {
+          done(err);
+        });
+    });
+  });
+
+  describe("if element has an association", function () {
+    before(setup());
+
+    it("should also create it or save it", function (done) {
+      Person.createAsync({
+        name : "John Doe",
+        pets : [ new Pet({ name: "Deco" }) ]
+      })
+        .then(function (John) {
+          John.should.have.property("name", "John Doe");
+
+          should(Array.isArray(John.pets));
+
+          John.pets[0].should.have.property("name", "Deco");
+          John.pets[0].should.have.property(Pet.id);
+          John.pets[0].saved().should.be.true;
+          done();
+        })
+        .catch(function (err) {
+          done(err);
+        });
+    });
+
+    it("should also create it or save it even if it's an object and not an instance", function (done) {
+      Person.createAsync({
+        name : "John Doe",
+        pets : [ { name: "Deco" } ]
+      })
+        .then(function (John) {
+          John.should.have.property("name", "John Doe");
+
+          should(Array.isArray(John.pets));
+
+          John.pets[0].should.have.property("name", "Deco");
+          John.pets[0].should.have.property(Pet.id);
+          John.pets[0].saved().should.be.true;
+          done();
+        })
+        .catch(function (err) {
+          done(err);
+        });
+    });
+  });
+
+  describe("when not passing a property", function () {
+    before(setup());
+
+    it("should use defaultValue if defined", function (done) {
+      Pet.createAsync({})
+        .then(function (Mutt) {
+          Mutt.should.have.property("name", "Mutt");
+          done();
+        })
+        .catch(function (err) {
+          done(err);
+        });
+    });
+  });
+});
diff --git a/test/integration/model-get.js b/test/integration/model-get.js
index 3bcffc78..1759cf64 100644
--- a/test/integration/model-get.js
+++ b/test/integration/model-get.js
@@ -124,23 +124,23 @@ describe("Model.get()", function() {
     });
 
     describe("changing instance.identityCacheSaveCheck = false", function () {
-      before(function (done) {
+      before(function () {
         Person.settings.set("instance.identityCacheSaveCheck", false);
+      });
 
-        it("should return the same object with the changed name", function (done) {
-          Person.get(John[Person.id], function (err, John1) {
-            should.equal(err, null);
+      it("should return the same object with the changed name", function (done) {
+        Person.get(John[Person.id], function (err, John1) {
+          should.equal(err, null);
 
-            John1.name = "James";
+          John1.name = "James";
 
-            Person.get(John[Person.id], function (err, John2) {
-              should.equal(err, null);
+          Person.get(John[Person.id], function (err, John2) {
+            should.equal(err, null);
 
-              John1[Person.id].should.equal(John2[Person.id]);
-              John2.name.should.equal("James");
+            John1[Person.id].should.equal(John2[Person.id]);
+            John2.name.should.equal("James");
 
-              return done();
-            });
+            return done();
           });
         });
       });
diff --git a/test/integration/model-getAsync.js b/test/integration/model-getAsync.js
new file mode 100644
index 00000000..2504cad1
--- /dev/null
+++ b/test/integration/model-getAsync.js
@@ -0,0 +1,266 @@
+var should   = require('should');
+var Promise  = require('bluebird');
+var helper   = require('../support/spec_helper');
+var common   = require('../common');
+var ORM      = require('../../');
+
+describe("Model.getAsync()", function () {
+  var db     = null;
+  var Person = null;
+  var John;
+
+  var setup = function (identityCache) {
+    return function (done) {
+      Person = db.define("person", {
+        name     : { type: 'text', mapsTo: 'fullname' }
+      }, {
+        identityCache : identityCache,
+        methods  : {
+          UID: function () {
+            return this[Person.id];
+          }
+        }
+      });
+
+      ORM.singleton.clear(); // clear identityCache cache
+
+      return helper.dropSync(Person, function () {
+        Person.create([{
+          name: "John Doe"
+        }, {
+          name: "Jane Doe"
+        }], function (err, people) {
+          if (err) done(err);
+          John = people[0];
+
+          return done();
+        });
+      });
+    };
+  };
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  describe('with identityCache cache', function () {
+    before(setup(true));
+
+    it("should throw if passed a wrong number of ids", function (done) {
+      Person.getAsync(1, 2)
+        .then(function () {
+          done(new Error('Fail'));
+        })
+        .catch(function () {
+          done();
+        });
+    });
+
+    it("should accept and try to fetch if passed an Array with ids", function (done) {
+      Person.getAsync([ John[Person.id] ])
+        .then(function (John) {
+          John.should.be.a.Object();
+          John.should.have.property(Person.id, John[Person.id]);
+          John.should.have.property("name", "John Doe");
+          done();
+        })
+        .catch(function (err) {
+          done(err);
+        });
+    });
+
+    it("should throw err", function (done) {
+      Person.getAsync(999)
+        .then(function () {
+          done(new Error('Fail!'));
+        })
+        .catch(function (err) {
+          err.should.be.a.Object();
+          err.message.should.equal("Not found");
+          done();
+        });
+    });
+
+    it("should return item with id 1", function (done) {
+      Person.getAsync(John[Person.id])
+        .then(function (John) {
+          John.should.be.a.Object();
+          John.should.have.property(Person.id, John[Person.id]);
+          John.should.have.property("name", "John Doe");
+
+          done();
+        })
+        .catch(function (err) {
+          done(err);
+        });
+    });
+
+    it("should have an UID method", function (done) {
+      Person.getAsync(John[Person.id])
+        .then(function (John) {
+          John.UID.should.be.a.Function();
+          John.UID().should.equal(John[Person.id]);
+
+          done();
+        })
+        .catch(function (err) {
+          done(err)
+        });
+    });
+
+    it("should return the original object with unchanged name", function (done) {
+      Person.getAsync(John[Person.id])
+        .then(function (John1) {
+          John1.name = "James";
+          return Person.getAsync(John[Person.id]);
+        })
+        .then(function (John2) {
+          should.equal(John2.name, "John Doe");
+          done();
+        })
+        .catch(function (err) {
+          done(err);
+        });
+    });
+
+    describe("changing instance.identityCacheSaveCheck = false", function () {
+      before(function () {
+        Person.settings.set("instance.identityCacheSaveCheck", false);
+      });
+
+      it("should return the same object with the changed name", function (done) {
+        Person.getAsync(John[Person.id])
+          .then(function (John1) {
+            John1.name = "James";
+            return [John1, Person.getAsync(John[Person.id])];
+          })
+          .spread(function (John1, John2) {
+            John1[Person.id].should.equal(John2[Person.id]);
+            John2.name.should.equal("James");
+
+            done();
+          })
+          .catch(function (err) {
+            done(err);
+          });
+      });
+    });
+  });
+
+  describe("with no identityCache cache", function () {
+    before(setup(false));
+
+    it("should return different objects", function (done) {
+      Person.getAsync(John[Person.id])
+        .then(function (John1) {
+          return [John1, Person.getAsync(John[Person.id])];
+        })
+        .spread(function (John1, John2) {
+          John1[Person.id].should.equal(John2[Person.id]);
+          John1.should.not.equal(John2);
+
+          done();
+        })
+        .catch(function (err) {
+          done(err);
+        });
+    });
+  });
+
+  describe("with identityCache cache = 0.5 secs", function () {
+    before(setup(0.5));
+
+    it("should return same objects after 0.2 sec", function (done) {
+      Person.getAsync(John[Person.id])
+        .then(function (John1) {
+          return [John1, Promise.delay(200)];
+        })
+        .spread(function (John1) {
+          return [John1, Person.getAsync(John[Person.id])];
+        })
+        .spread(function (John1, John2) {
+          John1[Person.id].should.equal(John2[Person.id]);
+          John1.should.equal(John2);
+          done();
+        })
+        .catch(function (err) {
+          done(err);
+        });
+    });
+
+    it("should return different objects after 0.7 sec", function (done) {
+      Person.getAsync(John[Person.id])
+        .then(function (John1) {
+          return [John1, Promise.delay(700)];
+        })
+        .spread(function (John1) {
+          return [John1, Person.getAsync(John[Person.id])];
+        })
+        .spread(function (John1, John2) {
+          John1.should.not.equal(John2);
+          done();
+        })
+        .catch(function (err) {
+          done(err);
+        });
+    });
+  });
+
+  describe("if primary key name is changed", function () {
+    before(function (done) {
+      Person = db.define("person", {
+        name : String
+      });
+
+      ORM.singleton.clear();
+
+      return helper.dropSync(Person, function () {
+        Person.create([{
+          name : "John Doe"
+        }, {
+          name : "Jane Doe"
+        }], done);
+      });
+    });
+
+    it("should search by key name and not 'id'", function (done) {
+      db.settings.set('properties.primary_key', 'name');
+
+      var OtherPerson = db.define("person", {
+        id : Number
+      });
+
+      OtherPerson.getAsync("Jane Doe")
+        .then(function (person) {
+          person.name.should.equal("Jane Doe");
+          db.settings.set('properties.primary_key', 'id');
+          done();
+        });
+    });
+  });
+
+  describe("with empty object as options", function () {
+    before(setup());
+
+    it("should return item with id 1 like previously", function (done) {
+      Person.getAsync(John[Person.id], {})
+        .then(function (John) {
+          John.should.be.a.Object();
+          John.should.have.property(Person.id, John[Person.id]);
+          John.should.have.property("name", "John Doe");
+          done();
+        })
+        .catch(function (err) {
+          done(err);
+        });
+    });
+  });
+});
\ No newline at end of file

From 172e2c661ba880942a635329b4a5443e79235801 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Wed, 6 Sep 2017 14:34:23 +0300
Subject: [PATCH 1141/1246] add promise support to hooks

---
 lib/Hook.js                      |  20 +-
 test/integration/hook-promise.js | 457 +++++++++++++++++++++++++++++++
 test/integration/hook.js         | 190 ++++++-------
 3 files changed, 568 insertions(+), 99 deletions(-)
 create mode 100644 test/integration/hook-promise.js

diff --git a/lib/Hook.js b/lib/Hook.js
index 1d74f4d8..8f4d2a66 100644
--- a/lib/Hook.js
+++ b/lib/Hook.js
@@ -1,3 +1,5 @@
+var Promise = require('bluebird');
+
 exports.trigger = function () {
   var args = Array.prototype.slice.apply(arguments);
   var self = args.shift();
@@ -11,15 +13,25 @@ exports.trigger = function () {
 exports.wait = function () {
   var args = Array.prototype.slice.apply(arguments);
   var self = args.shift();
-  var cb   = args.shift();
+  var hook   = args.shift();
   var next = args.shift();
 
   args.push(next);
+  if (typeof hook === "function") {
+    var hookValue = hook.apply(self, args);
 
-  if (typeof cb === "function") {
-    cb.apply(self, args);
+    var isHasCallback = hook.length < args.length;
 
-    if (cb.length < args.length) {
+    if (isHasCallback) {
+      if (hookValue instanceof Promise) {
+        return hookValue
+          .then(function () {
+            next();
+          })
+          .catch(function (err) {
+            next(err);
+          });
+      }
       return next();
     }
   } else {
diff --git a/test/integration/hook-promise.js b/test/integration/hook-promise.js
new file mode 100644
index 00000000..a8ad7503
--- /dev/null
+++ b/test/integration/hook-promise.js
@@ -0,0 +1,457 @@
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var async    = require('async');
+var Promise  = require('bluebird');
+
+describe("HookPromise", function() {
+  var db = null;
+  var Person = null;
+  var triggeredHooks = {};
+  var getTimestamp; // Calling it 'getTime' causes strangeness.
+
+  getTimestamp = function () { return Date.now(); };
+
+  var checkHook = function (hook) {
+    triggeredHooks[hook] = false;
+
+    return function () {
+      triggeredHooks[hook] = getTimestamp();
+    };
+  };
+
+  var setup = function (hooks) {
+    if (typeof hooks == "undefined") {
+      hooks = {
+        afterCreate      : checkHook("afterCreate"),
+        beforeCreate     : checkHook("beforeCreate"),
+        afterSave        : checkHook("afterSave"),
+        beforeSave       : checkHook("beforeSave"),
+        beforeValidation : checkHook("beforeValidation"),
+        beforeRemove     : checkHook("beforeRemove"),
+        afterRemove      : checkHook("afterRemove")
+      };
+    }
+
+    return function (done) {
+      Person = db.define("person", {
+        name   : String
+      }, {
+        hooks  : hooks
+      });
+
+      Person.settings.set("instance.returnAllErrors", false);
+
+      return helper.dropSync(Person, done);
+    };
+  };
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  describe('afterCreate', function () {
+    beforeEach(setup());
+    it("should trigger after model creation", function (done) {
+      var triggered = false;
+
+      Person.afterCreate(function () {
+        return new Promise(function (resolve) {
+          setTimeout(function () {
+            triggered = true;
+            resolve();
+          }, 700);
+        });
+      });
+
+      Person.create([{ name: "John Doe" }], function () {
+        triggered.should.be.true;
+        return done();
+      });
+    });
+  });
+
+  describe("beforeCreate", function () {
+    beforeEach(setup());
+    it("should allow modification of instance", function (done) {
+      Person.beforeCreate(function () {
+        var self = this;
+        return new Promise(function (resolve) {
+          setTimeout(function () {
+            self.name = "Hook Worked";
+            resolve();
+          }, 200);
+        });
+      });
+
+      Person.create([{ }], function (err, people) {
+        should.not.exist(err);
+        should.exist(people);
+        should.equal(people.length, 1);
+        should.equal(people[0].name, "Hook Worked");
+        // garantee it was correctly saved on database
+        Person.one({ name: "Hook Worked" }, function (err, person) {
+          should.not.exist(err);
+          should.exist(person);
+        });
+        done();
+      });
+    });
+
+    it("should trigger error", function (done) {
+      Person.beforeCreate(function () {
+        return new Promise(function (resolve, reject) {
+          setTimeout(function () {
+            reject(new Error('beforeCreate-error'));
+          }, 200);
+        });
+      });
+
+      Person.createAsync([{ name: "John Doe" }])
+        .then(function () {
+          done(new Error('Should throw err.'));
+        })
+        .catch(function (err) {
+          err.should.be.a.Object();
+          err.message.should.equal("beforeCreate-error");
+          done();
+        });
+    });
+  });
+
+  describe("beforeSave", function () {
+    beforeEach(setup());
+    it("should trigger and wait before save hook", function (done) {
+      Person.beforeSave(function () {
+        return new Promise(function (_, reject) {
+          setTimeout(function () {
+            reject(new Error('beforeSave-error'));
+          }, 400);
+        });
+      });
+
+      Person.createAsync([{ name: "Jane Doe" }])
+        .then(function () {
+          done(new Error('Should throw error'));
+        })
+        .catch(function (err) {
+          err.should.be.a.Object();
+          err.message.should.equal("beforeSave-error");
+          return done();
+        });
+    });
+
+    it("should trigger error when saving", function (done) {
+      Person.beforeSave(function () {
+        return new Promise(function (_, reject) {
+          setTimeout(function () {
+            reject(new Error('beforeSave-error'));
+          }, 400);
+        });
+      });
+
+      Person.createAsync([{ name: "Jane Doe" }])
+        .then(function (John) {
+          return John[0].saveAsync();
+        })
+        .catch(function (err) {
+          err.should.be.a.Object();
+          err.message.should.equal("beforeSave-error");
+          return done();
+        });
+    });
+
+    it("should trigger and wait", function (done) {
+      Person.beforeSave(function () {
+        var self = this;
+        return new Promise(function (resolve) {
+          setTimeout(function () {
+            self.name = 'John Doe';
+            resolve();
+          }, 400);
+        });
+      });
+
+      Person.createAsync([{ name: "Jane Doe" }])
+        .then(function (John) {
+          return John[0].saveAsync();
+        })
+        .then(function (John) {
+          should.equal(John.name, 'John Doe');
+          done();
+        })
+        .catch(function (err) {
+          done(err);
+        });
+    });
+  });
+
+  describe("afterSave", function () {
+    beforeEach(setup());
+    it("should call and wait after save hook", function (done) {
+      var triggered = false;
+
+      Person.afterSave(function () {
+        return new Promise(function (resolve) {
+          setTimeout(function () {
+            triggered = true;
+            resolve();
+          }, 700);
+        });
+      });
+
+      Person.createAsync([{ name: "John Doe" }])
+        .then(function (Jhon) {
+          return Jhon[0].saveAsync();
+        })
+        .then(function () {
+          triggered.should.be.true;
+          done();
+        })
+        .catch(function (err) {
+          done(err);
+        });
+    });
+  });
+
+  describe("beforeValidation", function () {
+    beforeEach(setup());
+    it("should trigger and wait", function (done) {
+      Person.beforeValidation(function () {
+        var self = this;
+        return new Promise(function (resolve) {
+          setTimeout(function () {
+            self.name = "John Snow";
+            resolve();
+          }, 500);
+        });
+      });
+
+      Person.createAsync([{ name: "John Doe" }])
+        .then(function (Jhon) {
+          should.equal(Jhon[0].name, "John Snow");
+          done();
+        })
+        .catch(function (err) {
+          done(err);
+        });
+    });
+
+    it("should throw error", function (done) {
+      Person.beforeValidation(function () {
+        var self = this;
+        return new Promise(function (_, reject) {
+          setTimeout(function () {
+            self.name = "John Snow";
+            reject(new Error("beforeValidation-error"));
+          }, 500);
+        });
+      });
+
+      Person.createAsync([{ name: "John Doe" }])
+        .then(function () {
+          done(new Error("Should throw error"));
+        })
+        .catch(function (err) {
+          should.equal(err.message, "beforeValidation-error");
+          done();
+        });
+    })
+  });
+
+  describe("afterLoad", function () {
+    beforeEach(setup());
+    it("should trigger and wait", function (done) {
+      var afterLoad = false;
+      Person.afterLoad(function () {
+        return new Promise(function (resolve) {
+          setTimeout(function () {
+            afterLoad = true;
+            resolve();
+          }, 500);
+        });
+      });
+
+      Person.createAsync([{ name: "John Doe" }])
+        .then(function () {
+          afterLoad.should.be.true;
+          done();
+        })
+        .catch(function (err) {
+          console.log('hererere');
+          done(err);
+        });
+    });
+
+    it("should trigger and wait", function (done) {
+      var afterLoad = false;
+      Person.afterLoad(function () {
+        return new Promise(function (_, reject) {
+          setTimeout(function () {
+            afterLoad = true;
+            reject(new Error("afterLoad-error"));
+          }, 500);
+        });
+      });
+
+      Person.createAsync([{ name: "John Doe" }])
+        .then(function () {
+          afterLoad.should.be.true;
+          done(new Error("Should throw."));
+        })
+        .catch(function (err) {
+          err.should.exist;
+          err.message.should.equal("afterLoad-error");
+          done();
+        });
+    });
+  });
+
+  describe("afterAutoFetch", function () {
+    beforeEach(setup());
+    it("should trigger and wait", function (done) {
+      var afterAutoFetch = false;
+      Person.afterAutoFetch(function () {
+        return new Promise(function (resolve) {
+          setTimeout(function () {
+            afterAutoFetch = true;
+            resolve();
+          }, 500);
+        });
+      });
+
+      Person.createAsync({ name: "John" })
+        .then(function () {
+          afterAutoFetch.should.be.true;
+          done();
+        })
+        .catch(function (err) {
+          done(err);
+        });
+    });
+
+    it("should trigger and wait", function (done) {
+      var afterAutoFetch = false;
+      Person.afterAutoFetch(function () {
+        return new Promise(function (_, reject) {
+          setTimeout(function () {
+            afterAutoFetch = true;
+            reject(new Error("afterAutoFetch-error"));
+          }, 500);
+        });
+      });
+
+      Person.createAsync({ name: "John" })
+        .then(function () {
+          done(new Error("Should throw error"));
+        })
+        .catch(function (err) {
+          should.equal(err.message, "afterAutoFetch-error");
+          done();
+        });
+    });
+  });
+
+  describe("beforeRemove", function () {
+    before(setup());
+
+    it("should trigger and wait", function (done) {
+      var beforeRemove = false;
+      Person.beforeRemove(function () {
+        return new Promise(function (resolve) {
+          beforeRemove = true;
+          resolve();
+        });
+      });
+
+      Person.createAsync([{ name: "John Doe" }])
+        .then(function (items) {
+          return items[0].removeAsync();
+        })
+        .then(function () {
+          beforeRemove.should.be.true;
+          done();
+        })
+        .catch(function (err) {
+          done(err);
+        });
+    });
+
+    it("should throw error", function (done) {
+      Person.beforeRemove(function () {
+        return new Promise(function (_, reject) {
+          setTimeout(function () {
+            reject(new Error('beforeRemove-error'));
+          }, 600);
+        });
+      });
+
+      Person.createAsync([{ name: "John Doe" }])
+        .then(function (items) {
+          return items[0].removeAsync();
+        })
+        .then(function () {
+          done(new Error('Should throw error'));
+        })
+        .catch(function (err) {
+          should.equal(err.message, 'beforeRemove-error');
+          done();
+        });
+    });
+  });
+
+  describe("instance modifications", function () {
+    before(setup({
+      beforeValidation: function () {
+        var self = this;
+        return new Promise(function (resolve) {
+          setTimeout(function () {
+            should.equal(self.name, "John Doe");
+            self.name = "beforeValidation";
+            resolve();
+          }, 800);
+        });
+      },
+      beforeCreate: function () {
+        var self = this;
+        return new Promise(function (resolve) {
+          setTimeout(function () {
+            should.equal(self.name, "beforeValidation");
+            self.name = "beforeCreate";
+            resolve();
+          }, 700);
+        });
+      },
+      beforeSave: function () {
+        var self = this;
+        return new Promise(function (resolve) {
+          setTimeout(function () {
+            should.equal(self.name, "beforeCreate");
+            self.name = "beforeSave";
+            resolve();
+          }, 500);
+        });
+      }
+    }));
+
+    it("should propagate down hooks", function (done) {
+      Person.createAsync([{ name: "John Doe" }])
+        .then(function (people) {
+          should.exist(people);
+          should.equal(people.length, 1);
+          should.equal(people[0].name, "beforeSave");
+          done();
+        })
+        .catch(function (err) {
+          done(err);
+        });
+    });
+  });
+});
diff --git a/test/integration/hook.js b/test/integration/hook.js
index 596dce3f..77dfe346 100644
--- a/test/integration/hook.js
+++ b/test/integration/hook.js
@@ -1,16 +1,16 @@
-var _        = require('lodash');
-var should   = require('should');
-var helper   = require('../support/spec_helper');
-var async    = require('async');
-var ORM      = require('../../');
+var should = require('should');
+var helper = require('../support/spec_helper');
+var async = require('async');
 
-describe("Hook", function() {
+describe("Hook", function () {
   var db = null;
   var Person = null;
   var triggeredHooks = {};
   var getTimestamp; // Calling it 'getTime' causes strangeness.
 
-  getTimestamp = function () { return Date.now(); };
+  getTimestamp = function () {
+    return Date.now();
+  };
   // this next lines are failing...
   // if (process.hrtime) {
   //   getTimestamp = function () { return parseFloat(process.hrtime().join('.')); };
@@ -29,21 +29,21 @@ describe("Hook", function() {
   var setup = function (hooks) {
     if (typeof hooks == "undefined") {
       hooks = {
-        afterCreate      : checkHook("afterCreate"),
-        beforeCreate     : checkHook("beforeCreate"),
-        afterSave        : checkHook("afterSave"),
-        beforeSave       : checkHook("beforeSave"),
-        beforeValidation : checkHook("beforeValidation"),
-        beforeRemove     : checkHook("beforeRemove"),
-        afterRemove      : checkHook("afterRemove")
+        afterCreate: checkHook("afterCreate"),
+        beforeCreate: checkHook("beforeCreate"),
+        afterSave: checkHook("afterSave"),
+        beforeSave: checkHook("beforeSave"),
+        beforeValidation: checkHook("beforeValidation"),
+        beforeRemove: checkHook("beforeRemove"),
+        afterRemove: checkHook("afterRemove")
       };
     }
 
     return function (done) {
       Person = db.define("person", {
-        name   : String
+        name: String
       }, {
-        hooks  : hooks
+        hooks: hooks
       });
 
       Person.settings.set("instance.returnAllErrors", false);
@@ -65,7 +65,7 @@ describe("Hook", function() {
   });
 
   describe("after Model creation", function () {
-    before(setup({}));
+    before(setup());
 
     it("can be changed", function (done) {
       var triggered = false;
@@ -73,9 +73,9 @@ describe("Hook", function() {
       Person.afterCreate(function () {
         triggered = true;
       });
+
       Person.create([{ name: "John Doe" }], function () {
         triggered.should.be.true;
-
         return done();
       });
     });
@@ -116,36 +116,36 @@ describe("Hook", function() {
     });
 
     it("should allow modification of instance", function (done) {
-        Person.beforeCreate(function (next) {
-            this.name = "Hook Worked";
-            next();
-        });
+      Person.beforeCreate(function (next) {
+        this.name = "Hook Worked";
+        next();
+      });
 
-        Person.create([{ }], function (err, people) {
-            should.not.exist(err);
-            should.exist(people);
-            should.equal(people.length, 1);
-            should.equal(people[0].name, "Hook Worked");
+      Person.create([{}], function (err, people) {
+        should.not.exist(err);
+        should.exist(people);
+        should.equal(people.length, 1);
+        should.equal(people[0].name, "Hook Worked");
 
-            // garantee it was correctly saved on database
-            Person.one({ name: "Hook Worked" }, function (err, person) {
-              should.not.exist(err);
-              should.exist(person);
+        // garantee it was correctly saved on database
+        Person.one({ name: "Hook Worked" }, function (err, person) {
+          should.not.exist(err);
+          should.exist(person);
 
-              return done();
-            });
+          return done();
         });
+      });
     });
 
     describe("when setting properties", function () {
       before(setup({
-        beforeCreate : function () {
+        beforeCreate: function () {
           this.name = "Jane Doe";
         }
       }));
 
       it("should not be discarded", function (done) {
-        Person.create([{ }], function (err, items) {
+        Person.create([{}], function (err, items) {
           should.equal(err, null);
 
           items.should.be.a.Object();
@@ -167,7 +167,7 @@ describe("Hook", function() {
       var beforeCreate = false;
 
       before(setup({
-        beforeCreate : function (next) {
+        beforeCreate: function (next) {
           setTimeout(function () {
             beforeCreate = true;
 
@@ -186,7 +186,7 @@ describe("Hook", function() {
 
       describe("if hook triggers error", function () {
         before(setup({
-          beforeCreate : function (next) {
+          beforeCreate: function (next) {
             setTimeout(function () {
               return next(new Error('beforeCreate-error'));
             }, 200);
@@ -233,15 +233,15 @@ describe("Hook", function() {
     });
 
     it("should allow modification of instance", function (done) {
-        Person.beforeSave(function () {
-            this.name = "Hook Worked";
-        });
+      Person.beforeSave(function () {
+        this.name = "Hook Worked";
+      });
 
-        Person.create([{ name: "John Doe" }], function (err, people) {
-            should.not.exist(err);
-            should.exist(people);
-            should.equal(people.length, 1);
-            should.equal(people[0].name, "Hook Worked");
+      Person.create([{ name: "John Doe" }], function (err, people) {
+        should.not.exist(err);
+        should.exist(people);
+        should.equal(people.length, 1);
+        should.equal(people[0].name, "Hook Worked");
 
         // garantee it was correctly saved on database
         Person.find({ name: "Hook Worked" }, { identityCache: false }, 1, function (err, people) {
@@ -250,18 +250,18 @@ describe("Hook", function() {
 
           return done();
         });
-        });
+      });
     });
 
     describe("when setting properties", function () {
       before(setup({
-        beforeSave : function () {
+        beforeSave: function () {
           this.name = "Jane Doe";
         }
       }));
 
       it("should not be discarded", function (done) {
-        Person.create([{ }], function (err, items) {
+        Person.create([{}], function (err, items) {
           should.equal(err, null);
 
           items.should.be.a.Object();
@@ -283,7 +283,7 @@ describe("Hook", function() {
       var beforeSave = false;
 
       before(setup({
-        beforeSave : function (next) {
+        beforeSave: function (next) {
           setTimeout(function () {
             beforeSave = true;
 
@@ -303,7 +303,7 @@ describe("Hook", function() {
 
       describe("if hook triggers error", function () {
         before(setup({
-          beforeSave : function (next) {
+          beforeSave: function (next) {
             if (this.name == "John Doe") {
               return next();
             }
@@ -400,24 +400,24 @@ describe("Hook", function() {
 
 
     it("should allow modification of instance", function (done) {
-        Person.beforeValidation(function () {
-            this.name = "Hook Worked";
-        });
+      Person.beforeValidation(function () {
+        this.name = "Hook Worked";
+      });
 
-        Person.create([{ name: "John Doe" }], function (err, people) {
-            should.not.exist(err);
-            should.exist(people);
-            should.equal(people.length, 1);
-            should.equal(people[0].name, "Hook Worked");
-            done();
-        });
+      Person.create([{ name: "John Doe" }], function (err, people) {
+        should.not.exist(err);
+        should.exist(people);
+        should.equal(people.length, 1);
+        should.equal(people[0].name, "Hook Worked");
+        done();
+      });
     });
 
     describe("if hook method has 1 argument", function () {
       var beforeValidation = false;
 
       before(setup({
-        beforeValidation : function (next) {
+        beforeValidation: function (next) {
           setTimeout(function () {
             beforeValidation = true;
 
@@ -483,7 +483,7 @@ describe("Hook", function() {
       var afterLoad = false;
 
       before(setup({
-        afterLoad : function (next) {
+        afterLoad: function (next) {
           setTimeout(function () {
             afterLoad = true;
 
@@ -502,7 +502,7 @@ describe("Hook", function() {
 
       describe("if hook returns an error", function () {
         before(setup({
-          afterLoad : function (next) {
+          afterLoad: function (next) {
             return next(new Error("AFTERLOAD_FAIL"));
           }
         }));
@@ -540,7 +540,7 @@ describe("Hook", function() {
       var afterAutoFetch = false;
 
       before(setup({
-        afterAutoFetch : function (next) {
+        afterAutoFetch: function (next) {
           setTimeout(function () {
             afterAutoFetch = true;
 
@@ -559,7 +559,7 @@ describe("Hook", function() {
 
       describe("if hook returns an error", function () {
         before(setup({
-          afterAutoFetch : function (next) {
+          afterAutoFetch: function (next) {
             return next(new Error("AFTERAUTOFETCH_FAIL"));
           }
         }));
@@ -595,7 +595,7 @@ describe("Hook", function() {
       var beforeRemove = false;
 
       before(setup({
-        beforeRemove : function (next) {
+        beforeRemove: function (next) {
           setTimeout(function () {
             beforeRemove = true;
 
@@ -617,7 +617,7 @@ describe("Hook", function() {
 
       describe("if hook triggers error", function () {
         before(setup({
-          beforeRemove : function (next) {
+          beforeRemove: function (next) {
             setTimeout(function () {
               return next(new Error('beforeRemove-error'));
             }, 200);
@@ -657,12 +657,12 @@ describe("Hook", function() {
   describe("if model has autoSave", function () {
     before(function (done) {
       Person = db.define("person", {
-        name    : String,
-        surname : String
+        name: String,
+        surname: String
       }, {
-        autoSave  : true,
-        hooks     : {
-          afterSave : checkHook("afterSave")
+        autoSave: true,
+        hooks: {
+          afterSave: checkHook("afterSave")
         }
       });
 
@@ -672,7 +672,7 @@ describe("Hook", function() {
     });
 
     it("should trigger for single property changes", function (done) {
-      Person.create({ name : "John", surname : "Doe" }, function (err, John) {
+      Person.create({ name: "John", surname: "Doe" }, function (err, John) {
         should.equal(err, null);
 
         triggeredHooks.afterSave.should.be.a.Number();
@@ -690,29 +690,29 @@ describe("Hook", function() {
   });
 
   describe("instance modifications", function () {
-      before(setup({
-          beforeValidation: function () {
-              should.equal(this.name, "John Doe");
-              this.name = "beforeValidation";
-          },
-          beforeCreate: function () {
-              should.equal(this.name, "beforeValidation");
-              this.name = "beforeCreate";
-          },
-          beforeSave: function () {
-              should.equal(this.name, "beforeCreate");
-              this.name = "beforeSave";
-          }
-      }));
+    before(setup({
+      beforeValidation: function () {
+        should.equal(this.name, "John Doe");
+        this.name = "beforeValidation";
+      },
+      beforeCreate: function () {
+        should.equal(this.name, "beforeValidation");
+        this.name = "beforeCreate";
+      },
+      beforeSave: function () {
+        should.equal(this.name, "beforeCreate");
+        this.name = "beforeSave";
+      }
+    }));
 
-      it("should propagate down hooks", function (done) {
-          Person.create([{ name: "John Doe" }], function (err, people) {
-              should.not.exist(err);
-              should.exist(people);
-              should.equal(people.length, 1);
-              should.equal(people[0].name, "beforeSave");
-              done();
-          });
+    it("should propagate down hooks", function (done) {
+      Person.create([{ name: "John Doe" }], function (err, people) {
+        should.not.exist(err);
+        should.exist(people);
+        should.equal(people.length, 1);
+        should.equal(people[0].name, "beforeSave");
+        done();
       });
+    });
   });
 });

From 45553e8e84193945806eca886f3f4dd67ff36926 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Wed, 6 Sep 2017 17:08:33 +0300
Subject: [PATCH 1142/1246] add Promise checking via chack that "then" is a
 function

---
 lib/Hook.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/Hook.js b/lib/Hook.js
index 8f4d2a66..2cb4256b 100644
--- a/lib/Hook.js
+++ b/lib/Hook.js
@@ -20,17 +20,16 @@ exports.wait = function () {
   if (typeof hook === "function") {
     var hookValue = hook.apply(self, args);
 
-    var isHasCallback = hook.length < args.length;
+    var hookDoesntExpectCallback = hook.length < args.length;
+    var isPromise = hookValue && typeof(hookValue.then) === "function";
 
-    if (isHasCallback) {
-      if (hookValue instanceof Promise) {
+    if (hookDoesntExpectCallback) {
+      if (isPromise) {
         return hookValue
           .then(function () {
             next();
           })
-          .catch(function (err) {
-            next(err);
-          });
+          .catch(next);
       }
       return next();
     }

From ecc74a493362c0feb3f12d1f8249217ceabbb80c Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Fri, 8 Sep 2017 11:25:37 +0300
Subject: [PATCH 1143/1246] adjust code style

---
 lib/Hook.js                      |  4 +-
 test/integration/hook-promise.js | 70 +++++++++++++-------------------
 2 files changed, 30 insertions(+), 44 deletions(-)

diff --git a/lib/Hook.js b/lib/Hook.js
index 2cb4256b..22285460 100644
--- a/lib/Hook.js
+++ b/lib/Hook.js
@@ -1,5 +1,3 @@
-var Promise = require('bluebird');
-
 exports.trigger = function () {
   var args = Array.prototype.slice.apply(arguments);
   var self = args.shift();
@@ -13,7 +11,7 @@ exports.trigger = function () {
 exports.wait = function () {
   var args = Array.prototype.slice.apply(arguments);
   var self = args.shift();
-  var hook   = args.shift();
+  var hook = args.shift();
   var next = args.shift();
 
   args.push(next);
diff --git a/test/integration/hook-promise.js b/test/integration/hook-promise.js
index a8ad7503..fb2575f7 100644
--- a/test/integration/hook-promise.js
+++ b/test/integration/hook-promise.js
@@ -71,10 +71,12 @@ describe("HookPromise", function() {
         });
       });
 
-      Person.create([{ name: "John Doe" }], function () {
-        triggered.should.be.true;
-        return done();
-      });
+      Person.createAsync([{ name: "John Doe" }])
+        .then(function () {
+          triggered.should.be.true;
+          done();
+        })
+        .catch(done);
     });
   });
 
@@ -91,18 +93,19 @@ describe("HookPromise", function() {
         });
       });
 
-      Person.create([{ }], function (err, people) {
-        should.not.exist(err);
-        should.exist(people);
-        should.equal(people.length, 1);
-        should.equal(people[0].name, "Hook Worked");
-        // garantee it was correctly saved on database
-        Person.one({ name: "Hook Worked" }, function (err, person) {
-          should.not.exist(err);
-          should.exist(person);
-        });
-        done();
-      });
+      Person.createAsync([{ }])
+        .then(function (people) {
+          should.exist(people);
+          should.equal(people.length, 1);
+          should.equal(people[0].name, "Hook Worked");
+          // garantee it was correctly saved on database
+          Person.one({ name: "Hook Worked" }, function (err, person) {
+            should.not.exist(err);
+            should.exist(person);
+          });
+          done();
+        })
+        .catch(done);
     });
 
     it("should trigger error", function (done) {
@@ -148,7 +151,7 @@ describe("HookPromise", function() {
         });
     });
 
-    it("should trigger error when saving", function (done) {
+    it("should trigger error", function (done) {
       Person.beforeSave(function () {
         return new Promise(function (_, reject) {
           setTimeout(function () {
@@ -187,9 +190,7 @@ describe("HookPromise", function() {
           should.equal(John.name, 'John Doe');
           done();
         })
-        .catch(function (err) {
-          done(err);
-        });
+        .catch(done);
     });
   });
 
@@ -215,9 +216,7 @@ describe("HookPromise", function() {
           triggered.should.be.true;
           done();
         })
-        .catch(function (err) {
-          done(err);
-        });
+        .catch(done);
     });
   });
 
@@ -239,9 +238,7 @@ describe("HookPromise", function() {
           should.equal(Jhon[0].name, "John Snow");
           done();
         })
-        .catch(function (err) {
-          done(err);
-        });
+        .catch(done);
     });
 
     it("should throw error", function (done) {
@@ -284,13 +281,10 @@ describe("HookPromise", function() {
           afterLoad.should.be.true;
           done();
         })
-        .catch(function (err) {
-          console.log('hererere');
-          done(err);
-        });
+        .catch(done);
     });
 
-    it("should trigger and wait", function (done) {
+    it("should throw error", function (done) {
       var afterLoad = false;
       Person.afterLoad(function () {
         return new Promise(function (_, reject) {
@@ -332,12 +326,10 @@ describe("HookPromise", function() {
           afterAutoFetch.should.be.true;
           done();
         })
-        .catch(function (err) {
-          done(err);
-        });
+        .catch(done);
     });
 
-    it("should trigger and wait", function (done) {
+    it("should throw error", function (done) {
       var afterAutoFetch = false;
       Person.afterAutoFetch(function () {
         return new Promise(function (_, reject) {
@@ -379,9 +371,7 @@ describe("HookPromise", function() {
           beforeRemove.should.be.true;
           done();
         })
-        .catch(function (err) {
-          done(err);
-        });
+        .catch(done);
     });
 
     it("should throw error", function (done) {
@@ -449,9 +439,7 @@ describe("HookPromise", function() {
           should.equal(people[0].name, "beforeSave");
           done();
         })
-        .catch(function (err) {
-          done(err);
-        });
+        .catch(done);
     });
   });
 });

From 4d09077b039aad6b9a15d182041c24200fec292c Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 11 Sep 2017 10:36:58 +0000
Subject: [PATCH 1144/1246] Fix broken tests

---
 test/integration/db.js          | 10 +++++++---
 test/integration/orm-exports.js |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/test/integration/db.js b/test/integration/db.js
index 3b5284cd..af06368a 100644
--- a/test/integration/db.js
+++ b/test/integration/db.js
@@ -313,7 +313,11 @@ describe('DB', function () {
             only: ['name', 'id'],
             keys: ['id'],
           },
-          expectedQuery: 'SELECT "t1"."name", "t1"."id", "t2"."dog_id" AS "$p" FROM "dog" "t1" JOIN "dog_family" "t2" ON "t2"."family_id" = "t1"."id" WHERE "t2"."dog_id" IN (1, 5)'
+          expectedQuery: {
+            postgres: 'SELECT "t1"."name", "t1"."id", "t2"."dog_id" AS "$p" FROM "dog" "t1" JOIN "dog_family" "t2" ON "t2"."family_id" = "t1"."id" WHERE "t2"."dog_id" IN (1, 5)',
+            mysql:    'SELECT `t1`.`name`, `t1`.`id`, `t2`.`dog_id` AS `$p` FROM `dog` `t1` JOIN `dog_family` `t2` ON `t2`.`family_id` = `t1`.`id` WHERE `t2`.`dog_id` IN (1, 5)',
+            sqlite:   'SELECT `t1`.`name`, `t1`.`id`, `t2`.`dog_id` AS `$p` FROM `dog` `t1` JOIN `dog_family` `t2` ON `t2`.`family_id` = `t1`.`id` WHERE `t2`.`dog_id` IN (1, 5)'
+          }
         };
 
         describe('cb', function () {
@@ -329,7 +333,7 @@ describe('DB', function () {
                 done(err);
               }
               should.equal(execSimpleQueryStub.calledOnce, true);
-              should.equal(execSimpleQueryStub.calledWith(fixture.expectedQuery), true);
+              should.equal(execSimpleQueryStub.lastCall.args[0], fixture.expectedQuery[common.protocol()]);
               execSimpleQueryStub.restore();
               done();
             });
@@ -345,7 +349,7 @@ describe('DB', function () {
             db.driver.eagerQueryAsync(fixture.association, fixture.opts, [ 1, 5 ])
               .then(function () {
                 should.equal(execSimpleQueryStub.calledOnce, true);
-                should.equal(execSimpleQueryStub.calledWith(fixture.expectedQuery), true);
+                should.equal(execSimpleQueryStub.lastCall.args[0], fixture.expectedQuery[common.protocol()]);
                 execSimpleQueryStub.restore();
                 done();
               })
diff --git a/test/integration/orm-exports.js b/test/integration/orm-exports.js
index dd5ba615..e5fce2d2 100644
--- a/test/integration/orm-exports.js
+++ b/test/integration/orm-exports.js
@@ -53,12 +53,12 @@ describe("ORM", function() {
       ORM.connectAsync.should.be.a.Function()
     });
 
-    it('should throw error with correct message when protocol not supported', function () {
+    it('should throw error with correct message when protocol not supported', function (done) {
       ORM.connectAsync("pg://127.0.0.6")
         .then(function () {
           done('Fail.');
         })
-        .catch(function () {
+        .catch(function (err) {
           should.exist(err);
           err.message.should.not.equal("CONNECTION_PROTOCOL_NOT_SUPPORTED");
           done();

From c43910f0284bca7202739dad112779a023e2d2de Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Mon, 11 Sep 2017 17:52:28 +0300
Subject: [PATCH 1145/1246] add useAsync and loadAsync

---
 lib/ORM.js                      |  62 ++--
 test/integration/db.js          | 604 ++++++++++++++++++--------------
 test/integration/orm-exports.js |  39 ++-
 3 files changed, 416 insertions(+), 289 deletions(-)

diff --git a/lib/ORM.js b/lib/ORM.js
index 5cee3f1c..176f1bd2 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -39,6 +39,19 @@ var optsChecker = function (opts) {
   return [OPTS_TYPE_STRING, OPTS_TYPE_OBJ].some(function (element) { return typeof(opts) === element })
 };
 
+var fileLoader = function (filePaths, cb) {
+  var self = this;
+  var iterator = function (filePath, cb) {
+    try {
+      require(filePath)(self, cb);
+    } catch (err) {
+      return cb(err)
+    }
+  };
+
+  async.eachSeries(filePaths, iterator, cb);
+};
+
 var connect = function (opts, cb) {
   if (arguments.length === 0 || !opts || !optsChecker(opts)) {
     cb = typeof(cb) !== 'function' ? opts : cb;
@@ -123,16 +136,7 @@ var connect = function (opts, cb) {
   return db;
 };
 
-exports.Text = Query.Text;
-for (var k in Query.Comparators) {
-  exports[Query.Comparators[k]] = Query[Query.Comparators[k]];
-}
-
-exports.express = function () {
-  return require("./Express").apply(this, arguments);
-};
-
-exports.use = function (connection, proto, opts, cb) {
+var use = function (connection, proto, opts, cb) {
   if (DriverAliases[proto]) {
     proto = DriverAliases[proto];
   }
@@ -153,8 +157,20 @@ exports.use = function (connection, proto, opts, cb) {
   } catch (ex) {
     return cb(ex);
   }
+}
+
+exports.Text = Query.Text;
+for (var k in Query.Comparators) {
+  exports[Query.Comparators[k]] = Query[Query.Comparators[k]];
+}
+
+exports.express = function () {
+  return require("./Express").apply(this, arguments);
 };
 
+exports.use = use;
+exports.useAsync = Promise.promisify(use);
+
 /**
  *
  * @param opts
@@ -226,7 +242,7 @@ ORM.prototype.use = function (plugin_const, opts) {
   return this;
 };
 ORM.prototype.define = function (name, properties, opts) {
-    var i;
+  var i;
 
   properties = properties || {};
   opts       = opts || {};
@@ -290,7 +306,6 @@ ORM.prototype.closeAsync = Promise.promisify(ORM.prototype.close);
 
 ORM.prototype.load = function () {
   var files = _.flatten(Array.prototype.slice.apply(arguments));
-  var self  = this;
   var cb    = function () {};
 
   if (typeof files[files.length - 1] == "function") {
@@ -307,15 +322,22 @@ ORM.prototype.load = function () {
     }());
   }
 
-  var iterator = function (filePath, cb) {
-    try {
-      require(filePath)(self, cb);
-    } catch (err) {
-      return cb(err)
-    }
-  };
+  fileLoader.call(this, filesWithPath, cb);
+};
+
+ORM.prototype.loadAsync = function () {
+  var files = _.flatten(Array.prototype.slice.apply(arguments));
+  var filesWithPath = [];
+  // Due to intricacies of `Utilities.getRealPath` the following
+  // code has to look as it does.
+
+  for(var a = 0; a < files.length; a++) {
+    filesWithPath.push(function () {
+      return Utilities.getRealPath(files[a], 4)
+    }());
+  }
 
-  async.eachSeries(filesWithPath, iterator, cb);
+  return Promise.promisify(fileLoader, { context: this })(filesWithPath)
 };
 
 ORM.prototype.sync = function (cb) {
diff --git a/test/integration/db.js b/test/integration/db.js
index af06368a..804c6986 100644
--- a/test/integration/db.js
+++ b/test/integration/db.js
@@ -1,146 +1,364 @@
 var should = require('should');
+var path = require('path');
 var helper = require('../support/spec_helper');
-var sinon  = require('sinon');
+var sinon = require('sinon');
 var common = require('../common');
 
-describe('DB', function () {
+describe("db.driver", function () {
   var db = null;
-  beforeEach(function (done) {
+
+  before(function (done) {
     helper.connect(function (connection) {
       db = connection;
 
-      return done();
+      var Log = db.define('log', {
+        what: { type: 'text' },
+        when: { type: 'date', time: true },
+        who: { type: 'text' }
+      });
+
+      helper.dropSync(Log, function (err) {
+        if (err) return done(err);
+
+        Log.create([
+          { what: "password reset", when: new Date('2013/04/07 12:33:05'), who: "jane" },
+          { what: "user login", when: new Date('2013/04/07 13:01:44'), who: "jane" },
+          { what: "user logout", when: new Date('2013/05/12 04:09:31'), who: "john" }
+        ], done);
+      });
     });
   });
 
-  afterEach(function () {
+  after(function () {
     return db.close();
   });
 
-  describe('db.syncPromise()', function () {
-    it('should call sync for each model', function (done) {
-      db.define("my_model", {
-        property: String
+  it("should be available", function () {
+    should.exist(db.driver);
+  });
+
+  if (common.protocol() == "mongodb") return;
+
+  describe("query", function () {
+    it("should be available", function () {
+      should.exist(db.driver.query);
+    });
+
+    describe('#execQueryAsync', function () {
+      it('should execute sql queries', function (done) {
+        db.driver.execQueryAsync('SELECT id FROM log')
+          .then(function (data) {
+            should(JSON.stringify(data) == JSON.stringify([{ id: 1 }, { id: 2 }, { id: 3 }]));
+            done()
+          })
+          .catch(function (err) {
+            done(err);
+          });
       });
-      db.define("my_model2", {
-        property: String
+
+      it("should escape sql queries", function (done) {
+        var query = "SELECT log.?? FROM log WHERE log.?? LIKE ? AND log.?? > ?";
+        var args = ['what', 'who', 'jane', 'when', new Date('2013/04/07 12:40:00')];
+        db.driver.execQueryAsync(query, args)
+          .then(function (data) {
+            should(JSON.stringify(data) == JSON.stringify([{ "what": "user login" }]));
+            done();
+          })
+          .catch(function (err) {
+            done(err);
+          });
       });
-      var syncStub = sinon.stub(db.models['my_model'], 'sync').callsFake(function (cb) {
-        cb(null, {})
+    });
+
+    describe('#eagerQuery', function () {
+      var fixture = {
+        association: {
+          model: {
+            table: 'dog'
+          },
+          field: {
+            dog_id: {
+              type: 'serial',
+              key: true,
+              required: false,
+              klass: 'primary',
+              enumerable: true,
+              mapsTo: 'dog_id',
+              name: 'dog_id'
+            }
+          },
+          mergeAssocId: {
+            family_id: {
+              type: 'integer',
+              required: true,
+              klass: 'primary',
+              enumerable: true,
+              mapsTo: 'family_id',
+              name: 'family_id'
+            }
+          },
+          mergeTable: 'dog_family',
+        },
+        opts: {
+          only: ['name', 'id'],
+          keys: ['id'],
+        },
+        expectedQuery: {
+          postgres: 'SELECT "t1"."name", "t1"."id", "t2"."dog_id" AS "$p" FROM "dog" "t1" JOIN "dog_family" "t2" ON "t2"."family_id" = "t1"."id" WHERE "t2"."dog_id" IN (1, 5)',
+          mysql: 'SELECT `t1`.`name`, `t1`.`id`, `t2`.`dog_id` AS `$p` FROM `dog` `t1` JOIN `dog_family` `t2` ON `t2`.`family_id` = `t1`.`id` WHERE `t2`.`dog_id` IN (1, 5)',
+          sqlite: 'SELECT `t1`.`name`, `t1`.`id`, `t2`.`dog_id` AS `$p` FROM `dog` `t1` JOIN `dog_family` `t2` ON `t2`.`family_id` = `t1`.`id` WHERE `t2`.`dog_id` IN (1, 5)'
+        }
+      };
+
+      describe('cb', function () {
+        it('should build correct query', function (done) {
+          var execSimpleQueryStub = sinon.stub(db.driver, 'execSimpleQuery')
+            .callsFake(function (q, cb) {
+              cb();
+            });
+
+          db.driver.eagerQuery(fixture.association, fixture.opts, [1, 5], function (err, data) {
+            if (err) {
+              execSimpleQueryStub.restore();
+              done(err);
+            }
+            should.equal(execSimpleQueryStub.calledOnce, true);
+            should.equal(execSimpleQueryStub.lastCall.args[0], fixture.expectedQuery[common.protocol()]);
+            execSimpleQueryStub.restore();
+            done();
+          });
+        });
       });
-      var syncStub2 = sinon.stub(db.models['my_model2'], 'sync').callsFake(function (cb) {
-        cb(null, {})
+
+      describe('async', function () {
+        it('should build correct query', function (done) {
+          var execSimpleQueryStub = sinon.stub(db.driver, 'execSimpleQuery')
+            .callsFake(function (q, cb) {
+              cb();
+            });
+          db.driver.eagerQueryAsync(fixture.association, fixture.opts, [1, 5])
+            .then(function () {
+              should.equal(execSimpleQueryStub.calledOnce, true);
+              should.equal(execSimpleQueryStub.lastCall.args[0], fixture.expectedQuery[common.protocol()]);
+              execSimpleQueryStub.restore();
+              done();
+            })
+            .catch(function (err) {
+              execSimpleQueryStub.restore();
+              done(err);
+            });
+        });
       });
-      db.syncPromise()
-        .then(function () {
-          should.equal(syncStub.calledOnce, true);
-          should.equal(syncStub2.calledOnce, true);
+    });
+
+    describe("#execQuery", function () {
+      it("should execute sql queries", function (done) {
+        db.driver.execQuery("SELECT id FROM log", function (err, data) {
+          should.not.exist(err);
+
+          should(JSON.stringify(data) == JSON.stringify([{ id: 1 }, { id: 2 }, { id: 3 }]));
+          done();
+        });
+      });
+
+      it("should escape sql queries", function (done) {
+        var query = "SELECT log.?? FROM log WHERE log.?? LIKE ? AND log.?? > ?";
+        var args = ['what', 'who', 'jane', 'when', new Date('2013/04/07 12:40:00')];
+        db.driver.execQuery(query, args, function (err, data) {
+          should.not.exist(err);
+
+          should(JSON.stringify(data) == JSON.stringify([{ "what": "user login" }]));
           done();
-        })
-        .catch(function (err) {
-          done(err)
         });
+      });
     });
   });
 
-  describe("db.dropAsync()", function () {
-    it('should should call drop for each model', function (done) {
-      db.define("my_model", {
-        property: String
-      });
+  describe('DB', function () {
+    var db = null;
+    beforeEach(function (done) {
+      helper.connect(function (connection) {
+        db = connection;
 
-      db.define("my_model2", {
-        property: String
+        return done();
       });
+    });
 
-      var dropStub = sinon.stub(db.models['my_model'], 'drop').callsFake(function (cb) {
-        cb(null, {})
-      });
-      var dropStub2 = sinon.stub(db.models['my_model2'], 'drop').callsFake(function (cb) {
-        cb(null, {})
+    afterEach(function () {
+      return db.close();
+    });
+
+    describe('db.syncPromise()', function () {
+      it('should call sync for each model', function (done) {
+        db.define("my_model", {
+          property: String
+        });
+        db.define("my_model2", {
+          property: String
+        });
+        var syncStub = sinon.stub(db.models['my_model'], 'sync').callsFake(function (cb) {
+          cb(null, {})
+        });
+        var syncStub2 = sinon.stub(db.models['my_model2'], 'sync').callsFake(function (cb) {
+          cb(null, {})
+        });
+        db.syncPromise()
+          .then(function () {
+            should.equal(syncStub.calledOnce, true);
+            should.equal(syncStub2.calledOnce, true);
+            done();
+          })
+          .catch(function (err) {
+            done(err)
+          });
       });
-      db.dropAsync()
-        .then(function () {
-          should.equal(dropStub.calledOnce, true);
-          should.equal(dropStub2.calledOnce, true);
-          done();
-        })
-        .catch(function (err) {
-          done(err)
+    });
+
+    describe("db.dropAsync()", function () {
+      it('should should call drop for each model', function (done) {
+        db.define("my_model", {
+          property: String
+        });
+
+        db.define("my_model2", {
+          property: String
         });
+
+        var dropStub = sinon.stub(db.models['my_model'], 'drop').callsFake(function (cb) {
+          cb(null, {})
+        });
+        var dropStub2 = sinon.stub(db.models['my_model2'], 'drop').callsFake(function (cb) {
+          cb(null, {})
+        });
+        db.dropAsync()
+          .then(function () {
+            should.equal(dropStub.calledOnce, true);
+            should.equal(dropStub2.calledOnce, true);
+            done();
+          })
+          .catch(function (err) {
+            done(err)
+          });
+      });
     });
-  });
 
-  describe("db.use()", function () {
-    it("should be able to register a plugin", function (done) {
-      var MyPlugin = require("../support/my_plugin");
-      var opts     = {
-        option       : true,
-        calledDefine : false
-      };
+    describe("db.use()", function () {
+      it("should be able to register a plugin", function (done) {
+        var MyPlugin = require("../support/my_plugin");
+        var opts = {
+          option: true,
+          calledDefine: false
+        };
+
+        db.use(MyPlugin, opts);
 
-      db.use(MyPlugin, opts);
+        var MyModel = db.define("my_model", { // db.define should call plugin.define method
+          property: String
+        });
+
+        opts.calledDefine.should.be.true;
 
-      var MyModel = db.define("my_model", { // db.define should call plugin.define method
-        property: String
+        return done();
       });
 
-      opts.calledDefine.should.be.true;
+      it("a plugin should be able to catch models before defining them", function (done) {
+        var MyPlugin = require("../support/my_plugin");
+        var opts = {
+          option: true,
+          calledDefine: false,
+          beforeDefine: function (name, props, opts) {
+            props.otherprop = Number;
+          }
+        };
 
-      return done();
-    });
+        db.use(MyPlugin, opts);
 
-    it("a plugin should be able to catch models before defining them", function (done) {
-      var MyPlugin = require("../support/my_plugin");
-      var opts     = {
-        option       : true,
-        calledDefine : false,
-        beforeDefine : function (name, props, opts) {
-          props.otherprop = Number;
-        }
-      };
+        var MyModel = db.define("my_model", { // db.define should call plugin.define method
+          property: String
+        });
 
-      db.use(MyPlugin, opts);
+        opts.calledDefine.should.be.true;
+        MyModel.properties.should.have.property("otherprop");
 
-      var MyModel = db.define("my_model", { // db.define should call plugin.define method
-        property: String
+        done();
       });
 
-      opts.calledDefine.should.be.true;
-      MyModel.properties.should.have.property("otherprop");
+      it("should be able to register a plugin as string", function (done) {
+        var opts = {
+          option: true,
+          calledDefine: false
+        };
 
-      done();
-    });
+        db.use("../support/my_plugin", opts);
 
-    it("should be able to register a plugin as string", function (done) {
-      var opts     = {
-        option       : true,
-        calledDefine : false
-      };
+        var MyModel = db.define("my_model", { // db.define should call plugin.define method
+          property: String
+        });
 
-      db.use("../support/my_plugin", opts);
+        opts.calledDefine.should.be.true;
 
-      var MyModel = db.define("my_model", { // db.define should call plugin.define method
-        property: String
+        return done();
       });
+    });
 
-      opts.calledDefine.should.be.true;
+    describe("db.define()", function () {
+      it("should use setting model.namePrefix as table prefix if defined", function (done) {
+        db.settings.set("model.namePrefix", "orm_");
 
-      return done();
+        var Person = db.define("person", {
+          name: String
+        });
+
+        Person.table.should.equal("orm_person");
+
+        return done();
+      });
     });
   });
 
-  describe("db.define()", function() {
-    it("should use setting model.namePrefix as table prefix if defined", function (done) {
-      db.settings.set("model.namePrefix", "orm_");
+  describe("db.loadAsync()", function () {
+    it("should require a file if array", function (done) {
+      var filePath = "../support/spec_load";
+      db.loadAsync([filePath])
+        .then(function () {
+          db.models.should.have.property("person");
+          db.models.should.have.property("pet");
+          done()
+        })
+        .catch(done);
+    });
 
-      var Person = db.define("person", {
-        name: String
-      });
+    it("should require a file if single file path string", function (done) {
+      var filePath = "../support/spec_load";
+      db.loadAsync(filePath)
+        .then(function () {
+          db.models.should.have.property("person");
+          db.models.should.have.property("pet");
+          done()
+        })
+        .catch(done);
+    });
+
+    it("should be able to load more than one file", function (done) {
+      var filePaths = ["../support/spec_load_second", "../support/spec_load_third"];
 
-      Person.table.should.equal("orm_person");
+      db.loadAsync(filePaths)
+        .then(function () {
+          db.models.should.have.property("person");
+          db.models.should.have.property("pet");
+          done()
+        })
+        .catch(done);
+    });
 
-      return done();
+    it("should throw error if files passed like arguments", function (done) {
+      db.loadAsync("../support/spec_load_second", "../support/spec_load_third")
+        .then(function () {
+          db.models.should.have.property("person");
+          db.models.should.have.property("pet");
+          done()
+        })
+        .catch(done);
     });
   });
 
@@ -160,6 +378,16 @@ describe('DB', function () {
       db.load("../support/spec_load_second", "../support/spec_load_third", function (err) {
         should.not.exist(err);
 
+        db.models.should.have.property("person");
+        db.models.should.have.property("pet");
+        return done();
+      });
+    });
+  });
+
+  describe("db.load()", function () {
+    it("should be able to load more than one file", function (done) {
+      db.load("../support/spec_load_second", "../support/spec_load_third", function () {
         db.models.should.have.property("person");
         db.models.should.have.property("pet");
 
@@ -168,9 +396,19 @@ describe('DB', function () {
     });
 
     it("should be able to load more than one file passed as Array", function (done) {
-      db.load([ "../support/spec_load_second", "../support/spec_load_third" ], function (err) {
+      db.load(["../support/spec_load_second", "../support/spec_load_third"], function (err) {
         should.not.exist(err);
 
+        db.models.should.have.property("person");
+        db.models.should.have.property("pet");
+        return done();
+      });
+    });
+  });
+
+  describe("db.load()", function () {
+    it("should be able to load more than one file passed as Array", function (done) {
+      db.load(["../support/spec_load_second", "../support/spec_load_third"], function () {
         db.models.should.have.property("person");
         db.models.should.have.property("pet");
 
@@ -182,17 +420,17 @@ describe('DB', function () {
   describe("db.serial()", function () {
     it("should be able to execute chains in serial", function (done) {
       var Person = db.define("person", {
-        name    : String,
-        surname : String
+        name: String,
+        surname: String
       });
       helper.dropSync(Person, function () {
         Person.create([
-          { name : "John", surname : "Doe" },
-          { name : "Jane", surname : "Doe" }
+          { name: "John", surname: "Doe" },
+          { name: "Jane", surname: "Doe" }
         ], function () {
           db.serial(
-            Person.find({ surname : "Doe" }),
-            Person.find({ name    : "John" })
+            Person.find({ surname: "Doe" }),
+            Person.find({ name: "John" })
           ).get(function (err, DoeFamily, JohnDoe) {
             should.equal(err, null);
 
@@ -214,174 +452,4 @@ describe('DB', function () {
     });
   });
 
-  describe("db.driver", function () {
-    var db = null;
-
-    before(function (done) {
-      helper.connect(function (connection) {
-        db = connection;
-
-        var Log = db.define('log', {
-          what : { type: 'text' },
-          when : { type: 'date', time: true },
-          who  : { type: 'text' }
-        });
-
-        helper.dropSync(Log, function (err) {
-          if (err) return done(err);
-
-          Log.create([
-            { what: "password reset", when: new Date('2013/04/07 12:33:05'), who: "jane" },
-            { what: "user login",     when: new Date('2013/04/07 13:01:44'), who: "jane" },
-            { what: "user logout",    when: new Date('2013/05/12 04:09:31'), who: "john" }
-          ], done);
-        });
-      });
-    });
-
-    after(function () {
-      return db.close();
-    });
-
-    it("should be available", function () {
-      should.exist(db.driver);
-    });
-
-    if (common.protocol() == "mongodb") return;
-
-    describe("query", function () {
-      it("should be available", function () {
-        should.exist(db.driver.query);
-      });
-
-      describe('#execQueryAsync', function () {
-        it('should execute sql queries', function (done) {
-          db.driver.execQueryAsync('SELECT id FROM log')
-            .then(function (data) {
-              should(JSON.stringify(data) == JSON.stringify([{ id: 1 }, { id: 2 }, { id: 3 }]));
-              done()
-            })
-            .catch(function (err) {
-              done(err);
-            });
-        });
-
-        it("should escape sql queries", function (done) {
-          var query = "SELECT log.?? FROM log WHERE log.?? LIKE ? AND log.?? > ?";
-          var args = ['what', 'who', 'jane', 'when', new Date('2013/04/07 12:40:00')];
-          db.driver.execQueryAsync(query, args)
-            .then(function (data) {
-              should(JSON.stringify(data) == JSON.stringify([{ "what": "user login" }]));
-              done();
-            })
-            .catch(function (err) {
-              done(err);
-            });
-        });
-      });
-
-      describe('#eagerQuery', function () {
-        var fixture = {
-          association: {
-            model: {
-              table: 'dog'
-            },
-            field: {
-              dog_id: {
-                type: 'serial',
-                key: true,
-                required: false,
-                klass: 'primary',
-                enumerable: true,
-                mapsTo: 'dog_id',
-                name: 'dog_id'
-              }
-            },
-            mergeAssocId: {
-              family_id: {
-                type: 'integer',
-                required: true,
-                klass: 'primary',
-                enumerable: true,
-                mapsTo: 'family_id',
-                name: 'family_id'
-              }
-            },
-            mergeTable: 'dog_family',
-          },
-          opts: {
-            only: ['name', 'id'],
-            keys: ['id'],
-          },
-          expectedQuery: {
-            postgres: 'SELECT "t1"."name", "t1"."id", "t2"."dog_id" AS "$p" FROM "dog" "t1" JOIN "dog_family" "t2" ON "t2"."family_id" = "t1"."id" WHERE "t2"."dog_id" IN (1, 5)',
-            mysql:    'SELECT `t1`.`name`, `t1`.`id`, `t2`.`dog_id` AS `$p` FROM `dog` `t1` JOIN `dog_family` `t2` ON `t2`.`family_id` = `t1`.`id` WHERE `t2`.`dog_id` IN (1, 5)',
-            sqlite:   'SELECT `t1`.`name`, `t1`.`id`, `t2`.`dog_id` AS `$p` FROM `dog` `t1` JOIN `dog_family` `t2` ON `t2`.`family_id` = `t1`.`id` WHERE `t2`.`dog_id` IN (1, 5)'
-          }
-        };
-
-        describe('cb', function () {
-          it('should build correct query', function (done) {
-            var execSimpleQueryStub = sinon.stub(db.driver, 'execSimpleQuery')
-              .callsFake(function (q, cb) {
-                cb();
-              });
-
-            db.driver.eagerQuery(fixture.association, fixture.opts, [ 1, 5 ], function (err, data) {
-              if (err) {
-                execSimpleQueryStub.restore();
-                done(err);
-              }
-              should.equal(execSimpleQueryStub.calledOnce, true);
-              should.equal(execSimpleQueryStub.lastCall.args[0], fixture.expectedQuery[common.protocol()]);
-              execSimpleQueryStub.restore();
-              done();
-            });
-          });
-        });
-
-        describe('async', function () {
-          it('should build correct query', function (done) {
-            var execSimpleQueryStub = sinon.stub(db.driver, 'execSimpleQuery')
-              .callsFake(function (q, cb) {
-                cb();
-              });
-            db.driver.eagerQueryAsync(fixture.association, fixture.opts, [ 1, 5 ])
-              .then(function () {
-                should.equal(execSimpleQueryStub.calledOnce, true);
-                should.equal(execSimpleQueryStub.lastCall.args[0], fixture.expectedQuery[common.protocol()]);
-                execSimpleQueryStub.restore();
-                done();
-              })
-              .catch(function (err) {
-                execSimpleQueryStub.restore();
-                done(err);
-              });
-          });
-        });
-      });
-
-      describe("#execQuery", function () {
-        it("should execute sql queries", function (done) {
-          db.driver.execQuery("SELECT id FROM log", function (err, data) {
-            should.not.exist(err);
-
-            should(JSON.stringify(data) == JSON.stringify([{ id: 1 }, { id: 2 }, { id: 3 }]));
-            done();
-          });
-        });
-
-        it("should escape sql queries", function (done) {
-          var query = "SELECT log.?? FROM log WHERE log.?? LIKE ? AND log.?? > ?";
-          var args  = ['what', 'who', 'jane', 'when', new Date('2013/04/07 12:40:00')];
-          db.driver.execQuery(query, args, function (err, data) {
-            should.not.exist(err);
-
-            should(JSON.stringify(data) == JSON.stringify([{ "what": "user login" }]));
-            done();
-          });
-        });
-      });
-    });
-  });
-});
+});
\ No newline at end of file
diff --git a/test/integration/orm-exports.js b/test/integration/orm-exports.js
index e5fce2d2..c613ca90 100644
--- a/test/integration/orm-exports.js
+++ b/test/integration/orm-exports.js
@@ -12,7 +12,9 @@ describe("ORM", function() {
     it("should expose .express(), .use() and .connect()", function (done) {
       ORM.express.should.be.a.Function();
       ORM.use.should.be.a.Function();
+      ORM.useAsync.should.be.a.Function();
       ORM.connect.should.be.a.Function();
+      ORM.connectAsync.should.be.a.Function();
 
       return done();
     });
@@ -54,7 +56,7 @@ describe("ORM", function() {
     });
 
     it('should throw error with correct message when protocol not supported', function (done) {
-      ORM.connectAsync("pg://127.0.0.6")
+      ORM.connectAsync("bd://127.0.0.6")
         .then(function () {
           done('Fail.');
         })
@@ -599,4 +601,39 @@ describe("ORM", function() {
       });
     });
   });
+
+  describe("ORM.useAsync()", function () {
+    it("should be able to use an established connection", function (done) {
+      var db = new sqlite.Database(':memory:');
+
+      ORM.useAsync(db, "sqlite")
+        .then(function () {
+          done();
+        })
+        .catch(done);
+    });
+
+    it("should be accept protocol alias", function (done) {
+      var db = new pg.Client();
+
+      ORM.useAsync(db, "pg")
+        .then(function () {
+          done();
+        })
+        .catch(done);
+    });
+
+    it("should throw an error in callback if protocol not supported", function (done) {
+      var db = new pg.Client();
+
+      ORM.useAsync(db, "unknowndriver")
+        .then(function () {
+          done(new Error('Should throw'));
+        })
+        .catch(function (err) {
+          should.exist(err);
+          done();
+        });
+    });
+  });
 });
\ No newline at end of file

From 53db079d5b5410be55616c55c6556237aee62a78 Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Tue, 12 Sep 2017 11:42:47 +0300
Subject: [PATCH 1146/1246] Promisified neccessary functions

---
 lib/ChainFind.js                           |  33 ++--
 test/integration/model-find-chain-async.js | 194 +++++++++++++++++++++
 2 files changed, 205 insertions(+), 22 deletions(-)
 create mode 100644 test/integration/model-find-chain-async.js

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 230679c7..b1e52498 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -2,8 +2,7 @@ var _             = require("lodash");
 var async         = require("async");
 var Utilities     = require("./Utilities");
 var ChainInstance = require("./ChainInstance");
-var Promise       = require("./Promise").Promise;
-var Bluebird      = require("bluebird");
+var Promise       = require("bluebird");
 
 module.exports = ChainFind;
 
@@ -90,8 +89,6 @@ function ChainFind(Model, opts) {
     });
   }
 
-  var chainRunAsync = Bluebird.promisify(chainRun);
-
   var promise = null;
   var chain = {
     find: function () {
@@ -151,9 +148,9 @@ function ChainFind(Model, opts) {
         opts.order = [];
       }
       if (property[0] === "-") {
-        opts.order.push([ property.substr(1), "Z" ]);
+        opts.order.push([property.substr(1), "Z"]);
       } else {
-        opts.order.push([ property, (order && order.toUpperCase() === "Z" ? "Z" : "A") ]);
+        opts.order.push([property, (order && order.toUpperCase() === "Z" ? "Z" : "A")]);
       }
       return this;
     },
@@ -161,7 +158,7 @@ function ChainFind(Model, opts) {
       if (!Array.isArray(opts.order)) {
         opts.order = [];
       }
-      opts.order.push([ str, args || [] ]);
+      opts.order.push([str, args || []]);
       return this;
     },
     count: function (cb) {
@@ -209,6 +206,7 @@ function ChainFind(Model, opts) {
       });
       return this;
     },
+
     first: function (cb) {
       return this.run(function (err, items) {
         return cb(err, items && items.length > 0 ? items[0] : null);
@@ -226,21 +224,6 @@ function ChainFind(Model, opts) {
       chainRun(cb);
       return this;
     },
-    runAsync: chainRunAsync,
-    success: function (cb) {
-      if (!promise) {
-        promise = new Promise();
-        promise.handle(this.all);
-      }
-      return promise.success(cb);
-    },
-    fail: function (cb) {
-      if (!promise) {
-        promise = new Promise();
-        promise.handle(this.all);
-      }
-      return promise.fail(cb);
-    },
     eager: function () {
       // This will allow params such as ("abc", "def") or (["abc", "def"])
       var associations = _.flatten(arguments);
@@ -259,6 +242,12 @@ function ChainFind(Model, opts) {
   };
   chain.all = chain.where = chain.find;
 
+  chain.findAsync   = Promise.promisify(chain.find);
+  chain.firstAsync  = Promise.promisify(chain.first);
+  chain.lastAsync   = Promise.promisify(chain.last);
+  chain.runAsync    = Promise.promisify(chain.run);
+  chain.removeAsync = Promise.promisify(chain.remove);
+
   if (opts.associations) {
     for (var i = 0; i < opts.associations.length; i++) {
       addChainMethod(chain, opts.associations[i], opts);
diff --git a/test/integration/model-find-chain-async.js b/test/integration/model-find-chain-async.js
new file mode 100644
index 00000000..05970ebd
--- /dev/null
+++ b/test/integration/model-find-chain-async.js
@@ -0,0 +1,194 @@
+var async    = require('async');
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var ORM      = require('../../');
+var common   = require('../common');
+
+describe("Model.find() chaining", function() {
+  var db = null;
+  var Person = null;
+  var Dog = null;
+
+  var setup = function (extraOpts) {
+    if (!extraOpts) extraOpts = {};
+
+    return function (done) {
+      Person = db.define("person", {
+        name    : String,
+        surname : String,
+        age     : Number
+      }, extraOpts);
+      Person.hasMany("parents");
+      Person.hasOne("friend");
+
+      ORM.singleton.clear(); // clear identityCache cache
+
+      return helper.dropSync(Person, function () {
+        Person.create([{
+          name      : "John",
+          surname   : "Doe",
+          age       : 18,
+          friend_id : 1
+        }, {
+          name      : "Jane",
+          surname   : "Doe",
+          age       : 20,
+          friend_id : 1
+        }, {
+          name      : "Jane",
+          surname   : "Dean",
+          age       : 18,
+          friend_id : 1
+        }], done);
+      });
+    };
+  };
+
+  var setup2 = function () {
+    return function (done) {
+      Dog = db.define("dog", {
+        name: String,
+      });
+      Dog.hasMany("friends");
+      Dog.hasMany("family");
+
+      ORM.singleton.clear(); // clear identityCache cache
+
+      return helper.dropSync(Dog, function () {
+        Dog.create([{
+          name    : "Fido",
+          friends : [{ name: "Gunner" }, { name: "Chainsaw" }],
+          family  : [{ name: "Chester" }]
+        }, {
+          name    : "Thumper",
+          friends : [{ name: "Bambi" }],
+          family  : [{ name: "Princess" }, { name: "Butch" }]
+        }], done);
+      });
+    };
+  };
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  describe(".firstAsync()", function () {
+    before(setup());
+
+    it("should return only the first element", function () {
+      return Person.find()
+        .order("-age")
+        .firstAsync()
+        .then(function (JaneDoe) {
+          JaneDoe.name.should.equal("Jane");
+          JaneDoe.surname.should.equal("Doe");
+          JaneDoe.age.should.equal(20);
+        });
+    });
+
+    it("should return null if not found", function () {
+      return Person.find({ name: "Jack" })
+        .firstAsync()
+        .then(function (Jack) {
+          should.equal(Jack, null);
+        });
+    });
+  });
+
+  describe(".lastAsync()", function () {
+    before(setup());
+
+    it("should return only the last element", function () {
+      return Person.find()
+        .order("age")
+        .lastAsync()
+        .then(function (JaneDoe) {
+          JaneDoe.name.should.equal("Jane");
+          JaneDoe.surname.should.equal("Doe");
+          JaneDoe.age.should.equal(20);
+        });
+    });
+
+    it("should return null if not found", function () {
+      return Person.find({ name: "Jack" })
+        .lastAsync()
+        .then(function (Jack) {
+          should.equal(Jack, null);
+        });
+    });
+  });
+
+  describe(".findAsync()", function () {
+    before(setup());
+
+    it("should not change find if no arguments", function () {
+      return Person.find()
+        .findAsync()
+        .then(function(Person) {
+          should.equal(Person.length, 3);
+        });
+    });
+
+    it("should restrict conditions if passed", function (done) {
+      Person.find()
+        .findAsync({ age: 18 })
+        .then(function(Person) {
+          should.equal(Person.length, 2);
+          done();
+        })
+        .catch(function(err) {
+          done(err);
+        });
+    });
+
+    if (common.protocol() == "mongodb") return;
+
+  });
+
+  describe(".removeAsync()", function () {
+    var hookFired = false;
+
+    before(setup({
+      hooks: {
+        beforeRemove: function () {
+          hookFired = true;
+        }
+      }
+    }));
+
+    it("should have no problems if no results found", function (done) {
+      Person.find({ age: 22 })
+        .removeAsync()
+        .then(function () {
+          Person.find(function(err, data) {
+            should.equal(data.length, 3);
+            done();
+          });
+        }).catch(function(err) {
+          done(err);
+        });
+    });
+
+    it("should remove results without calling hooks", function (done) {
+      Person.find({ age: 20 })
+        .removeAsync()
+        .then(function () {
+          should.equal(hookFired, false);
+          Person.find(function (err, data) {
+            should.equal(data.length, 2);
+            done();
+          });
+        }).catch(function(err) {
+          done(err);
+        });
+    });
+  });
+});
\ No newline at end of file

From 41a2d6aa20feffb144cb82226783e39166d24839 Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Tue, 12 Sep 2017 11:46:37 +0300
Subject: [PATCH 1147/1246] Remove success and fail tests

---
 test/integration/model-find-chain.js | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/test/integration/model-find-chain.js b/test/integration/model-find-chain.js
index 6c5f7498..75d0f321 100644
--- a/test/integration/model-find-chain.js
+++ b/test/integration/model-find-chain.js
@@ -822,32 +822,4 @@ describe("Model.find() chaining", function() {
       });
     });
   });
-
-  describe(".success()", function () {
-    before(setup());
-
-    it("should return a Promise with .fail() method", function (done) {
-      Person.find().success(function (people) {
-        should(Array.isArray(people));
-
-        return done();
-      }).fail(function (err) {
-        // never called..
-      });
-    });
-  });
-
-  describe(".fail()", function () {
-    before(setup());
-
-    it("should return a Promise with .success() method", function (done) {
-      Person.find().fail(function (err) {
-        // never called..
-      }).success(function (people) {
-        should(Array.isArray(people));
-
-        return done();
-      });
-    });
-  });
 });

From 986606a240570eb285f529a177ba28dfe4d1b232 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Tue, 12 Sep 2017 11:50:59 +0300
Subject: [PATCH 1148/1246] add existAsync, oneAsync, findAsync, countAsync
 methods

---
 lib/Model.js                          |  16 ++
 test/integration/model-countAsync.js  |  68 +++++
 test/integration/model-create.js      |   1 -
 test/integration/model-existsAsync.js | 122 +++++++++
 test/integration/model-findAsync.js   | 352 ++++++++++++++++++++++++++
 test/integration/model-one.js         |   1 -
 test/integration/model-oneAsync.js    |  96 +++++++
 7 files changed, 654 insertions(+), 2 deletions(-)
 create mode 100644 test/integration/model-countAsync.js
 create mode 100644 test/integration/model-existsAsync.js
 create mode 100644 test/integration/model-findAsync.js
 create mode 100644 test/integration/model-oneAsync.js

diff --git a/lib/Model.js b/lib/Model.js
index ab34f9dc..6cafd884 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -49,6 +49,7 @@ function Model(opts) {
       return this;
     };
   };
+
   var createInstance = function (data, inst_opts, cb) {
     if (!inst_opts) {
       inst_opts = {};
@@ -148,6 +149,8 @@ function Model(opts) {
     return instance;
   };
 
+
+
   var model = function () {
       var instance, i;
 
@@ -221,6 +224,8 @@ function Model(opts) {
     return cb(new ORMError("Driver does not support Model.drop()", 'NO_SUPPORT', { model: opts.table }));
   };
 
+  model.dropAsync = Promise.promisify(model.drop);
+
   model.sync = function (cb) {
     if (arguments.length === 0) {
       cb = function () {};
@@ -249,6 +254,8 @@ function Model(opts) {
     return cb(new ORMError("Driver does not support Model.sync()", 'NO_SUPPORT', { model: opts.table }));
   };
 
+  model.syncPromise = Promise.promisify(model.sync);
+
   model.get = function () {
     var conditions = {};
     var options    = {};
@@ -436,7 +443,10 @@ function Model(opts) {
     }
   };
 
+  model.findAsync = Promise.promisify(model.find);
+
   model.where = model.all = model.find;
+  model.whereAsync = model.allAsync = model.findAsync;
 
   model.one = function () {
     var args = Array.prototype.slice.apply(arguments);
@@ -466,6 +476,8 @@ function Model(opts) {
     return this.find.apply(this, args);
   };
 
+  model.oneAsync = Promise.promisify(model.one);
+
   model.count = function () {
     var conditions = null;
     var cb         = null;
@@ -498,6 +510,8 @@ function Model(opts) {
     return this;
   };
 
+  model.countAsync = Promise.promisify(model.count);
+
   model.aggregate = function () {
     var conditions = {};
     var propertyList = [];
@@ -563,6 +577,8 @@ function Model(opts) {
     return this;
   };
 
+  model.existsAsync = Promise.promisify(model.exists);
+
   model.create = function () {
     var itemsParams = [];
     var items       = [];
diff --git a/test/integration/model-countAsync.js b/test/integration/model-countAsync.js
new file mode 100644
index 00000000..fc817b96
--- /dev/null
+++ b/test/integration/model-countAsync.js
@@ -0,0 +1,68 @@
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+
+describe("Model.count()", function() {
+  var db = null;
+  var Person = null;
+
+  var setup = function () {
+    return function (done) {
+      Person = db.define("person", {
+        name   : String
+      });
+
+      return helper.dropSync(Person, function () {
+        Person.create([{
+          id  : 1,
+          name: "John Doe"
+        }, {
+          id  : 2,
+          name: "Jane Doe"
+        }, {
+          id  : 3,
+          name: "John Doe"
+        }], done);
+      });
+    };
+  };
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  describe("without conditions", function () {
+    before(setup());
+
+    it("should return all items in model", function (done) {
+      Person.countAsync()
+        .then(function (count) {
+          count.should.equal(3);
+
+          return done();
+        })
+        .catch(done);
+    });
+  });
+
+  describe("with conditions", function () {
+    before(setup());
+
+    it("should return only matching items", function (done) {
+      Person.countAsync({ name: "John Doe" })
+        .then(function (count) {
+          count.should.equal(2);
+
+          return done();
+        })
+        .catch(done);
+    });
+  });
+});
diff --git a/test/integration/model-create.js b/test/integration/model-create.js
index 4e2b7c37..9217c957 100644
--- a/test/integration/model-create.js
+++ b/test/integration/model-create.js
@@ -1,6 +1,5 @@
 var should   = require('should');
 var helper   = require('../support/spec_helper');
-var ORM      = require('../../');
 
 describe("Model.create()", function() {
   var db = null;
diff --git a/test/integration/model-existsAsync.js b/test/integration/model-existsAsync.js
new file mode 100644
index 00000000..cf4a7546
--- /dev/null
+++ b/test/integration/model-existsAsync.js
@@ -0,0 +1,122 @@
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+
+describe("Model.exists()", function() {
+  var db     = null;
+  var Person = null;
+  var good_id, bad_id;
+
+  var setup = function () {
+    return function (done) {
+      Person = db.define("person", {
+        name   : String
+      });
+
+      return helper.dropSync(Person, function () {
+        Person.create([{
+          name: "Jeremy Doe"
+        }, {
+          name: "John Doe"
+        }, {
+          name: "Jane Doe"
+        }], function (err, people) {
+          good_id = people[0][Person.id];
+
+          if (typeof good_id == "number") {
+            // numeric ID
+            bad_id = good_id * 100;
+          } else {
+            // string ID, keep same length..
+            bad_id = good_id.split('').reverse().join('');
+          }
+
+          return done();
+        });
+      });
+    };
+  };
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  describe("with an id", function () {
+    before(setup());
+
+    it("should return true if found", function (done) {
+      Person.existsAsync(good_id)
+        .then(function (exists) {
+          exists.should.be.true;
+
+          return done();
+        })
+        .catch(done);
+    });
+
+    it("should return false if not found", function (done) {
+      Person.existsAsync(bad_id)
+        .then(function (exists) {
+          exists.should.be.false;
+
+          return done();
+        })
+        .catch(done);
+    });
+  });
+
+  describe("with a list of ids", function () {
+    before(setup());
+
+    it("should return true if found", function (done) {
+      Person.existsAsync([ good_id ])
+        .then(function (exists) {
+          exists.should.be.true;
+
+          return done();
+        })
+        .catch(done);
+    });
+
+    it("should return false if not found", function (done) {
+      Person.exists([ bad_id ], function (err, exists) {
+        should.equal(err, null);
+
+        exists.should.be.false;
+
+        return done();
+      });
+    });
+  });
+
+  describe("with a conditions object", function () {
+    before(setup());
+
+    it("should return true if found", function (done) {
+      Person.existsAsync({ name: "John Doe" })
+        .then(function (exists) {
+          exists.should.be.true;
+
+          return done();
+        })
+        .catch(done);
+    });
+
+    it("should return false if not found", function (done) {
+      Person.existsAsync({ name: "Jack Doe" })
+        .then(function (exists) {
+          exists.should.be.false;
+
+          return done();
+        })
+        .catch(done);
+    });
+  });
+});
diff --git a/test/integration/model-findAsync.js b/test/integration/model-findAsync.js
new file mode 100644
index 00000000..58a05f5a
--- /dev/null
+++ b/test/integration/model-findAsync.js
@@ -0,0 +1,352 @@
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var ORM      = require('../../');
+
+describe("Model.findAsync()", function() {
+  var db = null;
+  var Person = null;
+
+  var setup = function () {
+    return function (done) {
+      Person = db.define("person", {
+        name    : String,
+        surname : String,
+        age     : Number,
+        male    : Boolean
+      });
+
+      return helper.dropSync(Person, function () {
+        Person.create([{
+          name    : "John",
+          surname : "Doe",
+          age     : 18,
+          male    : true
+        }, {
+          name    : "Jane",
+          surname : "Doe",
+          age     : 16,
+          male    : false
+        }, {
+          name    : "Jeremy",
+          surname : "Dean",
+          age     : 18,
+          male    : true
+        }, {
+          name    : "Jack",
+          surname : "Dean",
+          age     : 20,
+          male    : true
+        }, {
+          name    : "Jasmine",
+          surname : "Doe",
+          age     : 20,
+          male    : false
+        }], done);
+      });
+    };
+  };
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  describe("without arguments", function () {
+    before(setup());
+
+    it("should return all items", function (done) {
+      Person.findAsync()
+        .then(function (people) {
+          people.should.be.a.Object();
+          people.should.have.property("length", 5);
+
+          return done();
+        })
+        .catch(done);
+    });
+  });
+
+  describe("with a number as argument", function () {
+    before(setup());
+
+    it("should use it as limit", function (done) {
+      Person.findAsync(2)
+        .then(function (people) {
+          people.should.be.a.Object();
+          people.should.have.property("length", 2);
+
+          return done();
+        })
+        .catch(done);
+    });
+  });
+
+  describe("with a string argument", function () {
+    before(setup());
+
+    it("should use it as property ascending order", function (done) {
+      Person.findAsync("age")
+        .then(function (people) {
+          people.should.be.a.Object();
+          people.should.have.property("length", 5);
+          people[0].age.should.equal(16);
+          people[4].age.should.equal(20);
+
+          return done();
+        })
+        .catch(done);
+    });
+
+    it("should use it as property descending order if starting with '-'", function (done) {
+      Person.findAsync("-age")
+        .then(function (people) {
+          people.should.be.a.Object();
+          people.should.have.property("length", 5);
+          people[0].age.should.equal(20);
+          people[4].age.should.equal(16);
+
+          return done();
+        })
+        .catch(done);
+    });
+  });
+
+  describe("with an Array as argument", function () {
+    before(setup());
+
+    it("should use it as property ascending order", function (done) {
+      Person.findAsync([ "age" ])
+        .then(function (people) {
+          people.should.be.a.Object();
+          people.should.have.property("length", 5);
+          people[0].age.should.equal(16);
+          people[4].age.should.equal(20);
+
+          return done();
+      })
+        .catch(done);
+    });
+
+    it("should use it as property descending order if starting with '-'", function (done) {
+      Person.findAsync([ "-age" ])
+        .then(function (people) {
+          people.should.be.a.Object();
+          people.should.have.property("length", 5);
+          people[0].age.should.equal(20);
+          people[4].age.should.equal(16);
+
+          return done();
+      })
+        .catch(done);
+    });
+
+    it("should use it as property descending order if element is 'Z'", function (done) {
+      Person.findAsync([ "age", "Z" ])
+        .then(function (people) {
+          people.should.be.a.Object();
+          people.should.have.property("length", 5);
+          people[0].age.should.equal(20);
+          people[4].age.should.equal(16);
+
+          return done();
+      })
+        .catch(done);
+    });
+
+    it("should accept multiple ordering", function (done) {
+      Person.findAsync([ "age", "name", "Z" ])
+        .then(function (people) {
+          people.should.be.a.Object();
+          people.should.have.property("length", 5);
+          people[0].age.should.equal(16);
+          people[4].age.should.equal(20);
+
+          return done();
+      })
+        .catch(done);
+    });
+
+    it("should accept multiple ordering using '-' instead of 'Z'", function (done) {
+      Person.findAsync([ "age", "-name" ])
+        .then(function (people) {
+          people.should.be.a.Object();
+          people.should.have.property("length", 5);
+          people[0].age.should.equal(16);
+          people[4].age.should.equal(20);
+
+          return done();
+      })
+        .catch(done);
+    });
+  });
+
+  describe("with an Object as argument", function () {
+    before(setup());
+
+    it("should use it as conditions", function (done) {
+      Person.findAsync({ age: 16 })
+        .then(function (people) {
+          people.should.be.a.Object();
+          people.should.have.property("length", 1);
+          people[0].age.should.equal(16);
+
+          return done();
+        })
+        .catch(done);
+    });
+
+    it("should accept comparison objects", function (done) {
+      Person.findAsync({ age: ORM.gt(18) })
+        .then(function (people) {
+          people.should.be.a.Object();
+          people.should.have.property("length", 2);
+          people[0].age.should.equal(20);
+          people[1].age.should.equal(20);
+
+          return done();
+        })
+        .catch(done);
+    });
+
+    describe("with another Object as argument", function () {
+      before(setup());
+
+      it("should use it as options", function (done) {
+        Person.findAsync({ age: 18 }, 1, { cache: false })
+          .then(function (people) {
+            people.should.be.a.Object();
+            people.should.have.property("length", 1);
+            people[0].age.should.equal(18);
+
+            return done();
+          })
+          .catch(done);
+      });
+
+      describe("if a limit is passed", function () {
+        before(setup());
+
+        it("should use it", function (done) {
+          Person.findAsync({ age: 18 }, { limit: 1 })
+            .then(function (people) {
+              people.should.be.a.Object();
+              people.should.have.property("length", 1);
+              people[0].age.should.equal(18);
+
+              return done();
+            })
+            .catch(done);
+        });
+      });
+
+      describe("if an offset is passed", function () {
+        before(setup());
+
+        it("should use it", function (done) {
+          Person.findAsync({}, { offset: 1 }, "age")
+            .then(function (people) {
+              people.should.be.a.Object();
+              people.should.have.property("length", 4);
+              people[0].age.should.equal(18);
+
+              return done();
+            })
+            .catch(done);
+        });
+      });
+
+      describe("if an order is passed", function () {
+        before(setup());
+
+        it("should use it", function (done) {
+          Person.findAsync({ surname: "Doe" }, { order: "age" })
+            .then(function (people) {
+              people.should.be.a.Object();
+              people.should.have.property("length", 3);
+              people[0].age.should.equal(16);
+
+              return done();
+            })
+            .catch(done);
+        });
+
+        it("should use it and ignore previously defined order", function (done) {
+          Person.findAsync({ surname: "Doe" }, "-age", { order: "age" })
+            .then(function (people) {
+              people.should.be.a.Object();
+              people.should.have.property("length", 3);
+              people[0].age.should.equal(16);
+
+              return done();
+            })
+            .catch(done);
+        });
+      });
+    });
+  });
+
+  describe("with identityCache disabled", function () {
+    before(setup());
+    it("should not return singletons", function (done) {
+      Person.findAsync({ name: "Jasmine" }, { identityCache: false })
+        .then(function (people) {
+          people.should.be.a.Object();
+          people.should.have.property("length", 1);
+          people[0].name.should.equal("Jasmine");
+          people[0].surname.should.equal("Doe");
+
+          people[0].surname = "Dux";
+
+          return Person.findAsync({ name: "Jasmine" }, { identityCache: false });
+        })
+        .then(function (people) {
+          people.should.be.a.Object();
+          people.should.have.property("length", 1);
+          people[0].name.should.equal("Jasmine");
+          people[0].surname.should.equal("Doe");
+
+          return done();
+        })
+        .catch(done);
+    });
+  });
+
+  describe("when using Model.allAsync()", function () {
+    before(setup());
+    it("should work exactly the same", function (done) {
+      Person.allAsync({ surname: "Doe" }, "-age", 1)
+        .then(function (people) {
+          people.should.be.a.Object();
+          people.should.have.property("length", 1);
+          people[0].name.should.equal("Jasmine");
+          people[0].surname.should.equal("Doe");
+
+          return done();
+        })
+        .catch(done);
+    });
+  });
+
+  describe("when using Model.whereAsync()", function () {
+    before(setup());
+    it("should work exactly the same", function (done) {
+      Person.whereAsync({ surname: "Doe" }, "-age", 1)
+        .then(function (people) {
+          people.should.be.a.Object();
+          people.should.have.property("length", 1);
+          people[0].name.should.equal("Jasmine");
+          people[0].surname.should.equal("Doe");
+
+          return done();
+        })
+        .catch(done);
+    });
+  });
+});
diff --git a/test/integration/model-one.js b/test/integration/model-one.js
index 0ed6e153..dfe62d3b 100644
--- a/test/integration/model-one.js
+++ b/test/integration/model-one.js
@@ -1,6 +1,5 @@
 var should   = require('should');
 var helper   = require('../support/spec_helper');
-var ORM      = require('../../');
 
 describe("Model.one()", function() {
   var db = null;
diff --git a/test/integration/model-oneAsync.js b/test/integration/model-oneAsync.js
new file mode 100644
index 00000000..cf3324de
--- /dev/null
+++ b/test/integration/model-oneAsync.js
@@ -0,0 +1,96 @@
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+
+describe("Model.oneAsync()", function() {
+  var db = null;
+  var Person = null;
+
+  var setup = function () {
+    return function (done) {
+      Person = db.define("person", {
+        name   : String
+      });
+
+      return helper.dropSync(Person, function () {
+        Person.create([{
+          id  : 1,
+          name: "Jeremy Doe"
+        }, {
+          id  : 2,
+          name: "John Doe"
+        }, {
+          id  : 3,
+          name: "Jane Doe"
+        }], done);
+      });
+    };
+  };
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  describe("without arguments", function () {
+    before(setup());
+
+    it("should return first item in model", function (done) {
+      Person.oneAsync()
+        .then(function (person) {
+          person.name.should.equal("Jeremy Doe");
+
+          return done();
+        })
+        .catch(done);
+    });
+  });
+
+  describe("with order", function () {
+    before(setup());
+
+    it("should return first item in model based on order", function (done) {
+      Person.oneAsync("-name")
+        .then(function (person) {
+          person.name.should.equal("John Doe");
+
+          return done();
+        })
+        .catch(done);
+    });
+  });
+
+  describe("with conditions", function () {
+    before(setup());
+
+    it("should return first item in model based on conditions", function (done) {
+      Person.oneAsync({ name: "Jane Doe" })
+        .then(function (person) {
+          person.name.should.equal("Jane Doe");
+
+          return done();
+        })
+        .catch(done);
+    });
+
+    describe("if no match", function () {
+      before(setup());
+
+      it("should return null", function (done) {
+        Person.oneAsync({ name: "Jack Doe" })
+          .then(function (person) {
+            should.equal(person, null);
+
+            return done();
+          })
+          .catch(done);
+      });
+    });
+  });
+});

From c06df3e6ba19f625734d87d559affe3ed499f96f Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Tue, 12 Sep 2017 11:53:12 +0300
Subject: [PATCH 1149/1246] add existAsync, oneAsync, findAsync, countAsync
 methods

---
 test/integration/model-findAsync-mapsto.js | 98 ++++++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 test/integration/model-findAsync-mapsto.js

diff --git a/test/integration/model-findAsync-mapsto.js b/test/integration/model-findAsync-mapsto.js
new file mode 100644
index 00000000..1986d690
--- /dev/null
+++ b/test/integration/model-findAsync-mapsto.js
@@ -0,0 +1,98 @@
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var ORM      = require('../../');
+
+describe("Model.pkMapTo.find()", function() {
+  var db = null;
+  var Person = null;
+
+  var setup = function () {
+    return function (done) {
+
+      // The fact that we've applied mapsTo to the key
+      // property of the model - will break the cache.
+
+      // Without Stuart's little bugfix, 2nd (and subsequent) calls to find()
+      // will return the repeats of the first obect retrieved and placed in the cache.
+      Person = db.define("person", {
+        personId : {type : "integer", key: true,   mapsTo: "id"},
+        name     : String,
+        surname  : String,
+        age      : Number,
+        male     : Boolean
+      });
+
+      return helper.dropSync(Person, function () {
+        Person.create([{
+          personId: 1001,
+          name    : "John",
+          surname : "Doe",
+          age     : 18,
+          male    : true
+        }, {
+          personId: 1002,
+          name    : "Jane",
+          surname : "Doe",
+          age     : 16,
+          male    : false
+        }, {
+          personId: 1003,
+          name    : "Jeremy",
+          surname : "Dean",
+          age     : 18,
+          male    : true
+        }, {
+          personId: 1004,
+          name    : "Jack",
+          surname : "Dean",
+          age     : 20,
+          male    : true
+        }, {
+          personId: 1005,
+          name    : "Jasmine",
+          surname : "Doe",
+          age     : 20,
+          male    : false
+        }], done);
+      });
+    };
+  };
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+
+  describe("Cache should work with mapped key field", function () {
+    before(setup());
+
+    it("1st find should work", function (done) {
+      Person.find({ surname: "Dean" }, function (err, people) {
+        should.not.exist(err);
+        people.should.be.a.Object();
+        people.should.have.property("length", 2);
+        people[0].surname.should.equal("Dean");
+
+        return done();
+      });
+    });
+    it("2nd find should should also work", function (done) {
+      Person.find({ surname: "Doe" }, function (err, people) {
+        should.not.exist(err);
+        people.should.be.a.Object();
+        people.should.have.property("length", 3);
+        people[0].surname.should.equal("Doe");
+
+        return done();
+      });
+    });
+  });
+});

From 28ce1206fa744c1cdeae2fcd7e81362d87285471 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Tue, 12 Sep 2017 11:54:06 +0300
Subject: [PATCH 1150/1246] add test for findAsync mapsto

---
 test/integration/model-find-mapsto.js      | 31 +++++++++++-----------
 test/integration/model-findAsync-mapsto.js |  1 -
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/test/integration/model-find-mapsto.js b/test/integration/model-find-mapsto.js
index 1986d690..9f32bfa4 100644
--- a/test/integration/model-find-mapsto.js
+++ b/test/integration/model-find-mapsto.js
@@ -1,6 +1,5 @@
 var should   = require('should');
 var helper   = require('../support/spec_helper');
-var ORM      = require('../../');
 
 describe("Model.pkMapTo.find()", function() {
   var db = null;
@@ -75,24 +74,26 @@ describe("Model.pkMapTo.find()", function() {
     before(setup());
 
     it("1st find should work", function (done) {
-      Person.find({ surname: "Dean" }, function (err, people) {
-        should.not.exist(err);
-        people.should.be.a.Object();
-        people.should.have.property("length", 2);
-        people[0].surname.should.equal("Dean");
+      Person.findAsync({ surname: "Dean" })
+        .then(function (people) {
+          people.should.be.a.Object();
+          people.should.have.property("length", 2);
+          people[0].surname.should.equal("Dean");
 
-        return done();
-      });
+          return done();
+        })
+        .catch(done);
     });
     it("2nd find should should also work", function (done) {
-      Person.find({ surname: "Doe" }, function (err, people) {
-        should.not.exist(err);
-        people.should.be.a.Object();
-        people.should.have.property("length", 3);
-        people[0].surname.should.equal("Doe");
+      Person.findAsync({ surname: "Doe" })
+        .then(function (people) {
+          people.should.be.a.Object();
+          people.should.have.property("length", 3);
+          people[0].surname.should.equal("Doe");
 
-        return done();
-      });
+          return done();
+        })
+        .catch(done);
     });
   });
 });
diff --git a/test/integration/model-findAsync-mapsto.js b/test/integration/model-findAsync-mapsto.js
index 1986d690..32fb2587 100644
--- a/test/integration/model-findAsync-mapsto.js
+++ b/test/integration/model-findAsync-mapsto.js
@@ -1,6 +1,5 @@
 var should   = require('should');
 var helper   = require('../support/spec_helper');
-var ORM      = require('../../');
 
 describe("Model.pkMapTo.find()", function() {
   var db = null;

From 5f120b6971d6fcd61075367f5aa80b1fd1a91d01 Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Tue, 12 Sep 2017 12:17:38 +0300
Subject: [PATCH 1151/1246] Resolve PR comments: add postFix to async methods;
 rewrite tests

---
 lib/ChainFind.js                           | 12 +++---
 test/integration/model-find-chain-async.js | 43 +++++++++-------------
 2 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index b1e52498..547c8087 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -7,6 +7,8 @@ var Promise       = require("bluebird");
 module.exports = ChainFind;
 
 function ChainFind(Model, opts) {
+  var promiseFunctionPostfix = Model.settings.get('promiseFunctionPostfix');
+
   var prepareConditions = function () {
     return Utilities.transformPropertyNames(
       opts.conditions, opts.properties
@@ -242,11 +244,11 @@ function ChainFind(Model, opts) {
   };
   chain.all = chain.where = chain.find;
 
-  chain.findAsync   = Promise.promisify(chain.find);
-  chain.firstAsync  = Promise.promisify(chain.first);
-  chain.lastAsync   = Promise.promisify(chain.last);
-  chain.runAsync    = Promise.promisify(chain.run);
-  chain.removeAsync = Promise.promisify(chain.remove);
+  chain['find' + promiseFunctionPostfix]   = Promise.promisify(chain.find);
+  chain['first' + promiseFunctionPostfix]  = Promise.promisify(chain.first);
+  chain['last' + promiseFunctionPostfix]   = Promise.promisify(chain.last);
+  chain['run' + promiseFunctionPostfix]    = Promise.promisify(chain.run);
+  chain['remove' + promiseFunctionPostfix] = Promise.promisify(chain.remove);
 
   if (opts.associations) {
     for (var i = 0; i < opts.associations.length; i++) {
diff --git a/test/integration/model-find-chain-async.js b/test/integration/model-find-chain-async.js
index 05970ebd..6c6d5b53 100644
--- a/test/integration/model-find-chain-async.js
+++ b/test/integration/model-find-chain-async.js
@@ -132,20 +132,16 @@ describe("Model.find() chaining", function() {
     it("should not change find if no arguments", function () {
       return Person.find()
         .findAsync()
-        .then(function(Person) {
-          should.equal(Person.length, 3);
+        .then(function(person) {
+          should.equal(person.length, 3);
         });
     });
 
-    it("should restrict conditions if passed", function (done) {
-      Person.find()
+    it("should restrict conditions if passed", function () {
+      return Person.find()
         .findAsync({ age: 18 })
-        .then(function(Person) {
-          should.equal(Person.length, 2);
-          done();
-        })
-        .catch(function(err) {
-          done(err);
+        .then(function(person) {
+          should.equal(person.length, 2);
         });
     });
 
@@ -164,30 +160,25 @@ describe("Model.find() chaining", function() {
       }
     }));
 
-    it("should have no problems if no results found", function (done) {
-      Person.find({ age: 22 })
+    it("should have no problems if no results found", function () {
+      return Person.find({ age: 22 })
         .removeAsync()
         .then(function () {
-          Person.find(function(err, data) {
-            should.equal(data.length, 3);
-            done();
-          });
-        }).catch(function(err) {
-          done(err);
+          return Person.find().findAsync();
+        }).then(function(person) {
+          should.equal(person.length, 3);
         });
     });
 
-    it("should remove results without calling hooks", function (done) {
-      Person.find({ age: 20 })
+    it("should remove results without calling hooks", function () {
+      return Person.find({ age: 20 })
         .removeAsync()
         .then(function () {
           should.equal(hookFired, false);
-          Person.find(function (err, data) {
-            should.equal(data.length, 2);
-            done();
-          });
-        }).catch(function(err) {
-          done(err);
+          return Person.find().findAsync();
+        })
+        .then(function(person) {
+          should.equal(person.length, 2);
         });
     });
   });

From faf36f1edb3a242507a35e9ff8d17d6ff9bc618d Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Tue, 12 Sep 2017 15:06:27 +0300
Subject: [PATCH 1152/1246] remove done from tests which use Promise

---
 test/integration/hook-promise.js           |  70 ++++-----
 test/integration/model-clearAsync.js       |  25 ++-
 test/integration/model-countAsync.js       |  20 +--
 test/integration/model-existsAsync.js      |  60 +++-----
 test/integration/model-find-mapsto.js      |  32 ++--
 test/integration/model-findAsync-mapsto.js |  35 ++---
 test/integration/model-findAsync.js        | 171 ++++++++-------------
 test/integration/model-getAsync.js         |  81 +++-------
 test/integration/model-oneAsync.js         |  36 ++---
 test/integration/model-sync.js             |   2 -
 test/integration/orm-exports.js            |  84 +++-------
 11 files changed, 211 insertions(+), 405 deletions(-)

diff --git a/test/integration/hook-promise.js b/test/integration/hook-promise.js
index fb2575f7..cd696413 100644
--- a/test/integration/hook-promise.js
+++ b/test/integration/hook-promise.js
@@ -59,7 +59,7 @@ describe("HookPromise", function() {
 
   describe('afterCreate', function () {
     beforeEach(setup());
-    it("should trigger after model creation", function (done) {
+    it("should trigger after model creation", function () {
       var triggered = false;
 
       Person.afterCreate(function () {
@@ -71,18 +71,16 @@ describe("HookPromise", function() {
         });
       });
 
-      Person.createAsync([{ name: "John Doe" }])
+      return Person.createAsync([{ name: "John Doe" }])
         .then(function () {
           triggered.should.be.true;
-          done();
-        })
-        .catch(done);
+        });
     });
   });
 
   describe("beforeCreate", function () {
     beforeEach(setup());
-    it("should allow modification of instance", function (done) {
+    it("should allow modification of instance", function () {
       Person.beforeCreate(function () {
         var self = this;
         return new Promise(function (resolve) {
@@ -103,9 +101,7 @@ describe("HookPromise", function() {
             should.not.exist(err);
             should.exist(person);
           });
-          done();
-        })
-        .catch(done);
+        });
     });
 
     it("should trigger error", function (done) {
@@ -171,7 +167,7 @@ describe("HookPromise", function() {
         });
     });
 
-    it("should trigger and wait", function (done) {
+    it("should trigger and wait", function () {
       Person.beforeSave(function () {
         var self = this;
         return new Promise(function (resolve) {
@@ -182,21 +178,19 @@ describe("HookPromise", function() {
         });
       });
 
-      Person.createAsync([{ name: "Jane Doe" }])
+      return Person.createAsync([{ name: "Jane Doe" }])
         .then(function (John) {
           return John[0].saveAsync();
         })
         .then(function (John) {
           should.equal(John.name, 'John Doe');
-          done();
-        })
-        .catch(done);
+        });
     });
   });
 
   describe("afterSave", function () {
     beforeEach(setup());
-    it("should call and wait after save hook", function (done) {
+    it("should call and wait after save hook", function () {
       var triggered = false;
 
       Person.afterSave(function () {
@@ -208,21 +202,19 @@ describe("HookPromise", function() {
         });
       });
 
-      Person.createAsync([{ name: "John Doe" }])
+      return Person.createAsync([{ name: "John Doe" }])
         .then(function (Jhon) {
           return Jhon[0].saveAsync();
         })
         .then(function () {
           triggered.should.be.true;
-          done();
-        })
-        .catch(done);
+        });
     });
   });
 
   describe("beforeValidation", function () {
     beforeEach(setup());
-    it("should trigger and wait", function (done) {
+    it("should trigger and wait", function () {
       Person.beforeValidation(function () {
         var self = this;
         return new Promise(function (resolve) {
@@ -233,12 +225,10 @@ describe("HookPromise", function() {
         });
       });
 
-      Person.createAsync([{ name: "John Doe" }])
+      return Person.createAsync([{ name: "John Doe" }])
         .then(function (Jhon) {
           should.equal(Jhon[0].name, "John Snow");
-          done();
-        })
-        .catch(done);
+        });
     });
 
     it("should throw error", function (done) {
@@ -265,7 +255,7 @@ describe("HookPromise", function() {
 
   describe("afterLoad", function () {
     beforeEach(setup());
-    it("should trigger and wait", function (done) {
+    it("should trigger and wait", function () {
       var afterLoad = false;
       Person.afterLoad(function () {
         return new Promise(function (resolve) {
@@ -276,12 +266,10 @@ describe("HookPromise", function() {
         });
       });
 
-      Person.createAsync([{ name: "John Doe" }])
+      return Person.createAsync([{ name: "John Doe" }])
         .then(function () {
           afterLoad.should.be.true;
-          done();
-        })
-        .catch(done);
+        });
     });
 
     it("should throw error", function (done) {
@@ -310,7 +298,7 @@ describe("HookPromise", function() {
 
   describe("afterAutoFetch", function () {
     beforeEach(setup());
-    it("should trigger and wait", function (done) {
+    it("should trigger and wait", function () {
       var afterAutoFetch = false;
       Person.afterAutoFetch(function () {
         return new Promise(function (resolve) {
@@ -321,12 +309,10 @@ describe("HookPromise", function() {
         });
       });
 
-      Person.createAsync({ name: "John" })
+      return Person.createAsync({ name: "John" })
         .then(function () {
           afterAutoFetch.should.be.true;
-          done();
-        })
-        .catch(done);
+        });
     });
 
     it("should throw error", function (done) {
@@ -354,7 +340,7 @@ describe("HookPromise", function() {
   describe("beforeRemove", function () {
     before(setup());
 
-    it("should trigger and wait", function (done) {
+    it("should trigger and wait", function () {
       var beforeRemove = false;
       Person.beforeRemove(function () {
         return new Promise(function (resolve) {
@@ -363,15 +349,13 @@ describe("HookPromise", function() {
         });
       });
 
-      Person.createAsync([{ name: "John Doe" }])
+      return Person.createAsync([{ name: "John Doe" }])
         .then(function (items) {
           return items[0].removeAsync();
         })
         .then(function () {
           beforeRemove.should.be.true;
-          done();
-        })
-        .catch(done);
+        });
     });
 
     it("should throw error", function (done) {
@@ -431,15 +415,13 @@ describe("HookPromise", function() {
       }
     }));
 
-    it("should propagate down hooks", function (done) {
-      Person.createAsync([{ name: "John Doe" }])
+    it("should propagate down hooks", function () {
+      return Person.createAsync([{ name: "John Doe" }])
         .then(function (people) {
           should.exist(people);
           should.equal(people.length, 1);
           should.equal(people[0].name, "beforeSave");
-          done();
-        })
-        .catch(done);
+        });
     });
   });
 });
diff --git a/test/integration/model-clearAsync.js b/test/integration/model-clearAsync.js
index 5a6c34a4..e0392b5d 100644
--- a/test/integration/model-clearAsync.js
+++ b/test/integration/model-clearAsync.js
@@ -39,14 +39,11 @@ describe("Model.clearAsync()", function() {
   describe("with callback", function () {
     before(setup());
 
-    it("should call when done", function (done) {
-      Person.clearAsync()
-        .then(function () {
-          Person.find().count(function (err, count) {
-            count.should.equal(0);
-
-            return done();
-          });
+    it("should call when done", function () {
+      return Person.clearAsync()
+        .then(Person.countAsync)
+        .then(function (count) {
+          count.should.equal(0);
         });
     });
   });
@@ -54,16 +51,12 @@ describe("Model.clearAsync()", function() {
   describe("without callback", function () {
     before(setup());
 
-    it("should still remove", function (done) {
-      Person.clearAsync();
-
-      setTimeout(function () {
-        Person.find().count(function (err, count) {
+    it("should still remove", function () {
+      return Person.clearAsync()
+        .then(Person.countAsync)
+        .then(function (count) {
           count.should.equal(0);
-
-          return done();
         });
-      }, 200);
     });
   });
 });
diff --git a/test/integration/model-countAsync.js b/test/integration/model-countAsync.js
index fc817b96..3ce46e1b 100644
--- a/test/integration/model-countAsync.js
+++ b/test/integration/model-countAsync.js
@@ -1,7 +1,7 @@
 var should   = require('should');
 var helper   = require('../support/spec_helper');
 
-describe("Model.count()", function() {
+describe("Model.countAsync()", function() {
   var db = null;
   var Person = null;
 
@@ -41,28 +41,22 @@ describe("Model.count()", function() {
   describe("without conditions", function () {
     before(setup());
 
-    it("should return all items in model", function (done) {
-      Person.countAsync()
+    it("should return all items in model", function () {
+      return Person.countAsync()
         .then(function (count) {
           count.should.equal(3);
-
-          return done();
-        })
-        .catch(done);
+        });
     });
   });
 
   describe("with conditions", function () {
     before(setup());
 
-    it("should return only matching items", function (done) {
-      Person.countAsync({ name: "John Doe" })
+    it("should return only matching items", function () {
+      return Person.countAsync({ name: "John Doe" })
         .then(function (count) {
           count.should.equal(2);
-
-          return done();
-        })
-        .catch(done);
+        });
     });
   });
 });
diff --git a/test/integration/model-existsAsync.js b/test/integration/model-existsAsync.js
index cf4a7546..235c3229 100644
--- a/test/integration/model-existsAsync.js
+++ b/test/integration/model-existsAsync.js
@@ -1,7 +1,7 @@
 var should   = require('should');
 var helper   = require('../support/spec_helper');
 
-describe("Model.exists()", function() {
+describe("Model.existsAsync()", function() {
   var db     = null;
   var Person = null;
   var good_id, bad_id;
@@ -51,72 +51,54 @@ describe("Model.exists()", function() {
   describe("with an id", function () {
     before(setup());
 
-    it("should return true if found", function (done) {
-      Person.existsAsync(good_id)
+    it("should return true if found", function () {
+      return Person.existsAsync(good_id)
         .then(function (exists) {
           exists.should.be.true;
-
-          return done();
-        })
-        .catch(done);
+        });
     });
 
-    it("should return false if not found", function (done) {
-      Person.existsAsync(bad_id)
+    it("should return false if not found", function () {
+      return Person.existsAsync(bad_id)
         .then(function (exists) {
           exists.should.be.false;
-
-          return done();
-        })
-        .catch(done);
+        });
     });
   });
 
   describe("with a list of ids", function () {
     before(setup());
 
-    it("should return true if found", function (done) {
-      Person.existsAsync([ good_id ])
+    it("should return true if found", function () {
+      return Person.existsAsync([ good_id ])
         .then(function (exists) {
           exists.should.be.true;
-
-          return done();
-        })
-        .catch(done);
+        });
     });
 
-    it("should return false if not found", function (done) {
-      Person.exists([ bad_id ], function (err, exists) {
-        should.equal(err, null);
-
-        exists.should.be.false;
-
-        return done();
-      });
+    it("should return false if not found", function () {
+      return Person.existsAsync([ bad_id ])
+        .then(function (exists) {
+          exists.should.be.false;
+        });
     });
   });
 
   describe("with a conditions object", function () {
     before(setup());
 
-    it("should return true if found", function (done) {
-      Person.existsAsync({ name: "John Doe" })
+    it("should return true if found", function () {
+      return Person.existsAsync({ name: "John Doe" })
         .then(function (exists) {
           exists.should.be.true;
-
-          return done();
-        })
-        .catch(done);
+        });
     });
 
-    it("should return false if not found", function (done) {
-      Person.existsAsync({ name: "Jack Doe" })
+    it("should return false if not found", function () {
+      return Person.existsAsync({ name: "Jack Doe" })
         .then(function (exists) {
           exists.should.be.false;
-
-          return done();
-        })
-        .catch(done);
+        });
     });
   });
 });
diff --git a/test/integration/model-find-mapsto.js b/test/integration/model-find-mapsto.js
index 9f32bfa4..5b2877d5 100644
--- a/test/integration/model-find-mapsto.js
+++ b/test/integration/model-find-mapsto.js
@@ -74,26 +74,24 @@ describe("Model.pkMapTo.find()", function() {
     before(setup());
 
     it("1st find should work", function (done) {
-      Person.findAsync({ surname: "Dean" })
-        .then(function (people) {
-          people.should.be.a.Object();
-          people.should.have.property("length", 2);
-          people[0].surname.should.equal("Dean");
+      Person.find({ surname: "Dean" }, function (err, people) {
+        should.not.exist(err);
+        people.should.be.a.Object();
+        people.should.have.property("length", 2);
+        people[0].surname.should.equal("Dean");
 
-          return done();
-        })
-        .catch(done);
+        return done();
+      });
     });
     it("2nd find should should also work", function (done) {
-      Person.findAsync({ surname: "Doe" })
-        .then(function (people) {
-          people.should.be.a.Object();
-          people.should.have.property("length", 3);
-          people[0].surname.should.equal("Doe");
+      Person.find({ surname: "Doe" }, function (err, people) {
+        should.not.exist(err);
+        people.should.be.a.Object();
+        people.should.have.property("length", 3);
+        people[0].surname.should.equal("Doe");
 
-          return done();
-        })
-        .catch(done);
+        return done();
+      });
     });
   });
-});
+});
\ No newline at end of file
diff --git a/test/integration/model-findAsync-mapsto.js b/test/integration/model-findAsync-mapsto.js
index 32fb2587..0ab265c1 100644
--- a/test/integration/model-findAsync-mapsto.js
+++ b/test/integration/model-findAsync-mapsto.js
@@ -1,7 +1,7 @@
 var should   = require('should');
 var helper   = require('../support/spec_helper');
 
-describe("Model.pkMapTo.find()", function() {
+describe("Model.pkMapTo.findAsync()", function() {
   var db = null;
   var Person = null;
 
@@ -73,25 +73,22 @@ describe("Model.pkMapTo.find()", function() {
   describe("Cache should work with mapped key field", function () {
     before(setup());
 
-    it("1st find should work", function (done) {
-      Person.find({ surname: "Dean" }, function (err, people) {
-        should.not.exist(err);
-        people.should.be.a.Object();
-        people.should.have.property("length", 2);
-        people[0].surname.should.equal("Dean");
-
-        return done();
-      });
+    it("1st find should work", function () {
+      Person.findAsync({ surname: "Dean" })
+        .then(function (people) {
+          people.should.be.a.Object();
+          people.should.have.property("length", 2);
+          people[0].surname.should.equal("Dean");
+        });
     });
-    it("2nd find should should also work", function (done) {
-      Person.find({ surname: "Doe" }, function (err, people) {
-        should.not.exist(err);
-        people.should.be.a.Object();
-        people.should.have.property("length", 3);
-        people[0].surname.should.equal("Doe");
-
-        return done();
-      });
+    it("2nd find should should also work", function () {
+      Person.findAsync({ surname: "Doe" })
+        .then(function (people) {
+          people.should.be.a.Object();
+          people.should.have.property("length", 3);
+          people[0].surname.should.equal("Doe");
+        });
     });
   });
 });
+
diff --git a/test/integration/model-findAsync.js b/test/integration/model-findAsync.js
index 58a05f5a..21b3e33a 100644
--- a/test/integration/model-findAsync.js
+++ b/test/integration/model-findAsync.js
@@ -61,232 +61,194 @@ describe("Model.findAsync()", function() {
   describe("without arguments", function () {
     before(setup());
 
-    it("should return all items", function (done) {
-      Person.findAsync()
+    it("should return all items", function () {
+      return Person.findAsync()
         .then(function (people) {
           people.should.be.a.Object();
           people.should.have.property("length", 5);
-
-          return done();
-        })
-        .catch(done);
+        });
     });
   });
 
   describe("with a number as argument", function () {
     before(setup());
 
-    it("should use it as limit", function (done) {
-      Person.findAsync(2)
+    it("should use it as limit", function () {
+      return Person.findAsync(2)
         .then(function (people) {
           people.should.be.a.Object();
           people.should.have.property("length", 2);
-
-          return done();
-        })
-        .catch(done);
+        });
     });
   });
 
   describe("with a string argument", function () {
     before(setup());
 
-    it("should use it as property ascending order", function (done) {
-      Person.findAsync("age")
+    it("should use it as property ascending order", function () {
+      return Person.findAsync("age")
         .then(function (people) {
           people.should.be.a.Object();
           people.should.have.property("length", 5);
           people[0].age.should.equal(16);
           people[4].age.should.equal(20);
-
-          return done();
-        })
-        .catch(done);
+        });
     });
 
-    it("should use it as property descending order if starting with '-'", function (done) {
-      Person.findAsync("-age")
+    it("should use it as property descending order if starting with '-'", function () {
+      return Person.findAsync("-age")
         .then(function (people) {
           people.should.be.a.Object();
           people.should.have.property("length", 5);
           people[0].age.should.equal(20);
           people[4].age.should.equal(16);
-
-          return done();
-        })
-        .catch(done);
+        });
     });
   });
 
   describe("with an Array as argument", function () {
     before(setup());
 
-    it("should use it as property ascending order", function (done) {
-      Person.findAsync([ "age" ])
+    it("should use it as property ascending order", function () {
+      return Person.findAsync([ "age" ])
         .then(function (people) {
           people.should.be.a.Object();
           people.should.have.property("length", 5);
           people[0].age.should.equal(16);
           people[4].age.should.equal(20);
-
-          return done();
-      })
-        .catch(done);
+      });
     });
 
-    it("should use it as property descending order if starting with '-'", function (done) {
-      Person.findAsync([ "-age" ])
+    it("should use it as property descending order if starting with '-'", function () {
+      return Person.findAsync([ "-age" ])
         .then(function (people) {
           people.should.be.a.Object();
           people.should.have.property("length", 5);
           people[0].age.should.equal(20);
           people[4].age.should.equal(16);
-
-          return done();
-      })
-        .catch(done);
+      });
     });
 
-    it("should use it as property descending order if element is 'Z'", function (done) {
-      Person.findAsync([ "age", "Z" ])
+    it("should use it as property descending order if element is 'Z'", function () {
+      return Person.findAsync([ "age", "Z" ])
         .then(function (people) {
           people.should.be.a.Object();
           people.should.have.property("length", 5);
           people[0].age.should.equal(20);
           people[4].age.should.equal(16);
-
-          return done();
-      })
-        .catch(done);
+      });
     });
 
-    it("should accept multiple ordering", function (done) {
-      Person.findAsync([ "age", "name", "Z" ])
+    it("should accept multiple ordering", function () {
+      return Person.findAsync([ "age", "name", "Z" ])
         .then(function (people) {
           people.should.be.a.Object();
           people.should.have.property("length", 5);
           people[0].age.should.equal(16);
           people[4].age.should.equal(20);
-
-          return done();
-      })
-        .catch(done);
+      });
     });
 
-    it("should accept multiple ordering using '-' instead of 'Z'", function (done) {
-      Person.findAsync([ "age", "-name" ])
+    it("should accept multiple ordering using '-' instead of 'Z'", function () {
+      return Person.findAsync([ "age", "-name" ])
         .then(function (people) {
           people.should.be.a.Object();
           people.should.have.property("length", 5);
           people[0].age.should.equal(16);
           people[4].age.should.equal(20);
-
-          return done();
-      })
-        .catch(done);
+      });
     });
   });
 
   describe("with an Object as argument", function () {
     before(setup());
 
-    it("should use it as conditions", function (done) {
-      Person.findAsync({ age: 16 })
+    it("should use it as conditions", function () {
+      return Person.findAsync({ age: 16 })
         .then(function (people) {
           people.should.be.a.Object();
           people.should.have.property("length", 1);
           people[0].age.should.equal(16);
-
-          return done();
-        })
-        .catch(done);
+        });
     });
 
-    it("should accept comparison objects", function (done) {
-      Person.findAsync({ age: ORM.gt(18) })
+    it("should accept comparison objects", function () {
+      return Person.findAsync({ age: ORM.gt(18) })
         .then(function (people) {
           people.should.be.a.Object();
           people.should.have.property("length", 2);
           people[0].age.should.equal(20);
           people[1].age.should.equal(20);
-
-          return done();
-        })
-        .catch(done);
+        });
     });
 
     describe("with another Object as argument", function () {
       before(setup());
 
-      it("should use it as options", function (done) {
-        Person.findAsync({ age: 18 }, 1, { cache: false })
+      it("should use it as options", function () {
+        return Person.findAsync({ age: 18 }, 1, { cache: false })
           .then(function (people) {
             people.should.be.a.Object();
             people.should.have.property("length", 1);
             people[0].age.should.equal(18);
 
-            return done();
-          })
-          .catch(done);
+
+          });
       });
 
       describe("if a limit is passed", function () {
         before(setup());
 
-        it("should use it", function (done) {
-          Person.findAsync({ age: 18 }, { limit: 1 })
+        it("should use it", function () {
+          return Person.findAsync({ age: 18 }, { limit: 1 })
             .then(function (people) {
               people.should.be.a.Object();
               people.should.have.property("length", 1);
               people[0].age.should.equal(18);
 
-              return done();
-            })
-            .catch(done);
+
+            });
         });
       });
 
       describe("if an offset is passed", function () {
         before(setup());
 
-        it("should use it", function (done) {
-          Person.findAsync({}, { offset: 1 }, "age")
+        it("should use it", function () {
+          return Person.findAsync({}, { offset: 1 }, "age")
             .then(function (people) {
               people.should.be.a.Object();
               people.should.have.property("length", 4);
               people[0].age.should.equal(18);
 
-              return done();
-            })
-            .catch(done);
+
+            });
         });
       });
 
       describe("if an order is passed", function () {
         before(setup());
 
-        it("should use it", function (done) {
-          Person.findAsync({ surname: "Doe" }, { order: "age" })
+        it("should use it", function () {
+          return Person.findAsync({ surname: "Doe" }, { order: "age" })
             .then(function (people) {
               people.should.be.a.Object();
               people.should.have.property("length", 3);
               people[0].age.should.equal(16);
 
-              return done();
-            })
-            .catch(done);
+
+            });
         });
 
-        it("should use it and ignore previously defined order", function (done) {
-          Person.findAsync({ surname: "Doe" }, "-age", { order: "age" })
+        it("should use it and ignore previously defined order", function () {
+          return Person.findAsync({ surname: "Doe" }, "-age", { order: "age" })
             .then(function (people) {
               people.should.be.a.Object();
               people.should.have.property("length", 3);
               people[0].age.should.equal(16);
 
-              return done();
-            })
-            .catch(done);
+
+            });
         });
       });
     });
@@ -294,8 +256,8 @@ describe("Model.findAsync()", function() {
 
   describe("with identityCache disabled", function () {
     before(setup());
-    it("should not return singletons", function (done) {
-      Person.findAsync({ name: "Jasmine" }, { identityCache: false })
+    it("should not return singletons", function () {
+      return Person.findAsync({ name: "Jasmine" }, { identityCache: false })
         .then(function (people) {
           people.should.be.a.Object();
           people.should.have.property("length", 1);
@@ -311,42 +273,33 @@ describe("Model.findAsync()", function() {
           people.should.have.property("length", 1);
           people[0].name.should.equal("Jasmine");
           people[0].surname.should.equal("Doe");
-
-          return done();
-        })
-        .catch(done);
+        });
     });
   });
 
   describe("when using Model.allAsync()", function () {
     before(setup());
-    it("should work exactly the same", function (done) {
-      Person.allAsync({ surname: "Doe" }, "-age", 1)
+    it("should work exactly the same", function () {
+      return Person.allAsync({ surname: "Doe" }, "-age", 1)
         .then(function (people) {
           people.should.be.a.Object();
           people.should.have.property("length", 1);
           people[0].name.should.equal("Jasmine");
           people[0].surname.should.equal("Doe");
-
-          return done();
-        })
-        .catch(done);
+        });
     });
   });
 
   describe("when using Model.whereAsync()", function () {
     before(setup());
-    it("should work exactly the same", function (done) {
-      Person.whereAsync({ surname: "Doe" }, "-age", 1)
+    it("should work exactly the same", function () {
+      return Person.whereAsync({ surname: "Doe" }, "-age", 1)
         .then(function (people) {
           people.should.be.a.Object();
           people.should.have.property("length", 1);
           people[0].name.should.equal("Jasmine");
           people[0].surname.should.equal("Doe");
-
-          return done();
-        })
-        .catch(done);
+        });
     });
   });
 });
diff --git a/test/integration/model-getAsync.js b/test/integration/model-getAsync.js
index 2504cad1..526c83a9 100644
--- a/test/integration/model-getAsync.js
+++ b/test/integration/model-getAsync.js
@@ -64,17 +64,13 @@ describe("Model.getAsync()", function () {
         });
     });
 
-    it("should accept and try to fetch if passed an Array with ids", function (done) {
-      Person.getAsync([ John[Person.id] ])
+    it("should accept and try to fetch if passed an Array with ids", function () {
+      return Person.getAsync([ John[Person.id] ])
         .then(function (John) {
           John.should.be.a.Object();
           John.should.have.property(Person.id, John[Person.id]);
           John.should.have.property("name", "John Doe");
-          done();
         })
-        .catch(function (err) {
-          done(err);
-        });
     });
 
     it("should throw err", function (done) {
@@ -89,45 +85,31 @@ describe("Model.getAsync()", function () {
         });
     });
 
-    it("should return item with id 1", function (done) {
-      Person.getAsync(John[Person.id])
+    it("should return item with id 1", function () {
+      return Person.getAsync(John[Person.id])
         .then(function (John) {
           John.should.be.a.Object();
           John.should.have.property(Person.id, John[Person.id]);
           John.should.have.property("name", "John Doe");
-
-          done();
         })
-        .catch(function (err) {
-          done(err);
-        });
     });
 
-    it("should have an UID method", function (done) {
-      Person.getAsync(John[Person.id])
+    it("should have an UID method", function () {
+      return Person.getAsync(John[Person.id])
         .then(function (John) {
           John.UID.should.be.a.Function();
           John.UID().should.equal(John[Person.id]);
-
-          done();
         })
-        .catch(function (err) {
-          done(err)
-        });
     });
 
-    it("should return the original object with unchanged name", function (done) {
-      Person.getAsync(John[Person.id])
+    it("should return the original object with unchanged name", function () {
+      return Person.getAsync(John[Person.id])
         .then(function (John1) {
           John1.name = "James";
           return Person.getAsync(John[Person.id]);
         })
         .then(function (John2) {
           should.equal(John2.name, "John Doe");
-          done();
-        })
-        .catch(function (err) {
-          done(err);
         });
     });
 
@@ -136,8 +118,8 @@ describe("Model.getAsync()", function () {
         Person.settings.set("instance.identityCacheSaveCheck", false);
       });
 
-      it("should return the same object with the changed name", function (done) {
-        Person.getAsync(John[Person.id])
+      it("should return the same object with the changed name", function () {
+        return Person.getAsync(John[Person.id])
           .then(function (John1) {
             John1.name = "James";
             return [John1, Person.getAsync(John[Person.id])];
@@ -145,11 +127,6 @@ describe("Model.getAsync()", function () {
           .spread(function (John1, John2) {
             John1[Person.id].should.equal(John2[Person.id]);
             John2.name.should.equal("James");
-
-            done();
-          })
-          .catch(function (err) {
-            done(err);
           });
       });
     });
@@ -158,19 +135,14 @@ describe("Model.getAsync()", function () {
   describe("with no identityCache cache", function () {
     before(setup(false));
 
-    it("should return different objects", function (done) {
-      Person.getAsync(John[Person.id])
+    it("should return different objects", function () {
+      return Person.getAsync(John[Person.id])
         .then(function (John1) {
           return [John1, Person.getAsync(John[Person.id])];
         })
         .spread(function (John1, John2) {
           John1[Person.id].should.equal(John2[Person.id]);
           John1.should.not.equal(John2);
-
-          done();
-        })
-        .catch(function (err) {
-          done(err);
         });
     });
   });
@@ -178,8 +150,8 @@ describe("Model.getAsync()", function () {
   describe("with identityCache cache = 0.5 secs", function () {
     before(setup(0.5));
 
-    it("should return same objects after 0.2 sec", function (done) {
-      Person.getAsync(John[Person.id])
+    it("should return same objects after 0.2 sec", function () {
+      return Person.getAsync(John[Person.id])
         .then(function (John1) {
           return [John1, Promise.delay(200)];
         })
@@ -189,15 +161,11 @@ describe("Model.getAsync()", function () {
         .spread(function (John1, John2) {
           John1[Person.id].should.equal(John2[Person.id]);
           John1.should.equal(John2);
-          done();
-        })
-        .catch(function (err) {
-          done(err);
         });
     });
 
-    it("should return different objects after 0.7 sec", function (done) {
-      Person.getAsync(John[Person.id])
+    it("should return different objects after 0.7 sec", function () {
+      return Person.getAsync(John[Person.id])
         .then(function (John1) {
           return [John1, Promise.delay(700)];
         })
@@ -206,10 +174,6 @@ describe("Model.getAsync()", function () {
         })
         .spread(function (John1, John2) {
           John1.should.not.equal(John2);
-          done();
-        })
-        .catch(function (err) {
-          done(err);
         });
     });
   });
@@ -231,18 +195,17 @@ describe("Model.getAsync()", function () {
       });
     });
 
-    it("should search by key name and not 'id'", function (done) {
+    it("should search by key name and not 'id'", function () {
       db.settings.set('properties.primary_key', 'name');
 
       var OtherPerson = db.define("person", {
         id : Number
       });
 
-      OtherPerson.getAsync("Jane Doe")
+      return OtherPerson.getAsync("Jane Doe")
         .then(function (person) {
           person.name.should.equal("Jane Doe");
           db.settings.set('properties.primary_key', 'id');
-          done();
         });
     });
   });
@@ -250,16 +213,12 @@ describe("Model.getAsync()", function () {
   describe("with empty object as options", function () {
     before(setup());
 
-    it("should return item with id 1 like previously", function (done) {
-      Person.getAsync(John[Person.id], {})
+    it("should return item with id 1 like previously", function () {
+      return Person.getAsync(John[Person.id], {})
         .then(function (John) {
           John.should.be.a.Object();
           John.should.have.property(Person.id, John[Person.id]);
           John.should.have.property("name", "John Doe");
-          done();
-        })
-        .catch(function (err) {
-          done(err);
         });
     });
   });
diff --git a/test/integration/model-oneAsync.js b/test/integration/model-oneAsync.js
index cf3324de..2e77a0cf 100644
--- a/test/integration/model-oneAsync.js
+++ b/test/integration/model-oneAsync.js
@@ -41,55 +41,43 @@ describe("Model.oneAsync()", function() {
   describe("without arguments", function () {
     before(setup());
 
-    it("should return first item in model", function (done) {
-      Person.oneAsync()
+    it("should return first item in model", function () {
+      return Person.oneAsync()
         .then(function (person) {
           person.name.should.equal("Jeremy Doe");
-
-          return done();
-        })
-        .catch(done);
+        });
     });
   });
 
   describe("with order", function () {
     before(setup());
 
-    it("should return first item in model based on order", function (done) {
-      Person.oneAsync("-name")
+    it("should return first item in model based on order", function () {
+      return Person.oneAsync("-name")
         .then(function (person) {
           person.name.should.equal("John Doe");
-
-          return done();
-        })
-        .catch(done);
+        });
     });
   });
 
   describe("with conditions", function () {
     before(setup());
 
-    it("should return first item in model based on conditions", function (done) {
-      Person.oneAsync({ name: "Jane Doe" })
+    it("should return first item in model based on conditions", function () {
+      return Person.oneAsync({ name: "Jane Doe" })
         .then(function (person) {
           person.name.should.equal("Jane Doe");
-
-          return done();
-        })
-        .catch(done);
+        });
     });
 
     describe("if no match", function () {
       before(setup());
 
-      it("should return null", function (done) {
-        Person.oneAsync({ name: "Jack Doe" })
+      it("should return null", function () {
+        return Person.oneAsync({ name: "Jack Doe" })
           .then(function (person) {
             should.equal(person, null);
-
-            return done();
-          })
-          .catch(done);
+          });
       });
     });
   });
diff --git a/test/integration/model-sync.js b/test/integration/model-sync.js
index bf4199a3..585f6606 100644
--- a/test/integration/model-sync.js
+++ b/test/integration/model-sync.js
@@ -1,7 +1,5 @@
-var _      = require('lodash');
 var should = require('should');
 var helper = require('../support/spec_helper');
-var ORM    = require('../../');
 var common = require('../common');
 
 describe("Model.sync", function () {
diff --git a/test/integration/orm-exports.js b/test/integration/orm-exports.js
index c613ca90..0339734a 100644
--- a/test/integration/orm-exports.js
+++ b/test/integration/orm-exports.js
@@ -163,8 +163,8 @@ describe("ORM", function() {
         });
     });
 
-    it("should pass successful when opts is OK!", function (done) {
-      ORM.connectAsync(common.getConnectionString())
+    it("should pass successful when opts is OK!", function () {
+      return ORM.connectAsync(common.getConnectionString())
         .then(function (db) {
           should.exist(db);
 
@@ -172,12 +172,7 @@ describe("ORM", function() {
           db.define.should.be.a.Function();
           db.sync.should.be.a.Function();
           db.load.should.be.a.Function();
-
-          done();
         })
-        .catch(function (err) {
-          done(err);
-        });
     });
 
     describe('POOL via connectAsync', function () {
@@ -192,59 +187,43 @@ describe("ORM", function() {
       });
 
       if (protocol !== 'mongodb') {
-        it("should understand pool `'false'` from query string", function (done) {
+        it("should understand pool `'false'` from query string", function () {
           var connString = connStr + "debug=false&pool=false";
-          ORM.connectAsync(connString)
+          return ORM.connectAsync(connString)
             .then(function (db) {
               should.strictEqual(db.driver.opts.pool,  false);
               should.strictEqual(db.driver.opts.debug, false);
-              done();
             })
-            .catch(function (err) {
-              done(err);
-            });
         });
 
-        it("should understand pool `'0'` from query string", function (done) {
+        it("should understand pool `'0'` from query string", function () {
           var connString = connStr + "debug=0&pool=0";
-          ORM.connectAsync(connString)
+          return ORM.connectAsync(connString)
             .then(function (db) {
               should.strictEqual(db.driver.opts.pool,  false);
               should.strictEqual(db.driver.opts.debug, false);
-              done();
-            })
-            .catch(function (err) {
-              done(err);
             });
         });
 
-        it("should understand pool `'true'` from query string", function (done) {
+        it("should understand pool `'true'` from query string", function () {
           var connString = connStr + "debug=true&pool=true";
-          ORM.connectAsync(connString)
+          return ORM.connectAsync(connString)
             .then(function (db) {
               should.strictEqual(db.driver.opts.pool,  true);
               should.strictEqual(db.driver.opts.debug, true);
-              done();
-            })
-            .catch(function (err) {
-              done(err);
             });
         });
 
-        it("should understand pool `'true'` from query string", function (done) {
+        it("should understand pool `'true'` from query string", function () {
           var connString = connStr + "debug=1&pool=1";
-          ORM.connectAsync(connString)
+          return ORM.connectAsync(connString)
             .then(function (db) {
               should.strictEqual(db.driver.opts.pool,  true);
               should.strictEqual(db.driver.opts.debug, true);
-              done();
-            })
-            .catch(function (err) {
-              done(err);
             });
         });
 
-        it("should understand pool `'true'` from query string", function (done) {
+        it("should understand pool `'true'` from query string", function () {
           var connCopy = _.cloneDeep(common.getConfig());
           var connOpts = _.extend(connCopy, {
             protocol: common.protocol(),
@@ -252,18 +231,15 @@ describe("ORM", function() {
               pool: true, debug: true
             }
           });
-          ORM.connectAsync(connOpts)
+
+          return ORM.connectAsync(connOpts)
             .then(function (db) {
               should.strictEqual(db.driver.opts.pool,  true);
               should.strictEqual(db.driver.opts.debug, true);
-              done();
-            })
-            .catch(function (err) {
-              done(err);
             });
         });
 
-        it("should understand pool `false` from query options", function (done) {
+        it("should understand pool `false` from query options", function () {
           var connCopy = _.cloneDeep(common.getConfig());
           var connOpts = _.extend(connCopy, {
             protocol: common.protocol(),
@@ -271,14 +247,11 @@ describe("ORM", function() {
               pool: false, debug: false
             }
           });
-          ORM.connectAsync(connOpts)
+
+          return ORM.connectAsync(connOpts)
             .then(function (db) {
               should.strictEqual(db.driver.opts.pool,  false);
               should.strictEqual(db.driver.opts.debug, false);
-              done();
-            })
-            .catch(function (err) {
-              done(err);
             });
         });
       }
@@ -446,15 +419,12 @@ describe("ORM", function() {
         });
       });
 
-      it("should be able to pingAsync the server", function (done) {
-        db.pingAsync()
-          .then(function () {
-            return done();
-          });
+      it("should be able to pingAsync the server", function () {
+        return db.pingAsync();
       });
     });
 
-    describe("if callback is passed", function (done) {
+    describe("if callback is passed", function () {
       it("should return an error if empty url is passed", function (done) {
         ORM.connect("", function (err) {
           err.message.should.equal("CONNECTION_URL_EMPTY");
@@ -603,24 +573,16 @@ describe("ORM", function() {
   });
 
   describe("ORM.useAsync()", function () {
-    it("should be able to use an established connection", function (done) {
+    it("should be able to use an established connection", function () {
       var db = new sqlite.Database(':memory:');
 
-      ORM.useAsync(db, "sqlite")
-        .then(function () {
-          done();
-        })
-        .catch(done);
+      return ORM.useAsync(db, "sqlite");
     });
 
-    it("should be accept protocol alias", function (done) {
+    it("should be accept protocol alias", function () {
       var db = new pg.Client();
 
-      ORM.useAsync(db, "pg")
-        .then(function () {
-          done();
-        })
-        .catch(done);
+      return ORM.useAsync(db, "pg")
     });
 
     it("should throw an error in callback if protocol not supported", function (done) {

From 6ff98d27dbfcb325c38c4fc9cb234cb6cd06b5f8 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Tue, 12 Sep 2017 16:16:22 +0300
Subject: [PATCH 1153/1246] fix test

---
 test/integration/hook-promise.js      | 63 ++++-----------------------
 test/integration/model-clearAsync.js  |  4 +-
 test/integration/model-countAsync.js  |  4 +-
 test/integration/model-createAsync.js |  4 +-
 test/integration/model-existsAsync.js | 12 ++---
 5 files changed, 21 insertions(+), 66 deletions(-)

diff --git a/test/integration/hook-promise.js b/test/integration/hook-promise.js
index cd696413..2ef2c2a5 100644
--- a/test/integration/hook-promise.js
+++ b/test/integration/hook-promise.js
@@ -57,27 +57,6 @@ describe("HookPromise", function() {
     return db.close();
   });
 
-  describe('afterCreate', function () {
-    beforeEach(setup());
-    it("should trigger after model creation", function () {
-      var triggered = false;
-
-      Person.afterCreate(function () {
-        return new Promise(function (resolve) {
-          setTimeout(function () {
-            triggered = true;
-            resolve();
-          }, 700);
-        });
-      });
-
-      return Person.createAsync([{ name: "John Doe" }])
-        .then(function () {
-          triggered.should.be.true;
-        });
-    });
-  });
-
   describe("beforeCreate", function () {
     beforeEach(setup());
     it("should allow modification of instance", function () {
@@ -91,7 +70,7 @@ describe("HookPromise", function() {
         });
       });
 
-      Person.createAsync([{ }])
+      return Person.createAsync([{ }])
         .then(function (people) {
           should.exist(people);
           should.equal(people.length, 1);
@@ -119,7 +98,7 @@ describe("HookPromise", function() {
         })
         .catch(function (err) {
           err.should.be.a.Object();
-          err.message.should.equal("beforeCreate-error");
+          should.equal(err.message, "beforeCreate-error");
           done();
         });
     });
@@ -142,7 +121,7 @@ describe("HookPromise", function() {
         })
         .catch(function (err) {
           err.should.be.a.Object();
-          err.message.should.equal("beforeSave-error");
+          should.equal(err.message, "beforeSave-error");
           return done();
         });
     });
@@ -162,7 +141,7 @@ describe("HookPromise", function() {
         })
         .catch(function (err) {
           err.should.be.a.Object();
-          err.message.should.equal("beforeSave-error");
+          should.equal("beforeSave-error", err.message);
           return done();
         });
     });
@@ -188,30 +167,6 @@ describe("HookPromise", function() {
     });
   });
 
-  describe("afterSave", function () {
-    beforeEach(setup());
-    it("should call and wait after save hook", function () {
-      var triggered = false;
-
-      Person.afterSave(function () {
-        return new Promise(function (resolve) {
-          setTimeout(function () {
-            triggered = true;
-            resolve();
-          }, 700);
-        });
-      });
-
-      return Person.createAsync([{ name: "John Doe" }])
-        .then(function (Jhon) {
-          return Jhon[0].saveAsync();
-        })
-        .then(function () {
-          triggered.should.be.true;
-        });
-    });
-  });
-
   describe("beforeValidation", function () {
     beforeEach(setup());
     it("should trigger and wait", function () {
@@ -268,7 +223,7 @@ describe("HookPromise", function() {
 
       return Person.createAsync([{ name: "John Doe" }])
         .then(function () {
-          afterLoad.should.be.true;
+          should.equal(afterLoad, true);
         });
     });
 
@@ -290,7 +245,7 @@ describe("HookPromise", function() {
         })
         .catch(function (err) {
           err.should.exist;
-          err.message.should.equal("afterLoad-error");
+          should.equal("afterLoad-error", err.message);
           done();
         });
     });
@@ -305,13 +260,13 @@ describe("HookPromise", function() {
           setTimeout(function () {
             afterAutoFetch = true;
             resolve();
-          }, 500);
+          }, 1000);
         });
       });
 
       return Person.createAsync({ name: "John" })
         .then(function () {
-          afterAutoFetch.should.be.true;
+          should.equal(afterAutoFetch, true);
         });
     });
 
@@ -354,7 +309,7 @@ describe("HookPromise", function() {
           return items[0].removeAsync();
         })
         .then(function () {
-          beforeRemove.should.be.true;
+          should.equal(beforeRemove, true);
         });
     });
 
diff --git a/test/integration/model-clearAsync.js b/test/integration/model-clearAsync.js
index e0392b5d..c82aa057 100644
--- a/test/integration/model-clearAsync.js
+++ b/test/integration/model-clearAsync.js
@@ -43,7 +43,7 @@ describe("Model.clearAsync()", function() {
       return Person.clearAsync()
         .then(Person.countAsync)
         .then(function (count) {
-          count.should.equal(0);
+          should.equal(count, 0);
         });
     });
   });
@@ -55,7 +55,7 @@ describe("Model.clearAsync()", function() {
       return Person.clearAsync()
         .then(Person.countAsync)
         .then(function (count) {
-          count.should.equal(0);
+          should.equal(count, 0);
         });
     });
   });
diff --git a/test/integration/model-countAsync.js b/test/integration/model-countAsync.js
index 3ce46e1b..a9708ab0 100644
--- a/test/integration/model-countAsync.js
+++ b/test/integration/model-countAsync.js
@@ -44,7 +44,7 @@ describe("Model.countAsync()", function() {
     it("should return all items in model", function () {
       return Person.countAsync()
         .then(function (count) {
-          count.should.equal(3);
+          should.equal(count, 3);
         });
     });
   });
@@ -55,7 +55,7 @@ describe("Model.countAsync()", function() {
     it("should return only matching items", function () {
       return Person.countAsync({ name: "John Doe" })
         .then(function (count) {
-          count.should.equal(2);
+          should.equal(count, 2);
         });
     });
   });
diff --git a/test/integration/model-createAsync.js b/test/integration/model-createAsync.js
index 5e3371d8..56c6665c 100644
--- a/test/integration/model-createAsync.js
+++ b/test/integration/model-createAsync.js
@@ -87,7 +87,7 @@ describe("Model.createAsync()", function() {
 
           John.pets[0].should.have.property("name", "Deco");
           John.pets[0].should.have.property(Pet.id);
-          John.pets[0].saved().should.be.true;
+          should.equal(John.pets[0].saved(), true);
           done();
         })
         .catch(function (err) {
@@ -107,7 +107,7 @@ describe("Model.createAsync()", function() {
 
           John.pets[0].should.have.property("name", "Deco");
           John.pets[0].should.have.property(Pet.id);
-          John.pets[0].saved().should.be.true;
+          should.equal(John.pets[0].saved(), true);
           done();
         })
         .catch(function (err) {
diff --git a/test/integration/model-existsAsync.js b/test/integration/model-existsAsync.js
index 235c3229..b01f6222 100644
--- a/test/integration/model-existsAsync.js
+++ b/test/integration/model-existsAsync.js
@@ -54,14 +54,14 @@ describe("Model.existsAsync()", function() {
     it("should return true if found", function () {
       return Person.existsAsync(good_id)
         .then(function (exists) {
-          exists.should.be.true;
+          exists.should.be.true();
         });
     });
 
     it("should return false if not found", function () {
       return Person.existsAsync(bad_id)
         .then(function (exists) {
-          exists.should.be.false;
+          exists.should.be.false();
         });
     });
   });
@@ -72,14 +72,14 @@ describe("Model.existsAsync()", function() {
     it("should return true if found", function () {
       return Person.existsAsync([ good_id ])
         .then(function (exists) {
-          exists.should.be.true;
+          exists.should.be.true();
         });
     });
 
     it("should return false if not found", function () {
       return Person.existsAsync([ bad_id ])
         .then(function (exists) {
-          exists.should.be.false;
+          exists.should.be.false();
         });
     });
   });
@@ -90,14 +90,14 @@ describe("Model.existsAsync()", function() {
     it("should return true if found", function () {
       return Person.existsAsync({ name: "John Doe" })
         .then(function (exists) {
-          exists.should.be.true;
+          exists.should.be.true();
         });
     });
 
     it("should return false if not found", function () {
       return Person.existsAsync({ name: "Jack Doe" })
         .then(function (exists) {
-          exists.should.be.false;
+          exists.should.be.false();
         });
     });
   });

From 69a950d0d2c2a1d8a1a3353fba50d5274776e9dd Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Mon, 21 Aug 2017 18:07:38 +0300
Subject: [PATCH 1154/1246] add Promise support for connect, now connectAsync
 use promises

---
 test/config.example.js | 29 -----------------------------
 1 file changed, 29 deletions(-)
 delete mode 100644 test/config.example.js

diff --git a/test/config.example.js b/test/config.example.js
deleted file mode 100644
index bb9c2d73..00000000
--- a/test/config.example.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// To test, rename this file to config.js and update
-// the following configuration
-//
-// To run a single driver, go to root folder and do (mysql example):
-// ORM_PROTOCOL=mysql node test/run
-//
-// To run all drivers:
-// make test
-
-exports.mysql = {
-  user     : "root",
-  password : "",
-  database : "test"
-};
-exports.postgres = {
-  user     : "root",
-  password : "",
-  database : "test"
-};
-exports.redshift = {
-  user      : "root",
-  password  : "",
-  database  : "test"
-};
-exports.mongodb = {
-    host: "localhost",
-    database: "test"
-};
-exports.sqlite = { }; // uses in-memory database

From 2e93243cc34de909bf373ac4222c48e644541eff Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Tue, 22 Aug 2017 17:54:29 +0300
Subject: [PATCH 1155/1246] restore example file, fix after review

---
 test/config.example.js | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 test/config.example.js

diff --git a/test/config.example.js b/test/config.example.js
new file mode 100644
index 00000000..bb9c2d73
--- /dev/null
+++ b/test/config.example.js
@@ -0,0 +1,29 @@
+// To test, rename this file to config.js and update
+// the following configuration
+//
+// To run a single driver, go to root folder and do (mysql example):
+// ORM_PROTOCOL=mysql node test/run
+//
+// To run all drivers:
+// make test
+
+exports.mysql = {
+  user     : "root",
+  password : "",
+  database : "test"
+};
+exports.postgres = {
+  user     : "root",
+  password : "",
+  database : "test"
+};
+exports.redshift = {
+  user      : "root",
+  password  : "",
+  database  : "test"
+};
+exports.mongodb = {
+    host: "localhost",
+    database: "test"
+};
+exports.sqlite = { }; // uses in-memory database

From e04615b54a94ae500af4af772013463b07534064 Mon Sep 17 00:00:00 2001
From: Yevheniy Miropolets <yevheniy.miropolets@gmail.com>
Date: Mon, 4 Sep 2017 16:04:57 +0300
Subject: [PATCH 1156/1246] Add Promise support for get aggregation. Add tests
 for getAsync.

---
 test/config.example.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/config.example.js b/test/config.example.js
index bb9c2d73..0d9c232b 100644
--- a/test/config.example.js
+++ b/test/config.example.js
@@ -13,8 +13,8 @@ exports.mysql = {
   database : "test"
 };
 exports.postgres = {
-  user     : "root",
-  password : "",
+  user     : "postgres",
+  password : "1111",
   database : "test"
 };
 exports.redshift = {

From af712b4df8a8799766b5b966f99ba367b7f0cde2 Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Tue, 5 Sep 2017 18:09:01 +0300
Subject: [PATCH 1157/1246] Update Async tests (except Hooks)

---
 test/integration/association-hasmany-extra.js | 12 ++-
 .../integration/association-hasmany-mapsto.js | 18 ++--
 test/integration/association-hasmany.js       | 27 +++---
 .../association-hasone-required.js            | 89 +++++++++++++++++++
 test/integration/association-hasone.js        | 12 +--
 test/integration/instance.js                  | 32 ++++---
 test/integration/model-getAsync.js            | 10 +--
 test/integration/property-lazyload.js         | 12 +--
 8 files changed, 159 insertions(+), 53 deletions(-)

diff --git a/test/integration/association-hasmany-extra.js b/test/integration/association-hasmany-extra.js
index 3d04bb25..e4289ed8 100644
--- a/test/integration/association-hasmany-extra.js
+++ b/test/integration/association-hasmany-extra.js
@@ -80,14 +80,14 @@ describe("hasMany extra properties", function() {
     before(setup());
 
     it("should be added to association", function (done) {
-      Person.create([{
+      Person.createAsync([{
         name    : "John"
-      }], function (err, people) {
-        Pet.create([{
+      }]).then(function (people) {
+        Pet.createAsync([{
           name : "Deco"
         }, {
           name : "Mutt"
-        }], function (err, pets) {
+        }]).then(function (pets) {
           var data = { adopted: true };
 
           people[0].addPetsAsync(pets, { since : new Date(), data: data }).then(function () {
@@ -114,7 +114,11 @@ describe("hasMany extra properties", function() {
           }).catch(function(err) {
             done(err);
           });
+        }).catch(function(err) {
+          done(err);
         });
+      }).catch(function(err) {
+        done(err);
       });
     });
   });
diff --git a/test/integration/association-hasmany-mapsto.js b/test/integration/association-hasmany-mapsto.js
index 5e265fe5..df2ac501 100644
--- a/test/integration/association-hasmany-mapsto.js
+++ b/test/integration/association-hasmany-mapsto.js
@@ -1005,7 +1005,7 @@ describe("hasMany with mapsTo", function () {
       });
 
       it("should accept array as list of associations", function (done) {
-        Pet.create([{ petName: 'Ruff' }, { petName: 'Spotty' }],function (err, pets) {
+        Pet.createAsync([{ petName: 'Ruff' }, { petName: 'Spotty' }]).then(function (pets) {
           Person.find({ firstName: "Justin" }).first(function (err, Justin) {
             should.equal(err, null);
 
@@ -1031,6 +1031,8 @@ describe("hasMany with mapsTo", function () {
               done(err);
             });
           });
+        }).catch(function(err) {
+          done(err);
         });
       });
 
@@ -1159,15 +1161,13 @@ describe("hasMany with mapsTo", function () {
           should.not.exist(err);
           should.equal(pets.length, 2);
 
-          Person.create({ firstName: 'Paul' }, function (err, paul) {
-            should.not.exist(err);
+          Person.createAsync({ firstName: 'Paul' }).then(function (paul) {
 
             Person.one({ firstName: 'Paul' }, function (err, paul2) {
               should.not.exist(err);
               should.equal(paul2.pets.length, 0);
 
               paul.setPetsAsync(pets).then(function () {
-                should.not.exist(err);
 
                 // reload paul to make sure we have 2 pets
                 Person.one({ firstName: 'Paul' }, function (err, paul) {
@@ -1176,9 +1176,7 @@ describe("hasMany with mapsTo", function () {
 
                   // Saving paul2 should NOT auto save associations and hence delete
                   // the associations we just created.
-                  paul2.save(function (err) {
-                    should.not.exist(err);
-
+                  paul2.saveAsync().then(function () {
                     // let's check paul - pets should still be associated
                     Person.one({ firstName: 'Paul' }, function (err, paul) {
                       should.not.exist(err);
@@ -1186,13 +1184,17 @@ describe("hasMany with mapsTo", function () {
 
                       done();
                     });
+                  }).catch(function(err) {
+                    done(err);
                   });
                 });
               }).catch(function(err) {
                 done(err);
               });
             });
-          });
+          }).catch(function(err) {
+            done(err);
+          });;
         });
       });
 
diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
index 226f00ec..bf4a9998 100644
--- a/test/integration/association-hasmany.js
+++ b/test/integration/association-hasmany.js
@@ -317,12 +317,10 @@ describe("hasMany", function () {
               John.hasPetsAsync(pets).then(function (hasPets) {
                 should.equal(hasPets, true);
 
-                db.driver.execQuery(
+                db.driver.execQueryAsync(
                   "INSERT INTO person_pets (person_id, pets_id) VALUES (?,?), (?,?)",
-                  [John.id, pets[0].id, John.id, pets[1].id],
-                  function (err) {
-                    should.not.exist(err);
-
+                  [John.id, pets[0].id, John.id, pets[1].id]).then(
+                  function () {
                     John.hasPetsAsync(pets).then(function (hasPets) {
                       should.equal(hasPets, true);
                       done();
@@ -330,7 +328,9 @@ describe("hasMany", function () {
                       done(err);
                     });
                   }
-                );
+                ).catch(function(err) {
+                  done(err);
+                });
               }).catch(function(err){
                 done(err);
               });
@@ -847,11 +847,10 @@ describe("hasMany", function () {
               John.hasPetsAsync(pets).then(function (hasPets) {
                 should.equal(hasPets, true);
 
-                db.driver.execQuery(
+                db.driver.execQueryAsync(
                   "INSERT INTO person_pets (person_id, pets_id) VALUES (?,?), (?,?)",
-                  [John.id, pets[0].id, John.id, pets[1].id],
-                  function (err) {
-                    should.not.exist(err);
+                  [John.id, pets[0].id, John.id, pets[1].id]).then(
+                  function () {
 
                     John.hasPetsAsync(pets).then(function (hasPets) {
                       should.equal(hasPets, true);
@@ -860,7 +859,9 @@ describe("hasMany", function () {
                       done(err);
                     });
                   }
-                );
+                ).catch(function(err){
+                  done(err);
+                });
               }).catch(function(err){
                 done(err);
               });
@@ -1023,7 +1024,7 @@ describe("hasMany", function () {
       });
 
       it("should accept array as list of associations (promise-based)", function (done) {
-        Pet.create([{ name: 'Ruff' }, { name: 'Spotty' }],function (err, pets) {
+        Pet.createAsync([{ name: 'Ruff' }, { name: 'Spotty' }]).then(function (pets) {
           Person.find({ name: "Justin" }).first(function (err, Justin) {
             should.equal(err, null);
 
@@ -1048,6 +1049,8 @@ describe("hasMany", function () {
               done(err);
             });
           });
+        }).catch(function(err) {
+          done(err);
         });
       });
     });
diff --git a/test/integration/association-hasone-required.js b/test/integration/association-hasone-required.js
index cde0160b..2b8b7f2c 100644
--- a/test/integration/association-hasone-required.js
+++ b/test/integration/association-hasone-required.js
@@ -87,3 +87,92 @@ describe("hasOne", function() {
     });
   });
 });
+
+describe("hasOne Async", function() {
+  var db     = null;
+  var Person = null;
+
+  var setup = function (required) {
+    return function (done) {
+      db.settings.set('instance.identityCache', false);
+      db.settings.set('instance.returnAllErrors', true);
+
+      Person = db.define('person', {
+        name     : String
+      });
+      Person.hasOne('parent', Person, {
+        required : required,
+        field    : 'parentId'
+      });
+
+      return helper.dropSync(Person, done);
+    };
+  };
+
+  before(function(done) {
+    helper.connect(function (connection) {
+      db = connection;
+      done();
+    });
+  });
+
+  describe("required", function () {
+    before(setup(true));
+
+    it("should not accept empty association", function (done) {
+      var John = new Person({
+        name     : "John",
+        parentId : null
+      });
+      John.saveAsync().then(function() {
+        throw new Error('Should catch an error');
+      }).catch(function(err) {
+        should.exist(err);
+        should.equal(err.length, 1);
+        should.equal(err[0].type,     'validation');
+        should.equal(err[0].msg,      'required');
+        should.equal(err[0].property, 'parentId');
+        done();
+      });
+    });
+
+    it("should accept association", function (done) {
+      var John = new Person({
+        name     : "John",
+        parentId : 1
+      });
+      John.saveAsync().then(function () {
+        done();
+      }).catch(function(err) {
+        done(err);
+      });
+    });
+  });
+
+  describe("not required", function () {
+    before(setup(false));
+
+    it("should accept empty association", function (done) {
+      var John = new Person({
+        name : "John"
+      });
+      John.saveAsync().then(function () {
+        done();
+      }).catch(function(err) {
+        done(err);
+      });
+    });
+
+    it("should accept null association", function (done) {
+      var John = new Person({
+        name      : "John",
+        parent_id : null
+      });
+      John.saveAsync().then(function () {
+        done();
+      }).catch(function(err) {
+        done(err);
+      });
+    });
+  });
+});
\ No newline at end of file
diff --git a/test/integration/association-hasone.js b/test/integration/association-hasone.js
index 75455bf1..6c85b248 100644
--- a/test/integration/association-hasone.js
+++ b/test/integration/association-hasone.js
@@ -596,17 +596,18 @@ describe("hasOne", function() {
   });
 
   if (protocol != "mongodb") {
-    describe("mapsTo (promise-based tests)", function () {
+    describe("mapsTo Async (promise-based tests)", function () {
       describe("with `mapsTo` set via `hasOne`", function () {
         var leaf = null;
 
         before(setup());
 
         before(function (done) {
-          Leaf.create({ size: 444, stalkId: stalkId, holeId: holeId }, function (err, lf) {
-            should.not.exist(err);
+          Leaf.createAsync({ size: 444, stalkId: stalkId, holeId: holeId }).then(function (lf) {
             leaf = lf;
             done();
+          }).catch(function(err) {
+            done(err);
           });
         });
 
@@ -629,10 +630,11 @@ describe("hasOne", function() {
         before(setup());
 
         before(function (done) {
-          Leaf.create({ size: 444, stalkId: stalkId, holeId: holeId }, function (err, lf) {
-            should.not.exist(err);
+          Leaf.createAsync({ size: 444, stalkId: stalkId, holeId: holeId }).then(function (lf) {
             leaf = lf;
             done();
+          }).catch(function(err) {
+            done(err);
           });
         });
 
diff --git a/test/integration/instance.js b/test/integration/instance.js
index 876f0d6b..1b17d844 100644
--- a/test/integration/instance.js
+++ b/test/integration/instance.js
@@ -402,20 +402,21 @@ describe("Model instance", function() {
 
         person1.saveAsync().then(function () {
 
-          Person.create({ height: 170 }, function (err, person2) {
-            should.not.exist(err);
-
-            Person.get(person1[Person.id], function (err, item) {
-              should.not.exist(err);
+          Person.createAsync({ height: 170 }).then(function (person2) {
+            Person.getAsync(person1[Person.id]).then(function (item) {
               should.equal(item.height, 190);
-
-              Person.get(person2[Person.id], function (err, item) {
-                should.not.exist(err);
+              Person.getAsync(person2[Person.id]).then(function (item) {
                 should.equal(item.height, 170);
 
                 done();
+              }).catch(function(err) {
+                done(err);
               });
+            }).catch(function(err) {
+              done(err);
             });
+          }).catch(function(err) {
+            done(err);
           });
         }).catch(function(err) {
           done(err);
@@ -515,10 +516,11 @@ describe("Model instance", function() {
 
             should.equal(err.message, msg);
 
-            Person.create({ height: 'bugz' }, function (err, instance) {
+            Person.createAsync({ height: 'bugz' }).then(function () {
+              done(new Error('Function should catch an error instead of finish'));
+            }).catch(function(err) {
               should.exist(err);
               should.equal(err.message, msg);
-
               done();
             });
           });
@@ -556,20 +558,22 @@ describe("Model instance", function() {
 
           person.saveAsync().then(function () {
 
-            Person.get(person[Person.id], function (err, person) {
-              should.not.exist(err);
+            Person.getAsync(person[Person.id]).then(function (person) {
               should(isNaN(person.weight));
 
               person.saveAsync({ weight: Infinity, name: 'black hole' }).then(function () {
-                Person.get(person[Person.id], function (err, person) {
-                  should.not.exist(err);
+                Person.getAsync(person[Person.id]).then(function (person) {
                   should.strictEqual(person.weight, Infinity);
 
                   done();
+                }).catch(function(err) {
+                  done(err);
                 });
               }).catch(function(err) {
                 done(err);
               });
+            }).catch(function(err) {
+              done(err);
             });
           }).catch(function(err) {
             done(err);
diff --git a/test/integration/model-getAsync.js b/test/integration/model-getAsync.js
index 526c83a9..d265d903 100644
--- a/test/integration/model-getAsync.js
+++ b/test/integration/model-getAsync.js
@@ -25,15 +25,15 @@ describe("Model.getAsync()", function () {
       ORM.singleton.clear(); // clear identityCache cache
 
       return helper.dropSync(Person, function () {
-        Person.create([{
+        Person.createAsync([{
           name: "John Doe"
         }, {
           name: "Jane Doe"
-        }], function (err, people) {
-          if (err) done(err);
+        }]).then(function (people) {
           John = people[0];
-
-          return done();
+          done();
+        }).catch(function(err) {
+          done(err);
         });
       });
     };
diff --git a/test/integration/property-lazyload.js b/test/integration/property-lazyload.js
index 0b146be0..fce83845 100644
--- a/test/integration/property-lazyload.js
+++ b/test/integration/property-lazyload.js
@@ -122,7 +122,7 @@ describe("LazyLoad properties", function() {
       });
     });
 
-    it("promise-based setAccessor should change property", function (done) {
+    it("promise-based setAccessor should change property (promise-based)", function (done) {
       Person.find().first(function (err, John) {
         should.equal(err, null);
         John.should.be.a.Object();
@@ -171,15 +171,13 @@ describe("LazyLoad properties", function() {
         });
     });
 
-    it("promise-based removeAccessor should change property", function (done) {
+    it("removeAccessor should change property (promise-based)", function (done) {
       Person.find().first(function (err, John) {
         should.equal(err, null);
         John.should.be.a.Object();
 
         John.removePhotoAsync().then(function () {
-          should.equal(err, null);
-          Person.get(John[Person.id], function (err, John) {
-            should.equal(err, null);
+          Person.getAsync(John[Person.id]).then(function (John) {
             John.should.be.a.Object();
 
             John.getPhotoAsync()
@@ -190,7 +188,11 @@ describe("LazyLoad properties", function() {
               }).catch(function (err) {
                 done(err);
               });
+          }).catch(function(err) {
+            done(err);
           });
+        }).catch(function(err) {
+          done(err);
         });
       });
     });

From ad4eebe581f8a9755362c04b1a039497cc0ad703 Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Tue, 12 Sep 2017 17:35:21 +0300
Subject: [PATCH 1158/1246] Add changes to the part of tests

---
 test/integration/association-extend-async.js | 244 +++++++++++++++++++
 1 file changed, 244 insertions(+)
 create mode 100644 test/integration/association-extend-async.js

diff --git a/test/integration/association-extend-async.js b/test/integration/association-extend-async.js
new file mode 100644
index 00000000..927cbe62
--- /dev/null
+++ b/test/integration/association-extend-async.js
@@ -0,0 +1,244 @@
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var ORM      = require('../../');
+
+describe("Model.extendsTo()", function() {
+  var db = null;
+  var Person = null;
+  var PersonAddress = null;
+
+  var setup = function () {
+    return function (done) {
+      Person = db.define("person", {
+        name   : String
+      });
+      PersonAddress = Person.extendsTo("address", {
+        street : String,
+        number : Number
+      });
+
+      ORM.singleton.clear();
+
+      return helper.dropSync([ Person, PersonAddress ], function () {
+        Person.create({
+          name: "John Doe"
+        }, function (err, person) {
+          should.not.exist(err);
+
+          return person.setAddress(new PersonAddress({
+            street : "Liberty",
+            number : 123
+          }), done);
+        });
+      });
+    };
+  };
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  describe("when calling hasAccessorAsync", function () {
+    before(setup());
+
+    it("should return true if found", function (done) {
+      Person.find()
+        .firstAsync()
+        .then(function (John) {
+          return John.hasAddressAsync();
+        })
+        .then(function (hasAddress) {
+          hasAddress.should.equal(true);
+
+          done();
+        }).catch(function(err){
+          done(err);
+        });
+      //});
+    });
+
+    it("should return false if not found", function (done) {
+      Person.find().first(function (err, John) {
+        should.equal(err, null);
+        John.removeAddressAsync().then(function(){
+          John.hasAddressAsync().then(function (hasAddress) {
+          }).catch(function(err) {
+            err.should.be.a.Object();
+            done();
+          });
+        });
+      });
+    });
+
+    it("should return error if instance not with an ID", function (done) {
+      var Jane = new Person({
+        name: "Jane"
+      });
+      Jane.hasAddressAsync().catch(function(err) {
+        err.should.be.a.Object();
+        err.should.have.property("code", ORM.ErrorCodes.NOT_DEFINED);
+        done();
+      });
+    });
+  });
+
+  describe("when calling getAccessorAsync", function () {
+    before(setup());
+
+    it("should return extension if found", function (done) {
+      Person.find().first(function (err, John) {
+        should.equal(err, null);
+
+        John.getAddressAsync(John).then(function (Address) {
+          Address.should.be.a.Object();
+          Address.should.have.property("street", "Liberty");
+          done();
+        }).catch(function (err) {
+          done(err);
+        });
+      });
+    });
+
+    it("should return error if not found", function (done) {
+      Person.find().first(function (err, John) {
+        should.equal(err, null);
+        John.removeAddressAsync().then(function () {
+          John.getAddressAsync(John).catch(function(err){
+            err.should.be.a.Object();
+            err.should.have.property("code", ORM.ErrorCodes.NOT_FOUND);
+            done();
+          });
+        });
+      });
+    });
+
+    it("should return error if instance not with an ID", function (done) {
+      var Jane = new Person({
+        name: "Jane"
+      });
+      Jane.getAddressAsync().catch(function(err) {
+        err.should.be.a.Object();
+        err.should.have.property("code", ORM.ErrorCodes.NOT_DEFINED);
+        done();
+      });
+    });
+  });
+
+  describe("when calling setAccessor + Async", function () {
+    before(setup());
+
+    it("should remove any previous extension", function (done) {
+      Person.find().first(function (err, John) {
+        should.equal(err, null);
+
+        PersonAddress.find({ number: 123 }).count(function (err, c) {
+          should.equal(err, null);
+          c.should.equal(1);
+
+          var addr = new PersonAddress({
+            street : "4th Ave",
+            number : 4
+          });
+
+          John.setAddressAsync(addr).then(function () {
+            John.getAddressAsync(addr).then(function (Address) {
+              Address.should.be.a.Object();
+              Address.should.have.property("street", addr.street);
+              PersonAddress.find({ number: 123 }).count(function (err, c) {
+                should.equal(err, null);
+                c.should.equal(0);
+                 done();
+              });
+            });
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+    });
+  });
+
+  describe("when calling delAccessor + Async", function () {
+    before(setup());
+
+    it("should remove any extension", function (done) {
+      Person.find().first(function (err, John) {
+        should.equal(err, null);
+
+        PersonAddress.find({ number: 123 }).count(function (err, c) {
+          should.equal(err, null);
+          c.should.equal(1);
+
+          var addr = new PersonAddress({
+            street : "4th Ave",
+            number : 4
+          });
+
+          John.removeAddressAsync().then(function () {
+
+            PersonAddress.find({ number: 123 }).count(function (err, c) {
+              should.equal(err, null);
+              c.should.equal(0);
+
+              done();
+            });
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+    });
+
+    it("should return error if instance not with an ID", function (done) {
+      var Jane = new Person({
+        name: "Jane"
+      });
+      Jane.removeAddressAsync().catch(function(err) {
+        err.should.be.a.Object();
+        err.should.have.property("code", ORM.ErrorCodes.NOT_DEFINED);
+        done();
+      });
+    });
+  });
+
+  describe("findBy()", function () { // TODO: make async after Models method include async support
+    before(setup());
+
+    it("should throw if no conditions passed", function (done) {
+      (function () {
+        Person.findByAddress(function () {});
+      }).should.throw();
+
+      return done();
+    });
+
+    it("should lookup in Model based on associated model properties", function (done) {
+      Person.findByAddress({
+        number: 123
+      }, function (err, people) {
+        should.equal(err, null);
+        should(Array.isArray(people));
+        should(people.length == 1);
+
+        return done();
+      });
+    });
+
+    it("should return a ChainFind if no callback passed", function (done) {
+      var ChainFind = Person.findByAddress({
+        number: 123
+      });
+      ChainFind.run.should.be.a.Function();
+
+      return done();
+    });
+  });
+});

From 7ad36dcc5e8976c22633754faa0d78ac8e679ef9 Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Tue, 12 Sep 2017 17:35:59 +0300
Subject: [PATCH 1159/1246] Add changes to the part of tests

---
 test/integration/association-extend-async.js | 182 ++++++++-----------
 1 file changed, 71 insertions(+), 111 deletions(-)

diff --git a/test/integration/association-extend-async.js b/test/integration/association-extend-async.js
index 927cbe62..f0bb20bb 100644
--- a/test/integration/association-extend-async.js
+++ b/test/integration/association-extend-async.js
@@ -46,96 +46,84 @@ describe("Model.extendsTo()", function() {
     return db.close();
   });
 
-  describe("when calling hasAccessorAsync", function () {
+  describe("when calling hasAccessorAsync", function () { // TODO: fix Model.find to async
     before(setup());
 
-    it("should return true if found", function (done) {
-      Person.find()
+    it("should return true if found", function () {
+      return Person.find()
         .firstAsync()
         .then(function (John) {
           return John.hasAddressAsync();
         })
         .then(function (hasAddress) {
-          hasAddress.should.equal(true);
-
-          done();
-        }).catch(function(err){
-          done(err);
+          should.equal(hasAddress, true);
         });
-      //});
-    });
-
-    it("should return false if not found", function (done) {
-      Person.find().first(function (err, John) {
-        should.equal(err, null);
-        John.removeAddressAsync().then(function(){
-          John.hasAddressAsync().then(function (hasAddress) {
-          }).catch(function(err) {
-            err.should.be.a.Object();
-            done();
-          });
-        });
-      });
     });
 
     it("should return error if instance not with an ID", function (done) {
       var Jane = new Person({
         name: "Jane"
       });
-      Jane.hasAddressAsync().catch(function(err) {
-        err.should.be.a.Object();
-        err.should.have.property("code", ORM.ErrorCodes.NOT_DEFINED);
-        done();
-      });
+
+      Jane.hasAddressAsync()
+        .catch(function (err) {
+          err.should.be.a.Object();
+          should.equal(Array.isArray(err), false);
+          err.should.have.property("code", ORM.ErrorCodes.NOT_DEFINED);
+          done();
+        });
     });
   });
 
-  describe("when calling getAccessorAsync", function () {
+  describe("when calling getAccessorAsync", function () { // TODO: fix Model.find to async
     before(setup());
 
-    it("should return extension if found", function (done) {
-      Person.find().first(function (err, John) {
-        should.equal(err, null);
-
-        John.getAddressAsync(John).then(function (Address) {
+    it("should return extension if found", function () {
+      return Person.find()
+        .firstAsync()
+        .then(function (John) {
+          return John.getAddressAsync();
+        })
+        .then(function (Address) {
           Address.should.be.a.Object();
+          should.equal(Array.isArray(Address), false);
           Address.should.have.property("street", "Liberty");
-          done();
-        }).catch(function (err) {
-          done(err);
         });
-      });
     });
 
     it("should return error if not found", function (done) {
-      Person.find().first(function (err, John) {
-        should.equal(err, null);
-        John.removeAddressAsync().then(function () {
-          John.getAddressAsync(John).catch(function(err){
-            err.should.be.a.Object();
-            err.should.have.property("code", ORM.ErrorCodes.NOT_FOUND);
-            done();
-          });
+      Person.find()
+        .firstAsync()
+        .then(function (John) {
+          return [John, John.removeAddressAsync()];
+        })
+        .spread(function(John) {
+          return John.getAddressAsync();
+        })
+        .catch(function(err) {
+          err.should.be.a.Object();
+          err.should.have.property("code", ORM.ErrorCodes.NOT_FOUND);
+          done();
         });
-      });
     });
 
     it("should return error if instance not with an ID", function (done) {
       var Jane = new Person({
         name: "Jane"
       });
-      Jane.getAddressAsync().catch(function(err) {
-        err.should.be.a.Object();
-        err.should.have.property("code", ORM.ErrorCodes.NOT_DEFINED);
-        done();
-      });
+      Jane.getAddressAsync()
+        .catch(function(err) {
+          err.should.be.a.Object();
+          err.should.have.property("code", ORM.ErrorCodes.NOT_DEFINED);
+          done();
+        });
     });
   });
 
-  describe("when calling setAccessor + Async", function () {
+  describe("when calling setAccessorAsync", function () {
     before(setup());
 
-    it("should remove any previous extension", function (done) {
+    it("should remove any previous extension", function (done) { // TODO: fix Model.find to async
       Person.find().first(function (err, John) {
         should.equal(err, null);
 
@@ -148,25 +136,29 @@ describe("Model.extendsTo()", function() {
             number : 4
           });
 
-          John.setAddressAsync(addr).then(function () {
-            John.getAddressAsync(addr).then(function (Address) {
+          John.setAddressAsync(addr)
+            .then(function () {
+              return John.getAddressAsync();
+            })
+            .then(function (Address) {
               Address.should.be.a.Object();
+              should.equal(Array.isArray(Address), false);
               Address.should.have.property("street", addr.street);
-              PersonAddress.find({ number: 123 }).count(function (err, c) {
-                should.equal(err, null);
-                c.should.equal(0);
-                 done();
-              });
+              PersonAddress.find({ number: 123 })
+                .count(function (err, c) {
+                  should.equal(err, null);
+                  c.should.equal(0);
+                  done();
+                });
+            }).catch(function(err) {
+              done(err);
             });
-          }).catch(function(err) {
-            done(err);
-          });
         });
       });
     });
   });
 
-  describe("when calling delAccessor + Async", function () {
+  describe("when calling delAccessor + Async", function () { // TODO: fix .find to async
     before(setup());
 
     it("should remove any extension", function (done) {
@@ -182,17 +174,17 @@ describe("Model.extendsTo()", function() {
             number : 4
           });
 
-          John.removeAddressAsync().then(function () {
-
-            PersonAddress.find({ number: 123 }).count(function (err, c) {
-              should.equal(err, null);
-              c.should.equal(0);
+          John.removeAddressAsync()
+            .then(function () {
+              PersonAddress.find({ number: 123 }).count(function (err, c) {
+                should.equal(err, null);
+                c.should.equal(0);
 
-              done();
+                done();
+              });
+            }).catch(function(err) {
+              done(err);
             });
-          }).catch(function(err) {
-            done(err);
-          });
         });
       });
     });
@@ -201,44 +193,12 @@ describe("Model.extendsTo()", function() {
       var Jane = new Person({
         name: "Jane"
       });
-      Jane.removeAddressAsync().catch(function(err) {
-        err.should.be.a.Object();
-        err.should.have.property("code", ORM.ErrorCodes.NOT_DEFINED);
-        done();
-      });
-    });
-  });
-
-  describe("findBy()", function () { // TODO: make async after Models method include async support
-    before(setup());
-
-    it("should throw if no conditions passed", function (done) {
-      (function () {
-        Person.findByAddress(function () {});
-      }).should.throw();
-
-      return done();
-    });
-
-    it("should lookup in Model based on associated model properties", function (done) {
-      Person.findByAddress({
-        number: 123
-      }, function (err, people) {
-        should.equal(err, null);
-        should(Array.isArray(people));
-        should(people.length == 1);
-
-        return done();
-      });
-    });
-
-    it("should return a ChainFind if no callback passed", function (done) {
-      var ChainFind = Person.findByAddress({
-        number: 123
-      });
-      ChainFind.run.should.be.a.Function();
-
-      return done();
+      Jane.removeAddressAsync()
+        .catch(function(err) {
+          err.should.be.a.Object();
+          err.should.have.property("code", ORM.ErrorCodes.NOT_DEFINED);
+          done();
+        });
     });
   });
 });

From c0a00ce7c132163ddc633e91d845fe3bbe1f8f83 Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Tue, 12 Sep 2017 18:11:42 +0300
Subject: [PATCH 1160/1246] Association hasmany async tests moved to separate

---
 test/integration/association-hasmany-async.js | 729 ++++++++++++++++++
 test/integration/association-hasmany.js       | 536 -------------
 2 files changed, 729 insertions(+), 536 deletions(-)
 create mode 100644 test/integration/association-hasmany-async.js

diff --git a/test/integration/association-hasmany-async.js b/test/integration/association-hasmany-async.js
new file mode 100644
index 00000000..a48fed80
--- /dev/null
+++ b/test/integration/association-hasmany-async.js
@@ -0,0 +1,729 @@
+var _        = require('lodash');
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var ORM      = require('../../');
+var common   = require('../common');
+var protocol = common.protocol();
+
+describe("hasMany", function () {
+  var db     = null;
+  var Person = null;
+  var Pet    = null;
+
+  before(function(done) {
+    helper.connect(function (connection) {
+      db = connection;
+      done();
+    });
+  });
+
+  describe("normal", function () {
+
+    var setup = function (opts) {
+      opts = opts || {};
+
+      return function (done) {
+        db.settings.set('instance.identityCache', false);
+
+        Person = db.define('person', {
+          name    : String,
+          surname : String,
+          age     : Number
+        });
+        Pet = db.define('pet', {
+          name    : String
+        });
+        Person.hasMany('pets', Pet, {}, { autoFetch: opts.autoFetchPets });
+
+        helper.dropSync([ Person, Pet], function (err) {
+          should.not.exist(err);
+
+          Pet.create([{ name: "Cat" }, { name: "Dog" }], function (err) {
+            should.not.exist(err);
+
+            /**
+             * John --+---> Deco
+             *        '---> Mutt <----- Jane
+             *
+             * Justin
+             */
+            Person.create([
+              {
+                name    : "Bob",
+                surname : "Smith",
+                age     : 30
+              },
+              {
+                name    : "John",
+                surname : "Doe",
+                age     : 20,
+                pets    : [{
+                  name    : "Deco"
+                }, {
+                  name    : "Mutt"
+                }]
+              }, {
+                name    : "Jane",
+                surname : "Doe",
+                age     : 16
+              }, {
+                name    : "Justin",
+                surname : "Dean",
+                age     : 18
+              }
+            ], function (err) {
+              should.not.exist(err);
+
+              Person.find({ name: "Jane" }, function (err, people) {
+                should.not.exist(err);
+
+                Pet.find({ name: "Mutt" }, function (err, pets) {
+                  should.not.exist(err);
+
+                  people[0].addPets(pets, done);
+                });
+              });
+            });
+          });
+        });
+      };
+    };
+
+    describe("getAccessorAsync", function () {
+      before(setup());
+
+      it("should allow to specify order as string", function (done) {
+        Person.find({ name: "John" }, function (err, people) {
+          should.equal(err, null);
+
+          people[0].getPetsAsync("-name").then(function (pets) {
+
+            should(Array.isArray(pets));
+            pets.length.should.equal(2);
+            pets[0].model().should.equal(Pet);
+            pets[0].name.should.equal("Mutt");
+            pets[1].name.should.equal("Deco");
+
+            done();
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+
+      it ("should return proper instance model", function(done){
+        Person.find({ name: "John" }, function (err, people) {
+          people[0].getPetsAsync("-name").then(function (pets) {
+            pets[0].model().should.equal(Pet);
+            done();
+          }).catch(function(err) {
+            done(err);
+          })
+        });
+      });
+
+      it("should allow to specify order as Array", function (done) {
+        Person.find({ name: "John" }, function (err, people) {
+          should.equal(err, null);
+
+          people[0].getPetsAsync([ "name", "Z" ]).then(function (pets) {
+
+            should(Array.isArray(pets));
+            pets.length.should.equal(2);
+            pets[0].name.should.equal("Mutt");
+            pets[1].name.should.equal("Deco");
+
+            done();
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+
+      it("should allow to specify a limit", function (done) {
+        Person.find({ name: "John" }).first(function (err, John) {
+          should.equal(err, null);
+
+          John.getPetsAsync(1).then(function (pets) {
+            should(Array.isArray(pets));
+            pets.length.should.equal(1);
+
+            done();
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+
+      it("should allow to specify conditions", function (done) {
+        Person.find({ name: "John" }).first(function (err, John) {
+          should.equal(err, null);
+
+          John.getPetsAsync({ name: "Mutt" }).then(function (pets) {
+
+            should(Array.isArray(pets));
+            pets.length.should.equal(1);
+            pets[0].name.should.equal("Mutt");
+
+            done();
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+
+      if (common.protocol() == "mongodb") return;
+
+      it("should allow chaining count()", function (done) {
+        Person.find({}, function (err, people) {
+          should.equal(err, null);
+
+          people[1].getPetsAsync().then(function (count) {
+            should.strictEqual(count.length, 2);
+
+            people[2].getPetsAsync().then(function (count) {
+
+              should.strictEqual(count.length, 1);
+
+              people[3].getPetsAsync().then(function (count) {
+
+                should.strictEqual(count.length, 0);
+
+                done();
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          }).catch(function(err){
+            done(err);
+          });
+        });
+      });
+    });
+
+    describe("hasAccessorAsync", function () {
+      before(setup());
+
+      it("should return true if instance has associated item", function (done) {
+        Pet.find({ name: "Mutt" }, function (err, pets) {
+          should.equal(err, null);
+
+          Person.find({ name: "Jane" }).first(function (err, Jane) {
+            should.equal(err, null);
+
+            Jane.hasPetsAsync(pets[0]).then(function (has_pets) {
+              has_pets.should.be.true;
+              done();
+            }).catch(function(err){
+              done(err);
+            });
+          });
+        });
+      });
+
+      it("should return true if not passing any instance and has associated items", function (done) {
+        Person.find({ name: "Jane" }).first(function (err, Jane) {
+          should.equal(err, null);
+
+          Jane.hasPetsAsync().then(function (has_pets) {
+            has_pets.should.be.true;
+            done();
+          }).catch(function(err){
+            done(err);
+          });
+        });
+      });
+
+      it("should return true if all passed instances are associated", function (done) {
+        Pet.find(function (err, pets) {
+          Person.find({ name: "John" }).first(function (err, John) {
+            should.equal(err, null);
+
+            John.hasPetsAsync(pets).then(function (has_pets) {
+              should.equal(err, null);
+              has_pets.should.be.true;
+              done();
+            }).catch(function(err){
+              done(err);
+            });
+          });
+        });
+      });
+
+      it("should return false if any passed instances are not associated", function (done) {
+        Pet.find(function (err, pets) {
+          Person.find({ name: "Jane" }).first(function (err, Jane) {
+            should.equal(err, null);
+
+            Jane.hasPetsAsync(pets).then(function (has_pets) {
+              should.equal(err, null);
+              has_pets.should.be.false;
+
+              done();
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      });
+
+      if (common.protocol() != "mongodb") {
+        it("should return true if join table has duplicate entries", function (done) {
+          Pet.find({ name: ["Mutt", "Deco"] }, function (err, pets) {
+            should.not.exist(err);
+            should.equal(pets.length, 2);
+
+            Person.find({ name: "John" }).first(function (err, John) {
+              should.not.exist(err);
+
+              John.hasPets(pets, function (err, hasPets) {
+                should.equal(err, null);
+                should.equal(hasPets, true);
+
+                db.driver.execQuery(
+                  "INSERT INTO person_pets (person_id, pets_id) VALUES (?,?), (?,?)",
+                  [John.id, pets[0].id, John.id, pets[1].id],
+                  function (err) {
+                    should.not.exist(err);
+
+                    John.hasPets(pets, function (err, hasPets) {
+                      should.equal(err, null);
+                      should.equal(hasPets, true);
+
+                      done()
+                    });
+                  }
+                );
+              });
+            });
+          });
+        });
+        it("should return true if join table has duplicate entries (promise-based)", function (done) {
+          Pet.find({ name: ["Mutt", "Deco"] }, function (err, pets) {
+            should.not.exist(err);
+            should.equal(pets.length, 2);
+
+            Person.find({ name: "John" }).first(function (err, John) {
+              should.not.exist(err);
+
+              John.hasPetsAsync(pets).then(function (hasPets) {
+                should.equal(hasPets, true);
+
+                db.driver.execQueryAsync(
+                  "INSERT INTO person_pets (person_id, pets_id) VALUES (?,?), (?,?)",
+                  [John.id, pets[0].id, John.id, pets[1].id]).then(
+                  function () {
+
+                    John.hasPetsAsync(pets).then(function (hasPets) {
+                      should.equal(hasPets, true);
+                      done();
+                    }).catch(function(err){
+                      done(err);
+                    });
+                  }
+                ).catch(function(err){
+                  done(err);
+                });
+              }).catch(function(err){
+                done(err);
+              });
+            });
+          });
+        });
+      }
+    });
+
+    describe("delAccessorAsync", function () {
+      before(setup());
+
+      it("should accept arguments in different orders", function (done) {
+        Pet.find({ name: "Mutt" }, function (err, pets) {
+          Person.find({ name: "John" }, function (err, people) {
+            should.equal(err, null);
+
+            people[0].removePetsAsync(pets[0]).then(function () {
+              people[0].getPetsAsync().then(function (pets) {
+
+                should(Array.isArray(pets));
+                pets.length.should.equal(1);
+                pets[0].name.should.equal("Deco");
+
+                return done();
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      });
+
+      it("should remove specific associations if passed", function (done) {
+        Pet.find({ name: "Mutt" }, function (err, pets) {
+          Person.find({ name: "John" }, function (err, people) {
+            should.equal(err, null);
+
+            people[0].removePetsAsync(pets[0]).then(function () {
+              people[0].getPetsAsync().then(function (pets) {
+                should(Array.isArray(pets));
+                pets.length.should.equal(1);
+                pets[0].name.should.equal("Deco");
+
+                done();
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      });
+
+      it("should remove all associations if none passed", function (done) {
+        Person.find({ name: "John" }).first(function (err, John) {
+          should.equal(err, null);
+
+          John.removePetsAsync().then(function () {
+            John.getPetsAsync().then(function (pets) {
+
+              should(Array.isArray(pets));
+              pets.length.should.equal(0);
+
+              done();
+            }).catch(function(err) {
+              done(err);
+            });
+          }).catch(function(err){
+            done(err);
+          });
+        });
+      });
+    });
+
+    describe("addAccessorAsync", function () {
+      before(setup());
+
+      if (common.protocol() != "mongodb") {
+
+        it("might add duplicates (promise-based)", function (done) {
+          Pet.find({ name: "Mutt" }, function (err, pets) {
+            Person.find({ name: "Jane" }, function (err, people) {
+              should.equal(err, null);
+
+              people[0].addPetsAsync(pets[0]).then(function () {
+                people[0].getPetsAsync("name").then(function (pets) {
+
+                  should(Array.isArray(pets));
+                  pets.length.should.equal(2);
+                  pets[0].name.should.equal("Mutt");
+                  pets[1].name.should.equal("Mutt");
+
+                  done();
+                }).catch(function(err){
+                  done(err);
+                });
+              }).catch(function(err){
+                done(err);
+              });
+            });
+          });
+        });
+      }
+
+      it("should keep associations and add new ones", function (done) {
+        Pet.find({ name: "Deco" }).first(function (err, Deco) {
+          Person.find({ name: "Jane" }).first(function (err, Jane) {
+            should.equal(err, null);
+
+            Jane.getPetsAsync().then(function (janesPets) {
+              should.not.exist(err);
+
+              var petsAtStart = janesPets.length;
+
+              Jane.addPetsAsync(Deco).then(function () {
+                Jane.getPetsAsync("name").then(function (pets) {
+                  should(Array.isArray(pets));
+                  pets.length.should.equal(petsAtStart + 1);
+                  pets[0].name.should.equal("Deco");
+                  pets[1].name.should.equal("Mutt");
+
+                  done();
+                }).catch(function(err) {
+                  done(err);
+                });
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err){
+              done(err);
+            });
+          });
+        });
+      });
+
+      it("should accept several arguments as associations (promise-based)", function (done) {
+        Pet.find(function (err, pets) {
+          Person.find({ name: "Justin" }).first(function (err, Justin) {
+            should.equal(err, null);
+
+            Justin.addPetsAsync(pets[0], pets[1]).then(function () {
+              Justin.getPetsAsync().then(function (pets) {
+
+                should(Array.isArray(pets));
+                pets.length.should.equal(2);
+
+                done();
+              }).catch(function(err){
+                done(err);
+              });
+            }).catch(function(err){
+              done(err);
+            });
+          });
+        });
+      });
+
+      it("should accept array as list of associations (promise-based)", function (done) {
+        Pet.createAsync([{ name: 'Ruff' }, { name: 'Spotty' }]).then(function (pets) {
+          Person.find({ name: "Justin" }).first(function (err, Justin) {
+            should.equal(err, null);
+
+            Justin.getPetsAsync().then(function (justinsPets) {
+
+              var petCount = justinsPets.length;
+
+              Justin.addPetsAsync(pets).then(function () {
+
+                Justin.getPetsAsync().then(function (justinsPets) {
+
+                  should(Array.isArray(justinsPets));
+                  // Mongo doesn't like adding duplicates here, so we add new ones.
+                  should.equal(justinsPets.length, petCount + 2);
+
+                  done();
+                });
+              }).catch(function(err){
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        }).catch(function(err) {
+          done(err);
+        });
+      });
+    });
+
+    describe("setAccessorAsync", function () {
+      before(setup());
+
+      it("should accept several arguments as associations", function (done) {
+        Pet.find(function (err, pets) {
+          Person.find({ name: "Justin" }).first(function (err, Justin) {
+            should.equal(err, null);
+
+            Justin.setPetsAsync(pets[0], pets[1]).then(function () {
+              Justin.getPetsAsync().then(function (pets) {
+
+                should(Array.isArray(pets));
+                pets.length.should.equal(2);
+
+                done();
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function (err) {
+              done(err);
+            });
+          });
+        });
+      });
+
+      it("should accept an array of associations", function (done) {
+        Pet.find(function (err, pets) {
+          Person.find({ name: "Justin" }).first(function (err, Justin) {
+            should.equal(err, null);
+
+            Justin.setPetsAsync(pets).then(function () {
+              Justin.getPetsAsync().then(function (all_pets) {
+                should(Array.isArray(all_pets));
+                all_pets.length.should.equal(pets.length);
+
+                done();
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      });
+
+      it("should remove all associations if an empty array is passed", function (done) {
+        Person.find({ name: "Justin" }).first(function (err, Justin) {
+          should.equal(err, null);
+          Justin.getPetsAsync().then(function (pets) {
+            should.equal(pets.length, 4);
+
+            Justin.setPetsAsync([]).then(function () {
+
+              Justin.getPetsAsync().then(function (pets) {
+                should.equal(pets.length, 0);
+
+                done();
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+
+      it("clears current associations", function (done) {
+        Pet.find({ name: "Deco" }, function (err, pets) {
+          var Deco = pets[0];
+
+          Person.find({ name: "Jane" }).first(function (err, Jane) {
+            should.equal(err, null);
+
+            Jane.getPetsAsync().then(function (pets) {
+
+              should(Array.isArray(pets));
+              pets.length.should.equal(1);
+              pets[0].name.should.equal("Mutt");
+
+              Jane.setPetsAsync(Deco).then(function () {
+
+                Jane.getPetsAsync().then(function (pets) {
+
+                  should(Array.isArray(pets));
+                  pets.length.should.equal(1);
+                  pets[0].name.should.equal(Deco.name);
+
+                  done();
+                }).catch(function(err) {
+                  done(err);
+                });
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      });
+    });
+
+    describe("with autoFetch turned on", function () {
+      before(setup({
+        autoFetchPets : true
+      }));
+
+      it("should fetch associations", function (done) {
+        Person.find({ name: "John" }).first(function (err, John) {
+          should.equal(err, null);
+
+          John.should.have.property("pets");
+          should(Array.isArray(John.pets));
+          John.pets.length.should.equal(2);
+
+          return done();
+        });
+      });
+
+      it("should save existing", function (done) {
+        Person.create({ name: 'Bishan' }, function (err) {
+          should.not.exist(err);
+
+          Person.one({ name: 'Bishan' }, function (err, person) {
+            should.not.exist(err);
+
+            person.surname = 'Dominar';
+
+            person.save(function (err) {
+              should.not.exist(err);
+
+              done();
+            });
+          });
+        });
+      });
+
+      it("should not auto save associations which were autofetched", function (done) {
+        Pet.all(function (err, pets) {
+          should.not.exist(err);
+          should.equal(pets.length, 4);
+
+          Person.create({ name: 'Paul' }, function (err, paul) {
+            should.not.exist(err);
+
+            Person.one({ name: 'Paul' }, function (err, paul2) {
+              should.not.exist(err);
+              should.equal(paul2.pets.length, 0);
+
+              paul.setPets(pets, function (err) {
+                should.not.exist(err);
+
+                // reload paul to make sure we have 2 pets
+                Person.one({ name: 'Paul' }, function (err, paul) {
+                  should.not.exist(err);
+                  should.equal(paul.pets.length, 4);
+
+                  // Saving paul2 should NOT auto save associations and hence delete
+                  // the associations we just created.
+                  paul2.save(function (err) {
+                    should.not.exist(err);
+
+                    // let's check paul - pets should still be associated
+                    Person.one({ name: 'Paul' }, function (err, paul) {
+                      should.not.exist(err);
+                      should.equal(paul.pets.length, 4);
+
+                      done();
+                    });
+                  });
+                });
+              });
+            });
+          });
+        });
+      });
+
+      it("should save associations set by the user", function (done) {
+        Person.one({ name: 'John' }, function (err, john) {
+          should.not.exist(err);
+          should.equal(john.pets.length, 2);
+
+          john.pets = [];
+
+          john.save(function (err) {
+            should.not.exist(err);
+
+            // reload john to make sure pets were deleted
+            Person.one({ name: 'John' }, function (err, john) {
+              should.not.exist(err);
+              should.equal(john.pets.length, 0);
+
+              done();
+            });
+          });
+        });
+      });
+
+    });
+  });
+
+  if (protocol == "mongodb") return;
+
+});
diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
index bf4a9998..3170b07e 100644
--- a/test/integration/association-hasmany.js
+++ b/test/integration/association-hasmany.js
@@ -625,542 +625,6 @@ describe("hasMany", function () {
       });
     });
 
-    describe("getAccessorAsync", function () {
-      before(setup());
-
-      it("should allow to specify order as string", function (done) {
-        Person.find({ name: "John" }, function (err, people) {
-          should.equal(err, null);
-
-          people[0].getPetsAsync("-name").then(function (pets) {
-
-            should(Array.isArray(pets));
-            pets.length.should.equal(2);
-            pets[0].model().should.equal(Pet);
-            pets[0].name.should.equal("Mutt");
-            pets[1].name.should.equal("Deco");
-
-            done();
-          }).catch(function(err) {
-            done(err);
-          });
-        });
-      });
-
-      it ("should return proper instance model", function(done){
-        Person.find({ name: "John" }, function (err, people) {
-          people[0].getPetsAsync("-name").then(function (pets) {
-            pets[0].model().should.equal(Pet);
-            done();
-          }).catch(function(err) {
-            done(err);
-          })
-        });
-      });
-
-      it("should allow to specify order as Array", function (done) {
-        Person.find({ name: "John" }, function (err, people) {
-          should.equal(err, null);
-
-          people[0].getPetsAsync([ "name", "Z" ]).then(function (pets) {
-
-            should(Array.isArray(pets));
-            pets.length.should.equal(2);
-            pets[0].name.should.equal("Mutt");
-            pets[1].name.should.equal("Deco");
-
-            done();
-          }).catch(function(err) {
-            done(err);
-          });
-        });
-      });
-
-      it("should allow to specify a limit", function (done) {
-        Person.find({ name: "John" }).first(function (err, John) {
-          should.equal(err, null);
-
-          John.getPetsAsync(1).then(function (pets) {
-            should(Array.isArray(pets));
-            pets.length.should.equal(1);
-
-            done();
-          }).catch(function(err) {
-            done(err);
-          });
-        });
-      });
-
-      it("should allow to specify conditions", function (done) {
-        Person.find({ name: "John" }).first(function (err, John) {
-          should.equal(err, null);
-
-          John.getPetsAsync({ name: "Mutt" }).then(function (pets) {
-
-            should(Array.isArray(pets));
-            pets.length.should.equal(1);
-            pets[0].name.should.equal("Mutt");
-
-            done();
-          }).catch(function(err) {
-            done(err);
-          });
-        });
-      });
-
-      if (common.protocol() == "mongodb") return;
-
-      it("should allow chaining count()", function (done) {
-        Person.find({}, function (err, people) {
-          should.equal(err, null);
-
-          people[1].getPetsAsync().then(function (count) {
-            should.strictEqual(count.length, 2);
-
-            people[2].getPetsAsync().then(function (count) {
-
-              should.strictEqual(count.length, 1);
-
-              people[3].getPetsAsync().then(function (count) {
-
-                should.strictEqual(count.length, 0);
-
-                done();
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
-          }).catch(function(err){
-            done(err);
-          });
-        });
-      });
-    });
-
-    describe("hasAccessorAsync", function () {
-      before(setup());
-
-      it("should return true if instance has associated item", function (done) {
-        Pet.find({ name: "Mutt" }, function (err, pets) {
-          should.equal(err, null);
-
-          Person.find({ name: "Jane" }).first(function (err, Jane) {
-            should.equal(err, null);
-
-            Jane.hasPetsAsync(pets[0]).then(function (has_pets) {
-              has_pets.should.be.true;
-              done();
-            }).catch(function(err){
-              done(err);
-            });
-          });
-        });
-      });
-
-      it("should return true if not passing any instance and has associated items", function (done) {
-        Person.find({ name: "Jane" }).first(function (err, Jane) {
-          should.equal(err, null);
-
-          Jane.hasPetsAsync().then(function (has_pets) {
-            has_pets.should.be.true;
-            done();
-          }).catch(function(err){
-            done(err);
-          });
-        });
-      });
-
-      it("should return true if all passed instances are associated", function (done) {
-        Pet.find(function (err, pets) {
-          Person.find({ name: "John" }).first(function (err, John) {
-            should.equal(err, null);
-
-            John.hasPetsAsync(pets).then(function (has_pets) {
-              should.equal(err, null);
-              has_pets.should.be.true;
-              done();
-            }).catch(function(err){
-              done(err);
-            });
-          });
-        });
-      });
-
-      it("should return false if any passed instances are not associated", function (done) {
-        Pet.find(function (err, pets) {
-          Person.find({ name: "Jane" }).first(function (err, Jane) {
-            should.equal(err, null);
-
-            Jane.hasPetsAsync(pets).then(function (has_pets) {
-              should.equal(err, null);
-              has_pets.should.be.false;
-
-              done();
-            }).catch(function(err) {
-              done(err);
-            });
-          });
-        });
-      });
-
-      if (common.protocol() != "mongodb") {
-        it("should return true if join table has duplicate entries", function (done) {
-          Pet.find({ name: ["Mutt", "Deco"] }, function (err, pets) {
-            should.not.exist(err);
-            should.equal(pets.length, 2);
-
-            Person.find({ name: "John" }).first(function (err, John) {
-              should.not.exist(err);
-
-              John.hasPets(pets, function (err, hasPets) {
-                should.equal(err, null);
-                should.equal(hasPets, true);
-
-                db.driver.execQuery(
-                  "INSERT INTO person_pets (person_id, pets_id) VALUES (?,?), (?,?)",
-                  [John.id, pets[0].id, John.id, pets[1].id],
-                  function (err) {
-                    should.not.exist(err);
-
-                    John.hasPets(pets, function (err, hasPets) {
-                      should.equal(err, null);
-                      should.equal(hasPets, true);
-
-                      done()
-                    });
-                  }
-                );
-              });
-            });
-          });
-        });
-        it("should return true if join table has duplicate entries (promise-based)", function (done) {
-          Pet.find({ name: ["Mutt", "Deco"] }, function (err, pets) {
-            should.not.exist(err);
-            should.equal(pets.length, 2);
-
-            Person.find({ name: "John" }).first(function (err, John) {
-              should.not.exist(err);
-
-              John.hasPetsAsync(pets).then(function (hasPets) {
-                should.equal(hasPets, true);
-
-                db.driver.execQueryAsync(
-                  "INSERT INTO person_pets (person_id, pets_id) VALUES (?,?), (?,?)",
-                  [John.id, pets[0].id, John.id, pets[1].id]).then(
-                  function () {
-
-                    John.hasPetsAsync(pets).then(function (hasPets) {
-                      should.equal(hasPets, true);
-                      done();
-                    }).catch(function(err){
-                      done(err);
-                    });
-                  }
-                ).catch(function(err){
-                  done(err);
-                });
-              }).catch(function(err){
-                done(err);
-              });
-            });
-          });
-        });
-      }
-    });
-
-    describe("delAccessorAsync", function () {
-      before(setup());
-
-      it("should accept arguments in different orders", function (done) {
-        Pet.find({ name: "Mutt" }, function (err, pets) {
-          Person.find({ name: "John" }, function (err, people) {
-            should.equal(err, null);
-
-            people[0].removePetsAsync(pets[0]).then(function () {
-              people[0].getPetsAsync().then(function (pets) {
-
-                should(Array.isArray(pets));
-                pets.length.should.equal(1);
-                pets[0].name.should.equal("Deco");
-
-                return done();
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
-          });
-        });
-      });
-
-      it("should remove specific associations if passed", function (done) {
-        Pet.find({ name: "Mutt" }, function (err, pets) {
-          Person.find({ name: "John" }, function (err, people) {
-            should.equal(err, null);
-
-            people[0].removePetsAsync(pets[0]).then(function () {
-              people[0].getPetsAsync().then(function (pets) {
-                should(Array.isArray(pets));
-                pets.length.should.equal(1);
-                pets[0].name.should.equal("Deco");
-
-                done();
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
-          });
-        });
-      });
-
-      it("should remove all associations if none passed", function (done) {
-        Person.find({ name: "John" }).first(function (err, John) {
-          should.equal(err, null);
-
-          John.removePetsAsync().then(function () {
-            John.getPetsAsync().then(function (pets) {
-
-              should(Array.isArray(pets));
-              pets.length.should.equal(0);
-
-              done();
-            }).catch(function(err) {
-              done(err);
-            });
-          }).catch(function(err){
-            done(err);
-          });
-        });
-      });
-    });
-
-    describe("addAccessorAsync", function () {
-      before(setup());
-
-      if (common.protocol() != "mongodb") {
-
-        it("might add duplicates (promise-based)", function (done) {
-          Pet.find({ name: "Mutt" }, function (err, pets) {
-            Person.find({ name: "Jane" }, function (err, people) {
-              should.equal(err, null);
-
-              people[0].addPetsAsync(pets[0]).then(function () {
-                people[0].getPetsAsync("name").then(function (pets) {
-
-                  should(Array.isArray(pets));
-                  pets.length.should.equal(2);
-                  pets[0].name.should.equal("Mutt");
-                  pets[1].name.should.equal("Mutt");
-
-                  done();
-                }).catch(function(err){
-                  done(err);
-                });
-              }).catch(function(err){
-                done(err);
-              });
-            });
-          });
-        });
-      }
-
-      it("should keep associations and add new ones", function (done) {
-        Pet.find({ name: "Deco" }).first(function (err, Deco) {
-          Person.find({ name: "Jane" }).first(function (err, Jane) {
-            should.equal(err, null);
-
-            Jane.getPetsAsync().then(function (janesPets) {
-              should.not.exist(err);
-
-              var petsAtStart = janesPets.length;
-
-              Jane.addPetsAsync(Deco).then(function () {
-                Jane.getPetsAsync("name").then(function (pets) {
-                  should(Array.isArray(pets));
-                  pets.length.should.equal(petsAtStart + 1);
-                  pets[0].name.should.equal("Deco");
-                  pets[1].name.should.equal("Mutt");
-
-                  done();
-                }).catch(function(err) {
-                  done(err);
-                });
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err){
-              done(err);
-            });
-          });
-        });
-      });
-
-      it("should accept several arguments as associations (promise-based)", function (done) {
-        Pet.find(function (err, pets) {
-          Person.find({ name: "Justin" }).first(function (err, Justin) {
-            should.equal(err, null);
-
-            Justin.addPetsAsync(pets[0], pets[1]).then(function () {
-              Justin.getPetsAsync().then(function (pets) {
-
-                should(Array.isArray(pets));
-                pets.length.should.equal(2);
-
-                done();
-              }).catch(function(err){
-                done(err);
-              });
-            }).catch(function(err){
-              done(err);
-            });
-          });
-        });
-      });
-
-      it("should accept array as list of associations (promise-based)", function (done) {
-        Pet.createAsync([{ name: 'Ruff' }, { name: 'Spotty' }]).then(function (pets) {
-          Person.find({ name: "Justin" }).first(function (err, Justin) {
-            should.equal(err, null);
-
-            Justin.getPetsAsync().then(function (justinsPets) {
-
-              var petCount = justinsPets.length;
-
-              Justin.addPetsAsync(pets).then(function () {
-
-                Justin.getPetsAsync().then(function (justinsPets) {
-
-                  should(Array.isArray(justinsPets));
-                  // Mongo doesn't like adding duplicates here, so we add new ones.
-                  should.equal(justinsPets.length, petCount + 2);
-
-                  done();
-                });
-              }).catch(function(err){
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
-          });
-        }).catch(function(err) {
-          done(err);
-        });
-      });
-    });
-
-    describe("setAccessorAsync", function () {
-      before(setup());
-
-      it("should accept several arguments as associations", function (done) {
-        Pet.find(function (err, pets) {
-          Person.find({ name: "Justin" }).first(function (err, Justin) {
-            should.equal(err, null);
-
-            Justin.setPetsAsync(pets[0], pets[1]).then(function () {
-              Justin.getPetsAsync().then(function (pets) {
-
-                should(Array.isArray(pets));
-                pets.length.should.equal(2);
-
-                done();
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function (err) {
-              done(err);
-            });
-          });
-        });
-      });
-
-      it("should accept an array of associations", function (done) {
-        Pet.find(function (err, pets) {
-          Person.find({ name: "Justin" }).first(function (err, Justin) {
-            should.equal(err, null);
-
-            Justin.setPetsAsync(pets).then(function () {
-              Justin.getPetsAsync().then(function (all_pets) {
-                should(Array.isArray(all_pets));
-                all_pets.length.should.equal(pets.length);
-
-                done();
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
-          });
-        });
-      });
-
-      it("should remove all associations if an empty array is passed", function (done) {
-        Person.find({ name: "Justin" }).first(function (err, Justin) {
-          should.equal(err, null);
-          Justin.getPetsAsync().then(function (pets) {
-            should.equal(pets.length, 4);
-
-            Justin.setPetsAsync([]).then(function () {
-
-              Justin.getPetsAsync().then(function (pets) {
-                should.equal(pets.length, 0);
-
-                done();
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
-          }).catch(function(err) {
-            done(err);
-          });
-        });
-      });
-
-      it("clears current associations", function (done) {
-        Pet.find({ name: "Deco" }, function (err, pets) {
-          var Deco = pets[0];
-
-          Person.find({ name: "Jane" }).first(function (err, Jane) {
-            should.equal(err, null);
-
-            Jane.getPetsAsync().then(function (pets) {
-
-              should(Array.isArray(pets));
-              pets.length.should.equal(1);
-              pets[0].name.should.equal("Mutt");
-
-              Jane.setPetsAsync(Deco).then(function () {
-
-                Jane.getPetsAsync().then(function (pets) {
-
-                  should(Array.isArray(pets));
-                  pets.length.should.equal(1);
-                  pets[0].name.should.equal(Deco.name);
-
-                  done();
-                }).catch(function(err) {
-                  done(err);
-                });
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
-          });
-        });
-      });
-    });
-
     describe("with autoFetch turned on", function () {
       before(setup({
         autoFetchPets : true

From 1e38407df81cd1fdb85054ac75b9f62d5e633adc Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Wed, 13 Sep 2017 16:45:02 +0300
Subject: [PATCH 1161/1246] update has meny tests

---
 test/integration/association-hasmany-async.js | 840 +++++++-----------
 test/integration/association-hasmany-extra.js |  68 +-
 test/integration/association-hasmany-hooks.js | 109 +--
 .../association-hasmany-mapsto-async.js       | 474 ++++++++++
 .../integration/association-hasmany-mapsto.js | 540 -----------
 5 files changed, 886 insertions(+), 1145 deletions(-)
 create mode 100644 test/integration/association-hasmany-mapsto-async.js

diff --git a/test/integration/association-hasmany-async.js b/test/integration/association-hasmany-async.js
index a48fed80..d49a7ce7 100644
--- a/test/integration/association-hasmany-async.js
+++ b/test/integration/association-hasmany-async.js
@@ -1,7 +1,5 @@
-var _        = require('lodash');
 var should   = require('should');
 var helper   = require('../support/spec_helper');
-var ORM      = require('../../');
 var common   = require('../common');
 var protocol = common.protocol();
 
@@ -92,245 +90,170 @@ describe("hasMany", function () {
     describe("getAccessorAsync", function () {
       before(setup());
 
-      it("should allow to specify order as string", function (done) {
-        Person.find({ name: "John" }, function (err, people) {
-          should.equal(err, null);
-
-          people[0].getPetsAsync("-name").then(function (pets) {
-
+      it("should allow to specify order as string", function () {
+        return Person.findAsync({ name: "John" })
+          .then(function (people) {
+            return people[0].getPetsAsync("-name");
+          })
+          .then(function (pets) {
             should(Array.isArray(pets));
             pets.length.should.equal(2);
             pets[0].model().should.equal(Pet);
             pets[0].name.should.equal("Mutt");
             pets[1].name.should.equal("Deco");
-
-            done();
-          }).catch(function(err) {
-            done(err);
           });
-        });
       });
 
-      it ("should return proper instance model", function(done){
-        Person.find({ name: "John" }, function (err, people) {
-          people[0].getPetsAsync("-name").then(function (pets) {
-            pets[0].model().should.equal(Pet);
-            done();
-          }).catch(function(err) {
-            done(err);
+      it("should return proper instance model", function(){
+        return Person.findAsync({ name: "John" })
+          .then(function (people) {
+            return people[0].getPetsAsync("-name");
           })
-        });
+          .then(function (pets) {
+            pets[0].model().should.equal(Pet);
+          });
       });
 
-      it("should allow to specify order as Array", function (done) {
-        Person.find({ name: "John" }, function (err, people) {
-          should.equal(err, null);
-
-          people[0].getPetsAsync([ "name", "Z" ]).then(function (pets) {
-
+      it("should allow to specify order as Array", function () {
+        return Person.findAsync({ name: "John" })
+          .then(function (people) {
+            return people[0].getPetsAsync([ "name", "Z" ]);
+          })
+          .then(function (pets) {
             should(Array.isArray(pets));
             pets.length.should.equal(2);
             pets[0].name.should.equal("Mutt");
             pets[1].name.should.equal("Deco");
-
-            done();
-          }).catch(function(err) {
-            done(err);
           });
-        });
       });
 
-      it("should allow to specify a limit", function (done) {
-        Person.find({ name: "John" }).first(function (err, John) {
-          should.equal(err, null);
-
-          John.getPetsAsync(1).then(function (pets) {
+      it("should allow to specify a limit", function () {
+        return Person.find({ name: "John" })
+          .firstAsync()
+          .then(function (John) {
+            return John.getPetsAsync(1)
+            })
+          .then(function (pets) {
             should(Array.isArray(pets));
             pets.length.should.equal(1);
-
-            done();
-          }).catch(function(err) {
-            done(err);
           });
-        });
       });
 
-      it("should allow to specify conditions", function (done) {
-        Person.find({ name: "John" }).first(function (err, John) {
-          should.equal(err, null);
-
-          John.getPetsAsync({ name: "Mutt" }).then(function (pets) {
-
+      it("should allow to specify conditions", function () {
+        return Person.find({ name: "John" }).firstAsync()
+          .then(function (John) {
+            return John.getPetsAsync({ name: "Mutt" });
+          })
+          .then(function (pets) {
             should(Array.isArray(pets));
             pets.length.should.equal(1);
             pets[0].name.should.equal("Mutt");
-
-            done();
-          }).catch(function(err) {
-            done(err);
           });
-        });
       });
 
       if (common.protocol() == "mongodb") return;
 
-      it("should allow chaining count()", function (done) {
-        Person.find({}, function (err, people) {
-          should.equal(err, null);
-
-          people[1].getPetsAsync().then(function (count) {
-            should.strictEqual(count.length, 2);
-
-            people[2].getPetsAsync().then(function (count) {
-
-              should.strictEqual(count.length, 1);
-
-              people[3].getPetsAsync().then(function (count) {
-
-                should.strictEqual(count.length, 0);
-
-                done();
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
-          }).catch(function(err){
-            done(err);
+      it("should allow chaining count()", function () {
+        return Person.findAsync({})
+          .then(function (people) {
+            return [people[1].getPetsAsync(), people[2].getPetsAsync(), people[3].getPetsAsync()];
+          })
+          .spread(function (count1, count2, count3) {
+            should.strictEqual(count1.length, 2);
+            should.strictEqual(count2.length, 1);
+            should.strictEqual(count3.length, 0);
           });
-        });
       });
     });
 
     describe("hasAccessorAsync", function () {
       before(setup());
 
-      it("should return true if instance has associated item", function (done) {
-        Pet.find({ name: "Mutt" }, function (err, pets) {
-          should.equal(err, null);
-
-          Person.find({ name: "Jane" }).first(function (err, Jane) {
-            should.equal(err, null);
-
-            Jane.hasPetsAsync(pets[0]).then(function (has_pets) {
-              has_pets.should.be.true;
-              done();
-            }).catch(function(err){
-              done(err);
-            });
-          });
-        });
-      });
-
-      it("should return true if not passing any instance and has associated items", function (done) {
-        Person.find({ name: "Jane" }).first(function (err, Jane) {
-          should.equal(err, null);
-
-          Jane.hasPetsAsync().then(function (has_pets) {
-            has_pets.should.be.true;
-            done();
-          }).catch(function(err){
-            done(err);
-          });
-        });
-      });
-
-      it("should return true if all passed instances are associated", function (done) {
-        Pet.find(function (err, pets) {
-          Person.find({ name: "John" }).first(function (err, John) {
-            should.equal(err, null);
-
-            John.hasPetsAsync(pets).then(function (has_pets) {
-              should.equal(err, null);
-              has_pets.should.be.true;
-              done();
-            }).catch(function(err){
-              done(err);
-            });
+      it("should return true if instance has associated item", function () {
+        return Pet.findAsync({ name: "Mutt" })
+          .then(function (pets) {
+            return [pets, Person.find({ name: "Jane" }).firstAsync()];
+          })
+          .spread(function (pets, Jane) {
+            return Jane.hasPetsAsync(pets[0]);
+          })
+          .then(function (has_pets) {
+            has_pets.should.be.true();
           });
-        });
       });
 
-      it("should return false if any passed instances are not associated", function (done) {
-        Pet.find(function (err, pets) {
-          Person.find({ name: "Jane" }).first(function (err, Jane) {
-            should.equal(err, null);
-
-            Jane.hasPetsAsync(pets).then(function (has_pets) {
-              should.equal(err, null);
-              has_pets.should.be.false;
-
-              done();
-            }).catch(function(err) {
-              done(err);
-            });
+      it("should return false if any passed instances are not associated", function () {
+        return Pet.findAsync()
+          .then(function (pets) {
+            return [pets, Person.find({ name: "Jane" }).firstAsync()];
+          })
+          .spread(function (pets, Jane) {
+            return Jane.hasPetsAsync(pets);
+          })
+          .then(function (has_pets) {
+            has_pets.should.be.false();
           });
-        });
       });
 
       if (common.protocol() != "mongodb") {
-        it("should return true if join table has duplicate entries", function (done) {
-          Pet.find({ name: ["Mutt", "Deco"] }, function (err, pets) {
-            should.not.exist(err);
-            should.equal(pets.length, 2);
-
-            Person.find({ name: "John" }).first(function (err, John) {
-              should.not.exist(err);
-
-              John.hasPets(pets, function (err, hasPets) {
-                should.equal(err, null);
-                should.equal(hasPets, true);
-
-                db.driver.execQuery(
+        it("should return true if join table has duplicate entries", function () {
+          return Pet.findAsync({ name: ["Mutt", "Deco"] })
+            .then(function (pets) {
+              should.equal(pets.length, 2);
+
+              return [pets, Person.find({ name: "John" }).firstAsync()];
+            })
+            .spread(function (pets, John) {
+              return [John, pets, John.hasPetsAsync(pets)];
+            })
+            .spread(function (John, pets, hasPets) {
+              should.equal(hasPets, true);
+
+              return [
+                John,
+                pets,
+                db.driver.execQueryAsync(
                   "INSERT INTO person_pets (person_id, pets_id) VALUES (?,?), (?,?)",
-                  [John.id, pets[0].id, John.id, pets[1].id],
-                  function (err) {
-                    should.not.exist(err);
-
-                    John.hasPets(pets, function (err, hasPets) {
-                      should.equal(err, null);
-                      should.equal(hasPets, true);
-
-                      done()
-                    });
-                  }
-                );
-              });
+                  [John.id, pets[0].id, John.id, pets[1].id]
+                )
+              ];
+            })
+            .spread(function (John, pets) {
+              return John.hasPetsAsync(pets);
+            })
+            .then(function (hasPets) {
+              should.equal(hasPets, true);
             });
-          });
         });
-        it("should return true if join table has duplicate entries (promise-based)", function (done) {
-          Pet.find({ name: ["Mutt", "Deco"] }, function (err, pets) {
-            should.not.exist(err);
-            should.equal(pets.length, 2);
-
-            Person.find({ name: "John" }).first(function (err, John) {
-              should.not.exist(err);
-
-              John.hasPetsAsync(pets).then(function (hasPets) {
-                should.equal(hasPets, true);
 
+        it("should return true if join table has duplicate entries (promise-based)", function () {
+          return Pet.findAsync({ name: ["Mutt", "Deco"] })
+            .then(function (pets) {
+              should.equal(pets.length, 2);
+
+              return [pets, Person.find({ name: "John" }).firstAsync()];
+            })
+            .spread(function (pets, John) {
+              return [ John, pets, John.hasPetsAsync(pets)];
+            })
+            .spread(function (John, pets, hasPets) {
+              should.equal(hasPets, true);
+
+              return [
+                John,
+                pets,
                 db.driver.execQueryAsync(
                   "INSERT INTO person_pets (person_id, pets_id) VALUES (?,?), (?,?)",
-                  [John.id, pets[0].id, John.id, pets[1].id]).then(
-                  function () {
-
-                    John.hasPetsAsync(pets).then(function (hasPets) {
-                      should.equal(hasPets, true);
-                      done();
-                    }).catch(function(err){
-                      done(err);
-                    });
-                  }
-                ).catch(function(err){
-                  done(err);
-                });
-              }).catch(function(err){
-                done(err);
-              });
+                  [John.id, pets[0].id, John.id, pets[1].id]
+                )
+              ];
+            })
+            .spread(function (John, pets) {
+              return John.hasPetsAsync(pets);
+            })
+            .then(function (hasPets) {
+              should.equal(hasPets, true);
             });
-          });
         });
       }
     });
@@ -338,69 +261,54 @@ describe("hasMany", function () {
     describe("delAccessorAsync", function () {
       before(setup());
 
-      it("should accept arguments in different orders", function (done) {
-        Pet.find({ name: "Mutt" }, function (err, pets) {
-          Person.find({ name: "John" }, function (err, people) {
-            should.equal(err, null);
-
-            people[0].removePetsAsync(pets[0]).then(function () {
-              people[0].getPetsAsync().then(function (pets) {
-
-                should(Array.isArray(pets));
-                pets.length.should.equal(1);
-                pets[0].name.should.equal("Deco");
-
-                return done();
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
+      it("should accept arguments in different orders", function () {
+        return Pet.findAsync({ name: "Mutt" })
+          .then(function (pets) {
+            return [pets, Person.findAsync({ name: "John" })];
+          })
+          .spread(function (pets, people) {
+            return [people, people[0].removePetsAsync(pets[0])];
+          })
+          .spread(function (people) {
+            return people[0].getPetsAsync();
+          })
+          .then(function (pets) {
+            should(Array.isArray(pets));
+            pets.length.should.equal(1);
+            pets[0].name.should.equal("Deco");
           });
-        });
       });
 
-      it("should remove specific associations if passed", function (done) {
-        Pet.find({ name: "Mutt" }, function (err, pets) {
-          Person.find({ name: "John" }, function (err, people) {
-            should.equal(err, null);
-
-            people[0].removePetsAsync(pets[0]).then(function () {
-              people[0].getPetsAsync().then(function (pets) {
-                should(Array.isArray(pets));
-                pets.length.should.equal(1);
-                pets[0].name.should.equal("Deco");
-
-                done();
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
+      it("should remove specific associations if passed", function () {
+        return Pet.findAsync({ name: "Mutt" })
+          .then(function (pets) {
+            return [pets, Person.findAsync({ name: "John" })];
+          })
+          .spread(function (pets, people) {
+            return [people, people[0].removePetsAsync(pets[0])];
+          })
+          .spread(function (people) {
+            return people[0].getPetsAsync();
+          })
+          .then(function (pets) {
+            should(Array.isArray(pets));
+            pets.length.should.equal(1);
+            pets[0].name.should.equal("Deco");
           });
-        });
       });
 
-      it("should remove all associations if none passed", function (done) {
-        Person.find({ name: "John" }).first(function (err, John) {
-          should.equal(err, null);
-
-          John.removePetsAsync().then(function () {
-            John.getPetsAsync().then(function (pets) {
-
-              should(Array.isArray(pets));
-              pets.length.should.equal(0);
-
-              done();
-            }).catch(function(err) {
-              done(err);
-            });
-          }).catch(function(err){
-            done(err);
+      it("should remove all associations if none passed", function () {
+        return Person.find({ name: "John" }).firstAsync()
+          .then(function (John) {
+            return [John, John.removePetsAsync()];
+          })
+          .spread(function (John) {
+            return John.getPetsAsync();
+          })
+          .then(function (pets) {
+            should(Array.isArray(pets));
+            pets.length.should.equal(0);
           });
-        });
       });
     });
 
@@ -409,219 +317,171 @@ describe("hasMany", function () {
 
       if (common.protocol() != "mongodb") {
 
-        it("might add duplicates (promise-based)", function (done) {
-          Pet.find({ name: "Mutt" }, function (err, pets) {
-            Person.find({ name: "Jane" }, function (err, people) {
-              should.equal(err, null);
-
-              people[0].addPetsAsync(pets[0]).then(function () {
-                people[0].getPetsAsync("name").then(function (pets) {
-
-                  should(Array.isArray(pets));
-                  pets.length.should.equal(2);
-                  pets[0].name.should.equal("Mutt");
-                  pets[1].name.should.equal("Mutt");
-
-                  done();
-                }).catch(function(err){
-                  done(err);
-                });
-              }).catch(function(err){
-                done(err);
-              });
+        it("might add duplicates (promise-based)", function () {
+          return Pet.findAsync({ name: "Mutt" })
+            .then(function (pets) {
+              return [pets, Person.findAsync({ name: "Jane" })];
+            })
+            .spread(function (pets, people) {
+              return [people, people[0].addPetsAsync(pets[0])];
+            })
+            .spread(function (people) {
+              return people[0].getPetsAsync("name");
+            })
+            .then(function (pets) {
+              should(Array.isArray(pets));
+              pets.length.should.equal(2);
+              pets[0].name.should.equal("Mutt");
+              pets[1].name.should.equal("Mutt");
             });
-          });
         });
       }
 
-      it("should keep associations and add new ones", function (done) {
-        Pet.find({ name: "Deco" }).first(function (err, Deco) {
-          Person.find({ name: "Jane" }).first(function (err, Jane) {
-            should.equal(err, null);
-
-            Jane.getPetsAsync().then(function (janesPets) {
-              should.not.exist(err);
-
-              var petsAtStart = janesPets.length;
-
-              Jane.addPetsAsync(Deco).then(function () {
-                Jane.getPetsAsync("name").then(function (pets) {
-                  should(Array.isArray(pets));
-                  pets.length.should.equal(petsAtStart + 1);
-                  pets[0].name.should.equal("Deco");
-                  pets[1].name.should.equal("Mutt");
+      it("should keep associations and add new ones", function () {
+        return Pet.find({ name: "Deco" }).firstAsync()
+          .then(function (Deco) {
+            return [Deco, Person.find({ name: "Jane" }).firstAsync()];
+          })
+          .spread(function (Deco, Jane) {
+            return [Jane, Deco, Jane.getPetsAsync()]
+          })
+          .spread(function (Jane, Deco, janesPets) {
+            var petsAtStart = janesPets.length;
 
-                  done();
-                }).catch(function(err) {
-                  done(err);
-                });
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err){
-              done(err);
-            });
+            return [petsAtStart, Jane, Jane.addPetsAsync(Deco)];
+          })
+          .spread(function (petsAtStart, Jane) {
+            return [petsAtStart, Jane.getPetsAsync("name")];
+          })
+          .spread(function (petsAtStart, pets) {
+            should(Array.isArray(pets));
+            pets.length.should.equal(petsAtStart + 1);
+            pets[0].name.should.equal("Deco");
+            pets[1].name.should.equal("Mutt");
           });
-        });
       });
 
-      it("should accept several arguments as associations (promise-based)", function (done) {
-        Pet.find(function (err, pets) {
-          Person.find({ name: "Justin" }).first(function (err, Justin) {
-            should.equal(err, null);
-
-            Justin.addPetsAsync(pets[0], pets[1]).then(function () {
-              Justin.getPetsAsync().then(function (pets) {
-
-                should(Array.isArray(pets));
-                pets.length.should.equal(2);
-
-                done();
-              }).catch(function(err){
-                done(err);
-              });
-            }).catch(function(err){
-              done(err);
-            });
+      it("should accept several arguments as associations (promise-based)", function () {
+        return Pet.findAsync()
+          .then(function (pets) {
+            return [pets, Person.find({ name: "Justin" }).firstAsync()];
+          })
+          .spread(function (pets, Justin) {
+            return [Justin, Justin.addPetsAsync(pets[0], pets[1])];
+          })
+          .spread(function (Justin) {
+            return Justin.getPetsAsync();
+          })
+          .then(function (pets) {
+            should(Array.isArray(pets));
+            pets.length.should.equal(2);
           });
-        });
       });
 
-      it("should accept array as list of associations (promise-based)", function (done) {
-        Pet.createAsync([{ name: 'Ruff' }, { name: 'Spotty' }]).then(function (pets) {
-          Person.find({ name: "Justin" }).first(function (err, Justin) {
-            should.equal(err, null);
-
-            Justin.getPetsAsync().then(function (justinsPets) {
-
-              var petCount = justinsPets.length;
-
-              Justin.addPetsAsync(pets).then(function () {
-
-                Justin.getPetsAsync().then(function (justinsPets) {
-
-                  should(Array.isArray(justinsPets));
-                  // Mongo doesn't like adding duplicates here, so we add new ones.
-                  should.equal(justinsPets.length, petCount + 2);
+      it("should accept array as list of associations (promise-based)", function () {
+        return Pet.createAsync([{ name: 'Ruff' }, { name: 'Spotty' }])
+          .then(function (pets) {
+            return [pets, Person.find({ name: "Justin" }).firstAsync()];
+          })
+          .spread(function (pets, Justin) {
+            return [pets, Justin, Justin.getPetsAsync()];
+          })
+          .spread(function (pets, Justin, justinsPets) {
+            var petCount = justinsPets.length;
 
-                  done();
-                });
-              }).catch(function(err){
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
+            return [Justin, petCount, Justin.addPetsAsync(pets)];
+          })
+          .spread(function (Justin, petCount) {
+            return [petCount, Justin.getPetsAsync()];
+          })
+          .spread(function (petCount, justinsPets) {
+            should(Array.isArray(justinsPets));
+            // Mongo doesn't like adding duplicates here, so we add new ones.
+            should.equal(justinsPets.length, petCount + 2);
           });
-        }).catch(function(err) {
-          done(err);
-        });
       });
     });
 
     describe("setAccessorAsync", function () {
       before(setup());
 
-      it("should accept several arguments as associations", function (done) {
-        Pet.find(function (err, pets) {
-          Person.find({ name: "Justin" }).first(function (err, Justin) {
-            should.equal(err, null);
-
-            Justin.setPetsAsync(pets[0], pets[1]).then(function () {
-              Justin.getPetsAsync().then(function (pets) {
-
-                should(Array.isArray(pets));
-                pets.length.should.equal(2);
-
-                done();
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function (err) {
-              done(err);
-            });
+      it("should accept several arguments as associations", function () {
+        return Pet.findAsync()
+          .then(function (pets) {
+            return [pets, Person.find({ name: "Justin" }).firstAsync()];
+          })
+          .spread(function (pets, Justin) {
+            return [Justin, Justin.setPetsAsync(pets[0], pets[1])]
+          })
+          .spread(function (Justin) {
+            return Justin.getPetsAsync();
+          })
+          .then(function (pets) {
+            should(Array.isArray(pets));
+            pets.length.should.equal(2);
           });
-        });
       });
 
-      it("should accept an array of associations", function (done) {
-        Pet.find(function (err, pets) {
-          Person.find({ name: "Justin" }).first(function (err, Justin) {
-            should.equal(err, null);
-
-            Justin.setPetsAsync(pets).then(function () {
-              Justin.getPetsAsync().then(function (all_pets) {
-                should(Array.isArray(all_pets));
-                all_pets.length.should.equal(pets.length);
-
-                done();
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
+      it("should accept an array of associations", function () {
+        return Pet.findAsync()
+          .then(function (pets) {
+            return [pets, Person.find({ name: "Justin" }).firstAsync()];
+          })
+          .spread(function (pets, Justin) {
+            return [pets, Justin, Justin.setPetsAsync(pets)];
+          })
+          .spread(function (pets, Justin) {
+            return [pets, Justin.getPetsAsync()];
+          })
+          .spread(function (pets, all_pets) {
+            should(Array.isArray(all_pets));
+            all_pets.length.should.equal(pets.length);
           });
-        });
       });
 
-      it("should remove all associations if an empty array is passed", function (done) {
-        Person.find({ name: "Justin" }).first(function (err, Justin) {
-          should.equal(err, null);
-          Justin.getPetsAsync().then(function (pets) {
+      it("should remove all associations if an empty array is passed", function () {
+        return Person.find({ name: "Justin" }).firstAsync()
+          .then(function (Justin) {
+            return [Justin, Justin.getPetsAsync()];
+          })
+          .spread(function (Justin, pets) {
             should.equal(pets.length, 4);
 
-            Justin.setPetsAsync([]).then(function () {
-
-              Justin.getPetsAsync().then(function (pets) {
-                should.equal(pets.length, 0);
-
-                done();
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
-          }).catch(function(err) {
-            done(err);
+            return [Justin, Justin.setPetsAsync([])];
+          })
+          .spread(function (Justin) {
+            return Justin.getPetsAsync();
+          })
+          .then(function (pets) {
+            should.equal(pets.length, 0);
           });
-        });
       });
 
-      it("clears current associations", function (done) {
-        Pet.find({ name: "Deco" }, function (err, pets) {
-          var Deco = pets[0];
-
-          Person.find({ name: "Jane" }).first(function (err, Jane) {
-            should.equal(err, null);
-
-            Jane.getPetsAsync().then(function (pets) {
-
-              should(Array.isArray(pets));
-              pets.length.should.equal(1);
-              pets[0].name.should.equal("Mutt");
+      it("clears current associations", function () {
+        return Pet.findAsync({ name: "Deco" })
+          .then(function (pets) {
+            var Deco = pets[0];
 
-              Jane.setPetsAsync(Deco).then(function () {
-
-                Jane.getPetsAsync().then(function (pets) {
-
-                  should(Array.isArray(pets));
-                  pets.length.should.equal(1);
-                  pets[0].name.should.equal(Deco.name);
+            return [Deco, Person.find({ name: "Jane" }).firstAsync()];
+          })
+          .spread(function (Deco, Jane) {
+            return [Jane, Deco, Jane.getPetsAsync()];
+          })
+          .spread(function (Jane, Deco, pets) {
+            should(Array.isArray(pets));
+            pets.length.should.equal(1);
+            pets[0].name.should.equal("Mutt");
 
-                  done();
-                }).catch(function(err) {
-                  done(err);
-                });
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
+            return [Jane, Deco, Jane.setPetsAsync(Deco)];
+          })
+          .spread(function (Jane, Deco) {
+            return [Deco, Jane.getPetsAsync()];
+          })
+          .spread(function (Deco, pets) {
+            should(Array.isArray(pets));
+            pets.length.should.equal(1);
+            pets[0].name.should.equal(Deco.name);
           });
-        });
       });
     });
 
@@ -630,95 +490,81 @@ describe("hasMany", function () {
         autoFetchPets : true
       }));
 
-      it("should fetch associations", function (done) {
-        Person.find({ name: "John" }).first(function (err, John) {
-          should.equal(err, null);
-
-          John.should.have.property("pets");
-          should(Array.isArray(John.pets));
-          John.pets.length.should.equal(2);
-
-          return done();
-        });
+      it("should fetch associations", function () {
+        return Person.find({ name: "John" }).firstAsync()
+          .then(function (John) {
+            John.should.have.property("pets");
+            should(Array.isArray(John.pets));
+            John.pets.length.should.equal(2);
+          });
       });
 
-      it("should save existing", function (done) {
-        Person.create({ name: 'Bishan' }, function (err) {
-          should.not.exist(err);
-
-          Person.one({ name: 'Bishan' }, function (err, person) {
-            should.not.exist(err);
-
+      it("should save existing", function () {
+        return Person.createAsync({ name: 'Bishan' })
+          .then(function () {
+            return Person.oneAsync({ name: 'Bishan' });
+          })
+          .then(function (person) {
             person.surname = 'Dominar';
 
-            person.save(function (err) {
-              should.not.exist(err);
-
-              done();
-            });
+            return person.saveAsync();
+          })
+          .then(function (person) {
+            should.equal(person.surname, 'Dominar');
           });
-        });
       });
 
-      it("should not auto save associations which were autofetched", function (done) {
-        Pet.all(function (err, pets) {
-          should.not.exist(err);
-          should.equal(pets.length, 4);
-
-          Person.create({ name: 'Paul' }, function (err, paul) {
-            should.not.exist(err);
-
-            Person.one({ name: 'Paul' }, function (err, paul2) {
-              should.not.exist(err);
-              should.equal(paul2.pets.length, 0);
-
-              paul.setPets(pets, function (err) {
-                should.not.exist(err);
-
-                // reload paul to make sure we have 2 pets
-                Person.one({ name: 'Paul' }, function (err, paul) {
-                  should.not.exist(err);
-                  should.equal(paul.pets.length, 4);
+      it("should not auto save associations which were autofetched", function () {
+        return Pet.allAsync()
+          .then(function (pets) {
+            should.equal(pets.length, 4);
 
-                  // Saving paul2 should NOT auto save associations and hence delete
-                  // the associations we just created.
-                  paul2.save(function (err) {
-                    should.not.exist(err);
+            return [pets, Person.createAsync({ name: 'Paul' })];
+          })
+          .spread(function (pets) {
+            return [pets, Person.oneAsync({ name: 'Paul' })];
+          })
+          .spread(function (pets, paul) {
+            should.equal(paul.pets.length, 0);
 
-                    // let's check paul - pets should still be associated
-                    Person.one({ name: 'Paul' }, function (err, paul) {
-                      should.not.exist(err);
-                      should.equal(paul.pets.length, 4);
+            return paul.setPetsAsync(pets);
+          })
+          .then(function () {
+            // reload paul to make sure we have 2 pets
+            return Person.oneAsync({ name: 'Paul' });
+          })
+          .then(function (paul) {
+            should.equal(paul.pets.length, 4);
 
-                      done();
-                    });
-                  });
-                });
-              });
-            });
+            // Saving paul2 should NOT auto save associations and hence delete
+            // the associations we just created.
+            return paul.saveAsync();
+          })
+          .then(function () {
+            // let's check paul - pets should still be associated
+            return Person.oneAsync({ name: 'Paul' });
+          })
+          .then(function (paul) {
+            should.equal(paul.pets.length, 4);
           });
-        });
       });
 
-      it("should save associations set by the user", function (done) {
-        Person.one({ name: 'John' }, function (err, john) {
-          should.not.exist(err);
-          should.equal(john.pets.length, 2);
-
-          john.pets = [];
+      it("should save associations set by the user", function () {
+        return Person.oneAsync({ name: 'John' })
+          .then(function (john) {
+            should.equal(john.pets.length, 2);
 
-          john.save(function (err) {
-            should.not.exist(err);
+            john.pets = [];
 
+            return john.saveAsync();
+          })
+          .then(function () {
             // reload john to make sure pets were deleted
-            Person.one({ name: 'John' }, function (err, john) {
-              should.not.exist(err);
-              should.equal(john.pets.length, 0);
-
-              done();
-            });
+            return Person.oneAsync({ name: 'John' });
+          })
+          .then(function (john) {
+            should.equal(john.pets.length, 0);
           });
-        });
       });
 
     });
diff --git a/test/integration/association-hasmany-extra.js b/test/integration/association-hasmany-extra.js
index e4289ed8..2b07f164 100644
--- a/test/integration/association-hasmany-extra.js
+++ b/test/integration/association-hasmany-extra.js
@@ -1,6 +1,5 @@
 var should = require('should');
 var helper = require('../support/spec_helper');
-var ORM    = require('../../');
 
 describe("hasMany extra properties", function() {
   var db     = null;
@@ -79,47 +78,40 @@ describe("hasMany extra properties", function() {
   describe("if passed to addAccessorAsync", function () {
     before(setup());
 
-    it("should be added to association", function (done) {
-      Person.createAsync([{
+    it("should be added to association", function () {
+      return Person.createAsync([{
         name    : "John"
-      }]).then(function (people) {
-        Pet.createAsync([{
-          name : "Deco"
-        }, {
-          name : "Mutt"
-        }]).then(function (pets) {
+      }])
+        .then(function (people) {
+          return [people, Pet.createAsync([{
+            name : "Deco"
+          }, {
+            name : "Mutt"
+          }])];
+        })
+        .spread(function (people, pets) {
           var data = { adopted: true };
 
-          people[0].addPetsAsync(pets, { since : new Date(), data: data }).then(function () {
-
-            Person.find({ name: "John" }, { autoFetch : true }).first(function (err, John) {
-              should.equal(err, null);
-
-              John.should.have.property("pets");
-              should(Array.isArray(pets));
-
-              John.pets.length.should.equal(2);
-
-              John.pets[0].should.have.property("name");
-              John.pets[0].should.have.property("extra");
-              John.pets[0].extra.should.be.a.Object();
-              John.pets[0].extra.should.have.property("since");
-              should(John.pets[0].extra.since instanceof Date);
-
-              should.equal(typeof John.pets[0].extra.data, 'object');
-              should.equal(JSON.stringify(data), JSON.stringify(John.pets[0].extra.data));
-
-              done();
-            });
-          }).catch(function(err) {
-            done(err);
-          });
-        }).catch(function(err) {
-          done(err);
+          return [pets, data, people[0].addPetsAsync(pets, { since : new Date(), data: data })];
+        })
+        .spread(function (pets, data) {
+          return [pets, data, Person.find({ name: "John" }, { autoFetch : true }).firstAsync()];
+        })
+        .spread(function (pets, data, John) {
+          John.should.have.property("pets");
+          should(Array.isArray(pets));
+
+          John.pets.length.should.equal(2);
+
+          John.pets[0].should.have.property("name");
+          John.pets[0].should.have.property("extra");
+          John.pets[0].extra.should.be.a.Object();
+          John.pets[0].extra.should.have.property("since");
+          should(John.pets[0].extra.since instanceof Date);
+
+          should.equal(typeof John.pets[0].extra.data, 'object');
+          should.equal(JSON.stringify(data), JSON.stringify(John.pets[0].extra.data));
         });
-      }).catch(function(err) {
-        done(err);
-      });
     });
   });
 });
diff --git a/test/integration/association-hasmany-hooks.js b/test/integration/association-hasmany-hooks.js
index 54bbf504..fa201d3f 100644
--- a/test/integration/association-hasmany-hooks.js
+++ b/test/integration/association-hasmany-hooks.js
@@ -1,6 +1,5 @@
 var should = require('should');
 var helper = require('../support/spec_helper');
-var ORM    = require('../../');
 
 describe("hasMany hooks", function() {
   var db     = null;
@@ -64,8 +63,6 @@ describe("hasMany hooks", function() {
   });
 
   describe("beforeSave", function () {
-    var had_extra = false;
-
     before(setup({}, {
       hooks : {
         beforeSave: function (next) {
@@ -93,8 +90,6 @@ describe("hasMany hooks", function() {
   });
 
   describe("beforeSave", function () {
-    var had_extra = false;
-
     before(setup({}, {
       hooks : {
         beforeSave: function (next) {
@@ -130,90 +125,64 @@ describe("hasMany hooks", function() {
       born : Date
     }, {
       hooks : {
-        beforeSave: function (extra, next) {
-          had_extra = (typeof extra == "object");
-          return next();
-        }
-      }
-    }));
-
-    it("should pass extra data to hook if extra defined", function (done) {
-      Person.create({
-        name    : "John"
-      }, function (err, John) {
-        Pet.create({
-          name : "Deco"
-        }, function (err, Deco) {
-          John.addPetsAsync(Deco).then(function () {
-            should.not.exist(err);
-
-            had_extra.should.equal(true);
-
-            done();
-          }).catch(function(err) {
-            done(err);
+        beforeSave: function (extra) {
+          return new Promise(function (resolve) {
+            setTimeout(function () {
+              had_extra = (typeof extra == "object");
+              resolve()
+            }, 1000);
           });
-        });
-      });
-    });
-  });
-
-  describe("beforeSaveAsync", function () {
-    var had_extra = false;
-
-    before(setup({}, {
-      hooks : {
-        beforeSave: function (next) {
-          next.should.be.a.Function();
-          return next();
         }
       }
     }));
 
-    it("should not pass extra data to hook if extra defined", function (done) {
-      Person.create({
+    it("should pass extra data to hook if extra defined", function () {
+      return Person.createAsync({
         name    : "John"
-      }, function (err, John) {
-        Pet.create({
-          name : "Deco"
-        }, function (err, Deco) {
-          John.addPetsAsync(Deco).then(function () {
-            done();
-          }).catch(function(err) {
-            done(err);
-          });
+      })
+        .then(function (John) {
+          return [John, Pet.createAsync({
+            name : "Deco"
+          })];
+        })
+        .spread(function (John, Deco) {
+          return John.addPetsAsync(Deco);
+        })
+        .then(function () {
+          had_extra.should.equal(true);
         });
-      });
     });
   });
 
   describe("beforeSaveAsync", function () {
-    var had_extra = false;
-
     before(setup({}, {
       hooks : {
-        beforeSave: function (next) {
-          setTimeout(function () {
-            return next(new Error('blocked'));
-          }, 100);
+        beforeSave: function () {
+          return new Promise(function (resolve, reject) {
+            setTimeout(function () {
+              return reject(new Error('blocked'));
+            }, 1000);
+          });
         }
       }
     }));
 
-    it("should block if error returned", function (done) {
-      Person.create({
+    it("should block if error returned", function () {
+      return Person.createAsync({
         name    : "John"
-      }, function (err, John) {
-        Pet.create({
-          name : "Deco"
-        }, function (err, Deco) {
-          John.addPetsAsync(Deco).catch(function(err) {
-            should.exist(err);
-            err.message.should.equal('blocked');
-            done()
-          });
+      })
+        .then(function (John) {
+          return [John, Pet.createAsync({
+            name : "Deco"
+          })];
+        })
+        .spread(function (John, Deco) {
+          return John.addPetsAsync(Deco);
+        })
+        .catch(function(err) {
+          should.exist(err);
+          err.message.should.equal('blocked');
         });
-      });
     });
   });
 });
diff --git a/test/integration/association-hasmany-mapsto-async.js b/test/integration/association-hasmany-mapsto-async.js
new file mode 100644
index 00000000..1088bdfe
--- /dev/null
+++ b/test/integration/association-hasmany-mapsto-async.js
@@ -0,0 +1,474 @@
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var common   = require('../common');
+
+if (common.protocol() == "mongodb") return;   // Can't do mapsTo testing on mongoDB ()
+
+describe("hasMany with MapsTo Async", function () {
+  var db     = null;
+  var Person = null;
+  var Pet    = null;
+
+  before(function(done) {
+    helper.connect(function (connection) {
+      db = connection;
+      done();
+    });
+  });
+
+  var setup = function (opts) {
+    opts = opts || {};
+
+    return function (done) {
+      db.settings.set('instance.identityCache', false);
+
+      Person = db.define('person', {
+        id        : {type : "serial",  size:"8",    mapsTo: "personID", key:true},
+        firstName : {type : "text",    size:"255",  mapsTo: "name"},
+        lastName  : {type : "text",    size:"255",  mapsTo: "surname"},
+        ageYears  : {type : "number",  size:"8",    mapsTo: "age"}
+      });
+
+      Pet = db.define('pet', {
+        id      :  {type : "serial",   size:"8",    mapsTo:"petID", key:true},
+        petName :  {type : "text",     size:"255",  mapsTo: "name"}
+      });
+
+      Person.hasMany('pets', Pet, {},
+        { autoFetch:  opts.autoFetchPets,
+          mergeTable: 'person_pet',
+          mergeId: 'person_id',
+          mergeAssocId: 'pet_id'});
+
+      helper.dropSync([ Person, Pet ], function (err) {
+        if (err) return done(err);
+        //
+        // John --+---> Deco
+        //        '---> Mutt <----- Jane
+        //
+        // Justin
+        //
+        Person.create([{
+          firstName    : "John",
+          lastName     : "Doe",
+          ageYears     : 20,
+          pets    : [{
+            petName    : "Deco"
+          }, {
+            petName    : "Mutt"
+          }]
+        }, {
+          firstName  : "Jane",
+          lastName   : "Doe",
+          ageYears   : 16
+        }, {
+          firstName : "Justin",
+          lastName  : "Dean",
+          ageYears  : 18
+        }], function () {
+          Person.find({ firstName: "Jane" }, function (err, people) {
+            Pet.find({ petName: "Mutt" }, function (err, pets) {
+              people[0].addPets(pets, done);
+            });
+          });
+        });
+      });
+    };
+  };
+
+  describe("getAccessorAsync", function () {
+    before(setup());
+
+    it("should allow to specify order as string", function () {
+      return Person.findAsync({ firstName: "John" })
+        .then(function (people) {
+          return people[0].getPetsAsync("-petName");
+        })
+        .then(function (pets) {
+          should(Array.isArray(pets));
+          pets.length.should.equal(2);
+          pets[0].model().should.equal(Pet);
+          pets[0].petName.should.equal("Mutt");
+          pets[1].petName.should.equal("Deco");
+        });
+    });
+
+    it("should return proper instance model", function(){
+      return Person.findAsync({ firstName: "John" })
+        .then(function (people) {
+          return people[0].getPetsAsync("-petName");
+        })
+        .then(function (pets) {
+          pets[0].model().should.equal(Pet);
+        });
+    });
+
+    it("should allow to specify order as Array", function () {
+      return Person.findAsync({ firstName: "John" })
+        .then(function (people) {
+          return people[0].getPetsAsync([ "petName", "Z" ]);
+        })
+        .then(function (pets) {
+
+          should(Array.isArray(pets));
+          pets.length.should.equal(2);
+          pets[0].petName.should.equal("Mutt");
+          pets[1].petName.should.equal("Deco");
+        });
+    });
+
+    it("should allow to specify a limit", function () {
+      return Person.find({ firstName: "John" }).firstAsync()
+        .then(function (John) {
+          return John.getPetsAsync(1);
+        })
+        .then(function (pets) {
+          should(Array.isArray(pets));
+          pets.length.should.equal(1);
+        });
+    });
+
+    it("should allow to specify conditions", function () {
+      return Person.find({ firstName: "John" }).firstAsync()
+        .then(function (John) {
+          return John.getPetsAsync({ petName: "Mutt" });
+        })
+        .then(function (pets) {
+          should(Array.isArray(pets));
+          pets.length.should.equal(1);
+          pets[0].petName.should.equal("Mutt");
+        });
+    });
+
+    if (common.protocol() == "mongodb") return;
+
+    it("should allow chaining count()", function () {
+      return Person.findAsync({})
+        .then(function (people) {
+          return [people, people[0].getPetsAsync()];
+        })
+        .spread(function (people, count) {
+          should.strictEqual(count.length, 2);
+          return [people, people[1].getPetsAsync()];
+        })
+        .spread(function (people, count) {
+          should.strictEqual(count.length, 1);
+          return people[2].getPetsAsync();
+        })
+        .then(function (count) {
+          should.strictEqual(count.length, 0);
+        });
+    });
+  });
+
+  describe("hasAccessorAsync", function () {
+    before(setup());
+
+    it("should return true if instance has associated item", function () {
+      Pet.findAsync({ petName: "Mutt" })
+        .then(function (pets) {
+          return [pets, Person.find({ firstName: "Jane" }).firstAsync()];
+        })
+        .spread(function (pets, Jane) {
+          return Jane.hasPetsAsync(pets[0]);
+        })
+        .then(function (has_pets) {
+          has_pets.should.equal(true);
+        });
+    });
+
+    it("should return false if any passed instances are not associated", function () {
+      Pet.findAsync()
+        .then(function (pets) {
+          return [pets, Person.find({ firstName: "Jane" }).firstAsync()];
+        })
+        .spread(function (pets, Jane) {
+          return Jane.hasPetsAsync(pets);
+        })
+        .then(function (has_pets) {
+          has_pets.should.be.false();
+        });
+    });
+  });
+
+  describe("delAccessorAsync", function () {
+    before(setup());
+
+    it("should accept arguments in different orders", function () {
+      return Pet.findAsync({ petName: "Mutt" })
+        .then(function (pets) {
+          return [pets, Person.findAsync({ firstName: "John" })];
+        })
+        .spread(function (pets, people) {
+          return [people, people[0].removePetsAsync(pets[0])];
+        })
+        .spread(function (people) {
+          return people[0].getPetsAsync();
+        })
+        .then(function (pets) {
+          should(Array.isArray(pets));
+          pets.length.should.equal(1);
+          pets[0].petName.should.equal("Deco");
+
+        });
+    });
+  });
+
+  describe("delAccessorAsync", function () {
+    before(setup());
+
+    it("should remove specific associations if passed", function () {
+      return Pet.findAsync({ petName: "Mutt" })
+        .then(function (pets) {
+          return [pets, Person.findAsync({ firstName: "John" })];
+        })
+        .spread(function (pets, people) {
+          return [people, people[0].removePetsAsync(pets[0])];
+        })
+        .spread(function (people) {
+          return people[0].getPetsAsync();
+        })
+        .then(function (pets) {
+          should(Array.isArray(pets));
+          pets.length.should.equal(1);
+          pets[0].petName.should.equal("Deco");
+        });
+    });
+
+    it("should remove all associations if none passed", function () {
+      return Person.find({ firstName: "John" }).firstAsync()
+        .then(function (John) {
+          return [John, John.removePetsAsync()];
+        })
+        .spread(function (John) {
+          return John.getPetsAsync();
+        })
+        .then(function (pets) {
+          should(Array.isArray(pets));
+          pets.length.should.equal(0);
+        });
+    });
+  });
+
+  describe("addAccessorAsync", function () {
+    before(setup());
+
+    if (common.protocol() != "mongodb") {
+      it("might add duplicates", function () {
+        return Pet.findAsync({ petName: "Mutt" })
+          .then(function (pets) {
+            return [pets, Person.findAsync({ firstName: "Jane" })];
+          })
+          .spread(function (pets, people) {
+            return [people, people[0].addPetsAsync(pets[0])];
+          })
+          .spread(function (people) {
+            return people[0].getPetsAsync("petName");
+          })
+          .then(function (pets) {
+            should(Array.isArray(pets));
+            pets.length.should.equal(2);
+            pets[0].petName.should.equal("Mutt");
+            pets[1].petName.should.equal("Mutt");
+          });
+      });
+    }
+
+    it("should keep associations and add new ones", function () {
+      return Pet.find({ petName: "Deco" }).firstAsync()
+        .then(function (Deco) {
+          return [Deco, Person.find({ firstName: "Jane" }).firstAsync()];
+        })
+        .spread(function (Deco, Jane) {
+          return [Deco, Jane, Jane.getPetsAsync()];
+        })
+        .spread(function (Deco, Jane, janesPets) {
+          var petsAtStart = janesPets.length;
+          return [petsAtStart, Jane, Jane.addPetsAsync(Deco)];
+        })
+        .spread(function (petsAtStart, Jane) {
+          return [petsAtStart, Jane.getPetsAsync("petName")];
+        })
+        .spread(function (petsAtStart, pets) {
+          should(Array.isArray(pets));
+          pets.length.should.equal(petsAtStart + 1);
+          pets[0].petName.should.equal("Deco");
+          pets[1].petName.should.equal("Mutt");
+        });
+    });
+
+    it("should accept several arguments as associations", function () {
+      return Pet.findAsync()
+        .then(function (pets) {
+          return [pets, Person.find({ firstName: "Justin" }).firstAsync()];
+        })
+        .spread(function (pets, Justin) {
+          return [Justin, Justin.addPetsAsync(pets[0], pets[1])];
+        })
+        .spread(function (Justin) {
+          return Justin.getPetsAsync();
+        })
+        .then(function (pets) {
+          should(Array.isArray(pets));
+          pets.length.should.equal(2);
+        });
+    });
+
+    it("should accept array as list of associations", function () {
+      return Pet.createAsync([{ petName: 'Ruff' }, { petName: 'Spotty' }])
+        .then(function (pets) {
+          return [pets, Person.find({ firstName: "Justin" }).firstAsync()];
+        })
+        .spread(function (pets, Justin) {
+          return [Justin, pets, Justin.getPetsAsync()];
+        })
+        .spread(function (Justin, pets, justinsPets) {
+          var petCount = justinsPets.length;
+          return [petCount, Justin, Justin.addPetsAsync(pets)];
+        })
+        .spread(function (petCount, Justin) {
+          return [petCount, Justin.getPetsAsync()];
+        })
+        .spread(function (petCount, justinsPets) {
+          should(Array.isArray(justinsPets));
+          // Mongo doesn't like adding duplicates here, so we add new ones.
+          should.equal(justinsPets.length, petCount + 2);
+        });
+    });
+
+    it("should throw if no items passed", function () {
+      return Person.oneAsync()
+        .then(function (person) {
+          return person.addPetsAsync()
+        })
+        .catch(function(err) {
+          should.exists(err);
+        });
+    });
+  });
+
+  describe("setAccessorAsync", function () {
+    before(setup());
+
+    it("should accept several arguments as associations", function () {
+      return Pet.findAsync()
+        .then(function (pets) {
+          return [pets, Person.find({ firstName: "Justin" }).firstAsync()];
+        })
+        .spread(function (pets, Justin) {
+          return [Justin, Justin.setPetsAsync(pets[0], pets[1])];
+        })
+        .spread(function (Justin) {
+          return Justin.getPetsAsync();
+        })
+        .then(function (pets) {
+          should(Array.isArray(pets));
+          pets.length.should.equal(2);
+        });
+    });
+
+    it("should accept an array of associations", function () {
+      return Pet.findAsync()
+        .then(function (pets) {
+          return [pets, Person.find({ firstName: "Justin" }).firstAsync()];
+        })
+        .spread(function (pets, Justin) {
+          return [Justin, pets, Justin.setPetsAsync(pets)];
+        })
+        .spread(function (Justin, pets) {
+          return [Justin.getPetsAsync(), pets];
+        })
+        .spread(function (all_pets, pets) {
+          should(Array.isArray(all_pets));
+          all_pets.length.should.equal(pets.length);
+        });
+    });
+
+    it("should remove all associations if an empty array is passed", function () {
+      return Person.find({ firstName: "Justin" }).firstAsync()
+        .then(function (Justin) {
+          return [Justin, Justin.getPetsAsync()];
+        })
+        .spread(function (Justin, pets) {
+          should.equal(pets.length, 2);
+
+          return [Justin, Justin.setPetsAsync([])];
+        })
+        .spread(function (Justin) {
+          return Justin.getPetsAsync();
+        })
+        .then(function (pets) {
+          should.equal(pets.length, 0);
+        });
+    });
+
+    it("clears current associations", function () {
+      return Pet.findAsync({ petName: "Deco" })
+        .then(function (pets) {
+          var Deco = pets[0];
+
+          return [Deco, Person.find({ firstName: "Jane" }).firstAsync()];
+        })
+        .spread(function (Deco, Jane) {
+          return [Deco, Jane, Jane.getPetsAsync()];
+        })
+        .spread(function (Deco, Jane, pets) {
+          should(Array.isArray(pets));
+          pets.length.should.equal(1);
+          pets[0].petName.should.equal("Mutt");
+
+          return [pets, Jane, Deco, Jane.setPetsAsync(Deco)]
+        })
+        .spread(function (pets, Jane, Deco) {
+          return [Deco, Jane.getPetsAsync()];
+        })
+        .spread(function (Deco, pets) {
+          should(Array.isArray(pets));
+          pets.length.should.equal(1);
+          pets[0].petName.should.equal(Deco.petName);
+        });
+    });
+  });
+
+  describe("with autoFetch turned on (promised-based test)", function () {
+    before(setup({
+      autoFetchPets : true
+    }));
+
+    it("should not auto save associations which were autofetched", function () {
+      return Pet.allAsync()
+        .then(function (pets) {
+          should.equal(pets.length, 2);
+
+          return [pets, Person.createAsync({ firstName: 'Paul' })];
+        })
+        .spread(function (pets, paul) {
+          return [pets, paul, Person.oneAsync({ firstName: 'Paul' })];
+        })
+        .spread(function (pets, paul, paul2) {
+          should.equal(paul2.pets.length, 0);
+
+          return [pets, paul, paul2, paul.setPetsAsync(pets)];
+        })
+        .spread(function (pets, paul2) {
+
+          // reload paul to make sure we have 2 pets
+          return [pets, Person.oneAsync({ firstName: 'Paul' }), paul2];
+        })
+        .spread(function (pets, paul, paul2) {
+          should.equal(paul.pets.length, 2);
+
+          // Saving paul2 should NOT auto save associations and hence delete
+          // the associations we just created.
+          return paul2.saveAsync();
+        })
+        .then(function () {
+          // let's check paul - pets should still be associated
+          return Person.oneAsync({ firstName: 'Paul' });
+        })
+        .then(function (paul) {
+          should.equal(paul.pets.length, 2);
+        });
+    });
+  });
+});
diff --git a/test/integration/association-hasmany-mapsto.js b/test/integration/association-hasmany-mapsto.js
index df2ac501..05a3b1a8 100644
--- a/test/integration/association-hasmany-mapsto.js
+++ b/test/integration/association-hasmany-mapsto.js
@@ -1,9 +1,6 @@
-var _        = require('lodash');
 var should   = require('should');
 var helper   = require('../support/spec_helper');
-var ORM      = require('../../');
 var common   = require('../common');
-var protocol = common.protocol();
 
 if (common.protocol() == "mongodb") return;   // Can't do mapsTo testing on mongoDB ()
 
@@ -661,543 +658,6 @@ describe("hasMany with mapsTo", function () {
           });
         });
       });
-
-    });
-
-    describe("getAccessorAsync", function () {
-      before(setup());
-
-      it("should allow to specify order as string", function (done) {
-        Person.find({ firstName: "John" }, function (err, people) {
-          should.equal(err, null);
-
-          people[0].getPetsAsync("-petName").then(function (pets) {
-
-            should(Array.isArray(pets));
-            pets.length.should.equal(2);
-            pets[0].model().should.equal(Pet);
-            pets[0].petName.should.equal("Mutt");
-            pets[1].petName.should.equal("Deco");
-
-            done();
-          }).catch(function(err) {
-            done(err);
-          });
-        });
-      });
-
-      it ("should return proper instance model", function(done){
-        Person.find({ firstName: "John" }, function (err, people) {
-          people[0].getPetsAsync("-petName").then(function (pets) {
-            pets[0].model().should.equal(Pet);
-            done();
-          }).catch(function(err) {
-            done(err);
-          });
-        });
-      });
-
-      it("should allow to specify order as Array", function (done) {
-        Person.find({ firstName: "John" }, function (err, people) {
-          should.equal(err, null);
-
-          people[0].getPetsAsync([ "petName", "Z" ]).then(function (pets) {
-
-            should(Array.isArray(pets));
-            pets.length.should.equal(2);
-            pets[0].petName.should.equal("Mutt");
-            pets[1].petName.should.equal("Deco");
-
-            done();
-          }).catch(function(err) {
-            done(err);
-          });
-        });
-      });
-
-      it("should allow to specify a limit", function (done) {
-        Person.find({ firstName: "John" }).first(function (err, John) {
-          should.equal(err, null);
-
-          John.getPetsAsync(1).then(function (pets) {
-            should(Array.isArray(pets));
-            pets.length.should.equal(1);
-
-            done();
-          }).catch(function(err) {
-            done(err);
-          });
-        });
-      });
-
-      it("should allow to specify conditions", function (done) {
-        Person.find({ firstName: "John" }).first(function (err, John) {
-          should.equal(err, null);
-
-          John.getPetsAsync({ petName: "Mutt" }).then(function (pets) {
-            should(Array.isArray(pets));
-            pets.length.should.equal(1);
-            pets[0].petName.should.equal("Mutt");
-
-            done();
-          }).catch(function(err) {
-            done(err);
-          });
-        });
-      });
-
-      if (common.protocol() == "mongodb") return;
-
-      it("should allow chaining count()", function (done) {
-        Person.find({}, function (err, people) {
-          should.equal(err, null);
-
-          people[0].getPetsAsync().then(function (count) {
-
-            should.strictEqual(count.length, 2);
-
-            people[1].getPetsAsync().then(function (count) {
-
-              should.strictEqual(count.length, 1);
-
-              people[2].getPetsAsync().then(function (count) {
-
-                should.strictEqual(count.length, 0);
-
-                done();
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
-          }).catch(function(err) {
-            done(err);
-          });
-        });
-      });
-    });
-
-    describe("hasAccessorAsync", function () {
-      before(setup());
-
-      it("should return true if instance has associated item", function (done) {
-        Pet.find({ petName: "Mutt" }, function (err, pets) {
-          should.equal(err, null);
-
-          Person.find({ firstName: "Jane" }).first(function (err, Jane) {
-            should.equal(err, null);
-
-            Jane.hasPetsAsync(pets[0]).then(function (has_pets) {
-              has_pets.should.equal(true);
-
-              done();
-            }).catch(function(err) {
-              done(err);
-            });
-          });
-        });
-      });
-
-      it("should return true if not passing any instance and has associated items", function (done) {
-        Person.find({ firstName: "Jane" }).first(function (err, Jane) {
-          should.equal(err, null);
-
-          Jane.hasPetsAsync().then(function (has_pets) {
-            has_pets.should.be.true;
-
-            done();
-          }).catch(function(err) {
-            done(err);
-          });
-        });
-      });
-
-      it("should return true if all passed instances are associated", function (done) {
-        Pet.find(function (err, pets) {
-          Person.find({ firstName: "John" }).first(function (err, John) {
-            should.equal(err, null);
-
-            John.hasPetsAsync(pets).then(function (has_pets) {
-              has_pets.should.be.true;
-
-              done();
-            }).catch(function(err) {
-              done(err);
-            });
-          });
-        });
-      });
-
-      it("should return false if any passed instances are not associated", function (done) {
-        Pet.find(function (err, pets) {
-          Person.find({ firstName: "Jane" }).first(function (err, Jane) {
-            should.equal(err, null);
-
-            Jane.hasPetsAsync(pets).then(function (has_pets) {
-              has_pets.should.be.false;
-
-              done();
-            }).catch(function(err) {
-              done(err);
-            });
-          });
-        });
-      });
-    });
-
-    describe("delAccessorAsync", function () {
-      before(setup());
-
-      it("should accept arguments in different orders", function (done) {
-        Pet.find({ petName: "Mutt" }, function (err, pets) {
-          Person.find({ firstName: "John" }, function (err, people) {
-            should.equal(err, null);
-
-            people[0].removePetsAsync(pets[0]).then(function () {
-
-              people[0].getPetsAsync().then(function (pets) {
-
-                should(Array.isArray(pets));
-                pets.length.should.equal(1);
-                pets[0].petName.should.equal("Deco");
-
-                done();
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
-          });
-        });
-      });
-    });
-
-    describe("delAccessorAsync", function () {
-      before(setup());
-
-      it("should remove specific associations if passed", function (done) {
-        Pet.find({ petName: "Mutt" }, function (err, pets) {
-          Person.find({ firstName: "John" }, function (err, people) {
-            should.equal(err, null);
-
-            people[0].removePetsAsync(pets[0]).then(function () {
-
-              people[0].getPetsAsync().then(function (pets) {
-
-                should(Array.isArray(pets));
-                pets.length.should.equal(1);
-                pets[0].petName.should.equal("Deco");
-
-                done();
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
-          });
-        });
-      });
-
-      it("should remove all associations if none passed", function (done) {
-        Person.find({ firstName: "John" }).first(function (err, John) {
-          should.equal(err, null);
-
-          John.removePetsAsync().then(function () {
-
-            John.getPetsAsync().then(function (pets) {
-
-              should(Array.isArray(pets));
-              pets.length.should.equal(0);
-
-              done();
-            }).catch(function(err) {
-              done(err);
-            });
-          }).catch(function(err){
-            done(err);
-          });
-        });
-      });
-    });
-
-    describe("addAccessorAsync", function () {
-      before(setup());
-
-      if (common.protocol() != "mongodb") {
-        it("might add duplicates", function (done) {
-          Pet.find({ petName: "Mutt" }, function (err, pets) {
-            Person.find({ firstName: "Jane" }, function (err, people) {
-              should.equal(err, null);
-
-              people[0].addPetsAsync(pets[0]).then(function () {
-
-                people[0].getPetsAsync("petName").then(function (pets) {
-
-                  should(Array.isArray(pets));
-                  pets.length.should.equal(2);
-                  pets[0].petName.should.equal("Mutt");
-                  pets[1].petName.should.equal("Mutt");
-
-                  done();
-                }).catch(function(err) {
-                  done(err);
-                });
-              }).catch(function(err) {
-                done(err);
-              });
-            });
-          });
-        });
-      }
-
-      it("should keep associations and add new ones", function (done) {
-        Pet.find({ petName: "Deco" }).first(function (err, Deco) {
-          Person.find({ firstName: "Jane" }).first(function (err, Jane) {
-            should.equal(err, null);
-
-            Jane.getPetsAsync().then(function (janesPets) {
-
-              var petsAtStart = janesPets.length;
-
-              Jane.addPetsAsync(Deco).then(function () {
-                Jane.getPetsAsync("petName").then(function (pets) {
-
-                  should(Array.isArray(pets));
-                  pets.length.should.equal(petsAtStart + 1);
-                  pets[0].petName.should.equal("Deco");
-                  pets[1].petName.should.equal("Mutt");
-
-                  done();
-                });
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
-          });
-        });
-      });
-
-      it("should accept several arguments as associations", function (done) {
-        Pet.find(function (err, pets) {
-          Person.find({ firstName: "Justin" }).first(function (err, Justin) {
-            should.equal(err, null);
-
-            Justin.addPetsAsync(pets[0], pets[1]).then(function () {
-              Justin.getPetsAsync().then(function (pets) {
-
-                should(Array.isArray(pets));
-                pets.length.should.equal(2);
-
-                done();
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
-          });
-        });
-      });
-
-      it("should accept array as list of associations", function (done) {
-        Pet.createAsync([{ petName: 'Ruff' }, { petName: 'Spotty' }]).then(function (pets) {
-          Person.find({ firstName: "Justin" }).first(function (err, Justin) {
-            should.equal(err, null);
-
-            Justin.getPetsAsync().then(function (justinsPets) {
-
-              var petCount = justinsPets.length;
-
-              Justin.addPetsAsync(pets).then(function () {
-                Justin.getPetsAsync().then(function (justinsPets) {
-
-                  should(Array.isArray(justinsPets));
-                  // Mongo doesn't like adding duplicates here, so we add new ones.
-                  should.equal(justinsPets.length, petCount + 2);
-
-                  done();
-                }).catch(function(err) {
-                  done(err);
-                });
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
-          });
-        }).catch(function(err) {
-          done(err);
-        });
-      });
-
-      it("should throw if no items passed", function (done) {
-        Person.one(function (err, person) {
-          should.equal(err, null);
-            person.addPetsAsync().catch(function(err) {
-              should.exists(err);
-              done();
-            });
-        });
-      });
-    });
-
-    describe("setAccessorAsync", function () {
-      before(setup());
-
-      it("should accept several arguments as associations", function (done) {
-        Pet.find(function (err, pets) {
-          Person.find({ firstName: "Justin" }).first(function (err, Justin) {
-            should.equal(err, null);
-
-            Justin.setPetsAsync(pets[0], pets[1]).then(function () {
-
-              Justin.getPetsAsync().then(function (pets) {
-
-                should(Array.isArray(pets));
-                pets.length.should.equal(2);
-
-                done();
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
-          });
-        });
-      });
-
-      it("should accept an array of associations", function (done) {
-        Pet.find(function (err, pets) {
-          Person.find({ firstName: "Justin" }).first(function (err, Justin) {
-            should.equal(err, null);
-
-            Justin.setPetsAsync(pets).then(function () {
-              Justin.getPetsAsync().then(function (all_pets) {
-
-                should(Array.isArray(all_pets));
-                all_pets.length.should.equal(pets.length);
-
-                done();
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
-          });
-        });
-      });
-
-      it("should remove all associations if an empty array is passed", function (done) {
-        Person.find({ firstName: "Justin" }).first(function (err, Justin) {
-          should.equal(err, null);
-          Justin.getPetsAsync().then(function (pets) {
-            should.equal(pets.length, 2);
-
-            Justin.setPetsAsync([]).then(function () {
-              Justin.getPetsAsync().then(function (pets) {
-                should.equal(pets.length, 0);
-
-                done();
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
-          });
-        });
-      });
-
-      it("clears current associations", function (done) {
-        Pet.find({ petName: "Deco" }, function (err, pets) {
-          var Deco = pets[0];
-
-          Person.find({ firstName: "Jane" }).first(function (err, Jane) {
-            should.equal(err, null);
-
-            Jane.getPetsAsync().then(function (pets) {
-
-              should(Array.isArray(pets));
-              pets.length.should.equal(1);
-              pets[0].petName.should.equal("Mutt");
-
-              Jane.setPetsAsync(Deco).then(function () {
-                Jane.getPetsAsync().then(function (pets) {
-
-                  should(Array.isArray(pets));
-                  pets.length.should.equal(1);
-                  pets[0].petName.should.equal(Deco.petName);
-
-                  done();
-                }).catch(function(err) {
-                  done(err);
-                });
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
-          });
-        });
-      });
-    });
-
-    describe("with autoFetch turned on (promised-based test)", function () {
-      before(setup({
-        autoFetchPets : true
-      }));
-
-      it("should not auto save associations which were autofetched", function (done) {
-        Pet.all(function (err, pets) {
-          should.not.exist(err);
-          should.equal(pets.length, 2);
-
-          Person.createAsync({ firstName: 'Paul' }).then(function (paul) {
-
-            Person.one({ firstName: 'Paul' }, function (err, paul2) {
-              should.not.exist(err);
-              should.equal(paul2.pets.length, 0);
-
-              paul.setPetsAsync(pets).then(function () {
-
-                // reload paul to make sure we have 2 pets
-                Person.one({ firstName: 'Paul' }, function (err, paul) {
-                  should.not.exist(err);
-                  should.equal(paul.pets.length, 2);
-
-                  // Saving paul2 should NOT auto save associations and hence delete
-                  // the associations we just created.
-                  paul2.saveAsync().then(function () {
-                    // let's check paul - pets should still be associated
-                    Person.one({ firstName: 'Paul' }, function (err, paul) {
-                      should.not.exist(err);
-                      should.equal(paul.pets.length, 2);
-
-                      done();
-                    });
-                  }).catch(function(err) {
-                    done(err);
-                  });
-                });
-              }).catch(function(err) {
-                done(err);
-              });
-            });
-          }).catch(function(err) {
-            done(err);
-          });;
-        });
-      });
-
     });
   });
 });

From 373398b57eb406febd6e283dcce66b523b95924f Mon Sep 17 00:00:00 2001
From: root <akovylin@locomote.com>
Date: Wed, 13 Sep 2017 16:46:46 +0300
Subject: [PATCH 1162/1246] Update part of hasone async tests

---
 test/integration/association-hasone-async.js | 244 +++++++++++++++++++
 1 file changed, 244 insertions(+)
 create mode 100644 test/integration/association-hasone-async.js

diff --git a/test/integration/association-hasone-async.js b/test/integration/association-hasone-async.js
new file mode 100644
index 00000000..51efb2e7
--- /dev/null
+++ b/test/integration/association-hasone-async.js
@@ -0,0 +1,244 @@
+var ORM      = require('../../');
+var helper   = require('../support/spec_helper');
+var should   = require('should');
+var async    = require('async');
+var _        = require('lodash');
+var common   = require('../common');
+var protocol = common.protocol();
+
+describe("hasOne", function() {
+  var db    = null;
+  var Tree  = null;
+  var Stalk = null;
+  var Leaf  = null;
+  var leafId = null;
+  var treeId = null;
+  var stalkId = null;
+  var holeId  = null;
+
+  var setup = function (opts) {
+    opts = opts || {};
+    return function (done) {
+      db.settings.set('instance.identityCache', false);
+      db.settings.set('instance.returnAllErrors', true);
+      Tree  = db.define("tree",   { type:   { type: 'text'    } });
+      Stalk = db.define("stalk",  { length: { type: 'integer' } });
+      Hole  = db.define("hole",   { width:  { type: 'integer' } });
+      Leaf  = db.define("leaf", {
+        size:   { type: 'integer' },
+        holeId: { type: 'integer', mapsTo: 'hole_id' }
+      }, {
+        validations: opts.validations
+      });
+      Leaf.hasOne('tree',  Tree,  { field: 'treeId', autoFetch: !!opts.autoFetch });
+      Leaf.hasOne('stalk', Stalk, { field: 'stalkId', mapsTo: 'stalk_id' });
+      Leaf.hasOne('hole',  Hole,  { field: 'holeId' });
+
+      return helper.dropSync([Tree, Stalk, Hole, Leaf], function() {
+        Tree.create({ type: 'pine' }, function (err, tree) {
+          should.not.exist(err);
+          treeId = tree[Tree.id];
+          Leaf.create({ size: 14 }, function (err, leaf) {
+            should.not.exist(err);
+            leafId = leaf[Leaf.id];
+            leaf.setTree(tree, function (err) {
+              should.not.exist(err);
+              Stalk.create({ length: 20 }, function (err, stalk) {
+                should.not.exist(err);
+                should.exist(stalk);
+                stalkId = stalk[Stalk.id];
+                Hole.create({ width: 3 }, function (err, hole) {
+                  should.not.exist(err);
+                  holeId = hole.id;
+                  done();
+                });
+              });
+            });
+          });
+        });
+      });
+    };
+  };
+
+  before(function(done) {
+    helper.connect(function (connection) {
+      db = connection;
+      done();
+    });
+  });
+
+  describe("accessors Async", function () {
+    before(setup());
+
+    it("get should get the association", function () {
+      return Leaf
+        .oneAsync({ size: 14 })
+        .then(function(leaf) {
+					should.exist(leaf);
+          return leaf.getTreeAsync();
+        })
+        .then(function (tree) {
+          should.exist(tree);
+        });
+    });
+
+    it("should return proper instance model", function () {
+      return Leaf
+        .oneAsync({ size: 14 })
+        .then(function (leaf) {
+          return leaf.getTreeAsync();
+        })
+        .then(function (tree) {
+          tree.model().should.equal(Tree);
+        });
+    });
+
+    it("get should get the association with a shell model", function () {
+      return Leaf(leafId)
+        .getTreeAsync()
+        .then(function (tree) {
+          should.exist(tree);
+          should.equal(tree[Tree.id], treeId);
+        });
+    });
+
+    it("has should indicate if there is an association present", function () {
+      return Leaf.oneAsync({ size: 14 })
+        .then(function (leaf) {
+          should.exist(leaf);
+          return [leaf, leaf.hasTreeAsync()];
+        })
+        .spread(function (leaf, has) {
+          should.equal(has, true);
+          return leaf.hasStalkAsync();
+				})
+        .then(function (has) {
+          should.equal(has, false);
+        });
+    });
+
+    it("set should associate another instance", function () {
+      return Stalk
+        .oneAsync({ length: 20 })
+        .then(function (stalk) {
+          should.exist(stalk);
+          return [stalk, Leaf.oneAsync({ size: 14 })];
+        })
+        .spread(function (stalk, leaf) {
+          should.exist(leaf);
+          should.not.exist(leaf.stalkId);
+					return [stalk, leaf.setStalkAsync(stalk)];
+				})
+        .then(function (stalk) {
+          return [stalk, Leaf.oneAsync({ size: 14 })];
+        })
+        .spread(function (stalk, leafOne) {
+          should.equal(leafOne.stalkId, stalk[0][Stalk.id]);
+        });
+    });
+
+    it("remove should unassociation another instance", function () {
+      return Stalk
+        .oneAsync({ length: 20 })
+        .then(function (stalk) {
+          should.exist(stalk);
+					return Leaf.oneAsync({ size: 14 });
+				})
+        .then(function (leaf) {
+          should.exist(leaf);
+          should.exist(leaf.stalkId);
+          return leaf.removeStalkAsync();
+				})
+        .then(function () {
+          return Leaf.oneAsync({ size: 14 });
+        })
+				.then(function (leaf) {
+					should.equal(leaf.stalkId, null);
+				});
+    });
+  });
+
+  describe("if not passing another Model (promise-based test)", function () {
+    it("should use same model", function (done) {
+      db.settings.set('instance.identityCache', false);
+      db.settings.set('instance.returnAllErrors', true);
+
+      var Person = db.define("person", {
+        name : String
+      });
+      Person.hasOne("parent", {
+        autoFetch : true
+      });
+
+      helper.dropSync(Person, function () {
+        var child = new Person({
+          name : "Child"
+        });
+        child.setParentAsync(new Person({ name: "Parent" })).then(function () {
+          done();
+        }).catch(function(err) {
+          done(err);
+        });
+      });
+    });
+  });
+
+  if (protocol != "mongodb") {
+    describe("mapsTo Async (promise-based tests)", function () {
+      describe("with `mapsTo` set via `hasOne`", function () {
+        var leaf = null;
+
+        before(setup());
+
+        before(function (done) {
+          Leaf.createAsync({ size: 444, stalkId: stalkId, holeId: holeId }).then(function (lf) {
+            leaf = lf;
+            done();
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+
+        it("should get parent", function (done) {
+          leaf.getStalkAsync().then(function (stalk) {
+
+            should.exist(stalk);
+            should.equal(stalk.id, stalkId);
+            should.equal(stalk.length, 20);
+            done();
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+
+      describe("with `mapsTo` set via property definition", function () {
+        var leaf = null;
+
+        before(setup());
+
+        before(function (done) {
+          Leaf.createAsync({ size: 444, stalkId: stalkId, holeId: holeId }).then(function (lf) {
+            leaf = lf;
+            done();
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+
+        it("should get parent", function (done) {
+          leaf.getHoleAsync().then(function (hole) {
+
+            should.exist(hole);
+            should.equal(hole.id, stalkId);
+            should.equal(hole.width, 3);
+            done();
+          }).catch(function(err) {
+            done(err);
+          });
+        });
+      });
+    });
+  };
+
+});

From ad128861bf7666826719d4ea12ecc1ad0d71de88 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Wed, 13 Sep 2017 18:18:41 +0300
Subject: [PATCH 1163/1246] update db and extend promise test

---
 test/integration/association-extend-async.js | 83 ++++++++----------
 test/integration/db.js                       | 91 +++++++-------------
 test/integration/hook-promise.js             | 57 +++---------
 3 files changed, 81 insertions(+), 150 deletions(-)

diff --git a/test/integration/association-extend-async.js b/test/integration/association-extend-async.js
index f0bb20bb..ffe1065e 100644
--- a/test/integration/association-extend-async.js
+++ b/test/integration/association-extend-async.js
@@ -123,70 +123,55 @@ describe("Model.extendsTo()", function() {
   describe("when calling setAccessorAsync", function () {
     before(setup());
 
-    it("should remove any previous extension", function (done) { // TODO: fix Model.find to async
-      Person.find().first(function (err, John) {
-        should.equal(err, null);
-
-        PersonAddress.find({ number: 123 }).count(function (err, c) {
-          should.equal(err, null);
-          c.should.equal(1);
+    it("should remove any previous extension", function () { // TODO: fix Model.find to async
+      return Person.find().firstAsync()
+        .then(function (John) {
+          return [John, PersonAddress.find({ number: 123 }).countAsync()];
+        })
+        .spread(function (John, count) {
+          count.should.equal(1);
 
           var addr = new PersonAddress({
             street : "4th Ave",
             number : 4
           });
 
-          John.setAddressAsync(addr)
-            .then(function () {
-              return John.getAddressAsync();
-            })
-            .then(function (Address) {
-              Address.should.be.a.Object();
-              should.equal(Array.isArray(Address), false);
-              Address.should.have.property("street", addr.street);
-              PersonAddress.find({ number: 123 })
-                .count(function (err, c) {
-                  should.equal(err, null);
-                  c.should.equal(0);
-                  done();
-                });
-            }).catch(function(err) {
-              done(err);
-            });
+          return [John, addr, John.setAddressAsync(addr)];
+        })
+        .spread(function (John, addr) {
+          return [addr, John.getAddressAsync()];
+        })
+        .spread(function (addr, Address) {
+          Address.should.be.a.Object();
+          should.equal(Array.isArray(Address), false);
+          Address.should.have.property("street", addr.street);
+          return PersonAddress.findAsync({ number: 123 });
+        })
+        .then(function (addres) {
+          addres.length.should.equal(0);
         });
-      });
     });
   });
 
   describe("when calling delAccessor + Async", function () { // TODO: fix .find to async
     before(setup());
 
-    it("should remove any extension", function (done) {
-      Person.find().first(function (err, John) {
-        should.equal(err, null);
-
-        PersonAddress.find({ number: 123 }).count(function (err, c) {
-          should.equal(err, null);
-          c.should.equal(1);
-
-          var addr = new PersonAddress({
-            street : "4th Ave",
-            number : 4
-          });
+    it("should remove any extension", function () {
+      return Person.find().firstAsync()
+        .then(function (John) {
+          return [John, PersonAddress.find({ number: 123 }).countAsync()];
+        })
+        .spread(function (John, count) {
+          count.should.equal(1);
 
-          John.removeAddressAsync()
-            .then(function () {
-              PersonAddress.find({ number: 123 }).count(function (err, c) {
-                should.equal(err, null);
-                c.should.equal(0);
-
-                done();
-              });
-            }).catch(function(err) {
-              done(err);
-            });
+          return John.removeAddressAsync();
+        })
+        .then(function () {
+          return PersonAddress.findAsync({ number: 123 });
+        })
+        .then(function (addres) {
+          addres.length.should.equal(0);
         });
-      });
     });
 
     it("should return error if instance not with an ID", function (done) {
diff --git a/test/integration/db.js b/test/integration/db.js
index 804c6986..c7dd2ca8 100644
--- a/test/integration/db.js
+++ b/test/integration/db.js
@@ -45,27 +45,19 @@ describe("db.driver", function () {
     });
 
     describe('#execQueryAsync', function () {
-      it('should execute sql queries', function (done) {
-        db.driver.execQueryAsync('SELECT id FROM log')
+      it('should execute sql queries', function () {
+        return db.driver.execQueryAsync('SELECT id FROM log')
           .then(function (data) {
-            should(JSON.stringify(data) == JSON.stringify([{ id: 1 }, { id: 2 }, { id: 3 }]));
-            done()
+            should(JSON.stringify(data) === JSON.stringify([{ id: 1 }, { id: 2 }, { id: 3 }]));
           })
-          .catch(function (err) {
-            done(err);
-          });
       });
 
-      it("should escape sql queries", function (done) {
+      it("should escape sql queries", function () {
         var query = "SELECT log.?? FROM log WHERE log.?? LIKE ? AND log.?? > ?";
         var args = ['what', 'who', 'jane', 'when', new Date('2013/04/07 12:40:00')];
-        db.driver.execQueryAsync(query, args)
+        return db.driver.execQueryAsync(query, args)
           .then(function (data) {
-            should(JSON.stringify(data) == JSON.stringify([{ "what": "user login" }]));
-            done();
-          })
-          .catch(function (err) {
-            done(err);
+            should(JSON.stringify(data) === JSON.stringify([{ "what": "user login" }]));
           });
       });
     });
@@ -131,21 +123,19 @@ describe("db.driver", function () {
       });
 
       describe('async', function () {
-        it('should build correct query', function (done) {
+        it('should build correct query', function () {
           var execSimpleQueryStub = sinon.stub(db.driver, 'execSimpleQuery')
             .callsFake(function (q, cb) {
               cb();
             });
-          db.driver.eagerQueryAsync(fixture.association, fixture.opts, [1, 5])
+          return db.driver.eagerQueryAsync(fixture.association, fixture.opts, [1, 5])
             .then(function () {
               should.equal(execSimpleQueryStub.calledOnce, true);
               should.equal(execSimpleQueryStub.lastCall.args[0], fixture.expectedQuery[common.protocol()]);
               execSimpleQueryStub.restore();
-              done();
             })
-            .catch(function (err) {
+            .catch(function () {
               execSimpleQueryStub.restore();
-              done(err);
             });
         });
       });
@@ -156,7 +146,7 @@ describe("db.driver", function () {
         db.driver.execQuery("SELECT id FROM log", function (err, data) {
           should.not.exist(err);
 
-          should(JSON.stringify(data) == JSON.stringify([{ id: 1 }, { id: 2 }, { id: 3 }]));
+          should(JSON.stringify(data) === JSON.stringify([{ id: 1 }, { id: 2 }, { id: 3 }]));
           done();
         });
       });
@@ -167,7 +157,7 @@ describe("db.driver", function () {
         db.driver.execQuery(query, args, function (err, data) {
           should.not.exist(err);
 
-          should(JSON.stringify(data) == JSON.stringify([{ "what": "user login" }]));
+          should(JSON.stringify(data) === JSON.stringify([{ "what": "user login" }]));
           done();
         });
       });
@@ -189,7 +179,7 @@ describe("db.driver", function () {
     });
 
     describe('db.syncPromise()', function () {
-      it('should call sync for each model', function (done) {
+      it('should call sync for each model', function () {
         db.define("my_model", {
           property: String
         });
@@ -202,20 +192,16 @@ describe("db.driver", function () {
         var syncStub2 = sinon.stub(db.models['my_model2'], 'sync').callsFake(function (cb) {
           cb(null, {})
         });
-        db.syncPromise()
+        return db.syncPromise()
           .then(function () {
             should.equal(syncStub.calledOnce, true);
             should.equal(syncStub2.calledOnce, true);
-            done();
-          })
-          .catch(function (err) {
-            done(err)
           });
       });
     });
 
     describe("db.dropAsync()", function () {
-      it('should should call drop for each model', function (done) {
+      it('should should call drop for each model', function () {
         db.define("my_model", {
           property: String
         });
@@ -230,14 +216,11 @@ describe("db.driver", function () {
         var dropStub2 = sinon.stub(db.models['my_model2'], 'drop').callsFake(function (cb) {
           cb(null, {})
         });
-        db.dropAsync()
+
+        return db.dropAsync()
           .then(function () {
             should.equal(dropStub.calledOnce, true);
             should.equal(dropStub2.calledOnce, true);
-            done();
-          })
-          .catch(function (err) {
-            done(err)
           });
       });
     });
@@ -252,11 +235,11 @@ describe("db.driver", function () {
 
         db.use(MyPlugin, opts);
 
-        var MyModel = db.define("my_model", { // db.define should call plugin.define method
+        db.define("my_model", { // db.define should call plugin.define method
           property: String
         });
 
-        opts.calledDefine.should.be.true;
+        opts.calledDefine.should.be.true();
 
         return done();
       });
@@ -277,7 +260,7 @@ describe("db.driver", function () {
           property: String
         });
 
-        opts.calledDefine.should.be.true;
+        opts.calledDefine.should.be.true();
         MyModel.properties.should.have.property("otherprop");
 
         done();
@@ -291,11 +274,11 @@ describe("db.driver", function () {
 
         db.use("../support/my_plugin", opts);
 
-        var MyModel = db.define("my_model", { // db.define should call plugin.define method
+        db.define("my_model", { // db.define should call plugin.define method
           property: String
         });
 
-        opts.calledDefine.should.be.true;
+        opts.calledDefine.should.be.true();
 
         return done();
       });
@@ -317,48 +300,40 @@ describe("db.driver", function () {
   });
 
   describe("db.loadAsync()", function () {
-    it("should require a file if array", function (done) {
+    it("should require a file if array", function () {
       var filePath = "../support/spec_load";
-      db.loadAsync([filePath])
+      return db.loadAsync([filePath])
         .then(function () {
           db.models.should.have.property("person");
           db.models.should.have.property("pet");
-          done()
-        })
-        .catch(done);
+        });
     });
 
-    it("should require a file if single file path string", function (done) {
+    it("should require a file if single file path string", function () {
       var filePath = "../support/spec_load";
-      db.loadAsync(filePath)
+      return db.loadAsync(filePath)
         .then(function () {
           db.models.should.have.property("person");
           db.models.should.have.property("pet");
-          done()
-        })
-        .catch(done);
+        });
     });
 
-    it("should be able to load more than one file", function (done) {
+    it("should be able to load more than one file", function () {
       var filePaths = ["../support/spec_load_second", "../support/spec_load_third"];
 
-      db.loadAsync(filePaths)
+      return db.loadAsync(filePaths)
         .then(function () {
           db.models.should.have.property("person");
           db.models.should.have.property("pet");
-          done()
-        })
-        .catch(done);
+        });
     });
 
-    it("should throw error if files passed like arguments", function (done) {
-      db.loadAsync("../support/spec_load_second", "../support/spec_load_third")
+    it("should throw error if files passed like arguments", function () {
+      return db.loadAsync("../support/spec_load_second", "../support/spec_load_third")
         .then(function () {
           db.models.should.have.property("person");
           db.models.should.have.property("pet");
-          done()
-        })
-        .catch(done);
+        });
     });
   });
 
diff --git a/test/integration/hook-promise.js b/test/integration/hook-promise.js
index 2ef2c2a5..5969917b 100644
--- a/test/integration/hook-promise.js
+++ b/test/integration/hook-promise.js
@@ -83,7 +83,7 @@ describe("HookPromise", function() {
         });
     });
 
-    it("should trigger error", function (done) {
+    it("should trigger error", function () {
       Person.beforeCreate(function () {
         return new Promise(function (resolve, reject) {
           setTimeout(function () {
@@ -92,21 +92,17 @@ describe("HookPromise", function() {
         });
       });
 
-      Person.createAsync([{ name: "John Doe" }])
-        .then(function () {
-          done(new Error('Should throw err.'));
-        })
+      return Person.createAsync([{ name: "John Doe" }])
         .catch(function (err) {
           err.should.be.a.Object();
           should.equal(err.message, "beforeCreate-error");
-          done();
         });
     });
   });
 
   describe("beforeSave", function () {
     beforeEach(setup());
-    it("should trigger and wait before save hook", function (done) {
+    it("should trigger and wait before save hook", function () {
       Person.beforeSave(function () {
         return new Promise(function (_, reject) {
           setTimeout(function () {
@@ -115,18 +111,14 @@ describe("HookPromise", function() {
         });
       });
 
-      Person.createAsync([{ name: "Jane Doe" }])
-        .then(function () {
-          done(new Error('Should throw error'));
-        })
+      return Person.createAsync([{ name: "Jane Doe" }])
         .catch(function (err) {
           err.should.be.a.Object();
           should.equal(err.message, "beforeSave-error");
-          return done();
         });
     });
 
-    it("should trigger error", function (done) {
+    it("should trigger error", function () {
       Person.beforeSave(function () {
         return new Promise(function (_, reject) {
           setTimeout(function () {
@@ -135,14 +127,10 @@ describe("HookPromise", function() {
         });
       });
 
-      Person.createAsync([{ name: "Jane Doe" }])
-        .then(function (John) {
-          return John[0].saveAsync();
-        })
+      return Person.createAsync([{ name: "Jane Doe" }])
         .catch(function (err) {
           err.should.be.a.Object();
           should.equal("beforeSave-error", err.message);
-          return done();
         });
     });
 
@@ -186,7 +174,7 @@ describe("HookPromise", function() {
         });
     });
 
-    it("should throw error", function (done) {
+    it("should throw error", function () {
       Person.beforeValidation(function () {
         var self = this;
         return new Promise(function (_, reject) {
@@ -197,13 +185,9 @@ describe("HookPromise", function() {
         });
       });
 
-      Person.createAsync([{ name: "John Doe" }])
-        .then(function () {
-          done(new Error("Should throw error"));
-        })
+      return Person.createAsync([{ name: "John Doe" }])
         .catch(function (err) {
           should.equal(err.message, "beforeValidation-error");
-          done();
         });
     })
   });
@@ -227,7 +211,7 @@ describe("HookPromise", function() {
         });
     });
 
-    it("should throw error", function (done) {
+    it("should throw error", function () {
       var afterLoad = false;
       Person.afterLoad(function () {
         return new Promise(function (_, reject) {
@@ -238,15 +222,10 @@ describe("HookPromise", function() {
         });
       });
 
-      Person.createAsync([{ name: "John Doe" }])
-        .then(function () {
-          afterLoad.should.be.true;
-          done(new Error("Should throw."));
-        })
+      return Person.createAsync([{ name: "John Doe" }])
         .catch(function (err) {
           err.should.exist;
           should.equal("afterLoad-error", err.message);
-          done();
         });
     });
   });
@@ -270,7 +249,7 @@ describe("HookPromise", function() {
         });
     });
 
-    it("should throw error", function (done) {
+    it("should throw error", function () {
       var afterAutoFetch = false;
       Person.afterAutoFetch(function () {
         return new Promise(function (_, reject) {
@@ -281,13 +260,9 @@ describe("HookPromise", function() {
         });
       });
 
-      Person.createAsync({ name: "John" })
-        .then(function () {
-          done(new Error("Should throw error"));
-        })
+      return Person.createAsync({ name: "John" })
         .catch(function (err) {
           should.equal(err.message, "afterAutoFetch-error");
-          done();
         });
     });
   });
@@ -313,7 +288,7 @@ describe("HookPromise", function() {
         });
     });
 
-    it("should throw error", function (done) {
+    it("should throw error", function () {
       Person.beforeRemove(function () {
         return new Promise(function (_, reject) {
           setTimeout(function () {
@@ -322,16 +297,12 @@ describe("HookPromise", function() {
         });
       });
 
-      Person.createAsync([{ name: "John Doe" }])
+      return Person.createAsync([{ name: "John Doe" }])
         .then(function (items) {
           return items[0].removeAsync();
         })
-        .then(function () {
-          done(new Error('Should throw error'));
-        })
         .catch(function (err) {
           should.equal(err.message, 'beforeRemove-error');
-          done();
         });
     });
   });

From 6d49ff0ee1fdb0a4342ec00250ea68b43e4c54bf Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Thu, 14 Sep 2017 12:03:47 +0300
Subject: [PATCH 1164/1246] Update part of hasone async tests

---
 test/integration/association-hasone-async.js  |  92 +++----
 .../association-hasone-required-async.js      |  81 ++++++
 .../association-hasone-required.js            |  89 -------
 .../association-hasone-reverse-async.js       | 233 ++++++++++++++++++
 .../integration/association-hasone-reverse.js | 170 +------------
 test/integration/association-hasone.js        | 184 --------------
 6 files changed, 349 insertions(+), 500 deletions(-)
 create mode 100644 test/integration/association-hasone-required-async.js
 create mode 100644 test/integration/association-hasone-reverse-async.js

diff --git a/test/integration/association-hasone-async.js b/test/integration/association-hasone-async.js
index 51efb2e7..0eb0e155 100644
--- a/test/integration/association-hasone-async.js
+++ b/test/integration/association-hasone-async.js
@@ -158,57 +158,31 @@ describe("hasOne", function() {
     });
   });
 
-  describe("if not passing another Model (promise-based test)", function () {
-    it("should use same model", function (done) {
-      db.settings.set('instance.identityCache', false);
-      db.settings.set('instance.returnAllErrors', true);
-
-      var Person = db.define("person", {
-        name : String
-      });
-      Person.hasOne("parent", {
-        autoFetch : true
-      });
-
-      helper.dropSync(Person, function () {
-        var child = new Person({
-          name : "Child"
-        });
-        child.setParentAsync(new Person({ name: "Parent" })).then(function () {
-          done();
-        }).catch(function(err) {
-          done(err);
-        });
-      });
-    });
-  });
-
   if (protocol != "mongodb") {
-    describe("mapsTo Async (promise-based tests)", function () {
-      describe("with `mapsTo` set via `hasOne`", function () {
+    describe("mapsTo Async", function () {
+      describe("with `mapsTo` get via `getOneAsync`", function () {
         var leaf = null;
 
         before(setup());
 
         before(function (done) {
-          Leaf.createAsync({ size: 444, stalkId: stalkId, holeId: holeId }).then(function (lf) {
-            leaf = lf;
-            done();
-          }).catch(function(err) {
-            done(err);
-          });
+          Leaf.createAsync({ size: 444, stalkId: stalkId, holeId: holeId })
+            .then(function (lf) {
+              leaf = lf;
+              done();
+            }).catch(function(err) {
+              done(err);
+            });
         });
 
-        it("should get parent", function (done) {
-          leaf.getStalkAsync().then(function (stalk) {
-
-            should.exist(stalk);
-            should.equal(stalk.id, stalkId);
-            should.equal(stalk.length, 20);
-            done();
-          }).catch(function(err) {
-            done(err);
-          });
+        it("should get parent", function () {
+          return leaf
+            .getStalkAsync()
+            .then(function (stalk) {
+              should.exist(stalk);
+              should.equal(stalk.id, stalkId);
+              should.equal(stalk.length, 20);
+            });
         });
       });
 
@@ -218,27 +192,25 @@ describe("hasOne", function() {
         before(setup());
 
         before(function (done) {
-          Leaf.createAsync({ size: 444, stalkId: stalkId, holeId: holeId }).then(function (lf) {
-            leaf = lf;
-            done();
-          }).catch(function(err) {
-            done(err);
-          });
+          Leaf.createAsync({ size: 444, stalkId: stalkId, holeId: holeId })
+            .then(function (lf) {
+              leaf = lf;
+              done();
+            }).catch(function(err) {
+              done(err);
+            });
         });
 
-        it("should get parent", function (done) {
-          leaf.getHoleAsync().then(function (hole) {
-
-            should.exist(hole);
-            should.equal(hole.id, stalkId);
-            should.equal(hole.width, 3);
-            done();
-          }).catch(function(err) {
-            done(err);
-          });
+        it("should get parent", function () {
+          return leaf
+            .getHoleAsync()
+            .then(function (hole) {
+              should.exist(hole);
+              should.equal(hole.id, stalkId);
+              should.equal(hole.width, 3);
+            });
         });
       });
     });
   };
-
 });
diff --git a/test/integration/association-hasone-required-async.js b/test/integration/association-hasone-required-async.js
new file mode 100644
index 00000000..7bddbd71
--- /dev/null
+++ b/test/integration/association-hasone-required-async.js
@@ -0,0 +1,81 @@
+var ORM    = require('../../');
+var helper = require('../support/spec_helper');
+var should = require('should');
+var async  = require('async');
+var _      = require('lodash');
+
+describe("hasOne Async", function() {
+  var db     = null;
+  var Person = null;
+
+  var setup = function (required) {
+    return function (done) {
+      db.settings.set('instance.identityCache', false);
+      db.settings.set('instance.returnAllErrors', true);
+
+      Person = db.define('person', {
+        name     : String
+      });
+      Person.hasOne('parent', Person, {
+        required : required,
+        field    : 'parentId'
+      });
+
+      return helper.dropSync(Person, done);
+    };
+  };
+
+  before(function(done) {
+    helper.connect(function (connection) {
+      db = connection;
+      done();
+    });
+  });
+
+  describe("required", function () {
+    before(setup(true));
+
+    it("should not accept empty association", function (done) {
+      var John = new Person({
+        name     : "John",
+        parentId : null
+      });
+      John.saveAsync()
+        .catch(function(err) {
+          should.exist(err);
+          should.equal(err.length, 1);
+          should.equal(err[0].type,     'validation');
+          should.equal(err[0].msg,      'required');
+          should.equal(err[0].property, 'parentId');
+          done();
+        });
+    });
+
+    it("should accept association", function () {
+      var John = new Person({
+        name     : "John",
+        parentId : 1
+      });
+      return John.saveAsync();
+    });
+  });
+
+  describe("not required", function () {
+    before(setup(false));
+
+    it("should accept empty association", function () {
+      var John = new Person({
+        name : "John"
+      });
+      return John.saveAsync();
+    });
+
+    it("should accept null association", function () {
+      var John = new Person({
+        name      : "John",
+        parent_id : null
+      });
+      return John.saveAsync();
+    });
+  });
+});
\ No newline at end of file
diff --git a/test/integration/association-hasone-required.js b/test/integration/association-hasone-required.js
index 2b8b7f2c..137bd7d2 100644
--- a/test/integration/association-hasone-required.js
+++ b/test/integration/association-hasone-required.js
@@ -86,93 +86,4 @@ describe("hasOne", function() {
       });
     });
   });
-});
-
-describe("hasOne Async", function() {
-  var db     = null;
-  var Person = null;
-
-  var setup = function (required) {
-    return function (done) {
-      db.settings.set('instance.identityCache', false);
-      db.settings.set('instance.returnAllErrors', true);
-
-      Person = db.define('person', {
-        name     : String
-      });
-      Person.hasOne('parent', Person, {
-        required : required,
-        field    : 'parentId'
-      });
-
-      return helper.dropSync(Person, done);
-    };
-  };
-
-  before(function(done) {
-    helper.connect(function (connection) {
-      db = connection;
-      done();
-    });
-  });
-
-  describe("required", function () {
-    before(setup(true));
-
-    it("should not accept empty association", function (done) {
-      var John = new Person({
-        name     : "John",
-        parentId : null
-      });
-      John.saveAsync().then(function() {
-        throw new Error('Should catch an error');
-      }).catch(function(err) {
-        should.exist(err);
-        should.equal(err.length, 1);
-        should.equal(err[0].type,     'validation');
-        should.equal(err[0].msg,      'required');
-        should.equal(err[0].property, 'parentId');
-        done();
-      });
-    });
-
-    it("should accept association", function (done) {
-      var John = new Person({
-        name     : "John",
-        parentId : 1
-      });
-      John.saveAsync().then(function () {
-        done();
-      }).catch(function(err) {
-        done(err);
-      });
-    });
-  });
-
-  describe("not required", function () {
-    before(setup(false));
-
-    it("should accept empty association", function (done) {
-      var John = new Person({
-        name : "John"
-      });
-      John.saveAsync().then(function () {
-        done();
-      }).catch(function(err) {
-        done(err);
-      });
-    });
-
-    it("should accept null association", function (done) {
-      var John = new Person({
-        name      : "John",
-        parent_id : null
-      });
-      John.saveAsync().then(function () {
-        done();
-      }).catch(function(err) {
-        done(err);
-      });
-    });
-  });
 });
\ No newline at end of file
diff --git a/test/integration/association-hasone-reverse-async.js b/test/integration/association-hasone-reverse-async.js
new file mode 100644
index 00000000..1da35125
--- /dev/null
+++ b/test/integration/association-hasone-reverse-async.js
@@ -0,0 +1,233 @@
+var ORM = require('../../');
+var helper = require('../support/spec_helper');
+var should = require('should');
+var async = require('async');
+var common = require('../common');
+var _ = require('lodash');
+
+describe("hasOne Async", function () {
+  var db = null;
+  var Person = null;
+  var Pet = null;
+
+  var setup = function () {
+    return function (done) {
+      Person = db.define('person', {
+        name: String
+      });
+      Pet = db.define('pet', {
+        name: String
+      });
+      Person.hasOne('pet', Pet, {
+        reverse: 'owners',
+        field: 'pet_id'
+      });
+
+      return helper.dropSync([Person, Pet], function () {
+        // Running in series because in-memory sqlite encounters problems
+        async.series([
+          Person.create.bind(Person, { name: "John Doe" }),
+          Person.create.bind(Person, { name: "Jane Doe" }),
+          Pet.create.bind(Pet, { name: "Deco"  }),
+          Pet.create.bind(Pet, { name: "Fido"  })
+        ], done);
+      });
+    };
+  };
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+      done();
+    });
+  });
+
+  describe("reverse", function () {
+    removeHookRun = false;
+
+    before(setup({
+      hooks: {
+        beforeRemove: function () {
+          removeHookRun = true;
+        }
+      }
+    }));
+
+    it("should create methods in both models", function (done) {
+      var person = Person(1);
+      var pet = Pet(1);
+
+      person.getPet.should.be.a.Function();
+      person.setPet.should.be.a.Function();
+      person.removePet.should.be.a.Function();
+      person.hasPet.should.be.a.Function();
+
+      pet.getOwners.should.be.a.Function();
+      pet.setOwners.should.be.a.Function();
+      pet.hasOwners.should.be.a.Function();
+  
+      person.getPetAsync.should.be.a.Function();
+      person.setPetAsync.should.be.a.Function();
+      person.removePetAsync.should.be.a.Function();
+      person.hasPetAsync.should.be.a.Function();
+  
+      pet.getOwnersAsync.should.be.a.Function();
+      pet.setOwnersAsync.should.be.a.Function();
+      pet.hasOwnersAsync.should.be.a.Function();
+
+      return done();
+    });
+
+    describe(".getAccessorAsync()", function () {
+
+      it("compare if model updated", function () {
+        return Person
+          .findAsync({ name: "John Doe" })
+          .then(function (John) {
+            return [John, Pet.findAsync({ name: "Deco" })];
+          })
+          .spread(function (John, deco) {
+            return [John[0], deco[0], deco[0].hasOwnersAsync()];
+          })
+          .spread(function (John, deco, has_owner) {
+            has_owner.should.equal(false);
+            return [deco.setOwnersAsync(John), deco];
+          })
+          .spread(function (John, deco) {
+            return [John, deco.getOwnersAsync()];
+          })
+          .spread(function (John, JohnCopy) {
+            should(Array.isArray(JohnCopy));
+            John.should.eql(JohnCopy[0]);
+          });
+      });
+      
+    });
+
+    it("should be able to set an array of people as the owner", function () {
+      return Person
+        .findAsync({ name: ["John Doe", "Jane Doe"] })
+        .then(function (owners) {
+          return [owners, Pet.findAsync({ name: "Fido" })];
+        })
+        .spread(function (owners, Fido) {
+          return [Fido[0], owners, Fido[0].hasOwnersAsync()];
+        })
+        .spread(function (Fido, owners, has_owner) {
+          has_owner.should.equal(false);
+          return [Fido, owners, Fido.setOwnersAsync(owners)];
+        })
+        .spread(function (Fido, owners) {
+          return [owners, Fido.getOwnersAsync()];
+        })
+        .spread(function (owners, ownersCopy) {
+          should(Array.isArray(owners));
+          owners.length.should.equal(2);
+          // Don't know which order they'll be in.
+          var idProp = common.protocol() == 'mongodb' ? '_id' : 'id'
+
+          if (owners[0][idProp] == ownersCopy[0][idProp]) {
+            owners[0].should.eql(ownersCopy[0]);
+            owners[1].should.eql(ownersCopy[1]);
+          } else {
+            owners[0].should.eql(ownersCopy[1]);
+            owners[1].should.eql(ownersCopy[0]);
+          }
+        });
+    });
+  });
+
+  describe("reverse find", function () {
+    before(setup());
+    it("should be able to find given an association id", function (done) {
+      common.retry(setup(), function () {
+        return Person
+          .findAsync({ name: "John Doe" })
+          .then(function (John) {
+            should.exist(John);
+            return [John, Pet.findAsync({ name: "Deco" })];
+          })
+          .spread(function (John, Deco) {
+            should.exist(Deco);
+            return [John[0], Deco[0], Deco[0].hasOwnersAsync()];
+          })
+          .spread(function (John, Deco, has_owner) {
+            has_owner.should.equal(false);
+            return [John, Deco.setOwnersAsync(John)];
+          })
+          .spread(function (John, Deco) {
+            return [John, Person.findAsync({ pet_id: 1 })];
+          })
+          .spread(function (John, owner) {
+            should.exist(owner[0]);
+            should.equal(owner[0].name, John.name);
+          });
+       }, 3, done);
+    });
+
+    it("should be able to find given an association instance", function (done) {
+      common.retry(setup(), function (done) {
+        Person.find({ name: "John Doe" }).first(function (err, John) {
+          should.not.exist(err);
+          should.exist(John);
+          Pet.find({ name: "Deco" }).first(function (err, Deco) {
+            should.not.exist(err);
+            should.exist(Deco);
+            Deco.hasOwnersAsync().then(function (has_owner) {
+              has_owner.should.equal(false);
+
+              Deco.setOwnersAsync(John).then(function () {
+
+                Person.find({ pet: Deco }).first(function (err, owner) {
+                  should.not.exist(err);
+                  should.exist(owner);
+                  should.equal(owner.name, John.name);
+                  done();
+                });
+
+              }).catch(function(err) {
+                done(err);
+              });
+            }).done(function(err) {
+              done(err);
+            });
+          });
+        });
+      }, 3, done);
+    });
+
+    it("should be able to find given a number of association instances with a single primary key", function (done) {
+      common.retry(setup(), function (done) {
+        Person.find({ name: "John Doe" }).first(function (err, John) {
+          should.not.exist(err);
+          should.exist(John);
+          Pet.all(function (err, pets) {
+            should.not.exist(err);
+            should.exist(pets);
+            should.equal(pets.length, 2);
+
+            pets[0].hasOwnersAsync().then(function (has_owner) {
+              has_owner.should.equal(false);
+
+              pets[0].setOwnersAsync(John).then(function () {
+
+                Person.find({ pet: pets }, function (err, owners) {
+                  should.not.exist(err);
+                  should.exist(owners);
+                  owners.length.should.equal(1);
+
+                  should.equal(owners[0].name, John.name);
+                  done();
+                });
+              }).catch(function(err) {
+                done(err);
+              });
+            }).catch(function(err) {
+              done(err);
+            });
+          });
+        });
+      }, 3, done);
+    });
+  });
+});
diff --git a/test/integration/association-hasone-reverse.js b/test/integration/association-hasone-reverse.js
index dd0b8362..bb215182 100644
--- a/test/integration/association-hasone-reverse.js
+++ b/test/integration/association-hasone-reverse.js
@@ -92,32 +92,7 @@ describe("hasOne", function () {
           });
         });
       });
-
-      it("should work (promise-based)", function (done) {
-        Person.find({ name: "John Doe" }).first(function (err, John) {
-          Pet.find({ name: "Deco" }).first(function (err, Deco) {
-            Deco.hasOwnersAsync().then(function (has_owner) {
-              has_owner.should.equal(false);
-
-              Deco.setOwnersAsync(John).then(function () {
-                Deco.getOwnersAsync().then(function (JohnCopy) {
-
-                  should(Array.isArray(JohnCopy));
-                  John.should.eql(JohnCopy[0]);
-
-                  done();
-                }).catch(function(err) {
-                  done(err);
-                });
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
-          });
-        });
-      });
+      
 
       describe("Chain", function () {
         before(function (done) {
@@ -187,7 +162,7 @@ describe("hasOne", function () {
           Fido.hasOwners(function (err, has_owner) {
             should.not.exist(err);
             has_owner.should.be.false;
-
+            
             Fido.setOwners(owners, function (err) {
               should.not.exist(err);
 
@@ -214,48 +189,7 @@ describe("hasOne", function () {
         });
       });
     });
-
-    it("should be able to set an array of people as the owner (promise-based test)", function (done) {
-      Person.find({ name: ["John Doe", "Jane Doe"] }, function (err, owners) {
-        should.not.exist(err);
-
-        Pet.find({ name: "Fido" }).first(function (err, Fido) {
-          should.not.exist(err);
-
-          Fido.hasOwnersAsync().then(function (has_owner) {
-            has_owner.should.equal(false);
-
-            Fido.setOwnersAsync(owners).then(function () {
-
-              Fido.getOwnersAsync().then(function (ownersCopy) {
-                should(Array.isArray(owners));
-                owners.length.should.equal(2);
-
-                // Don't know which order they'll be in.
-                var idProp = common.protocol() == 'mongodb' ? '_id' : 'id'
-
-                if (owners[0][idProp] == ownersCopy[0][idProp]) {
-                  owners[0].should.eql(ownersCopy[0]);
-                  owners[1].should.eql(ownersCopy[1]);
-                } else {
-                  owners[0].should.eql(ownersCopy[1]);
-                  owners[1].should.eql(ownersCopy[0]);
-                }
-
-                done();
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
-          }).catch(function(err) {
-            done(err);
-          });
-        });
-      });
-    });
-
+    
     // broken in mongo
     if (common.protocol() != "mongodb") {
       describe("findBy()", function () {
@@ -400,102 +334,4 @@ describe("hasOne", function () {
       }, 3, done);
     });
   });
-
-  describe("reverse find (promise-based)", function () {
-    it("should be able to find given an association id", function (done) {
-      common.retry(setup(), function (done) {
-        Person.find({ name: "John Doe" }).first(function (err, John) {
-          should.not.exist(err);
-          should.exist(John);
-          Pet.find({ name: "Deco" }).first(function (err, Deco) {
-            should.not.exist(err);
-            should.exist(Deco);
-            Deco.hasOwnersAsync().then(function (has_owner) {
-              has_owner.should.equal(false);
-
-              Deco.setOwnersAsync(John).then(function () {
-
-                Person.find({ pet_id: Deco[Pet.id[0]] }).first(function (err, owner) {
-                  should.not.exist(err);
-                  should.exist(owner);
-                  should.equal(owner.name, John.name);
-                  done();
-                });
-
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
-          });
-        });
-      }, 3, done);
-    });
-
-    it("should be able to find given an association instance", function (done) {
-      common.retry(setup(), function (done) {
-        Person.find({ name: "John Doe" }).first(function (err, John) {
-          should.not.exist(err);
-          should.exist(John);
-          Pet.find({ name: "Deco" }).first(function (err, Deco) {
-            should.not.exist(err);
-            should.exist(Deco);
-            Deco.hasOwnersAsync().then(function (has_owner) {
-              has_owner.should.equal(false);
-
-              Deco.setOwnersAsync(John).then(function () {
-
-                Person.find({ pet: Deco }).first(function (err, owner) {
-                  should.not.exist(err);
-                  should.exist(owner);
-                  should.equal(owner.name, John.name);
-                  done();
-                });
-
-              }).catch(function(err) {
-                done(err);
-              });
-            }).done(function(err) {
-              done(err);
-            });
-          });
-        });
-      }, 3, done);
-    });
-
-    it("should be able to find given a number of association instances with a single primary key", function (done) {
-      common.retry(setup(), function (done) {
-        Person.find({ name: "John Doe" }).first(function (err, John) {
-          should.not.exist(err);
-          should.exist(John);
-          Pet.all(function (err, pets) {
-            should.not.exist(err);
-            should.exist(pets);
-            should.equal(pets.length, 2);
-
-            pets[0].hasOwnersAsync().then(function (has_owner) {
-              has_owner.should.equal(false);
-
-              pets[0].setOwnersAsync(John).then(function () {
-
-                Person.find({ pet: pets }, function (err, owners) {
-                  should.not.exist(err);
-                  should.exist(owners);
-                  owners.length.should.equal(1);
-
-                  should.equal(owners[0].name, John.name);
-                  done();
-                });
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
-            });
-          });
-        });
-      }, 3, done);
-    });
-  });
 });
diff --git a/test/integration/association-hasone.js b/test/integration/association-hasone.js
index 6c85b248..fa68dffb 100644
--- a/test/integration/association-hasone.js
+++ b/test/integration/association-hasone.js
@@ -469,188 +469,4 @@ describe("hasOne", function() {
     });
   };
 
-  describe("accessors (promise-based)", function () {
-    before(setup());
-
-    it("get should get the association", function (done) {
-      Leaf.one({ size: 14 }, function (err, leaf) {
-        should.not.exist(err);
-        should.exist(leaf);
-        leaf.getTreeAsync().then(function (tree) {
-          should.not.exist(err);
-          should.exist(tree);
-          done();
-        }).catch(function(err) {
-          done(err);
-        });
-      });
-    });
-
-    it("should return proper instance model", function (done) {
-      Leaf.one({ size: 14 }, function (err, leaf) {
-        leaf.getTreeAsync().then(function (tree) {
-          tree.model().should.equal(Tree);
-          done();
-        }).catch(function(err) {
-          done(err);
-        });
-      });
-    });
-
-    it("get should get the association with a shell model", function (done) {
-      Leaf(leafId).getTreeAsync().then(function (tree) {
-        should.exist(tree);
-        should.equal(tree[Tree.id], treeId);
-        done();
-      }).catch(function(err) {
-        done(err);
-      });
-    });
-
-    it("has should indicate if there is an association present", function (done) {
-      Leaf.one({ size: 14 }, function (err, leaf) {
-        should.not.exist(err);
-        should.exist(leaf);
-
-        leaf.hasTreeAsync().then(function (has) {
-          should.equal(has, true);
-
-          leaf.hasStalkAsync().then(function (has) {
-            should.equal(has, false);
-            done();
-          }).catch(function(err) {
-            done(err);
-          });
-        }).catch(function(err) {
-          done(err);
-        });
-      });
-    });
-
-    it("set should associate another instance", function (done) {
-      Stalk.one({ length: 20 }, function (err, stalk) {
-        should.not.exist(err);
-        should.exist(stalk);
-        Leaf.one({ size: 14 }, function (err, leaf) {
-          should.not.exist(err);
-          should.exist(leaf);
-          should.not.exist(leaf.stalkId);
-          leaf.setStalkAsync(stalk).then(function () {
-            Leaf.one({ size: 14 }, function (err, leaf) {
-              should.not.exist(err);
-              should.equal(leaf.stalkId, stalk[Stalk.id]);
-              done();
-            });
-          }).catch(function(err) {
-            done(err);
-          });
-        });
-      });
-    });
-
-    it("remove should unassociation another instance", function (done) {
-      Stalk.one({ length: 20 }, function (err, stalk) {
-        should.not.exist(err);
-        should.exist(stalk);
-        Leaf.one({ size: 14 }, function (err, leaf) {
-          should.not.exist(err);
-          should.exist(leaf);
-          should.exist(leaf.stalkId);
-          leaf.removeStalkAsync(function () {
-            Leaf.one({ size: 14 }, function (err, leaf) {
-              should.not.exist(err);
-              should.equal(leaf.stalkId, null);
-              done();
-            });
-          }).catch(function(err) {
-            done(err);
-          });
-        });
-      });
-    });
-  });
-
-  describe("if not passing another Model (promise-based test)", function () {
-    it("should use same model", function (done) {
-      db.settings.set('instance.identityCache', false);
-      db.settings.set('instance.returnAllErrors', true);
-
-      var Person = db.define("person", {
-        name : String
-      });
-      Person.hasOne("parent", {
-        autoFetch : true
-      });
-
-      helper.dropSync(Person, function () {
-        var child = new Person({
-          name : "Child"
-        });
-        child.setParentAsync(new Person({ name: "Parent" })).then(function () {
-          done();
-        }).catch(function(err) {
-          done(err);
-        });
-      });
-    });
-  });
-
-  if (protocol != "mongodb") {
-    describe("mapsTo Async (promise-based tests)", function () {
-      describe("with `mapsTo` set via `hasOne`", function () {
-        var leaf = null;
-
-        before(setup());
-
-        before(function (done) {
-          Leaf.createAsync({ size: 444, stalkId: stalkId, holeId: holeId }).then(function (lf) {
-            leaf = lf;
-            done();
-          }).catch(function(err) {
-            done(err);
-          });
-        });
-
-        it("should get parent", function (done) {
-          leaf.getStalkAsync().then(function (stalk) {
-
-            should.exist(stalk);
-            should.equal(stalk.id, stalkId);
-            should.equal(stalk.length, 20);
-            done();
-          }).catch(function(err) {
-            done(err);
-          });
-        });
-      });
-
-      describe("with `mapsTo` set via property definition", function () {
-        var leaf = null;
-
-        before(setup());
-
-        before(function (done) {
-          Leaf.createAsync({ size: 444, stalkId: stalkId, holeId: holeId }).then(function (lf) {
-            leaf = lf;
-            done();
-          }).catch(function(err) {
-            done(err);
-          });
-        });
-
-        it("should get parent", function (done) {
-          leaf.getHoleAsync().then(function (hole) {
-
-            should.exist(hole);
-            should.equal(hole.id, stalkId);
-            should.equal(hole.width, 3);
-            done();
-          }).catch(function(err) {
-            done(err);
-          });
-        });
-      });
-    });
-  };
-
 });

From 3d352c382f67eac53bf8efee452f83d9b992363e Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Thu, 14 Sep 2017 12:31:56 +0300
Subject: [PATCH 1165/1246] adjust test code style

---
 test/integration/model-createAsync.js      | 40 +++---------
 test/integration/model-findAsync-mapsto.js |  4 +-
 test/integration/model-getAsync.js         | 19 ++----
 test/integration/orm-exports.js            | 72 ++++++----------------
 4 files changed, 36 insertions(+), 99 deletions(-)

diff --git a/test/integration/model-createAsync.js b/test/integration/model-createAsync.js
index 56c6665c..cb95d53c 100644
--- a/test/integration/model-createAsync.js
+++ b/test/integration/model-createAsync.js
@@ -35,25 +35,21 @@ describe("Model.createAsync()", function() {
   describe("if passing an object", function () {
     before(setup());
 
-    it("should accept it as the only item to create", function (done) {
-      Person.createAsync({
+    it("should accept it as the only item to create", function () {
+      return Person.createAsync({
         name : "John Doe"
       })
         .then(function (John) {
           John.should.have.property("name", "John Doe");
-          done();
         })
-        .catch(function (err) {
-          done(err);
-        });
     });
   });
 
   describe("if passing an array", function () {
     before(setup());
 
-    it("should accept it as a list of items to create", function (done) {
-      Person.createAsync([{
+    it("should accept it as a list of items to create", function () {
+      return Person.createAsync([{
         name : "John Doe"
       }, {
         name : "Jane Doe"
@@ -64,19 +60,15 @@ describe("Model.createAsync()", function() {
           people.should.have.property("length", 2);
           people[0].should.have.property("name", "John Doe");
           people[1].should.have.property("name", "Jane Doe");
-          done();
         })
-        .catch(function (err) {
-          done(err);
-        });
     });
   });
 
   describe("if element has an association", function () {
     before(setup());
 
-    it("should also create it or save it", function (done) {
-      Person.createAsync({
+    it("should also create it or save it", function () {
+      return Person.createAsync({
         name : "John Doe",
         pets : [ new Pet({ name: "Deco" }) ]
       })
@@ -88,15 +80,11 @@ describe("Model.createAsync()", function() {
           John.pets[0].should.have.property("name", "Deco");
           John.pets[0].should.have.property(Pet.id);
           should.equal(John.pets[0].saved(), true);
-          done();
-        })
-        .catch(function (err) {
-          done(err);
         });
     });
 
-    it("should also create it or save it even if it's an object and not an instance", function (done) {
-      Person.createAsync({
+    it("should also create it or save it even if it's an object and not an instance", function () {
+      return Person.createAsync({
         name : "John Doe",
         pets : [ { name: "Deco" } ]
       })
@@ -108,10 +96,6 @@ describe("Model.createAsync()", function() {
           John.pets[0].should.have.property("name", "Deco");
           John.pets[0].should.have.property(Pet.id);
           should.equal(John.pets[0].saved(), true);
-          done();
-        })
-        .catch(function (err) {
-          done(err);
         });
     });
   });
@@ -119,14 +103,10 @@ describe("Model.createAsync()", function() {
   describe("when not passing a property", function () {
     before(setup());
 
-    it("should use defaultValue if defined", function (done) {
-      Pet.createAsync({})
+    it("should use defaultValue if defined", function () {
+      return Pet.createAsync({})
         .then(function (Mutt) {
           Mutt.should.have.property("name", "Mutt");
-          done();
-        })
-        .catch(function (err) {
-          done(err);
         });
     });
   });
diff --git a/test/integration/model-findAsync-mapsto.js b/test/integration/model-findAsync-mapsto.js
index 0ab265c1..efec9e94 100644
--- a/test/integration/model-findAsync-mapsto.js
+++ b/test/integration/model-findAsync-mapsto.js
@@ -74,7 +74,7 @@ describe("Model.pkMapTo.findAsync()", function() {
     before(setup());
 
     it("1st find should work", function () {
-      Person.findAsync({ surname: "Dean" })
+      return Person.findAsync({ surname: "Dean" })
         .then(function (people) {
           people.should.be.a.Object();
           people.should.have.property("length", 2);
@@ -82,7 +82,7 @@ describe("Model.pkMapTo.findAsync()", function() {
         });
     });
     it("2nd find should should also work", function () {
-      Person.findAsync({ surname: "Doe" })
+      return Person.findAsync({ surname: "Doe" })
         .then(function (people) {
           people.should.be.a.Object();
           people.should.have.property("length", 3);
diff --git a/test/integration/model-getAsync.js b/test/integration/model-getAsync.js
index d265d903..7f8b223a 100644
--- a/test/integration/model-getAsync.js
+++ b/test/integration/model-getAsync.js
@@ -54,13 +54,10 @@ describe("Model.getAsync()", function () {
   describe('with identityCache cache', function () {
     before(setup(true));
 
-    it("should throw if passed a wrong number of ids", function (done) {
-      Person.getAsync(1, 2)
-        .then(function () {
-          done(new Error('Fail'));
-        })
-        .catch(function () {
-          done();
+    it("should throw if passed a wrong number of ids", function () {
+      return Person.getAsync(1, 2)
+        .catch(function (err) {
+          err.should.be.an.Object();
         });
     });
 
@@ -73,15 +70,11 @@ describe("Model.getAsync()", function () {
         })
     });
 
-    it("should throw err", function (done) {
-      Person.getAsync(999)
-        .then(function () {
-          done(new Error('Fail!'));
-        })
+    it("should throw err", function () {
+      return Person.getAsync(999)
         .catch(function (err) {
           err.should.be.a.Object();
           err.message.should.equal("Not found");
-          done();
         });
     });
 
diff --git a/test/integration/orm-exports.js b/test/integration/orm-exports.js
index 0339734a..9fa4871e 100644
--- a/test/integration/orm-exports.js
+++ b/test/integration/orm-exports.js
@@ -52,95 +52,67 @@ describe("ORM", function() {
   });
   describe('ORM.connectAsync()', function () {
     it('should be a function', function () {
-      ORM.connectAsync.should.be.a.Function()
+      return ORM.connectAsync.should.be.a.Function()
     });
 
-    it('should throw error with correct message when protocol not supported', function (done) {
-      ORM.connectAsync("bd://127.0.0.6")
-        .then(function () {
-          done('Fail.');
-        })
+    it('should throw error with correct message when protocol not supported', function () {
+      return ORM.connectAsync("bd://127.0.0.6")
         .catch(function (err) {
           should.exist(err);
           err.message.should.not.equal("CONNECTION_PROTOCOL_NOT_SUPPORTED");
-          done();
         });
     });
 
-    it('should throw error with correct message when connection URL doesn\'t exist', function (done) {
+    it('should throw error with correct message when connection URL doesn\'t exist', function () {
       ORM.connectAsync()
-        .then(function () {
-          done('Fail')
-        })
         .catch(function (err) {
           err.message.should.equal("CONNECTION_URL_EMPTY");
-          done();
         });
     });
 
-    it("should throw error when passed empty string like connection URL", function (done) {
-      ORM.connectAsync("")
-        .then(function () {
-          done('Fail');
-        })
+    it("should throw error when passed empty string like connection URL", function () {
+      return ORM.connectAsync("")
         .catch(function (err) {
           err.message.should.equal("CONNECTION_URL_EMPTY");
-          done()
         });
     });
 
-    it("should throw error when passed string with spaces only", function (done) {
-      ORM.connectAsync("    ")
-        .then(function () {
-          done('Fail');
-        })
+    it("should throw error when passed string with spaces only", function () {
+      return ORM.connectAsync("    ")
         .catch(function (err) {
           err.message.should.equal("CONNECTION_URL_EMPTY");
-          done()
         });
     });
 
-    it("should throw error when passed invalid protocol", function (done) {
-      ORM.connectAsync("user@db")
-        .then(function () {
-          done('Fail');
-        })
+    it("should throw error when passed invalid protocol", function () {
+      return ORM.connectAsync("user@db")
         .catch(function (err) {
           err.message.should.equal("CONNECTION_URL_NO_PROTOCOL");
-          done()
         });
     });
 
-    it("should throw error when passed unknown protocol", function (done) {
-      ORM.connectAsync("unknown://db")
-        .then(function () {
-          done('Fail');
-        })
+    it("should throw error when passed unknown protocol", function () {
+      return ORM.connectAsync("unknown://db")
         .catch(function (err) {
           should.equal(err.literalCode, 'NO_SUPPORT');
           should.equal(
             err.message,
             "Connection protocol not supported - have you installed the database driver for unknown?"
           );
-          done()
         });
     });
 
-    it("should throw error when passed invalid connection db link", function (done) {
-      ORM.connectAsync("mysql://fakeuser:nopassword@127.0.0.1/unknowndb")
-        .then(function () {
-          done('Fail');
-        })
+    it("should throw error when passed invalid connection db link", function () {
+      return ORM.connectAsync("mysql://fakeuser:nopassword@127.0.0.1/unknowndb")
         .catch(function (err) {
           should.exist(err);
           should.equal(err.message.indexOf("Connection protocol not supported"), -1);
           err.message.should.not.equal("CONNECTION_URL_NO_PROTOCOL");
           err.message.should.not.equal("CONNECTION_URL_EMPTY");
-          done()
         });
     });
 
-    it("should do not mutate opts", function (done) {
+    it("should do not mutate opts", function () {
       var opts = {
         protocol : 'mysql',
         user     : 'notauser',
@@ -150,16 +122,12 @@ describe("ORM", function() {
 
       var expected = JSON.stringify(opts);
 
-      ORM.connectAsync(opts)
-        .then(function () {
-          done('Fail');
-        })
+      return ORM.connectAsync(opts)
         .catch(function () {
           should.equal(
             JSON.stringify(opts),
             expected
           );
-          done();
         });
     });
 
@@ -585,16 +553,12 @@ describe("ORM", function() {
       return ORM.useAsync(db, "pg")
     });
 
-    it("should throw an error in callback if protocol not supported", function (done) {
+    it("should throw an error in callback if protocol not supported", function () {
       var db = new pg.Client();
 
-      ORM.useAsync(db, "unknowndriver")
-        .then(function () {
-          done(new Error('Should throw'));
-        })
+      return ORM.useAsync(db, "unknowndriver")
         .catch(function (err) {
           should.exist(err);
-          done();
         });
     });
   });

From ff245cdc4609f57d886ff0321e406d6cb98af46d Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Thu, 14 Sep 2017 13:35:06 +0300
Subject: [PATCH 1166/1246] add model save async tests

---
 test/integration/model-save.js      |   1 -
 test/integration/model-saveAsync.js | 415 ++++++++++++++++++++++++++++
 2 files changed, 415 insertions(+), 1 deletion(-)
 create mode 100644 test/integration/model-saveAsync.js

diff --git a/test/integration/model-save.js b/test/integration/model-save.js
index 30d48cf6..9d3f4bce 100644
--- a/test/integration/model-save.js
+++ b/test/integration/model-save.js
@@ -1,7 +1,6 @@
 var should   = require('should');
 var helper   = require('../support/spec_helper');
 var common   = require('../common');
-var ORM      = require('../../');
 
 describe("Model.save()", function() {
   var db = null;
diff --git a/test/integration/model-saveAsync.js b/test/integration/model-saveAsync.js
new file mode 100644
index 00000000..df78332f
--- /dev/null
+++ b/test/integration/model-saveAsync.js
@@ -0,0 +1,415 @@
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var common   = require('../common');
+
+describe("Model.saveAsync()", function() {
+  var db = null;
+  var Person = null;
+
+  var setup = function (nameDefinition, opts) {
+    opts = opts || {};
+
+    return function (done) {
+      Person = db.define("person", {
+        name   : nameDefinition || String
+      }, opts || {});
+
+      Person.hasOne("parent", Person, opts.hasOneOpts);
+      if ('saveAssociationsByDefault' in opts) {
+        Person.settings.set(
+          'instance.saveAssociationsByDefault', opts.saveAssociationsByDefault
+        );
+      }
+
+      return helper.dropSync(Person, done);
+    };
+  };
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  describe("if properties have default values", function () {
+    before(setup({ type: "text", defaultValue: "John" }));
+
+    it("should use it if not defined", function () {
+      var John = new Person();
+
+      return John.saveAsync()
+        .then(function () {
+          John.name.should.equal("John");
+        });
+    });
+  });
+
+  describe("with callback", function () {
+    before(setup());
+
+    it("should save item and return id", function () {
+      var John = new Person({
+        name: "John"
+      });
+
+      return John.saveAsync()
+        .then(function () {
+          should.exist(John[Person.id]);
+          return Person.getAsync(John[Person.id]);
+        })
+        .then(function (JohnCopy) {
+          JohnCopy[Person.id].should.equal(John[Person.id]);
+          JohnCopy.name.should.equal(John.name);
+        });
+    });
+  });
+
+  describe("without callback", function () {
+    before(setup());
+
+    it("should still save item and return id", function (done) {
+      var John = new Person({
+        name: "John"
+      });
+      John.saveAsync();
+      John.on("save", function (err) {
+        should.equal(err, null);
+        should.exist(John[Person.id]);
+
+        Person.getAsync(John[Person.id])
+          .then(function (JohnCopy) {
+            JohnCopy[Person.id].should.equal(John[Person.id]);
+            JohnCopy.name.should.equal(John.name);
+
+            return done();
+          });
+      });
+    });
+  });
+
+  describe("with properties object", function () {
+    before(setup());
+
+    it("should update properties, save item and return id", function () {
+      var John = new Person({
+        name: "Jane"
+      });
+      return John.saveAsync({ name: "John" })
+        .then(function () {
+          should.exist(John[Person.id]);
+          John.name.should.equal("John");
+
+          return Person.getAsync(John[Person.id])
+        })
+        .then(function (JohnCopy) {
+          JohnCopy[Person.id].should.equal(John[Person.id]);
+          JohnCopy.name.should.equal(John.name);
+        });
+    });
+  });
+
+  describe("with unknown argument type", function () {
+    before(setup());
+
+    it("should should throw", function () {
+      var John = new Person({
+        name: "Jane"
+      });
+      return John.saveAsync("will-fail")
+        .catch(function (err) {
+          err.should.be.an.Object();
+        });
+    });
+  });
+
+  describe("if passed an association instance", function () {
+    before(setup());
+
+    it("should save association first and then save item and return id", function () {
+      var Jane = new Person({
+        name  : "Jane"
+      });
+      var John = new Person({
+        name  : "John",
+        parent: Jane
+      });
+
+      return John.saveAsync()
+        .then(function () {
+          John.saved().should.be.true();
+          Jane.saved().should.be.true();
+
+          should.exist(John[Person.id]);
+          should.exist(Jane[Person.id]);
+        });
+    });
+  });
+
+  describe("if passed an association object", function () {
+    before(setup());
+
+    it("should save association first and then save item and return id", function () {
+      var John = new Person({
+        name  : "John",
+        parent: {
+          name  : "Jane"
+        }
+      });
+
+      return John.saveAsync()
+        .then(function () {
+          John.saved().should.be.true();
+          John.parent.saved().should.be.true();
+
+          should.exist(John[Person.id]);
+          should.exist(John.parent[Person.id]);
+          should.equal(John.parent.name, "Jane");
+        });
+    });
+  });
+
+  describe("if autoSave is on", function () {
+    before(setup(null, { autoSave: true }));
+
+    it("should save the instance as soon as a property is changed", function (done) {
+      var John = new Person({
+        name : "Jhon"
+      });
+
+      John.saveAsync()
+        .then(function () {
+          John.on("save", function () {
+            return done();
+          });
+
+          John.name = "John";
+        });
+    });
+  });
+
+  describe("with saveAssociations", function () {
+    var afterSaveCalled = false;
+
+    if (common.protocol() == 'mongodb') return;
+
+    describe("default on in settings", function () {
+      beforeEach(function (done) {
+        function afterSave () {
+          afterSaveCalled = true;
+        }
+        var hooks = { afterSave: afterSave };
+
+        setup(null, { hooks: hooks, cache: false, hasOneOpts: { autoFetch: true } })(function (err) {
+          should.not.exist(err);
+
+          Person.create({ name: 'Olga' }, function (err, olga) {
+            should.not.exist(err);
+
+            should.exist(olga);
+            Person.create({ name: 'Hagar', parent_id: olga.id }, function (err, hagar) {
+              should.not.exist(err);
+              should.exist(hagar);
+              afterSaveCalled = false;
+              done();
+            });
+          });
+        });
+      });
+
+      it("should be on", function () {
+        should.equal(Person.settings.get('instance.saveAssociationsByDefault'), true);
+      });
+
+      it("off should not save associations but save itself", function () {
+        return Person.oneAsync({ name: 'Hagar' })
+          .then(function (hagar) {
+            should.exist(hagar.parent);
+
+            hagar.parent.name = 'Olga2';
+            return [hagar, hagar.saveAsync({name: 'Hagar2'}, { saveAssociations: false })];
+          })
+          .spread(function (hagar) {
+            should.equal(afterSaveCalled, true);
+
+            return Person.getAsync(hagar.parent.id);
+          })
+          .then(function (olga) {
+            should.equal(olga.name, 'Olga');
+          });
+      });
+
+      it("off should not save associations or itself if there are no changes", function () {
+        return Person.oneAsync({ name: 'Hagar' })
+          .then(function (hagar) {
+            return [hagar, hagar.saveAsync({}, { saveAssociations: false })];
+          })
+          .spread(function (hagar) {
+            should.equal(afterSaveCalled, false);
+            return Person.getAsync(hagar.parent.id);
+          })
+          .then(function (olga) {
+            should.equal(olga.name, 'Olga');
+          });
+      });
+
+      it("unspecified should save associations and itself", function () {
+        return Person.oneAsync({ name: 'Hagar' })
+          .then(function (hagar) {
+            should.exist(hagar.parent);
+
+            hagar.parent.name = 'Olga2';
+            return [hagar, hagar.saveAsync({name: 'Hagar2'})];
+          })
+          .spread(function (hagar) {
+            return [hagar, Person.getAsync(hagar.parent.id)];
+          })
+          .spread(function (hagar, olga) {
+            should.equal(olga.name, 'Olga2');
+
+            return Person.getAsync(hagar.id);
+          })
+          .then(function (person) {
+            should.equal(person.name, 'Hagar2');
+          });
+      });
+
+      it("on should save associations and itself", function () {
+        return Person.oneAsync({ name: 'Hagar' })
+          .then(function (hagar) {
+            should.exist(hagar.parent);
+
+            hagar.parent.name = 'Olga2';
+            return [hagar, hagar.saveAsync({name: 'Hagar2'}, { saveAssociations: true })];
+          })
+          .spread(function (hagar) {
+            return [hagar, Person.getAsync(hagar.parent.id)];
+          })
+          .spread(function (hagar, olga) {
+            should.equal(olga.name, 'Olga2');
+
+            return Person.getAsync(hagar.id);
+          })
+          .then(function (person) {
+            should.equal(person.name, 'Hagar2');
+          });
+      });
+    });
+
+    describe("turned off in settings", function () {
+      beforeEach(function (done) {
+        function afterSave () {
+          afterSaveCalled = true;
+        }
+        var hooks = { afterSave: afterSave };
+
+        setup(null, {
+          hooks: hooks, cache: false, hasOneOpts: { autoFetch: true },
+          saveAssociationsByDefault: false
+        })(function (err) {
+          should.not.exist(err);
+
+          Person.create({ name: 'Olga' }, function (err, olga) {
+            should.not.exist(err);
+
+            should.exist(olga);
+            Person.create({ name: 'Hagar', parent_id: olga.id }, function (err, hagar) {
+              should.not.exist(err);
+              should.exist(hagar);
+              afterSaveCalled = false;
+              done();
+            });
+          });
+        });
+      });
+
+      it("should be off", function () {
+        should.equal(Person.settings.get('instance.saveAssociationsByDefault'), false);
+      });
+
+      it("unspecified should not save associations but save itself", function () {
+        return Person.oneAsync({ name: 'Hagar' })
+          .then(function (hagar) {
+            should.exist(hagar.parent);
+
+            hagar.parent.name = 'Olga2';
+            return [hagar, hagar.saveAsync({ name: 'Hagar2' })];
+          })
+          .spread(function (hagar) {
+            return [hagar, Person.getAsync(hagar.parent.id)];
+          })
+          .spread(function (hagar, olga) {
+            should.equal(olga.name, 'Olga');
+
+            return Person.getAsync(hagar.id);
+          })
+          .then(function (person) {
+            should.equal(person.name, 'Hagar2');
+          });
+      });
+
+      it("off should not save associations but save itself", function () {
+        return Person.oneAsync({ name: 'Hagar' })
+          .then(function (hagar) {
+            should.exist(hagar.parent);
+
+            hagar.parent.name = 'Olga2';
+            return [hagar, hagar.saveAsync({ name: 'Hagar2' }, { saveAssociations: false })];
+          })
+          .spread(function (hagar) {
+            should.equal(afterSaveCalled, true);
+
+            return Person.getAsync(hagar.parent.id);
+          })
+          .then(function (olga) {
+            should.equal(olga.name, 'Olga');
+          });
+      });
+
+      it("on should save associations and itself", function () {
+        return Person.oneAsync({ name: 'Hagar' })
+          .then(function (hagar) {
+            should.exist(hagar.parent);
+
+            hagar.parent.name = 'Olga2';
+            return [hagar, hagar.saveAsync({ name: 'Hagar2' }, { saveAssociations: true })];
+          })
+          .spread(function (hagar) {
+            return [hagar, Person.getAsync(hagar.parent.id)];
+          })
+          .spread(function (hagar, olga) {
+            should.equal(olga.name, 'Olga2');
+
+            return Person.getAsync(hagar.id);
+          })
+          .then(function (person) {
+            should.equal(person.name, 'Hagar2');
+          });
+      });
+    });
+  });
+
+  describe("with a point property", function () {
+    if (common.protocol() == 'sqlite' || common.protocol() == 'mongodb') return;
+    before(function (done) {
+      setup({ type: "point" })(done);
+    });
+
+    it("should save the instance as a geospatial point", function () {
+      var John = new Person({
+        name: { x: 51.5177, y: -0.0968 }
+      });
+      return John.saveAsync()
+        .then(function () {
+          John.name.should.be.an.instanceOf(Object);
+          John.name.should.have.property('x', 51.5177);
+          John.name.should.have.property('y', -0.0968);
+        });
+    });
+  });
+});

From c1204cc9b32b5cc0ee329223f85b043e91fc6de3 Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Thu, 14 Sep 2017 13:36:50 +0300
Subject: [PATCH 1167/1246] Tests changes before branch pull

---
 .../association-hasone-reverse-async.js       | 79 +++++++++----------
 1 file changed, 36 insertions(+), 43 deletions(-)

diff --git a/test/integration/association-hasone-reverse-async.js b/test/integration/association-hasone-reverse-async.js
index 1da35125..2d2c6b21 100644
--- a/test/integration/association-hasone-reverse-async.js
+++ b/test/integration/association-hasone-reverse-async.js
@@ -155,7 +155,7 @@ describe("hasOne Async", function () {
             has_owner.should.equal(false);
             return [John, Deco.setOwnersAsync(John)];
           })
-          .spread(function (John, Deco) {
+          .spread(function (John) {
             return [John, Person.findAsync({ pet_id: 1 })];
           })
           .spread(function (John, owner) {
@@ -164,49 +164,48 @@ describe("hasOne Async", function () {
           });
        }, 3, done);
     });
-
+    
     it("should be able to find given an association instance", function (done) {
-      common.retry(setup(), function (done) {
-        Person.find({ name: "John Doe" }).first(function (err, John) {
-          should.not.exist(err);
-          should.exist(John);
-          Pet.find({ name: "Deco" }).first(function (err, Deco) {
-            should.not.exist(err);
+      common.retry(setup(), function () {
+        return Person
+          .findAsync({ name: "John Doe" })
+          .then(function (John) {
+            var John = John[0];
+            should.exist(John);
+            return [John, Pet.findAsync({ name: "Deco" })];
+          })
+          .spread(function (John, Deco) {
+            var Deco = Deco[0];
             should.exist(Deco);
-            Deco.hasOwnersAsync().then(function (has_owner) {
-              has_owner.should.equal(false);
-
-              Deco.setOwnersAsync(John).then(function () {
-
-                Person.find({ pet: Deco }).first(function (err, owner) {
-                  should.not.exist(err);
-                  should.exist(owner);
-                  should.equal(owner.name, John.name);
-                  done();
-                });
-
-              }).catch(function(err) {
-                done(err);
-              });
-            }).done(function(err) {
-              done(err);
-            });
+            return [John, Deco, Deco.hasOwnersAsync()];
+          })
+          .spread(function (John, Deco, has_owner) {
+            has_owner.should.equal(false);
+            return [John, Deco.setOwnersAsync(John)];
+          })
+          .spread(function (John, Deco) {
+            return [John, Person.findAsync({ pet: Deco })];
+          })
+          .spread(function(John, owner){
+            should.exist(owner[1]);
+            should.equal(owner[1].name, John.name);
           });
-        });
       }, 3, done);
     });
 
-    it("should be able to find given a number of association instances with a single primary key", function (done) {
-      common.retry(setup(), function (done) {
-        Person.find({ name: "John Doe" }).first(function (err, John) {
-          should.not.exist(err);
-          should.exist(John);
-          Pet.all(function (err, pets) {
-            should.not.exist(err);
+    it.only("should be able to find given a number of association instances with a single primary key", function (done) {
+      //common.retry(setup(), function (done) {
+        Person.findAsync({ name: "John Doe" })
+          .then(function (John) {
+            should.exist(John);
+            return [John, Pet.allAsync()];
+          })
+          .then(function (John, pets) {
             should.exist(pets);
             should.equal(pets.length, 2);
-
-            pets[0].hasOwnersAsync().then(function (has_owner) {
+            return [John, pets[0], pets[0].hasOwnersAsync()];
+          })
+          .then(function (John, pets, has_owner) {
               has_owner.should.equal(false);
 
               pets[0].setOwnersAsync(John).then(function () {
@@ -219,15 +218,9 @@ describe("hasOne Async", function () {
                   should.equal(owners[0].name, John.name);
                   done();
                 });
-              }).catch(function(err) {
-                done(err);
               });
-            }).catch(function(err) {
-              done(err);
             });
-          });
-        });
-      }, 3, done);
+      //}, 3, done);
     });
   });
 });

From dadc4448e2c73220ac4d9f7473f15a7151026eea Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Thu, 14 Sep 2017 14:58:29 +0300
Subject: [PATCH 1168/1246] Final commit for hasone association async tests

---
 .../association-hasone-reverse-async.js       | 39 +++++++++----------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/test/integration/association-hasone-reverse-async.js b/test/integration/association-hasone-reverse-async.js
index 2d2c6b21..2b817be0 100644
--- a/test/integration/association-hasone-reverse-async.js
+++ b/test/integration/association-hasone-reverse-async.js
@@ -193,34 +193,31 @@ describe("hasOne Async", function () {
       }, 3, done);
     });
 
-    it.only("should be able to find given a number of association instances with a single primary key", function (done) {
-      //common.retry(setup(), function (done) {
-        Person.findAsync({ name: "John Doe" })
+    it("should be able to find given a number of association instances with a single primary key", function (done) {
+      common.retry(setup(), function (done) {
+        return Person.findAsync({ name: "John Doe" })
           .then(function (John) {
             should.exist(John);
             return [John, Pet.allAsync()];
           })
-          .then(function (John, pets) {
+          .spread(function (John, pets) {
             should.exist(pets);
             should.equal(pets.length, 2);
-            return [John, pets[0], pets[0].hasOwnersAsync()];
+            return [John[0], pets, pets[0].hasOwnersAsync()];
           })
-          .then(function (John, pets, has_owner) {
-              has_owner.should.equal(false);
-
-              pets[0].setOwnersAsync(John).then(function () {
-
-                Person.find({ pet: pets }, function (err, owners) {
-                  should.not.exist(err);
-                  should.exist(owners);
-                  owners.length.should.equal(1);
-
-                  should.equal(owners[0].name, John.name);
-                  done();
-                });
-              });
-            });
-      //}, 3, done);
+          .spread(function (John, pets, has_owner) {
+            has_owner.should.equal(false);
+            return [John, pets, pets[0].setOwnersAsync(John)];
+          })
+          .spread(function (John, pets) {
+            return [John, Person.findAsync({ pet: pets })];
+          })
+          .spread(function (John, owners) {
+            should.exist(owners[0]);
+            owners.length.should.equal(1);
+            should.equal(owners[0].name, John.name);
+          });
+      }, 3, done);
     });
   });
 });

From 2900c3d78717d9d02bfbf1c941f6770f7971f1b0 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Thu, 14 Sep 2017 15:22:28 +0300
Subject: [PATCH 1169/1246] update instance tests

---
 test/integration/instance.js | 182 +++++++++++++++--------------------
 1 file changed, 76 insertions(+), 106 deletions(-)

diff --git a/test/integration/instance.js b/test/integration/instance.js
index 1b17d844..91e6f9c4 100644
--- a/test/integration/instance.js
+++ b/test/integration/instance.js
@@ -97,14 +97,11 @@ describe("Model instance", function() {
       });
     });
 
-    it("should have a saving state to avoid loops (promise-based)", function (done) {
-      main_item.find({ name : "new name" }).first(function (err, mainItem) {
-        mainItem.saveAsync({ name : "new name test" }).then(function () {
-          done();
-        }).catch(function(err) {
-          done(err);
+    it("should have a saving state to avoid loops (promise-based)", function () {
+      return main_item.find({ name : "new name" }).firstAsync()
+        .then(function (mainItem) {
+          return mainItem.saveAsync({ name : "new name test" });
         });
-      });
     });
   });
 
@@ -347,28 +344,23 @@ describe("Model instance", function() {
       });
     });
 
-    it("should return validation errors if invalid (promise-based)", function (done) {
+    it("should return validation errors if invalid (promise-based)", function () {
       var person = new Person({ age: -1 });
 
-      person.validateAsync().then(function (validationErrors) {
-        should.equal(Array.isArray(validationErrors), true);
-
-        done();
-      }).catch(function(err) {
-        done(err);
-      });
+      return person.validateAsync()
+        .then(function (validationErrors) {
+          should.equal(Array.isArray(validationErrors), true);
+        });
     });
 
-    it("should return false if valid (promise-based)", function (done) {
+    it("should return false if valid (promise-based)", function () {
       var person = new Person({ name: 'Janette' });
 
-      person.validateAsync().then(function (validationErrors) {
-        should.equal(validationErrors, false);
+      return person.validateAsync()
+        .then(function (validationErrors) {
+          should.equal(validationErrors, false);
 
-        done();
-      }).catch(function(err) {
-        done(err);
-      });
+        });
     });
   });
 
@@ -397,29 +389,21 @@ describe("Model instance", function() {
         });
       });
 
-      it("should be saved for valid numbers, using both save & create (promise-based)", function (done) {
+      it("should be saved for valid numbers, using both save & create (promise-based)", function () {
         var person1 = new Person({ height: 190 });
 
-        person1.saveAsync().then(function () {
-
-          Person.createAsync({ height: 170 }).then(function (person2) {
-            Person.getAsync(person1[Person.id]).then(function (item) {
+        return person1.saveAsync().then(function () {
+          return Person.createAsync({ height: 170 })
+            .then(function (person2) {
+              return [person2, Person.getAsync(person1[Person.id])];
+            })
+            .spread(function (person2, item) {
               should.equal(item.height, 190);
-              Person.getAsync(person2[Person.id]).then(function (item) {
-                should.equal(item.height, 170);
-
-                done();
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
+              return Person.getAsync(person2[Person.id]);
+            })
+            .then(function (item) {
+              should.equal(item.height, 170);
             });
-          }).catch(function(err) {
-            done(err);
-          });
-        }).catch(function(err) {
-          done(err);
         });
       });
 
@@ -476,54 +460,50 @@ describe("Model instance", function() {
           });
         });
 
-        it("should raise an error for NaN integers (promise-based)", function (done) {
+        it("should raise an error for NaN integers (promise-based)", function () {
           var person = new Person({ height: NaN });
 
-          person.saveAsync().catch(function(err) {
-            var msg = {
-              postgres : 'invalid input syntax for integer: "NaN"'
-            }[protocol];
-
-            should.equal(err.message, msg);
+          return person.saveAsync()
+            .catch(function(err) {
+              var msg = {
+                postgres : 'invalid input syntax for integer: "NaN"'
+              }[protocol];
 
-            done();
-          });
+              should.equal(err.message, msg);
+            });
         });
 
-        it("should raise an error for Infinity integers (promise-based)", function (done) {
+        it("should raise an error for Infinity integers (promise-based)", function () {
           var person = new Person({ height: Infinity });
 
-          person.saveAsync().catch(function (err) {
-            should.exist(err);
-            var msg = {
-              postgres : 'invalid input syntax for integer: "Infinity"'
-            }[protocol];
-
-            should.equal(err.message, msg);
+          return person.saveAsync()
+            .catch(function (err) {
+              should.exist(err);
+              var msg = {
+                postgres : 'invalid input syntax for integer: "Infinity"'
+              }[protocol];
 
-            done();
-          });
+              should.equal(err.message, msg);
+            });
         });
 
-        it("should raise an error for nonsensical integers, for both save & create (promise-based)", function (done) {
+        it("should raise an error for nonsensical integers, for both save & create (promise-based)", function () {
           var person = new Person({ height: 'bugz' });
+          var msg = {
+            postgres : 'invalid input syntax for integer: "bugz"'
+          }[protocol];
 
-          person.saveAsync().catch(function (err) {
-            should.exist(err);
-            var msg = {
-              postgres : 'invalid input syntax for integer: "bugz"'
-            }[protocol];
-
-            should.equal(err.message, msg);
+          return person.saveAsync()
+            .catch(function (err) {
+              should.exist(err);
 
-            Person.createAsync({ height: 'bugz' }).then(function () {
-              done(new Error('Function should catch an error instead of finish'));
-            }).catch(function(err) {
+              should.equal(err.message, msg);
+              return Person.createAsync({ height: 'bugz' });
+            })
+            .catch(function(err) {
               should.exist(err);
               should.equal(err.message, msg);
-              done();
             });
-          });
         });
       }
 
@@ -553,31 +533,24 @@ describe("Model instance", function() {
           });
         });
 
-        it("should store NaN & Infinite floats (promise-based)", function (done) {
+        it("should store NaN & Infinite floats (promise-based)", function () {
           var person = new Person({ weight: NaN });
 
-          person.saveAsync().then(function () {
-
-            Person.getAsync(person[Person.id]).then(function (person) {
+          return person.saveAsync()
+            .then(function () {
+              return Person.getAsync(person[Person.id]);
+            })
+            .then(function (person) {
               should(isNaN(person.weight));
 
-              person.saveAsync({ weight: Infinity, name: 'black hole' }).then(function () {
-                Person.getAsync(person[Person.id]).then(function (person) {
-                  should.strictEqual(person.weight, Infinity);
-
-                  done();
-                }).catch(function(err) {
-                  done(err);
-                });
-              }).catch(function(err) {
-                done(err);
-              });
-            }).catch(function(err) {
-              done(err);
+              return person.saveAsync({ weight: Infinity, name: 'black hole' });
+            })
+            .then(function () {
+              return Person.getAsync(person[Person.id]);
+            })
+            .then(function (person) {
+              should.strictEqual(person.weight, Infinity);
             });
-          }).catch(function(err) {
-            done(err);
-          });
         });
       }
     });
@@ -634,20 +607,17 @@ describe("Model instance", function() {
         });
       });
 
-      it("should delete an item and send an error", function (done) {
-        main_item.find({ name : "Main Item" }).first(function (err, mainItem) {
-          mainItem.removeAsync().then(function () {
-            main_item.find({ name : "Main Item" }).first(function (err, itemFound) {
-              if (err && !itemFound) {
-                done();
-              }
-
-              done(err);
-            });
-          }).catch(function(err) {
-            done(err);
+      it("should delete an item and send an error", function () {
+        return main_item.find({ name : "Main Item" }).firstAsync()
+          .then(function (mainItem) {
+            return mainItem.removeAsync();
+          })
+          .then(function () {
+            return main_item.find({ name : "Main Item" }).firstAsync();
+          })
+          .then(function (item) {
+            should.equal(item, null)
           });
-        });
       });
     });
   });

From bf6f37e8e08fb2c232f0fe2767b8eeab506ac9f6 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Thu, 14 Sep 2017 15:52:32 +0300
Subject: [PATCH 1170/1246] update ignore files

---
 .gitignore | 2 +-
 .npmignore | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index afba1e84..2450dd37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,4 @@ test/config.js
 test/coverage.html
 lib-cov/
 *~
-/.idea
+.idea
diff --git a/.npmignore b/.npmignore
index 0c0d8ef4..7b93b7d6 100644
--- a/.npmignore
+++ b/.npmignore
@@ -6,3 +6,4 @@ node_modules
 test*
 lib-cov/
 *~
+.idea
\ No newline at end of file

From 1275d848e095f25fbefcaf0f708da500d6392022 Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Thu, 14 Sep 2017 15:55:31 +0300
Subject: [PATCH 1171/1246] Add and update lazyload async methods

---
 test/integration/property-lazyload-async.js | 133 ++++++++++++++++++++
 1 file changed, 133 insertions(+)
 create mode 100644 test/integration/property-lazyload-async.js

diff --git a/test/integration/property-lazyload-async.js b/test/integration/property-lazyload-async.js
new file mode 100644
index 00000000..bc963f8d
--- /dev/null
+++ b/test/integration/property-lazyload-async.js
@@ -0,0 +1,133 @@
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var ORM      = require('../../');
+
+describe("LazyLoad Async properties", function() {
+  var db = null;
+  var Person = null;
+  var PersonPhoto = new Buffer(1024); // fake photo
+  var OtherPersonPhoto = new Buffer(1024); // other fake photo
+
+  var setup = function () {
+    return function (done) {
+      Person = db.define("person", {
+        name   : String,
+        photo  : { type: "binary", lazyload: true }
+      });
+
+      ORM.singleton.clear();
+
+      return helper.dropSync(Person, function () {
+        Person.create({
+          name  : "John Doe",
+          photo : PersonPhoto
+        }, done);
+      });
+    };
+  };
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  describe("when defined Async methods", function () {
+    before(setup());
+
+    it("should not be available when fetching an instance", function () {
+      return Person
+        .findAsync()
+        .then(function (John) {
+          var john = John[0];
+          
+          should.equal(typeof john, 'object');
+          should.equal(Array.isArray(john), false);
+          john.should.have.property("name", "John Doe");
+          john.should.have.property("photo", null);
+        });
+    });
+
+    it("should have apropriate accessors", function () {
+      return Person
+        .findAsync()
+        .then(function (persons) {
+          var John = persons[0];
+          should.equal(typeof John, 'object');
+          should.equal(Array.isArray(John), false);
+          
+          John.getPhotoAsync.should.be.a.Function();
+          John.setPhotoAsync.should.be.a.Function();
+          John.removePhotoAsync.should.be.a.Function();
+        });
+    });
+
+    it("getAccessorAsync should return property", function () {
+      return Person
+        .findAsync()
+        .then(function (persons) {
+          var John = persons[0];
+  
+          should.equal(typeof John, 'object');
+          should.equal(Array.isArray(John), false);
+          return John.getPhotoAsync();
+        })
+        .then(function (photo) {
+          photo.toString().should.equal(PersonPhoto.toString());
+        });
+    });
+
+    it("setAccessorAsync should change property", function () {
+      return Person
+        .findAsync()
+        .then(function (persons) {
+          var John = persons[0];
+          should.equal(typeof John, 'object');
+          return John.setPhotoAsync(OtherPersonPhoto);
+        })
+        .then(function (johnPhotoUpdated) {
+          should.equal(typeof johnPhotoUpdated, 'object');
+          return Person.findAsync();
+        })
+        .then(function (persons) {
+          var John = persons[0];
+          
+          should.equal(typeof John, 'object');
+          should.equal(Array.isArray(John), false);
+          return John.getPhotoAsync();
+        })
+        .then(function (photo) {
+          photo.toString().should.equal(OtherPersonPhoto.toString());
+        });
+    });
+
+    it("removeAccessorAsync should change property", function () {
+      return Person
+        .findAsync()
+        .then(function (persons) {
+          var John = persons[0];
+          
+          should.equal(typeof John, 'object');
+          should.equal(Array.isArray(John), false);
+          return John.removePhotoAsync();
+        })
+        .then(function (John) {
+          return Person.getAsync(John[Person.id]);
+        })
+        .then(function (John) {
+          should.equal(typeof John, 'object');
+          should.equal(Array.isArray(John), false);
+          return John.getPhotoAsync();
+        })
+        .then(function (photo) {
+          should.equal(photo, null);
+        });
+    });
+  });
+});

From bc2d54a062af2a04a37d514ec7d6ebe51ec1af93 Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Thu, 14 Sep 2017 16:22:31 +0300
Subject: [PATCH 1172/1246] Add hasone-zeroid async tests; Removed test
 duplicates

---
 .../association-hasone-zeroid-async.js        | 155 ++++++++++++++++++
 test/integration/association-hasone-zeroid.js |  59 -------
 test/integration/property-lazyload.js         |  69 --------
 3 files changed, 155 insertions(+), 128 deletions(-)
 create mode 100644 test/integration/association-hasone-zeroid-async.js

diff --git a/test/integration/association-hasone-zeroid-async.js b/test/integration/association-hasone-zeroid-async.js
new file mode 100644
index 00000000..b872a99d
--- /dev/null
+++ b/test/integration/association-hasone-zeroid-async.js
@@ -0,0 +1,155 @@
+var _      = require('lodash');
+var should = require('should');
+var async  = require('async');
+var helper = require('../support/spec_helper');
+var ORM    = require('../../');
+
+describe("hasOne promise-based methods", function() {
+  var db     = null;
+  var Person = null;
+  var Pet    = null;
+
+  var setup = function (autoFetch) {
+    return function (done) {
+      db.settings.set('instance.identityCache', false);
+      db.settings.set('instance.returnAllErrors', true);
+
+      Person = db.define('person', {
+        id        : { type : "integer",  mapsTo: "personID", key: true },
+        firstName : { type : "text",     size:   "255" },
+        lastName  : { type : "text",     size:   "255" }
+      });
+
+      Pet = db.define('pet', {
+        id      : { type : "integer",  mapsTo: "petID", key: true },
+        petName : { type : "text",     size:   "255" },
+        ownerID : { type : "integer",  size:   "4" }
+      });
+
+      Pet.hasOne('owner', Person, { field: 'ownerID', autoFetch: autoFetch });
+
+      helper.dropSync([Person, Pet], function(err) {
+        if (err) return done(err);
+
+        Pet.create([
+          {
+            id: 10,
+            petName: 'Muttley',
+            owner: {
+              id: 12,
+              firstName: 'Stuey',
+              lastName: 'McG'
+            }
+          },
+          {
+            id: 11,
+            petName: 'Snagglepuss',
+            owner: {
+              id: 0,
+              firstName: 'John',
+              lastName: 'Doe'
+            }
+          }
+        ], done);
+      });
+    };
+  };
+
+  before(function(done) {
+    helper.connect(function (connection) {
+      db = connection;
+      done();
+    });
+  });
+
+  describe("auto fetch", function () {
+    before(setup(true));
+
+    it("should work for non-zero ownerID ", function () {
+      return Pet
+        .findAsync({petName: "Muttley"})
+        .then(function(pets) {
+          pets[0].petName.should.equal("Muttley");
+          pets[0].should.have.property("id");
+          pets[0].id.should.equal(10);
+          pets[0].ownerID.should.equal(12);
+          pets[0].should.have.property("owner");
+          pets[0].owner.firstName.should.equal("Stuey");
+        });
+    });
+
+    it("should work for zero ownerID ", function () {
+      return Pet
+        .findAsync({petName: "Snagglepuss"})
+        .then(function(pets) {
+          pets[0].petName.should.equal("Snagglepuss");
+          pets[0].should.have.property("id");
+          pets[0].id.should.equal(11);
+  
+          return Person.allAsync();
+        })
+        .then(function (people) {
+          should.equal(typeof people[0], 'object');
+          should.equal(Array.isArray(people), true);
+          people[0].should.have.property("firstName", "Stuey");
+        });
+    });
+  });
+
+  describe("no auto fetch", function () {
+    before(setup(false));
+    
+    it("should work for non-zero ownerID (promise-based)", function () {
+      return Pet
+        .findAsync({petName: "Muttley"})
+        .then(function(pets) {
+          var pets = pets[0];
+          
+          pets.petName.should.equal("Muttley");
+          pets.should.have.property("id");
+          pets.id.should.equal(10);
+          pets.ownerID.should.equal(12);
+
+          pets.should.not.have.property("owner");
+
+          // But we should be able to see if its there
+          return [pets, pets.hasOwnerAsync()];
+        })
+        .spread(function(pets, hasOwner) {
+          should.equal(hasOwner, true);
+          // ...and then get it
+          return pets.getOwnerAsync();
+        })
+        .then(function(petOwner) {
+          petOwner.firstName.should.equal("Stuey");
+        });
+    });
+
+    it("should work for zero ownerID", function () {
+      return Pet
+        .findAsync({petName: "Snagglepuss"})
+        .then(function(pets) {
+          var pets = pets[0];
+          
+          pets.petName.should.equal("Snagglepuss");
+          pets.should.have.property("id");
+          pets.id.should.equal(11);
+          pets.ownerID.should.equal(0);
+
+          pets.should.not.have.property("owner");
+
+          // But we should be able to see if its there
+          return [pets, pets.hasOwnerAsync()];
+        })
+        .spread(function(pets, hasOwner) {
+          should.equal(hasOwner, true);
+          
+          // ...and then get it
+          return pets.getOwnerAsync();
+        })
+        .then(function(petOwner) {
+          petOwner.firstName.should.equal("John");
+        });
+    });
+  });
+});
diff --git a/test/integration/association-hasone-zeroid.js b/test/integration/association-hasone-zeroid.js
index 17296866..8fd2bd17 100644
--- a/test/integration/association-hasone-zeroid.js
+++ b/test/integration/association-hasone-zeroid.js
@@ -125,64 +125,5 @@ describe("hasOne", function() {
         });
       });
     });
-
-    it("should work for non-zero ownerID (promise-based)", function (done) {
-      Pet.find({petName: "Muttley"}, function(err, pets) {
-        should.not.exist(err);
-
-        pets[0].petName.should.equal("Muttley");
-        pets[0].should.have.property("id");
-        pets[0].id.should.equal(10);
-        pets[0].ownerID.should.equal(12);
-
-        pets[0].should.not.have.property("owner");
-
-        // But we should be able to see if its there
-        pets[0].hasOwnerAsync().then(function(result) {
-          should.equal(result, true);
-
-          // ...and then get it
-          pets[0].getOwnerAsync().then(function(result) {
-            result.firstName.should.equal("Stuey");
-
-            done()
-          }).catch(function(err) {
-            done(err);
-          });
-        }).catch(function(err) {
-          done(err);
-        });
-      });
-    });
-
-    it("should work for zero ownerID (promise-based)", function (done) {
-      Pet.find({petName: "Snagglepuss"}, function(err, pets) {
-        should.not.exist(err);
-
-        pets[0].petName.should.equal("Snagglepuss");
-        pets[0].should.have.property("id");
-        pets[0].id.should.equal(11);
-        pets[0].ownerID.should.equal(0);
-
-        pets[0].should.not.have.property("owner");
-
-        // But we should be able to see if its there
-        pets[0].hasOwnerAsync().then(function(result) {
-          should.equal(result, true);
-
-          // ...and then get it
-          pets[0].getOwnerAsync().then(function(result) {
-            should.not.exist(err);
-            result.firstName.should.equal("John");
-
-            done()
-          }).catch(function(err) {
-            done(err);
-          });
-        }).catch(function(err) {
-          done(err);
-        });
-      });
-    });
   });
 });
diff --git a/test/integration/property-lazyload.js b/test/integration/property-lazyload.js
index fce83845..0b83f00c 100644
--- a/test/integration/property-lazyload.js
+++ b/test/integration/property-lazyload.js
@@ -63,9 +63,6 @@ describe("LazyLoad properties", function() {
         John.getPhoto.should.be.a.Function();
         John.setPhoto.should.be.a.Function();
         John.removePhoto.should.be.a.Function();
-        John.getPhotoAsync.should.be.a.Function();
-        John.setPhotoAsync.should.be.a.Function();
-        John.removePhotoAsync.should.be.a.Function();
 
         return done();
       });
@@ -86,20 +83,6 @@ describe("LazyLoad properties", function() {
       });
     });
 
-    it("promise-based getAccessor should return property", function (done) {
-      Person.find().first(function (err, John) {
-        should.equal(err, null);
-        John.should.be.a.Object();
-        John.getPhotoAsync()
-          .then(function (photo) {
-            photo.toString().should.equal(PersonPhoto.toString());
-            done();
-          }).catch(function(err) {
-            done(err);
-          });
-      });
-    });
-
     it("setAccessor should change property", function (done) {
       Person.find().first(function (err, John) {
         should.equal(err, null);
@@ -122,32 +105,6 @@ describe("LazyLoad properties", function() {
       });
     });
 
-    it("promise-based setAccessor should change property (promise-based)", function (done) {
-      Person.find().first(function (err, John) {
-        should.equal(err, null);
-        John.should.be.a.Object();
-
-        John.setPhotoAsync(OtherPersonPhoto)
-          .then(function (johnPhotoUpdated) {
-            johnPhotoUpdated.should.be.a.Object();
-
-            Person.find().first(function (err, John) {
-              should.equal(err, null);
-              John.should.be.a.Object();
-
-              John.getPhotoAsync()
-                .then(function (photo) {
-                  should.equal(err, null);
-                  photo.toString().should.equal(OtherPersonPhoto.toString());
-                  done();
-                }).catch(function (err) {
-                  done(err);
-                });
-            });
-          });
-      });
-    });
-
     it("removeAccessor should change property", function (done) {
       Person.find().first(function (err, John) {
         should.equal(err, null);
@@ -170,31 +127,5 @@ describe("LazyLoad properties", function() {
           });
         });
     });
-
-    it("removeAccessor should change property (promise-based)", function (done) {
-      Person.find().first(function (err, John) {
-        should.equal(err, null);
-        John.should.be.a.Object();
-
-        John.removePhotoAsync().then(function () {
-          Person.getAsync(John[Person.id]).then(function (John) {
-            John.should.be.a.Object();
-
-            John.getPhotoAsync()
-              .then(function (photo) {
-                should.equal(err, null);
-                should.equal(photo, null);
-                done();
-              }).catch(function (err) {
-                done(err);
-              });
-          }).catch(function(err) {
-            done(err);
-          });
-        }).catch(function(err) {
-          done(err);
-        });
-      });
-    });
   });
 });

From 4257227e3a50ab433eb76a61f014e6b8dcc3bb7d Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Thu, 14 Sep 2017 16:27:04 +0300
Subject: [PATCH 1173/1246] Reset test config to default

---
 test/config.example.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/config.example.js b/test/config.example.js
index 0d9c232b..bb9c2d73 100644
--- a/test/config.example.js
+++ b/test/config.example.js
@@ -13,8 +13,8 @@ exports.mysql = {
   database : "test"
 };
 exports.postgres = {
-  user     : "postgres",
-  password : "1111",
+  user     : "root",
+  password : "",
   database : "test"
 };
 exports.redshift = {

From ec4d5263210e78bbfcfccb60490e7953bc1113ac Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Thu, 14 Sep 2017 18:29:44 +0300
Subject: [PATCH 1174/1246] Resolve PR comments: format some indents; removed
 done()

---
 test/integration/association-hasone-async.js  |  18 +--
 .../association-hasone-reverse-async.js       | 144 +++++++++---------
 2 files changed, 78 insertions(+), 84 deletions(-)

diff --git a/test/integration/association-hasone-async.js b/test/integration/association-hasone-async.js
index 0eb0e155..81b165d6 100644
--- a/test/integration/association-hasone-async.js
+++ b/test/integration/association-hasone-async.js
@@ -73,8 +73,8 @@ describe("hasOne", function() {
     it("get should get the association", function () {
       return Leaf
         .oneAsync({ size: 14 })
-        .then(function(leaf) {
-					should.exist(leaf);
+        .then(function (leaf) {
+          should.exist(leaf);
           return leaf.getTreeAsync();
         })
         .then(function (tree) {
@@ -127,8 +127,8 @@ describe("hasOne", function() {
         .spread(function (stalk, leaf) {
           should.exist(leaf);
           should.not.exist(leaf.stalkId);
-					return [stalk, leaf.setStalkAsync(stalk)];
-				})
+          return [stalk, leaf.setStalkAsync(stalk)];
+        })
         .then(function (stalk) {
           return [stalk, Leaf.oneAsync({ size: 14 })];
         })
@@ -142,8 +142,8 @@ describe("hasOne", function() {
         .oneAsync({ length: 20 })
         .then(function (stalk) {
           should.exist(stalk);
-					return Leaf.oneAsync({ size: 14 });
-				})
+          return Leaf.oneAsync({size: 14});
+        })
         .then(function (leaf) {
           should.exist(leaf);
           should.exist(leaf.stalkId);
@@ -152,9 +152,9 @@ describe("hasOne", function() {
         .then(function () {
           return Leaf.oneAsync({ size: 14 });
         })
-				.then(function (leaf) {
-					should.equal(leaf.stalkId, null);
-				});
+        .then(function (leaf) {
+          should.equal(leaf.stalkId, null);
+        });
     });
   });
 
diff --git a/test/integration/association-hasone-reverse-async.js b/test/integration/association-hasone-reverse-async.js
index 2b817be0..6d10d79b 100644
--- a/test/integration/association-hasone-reverse-async.js
+++ b/test/integration/association-hasone-reverse-async.js
@@ -139,85 +139,79 @@ describe("hasOne Async", function () {
 
   describe("reverse find", function () {
     before(setup());
-    it("should be able to find given an association id", function (done) {
-      common.retry(setup(), function () {
-        return Person
-          .findAsync({ name: "John Doe" })
-          .then(function (John) {
-            should.exist(John);
-            return [John, Pet.findAsync({ name: "Deco" })];
-          })
-          .spread(function (John, Deco) {
-            should.exist(Deco);
-            return [John[0], Deco[0], Deco[0].hasOwnersAsync()];
-          })
-          .spread(function (John, Deco, has_owner) {
-            has_owner.should.equal(false);
-            return [John, Deco.setOwnersAsync(John)];
-          })
-          .spread(function (John) {
-            return [John, Person.findAsync({ pet_id: 1 })];
-          })
-          .spread(function (John, owner) {
-            should.exist(owner[0]);
-            should.equal(owner[0].name, John.name);
-          });
-       }, 3, done);
+    it("should be able to find given an association id", function () {
+      return Person
+        .findAsync({ name: "John Doe" })
+        .then(function (John) {
+          should.exist(John);
+          return [John, Pet.findAsync({ name: "Deco" })];
+        })
+        .spread(function (John, Deco) {
+          should.exist(Deco);
+          return [John[0], Deco[0], Deco[0].hasOwnersAsync()];
+        })
+        .spread(function (John, Deco, has_owner) {
+          has_owner.should.equal(false);
+          return [John, Deco.setOwnersAsync(John)];
+        })
+        .spread(function (John) {
+          return [John, Person.findAsync({ pet_id: 1 })];
+        })
+        .spread(function (John, owner) {
+          should.exist(owner[0]);
+          should.equal(owner[0].name, John.name);
+        });
     });
     
-    it("should be able to find given an association instance", function (done) {
-      common.retry(setup(), function () {
-        return Person
-          .findAsync({ name: "John Doe" })
-          .then(function (John) {
-            var John = John[0];
-            should.exist(John);
-            return [John, Pet.findAsync({ name: "Deco" })];
-          })
-          .spread(function (John, Deco) {
-            var Deco = Deco[0];
-            should.exist(Deco);
-            return [John, Deco, Deco.hasOwnersAsync()];
-          })
-          .spread(function (John, Deco, has_owner) {
-            has_owner.should.equal(false);
-            return [John, Deco.setOwnersAsync(John)];
-          })
-          .spread(function (John, Deco) {
-            return [John, Person.findAsync({ pet: Deco })];
-          })
-          .spread(function(John, owner){
-            should.exist(owner[1]);
-            should.equal(owner[1].name, John.name);
-          });
-      }, 3, done);
+    it("should be able to find given an association instance", function () {
+      return Person
+        .findAsync({ name: "John Doe" })
+        .then(function (John) {
+          var John = John[0];
+          should.exist(John);
+          return [John, Pet.findAsync({ name: "Deco" })];
+        })
+        .spread(function (John, Deco) {
+          var Deco = Deco[0];
+          should.exist(Deco);
+          return [John, Deco, Deco.hasOwnersAsync()];
+        })
+        .spread(function (John, Deco, has_owner) {
+          has_owner.should.equal(false);
+          return [John, Deco.setOwnersAsync(John)];
+        })
+        .spread(function (John, Deco) {
+          return [John, Person.findAsync({ pet: Deco })];
+        })
+        .spread(function(John, owner){
+          should.exist(owner[1]);
+          should.equal(owner[1].name, John.name);
+        });
     });
 
-    it("should be able to find given a number of association instances with a single primary key", function (done) {
-      common.retry(setup(), function (done) {
-        return Person.findAsync({ name: "John Doe" })
-          .then(function (John) {
-            should.exist(John);
-            return [John, Pet.allAsync()];
-          })
-          .spread(function (John, pets) {
-            should.exist(pets);
-            should.equal(pets.length, 2);
-            return [John[0], pets, pets[0].hasOwnersAsync()];
-          })
-          .spread(function (John, pets, has_owner) {
-            has_owner.should.equal(false);
-            return [John, pets, pets[0].setOwnersAsync(John)];
-          })
-          .spread(function (John, pets) {
-            return [John, Person.findAsync({ pet: pets })];
-          })
-          .spread(function (John, owners) {
-            should.exist(owners[0]);
-            owners.length.should.equal(1);
-            should.equal(owners[0].name, John.name);
-          });
-      }, 3, done);
+    it("should be able to find given a number of association instances with a single primary key", function () {
+      return Person.findAsync({ name: "John Doe" })
+        .then(function (John) {
+          should.exist(John);
+          return [John, Pet.allAsync()];
+        })
+        .spread(function (John, pets) {
+          should.exist(pets);
+          should.equal(pets.length, 2);
+          return [John[0], pets, pets[0].hasOwnersAsync()];
+        })
+        .spread(function (John, pets, has_owner) {
+          has_owner.should.equal(false);
+          return [John, pets, pets[0].setOwnersAsync(John)];
+        })
+        .spread(function (John, pets) {
+          return [John, Person.findAsync({ pet: pets })];
+        })
+        .spread(function (John, owners) {
+          should.exist(owners[0]);
+          owners.length.should.equal(1);
+          should.equal(owners[0].name, John.name);
+        });
     });
   });
 });

From e9a8a1b33b1e24193e74dc1a8e9780bec79ecd74 Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Fri, 15 Sep 2017 15:56:31 +0300
Subject: [PATCH 1175/1246] Lazyload global scope variable fix

---
 lib/LazyLoad.js | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/LazyLoad.js b/lib/LazyLoad.js
index e6a39a1c..a81e2624 100644
--- a/lib/LazyLoad.js
+++ b/lib/LazyLoad.js
@@ -6,7 +6,13 @@ var extend = function (Instance, Model, properties) {
       addLazyLoadProperty(properties[k].lazyname || k, Instance, Model, k);
     }
   }
-};
+}
+
+var conditionAssign = function (instance, model) {
+  var conditions = {};
+  conditions[model.id] = instance[model.id];
+  return conditions;
+}
 
 function addLazyLoadProperty(name, Instance, Model, property) {
   var method = ucfirst(name);
@@ -26,12 +32,10 @@ function addLazyLoadProperty(name, Instance, Model, property) {
     }
   }
 
-  var conditions = {};
-  conditions[Model.id] = Instance[Model.id];
-
   Object.defineProperty(Instance, functionNames.get.callback, {
     value: function (cb) {
-
+      var conditions = conditionAssign(Instance, Model);
+      
       Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
         return cb(err, item ? item[property] : null);
       });
@@ -43,7 +47,8 @@ function addLazyLoadProperty(name, Instance, Model, property) {
 
   Object.defineProperty(Instance, functionNames.remove.callback, {
     value: function (cb) {
-
+      var conditions = conditionAssign(Instance, Model);
+      
       Model.find(conditions, { identityCache: false }).only(Model.id.concat(property)).first(function (err, item) {
         if (err) {
           return cb(err);
@@ -64,7 +69,8 @@ function addLazyLoadProperty(name, Instance, Model, property) {
 
   Object.defineProperty(Instance, functionNames.set.callback, {
     value: function (data, cb) {
-
+      var conditions = conditionAssign(Instance, Model);
+      
       Model.find(conditions, { identityCache: false }).first(function (err, item) {
         if (err) {
           return cb(err);

From f30e56a7fd085883b1449d81f08888e1d3cfcf3d Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Fri, 15 Sep 2017 15:57:49 +0300
Subject: [PATCH 1176/1246] fix unused vars

---
 lib/ChainFind.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 547c8087..f3f050f5 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -44,10 +44,8 @@ function ChainFind(Model, opts) {
       if (dataItems.length === 0) {
         return done(null, []);
       }
-      var pending = dataItems.length;
 
       var eagerLoad = function (err, items) {
-        var pending = opts.__eager.length;
         var idMap = {};
 
         var keys = _.map(items, function (item, index) {
@@ -91,7 +89,6 @@ function ChainFind(Model, opts) {
     });
   }
 
-  var promise = null;
   var chain = {
     find: function () {
       var cb = null;

From 0588a99276b8a5a6a327402813e9d41109803244 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Fri, 15 Sep 2017 15:57:49 +0300
Subject: [PATCH 1177/1246] fix unused vars

---
 lib/ChainFind.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 547c8087..f3f050f5 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -44,10 +44,8 @@ function ChainFind(Model, opts) {
       if (dataItems.length === 0) {
         return done(null, []);
       }
-      var pending = dataItems.length;
 
       var eagerLoad = function (err, items) {
-        var pending = opts.__eager.length;
         var idMap = {};
 
         var keys = _.map(items, function (item, index) {
@@ -91,7 +89,6 @@ function ChainFind(Model, opts) {
     });
   }
 
-  var promise = null;
   var chain = {
     find: function () {
       var cb = null;

From 365d714990366ee525c714ffa27dc03e66588082 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Mon, 18 Sep 2017 10:23:36 +0300
Subject: [PATCH 1178/1246] add promise documentation

---
 .gitignore |   1 +
 Readme.md  | 276 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 271 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2450dd37..a09ad17e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,5 @@ test/config.js
 test/coverage.html
 lib-cov/
 *~
+npm-debug.log
 .idea
diff --git a/Readme.md b/Readme.md
index 1360fc2e..7e01b49c 100755
--- a/Readme.md
+++ b/Readme.md
@@ -95,16 +95,280 @@ orm.connect("mysql://username:password@host/database", function (err, db) {
 	});
 });
 ```
+------
+## Promise
 
-## Promises
+- Read documentation about [bluebird](http://bluebirdjs.com/docs/api-reference.html) `Promise` for more advanced knowledge how to use `Promises`.
 
-The methods what has Async like a postfix, like example `connectAsync` 
-can apply the same arguments as a original method but return a promise. 
-Exclusion method `sync` they called `syncPromise`.
-More details [wiki](linkToWikiHere). // TODO add link to wiki where described async methods.
+###Connect
 
-You can use the [promise enabled wrapper library](https://github.com/rafaelkaufmann/q-orm).
+The connection URL has the following syntax: `driver://username:password@hostname/database?option1=value1&option2=value2..`
 
+```javascript
+var orm = require('orm');
+
+orm.connectAsync('mysql://root:password@localhost/test')
+  .then(function(db) {
+      // connected
+      // ...
+  })
+  .catch(function() {
+     console.error('Connection error: ' + err);
+  });
+```
+
+Valid options are:
+
+- `debug` (default: **false**): prints queries to console;
+- `pool` (default: **false**): manages a connection pool (only for `mysql` and `postgres`) using built-in driver pool;
+- `strdates` (default: **false**): saves dates as strings (only for `sqlite`).
+- `timezone` (default: **'local'**): store dates in the database using this timezone (`mysql` and `postgres` only)
+
+```javascript
+var orm = require('orm');
+
+var opts = {
+    host:     host,
+    database: database,
+    protocol: 'mysql',
+    port:     '3306',
+    query:    {pool: true}
+  };
+  
+orm.connectAsync(opts)
+  .then(function(db) { 
+    // connected
+    // ...  
+  })
+  .catch(function() {
+    console.error('Connection error: ' + err);
+  });
+```
+-------
+
+###Model Hooks
+
+If you want to listen for a type of event than occurs in instances of a Model, you can attach a function that
+will be called when that event happens. For each hook above implemented Promise support, with backward capability via use next callback.
+For use promise you should return `Promise`, look at example.
+
+Currently the following events are supported:
+
+- `beforeValidation` : (no parameters) Before all validations and prior to `beforeCreate` and `beforeSave`;
+- `beforeCreate` : (no parameters) Right before trying to save a new instance (prior to `beforeSave`);
+- `beforeSave` : (no parameters) Right before trying to save;
+- `afterSave` : (bool success) Right after saving;
+- `afterCreate` : (bool success) Right after saving a new instance;
+- `afterLoad` : (no parameters) Right after loading and preparing an instance to be used;
+- `afterAutoFetch` : (no parameters) Right after auto-fetching associations (if any), it will trigger regardless of having associations or not;
+- `beforeRemove` : (no parameters) Right before trying to remove an instance;
+- `afterRemove` : (bool success) Right after removing an instance;
+
+All hook function are called with `this` as the instance so you can access anything you want related to it.
+Here's an example:
+
+```js
+var Person = db.define("person", {
+	name    : String,
+	surname : String
+}, {
+	hooks: {
+		beforeCreate: function () {
+		  return new Promise(function(resolve, reject) {
+		    if (this.surname == "Doe") {
+              return reject(new Error("No Does allowed"));
+            }
+            return resolve();
+		  });
+		}
+	}
+});
+```
+-------
+###Editing Syncing and dropping models
+Syncing is an utility method that creates all the necessary tables in the database for your models and associations to work. Tables are not replaced, they are only created if they don't exist.
+
+There are 2 ways of syncing:
+
+1. Calling `Model.syncPromise()` will only synchronize the model
+2. Calling `db.syncPromise()` will synchronize all models
+
+Dropping is a similar method but instead it drops all tables involved in your models, even if they were not created by ORM. There also 2 ways of dropping.
+
+```js
+var orm = require("orm");
+
+orm.connectAsync("....")
+  .then(function (db) {
+    var Person = db.define("person", {
+        name : String
+    });
+
+    return [Person, db.dropAsync()];
+  })
+  .spread(function(Person) {
+    return Person.syncPromise();
+  })
+  .then(function () {
+    // created tables for Person model
+  });
+```
+-------
+###Finding items
+
+#### findAsync
+Find records with matching criteria, can be chained (see below):
+```javascript
+Person.find({status:'active'})
+  .then(function(results) {
+    // ...
+  });
+```
+
+You can limit your results as well. This limits our results to 10
+```javascript
+Person.find({status:'active'}, 10)
+  .then(function(results) {
+    // ...
+  });
+```
+
+`Person.all` is an alias to `Person.find`
+
+#### getAsync
+Find record by primary key.
+```javascript
+Person.getAsync(1)
+  .then(function(person) {
+    // ...
+  });
+```
+#### oneAsync
+Find one record with similar syntax to find.
+```javascript
+Person.oneAsync({status:'active'})
+  .then(function(person) {
+    // ...
+  });
+```
+
+#### countAsync
+Get the number of matching records.
+```javascript
+Person.countAsync({status:'active'})
+  .then(function(activePeopleCount) {
+    // ...
+  });
+```
+
+#### existsAsync
+Test a record matching your conditions exists.
+```javascript
+Person.exists({id:1, status:'active'})
+  .then(function(personIsActive) {
+    // ...
+  });
+```
+
+#### Filtering and sorting
+We accept 2 objects to perform filtering (first) and aggregate (second). The aggregate object accepts `limit`, `order`, and `groupBy`.
+
+```javascript
+Person.findAsync({status:'active'}, {limit:10})
+  .then(function(results) {
+    // ...
+  });
+```
+
+#### Conditions for find/count/one etc.
+All comma separated key/values are AND'd together in the query. You may prefix a set of conditions with logical operators.
+```javascript
+Person.findAsync({or:[{col1: 1}, {col2: 2}]})
+  .then(function(res) {
+    // ...
+  });
+```
+
+#### Finding with an `IN`
+`sql-query` (underlying SQL engine) will automatically coerce any array to an `IN` based query.
+
+```javascript
+Person.findAsync({id: [1, 2]})
+  .then(function(persons) {
+    // Finds people with id's 1 and 2 (e.g. `WHERE id IN (1, 2)`)
+  });
+```
+-------
+###Creating and Updating Items
+#### createAsync
+```javascript
+var newRecord = {};
+newRecord.id = 1;
+newRecord.name = "John";
+
+Person.createAsync(newRecord)
+  .then(function(results) {
+    // ...
+  });
+```
+
+#### saveAsync
+```js
+    Person.findAsync({ surname: "Doe" })
+      .then(function (people) {
+        // SQL: "SELECT * FROM person WHERE surname = 'Doe'"
+        
+        console.log("People found: %d", people.length);
+        console.log("First person: %s, age %d", people[0].fullName(), people[0].age);
+        
+        people[0].age = 16;
+        return people[0].saveAsync();
+    })
+    .then(function () {
+      // saved
+    });
+```
+-------
+###Aggregation
+If you need to get some aggregated values from a Model, you can use `Model.aggregate()`. Here's an example to better
+illustrate:
+
+```js
+Person.aggregate({ surname: "Doe" }).min("age").max("age").getAsync()
+  .then(function(result) {
+   var [min, max] = result; // you should use destructuring here
+   
+   console.log(min, max);
+  });
+```
+
+An `Array` of properties can be passed to select only a few properties. An `Object` is also accepted to define conditions.
+
+Here's an example to illustrate how to use `.groupBy()`:
+
+```js
+//The same as "select avg(weight), age from person where country='someCountry' group by age;"
+Person.aggregate(["age"], { country: "someCountry" }).avg("weight").groupBy("age").getAsync()
+  .then(function (stats) {
+    // stats is an Array, each item should have 'age' and 'avg_weight'
+  });
+```
+
+### Base `.aggregate()` methods
+
+- `.limit()`: you can pass a number as a limit, or two numbers as offset and limit respectively
+- `.order()`: same as `Model.find().order()`
+
+### Additional `.aggregate()` methods
+
+- `min`
+- `max`
+- `avg`
+- `sum`
+
+There are more aggregate functions depending on the driver (Math functions for example).
+
+-------
 
 ## Express
 

From 48124485f91bc385021576e2bbc06ebe7d289001 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Mon, 18 Sep 2017 10:57:14 +0300
Subject: [PATCH 1179/1246] 4.0.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 511c8787..dfc98558 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "sqlite",
     "mongodb"
   ],
-  "version": "3.2.4",
+  "version": "4.0.0",
   "license": "MIT",
   "homepage": "http://dresende.github.io/node-orm2",
   "repository": "http://github.com/dresende/node-orm2.git",

From 4729f591266980d28a6b81cae16bb4148597060e Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Mon, 18 Sep 2017 11:07:37 +0300
Subject: [PATCH 1180/1246] fix after review

---
 Readme.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Readme.md b/Readme.md
index 7e01b49c..96526d9e 100755
--- a/Readme.md
+++ b/Readme.md
@@ -100,7 +100,7 @@ orm.connect("mysql://username:password@host/database", function (err, db) {
 
 - Read documentation about [bluebird](http://bluebirdjs.com/docs/api-reference.html) `Promise` for more advanced knowledge how to use `Promises`.
 
-###Connect
+### Connect
 
 The connection URL has the following syntax: `driver://username:password@hostname/database?option1=value1&option2=value2..`
 
@@ -146,7 +146,7 @@ orm.connectAsync(opts)
 ```
 -------
 
-###Model Hooks
+### Model Hooks
 
 If you want to listen for a type of event than occurs in instances of a Model, you can attach a function that
 will be called when that event happens. For each hook above implemented Promise support, with backward capability via use next callback.
@@ -185,7 +185,7 @@ var Person = db.define("person", {
 });
 ```
 -------
-###Editing Syncing and dropping models
+### Editing Syncing and dropping models
 Syncing is an utility method that creates all the necessary tables in the database for your models and associations to work. Tables are not replaced, they are only created if they don't exist.
 
 There are 2 ways of syncing:
@@ -214,7 +214,7 @@ orm.connectAsync("....")
   });
 ```
 -------
-###Finding items
+### Finding items
 
 #### findAsync
 Find records with matching criteria, can be chained (see below):
@@ -299,7 +299,7 @@ Person.findAsync({id: [1, 2]})
   });
 ```
 -------
-###Creating and Updating Items
+### Creating and Updating Items
 #### createAsync
 ```javascript
 var newRecord = {};
@@ -329,7 +329,7 @@ Person.createAsync(newRecord)
     });
 ```
 -------
-###Aggregation
+### Aggregation
 If you need to get some aggregated values from a Model, you can use `Model.aggregate()`. Here's an example to better
 illustrate:
 

From fda27876c5f8ab94cbd9756307c2616071361323 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Mon, 18 Sep 2017 11:09:13 +0300
Subject: [PATCH 1181/1246] fix after review

---
 Readme.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Readme.md b/Readme.md
index 96526d9e..7a2dc467 100755
--- a/Readme.md
+++ b/Readme.md
@@ -173,15 +173,15 @@ var Person = db.define("person", {
 	surname : String
 }, {
 	hooks: {
-		beforeCreate: function () {
-		  return new Promise(function(resolve, reject) {
-		    if (this.surname == "Doe") {
-              return reject(new Error("No Does allowed"));
-            }
+      beforeCreate: function () {
+        return new Promise(function(resolve, reject) {
+          if (this.surname == "Doe") {
+            return reject(new Error("No Does allowed"));
+          }
             return resolve();
-		  });
-		}
-	}
+          });
+        }
+      }
 });
 ```
 -------

From eb49dc8378b49cca23072cb01403e8099eaa206c Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Mon, 18 Sep 2017 11:10:56 +0300
Subject: [PATCH 1182/1246] fix after review

---
 Readme.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Readme.md b/Readme.md
index 7a2dc467..8ba49c65 100755
--- a/Readme.md
+++ b/Readme.md
@@ -169,19 +169,19 @@ Here's an example:
 
 ```js
 var Person = db.define("person", {
-	name    : String,
-	surname : String
+  name    : String,
+  surname : String
 }, {
-	hooks: {
-      beforeCreate: function () {
-        return new Promise(function(resolve, reject) {
-          if (this.surname == "Doe") {
-            return reject(new Error("No Does allowed"));
-          }
-            return resolve();
-          });
-        }
+  hooks: {
+    beforeCreate: function () {
+    return new Promise(function(resolve, reject) {
+      if (this.surname == "Doe") {
+        return reject(new Error("No Does allowed"));
       }
+        return resolve();
+      });
+    }
+  }
 });
 ```
 -------

From 031075a6fe28c27e33f630a2f6ac3f135230031f Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Mon, 18 Sep 2017 11:32:05 +0300
Subject: [PATCH 1183/1246] add deprecation message for fail and success

---
 lib/ChainFind.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index f3f050f5..6234466c 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -223,6 +223,20 @@ function ChainFind(Model, opts) {
       chainRun(cb);
       return this;
     },
+    success: function (cb) { // deprecated use original Promise
+      if (!promise) {
+        promise = new Promise();
+        promise.handle(this.all);
+      }
+      return promise.success(cb);
+    },
+    fail: function (cb) { // deprecated use original Promise
+      if (!promise) {
+        promise = new Promise();
+        promise.handle(this.all);
+      }
+      return promise.fail(cb);
+    },
     eager: function () {
       // This will allow params such as ("abc", "def") or (["abc", "def"])
       var associations = _.flatten(arguments);

From 24d6102db05f03b1041cc67094c803abb9eaffbf Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Mon, 18 Sep 2017 11:37:17 +0300
Subject: [PATCH 1184/1246] add deprecation log message

---
 lib/ChainFind.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 6234466c..5e205182 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -224,6 +224,7 @@ function ChainFind(Model, opts) {
       return this;
     },
     success: function (cb) { // deprecated use original Promise
+      console.warn("ChainFind.success() function is deprecated & will be removed in a future version");
       if (!promise) {
         promise = new Promise();
         promise.handle(this.all);
@@ -231,6 +232,7 @@ function ChainFind(Model, opts) {
       return promise.success(cb);
     },
     fail: function (cb) { // deprecated use original Promise
+      console.warn("ChainFind.fail() function is deprecated & will be removed in a future version");
       if (!promise) {
         promise = new Promise();
         promise.handle(this.all);

From 7ec05d1cd14775f599a151a82648ac1718bbf953 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Mon, 18 Sep 2017 11:44:18 +0300
Subject: [PATCH 1185/1246] add deprecated promise backward capability

---
 lib/ChainFind.js                         | 13 +++++++------
 lib/{Promise.js => DeprecatedPromise.js} |  0
 2 files changed, 7 insertions(+), 6 deletions(-)
 rename lib/{Promise.js => DeprecatedPromise.js} (100%)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 5e205182..671732d4 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -3,6 +3,7 @@ var async         = require("async");
 var Utilities     = require("./Utilities");
 var ChainInstance = require("./ChainInstance");
 var Promise       = require("bluebird");
+var DeprecatedPromise       = require("./DeprecatedPromise").Promise;
 
 module.exports = ChainFind;
 
@@ -87,8 +88,8 @@ function ChainFind(Model, opts) {
         return completeFn(null, items);
       });
     });
-  }
-
+  };
+  var promise = null;
   var chain = {
     find: function () {
       var cb = null;
@@ -223,18 +224,18 @@ function ChainFind(Model, opts) {
       chainRun(cb);
       return this;
     },
-    success: function (cb) { // deprecated use original Promise
+    success: function (cb) {
       console.warn("ChainFind.success() function is deprecated & will be removed in a future version");
       if (!promise) {
-        promise = new Promise();
+        promise = new DeprecatedPromise();
         promise.handle(this.all);
       }
       return promise.success(cb);
     },
-    fail: function (cb) { // deprecated use original Promise
+    fail: function (cb) {
       console.warn("ChainFind.fail() function is deprecated & will be removed in a future version");
       if (!promise) {
-        promise = new Promise();
+        promise = new DeprecatedPromise();
         promise.handle(this.all);
       }
       return promise.fail(cb);
diff --git a/lib/Promise.js b/lib/DeprecatedPromise.js
similarity index 100%
rename from lib/Promise.js
rename to lib/DeprecatedPromise.js

From 1934b1546f841416a9718a382c1195e0dd06e13b Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Mon, 18 Sep 2017 15:02:50 +0300
Subject: [PATCH 1186/1246] Fixed failed mysql tests

---
 test/integration/association-hasone-reverse-async.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/integration/association-hasone-reverse-async.js b/test/integration/association-hasone-reverse-async.js
index 6d10d79b..c393855e 100644
--- a/test/integration/association-hasone-reverse-async.js
+++ b/test/integration/association-hasone-reverse-async.js
@@ -181,11 +181,11 @@ describe("hasOne Async", function () {
           return [John, Deco.setOwnersAsync(John)];
         })
         .spread(function (John, Deco) {
-          return [John, Person.findAsync({ pet: Deco })];
+          return [John, Person.findAsync({ pet: Deco, id: John.id })];
         })
         .spread(function(John, owner){
-          should.exist(owner[1]);
-          should.equal(owner[1].name, John.name);
+          should.exist(owner[0]);
+          should.equal(owner[0].name, John.name);
         });
     });
 
@@ -205,7 +205,7 @@ describe("hasOne Async", function () {
           return [John, pets, pets[0].setOwnersAsync(John)];
         })
         .spread(function (John, pets) {
-          return [John, Person.findAsync({ pet: pets })];
+          return [John, Person.findAsync({ pet: pets, id: John.id })];
         })
         .spread(function (John, owners) {
           should.exist(owners[0]);

From c4e886df85a6fc8cafa895fe21c11538d8f448cc Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Mon, 18 Sep 2017 16:13:14 +0300
Subject: [PATCH 1187/1246] Fix hasone-zeroid-async test according to old test
 logic

---
 test/integration/association-hasone-zeroid-async.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/integration/association-hasone-zeroid-async.js b/test/integration/association-hasone-zeroid-async.js
index b872a99d..29f3777e 100644
--- a/test/integration/association-hasone-zeroid-async.js
+++ b/test/integration/association-hasone-zeroid-async.js
@@ -82,16 +82,16 @@ describe("hasOne promise-based methods", function() {
       return Pet
         .findAsync({petName: "Snagglepuss"})
         .then(function(pets) {
-          pets[0].petName.should.equal("Snagglepuss");
-          pets[0].should.have.property("id");
-          pets[0].id.should.equal(11);
+          var pet = pets[0];
+          pet.petName.should.equal("Snagglepuss");
+          pet.should.have.property("id");
+          pet.id.should.equal(11);
   
           return Person.allAsync();
         })
         .then(function (people) {
           should.equal(typeof people[0], 'object');
           should.equal(Array.isArray(people), true);
-          people[0].should.have.property("firstName", "Stuey");
         });
     });
   });

From 9e3ea6223e827ba08d64d02a93ce4f670fc16b62 Mon Sep 17 00:00:00 2001
From: Anton Kovylin <akovylin@locomote.com>
Date: Mon, 18 Sep 2017 17:25:24 +0300
Subject: [PATCH 1188/1246] Fixed tests according to sync tests logic

---
 .../association-hasone-reverse-async.js       | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/test/integration/association-hasone-reverse-async.js b/test/integration/association-hasone-reverse-async.js
index c393855e..a15bd675 100644
--- a/test/integration/association-hasone-reverse-async.js
+++ b/test/integration/association-hasone-reverse-async.js
@@ -142,23 +142,25 @@ describe("hasOne Async", function () {
     it("should be able to find given an association id", function () {
       return Person
         .findAsync({ name: "John Doe" })
-        .then(function (John) {
+        .then(function (persons) {
+          var John = persons[0];
           should.exist(John);
           return [John, Pet.findAsync({ name: "Deco" })];
         })
         .spread(function (John, Deco) {
+          var Deco = Deco[0];
           should.exist(Deco);
-          return [John[0], Deco[0], Deco[0].hasOwnersAsync()];
+          return [John, Deco, Deco.hasOwnersAsync()];
         })
         .spread(function (John, Deco, has_owner) {
           has_owner.should.equal(false);
-          return [John, Deco.setOwnersAsync(John)];
+          return [John, Deco, Deco.setOwnersAsync(John)];
         })
-        .spread(function (John) {
-          return [John, Person.findAsync({ pet_id: 1 })];
+        .spread(function (John, Deco) {
+          return [John, Person.findAsync({ pet_id: Deco[Pet.id] })];
         })
         .spread(function (John, owner) {
-          should.exist(owner[0]);
+          should.exist(owner);
           should.equal(owner[0].name, John.name);
         });
     });
@@ -178,10 +180,10 @@ describe("hasOne Async", function () {
         })
         .spread(function (John, Deco, has_owner) {
           has_owner.should.equal(false);
-          return [John, Deco.setOwnersAsync(John)];
+          return [John, Deco, Deco.setOwnersAsync(John)];
         })
         .spread(function (John, Deco) {
-          return [John, Person.findAsync({ pet: Deco, id: John.id })];
+          return [John, Person.findAsync({ pet: Deco })];
         })
         .spread(function(John, owner){
           should.exist(owner[0]);
@@ -205,7 +207,7 @@ describe("hasOne Async", function () {
           return [John, pets, pets[0].setOwnersAsync(John)];
         })
         .spread(function (John, pets) {
-          return [John, Person.findAsync({ pet: pets, id: John.id })];
+          return [John, Person.findAsync({ pet: pets })];
         })
         .spread(function (John, owners) {
           should.exist(owners[0]);

From ffdaba7e8d09e2fccec06ad61e57a09b1ef41224 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Tue, 19 Sep 2017 10:20:53 +0300
Subject: [PATCH 1189/1246] skip eagerQuery test for redshift

---
 test/integration/association-hasmany-hooks.js | 2 +-
 test/integration/db.js                        | 3 ++-
 test/integration/property-number-size.js      | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/integration/association-hasmany-hooks.js b/test/integration/association-hasmany-hooks.js
index fa201d3f..2eeb9607 100644
--- a/test/integration/association-hasmany-hooks.js
+++ b/test/integration/association-hasmany-hooks.js
@@ -130,7 +130,7 @@ describe("hasMany hooks", function() {
             setTimeout(function () {
               had_extra = (typeof extra == "object");
               resolve()
-            }, 1000);
+            }, 3000);
           });
         }
       }
diff --git a/test/integration/db.js b/test/integration/db.js
index c7dd2ca8..016824b1 100644
--- a/test/integration/db.js
+++ b/test/integration/db.js
@@ -37,7 +37,7 @@ describe("db.driver", function () {
     should.exist(db.driver);
   });
 
-  if (common.protocol() == "mongodb") return;
+  if (common.protocol() === "mongodb") return;
 
   describe("query", function () {
     it("should be available", function () {
@@ -63,6 +63,7 @@ describe("db.driver", function () {
     });
 
     describe('#eagerQuery', function () {
+      if (common.protocol() === "redshift") return;
       var fixture = {
         association: {
           model: {
diff --git a/test/integration/property-number-size.js b/test/integration/property-number-size.js
index b4b3e2dd..bf175518 100644
--- a/test/integration/property-number-size.js
+++ b/test/integration/property-number-size.js
@@ -1,7 +1,6 @@
 var should   = require('should');
 var common   = require('../common');
 var helper   = require('../support/spec_helper');
-var ORM      = require('../../');
 var protocol = common.protocol().toLowerCase();
 
 // Round because different systems store floats in different

From a6e7037e949da6eb4f455512920bf98b049c3ab5 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Tue, 19 Sep 2017 12:22:54 +0300
Subject: [PATCH 1190/1246] fix code duplication

---
 lib/Associations/Extend.js | 31 ++++++++++------------------
 lib/Associations/Many.js   | 41 +++++++++----------------------------
 lib/Associations/One.js    | 31 ++++++++++------------------
 lib/ChainFind.js           | 10 +++++----
 lib/Instance.js            | 26 +++++++++--------------
 lib/LazyLoad.js            | 42 +++++++++++++++++++++++---------------
 lib/ORM.js                 |  5 +++--
 7 files changed, 77 insertions(+), 109 deletions(-)

diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index 51eae7ac..920ac619 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -5,6 +5,8 @@ var Singleton  = require("../Singleton");
 var util       = require("../Utilities");
 var Promise    = require("bluebird");
 
+var ACCESSOR_METHODS = ["hasAccessor", "getAccessor", "setAccessor", "delAccessor"];
+
 exports.prepare = function (db, Model, associations) {
   Model.extendsTo = function (name, properties, opts) {
     opts = opts || {};
@@ -207,25 +209,14 @@ function extendInstance(Model, Instance, Driver, association, opts) {
     enumerable : false
   });
 
-  Object.defineProperty(Instance, association.hasAccessor + promiseFunctionPostfix, {
-    value : Promise.promisify(Instance[association.hasAccessor]),
-    enumerable : false
-  });
-
-  Object.defineProperty(Instance, association.getAccessor + promiseFunctionPostfix, {
-    value: Promise.promisify(Instance[association.getAccessor]),
-    enumerable : false
-  });
-
-  Object.defineProperty(Instance, association.setAccessor + promiseFunctionPostfix, {
-    value : Promise.promisify(Instance[association.setAccessor]),
-    enumerable : false
-  });
-
-  Object.defineProperty(Instance, association.delAccessor + promiseFunctionPostfix, {
-    value : Promise.promisify(Instance[association.delAccessor]),
-    enumerable : false
-  });
+  for (var i = 0; i < ACCESSOR_METHODS.length; i++) {
+    var name = ACCESSOR_METHODS[i];
+    Object.defineProperty(Instance, association[name] + promiseFunctionPostfix, {
+      value: Promise.promisify(Instance[association[name]]),
+      enumerable: false,
+      writable: true
+    });
+  }
 }
 
 function autoFetchInstance(Instance, association, opts, cb) {
@@ -233,7 +224,7 @@ function autoFetchInstance(Instance, association, opts, cb) {
     return cb();
   }
 
-  if (!opts.hasOwnProperty("autoFetchLimit") || typeof opts.autoFetchLimit == "undefined") {
+  if (!opts.hasOwnProperty("autoFetchLimit") || typeof opts.autoFetchLimit === "undefined") {
     opts.autoFetchLimit = association.autoFetchLimit;
   }
 
diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index c6472ae5..deec72d5 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -1,5 +1,4 @@
 var _                   = require("lodash");
-var InstanceConstructor = require("../Instance").Instance;
 var Hook                = require("../Hook");
 var Settings            = require("../Settings");
 var Property            = require("../Property");
@@ -7,6 +6,8 @@ var ORMError            = require("../Error");
 var util                = require("../Utilities");
 var Promise             = require("bluebird");
 
+var ACCESSOR_METHODS = ["hasAccessor", "getAccessor", "setAccessor", "delAccessor", "addAccessor"];
+
 exports.prepare = function (db, Model, associations) {
   Model.hasMany = function () {
     var promiseFunctionPostfix = Model.settings.get('promiseFunctionPostfix');
@@ -491,36 +492,14 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
     enumerable: true
   });
 
-  Object.defineProperty(Instance, association.hasAccessor + promiseFunctionPostfix, {
-    value: Promise.promisify(Instance[association.hasAccessor]),
-    enumerable: false,
-    writable: true
-  });
-
-  Object.defineProperty(Instance, association.getAccessor + promiseFunctionPostfix, {
-    value: Promise.promisify(Instance[association.getAccessor]),
-    enumerable: false,
-    writable: true
-  });
-
-  Object.defineProperty(Instance, association.setAccessor + promiseFunctionPostfix, {
-    value: Promise.promisify(Instance[association.setAccessor]),
-    enumerable: false,
-    writable: true
-  });
-
-  Object.defineProperty(Instance, association.delAccessor + promiseFunctionPostfix, {
-    value: Promise.promisify(Instance[association.delAccessor]),
-    enumerable: false,
-    writable: true
-  });
-
-  Object.defineProperty(Instance, association.addAccessor + promiseFunctionPostfix, {
-    value: Promise.promisify(Instance[association.addAccessor]),
-    enumerable: false,
-    writable: true
-  });
-
+  for (var i = 0; i < ACCESSOR_METHODS.length; i++) {
+    var name = ACCESSOR_METHODS[i];
+    Object.defineProperty(Instance, association[name] + promiseFunctionPostfix, {
+      value: Promise.promisify(Instance[association[name]]),
+      enumerable: false,
+      writable: true
+    });
+  }
 }
 
 function autoFetchInstance(Instance, association, opts, cb) {
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index 48a48872..b0c429cc 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -4,6 +4,8 @@ var ORMError   = require("../Error");
 var Accessors  = { "get": "get", "set": "set", "has": "has", "del": "remove" };
 var Promise    = require("bluebird");
 
+var ACCESSOR_METHODS = ["hasAccessor", "getAccessor", "setAccessor", "delAccessor"];
+
 exports.prepare = function (Model, associations) {
   Model.hasOne = function () {
     var assocName;
@@ -266,6 +268,7 @@ function extendInstance(Model, Instance, Driver, association) {
     enumerable: false,
     writable: true
   });
+
   if (!association.reversed) {
     Object.defineProperty(Instance, association.delAccessor, {
       value: function (cb) {
@@ -287,31 +290,19 @@ function extendInstance(Model, Instance, Driver, association) {
       enumerable: false,
       writable: true
     });
+  }
+
+  for (var i = 0; i < ACCESSOR_METHODS.length; i++) {
+    var name = ACCESSOR_METHODS[i];
+
+    if (name === "delAccessor" && !Instance[association.delAccessor]) continue;
 
-    Object.defineProperty(Instance, association.delAccessor + promiseFunctionPostfix, {
-      value: Promise.promisify(Instance[association.delAccessor]),
+    Object.defineProperty(Instance, association[name] + promiseFunctionPostfix, {
+      value: Promise.promisify(Instance[association[name]]),
       enumerable: false,
       writable: true
     });
   }
-
-  Object.defineProperty(Instance, association.hasAccessor + promiseFunctionPostfix, {
-    value: Promise.promisify(Instance[association.hasAccessor]),
-    enumerable: false,
-    writable: true
-  });
-
-  Object.defineProperty(Instance, association.getAccessor + promiseFunctionPostfix, {
-    value: Promise.promisify(Instance[association.getAccessor]),
-    enumerable: false,
-    writable: true
-  });
-
-  Object.defineProperty(Instance, association.setAccessor + promiseFunctionPostfix, {
-    value: Promise.promisify(Instance[association.setAccessor]),
-    enumerable: false,
-    writable: true
-  });
 }
 
 function autoFetchInstance(Instance, association, opts, cb) {
diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 671732d4..310e2538 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -224,19 +224,21 @@ function ChainFind(Model, opts) {
       chainRun(cb);
       return this;
     },
+    promiseAssign: function () {
+      promise = new DeprecatedPromise();
+      promise.handle(this.all);
+    },
     success: function (cb) {
       console.warn("ChainFind.success() function is deprecated & will be removed in a future version");
       if (!promise) {
-        promise = new DeprecatedPromise();
-        promise.handle(this.all);
+        chain.promiseAssign();
       }
       return promise.success(cb);
     },
     fail: function (cb) {
       console.warn("ChainFind.fail() function is deprecated & will be removed in a future version");
       if (!promise) {
-        promise = new DeprecatedPromise();
-        promise.handle(this.all);
+        chain.promiseAssign();
       }
       return promise.fail(cb);
     },
diff --git a/lib/Instance.js b/lib/Instance.js
index 376cbc61..69343ca7 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -6,6 +6,8 @@ var Promise   = require("bluebird");
 
 exports.Instance = Instance;
 
+var INSTNCE_METHOD_NAMES = ["save", "remove", "validate"];
+
 function Instance(Model, opts) {
   opts = opts || {};
   opts.data = opts.data || {};
@@ -703,22 +705,14 @@ function Instance(Model, opts) {
     enumerable: false
   });
 
-  Object.defineProperty(instance, 'save' + promiseFunctionPostfix, {
-    value: Promise.promisify(instance['save']),
-    enumerable: false,
-    writable: true
-  });
-  Object.defineProperty(instance, 'remove' + promiseFunctionPostfix, {
-    value: Promise.promisify(instance['remove']),
-    enumerable: false,
-    writable: true
-  });
-
-  Object.defineProperty(instance, 'validate' + promiseFunctionPostfix, {
-    value: Promise.promisify(instance['validate']),
-    enumerable: false,
-    writable: true
-  });
+  for (var k = 0; k < INSTNCE_METHOD_NAMES.length; k++) {
+    var name = INSTNCE_METHOD_NAMES[k];
+    Object.defineProperty(instance, name + promiseFunctionPostfix, {
+      value: Promise.promisify(instance[name]),
+      enumerable: false,
+      writable: true
+    });
+  }
 
   for (i = 0; i < opts.keyProperties.length; i++) {
     var prop = opts.keyProperties[i];
diff --git a/lib/LazyLoad.js b/lib/LazyLoad.js
index a81e2624..74a618f5 100644
--- a/lib/LazyLoad.js
+++ b/lib/LazyLoad.js
@@ -1,18 +1,20 @@
 var Promise  = require("bluebird");
 
+var LAZY_METHOD_NAMES = ["get", "remove", "set"];
+
 var extend = function (Instance, Model, properties) {
   for (var k in properties) {
     if (properties[k].lazyload === true) {
       addLazyLoadProperty(properties[k].lazyname || k, Instance, Model, k);
     }
   }
-}
+};
 
 var conditionAssign = function (instance, model) {
   var conditions = {};
   conditions[model.id] = instance[model.id];
   return conditions;
-}
+};
 
 function addLazyLoadProperty(name, Instance, Model, property) {
   var method = ucfirst(name);
@@ -30,7 +32,7 @@ function addLazyLoadProperty(name, Instance, Model, property) {
       callback : "set" + method,
       promise  : "set" + method + promiseFunctionPostfix
     }
-  }
+  };
 
   Object.defineProperty(Instance, functionNames.get.callback, {
     value: function (cb) {
@@ -89,20 +91,28 @@ function addLazyLoadProperty(name, Instance, Model, property) {
     enumerable: false
   });
 
-  Object.defineProperty(Instance, functionNames.get.promise, {
-    value: Promise.promisify(Instance[functionNames.get.callback]),
-    enumerable: false
-  });
-
-  Object.defineProperty(Instance, functionNames.remove.promise, {
-    value: Promise.promisify(Instance[functionNames.remove.callback]),
-    enumerable: false
-  });
+  for(var i = 0; i < LAZY_METHOD_NAMES.length; i++) {
+    var name = LAZY_METHOD_NAMES[i];
+    Object.defineProperty(Instance, functionNames[name].promise, {
+      value: Promise.promisify(Instance[functionNames[name].callback]),
+      enumerable: false
+    });
+  }
 
-  Object.defineProperty(Instance, functionNames.set.promise, {
-    value: Promise.promisify(Instance[functionNames.set.callback]),
-    enumerable: false
-  });
+  // Object.defineProperty(Instance, functionNames.get.promise, {
+  //   value: Promise.promisify(Instance[functionNames.get.callback]),
+  //   enumerable: false
+  // });
+  //
+  // Object.defineProperty(Instance, functionNames.remove.promise, {
+  //   value: Promise.promisify(Instance[functionNames.remove.callback]),
+  //   enumerable: false
+  // });
+  //
+  // Object.defineProperty(Instance, functionNames.set.promise, {
+  //   value: Promise.promisify(Instance[functionNames.set.callback]),
+  //   enumerable: false
+  // });
 }
 
 function ucfirst(text) {
diff --git a/lib/ORM.js b/lib/ORM.js
index 176f1bd2..42641863 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -331,9 +331,10 @@ ORM.prototype.loadAsync = function () {
   // Due to intricacies of `Utilities.getRealPath` the following
   // code has to look as it does.
 
-  for(var a = 0; a < files.length; a++) {
+  for(var i = 0; i < files.length; i++) {
+    var file = files[i];
     filesWithPath.push(function () {
-      return Utilities.getRealPath(files[a], 4)
+      return Utilities.getRealPath(file, 4)
     }());
   }
 

From ea923e35be06a1103348ed8f15016df019984f56 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Tue, 19 Sep 2017 12:25:16 +0300
Subject: [PATCH 1191/1246] fix code duplication

---
 lib/LazyLoad.js | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/lib/LazyLoad.js b/lib/LazyLoad.js
index 74a618f5..9bc30ca5 100644
--- a/lib/LazyLoad.js
+++ b/lib/LazyLoad.js
@@ -98,21 +98,6 @@ function addLazyLoadProperty(name, Instance, Model, property) {
       enumerable: false
     });
   }
-
-  // Object.defineProperty(Instance, functionNames.get.promise, {
-  //   value: Promise.promisify(Instance[functionNames.get.callback]),
-  //   enumerable: false
-  // });
-  //
-  // Object.defineProperty(Instance, functionNames.remove.promise, {
-  //   value: Promise.promisify(Instance[functionNames.remove.callback]),
-  //   enumerable: false
-  // });
-  //
-  // Object.defineProperty(Instance, functionNames.set.promise, {
-  //   value: Promise.promisify(Instance[functionNames.set.callback]),
-  //   enumerable: false
-  // });
 }
 
 function ucfirst(text) {

From a3a43139ef499de5ee610aaa12a3828f2203f2c8 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Tue, 19 Sep 2017 12:48:46 +0300
Subject: [PATCH 1192/1246] fix if statement

---
 lib/Associations/Extend.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index 920ac619..66ad350f 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -224,7 +224,7 @@ function autoFetchInstance(Instance, association, opts, cb) {
     return cb();
   }
 
-  if (!opts.hasOwnProperty("autoFetchLimit") || typeof opts.autoFetchLimit === "undefined") {
+  if (!opts.hasOwnProperty("autoFetchLimit") || !opts.autoFetchLimit) {
     opts.autoFetchLimit = association.autoFetchLimit;
   }
 

From 3fae37a957bff35a6d8ccf5f01b8d99b60897357 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Tue, 19 Sep 2017 13:31:17 +0300
Subject: [PATCH 1193/1246] fix duplication

---
 lib/Associations/Many.js |  8 ++++----
 lib/ChainFind.js         | 12 +++++-------
 lib/Instance.js          |  4 ++--
 lib/LazyLoad.js          |  6 +++---
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index deec72d5..adb7b1ff 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -492,10 +492,10 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
     enumerable: true
   });
 
-  for (var i = 0; i < ACCESSOR_METHODS.length; i++) {
-    var name = ACCESSOR_METHODS[i];
-    Object.defineProperty(Instance, association[name] + promiseFunctionPostfix, {
-      value: Promise.promisify(Instance[association[name]]),
+  for (var y = 0; y < ACCESSOR_METHODS.length; y++) {
+    var accessorMethodName = ACCESSOR_METHODS[y];
+    Object.defineProperty(Instance, association[accessorMethodName] + promiseFunctionPostfix, {
+      value: Promise.promisify(Instance[association[accessorMethodName]]),
       enumerable: false,
       writable: true
     });
diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 310e2538..99985839 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -224,22 +224,20 @@ function ChainFind(Model, opts) {
       chainRun(cb);
       return this;
     },
-    promiseAssign: function () {
-      promise = new DeprecatedPromise();
-      promise.handle(this.all);
-    },
     success: function (cb) {
       console.warn("ChainFind.success() function is deprecated & will be removed in a future version");
       if (!promise) {
-        chain.promiseAssign();
+        promise = new DeprecatedPromise();
+        promise.handle(this.all);
       }
       return promise.success(cb);
     },
     fail: function (cb) {
-      console.warn("ChainFind.fail() function is deprecated & will be removed in a future version");
       if (!promise) {
-        chain.promiseAssign();
+        promise = new DeprecatedPromise();
+        promise.handle(this.all);
       }
+      console.warn("ChainFind.fail() function is deprecated & will be removed in a future version");
       return promise.fail(cb);
     },
     eager: function () {
diff --git a/lib/Instance.js b/lib/Instance.js
index 69343ca7..e0778fda 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -705,8 +705,8 @@ function Instance(Model, opts) {
     enumerable: false
   });
 
-  for (var k = 0; k < INSTNCE_METHOD_NAMES.length; k++) {
-    var name = INSTNCE_METHOD_NAMES[k];
+  for (var j = 0; j < INSTNCE_METHOD_NAMES.length; j++) {
+    var name = INSTNCE_METHOD_NAMES[j];
     Object.defineProperty(instance, name + promiseFunctionPostfix, {
       value: Promise.promisify(instance[name]),
       enumerable: false,
diff --git a/lib/LazyLoad.js b/lib/LazyLoad.js
index 9bc30ca5..d5bd78b1 100644
--- a/lib/LazyLoad.js
+++ b/lib/LazyLoad.js
@@ -92,9 +92,9 @@ function addLazyLoadProperty(name, Instance, Model, property) {
   });
 
   for(var i = 0; i < LAZY_METHOD_NAMES.length; i++) {
-    var name = LAZY_METHOD_NAMES[i];
-    Object.defineProperty(Instance, functionNames[name].promise, {
-      value: Promise.promisify(Instance[functionNames[name].callback]),
+    var methodName = LAZY_METHOD_NAMES[i];
+    Object.defineProperty(Instance, functionNames[methodName].promise, {
+      value: Promise.promisify(Instance[functionNames[methodName].callback]),
       enumerable: false
     });
   }

From b03cea7717736897836b8b0b8ebe9295f23e5234 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Tue, 19 Sep 2017 14:06:46 +0300
Subject: [PATCH 1194/1246] fix indentation

---
 lib/ChainFind.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index 99985839..a4df9574 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -1,8 +1,8 @@
-var _             = require("lodash");
-var async         = require("async");
-var Utilities     = require("./Utilities");
-var ChainInstance = require("./ChainInstance");
-var Promise       = require("bluebird");
+var _                       = require("lodash");
+var async                   = require("async");
+var Utilities               = require("./Utilities");
+var ChainInstance           = require("./ChainInstance");
+var Promise                 = require("bluebird");
 var DeprecatedPromise       = require("./DeprecatedPromise").Promise;
 
 module.exports = ChainFind;

From dc137314a1bcc2257f864e453ecc817cba455237 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Tue, 19 Sep 2017 14:26:20 +0300
Subject: [PATCH 1195/1246] fix indentation

---
 lib/Associations/Extend.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
index 66ad350f..99a520cb 100644
--- a/lib/Associations/Extend.js
+++ b/lib/Associations/Extend.js
@@ -211,7 +211,8 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 
   for (var i = 0; i < ACCESSOR_METHODS.length; i++) {
     var name = ACCESSOR_METHODS[i];
-    Object.defineProperty(Instance, association[name] + promiseFunctionPostfix, {
+    var asyncName = association[name] + promiseFunctionPostfix;
+    Object.defineProperty(Instance, asyncName, {
       value: Promise.promisify(Instance[association[name]]),
       enumerable: false,
       writable: true

From b9809a367396cb79bcf37bcc2e1e65096ba00f4c Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Tue, 19 Sep 2017 14:32:27 +0300
Subject: [PATCH 1196/1246] fix duplication

---
 lib/Associations/One.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index b0c429cc..e9a3d3f8 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -294,10 +294,10 @@ function extendInstance(Model, Instance, Driver, association) {
 
   for (var i = 0; i < ACCESSOR_METHODS.length; i++) {
     var name = ACCESSOR_METHODS[i];
+    var asyncNameAccessorName = association[name] + promiseFunctionPostfix;
 
     if (name === "delAccessor" && !Instance[association.delAccessor]) continue;
-
-    Object.defineProperty(Instance, association[name] + promiseFunctionPostfix, {
+    Object.defineProperty(Instance, asyncNameAccessorName, {
       value: Promise.promisify(Instance[association[name]]),
       enumerable: false,
       writable: true

From 4892353d04b72a78e5bd7ca99b9884a7e6159543 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 19 Sep 2017 12:29:34 +0000
Subject: [PATCH 1197/1246] Update changelog for v4

---
 Changelog.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 0a3490dc..907dac21 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### v4.0.0
+- Added Promise support (see readme & wiki) ([#807](../../pull/807))
+
 ### v3.2.4
 - Update dependencies
 

From c79692bc57d1b0fad942bef1b0d36dca5ac5bc08 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Wed, 27 Sep 2017 14:35:27 +0300
Subject: [PATCH 1198/1246] remove duplicate declaration of async accessors
 methods

---
 lib/Associations/Many.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index adb7b1ff..7bce6eac 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -60,7 +60,7 @@ exports.prepare = function (db, Model, associations) {
       }) ||
       util.formatField(OtherModel, name, true, opts.reversed),
       { makeKey: makeKey, required: true }
-    )
+    );
 
     var assocName = opts.name || ucfirst(name);
     var assocTemplateName = opts.accessor || assocName;
@@ -85,12 +85,6 @@ exports.prepare = function (db, Model, associations) {
       hasAccessor    : opts.hasAccessor || ("has" + assocTemplateName),
       delAccessor    : opts.delAccessor || ("remove" + assocTemplateName),
       addAccessor    : opts.addAccessor || ("add" + assocTemplateName),
-
-      getAccessorAsync : opts.getAccessor + promiseFunctionPostfix || ("get" + assocTemplateName + promiseFunctionPostfix),
-      setAccessorAsync : opts.setAccessor + promiseFunctionPostfix || ("set" + assocTemplateName + promiseFunctionPostfix),
-      hasAccessorAsync : opts.hasAccessor + promiseFunctionPostfix || ("has" + assocTemplateName + promiseFunctionPostfix),
-      delAccessorAsync : opts.delAccessor + promiseFunctionPostfix || ("remove" + assocTemplateName + promiseFunctionPostfix),
-      addAccessorAsync : opts.addAccessor + promiseFunctionPostfix || ("add" + assocTemplateName + promiseFunctionPostfix)
     };
     associations.push(association);
 

From 568236d0ff705068146c72acb5690d2ee4abf45b Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Wed, 27 Sep 2017 14:45:46 +0300
Subject: [PATCH 1199/1246] 4.0.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dfc98558..21e9a78e 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "sqlite",
     "mongodb"
   ],
-  "version": "4.0.0",
+  "version": "4.0.1",
   "license": "MIT",
   "homepage": "http://dresende.github.io/node-orm2",
   "repository": "http://github.com/dresende/node-orm2.git",

From ec857ebef16d98fd0eb4a80c9d3a3378954d3bc9 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Thu, 28 Sep 2017 08:56:45 +0300
Subject: [PATCH 1200/1246] remove trailing comma

---
 lib/Associations/Many.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 7bce6eac..684dbae2 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -84,7 +84,7 @@ exports.prepare = function (db, Model, associations) {
       setAccessor    : opts.setAccessor || ("set" + assocTemplateName),
       hasAccessor    : opts.hasAccessor || ("has" + assocTemplateName),
       delAccessor    : opts.delAccessor || ("remove" + assocTemplateName),
-      addAccessor    : opts.addAccessor || ("add" + assocTemplateName),
+      addAccessor    : opts.addAccessor || ("add" + assocTemplateName)
     };
     associations.push(association);
 

From 58780d939362f5d2ddaf7de940606697dafa4cc6 Mon Sep 17 00:00:00 2001
From: mradko <mradko@locomote.com>
Date: Thu, 28 Sep 2017 09:06:30 +0300
Subject: [PATCH 1201/1246] update change log

---
 Changelog.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 0a3490dc..fb362e12 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,9 @@
+### v4.0.1
+- Fix undefinedAsync accessor methods.
+
+### v4.0.0
+- Added Promise support (see readme & wiki) ([#807](../../pull/807))
+
 ### v3.2.4
 - Update dependencies
 

From 2d3df1fd54059aed0e79379b27cd2da863eb69bb Mon Sep 17 00:00:00 2001
From: fossabot <badges@fossa.io>
Date: Fri, 10 Nov 2017 01:16:39 -0800
Subject: [PATCH 1202/1246] Add license scan report and status

---
 Readme.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Readme.md b/Readme.md
index 8ba49c65..9facd714 100755
--- a/Readme.md
+++ b/Readme.md
@@ -1,6 +1,7 @@
 ## Object Relational Mapping
 
 [![Build Status](https://api.travis-ci.org/dresende/node-orm2.svg?branch=master)](http://travis-ci.org/dresende/node-orm2)
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fdresende%2Fnode-orm2.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fdresende%2Fnode-orm2?ref=badge_shield)
 [![](https://badge.fury.io/js/orm.svg)](https://npmjs.org/package/orm)
 [![](https://gemnasium.com/dresende/node-orm2.svg)](https://gemnasium.com/dresende/node-orm2)
 [![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=dresende&url=https://github.com/dresende/node-orm2&title=ORM&language=&tags=github&category=software)
@@ -1147,3 +1148,7 @@ require('orm').addAdapter('cassandra', CassandraAdapter);
 ```
 
 See [the documentation for creating adapters](./Adapters.md) for more details.
+
+
+## License
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fdresende%2Fnode-orm2.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fdresende%2Fnode-orm2?ref=badge_large)
\ No newline at end of file

From 955da366af7863ebf60fda521af4d2adaa292bcf Mon Sep 17 00:00:00 2001
From: moonrailgun <moonrailgun@gmail.com>
Date: Mon, 4 Dec 2017 13:48:37 +0800
Subject: [PATCH 1203/1246] FIX timezone bug in sqlite:issue #820

---
 lib/Drivers/DML/sqlite.js | 5 +++--
 package-lock.json         | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index f36220de..d49abee6 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -273,12 +273,13 @@ Driver.prototype.valueToProperty = function (value, property) {
         if (this.config.timezone && this.config.timezone != 'local') {
           var tz = convertTimezone(this.config.timezone);
 
-          // shift local to UTC
-          value.setTime(value.getTime() - (value.getTimezoneOffset() * 60000));
           if (tz !== false) {
             // shift UTC to timezone
             value.setTime(value.getTime() - (tz * 60000));
           }
+        }else {
+          // shift local to UTC
+          value.setTime(value.getTime() - (value.getTimezoneOffset() * 60000));
         }
       }
       break;
diff --git a/package-lock.json b/package-lock.json
index b1760b04..27ccc198 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "orm",
-	"version": "3.2.4",
+	"version": "4.0.1",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {

From 93926224ffe0e768a49de984f0013cbd6119dddf Mon Sep 17 00:00:00 2001
From: moonrailgun <moonrailgun@users.noreply.github.com>
Date: Tue, 5 Dec 2017 09:35:07 +0800
Subject: [PATCH 1204/1246] Update sqlite.js

FIX:cal
---
 lib/Drivers/DML/sqlite.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index d49abee6..43905d17 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -279,7 +279,7 @@ Driver.prototype.valueToProperty = function (value, property) {
           }
         }else {
           // shift local to UTC
-          value.setTime(value.getTime() - (value.getTimezoneOffset() * 60000));
+          value.setTime(value.getTime() + (value.getTimezoneOffset() * 60000));
         }
       }
       break;

From a3a8f8d3baf40e1f0f7d20fbbb407691ea910757 Mon Sep 17 00:00:00 2001
From: moonrailgun <moonrailgun@gmail.com>
Date: Thu, 7 Dec 2017 10:40:32 +0800
Subject: [PATCH 1205/1246] add test suit with sqlite date type

---
 test/integration/drivers/sqlite_spec.js | 34 +++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/test/integration/drivers/sqlite_spec.js b/test/integration/drivers/sqlite_spec.js
index d0e956f7..8e1d302c 100644
--- a/test/integration/drivers/sqlite_spec.js
+++ b/test/integration/drivers/sqlite_spec.js
@@ -72,6 +72,40 @@ describe("Sqlite driver", function() {
           should.strictEqual(valueToProperty('1.200 '), 1);
         });
       });
+
+      describe("date", function () {
+        var timezone = /GMT([+/-]\d{4})/.exec(new Date().toString())[1];
+
+        function valueToProperty (value) {
+          return driver.valueToProperty(value, { type: 'date' });
+        }
+
+        it("should return origin object when given non-string", function () {
+          var now = new Date();
+          should.strictEqual(valueToProperty(now), now);
+          var array = [];
+          should.strictEqual(valueToProperty(array), array);
+          var obj = {};
+          should.strictEqual(valueToProperty(obj), obj);
+        })
+
+        it("should pass on normal time", function () {
+          var normal = '2017-12-07 00:00:00';
+          should.strictEqual(valueToProperty(normal).toString(), new Date(normal).toString());
+        })
+
+        it("should pass on utc time by orm saved with local config", function () {
+          var utc = '2017-12-07T00:00:00';
+          should.strictEqual(valueToProperty(utc+'Z').toString(), new Date(utc+timezone).toString());
+        })
+
+        it("should pass on utc time by orm saved with timezone config", function () {
+          var utc = '2017-12-07T00:00:00';
+          driver.config.timezone = timezone;
+          should.strictEqual(valueToProperty(utc+'Z').toString(), new Date(utc+timezone).toString());
+          driver.config.timezone = '';
+        })
+      });
     });
   });
 

From 6d3a7a6d190e244a541e83d196e87d535081e987 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 7 Dec 2017 16:07:54 +1100
Subject: [PATCH 1206/1246] Bump version

---
 Changelog.md | 3 +++
 package.json | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index fb362e12..25ff6640 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### v4.0.2
+- Fix timezone bug in sqlite ([822](../../pull/822)]
+
 ### v4.0.1
 - Fix undefinedAsync accessor methods.
 
diff --git a/package.json b/package.json
index 21e9a78e..7b7ea9ae 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "sqlite",
     "mongodb"
   ],
-  "version": "4.0.1",
+  "version": "4.0.2",
   "license": "MIT",
   "homepage": "http://dresende.github.io/node-orm2",
   "repository": "http://github.com/dresende/node-orm2.git",

From ec0374282d1b471d9821cb278105aeeff60bafe2 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 15 Feb 2018 13:25:58 +1100
Subject: [PATCH 1207/1246] Not actively maintained

---
 Readme.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 9facd714..185ace21 100755
--- a/Readme.md
+++ b/Readme.md
@@ -6,6 +6,13 @@
 [![](https://gemnasium.com/dresende/node-orm2.svg)](https://gemnasium.com/dresende/node-orm2)
 [![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=dresende&url=https://github.com/dresende/node-orm2&title=ORM&language=&tags=github&category=software)
 
+## This package is not actively maintained
+
+If you're starting a new project, please consider using one of the following instead as they have a much more active community:
+https://github.com/bookshelf/bookshelf
+https://github.com/sequelize/sequelize
+
+
 ## Install
 
 ```sh
@@ -1151,4 +1158,4 @@ See [the documentation for creating adapters](./Adapters.md) for more details.
 
 
 ## License
-[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fdresende%2Fnode-orm2.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fdresende%2Fnode-orm2?ref=badge_large)
\ No newline at end of file
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fdresende%2Fnode-orm2.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fdresende%2Fnode-orm2?ref=badge_large)

From 405daf475cac6fd506d4ed0fd8d0391208c0851d Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 15 Feb 2018 13:26:22 +1100
Subject: [PATCH 1208/1246] Fix formatting

---
 Readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Readme.md b/Readme.md
index 185ace21..f0a5d47e 100755
--- a/Readme.md
+++ b/Readme.md
@@ -9,8 +9,8 @@
 ## This package is not actively maintained
 
 If you're starting a new project, please consider using one of the following instead as they have a much more active community:
-https://github.com/bookshelf/bookshelf
-https://github.com/sequelize/sequelize
+* https://github.com/bookshelf/bookshelf
+* https://github.com/sequelize/sequelize
 
 
 ## Install

From d8cc18d85fb1302964ef7960233f1c54b79e10e3 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Tue, 27 Mar 2018 18:12:02 +0100
Subject: [PATCH 1209/1246] examples/anontxt: moment@2.21.0

---
 examples/anontxt/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/anontxt/package.json b/examples/anontxt/package.json
index 3b925038..883788cd 100644
--- a/examples/anontxt/package.json
+++ b/examples/anontxt/package.json
@@ -7,7 +7,7 @@
     "express": "3.3.*",
     "lodash": "2.3.0",
     "nodemon": "0.7.10",
-    "moment": "2.4.0",
+    "moment": "2.21.0",
     "pg": "2.6.2",
     "colors": "0.6.2"
   },

From 3a276827a1ad84ef68b938bc294fce4d86fde24a Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 13 Jun 2018 10:57:09 +0000
Subject: [PATCH 1210/1246] Update development dependencies

---
 .travis.yml       |   1 +
 package-lock.json | 774 ++++++++++++++++++++--------------------------
 package.json      |  10 +-
 3 files changed, 341 insertions(+), 444 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4d1b06af..d26902dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ node_js:
   - '4'
   - '6'
   - '8'
+  - '10'
 before_script:
   - mysql -e 'create database orm_test;'
   - psql -c 'create database orm_test;' -U postgres
diff --git a/package-lock.json b/package-lock.json
index 27ccc198..a42215fb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,16 +1,25 @@
 {
 	"name": "orm",
-	"version": "4.0.1",
+	"version": "4.0.2",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
+		"@sinonjs/formatio": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz",
+			"integrity": "sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==",
+			"dev": true,
+			"requires": {
+				"samsam": "1.3.0"
+			}
+		},
 		"ansi-styles": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz",
-			"integrity": "sha1-CcIC1ckX7CMYjKpcnLkXnNlUd1A=",
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
 			"dev": true,
 			"requires": {
-				"color-convert": "1.9.0"
+				"color-convert": "^1.9.0"
 			}
 		},
 		"ap": {
@@ -24,7 +33,7 @@
 			"resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
 			"integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
 			"requires": {
-				"lodash": "4.17.4"
+				"lodash": "^4.14.0"
 			}
 		},
 		"balanced-match": {
@@ -50,14 +59,14 @@
 			"integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
 			"dev": true,
 			"requires": {
-				"balanced-match": "1.0.0",
+				"balanced-match": "^1.0.0",
 				"concat-map": "0.0.1"
 			}
 		},
 		"browser-stdout": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz",
-			"integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=",
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+			"integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
 			"dev": true
 		},
 		"bson": {
@@ -66,7 +75,7 @@
 			"integrity": "sha1-/NoQPybQwHTVpS1Qkn24D9ArSzk=",
 			"dev": true,
 			"requires": {
-				"nan": "1.8.4"
+				"nan": "~1.8"
 			}
 		},
 		"buffer-writer": {
@@ -76,39 +85,36 @@
 			"dev": true
 		},
 		"chalk": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz",
-			"integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==",
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+			"integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
 			"dev": true,
 			"requires": {
-				"ansi-styles": "3.1.0",
-				"escape-string-regexp": "1.0.5",
-				"supports-color": "4.2.0"
+				"ansi-styles": "^3.2.1",
+				"escape-string-regexp": "^1.0.5",
+				"supports-color": "^5.3.0"
 			}
 		},
 		"color-convert": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz",
-			"integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=",
+			"version": "1.9.2",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz",
+			"integrity": "sha512-3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg==",
 			"dev": true,
 			"requires": {
-				"color-name": "1.1.3"
+				"color-name": "1.1.1"
 			}
 		},
 		"color-name": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz",
+			"integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok=",
 			"dev": true
 		},
 		"commander": {
-			"version": "2.9.0",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-			"integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
-			"dev": true,
-			"requires": {
-				"graceful-readlink": "1.0.1"
-			}
+			"version": "2.15.1",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
+			"integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
+			"dev": true
 		},
 		"concat-map": {
 			"version": "0.0.1",
@@ -123,18 +129,19 @@
 			"dev": true
 		},
 		"debug": {
-			"version": "2.6.0",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz",
-			"integrity": "sha1-vFlryr52F/Edn6FTYe3tVgi4SZs=",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+			"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
 			"dev": true,
 			"requires": {
-				"ms": "0.7.2"
+				"ms": "2.0.0"
 			}
 		},
 		"diff": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz",
-			"integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k="
+			"version": "3.5.0",
+			"resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+			"integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+			"dev": true
 		},
 		"enforce": {
 			"version": "0.1.7",
@@ -147,14 +154,6 @@
 			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
 			"dev": true
 		},
-		"formatio": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/formatio/-/formatio-1.2.0.tgz",
-			"integrity": "sha1-87IWfZBoxGmKjVH092CjmlTYGOs=",
-			"requires": {
-				"samsam": "1.2.1"
-			}
-		},
 		"fs.realpath": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -173,30 +172,24 @@
 			"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
 			"dev": true,
 			"requires": {
-				"fs.realpath": "1.0.0",
-				"inflight": "1.0.6",
-				"inherits": "2.0.3",
-				"minimatch": "3.0.4",
-				"once": "1.4.0",
-				"path-is-absolute": "1.0.1"
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.0.4",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
 			}
 		},
-		"graceful-readlink": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-			"integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-			"dev": true
-		},
 		"growl": {
-			"version": "1.9.2",
-			"resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
-			"integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=",
+			"version": "1.10.5",
+			"resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+			"integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
 			"dev": true
 		},
 		"has-flag": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-			"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
 			"dev": true
 		},
 		"hat": {
@@ -204,14 +197,20 @@
 			"resolved": "https://registry.npmjs.org/hat/-/hat-0.0.3.tgz",
 			"integrity": "sha1-uwFKnmSzeIrtgAWRdBPU/z1QLYo="
 		},
+		"he": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
+			"integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
+			"dev": true
+		},
 		"inflight": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
 			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
 			"dev": true,
 			"requires": {
-				"once": "1.4.0",
-				"wrappy": "1.0.2"
+				"once": "^1.3.0",
+				"wrappy": "1"
 			}
 		},
 		"inherits": {
@@ -227,16 +226,11 @@
 			"dev": true,
 			"optional": true
 		},
-		"json3": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
-			"integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
-			"dev": true
-		},
 		"just-extend": {
-			"version": "1.1.22",
-			"resolved": "https://registry.npmjs.org/just-extend/-/just-extend-1.1.22.tgz",
-			"integrity": "sha1-MzCvdWyralQnAMZLLk5KoGLVL/8="
+			"version": "1.1.27",
+			"resolved": "https://registry.npmjs.org/just-extend/-/just-extend-1.1.27.tgz",
+			"integrity": "sha512-mJVp13Ix6gFo3SBAy9U/kL+oeZqzlYYYLQBwXVBlVzIsZwBqGREnOro24oC/8s8aox+rJhtZ2DiQof++IrkA+g==",
+			"dev": true
 		},
 		"kerberos": {
 			"version": "0.0.4",
@@ -250,78 +244,17 @@
 			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
 			"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
 		},
-		"lodash._baseassign": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
-			"integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
-			"dev": true,
-			"requires": {
-				"lodash._basecopy": "3.0.1",
-				"lodash.keys": "3.1.2"
-			}
-		},
-		"lodash._basecopy": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-			"integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
-			"dev": true
-		},
-		"lodash._basecreate": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz",
-			"integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=",
-			"dev": true
-		},
-		"lodash._getnative": {
-			"version": "3.9.1",
-			"resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-			"integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-			"dev": true
-		},
-		"lodash._isiterateecall": {
-			"version": "3.0.9",
-			"resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-			"integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
-			"dev": true
-		},
-		"lodash.create": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz",
-			"integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=",
-			"dev": true,
-			"requires": {
-				"lodash._baseassign": "3.2.0",
-				"lodash._basecreate": "3.0.3",
-				"lodash._isiterateecall": "3.0.9"
-			}
-		},
-		"lodash.isarguments": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-			"integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-			"dev": true
-		},
-		"lodash.isarray": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-			"integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
+		"lodash.get": {
+			"version": "4.4.2",
+			"resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+			"integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
 			"dev": true
 		},
-		"lodash.keys": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-			"integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-			"dev": true,
-			"requires": {
-				"lodash._getnative": "3.9.1",
-				"lodash.isarguments": "3.1.0",
-				"lodash.isarray": "3.0.4"
-			}
-		},
 		"lolex": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/lolex/-/lolex-2.1.2.tgz",
-			"integrity": "sha1-JpS5U8nqTQE+W4v7qJHJkQJbJik="
+			"version": "2.7.0",
+			"resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.0.tgz",
+			"integrity": "sha512-uJkH2e0BVfU5KOJUevbTOtpDduooSarH5PopO+LfM/vZf8Z9sJzODqKev804JYM2i++ktJfUmC1le4LwFQ1VMg==",
+			"dev": true
 		},
 		"minimatch": {
 			"version": "3.0.4",
@@ -329,7 +262,7 @@
 			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
 			"dev": true,
 			"requires": {
-				"brace-expansion": "1.1.8"
+				"brace-expansion": "^1.1.7"
 			}
 		},
 		"minimist": {
@@ -348,53 +281,22 @@
 			}
 		},
 		"mocha": {
-			"version": "3.4.2",
-			"resolved": "https://registry.npmjs.org/mocha/-/mocha-3.4.2.tgz",
-			"integrity": "sha1-0O9NMyEm2/GNDWQMmzgt1IvpdZQ=",
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz",
+			"integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==",
 			"dev": true,
 			"requires": {
-				"browser-stdout": "1.3.0",
-				"commander": "2.9.0",
-				"debug": "2.6.0",
-				"diff": "3.2.0",
+				"browser-stdout": "1.3.1",
+				"commander": "2.15.1",
+				"debug": "3.1.0",
+				"diff": "3.5.0",
 				"escape-string-regexp": "1.0.5",
-				"glob": "7.1.1",
-				"growl": "1.9.2",
-				"json3": "3.3.2",
-				"lodash.create": "3.1.1",
+				"glob": "7.1.2",
+				"growl": "1.10.5",
+				"he": "1.1.1",
+				"minimatch": "3.0.4",
 				"mkdirp": "0.5.1",
-				"supports-color": "3.1.2"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "7.1.1",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
-					"integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "1.0.0",
-						"inflight": "1.0.6",
-						"inherits": "2.0.3",
-						"minimatch": "3.0.4",
-						"once": "1.4.0",
-						"path-is-absolute": "1.0.1"
-					}
-				},
-				"has-flag": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "3.1.2",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
-					"integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=",
-					"dev": true,
-					"requires": {
-						"has-flag": "1.0.0"
-					}
-				}
+				"supports-color": "5.4.0"
 			}
 		},
 		"mongodb": {
@@ -403,15 +305,15 @@
 			"integrity": "sha1-6wEjlshB1H3GKtNicu6lUOW2l5s=",
 			"dev": true,
 			"requires": {
-				"bson": "0.2.22",
+				"bson": "~0.2",
 				"kerberos": "0.0.4",
-				"readable-stream": "2.3.3"
+				"readable-stream": "^2.3.3"
 			}
 		},
 		"ms": {
-			"version": "0.7.2",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
-			"integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
 			"dev": true
 		},
 		"mysql": {
@@ -437,10 +339,10 @@
 					"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
 					"dev": true,
 					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
+						"core-util-is": "~1.0.0",
+						"inherits": "~2.0.1",
 						"isarray": "0.0.1",
-						"string_decoder": "0.10.31"
+						"string_decoder": "~0.10.x"
 					}
 				},
 				"string_decoder": {
@@ -457,27 +359,17 @@
 			"integrity": "sha1-PHa1OC6rM+RLdY0oE8qdkuk0LzQ=",
 			"dev": true
 		},
-		"native-promise-only": {
-			"version": "0.8.1",
-			"resolved": "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz",
-			"integrity": "sha1-IKMYwwy0X3H+et+/eyHJnBRy7xE="
-		},
 		"nise": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/nise/-/nise-1.0.1.tgz",
-			"integrity": "sha1-DakrEKhU6XwPSW9sKEWjASgLPu8=",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/nise/-/nise-1.4.1.tgz",
+			"integrity": "sha512-9JX3YwoIt3kS237scmSSOpEv7vCukVzLfwK0I0XhocDSHUANid8ZHnLEULbbSkfeMn98B2y5kphIWzZUylESRQ==",
+			"dev": true,
 			"requires": {
-				"formatio": "1.2.0",
-				"just-extend": "1.1.22",
-				"lolex": "1.6.0",
-				"path-to-regexp": "1.7.0"
-			},
-			"dependencies": {
-				"lolex": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/lolex/-/lolex-1.6.0.tgz",
-					"integrity": "sha1-OpoCg0UqR9dDnnJzG54H1zhuSfY="
-				}
+				"@sinonjs/formatio": "^2.0.0",
+				"just-extend": "^1.1.27",
+				"lolex": "^2.3.2",
+				"path-to-regexp": "^1.7.0",
+				"text-encoding": "^0.6.4"
 			}
 		},
 		"object-assign": {
@@ -492,7 +384,7 @@
 			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
 			"dev": true,
 			"requires": {
-				"wrappy": "1.0.2"
+				"wrappy": "1"
 			}
 		},
 		"packet-reader": {
@@ -510,6 +402,7 @@
 			"version": "1.7.0",
 			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
 			"integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=",
+			"dev": true,
 			"requires": {
 				"isarray": "0.0.1"
 			},
@@ -517,7 +410,8 @@
 				"isarray": {
 					"version": "0.0.1",
 					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+					"dev": true
 				}
 			}
 		},
@@ -530,9 +424,9 @@
 				"buffer-writer": "1.0.1",
 				"packet-reader": "0.3.1",
 				"pg-connection-string": "0.1.3",
-				"pg-pool": "1.8.0",
-				"pg-types": "1.12.0",
-				"pgpass": "1.0.2",
+				"pg-pool": "1.*",
+				"pg-types": "1.*",
+				"pgpass": "1.*",
 				"semver": "4.3.2"
 			},
 			"dependencies": {
@@ -566,11 +460,11 @@
 			"integrity": "sha1-itO3uJfj/UY+Yt4kGtX8ZAtKZvA=",
 			"dev": true,
 			"requires": {
-				"ap": "0.2.0",
-				"postgres-array": "1.0.2",
-				"postgres-bytea": "1.0.0",
-				"postgres-date": "1.0.3",
-				"postgres-interval": "1.1.0"
+				"ap": "~0.2.0",
+				"postgres-array": "~1.0.0",
+				"postgres-bytea": "~1.0.0",
+				"postgres-date": "~1.0.0",
+				"postgres-interval": "^1.1.0"
 			}
 		},
 		"pgpass": {
@@ -579,7 +473,7 @@
 			"integrity": "sha1-Knu0G2BltnkH6R2hsHwYR8h3swY=",
 			"dev": true,
 			"requires": {
-				"split": "1.0.0"
+				"split": "^1.0.0"
 			}
 		},
 		"postgres-array": {
@@ -606,7 +500,7 @@
 			"integrity": "sha1-EDHnusNFZBMoYq3J62xtLzqnW7Q=",
 			"dev": true,
 			"requires": {
-				"xtend": "4.0.1"
+				"xtend": "^4.0.0"
 			}
 		},
 		"process-nextick-args": {
@@ -623,13 +517,13 @@
 			"dev": true,
 			"optional": true,
 			"requires": {
-				"core-util-is": "1.0.2",
-				"inherits": "2.0.3",
-				"isarray": "1.0.0",
-				"process-nextick-args": "1.0.7",
-				"safe-buffer": "5.1.1",
-				"string_decoder": "1.0.3",
-				"util-deprecate": "1.0.2"
+				"core-util-is": "~1.0.0",
+				"inherits": "~2.0.3",
+				"isarray": "~1.0.0",
+				"process-nextick-args": "~1.0.6",
+				"safe-buffer": "~5.1.1",
+				"string_decoder": "~1.0.3",
+				"util-deprecate": "~1.0.1"
 			}
 		},
 		"safe-buffer": {
@@ -639,36 +533,37 @@
 			"dev": true
 		},
 		"samsam": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/samsam/-/samsam-1.2.1.tgz",
-			"integrity": "sha1-7dOQk6MYQ3DLhZJDsr3yVefY6mc="
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz",
+			"integrity": "sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg==",
+			"dev": true
 		},
 		"semver": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-			"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+			"version": "5.5.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
+			"integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
 			"dev": true
 		},
 		"should": {
-			"version": "11.2.1",
-			"resolved": "https://registry.npmjs.org/should/-/should-11.2.1.tgz",
-			"integrity": "sha1-kPVRRVUtAc/CAGZuToGKHJZw7aI=",
+			"version": "13.2.1",
+			"resolved": "https://registry.npmjs.org/should/-/should-13.2.1.tgz",
+			"integrity": "sha512-l+/NwEMO+DcstsHEwPHRHzC9j4UOE3VQwJGcMWSsD/vqpqHbnQ+1iSHy64Ihmmjx1uiRPD9pFadTSc3MJtXAgw==",
 			"dev": true,
 			"requires": {
-				"should-equal": "1.0.1",
-				"should-format": "3.0.3",
-				"should-type": "1.4.0",
-				"should-type-adaptors": "1.0.1",
-				"should-util": "1.0.0"
+				"should-equal": "^2.0.0",
+				"should-format": "^3.0.3",
+				"should-type": "^1.4.0",
+				"should-type-adaptors": "^1.0.1",
+				"should-util": "^1.0.0"
 			}
 		},
 		"should-equal": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/should-equal/-/should-equal-1.0.1.tgz",
-			"integrity": "sha1-C26VFvJgGp+wuy3MNpr6HH4gCvc=",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/should-equal/-/should-equal-2.0.0.tgz",
+			"integrity": "sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==",
 			"dev": true,
 			"requires": {
-				"should-type": "1.4.0"
+				"should-type": "^1.4.0"
 			}
 		},
 		"should-format": {
@@ -677,8 +572,8 @@
 			"integrity": "sha1-m/yPdPo5IFxT04w01xcwPidxJPE=",
 			"dev": true,
 			"requires": {
-				"should-type": "1.4.0",
-				"should-type-adaptors": "1.0.1"
+				"should-type": "^1.3.0",
+				"should-type-adaptors": "^1.0.1"
 			}
 		},
 		"should-type": {
@@ -688,13 +583,13 @@
 			"dev": true
 		},
 		"should-type-adaptors": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.0.1.tgz",
-			"integrity": "sha1-7+VVPN9oz/ZuXF9RtxLcNRx3vqo=",
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz",
+			"integrity": "sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==",
 			"dev": true,
 			"requires": {
-				"should-type": "1.4.0",
-				"should-util": "1.0.0"
+				"should-type": "^1.3.0",
+				"should-util": "^1.0.0"
 			}
 		},
 		"should-util": {
@@ -704,19 +599,18 @@
 			"dev": true
 		},
 		"sinon": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/sinon/-/sinon-3.2.1.tgz",
-			"integrity": "sha512-KY3OLOWpek/I4NGAMHetuutVgS2aRgMR5g5/1LSYvPJ3qo2BopIvk3esFztPxF40RWf/NNNJzdFPriSkXUVK3A==",
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/sinon/-/sinon-6.0.0.tgz",
+			"integrity": "sha512-MatciKXyM5pXMSoqd593MqTsItJNCkSSl53HJYeKR5wfsDdp2yljjUQJLfVwAWLoBNfx1HThteqygGQ0ZEpXpQ==",
+			"dev": true,
 			"requires": {
-				"diff": "3.2.0",
-				"formatio": "1.2.0",
-				"lolex": "2.1.2",
-				"native-promise-only": "0.8.1",
-				"nise": "1.0.1",
-				"path-to-regexp": "1.7.0",
-				"samsam": "1.2.1",
-				"text-encoding": "0.6.4",
-				"type-detect": "4.0.3"
+				"@sinonjs/formatio": "^2.0.0",
+				"diff": "^3.5.0",
+				"lodash.get": "^4.4.2",
+				"lolex": "^2.4.2",
+				"nise": "^1.3.3",
+				"supports-color": "^5.4.0",
+				"type-detect": "^4.0.8"
 			}
 		},
 		"split": {
@@ -725,7 +619,7 @@
 			"integrity": "sha1-xDlc5oOrzSVLwo/h2rtuXCfc/64=",
 			"dev": true,
 			"requires": {
-				"through": "2.3.8"
+				"through": "2"
 			}
 		},
 		"sql-ddl-sync": {
@@ -747,8 +641,8 @@
 			"integrity": "sha1-TLz5Zdi5AdGxAVy8f8QVquFX36o=",
 			"dev": true,
 			"requires": {
-				"nan": "2.4.0",
-				"node-pre-gyp": "0.6.31"
+				"nan": "~2.4.0",
+				"node-pre-gyp": "~0.6.31"
 			},
 			"dependencies": {
 				"nan": {
@@ -762,15 +656,15 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"mkdirp": "0.5.1",
-						"nopt": "3.0.6",
-						"npmlog": "4.0.0",
-						"rc": "1.1.6",
-						"request": "2.76.0",
-						"rimraf": "2.5.4",
-						"semver": "5.3.0",
-						"tar": "2.2.1",
-						"tar-pack": "3.3.0"
+						"mkdirp": "~0.5.1",
+						"nopt": "~3.0.6",
+						"npmlog": "^4.0.0",
+						"rc": "~1.1.6",
+						"request": "^2.75.0",
+						"rimraf": "~2.5.4",
+						"semver": "~5.3.0",
+						"tar": "~2.2.1",
+						"tar-pack": "~3.3.0"
 					},
 					"dependencies": {
 						"mkdirp": {
@@ -793,7 +687,7 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"abbrev": "1.0.9"
+								"abbrev": "1"
 							},
 							"dependencies": {
 								"abbrev": {
@@ -808,10 +702,10 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"are-we-there-yet": "1.1.2",
-								"console-control-strings": "1.1.0",
-								"gauge": "2.6.0",
-								"set-blocking": "2.0.0"
+								"are-we-there-yet": "~1.1.2",
+								"console-control-strings": "~1.1.0",
+								"gauge": "~2.6.0",
+								"set-blocking": "~2.0.0"
 							},
 							"dependencies": {
 								"are-we-there-yet": {
@@ -819,8 +713,8 @@
 									"bundled": true,
 									"dev": true,
 									"requires": {
-										"delegates": "1.0.0",
-										"readable-stream": "2.1.5"
+										"delegates": "^1.0.0",
+										"readable-stream": "^2.0.0 || ^1.1.13"
 									},
 									"dependencies": {
 										"delegates": {
@@ -833,13 +727,13 @@
 											"bundled": true,
 											"dev": true,
 											"requires": {
-												"buffer-shims": "1.0.0",
-												"core-util-is": "1.0.2",
-												"inherits": "2.0.3",
-												"isarray": "1.0.0",
-												"process-nextick-args": "1.0.7",
-												"string_decoder": "0.10.31",
-												"util-deprecate": "1.0.2"
+												"buffer-shims": "^1.0.0",
+												"core-util-is": "~1.0.0",
+												"inherits": "~2.0.1",
+												"isarray": "~1.0.0",
+												"process-nextick-args": "~1.0.6",
+												"string_decoder": "~0.10.x",
+												"util-deprecate": "~1.0.1"
 											},
 											"dependencies": {
 												"buffer-shims": {
@@ -891,15 +785,15 @@
 									"bundled": true,
 									"dev": true,
 									"requires": {
-										"aproba": "1.0.4",
-										"console-control-strings": "1.1.0",
-										"has-color": "0.1.7",
-										"has-unicode": "2.0.1",
-										"object-assign": "4.1.0",
-										"signal-exit": "3.0.1",
-										"string-width": "1.0.2",
-										"strip-ansi": "3.0.1",
-										"wide-align": "1.1.0"
+										"aproba": "^1.0.3",
+										"console-control-strings": "^1.0.0",
+										"has-color": "^0.1.7",
+										"has-unicode": "^2.0.0",
+										"object-assign": "^4.1.0",
+										"signal-exit": "^3.0.0",
+										"string-width": "^1.0.1",
+										"strip-ansi": "^3.0.1",
+										"wide-align": "^1.1.0"
 									},
 									"dependencies": {
 										"aproba": {
@@ -932,9 +826,9 @@
 											"bundled": true,
 											"dev": true,
 											"requires": {
-												"code-point-at": "1.0.1",
-												"is-fullwidth-code-point": "1.0.0",
-												"strip-ansi": "3.0.1"
+												"code-point-at": "^1.0.0",
+												"is-fullwidth-code-point": "^1.0.0",
+												"strip-ansi": "^3.0.0"
 											},
 											"dependencies": {
 												"code-point-at": {
@@ -942,7 +836,7 @@
 													"bundled": true,
 													"dev": true,
 													"requires": {
-														"number-is-nan": "1.0.1"
+														"number-is-nan": "^1.0.0"
 													},
 													"dependencies": {
 														"number-is-nan": {
@@ -957,7 +851,7 @@
 													"bundled": true,
 													"dev": true,
 													"requires": {
-														"number-is-nan": "1.0.1"
+														"number-is-nan": "^1.0.0"
 													},
 													"dependencies": {
 														"number-is-nan": {
@@ -974,7 +868,7 @@
 											"bundled": true,
 											"dev": true,
 											"requires": {
-												"ansi-regex": "2.0.0"
+												"ansi-regex": "^2.0.0"
 											},
 											"dependencies": {
 												"ansi-regex": {
@@ -989,7 +883,7 @@
 											"bundled": true,
 											"dev": true,
 											"requires": {
-												"string-width": "1.0.2"
+												"string-width": "^1.0.1"
 											}
 										}
 									}
@@ -1006,10 +900,10 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"deep-extend": "0.4.1",
-								"ini": "1.3.4",
-								"minimist": "1.2.0",
-								"strip-json-comments": "1.0.4"
+								"deep-extend": "~0.4.0",
+								"ini": "~1.3.0",
+								"minimist": "^1.2.0",
+								"strip-json-comments": "~1.0.4"
 							},
 							"dependencies": {
 								"deep-extend": {
@@ -1039,26 +933,26 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"aws-sign2": "0.6.0",
-								"aws4": "1.5.0",
-								"caseless": "0.11.0",
-								"combined-stream": "1.0.5",
-								"extend": "3.0.0",
-								"forever-agent": "0.6.1",
-								"form-data": "2.1.1",
-								"har-validator": "2.0.6",
-								"hawk": "3.1.3",
-								"http-signature": "1.1.1",
-								"is-typedarray": "1.0.0",
-								"isstream": "0.1.2",
-								"json-stringify-safe": "5.0.1",
-								"mime-types": "2.1.12",
-								"node-uuid": "1.4.7",
-								"oauth-sign": "0.8.2",
-								"qs": "6.3.0",
-								"stringstream": "0.0.5",
-								"tough-cookie": "2.3.2",
-								"tunnel-agent": "0.4.3"
+								"aws-sign2": "~0.6.0",
+								"aws4": "^1.2.1",
+								"caseless": "~0.11.0",
+								"combined-stream": "~1.0.5",
+								"extend": "~3.0.0",
+								"forever-agent": "~0.6.1",
+								"form-data": "~2.1.1",
+								"har-validator": "~2.0.6",
+								"hawk": "~3.1.3",
+								"http-signature": "~1.1.0",
+								"is-typedarray": "~1.0.0",
+								"isstream": "~0.1.2",
+								"json-stringify-safe": "~5.0.1",
+								"mime-types": "~2.1.7",
+								"node-uuid": "~1.4.7",
+								"oauth-sign": "~0.8.1",
+								"qs": "~6.3.0",
+								"stringstream": "~0.0.4",
+								"tough-cookie": "~2.3.0",
+								"tunnel-agent": "~0.4.1"
 							},
 							"dependencies": {
 								"aws-sign2": {
@@ -1081,7 +975,7 @@
 									"bundled": true,
 									"dev": true,
 									"requires": {
-										"delayed-stream": "1.0.0"
+										"delayed-stream": "~1.0.0"
 									},
 									"dependencies": {
 										"delayed-stream": {
@@ -1106,9 +1000,9 @@
 									"bundled": true,
 									"dev": true,
 									"requires": {
-										"asynckit": "0.4.0",
-										"combined-stream": "1.0.5",
-										"mime-types": "2.1.12"
+										"asynckit": "^0.4.0",
+										"combined-stream": "^1.0.5",
+										"mime-types": "^2.1.12"
 									},
 									"dependencies": {
 										"asynckit": {
@@ -1123,10 +1017,10 @@
 									"bundled": true,
 									"dev": true,
 									"requires": {
-										"chalk": "1.1.3",
-										"commander": "2.9.0",
-										"is-my-json-valid": "2.15.0",
-										"pinkie-promise": "2.0.1"
+										"chalk": "^1.1.1",
+										"commander": "^2.9.0",
+										"is-my-json-valid": "^2.12.4",
+										"pinkie-promise": "^2.0.0"
 									},
 									"dependencies": {
 										"chalk": {
@@ -1134,11 +1028,11 @@
 											"bundled": true,
 											"dev": true,
 											"requires": {
-												"ansi-styles": "2.2.1",
-												"escape-string-regexp": "1.0.5",
-												"has-ansi": "2.0.0",
-												"strip-ansi": "3.0.1",
-												"supports-color": "2.0.0"
+												"ansi-styles": "^2.2.1",
+												"escape-string-regexp": "^1.0.2",
+												"has-ansi": "^2.0.0",
+												"strip-ansi": "^3.0.0",
+												"supports-color": "^2.0.0"
 											},
 											"dependencies": {
 												"ansi-styles": {
@@ -1156,7 +1050,7 @@
 													"bundled": true,
 													"dev": true,
 													"requires": {
-														"ansi-regex": "2.0.0"
+														"ansi-regex": "^2.0.0"
 													},
 													"dependencies": {
 														"ansi-regex": {
@@ -1171,7 +1065,7 @@
 													"bundled": true,
 													"dev": true,
 													"requires": {
-														"ansi-regex": "2.0.0"
+														"ansi-regex": "^2.0.0"
 													},
 													"dependencies": {
 														"ansi-regex": {
@@ -1193,7 +1087,7 @@
 											"bundled": true,
 											"dev": true,
 											"requires": {
-												"graceful-readlink": "1.0.1"
+												"graceful-readlink": ">= 1.0.0"
 											},
 											"dependencies": {
 												"graceful-readlink": {
@@ -1208,10 +1102,10 @@
 											"bundled": true,
 											"dev": true,
 											"requires": {
-												"generate-function": "2.0.0",
-												"generate-object-property": "1.2.0",
-												"jsonpointer": "4.0.0",
-												"xtend": "4.0.1"
+												"generate-function": "^2.0.0",
+												"generate-object-property": "^1.1.0",
+												"jsonpointer": "^4.0.0",
+												"xtend": "^4.0.0"
 											},
 											"dependencies": {
 												"generate-function": {
@@ -1224,7 +1118,7 @@
 													"bundled": true,
 													"dev": true,
 													"requires": {
-														"is-property": "1.0.2"
+														"is-property": "^1.0.0"
 													},
 													"dependencies": {
 														"is-property": {
@@ -1251,7 +1145,7 @@
 											"bundled": true,
 											"dev": true,
 											"requires": {
-												"pinkie": "2.0.4"
+												"pinkie": "^2.0.0"
 											},
 											"dependencies": {
 												"pinkie": {
@@ -1268,10 +1162,10 @@
 									"bundled": true,
 									"dev": true,
 									"requires": {
-										"boom": "2.10.1",
-										"cryptiles": "2.0.5",
-										"hoek": "2.16.3",
-										"sntp": "1.0.9"
+										"boom": "2.x.x",
+										"cryptiles": "2.x.x",
+										"hoek": "2.x.x",
+										"sntp": "1.x.x"
 									},
 									"dependencies": {
 										"boom": {
@@ -1279,7 +1173,7 @@
 											"bundled": true,
 											"dev": true,
 											"requires": {
-												"hoek": "2.16.3"
+												"hoek": "2.x.x"
 											}
 										},
 										"cryptiles": {
@@ -1287,7 +1181,7 @@
 											"bundled": true,
 											"dev": true,
 											"requires": {
-												"boom": "2.10.1"
+												"boom": "2.x.x"
 											}
 										},
 										"hoek": {
@@ -1300,7 +1194,7 @@
 											"bundled": true,
 											"dev": true,
 											"requires": {
-												"hoek": "2.16.3"
+												"hoek": "2.x.x"
 											}
 										}
 									}
@@ -1310,9 +1204,9 @@
 									"bundled": true,
 									"dev": true,
 									"requires": {
-										"assert-plus": "0.2.0",
-										"jsprim": "1.3.1",
-										"sshpk": "1.10.1"
+										"assert-plus": "^0.2.0",
+										"jsprim": "^1.2.2",
+										"sshpk": "^1.7.0"
 									},
 									"dependencies": {
 										"assert-plus": {
@@ -1355,15 +1249,15 @@
 											"bundled": true,
 											"dev": true,
 											"requires": {
-												"asn1": "0.2.3",
-												"assert-plus": "1.0.0",
-												"bcrypt-pbkdf": "1.0.0",
-												"dashdash": "1.14.0",
-												"ecc-jsbn": "0.1.1",
-												"getpass": "0.1.6",
-												"jodid25519": "1.0.2",
-												"jsbn": "0.1.0",
-												"tweetnacl": "0.14.3"
+												"asn1": "~0.2.3",
+												"assert-plus": "^1.0.0",
+												"bcrypt-pbkdf": "^1.0.0",
+												"dashdash": "^1.12.0",
+												"ecc-jsbn": "~0.1.1",
+												"getpass": "^0.1.1",
+												"jodid25519": "^1.0.0",
+												"jsbn": "~0.1.0",
+												"tweetnacl": "~0.14.0"
 											},
 											"dependencies": {
 												"asn1": {
@@ -1382,7 +1276,7 @@
 													"dev": true,
 													"optional": true,
 													"requires": {
-														"tweetnacl": "0.14.3"
+														"tweetnacl": "^0.14.3"
 													}
 												},
 												"dashdash": {
@@ -1390,7 +1284,7 @@
 													"bundled": true,
 													"dev": true,
 													"requires": {
-														"assert-plus": "1.0.0"
+														"assert-plus": "^1.0.0"
 													}
 												},
 												"ecc-jsbn": {
@@ -1399,7 +1293,7 @@
 													"dev": true,
 													"optional": true,
 													"requires": {
-														"jsbn": "0.1.0"
+														"jsbn": "~0.1.0"
 													}
 												},
 												"getpass": {
@@ -1407,7 +1301,7 @@
 													"bundled": true,
 													"dev": true,
 													"requires": {
-														"assert-plus": "1.0.0"
+														"assert-plus": "^1.0.0"
 													}
 												},
 												"jodid25519": {
@@ -1416,7 +1310,7 @@
 													"dev": true,
 													"optional": true,
 													"requires": {
-														"jsbn": "0.1.0"
+														"jsbn": "~0.1.0"
 													}
 												},
 												"jsbn": {
@@ -1455,7 +1349,7 @@
 									"bundled": true,
 									"dev": true,
 									"requires": {
-										"mime-db": "1.24.0"
+										"mime-db": "~1.24.0"
 									},
 									"dependencies": {
 										"mime-db": {
@@ -1490,7 +1384,7 @@
 									"bundled": true,
 									"dev": true,
 									"requires": {
-										"punycode": "1.4.1"
+										"punycode": "^1.4.1"
 									},
 									"dependencies": {
 										"punycode": {
@@ -1512,7 +1406,7 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"glob": "7.1.1"
+								"glob": "^7.0.5"
 							},
 							"dependencies": {
 								"glob": {
@@ -1520,12 +1414,12 @@
 									"bundled": true,
 									"dev": true,
 									"requires": {
-										"fs.realpath": "1.0.0",
-										"inflight": "1.0.6",
-										"inherits": "2.0.3",
-										"minimatch": "3.0.3",
-										"once": "1.4.0",
-										"path-is-absolute": "1.0.1"
+										"fs.realpath": "^1.0.0",
+										"inflight": "^1.0.4",
+										"inherits": "2",
+										"minimatch": "^3.0.2",
+										"once": "^1.3.0",
+										"path-is-absolute": "^1.0.0"
 									},
 									"dependencies": {
 										"fs.realpath": {
@@ -1538,8 +1432,8 @@
 											"bundled": true,
 											"dev": true,
 											"requires": {
-												"once": "1.4.0",
-												"wrappy": "1.0.2"
+												"once": "^1.3.0",
+												"wrappy": "1"
 											},
 											"dependencies": {
 												"wrappy": {
@@ -1559,7 +1453,7 @@
 											"bundled": true,
 											"dev": true,
 											"requires": {
-												"brace-expansion": "1.1.6"
+												"brace-expansion": "^1.0.0"
 											},
 											"dependencies": {
 												"brace-expansion": {
@@ -1567,7 +1461,7 @@
 													"bundled": true,
 													"dev": true,
 													"requires": {
-														"balanced-match": "0.4.2",
+														"balanced-match": "^0.4.1",
 														"concat-map": "0.0.1"
 													},
 													"dependencies": {
@@ -1590,7 +1484,7 @@
 											"bundled": true,
 											"dev": true,
 											"requires": {
-												"wrappy": "1.0.2"
+												"wrappy": "1"
 											},
 											"dependencies": {
 												"wrappy": {
@@ -1619,9 +1513,9 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"block-stream": "0.0.9",
-								"fstream": "1.0.10",
-								"inherits": "2.0.3"
+								"block-stream": "*",
+								"fstream": "^1.0.2",
+								"inherits": "2"
 							},
 							"dependencies": {
 								"block-stream": {
@@ -1629,7 +1523,7 @@
 									"bundled": true,
 									"dev": true,
 									"requires": {
-										"inherits": "2.0.3"
+										"inherits": "~2.0.0"
 									}
 								},
 								"fstream": {
@@ -1637,10 +1531,10 @@
 									"bundled": true,
 									"dev": true,
 									"requires": {
-										"graceful-fs": "4.1.9",
-										"inherits": "2.0.3",
-										"mkdirp": "0.5.1",
-										"rimraf": "2.5.4"
+										"graceful-fs": "^4.1.2",
+										"inherits": "~2.0.0",
+										"mkdirp": ">=0.5 0",
+										"rimraf": "2"
 									},
 									"dependencies": {
 										"graceful-fs": {
@@ -1662,14 +1556,14 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"debug": "2.2.0",
-								"fstream": "1.0.10",
-								"fstream-ignore": "1.0.5",
-								"once": "1.3.3",
-								"readable-stream": "2.1.5",
-								"rimraf": "2.5.4",
-								"tar": "2.2.1",
-								"uid-number": "0.0.6"
+								"debug": "~2.2.0",
+								"fstream": "~1.0.10",
+								"fstream-ignore": "~1.0.5",
+								"once": "~1.3.3",
+								"readable-stream": "~2.1.4",
+								"rimraf": "~2.5.1",
+								"tar": "~2.2.1",
+								"uid-number": "~0.0.6"
 							},
 							"dependencies": {
 								"debug": {
@@ -1692,10 +1586,10 @@
 									"bundled": true,
 									"dev": true,
 									"requires": {
-										"graceful-fs": "4.1.9",
-										"inherits": "2.0.3",
-										"mkdirp": "0.5.1",
-										"rimraf": "2.5.4"
+										"graceful-fs": "^4.1.2",
+										"inherits": "~2.0.0",
+										"mkdirp": ">=0.5 0",
+										"rimraf": "2"
 									},
 									"dependencies": {
 										"graceful-fs": {
@@ -1715,9 +1609,9 @@
 									"bundled": true,
 									"dev": true,
 									"requires": {
-										"fstream": "1.0.10",
-										"inherits": "2.0.3",
-										"minimatch": "3.0.3"
+										"fstream": "^1.0.0",
+										"inherits": "2",
+										"minimatch": "^3.0.0"
 									},
 									"dependencies": {
 										"inherits": {
@@ -1730,7 +1624,7 @@
 											"bundled": true,
 											"dev": true,
 											"requires": {
-												"brace-expansion": "1.1.6"
+												"brace-expansion": "^1.0.0"
 											},
 											"dependencies": {
 												"brace-expansion": {
@@ -1738,7 +1632,7 @@
 													"bundled": true,
 													"dev": true,
 													"requires": {
-														"balanced-match": "0.4.2",
+														"balanced-match": "^0.4.1",
 														"concat-map": "0.0.1"
 													},
 													"dependencies": {
@@ -1763,7 +1657,7 @@
 									"bundled": true,
 									"dev": true,
 									"requires": {
-										"wrappy": "1.0.2"
+										"wrappy": "1"
 									},
 									"dependencies": {
 										"wrappy": {
@@ -1778,13 +1672,13 @@
 									"bundled": true,
 									"dev": true,
 									"requires": {
-										"buffer-shims": "1.0.0",
-										"core-util-is": "1.0.2",
-										"inherits": "2.0.3",
-										"isarray": "1.0.0",
-										"process-nextick-args": "1.0.7",
-										"string_decoder": "0.10.31",
-										"util-deprecate": "1.0.2"
+										"buffer-shims": "^1.0.0",
+										"core-util-is": "~1.0.0",
+										"inherits": "~2.0.1",
+										"isarray": "~1.0.0",
+										"process-nextick-args": "~1.0.6",
+										"string_decoder": "~0.10.x",
+										"util-deprecate": "~1.0.1"
 									},
 									"dependencies": {
 										"buffer-shims": {
@@ -1848,22 +1742,23 @@
 			"dev": true,
 			"optional": true,
 			"requires": {
-				"safe-buffer": "5.1.1"
+				"safe-buffer": "~5.1.0"
 			}
 		},
 		"supports-color": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.0.tgz",
-			"integrity": "sha512-Ts0Mu/A1S1aZxEJNG88I4Oc9rcZSBFNac5e27yh4j2mqbhZSSzR1Ah79EYwSn9Zuh7lrlGD2cVGzw1RKGzyLSg==",
+			"version": "5.4.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+			"integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
 			"dev": true,
 			"requires": {
-				"has-flag": "2.0.0"
+				"has-flag": "^3.0.0"
 			}
 		},
 		"text-encoding": {
 			"version": "0.6.4",
 			"resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz",
-			"integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk="
+			"integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk=",
+			"dev": true
 		},
 		"through": {
 			"version": "2.3.8",
@@ -1872,9 +1767,10 @@
 			"dev": true
 		},
 		"type-detect": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.3.tgz",
-			"integrity": "sha1-Dj8mcLRAmbC0bChNE2p+9Jx0wuo="
+			"version": "4.0.8",
+			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+			"dev": true
 		},
 		"util-deprecate": {
 			"version": "1.0.2",
diff --git a/package.json b/package.json
index 7b7ea9ae..b63b58bd 100644
--- a/package.json
+++ b/package.json
@@ -67,19 +67,19 @@
     "hat": "0.0.3",
     "lodash": "4.17.4",
     "path-is-absolute": "1.0.1",
-    "sinon": "^3.2.1",
     "sql-ddl-sync": "0.3.13",
     "sql-query": "0.1.26"
   },
   "devDependencies": {
-    "chalk": "2.0.1",
+    "chalk": "2.4.1",
     "glob": "7.1.2",
-    "mocha": "3.4.2",
+    "mocha": "5.2.0",
     "mongodb": "1.4.10",
     "mysql": "2.13.0",
     "pg": "6.4.1",
-    "semver": "5.3.0",
-    "should": "11.2.1",
+    "semver": "5.5.0",
+    "should": "13.2.1",
+    "sinon": "6.0.0",
     "sqlite3": "3.1.8"
   },
   "optionalDependencies": {}

From 63be0a6222190a60502fc64c5edb90a95dcd50a2 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 13 Jun 2018 12:48:54 +0000
Subject: [PATCH 1211/1246] Update dependencies

---
 Changelog.md                |    5 +
 Readme.md                   |   14 +-
 lib/Drivers/DML/postgres.js |   24 +-
 lib/ORM.js                  |   12 +-
 package-lock.json           | 1681 +++++++++++------------------------
 package.json                |   16 +-
 test/mocha.opts             |    1 +
 7 files changed, 543 insertions(+), 1210 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 25ff6640..1e548a93 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,8 @@
+### v5.0.0
+- Upgrade to latest `sqlite` & `mysql` package versions
+- Upgrade to `pg` 7.x. ORM will not work with `pg` < 7
+- Drop support for nodejs < 4 (required due to `pg` upgrade)
+
 ### v4.0.2
 - Fix timezone bug in sqlite ([822](../../pull/822)]
 
diff --git a/Readme.md b/Readme.md
index f0a5d47e..fff4ae73 100755
--- a/Readme.md
+++ b/Readme.md
@@ -21,7 +21,7 @@ npm install orm
 
 ## Node.js Version Support
 
-Supported: 0.12 - 6.0 +
+Supported: 4.0 +
 
 Tests are run on [Travis CI](https://travis-ci.org/)
 If you want you can run tests locally:
@@ -142,11 +142,11 @@ var opts = {
     port:     '3306',
     query:    {pool: true}
   };
-  
+
 orm.connectAsync(opts)
-  .then(function(db) { 
+  .then(function(db) {
     // connected
-    // ...  
+    // ...
   })
   .catch(function() {
     console.error('Connection error: ' + err);
@@ -325,10 +325,10 @@ Person.createAsync(newRecord)
     Person.findAsync({ surname: "Doe" })
       .then(function (people) {
         // SQL: "SELECT * FROM person WHERE surname = 'Doe'"
-        
+
         console.log("People found: %d", people.length);
         console.log("First person: %s, age %d", people[0].fullName(), people[0].age);
-        
+
         people[0].age = 16;
         return people[0].saveAsync();
     })
@@ -345,7 +345,7 @@ illustrate:
 Person.aggregate({ surname: "Doe" }).min("age").max("age").getAsync()
   .then(function(result) {
    var [min, max] = result; // you should use destructuring here
-   
+
    console.log(min, max);
   });
 ```
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 26bd07fc..0ed52697 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -9,7 +9,7 @@ exports.Driver = Driver;
 var switchableFunctions = {
   pool: {
     connect: function (cb) {
-      this.db.connect(this.config, function (err, client, done) {
+      this.db.connect(function (err, client, done) {
         if (!err) {
           done();
         }
@@ -20,7 +20,7 @@ var switchableFunctions = {
       if (this.opts.debug) {
         require("../../Debug").sql('postgres', query);
       }
-      this.db.connect(this.config, function (err, client, done) {
+      this.db.connect(function (err, client, done) {
         if (err) {
           return cb(err);
         }
@@ -36,11 +36,6 @@ var switchableFunctions = {
         });
       });
       return this;
-    },
-    on: function(ev, cb) {
-      // Because `pg` is the same for all instances of this driver
-      // we can't keep adding listeners since they are never removed.
-      return this;
     }
   },
   client: {
@@ -59,12 +54,6 @@ var switchableFunctions = {
         }
       });
       return this;
-    },
-    on: function(ev, cb) {
-      if (ev == "error") {
-        this.db.on("error", cb);
-      }
-      return this;
     }
   }
 };
@@ -98,7 +87,7 @@ function Driver(config, connection, opts) {
 
     if (opts.pool) {
       functions = switchableFunctions.pool;
-      this.db = pg;
+      this.db = new pg.Pool(this.config);
     } else {
       this.db = new pg.Client(this.config);
     }
@@ -119,6 +108,13 @@ function Driver(config, connection, opts) {
 
 _.extend(Driver.prototype, shared, DDL);
 
+Driver.prototype.on = function(ev, cb) {
+  if (ev == "error") {
+    this.db.on("error", cb);
+  }
+  return this;
+};
+
 Driver.prototype.ping = function (cb) {
   this.execSimpleQuery("SELECT * FROM pg_stat_activity LIMIT 1", function () {
     return cb();
diff --git a/lib/ORM.js b/lib/ORM.js
index 42641863..65b3c777 100644
--- a/lib/ORM.js
+++ b/lib/ORM.js
@@ -52,7 +52,7 @@ var fileLoader = function (filePaths, cb) {
   async.eachSeries(filePaths, iterator, cb);
 };
 
-var connect = function (opts, cb) {
+exports.connect = function (opts, cb) {
   if (arguments.length === 0 || !opts || !optsChecker(opts)) {
     cb = typeof(cb) !== 'function' ? opts : cb;
     return ORM_Error(new ORMError("CONNECTION_URL_EMPTY", 'PARAM_MISMATCH'), cb);
@@ -136,6 +136,8 @@ var connect = function (opts, cb) {
   return db;
 };
 
+exports.connectAsync = Promise.promisify(exports.connect, { context: exports });
+
 var use = function (connection, proto, opts, cb) {
   if (DriverAliases[proto]) {
     proto = DriverAliases[proto];
@@ -171,12 +173,6 @@ exports.express = function () {
 exports.use = use;
 exports.useAsync = Promise.promisify(use);
 
-/**
- *
- * @param opts
- */
-exports.connectAsync = Promise.promisify(connect);
-
 exports.addAdapter = adapters.add;
 
 function ORM(driver_name, driver, settings) {
@@ -462,5 +458,3 @@ function queryParamCast (val) {
   }
   return val;
 }
-
-exports.connect = connect;
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index a42215fb..91fdfee3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "orm",
-	"version": "4.0.2",
+	"version": "5.0.0",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -22,18 +22,12 @@
 				"color-convert": "^1.9.0"
 			}
 		},
-		"ap": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/ap/-/ap-0.2.0.tgz",
-			"integrity": "sha1-rglCYAspkS8NKxTsYMRejzMLYRA=",
-			"dev": true
-		},
 		"async": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
-			"integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
+			"version": "2.6.1",
+			"resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
+			"integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
 			"requires": {
-				"lodash": "^4.14.0"
+				"lodash": "^4.17.10"
 			}
 		},
 		"balanced-match": {
@@ -43,15 +37,15 @@
 			"dev": true
 		},
 		"bignumber.js": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-3.1.2.tgz",
-			"integrity": "sha1-8725mtUmihX8HwvtL7AY4mk/4jY=",
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-4.0.4.tgz",
+			"integrity": "sha512-LDXpJKVzEx2/OqNbG9mXBNvHuiRL4PzHCGfnANHMJ+fv68Ads3exDVJeGDJws+AoNEuca93bU3q+S0woeUaCdg==",
 			"dev": true
 		},
 		"bluebird": {
-			"version": "3.5.0",
-			"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
-			"integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw="
+			"version": "3.5.1",
+			"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
+			"integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
 		},
 		"brace-expansion": {
 			"version": "1.1.8",
@@ -160,12 +154,6 @@
 			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
 			"dev": true
 		},
-		"generic-pool": {
-			"version": "2.4.3",
-			"resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.4.3.tgz",
-			"integrity": "sha1-eAw29p360FpaBF3Te+etyhGk9v8=",
-			"dev": true
-		},
 		"glob": {
 			"version": "7.1.2",
 			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
@@ -223,8 +211,7 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
 			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-			"dev": true,
-			"optional": true
+			"dev": true
 		},
 		"just-extend": {
 			"version": "1.1.27",
@@ -240,9 +227,9 @@
 			"optional": true
 		},
 		"lodash": {
-			"version": "4.17.4",
-			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-			"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
+			"version": "4.17.10",
+			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
+			"integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
 		},
 		"lodash.get": {
 			"version": "4.4.2",
@@ -317,40 +304,15 @@
 			"dev": true
 		},
 		"mysql": {
-			"version": "2.13.0",
-			"resolved": "https://registry.npmjs.org/mysql/-/mysql-2.13.0.tgz",
-			"integrity": "sha1-mY8fjKRuLj3XFJzpgkE2U5hqrkc=",
+			"version": "2.15.0",
+			"resolved": "https://registry.npmjs.org/mysql/-/mysql-2.15.0.tgz",
+			"integrity": "sha512-C7tjzWtbN5nzkLIV+E8Crnl9bFyc7d3XJcBAvHKEVkjrYjogz3llo22q6s/hw+UcsE4/844pDob9ac+3dVjQSA==",
 			"dev": true,
 			"requires": {
-				"bignumber.js": "3.1.2",
-				"readable-stream": "1.1.14",
-				"sqlstring": "2.2.0"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "1.1.14",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-					"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.1",
-						"isarray": "0.0.1",
-						"string_decoder": "~0.10.x"
-					}
-				},
-				"string_decoder": {
-					"version": "0.10.31",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-					"dev": true
-				}
+				"bignumber.js": "4.0.4",
+				"readable-stream": "2.3.3",
+				"safe-buffer": "5.1.1",
+				"sqlstring": "2.3.0"
 			}
 		},
 		"nan": {
@@ -372,12 +334,6 @@
 				"text-encoding": "^0.6.4"
 			}
 		},
-		"object-assign": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz",
-			"integrity": "sha1-ejs9DpgGPUP0wD8uiubNUahog6A=",
-			"dev": true
-		},
 		"once": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -416,17 +372,17 @@
 			}
 		},
 		"pg": {
-			"version": "6.4.1",
-			"resolved": "https://registry.npmjs.org/pg/-/pg-6.4.1.tgz",
-			"integrity": "sha1-PqvYygVoFEN8dp8X/3oMNqxwI8U=",
+			"version": "7.4.3",
+			"resolved": "https://registry.npmjs.org/pg/-/pg-7.4.3.tgz",
+			"integrity": "sha1-97b5P1NA7MJZavu5ShPj1rYJg0s=",
 			"dev": true,
 			"requires": {
 				"buffer-writer": "1.0.1",
 				"packet-reader": "0.3.1",
 				"pg-connection-string": "0.1.3",
-				"pg-pool": "1.*",
-				"pg-types": "1.*",
-				"pgpass": "1.*",
+				"pg-pool": "~2.0.3",
+				"pg-types": "~1.12.1",
+				"pgpass": "1.x",
 				"semver": "4.3.2"
 			},
 			"dependencies": {
@@ -445,22 +401,17 @@
 			"dev": true
 		},
 		"pg-pool": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-1.8.0.tgz",
-			"integrity": "sha1-9+xzgkw3oD8Hb1G/33DjQBR8Tzc=",
-			"dev": true,
-			"requires": {
-				"generic-pool": "2.4.3",
-				"object-assign": "4.1.0"
-			}
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-2.0.3.tgz",
+			"integrity": "sha1-wCIDLIlJ8xKk+R+2QJzgQHa+Mlc=",
+			"dev": true
 		},
 		"pg-types": {
-			"version": "1.12.0",
-			"resolved": "https://registry.npmjs.org/pg-types/-/pg-types-1.12.0.tgz",
-			"integrity": "sha1-itO3uJfj/UY+Yt4kGtX8ZAtKZvA=",
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/pg-types/-/pg-types-1.12.1.tgz",
+			"integrity": "sha1-1kCH45A7WP+q0nnnWVxSIIoUw9I=",
 			"dev": true,
 			"requires": {
-				"ap": "~0.2.0",
 				"postgres-array": "~1.0.0",
 				"postgres-bytea": "~1.0.0",
 				"postgres-date": "~1.0.0",
@@ -495,9 +446,9 @@
 			"dev": true
 		},
 		"postgres-interval": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.1.0.tgz",
-			"integrity": "sha1-EDHnusNFZBMoYq3J62xtLzqnW7Q=",
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.1.1.tgz",
+			"integrity": "sha512-OkuCi9t/3CZmeQreutGgx/OVNv9MKHGIT5jH8KldQ4NLYXkvmT9nDVxEuCENlNwhlGPE374oA/xMqn05G49pHA==",
 			"dev": true,
 			"requires": {
 				"xtend": "^4.0.0"
@@ -507,15 +458,13 @@
 			"version": "1.0.7",
 			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
 			"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-			"dev": true,
-			"optional": true
+			"dev": true
 		},
 		"readable-stream": {
 			"version": "2.3.3",
 			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
 			"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
 			"dev": true,
-			"optional": true,
 			"requires": {
 				"core-util-is": "~1.0.0",
 				"inherits": "~2.0.3",
@@ -614,9 +563,9 @@
 			}
 		},
 		"split": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/split/-/split-1.0.0.tgz",
-			"integrity": "sha1-xDlc5oOrzSVLwo/h2rtuXCfc/64=",
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
+			"integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
 			"dev": true,
 			"requires": {
 				"through": "2"
@@ -628,6 +577,13 @@
 			"integrity": "sha512-8hxYFdiwBoRySLFeBeMOiipvCJvtHcIEMuegQRqvBuOcjyhZgalv+uNlO1RIQNu/A+Jm9d8K8fTFbQYxH2KEAg==",
 			"requires": {
 				"lodash": "4.17.4"
+			},
+			"dependencies": {
+				"lodash": {
+					"version": "4.17.4",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
+				}
 			}
 		},
 		"sql-query": {
@@ -636,1103 +592,486 @@
 			"integrity": "sha1-yNNYvl2xxJzCBVVYuj32TlpIxEE="
 		},
 		"sqlite3": {
-			"version": "3.1.8",
-			"resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-3.1.8.tgz",
-			"integrity": "sha1-TLz5Zdi5AdGxAVy8f8QVquFX36o=",
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.0.tgz",
+			"integrity": "sha512-6OlcAQNGaRSBLK1CuaRbKwlMFBb9DEhzmZyQP+fltNRF6XcIMpVIfXCBEcXPe1d4v9LnhkQUYkknDbA5JReqJg==",
 			"dev": true,
 			"requires": {
-				"nan": "~2.4.0",
-				"node-pre-gyp": "~0.6.31"
+				"nan": "~2.9.2",
+				"node-pre-gyp": "~0.9.0"
 			},
 			"dependencies": {
+				"abbrev": {
+					"version": "1.1.1",
+					"bundled": true,
+					"dev": true
+				},
+				"ansi-regex": {
+					"version": "2.1.1",
+					"bundled": true,
+					"dev": true
+				},
+				"aproba": {
+					"version": "1.2.0",
+					"bundled": true,
+					"dev": true
+				},
+				"are-we-there-yet": {
+					"version": "1.1.4",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"delegates": "^1.0.0",
+						"readable-stream": "^2.0.6"
+					}
+				},
+				"balanced-match": {
+					"version": "1.0.0",
+					"bundled": true,
+					"dev": true
+				},
+				"brace-expansion": {
+					"version": "1.1.11",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"balanced-match": "^1.0.0",
+						"concat-map": "0.0.1"
+					}
+				},
+				"chownr": {
+					"version": "1.0.1",
+					"bundled": true,
+					"dev": true
+				},
+				"code-point-at": {
+					"version": "1.1.0",
+					"bundled": true,
+					"dev": true
+				},
+				"concat-map": {
+					"version": "0.0.1",
+					"bundled": true,
+					"dev": true
+				},
+				"console-control-strings": {
+					"version": "1.1.0",
+					"bundled": true,
+					"dev": true
+				},
+				"core-util-is": {
+					"version": "1.0.2",
+					"bundled": true,
+					"dev": true
+				},
+				"debug": {
+					"version": "2.6.9",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"deep-extend": {
+					"version": "0.4.2",
+					"bundled": true,
+					"dev": true
+				},
+				"delegates": {
+					"version": "1.0.0",
+					"bundled": true,
+					"dev": true
+				},
+				"detect-libc": {
+					"version": "1.0.3",
+					"bundled": true,
+					"dev": true
+				},
+				"fs-minipass": {
+					"version": "1.2.5",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"minipass": "^2.2.1"
+					}
+				},
+				"fs.realpath": {
+					"version": "1.0.0",
+					"bundled": true,
+					"dev": true
+				},
+				"gauge": {
+					"version": "2.7.4",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"aproba": "^1.0.3",
+						"console-control-strings": "^1.0.0",
+						"has-unicode": "^2.0.0",
+						"object-assign": "^4.1.0",
+						"signal-exit": "^3.0.0",
+						"string-width": "^1.0.1",
+						"strip-ansi": "^3.0.1",
+						"wide-align": "^1.1.0"
+					}
+				},
+				"glob": {
+					"version": "7.1.2",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"fs.realpath": "^1.0.0",
+						"inflight": "^1.0.4",
+						"inherits": "2",
+						"minimatch": "^3.0.4",
+						"once": "^1.3.0",
+						"path-is-absolute": "^1.0.0"
+					}
+				},
+				"has-unicode": {
+					"version": "2.0.1",
+					"bundled": true,
+					"dev": true
+				},
+				"iconv-lite": {
+					"version": "0.4.19",
+					"bundled": true,
+					"dev": true
+				},
+				"ignore-walk": {
+					"version": "3.0.1",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"minimatch": "^3.0.4"
+					}
+				},
+				"inflight": {
+					"version": "1.0.6",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"once": "^1.3.0",
+						"wrappy": "1"
+					}
+				},
+				"inherits": {
+					"version": "2.0.3",
+					"bundled": true,
+					"dev": true
+				},
+				"ini": {
+					"version": "1.3.5",
+					"bundled": true,
+					"dev": true
+				},
+				"is-fullwidth-code-point": {
+					"version": "1.0.0",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"number-is-nan": "^1.0.0"
+					}
+				},
+				"isarray": {
+					"version": "1.0.0",
+					"bundled": true,
+					"dev": true
+				},
+				"minimatch": {
+					"version": "3.0.4",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"brace-expansion": "^1.1.7"
+					}
+				},
+				"minimist": {
+					"version": "0.0.8",
+					"bundled": true,
+					"dev": true
+				},
+				"minipass": {
+					"version": "2.2.1",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"yallist": "^3.0.0"
+					}
+				},
+				"minizlib": {
+					"version": "1.1.0",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"minipass": "^2.2.1"
+					}
+				},
+				"mkdirp": {
+					"version": "0.5.1",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"minimist": "0.0.8"
+					}
+				},
+				"ms": {
+					"version": "2.0.0",
+					"bundled": true,
+					"dev": true
+				},
 				"nan": {
-					"version": "2.4.0",
-					"resolved": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz",
-					"integrity": "sha1-+zxZ1F/k7/4hXwuJD4rfbrMtIjI=",
+					"version": "2.9.2",
+					"resolved": "https://registry.npmjs.org/nan/-/nan-2.9.2.tgz",
+					"integrity": "sha512-ltW65co7f3PQWBDbqVvaU1WtFJUsNW7sWWm4HINhbMQIyVyzIeyZ8toX5TC5eeooE6piZoaEh4cZkueSKG3KYw==",
 					"dev": true
 				},
+				"needle": {
+					"version": "2.2.0",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"debug": "^2.1.2",
+						"iconv-lite": "^0.4.4",
+						"sax": "^1.2.4"
+					}
+				},
 				"node-pre-gyp": {
-					"version": "0.6.31",
+					"version": "0.9.0",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"detect-libc": "^1.0.2",
+						"mkdirp": "^0.5.1",
+						"needle": "^2.2.0",
+						"nopt": "^4.0.1",
+						"npm-packlist": "^1.1.6",
+						"npmlog": "^4.0.2",
+						"rc": "^1.1.7",
+						"rimraf": "^2.6.1",
+						"semver": "^5.3.0",
+						"tar": "^4"
+					}
+				},
+				"nopt": {
+					"version": "4.0.1",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"abbrev": "1",
+						"osenv": "^0.1.4"
+					}
+				},
+				"npm-bundled": {
+					"version": "1.0.3",
+					"bundled": true,
+					"dev": true
+				},
+				"npm-packlist": {
+					"version": "1.1.10",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"ignore-walk": "^3.0.1",
+						"npm-bundled": "^1.0.1"
+					}
+				},
+				"npmlog": {
+					"version": "4.1.2",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"are-we-there-yet": "~1.1.2",
+						"console-control-strings": "~1.1.0",
+						"gauge": "~2.7.3",
+						"set-blocking": "~2.0.0"
+					}
+				},
+				"number-is-nan": {
+					"version": "1.0.1",
+					"bundled": true,
+					"dev": true
+				},
+				"object-assign": {
+					"version": "4.1.1",
+					"bundled": true,
+					"dev": true
+				},
+				"once": {
+					"version": "1.4.0",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"wrappy": "1"
+					}
+				},
+				"os-homedir": {
+					"version": "1.0.2",
+					"bundled": true,
+					"dev": true
+				},
+				"os-tmpdir": {
+					"version": "1.0.2",
+					"bundled": true,
+					"dev": true
+				},
+				"osenv": {
+					"version": "0.1.5",
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"mkdirp": "~0.5.1",
-						"nopt": "~3.0.6",
-						"npmlog": "^4.0.0",
-						"rc": "~1.1.6",
-						"request": "^2.75.0",
-						"rimraf": "~2.5.4",
-						"semver": "~5.3.0",
-						"tar": "~2.2.1",
-						"tar-pack": "~3.3.0"
+						"os-homedir": "^1.0.0",
+						"os-tmpdir": "^1.0.0"
+					}
+				},
+				"path-is-absolute": {
+					"version": "1.0.1",
+					"bundled": true,
+					"dev": true
+				},
+				"process-nextick-args": {
+					"version": "2.0.0",
+					"bundled": true,
+					"dev": true
+				},
+				"rc": {
+					"version": "1.2.6",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"deep-extend": "~0.4.0",
+						"ini": "~1.3.0",
+						"minimist": "^1.2.0",
+						"strip-json-comments": "~2.0.1"
 					},
 					"dependencies": {
-						"mkdirp": {
-							"version": "0.5.1",
-							"bundled": true,
-							"dev": true,
-							"requires": {
-								"minimist": "0.0.8"
-							},
-							"dependencies": {
-								"minimist": {
-									"version": "0.0.8",
-									"bundled": true,
-									"dev": true
-								}
-							}
-						},
-						"nopt": {
-							"version": "3.0.6",
-							"bundled": true,
-							"dev": true,
-							"requires": {
-								"abbrev": "1"
-							},
-							"dependencies": {
-								"abbrev": {
-									"version": "1.0.9",
-									"bundled": true,
-									"dev": true
-								}
-							}
-						},
-						"npmlog": {
-							"version": "4.0.0",
-							"bundled": true,
-							"dev": true,
-							"requires": {
-								"are-we-there-yet": "~1.1.2",
-								"console-control-strings": "~1.1.0",
-								"gauge": "~2.6.0",
-								"set-blocking": "~2.0.0"
-							},
-							"dependencies": {
-								"are-we-there-yet": {
-									"version": "1.1.2",
-									"bundled": true,
-									"dev": true,
-									"requires": {
-										"delegates": "^1.0.0",
-										"readable-stream": "^2.0.0 || ^1.1.13"
-									},
-									"dependencies": {
-										"delegates": {
-											"version": "1.0.0",
-											"bundled": true,
-											"dev": true
-										},
-										"readable-stream": {
-											"version": "2.1.5",
-											"bundled": true,
-											"dev": true,
-											"requires": {
-												"buffer-shims": "^1.0.0",
-												"core-util-is": "~1.0.0",
-												"inherits": "~2.0.1",
-												"isarray": "~1.0.0",
-												"process-nextick-args": "~1.0.6",
-												"string_decoder": "~0.10.x",
-												"util-deprecate": "~1.0.1"
-											},
-											"dependencies": {
-												"buffer-shims": {
-													"version": "1.0.0",
-													"bundled": true,
-													"dev": true
-												},
-												"core-util-is": {
-													"version": "1.0.2",
-													"bundled": true,
-													"dev": true
-												},
-												"inherits": {
-													"version": "2.0.3",
-													"bundled": true,
-													"dev": true
-												},
-												"isarray": {
-													"version": "1.0.0",
-													"bundled": true,
-													"dev": true
-												},
-												"process-nextick-args": {
-													"version": "1.0.7",
-													"bundled": true,
-													"dev": true
-												},
-												"string_decoder": {
-													"version": "0.10.31",
-													"bundled": true,
-													"dev": true
-												},
-												"util-deprecate": {
-													"version": "1.0.2",
-													"bundled": true,
-													"dev": true
-												}
-											}
-										}
-									}
-								},
-								"console-control-strings": {
-									"version": "1.1.0",
-									"bundled": true,
-									"dev": true
-								},
-								"gauge": {
-									"version": "2.6.0",
-									"bundled": true,
-									"dev": true,
-									"requires": {
-										"aproba": "^1.0.3",
-										"console-control-strings": "^1.0.0",
-										"has-color": "^0.1.7",
-										"has-unicode": "^2.0.0",
-										"object-assign": "^4.1.0",
-										"signal-exit": "^3.0.0",
-										"string-width": "^1.0.1",
-										"strip-ansi": "^3.0.1",
-										"wide-align": "^1.1.0"
-									},
-									"dependencies": {
-										"aproba": {
-											"version": "1.0.4",
-											"bundled": true,
-											"dev": true
-										},
-										"has-color": {
-											"version": "0.1.7",
-											"bundled": true,
-											"dev": true
-										},
-										"has-unicode": {
-											"version": "2.0.1",
-											"bundled": true,
-											"dev": true
-										},
-										"object-assign": {
-											"version": "4.1.0",
-											"bundled": true,
-											"dev": true
-										},
-										"signal-exit": {
-											"version": "3.0.1",
-											"bundled": true,
-											"dev": true
-										},
-										"string-width": {
-											"version": "1.0.2",
-											"bundled": true,
-											"dev": true,
-											"requires": {
-												"code-point-at": "^1.0.0",
-												"is-fullwidth-code-point": "^1.0.0",
-												"strip-ansi": "^3.0.0"
-											},
-											"dependencies": {
-												"code-point-at": {
-													"version": "1.0.1",
-													"bundled": true,
-													"dev": true,
-													"requires": {
-														"number-is-nan": "^1.0.0"
-													},
-													"dependencies": {
-														"number-is-nan": {
-															"version": "1.0.1",
-															"bundled": true,
-															"dev": true
-														}
-													}
-												},
-												"is-fullwidth-code-point": {
-													"version": "1.0.0",
-													"bundled": true,
-													"dev": true,
-													"requires": {
-														"number-is-nan": "^1.0.0"
-													},
-													"dependencies": {
-														"number-is-nan": {
-															"version": "1.0.1",
-															"bundled": true,
-															"dev": true
-														}
-													}
-												}
-											}
-										},
-										"strip-ansi": {
-											"version": "3.0.1",
-											"bundled": true,
-											"dev": true,
-											"requires": {
-												"ansi-regex": "^2.0.0"
-											},
-											"dependencies": {
-												"ansi-regex": {
-													"version": "2.0.0",
-													"bundled": true,
-													"dev": true
-												}
-											}
-										},
-										"wide-align": {
-											"version": "1.1.0",
-											"bundled": true,
-											"dev": true,
-											"requires": {
-												"string-width": "^1.0.1"
-											}
-										}
-									}
-								},
-								"set-blocking": {
-									"version": "2.0.0",
-									"bundled": true,
-									"dev": true
-								}
-							}
-						},
-						"rc": {
-							"version": "1.1.6",
-							"bundled": true,
-							"dev": true,
-							"requires": {
-								"deep-extend": "~0.4.0",
-								"ini": "~1.3.0",
-								"minimist": "^1.2.0",
-								"strip-json-comments": "~1.0.4"
-							},
-							"dependencies": {
-								"deep-extend": {
-									"version": "0.4.1",
-									"bundled": true,
-									"dev": true
-								},
-								"ini": {
-									"version": "1.3.4",
-									"bundled": true,
-									"dev": true
-								},
-								"minimist": {
-									"version": "1.2.0",
-									"bundled": true,
-									"dev": true
-								},
-								"strip-json-comments": {
-									"version": "1.0.4",
-									"bundled": true,
-									"dev": true
-								}
-							}
-						},
-						"request": {
-							"version": "2.76.0",
-							"bundled": true,
-							"dev": true,
-							"requires": {
-								"aws-sign2": "~0.6.0",
-								"aws4": "^1.2.1",
-								"caseless": "~0.11.0",
-								"combined-stream": "~1.0.5",
-								"extend": "~3.0.0",
-								"forever-agent": "~0.6.1",
-								"form-data": "~2.1.1",
-								"har-validator": "~2.0.6",
-								"hawk": "~3.1.3",
-								"http-signature": "~1.1.0",
-								"is-typedarray": "~1.0.0",
-								"isstream": "~0.1.2",
-								"json-stringify-safe": "~5.0.1",
-								"mime-types": "~2.1.7",
-								"node-uuid": "~1.4.7",
-								"oauth-sign": "~0.8.1",
-								"qs": "~6.3.0",
-								"stringstream": "~0.0.4",
-								"tough-cookie": "~2.3.0",
-								"tunnel-agent": "~0.4.1"
-							},
-							"dependencies": {
-								"aws-sign2": {
-									"version": "0.6.0",
-									"bundled": true,
-									"dev": true
-								},
-								"aws4": {
-									"version": "1.5.0",
-									"bundled": true,
-									"dev": true
-								},
-								"caseless": {
-									"version": "0.11.0",
-									"bundled": true,
-									"dev": true
-								},
-								"combined-stream": {
-									"version": "1.0.5",
-									"bundled": true,
-									"dev": true,
-									"requires": {
-										"delayed-stream": "~1.0.0"
-									},
-									"dependencies": {
-										"delayed-stream": {
-											"version": "1.0.0",
-											"bundled": true,
-											"dev": true
-										}
-									}
-								},
-								"extend": {
-									"version": "3.0.0",
-									"bundled": true,
-									"dev": true
-								},
-								"forever-agent": {
-									"version": "0.6.1",
-									"bundled": true,
-									"dev": true
-								},
-								"form-data": {
-									"version": "2.1.1",
-									"bundled": true,
-									"dev": true,
-									"requires": {
-										"asynckit": "^0.4.0",
-										"combined-stream": "^1.0.5",
-										"mime-types": "^2.1.12"
-									},
-									"dependencies": {
-										"asynckit": {
-											"version": "0.4.0",
-											"bundled": true,
-											"dev": true
-										}
-									}
-								},
-								"har-validator": {
-									"version": "2.0.6",
-									"bundled": true,
-									"dev": true,
-									"requires": {
-										"chalk": "^1.1.1",
-										"commander": "^2.9.0",
-										"is-my-json-valid": "^2.12.4",
-										"pinkie-promise": "^2.0.0"
-									},
-									"dependencies": {
-										"chalk": {
-											"version": "1.1.3",
-											"bundled": true,
-											"dev": true,
-											"requires": {
-												"ansi-styles": "^2.2.1",
-												"escape-string-regexp": "^1.0.2",
-												"has-ansi": "^2.0.0",
-												"strip-ansi": "^3.0.0",
-												"supports-color": "^2.0.0"
-											},
-											"dependencies": {
-												"ansi-styles": {
-													"version": "2.2.1",
-													"bundled": true,
-													"dev": true
-												},
-												"escape-string-regexp": {
-													"version": "1.0.5",
-													"bundled": true,
-													"dev": true
-												},
-												"has-ansi": {
-													"version": "2.0.0",
-													"bundled": true,
-													"dev": true,
-													"requires": {
-														"ansi-regex": "^2.0.0"
-													},
-													"dependencies": {
-														"ansi-regex": {
-															"version": "2.0.0",
-															"bundled": true,
-															"dev": true
-														}
-													}
-												},
-												"strip-ansi": {
-													"version": "3.0.1",
-													"bundled": true,
-													"dev": true,
-													"requires": {
-														"ansi-regex": "^2.0.0"
-													},
-													"dependencies": {
-														"ansi-regex": {
-															"version": "2.0.0",
-															"bundled": true,
-															"dev": true
-														}
-													}
-												},
-												"supports-color": {
-													"version": "2.0.0",
-													"bundled": true,
-													"dev": true
-												}
-											}
-										},
-										"commander": {
-											"version": "2.9.0",
-											"bundled": true,
-											"dev": true,
-											"requires": {
-												"graceful-readlink": ">= 1.0.0"
-											},
-											"dependencies": {
-												"graceful-readlink": {
-													"version": "1.0.1",
-													"bundled": true,
-													"dev": true
-												}
-											}
-										},
-										"is-my-json-valid": {
-											"version": "2.15.0",
-											"bundled": true,
-											"dev": true,
-											"requires": {
-												"generate-function": "^2.0.0",
-												"generate-object-property": "^1.1.0",
-												"jsonpointer": "^4.0.0",
-												"xtend": "^4.0.0"
-											},
-											"dependencies": {
-												"generate-function": {
-													"version": "2.0.0",
-													"bundled": true,
-													"dev": true
-												},
-												"generate-object-property": {
-													"version": "1.2.0",
-													"bundled": true,
-													"dev": true,
-													"requires": {
-														"is-property": "^1.0.0"
-													},
-													"dependencies": {
-														"is-property": {
-															"version": "1.0.2",
-															"bundled": true,
-															"dev": true
-														}
-													}
-												},
-												"jsonpointer": {
-													"version": "4.0.0",
-													"bundled": true,
-													"dev": true
-												},
-												"xtend": {
-													"version": "4.0.1",
-													"bundled": true,
-													"dev": true
-												}
-											}
-										},
-										"pinkie-promise": {
-											"version": "2.0.1",
-											"bundled": true,
-											"dev": true,
-											"requires": {
-												"pinkie": "^2.0.0"
-											},
-											"dependencies": {
-												"pinkie": {
-													"version": "2.0.4",
-													"bundled": true,
-													"dev": true
-												}
-											}
-										}
-									}
-								},
-								"hawk": {
-									"version": "3.1.3",
-									"bundled": true,
-									"dev": true,
-									"requires": {
-										"boom": "2.x.x",
-										"cryptiles": "2.x.x",
-										"hoek": "2.x.x",
-										"sntp": "1.x.x"
-									},
-									"dependencies": {
-										"boom": {
-											"version": "2.10.1",
-											"bundled": true,
-											"dev": true,
-											"requires": {
-												"hoek": "2.x.x"
-											}
-										},
-										"cryptiles": {
-											"version": "2.0.5",
-											"bundled": true,
-											"dev": true,
-											"requires": {
-												"boom": "2.x.x"
-											}
-										},
-										"hoek": {
-											"version": "2.16.3",
-											"bundled": true,
-											"dev": true
-										},
-										"sntp": {
-											"version": "1.0.9",
-											"bundled": true,
-											"dev": true,
-											"requires": {
-												"hoek": "2.x.x"
-											}
-										}
-									}
-								},
-								"http-signature": {
-									"version": "1.1.1",
-									"bundled": true,
-									"dev": true,
-									"requires": {
-										"assert-plus": "^0.2.0",
-										"jsprim": "^1.2.2",
-										"sshpk": "^1.7.0"
-									},
-									"dependencies": {
-										"assert-plus": {
-											"version": "0.2.0",
-											"bundled": true,
-											"dev": true
-										},
-										"jsprim": {
-											"version": "1.3.1",
-											"bundled": true,
-											"dev": true,
-											"requires": {
-												"extsprintf": "1.0.2",
-												"json-schema": "0.2.3",
-												"verror": "1.3.6"
-											},
-											"dependencies": {
-												"extsprintf": {
-													"version": "1.0.2",
-													"bundled": true,
-													"dev": true
-												},
-												"json-schema": {
-													"version": "0.2.3",
-													"bundled": true,
-													"dev": true
-												},
-												"verror": {
-													"version": "1.3.6",
-													"bundled": true,
-													"dev": true,
-													"requires": {
-														"extsprintf": "1.0.2"
-													}
-												}
-											}
-										},
-										"sshpk": {
-											"version": "1.10.1",
-											"bundled": true,
-											"dev": true,
-											"requires": {
-												"asn1": "~0.2.3",
-												"assert-plus": "^1.0.0",
-												"bcrypt-pbkdf": "^1.0.0",
-												"dashdash": "^1.12.0",
-												"ecc-jsbn": "~0.1.1",
-												"getpass": "^0.1.1",
-												"jodid25519": "^1.0.0",
-												"jsbn": "~0.1.0",
-												"tweetnacl": "~0.14.0"
-											},
-											"dependencies": {
-												"asn1": {
-													"version": "0.2.3",
-													"bundled": true,
-													"dev": true
-												},
-												"assert-plus": {
-													"version": "1.0.0",
-													"bundled": true,
-													"dev": true
-												},
-												"bcrypt-pbkdf": {
-													"version": "1.0.0",
-													"bundled": true,
-													"dev": true,
-													"optional": true,
-													"requires": {
-														"tweetnacl": "^0.14.3"
-													}
-												},
-												"dashdash": {
-													"version": "1.14.0",
-													"bundled": true,
-													"dev": true,
-													"requires": {
-														"assert-plus": "^1.0.0"
-													}
-												},
-												"ecc-jsbn": {
-													"version": "0.1.1",
-													"bundled": true,
-													"dev": true,
-													"optional": true,
-													"requires": {
-														"jsbn": "~0.1.0"
-													}
-												},
-												"getpass": {
-													"version": "0.1.6",
-													"bundled": true,
-													"dev": true,
-													"requires": {
-														"assert-plus": "^1.0.0"
-													}
-												},
-												"jodid25519": {
-													"version": "1.0.2",
-													"bundled": true,
-													"dev": true,
-													"optional": true,
-													"requires": {
-														"jsbn": "~0.1.0"
-													}
-												},
-												"jsbn": {
-													"version": "0.1.0",
-													"bundled": true,
-													"dev": true,
-													"optional": true
-												},
-												"tweetnacl": {
-													"version": "0.14.3",
-													"bundled": true,
-													"dev": true,
-													"optional": true
-												}
-											}
-										}
-									}
-								},
-								"is-typedarray": {
-									"version": "1.0.0",
-									"bundled": true,
-									"dev": true
-								},
-								"isstream": {
-									"version": "0.1.2",
-									"bundled": true,
-									"dev": true
-								},
-								"json-stringify-safe": {
-									"version": "5.0.1",
-									"bundled": true,
-									"dev": true
-								},
-								"mime-types": {
-									"version": "2.1.12",
-									"bundled": true,
-									"dev": true,
-									"requires": {
-										"mime-db": "~1.24.0"
-									},
-									"dependencies": {
-										"mime-db": {
-											"version": "1.24.0",
-											"bundled": true,
-											"dev": true
-										}
-									}
-								},
-								"node-uuid": {
-									"version": "1.4.7",
-									"bundled": true,
-									"dev": true
-								},
-								"oauth-sign": {
-									"version": "0.8.2",
-									"bundled": true,
-									"dev": true
-								},
-								"qs": {
-									"version": "6.3.0",
-									"bundled": true,
-									"dev": true
-								},
-								"stringstream": {
-									"version": "0.0.5",
-									"bundled": true,
-									"dev": true
-								},
-								"tough-cookie": {
-									"version": "2.3.2",
-									"bundled": true,
-									"dev": true,
-									"requires": {
-										"punycode": "^1.4.1"
-									},
-									"dependencies": {
-										"punycode": {
-											"version": "1.4.1",
-											"bundled": true,
-											"dev": true
-										}
-									}
-								},
-								"tunnel-agent": {
-									"version": "0.4.3",
-									"bundled": true,
-									"dev": true
-								}
-							}
-						},
-						"rimraf": {
-							"version": "2.5.4",
-							"bundled": true,
-							"dev": true,
-							"requires": {
-								"glob": "^7.0.5"
-							},
-							"dependencies": {
-								"glob": {
-									"version": "7.1.1",
-									"bundled": true,
-									"dev": true,
-									"requires": {
-										"fs.realpath": "^1.0.0",
-										"inflight": "^1.0.4",
-										"inherits": "2",
-										"minimatch": "^3.0.2",
-										"once": "^1.3.0",
-										"path-is-absolute": "^1.0.0"
-									},
-									"dependencies": {
-										"fs.realpath": {
-											"version": "1.0.0",
-											"bundled": true,
-											"dev": true
-										},
-										"inflight": {
-											"version": "1.0.6",
-											"bundled": true,
-											"dev": true,
-											"requires": {
-												"once": "^1.3.0",
-												"wrappy": "1"
-											},
-											"dependencies": {
-												"wrappy": {
-													"version": "1.0.2",
-													"bundled": true,
-													"dev": true
-												}
-											}
-										},
-										"inherits": {
-											"version": "2.0.3",
-											"bundled": true,
-											"dev": true
-										},
-										"minimatch": {
-											"version": "3.0.3",
-											"bundled": true,
-											"dev": true,
-											"requires": {
-												"brace-expansion": "^1.0.0"
-											},
-											"dependencies": {
-												"brace-expansion": {
-													"version": "1.1.6",
-													"bundled": true,
-													"dev": true,
-													"requires": {
-														"balanced-match": "^0.4.1",
-														"concat-map": "0.0.1"
-													},
-													"dependencies": {
-														"balanced-match": {
-															"version": "0.4.2",
-															"bundled": true,
-															"dev": true
-														},
-														"concat-map": {
-															"version": "0.0.1",
-															"bundled": true,
-															"dev": true
-														}
-													}
-												}
-											}
-										},
-										"once": {
-											"version": "1.4.0",
-											"bundled": true,
-											"dev": true,
-											"requires": {
-												"wrappy": "1"
-											},
-											"dependencies": {
-												"wrappy": {
-													"version": "1.0.2",
-													"bundled": true,
-													"dev": true
-												}
-											}
-										},
-										"path-is-absolute": {
-											"version": "1.0.1",
-											"bundled": true,
-											"dev": true
-										}
-									}
-								}
-							}
-						},
-						"semver": {
-							"version": "5.3.0",
+						"minimist": {
+							"version": "1.2.0",
 							"bundled": true,
 							"dev": true
-						},
-						"tar": {
-							"version": "2.2.1",
-							"bundled": true,
-							"dev": true,
-							"requires": {
-								"block-stream": "*",
-								"fstream": "^1.0.2",
-								"inherits": "2"
-							},
-							"dependencies": {
-								"block-stream": {
-									"version": "0.0.9",
-									"bundled": true,
-									"dev": true,
-									"requires": {
-										"inherits": "~2.0.0"
-									}
-								},
-								"fstream": {
-									"version": "1.0.10",
-									"bundled": true,
-									"dev": true,
-									"requires": {
-										"graceful-fs": "^4.1.2",
-										"inherits": "~2.0.0",
-										"mkdirp": ">=0.5 0",
-										"rimraf": "2"
-									},
-									"dependencies": {
-										"graceful-fs": {
-											"version": "4.1.9",
-											"bundled": true,
-											"dev": true
-										}
-									}
-								},
-								"inherits": {
-									"version": "2.0.3",
-									"bundled": true,
-									"dev": true
-								}
-							}
-						},
-						"tar-pack": {
-							"version": "3.3.0",
-							"bundled": true,
-							"dev": true,
-							"requires": {
-								"debug": "~2.2.0",
-								"fstream": "~1.0.10",
-								"fstream-ignore": "~1.0.5",
-								"once": "~1.3.3",
-								"readable-stream": "~2.1.4",
-								"rimraf": "~2.5.1",
-								"tar": "~2.2.1",
-								"uid-number": "~0.0.6"
-							},
-							"dependencies": {
-								"debug": {
-									"version": "2.2.0",
-									"bundled": true,
-									"dev": true,
-									"requires": {
-										"ms": "0.7.1"
-									},
-									"dependencies": {
-										"ms": {
-											"version": "0.7.1",
-											"bundled": true,
-											"dev": true
-										}
-									}
-								},
-								"fstream": {
-									"version": "1.0.10",
-									"bundled": true,
-									"dev": true,
-									"requires": {
-										"graceful-fs": "^4.1.2",
-										"inherits": "~2.0.0",
-										"mkdirp": ">=0.5 0",
-										"rimraf": "2"
-									},
-									"dependencies": {
-										"graceful-fs": {
-											"version": "4.1.9",
-											"bundled": true,
-											"dev": true
-										},
-										"inherits": {
-											"version": "2.0.3",
-											"bundled": true,
-											"dev": true
-										}
-									}
-								},
-								"fstream-ignore": {
-									"version": "1.0.5",
-									"bundled": true,
-									"dev": true,
-									"requires": {
-										"fstream": "^1.0.0",
-										"inherits": "2",
-										"minimatch": "^3.0.0"
-									},
-									"dependencies": {
-										"inherits": {
-											"version": "2.0.3",
-											"bundled": true,
-											"dev": true
-										},
-										"minimatch": {
-											"version": "3.0.3",
-											"bundled": true,
-											"dev": true,
-											"requires": {
-												"brace-expansion": "^1.0.0"
-											},
-											"dependencies": {
-												"brace-expansion": {
-													"version": "1.1.6",
-													"bundled": true,
-													"dev": true,
-													"requires": {
-														"balanced-match": "^0.4.1",
-														"concat-map": "0.0.1"
-													},
-													"dependencies": {
-														"balanced-match": {
-															"version": "0.4.2",
-															"bundled": true,
-															"dev": true
-														},
-														"concat-map": {
-															"version": "0.0.1",
-															"bundled": true,
-															"dev": true
-														}
-													}
-												}
-											}
-										}
-									}
-								},
-								"once": {
-									"version": "1.3.3",
-									"bundled": true,
-									"dev": true,
-									"requires": {
-										"wrappy": "1"
-									},
-									"dependencies": {
-										"wrappy": {
-											"version": "1.0.2",
-											"bundled": true,
-											"dev": true
-										}
-									}
-								},
-								"readable-stream": {
-									"version": "2.1.5",
-									"bundled": true,
-									"dev": true,
-									"requires": {
-										"buffer-shims": "^1.0.0",
-										"core-util-is": "~1.0.0",
-										"inherits": "~2.0.1",
-										"isarray": "~1.0.0",
-										"process-nextick-args": "~1.0.6",
-										"string_decoder": "~0.10.x",
-										"util-deprecate": "~1.0.1"
-									},
-									"dependencies": {
-										"buffer-shims": {
-											"version": "1.0.0",
-											"bundled": true,
-											"dev": true
-										},
-										"core-util-is": {
-											"version": "1.0.2",
-											"bundled": true,
-											"dev": true
-										},
-										"inherits": {
-											"version": "2.0.3",
-											"bundled": true,
-											"dev": true
-										},
-										"isarray": {
-											"version": "1.0.0",
-											"bundled": true,
-											"dev": true
-										},
-										"process-nextick-args": {
-											"version": "1.0.7",
-											"bundled": true,
-											"dev": true
-										},
-										"string_decoder": {
-											"version": "0.10.31",
-											"bundled": true,
-											"dev": true
-										},
-										"util-deprecate": {
-											"version": "1.0.2",
-											"bundled": true,
-											"dev": true
-										}
-									}
-								},
-								"uid-number": {
-									"version": "0.0.6",
-									"bundled": true,
-									"dev": true
-								}
-							}
 						}
 					}
+				},
+				"readable-stream": {
+					"version": "2.3.5",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"core-util-is": "~1.0.0",
+						"inherits": "~2.0.3",
+						"isarray": "~1.0.0",
+						"process-nextick-args": "~2.0.0",
+						"safe-buffer": "~5.1.1",
+						"string_decoder": "~1.0.3",
+						"util-deprecate": "~1.0.1"
+					}
+				},
+				"rimraf": {
+					"version": "2.6.2",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"glob": "^7.0.5"
+					}
+				},
+				"safe-buffer": {
+					"version": "5.1.1",
+					"bundled": true,
+					"dev": true
+				},
+				"sax": {
+					"version": "1.2.4",
+					"bundled": true,
+					"dev": true
+				},
+				"semver": {
+					"version": "5.5.0",
+					"bundled": true,
+					"dev": true
+				},
+				"set-blocking": {
+					"version": "2.0.0",
+					"bundled": true,
+					"dev": true
+				},
+				"signal-exit": {
+					"version": "3.0.2",
+					"bundled": true,
+					"dev": true
+				},
+				"string-width": {
+					"version": "1.0.2",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"code-point-at": "^1.0.0",
+						"is-fullwidth-code-point": "^1.0.0",
+						"strip-ansi": "^3.0.0"
+					}
+				},
+				"string_decoder": {
+					"version": "1.0.3",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"safe-buffer": "~5.1.0"
+					}
+				},
+				"strip-ansi": {
+					"version": "3.0.1",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"ansi-regex": "^2.0.0"
+					}
+				},
+				"strip-json-comments": {
+					"version": "2.0.1",
+					"bundled": true,
+					"dev": true
+				},
+				"tar": {
+					"version": "4.4.0",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"chownr": "^1.0.1",
+						"fs-minipass": "^1.2.3",
+						"minipass": "^2.2.1",
+						"minizlib": "^1.1.0",
+						"mkdirp": "^0.5.0",
+						"yallist": "^3.0.2"
+					}
+				},
+				"util-deprecate": {
+					"version": "1.0.2",
+					"bundled": true,
+					"dev": true
+				},
+				"wide-align": {
+					"version": "1.1.2",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"string-width": "^1.0.2"
+					}
+				},
+				"wrappy": {
+					"version": "1.0.2",
+					"bundled": true,
+					"dev": true
+				},
+				"yallist": {
+					"version": "3.0.2",
+					"bundled": true,
+					"dev": true
 				}
 			}
 		},
 		"sqlstring": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.2.0.tgz",
-			"integrity": "sha1-wxNcTqirzX5+50GklmqJHYak8ZE=",
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.0.tgz",
+			"integrity": "sha1-UluKT9Jtb3GqYegipsr5dtMa0qg=",
 			"dev": true
 		},
 		"string_decoder": {
@@ -1740,7 +1079,6 @@
 			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
 			"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
 			"dev": true,
-			"optional": true,
 			"requires": {
 				"safe-buffer": "~5.1.0"
 			}
@@ -1776,8 +1114,7 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
 			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-			"dev": true,
-			"optional": true
+			"dev": true
 		},
 		"wrappy": {
 			"version": "1.0.2",
diff --git a/package.json b/package.json
index b63b58bd..9d18d455 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "sqlite",
     "mongodb"
   ],
-  "version": "4.0.2",
+  "version": "5.0.0",
   "license": "MIT",
   "homepage": "http://dresende.github.io/node-orm2",
   "repository": "http://github.com/dresende/node-orm2.git",
@@ -57,15 +57,15 @@
     "test": "make test"
   },
   "engines": {
-    "node": "*"
+    "node": ">= 4.0.0"
   },
   "analyse": false,
   "dependencies": {
-    "async": "2.5.0",
-    "bluebird": "^3.5.0",
+    "async": "2.6.1",
+    "bluebird": "3.5.1",
     "enforce": "0.1.7",
     "hat": "0.0.3",
-    "lodash": "4.17.4",
+    "lodash": "4.17.10",
     "path-is-absolute": "1.0.1",
     "sql-ddl-sync": "0.3.13",
     "sql-query": "0.1.26"
@@ -75,12 +75,12 @@
     "glob": "7.1.2",
     "mocha": "5.2.0",
     "mongodb": "1.4.10",
-    "mysql": "2.13.0",
-    "pg": "6.4.1",
+    "mysql": "2.15.0",
+    "pg": "7.4.3",
     "semver": "5.5.0",
     "should": "13.2.1",
     "sinon": "6.0.0",
-    "sqlite3": "3.1.8"
+    "sqlite3": "4.0.0"
   },
   "optionalDependencies": {}
 }
diff --git a/test/mocha.opts b/test/mocha.opts
index 873f95ca..d6159085 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1,2 +1,3 @@
 --reporter spec
 --timeout 10000
+--exit

From 23df09ebc0467034c81c3822abee17c464b05001 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 20 Jun 2018 14:38:53 +0200
Subject: [PATCH 1212/1246] Improve version 5 upgrade documentation

---
 Changelog.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 1e548a93..24590319 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,7 +1,8 @@
 ### v5.0.0
-- Upgrade to latest `sqlite` & `mysql` package versions
-- Upgrade to `pg` 7.x. ORM will not work with `pg` < 7
-- Drop support for nodejs < 4 (required due to `pg` upgrade)
+- Update dependencies ([#830](../../pull/830))
+  - You need to upgrade `pg` in your project to version 7.x. Older versions are no longer supported.
+  - Postgres driver now has an error handler. You will need to add an error listener the the ORM instance returned by `connect` function, otherwise any errors will crash your application as per the [EventEmitter documentation](https://nodejs.org/api/events.html#events_error_events). This makes the Postgres driver consistent with other drivers supported by ORM (those however have reconnecting functionality, which prevents the error from surfacing). Due to the lack of reconnecting functionality, you should set `connection.reconnect` to `false` to avoid connection errors.
+  - Drop support for nodejs < 4 (required due to `pg` v 7 upgrade)
 
 ### v4.0.2
 - Fix timezone bug in sqlite ([822](../../pull/822)]

From 62bf8dba267778927f62e35ff78f69e5214d67e0 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 25 Jun 2018 12:56:20 +0000
Subject: [PATCH 1213/1246] Bump sql-ddl-sync - dependency update

---
 Changelog.md      |   3 +
 package-lock.json | 285 ++++++++++++++++++++++------------------------
 package.json      |   4 +-
 3 files changed, 144 insertions(+), 148 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 24590319..eeb40ecc 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### v5.0.1
+- Update sql-ddl-sync (no functionality changes; lodash update)
+
 ### v5.0.0
 - Update dependencies ([#830](../../pull/830))
   - You need to upgrade `pg` in your project to version 7.x. Older versions are no longer supported.
diff --git a/package-lock.json b/package-lock.json
index 91fdfee3..7d59ef4d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,7 @@
 			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
 			"dev": true,
 			"requires": {
-				"color-convert": "^1.9.0"
+				"color-convert": "1.9.2"
 			}
 		},
 		"async": {
@@ -27,7 +27,7 @@
 			"resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
 			"integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
 			"requires": {
-				"lodash": "^4.17.10"
+				"lodash": "4.17.10"
 			}
 		},
 		"balanced-match": {
@@ -53,7 +53,7 @@
 			"integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
 			"dev": true,
 			"requires": {
-				"balanced-match": "^1.0.0",
+				"balanced-match": "1.0.0",
 				"concat-map": "0.0.1"
 			}
 		},
@@ -69,7 +69,7 @@
 			"integrity": "sha1-/NoQPybQwHTVpS1Qkn24D9ArSzk=",
 			"dev": true,
 			"requires": {
-				"nan": "~1.8"
+				"nan": "1.8.4"
 			}
 		},
 		"buffer-writer": {
@@ -84,9 +84,9 @@
 			"integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
 			"dev": true,
 			"requires": {
-				"ansi-styles": "^3.2.1",
-				"escape-string-regexp": "^1.0.5",
-				"supports-color": "^5.3.0"
+				"ansi-styles": "3.2.1",
+				"escape-string-regexp": "1.0.5",
+				"supports-color": "5.4.0"
 			}
 		},
 		"color-convert": {
@@ -160,12 +160,12 @@
 			"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
 			"dev": true,
 			"requires": {
-				"fs.realpath": "^1.0.0",
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "^3.0.4",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
+				"fs.realpath": "1.0.0",
+				"inflight": "1.0.6",
+				"inherits": "2.0.3",
+				"minimatch": "3.0.4",
+				"once": "1.4.0",
+				"path-is-absolute": "1.0.1"
 			}
 		},
 		"growl": {
@@ -197,8 +197,8 @@
 			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
 			"dev": true,
 			"requires": {
-				"once": "^1.3.0",
-				"wrappy": "1"
+				"once": "1.4.0",
+				"wrappy": "1.0.2"
 			}
 		},
 		"inherits": {
@@ -249,7 +249,7 @@
 			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
 			"dev": true,
 			"requires": {
-				"brace-expansion": "^1.1.7"
+				"brace-expansion": "1.1.8"
 			}
 		},
 		"minimist": {
@@ -292,9 +292,9 @@
 			"integrity": "sha1-6wEjlshB1H3GKtNicu6lUOW2l5s=",
 			"dev": true,
 			"requires": {
-				"bson": "~0.2",
+				"bson": "0.2.22",
 				"kerberos": "0.0.4",
-				"readable-stream": "^2.3.3"
+				"readable-stream": "2.3.3"
 			}
 		},
 		"ms": {
@@ -327,11 +327,11 @@
 			"integrity": "sha512-9JX3YwoIt3kS237scmSSOpEv7vCukVzLfwK0I0XhocDSHUANid8ZHnLEULbbSkfeMn98B2y5kphIWzZUylESRQ==",
 			"dev": true,
 			"requires": {
-				"@sinonjs/formatio": "^2.0.0",
-				"just-extend": "^1.1.27",
-				"lolex": "^2.3.2",
-				"path-to-regexp": "^1.7.0",
-				"text-encoding": "^0.6.4"
+				"@sinonjs/formatio": "2.0.0",
+				"just-extend": "1.1.27",
+				"lolex": "2.7.0",
+				"path-to-regexp": "1.7.0",
+				"text-encoding": "0.6.4"
 			}
 		},
 		"once": {
@@ -340,7 +340,7 @@
 			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
 			"dev": true,
 			"requires": {
-				"wrappy": "1"
+				"wrappy": "1.0.2"
 			}
 		},
 		"packet-reader": {
@@ -380,9 +380,9 @@
 				"buffer-writer": "1.0.1",
 				"packet-reader": "0.3.1",
 				"pg-connection-string": "0.1.3",
-				"pg-pool": "~2.0.3",
-				"pg-types": "~1.12.1",
-				"pgpass": "1.x",
+				"pg-pool": "2.0.3",
+				"pg-types": "1.12.1",
+				"pgpass": "1.0.2",
 				"semver": "4.3.2"
 			},
 			"dependencies": {
@@ -412,10 +412,10 @@
 			"integrity": "sha1-1kCH45A7WP+q0nnnWVxSIIoUw9I=",
 			"dev": true,
 			"requires": {
-				"postgres-array": "~1.0.0",
-				"postgres-bytea": "~1.0.0",
-				"postgres-date": "~1.0.0",
-				"postgres-interval": "^1.1.0"
+				"postgres-array": "1.0.2",
+				"postgres-bytea": "1.0.0",
+				"postgres-date": "1.0.3",
+				"postgres-interval": "1.1.1"
 			}
 		},
 		"pgpass": {
@@ -424,7 +424,7 @@
 			"integrity": "sha1-Knu0G2BltnkH6R2hsHwYR8h3swY=",
 			"dev": true,
 			"requires": {
-				"split": "^1.0.0"
+				"split": "1.0.1"
 			}
 		},
 		"postgres-array": {
@@ -451,7 +451,7 @@
 			"integrity": "sha512-OkuCi9t/3CZmeQreutGgx/OVNv9MKHGIT5jH8KldQ4NLYXkvmT9nDVxEuCENlNwhlGPE374oA/xMqn05G49pHA==",
 			"dev": true,
 			"requires": {
-				"xtend": "^4.0.0"
+				"xtend": "4.0.1"
 			}
 		},
 		"process-nextick-args": {
@@ -466,13 +466,13 @@
 			"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
 			"dev": true,
 			"requires": {
-				"core-util-is": "~1.0.0",
-				"inherits": "~2.0.3",
-				"isarray": "~1.0.0",
-				"process-nextick-args": "~1.0.6",
-				"safe-buffer": "~5.1.1",
-				"string_decoder": "~1.0.3",
-				"util-deprecate": "~1.0.1"
+				"core-util-is": "1.0.2",
+				"inherits": "2.0.3",
+				"isarray": "1.0.0",
+				"process-nextick-args": "1.0.7",
+				"safe-buffer": "5.1.1",
+				"string_decoder": "1.0.3",
+				"util-deprecate": "1.0.2"
 			}
 		},
 		"safe-buffer": {
@@ -499,11 +499,11 @@
 			"integrity": "sha512-l+/NwEMO+DcstsHEwPHRHzC9j4UOE3VQwJGcMWSsD/vqpqHbnQ+1iSHy64Ihmmjx1uiRPD9pFadTSc3MJtXAgw==",
 			"dev": true,
 			"requires": {
-				"should-equal": "^2.0.0",
-				"should-format": "^3.0.3",
-				"should-type": "^1.4.0",
-				"should-type-adaptors": "^1.0.1",
-				"should-util": "^1.0.0"
+				"should-equal": "2.0.0",
+				"should-format": "3.0.3",
+				"should-type": "1.4.0",
+				"should-type-adaptors": "1.1.0",
+				"should-util": "1.0.0"
 			}
 		},
 		"should-equal": {
@@ -512,7 +512,7 @@
 			"integrity": "sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==",
 			"dev": true,
 			"requires": {
-				"should-type": "^1.4.0"
+				"should-type": "1.4.0"
 			}
 		},
 		"should-format": {
@@ -521,8 +521,8 @@
 			"integrity": "sha1-m/yPdPo5IFxT04w01xcwPidxJPE=",
 			"dev": true,
 			"requires": {
-				"should-type": "^1.3.0",
-				"should-type-adaptors": "^1.0.1"
+				"should-type": "1.4.0",
+				"should-type-adaptors": "1.1.0"
 			}
 		},
 		"should-type": {
@@ -537,8 +537,8 @@
 			"integrity": "sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==",
 			"dev": true,
 			"requires": {
-				"should-type": "^1.3.0",
-				"should-util": "^1.0.0"
+				"should-type": "1.4.0",
+				"should-util": "1.0.0"
 			}
 		},
 		"should-util": {
@@ -553,13 +553,13 @@
 			"integrity": "sha512-MatciKXyM5pXMSoqd593MqTsItJNCkSSl53HJYeKR5wfsDdp2yljjUQJLfVwAWLoBNfx1HThteqygGQ0ZEpXpQ==",
 			"dev": true,
 			"requires": {
-				"@sinonjs/formatio": "^2.0.0",
-				"diff": "^3.5.0",
-				"lodash.get": "^4.4.2",
-				"lolex": "^2.4.2",
-				"nise": "^1.3.3",
-				"supports-color": "^5.4.0",
-				"type-detect": "^4.0.8"
+				"@sinonjs/formatio": "2.0.0",
+				"diff": "3.5.0",
+				"lodash.get": "4.4.2",
+				"lolex": "2.7.0",
+				"nise": "1.4.1",
+				"supports-color": "5.4.0",
+				"type-detect": "4.0.8"
 			}
 		},
 		"split": {
@@ -568,22 +568,15 @@
 			"integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
 			"dev": true,
 			"requires": {
-				"through": "2"
+				"through": "2.3.8"
 			}
 		},
 		"sql-ddl-sync": {
-			"version": "0.3.13",
-			"resolved": "https://registry.npmjs.org/sql-ddl-sync/-/sql-ddl-sync-0.3.13.tgz",
-			"integrity": "sha512-8hxYFdiwBoRySLFeBeMOiipvCJvtHcIEMuegQRqvBuOcjyhZgalv+uNlO1RIQNu/A+Jm9d8K8fTFbQYxH2KEAg==",
+			"version": "0.3.14",
+			"resolved": "https://registry.npmjs.org/sql-ddl-sync/-/sql-ddl-sync-0.3.14.tgz",
+			"integrity": "sha512-iKY7pFY7qiXoqRK8QZEvcZ9JSVFuD6XiNriHqCbiCYYYWR7DCWyjrwauL1OUYgVCxd6Ehe3+wwgp9ZRQtTux0A==",
 			"requires": {
-				"lodash": "4.17.4"
-			},
-			"dependencies": {
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
-				}
+				"lodash": "4.17.10"
 			}
 		},
 		"sql-query": {
@@ -597,8 +590,8 @@
 			"integrity": "sha512-6OlcAQNGaRSBLK1CuaRbKwlMFBb9DEhzmZyQP+fltNRF6XcIMpVIfXCBEcXPe1d4v9LnhkQUYkknDbA5JReqJg==",
 			"dev": true,
 			"requires": {
-				"nan": "~2.9.2",
-				"node-pre-gyp": "~0.9.0"
+				"nan": "2.9.2",
+				"node-pre-gyp": "0.9.0"
 			},
 			"dependencies": {
 				"abbrev": {
@@ -621,8 +614,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"delegates": "^1.0.0",
-						"readable-stream": "^2.0.6"
+						"delegates": "1.0.0",
+						"readable-stream": "2.3.5"
 					}
 				},
 				"balanced-match": {
@@ -635,7 +628,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"balanced-match": "^1.0.0",
+						"balanced-match": "1.0.0",
 						"concat-map": "0.0.1"
 					}
 				},
@@ -692,7 +685,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"minipass": "^2.2.1"
+						"minipass": "2.2.1"
 					}
 				},
 				"fs.realpath": {
@@ -705,14 +698,14 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"aproba": "^1.0.3",
-						"console-control-strings": "^1.0.0",
-						"has-unicode": "^2.0.0",
-						"object-assign": "^4.1.0",
-						"signal-exit": "^3.0.0",
-						"string-width": "^1.0.1",
-						"strip-ansi": "^3.0.1",
-						"wide-align": "^1.1.0"
+						"aproba": "1.2.0",
+						"console-control-strings": "1.1.0",
+						"has-unicode": "2.0.1",
+						"object-assign": "4.1.1",
+						"signal-exit": "3.0.2",
+						"string-width": "1.0.2",
+						"strip-ansi": "3.0.1",
+						"wide-align": "1.1.2"
 					}
 				},
 				"glob": {
@@ -720,12 +713,12 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.0.4",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
+						"fs.realpath": "1.0.0",
+						"inflight": "1.0.6",
+						"inherits": "2.0.3",
+						"minimatch": "3.0.4",
+						"once": "1.4.0",
+						"path-is-absolute": "1.0.1"
 					}
 				},
 				"has-unicode": {
@@ -743,7 +736,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"minimatch": "^3.0.4"
+						"minimatch": "3.0.4"
 					}
 				},
 				"inflight": {
@@ -751,8 +744,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"once": "^1.3.0",
-						"wrappy": "1"
+						"once": "1.4.0",
+						"wrappy": "1.0.2"
 					}
 				},
 				"inherits": {
@@ -770,7 +763,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"number-is-nan": "^1.0.0"
+						"number-is-nan": "1.0.1"
 					}
 				},
 				"isarray": {
@@ -783,7 +776,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"brace-expansion": "^1.1.7"
+						"brace-expansion": "1.1.11"
 					}
 				},
 				"minimist": {
@@ -796,7 +789,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"yallist": "^3.0.0"
+						"yallist": "3.0.2"
 					}
 				},
 				"minizlib": {
@@ -804,7 +797,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"minipass": "^2.2.1"
+						"minipass": "2.2.1"
 					}
 				},
 				"mkdirp": {
@@ -831,9 +824,9 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"debug": "^2.1.2",
-						"iconv-lite": "^0.4.4",
-						"sax": "^1.2.4"
+						"debug": "2.6.9",
+						"iconv-lite": "0.4.19",
+						"sax": "1.2.4"
 					}
 				},
 				"node-pre-gyp": {
@@ -841,16 +834,16 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"detect-libc": "^1.0.2",
-						"mkdirp": "^0.5.1",
-						"needle": "^2.2.0",
-						"nopt": "^4.0.1",
-						"npm-packlist": "^1.1.6",
-						"npmlog": "^4.0.2",
-						"rc": "^1.1.7",
-						"rimraf": "^2.6.1",
-						"semver": "^5.3.0",
-						"tar": "^4"
+						"detect-libc": "1.0.3",
+						"mkdirp": "0.5.1",
+						"needle": "2.2.0",
+						"nopt": "4.0.1",
+						"npm-packlist": "1.1.10",
+						"npmlog": "4.1.2",
+						"rc": "1.2.6",
+						"rimraf": "2.6.2",
+						"semver": "5.5.0",
+						"tar": "4.4.0"
 					}
 				},
 				"nopt": {
@@ -858,8 +851,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"abbrev": "1",
-						"osenv": "^0.1.4"
+						"abbrev": "1.1.1",
+						"osenv": "0.1.5"
 					}
 				},
 				"npm-bundled": {
@@ -872,8 +865,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"ignore-walk": "^3.0.1",
-						"npm-bundled": "^1.0.1"
+						"ignore-walk": "3.0.1",
+						"npm-bundled": "1.0.3"
 					}
 				},
 				"npmlog": {
@@ -881,10 +874,10 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"are-we-there-yet": "~1.1.2",
-						"console-control-strings": "~1.1.0",
-						"gauge": "~2.7.3",
-						"set-blocking": "~2.0.0"
+						"are-we-there-yet": "1.1.4",
+						"console-control-strings": "1.1.0",
+						"gauge": "2.7.4",
+						"set-blocking": "2.0.0"
 					}
 				},
 				"number-is-nan": {
@@ -902,7 +895,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"wrappy": "1"
+						"wrappy": "1.0.2"
 					}
 				},
 				"os-homedir": {
@@ -920,8 +913,8 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"os-homedir": "^1.0.0",
-						"os-tmpdir": "^1.0.0"
+						"os-homedir": "1.0.2",
+						"os-tmpdir": "1.0.2"
 					}
 				},
 				"path-is-absolute": {
@@ -939,10 +932,10 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"deep-extend": "~0.4.0",
-						"ini": "~1.3.0",
-						"minimist": "^1.2.0",
-						"strip-json-comments": "~2.0.1"
+						"deep-extend": "0.4.2",
+						"ini": "1.3.5",
+						"minimist": "1.2.0",
+						"strip-json-comments": "2.0.1"
 					},
 					"dependencies": {
 						"minimist": {
@@ -957,13 +950,13 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.3",
-						"isarray": "~1.0.0",
-						"process-nextick-args": "~2.0.0",
-						"safe-buffer": "~5.1.1",
-						"string_decoder": "~1.0.3",
-						"util-deprecate": "~1.0.1"
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.3",
+						"isarray": "1.0.0",
+						"process-nextick-args": "2.0.0",
+						"safe-buffer": "5.1.1",
+						"string_decoder": "1.0.3",
+						"util-deprecate": "1.0.2"
 					}
 				},
 				"rimraf": {
@@ -971,7 +964,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"glob": "^7.0.5"
+						"glob": "7.1.2"
 					}
 				},
 				"safe-buffer": {
@@ -1004,9 +997,9 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"code-point-at": "^1.0.0",
-						"is-fullwidth-code-point": "^1.0.0",
-						"strip-ansi": "^3.0.0"
+						"code-point-at": "1.1.0",
+						"is-fullwidth-code-point": "1.0.0",
+						"strip-ansi": "3.0.1"
 					}
 				},
 				"string_decoder": {
@@ -1014,7 +1007,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"safe-buffer": "5.1.1"
 					}
 				},
 				"strip-ansi": {
@@ -1022,7 +1015,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"ansi-regex": "^2.0.0"
+						"ansi-regex": "2.1.1"
 					}
 				},
 				"strip-json-comments": {
@@ -1035,12 +1028,12 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"chownr": "^1.0.1",
-						"fs-minipass": "^1.2.3",
-						"minipass": "^2.2.1",
-						"minizlib": "^1.1.0",
-						"mkdirp": "^0.5.0",
-						"yallist": "^3.0.2"
+						"chownr": "1.0.1",
+						"fs-minipass": "1.2.5",
+						"minipass": "2.2.1",
+						"minizlib": "1.1.0",
+						"mkdirp": "0.5.1",
+						"yallist": "3.0.2"
 					}
 				},
 				"util-deprecate": {
@@ -1053,7 +1046,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"string-width": "^1.0.2"
+						"string-width": "1.0.2"
 					}
 				},
 				"wrappy": {
@@ -1080,7 +1073,7 @@
 			"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
 			"dev": true,
 			"requires": {
-				"safe-buffer": "~5.1.0"
+				"safe-buffer": "5.1.1"
 			}
 		},
 		"supports-color": {
@@ -1089,7 +1082,7 @@
 			"integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
 			"dev": true,
 			"requires": {
-				"has-flag": "^3.0.0"
+				"has-flag": "3.0.0"
 			}
 		},
 		"text-encoding": {
diff --git a/package.json b/package.json
index 9d18d455..cbc8e3f3 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "sqlite",
     "mongodb"
   ],
-  "version": "5.0.0",
+  "version": "5.0.1",
   "license": "MIT",
   "homepage": "http://dresende.github.io/node-orm2",
   "repository": "http://github.com/dresende/node-orm2.git",
@@ -67,7 +67,7 @@
     "hat": "0.0.3",
     "lodash": "4.17.10",
     "path-is-absolute": "1.0.1",
-    "sql-ddl-sync": "0.3.13",
+    "sql-ddl-sync": "0.3.14",
     "sql-query": "0.1.26"
   },
   "devDependencies": {

From df0181de0222ea99ab4ad692bb7b88cc142f01fc Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 27 Jun 2018 13:09:07 +0000
Subject: [PATCH 1214/1246] Update node-sql-query dep & dev sqlite version -
 security.

---
 Changelog.md      |   4 +
 package-lock.json | 867 +++++++++++++++++++++-------------------------
 package.json      |   6 +-
 test/mocha.opts   |   2 +-
 test/run.js       |   2 +-
 5 files changed, 405 insertions(+), 476 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index eeb40ecc..fb5ca668 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,7 @@
+### v5.0.2
+
+- Fix rare crash when object slips into postgres `escapeValue` ([dresende/node-sql-query#54](dresende/node-sql-query#54)) ([#833](../../pull/833))
+
 ### v5.0.1
 - Update sql-ddl-sync (no functionality changes; lodash update)
 
diff --git a/package-lock.json b/package-lock.json
index 7d59ef4d..cf52bcdd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "orm",
-	"version": "5.0.0",
+	"version": "5.0.2",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -13,6 +13,18 @@
 				"samsam": "1.3.0"
 			}
 		},
+		"abbrev": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+			"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+			"dev": true
+		},
+		"ansi-regex": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+			"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+			"dev": true
+		},
 		"ansi-styles": {
 			"version": "3.2.1",
 			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
@@ -22,6 +34,22 @@
 				"color-convert": "1.9.2"
 			}
 		},
+		"aproba": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+			"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+			"dev": true
+		},
+		"are-we-there-yet": {
+			"version": "1.1.5",
+			"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
+			"integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+			"dev": true,
+			"requires": {
+				"delegates": "1.0.0",
+				"readable-stream": "2.3.3"
+			}
+		},
 		"async": {
 			"version": "2.6.1",
 			"resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
@@ -89,6 +117,18 @@
 				"supports-color": "5.4.0"
 			}
 		},
+		"chownr": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
+			"integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=",
+			"dev": true
+		},
+		"code-point-at": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+			"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+			"dev": true
+		},
 		"color-convert": {
 			"version": "1.9.2",
 			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz",
@@ -116,6 +156,12 @@
 			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
 			"dev": true
 		},
+		"console-control-strings": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+			"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+			"dev": true
+		},
 		"core-util-is": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -131,6 +177,24 @@
 				"ms": "2.0.0"
 			}
 		},
+		"deep-extend": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+			"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+			"dev": true
+		},
+		"delegates": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+			"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+			"dev": true
+		},
+		"detect-libc": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+			"integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
+			"dev": true
+		},
 		"diff": {
 			"version": "3.5.0",
 			"resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
@@ -148,12 +212,37 @@
 			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
 			"dev": true
 		},
+		"fs-minipass": {
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
+			"integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
+			"dev": true,
+			"requires": {
+				"minipass": "2.3.3"
+			}
+		},
 		"fs.realpath": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
 			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
 			"dev": true
 		},
+		"gauge": {
+			"version": "2.7.4",
+			"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+			"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+			"dev": true,
+			"requires": {
+				"aproba": "1.2.0",
+				"console-control-strings": "1.1.0",
+				"has-unicode": "2.0.1",
+				"object-assign": "4.1.1",
+				"signal-exit": "3.0.2",
+				"string-width": "1.0.2",
+				"strip-ansi": "3.0.1",
+				"wide-align": "1.1.3"
+			}
+		},
 		"glob": {
 			"version": "7.1.2",
 			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
@@ -180,6 +269,12 @@
 			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
 			"dev": true
 		},
+		"has-unicode": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+			"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+			"dev": true
+		},
 		"hat": {
 			"version": "0.0.3",
 			"resolved": "https://registry.npmjs.org/hat/-/hat-0.0.3.tgz",
@@ -191,6 +286,24 @@
 			"integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
 			"dev": true
 		},
+		"iconv-lite": {
+			"version": "0.4.23",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
+			"integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
+			"dev": true,
+			"requires": {
+				"safer-buffer": "2.1.2"
+			}
+		},
+		"ignore-walk": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
+			"integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
+			"dev": true,
+			"requires": {
+				"minimatch": "3.0.4"
+			}
+		},
 		"inflight": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -207,6 +320,21 @@
 			"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
 			"dev": true
 		},
+		"ini": {
+			"version": "1.3.5",
+			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+			"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+			"dev": true
+		},
+		"is-fullwidth-code-point": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+			"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+			"dev": true,
+			"requires": {
+				"number-is-nan": "1.0.1"
+			}
+		},
 		"isarray": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -258,6 +386,33 @@
 			"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
 			"dev": true
 		},
+		"minipass": {
+			"version": "2.3.3",
+			"resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.3.tgz",
+			"integrity": "sha512-/jAn9/tEX4gnpyRATxgHEOV6xbcyxgT7iUnxo9Y3+OB0zX00TgKIv/2FZCf5brBbICcwbLqVv2ImjvWWrQMSYw==",
+			"dev": true,
+			"requires": {
+				"safe-buffer": "5.1.2",
+				"yallist": "3.0.2"
+			},
+			"dependencies": {
+				"safe-buffer": {
+					"version": "5.1.2",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+					"dev": true
+				}
+			}
+		},
+		"minizlib": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz",
+			"integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==",
+			"dev": true,
+			"requires": {
+				"minipass": "2.3.3"
+			}
+		},
 		"mkdirp": {
 			"version": "0.5.1",
 			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
@@ -321,6 +476,28 @@
 			"integrity": "sha1-PHa1OC6rM+RLdY0oE8qdkuk0LzQ=",
 			"dev": true
 		},
+		"needle": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/needle/-/needle-2.2.1.tgz",
+			"integrity": "sha512-t/ZswCM9JTWjAdXS9VpvqhI2Ct2sL2MdY4fUXqGJaGBk13ge99ObqRksRTbBE56K+wxUXwwfZYOuZHifFW9q+Q==",
+			"dev": true,
+			"requires": {
+				"debug": "2.6.9",
+				"iconv-lite": "0.4.23",
+				"sax": "1.2.4"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "2.6.9",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				}
+			}
+		},
 		"nise": {
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/nise/-/nise-1.4.1.tgz",
@@ -334,6 +511,74 @@
 				"text-encoding": "0.6.4"
 			}
 		},
+		"node-pre-gyp": {
+			"version": "0.10.2",
+			"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.2.tgz",
+			"integrity": "sha512-16lql9QTqs6KsB9fl3neWyZm02KxIKdI9FlJjrB0y7eMTP5Nyz+xalwPbOlw3iw7EejllJPmlJSnY711PLD1ug==",
+			"dev": true,
+			"requires": {
+				"detect-libc": "1.0.3",
+				"mkdirp": "0.5.1",
+				"needle": "2.2.1",
+				"nopt": "4.0.1",
+				"npm-packlist": "1.1.10",
+				"npmlog": "4.1.2",
+				"rc": "1.2.8",
+				"rimraf": "2.6.2",
+				"semver": "5.5.0",
+				"tar": "4.4.4"
+			}
+		},
+		"nopt": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+			"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+			"dev": true,
+			"requires": {
+				"abbrev": "1.1.1",
+				"osenv": "0.1.5"
+			}
+		},
+		"npm-bundled": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz",
+			"integrity": "sha512-ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow==",
+			"dev": true
+		},
+		"npm-packlist": {
+			"version": "1.1.10",
+			"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz",
+			"integrity": "sha512-AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA==",
+			"dev": true,
+			"requires": {
+				"ignore-walk": "3.0.1",
+				"npm-bundled": "1.0.3"
+			}
+		},
+		"npmlog": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+			"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+			"dev": true,
+			"requires": {
+				"are-we-there-yet": "1.1.5",
+				"console-control-strings": "1.1.0",
+				"gauge": "2.7.4",
+				"set-blocking": "2.0.0"
+			}
+		},
+		"number-is-nan": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+			"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+			"dev": true
+		},
+		"object-assign": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+			"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+			"dev": true
+		},
 		"once": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -343,6 +588,28 @@
 				"wrappy": "1.0.2"
 			}
 		},
+		"os-homedir": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+			"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+			"dev": true
+		},
+		"os-tmpdir": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+			"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+			"dev": true
+		},
+		"osenv": {
+			"version": "0.1.5",
+			"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+			"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+			"dev": true,
+			"requires": {
+				"os-homedir": "1.0.2",
+				"os-tmpdir": "1.0.2"
+			}
+		},
 		"packet-reader": {
 			"version": "0.3.1",
 			"resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-0.3.1.tgz",
@@ -460,6 +727,26 @@
 			"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
 			"dev": true
 		},
+		"rc": {
+			"version": "1.2.8",
+			"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+			"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+			"dev": true,
+			"requires": {
+				"deep-extend": "0.6.0",
+				"ini": "1.3.5",
+				"minimist": "1.2.0",
+				"strip-json-comments": "2.0.1"
+			},
+			"dependencies": {
+				"minimist": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+					"dev": true
+				}
+			}
+		},
 		"readable-stream": {
 			"version": "2.3.3",
 			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
@@ -475,24 +762,51 @@
 				"util-deprecate": "1.0.2"
 			}
 		},
+		"rimraf": {
+			"version": "2.6.2",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+			"integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+			"dev": true,
+			"requires": {
+				"glob": "7.1.2"
+			}
+		},
 		"safe-buffer": {
 			"version": "5.1.1",
 			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
 			"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
 			"dev": true
 		},
+		"safer-buffer": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+			"dev": true
+		},
 		"samsam": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz",
 			"integrity": "sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg==",
 			"dev": true
 		},
+		"sax": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+			"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+			"dev": true
+		},
 		"semver": {
 			"version": "5.5.0",
 			"resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
 			"integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
 			"dev": true
 		},
+		"set-blocking": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+			"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+			"dev": true
+		},
 		"should": {
 			"version": "13.2.1",
 			"resolved": "https://registry.npmjs.org/should/-/should-13.2.1.tgz",
@@ -547,6 +861,12 @@
 			"integrity": "sha1-yYzaN0qmsZDfi6h8mInCtNtiAGM=",
 			"dev": true
 		},
+		"signal-exit": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+			"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+			"dev": true
+		},
 		"sinon": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/sinon/-/sinon-6.0.0.tgz",
@@ -580,483 +900,24 @@
 			}
 		},
 		"sql-query": {
-			"version": "0.1.26",
-			"resolved": "https://registry.npmjs.org/sql-query/-/sql-query-0.1.26.tgz",
-			"integrity": "sha1-yNNYvl2xxJzCBVVYuj32TlpIxEE="
+			"version": "0.1.27",
+			"resolved": "https://registry.npmjs.org/sql-query/-/sql-query-0.1.27.tgz",
+			"integrity": "sha512-XXK6W6n0D18YspS/7TziKln8ij9RUnpDzl+qr2hUOqEqrhuilGPhbKBYQ1dkfYoQ0ViNtr2y8RKut06nkAkx2w=="
 		},
 		"sqlite3": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.0.tgz",
-			"integrity": "sha512-6OlcAQNGaRSBLK1CuaRbKwlMFBb9DEhzmZyQP+fltNRF6XcIMpVIfXCBEcXPe1d4v9LnhkQUYkknDbA5JReqJg==",
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.1.tgz",
+			"integrity": "sha512-i8LtU2fdEGFEt4Kcs7eNjYdGmnAQ8zWlaOv6Esbq/jfVfR0Qbn/1dgVyKebrMc2zN7h3oHsqla9zq7AJ0+34ZA==",
 			"dev": true,
 			"requires": {
-				"nan": "2.9.2",
-				"node-pre-gyp": "0.9.0"
+				"nan": "2.10.0",
+				"node-pre-gyp": "0.10.2"
 			},
 			"dependencies": {
-				"abbrev": {
-					"version": "1.1.1",
-					"bundled": true,
-					"dev": true
-				},
-				"ansi-regex": {
-					"version": "2.1.1",
-					"bundled": true,
-					"dev": true
-				},
-				"aproba": {
-					"version": "1.2.0",
-					"bundled": true,
-					"dev": true
-				},
-				"are-we-there-yet": {
-					"version": "1.1.4",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"delegates": "1.0.0",
-						"readable-stream": "2.3.5"
-					}
-				},
-				"balanced-match": {
-					"version": "1.0.0",
-					"bundled": true,
-					"dev": true
-				},
-				"brace-expansion": {
-					"version": "1.1.11",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"balanced-match": "1.0.0",
-						"concat-map": "0.0.1"
-					}
-				},
-				"chownr": {
-					"version": "1.0.1",
-					"bundled": true,
-					"dev": true
-				},
-				"code-point-at": {
-					"version": "1.1.0",
-					"bundled": true,
-					"dev": true
-				},
-				"concat-map": {
-					"version": "0.0.1",
-					"bundled": true,
-					"dev": true
-				},
-				"console-control-strings": {
-					"version": "1.1.0",
-					"bundled": true,
-					"dev": true
-				},
-				"core-util-is": {
-					"version": "1.0.2",
-					"bundled": true,
-					"dev": true
-				},
-				"debug": {
-					"version": "2.6.9",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"deep-extend": {
-					"version": "0.4.2",
-					"bundled": true,
-					"dev": true
-				},
-				"delegates": {
-					"version": "1.0.0",
-					"bundled": true,
-					"dev": true
-				},
-				"detect-libc": {
-					"version": "1.0.3",
-					"bundled": true,
-					"dev": true
-				},
-				"fs-minipass": {
-					"version": "1.2.5",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"minipass": "2.2.1"
-					}
-				},
-				"fs.realpath": {
-					"version": "1.0.0",
-					"bundled": true,
-					"dev": true
-				},
-				"gauge": {
-					"version": "2.7.4",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"aproba": "1.2.0",
-						"console-control-strings": "1.1.0",
-						"has-unicode": "2.0.1",
-						"object-assign": "4.1.1",
-						"signal-exit": "3.0.2",
-						"string-width": "1.0.2",
-						"strip-ansi": "3.0.1",
-						"wide-align": "1.1.2"
-					}
-				},
-				"glob": {
-					"version": "7.1.2",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"fs.realpath": "1.0.0",
-						"inflight": "1.0.6",
-						"inherits": "2.0.3",
-						"minimatch": "3.0.4",
-						"once": "1.4.0",
-						"path-is-absolute": "1.0.1"
-					}
-				},
-				"has-unicode": {
-					"version": "2.0.1",
-					"bundled": true,
-					"dev": true
-				},
-				"iconv-lite": {
-					"version": "0.4.19",
-					"bundled": true,
-					"dev": true
-				},
-				"ignore-walk": {
-					"version": "3.0.1",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"minimatch": "3.0.4"
-					}
-				},
-				"inflight": {
-					"version": "1.0.6",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"once": "1.4.0",
-						"wrappy": "1.0.2"
-					}
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"bundled": true,
-					"dev": true
-				},
-				"ini": {
-					"version": "1.3.5",
-					"bundled": true,
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "1.0.0",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"number-is-nan": "1.0.1"
-					}
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"bundled": true,
-					"dev": true
-				},
-				"minimatch": {
-					"version": "3.0.4",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"brace-expansion": "1.1.11"
-					}
-				},
-				"minimist": {
-					"version": "0.0.8",
-					"bundled": true,
-					"dev": true
-				},
-				"minipass": {
-					"version": "2.2.1",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"yallist": "3.0.2"
-					}
-				},
-				"minizlib": {
-					"version": "1.1.0",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"minipass": "2.2.1"
-					}
-				},
-				"mkdirp": {
-					"version": "0.5.1",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"minimist": "0.0.8"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"bundled": true,
-					"dev": true
-				},
 				"nan": {
-					"version": "2.9.2",
-					"resolved": "https://registry.npmjs.org/nan/-/nan-2.9.2.tgz",
-					"integrity": "sha512-ltW65co7f3PQWBDbqVvaU1WtFJUsNW7sWWm4HINhbMQIyVyzIeyZ8toX5TC5eeooE6piZoaEh4cZkueSKG3KYw==",
-					"dev": true
-				},
-				"needle": {
-					"version": "2.2.0",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"debug": "2.6.9",
-						"iconv-lite": "0.4.19",
-						"sax": "1.2.4"
-					}
-				},
-				"node-pre-gyp": {
-					"version": "0.9.0",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"detect-libc": "1.0.3",
-						"mkdirp": "0.5.1",
-						"needle": "2.2.0",
-						"nopt": "4.0.1",
-						"npm-packlist": "1.1.10",
-						"npmlog": "4.1.2",
-						"rc": "1.2.6",
-						"rimraf": "2.6.2",
-						"semver": "5.5.0",
-						"tar": "4.4.0"
-					}
-				},
-				"nopt": {
-					"version": "4.0.1",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"abbrev": "1.1.1",
-						"osenv": "0.1.5"
-					}
-				},
-				"npm-bundled": {
-					"version": "1.0.3",
-					"bundled": true,
-					"dev": true
-				},
-				"npm-packlist": {
-					"version": "1.1.10",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"ignore-walk": "3.0.1",
-						"npm-bundled": "1.0.3"
-					}
-				},
-				"npmlog": {
-					"version": "4.1.2",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"are-we-there-yet": "1.1.4",
-						"console-control-strings": "1.1.0",
-						"gauge": "2.7.4",
-						"set-blocking": "2.0.0"
-					}
-				},
-				"number-is-nan": {
-					"version": "1.0.1",
-					"bundled": true,
-					"dev": true
-				},
-				"object-assign": {
-					"version": "4.1.1",
-					"bundled": true,
-					"dev": true
-				},
-				"once": {
-					"version": "1.4.0",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"wrappy": "1.0.2"
-					}
-				},
-				"os-homedir": {
-					"version": "1.0.2",
-					"bundled": true,
-					"dev": true
-				},
-				"os-tmpdir": {
-					"version": "1.0.2",
-					"bundled": true,
-					"dev": true
-				},
-				"osenv": {
-					"version": "0.1.5",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"os-homedir": "1.0.2",
-						"os-tmpdir": "1.0.2"
-					}
-				},
-				"path-is-absolute": {
-					"version": "1.0.1",
-					"bundled": true,
-					"dev": true
-				},
-				"process-nextick-args": {
-					"version": "2.0.0",
-					"bundled": true,
-					"dev": true
-				},
-				"rc": {
-					"version": "1.2.6",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"deep-extend": "0.4.2",
-						"ini": "1.3.5",
-						"minimist": "1.2.0",
-						"strip-json-comments": "2.0.1"
-					},
-					"dependencies": {
-						"minimist": {
-							"version": "1.2.0",
-							"bundled": true,
-							"dev": true
-						}
-					}
-				},
-				"readable-stream": {
-					"version": "2.3.5",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "1.0.0",
-						"process-nextick-args": "2.0.0",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"rimraf": {
-					"version": "2.6.2",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"glob": "7.1.2"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"bundled": true,
-					"dev": true
-				},
-				"sax": {
-					"version": "1.2.4",
-					"bundled": true,
-					"dev": true
-				},
-				"semver": {
-					"version": "5.5.0",
-					"bundled": true,
-					"dev": true
-				},
-				"set-blocking": {
-					"version": "2.0.0",
-					"bundled": true,
-					"dev": true
-				},
-				"signal-exit": {
-					"version": "3.0.2",
-					"bundled": true,
-					"dev": true
-				},
-				"string-width": {
-					"version": "1.0.2",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"code-point-at": "1.1.0",
-						"is-fullwidth-code-point": "1.0.0",
-						"strip-ansi": "3.0.1"
-					}
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"ansi-regex": "2.1.1"
-					}
-				},
-				"strip-json-comments": {
-					"version": "2.0.1",
-					"bundled": true,
-					"dev": true
-				},
-				"tar": {
-					"version": "4.4.0",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"chownr": "1.0.1",
-						"fs-minipass": "1.2.5",
-						"minipass": "2.2.1",
-						"minizlib": "1.1.0",
-						"mkdirp": "0.5.1",
-						"yallist": "3.0.2"
-					}
-				},
-				"util-deprecate": {
-					"version": "1.0.2",
-					"bundled": true,
-					"dev": true
-				},
-				"wide-align": {
-					"version": "1.1.2",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"string-width": "1.0.2"
-					}
-				},
-				"wrappy": {
-					"version": "1.0.2",
-					"bundled": true,
-					"dev": true
-				},
-				"yallist": {
-					"version": "3.0.2",
-					"bundled": true,
+					"version": "2.10.0",
+					"resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
+					"integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
 					"dev": true
 				}
 			}
@@ -1067,6 +928,17 @@
 			"integrity": "sha1-UluKT9Jtb3GqYegipsr5dtMa0qg=",
 			"dev": true
 		},
+		"string-width": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+			"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+			"dev": true,
+			"requires": {
+				"code-point-at": "1.1.0",
+				"is-fullwidth-code-point": "1.0.0",
+				"strip-ansi": "3.0.1"
+			}
+		},
 		"string_decoder": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
@@ -1076,6 +948,21 @@
 				"safe-buffer": "5.1.1"
 			}
 		},
+		"strip-ansi": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+			"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+			"dev": true,
+			"requires": {
+				"ansi-regex": "2.1.1"
+			}
+		},
+		"strip-json-comments": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+			"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+			"dev": true
+		},
 		"supports-color": {
 			"version": "5.4.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
@@ -1085,6 +972,29 @@
 				"has-flag": "3.0.0"
 			}
 		},
+		"tar": {
+			"version": "4.4.4",
+			"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.4.tgz",
+			"integrity": "sha512-mq9ixIYfNF9SK0IS/h2HKMu8Q2iaCuhDDsZhdEag/FHv8fOaYld4vN7ouMgcSSt5WKZzPs8atclTcJm36OTh4w==",
+			"dev": true,
+			"requires": {
+				"chownr": "1.0.1",
+				"fs-minipass": "1.2.5",
+				"minipass": "2.3.3",
+				"minizlib": "1.1.0",
+				"mkdirp": "0.5.1",
+				"safe-buffer": "5.1.2",
+				"yallist": "3.0.2"
+			},
+			"dependencies": {
+				"safe-buffer": {
+					"version": "5.1.2",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+					"dev": true
+				}
+			}
+		},
 		"text-encoding": {
 			"version": "0.6.4",
 			"resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz",
@@ -1109,6 +1019,15 @@
 			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
 			"dev": true
 		},
+		"wide-align": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+			"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+			"dev": true,
+			"requires": {
+				"string-width": "1.0.2"
+			}
+		},
 		"wrappy": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -1120,6 +1039,12 @@
 			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
 			"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
 			"dev": true
+		},
+		"yallist": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz",
+			"integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
+			"dev": true
 		}
 	}
 }
diff --git a/package.json b/package.json
index cbc8e3f3..ff29df8d 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "sqlite",
     "mongodb"
   ],
-  "version": "5.0.1",
+  "version": "5.0.2",
   "license": "MIT",
   "homepage": "http://dresende.github.io/node-orm2",
   "repository": "http://github.com/dresende/node-orm2.git",
@@ -68,7 +68,7 @@
     "lodash": "4.17.10",
     "path-is-absolute": "1.0.1",
     "sql-ddl-sync": "0.3.14",
-    "sql-query": "0.1.26"
+    "sql-query": "0.1.27"
   },
   "devDependencies": {
     "chalk": "2.4.1",
@@ -80,7 +80,7 @@
     "semver": "5.5.0",
     "should": "13.2.1",
     "sinon": "6.0.0",
-    "sqlite3": "4.0.0"
+    "sqlite3": "4.0.1"
   },
   "optionalDependencies": {}
 }
diff --git a/test/mocha.opts b/test/mocha.opts
index d6159085..33456697 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1,3 +1,3 @@
 --reporter spec
---timeout 10000
+--timeout 15000
 --exit
diff --git a/test/run.js b/test/run.js
index 92a97fcc..45b4626a 100644
--- a/test/run.js
+++ b/test/run.js
@@ -8,7 +8,7 @@ var logging  = require("./logging");
 var location = path.normalize(path.join(__dirname, "integration", "**", "*.js"));
 var mocha    = new Mocha({
   reporter: "progress",
-  timeout: 10000
+  timeout: 15000
 });
 
 switch (common.hasConfig(common.protocol())) {

From c7fbe812f32a1e307b35c882fecdcc4755cea3ca Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 27 Jun 2018 16:13:14 +0200
Subject: [PATCH 1215/1246] Fix link

---
 Changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index fb5ca668..8726b8a3 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,6 @@
 ### v5.0.2
 
-- Fix rare crash when object slips into postgres `escapeValue` ([dresende/node-sql-query#54](dresende/node-sql-query#54)) ([#833](../../pull/833))
+- Fix rare crash when object slips into postgres `escapeValue` ([dresende/node-sql-query#54](https://github.com/dresende/node-sql-query/pull/54)) ([#833](../../pull/833))
 
 ### v5.0.1
 - Update sql-ddl-sync (no functionality changes; lodash update)

From ba6558d78206eb302791d765d8b2712808f8ff05 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 24 Sep 2018 10:44:55 +0000
Subject: [PATCH 1216/1246] Remove redundant readme promise info

Also clean up indentation
---
 Readme.md | 449 ++++++++++++------------------------------------------
 1 file changed, 99 insertions(+), 350 deletions(-)

diff --git a/Readme.md b/Readme.md
index fff4ae73..e0bf588f 100755
--- a/Readme.md
+++ b/Readme.md
@@ -58,324 +58,51 @@ var orm = require("orm");
 orm.connect("mysql://username:password@host/database", function (err, db) {
   if (err) throw err;
 
-	var Person = db.define("person", {
-		name      : String,
-		surname   : String,
-		age       : Number, // FLOAT
-		male      : Boolean,
-		continent : [ "Europe", "America", "Asia", "Africa", "Australia", "Antarctica" ], // ENUM type
-		photo     : Buffer, // BLOB/BINARY
-		data      : Object // JSON encoded
-	}, {
-		methods: {
-			fullName: function () {
-				return this.name + ' ' + this.surname;
-			}
-		},
-		validations: {
-			age: orm.enforce.ranges.number(18, undefined, "under-age")
-		}
-	});
-
-    // add the table to the database
-	db.sync(function(err) {
-		if (err) throw err;
-
-		// add a row to the person table
-		Person.create({ id: 1, name: "John", surname: "Doe", age: 27 }, function(err) {
-			if (err) throw err;
-
-				// query the person table by surname
-				Person.find({ surname: "Doe" }, function (err, people) {
-			        // SQL: "SELECT * FROM person WHERE surname = 'Doe'"
-		        	if (err) throw err;
-
-			        console.log("People found: %d", people.length);
-			        console.log("First person: %s, age %d", people[0].fullName(), people[0].age);
-
-			        people[0].age = 16;
-			        people[0].save(function (err) {
-			            // err.msg = "under-age";
-		        });
-		    });
-
-		});
-	});
-});
-```
-------
-## Promise
-
-- Read documentation about [bluebird](http://bluebirdjs.com/docs/api-reference.html) `Promise` for more advanced knowledge how to use `Promises`.
-
-### Connect
-
-The connection URL has the following syntax: `driver://username:password@hostname/database?option1=value1&option2=value2..`
-
-```javascript
-var orm = require('orm');
-
-orm.connectAsync('mysql://root:password@localhost/test')
-  .then(function(db) {
-      // connected
-      // ...
-  })
-  .catch(function() {
-     console.error('Connection error: ' + err);
-  });
-```
-
-Valid options are:
-
-- `debug` (default: **false**): prints queries to console;
-- `pool` (default: **false**): manages a connection pool (only for `mysql` and `postgres`) using built-in driver pool;
-- `strdates` (default: **false**): saves dates as strings (only for `sqlite`).
-- `timezone` (default: **'local'**): store dates in the database using this timezone (`mysql` and `postgres` only)
-
-```javascript
-var orm = require('orm');
-
-var opts = {
-    host:     host,
-    database: database,
-    protocol: 'mysql',
-    port:     '3306',
-    query:    {pool: true}
-  };
-
-orm.connectAsync(opts)
-  .then(function(db) {
-    // connected
-    // ...
-  })
-  .catch(function() {
-    console.error('Connection error: ' + err);
-  });
-```
--------
-
-### Model Hooks
-
-If you want to listen for a type of event than occurs in instances of a Model, you can attach a function that
-will be called when that event happens. For each hook above implemented Promise support, with backward capability via use next callback.
-For use promise you should return `Promise`, look at example.
-
-Currently the following events are supported:
-
-- `beforeValidation` : (no parameters) Before all validations and prior to `beforeCreate` and `beforeSave`;
-- `beforeCreate` : (no parameters) Right before trying to save a new instance (prior to `beforeSave`);
-- `beforeSave` : (no parameters) Right before trying to save;
-- `afterSave` : (bool success) Right after saving;
-- `afterCreate` : (bool success) Right after saving a new instance;
-- `afterLoad` : (no parameters) Right after loading and preparing an instance to be used;
-- `afterAutoFetch` : (no parameters) Right after auto-fetching associations (if any), it will trigger regardless of having associations or not;
-- `beforeRemove` : (no parameters) Right before trying to remove an instance;
-- `afterRemove` : (bool success) Right after removing an instance;
-
-All hook function are called with `this` as the instance so you can access anything you want related to it.
-Here's an example:
-
-```js
-var Person = db.define("person", {
-  name    : String,
-  surname : String
-}, {
-  hooks: {
-    beforeCreate: function () {
-    return new Promise(function(resolve, reject) {
-      if (this.surname == "Doe") {
-        return reject(new Error("No Does allowed"));
+  var Person = db.define("person", {
+    name      : String,
+    surname   : String,
+    age       : Number, // FLOAT
+    male      : Boolean,
+    continent : [ "Europe", "America", "Asia", "Africa", "Australia", "Antarctica" ], // ENUM type
+    photo     : Buffer, // BLOB/BINARY
+    data      : Object // JSON encoded
+  }, {
+    methods: {
+      fullName: function () {
+        return this.name + ' ' + this.surname;
       }
-        return resolve();
-      });
+    },
+    validations: {
+      age: orm.enforce.ranges.number(18, undefined, "under-age")
     }
-  }
-});
-```
--------
-### Editing Syncing and dropping models
-Syncing is an utility method that creates all the necessary tables in the database for your models and associations to work. Tables are not replaced, they are only created if they don't exist.
-
-There are 2 ways of syncing:
-
-1. Calling `Model.syncPromise()` will only synchronize the model
-2. Calling `db.syncPromise()` will synchronize all models
-
-Dropping is a similar method but instead it drops all tables involved in your models, even if they were not created by ORM. There also 2 ways of dropping.
-
-```js
-var orm = require("orm");
-
-orm.connectAsync("....")
-  .then(function (db) {
-    var Person = db.define("person", {
-        name : String
-    });
-
-    return [Person, db.dropAsync()];
-  })
-  .spread(function(Person) {
-    return Person.syncPromise();
-  })
-  .then(function () {
-    // created tables for Person model
-  });
-```
--------
-### Finding items
-
-#### findAsync
-Find records with matching criteria, can be chained (see below):
-```javascript
-Person.find({status:'active'})
-  .then(function(results) {
-    // ...
   });
-```
 
-You can limit your results as well. This limits our results to 10
-```javascript
-Person.find({status:'active'}, 10)
-  .then(function(results) {
-    // ...
-  });
-```
+  // add the table to the database
+  db.sync(function(err) {
+    if (err) throw err;
 
-`Person.all` is an alias to `Person.find`
+    // add a row to the person table
+    Person.create({ id: 1, name: "John", surname: "Doe", age: 27 }, function(err) {
+      if (err) throw err;
 
-#### getAsync
-Find record by primary key.
-```javascript
-Person.getAsync(1)
-  .then(function(person) {
-    // ...
-  });
-```
-#### oneAsync
-Find one record with similar syntax to find.
-```javascript
-Person.oneAsync({status:'active'})
-  .then(function(person) {
-    // ...
-  });
-```
-
-#### countAsync
-Get the number of matching records.
-```javascript
-Person.countAsync({status:'active'})
-  .then(function(activePeopleCount) {
-    // ...
-  });
-```
-
-#### existsAsync
-Test a record matching your conditions exists.
-```javascript
-Person.exists({id:1, status:'active'})
-  .then(function(personIsActive) {
-    // ...
-  });
-```
-
-#### Filtering and sorting
-We accept 2 objects to perform filtering (first) and aggregate (second). The aggregate object accepts `limit`, `order`, and `groupBy`.
-
-```javascript
-Person.findAsync({status:'active'}, {limit:10})
-  .then(function(results) {
-    // ...
-  });
-```
-
-#### Conditions for find/count/one etc.
-All comma separated key/values are AND'd together in the query. You may prefix a set of conditions with logical operators.
-```javascript
-Person.findAsync({or:[{col1: 1}, {col2: 2}]})
-  .then(function(res) {
-    // ...
-  });
-```
-
-#### Finding with an `IN`
-`sql-query` (underlying SQL engine) will automatically coerce any array to an `IN` based query.
-
-```javascript
-Person.findAsync({id: [1, 2]})
-  .then(function(persons) {
-    // Finds people with id's 1 and 2 (e.g. `WHERE id IN (1, 2)`)
-  });
-```
--------
-### Creating and Updating Items
-#### createAsync
-```javascript
-var newRecord = {};
-newRecord.id = 1;
-newRecord.name = "John";
-
-Person.createAsync(newRecord)
-  .then(function(results) {
-    // ...
-  });
-```
-
-#### saveAsync
-```js
-    Person.findAsync({ surname: "Doe" })
-      .then(function (people) {
+      // query the person table by surname
+      Person.find({ surname: "Doe" }, function (err, people) {
         // SQL: "SELECT * FROM person WHERE surname = 'Doe'"
+        if (err) throw err;
 
         console.log("People found: %d", people.length);
         console.log("First person: %s, age %d", people[0].fullName(), people[0].age);
 
         people[0].age = 16;
-        return people[0].saveAsync();
-    })
-    .then(function () {
-      // saved
+        people[0].save(function (err) {
+          // err.msg == "under-age";
+        });
+      });
     });
-```
--------
-### Aggregation
-If you need to get some aggregated values from a Model, you can use `Model.aggregate()`. Here's an example to better
-illustrate:
-
-```js
-Person.aggregate({ surname: "Doe" }).min("age").max("age").getAsync()
-  .then(function(result) {
-   var [min, max] = result; // you should use destructuring here
-
-   console.log(min, max);
-  });
-```
-
-An `Array` of properties can be passed to select only a few properties. An `Object` is also accepted to define conditions.
-
-Here's an example to illustrate how to use `.groupBy()`:
-
-```js
-//The same as "select avg(weight), age from person where country='someCountry' group by age;"
-Person.aggregate(["age"], { country: "someCountry" }).avg("weight").groupBy("age").getAsync()
-  .then(function (stats) {
-    // stats is an Array, each item should have 'age' and 'avg_weight'
   });
+});
 ```
 
-### Base `.aggregate()` methods
-
-- `.limit()`: you can pass a number as a limit, or two numbers as offset and limit respectively
-- `.order()`: same as `Model.find().order()`
-
-### Additional `.aggregate()` methods
-
-- `min`
-- `max`
-- `avg`
-- `sum`
-
-There are more aggregate functions depending on the driver (Math functions for example).
-
 -------
 
 ## Express
@@ -482,33 +209,33 @@ Note - using this technique you can have cascading loads.
 ```js
 // your main file (after connecting)
 db.load("./models", function (err) {
-    // loaded!
-    var Person = db.models.person;
-    var Pet    = db.models.pet;
+  // loaded!
+  var Person = db.models.person;
+  var Pet    = db.models.pet;
 });
 
 // models.js
 module.exports = function (db, cb) {
-    db.load("./models-extra", function (err) {
-        if (err) {
-            return cb(err);
-        }
-
-        db.define('person', {
-            name : String
-        });
+  db.load("./models-extra", function (err) {
+    if (err) {
+      return cb(err);
+    }
 
-        return cb();
+    db.define('person', {
+      name : String
     });
+
+    return cb();
+  });
 };
 
 // models-extra.js
 module.exports = function (db, cb) {
-    db.define('pet', {
-        name : String
-    });
+  db.define('pet', {
+      name : String
+  });
 
-    return cb();
+  return cb();
 };
 ```
 
@@ -648,7 +375,7 @@ Here's an example to illustrate how to use `.groupBy()`:
 ```js
 //The same as "select avg(weight), age from person where country='someCountry' group by age;"
 Person.aggregate(["age"], { country: "someCountry" }).avg("weight").groupBy("age").get(function (err, stats) {
-    // stats is an Array, each item should have 'age' and 'avg_weight'
+  // stats is an Array, each item should have 'age' and 'avg_weight'
 });
 ```
 
@@ -700,7 +427,7 @@ You can also chain and just get the count in the end. In this case, offset, limi
 
 ```js
 Person.find({ surname: "Doe" }).count(function (err, people) {
-    // people = number of people with surname="Doe"
+  // people = number of people with surname="Doe"
 });
 ```
 
@@ -709,7 +436,7 @@ Note that a chained remove will not run any hooks.
 
 ```js
 Person.find({ surname: "Doe" }).remove(function (err) {
-    // Does gone..
+  // Does gone..
 });
 ```
 
@@ -1013,19 +740,19 @@ If you have a relation of 1 to n, you should use `hasOne` (belongs to) associati
 
 ```js
 var Person = db.define('person', {
-    name : String
+  name : String
 });
 var Animal = db.define('animal', {
-    name : String
+  name : String
 });
 Animal.hasOne("owner", Person); // creates column 'owner_id' in 'animal' table
 
 // get animal with id = 123
 Animal.get(123, function (err, animal) {
-    // animal is the animal model instance, if found
-    animal.getOwner(function (err, person) {
-        // if animal has really an owner, person points to it
-    });
+  // animal is the animal model instance, if found
+  animal.getOwner(function (err, person) {
+    // if animal has really an owner, person points to it
+  });
 });
 ```
 
@@ -1055,14 +782,14 @@ var Person = db.define('person', {
     name : String
 });
 Person.hasMany("friends", {
-    rate : Number
+  rate : Number
 }, {}, { key: true });
 
 Person.get(123, function (err, John) {
-    John.getFriends(function (err, friends) {
-        // assumes rate is another column on table person_friends
-        // you can access it by going to friends[N].extra.rate
-    });
+  John.getFriends(function (err, friends) {
+    // assumes rate is another column on table person_friends
+    // you can access it by going to friends[N].extra.rate
+  });
 });
 ```
 
@@ -1074,10 +801,10 @@ var Person = db.define('person', {
   name : String
 });
 Person.hasMany("friends", {
-    rate : Number
+  rate : Number
 }, {
-    key       : true, // Turns the foreign keys in the join table into a composite key
-    autoFetch : true
+  key       : true, // Turns the foreign keys in the join table into a composite key
+  autoFetch : true
 });
 
 Person.get(123, function (err, John) {
@@ -1089,12 +816,12 @@ You can also define this option globally instead of a per association basis.
 
 ```js
 var Person = db.define('person', {
-    name : String
+  name : String
 }, {
     autoFetch : true
 });
 Person.hasMany("friends", {
-    rate : Number
+  rate : Number
 }, {
   key: true
 });
@@ -1106,21 +833,21 @@ Confusing? Look at the next example.
 
 ```js
 var Pet = db.define('pet', {
-    name : String
+  name : String
 });
 var Person = db.define('person', {
-    name : String
+  name : String
 });
 Pet.hasOne("owner", Person, {
-    reverse : "pets"
+  reverse : "pets"
 });
 
 Person(4).getPets(function (err, pets) {
-    // although the association was made on Pet,
-    // Person will have an accessor (getPets)
-    //
-    // In this example, ORM will fetch all pets
-    // whose owner_id = 4
+  // although the association was made on Pet,
+  // Person will have an accessor (getPets)
+  //
+  // In this example, ORM will fetch all pets
+  // whose owner_id = 4
 });
 ```
 
@@ -1129,22 +856,44 @@ associations from both sides.
 
 ```js
 var Pet = db.define('pet', {
-    name : String
+  name : String
 });
 var Person = db.define('person', {
-    name : String
+  name : String
 });
 Person.hasMany("pets", Pet, {
-    bought  : Date
+  bought  : Date
 }, {
-    key     : true,
-    reverse : "owners"
+  key     : true,
+  reverse : "owners"
 });
 
 Person(1).getPets(...);
 Pet(2).getOwners(...);
 ```
 
+------
+
+## Promise support
+
+ORM supports Promises via [bluebird](http://bluebirdjs.com/docs/api-reference.html).
+Most methods which accept a callback have a Promise version whith a `Async` postfix.
+Eg:
+```js
+orm.connectAsync().then().catch();
+Person.getAsync(1).then();
+Person.find({ age: 18 }).where("LOWER(surname) LIKE ?", ['dea%']).allAsync( ... );
+Person.aggregate({ surname: "Doe" }).min("age").max("age").getAsync();
+
+```
+The exception here are hooks, which should return a Promise if they perform asynchronous operations:
+```js
+beforeCreate: function () {
+  return new Promise(function(resolve, reject) {
+    doSomeStuff().then(resolve);
+  }
+```
+
 ## Adding external database adapters
 
 To add an external database adapter to `orm`, call the `addAdapter` method, passing in the alias to use for connecting

From 3290f2012d0cb6e96045d6e9fb3c3c3013eab341 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 12 Feb 2019 12:39:59 +0000
Subject: [PATCH 1217/1246] Bump dependency versions to address security
 vulnerabilities

---
 Changelog.md      |   3 +
 package-lock.json | 336 ++++++++++++++++++++++++++--------------------
 package.json      |   6 +-
 3 files changed, 197 insertions(+), 148 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 8726b8a3..4687f1a8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### v5.0.3
+- Update dependencies to address security vulnerabilities
+
 ### v5.0.2
 
 - Fix rare crash when object slips into postgres `escapeValue` ([dresende/node-sql-query#54](https://github.com/dresende/node-sql-query/pull/54)) ([#833](../../pull/833))
diff --git a/package-lock.json b/package-lock.json
index cf52bcdd..ad1c684e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,16 +1,36 @@
 {
 	"name": "orm",
-	"version": "5.0.2",
+	"version": "5.0.3",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
+		"@sinonjs/commons": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.3.0.tgz",
+			"integrity": "sha512-j4ZwhaHmwsCb4DlDOIWnI5YyKDNMoNThsmwEpfHx6a1EpsGZ9qYLxP++LMlmBRjtGptGHFsGItJ768snllFWpA==",
+			"dev": true,
+			"requires": {
+				"type-detect": "4.0.8"
+			}
+		},
 		"@sinonjs/formatio": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz",
-			"integrity": "sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.1.0.tgz",
+			"integrity": "sha512-ZAR2bPHOl4Xg6eklUGpsdiIJ4+J1SNag1DHHrG/73Uz/nVwXqjgUtRPLoS+aVyieN9cSbc0E4LsU984tWcDyNg==",
 			"dev": true,
 			"requires": {
-				"samsam": "1.3.0"
+				"@sinonjs/samsam": "^2 || ^3"
+			}
+		},
+		"@sinonjs/samsam": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.1.0.tgz",
+			"integrity": "sha512-IXio+GWY+Q8XUjHUOgK7wx8fpvr7IFffgyXb1bnJFfX3001KmHt35Zq4tp7MXZyjJPCLPuadesDYNk41LYtVjw==",
+			"dev": true,
+			"requires": {
+				"@sinonjs/commons": "^1.0.2",
+				"array-from": "^2.1.1",
+				"lodash.get": "^4.4.2"
 			}
 		},
 		"abbrev": {
@@ -31,7 +51,7 @@
 			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
 			"dev": true,
 			"requires": {
-				"color-convert": "1.9.2"
+				"color-convert": "^1.9.0"
 			}
 		},
 		"aproba": {
@@ -46,16 +66,22 @@
 			"integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
 			"dev": true,
 			"requires": {
-				"delegates": "1.0.0",
-				"readable-stream": "2.3.3"
+				"delegates": "^1.0.0",
+				"readable-stream": "^2.0.6"
 			}
 		},
+		"array-from": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz",
+			"integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=",
+			"dev": true
+		},
 		"async": {
 			"version": "2.6.1",
 			"resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
 			"integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
 			"requires": {
-				"lodash": "4.17.10"
+				"lodash": "^4.17.10"
 			}
 		},
 		"balanced-match": {
@@ -81,7 +107,7 @@
 			"integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
 			"dev": true,
 			"requires": {
-				"balanced-match": "1.0.0",
+				"balanced-match": "^1.0.0",
 				"concat-map": "0.0.1"
 			}
 		},
@@ -97,7 +123,7 @@
 			"integrity": "sha1-/NoQPybQwHTVpS1Qkn24D9ArSzk=",
 			"dev": true,
 			"requires": {
-				"nan": "1.8.4"
+				"nan": "~1.8"
 			}
 		},
 		"buffer-writer": {
@@ -112,9 +138,9 @@
 			"integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
 			"dev": true,
 			"requires": {
-				"ansi-styles": "3.2.1",
-				"escape-string-regexp": "1.0.5",
-				"supports-color": "5.4.0"
+				"ansi-styles": "^3.2.1",
+				"escape-string-regexp": "^1.0.5",
+				"supports-color": "^5.3.0"
 			}
 		},
 		"chownr": {
@@ -218,7 +244,7 @@
 			"integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
 			"dev": true,
 			"requires": {
-				"minipass": "2.3.3"
+				"minipass": "^2.2.1"
 			}
 		},
 		"fs.realpath": {
@@ -233,14 +259,14 @@
 			"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
 			"dev": true,
 			"requires": {
-				"aproba": "1.2.0",
-				"console-control-strings": "1.1.0",
-				"has-unicode": "2.0.1",
-				"object-assign": "4.1.1",
-				"signal-exit": "3.0.2",
-				"string-width": "1.0.2",
-				"strip-ansi": "3.0.1",
-				"wide-align": "1.1.3"
+				"aproba": "^1.0.3",
+				"console-control-strings": "^1.0.0",
+				"has-unicode": "^2.0.0",
+				"object-assign": "^4.1.0",
+				"signal-exit": "^3.0.0",
+				"string-width": "^1.0.1",
+				"strip-ansi": "^3.0.1",
+				"wide-align": "^1.1.0"
 			}
 		},
 		"glob": {
@@ -249,12 +275,12 @@
 			"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
 			"dev": true,
 			"requires": {
-				"fs.realpath": "1.0.0",
-				"inflight": "1.0.6",
-				"inherits": "2.0.3",
-				"minimatch": "3.0.4",
-				"once": "1.4.0",
-				"path-is-absolute": "1.0.1"
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.0.4",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
 			}
 		},
 		"growl": {
@@ -292,7 +318,7 @@
 			"integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
 			"dev": true,
 			"requires": {
-				"safer-buffer": "2.1.2"
+				"safer-buffer": ">= 2.1.2 < 3"
 			}
 		},
 		"ignore-walk": {
@@ -301,7 +327,7 @@
 			"integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
 			"dev": true,
 			"requires": {
-				"minimatch": "3.0.4"
+				"minimatch": "^3.0.4"
 			}
 		},
 		"inflight": {
@@ -310,8 +336,8 @@
 			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
 			"dev": true,
 			"requires": {
-				"once": "1.4.0",
-				"wrappy": "1.0.2"
+				"once": "^1.3.0",
+				"wrappy": "1"
 			}
 		},
 		"inherits": {
@@ -332,7 +358,7 @@
 			"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
 			"dev": true,
 			"requires": {
-				"number-is-nan": "1.0.1"
+				"number-is-nan": "^1.0.0"
 			}
 		},
 		"isarray": {
@@ -342,9 +368,9 @@
 			"dev": true
 		},
 		"just-extend": {
-			"version": "1.1.27",
-			"resolved": "https://registry.npmjs.org/just-extend/-/just-extend-1.1.27.tgz",
-			"integrity": "sha512-mJVp13Ix6gFo3SBAy9U/kL+oeZqzlYYYLQBwXVBlVzIsZwBqGREnOro24oC/8s8aox+rJhtZ2DiQof++IrkA+g==",
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.0.2.tgz",
+			"integrity": "sha512-FrLwOgm+iXrPV+5zDU6Jqu4gCRXbWEQg2O3SKONsWE4w7AXFRkryS53bpWdaL9cNol+AmR3AEYz6kn+o0fCPnw==",
 			"dev": true
 		},
 		"kerberos": {
@@ -355,9 +381,9 @@
 			"optional": true
 		},
 		"lodash": {
-			"version": "4.17.10",
-			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
-			"integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
+			"version": "4.17.11",
+			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+			"integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
 		},
 		"lodash.get": {
 			"version": "4.4.2",
@@ -366,9 +392,9 @@
 			"dev": true
 		},
 		"lolex": {
-			"version": "2.7.0",
-			"resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.0.tgz",
-			"integrity": "sha512-uJkH2e0BVfU5KOJUevbTOtpDduooSarH5PopO+LfM/vZf8Z9sJzODqKev804JYM2i++ktJfUmC1le4LwFQ1VMg==",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/lolex/-/lolex-3.1.0.tgz",
+			"integrity": "sha512-zFo5MgCJ0rZ7gQg69S4pqBsLURbFw11X68C18OcJjJQbqaXm2NoTrGl1IMM3TIz0/BnN1tIs2tzmmqvCsOMMjw==",
 			"dev": true
 		},
 		"minimatch": {
@@ -377,7 +403,7 @@
 			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
 			"dev": true,
 			"requires": {
-				"brace-expansion": "1.1.8"
+				"brace-expansion": "^1.1.7"
 			}
 		},
 		"minimist": {
@@ -392,8 +418,8 @@
 			"integrity": "sha512-/jAn9/tEX4gnpyRATxgHEOV6xbcyxgT7iUnxo9Y3+OB0zX00TgKIv/2FZCf5brBbICcwbLqVv2ImjvWWrQMSYw==",
 			"dev": true,
 			"requires": {
-				"safe-buffer": "5.1.2",
-				"yallist": "3.0.2"
+				"safe-buffer": "^5.1.2",
+				"yallist": "^3.0.0"
 			},
 			"dependencies": {
 				"safe-buffer": {
@@ -410,7 +436,7 @@
 			"integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==",
 			"dev": true,
 			"requires": {
-				"minipass": "2.3.3"
+				"minipass": "^2.2.1"
 			}
 		},
 		"mkdirp": {
@@ -447,9 +473,9 @@
 			"integrity": "sha1-6wEjlshB1H3GKtNicu6lUOW2l5s=",
 			"dev": true,
 			"requires": {
-				"bson": "0.2.22",
+				"bson": "~0.2",
 				"kerberos": "0.0.4",
-				"readable-stream": "2.3.3"
+				"readable-stream": "^2.3.3"
 			}
 		},
 		"ms": {
@@ -482,9 +508,9 @@
 			"integrity": "sha512-t/ZswCM9JTWjAdXS9VpvqhI2Ct2sL2MdY4fUXqGJaGBk13ge99ObqRksRTbBE56K+wxUXwwfZYOuZHifFW9q+Q==",
 			"dev": true,
 			"requires": {
-				"debug": "2.6.9",
-				"iconv-lite": "0.4.23",
-				"sax": "1.2.4"
+				"debug": "^2.1.2",
+				"iconv-lite": "^0.4.4",
+				"sax": "^1.2.4"
 			},
 			"dependencies": {
 				"debug": {
@@ -499,16 +525,24 @@
 			}
 		},
 		"nise": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/nise/-/nise-1.4.1.tgz",
-			"integrity": "sha512-9JX3YwoIt3kS237scmSSOpEv7vCukVzLfwK0I0XhocDSHUANid8ZHnLEULbbSkfeMn98B2y5kphIWzZUylESRQ==",
+			"version": "1.4.8",
+			"resolved": "https://registry.npmjs.org/nise/-/nise-1.4.8.tgz",
+			"integrity": "sha512-kGASVhuL4tlAV0tvA34yJYZIVihrUt/5bDwpp4tTluigxUr2bBlJeDXmivb6NuEdFkqvdv/Ybb9dm16PSKUhtw==",
 			"dev": true,
 			"requires": {
-				"@sinonjs/formatio": "2.0.0",
-				"just-extend": "1.1.27",
-				"lolex": "2.7.0",
-				"path-to-regexp": "1.7.0",
-				"text-encoding": "0.6.4"
+				"@sinonjs/formatio": "^3.1.0",
+				"just-extend": "^4.0.2",
+				"lolex": "^2.3.2",
+				"path-to-regexp": "^1.7.0",
+				"text-encoding": "^0.6.4"
+			},
+			"dependencies": {
+				"lolex": {
+					"version": "2.7.5",
+					"resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.5.tgz",
+					"integrity": "sha512-l9x0+1offnKKIzYVjyXU2SiwhXDLekRzKyhnbyldPHvC7BvLPVpdNUNR2KeMAiCN2D/kLNttZgQD5WjSxuBx3Q==",
+					"dev": true
+				}
 			}
 		},
 		"node-pre-gyp": {
@@ -517,16 +551,16 @@
 			"integrity": "sha512-16lql9QTqs6KsB9fl3neWyZm02KxIKdI9FlJjrB0y7eMTP5Nyz+xalwPbOlw3iw7EejllJPmlJSnY711PLD1ug==",
 			"dev": true,
 			"requires": {
-				"detect-libc": "1.0.3",
-				"mkdirp": "0.5.1",
-				"needle": "2.2.1",
-				"nopt": "4.0.1",
-				"npm-packlist": "1.1.10",
-				"npmlog": "4.1.2",
-				"rc": "1.2.8",
-				"rimraf": "2.6.2",
-				"semver": "5.5.0",
-				"tar": "4.4.4"
+				"detect-libc": "^1.0.2",
+				"mkdirp": "^0.5.1",
+				"needle": "^2.2.0",
+				"nopt": "^4.0.1",
+				"npm-packlist": "^1.1.6",
+				"npmlog": "^4.0.2",
+				"rc": "^1.2.7",
+				"rimraf": "^2.6.1",
+				"semver": "^5.3.0",
+				"tar": "^4"
 			}
 		},
 		"nopt": {
@@ -535,8 +569,8 @@
 			"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
 			"dev": true,
 			"requires": {
-				"abbrev": "1.1.1",
-				"osenv": "0.1.5"
+				"abbrev": "1",
+				"osenv": "^0.1.4"
 			}
 		},
 		"npm-bundled": {
@@ -551,8 +585,8 @@
 			"integrity": "sha512-AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA==",
 			"dev": true,
 			"requires": {
-				"ignore-walk": "3.0.1",
-				"npm-bundled": "1.0.3"
+				"ignore-walk": "^3.0.1",
+				"npm-bundled": "^1.0.1"
 			}
 		},
 		"npmlog": {
@@ -561,10 +595,10 @@
 			"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
 			"dev": true,
 			"requires": {
-				"are-we-there-yet": "1.1.5",
-				"console-control-strings": "1.1.0",
-				"gauge": "2.7.4",
-				"set-blocking": "2.0.0"
+				"are-we-there-yet": "~1.1.2",
+				"console-control-strings": "~1.1.0",
+				"gauge": "~2.7.3",
+				"set-blocking": "~2.0.0"
 			}
 		},
 		"number-is-nan": {
@@ -585,7 +619,7 @@
 			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
 			"dev": true,
 			"requires": {
-				"wrappy": "1.0.2"
+				"wrappy": "1"
 			}
 		},
 		"os-homedir": {
@@ -606,8 +640,8 @@
 			"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
 			"dev": true,
 			"requires": {
-				"os-homedir": "1.0.2",
-				"os-tmpdir": "1.0.2"
+				"os-homedir": "^1.0.0",
+				"os-tmpdir": "^1.0.0"
 			}
 		},
 		"packet-reader": {
@@ -647,9 +681,9 @@
 				"buffer-writer": "1.0.1",
 				"packet-reader": "0.3.1",
 				"pg-connection-string": "0.1.3",
-				"pg-pool": "2.0.3",
-				"pg-types": "1.12.1",
-				"pgpass": "1.0.2",
+				"pg-pool": "~2.0.3",
+				"pg-types": "~1.12.1",
+				"pgpass": "1.x",
 				"semver": "4.3.2"
 			},
 			"dependencies": {
@@ -679,10 +713,10 @@
 			"integrity": "sha1-1kCH45A7WP+q0nnnWVxSIIoUw9I=",
 			"dev": true,
 			"requires": {
-				"postgres-array": "1.0.2",
-				"postgres-bytea": "1.0.0",
-				"postgres-date": "1.0.3",
-				"postgres-interval": "1.1.1"
+				"postgres-array": "~1.0.0",
+				"postgres-bytea": "~1.0.0",
+				"postgres-date": "~1.0.0",
+				"postgres-interval": "^1.1.0"
 			}
 		},
 		"pgpass": {
@@ -691,7 +725,7 @@
 			"integrity": "sha1-Knu0G2BltnkH6R2hsHwYR8h3swY=",
 			"dev": true,
 			"requires": {
-				"split": "1.0.1"
+				"split": "^1.0.0"
 			}
 		},
 		"postgres-array": {
@@ -718,7 +752,7 @@
 			"integrity": "sha512-OkuCi9t/3CZmeQreutGgx/OVNv9MKHGIT5jH8KldQ4NLYXkvmT9nDVxEuCENlNwhlGPE374oA/xMqn05G49pHA==",
 			"dev": true,
 			"requires": {
-				"xtend": "4.0.1"
+				"xtend": "^4.0.0"
 			}
 		},
 		"process-nextick-args": {
@@ -733,10 +767,10 @@
 			"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
 			"dev": true,
 			"requires": {
-				"deep-extend": "0.6.0",
-				"ini": "1.3.5",
-				"minimist": "1.2.0",
-				"strip-json-comments": "2.0.1"
+				"deep-extend": "^0.6.0",
+				"ini": "~1.3.0",
+				"minimist": "^1.2.0",
+				"strip-json-comments": "~2.0.1"
 			},
 			"dependencies": {
 				"minimist": {
@@ -753,13 +787,13 @@
 			"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
 			"dev": true,
 			"requires": {
-				"core-util-is": "1.0.2",
-				"inherits": "2.0.3",
-				"isarray": "1.0.0",
-				"process-nextick-args": "1.0.7",
-				"safe-buffer": "5.1.1",
-				"string_decoder": "1.0.3",
-				"util-deprecate": "1.0.2"
+				"core-util-is": "~1.0.0",
+				"inherits": "~2.0.3",
+				"isarray": "~1.0.0",
+				"process-nextick-args": "~1.0.6",
+				"safe-buffer": "~5.1.1",
+				"string_decoder": "~1.0.3",
+				"util-deprecate": "~1.0.1"
 			}
 		},
 		"rimraf": {
@@ -768,7 +802,7 @@
 			"integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
 			"dev": true,
 			"requires": {
-				"glob": "7.1.2"
+				"glob": "^7.0.5"
 			}
 		},
 		"safe-buffer": {
@@ -783,12 +817,6 @@
 			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
 			"dev": true
 		},
-		"samsam": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz",
-			"integrity": "sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg==",
-			"dev": true
-		},
 		"sax": {
 			"version": "1.2.4",
 			"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
@@ -813,11 +841,11 @@
 			"integrity": "sha512-l+/NwEMO+DcstsHEwPHRHzC9j4UOE3VQwJGcMWSsD/vqpqHbnQ+1iSHy64Ihmmjx1uiRPD9pFadTSc3MJtXAgw==",
 			"dev": true,
 			"requires": {
-				"should-equal": "2.0.0",
-				"should-format": "3.0.3",
-				"should-type": "1.4.0",
-				"should-type-adaptors": "1.1.0",
-				"should-util": "1.0.0"
+				"should-equal": "^2.0.0",
+				"should-format": "^3.0.3",
+				"should-type": "^1.4.0",
+				"should-type-adaptors": "^1.0.1",
+				"should-util": "^1.0.0"
 			}
 		},
 		"should-equal": {
@@ -826,7 +854,7 @@
 			"integrity": "sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==",
 			"dev": true,
 			"requires": {
-				"should-type": "1.4.0"
+				"should-type": "^1.4.0"
 			}
 		},
 		"should-format": {
@@ -835,8 +863,8 @@
 			"integrity": "sha1-m/yPdPo5IFxT04w01xcwPidxJPE=",
 			"dev": true,
 			"requires": {
-				"should-type": "1.4.0",
-				"should-type-adaptors": "1.1.0"
+				"should-type": "^1.3.0",
+				"should-type-adaptors": "^1.0.1"
 			}
 		},
 		"should-type": {
@@ -851,8 +879,8 @@
 			"integrity": "sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==",
 			"dev": true,
 			"requires": {
-				"should-type": "1.4.0",
-				"should-util": "1.0.0"
+				"should-type": "^1.3.0",
+				"should-util": "^1.0.0"
 			}
 		},
 		"should-util": {
@@ -868,18 +896,29 @@
 			"dev": true
 		},
 		"sinon": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/sinon/-/sinon-6.0.0.tgz",
-			"integrity": "sha512-MatciKXyM5pXMSoqd593MqTsItJNCkSSl53HJYeKR5wfsDdp2yljjUQJLfVwAWLoBNfx1HThteqygGQ0ZEpXpQ==",
+			"version": "7.2.3",
+			"resolved": "https://registry.npmjs.org/sinon/-/sinon-7.2.3.tgz",
+			"integrity": "sha512-i6j7sqcLEqTYqUcMV327waI745VASvYuSuQMCjbAwlpAeuCgKZ3LtrjDxAbu+GjNQR0FEDpywtwGCIh8GicNyg==",
 			"dev": true,
 			"requires": {
-				"@sinonjs/formatio": "2.0.0",
-				"diff": "3.5.0",
-				"lodash.get": "4.4.2",
-				"lolex": "2.7.0",
-				"nise": "1.4.1",
-				"supports-color": "5.4.0",
-				"type-detect": "4.0.8"
+				"@sinonjs/commons": "^1.3.0",
+				"@sinonjs/formatio": "^3.1.0",
+				"@sinonjs/samsam": "^3.0.2",
+				"diff": "^3.5.0",
+				"lolex": "^3.0.0",
+				"nise": "^1.4.8",
+				"supports-color": "^5.5.0"
+			},
+			"dependencies": {
+				"supports-color": {
+					"version": "5.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^3.0.0"
+					}
+				}
 			}
 		},
 		"split": {
@@ -888,7 +927,7 @@
 			"integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
 			"dev": true,
 			"requires": {
-				"through": "2.3.8"
+				"through": "2"
 			}
 		},
 		"sql-ddl-sync": {
@@ -897,6 +936,13 @@
 			"integrity": "sha512-iKY7pFY7qiXoqRK8QZEvcZ9JSVFuD6XiNriHqCbiCYYYWR7DCWyjrwauL1OUYgVCxd6Ehe3+wwgp9ZRQtTux0A==",
 			"requires": {
 				"lodash": "4.17.10"
+			},
+			"dependencies": {
+				"lodash": {
+					"version": "4.17.10",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
+					"integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
+				}
 			}
 		},
 		"sql-query": {
@@ -910,8 +956,8 @@
 			"integrity": "sha512-i8LtU2fdEGFEt4Kcs7eNjYdGmnAQ8zWlaOv6Esbq/jfVfR0Qbn/1dgVyKebrMc2zN7h3oHsqla9zq7AJ0+34ZA==",
 			"dev": true,
 			"requires": {
-				"nan": "2.10.0",
-				"node-pre-gyp": "0.10.2"
+				"nan": "~2.10.0",
+				"node-pre-gyp": "~0.10.1"
 			},
 			"dependencies": {
 				"nan": {
@@ -934,9 +980,9 @@
 			"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
 			"dev": true,
 			"requires": {
-				"code-point-at": "1.1.0",
-				"is-fullwidth-code-point": "1.0.0",
-				"strip-ansi": "3.0.1"
+				"code-point-at": "^1.0.0",
+				"is-fullwidth-code-point": "^1.0.0",
+				"strip-ansi": "^3.0.0"
 			}
 		},
 		"string_decoder": {
@@ -945,7 +991,7 @@
 			"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
 			"dev": true,
 			"requires": {
-				"safe-buffer": "5.1.1"
+				"safe-buffer": "~5.1.0"
 			}
 		},
 		"strip-ansi": {
@@ -954,7 +1000,7 @@
 			"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
 			"dev": true,
 			"requires": {
-				"ansi-regex": "2.1.1"
+				"ansi-regex": "^2.0.0"
 			}
 		},
 		"strip-json-comments": {
@@ -969,7 +1015,7 @@
 			"integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
 			"dev": true,
 			"requires": {
-				"has-flag": "3.0.0"
+				"has-flag": "^3.0.0"
 			}
 		},
 		"tar": {
@@ -978,13 +1024,13 @@
 			"integrity": "sha512-mq9ixIYfNF9SK0IS/h2HKMu8Q2iaCuhDDsZhdEag/FHv8fOaYld4vN7ouMgcSSt5WKZzPs8atclTcJm36OTh4w==",
 			"dev": true,
 			"requires": {
-				"chownr": "1.0.1",
-				"fs-minipass": "1.2.5",
-				"minipass": "2.3.3",
-				"minizlib": "1.1.0",
-				"mkdirp": "0.5.1",
-				"safe-buffer": "5.1.2",
-				"yallist": "3.0.2"
+				"chownr": "^1.0.1",
+				"fs-minipass": "^1.2.5",
+				"minipass": "^2.3.3",
+				"minizlib": "^1.1.0",
+				"mkdirp": "^0.5.0",
+				"safe-buffer": "^5.1.2",
+				"yallist": "^3.0.2"
 			},
 			"dependencies": {
 				"safe-buffer": {
@@ -1025,7 +1071,7 @@
 			"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
 			"dev": true,
 			"requires": {
-				"string-width": "1.0.2"
+				"string-width": "^1.0.2 || 2"
 			}
 		},
 		"wrappy": {
diff --git a/package.json b/package.json
index ff29df8d..057d05aa 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "sqlite",
     "mongodb"
   ],
-  "version": "5.0.2",
+  "version": "5.0.3",
   "license": "MIT",
   "homepage": "http://dresende.github.io/node-orm2",
   "repository": "http://github.com/dresende/node-orm2.git",
@@ -65,7 +65,7 @@
     "bluebird": "3.5.1",
     "enforce": "0.1.7",
     "hat": "0.0.3",
-    "lodash": "4.17.10",
+    "lodash": "^4.17.11",
     "path-is-absolute": "1.0.1",
     "sql-ddl-sync": "0.3.14",
     "sql-query": "0.1.27"
@@ -79,7 +79,7 @@
     "pg": "7.4.3",
     "semver": "5.5.0",
     "should": "13.2.1",
-    "sinon": "6.0.0",
+    "sinon": "7.2.3",
     "sqlite3": "4.0.1"
   },
   "optionalDependencies": {}

From 8625e5fc76b2fa155e3fc77fb127a1a5ed5f9191 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 14 Feb 2019 20:58:05 +0000
Subject: [PATCH 1218/1246] Update package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 057d05aa..a34b6a97 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "hat": "0.0.3",
     "lodash": "^4.17.11",
     "path-is-absolute": "1.0.1",
-    "sql-ddl-sync": "0.3.14",
+    "sql-ddl-sync": "0.3.15",
     "sql-query": "0.1.27"
   },
   "devDependencies": {

From 38249a61a6b642209371db60008e2308b2893006 Mon Sep 17 00:00:00 2001
From: Diogo Resende <dresende@thinkdigital.pt>
Date: Thu, 14 Feb 2019 21:14:13 +0000
Subject: [PATCH 1219/1246] updates package lock

---
 package-lock.json | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ad1c684e..a121b694 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -931,18 +931,11 @@
 			}
 		},
 		"sql-ddl-sync": {
-			"version": "0.3.14",
-			"resolved": "https://registry.npmjs.org/sql-ddl-sync/-/sql-ddl-sync-0.3.14.tgz",
-			"integrity": "sha512-iKY7pFY7qiXoqRK8QZEvcZ9JSVFuD6XiNriHqCbiCYYYWR7DCWyjrwauL1OUYgVCxd6Ehe3+wwgp9ZRQtTux0A==",
+			"version": "0.3.15",
+			"resolved": "https://registry.npmjs.org/sql-ddl-sync/-/sql-ddl-sync-0.3.15.tgz",
+			"integrity": "sha512-MoqSN2THqrKGvVuAvyORC6Q3lu9dGtjpFzG6RKDSN0cOs3JLJMl1JZuIw4UMlefHEe/Whzuc3+ZH0gTlVucBfA==",
 			"requires": {
-				"lodash": "4.17.10"
-			},
-			"dependencies": {
-				"lodash": {
-					"version": "4.17.10",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
-					"integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
-				}
+				"lodash": "4.17.11"
 			}
 		},
 		"sql-query": {

From 3ce8d5a57dd878eb0b5b84335c7a7dbee6685f7f Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 20 Feb 2019 13:59:02 +0000
Subject: [PATCH 1220/1246] Update dependencies to address security

---
 Changelog.md      |  3 +++
 package-lock.json | 10 +++++-----
 package.json      |  4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 4687f1a8..25034bd8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### v5.0.4
+- Update sql-query version to address security vulnerabilities ([841](../../pull/841)
+
 ### v5.0.3
 - Update dependencies to address security vulnerabilities
 
diff --git a/package-lock.json b/package-lock.json
index a121b694..917053f7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "orm",
-	"version": "5.0.3",
+	"version": "5.0.4",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -77,11 +77,11 @@
 			"dev": true
 		},
 		"async": {
-			"version": "2.6.1",
-			"resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
-			"integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
+			"version": "2.6.2",
+			"resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz",
+			"integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
 			"requires": {
-				"lodash": "^4.17.10"
+				"lodash": "^4.17.11"
 			}
 		},
 		"balanced-match": {
diff --git a/package.json b/package.json
index a34b6a97..03ed70e5 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "sqlite",
     "mongodb"
   ],
-  "version": "5.0.3",
+  "version": "5.0.4",
   "license": "MIT",
   "homepage": "http://dresende.github.io/node-orm2",
   "repository": "http://github.com/dresende/node-orm2.git",
@@ -61,7 +61,7 @@
   },
   "analyse": false,
   "dependencies": {
-    "async": "2.6.1",
+    "async": "^2.6.2",
     "bluebird": "3.5.1",
     "enforce": "0.1.7",
     "hat": "0.0.3",

From 85379dcffa6c3f7c706ba83f7f6651844126dc89 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 4 Nov 2019 08:38:47 +0000
Subject: [PATCH 1221/1246] Resolve lodash security issues

---
 package-lock.json | 692 +++++++++++++++++++++++++++++++++++++---------
 package.json      |  14 +-
 2 files changed, 575 insertions(+), 131 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 917053f7..84ab558e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "orm",
-	"version": "5.0.4",
+	"version": "5.0.5",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -39,6 +39,18 @@
 			"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
 			"dev": true
 		},
+		"ajv": {
+			"version": "6.10.2",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
+			"integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+			"dev": true,
+			"requires": {
+				"fast-deep-equal": "^2.0.1",
+				"fast-json-stable-stringify": "^2.0.0",
+				"json-schema-traverse": "^0.4.1",
+				"uri-js": "^4.2.2"
+			}
+		},
 		"ansi-regex": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
@@ -76,24 +88,66 @@
 			"integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=",
 			"dev": true
 		},
+		"asn1": {
+			"version": "0.2.4",
+			"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+			"integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+			"dev": true,
+			"requires": {
+				"safer-buffer": "~2.1.0"
+			}
+		},
+		"assert-plus": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+			"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+			"dev": true
+		},
 		"async": {
-			"version": "2.6.2",
-			"resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz",
-			"integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
+			"version": "2.6.3",
+			"resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+			"integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
 			"requires": {
-				"lodash": "^4.17.11"
+				"lodash": "^4.17.14"
 			}
 		},
+		"asynckit": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+			"dev": true
+		},
+		"aws-sign2": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+			"integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+			"dev": true
+		},
+		"aws4": {
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
+			"integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
+			"dev": true
+		},
 		"balanced-match": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
 			"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
 			"dev": true
 		},
+		"bcrypt-pbkdf": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+			"integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+			"dev": true,
+			"requires": {
+				"tweetnacl": "^0.14.3"
+			}
+		},
 		"bignumber.js": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-4.0.4.tgz",
-			"integrity": "sha512-LDXpJKVzEx2/OqNbG9mXBNvHuiRL4PzHCGfnANHMJ+fv68Ads3exDVJeGDJws+AoNEuca93bU3q+S0woeUaCdg==",
+			"version": "7.2.1",
+			"resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-7.2.1.tgz",
+			"integrity": "sha512-S4XzBk5sMB+Rcb/LNcpzXr57VRTxgAvaAEDAl1AwRx27j00hT84O6OkteE7u8UB3NuaaygCRrEpqox4uDOrbdQ==",
 			"dev": true
 		},
 		"bluebird": {
@@ -127,9 +181,15 @@
 			}
 		},
 		"buffer-writer": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-1.0.1.tgz",
-			"integrity": "sha1-Iqk2kB4wKa/NdUfrRIfOtpejvwg=",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz",
+			"integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==",
+			"dev": true
+		},
+		"caseless": {
+			"version": "0.12.0",
+			"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+			"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
 			"dev": true
 		},
 		"chalk": {
@@ -144,9 +204,9 @@
 			}
 		},
 		"chownr": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
-			"integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=",
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz",
+			"integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==",
 			"dev": true
 		},
 		"code-point-at": {
@@ -170,6 +230,15 @@
 			"integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok=",
 			"dev": true
 		},
+		"combined-stream": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+			"dev": true,
+			"requires": {
+				"delayed-stream": "~1.0.0"
+			}
+		},
 		"commander": {
 			"version": "2.15.1",
 			"resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
@@ -194,6 +263,15 @@
 			"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
 			"dev": true
 		},
+		"dashdash": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+			"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+			"dev": true,
+			"requires": {
+				"assert-plus": "^1.0.0"
+			}
+		},
 		"debug": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
@@ -209,6 +287,12 @@
 			"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
 			"dev": true
 		},
+		"delayed-stream": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+			"dev": true
+		},
 		"delegates": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
@@ -227,6 +311,16 @@
 			"integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
 			"dev": true
 		},
+		"ecc-jsbn": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+			"integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+			"dev": true,
+			"requires": {
+				"jsbn": "~0.1.0",
+				"safer-buffer": "^2.1.0"
+			}
+		},
 		"enforce": {
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/enforce/-/enforce-0.1.7.tgz",
@@ -238,13 +332,54 @@
 			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
 			"dev": true
 		},
+		"extend": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+			"dev": true
+		},
+		"extsprintf": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+			"dev": true
+		},
+		"fast-deep-equal": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+			"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+			"dev": true
+		},
+		"fast-json-stable-stringify": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+			"integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+			"dev": true
+		},
+		"forever-agent": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+			"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+			"dev": true
+		},
+		"form-data": {
+			"version": "2.3.3",
+			"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+			"integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+			"dev": true,
+			"requires": {
+				"asynckit": "^0.4.0",
+				"combined-stream": "^1.0.6",
+				"mime-types": "^2.1.12"
+			}
+		},
 		"fs-minipass": {
-			"version": "1.2.5",
-			"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
-			"integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
+			"version": "1.2.7",
+			"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
+			"integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
 			"dev": true,
 			"requires": {
-				"minipass": "^2.2.1"
+				"minipass": "^2.6.0"
 			}
 		},
 		"fs.realpath": {
@@ -269,6 +404,15 @@
 				"wide-align": "^1.1.0"
 			}
 		},
+		"getpass": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+			"dev": true,
+			"requires": {
+				"assert-plus": "^1.0.0"
+			}
+		},
 		"glob": {
 			"version": "7.1.2",
 			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
@@ -289,6 +433,22 @@
 			"integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
 			"dev": true
 		},
+		"har-schema": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+			"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+			"dev": true
+		},
+		"har-validator": {
+			"version": "5.1.3",
+			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+			"integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+			"dev": true,
+			"requires": {
+				"ajv": "^6.5.5",
+				"har-schema": "^2.0.0"
+			}
+		},
 		"has-flag": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@@ -312,19 +472,30 @@
 			"integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
 			"dev": true
 		},
+		"http-signature": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+			"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+			"dev": true,
+			"requires": {
+				"assert-plus": "^1.0.0",
+				"jsprim": "^1.2.2",
+				"sshpk": "^1.7.0"
+			}
+		},
 		"iconv-lite": {
-			"version": "0.4.23",
-			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
-			"integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
+			"version": "0.4.24",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
 			"dev": true,
 			"requires": {
 				"safer-buffer": ">= 2.1.2 < 3"
 			}
 		},
 		"ignore-walk": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
-			"integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
+			"integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
 			"dev": true,
 			"requires": {
 				"minimatch": "^3.0.4"
@@ -361,12 +532,60 @@
 				"number-is-nan": "^1.0.0"
 			}
 		},
+		"is-typedarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+			"dev": true
+		},
 		"isarray": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
 			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
 			"dev": true
 		},
+		"isstream": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+			"dev": true
+		},
+		"jsbn": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+			"dev": true
+		},
+		"json-schema": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+			"dev": true
+		},
+		"json-schema-traverse": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+			"dev": true
+		},
+		"json-stringify-safe": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+			"dev": true
+		},
+		"jsprim": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+			"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+			"dev": true,
+			"requires": {
+				"assert-plus": "1.0.0",
+				"extsprintf": "1.3.0",
+				"json-schema": "0.2.3",
+				"verror": "1.10.0"
+			}
+		},
 		"just-extend": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.0.2.tgz",
@@ -381,9 +600,9 @@
 			"optional": true
 		},
 		"lodash": {
-			"version": "4.17.11",
-			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-			"integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+			"version": "4.17.15",
+			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+			"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
 		},
 		"lodash.get": {
 			"version": "4.4.2",
@@ -397,6 +616,21 @@
 			"integrity": "sha512-zFo5MgCJ0rZ7gQg69S4pqBsLURbFw11X68C18OcJjJQbqaXm2NoTrGl1IMM3TIz0/BnN1tIs2tzmmqvCsOMMjw==",
 			"dev": true
 		},
+		"mime-db": {
+			"version": "1.40.0",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+			"integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==",
+			"dev": true
+		},
+		"mime-types": {
+			"version": "2.1.24",
+			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+			"integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+			"dev": true,
+			"requires": {
+				"mime-db": "1.40.0"
+			}
+		},
 		"minimatch": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -413,9 +647,9 @@
 			"dev": true
 		},
 		"minipass": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.3.tgz",
-			"integrity": "sha512-/jAn9/tEX4gnpyRATxgHEOV6xbcyxgT7iUnxo9Y3+OB0zX00TgKIv/2FZCf5brBbICcwbLqVv2ImjvWWrQMSYw==",
+			"version": "2.9.0",
+			"resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
+			"integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
 			"dev": true,
 			"requires": {
 				"safe-buffer": "^5.1.2",
@@ -423,20 +657,20 @@
 			},
 			"dependencies": {
 				"safe-buffer": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
+					"integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==",
 					"dev": true
 				}
 			}
 		},
 		"minizlib": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz",
-			"integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==",
+			"version": "1.3.3",
+			"resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
+			"integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
 			"dev": true,
 			"requires": {
-				"minipass": "^2.2.1"
+				"minipass": "^2.9.0"
 			}
 		},
 		"mkdirp": {
@@ -485,15 +719,53 @@
 			"dev": true
 		},
 		"mysql": {
-			"version": "2.15.0",
-			"resolved": "https://registry.npmjs.org/mysql/-/mysql-2.15.0.tgz",
-			"integrity": "sha512-C7tjzWtbN5nzkLIV+E8Crnl9bFyc7d3XJcBAvHKEVkjrYjogz3llo22q6s/hw+UcsE4/844pDob9ac+3dVjQSA==",
+			"version": "2.17.1",
+			"resolved": "https://registry.npmjs.org/mysql/-/mysql-2.17.1.tgz",
+			"integrity": "sha512-7vMqHQ673SAk5C8fOzTG2LpPcf3bNt0oL3sFpxPEEFp1mdlDcrLK0On7z8ZYKaaHrHwNcQ/MTUz7/oobZ2OyyA==",
 			"dev": true,
 			"requires": {
-				"bignumber.js": "4.0.4",
-				"readable-stream": "2.3.3",
-				"safe-buffer": "5.1.1",
-				"sqlstring": "2.3.0"
+				"bignumber.js": "7.2.1",
+				"readable-stream": "2.3.6",
+				"safe-buffer": "5.1.2",
+				"sqlstring": "2.3.1"
+			},
+			"dependencies": {
+				"process-nextick-args": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+					"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "2.3.6",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+					"dev": true,
+					"requires": {
+						"core-util-is": "~1.0.0",
+						"inherits": "~2.0.3",
+						"isarray": "~1.0.0",
+						"process-nextick-args": "~2.0.0",
+						"safe-buffer": "~5.1.1",
+						"string_decoder": "~1.1.1",
+						"util-deprecate": "~1.0.1"
+					}
+				},
+				"safe-buffer": {
+					"version": "5.1.2",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+					"dev": true
+				},
+				"string_decoder": {
+					"version": "1.1.1",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+					"dev": true,
+					"requires": {
+						"safe-buffer": "~5.1.0"
+					}
+				}
 			}
 		},
 		"nan": {
@@ -503,24 +775,30 @@
 			"dev": true
 		},
 		"needle": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/needle/-/needle-2.2.1.tgz",
-			"integrity": "sha512-t/ZswCM9JTWjAdXS9VpvqhI2Ct2sL2MdY4fUXqGJaGBk13ge99ObqRksRTbBE56K+wxUXwwfZYOuZHifFW9q+Q==",
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz",
+			"integrity": "sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==",
 			"dev": true,
 			"requires": {
-				"debug": "^2.1.2",
+				"debug": "^3.2.6",
 				"iconv-lite": "^0.4.4",
 				"sax": "^1.2.4"
 			},
 			"dependencies": {
 				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
 					"dev": true,
 					"requires": {
-						"ms": "2.0.0"
+						"ms": "^2.1.1"
 					}
+				},
+				"ms": {
+					"version": "2.1.2",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+					"dev": true
 				}
 			}
 		},
@@ -546,14 +824,14 @@
 			}
 		},
 		"node-pre-gyp": {
-			"version": "0.10.2",
-			"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.2.tgz",
-			"integrity": "sha512-16lql9QTqs6KsB9fl3neWyZm02KxIKdI9FlJjrB0y7eMTP5Nyz+xalwPbOlw3iw7EejllJPmlJSnY711PLD1ug==",
+			"version": "0.11.0",
+			"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz",
+			"integrity": "sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q==",
 			"dev": true,
 			"requires": {
 				"detect-libc": "^1.0.2",
 				"mkdirp": "^0.5.1",
-				"needle": "^2.2.0",
+				"needle": "^2.2.1",
 				"nopt": "^4.0.1",
 				"npm-packlist": "^1.1.6",
 				"npmlog": "^4.0.2",
@@ -574,15 +852,15 @@
 			}
 		},
 		"npm-bundled": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz",
-			"integrity": "sha512-ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow==",
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz",
+			"integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
 			"dev": true
 		},
 		"npm-packlist": {
-			"version": "1.1.10",
-			"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz",
-			"integrity": "sha512-AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA==",
+			"version": "1.4.6",
+			"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.6.tgz",
+			"integrity": "sha512-u65uQdb+qwtGvEJh/DgQgW1Xg7sqeNbmxYyrvlNznaVTjV3E5P6F/EFjM+BVHXl7JJlsdG8A64M0XI8FI/IOlg==",
 			"dev": true,
 			"requires": {
 				"ignore-walk": "^3.0.1",
@@ -607,6 +885,12 @@
 			"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
 			"dev": true
 		},
+		"oauth-sign": {
+			"version": "0.9.0",
+			"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+			"integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+			"dev": true
+		},
 		"object-assign": {
 			"version": "4.1.1",
 			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -645,9 +929,9 @@
 			}
 		},
 		"packet-reader": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-0.3.1.tgz",
-			"integrity": "sha1-zWLmCvjX/qinBexP+ZCHHEaHHyc=",
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz",
+			"integrity": "sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==",
 			"dev": true
 		},
 		"path-is-absolute": {
@@ -672,17 +956,23 @@
 				}
 			}
 		},
+		"performance-now": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+			"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+			"dev": true
+		},
 		"pg": {
-			"version": "7.4.3",
-			"resolved": "https://registry.npmjs.org/pg/-/pg-7.4.3.tgz",
-			"integrity": "sha1-97b5P1NA7MJZavu5ShPj1rYJg0s=",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/pg/-/pg-7.12.1.tgz",
+			"integrity": "sha512-l1UuyfEvoswYfcUe6k+JaxiN+5vkOgYcVSbSuw3FvdLqDbaoa2RJo1zfJKfPsSYPFVERd4GHvX3s2PjG1asSDA==",
 			"dev": true,
 			"requires": {
-				"buffer-writer": "1.0.1",
-				"packet-reader": "0.3.1",
+				"buffer-writer": "2.0.0",
+				"packet-reader": "1.0.0",
 				"pg-connection-string": "0.1.3",
-				"pg-pool": "~2.0.3",
-				"pg-types": "~1.12.1",
+				"pg-pool": "^2.0.4",
+				"pg-types": "^2.1.0",
 				"pgpass": "1.x",
 				"semver": "4.3.2"
 			},
@@ -701,21 +991,28 @@
 			"integrity": "sha1-2hhHsglA5C7hSSvq9l1J2RskXfc=",
 			"dev": true
 		},
+		"pg-int8": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
+			"integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==",
+			"dev": true
+		},
 		"pg-pool": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-2.0.3.tgz",
-			"integrity": "sha1-wCIDLIlJ8xKk+R+2QJzgQHa+Mlc=",
+			"version": "2.0.7",
+			"resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-2.0.7.tgz",
+			"integrity": "sha512-UiJyO5B9zZpu32GSlP0tXy8J2NsJ9EFGFfz5v6PSbdz/1hBLX1rNiiy5+mAm5iJJYwfCv4A0EBcQLGWwjbpzZw==",
 			"dev": true
 		},
 		"pg-types": {
-			"version": "1.12.1",
-			"resolved": "https://registry.npmjs.org/pg-types/-/pg-types-1.12.1.tgz",
-			"integrity": "sha1-1kCH45A7WP+q0nnnWVxSIIoUw9I=",
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
+			"integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
 			"dev": true,
 			"requires": {
-				"postgres-array": "~1.0.0",
+				"pg-int8": "1.0.1",
+				"postgres-array": "~2.0.0",
 				"postgres-bytea": "~1.0.0",
-				"postgres-date": "~1.0.0",
+				"postgres-date": "~1.0.4",
 				"postgres-interval": "^1.1.0"
 			}
 		},
@@ -729,9 +1026,9 @@
 			}
 		},
 		"postgres-array": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-1.0.2.tgz",
-			"integrity": "sha1-jgsy6wO/d6XAp4UeBEHBaaJWojg=",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
+			"integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
 			"dev": true
 		},
 		"postgres-bytea": {
@@ -741,15 +1038,15 @@
 			"dev": true
 		},
 		"postgres-date": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.3.tgz",
-			"integrity": "sha1-4tiXAu/bJY/52c7g/pG9BpdSV6g=",
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.4.tgz",
+			"integrity": "sha512-bESRvKVuTrjoBluEcpv2346+6kgB7UlnqWZsnbnCccTNq/pqfj1j6oBaN5+b/NrDXepYUT/HKadqv3iS9lJuVA==",
 			"dev": true
 		},
 		"postgres-interval": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.1.1.tgz",
-			"integrity": "sha512-OkuCi9t/3CZmeQreutGgx/OVNv9MKHGIT5jH8KldQ4NLYXkvmT9nDVxEuCENlNwhlGPE374oA/xMqn05G49pHA==",
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
+			"integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
 			"dev": true,
 			"requires": {
 				"xtend": "^4.0.0"
@@ -761,6 +1058,24 @@
 			"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
 			"dev": true
 		},
+		"psl": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz",
+			"integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==",
+			"dev": true
+		},
+		"punycode": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+			"dev": true
+		},
+		"qs": {
+			"version": "6.5.2",
+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+			"integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+			"dev": true
+		},
 		"rc": {
 			"version": "1.2.8",
 			"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@@ -796,13 +1111,65 @@
 				"util-deprecate": "~1.0.1"
 			}
 		},
+		"request": {
+			"version": "2.88.0",
+			"resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+			"integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+			"dev": true,
+			"requires": {
+				"aws-sign2": "~0.7.0",
+				"aws4": "^1.8.0",
+				"caseless": "~0.12.0",
+				"combined-stream": "~1.0.6",
+				"extend": "~3.0.2",
+				"forever-agent": "~0.6.1",
+				"form-data": "~2.3.2",
+				"har-validator": "~5.1.0",
+				"http-signature": "~1.2.0",
+				"is-typedarray": "~1.0.0",
+				"isstream": "~0.1.2",
+				"json-stringify-safe": "~5.0.1",
+				"mime-types": "~2.1.19",
+				"oauth-sign": "~0.9.0",
+				"performance-now": "^2.1.0",
+				"qs": "~6.5.2",
+				"safe-buffer": "^5.1.2",
+				"tough-cookie": "~2.4.3",
+				"tunnel-agent": "^0.6.0",
+				"uuid": "^3.3.2"
+			},
+			"dependencies": {
+				"safe-buffer": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
+					"integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==",
+					"dev": true
+				}
+			}
+		},
 		"rimraf": {
-			"version": "2.6.2",
-			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-			"integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+			"version": "2.7.1",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+			"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
 			"dev": true,
 			"requires": {
-				"glob": "^7.0.5"
+				"glob": "^7.1.3"
+			},
+			"dependencies": {
+				"glob": {
+					"version": "7.1.5",
+					"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.5.tgz",
+					"integrity": "sha512-J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ==",
+					"dev": true,
+					"requires": {
+						"fs.realpath": "^1.0.0",
+						"inflight": "^1.0.4",
+						"inherits": "2",
+						"minimatch": "^3.0.4",
+						"once": "^1.3.0",
+						"path-is-absolute": "^1.0.0"
+					}
+				}
 			}
 		},
 		"safe-buffer": {
@@ -931,11 +1298,11 @@
 			}
 		},
 		"sql-ddl-sync": {
-			"version": "0.3.15",
-			"resolved": "https://registry.npmjs.org/sql-ddl-sync/-/sql-ddl-sync-0.3.15.tgz",
-			"integrity": "sha512-MoqSN2THqrKGvVuAvyORC6Q3lu9dGtjpFzG6RKDSN0cOs3JLJMl1JZuIw4UMlefHEe/Whzuc3+ZH0gTlVucBfA==",
+			"version": "0.3.16",
+			"resolved": "https://registry.npmjs.org/sql-ddl-sync/-/sql-ddl-sync-0.3.16.tgz",
+			"integrity": "sha512-6uiVLN1UAkL2UFpFLjACLYZkzdkPjtRYAgN0jeJWGE/oNzMFabdYZF26IFcXBgobVZ0g8GLagQTI+b9GNKOV2w==",
 			"requires": {
-				"lodash": "4.17.11"
+				"lodash": "~4.17.15"
 			}
 		},
 		"sql-query": {
@@ -944,29 +1311,47 @@
 			"integrity": "sha512-XXK6W6n0D18YspS/7TziKln8ij9RUnpDzl+qr2hUOqEqrhuilGPhbKBYQ1dkfYoQ0ViNtr2y8RKut06nkAkx2w=="
 		},
 		"sqlite3": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.1.tgz",
-			"integrity": "sha512-i8LtU2fdEGFEt4Kcs7eNjYdGmnAQ8zWlaOv6Esbq/jfVfR0Qbn/1dgVyKebrMc2zN7h3oHsqla9zq7AJ0+34ZA==",
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.1.0.tgz",
+			"integrity": "sha512-RvqoKxq+8pDHsJo7aXxsFR18i+dU2Wp5o12qAJOV5LNcDt+fgJsc2QKKg3sIRfXrN9ZjzY1T7SNe/DFVqAXjaw==",
 			"dev": true,
 			"requires": {
-				"nan": "~2.10.0",
-				"node-pre-gyp": "~0.10.1"
+				"nan": "^2.12.1",
+				"node-pre-gyp": "^0.11.0",
+				"request": "^2.87.0"
 			},
 			"dependencies": {
 				"nan": {
-					"version": "2.10.0",
-					"resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
-					"integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
+					"version": "2.14.0",
+					"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+					"integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
 					"dev": true
 				}
 			}
 		},
 		"sqlstring": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.0.tgz",
-			"integrity": "sha1-UluKT9Jtb3GqYegipsr5dtMa0qg=",
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.1.tgz",
+			"integrity": "sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A=",
 			"dev": true
 		},
+		"sshpk": {
+			"version": "1.16.1",
+			"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+			"integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+			"dev": true,
+			"requires": {
+				"asn1": "~0.2.3",
+				"assert-plus": "^1.0.0",
+				"bcrypt-pbkdf": "^1.0.0",
+				"dashdash": "^1.12.0",
+				"ecc-jsbn": "~0.1.1",
+				"getpass": "^0.1.1",
+				"jsbn": "~0.1.0",
+				"safer-buffer": "^2.0.2",
+				"tweetnacl": "~0.14.0"
+			}
+		},
 		"string-width": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -1012,24 +1397,24 @@
 			}
 		},
 		"tar": {
-			"version": "4.4.4",
-			"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.4.tgz",
-			"integrity": "sha512-mq9ixIYfNF9SK0IS/h2HKMu8Q2iaCuhDDsZhdEag/FHv8fOaYld4vN7ouMgcSSt5WKZzPs8atclTcJm36OTh4w==",
+			"version": "4.4.13",
+			"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
+			"integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
 			"dev": true,
 			"requires": {
-				"chownr": "^1.0.1",
+				"chownr": "^1.1.1",
 				"fs-minipass": "^1.2.5",
-				"minipass": "^2.3.3",
-				"minizlib": "^1.1.0",
+				"minipass": "^2.8.6",
+				"minizlib": "^1.2.1",
 				"mkdirp": "^0.5.0",
 				"safe-buffer": "^5.1.2",
-				"yallist": "^3.0.2"
+				"yallist": "^3.0.3"
 			},
 			"dependencies": {
 				"safe-buffer": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
+					"integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==",
 					"dev": true
 				}
 			}
@@ -1046,18 +1431,77 @@
 			"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
 			"dev": true
 		},
+		"tough-cookie": {
+			"version": "2.4.3",
+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+			"integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+			"dev": true,
+			"requires": {
+				"psl": "^1.1.24",
+				"punycode": "^1.4.1"
+			},
+			"dependencies": {
+				"punycode": {
+					"version": "1.4.1",
+					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+					"integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+					"dev": true
+				}
+			}
+		},
+		"tunnel-agent": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+			"dev": true,
+			"requires": {
+				"safe-buffer": "^5.0.1"
+			}
+		},
+		"tweetnacl": {
+			"version": "0.14.5",
+			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+			"dev": true
+		},
 		"type-detect": {
 			"version": "4.0.8",
 			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
 			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
 			"dev": true
 		},
+		"uri-js": {
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+			"integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+			"dev": true,
+			"requires": {
+				"punycode": "^2.1.0"
+			}
+		},
 		"util-deprecate": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
 			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
 			"dev": true
 		},
+		"uuid": {
+			"version": "3.3.3",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
+			"integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==",
+			"dev": true
+		},
+		"verror": {
+			"version": "1.10.0",
+			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+			"dev": true,
+			"requires": {
+				"assert-plus": "^1.0.0",
+				"core-util-is": "1.0.2",
+				"extsprintf": "^1.2.0"
+			}
+		},
 		"wide-align": {
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
@@ -1074,15 +1518,15 @@
 			"dev": true
 		},
 		"xtend": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-			"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+			"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
 			"dev": true
 		},
 		"yallist": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz",
-			"integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+			"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
 			"dev": true
 		}
 	}
diff --git a/package.json b/package.json
index 03ed70e5..21f836be 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "sqlite",
     "mongodb"
   ],
-  "version": "5.0.4",
+  "version": "5.0.5",
   "license": "MIT",
   "homepage": "http://dresende.github.io/node-orm2",
   "repository": "http://github.com/dresende/node-orm2.git",
@@ -61,13 +61,13 @@
   },
   "analyse": false,
   "dependencies": {
-    "async": "^2.6.2",
+    "async": "~2.6.3",
     "bluebird": "3.5.1",
     "enforce": "0.1.7",
     "hat": "0.0.3",
-    "lodash": "^4.17.11",
+    "lodash": "~4.17.15",
     "path-is-absolute": "1.0.1",
-    "sql-ddl-sync": "0.3.15",
+    "sql-ddl-sync": "0.3.16",
     "sql-query": "0.1.27"
   },
   "devDependencies": {
@@ -75,12 +75,12 @@
     "glob": "7.1.2",
     "mocha": "5.2.0",
     "mongodb": "1.4.10",
-    "mysql": "2.15.0",
-    "pg": "7.4.3",
+    "mysql": "2.17.1",
+    "pg": "7.12.1",
     "semver": "5.5.0",
     "should": "13.2.1",
     "sinon": "7.2.3",
-    "sqlite3": "4.0.1"
+    "sqlite3": "4.1.0"
   },
   "optionalDependencies": {}
 }

From c4d3e464757483e9e3f17546c537f3ff806de4e2 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 4 Nov 2019 08:38:56 +0000
Subject: [PATCH 1222/1246] Add node 11+ support

Had to fix a sorting test - see https://github.com/nodejs/node/issues/24294 for details
---
 .travis.yml                          | 2 ++
 Changelog.md                         | 6 +++++-
 lib/ChainInstance.js                 | 4 ++--
 test/integration/model-find-chain.js | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d26902dd..36d92f31 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,8 @@ node_js:
   - '6'
   - '8'
   - '10'
+  - '12'
+  - '13'
 before_script:
   - mysql -e 'create database orm_test;'
   - psql -c 'create database orm_test;' -U postgres
diff --git a/Changelog.md b/Changelog.md
index 25034bd8..9a7274f5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,8 @@
+### v5.0.5
+- Update lodash & sql-ddl-sync version to address security vulnerabilities ([845](../../pull/845)
+- Node 11+ support (stable sort; see https://github.com/nodejs/node/issues/24294 for details)
+- Test against node 12 & 13
+
 ### v5.0.4
 - Update sql-query version to address security vulnerabilities ([841](../../pull/841)
 
@@ -5,7 +10,6 @@
 - Update dependencies to address security vulnerabilities
 
 ### v5.0.2
-
 - Fix rare crash when object slips into postgres `escapeValue` ([dresende/node-sql-query#54](https://github.com/dresende/node-sql-query/pull/54)) ([#833](../../pull/833))
 
 ### v5.0.1
diff --git a/lib/ChainInstance.js b/lib/ChainInstance.js
index d6dba167..b8faa94a 100644
--- a/lib/ChainInstance.js
+++ b/lib/ChainInstance.js
@@ -42,8 +42,8 @@ function ChainInstance(chain, cb) {
 
       return next();
     }),
-    sort: promise(function (cb) {
-      instances.sort(cb);
+    sort: promise(function (sortFn) {
+      instances.sort(sortFn);
 
       return next();
     }),
diff --git a/test/integration/model-find-chain.js b/test/integration/model-find-chain.js
index 75d0f321..0767785d 100644
--- a/test/integration/model-find-chain.js
+++ b/test/integration/model-find-chain.js
@@ -668,7 +668,7 @@ describe("Model.find() chaining", function() {
     describe(".sort()", function () {
       it("should return the items sorted using the sorted function", function (done) {
         Person.find().each().sort(function (first, second) {
-          return (first.age < second.age);
+          return second.age - first.age;
         }).get(function (people) {
           should(Array.isArray(people));
 

From 5b59c98450e24d0978eefd5e579521eb7a2b3985 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 4 Nov 2019 09:59:54 +0000
Subject: [PATCH 1223/1246] Add mysql & postgresql services to travis file

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 36d92f31..83318acd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,3 +12,5 @@ before_script:
   - psql -c 'create database orm_test;' -U postgres
 services:
   - mongodb
+  - mysql
+  - postgresql

From d9079248af36e1f944e33588ca514a5acd8131f7 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 4 Nov 2019 10:09:19 +0000
Subject: [PATCH 1224/1246] Resolve newer mysql version test failures

Previously MySQL silently accepted out of range values (whereas other DBs threw errors).
Newer MySQL versions now exhibit sane behaviour and also throw errors, so a workaround for this in tests can be removed.
---
 test/integration/property-number-size.js | 36 ++----------------------
 1 file changed, 3 insertions(+), 33 deletions(-)

diff --git a/test/integration/property-number-size.js b/test/integration/property-number-size.js
index bf175518..239f8ad4 100644
--- a/test/integration/property-number-size.js
+++ b/test/integration/property-number-size.js
@@ -74,17 +74,7 @@ if (protocol != "sqlite") {
 
       it("should not be able to store int2 values which are too large", function (done) {
         NumberSize.create({ int2 : NumberData.int4 }, function (err, item) {
-          if (protocol == "mysql") {
-            should.equal(err, null);
-
-            return NumberSize.get(item.id, function (err, item) {
-              should(!fuzzyEql(item.int2, NumberData.int4));
-
-              return done();
-            });
-          } else {
-            err.should.be.a.Object();
-          }
+          err.should.be.an.Object();
 
           return done();
         });
@@ -92,17 +82,7 @@ if (protocol != "sqlite") {
 
       it("should not be able to store int4 values which are too large", function (done) {
         NumberSize.create({ int4 : NumberData.int8 }, function (err, item) {
-          if (protocol == "mysql") {
-            should.equal(err, null);
-
-            return NumberSize.get(item.id, function (err, item) {
-              should(!fuzzyEql(item.int4, NumberData.int8));
-
-              return done();
-            });
-          } else {
-            err.should.be.a.Object();
-          }
+          err.should.be.a.Object();
 
           return done();
         });
@@ -110,17 +90,7 @@ if (protocol != "sqlite") {
 
       it("should not be able to store float4 values which are too large", function (done) {
         NumberSize.create({ float4 : NumberData.float8 }, function (err, item) {
-          if (protocol == "mysql") {
-            should.equal(err, null);
-
-            return NumberSize.get(item.id, function (err, item) {
-              should(!fuzzyEql(item.float4, NumberData.float8));
-
-              return done();
-            });
-          } else {
-            err.should.be.a.Object();
-          }
+          err.should.be.a.Object();
 
           return done();
         });

From f62d408cfb0efcece6a4a22f45ab3018cf14e666 Mon Sep 17 00:00:00 2001
From: Oleksandr Shlinchak <oleksandr.shlenchak@travelport.com>
Date: Wed, 19 Feb 2020 15:52:59 +0200
Subject: [PATCH 1225/1246] Add allAsync and whereAsync to chain

---
 lib/ChainFind.js                           |  2 +
 test/integration/model-find-chain-async.js | 48 +++++++++++++++++++++-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/lib/ChainFind.js b/lib/ChainFind.js
index a4df9574..099ede4f 100644
--- a/lib/ChainFind.js
+++ b/lib/ChainFind.js
@@ -259,6 +259,8 @@ function ChainFind(Model, opts) {
   chain.all = chain.where = chain.find;
 
   chain['find' + promiseFunctionPostfix]   = Promise.promisify(chain.find);
+  chain['all' + promiseFunctionPostfix]    = Promise.promisify(chain.all);
+  chain['where' + promiseFunctionPostfix]  = Promise.promisify(chain.where);
   chain['first' + promiseFunctionPostfix]  = Promise.promisify(chain.first);
   chain['last' + promiseFunctionPostfix]   = Promise.promisify(chain.last);
   chain['run' + promiseFunctionPostfix]    = Promise.promisify(chain.run);
diff --git a/test/integration/model-find-chain-async.js b/test/integration/model-find-chain-async.js
index 6c6d5b53..ae220b42 100644
--- a/test/integration/model-find-chain-async.js
+++ b/test/integration/model-find-chain-async.js
@@ -182,4 +182,50 @@ describe("Model.find() chaining", function() {
         });
     });
   });
-});
\ No newline at end of file
+
+  describe(".allAsync()", function () {
+    before(setup());
+
+    it("should return all records without any restriction", function () {
+      return Person.find()
+        .allAsync()
+        .then(function(persons) {
+          should.equal(persons.length, 3);
+        });
+    });
+
+    it("should restrict conditions from pervious chain calls", function () {
+      return Person.find({ age: 18 })
+        .order('-name')
+        .allAsync()
+        .then(function(persons) {
+          should.equal(persons.length, 2);
+          should.equal(persons[0].name, 'John');
+          should.equal(persons[1].name, 'Jane');
+        });
+    });
+  });
+
+  describe(".whereAsync()", function () {
+    before(setup());
+
+    it("should return all records without any restriction", function () {
+      return Person.find()
+        .whereAsync()
+        .then(function(persons) {
+          should.equal(persons.length, 3);
+        });
+    });
+
+    it("should restrict conditions from pervious chain calls", function () {
+      return Person.find({ age: 18 })
+        .order('-name')
+        .whereAsync()
+        .then(function(persons) {
+          should.equal(persons.length, 2);
+          should.equal(persons[0].name, 'John');
+          should.equal(persons[1].name, 'Jane');
+        });
+    });
+  });
+});

From 27a34a8ee335b58e3066771dffa7f9e636e61fb2 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 29 Apr 2021 12:16:36 +0000
Subject: [PATCH 1226/1246] Update packages to resolve security vulnerabilities

---
 .travis.yml                  |   20 +-
 Changelog.md                 |    5 +
 Readme.md                    |    2 +
 package-lock.json            | 1329 +++++++++++++++++++++++++++-------
 package.json                 |   10 +-
 test/common.js               |    2 +-
 test/integration/instance.js |   12 +-
 7 files changed, 1111 insertions(+), 269 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 83318acd..0acdd63b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,24 @@
 sudo: false
 language: node_js
 node_js:
-  - '4'
-  - '6'
-  - '8'
   - '10'
   - '12'
-  - '13'
+  - '14'
+  - '16'
 before_script:
   - mysql -e 'create database orm_test;'
-  - psql -c 'create database orm_test;' -U postgres
+  - sudo sed -i -e '/local.*peer/s/postgres/all/' -e 's/peer\|md5/trust/g' /etc/postgresql/13/main/pg_hba.conf
+  - sudo service postgresql@13-main restart
+  - psql -U postgres -p 5433 -c 'create database orm_test;'
 services:
   - mongodb
   - mysql
-  - postgresql
+addons:
+  postgresql: "13"
+  apt:
+    packages:
+    - postgresql-13
+    - postgresql-client-13
+env:
+  global:
+    - PGPORT=5433
diff --git a/Changelog.md b/Changelog.md
index 9a7274f5..4b7df4b7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,8 @@
+### v5.0.6
+- Update packages to resolve security vulnerabilities
+- Test against modern nodejs versions only [10..16]
+- If using Postgres and Nodejs v14+, you must use `pg` driver >= 8.1. The cause of this is unclear, but tests timeout.
+
 ### v5.0.5
 - Update lodash & sql-ddl-sync version to address security vulnerabilities ([845](../../pull/845)
 - Node 11+ support (stable sort; see https://github.com/nodejs/node/issues/24294 for details)
diff --git a/Readme.md b/Readme.md
index e0bf588f..6ea3d768 100755
--- a/Readme.md
+++ b/Readme.md
@@ -23,6 +23,8 @@ npm install orm
 
 Supported: 4.0 +
 
+If using Nodejs >= 14 & Postgres, you must use `pg` driver >= 8.1. v7 doesn't work correctly (tests time out).
+
 Tests are run on [Travis CI](https://travis-ci.org/)
 If you want you can run tests locally:
 
diff --git a/package-lock.json b/package-lock.json
index 84ab558e..a5f8c317 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "orm",
-	"version": "5.0.5",
+	"version": "5.0.6",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -33,6 +33,12 @@
 				"lodash.get": "^4.4.2"
 			}
 		},
+		"@ungap/promise-all-settled": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
+			"integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
+			"dev": true
+		},
 		"abbrev": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -40,21 +46,28 @@
 			"dev": true
 		},
 		"ajv": {
-			"version": "6.10.2",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-			"integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+			"version": "6.12.6",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
 			"dev": true,
+			"optional": true,
 			"requires": {
-				"fast-deep-equal": "^2.0.1",
+				"fast-deep-equal": "^3.1.1",
 				"fast-json-stable-stringify": "^2.0.0",
 				"json-schema-traverse": "^0.4.1",
 				"uri-js": "^4.2.2"
 			}
 		},
+		"ansi-colors": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+			"integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+			"dev": true
+		},
 		"ansi-regex": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-			"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+			"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
 			"dev": true
 		},
 		"ansi-styles": {
@@ -66,6 +79,16 @@
 				"color-convert": "^1.9.0"
 			}
 		},
+		"anymatch": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+			"integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+			"dev": true,
+			"requires": {
+				"normalize-path": "^3.0.0",
+				"picomatch": "^2.0.4"
+			}
+		},
 		"aproba": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
@@ -82,6 +105,15 @@
 				"readable-stream": "^2.0.6"
 			}
 		},
+		"argparse": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+			"dev": true,
+			"requires": {
+				"sprintf-js": "~1.0.2"
+			}
+		},
 		"array-from": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz",
@@ -93,6 +125,7 @@
 			"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
 			"integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
 			"dev": true,
+			"optional": true,
 			"requires": {
 				"safer-buffer": "~2.1.0"
 			}
@@ -101,7 +134,8 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
 			"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
 		"async": {
 			"version": "2.6.3",
@@ -115,19 +149,22 @@
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
 			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
 		"aws-sign2": {
 			"version": "0.7.0",
 			"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
 			"integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
 		"aws4": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-			"integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
-			"dev": true
+			"version": "1.11.0",
+			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
+			"integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
+			"dev": true,
+			"optional": true
 		},
 		"balanced-match": {
 			"version": "1.0.0",
@@ -140,6 +177,7 @@
 			"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
 			"integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
 			"dev": true,
+			"optional": true,
 			"requires": {
 				"tweetnacl": "^0.14.3"
 			}
@@ -150,6 +188,22 @@
 			"integrity": "sha512-S4XzBk5sMB+Rcb/LNcpzXr57VRTxgAvaAEDAl1AwRx27j00hT84O6OkteE7u8UB3NuaaygCRrEpqox4uDOrbdQ==",
 			"dev": true
 		},
+		"binary-extensions": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+			"integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+			"dev": true
+		},
+		"block-stream": {
+			"version": "0.0.9",
+			"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+			"integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"inherits": "~2.0.0"
+			}
+		},
 		"bluebird": {
 			"version": "3.5.1",
 			"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
@@ -165,6 +219,15 @@
 				"concat-map": "0.0.1"
 			}
 		},
+		"braces": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+			"dev": true,
+			"requires": {
+				"fill-range": "^7.0.1"
+			}
+		},
 		"browser-stdout": {
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
@@ -186,11 +249,18 @@
 			"integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==",
 			"dev": true
 		},
+		"camelcase": {
+			"version": "5.3.1",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+			"dev": true
+		},
 		"caseless": {
 			"version": "0.12.0",
 			"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
 			"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
 		"chalk": {
 			"version": "2.4.1",
@@ -203,12 +273,67 @@
 				"supports-color": "^5.3.0"
 			}
 		},
+		"chokidar": {
+			"version": "3.4.3",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz",
+			"integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==",
+			"dev": true,
+			"requires": {
+				"anymatch": "~3.1.1",
+				"braces": "~3.0.2",
+				"fsevents": "~2.1.2",
+				"glob-parent": "~5.1.0",
+				"is-binary-path": "~2.1.0",
+				"is-glob": "~4.0.1",
+				"normalize-path": "~3.0.0",
+				"readdirp": "~3.5.0"
+			}
+		},
 		"chownr": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz",
-			"integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==",
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+			"integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
 			"dev": true
 		},
+		"cliui": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+			"integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+			"dev": true,
+			"requires": {
+				"string-width": "^3.1.0",
+				"strip-ansi": "^5.2.0",
+				"wrap-ansi": "^5.1.0"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+					"dev": true
+				},
+				"string-width": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+					"dev": true,
+					"requires": {
+						"emoji-regex": "^7.0.1",
+						"is-fullwidth-code-point": "^2.0.0",
+						"strip-ansi": "^5.1.0"
+					}
+				},
+				"strip-ansi": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "^4.1.0"
+					}
+				}
+			}
+		},
 		"code-point-at": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
@@ -235,16 +360,11 @@
 			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
 			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
 			"dev": true,
+			"optional": true,
 			"requires": {
 				"delayed-stream": "~1.0.0"
 			}
 		},
-		"commander": {
-			"version": "2.15.1",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
-			"integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
-			"dev": true
-		},
 		"concat-map": {
 			"version": "0.0.1",
 			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -268,19 +388,26 @@
 			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
 			"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
 			"dev": true,
+			"optional": true,
 			"requires": {
 				"assert-plus": "^1.0.0"
 			}
 		},
 		"debug": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-			"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+			"integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
 			"dev": true,
 			"requires": {
-				"ms": "2.0.0"
+				"ms": "2.1.2"
 			}
 		},
+		"decamelize": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+			"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+			"dev": true
+		},
 		"deep-extend": {
 			"version": "0.6.0",
 			"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
@@ -291,7 +418,8 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
 			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
 		"delegates": {
 			"version": "1.0.0",
@@ -316,11 +444,18 @@
 			"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
 			"integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
 			"dev": true,
+			"optional": true,
 			"requires": {
 				"jsbn": "~0.1.0",
 				"safer-buffer": "^2.1.0"
 			}
 		},
+		"emoji-regex": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+			"integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+			"dev": true
+		},
 		"enforce": {
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/enforce/-/enforce-0.1.7.tgz",
@@ -332,41 +467,78 @@
 			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
 			"dev": true
 		},
+		"esprima": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+			"dev": true
+		},
 		"extend": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
 			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
 		"extsprintf": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
 			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
 		"fast-deep-equal": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-			"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-			"dev": true
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+			"dev": true,
+			"optional": true
 		},
 		"fast-json-stable-stringify": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-			"integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+			"dev": true,
+			"optional": true
+		},
+		"fill-range": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+			"dev": true,
+			"requires": {
+				"to-regex-range": "^5.0.1"
+			}
+		},
+		"find-up": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+			"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+			"dev": true,
+			"requires": {
+				"locate-path": "^6.0.0",
+				"path-exists": "^4.0.0"
+			}
+		},
+		"flat": {
+			"version": "5.0.2",
+			"resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+			"integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
 			"dev": true
 		},
 		"forever-agent": {
 			"version": "0.6.1",
 			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
 			"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
 		"form-data": {
 			"version": "2.3.3",
 			"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
 			"integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
 			"dev": true,
+			"optional": true,
 			"requires": {
 				"asynckit": "^0.4.0",
 				"combined-stream": "^1.0.6",
@@ -388,6 +560,26 @@
 			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
 			"dev": true
 		},
+		"fsevents": {
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+			"integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+			"dev": true,
+			"optional": true
+		},
+		"fstream": {
+			"version": "1.0.12",
+			"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
+			"integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"graceful-fs": "^4.1.2",
+				"inherits": "~2.0.0",
+				"mkdirp": ">=0.5 0",
+				"rimraf": "2"
+			}
+		},
 		"gauge": {
 			"version": "2.7.4",
 			"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
@@ -402,13 +594,57 @@
 				"string-width": "^1.0.1",
 				"strip-ansi": "^3.0.1",
 				"wide-align": "^1.1.0"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+					"dev": true
+				},
+				"is-fullwidth-code-point": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+					"dev": true,
+					"requires": {
+						"number-is-nan": "^1.0.0"
+					}
+				},
+				"string-width": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+					"dev": true,
+					"requires": {
+						"code-point-at": "^1.0.0",
+						"is-fullwidth-code-point": "^1.0.0",
+						"strip-ansi": "^3.0.0"
+					}
+				},
+				"strip-ansi": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "^2.0.0"
+					}
+				}
 			}
 		},
+		"get-caller-file": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+			"dev": true
+		},
 		"getpass": {
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
 			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
 			"dev": true,
+			"optional": true,
 			"requires": {
 				"assert-plus": "^1.0.0"
 			}
@@ -427,6 +663,22 @@
 				"path-is-absolute": "^1.0.0"
 			}
 		},
+		"glob-parent": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+			"integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+			"dev": true,
+			"requires": {
+				"is-glob": "^4.0.1"
+			}
+		},
+		"graceful-fs": {
+			"version": "4.2.4",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+			"integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+			"dev": true,
+			"optional": true
+		},
 		"growl": {
 			"version": "1.10.5",
 			"resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
@@ -437,15 +689,17 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
 			"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
 		"har-validator": {
-			"version": "5.1.3",
-			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-			"integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+			"version": "5.1.5",
+			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+			"integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
 			"dev": true,
+			"optional": true,
 			"requires": {
-				"ajv": "^6.5.5",
+				"ajv": "^6.12.3",
 				"har-schema": "^2.0.0"
 			}
 		},
@@ -467,9 +721,9 @@
 			"integrity": "sha1-uwFKnmSzeIrtgAWRdBPU/z1QLYo="
 		},
 		"he": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
-			"integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+			"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
 			"dev": true
 		},
 		"http-signature": {
@@ -477,6 +731,7 @@
 			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
 			"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
 			"dev": true,
+			"optional": true,
 			"requires": {
 				"assert-plus": "^1.0.0",
 				"jsprim": "^1.2.2",
@@ -518,25 +773,59 @@
 			"dev": true
 		},
 		"ini": {
-			"version": "1.3.5",
-			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-			"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+			"version": "1.3.8",
+			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+			"dev": true
+		},
+		"is-binary-path": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+			"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+			"dev": true,
+			"requires": {
+				"binary-extensions": "^2.0.0"
+			}
+		},
+		"is-extglob": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+			"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
 			"dev": true
 		},
 		"is-fullwidth-code-point": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-			"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+			"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+			"dev": true
+		},
+		"is-glob": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+			"integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
 			"dev": true,
 			"requires": {
-				"number-is-nan": "^1.0.0"
+				"is-extglob": "^2.1.1"
 			}
 		},
+		"is-number": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+			"dev": true
+		},
+		"is-plain-obj": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+			"integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+			"dev": true
+		},
 		"is-typedarray": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
 			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
 		"isarray": {
 			"version": "1.0.0",
@@ -544,41 +833,63 @@
 			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
 			"dev": true
 		},
+		"isexe": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+			"dev": true
+		},
 		"isstream": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
 			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-			"dev": true
+			"dev": true,
+			"optional": true
+		},
+		"js-yaml": {
+			"version": "3.14.0",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
+			"integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
+			"dev": true,
+			"requires": {
+				"argparse": "^1.0.7",
+				"esprima": "^4.0.0"
+			}
 		},
 		"jsbn": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
 			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
 		"json-schema": {
 			"version": "0.2.3",
 			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
 			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
 		"json-schema-traverse": {
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
 			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
 		"json-stringify-safe": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
 			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
 		"jsprim": {
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
 			"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
 			"dev": true,
+			"optional": true,
 			"requires": {
 				"assert-plus": "1.0.0",
 				"extsprintf": "1.3.0",
@@ -599,10 +910,19 @@
 			"dev": true,
 			"optional": true
 		},
+		"locate-path": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+			"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+			"dev": true,
+			"requires": {
+				"p-locate": "^5.0.0"
+			}
+		},
 		"lodash": {
-			"version": "4.17.15",
-			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-			"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+			"version": "4.17.20",
+			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+			"integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
 		},
 		"lodash.get": {
 			"version": "4.4.2",
@@ -610,6 +930,66 @@
 			"integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
 			"dev": true
 		},
+		"log-symbols": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz",
+			"integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==",
+			"dev": true,
+			"requires": {
+				"chalk": "^4.0.0"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "4.3.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+					"dev": true,
+					"requires": {
+						"color-convert": "^2.0.1"
+					}
+				},
+				"chalk": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "^4.1.0",
+						"supports-color": "^7.1.0"
+					}
+				},
+				"color-convert": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+					"dev": true,
+					"requires": {
+						"color-name": "~1.1.4"
+					}
+				},
+				"color-name": {
+					"version": "1.1.4",
+					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+					"dev": true
+				},
+				"has-flag": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "7.2.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^4.0.0"
+					}
+				}
+			}
+		},
 		"lolex": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/lolex/-/lolex-3.1.0.tgz",
@@ -617,18 +997,20 @@
 			"dev": true
 		},
 		"mime-db": {
-			"version": "1.40.0",
-			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
-			"integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==",
-			"dev": true
+			"version": "1.45.0",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz",
+			"integrity": "sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==",
+			"dev": true,
+			"optional": true
 		},
 		"mime-types": {
-			"version": "2.1.24",
-			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
-			"integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+			"version": "2.1.28",
+			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz",
+			"integrity": "sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==",
 			"dev": true,
+			"optional": true,
 			"requires": {
-				"mime-db": "1.40.0"
+				"mime-db": "1.45.0"
 			}
 		},
 		"minimatch": {
@@ -641,9 +1023,9 @@
 			}
 		},
 		"minimist": {
-			"version": "0.0.8",
-			"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-			"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+			"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
 			"dev": true
 		},
 		"minipass": {
@@ -657,9 +1039,9 @@
 			},
 			"dependencies": {
 				"safe-buffer": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
-					"integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==",
+					"version": "5.2.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
 					"dev": true
 				}
 			}
@@ -674,31 +1056,88 @@
 			}
 		},
 		"mkdirp": {
-			"version": "0.5.1",
-			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-			"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+			"version": "0.5.5",
+			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+			"integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
 			"dev": true,
 			"requires": {
-				"minimist": "0.0.8"
+				"minimist": "^1.2.5"
 			}
 		},
 		"mocha": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz",
-			"integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==",
+			"version": "8.2.1",
+			"resolved": "https://registry.npmjs.org/mocha/-/mocha-8.2.1.tgz",
+			"integrity": "sha512-cuLBVfyFfFqbNR0uUKbDGXKGk+UDFe6aR4os78XIrMQpZl/nv7JYHcvP5MFIAb374b2zFXsdgEGwmzMtP0Xg8w==",
 			"dev": true,
 			"requires": {
+				"@ungap/promise-all-settled": "1.1.2",
+				"ansi-colors": "4.1.1",
 				"browser-stdout": "1.3.1",
-				"commander": "2.15.1",
-				"debug": "3.1.0",
-				"diff": "3.5.0",
-				"escape-string-regexp": "1.0.5",
-				"glob": "7.1.2",
+				"chokidar": "3.4.3",
+				"debug": "4.2.0",
+				"diff": "4.0.2",
+				"escape-string-regexp": "4.0.0",
+				"find-up": "5.0.0",
+				"glob": "7.1.6",
 				"growl": "1.10.5",
-				"he": "1.1.1",
+				"he": "1.2.0",
+				"js-yaml": "3.14.0",
+				"log-symbols": "4.0.0",
 				"minimatch": "3.0.4",
-				"mkdirp": "0.5.1",
-				"supports-color": "5.4.0"
+				"ms": "2.1.2",
+				"nanoid": "3.1.12",
+				"serialize-javascript": "5.0.1",
+				"strip-json-comments": "3.1.1",
+				"supports-color": "7.2.0",
+				"which": "2.0.2",
+				"wide-align": "1.1.3",
+				"workerpool": "6.0.2",
+				"yargs": "13.3.2",
+				"yargs-parser": "13.1.2",
+				"yargs-unparser": "2.0.0"
+			},
+			"dependencies": {
+				"diff": {
+					"version": "4.0.2",
+					"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+					"integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+					"dev": true
+				},
+				"escape-string-regexp": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+					"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+					"dev": true
+				},
+				"glob": {
+					"version": "7.1.6",
+					"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+					"integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+					"dev": true,
+					"requires": {
+						"fs.realpath": "^1.0.0",
+						"inflight": "^1.0.4",
+						"inherits": "2",
+						"minimatch": "^3.0.4",
+						"once": "^1.3.0",
+						"path-is-absolute": "^1.0.0"
+					}
+				},
+				"has-flag": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "7.2.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^4.0.0"
+					}
+				}
 			}
 		},
 		"mongodb": {
@@ -713,9 +1152,9 @@
 			}
 		},
 		"ms": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
 			"dev": true
 		},
 		"mysql": {
@@ -774,10 +1213,16 @@
 			"integrity": "sha1-PHa1OC6rM+RLdY0oE8qdkuk0LzQ=",
 			"dev": true
 		},
+		"nanoid": {
+			"version": "3.1.12",
+			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz",
+			"integrity": "sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==",
+			"dev": true
+		},
 		"needle": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz",
-			"integrity": "sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==",
+			"version": "2.6.0",
+			"resolved": "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz",
+			"integrity": "sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==",
 			"dev": true,
 			"requires": {
 				"debug": "^3.2.6",
@@ -786,19 +1231,13 @@
 			},
 			"dependencies": {
 				"debug": {
-					"version": "3.2.6",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+					"version": "3.2.7",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+					"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
 					"dev": true,
 					"requires": {
 						"ms": "^2.1.1"
 					}
-				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-					"dev": true
 				}
 			}
 		},
@@ -823,6 +1262,52 @@
 				}
 			}
 		},
+		"node-addon-api": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.1.0.tgz",
+			"integrity": "sha512-flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw==",
+			"dev": true
+		},
+		"node-gyp": {
+			"version": "3.8.0",
+			"resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
+			"integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"fstream": "^1.0.0",
+				"glob": "^7.0.3",
+				"graceful-fs": "^4.1.2",
+				"mkdirp": "^0.5.0",
+				"nopt": "2 || 3",
+				"npmlog": "0 || 1 || 2 || 3 || 4",
+				"osenv": "0",
+				"request": "^2.87.0",
+				"rimraf": "2",
+				"semver": "~5.3.0",
+				"tar": "^2.0.0",
+				"which": "1"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "5.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+					"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+					"dev": true,
+					"optional": true
+				},
+				"which": {
+					"version": "1.3.1",
+					"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+					"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"isexe": "^2.0.0"
+					}
+				}
+			}
+		},
 		"node-pre-gyp": {
 			"version": "0.11.0",
 			"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz",
@@ -839,32 +1324,81 @@
 				"rimraf": "^2.6.1",
 				"semver": "^5.3.0",
 				"tar": "^4"
+			},
+			"dependencies": {
+				"nopt": {
+					"version": "4.0.3",
+					"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
+					"integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
+					"dev": true,
+					"requires": {
+						"abbrev": "1",
+						"osenv": "^0.1.4"
+					}
+				},
+				"safe-buffer": {
+					"version": "5.2.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+					"dev": true
+				},
+				"tar": {
+					"version": "4.4.13",
+					"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
+					"integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
+					"dev": true,
+					"requires": {
+						"chownr": "^1.1.1",
+						"fs-minipass": "^1.2.5",
+						"minipass": "^2.8.6",
+						"minizlib": "^1.2.1",
+						"mkdirp": "^0.5.0",
+						"safe-buffer": "^5.1.2",
+						"yallist": "^3.0.3"
+					}
+				}
 			}
 		},
 		"nopt": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-			"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+			"version": "3.0.6",
+			"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+			"integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
 			"dev": true,
+			"optional": true,
 			"requires": {
-				"abbrev": "1",
-				"osenv": "^0.1.4"
+				"abbrev": "1"
 			}
 		},
+		"normalize-path": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+			"dev": true
+		},
 		"npm-bundled": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz",
-			"integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz",
+			"integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==",
+			"dev": true,
+			"requires": {
+				"npm-normalize-package-bin": "^1.0.1"
+			}
+		},
+		"npm-normalize-package-bin": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
+			"integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==",
 			"dev": true
 		},
 		"npm-packlist": {
-			"version": "1.4.6",
-			"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.6.tgz",
-			"integrity": "sha512-u65uQdb+qwtGvEJh/DgQgW1Xg7sqeNbmxYyrvlNznaVTjV3E5P6F/EFjM+BVHXl7JJlsdG8A64M0XI8FI/IOlg==",
+			"version": "1.4.8",
+			"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz",
+			"integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==",
 			"dev": true,
 			"requires": {
 				"ignore-walk": "^3.0.1",
-				"npm-bundled": "^1.0.1"
+				"npm-bundled": "^1.0.1",
+				"npm-normalize-package-bin": "^1.0.1"
 			}
 		},
 		"npmlog": {
@@ -889,7 +1423,8 @@
 			"version": "0.9.0",
 			"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
 			"integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
 		"object-assign": {
 			"version": "4.1.1",
@@ -928,12 +1463,42 @@
 				"os-tmpdir": "^1.0.0"
 			}
 		},
+		"p-limit": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+			"dev": true,
+			"requires": {
+				"yocto-queue": "^0.1.0"
+			}
+		},
+		"p-locate": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+			"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+			"dev": true,
+			"requires": {
+				"p-limit": "^3.0.2"
+			}
+		},
+		"p-try": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+			"dev": true
+		},
 		"packet-reader": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz",
 			"integrity": "sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==",
 			"dev": true
 		},
+		"path-exists": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+			"dev": true
+		},
 		"path-is-absolute": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -960,35 +1525,28 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
 			"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
 		"pg": {
-			"version": "7.12.1",
-			"resolved": "https://registry.npmjs.org/pg/-/pg-7.12.1.tgz",
-			"integrity": "sha512-l1UuyfEvoswYfcUe6k+JaxiN+5vkOgYcVSbSuw3FvdLqDbaoa2RJo1zfJKfPsSYPFVERd4GHvX3s2PjG1asSDA==",
+			"version": "8.6.0",
+			"resolved": "https://registry.npmjs.org/pg/-/pg-8.6.0.tgz",
+			"integrity": "sha512-qNS9u61lqljTDFvmk/N66EeGq3n6Ujzj0FFyNMGQr6XuEv4tgNTXvJQTfJdcvGit5p5/DWPu+wj920hAJFI+QQ==",
 			"dev": true,
 			"requires": {
 				"buffer-writer": "2.0.0",
 				"packet-reader": "1.0.0",
-				"pg-connection-string": "0.1.3",
-				"pg-pool": "^2.0.4",
+				"pg-connection-string": "^2.5.0",
+				"pg-pool": "^3.3.0",
+				"pg-protocol": "^1.5.0",
 				"pg-types": "^2.1.0",
-				"pgpass": "1.x",
-				"semver": "4.3.2"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "4.3.2",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-4.3.2.tgz",
-					"integrity": "sha1-x6BxWKgL7dBSNVt3DYLWZA+AO+c=",
-					"dev": true
-				}
+				"pgpass": "1.x"
 			}
 		},
 		"pg-connection-string": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-0.1.3.tgz",
-			"integrity": "sha1-2hhHsglA5C7hSSvq9l1J2RskXfc=",
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.5.0.tgz",
+			"integrity": "sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ==",
 			"dev": true
 		},
 		"pg-int8": {
@@ -998,9 +1556,15 @@
 			"dev": true
 		},
 		"pg-pool": {
-			"version": "2.0.7",
-			"resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-2.0.7.tgz",
-			"integrity": "sha512-UiJyO5B9zZpu32GSlP0tXy8J2NsJ9EFGFfz5v6PSbdz/1hBLX1rNiiy5+mAm5iJJYwfCv4A0EBcQLGWwjbpzZw==",
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.3.0.tgz",
+			"integrity": "sha512-0O5huCql8/D6PIRFAlmccjphLYWC+JIzvUhSzXSpGaf+tjTZc4nn+Lr7mLXBbFJfvwbP0ywDv73EiaBsxn7zdg==",
+			"dev": true
+		},
+		"pg-protocol": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz",
+			"integrity": "sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ==",
 			"dev": true
 		},
 		"pg-types": {
@@ -1017,14 +1581,20 @@
 			}
 		},
 		"pgpass": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.2.tgz",
-			"integrity": "sha1-Knu0G2BltnkH6R2hsHwYR8h3swY=",
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.4.tgz",
+			"integrity": "sha512-YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w==",
 			"dev": true,
 			"requires": {
-				"split": "^1.0.0"
+				"split2": "^3.1.1"
 			}
 		},
+		"picomatch": {
+			"version": "2.2.2",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+			"integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+			"dev": true
+		},
 		"postgres-array": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
@@ -1038,9 +1608,9 @@
 			"dev": true
 		},
 		"postgres-date": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.4.tgz",
-			"integrity": "sha512-bESRvKVuTrjoBluEcpv2346+6kgB7UlnqWZsnbnCccTNq/pqfj1j6oBaN5+b/NrDXepYUT/HKadqv3iS9lJuVA==",
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
+			"integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
 			"dev": true
 		},
 		"postgres-interval": {
@@ -1059,22 +1629,34 @@
 			"dev": true
 		},
 		"psl": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz",
-			"integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==",
-			"dev": true
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+			"integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+			"dev": true,
+			"optional": true
 		},
 		"punycode": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
 			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
 		"qs": {
 			"version": "6.5.2",
 			"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
 			"integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-			"dev": true
+			"dev": true,
+			"optional": true
+		},
+		"randombytes": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+			"dev": true,
+			"requires": {
+				"safe-buffer": "^5.1.0"
+			}
 		},
 		"rc": {
 			"version": "1.2.8",
@@ -1088,10 +1670,10 @@
 				"strip-json-comments": "~2.0.1"
 			},
 			"dependencies": {
-				"minimist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+				"strip-json-comments": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+					"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
 					"dev": true
 				}
 			}
@@ -1111,11 +1693,21 @@
 				"util-deprecate": "~1.0.1"
 			}
 		},
+		"readdirp": {
+			"version": "3.5.0",
+			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
+			"integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
+			"dev": true,
+			"requires": {
+				"picomatch": "^2.2.1"
+			}
+		},
 		"request": {
-			"version": "2.88.0",
-			"resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-			"integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+			"version": "2.88.2",
+			"resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+			"integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
 			"dev": true,
+			"optional": true,
 			"requires": {
 				"aws-sign2": "~0.7.0",
 				"aws4": "^1.8.0",
@@ -1124,7 +1716,7 @@
 				"extend": "~3.0.2",
 				"forever-agent": "~0.6.1",
 				"form-data": "~2.3.2",
-				"har-validator": "~5.1.0",
+				"har-validator": "~5.1.3",
 				"http-signature": "~1.2.0",
 				"is-typedarray": "~1.0.0",
 				"isstream": "~0.1.2",
@@ -1134,19 +1726,32 @@
 				"performance-now": "^2.1.0",
 				"qs": "~6.5.2",
 				"safe-buffer": "^5.1.2",
-				"tough-cookie": "~2.4.3",
+				"tough-cookie": "~2.5.0",
 				"tunnel-agent": "^0.6.0",
 				"uuid": "^3.3.2"
 			},
 			"dependencies": {
 				"safe-buffer": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
-					"integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==",
-					"dev": true
+					"version": "5.2.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+					"dev": true,
+					"optional": true
 				}
 			}
 		},
+		"require-directory": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+			"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+			"dev": true
+		},
+		"require-main-filename": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+			"integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+			"dev": true
+		},
 		"rimraf": {
 			"version": "2.7.1",
 			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -1157,9 +1762,9 @@
 			},
 			"dependencies": {
 				"glob": {
-					"version": "7.1.5",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.5.tgz",
-					"integrity": "sha512-J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ==",
+					"version": "7.1.6",
+					"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+					"integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
 					"dev": true,
 					"requires": {
 						"fs.realpath": "^1.0.0",
@@ -1196,6 +1801,15 @@
 			"integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
 			"dev": true
 		},
+		"serialize-javascript": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
+			"integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+			"dev": true,
+			"requires": {
+				"randombytes": "^2.1.0"
+			}
+		},
 		"set-blocking": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
@@ -1257,9 +1871,9 @@
 			"dev": true
 		},
 		"signal-exit": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-			"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+			"integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
 			"dev": true
 		},
 		"sinon": {
@@ -1288,15 +1902,49 @@
 				}
 			}
 		},
-		"split": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-			"integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
+		"split2": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
+			"integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
 			"dev": true,
 			"requires": {
-				"through": "2"
+				"readable-stream": "^3.0.0"
+			},
+			"dependencies": {
+				"readable-stream": {
+					"version": "3.6.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+					"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+					"dev": true,
+					"requires": {
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
+					}
+				},
+				"safe-buffer": {
+					"version": "5.2.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+					"dev": true
+				},
+				"string_decoder": {
+					"version": "1.3.0",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+					"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+					"dev": true,
+					"requires": {
+						"safe-buffer": "~5.2.0"
+					}
+				}
 			}
 		},
+		"sprintf-js": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+			"dev": true
+		},
 		"sql-ddl-sync": {
 			"version": "0.3.16",
 			"resolved": "https://registry.npmjs.org/sql-ddl-sync/-/sql-ddl-sync-0.3.16.tgz",
@@ -1311,22 +1959,14 @@
 			"integrity": "sha512-XXK6W6n0D18YspS/7TziKln8ij9RUnpDzl+qr2hUOqEqrhuilGPhbKBYQ1dkfYoQ0ViNtr2y8RKut06nkAkx2w=="
 		},
 		"sqlite3": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.1.0.tgz",
-			"integrity": "sha512-RvqoKxq+8pDHsJo7aXxsFR18i+dU2Wp5o12qAJOV5LNcDt+fgJsc2QKKg3sIRfXrN9ZjzY1T7SNe/DFVqAXjaw==",
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.1.tgz",
+			"integrity": "sha512-kh2lTIcYNfmVcvhVJihsYuPj9U0xzBbh6bmqILO2hkryWSC9RRhzYmkIDtJkJ+d8Kg4wZRJ0T1reyHUEspICfg==",
 			"dev": true,
 			"requires": {
-				"nan": "^2.12.1",
-				"node-pre-gyp": "^0.11.0",
-				"request": "^2.87.0"
-			},
-			"dependencies": {
-				"nan": {
-					"version": "2.14.0",
-					"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
-					"integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
-					"dev": true
-				}
+				"node-addon-api": "^3.0.0",
+				"node-gyp": "3.x",
+				"node-pre-gyp": "^0.11.0"
 			}
 		},
 		"sqlstring": {
@@ -1340,6 +1980,7 @@
 			"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
 			"integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
 			"dev": true,
+			"optional": true,
 			"requires": {
 				"asn1": "~0.2.3",
 				"assert-plus": "^1.0.0",
@@ -1353,14 +1994,13 @@
 			}
 		},
 		"string-width": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-			"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+			"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
 			"dev": true,
 			"requires": {
-				"code-point-at": "^1.0.0",
-				"is-fullwidth-code-point": "^1.0.0",
-				"strip-ansi": "^3.0.0"
+				"is-fullwidth-code-point": "^2.0.0",
+				"strip-ansi": "^4.0.0"
 			}
 		},
 		"string_decoder": {
@@ -1373,18 +2013,18 @@
 			}
 		},
 		"strip-ansi": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-			"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+			"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
 			"dev": true,
 			"requires": {
-				"ansi-regex": "^2.0.0"
+				"ansi-regex": "^3.0.0"
 			}
 		},
 		"strip-json-comments": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-			"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
 			"dev": true
 		},
 		"supports-color": {
@@ -1397,26 +2037,15 @@
 			}
 		},
 		"tar": {
-			"version": "4.4.13",
-			"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
-			"integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
+			"version": "2.2.2",
+			"resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
+			"integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
 			"dev": true,
+			"optional": true,
 			"requires": {
-				"chownr": "^1.1.1",
-				"fs-minipass": "^1.2.5",
-				"minipass": "^2.8.6",
-				"minizlib": "^1.2.1",
-				"mkdirp": "^0.5.0",
-				"safe-buffer": "^5.1.2",
-				"yallist": "^3.0.3"
-			},
-			"dependencies": {
-				"safe-buffer": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
-					"integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==",
-					"dev": true
-				}
+				"block-stream": "*",
+				"fstream": "^1.0.12",
+				"inherits": "2"
 			}
 		},
 		"text-encoding": {
@@ -1425,28 +2054,24 @@
 			"integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk=",
 			"dev": true
 		},
-		"through": {
-			"version": "2.3.8",
-			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-			"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-			"dev": true
+		"to-regex-range": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+			"dev": true,
+			"requires": {
+				"is-number": "^7.0.0"
+			}
 		},
 		"tough-cookie": {
-			"version": "2.4.3",
-			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-			"integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+			"integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
 			"dev": true,
+			"optional": true,
 			"requires": {
-				"psl": "^1.1.24",
-				"punycode": "^1.4.1"
-			},
-			"dependencies": {
-				"punycode": {
-					"version": "1.4.1",
-					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-					"integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-					"dev": true
-				}
+				"psl": "^1.1.28",
+				"punycode": "^2.1.1"
 			}
 		},
 		"tunnel-agent": {
@@ -1454,6 +2079,7 @@
 			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
 			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
 			"dev": true,
+			"optional": true,
 			"requires": {
 				"safe-buffer": "^5.0.1"
 			}
@@ -1462,7 +2088,8 @@
 			"version": "0.14.5",
 			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
 			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
 		"type-detect": {
 			"version": "4.0.8",
@@ -1471,10 +2098,11 @@
 			"dev": true
 		},
 		"uri-js": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-			"integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+			"version": "4.4.1",
+			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
 			"dev": true,
+			"optional": true,
 			"requires": {
 				"punycode": "^2.1.0"
 			}
@@ -1486,22 +2114,39 @@
 			"dev": true
 		},
 		"uuid": {
-			"version": "3.3.3",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
-			"integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==",
-			"dev": true
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+			"integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+			"dev": true,
+			"optional": true
 		},
 		"verror": {
 			"version": "1.10.0",
 			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
 			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
 			"dev": true,
+			"optional": true,
 			"requires": {
 				"assert-plus": "^1.0.0",
 				"core-util-is": "1.0.2",
 				"extsprintf": "^1.2.0"
 			}
 		},
+		"which": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+			"dev": true,
+			"requires": {
+				"isexe": "^2.0.0"
+			}
+		},
+		"which-module": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+			"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+			"dev": true
+		},
 		"wide-align": {
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
@@ -1511,6 +2156,51 @@
 				"string-width": "^1.0.2 || 2"
 			}
 		},
+		"workerpool": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.0.2.tgz",
+			"integrity": "sha512-DSNyvOpFKrNusaaUwk+ej6cBj1bmhLcBfj80elGk+ZIo5JSkq+unB1dLKEOcNfJDZgjGICfhQ0Q5TbP0PvF4+Q==",
+			"dev": true
+		},
+		"wrap-ansi": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+			"integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+			"dev": true,
+			"requires": {
+				"ansi-styles": "^3.2.0",
+				"string-width": "^3.0.0",
+				"strip-ansi": "^5.0.0"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+					"dev": true
+				},
+				"string-width": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+					"dev": true,
+					"requires": {
+						"emoji-regex": "^7.0.1",
+						"is-fullwidth-code-point": "^2.0.0",
+						"strip-ansi": "^5.1.0"
+					}
+				},
+				"strip-ansi": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "^4.1.0"
+					}
+				}
+			}
+		},
 		"wrappy": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -1523,11 +2213,148 @@
 			"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
 			"dev": true
 		},
+		"y18n": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
+			"integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
+			"dev": true
+		},
 		"yallist": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
 			"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
 			"dev": true
+		},
+		"yargs": {
+			"version": "13.3.2",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+			"integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+			"dev": true,
+			"requires": {
+				"cliui": "^5.0.0",
+				"find-up": "^3.0.0",
+				"get-caller-file": "^2.0.1",
+				"require-directory": "^2.1.1",
+				"require-main-filename": "^2.0.0",
+				"set-blocking": "^2.0.0",
+				"string-width": "^3.0.0",
+				"which-module": "^2.0.0",
+				"y18n": "^4.0.0",
+				"yargs-parser": "^13.1.2"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+					"dev": true
+				},
+				"find-up": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+					"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+					"dev": true,
+					"requires": {
+						"locate-path": "^3.0.0"
+					}
+				},
+				"locate-path": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+					"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+					"dev": true,
+					"requires": {
+						"p-locate": "^3.0.0",
+						"path-exists": "^3.0.0"
+					}
+				},
+				"p-limit": {
+					"version": "2.3.0",
+					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+					"dev": true,
+					"requires": {
+						"p-try": "^2.0.0"
+					}
+				},
+				"p-locate": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+					"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+					"dev": true,
+					"requires": {
+						"p-limit": "^2.0.0"
+					}
+				},
+				"path-exists": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+					"integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+					"dev": true
+				},
+				"string-width": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+					"dev": true,
+					"requires": {
+						"emoji-regex": "^7.0.1",
+						"is-fullwidth-code-point": "^2.0.0",
+						"strip-ansi": "^5.1.0"
+					}
+				},
+				"strip-ansi": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "^4.1.0"
+					}
+				}
+			}
+		},
+		"yargs-parser": {
+			"version": "13.1.2",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+			"integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+			"dev": true,
+			"requires": {
+				"camelcase": "^5.0.0",
+				"decamelize": "^1.2.0"
+			}
+		},
+		"yargs-unparser": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+			"integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
+			"dev": true,
+			"requires": {
+				"camelcase": "^6.0.0",
+				"decamelize": "^4.0.0",
+				"flat": "^5.0.2",
+				"is-plain-obj": "^2.1.0"
+			},
+			"dependencies": {
+				"camelcase": {
+					"version": "6.2.0",
+					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+					"integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+					"dev": true
+				},
+				"decamelize": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+					"integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
+					"dev": true
+				}
+			}
+		},
+		"yocto-queue": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+			"dev": true
 		}
 	}
 }
diff --git a/package.json b/package.json
index 21f836be..417cd06f 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "sqlite",
     "mongodb"
   ],
-  "version": "5.0.5",
+  "version": "5.0.6",
   "license": "MIT",
   "homepage": "http://dresende.github.io/node-orm2",
   "repository": "http://github.com/dresende/node-orm2.git",
@@ -65,7 +65,7 @@
     "bluebird": "3.5.1",
     "enforce": "0.1.7",
     "hat": "0.0.3",
-    "lodash": "~4.17.15",
+    "lodash": "~4.17.20",
     "path-is-absolute": "1.0.1",
     "sql-ddl-sync": "0.3.16",
     "sql-query": "0.1.27"
@@ -73,14 +73,14 @@
   "devDependencies": {
     "chalk": "2.4.1",
     "glob": "7.1.2",
-    "mocha": "5.2.0",
+    "mocha": "8.2.1",
     "mongodb": "1.4.10",
     "mysql": "2.17.1",
-    "pg": "7.12.1",
+    "pg": "8.6.0",
     "semver": "5.5.0",
     "should": "13.2.1",
     "sinon": "7.2.3",
-    "sqlite3": "4.1.0"
+    "sqlite3": "5.0.1"
   },
   "optionalDependencies": {}
 }
diff --git a/test/common.js b/test/common.js
index 0a6cb74b..98449bbd 100644
--- a/test/common.js
+++ b/test/common.js
@@ -42,7 +42,7 @@ common.getConfig = function () {
         return { user: "root", host: "localhost", database: "orm_test" };
       case 'postgres':
       case 'redshift':
-        return { user: "postgres", host: "localhost", database: "orm_test" };
+        return { user: "postgres", port: 5433, database: "orm_test" };
       case 'sqlite':
         return {};
       case 'mongodb':
diff --git a/test/integration/instance.js b/test/integration/instance.js
index 91e6f9c4..363d7dee 100644
--- a/test/integration/instance.js
+++ b/test/integration/instance.js
@@ -416,7 +416,7 @@ describe("Model instance", function() {
           person.save(function (err) {
             should.exist(err);
             var msg = {
-              postgres : 'invalid input syntax for integer: "NaN"'
+              postgres : 'invalid input syntax for type integer: "NaN"'
             }[protocol];
 
             should.equal(err.message, msg);
@@ -431,7 +431,7 @@ describe("Model instance", function() {
           person.save(function (err) {
             should.exist(err);
             var msg = {
-              postgres : 'invalid input syntax for integer: "Infinity"'
+              postgres : 'invalid input syntax for type integer: "Infinity"'
             }[protocol];
 
             should.equal(err.message, msg);
@@ -446,7 +446,7 @@ describe("Model instance", function() {
           person.save(function (err) {
             should.exist(err);
             var msg = {
-              postgres : 'invalid input syntax for integer: "bugz"'
+              postgres : 'invalid input syntax for type integer: "bugz"'
             }[protocol];
 
             should.equal(err.message, msg);
@@ -466,7 +466,7 @@ describe("Model instance", function() {
           return person.saveAsync()
             .catch(function(err) {
               var msg = {
-                postgres : 'invalid input syntax for integer: "NaN"'
+                postgres : 'invalid input syntax for type integer: "NaN"'
               }[protocol];
 
               should.equal(err.message, msg);
@@ -480,7 +480,7 @@ describe("Model instance", function() {
             .catch(function (err) {
               should.exist(err);
               var msg = {
-                postgres : 'invalid input syntax for integer: "Infinity"'
+                postgres : 'invalid input syntax for type integer: "Infinity"'
               }[protocol];
 
               should.equal(err.message, msg);
@@ -490,7 +490,7 @@ describe("Model instance", function() {
         it("should raise an error for nonsensical integers, for both save & create (promise-based)", function () {
           var person = new Person({ height: 'bugz' });
           var msg = {
-            postgres : 'invalid input syntax for integer: "bugz"'
+            postgres : 'invalid input syntax for type integer: "bugz"'
           }[protocol];
 
           return person.saveAsync()

From c3ed686764e0b7c9f98cd5fed80cd63766a8f79a Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Sat, 22 May 2021 11:34:29 +0000
Subject: [PATCH 1227/1246] Resolve security vulnerabilities

---
 Changelog.md      | 3 +++
 package-lock.json | 8 ++++----
 package.json      | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 4b7df4b7..f2e6c1c4 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### v5.0.7
+- Resolve security vulnerabilities
+
 ### v5.0.6
 - Update packages to resolve security vulnerabilities
 - Test against modern nodejs versions only [10..16]
diff --git a/package-lock.json b/package-lock.json
index a5f8c317..050524ae 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "orm",
-	"version": "5.0.6",
+	"version": "5.0.7",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -920,9 +920,9 @@
 			}
 		},
 		"lodash": {
-			"version": "4.17.20",
-			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-			"integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
+			"version": "4.17.21",
+			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
 		},
 		"lodash.get": {
 			"version": "4.4.2",
diff --git a/package.json b/package.json
index 417cd06f..50e030e1 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "sqlite",
     "mongodb"
   ],
-  "version": "5.0.6",
+  "version": "5.0.7",
   "license": "MIT",
   "homepage": "http://dresende.github.io/node-orm2",
   "repository": "http://github.com/dresende/node-orm2.git",
@@ -65,7 +65,7 @@
     "bluebird": "3.5.1",
     "enforce": "0.1.7",
     "hat": "0.0.3",
-    "lodash": "~4.17.20",
+    "lodash": "^4.17.21",
     "path-is-absolute": "1.0.1",
     "sql-ddl-sync": "0.3.16",
     "sql-query": "0.1.27"

From 8a0e8ac5799228c16cfefde4a69a0438e6042726 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Sat, 22 May 2021 11:39:27 +0000
Subject: [PATCH 1228/1246] Add utf8mb4 test

---
 test/integration/utf8mb4.js | 55 +++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 test/integration/utf8mb4.js

diff --git a/test/integration/utf8mb4.js b/test/integration/utf8mb4.js
new file mode 100644
index 00000000..0bdd24cb
--- /dev/null
+++ b/test/integration/utf8mb4.js
@@ -0,0 +1,55 @@
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var ORM      = require('../../');
+var common   = require('../common');
+
+describe("UTF8mb4", function() {
+  var db = null;
+  var Text;
+
+  var setup = function () {
+    return function (done) {
+      Text = db.define("utf8mb4text", {
+        value: String
+      });
+
+      ORM.singleton.clear();
+
+      return helper.dropSync(Text, function () {
+        Text.create({ value: 'Hello 😃' }, done);
+      });
+    };
+  };
+
+  before(function (done) {
+    var opts = {};
+
+    if (common.protocol() == 'mysql') {
+      opts = { query: { charset: 'utf8mb4' }};
+    }
+
+    helper.connect(opts, function (connection) {
+      db = connection;
+
+      return done();
+    });
+  });
+
+  after(function () {
+    return db.close();
+  });
+
+  describe("strings", function () {
+    before(setup());
+
+    it("should be stored", function (done) {
+      Text.one(function (err, item) {
+        should.equal(err, null);
+        should.exist(item);
+        should.equal(item.value, 'Hello 😃');
+
+        return done();
+      });
+    });
+  });
+});

From c6d5d812227f86026be866233844497cdd4a6492 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Sat, 22 May 2021 11:49:55 +0000
Subject: [PATCH 1229/1246] Create utf8mb4 mysql connection

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0acdd63b..3fd03e41 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ node_js:
   - '14'
   - '16'
 before_script:
-  - mysql -e 'create database orm_test;'
+  - mysql -e 'create database orm_test character set utf8mb4;'
   - sudo sed -i -e '/local.*peer/s/postgres/all/' -e 's/peer\|md5/trust/g' /etc/postgresql/13/main/pg_hba.conf
   - sudo service postgresql@13-main restart
   - psql -U postgres -p 5433 -c 'create database orm_test;'

From 12c515f0d97f885f9d956e0171da83f1c903584f Mon Sep 17 00:00:00 2001
From: dmitry_gorodentcev <dmitry.gorodentcev@elementpay.io>
Date: Thu, 16 Sep 2021 16:18:12 +0700
Subject: [PATCH 1230/1246] Added offset prop for find options

---
 lib/TypeScript/orm.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/TypeScript/orm.d.ts b/lib/TypeScript/orm.d.ts
index 941c5244..7d5d1ec5 100644
--- a/lib/TypeScript/orm.d.ts
+++ b/lib/TypeScript/orm.d.ts
@@ -24,6 +24,7 @@ declare module "orm" {
             find(conditions: { [property: string]: any }, callback: (err: Error, results: Instance[]) => void): Model;
             find(conditions: { [property: string]: any }, options: {
                 limit?: number;
+                offset?: number;
                 order?: any;
             }, callback: (err: Error, results: Instance[]) => void): Model;
             find(conditions: { [property: string]: any }, limit: number, order: string[], callback: (err: Error, results: Instance[]) => void): Model;

From 42e2f6610a5abab0deba512b70f570cfef8ff31b Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Fri, 17 Sep 2021 02:14:28 +0000
Subject: [PATCH 1231/1246] Bump version

---
 Changelog.md      | 3 +++
 package-lock.json | 2 +-
 package.json      | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f2e6c1c4..b0bd8ad3 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### v5.0.8
+- Improve Typescript typings - add offset prop to find options ([850](../../pull/850)
+
 ### v5.0.7
 - Resolve security vulnerabilities
 
diff --git a/package-lock.json b/package-lock.json
index 050524ae..03dd2790 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "orm",
-	"version": "5.0.7",
+	"version": "5.0.8",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
diff --git a/package.json b/package.json
index 50e030e1..dfe63a07 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "sqlite",
     "mongodb"
   ],
-  "version": "5.0.7",
+  "version": "5.0.8",
   "license": "MIT",
   "homepage": "http://dresende.github.io/node-orm2",
   "repository": "http://github.com/dresende/node-orm2.git",

From 4c45cd1f7ede39dbf60d54a1649185fb95014492 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Fri, 22 Oct 2021 08:38:42 +0000
Subject: [PATCH 1232/1246] Add github actions because travis disappeared

---
 .github/workflows/ci.yml                      | 86 ++++++++++++++++++
 .travis.yml                                   | 24 -----
 test/common.js                                | 89 ++++++++++---------
 .../integration/association-hasone-reverse.js |  2 +-
 test/integration/orm-exports.js               | 82 +++++++++--------
 test/integration/property-timezones.js        |  2 +-
 6 files changed, 181 insertions(+), 104 deletions(-)
 create mode 100644 .github/workflows/ci.yml
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..bf7f43d3
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,86 @@
+name: test
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    env:
+      CI: true
+      TZ: utc
+      NODE_ENV: test
+      MYSQL_DB_URL: "mysql://root:root@127.0.0.1:3306/orm_test?"
+      POSTGRES_DB_URL: "postgres://postgres:postgres@127.0.0.1:3306/orm_test?"
+      REDSHIFT_DB_URL: "redshift://postgres:postgres@127.0.0.1:3306/orm_test?"
+      SQLITE_DB_URL: "sqlite://?"
+
+    strategy:
+      matrix:
+        node-version: ['14']
+
+    name: test on nodejs ${{ matrix.node-version }}
+
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_ROOT_PASSWORD: root
+        options: >-
+          --health-cmd="mysqladmin ping"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=3
+        ports:
+          - 3306:3306
+
+      postgres:
+        # Docker Hub image
+        image: postgres
+        # Set health checks to wait until postgres has started
+        env:
+          POSTGRES_PASSWORD: postgres
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+
+    steps:
+      - name: create mysql DB
+        run: mysql -uroot -proot -h 127.0.0.1 --port 3306 -e "CREATE DATABASE orm_test CHARACTER SET utf8mb4;"
+
+      - name: create postgres DB
+        run: psql -U postgres -h 127.0.0.1 -c 'create database orm_test;'
+        env:
+          PGPASSWORD: postgres
+
+      - uses: actions/checkout@v2
+
+      - name: install node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: 'npm'
+      
+      - uses: bahmutov/npm-install@v1
+
+      - name: run tests
+        run: npm run test
+
+  test-success:
+    name: Tests
+    if: ${{ always() }}
+    runs-on: ubuntu-latest
+    needs: test
+    steps:
+      - name: Check build matrix status
+        if: ${{ needs.test.result != 'success' }}
+        run: exit 1
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 3fd03e41..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-sudo: false
-language: node_js
-node_js:
-  - '10'
-  - '12'
-  - '14'
-  - '16'
-before_script:
-  - mysql -e 'create database orm_test character set utf8mb4;'
-  - sudo sed -i -e '/local.*peer/s/postgres/all/' -e 's/peer\|md5/trust/g' /etc/postgresql/13/main/pg_hba.conf
-  - sudo service postgresql@13-main restart
-  - psql -U postgres -p 5433 -c 'create database orm_test;'
-services:
-  - mongodb
-  - mysql
-addons:
-  postgresql: "13"
-  apt:
-    packages:
-    - postgresql-13
-    - postgresql-client-13
-env:
-  global:
-    - PGPORT=5433
diff --git a/test/common.js b/test/common.js
index 98449bbd..d901ee91 100644
--- a/test/common.js
+++ b/test/common.js
@@ -2,6 +2,7 @@ var common      = exports;
 var path        = require('path');
 var async       = require('async');
 var _           = require('lodash');
+var url         = require("url");
 var util        = require('util');
 var querystring = require('querystring');
 var Semver      = require('semver');
@@ -13,8 +14,8 @@ common.protocol = function () {
   return process.env.ORM_PROTOCOL;
 };
 
-common.isTravis = function() {
-  return Boolean(process.env.CI);
+common.isCI = function() {
+  return !!process.env.CI;
 };
 
 common.createConnection = function(opts, cb) {
@@ -24,7 +25,7 @@ common.createConnection = function(opts, cb) {
 common.hasConfig = function (proto) {
   var config;
 
-  if (common.isTravis()) return 'found';
+  if (common.isCI()) return 'found';
 
   try {
     config = require("./config");
@@ -35,47 +36,47 @@ common.hasConfig = function (proto) {
   return (config.hasOwnProperty(proto) ? 'found' : 'not-defined');
 };
 
-common.getConfig = function () {
-  if (common.isTravis()) {
-    switch (this.protocol()) {
-      case 'mysql':
-        return { user: "root", host: "localhost", database: "orm_test" };
-      case 'postgres':
-      case 'redshift':
-        return { user: "postgres", port: 5433, database: "orm_test" };
-      case 'sqlite':
-        return {};
-      case 'mongodb':
-        return { host: "localhost", database: "test" };
-      default:
-        throw new Error("Unknown protocol");
-    }
-  } else {
-    var config = require("./config")[this.protocol()];
-    if (typeof config == "string") {
-      config = require("url").parse(config);
-    }
-    if (config.hasOwnProperty("auth")) {
-      if (config.auth.indexOf(":") >= 0) {
-        config.user = config.auth.substr(0, config.auth.indexOf(":"));
-        config.password = config.auth.substr(config.auth.indexOf(":") + 1);
-      } else {
-        config.user = config.auth;
-        config.password = "";
-      }
-    }
-    if (config.hostname) {
-      config.host = config.hostname;
-    }
+common.parseConnectionString = function (connString) {
+  const config = url.parse(connString);
 
-    return config;
+  if (config.auth) {
+    if (config.auth.indexOf(":") >= 0) {
+      config.user = config.auth.substr(0, config.auth.indexOf(":"));
+      config.password = config.auth.substr(config.auth.indexOf(":") + 1);
+    } else {
+      config.user = config.auth;
+      config.password = "";
+    }
+  }
+  if (config.hostname) {
+    config.host = config.hostname;
+  }
+  if (config.pathname) {
+    config.database = config.pathname.slice(1);
   }
+
+  return config;
 };
 
 common.getConnectionString = function (opts) {
-  var config   = this.getConfig();
-  var protocol = this.protocol();
-  var query;
+  let protocol = this.protocol();
+  const dbEnvVar = `${protocol.toUpperCase()}_DB_URL`;
+  const dbEnvConnString = process.env[dbEnvVar];
+
+  let config;
+  let query;
+
+  if (dbEnvConnString) {
+    config = common.parseConnectionString(dbEnvConnString);
+  } else {
+    const testDBConfig = require("./config")[this.protocol()];
+
+    if (typeof config == "string") {
+      config = common.parseConnectionString(testDBConfig);
+    } else {
+      config = _.cloneDeep(testDBConfig);
+    }
+  }
 
   _.defaults(config, {
     user     : { postgres: 'postgres', redshift: 'postgres', mongodb: '' }[protocol] || 'root',
@@ -94,10 +95,12 @@ common.getConnectionString = function (opts) {
     case 'postgres':
     case 'redshift':
     case 'mongodb':
-      if (common.isTravis()) {
+      if (common.isCI()) {
         if (protocol == 'redshift') protocol = 'postgres';
+        const auth = [config.user, config.password].join(':');
+
         return util.format("%s://%s@%s/%s?%s",
-          protocol, config.user, config.host, config.database, query
+          protocol, auth, config.host, config.database, query
         );
       } else {
         return util.format("%s://%s:%s@%s/%s?%s",
@@ -112,6 +115,10 @@ common.getConnectionString = function (opts) {
   }
 };
 
+common.getConnectionConfig = function (opts) {
+  return common.parseConnectionString(common.getConnectionString(opts));
+}
+
 common.retry = function (before, run, until, done, args) {
   if (typeof until === "number") {
     var countDown = until;
diff --git a/test/integration/association-hasone-reverse.js b/test/integration/association-hasone-reverse.js
index bb215182..433b1b20 100644
--- a/test/integration/association-hasone-reverse.js
+++ b/test/integration/association-hasone-reverse.js
@@ -222,7 +222,7 @@ describe("hasOne", function () {
             should.equal(Array.isArray(pets), true);
 
             // This often fails for sqlite on travis
-            if (common.isTravis() && common.protocol() != 'sqlite') {
+            if (common.isCI() && common.protocol() != 'sqlite') {
               should.equal(pets.length, 1);
               should.equal(pets[0].name, 'Deco');
             }
diff --git a/test/integration/orm-exports.js b/test/integration/orm-exports.js
index 9fa4871e..3338885c 100644
--- a/test/integration/orm-exports.js
+++ b/test/integration/orm-exports.js
@@ -182,7 +182,7 @@ describe("ORM", function() {
             });
         });
 
-        it("should understand pool `'true'` from query string", function () {
+        it("should understand pool `'1'` from query string", function () {
           var connString = connStr + "debug=1&pool=1";
           return ORM.connectAsync(connString)
             .then(function (db) {
@@ -191,32 +191,36 @@ describe("ORM", function() {
             });
         });
 
-        it("should understand pool `'true'` from query string", function () {
-          var connCopy = _.cloneDeep(common.getConfig());
-          var connOpts = _.extend(connCopy, {
-            protocol: common.protocol(),
-            query: {
-              pool: true, debug: true
+        it("should understand pool `'true'` from connection object", function () {
+          const config = _.extend(
+            common.parseConnectionString(connStr),
+            {
+              protocol: common.protocol(),
+              query: {
+                pool: true, debug: true
+              }
             }
-          });
+          );
 
-          return ORM.connectAsync(connOpts)
+          return ORM.connectAsync(config)
             .then(function (db) {
               should.strictEqual(db.driver.opts.pool,  true);
               should.strictEqual(db.driver.opts.debug, true);
             });
         });
 
-        it("should understand pool `false` from query options", function () {
-          var connCopy = _.cloneDeep(common.getConfig());
-          var connOpts = _.extend(connCopy, {
-            protocol: common.protocol(),
-            query: {
-              pool: false, debug: false
+        it("should understand pool `false` from connection options", function () {
+          const config = _.extend(
+            common.parseConnectionString(connStr),
+            {
+              protocol: common.protocol(),
+              query: {
+                pool: false, debug: false
+              }
             }
-          });
+          );
 
-          return ORM.connectAsync(connOpts)
+          return ORM.connectAsync(config)
             .then(function (db) {
               should.strictEqual(db.driver.opts.pool,  false);
               should.strictEqual(db.driver.opts.debug, false);
@@ -362,7 +366,7 @@ describe("ORM", function() {
       db.on("connect", function (err) {
         should.not.exist(err);
 
-        return done();
+        db.close(done);
       });
     });
 
@@ -382,9 +386,7 @@ describe("ORM", function() {
       });
 
       it("should be able to ping the server", function (done) {
-        db.ping(function () {
-          return done();
-        });
+        db.ping(done);
       });
 
       it("should be able to pingAsync the server", function () {
@@ -473,15 +475,18 @@ describe("ORM", function() {
           });
         });
 
-        it("should understand pool `true` from query options", function (done) {
-          var connCopy = _.cloneDeep(common.getConfig());
-          var connOpts = _.extend(connCopy, {
-            protocol: common.protocol(),
-            query: {
-              pool: true, debug: true
+        it("should understand pool `true` from connection options", function (done) {
+          const config = _.extend(
+            common.parseConnectionString(connStr),
+            {
+              protocol: common.protocol(),
+              query: {
+                pool: true, debug: true
+              }
             }
-          });
-          ORM.connect(connOpts, function (err, db) {
+          );
+
+          ORM.connect(config, function (err, db) {
             should.not.exist(err);
             should.strictEqual(db.driver.opts.pool,  true);
             should.strictEqual(db.driver.opts.debug, true);
@@ -489,15 +494,18 @@ describe("ORM", function() {
           });
         });
 
-        it("should understand pool `false` from query options", function (done) {
-          var connCopy = _.cloneDeep(common.getConfig());
-          var connOpts = _.extend(connCopy, {
-            protocol: common.protocol(),
-            query: {
-              pool: false, debug: false
+        it("should understand pool `false` from connection options", function (done) {
+          const config = _.extend(
+            common.parseConnectionString(connStr),
+            {
+              protocol: common.protocol(),
+              query: {
+                pool: false, debug: false
+              }
             }
-          });
-          ORM.connect(connOpts, function (err, db) {
+          );
+
+          ORM.connect(config, function (err, db) {
             should.not.exist(err);
             should.strictEqual(db.driver.opts.pool,  false);
             should.strictEqual(db.driver.opts.debug, false);
diff --git a/test/integration/property-timezones.js b/test/integration/property-timezones.js
index 88fea8c7..79e1a6c0 100644
--- a/test/integration/property-timezones.js
+++ b/test/integration/property-timezones.js
@@ -4,7 +4,7 @@ var common   = require('../common');
 var ORM      = require('../../');
 
 if (common.protocol() == "mongodb") return;
-if (common.protocol() == "sqlite" && !common.getConfig().pathname) {
+if (common.protocol() == "sqlite" && !common.getConnectionConfig().pathname) {
   // sqlite needs a pathname for this test (because of reconnecting)
   // if using memory, when disconnecting everything is lost and this
   // test needs it

From 8f99b196de6bb152743412c5bb8882ba79a91e41 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Fri, 22 Oct 2021 08:09:03 +0000
Subject: [PATCH 1233/1246] Add async versions of driver functions

---
 Changelog.md                              |   3 +
 lib/Drivers/DML/_utils.js                 |  11 +
 lib/Drivers/DML/mongodb.js                |   5 +
 lib/Drivers/DML/mysql.js                  |   3 +
 lib/Drivers/DML/postgres.js               |  16 +-
 lib/Drivers/DML/redshift.js               |   2 +
 lib/Drivers/DML/sqlite.js                 |  17 +-
 package-lock.json                         | 917 ++++++++--------------
 package.json                              |  22 +-
 test/common.js                            |   2 +-
 test/integration/drivers/mysql_spec.js    | 200 +++++
 test/integration/drivers/postgres_spec.js | 190 ++++-
 test/integration/drivers/sqlite_spec.js   | 215 ++++-
 13 files changed, 991 insertions(+), 612 deletions(-)
 create mode 100644 lib/Drivers/DML/_utils.js
 create mode 100644 test/integration/drivers/mysql_spec.js

diff --git a/Changelog.md b/Changelog.md
index b0bd8ad3..18cddeca 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### v5.0.9
+- Add async versions of driver functions ([851](../../pull/851)
+
 ### v5.0.8
 - Improve Typescript typings - add offset prop to find options ([850](../../pull/850)
 
diff --git a/lib/Drivers/DML/_utils.js b/lib/Drivers/DML/_utils.js
new file mode 100644
index 00000000..686244b9
--- /dev/null
+++ b/lib/Drivers/DML/_utils.js
@@ -0,0 +1,11 @@
+var Promise  = require("bluebird");
+
+function promisifyFunctions (target, functions) {
+  functions.forEach(function (fnName) {
+    target[fnName + 'Async'] = Promise.promisify(target[fnName]);
+  });
+};
+
+module.exports = {
+  promisifyFunctions: promisifyFunctions,
+};
diff --git a/lib/Drivers/DML/mongodb.js b/lib/Drivers/DML/mongodb.js
index b9d25b58..a2a417e7 100644
--- a/lib/Drivers/DML/mongodb.js
+++ b/lib/Drivers/DML/mongodb.js
@@ -1,5 +1,6 @@
 var Utilities = require("../../Utilities");
 var mongodb   = require("mongodb");
+var Promise   = require("bluebird");
 var util      = require("util");
 var _         = require('lodash');
 
@@ -440,6 +441,10 @@ function convertToDBVal(key, value, timezone) {
   return value;
 }
 
+['ping', 'find', 'count', 'insert', 'update', 'remove', 'clear',].forEach(function (fnName) {
+  Driver.prototype[fnName + 'Async'] = Promise.promisify(Driver.prototype[fnName]);
+});
+
 Object.defineProperty(Driver.prototype, "isSql", {
     value: false
 });
diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
index 095b3f40..51bf0213 100644
--- a/lib/Drivers/DML/mysql.js
+++ b/lib/Drivers/DML/mysql.js
@@ -2,6 +2,7 @@ var _       = require("lodash");
 var mysql   = require("mysql");
 var Query   = require("sql-query").Query;
 var shared  = require("./_shared");
+var utils   = require("./_utils");
 var DDL     = require("../DDL/SQL");
 
 exports.Driver = Driver;
@@ -290,6 +291,8 @@ Driver.prototype.propertyToValue = function (value, property) {
   return value;
 };
 
+utils.promisifyFunctions(Driver.prototype, ['ping', 'execSimpleQuery', 'find', 'count', 'insert', 'update', 'remove', 'clear']);
+
 Object.defineProperty(Driver.prototype, "isSql", {
     value: true
 });
diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
index 0ed52697..4d245b1c 100644
--- a/lib/Drivers/DML/postgres.js
+++ b/lib/Drivers/DML/postgres.js
@@ -1,8 +1,10 @@
-var _       = require("lodash");
-var pg      = require("pg");
-var Query   = require("sql-query").Query;
-var shared  = require("./_shared");
-var DDL     = require("../DDL/SQL");
+var _        = require("lodash");
+var Promise  = require("bluebird");
+var pg       = require("pg");
+var Query    = require("sql-query").Query;
+var shared   = require("./_shared");
+var utils   = require("./_utils");
+var DDL      = require("../DDL/SQL");
 
 exports.Driver = Driver;
 
@@ -95,6 +97,8 @@ function Driver(config, connection, opts) {
 
   _.extend(this.constructor.prototype, functions);
 
+  this.constructor.prototype.execSimpleQueryAsync = Promise.promisify(this.constructor.prototype.execSimpleQuery);
+
   this.aggregate_functions = [
     "ABS", "CEIL", "FLOOR", "ROUND",
     "AVG", "MIN", "MAX",
@@ -342,6 +346,8 @@ Driver.prototype.propertyToValue = function (value, property) {
   return value;
 };
 
+utils.promisifyFunctions(Driver.prototype, ['ping', 'find', 'count', 'insert', 'update', 'remove', 'clear']);
+
 Object.defineProperty(Driver.prototype, "isSql", {
     value: true
 });
diff --git a/lib/Drivers/DML/redshift.js b/lib/Drivers/DML/redshift.js
index 7c760938..1fe08343 100644
--- a/lib/Drivers/DML/redshift.js
+++ b/lib/Drivers/DML/redshift.js
@@ -1,3 +1,4 @@
+var Promise  = require("bluebird");
 var util     = require("util");
 var postgres = require("./postgres");
 
@@ -42,3 +43,4 @@ Driver.prototype.insert = function (table, data, keyProperties, cb) {
     }
   }.bind(this));
 };
+Driver.prototype.insertAsync = Promise.promisify(Driver.prototype.insert);
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
index 43905d17..174efa19 100644
--- a/lib/Drivers/DML/sqlite.js
+++ b/lib/Drivers/DML/sqlite.js
@@ -3,8 +3,8 @@ var util    = require("util");
 var sqlite3 = require("sqlite3");
 var Query   = require("sql-query").Query;
 var shared  = require("./_shared");
+var utils   = require("./_utils");
 var DDL     = require("../DDL/SQL");
-var Promise = require("bluebird");
 
 exports.Driver = Driver;
 
@@ -212,12 +212,21 @@ Driver.prototype.remove = function (table, conditions, cb) {
 
 Driver.prototype.clear = function (table, cb) {
   var debug = this.opts.debug;
+  var self = this;
 
   this.execQuery("DELETE FROM ??", [table], function (err) {
     if (err) return cb(err);
 
-    this.execQuery("DELETE FROM ?? WHERE NAME = ?", ['sqlite_sequence', table], cb);
-  }.bind(this));
+    self.execQuery("SELECT count(*) FROM ?? WHERE type=? AND name=?;", ['sqlite_master', 'table', 'sqlite_sequence'], function (err, data) {
+      if (err) return cb(err);
+
+      if (data[0] && data[0]['count(*)'] === 1) {
+        self.execQuery("DELETE FROM ?? WHERE NAME = ?", ['sqlite_sequence', table], cb);
+      } else {
+        cb();
+      }
+    });
+  });
 };
 
 Driver.prototype.valueToProperty = function (value, property) {
@@ -355,6 +364,8 @@ Driver.prototype.propertyToValue = function (value, property) {
   return value;
 };
 
+utils.promisifyFunctions(Driver.prototype, ['ping', 'execSimpleQuery', 'find', 'count', 'insert', 'update', 'remove', 'clear']);
+
 Object.defineProperty(Driver.prototype, "isSql", {
     value: true
 });
diff --git a/package-lock.json b/package-lock.json
index 03dd2790..b1af8b4d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,38 +1,44 @@
 {
 	"name": "orm",
-	"version": "5.0.8",
+	"version": "5.0.9",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
 		"@sinonjs/commons": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.3.0.tgz",
-			"integrity": "sha512-j4ZwhaHmwsCb4DlDOIWnI5YyKDNMoNThsmwEpfHx6a1EpsGZ9qYLxP++LMlmBRjtGptGHFsGItJ768snllFWpA==",
+			"version": "1.8.3",
+			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
+			"integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
 			"dev": true,
 			"requires": {
 				"type-detect": "4.0.8"
 			}
 		},
-		"@sinonjs/formatio": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.1.0.tgz",
-			"integrity": "sha512-ZAR2bPHOl4Xg6eklUGpsdiIJ4+J1SNag1DHHrG/73Uz/nVwXqjgUtRPLoS+aVyieN9cSbc0E4LsU984tWcDyNg==",
+		"@sinonjs/fake-timers": {
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz",
+			"integrity": "sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==",
 			"dev": true,
 			"requires": {
-				"@sinonjs/samsam": "^2 || ^3"
+				"@sinonjs/commons": "^1.7.0"
 			}
 		},
 		"@sinonjs/samsam": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.1.0.tgz",
-			"integrity": "sha512-IXio+GWY+Q8XUjHUOgK7wx8fpvr7IFffgyXb1bnJFfX3001KmHt35Zq4tp7MXZyjJPCLPuadesDYNk41LYtVjw==",
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-6.0.2.tgz",
+			"integrity": "sha512-jxPRPp9n93ci7b8hMfJOFDPRLFYadN6FSpeROFTR4UNF4i5b+EK6m4QXPO46BDhFgRy1JuS87zAnFOzCUwMJcQ==",
 			"dev": true,
 			"requires": {
-				"@sinonjs/commons": "^1.0.2",
-				"array-from": "^2.1.1",
-				"lodash.get": "^4.4.2"
+				"@sinonjs/commons": "^1.6.0",
+				"lodash.get": "^4.4.2",
+				"type-detect": "^4.0.8"
 			}
 		},
+		"@sinonjs/text-encoding": {
+			"version": "0.7.1",
+			"resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz",
+			"integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==",
+			"dev": true
+		},
 		"@ungap/promise-all-settled": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
@@ -65,24 +71,24 @@
 			"dev": true
 		},
 		"ansi-regex": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-			"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
 			"dev": true
 		},
 		"ansi-styles": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 			"dev": true,
 			"requires": {
-				"color-convert": "^1.9.0"
+				"color-convert": "^2.0.1"
 			}
 		},
 		"anymatch": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-			"integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+			"integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
 			"dev": true,
 			"requires": {
 				"normalize-path": "^3.0.0",
@@ -96,9 +102,9 @@
 			"dev": true
 		},
 		"are-we-there-yet": {
-			"version": "1.1.5",
-			"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
-			"integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+			"version": "1.1.7",
+			"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
+			"integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
 			"dev": true,
 			"requires": {
 				"delegates": "^1.0.0",
@@ -106,18 +112,9 @@
 			}
 		},
 		"argparse": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-			"dev": true,
-			"requires": {
-				"sprintf-js": "~1.0.2"
-			}
-		},
-		"array-from": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz",
-			"integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
 			"dev": true
 		},
 		"asn1": {
@@ -167,9 +164,9 @@
 			"optional": true
 		},
 		"balanced-match": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-			"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
 			"dev": true
 		},
 		"bcrypt-pbkdf": {
@@ -183,9 +180,9 @@
 			}
 		},
 		"bignumber.js": {
-			"version": "7.2.1",
-			"resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-7.2.1.tgz",
-			"integrity": "sha512-S4XzBk5sMB+Rcb/LNcpzXr57VRTxgAvaAEDAl1AwRx27j00hT84O6OkteE7u8UB3NuaaygCRrEpqox4uDOrbdQ==",
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.0.tgz",
+			"integrity": "sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A==",
 			"dev": true
 		},
 		"binary-extensions": {
@@ -210,9 +207,9 @@
 			"integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
 		},
 		"brace-expansion": {
-			"version": "1.1.8",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-			"integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
 			"dev": true,
 			"requires": {
 				"balanced-match": "^1.0.0",
@@ -250,9 +247,9 @@
 			"dev": true
 		},
 		"camelcase": {
-			"version": "5.3.1",
-			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+			"integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
 			"dev": true
 		},
 		"caseless": {
@@ -263,30 +260,29 @@
 			"optional": true
 		},
 		"chalk": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-			"integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
 			"requires": {
-				"ansi-styles": "^3.2.1",
-				"escape-string-regexp": "^1.0.5",
-				"supports-color": "^5.3.0"
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
 			}
 		},
 		"chokidar": {
-			"version": "3.4.3",
-			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz",
-			"integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==",
+			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
+			"integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
 			"dev": true,
 			"requires": {
-				"anymatch": "~3.1.1",
+				"anymatch": "~3.1.2",
 				"braces": "~3.0.2",
-				"fsevents": "~2.1.2",
-				"glob-parent": "~5.1.0",
+				"fsevents": "~2.3.2",
+				"glob-parent": "~5.1.2",
 				"is-binary-path": "~2.1.0",
 				"is-glob": "~4.0.1",
 				"normalize-path": "~3.0.0",
-				"readdirp": "~3.5.0"
+				"readdirp": "~3.6.0"
 			}
 		},
 		"chownr": {
@@ -296,42 +292,14 @@
 			"dev": true
 		},
 		"cliui": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-			"integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+			"version": "7.0.4",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+			"integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
 			"dev": true,
 			"requires": {
-				"string-width": "^3.1.0",
-				"strip-ansi": "^5.2.0",
-				"wrap-ansi": "^5.1.0"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-					"dev": true
-				},
-				"string-width": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^7.0.1",
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^5.1.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^4.1.0"
-					}
-				}
+				"string-width": "^4.2.0",
+				"strip-ansi": "^6.0.0",
+				"wrap-ansi": "^7.0.0"
 			}
 		},
 		"code-point-at": {
@@ -341,18 +309,18 @@
 			"dev": true
 		},
 		"color-convert": {
-			"version": "1.9.2",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz",
-			"integrity": "sha512-3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
 			"requires": {
-				"color-name": "1.1.1"
+				"color-name": "~1.1.4"
 			}
 		},
 		"color-name": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz",
-			"integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok=",
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true
 		},
 		"combined-stream": {
@@ -394,18 +362,26 @@
 			}
 		},
 		"debug": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-			"integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+			"version": "4.3.2",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+			"integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
 			"dev": true,
 			"requires": {
 				"ms": "2.1.2"
+			},
+			"dependencies": {
+				"ms": {
+					"version": "2.1.2",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+					"dev": true
+				}
 			}
 		},
 		"decamelize": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-			"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+			"integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
 			"dev": true
 		},
 		"deep-extend": {
@@ -434,9 +410,9 @@
 			"dev": true
 		},
 		"diff": {
-			"version": "3.5.0",
-			"resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-			"integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+			"integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
 			"dev": true
 		},
 		"ecc-jsbn": {
@@ -451,9 +427,9 @@
 			}
 		},
 		"emoji-regex": {
-			"version": "7.0.3",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-			"integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
 			"dev": true
 		},
 		"enforce": {
@@ -461,16 +437,16 @@
 			"resolved": "https://registry.npmjs.org/enforce/-/enforce-0.1.7.tgz",
 			"integrity": "sha1-r3zdP6mCsuyq4GrntcJZUX0ivj8="
 		},
-		"escape-string-regexp": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+		"escalade": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
 			"dev": true
 		},
-		"esprima": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+		"escape-string-regexp": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
 			"dev": true
 		},
 		"extend": {
@@ -561,9 +537,9 @@
 			"dev": true
 		},
 		"fsevents": {
-			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-			"integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+			"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
 			"dev": true,
 			"optional": true
 		},
@@ -650,9 +626,9 @@
 			}
 		},
 		"glob": {
-			"version": "7.1.2",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-			"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+			"integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
 			"dev": true,
 			"requires": {
 				"fs.realpath": "^1.0.0",
@@ -664,18 +640,18 @@
 			}
 		},
 		"glob-parent": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-			"integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
 			"dev": true,
 			"requires": {
 				"is-glob": "^4.0.1"
 			}
 		},
 		"graceful-fs": {
-			"version": "4.2.4",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-			"integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+			"version": "4.2.8",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
+			"integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
 			"dev": true,
 			"optional": true
 		},
@@ -704,9 +680,9 @@
 			}
 		},
 		"has-flag": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true
 		},
 		"has-unicode": {
@@ -748,9 +724,9 @@
 			}
 		},
 		"ignore-walk": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
-			"integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz",
+			"integrity": "sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==",
 			"dev": true,
 			"requires": {
 				"minimatch": "^3.0.4"
@@ -794,15 +770,15 @@
 			"dev": true
 		},
 		"is-fullwidth-code-point": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-			"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
 			"dev": true
 		},
 		"is-glob": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-			"integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
 			"dev": true,
 			"requires": {
 				"is-extglob": "^2.1.1"
@@ -827,6 +803,12 @@
 			"dev": true,
 			"optional": true
 		},
+		"is-unicode-supported": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+			"integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+			"dev": true
+		},
 		"isarray": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -847,13 +829,12 @@
 			"optional": true
 		},
 		"js-yaml": {
-			"version": "3.14.0",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
-			"integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
 			"dev": true,
 			"requires": {
-				"argparse": "^1.0.7",
-				"esprima": "^4.0.0"
+				"argparse": "^2.0.1"
 			}
 		},
 		"jsbn": {
@@ -898,9 +879,9 @@
 			}
 		},
 		"just-extend": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.0.2.tgz",
-			"integrity": "sha512-FrLwOgm+iXrPV+5zDU6Jqu4gCRXbWEQg2O3SKONsWE4w7AXFRkryS53bpWdaL9cNol+AmR3AEYz6kn+o0fCPnw==",
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz",
+			"integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==",
 			"dev": true
 		},
 		"kerberos": {
@@ -931,86 +912,39 @@
 			"dev": true
 		},
 		"log-symbols": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz",
-			"integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==",
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+			"integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
 			"dev": true,
 			"requires": {
-				"chalk": "^4.0.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+				"chalk": "^4.1.0",
+				"is-unicode-supported": "^0.1.0"
 			}
 		},
-		"lolex": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/lolex/-/lolex-3.1.0.tgz",
-			"integrity": "sha512-zFo5MgCJ0rZ7gQg69S4pqBsLURbFw11X68C18OcJjJQbqaXm2NoTrGl1IMM3TIz0/BnN1tIs2tzmmqvCsOMMjw==",
-			"dev": true
+		"lru-cache": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+			"dev": true,
+			"requires": {
+				"yallist": "^4.0.0"
+			}
 		},
 		"mime-db": {
-			"version": "1.45.0",
-			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz",
-			"integrity": "sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==",
+			"version": "1.50.0",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz",
+			"integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==",
 			"dev": true,
 			"optional": true
 		},
 		"mime-types": {
-			"version": "2.1.28",
-			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz",
-			"integrity": "sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==",
+			"version": "2.1.33",
+			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz",
+			"integrity": "sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==",
 			"dev": true,
 			"optional": true,
 			"requires": {
-				"mime-db": "1.45.0"
+				"mime-db": "1.50.0"
 			}
 		},
 		"minimatch": {
@@ -1043,6 +977,12 @@
 					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
 					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
 					"dev": true
+				},
+				"yallist": {
+					"version": "3.1.1",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+					"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+					"dev": true
 				}
 			}
 		},
@@ -1065,54 +1005,41 @@
 			}
 		},
 		"mocha": {
-			"version": "8.2.1",
-			"resolved": "https://registry.npmjs.org/mocha/-/mocha-8.2.1.tgz",
-			"integrity": "sha512-cuLBVfyFfFqbNR0uUKbDGXKGk+UDFe6aR4os78XIrMQpZl/nv7JYHcvP5MFIAb374b2zFXsdgEGwmzMtP0Xg8w==",
+			"version": "9.1.3",
+			"resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.3.tgz",
+			"integrity": "sha512-Xcpl9FqXOAYqI3j79pEtHBBnQgVXIhpULjGQa7DVb0Po+VzmSIK9kanAiWLHoRR/dbZ2qpdPshuXr8l1VaHCzw==",
 			"dev": true,
 			"requires": {
 				"@ungap/promise-all-settled": "1.1.2",
 				"ansi-colors": "4.1.1",
 				"browser-stdout": "1.3.1",
-				"chokidar": "3.4.3",
-				"debug": "4.2.0",
-				"diff": "4.0.2",
+				"chokidar": "3.5.2",
+				"debug": "4.3.2",
+				"diff": "5.0.0",
 				"escape-string-regexp": "4.0.0",
 				"find-up": "5.0.0",
-				"glob": "7.1.6",
+				"glob": "7.1.7",
 				"growl": "1.10.5",
 				"he": "1.2.0",
-				"js-yaml": "3.14.0",
-				"log-symbols": "4.0.0",
+				"js-yaml": "4.1.0",
+				"log-symbols": "4.1.0",
 				"minimatch": "3.0.4",
-				"ms": "2.1.2",
-				"nanoid": "3.1.12",
-				"serialize-javascript": "5.0.1",
+				"ms": "2.1.3",
+				"nanoid": "3.1.25",
+				"serialize-javascript": "6.0.0",
 				"strip-json-comments": "3.1.1",
-				"supports-color": "7.2.0",
+				"supports-color": "8.1.1",
 				"which": "2.0.2",
-				"wide-align": "1.1.3",
-				"workerpool": "6.0.2",
-				"yargs": "13.3.2",
-				"yargs-parser": "13.1.2",
+				"workerpool": "6.1.5",
+				"yargs": "16.2.0",
+				"yargs-parser": "20.2.4",
 				"yargs-unparser": "2.0.0"
 			},
 			"dependencies": {
-				"diff": {
-					"version": "4.0.2",
-					"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-					"integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-					"dev": true
-				},
-				"escape-string-regexp": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-					"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-					"dev": true
-				},
 				"glob": {
-					"version": "7.1.6",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-					"integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+					"version": "7.1.7",
+					"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+					"integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
 					"dev": true,
 					"requires": {
 						"fs.realpath": "^1.0.0",
@@ -1123,16 +1050,10 @@
 						"path-is-absolute": "^1.0.0"
 					}
 				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
 				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+					"version": "8.1.1",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+					"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
 					"dev": true,
 					"requires": {
 						"has-flag": "^4.0.0"
@@ -1152,19 +1073,19 @@
 			}
 		},
 		"ms": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
 			"dev": true
 		},
 		"mysql": {
-			"version": "2.17.1",
-			"resolved": "https://registry.npmjs.org/mysql/-/mysql-2.17.1.tgz",
-			"integrity": "sha512-7vMqHQ673SAk5C8fOzTG2LpPcf3bNt0oL3sFpxPEEFp1mdlDcrLK0On7z8ZYKaaHrHwNcQ/MTUz7/oobZ2OyyA==",
+			"version": "2.18.1",
+			"resolved": "https://registry.npmjs.org/mysql/-/mysql-2.18.1.tgz",
+			"integrity": "sha512-Bca+gk2YWmqp2Uf6k5NFEurwY/0td0cpebAucFpY/3jhrwrVGuxU2uQFCHjU19SJfje0yQvi+rVWdq78hR5lig==",
 			"dev": true,
 			"requires": {
-				"bignumber.js": "7.2.1",
-				"readable-stream": "2.3.6",
+				"bignumber.js": "9.0.0",
+				"readable-stream": "2.3.7",
 				"safe-buffer": "5.1.2",
 				"sqlstring": "2.3.1"
 			},
@@ -1176,9 +1097,9 @@
 					"dev": true
 				},
 				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+					"version": "2.3.7",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+					"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
 					"dev": true,
 					"requires": {
 						"core-util-is": "~1.0.0",
@@ -1214,15 +1135,15 @@
 			"dev": true
 		},
 		"nanoid": {
-			"version": "3.1.12",
-			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz",
-			"integrity": "sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==",
+			"version": "3.1.25",
+			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz",
+			"integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==",
 			"dev": true
 		},
 		"needle": {
-			"version": "2.6.0",
-			"resolved": "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz",
-			"integrity": "sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==",
+			"version": "2.9.1",
+			"resolved": "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz",
+			"integrity": "sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==",
 			"dev": true,
 			"requires": {
 				"debug": "^3.2.6",
@@ -1242,30 +1163,22 @@
 			}
 		},
 		"nise": {
-			"version": "1.4.8",
-			"resolved": "https://registry.npmjs.org/nise/-/nise-1.4.8.tgz",
-			"integrity": "sha512-kGASVhuL4tlAV0tvA34yJYZIVihrUt/5bDwpp4tTluigxUr2bBlJeDXmivb6NuEdFkqvdv/Ybb9dm16PSKUhtw==",
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/nise/-/nise-5.1.0.tgz",
+			"integrity": "sha512-W5WlHu+wvo3PaKLsJJkgPup2LrsXCcm7AWwyNZkUnn5rwPkuPBi3Iwk5SQtN0mv+K65k7nKKjwNQ30wg3wLAQQ==",
 			"dev": true,
 			"requires": {
-				"@sinonjs/formatio": "^3.1.0",
+				"@sinonjs/commons": "^1.7.0",
+				"@sinonjs/fake-timers": "^7.0.4",
+				"@sinonjs/text-encoding": "^0.7.1",
 				"just-extend": "^4.0.2",
-				"lolex": "^2.3.2",
-				"path-to-regexp": "^1.7.0",
-				"text-encoding": "^0.6.4"
-			},
-			"dependencies": {
-				"lolex": {
-					"version": "2.7.5",
-					"resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.5.tgz",
-					"integrity": "sha512-l9x0+1offnKKIzYVjyXU2SiwhXDLekRzKyhnbyldPHvC7BvLPVpdNUNR2KeMAiCN2D/kLNttZgQD5WjSxuBx3Q==",
-					"dev": true
-				}
+				"path-to-regexp": "^1.7.0"
 			}
 		},
 		"node-addon-api": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.1.0.tgz",
-			"integrity": "sha512-flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw==",
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
+			"integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
 			"dev": true
 		},
 		"node-gyp": {
@@ -1342,20 +1255,32 @@
 					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
 					"dev": true
 				},
+				"semver": {
+					"version": "5.7.1",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+					"dev": true
+				},
 				"tar": {
-					"version": "4.4.13",
-					"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
-					"integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
+					"version": "4.4.19",
+					"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz",
+					"integrity": "sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==",
 					"dev": true,
 					"requires": {
-						"chownr": "^1.1.1",
-						"fs-minipass": "^1.2.5",
-						"minipass": "^2.8.6",
-						"minizlib": "^1.2.1",
-						"mkdirp": "^0.5.0",
-						"safe-buffer": "^5.1.2",
-						"yallist": "^3.0.3"
+						"chownr": "^1.1.4",
+						"fs-minipass": "^1.2.7",
+						"minipass": "^2.9.0",
+						"minizlib": "^1.3.3",
+						"mkdirp": "^0.5.5",
+						"safe-buffer": "^5.2.1",
+						"yallist": "^3.1.1"
 					}
+				},
+				"yallist": {
+					"version": "3.1.1",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+					"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+					"dev": true
 				}
 			}
 		},
@@ -1376,9 +1301,9 @@
 			"dev": true
 		},
 		"npm-bundled": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz",
-			"integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==",
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz",
+			"integrity": "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==",
 			"dev": true,
 			"requires": {
 				"npm-normalize-package-bin": "^1.0.1"
@@ -1481,12 +1406,6 @@
 				"p-limit": "^3.0.2"
 			}
 		},
-		"p-try": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-			"dev": true
-		},
 		"packet-reader": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz",
@@ -1505,9 +1424,9 @@
 			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
 		},
 		"path-to-regexp": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
-			"integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=",
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
+			"integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
 			"dev": true,
 			"requires": {
 				"isarray": "0.0.1"
@@ -1529,15 +1448,15 @@
 			"optional": true
 		},
 		"pg": {
-			"version": "8.6.0",
-			"resolved": "https://registry.npmjs.org/pg/-/pg-8.6.0.tgz",
-			"integrity": "sha512-qNS9u61lqljTDFvmk/N66EeGq3n6Ujzj0FFyNMGQr6XuEv4tgNTXvJQTfJdcvGit5p5/DWPu+wj920hAJFI+QQ==",
+			"version": "8.7.1",
+			"resolved": "https://registry.npmjs.org/pg/-/pg-8.7.1.tgz",
+			"integrity": "sha512-7bdYcv7V6U3KAtWjpQJJBww0UEsWuh4yQ/EjNf2HeO/NnvKjpvhEIe/A/TleP6wtmSKnUnghs5A9jUoK6iDdkA==",
 			"dev": true,
 			"requires": {
 				"buffer-writer": "2.0.0",
 				"packet-reader": "1.0.0",
 				"pg-connection-string": "^2.5.0",
-				"pg-pool": "^3.3.0",
+				"pg-pool": "^3.4.1",
 				"pg-protocol": "^1.5.0",
 				"pg-types": "^2.1.0",
 				"pgpass": "1.x"
@@ -1556,9 +1475,9 @@
 			"dev": true
 		},
 		"pg-pool": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.3.0.tgz",
-			"integrity": "sha512-0O5huCql8/D6PIRFAlmccjphLYWC+JIzvUhSzXSpGaf+tjTZc4nn+Lr7mLXBbFJfvwbP0ywDv73EiaBsxn7zdg==",
+			"version": "3.4.1",
+			"resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.4.1.tgz",
+			"integrity": "sha512-TVHxR/gf3MeJRvchgNHxsYsTCHQ+4wm3VIHSS19z8NC0+gioEhq1okDY1sm/TYbfoP6JLFx01s0ShvZ3puP/iQ==",
 			"dev": true
 		},
 		"pg-protocol": {
@@ -1590,9 +1509,9 @@
 			}
 		},
 		"picomatch": {
-			"version": "2.2.2",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-			"integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
+			"integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
 			"dev": true
 		},
 		"postgres-array": {
@@ -1694,9 +1613,9 @@
 			}
 		},
 		"readdirp": {
-			"version": "3.5.0",
-			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
-			"integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+			"integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
 			"dev": true,
 			"requires": {
 				"picomatch": "^2.2.1"
@@ -1746,12 +1665,6 @@
 			"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
 			"dev": true
 		},
-		"require-main-filename": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-			"integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-			"dev": true
-		},
 		"rimraf": {
 			"version": "2.7.1",
 			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -1759,22 +1672,6 @@
 			"dev": true,
 			"requires": {
 				"glob": "^7.1.3"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "7.1.6",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-					"integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.0.4",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				}
 			}
 		},
 		"safe-buffer": {
@@ -1796,15 +1693,18 @@
 			"dev": true
 		},
 		"semver": {
-			"version": "5.5.0",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-			"integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
-			"dev": true
+			"version": "7.3.5",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+			"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+			"dev": true,
+			"requires": {
+				"lru-cache": "^6.0.0"
+			}
 		},
 		"serialize-javascript": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
-			"integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+			"integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
 			"dev": true,
 			"requires": {
 				"randombytes": "^2.1.0"
@@ -1817,9 +1717,9 @@
 			"dev": true
 		},
 		"should": {
-			"version": "13.2.1",
-			"resolved": "https://registry.npmjs.org/should/-/should-13.2.1.tgz",
-			"integrity": "sha512-l+/NwEMO+DcstsHEwPHRHzC9j4UOE3VQwJGcMWSsD/vqpqHbnQ+1iSHy64Ihmmjx1uiRPD9pFadTSc3MJtXAgw==",
+			"version": "13.2.3",
+			"resolved": "https://registry.npmjs.org/should/-/should-13.2.3.tgz",
+			"integrity": "sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ==",
 			"dev": true,
 			"requires": {
 				"should-equal": "^2.0.0",
@@ -1865,41 +1765,29 @@
 			}
 		},
 		"should-util": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/should-util/-/should-util-1.0.0.tgz",
-			"integrity": "sha1-yYzaN0qmsZDfi6h8mInCtNtiAGM=",
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/should-util/-/should-util-1.0.1.tgz",
+			"integrity": "sha512-oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g==",
 			"dev": true
 		},
 		"signal-exit": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-			"integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
+			"version": "3.0.5",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz",
+			"integrity": "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==",
 			"dev": true
 		},
 		"sinon": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/sinon/-/sinon-7.2.3.tgz",
-			"integrity": "sha512-i6j7sqcLEqTYqUcMV327waI745VASvYuSuQMCjbAwlpAeuCgKZ3LtrjDxAbu+GjNQR0FEDpywtwGCIh8GicNyg==",
-			"dev": true,
-			"requires": {
-				"@sinonjs/commons": "^1.3.0",
-				"@sinonjs/formatio": "^3.1.0",
-				"@sinonjs/samsam": "^3.0.2",
-				"diff": "^3.5.0",
-				"lolex": "^3.0.0",
-				"nise": "^1.4.8",
-				"supports-color": "^5.5.0"
-			},
-			"dependencies": {
-				"supports-color": {
-					"version": "5.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^3.0.0"
-					}
-				}
+			"version": "11.1.2",
+			"resolved": "https://registry.npmjs.org/sinon/-/sinon-11.1.2.tgz",
+			"integrity": "sha512-59237HChms4kg7/sXhiRcUzdSkKuydDeTiamT/jesUVHshBgL8XAmhgFo0GfK6RruMDM/iRSij1EybmMog9cJw==",
+			"dev": true,
+			"requires": {
+				"@sinonjs/commons": "^1.8.3",
+				"@sinonjs/fake-timers": "^7.1.2",
+				"@sinonjs/samsam": "^6.0.2",
+				"diff": "^5.0.0",
+				"nise": "^5.1.0",
+				"supports-color": "^7.2.0"
 			}
 		},
 		"split2": {
@@ -1939,12 +1827,6 @@
 				}
 			}
 		},
-		"sprintf-js": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-			"dev": true
-		},
 		"sql-ddl-sync": {
 			"version": "0.3.16",
 			"resolved": "https://registry.npmjs.org/sql-ddl-sync/-/sql-ddl-sync-0.3.16.tgz",
@@ -1959,9 +1841,9 @@
 			"integrity": "sha512-XXK6W6n0D18YspS/7TziKln8ij9RUnpDzl+qr2hUOqEqrhuilGPhbKBYQ1dkfYoQ0ViNtr2y8RKut06nkAkx2w=="
 		},
 		"sqlite3": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.1.tgz",
-			"integrity": "sha512-kh2lTIcYNfmVcvhVJihsYuPj9U0xzBbh6bmqILO2hkryWSC9RRhzYmkIDtJkJ+d8Kg4wZRJ0T1reyHUEspICfg==",
+			"version": "5.0.2",
+			"resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.2.tgz",
+			"integrity": "sha512-1SdTNo+BVU211Xj1csWa8lV6KM0CtucDwRyA0VHl91wEH1Mgh7RxUpI4rVvG7OhHrzCSGaVyW5g8vKvlrk9DJA==",
 			"dev": true,
 			"requires": {
 				"node-addon-api": "^3.0.0",
@@ -1994,13 +1876,14 @@
 			}
 		},
 		"string-width": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-			"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
 			"dev": true,
 			"requires": {
-				"is-fullwidth-code-point": "^2.0.0",
-				"strip-ansi": "^4.0.0"
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.1"
 			}
 		},
 		"string_decoder": {
@@ -2013,12 +1896,12 @@
 			}
 		},
 		"strip-ansi": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-			"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
 			"dev": true,
 			"requires": {
-				"ansi-regex": "^3.0.0"
+				"ansi-regex": "^5.0.1"
 			}
 		},
 		"strip-json-comments": {
@@ -2028,12 +1911,12 @@
 			"dev": true
 		},
 		"supports-color": {
-			"version": "5.4.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-			"integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
 			"requires": {
-				"has-flag": "^3.0.0"
+				"has-flag": "^4.0.0"
 			}
 		},
 		"tar": {
@@ -2048,12 +1931,6 @@
 				"inherits": "2"
 			}
 		},
-		"text-encoding": {
-			"version": "0.6.4",
-			"resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz",
-			"integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk=",
-			"dev": true
-		},
 		"to-regex-range": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -2141,64 +2018,30 @@
 				"isexe": "^2.0.0"
 			}
 		},
-		"which-module": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-			"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-			"dev": true
-		},
 		"wide-align": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-			"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+			"version": "1.1.5",
+			"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+			"integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
 			"dev": true,
 			"requires": {
-				"string-width": "^1.0.2 || 2"
+				"string-width": "^1.0.2 || 2 || 3 || 4"
 			}
 		},
 		"workerpool": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.0.2.tgz",
-			"integrity": "sha512-DSNyvOpFKrNusaaUwk+ej6cBj1bmhLcBfj80elGk+ZIo5JSkq+unB1dLKEOcNfJDZgjGICfhQ0Q5TbP0PvF4+Q==",
+			"version": "6.1.5",
+			"resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz",
+			"integrity": "sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==",
 			"dev": true
 		},
 		"wrap-ansi": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-			"integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
 			"dev": true,
 			"requires": {
-				"ansi-styles": "^3.2.0",
-				"string-width": "^3.0.0",
-				"strip-ansi": "^5.0.0"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-					"dev": true
-				},
-				"string-width": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^7.0.1",
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^5.1.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^4.1.0"
-					}
-				}
+				"ansi-styles": "^4.0.0",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0"
 			}
 		},
 		"wrappy": {
@@ -2214,115 +2057,37 @@
 			"dev": true
 		},
 		"y18n": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
-			"integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
+			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
 			"dev": true
 		},
 		"yallist": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-			"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
 			"dev": true
 		},
 		"yargs": {
-			"version": "13.3.2",
-			"resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-			"integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+			"version": "16.2.0",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+			"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
 			"dev": true,
 			"requires": {
-				"cliui": "^5.0.0",
-				"find-up": "^3.0.0",
-				"get-caller-file": "^2.0.1",
+				"cliui": "^7.0.2",
+				"escalade": "^3.1.1",
+				"get-caller-file": "^2.0.5",
 				"require-directory": "^2.1.1",
-				"require-main-filename": "^2.0.0",
-				"set-blocking": "^2.0.0",
-				"string-width": "^3.0.0",
-				"which-module": "^2.0.0",
-				"y18n": "^4.0.0",
-				"yargs-parser": "^13.1.2"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-					"dev": true
-				},
-				"find-up": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-					"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^3.0.0"
-					}
-				},
-				"locate-path": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-					"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^3.0.0",
-						"path-exists": "^3.0.0"
-					}
-				},
-				"p-limit": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-					"dev": true,
-					"requires": {
-						"p-try": "^2.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-					"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^2.0.0"
-					}
-				},
-				"path-exists": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-					"integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-					"dev": true
-				},
-				"string-width": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^7.0.1",
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^5.1.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^4.1.0"
-					}
-				}
+				"string-width": "^4.2.0",
+				"y18n": "^5.0.5",
+				"yargs-parser": "^20.2.2"
 			}
 		},
 		"yargs-parser": {
-			"version": "13.1.2",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-			"integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-			"dev": true,
-			"requires": {
-				"camelcase": "^5.0.0",
-				"decamelize": "^1.2.0"
-			}
+			"version": "20.2.4",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+			"integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+			"dev": true
 		},
 		"yargs-unparser": {
 			"version": "2.0.0",
@@ -2334,20 +2099,6 @@
 				"decamelize": "^4.0.0",
 				"flat": "^5.0.2",
 				"is-plain-obj": "^2.1.0"
-			},
-			"dependencies": {
-				"camelcase": {
-					"version": "6.2.0",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-					"integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
-					"dev": true
-				},
-				"decamelize": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
-					"integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
-					"dev": true
-				}
 			}
 		},
 		"yocto-queue": {
diff --git a/package.json b/package.json
index dfe63a07..8d04d62f 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "sqlite",
     "mongodb"
   ],
-  "version": "5.0.8",
+  "version": "5.0.9",
   "license": "MIT",
   "homepage": "http://dresende.github.io/node-orm2",
   "repository": "http://github.com/dresende/node-orm2.git",
@@ -71,16 +71,16 @@
     "sql-query": "0.1.27"
   },
   "devDependencies": {
-    "chalk": "2.4.1",
-    "glob": "7.1.2",
-    "mocha": "8.2.1",
-    "mongodb": "1.4.10",
-    "mysql": "2.17.1",
-    "pg": "8.6.0",
-    "semver": "5.5.0",
-    "should": "13.2.1",
-    "sinon": "7.2.3",
-    "sqlite3": "5.0.1"
+    "chalk": "~4.1.2",
+    "glob": "~7.2.0",
+    "mocha": "~9.1.3",
+    "mongodb": "~1.4.10",
+    "mysql": "~2.18.1",
+    "pg": "~8.7.1",
+    "semver": "~7.3.5",
+    "should": "~13.2.3",
+    "sinon": "~11.1.2",
+    "sqlite3": "~5.0.2"
   },
   "optionalDependencies": {}
 }
diff --git a/test/common.js b/test/common.js
index d901ee91..c0fbde0d 100644
--- a/test/common.js
+++ b/test/common.js
@@ -5,7 +5,7 @@ var _           = require('lodash');
 var url         = require("url");
 var util        = require('util');
 var querystring = require('querystring');
-var Semver      = require('semver');
+var Semver      = require('semver/classes/semver');
 var ORM         = require('../');
 
 common.ORM = ORM;
diff --git a/test/integration/drivers/mysql_spec.js b/test/integration/drivers/mysql_spec.js
new file mode 100644
index 00000000..964c6bac
--- /dev/null
+++ b/test/integration/drivers/mysql_spec.js
@@ -0,0 +1,200 @@
+var _      = require('lodash');
+var should = require('should');
+var Driver = require('../../../lib/Drivers/DML/mysql').Driver;
+var helper = require('../../support/spec_helper');
+var common = require('../../common');
+
+if (common.protocol() != "mysql") return;
+
+describe("MySQL driver", function() {
+  let db;
+  let driver;
+
+  const simpleObj = function (obj) {
+    return JSON.parse(JSON.stringify(obj));
+  }
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db     = connection;
+      driver = connection.driver;
+      done();
+    });
+  });
+
+  after(function (done) {
+    db.close(done);
+  });
+
+  describe("execSimpleQuery", function () {
+    it("#execSimpleQuery should run query", function (done) {
+      driver.execSimpleQuery("SELECT count(*)", function (err, data) {
+        should.not.exist(err);
+        should.deepEqual(simpleObj(data), [{ 'count(*)': 1 }]);
+        done();
+      });
+    });
+
+    it("#execSimpleQueryAsync should run query", function () {
+      it("should run query", async function () {
+        const data = await driver.execSimpleQueryAsync("SELECT count(*)");
+        should.deepEqual(simpleObj(data), [{ 'count(*)': 1 }]);
+      });
+    });
+  });
+
+  describe("ping", function () {
+    it("#ping should work", function (done) {
+      driver.ping(function (err) {
+        should.not.exist(err);
+        done();
+      });
+    });
+
+    it("#pingAsync should work", async function () {
+      await driver.pingAsync();
+    });
+  });
+
+  describe("find", function () {
+    beforeEach(async function () {
+      await driver.execSimpleQueryAsync("DROP TABLE IF EXISTS abc");
+      await driver.execSimpleQueryAsync("CREATE TABLE abc (name varchar(100))");
+      await driver.execSimpleQueryAsync("INSERT INTO abc VALUES ('jane'), ('bob'), ('alice')");
+    });
+
+    it("#find should work", function (done) {
+      driver.find(['name'], 'abc', { name: 'jane' }, {}, function (err, data) {
+        should.not.exist(err);
+        should.deepEqual(simpleObj(data), [{ name: 'jane' }]);
+        done();
+      });
+    });
+
+    it("#findAsync should work", async function () {
+      const data = await driver.findAsync(['name'], 'abc', { name: 'jane' }, {});
+      should.deepEqual(simpleObj(data), [{ name: 'jane' }]);
+    });
+  });
+
+  describe("count", function () {
+    beforeEach(async function () {
+      await driver.execSimpleQueryAsync("DROP TABLE IF EXISTS abc");
+      await driver.execSimpleQueryAsync("CREATE TABLE abc (name varchar(100))");
+      await driver.execSimpleQueryAsync("INSERT INTO abc VALUES ('jane'), ('bob'), ('alice')");
+    });
+
+    it("#count should work", function (done) {
+      driver.count('abc', {}, {}, function (err, data) {
+        should.not.exist(err);
+        should.deepEqual(simpleObj(data), [{ c: 3 }]);
+        done();
+      });
+    });
+
+    it("#countAsync should work", async function () {
+      const data = await driver.countAsync('abc', {}, {});
+      should.deepEqual(simpleObj(data), [{ c: 3 }]);
+    });
+  });
+
+  describe("insert", function () {
+    beforeEach(async function () {
+      await driver.execSimpleQueryAsync("DROP TABLE IF EXISTS abc");
+      await driver.execSimpleQueryAsync("CREATE TABLE abc (name varchar(100))");
+    });
+
+    it("#insert should work", function (done) {
+      driver.insert('abc', { name: 'jane' }, null, function (err) {
+        should.not.exist(err);
+        driver.execSimpleQuery("SELECT count(*) FROM abc", function (err, data) {
+          should.not.exist(err);
+          should.deepEqual(simpleObj(data), [{ 'count(*)': 1 }]);
+          done();
+        });
+      });
+    });
+
+    it("#insertAsync should work", async function () {
+      await driver.insertAsync('abc', { name: 'jane' }, null);
+      const data = await driver.execSimpleQueryAsync("SELECT count(*) FROM abc");
+      should.deepEqual(simpleObj(data), [{ 'count(*)': 1 }]);
+    });
+  });
+
+  describe("update", function () {
+    beforeEach(async function () {
+      await driver.execSimpleQueryAsync("DROP TABLE IF EXISTS abc");
+      await driver.execSimpleQueryAsync("CREATE TABLE abc (name varchar(100))");
+      await driver.execSimpleQueryAsync("INSERT INTO abc VALUES ('jane'), ('bob'), ('alice')");
+    });
+
+    it("#update should work", function (done) {
+      driver.update('abc', { name: 'bob' }, { name: 'jane' }, function (err) {
+        should.not.exist(err);
+        driver.execSimpleQuery("SELECT count(*) FROM abc WHERE name = 'bob'", function (err, data) {
+          should.not.exist(err);
+          should.deepEqual(simpleObj(data), [{ 'count(*)': 2 }]);
+          done();
+        });
+      });
+    });
+
+    it("#updateAsync should work", async function () {
+      await driver.updateAsync('abc', { name: 'bob' }, { name: 'jane' });
+      const data = await driver.execSimpleQueryAsync("SELECT count(*) FROM abc WHERE name = 'bob'");
+      should.deepEqual(simpleObj(data), [{ 'count(*)': 2 }]);
+    });
+  });
+
+  describe("remove", function () {
+    beforeEach(async function () {
+      await driver.execSimpleQueryAsync("DROP TABLE IF EXISTS abc");
+      await driver.execSimpleQueryAsync("CREATE TABLE abc (name varchar(100))");
+      await driver.execSimpleQueryAsync("INSERT INTO abc VALUES ('jane'), ('bob'), ('alice')");
+    });
+
+    it("#remove should work", function (done) {
+      driver.remove('abc', { name: 'bob' }, function (err) {
+        should.not.exist(err);
+        driver.execSimpleQuery("SELECT name FROM abc ORDER BY name", function (err, data) {
+          should.not.exist(err);
+          should.deepEqual(simpleObj(data), [{ name: 'alice' }, { name: 'jane' }]);
+          done();
+        });
+      });
+    });
+
+    it("#removeAsync should work", async function () {
+      await driver.removeAsync('abc', { name: 'bob' });
+      const data = await driver.execSimpleQueryAsync("SELECT name FROM abc ORDER BY name");
+      should.deepEqual(simpleObj(data), [{ name: 'alice' }, { name: 'jane' }]);
+    });
+  });
+
+  describe("clear", function () {
+    beforeEach(async function () {
+      await driver.execSimpleQueryAsync("DROP TABLE IF EXISTS abc");
+      await driver.execSimpleQueryAsync("CREATE TABLE abc (name varchar(100))");
+      await driver.execSimpleQueryAsync("INSERT INTO abc VALUES ('jane'), ('bob'), ('alice')");
+    });
+
+    it("#clear should work", function (done) {
+      driver.clear('abc', function (err) {
+        should.not.exist(err);
+        driver.execSimpleQuery("SELECT count(*) FROM abc", function (err, data) {
+          should.not.exist(err);
+          should.deepEqual(simpleObj(data), [{ 'count(*)': 0 }]);
+          done();
+        });
+      });
+    });
+
+    it("#clearAsync should work", async function () {
+      await driver.clearAsync('abc');
+      const data = await driver.execSimpleQueryAsync("SELECT count(*) FROM abc");
+      should.deepEqual(simpleObj(data), [{ 'count(*)': 0 }]);
+    });
+  });
+
+});
diff --git a/test/integration/drivers/postgres_spec.js b/test/integration/drivers/postgres_spec.js
index 7bd8eabc..f7f68f66 100644
--- a/test/integration/drivers/postgres_spec.js
+++ b/test/integration/drivers/postgres_spec.js
@@ -7,13 +7,193 @@ var common = require('../../common');
 if (common.protocol() != "postgres") return;
 
 describe("Postgres driver", function() {
-  describe("#valueToProperty", function () {
-    var driver = null;
+  let db;
+  let driver;
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db     = connection;
+      driver = connection.driver;
+      done();
+    });
+  });
+
+  after(function (done) {
+    db.close(done);
+  });
+
+  describe("execSimpleQuery", function () {
+    it("#execSimpleQuery should run query", function (done) {
+      driver.execSimpleQuery("SELECT count(*)", function (err, data) {
+        should.not.exist(err);
+        should.deepEqual(data, [{ count: 1 }]);
+        done();
+      });
+    });
+
+    it("#execSimpleQueryAsync should run query", function () {
+      it("should run query", async function () {
+        const data = await driver.execSimpleQueryAsync("SELECT count(*)");
+        should.deepEqual(data, [{ count: 1 }]);
+      });
+    });
+  });
+
+  describe("ping", function () {
+    it("#ping should work", function (done) {
+      driver.ping(function (err) {
+        should.not.exist(err);
+        done();
+      });
+    });
+
+    it("#pingAsync should work", async function () {
+      await driver.pingAsync();
+    });
+  });
 
-    beforeEach(function () {
-      driver = new Driver({}, {}, {});
+  describe("find", function () {
+    beforeEach(async function () {
+      await driver.execSimpleQueryAsync("DROP TABLE IF EXISTS abc");
+      await driver.execSimpleQueryAsync("CREATE TABLE abc (name varchar(100))");
+      await driver.execSimpleQueryAsync("INSERT INTO abc VALUES ('jane'), ('bob'), ('alice')");
     });
 
+    it("#find should work", function (done) {
+      driver.find(['name'], 'abc', { name: 'jane' }, {}, function (err, data) {
+        should.not.exist(err);
+        should.deepEqual(data, [{ name: 'jane' }]);
+        done();
+      });
+    });
+
+    it("#findAsync should work", async function () {
+      const data = await driver.findAsync(['name'], 'abc', { name: 'jane' }, {});
+      should.deepEqual(data, [{ name: 'jane' }]);
+    });
+  });
+
+  describe("count", function () {
+    beforeEach(async function () {
+      await driver.execSimpleQueryAsync("DROP TABLE IF EXISTS abc");
+      await driver.execSimpleQueryAsync("CREATE TABLE abc (name varchar(100))");
+      await driver.execSimpleQueryAsync("INSERT INTO abc VALUES ('jane'), ('bob'), ('alice')");
+    });
+
+    it("#count should work", function (done) {
+      driver.count('abc', {}, {}, function (err, data) {
+        should.not.exist(err);
+        should.deepEqual(data, [{ c: 3 }]);
+        done();
+      });
+    });
+
+    it("#countAsync should work", async function () {
+      const data = await driver.countAsync('abc', {}, {});
+      should.deepEqual(data, [{ c: 3 }]);
+    });
+  });
+
+  describe("insert", function () {
+    beforeEach(async function () {
+      await driver.execSimpleQueryAsync("DROP TABLE IF EXISTS abc");
+      await driver.execSimpleQueryAsync("CREATE TABLE abc (name varchar(100))");
+    });
+
+    it("#insert should work", function (done) {
+      driver.insert('abc', { name: 'jane' }, null, function (err) {
+        should.not.exist(err);
+        driver.execSimpleQuery("SELECT count(*) FROM abc", function (err, data) {
+          should.not.exist(err);
+          should.deepEqual(data, [{ count: 1 }]);
+          done();
+        });
+      });
+    });
+
+    it("#insertAsync should work", async function () {
+      await driver.insertAsync('abc', { name: 'jane' }, null);
+      const data = await driver.execSimpleQueryAsync("SELECT count(*) FROM abc");
+      should.deepEqual(data, [{ count: 1 }]);
+    });
+  });
+
+  describe("update", function () {
+    beforeEach(async function () {
+      await driver.execSimpleQueryAsync("DROP TABLE IF EXISTS abc");
+      await driver.execSimpleQueryAsync("CREATE TABLE abc (name varchar(100))");
+      await driver.execSimpleQueryAsync("INSERT INTO abc VALUES ('jane'), ('bob'), ('alice')");
+    });
+
+    it("#update should work", function (done) {
+      driver.update('abc', { name: 'bob' }, { name: 'jane' }, function (err) {
+        should.not.exist(err);
+        driver.execSimpleQuery("SELECT count(*) FROM abc WHERE name = 'bob'", function (err, data) {
+          should.not.exist(err);
+          should.deepEqual(data, [{ count: 2 }]);
+          done();
+        });
+      });
+    });
+
+    it("#updateAsync should work", async function () {
+      await driver.updateAsync('abc', { name: 'bob' }, { name: 'jane' });
+      const data = await driver.execSimpleQueryAsync("SELECT count(*) FROM abc WHERE name = 'bob'");
+      should.deepEqual(data, [{ count: 2 }]);
+    });
+  });
+
+  describe("remove", function () {
+    beforeEach(async function () {
+      await driver.execSimpleQueryAsync("DROP TABLE IF EXISTS abc");
+      await driver.execSimpleQueryAsync("CREATE TABLE abc (name varchar(100))");
+      await driver.execSimpleQueryAsync("INSERT INTO abc VALUES ('jane'), ('bob'), ('alice')");
+    });
+
+    it("#remove should work", function (done) {
+      driver.remove('abc', { name: 'bob' }, function (err) {
+        should.not.exist(err);
+        driver.execSimpleQuery("SELECT name FROM abc ORDER BY name", function (err, data) {
+          should.not.exist(err);
+          should.deepEqual(data, [{ name: 'alice' }, { name: 'jane' }]);
+          done();
+        });
+      });
+    });
+
+    it("#removeAsync should work", async function () {
+      await driver.removeAsync('abc', { name: 'bob' });
+      const data = await driver.execSimpleQueryAsync("SELECT name FROM abc ORDER BY name");
+      should.deepEqual(data, [{ name: 'alice' }, { name: 'jane' }]);
+    });
+  });
+
+  describe("clear", function () {
+    beforeEach(async function () {
+      await driver.execSimpleQueryAsync("DROP TABLE IF EXISTS abc");
+      await driver.execSimpleQueryAsync("CREATE TABLE abc (name varchar(100))");
+      await driver.execSimpleQueryAsync("INSERT INTO abc VALUES ('jane'), ('bob'), ('alice')");
+    });
+
+    it("#clear should work", function (done) {
+      driver.clear('abc', function (err) {
+        should.not.exist(err);
+        driver.execSimpleQuery("SELECT count(*) FROM abc", function (err, data) {
+          should.not.exist(err);
+          should.deepEqual(data, [{ count: 0 }]);
+          done();
+        });
+      });
+    });
+
+    it("#clearAsync should work", async function () {
+      await driver.clearAsync('abc');
+      const data = await driver.execSimpleQueryAsync("SELECT count(*) FROM abc");
+      should.deepEqual(data, [{ count: 0 }]);
+    });
+  });
+
+  describe("#valueToProperty", function () {
     describe("numbers", function () {
       describe("floats", function () {
         function valueToProperty (value) {
@@ -116,7 +296,7 @@ describe("Postgres driver", function() {
       });
 
       it("should not change buffer", function () {
-        var b = new Buffer('abc');
+        var b = Buffer.alloc(3, 'abc')
         should.strictEqual(evaluate(b), b);
       });
 
diff --git a/test/integration/drivers/sqlite_spec.js b/test/integration/drivers/sqlite_spec.js
index 8e1d302c..ed0353a1 100644
--- a/test/integration/drivers/sqlite_spec.js
+++ b/test/integration/drivers/sqlite_spec.js
@@ -7,13 +7,220 @@ var common = require('../../common');
 if (common.protocol() != "sqlite") return;
 
 describe("Sqlite driver", function() {
-  describe("#valueToProperty", function () {
-    var driver = null;
+  let db;
+  let driver;
+
+  before(function (done) {
+    helper.connect(function (connection) {
+      db     = connection;
+      driver = connection.driver;
+      done();
+    });
+  });
+
+  after(function (done) {
+    db.close(done);
+  });
+
+  describe("execSimpleQuery", function () {
+    it("#execSimpleQuery should run query", function (done) {
+      driver.execSimpleQuery("SELECT count(*)", function (err, data) {
+        should.not.exist(err);
+        should.deepEqual(data, [{ 'count(*)': 1 }]);
+        done();
+      });
+    });
+
+    it("#execSimpleQueryAsync should run query", function () {
+      it("should run query", async function () {
+        const data = await driver.execSimpleQueryAsync("SELECT count(*)");
+        should.deepEqual(data, [{ 'count(*)': 1 }]);
+      });
+    });
+  });
+
+  describe("ping", function () {
+    it("#ping should work", function (done) {
+      driver.ping(function (err) {
+        should.not.exist(err);
+        done();
+      });
+    });
+
+    it("#pingAsync should work", async function () {
+      await driver.pingAsync();
+    });
+  });
+
+  describe("find", function () {
+    beforeEach(async function () {
+      await driver.execSimpleQueryAsync("DROP TABLE IF EXISTS abc");
+      await driver.execSimpleQueryAsync("CREATE TABLE abc (name varchar(100))");
+      await driver.execSimpleQueryAsync("INSERT INTO abc VALUES ('jane'), ('bob'), ('alice')");
+    });
+
+    it("#find should work", function (done) {
+      driver.find(['name'], 'abc', { name: 'jane' }, {}, function (err, data) {
+        should.not.exist(err);
+        should.deepEqual(data, [{ name: 'jane' }]);
+        done();
+      });
+    });
+
+    it("#findAsync should work", async function () {
+      const data = await driver.findAsync(['name'], 'abc', { name: 'jane' }, {});
+      should.deepEqual(data, [{ name: 'jane' }]);
+    });
+  });
+
+  describe("count", function () {
+    beforeEach(async function () {
+      await driver.execSimpleQueryAsync("DROP TABLE IF EXISTS abc");
+      await driver.execSimpleQueryAsync("CREATE TABLE abc (name varchar(100))");
+      await driver.execSimpleQueryAsync("INSERT INTO abc VALUES ('jane'), ('bob'), ('alice')");
+    });
+
+    it("#count should work", function (done) {
+      driver.count('abc', {}, {}, function (err, data) {
+        should.not.exist(err);
+        should.deepEqual(data, [{ c: 3 }]);
+        done();
+      });
+    });
+
+    it("#countAsync should work", async function () {
+      const data = await driver.countAsync('abc', {}, {});
+      should.deepEqual(data, [{ c: 3 }]);
+    });
+  });
+
+  describe("insert", function () {
+    beforeEach(async function () {
+      await driver.execSimpleQueryAsync("DROP TABLE IF EXISTS abc");
+      await driver.execSimpleQueryAsync("CREATE TABLE abc (name varchar(100))");
+    });
+
+    it("#insert should work", function (done) {
+      driver.insert('abc', { name: 'jane' }, null, function (err) {
+        should.not.exist(err);
+        driver.execSimpleQuery("SELECT count(*) FROM abc", function (err, data) {
+          should.not.exist(err);
+          should.deepEqual(data, [{ 'count(*)': 1 }]);
+          done();
+        });
+      });
+    });
+
+    it("#insertAsync should work", async function () {
+      await driver.insertAsync('abc', { name: 'jane' }, null);
+      const data = await driver.execSimpleQueryAsync("SELECT count(*) FROM abc");
+      should.deepEqual(data, [{ 'count(*)': 1 }]);
+    });
+  });
 
-    before(function () {
-      driver = new Driver({}, {}, {});
+  describe("update", function () {
+    beforeEach(async function () {
+      await driver.execSimpleQueryAsync("DROP TABLE IF EXISTS abc");
+      await driver.execSimpleQueryAsync("CREATE TABLE abc (name varchar(100))");
+      await driver.execSimpleQueryAsync("INSERT INTO abc VALUES ('jane'), ('bob'), ('alice')");
     });
 
+    it("#update should work", function (done) {
+      driver.update('abc', { name: 'bob' }, { name: 'jane' }, function (err) {
+        should.not.exist(err);
+        driver.execSimpleQuery("SELECT count(*) FROM abc WHERE name = 'bob'", function (err, data) {
+          should.not.exist(err);
+          should.deepEqual(data, [{ 'count(*)': 2 }]);
+          done();
+        });
+      });
+    });
+
+    it("#updateAsync should work", async function () {
+      await driver.updateAsync('abc', { name: 'bob' }, { name: 'jane' });
+      const data = await driver.execSimpleQueryAsync("SELECT count(*) FROM abc WHERE name = 'bob'");
+      should.deepEqual(data, [{ 'count(*)': 2 }]);
+    });
+  });
+
+  describe("remove", function () {
+    beforeEach(async function () {
+      await driver.execSimpleQueryAsync("DROP TABLE IF EXISTS abc");
+      await driver.execSimpleQueryAsync("CREATE TABLE abc (name varchar(100))");
+      await driver.execSimpleQueryAsync("INSERT INTO abc VALUES ('jane'), ('bob'), ('alice')");
+    });
+
+    it("#remove should work", function (done) {
+      driver.remove('abc', { name: 'bob' }, function (err) {
+        should.not.exist(err);
+        driver.execSimpleQuery("SELECT name FROM abc ORDER BY name", function (err, data) {
+          should.not.exist(err);
+          should.deepEqual(data, [{ name: 'alice' }, { name: 'jane' }]);
+          done();
+        });
+      });
+    });
+
+    it("#removeAsync should work", async function () {
+      await driver.removeAsync('abc', { name: 'bob' });
+      const data = await driver.execSimpleQueryAsync("SELECT name FROM abc ORDER BY name");
+      should.deepEqual(data, [{ name: 'alice' }, { name: 'jane' }]);
+    });
+  });
+
+  describe("clear", function () {
+    describe("without sqlite_sequence table", function () {
+      beforeEach(async function () {
+        await driver.execSimpleQueryAsync("DROP TABLE IF EXISTS abc");
+        await driver.execSimpleQueryAsync("CREATE TABLE abc (name varchar(100))");
+        await driver.execSimpleQueryAsync("INSERT INTO abc VALUES ('jane'), ('bob'), ('alice')");
+      });
+
+      it("#clear should work", function (done) {
+        driver.clear('abc', function (err) {
+          should.not.exist(err);
+          driver.execSimpleQuery("SELECT count(*) FROM abc", function (err, data) {
+            should.not.exist(err);
+            should.deepEqual(data, [{ 'count(*)': 0 }]);
+            done();
+          });
+        });
+      });
+
+      it("#clearAsync should work", async function () {
+        await driver.clearAsync('abc');
+        const data = await driver.execSimpleQueryAsync("SELECT count(*) FROM abc");
+        should.deepEqual(data, [{ 'count(*)': 0 }]);
+      });
+    });
+
+    describe("with sqlite_sequence table", function () {
+      beforeEach(async function () {
+        await driver.execSimpleQueryAsync("DROP TABLE IF EXISTS abc");
+        await driver.execSimpleQueryAsync("CREATE TABLE abc (name varchar(100), id INTEGER PRIMARY KEY AUTOINCREMENT)");
+        await driver.execSimpleQueryAsync("INSERT INTO abc VALUES ('jane', null), ('bob', null), ('alice', null)");
+      });
+
+      it("#clear should work", function (done) {
+        driver.clear('abc', function (err) {
+          should.not.exist(err);
+          driver.execSimpleQuery("SELECT count(*) FROM abc", function (err, data) {
+            should.not.exist(err);
+            should.deepEqual(data, [{ 'count(*)': 0 }]);
+            done();
+          });
+        });
+      });
+
+      it("#clearAsync should work", async function () {
+        await driver.clearAsync('abc');
+        const data = await driver.execSimpleQueryAsync("SELECT count(*) FROM abc");
+        should.deepEqual(data, [{ 'count(*)': 0 }]);
+      });
+    });
+  });
+
+  describe("#valueToProperty", function () {
     describe("numbers", function () {
       describe("floats", function () {
         function valueToProperty (value) {

From 01586f7a3a148371381bcb663a49b16a8c71c133 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 26 Oct 2021 07:16:33 +0000
Subject: [PATCH 1234/1246] Run tests against multiple nodejs versions

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bf7f43d3..dc7e3c82 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: ['14']
+        node-version: ['10', '12', '14', '16']
 
     name: test on nodejs ${{ matrix.node-version }}
 

From 1512a4cb697accfb009bde5b3450bd883fafd4ab Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 26 Oct 2021 07:21:58 +0000
Subject: [PATCH 1235/1246] Excluse github files from npm

---
 .npmignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.npmignore b/.npmignore
index 7b93b7d6..f3910ecb 100644
--- a/.npmignore
+++ b/.npmignore
@@ -2,8 +2,9 @@
 *.njsproj
 *.nodevsdbg
 .DS_Store
+.github
 node_modules
 test*
 lib-cov/
 *~
-.idea
\ No newline at end of file
+.idea

From 24db55fa1df0939a025c497010871700d232fc5e Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 27 Oct 2021 00:47:55 +0000
Subject: [PATCH 1236/1246] show & verify test coverage

---
 .gitignore                         |    9 +-
 .mocharc.json                      |    5 +
 .npmignore                         |    6 +-
 Makefile                           |   16 +-
 package-lock.json                  | 1144 +++++++++++++++++++++++++++-
 package.json                       |   12 +-
 test/common.js                     |    5 +-
 test/integration/orm-exports.js    |    6 +-
 test/mocha.opts                    |    3 -
 test/run.js                        |   21 +-
 test/support/coverage-package.json |    4 -
 11 files changed, 1179 insertions(+), 52 deletions(-)
 create mode 100644 .mocharc.json
 delete mode 100644 test/mocha.opts
 delete mode 100644 test/support/coverage-package.json

diff --git a/.gitignore b/.gitignore
index a09ad17e..090388b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,10 @@
 *.sublime-*
 *.njsproj
 *.nodevsdbg
+*~
 .DS_Store
+.idea
+.nyc_output
 node_modules
-test/config.js
-test/coverage.html
-lib-cov/
-*~
 npm-debug.log
-.idea
+test/config.js
diff --git a/.mocharc.json b/.mocharc.json
new file mode 100644
index 00000000..f8d2af6a
--- /dev/null
+++ b/.mocharc.json
@@ -0,0 +1,5 @@
+{
+  "reporter": "spec",
+  "timeout": 15000,
+  "exit": true
+}
diff --git a/.npmignore b/.npmignore
index f3910ecb..4f81eb10 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,10 +1,10 @@
 *.sublime-*
 *.njsproj
 *.nodevsdbg
+*~
 .DS_Store
 .github
+.idea
+.nyc_output
 node_modules
 test*
-lib-cov/
-*~
-.idea
diff --git a/Makefile b/Makefile
index 24f0d9d0..b3e4fa54 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,8 @@
 test:
-	ORM_PROTOCOL=mysql node test/run
+	ORM_PROTOCOL=mysql    node test/run
 	ORM_PROTOCOL=postgres node test/run
 	ORM_PROTOCOL=redshift node test/run
-	ORM_PROTOCOL=sqlite node test/run
-	ORM_PROTOCOL=mongodb node test/run
-
-coverage: cov
-
-cov:
-	rm -rf lib-cov
-	jscoverage lib lib-cov
-	mv package.json test/support/
-	cp test/support/coverage-package.json package.json
-	ORM_PROTOCOL=mysql mocha -R html-cov test/integration/ > test/coverage.html
-	mv test/support/package.json .
+	ORM_PROTOCOL=sqlite   node test/run
+	ORM_PROTOCOL=mongodb  node test/run
 
 .PHONY: test
diff --git a/package-lock.json b/package-lock.json
index b1af8b4d..63f2cb7e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,404 @@
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
+		"@babel/code-frame": {
+			"version": "7.15.8",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz",
+			"integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==",
+			"dev": true,
+			"requires": {
+				"@babel/highlight": "^7.14.5"
+			}
+		},
+		"@babel/compat-data": {
+			"version": "7.15.0",
+			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz",
+			"integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==",
+			"dev": true
+		},
+		"@babel/core": {
+			"version": "7.15.8",
+			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.8.tgz",
+			"integrity": "sha512-3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.15.8",
+				"@babel/generator": "^7.15.8",
+				"@babel/helper-compilation-targets": "^7.15.4",
+				"@babel/helper-module-transforms": "^7.15.8",
+				"@babel/helpers": "^7.15.4",
+				"@babel/parser": "^7.15.8",
+				"@babel/template": "^7.15.4",
+				"@babel/traverse": "^7.15.4",
+				"@babel/types": "^7.15.6",
+				"convert-source-map": "^1.7.0",
+				"debug": "^4.1.0",
+				"gensync": "^1.0.0-beta.2",
+				"json5": "^2.1.2",
+				"semver": "^6.3.0",
+				"source-map": "^0.5.0"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/generator": {
+			"version": "7.15.8",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz",
+			"integrity": "sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.15.6",
+				"jsesc": "^2.5.1",
+				"source-map": "^0.5.0"
+			}
+		},
+		"@babel/helper-compilation-targets": {
+			"version": "7.15.4",
+			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz",
+			"integrity": "sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==",
+			"dev": true,
+			"requires": {
+				"@babel/compat-data": "^7.15.0",
+				"@babel/helper-validator-option": "^7.14.5",
+				"browserslist": "^4.16.6",
+				"semver": "^6.3.0"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/helper-function-name": {
+			"version": "7.15.4",
+			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz",
+			"integrity": "sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-get-function-arity": "^7.15.4",
+				"@babel/template": "^7.15.4",
+				"@babel/types": "^7.15.4"
+			}
+		},
+		"@babel/helper-get-function-arity": {
+			"version": "7.15.4",
+			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz",
+			"integrity": "sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.15.4"
+			}
+		},
+		"@babel/helper-hoist-variables": {
+			"version": "7.15.4",
+			"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz",
+			"integrity": "sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.15.4"
+			}
+		},
+		"@babel/helper-member-expression-to-functions": {
+			"version": "7.15.4",
+			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz",
+			"integrity": "sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.15.4"
+			}
+		},
+		"@babel/helper-module-imports": {
+			"version": "7.15.4",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz",
+			"integrity": "sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.15.4"
+			}
+		},
+		"@babel/helper-module-transforms": {
+			"version": "7.15.8",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.8.tgz",
+			"integrity": "sha512-DfAfA6PfpG8t4S6npwzLvTUpp0sS7JrcuaMiy1Y5645laRJIp/LiLGIBbQKaXSInK8tiGNI7FL7L8UvB8gdUZg==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-module-imports": "^7.15.4",
+				"@babel/helper-replace-supers": "^7.15.4",
+				"@babel/helper-simple-access": "^7.15.4",
+				"@babel/helper-split-export-declaration": "^7.15.4",
+				"@babel/helper-validator-identifier": "^7.15.7",
+				"@babel/template": "^7.15.4",
+				"@babel/traverse": "^7.15.4",
+				"@babel/types": "^7.15.6"
+			}
+		},
+		"@babel/helper-optimise-call-expression": {
+			"version": "7.15.4",
+			"resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz",
+			"integrity": "sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.15.4"
+			}
+		},
+		"@babel/helper-replace-supers": {
+			"version": "7.15.4",
+			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz",
+			"integrity": "sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-member-expression-to-functions": "^7.15.4",
+				"@babel/helper-optimise-call-expression": "^7.15.4",
+				"@babel/traverse": "^7.15.4",
+				"@babel/types": "^7.15.4"
+			}
+		},
+		"@babel/helper-simple-access": {
+			"version": "7.15.4",
+			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz",
+			"integrity": "sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.15.4"
+			}
+		},
+		"@babel/helper-split-export-declaration": {
+			"version": "7.15.4",
+			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz",
+			"integrity": "sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.15.4"
+			}
+		},
+		"@babel/helper-validator-identifier": {
+			"version": "7.15.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
+			"integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
+			"dev": true
+		},
+		"@babel/helper-validator-option": {
+			"version": "7.14.5",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz",
+			"integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==",
+			"dev": true
+		},
+		"@babel/helpers": {
+			"version": "7.15.4",
+			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz",
+			"integrity": "sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==",
+			"dev": true,
+			"requires": {
+				"@babel/template": "^7.15.4",
+				"@babel/traverse": "^7.15.4",
+				"@babel/types": "^7.15.4"
+			}
+		},
+		"@babel/highlight": {
+			"version": "7.14.5",
+			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
+			"integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-validator-identifier": "^7.14.5",
+				"chalk": "^2.0.0",
+				"js-tokens": "^4.0.0"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "3.2.1",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+					"dev": true,
+					"requires": {
+						"color-convert": "^1.9.0"
+					}
+				},
+				"chalk": {
+					"version": "2.4.2",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "^3.2.1",
+						"escape-string-regexp": "^1.0.5",
+						"supports-color": "^5.3.0"
+					}
+				},
+				"color-convert": {
+					"version": "1.9.3",
+					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+					"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+					"dev": true,
+					"requires": {
+						"color-name": "1.1.3"
+					}
+				},
+				"color-name": {
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+					"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+					"dev": true
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				},
+				"has-flag": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+					"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "5.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^3.0.0"
+					}
+				}
+			}
+		},
+		"@babel/parser": {
+			"version": "7.15.8",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz",
+			"integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==",
+			"dev": true
+		},
+		"@babel/template": {
+			"version": "7.15.4",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz",
+			"integrity": "sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.14.5",
+				"@babel/parser": "^7.15.4",
+				"@babel/types": "^7.15.4"
+			}
+		},
+		"@babel/traverse": {
+			"version": "7.15.4",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz",
+			"integrity": "sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.14.5",
+				"@babel/generator": "^7.15.4",
+				"@babel/helper-function-name": "^7.15.4",
+				"@babel/helper-hoist-variables": "^7.15.4",
+				"@babel/helper-split-export-declaration": "^7.15.4",
+				"@babel/parser": "^7.15.4",
+				"@babel/types": "^7.15.4",
+				"debug": "^4.1.0",
+				"globals": "^11.1.0"
+			}
+		},
+		"@babel/types": {
+			"version": "7.15.6",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz",
+			"integrity": "sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-validator-identifier": "^7.14.9",
+				"to-fast-properties": "^2.0.0"
+			}
+		},
+		"@istanbuljs/load-nyc-config": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+			"integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+			"dev": true,
+			"requires": {
+				"camelcase": "^5.3.1",
+				"find-up": "^4.1.0",
+				"get-package-type": "^0.1.0",
+				"js-yaml": "^3.13.1",
+				"resolve-from": "^5.0.0"
+			},
+			"dependencies": {
+				"argparse": {
+					"version": "1.0.10",
+					"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+					"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+					"dev": true,
+					"requires": {
+						"sprintf-js": "~1.0.2"
+					}
+				},
+				"camelcase": {
+					"version": "5.3.1",
+					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+					"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+					"dev": true
+				},
+				"find-up": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+					"dev": true,
+					"requires": {
+						"locate-path": "^5.0.0",
+						"path-exists": "^4.0.0"
+					}
+				},
+				"js-yaml": {
+					"version": "3.14.1",
+					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+					"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+					"dev": true,
+					"requires": {
+						"argparse": "^1.0.7",
+						"esprima": "^4.0.0"
+					}
+				},
+				"locate-path": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+					"dev": true,
+					"requires": {
+						"p-locate": "^4.1.0"
+					}
+				},
+				"p-limit": {
+					"version": "2.3.0",
+					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+					"dev": true,
+					"requires": {
+						"p-try": "^2.0.0"
+					}
+				},
+				"p-locate": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+					"dev": true,
+					"requires": {
+						"p-limit": "^2.2.0"
+					}
+				}
+			}
+		},
+		"@istanbuljs/schema": {
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+			"integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+			"dev": true
+		},
 		"@sinonjs/commons": {
 			"version": "1.8.3",
 			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
@@ -51,6 +449,16 @@
 			"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
 			"dev": true
 		},
+		"aggregate-error": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+			"integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+			"dev": true,
+			"requires": {
+				"clean-stack": "^2.0.0",
+				"indent-string": "^4.0.0"
+			}
+		},
 		"ajv": {
 			"version": "6.12.6",
 			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -95,12 +503,27 @@
 				"picomatch": "^2.0.4"
 			}
 		},
+		"append-transform": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz",
+			"integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==",
+			"dev": true,
+			"requires": {
+				"default-require-extensions": "^3.0.0"
+			}
+		},
 		"aproba": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
 			"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
 			"dev": true
 		},
+		"archy": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
+			"integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
+			"dev": true
+		},
 		"are-we-there-yet": {
 			"version": "1.1.7",
 			"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
@@ -231,6 +654,19 @@
 			"integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
 			"dev": true
 		},
+		"browserslist": {
+			"version": "4.17.5",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.5.tgz",
+			"integrity": "sha512-I3ekeB92mmpctWBoLXe0d5wPS2cBuRvvW0JyyJHMrk9/HmP2ZjrTboNAZ8iuGqaEIlKguljbQY32OkOJIRrgoA==",
+			"dev": true,
+			"requires": {
+				"caniuse-lite": "^1.0.30001271",
+				"electron-to-chromium": "^1.3.878",
+				"escalade": "^3.1.1",
+				"node-releases": "^2.0.1",
+				"picocolors": "^1.0.0"
+			}
+		},
 		"bson": {
 			"version": "0.2.22",
 			"resolved": "https://registry.npmjs.org/bson/-/bson-0.2.22.tgz",
@@ -246,12 +682,30 @@
 			"integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==",
 			"dev": true
 		},
+		"caching-transform": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz",
+			"integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==",
+			"dev": true,
+			"requires": {
+				"hasha": "^5.0.0",
+				"make-dir": "^3.0.0",
+				"package-hash": "^4.0.0",
+				"write-file-atomic": "^3.0.0"
+			}
+		},
 		"camelcase": {
 			"version": "6.2.0",
 			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
 			"integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
 			"dev": true
 		},
+		"caniuse-lite": {
+			"version": "1.0.30001271",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001271.tgz",
+			"integrity": "sha512-BBruZFWmt3HFdVPS8kceTBIguKxu4f99n5JNp06OlPD/luoAMIaIK5ieV5YjnBLH3Nysai9sxj9rpJj4ZisXOA==",
+			"dev": true
+		},
 		"caseless": {
 			"version": "0.12.0",
 			"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
@@ -291,6 +745,12 @@
 			"integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
 			"dev": true
 		},
+		"clean-stack": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+			"integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+			"dev": true
+		},
 		"cliui": {
 			"version": "7.0.4",
 			"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
@@ -333,6 +793,12 @@
 				"delayed-stream": "~1.0.0"
 			}
 		},
+		"commondir": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+			"integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+			"dev": true
+		},
 		"concat-map": {
 			"version": "0.0.1",
 			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -345,12 +811,32 @@
 			"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
 			"dev": true
 		},
+		"convert-source-map": {
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+			"integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+			"dev": true,
+			"requires": {
+				"safe-buffer": "~5.1.1"
+			}
+		},
 		"core-util-is": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
 			"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
 			"dev": true
 		},
+		"cross-spawn": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+			"dev": true,
+			"requires": {
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
+			}
+		},
 		"dashdash": {
 			"version": "1.14.1",
 			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -390,6 +876,15 @@
 			"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
 			"dev": true
 		},
+		"default-require-extensions": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.0.tgz",
+			"integrity": "sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg==",
+			"dev": true,
+			"requires": {
+				"strip-bom": "^4.0.0"
+			}
+		},
 		"delayed-stream": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -426,6 +921,12 @@
 				"safer-buffer": "^2.1.0"
 			}
 		},
+		"electron-to-chromium": {
+			"version": "1.3.880",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.880.tgz",
+			"integrity": "sha512-iwIP/6WoeSimzUKJIQtjtpVDsK8Ir8qQCMXsUBwg+rxJR2Uh3wTNSbxoYRfs+3UWx/9MAnPIxVZCyWkm8MT0uw==",
+			"dev": true
+		},
 		"emoji-regex": {
 			"version": "8.0.0",
 			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -437,6 +938,12 @@
 			"resolved": "https://registry.npmjs.org/enforce/-/enforce-0.1.7.tgz",
 			"integrity": "sha1-r3zdP6mCsuyq4GrntcJZUX0ivj8="
 		},
+		"es6-error": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
+			"integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
+			"dev": true
+		},
 		"escalade": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@@ -449,6 +956,12 @@
 			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
 			"dev": true
 		},
+		"esprima": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+			"dev": true
+		},
 		"extend": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -486,6 +999,17 @@
 				"to-regex-range": "^5.0.1"
 			}
 		},
+		"find-cache-dir": {
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
+			"integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+			"dev": true,
+			"requires": {
+				"commondir": "^1.0.1",
+				"make-dir": "^3.0.2",
+				"pkg-dir": "^4.1.0"
+			}
+		},
 		"find-up": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
@@ -502,6 +1026,16 @@
 			"integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
 			"dev": true
 		},
+		"foreground-child": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz",
+			"integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==",
+			"dev": true,
+			"requires": {
+				"cross-spawn": "^7.0.0",
+				"signal-exit": "^3.0.2"
+			}
+		},
 		"forever-agent": {
 			"version": "0.6.1",
 			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -521,6 +1055,12 @@
 				"mime-types": "^2.1.12"
 			}
 		},
+		"fromentries": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz",
+			"integrity": "sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==",
+			"dev": true
+		},
 		"fs-minipass": {
 			"version": "1.2.7",
 			"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
@@ -609,12 +1149,24 @@
 				}
 			}
 		},
+		"gensync": {
+			"version": "1.0.0-beta.2",
+			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+			"dev": true
+		},
 		"get-caller-file": {
 			"version": "2.0.5",
 			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
 			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
 			"dev": true
 		},
+		"get-package-type": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+			"integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+			"dev": true
+		},
 		"getpass": {
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
@@ -648,12 +1200,17 @@
 				"is-glob": "^4.0.1"
 			}
 		},
+		"globals": {
+			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+			"dev": true
+		},
 		"graceful-fs": {
 			"version": "4.2.8",
 			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
 			"integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
-			"dev": true,
-			"optional": true
+			"dev": true
 		},
 		"growl": {
 			"version": "1.10.5",
@@ -691,6 +1248,16 @@
 			"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
 			"dev": true
 		},
+		"hasha": {
+			"version": "5.2.2",
+			"resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz",
+			"integrity": "sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==",
+			"dev": true,
+			"requires": {
+				"is-stream": "^2.0.0",
+				"type-fest": "^0.8.0"
+			}
+		},
 		"hat": {
 			"version": "0.0.3",
 			"resolved": "https://registry.npmjs.org/hat/-/hat-0.0.3.tgz",
@@ -702,6 +1269,12 @@
 			"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
 			"dev": true
 		},
+		"html-escaper": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+			"integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+			"dev": true
+		},
 		"http-signature": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
@@ -732,6 +1305,18 @@
 				"minimatch": "^3.0.4"
 			}
 		},
+		"imurmurhash": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+			"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+			"dev": true
+		},
+		"indent-string": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+			"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+			"dev": true
+		},
 		"inflight": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -796,12 +1381,17 @@
 			"integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
 			"dev": true
 		},
+		"is-stream": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+			"dev": true
+		},
 		"is-typedarray": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
 			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-			"dev": true,
-			"optional": true
+			"dev": true
 		},
 		"is-unicode-supported": {
 			"version": "0.1.0",
@@ -809,6 +1399,12 @@
 			"integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
 			"dev": true
 		},
+		"is-windows": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+			"dev": true
+		},
 		"isarray": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -828,6 +1424,113 @@
 			"dev": true,
 			"optional": true
 		},
+		"istanbul-lib-coverage": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
+			"integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
+			"dev": true
+		},
+		"istanbul-lib-hook": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz",
+			"integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==",
+			"dev": true,
+			"requires": {
+				"append-transform": "^2.0.0"
+			}
+		},
+		"istanbul-lib-instrument": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
+			"integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+			"dev": true,
+			"requires": {
+				"@babel/core": "^7.7.5",
+				"@istanbuljs/schema": "^0.1.2",
+				"istanbul-lib-coverage": "^3.0.0",
+				"semver": "^6.3.0"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				}
+			}
+		},
+		"istanbul-lib-processinfo": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.2.tgz",
+			"integrity": "sha512-kOwpa7z9hme+IBPZMzQ5vdQj8srYgAtaRqeI48NGmAQ+/5yKiHLV0QbYqQpxsdEF0+w14SoB8YbnHKcXE2KnYw==",
+			"dev": true,
+			"requires": {
+				"archy": "^1.0.0",
+				"cross-spawn": "^7.0.0",
+				"istanbul-lib-coverage": "^3.0.0-alpha.1",
+				"make-dir": "^3.0.0",
+				"p-map": "^3.0.0",
+				"rimraf": "^3.0.0",
+				"uuid": "^3.3.3"
+			},
+			"dependencies": {
+				"rimraf": {
+					"version": "3.0.2",
+					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+					"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+					"dev": true,
+					"requires": {
+						"glob": "^7.1.3"
+					}
+				}
+			}
+		},
+		"istanbul-lib-report": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+			"integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+			"dev": true,
+			"requires": {
+				"istanbul-lib-coverage": "^3.0.0",
+				"make-dir": "^3.0.0",
+				"supports-color": "^7.1.0"
+			}
+		},
+		"istanbul-lib-source-maps": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+			"integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.1.1",
+				"istanbul-lib-coverage": "^3.0.0",
+				"source-map": "^0.6.1"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				}
+			}
+		},
+		"istanbul-reports": {
+			"version": "3.0.5",
+			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.5.tgz",
+			"integrity": "sha512-5+19PlhnGabNWB7kOFnuxT8H3T/iIyQzIbQMxXsURmmvKg86P2sbkrGOT77VnHw0Qr0gc2XzRaRfMZYYbSQCJQ==",
+			"dev": true,
+			"requires": {
+				"html-escaper": "^2.0.0",
+				"istanbul-lib-report": "^3.0.0"
+			}
+		},
+		"js-tokens": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+			"dev": true
+		},
 		"js-yaml": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -844,6 +1547,12 @@
 			"dev": true,
 			"optional": true
 		},
+		"jsesc": {
+			"version": "2.5.2",
+			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+			"dev": true
+		},
 		"json-schema": {
 			"version": "0.2.3",
 			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
@@ -865,6 +1574,15 @@
 			"dev": true,
 			"optional": true
 		},
+		"json5": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+			"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+			"dev": true,
+			"requires": {
+				"minimist": "^1.2.5"
+			}
+		},
 		"jsprim": {
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -905,6 +1623,12 @@
 			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
 			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
 		},
+		"lodash.flattendeep": {
+			"version": "4.4.0",
+			"resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
+			"integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
+			"dev": true
+		},
 		"lodash.get": {
 			"version": "4.4.2",
 			"resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
@@ -930,6 +1654,23 @@
 				"yallist": "^4.0.0"
 			}
 		},
+		"make-dir": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+			"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+			"dev": true,
+			"requires": {
+				"semver": "^6.0.0"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				}
+			}
+		},
 		"mime-db": {
 			"version": "1.50.0",
 			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz",
@@ -1284,6 +2025,21 @@
 				}
 			}
 		},
+		"node-preload": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz",
+			"integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==",
+			"dev": true,
+			"requires": {
+				"process-on-spawn": "^1.0.0"
+			}
+		},
+		"node-releases": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
+			"integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
+			"dev": true
+		},
 		"nopt": {
 			"version": "3.0.6",
 			"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
@@ -1344,6 +2100,158 @@
 			"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
 			"dev": true
 		},
+		"nyc": {
+			"version": "15.1.0",
+			"resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz",
+			"integrity": "sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==",
+			"dev": true,
+			"requires": {
+				"@istanbuljs/load-nyc-config": "^1.0.0",
+				"@istanbuljs/schema": "^0.1.2",
+				"caching-transform": "^4.0.0",
+				"convert-source-map": "^1.7.0",
+				"decamelize": "^1.2.0",
+				"find-cache-dir": "^3.2.0",
+				"find-up": "^4.1.0",
+				"foreground-child": "^2.0.0",
+				"get-package-type": "^0.1.0",
+				"glob": "^7.1.6",
+				"istanbul-lib-coverage": "^3.0.0",
+				"istanbul-lib-hook": "^3.0.0",
+				"istanbul-lib-instrument": "^4.0.0",
+				"istanbul-lib-processinfo": "^2.0.2",
+				"istanbul-lib-report": "^3.0.0",
+				"istanbul-lib-source-maps": "^4.0.0",
+				"istanbul-reports": "^3.0.2",
+				"make-dir": "^3.0.0",
+				"node-preload": "^0.2.1",
+				"p-map": "^3.0.0",
+				"process-on-spawn": "^1.0.0",
+				"resolve-from": "^5.0.0",
+				"rimraf": "^3.0.0",
+				"signal-exit": "^3.0.2",
+				"spawn-wrap": "^2.0.0",
+				"test-exclude": "^6.0.0",
+				"yargs": "^15.0.2"
+			},
+			"dependencies": {
+				"camelcase": {
+					"version": "5.3.1",
+					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+					"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+					"dev": true
+				},
+				"cliui": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+					"integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+					"dev": true,
+					"requires": {
+						"string-width": "^4.2.0",
+						"strip-ansi": "^6.0.0",
+						"wrap-ansi": "^6.2.0"
+					}
+				},
+				"decamelize": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+					"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+					"dev": true
+				},
+				"find-up": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+					"dev": true,
+					"requires": {
+						"locate-path": "^5.0.0",
+						"path-exists": "^4.0.0"
+					}
+				},
+				"locate-path": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+					"dev": true,
+					"requires": {
+						"p-locate": "^4.1.0"
+					}
+				},
+				"p-limit": {
+					"version": "2.3.0",
+					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+					"dev": true,
+					"requires": {
+						"p-try": "^2.0.0"
+					}
+				},
+				"p-locate": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+					"dev": true,
+					"requires": {
+						"p-limit": "^2.2.0"
+					}
+				},
+				"rimraf": {
+					"version": "3.0.2",
+					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+					"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+					"dev": true,
+					"requires": {
+						"glob": "^7.1.3"
+					}
+				},
+				"wrap-ansi": {
+					"version": "6.2.0",
+					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+					"integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "^4.0.0",
+						"string-width": "^4.1.0",
+						"strip-ansi": "^6.0.0"
+					}
+				},
+				"y18n": {
+					"version": "4.0.3",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+					"integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+					"dev": true
+				},
+				"yargs": {
+					"version": "15.4.1",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+					"integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+					"dev": true,
+					"requires": {
+						"cliui": "^6.0.0",
+						"decamelize": "^1.2.0",
+						"find-up": "^4.1.0",
+						"get-caller-file": "^2.0.1",
+						"require-directory": "^2.1.1",
+						"require-main-filename": "^2.0.0",
+						"set-blocking": "^2.0.0",
+						"string-width": "^4.2.0",
+						"which-module": "^2.0.0",
+						"y18n": "^4.0.0",
+						"yargs-parser": "^18.1.2"
+					}
+				},
+				"yargs-parser": {
+					"version": "18.1.3",
+					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+					"integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+					"dev": true,
+					"requires": {
+						"camelcase": "^5.0.0",
+						"decamelize": "^1.2.0"
+					}
+				}
+			}
+		},
 		"oauth-sign": {
 			"version": "0.9.0",
 			"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
@@ -1406,6 +2314,33 @@
 				"p-limit": "^3.0.2"
 			}
 		},
+		"p-map": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
+			"integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
+			"dev": true,
+			"requires": {
+				"aggregate-error": "^3.0.0"
+			}
+		},
+		"p-try": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+			"dev": true
+		},
+		"package-hash": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz",
+			"integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==",
+			"dev": true,
+			"requires": {
+				"graceful-fs": "^4.1.15",
+				"hasha": "^5.0.0",
+				"lodash.flattendeep": "^4.4.0",
+				"release-zalgo": "^1.0.0"
+			}
+		},
 		"packet-reader": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz",
@@ -1423,6 +2358,12 @@
 			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
 			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
 		},
+		"path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"dev": true
+		},
 		"path-to-regexp": {
 			"version": "1.8.0",
 			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
@@ -1508,12 +2449,66 @@
 				"split2": "^3.1.1"
 			}
 		},
+		"picocolors": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+			"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+			"dev": true
+		},
 		"picomatch": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
 			"integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
 			"dev": true
 		},
+		"pkg-dir": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+			"dev": true,
+			"requires": {
+				"find-up": "^4.0.0"
+			},
+			"dependencies": {
+				"find-up": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+					"dev": true,
+					"requires": {
+						"locate-path": "^5.0.0",
+						"path-exists": "^4.0.0"
+					}
+				},
+				"locate-path": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+					"dev": true,
+					"requires": {
+						"p-locate": "^4.1.0"
+					}
+				},
+				"p-limit": {
+					"version": "2.3.0",
+					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+					"dev": true,
+					"requires": {
+						"p-try": "^2.0.0"
+					}
+				},
+				"p-locate": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+					"dev": true,
+					"requires": {
+						"p-limit": "^2.2.0"
+					}
+				}
+			}
+		},
 		"postgres-array": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
@@ -1547,6 +2542,15 @@
 			"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
 			"dev": true
 		},
+		"process-on-spawn": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz",
+			"integrity": "sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==",
+			"dev": true,
+			"requires": {
+				"fromentries": "^1.2.0"
+			}
+		},
 		"psl": {
 			"version": "1.8.0",
 			"resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
@@ -1621,6 +2625,15 @@
 				"picomatch": "^2.2.1"
 			}
 		},
+		"release-zalgo": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz",
+			"integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=",
+			"dev": true,
+			"requires": {
+				"es6-error": "^4.0.1"
+			}
+		},
 		"request": {
 			"version": "2.88.2",
 			"resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
@@ -1665,6 +2678,18 @@
 			"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
 			"dev": true
 		},
+		"require-main-filename": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+			"integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+			"dev": true
+		},
+		"resolve-from": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+			"dev": true
+		},
 		"rimraf": {
 			"version": "2.7.1",
 			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -1716,6 +2741,21 @@
 			"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
 			"dev": true
 		},
+		"shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+			"dev": true,
+			"requires": {
+				"shebang-regex": "^3.0.0"
+			}
+		},
+		"shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+			"dev": true
+		},
 		"should": {
 			"version": "13.2.3",
 			"resolved": "https://registry.npmjs.org/should/-/should-13.2.3.tgz",
@@ -1790,6 +2830,37 @@
 				"supports-color": "^7.2.0"
 			}
 		},
+		"source-map": {
+			"version": "0.5.7",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+			"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+			"dev": true
+		},
+		"spawn-wrap": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz",
+			"integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==",
+			"dev": true,
+			"requires": {
+				"foreground-child": "^2.0.0",
+				"is-windows": "^1.0.2",
+				"make-dir": "^3.0.0",
+				"rimraf": "^3.0.0",
+				"signal-exit": "^3.0.2",
+				"which": "^2.0.1"
+			},
+			"dependencies": {
+				"rimraf": {
+					"version": "3.0.2",
+					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+					"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+					"dev": true,
+					"requires": {
+						"glob": "^7.1.3"
+					}
+				}
+			}
+		},
 		"split2": {
 			"version": "3.2.2",
 			"resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
@@ -1827,6 +2898,12 @@
 				}
 			}
 		},
+		"sprintf-js": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+			"dev": true
+		},
 		"sql-ddl-sync": {
 			"version": "0.3.16",
 			"resolved": "https://registry.npmjs.org/sql-ddl-sync/-/sql-ddl-sync-0.3.16.tgz",
@@ -1904,6 +2981,12 @@
 				"ansi-regex": "^5.0.1"
 			}
 		},
+		"strip-bom": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+			"integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+			"dev": true
+		},
 		"strip-json-comments": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -1931,6 +3014,23 @@
 				"inherits": "2"
 			}
 		},
+		"test-exclude": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+			"integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+			"dev": true,
+			"requires": {
+				"@istanbuljs/schema": "^0.1.2",
+				"glob": "^7.1.4",
+				"minimatch": "^3.0.4"
+			}
+		},
+		"to-fast-properties": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+			"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+			"dev": true
+		},
 		"to-regex-range": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -1974,6 +3074,21 @@
 			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
 			"dev": true
 		},
+		"type-fest": {
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+			"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+			"dev": true
+		},
+		"typedarray-to-buffer": {
+			"version": "3.1.5",
+			"resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+			"integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+			"dev": true,
+			"requires": {
+				"is-typedarray": "^1.0.0"
+			}
+		},
 		"uri-js": {
 			"version": "4.4.1",
 			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@@ -1994,8 +3109,7 @@
 			"version": "3.4.0",
 			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
 			"integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-			"dev": true,
-			"optional": true
+			"dev": true
 		},
 		"verror": {
 			"version": "1.10.0",
@@ -2018,6 +3132,12 @@
 				"isexe": "^2.0.0"
 			}
 		},
+		"which-module": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+			"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+			"dev": true
+		},
 		"wide-align": {
 			"version": "1.1.5",
 			"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
@@ -2050,6 +3170,18 @@
 			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
 			"dev": true
 		},
+		"write-file-atomic": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+			"integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+			"dev": true,
+			"requires": {
+				"imurmurhash": "^0.1.4",
+				"is-typedarray": "^1.0.0",
+				"signal-exit": "^3.0.2",
+				"typedarray-to-buffer": "^3.1.5"
+			}
+		},
 		"xtend": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
diff --git a/package.json b/package.json
index 8d04d62f..13adb7bf 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
   ],
   "main": "./lib/ORM",
   "scripts": {
-    "test": "make test"
+    "test": "nyc make test"
   },
   "engines": {
     "node": ">= 4.0.0"
@@ -76,11 +76,19 @@
     "mocha": "~9.1.3",
     "mongodb": "~1.4.10",
     "mysql": "~2.18.1",
+    "nyc": "~15.1.0",
     "pg": "~8.7.1",
     "semver": "~7.3.5",
     "should": "~13.2.3",
     "sinon": "~11.1.2",
     "sqlite3": "~5.0.2"
   },
-  "optionalDependencies": {}
+  "optionalDependencies": {},
+  "nyc": {
+    "check-coverage": true,
+    "statements": 89.22,
+    "branches": 79.76,
+    "functions": 91.46,
+    "lines": 89.68
+  }
 }
diff --git a/test/common.js b/test/common.js
index c0fbde0d..91e5bfe8 100644
--- a/test/common.js
+++ b/test/common.js
@@ -1,13 +1,14 @@
-var common      = exports;
-var path        = require('path');
 var async       = require('async');
 var _           = require('lodash');
+var path        = require('path');
 var url         = require("url");
 var util        = require('util');
 var querystring = require('querystring');
 var Semver      = require('semver/classes/semver');
 var ORM         = require('../');
 
+var common      = exports;
+
 common.ORM = ORM;
 
 common.protocol = function () {
diff --git a/test/integration/orm-exports.js b/test/integration/orm-exports.js
index 3338885c..ee6db257 100644
--- a/test/integration/orm-exports.js
+++ b/test/integration/orm-exports.js
@@ -323,11 +323,11 @@ describe("ORM", function() {
 
     it("should emit valid error if exception being thrown during connection try", function (done) {
       var testConfig = {
-          protocol : 'mongodb',
+          protocol : 'postgres',
           href     : 'unknownhost',
           database : 'unknowndb',
-          user     : '',
-          password : ''
+          user     : 'a',
+          password : 'b'
         },
         db = ORM.connect(testConfig);
 
diff --git a/test/mocha.opts b/test/mocha.opts
deleted file mode 100644
index 33456697..00000000
--- a/test/mocha.opts
+++ /dev/null
@@ -1,3 +0,0 @@
---reporter spec
---timeout 15000
---exit
diff --git a/test/run.js b/test/run.js
index 45b4626a..1aae550a 100644
--- a/test/run.js
+++ b/test/run.js
@@ -20,7 +20,15 @@ switch (common.hasConfig(common.protocol())) {
     process.exit(0);
 }
 
-runTests();
+function shouldRunTest(file) {
+  var name  = path.basename(file).slice(0, -3)
+  var proto = common.protocol();
+  var exclude = ['model-aggregate','property-number-size','smart-types'];
+
+  if (proto == "mongodb" && exclude.indexOf(name) >= 0) return false;
+
+  return true;
+}
 
 function runTests() {
   if (common.protocol() == 'mongodb' && common.nodeVersion().major > 6) {
@@ -42,13 +50,4 @@ function runTests() {
   });
 }
 
-function shouldRunTest(file) {
-  var name  = path.basename(file).slice(0, -3)
-  var proto = common.protocol();
-  var exclude = ['model-aggregate','property-number-size','smart-types'];
-
-  if (proto == "mongodb" && exclude.indexOf(name) >= 0) return false;
-
-  return true;
-}
-
+runTests();
diff --git a/test/support/coverage-package.json b/test/support/coverage-package.json
deleted file mode 100644
index 144f40dc..00000000
--- a/test/support/coverage-package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name"        : "orm",
-  "main"        : "./lib-cov/ORM"
-}

From 996f27f218dcf1b04bd0eeb055586db71d4ccf3b Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 11 Jan 2022 18:51:10 +0100
Subject: [PATCH 1237/1246] Set internal default property value to undefined
 instead of null.

This will prevent null values being explicitly sent to the database when no value was assigned and instead result in the database setting the column to null, or generating a default value.
Properties with an internal value of undefined will still return null when accessed.
Setting a previously filled property to undefined will still set it to null in the DB.
No ORM tests were broken by this change, and as such, the impact of this should be limited ot a very small number of corner cases.

Add PostgreSQL uuid column support.
Allow specifying defaultExpression (eg. uuid_generate_v4() for PostgreSQL or uuid() for MySQL) to be executed by the database engine for generating default values.
---
 Changelog.md                      |  17 +++--
 lib/Instance.js                   |  14 +++-
 lib/Property.js                   |   2 +-
 package-lock.json                 |  10 +--
 package.json                      |   4 +-
 test/integration/property-uuid.js | 115 ++++++++++++++++++++++++++++++
 6 files changed, 147 insertions(+), 15 deletions(-)
 create mode 100644 test/integration/property-uuid.js

diff --git a/Changelog.md b/Changelog.md
index 18cddeca..57df3cc3 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,8 +1,17 @@
+### v6.0.0
+- [POSSIBLY BREAKING] Set internal default property value to `undefined` instead of `null` ([855](../../pull/855)).
+  - This will prevent `null` values being explicitly sent to the database when no value was assigned and instead result in the database setting the column to null, or generating a default value.
+  - Properties with an internal value of `undefined` will still return `null` when accessed.
+  - Setting a previously filled property to `undefined` will still set it to null in the DB.
+  - No ORM tests were broken by this change, and as such, the impact of this should be limited to a very small number of corner cases.
+- Add PostgreSQL `uuid` column support ([855](../../pull/855)).
+- Allow specifying `defaultExpression` (eg. `uuid_generate_v4()` for PostgreSQL or `uuid()` for MySQL) to be executed by the database engine for generating default values ([855](../../pull/855)).
+
 ### v5.0.9
-- Add async versions of driver functions ([851](../../pull/851)
+- Add async versions of driver functions ([851](../../pull/851))
 
 ### v5.0.8
-- Improve Typescript typings - add offset prop to find options ([850](../../pull/850)
+- Improve Typescript typings - add offset prop to find options ([850](../../pull/850))
 
 ### v5.0.7
 - Resolve security vulnerabilities
@@ -13,12 +22,12 @@
 - If using Postgres and Nodejs v14+, you must use `pg` driver >= 8.1. The cause of this is unclear, but tests timeout.
 
 ### v5.0.5
-- Update lodash & sql-ddl-sync version to address security vulnerabilities ([845](../../pull/845)
+- Update lodash & sql-ddl-sync version to address security vulnerabilities ([845](../../pull/845))
 - Node 11+ support (stable sort; see https://github.com/nodejs/node/issues/24294 for details)
 - Test against node 12 & 13
 
 ### v5.0.4
-- Update sql-query version to address security vulnerabilities ([841](../../pull/841)
+- Update sql-query version to address security vulnerabilities ([841](../../pull/841))
 
 ### v5.0.3
 - Update dependencies to address security vulnerabilities
diff --git a/lib/Instance.js b/lib/Instance.js
index e0778fda..2ad70443 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -153,9 +153,11 @@ function Instance(Model, opts) {
       prop = Model.allProperties[k];
 
       if (prop) {
+        /*
         if (opts.data[k] == null &&  (prop.type == 'serial' || typeof prop.defaultValue == 'function')) {
           continue;
         }
+        */
 
         if (opts.driver.propertyToValue) {
           data[k] = opts.driver.propertyToValue(opts.data[k], prop);
@@ -484,7 +486,7 @@ function Instance(Model, opts) {
   }
 
   var addInstanceProperty = function (key) {
-    var defaultValue = null;
+    var defaultValue = undefined;
     var prop = Model.allProperties[key];
 
     // This code was first added, and then commented out in a later commit.
@@ -502,7 +504,13 @@ function Instance(Model, opts) {
 
     Object.defineProperty(instance, key, {
       get: function () {
-        return opts.data[key];
+        var val = opts.data[key];
+
+        if (val === undefined) {
+          return null;
+        } else {
+          return opts.data[key];
+        }
       },
       set: function (val) {
         if (prop.key === true) {
@@ -731,7 +739,7 @@ function Instance(Model, opts) {
 
     if (!asc.reversed && !asc.extension) {
       for (k in asc.field) {
-        if (!opts.data.hasOwnProperty(k)) {
+        if (!instance.hasOwnProperty(k)) {
           addInstanceProperty(k);
         }
       }
diff --git a/lib/Property.js b/lib/Property.js
index 9fb6ae78..29cab0af 100644
--- a/lib/Property.js
+++ b/lib/Property.js
@@ -3,7 +3,7 @@ var ORMError = require("./Error");
 
 var KNOWN_TYPES = [
   "text",   "number", "integer", "boolean", "date", "enum", "object",
-  "binary", "point",  "serial"
+  "binary", "point",  "serial", "uuid"
 ];
 
 exports.normalize = function (opts) {
diff --git a/package-lock.json b/package-lock.json
index 63f2cb7e..8f372ea1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "orm",
-	"version": "5.0.9",
+	"version": "6.0.0",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -2905,11 +2905,11 @@
 			"dev": true
 		},
 		"sql-ddl-sync": {
-			"version": "0.3.16",
-			"resolved": "https://registry.npmjs.org/sql-ddl-sync/-/sql-ddl-sync-0.3.16.tgz",
-			"integrity": "sha512-6uiVLN1UAkL2UFpFLjACLYZkzdkPjtRYAgN0jeJWGE/oNzMFabdYZF26IFcXBgobVZ0g8GLagQTI+b9GNKOV2w==",
+			"version": "0.3.18",
+			"resolved": "https://registry.npmjs.org/sql-ddl-sync/-/sql-ddl-sync-0.3.18.tgz",
+			"integrity": "sha512-KZ+7qa4MIIoZZWDzWijMGheMLPkn/58WHt9//UzF84P1XFqsJ4Xk5Xfg8LlWovFXhoi2SRynX1nRw7zXTV9Yig==",
 			"requires": {
-				"lodash": "~4.17.15"
+				"lodash": "~4.17.21"
 			}
 		},
 		"sql-query": {
diff --git a/package.json b/package.json
index 13adb7bf..c0c6b6a1 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "sqlite",
     "mongodb"
   ],
-  "version": "5.0.9",
+  "version": "6.0.0",
   "license": "MIT",
   "homepage": "http://dresende.github.io/node-orm2",
   "repository": "http://github.com/dresende/node-orm2.git",
@@ -67,7 +67,7 @@
     "hat": "0.0.3",
     "lodash": "^4.17.21",
     "path-is-absolute": "1.0.1",
-    "sql-ddl-sync": "0.3.16",
+    "sql-ddl-sync": "0.3.18",
     "sql-query": "0.1.27"
   },
   "devDependencies": {
diff --git a/test/integration/property-uuid.js b/test/integration/property-uuid.js
new file mode 100644
index 00000000..2bc60f1b
--- /dev/null
+++ b/test/integration/property-uuid.js
@@ -0,0 +1,115 @@
+var _        = require('lodash');
+var should   = require('should');
+var helper   = require('../support/spec_helper');
+var common   = require('../common');
+var ORM      = require('../../');
+
+if (common.protocol() !== "postgres") return;
+
+describe("Property", function() {
+  describe("type uuid", function () {
+    var db = null;
+
+    before(function (done) {
+      helper.connect(function (connection) {
+        db = connection;
+
+        done();
+      });
+    });
+
+    after(function () {
+      db.close();
+    });
+
+    var Thing = null;
+
+    before(function (done) {
+      db.driver.execQuery('CREATE EXTENSION IF NOT EXISTS "uuid-ossp";', function (err) {
+        should.not.exist(err);
+
+        Thing = db.define('thing', {
+          id:   { type: 'uuid', key: true, defaultExpression: 'uuid_generate_v4()' },
+          //id:   { type: 'serial' },
+          name: { type: 'text' }
+        });
+
+        helper.dropSync(Thing, done);
+      });
+    });
+
+    it("should create the table", function () {
+      should(true);
+    });
+
+    var infoSQL = "SELECT * FROM information_schema.columns WHERE table_name = 'thing' AND column_name = 'id'";
+
+    it("should have the correct type", function (done) {
+      db.driver.execQuery(infoSQL, function (err, cols) {
+        should.not.exist(err);
+
+        var uuidCol = cols[0];
+
+        should.exist(uuidCol);
+        should.equal(uuidCol.data_type, 'uuid');
+        done();
+      });
+    });
+
+    it("should have the correct default value", function (done) {
+      db.driver.execQuery(infoSQL, function (err, cols) {
+        should.not.exist(err);
+
+        var uuidCol = cols[0];
+
+        should.exist(uuidCol);
+        should.equal(uuidCol.column_default, 'uuid_generate_v4()');
+        done();
+      });
+    });
+
+    it("should set id automatically", function (done) {
+      var chair = new Thing({ name: 'chair' });
+
+      chair.save(function (err) {
+        should.not.exist(err);
+
+        Thing.find().all(function (err, items) {
+          should.not.exist(err);
+          should.equal(items.length, 1);
+          should.equal(items[0].name, 'chair');
+          items[0].id.should.match(/^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i);
+
+          done();
+        });
+      });
+    });
+
+    it("should save", function (done) {
+      var horse = new Thing({ name: 'horse' });
+
+      horse.save(function (err) {
+        should.not.exist(err);
+
+        Thing.get(horse.id, function (err, item) {
+          should.not.exist(err);
+
+          item.name = 'horsey';
+
+          item.save(function (err) {
+            should.not.exist(err);
+
+            Thing.get(horse.id, function (err, item) {
+              should.not.exist(err);
+              should.equal(item.id, horse.id);
+              should.equal(item.name, 'horsey');
+
+              done();
+            });
+          });
+        });
+      });
+    });
+
+  });
+});

From 4d08e89214a9cbc8e39d41bb788db064e6ebcd4a Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 24 Jan 2022 17:31:20 +0100
Subject: [PATCH 1238/1246] Accept options in 'model.create' call

---
 Changelog.md                          |  3 ++
 Readme.md                             |  2 +-
 lib/Model.js                          |  2 +-
 package-lock.json                     |  2 +-
 package.json                          |  2 +-
 test/integration/model-create.js      | 48 ++++++++++++++++++++++++++-
 test/integration/model-createAsync.js | 44 ++++++++++++++++++++++++
 7 files changed, 98 insertions(+), 5 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 57df3cc3..feeb3e1e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### v6.1.0
+- [Feature] Accept options when calling `Model.create` ([856](../../pull/856))
+
 ### v6.0.0
 - [POSSIBLY BREAKING] Set internal default property value to `undefined` instead of `null` ([855](../../pull/855)).
   - This will prevent `null` values being explicitly sent to the database when no value was assigned and instead result in the database setting the column to null, or generating a default value.
diff --git a/Readme.md b/Readme.md
index 6ea3d768..fbf65827 100755
--- a/Readme.md
+++ b/Readme.md
@@ -8,7 +8,7 @@
 
 ## This package is not actively maintained
 
-If you're starting a new project, please consider using one of the following instead as they have a much more active community:
+If you're starting a new project, consider using one of the following instead as they have a more active community:
 * https://github.com/bookshelf/bookshelf
 * https://github.com/sequelize/sequelize
 
diff --git a/lib/Model.js b/lib/Model.js
index 6cafd884..d5df52fe 100644
--- a/lib/Model.js
+++ b/lib/Model.js
@@ -616,7 +616,7 @@ function Model(opts) {
 
           return cb(err);
         }
-        item.save(function (err) {
+        item.save({}, options, function (err) {
           if (err) {
             err.index    = index;
             err.instance = item;
diff --git a/package-lock.json b/package-lock.json
index 8f372ea1..0833ef49 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "orm",
-	"version": "6.0.0",
+	"version": "6.1.0",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
diff --git a/package.json b/package.json
index c0c6b6a1..68c18e20 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "sqlite",
     "mongodb"
   ],
-  "version": "6.0.0",
+  "version": "6.1.0",
   "license": "MIT",
   "homepage": "http://dresende.github.io/node-orm2",
   "repository": "http://github.com/dresende/node-orm2.git",
diff --git a/test/integration/model-create.js b/test/integration/model-create.js
index 9217c957..c9e7b6f5 100644
--- a/test/integration/model-create.js
+++ b/test/integration/model-create.js
@@ -1,4 +1,5 @@
 var should   = require('should');
+var sinon    = require('sinon');
 var helper   = require('../support/spec_helper');
 
 describe("Model.create()", function() {
@@ -16,7 +17,7 @@ describe("Model.create()", function() {
       });
       Person.hasMany("pets", Pet);
 
-      return helper.dropSync([ Person, Pet ], done);
+      return helper.dropSync([Person, Pet], done);
     };
   };
 
@@ -32,6 +33,10 @@ describe("Model.create()", function() {
     return db.close();
   });
 
+  afterEach(function () {
+    sinon.restore();
+  });
+
   describe("if passing an object", function () {
     before(setup());
 
@@ -108,6 +113,47 @@ describe("Model.create()", function() {
         return done();
       });
     });
+
+    describe("with 'saveAssociationsByDefault' disabled", function () {
+      beforeEach(function () {
+        sinon.stub(db.settings, 'get').withArgs('instance.saveAssociationsByDefault').returns(false);
+      });
+
+      it("should not save associations", function (done) {
+        Person.create({
+          name : "John Doe",
+          pets : [ { name: "Deco" } ]
+        }, function (err, John) {
+          should.equal(err, null);
+
+          should.equal(Array.isArray(John.pets), true);
+
+          John.pets[0].should.have.property("name", "Deco");
+          John.pets[0].should.not.have.property(Pet.id);
+
+          return done();
+        });
+      });
+
+      it("should save associations if 'saveAssociations' is passed", function (done) {
+        Person.create({
+          name : "John Doe",
+          pets : [ { name: "Deco" } ]
+        }, {
+          saveAssociations: true
+        }, function (err, John) {
+          should.equal(err, null);
+
+          should.equal(Array.isArray(John.pets), true);
+
+          John.pets[0].should.have.property("name", "Deco");
+          John.pets[0].should.have.property(Pet.id);
+          John.pets[0].saved().should.be.true;
+
+          return done();
+        });
+      });
+    });
   });
 
   describe("when not passing a property", function () {
diff --git a/test/integration/model-createAsync.js b/test/integration/model-createAsync.js
index cb95d53c..8c60768c 100644
--- a/test/integration/model-createAsync.js
+++ b/test/integration/model-createAsync.js
@@ -1,4 +1,5 @@
 var should   = require('should');
+var sinon    = require('sinon');
 var helper   = require('../support/spec_helper');
 
 describe("Model.createAsync()", function() {
@@ -32,6 +33,10 @@ describe("Model.createAsync()", function() {
     return db.close();
   });
 
+  afterEach(function () {
+    sinon.restore();
+  });
+
   describe("if passing an object", function () {
     before(setup());
 
@@ -98,6 +103,45 @@ describe("Model.createAsync()", function() {
           should.equal(John.pets[0].saved(), true);
         });
     });
+
+    describe("with 'saveAssociationsByDefault' disabled", function () {
+      beforeEach(function () {
+        sinon.stub(db.settings, 'get').withArgs('instance.saveAssociationsByDefault').returns(false);
+      });
+
+      it("should not save associations", function () {
+        return Person.createAsync({
+          name : "John Doe",
+          pets : [ { name: "Deco" } ]
+        })
+          .then(function (John) {
+            John.should.have.property("name", "John Doe");
+
+            should(Array.isArray(John.pets));
+
+            John.pets[0].should.have.property("name", "Deco");
+            John.pets[0].should.not.have.property(Pet.id);
+          });
+      });
+
+      it("should save associations if 'saveAssociations' is passed", function () {
+        return Person.createAsync({
+          name : "John Doe",
+          pets : [ { name: "Deco" } ]
+        }, {
+          saveAssociations: true
+        })
+          .then(function (John) {
+            John.should.have.property("name", "John Doe");
+
+            should(Array.isArray(John.pets));
+
+            John.pets[0].should.have.property("name", "Deco");
+            John.pets[0].should.have.property(Pet.id);
+            should.equal(John.pets[0].saved(), true);
+          });
+      });
+    });
   });
 
   describe("when not passing a property", function () {

From 4d6f82e9c1b49ec9483e757d2812bca2eccad7b2 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 16 Mar 2022 18:05:32 +0100
Subject: [PATCH 1239/1246] Add '.driver.generateQuery' function

Same as '.driver.execQuery' but returns the SQL instead of executing it
---
 Changelog.md               |  3 +++
 lib/Drivers/DML/_shared.js | 17 +++++++++++++----
 package-lock.json          |  2 +-
 package.json               |  2 +-
 test/integration/db.js     | 21 +++++++++++++++++++++
 5 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index feeb3e1e..a76b86cc 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### v6.2.0
+- [Feature] Add `.driver.generateQuery` function - same as `.driver.execQuery` but returns the SQL instead of executing it
+
 ### v6.1.0
 - [Feature] Accept options when calling `Model.create` ([856](../../pull/856))
 
diff --git a/lib/Drivers/DML/_shared.js b/lib/Drivers/DML/_shared.js
index e12a0055..f353b76b 100644
--- a/lib/Drivers/DML/_shared.js
+++ b/lib/Drivers/DML/_shared.js
@@ -1,12 +1,19 @@
 var Promise = require('bluebird');
 
+var generateQuery = function (sql, params) {
+  return this.query.escape(sql, params);
+};
+
 var execQuery = function () {
+  var cb;
+  var query;
+
   if (arguments.length == 2) {
-    var query = arguments[0];
-    var cb    = arguments[1];
+    query = arguments[0];
+    cb    = arguments[1];
   } else if (arguments.length == 3) {
-    var query = this.query.escape(arguments[0], arguments[1]);
-    var cb    = arguments[2];
+    query = this.generateQuery(arguments[0], arguments[1]);
+    cb    = arguments[2];
   }
   return this.execSimpleQuery(query, cb);
 };
@@ -30,6 +37,8 @@ var eagerQuery = function (association, opts, keys, cb) {
 };
 
 module.exports = {
+  generateQuery: generateQuery,
+
   execQuery: execQuery,
 
   eagerQuery: eagerQuery,
diff --git a/package-lock.json b/package-lock.json
index 0833ef49..c0d97e97 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "orm",
-	"version": "6.1.0",
+	"version": "6.2.0",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
diff --git a/package.json b/package.json
index 68c18e20..91769df8 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "sqlite",
     "mongodb"
   ],
-  "version": "6.1.0",
+  "version": "6.2.0",
   "license": "MIT",
   "homepage": "http://dresende.github.io/node-orm2",
   "repository": "http://github.com/dresende/node-orm2.git",
diff --git a/test/integration/db.js b/test/integration/db.js
index 016824b1..b6664077 100644
--- a/test/integration/db.js
+++ b/test/integration/db.js
@@ -142,6 +142,27 @@ describe("db.driver", function () {
       });
     });
 
+    describe("#generateQuery", function () {
+      it("should return interpolated & escaped SQL", function () {
+        var expected = "expectation missing; unknown protocol";
+
+        switch (common.protocol()) {
+          case 'mysql':
+          case 'sqlite':
+            expected = "UPDATE `animals` SET `name` = 'cat' WHERE `id` = 9"
+            break;
+          case 'postgres':
+            expected = 'UPDATE "animals" SET "name" = \'cat\' WHERE "id" = 9'
+            break;
+        }
+
+        should.equal(
+          db.driver.generateQuery("UPDATE ?? SET ?? = ? WHERE ?? = ?", ['animals', 'name', 'cat', 'id', 9]),
+          expected,
+        );
+      });
+    });
+
     describe("#execQuery", function () {
       it("should execute sql queries", function (done) {
         db.driver.execQuery("SELECT id FROM log", function (err, data) {

From de42d1f1652dae7a5469e2fc3552c03f8d58f3ef Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 16 Mar 2022 18:26:13 +0100
Subject: [PATCH 1240/1246] Fix redshift test failure

---
 test/integration/db.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/integration/db.js b/test/integration/db.js
index b6664077..432ecef8 100644
--- a/test/integration/db.js
+++ b/test/integration/db.js
@@ -144,7 +144,7 @@ describe("db.driver", function () {
 
     describe("#generateQuery", function () {
       it("should return interpolated & escaped SQL", function () {
-        var expected = "expectation missing; unknown protocol";
+        var expected = "expectation missing; unknown protocol " + common.protocol();
 
         switch (common.protocol()) {
           case 'mysql':
@@ -152,6 +152,7 @@ describe("db.driver", function () {
             expected = "UPDATE `animals` SET `name` = 'cat' WHERE `id` = 9"
             break;
           case 'postgres':
+          case 'redshift':
             expected = 'UPDATE "animals" SET "name" = \'cat\' WHERE "id" = 9'
             break;
         }

From 72d0ce08ebbca08a1157dbe695332ddcd00ae171 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 14 Apr 2022 00:49:54 +0000
Subject: [PATCH 1241/1246] Update async package to resolve security
 vulnerabilities

---
 Changelog.md      |  6 ++-
 package-lock.json | 97 ++++++++++++++++++++++++++---------------------
 package.json      |  8 ++--
 3 files changed, 62 insertions(+), 49 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index a76b86cc..70d84a99 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,9 @@
+### v7.0.0
+- Update `async` package from v2 to v3 to resolve security vulnerabilities ([858](../../pull/858))
+- Drop support for node < 6 (due to `async` package update)
+
 ### v6.2.0
-- [Feature] Add `.driver.generateQuery` function - same as `.driver.execQuery` but returns the SQL instead of executing it
+- [Feature] Add `.driver.generateQuery` function - same as `.driver.execQuery` but returns the SQL instead of executing it ([857](../../pull/857))
 
 ### v6.1.0
 - [Feature] Accept options when calling `Model.create` ([856](../../pull/856))
diff --git a/package-lock.json b/package-lock.json
index c0d97e97..7439e127 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "orm",
-	"version": "6.2.0",
+	"version": "7.0.0",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -558,12 +558,9 @@
 			"optional": true
 		},
 		"async": {
-			"version": "2.6.3",
-			"resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-			"integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
-			"requires": {
-				"lodash": "^4.17.14"
-			}
+			"version": "3.2.3",
+			"resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
+			"integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="
 		},
 		"asynckit": {
 			"version": "0.4.0",
@@ -695,9 +692,9 @@
 			}
 		},
 		"camelcase": {
-			"version": "6.2.0",
-			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-			"integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+			"integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
 			"dev": true
 		},
 		"caniuse-lite": {
@@ -724,9 +721,9 @@
 			}
 		},
 		"chokidar": {
-			"version": "3.5.2",
-			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
-			"integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
+			"version": "3.5.3",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+			"integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
 			"dev": true,
 			"requires": {
 				"anymatch": "~3.1.2",
@@ -1698,9 +1695,9 @@
 			}
 		},
 		"minimist": {
-			"version": "1.2.5",
-			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-			"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+			"version": "1.2.6",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+			"integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
 			"dev": true
 		},
 		"minipass": {
@@ -1746,49 +1743,61 @@
 			}
 		},
 		"mocha": {
-			"version": "9.1.3",
-			"resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.3.tgz",
-			"integrity": "sha512-Xcpl9FqXOAYqI3j79pEtHBBnQgVXIhpULjGQa7DVb0Po+VzmSIK9kanAiWLHoRR/dbZ2qpdPshuXr8l1VaHCzw==",
+			"version": "9.2.2",
+			"resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz",
+			"integrity": "sha512-L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g==",
 			"dev": true,
 			"requires": {
 				"@ungap/promise-all-settled": "1.1.2",
 				"ansi-colors": "4.1.1",
 				"browser-stdout": "1.3.1",
-				"chokidar": "3.5.2",
-				"debug": "4.3.2",
+				"chokidar": "3.5.3",
+				"debug": "4.3.3",
 				"diff": "5.0.0",
 				"escape-string-regexp": "4.0.0",
 				"find-up": "5.0.0",
-				"glob": "7.1.7",
+				"glob": "7.2.0",
 				"growl": "1.10.5",
 				"he": "1.2.0",
 				"js-yaml": "4.1.0",
 				"log-symbols": "4.1.0",
-				"minimatch": "3.0.4",
+				"minimatch": "4.2.1",
 				"ms": "2.1.3",
-				"nanoid": "3.1.25",
+				"nanoid": "3.3.1",
 				"serialize-javascript": "6.0.0",
 				"strip-json-comments": "3.1.1",
 				"supports-color": "8.1.1",
 				"which": "2.0.2",
-				"workerpool": "6.1.5",
+				"workerpool": "6.2.0",
 				"yargs": "16.2.0",
 				"yargs-parser": "20.2.4",
 				"yargs-unparser": "2.0.0"
 			},
 			"dependencies": {
-				"glob": {
-					"version": "7.1.7",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-					"integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+				"debug": {
+					"version": "4.3.3",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+					"integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+					"dev": true,
+					"requires": {
+						"ms": "2.1.2"
+					},
+					"dependencies": {
+						"ms": {
+							"version": "2.1.2",
+							"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+							"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+							"dev": true
+						}
+					}
+				},
+				"minimatch": {
+					"version": "4.2.1",
+					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-4.2.1.tgz",
+					"integrity": "sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g==",
 					"dev": true,
 					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.0.4",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
+						"brace-expansion": "^1.1.7"
 					}
 				},
 				"supports-color": {
@@ -1876,9 +1885,9 @@
 			"dev": true
 		},
 		"nanoid": {
-			"version": "3.1.25",
-			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz",
-			"integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==",
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
+			"integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==",
 			"dev": true
 		},
 		"needle": {
@@ -2456,9 +2465,9 @@
 			"dev": true
 		},
 		"picomatch": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-			"integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+			"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
 			"dev": true
 		},
 		"pkg-dir": {
@@ -3148,9 +3157,9 @@
 			}
 		},
 		"workerpool": {
-			"version": "6.1.5",
-			"resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz",
-			"integrity": "sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==",
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz",
+			"integrity": "sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==",
 			"dev": true
 		},
 		"wrap-ansi": {
diff --git a/package.json b/package.json
index 91769df8..7c38938a 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "sqlite",
     "mongodb"
   ],
-  "version": "6.2.0",
+  "version": "7.0.0",
   "license": "MIT",
   "homepage": "http://dresende.github.io/node-orm2",
   "repository": "http://github.com/dresende/node-orm2.git",
@@ -57,11 +57,11 @@
     "test": "nyc make test"
   },
   "engines": {
-    "node": ">= 4.0.0"
+    "node": ">= 6.0.0"
   },
   "analyse": false,
   "dependencies": {
-    "async": "~2.6.3",
+    "async": "~3.2.3",
     "bluebird": "3.5.1",
     "enforce": "0.1.7",
     "hat": "0.0.3",
@@ -73,7 +73,7 @@
   "devDependencies": {
     "chalk": "~4.1.2",
     "glob": "~7.2.0",
-    "mocha": "~9.1.3",
+    "mocha": "~9.2.2",
     "mongodb": "~1.4.10",
     "mysql": "~2.18.1",
     "nyc": "~15.1.0",

From 88a21c3086b409cee08daef285fcd81f92ab9896 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Wed, 22 Jun 2022 18:13:12 +0200
Subject: [PATCH 1242/1246] Add isDirty function to model instances

---
 Changelog.md                 |  3 +++
 lib/Instance.js              |  6 ++++++
 package-lock.json            |  2 +-
 package.json                 |  2 +-
 test/integration/instance.js | 29 +++++++++++++++++++++++++++++
 5 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 70d84a99..fe2a89c7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### v7.1.0
+- Add `isDirty` function to instances ([859](../../pull/859))
+
 ### v7.0.0
 - Update `async` package from v2 to v3 to resolve security vulnerabilities ([858](../../pull/858))
 - Drop support for node < 6 (due to `async` package update)
diff --git a/lib/Instance.js b/lib/Instance.js
index 2ad70443..24da4724 100755
--- a/lib/Instance.js
+++ b/lib/Instance.js
@@ -670,6 +670,12 @@ function Instance(Model, opts) {
     get: function () { return opts.changes; },
     enumerable: false
   });
+  Object.defineProperty(instance, "isDirty", {
+    value: function () {
+      return opts.changes.length > 0;
+    },
+    enumerable: false
+  });
   Object.defineProperty(instance, "isInstance", {
     value: true,
     enumerable: false
diff --git a/package-lock.json b/package-lock.json
index 7439e127..66013c86 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "orm",
-	"version": "7.0.0",
+	"version": "7.1.0",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
diff --git a/package.json b/package.json
index 7c38938a..b2fa2785 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "sqlite",
     "mongodb"
   ],
-  "version": "7.0.0",
+  "version": "7.1.0",
   "license": "MIT",
   "homepage": "http://dresende.github.io/node-orm2",
   "repository": "http://github.com/dresende/node-orm2.git",
diff --git a/test/integration/instance.js b/test/integration/instance.js
index 363d7dee..eb49a30d 100644
--- a/test/integration/instance.js
+++ b/test/integration/instance.js
@@ -303,6 +303,35 @@ describe("Model instance", function() {
     });
   });
 
+  describe("#isDirty", function () {
+    var person = null;
+
+    beforeEach(function (done) {
+      Person.create({ name: 'John', age: 44, data: { a: 1 } }, function (err, p) {
+        if (err) return cb(err);
+
+        person = p;
+        done();
+      });
+    });
+
+    it("should return false by default", function () {
+      should.equal(person.isDirty(), false);
+    });
+
+    it("should return false when property is set to same value", function () {
+      should.equal(person.isDirty(), false);
+      person.name = 'John';
+      should.equal(person.isDirty(), false);
+    });
+
+    it("should return true when property is changed", function () {
+      should.equal(person.isDirty(), false);
+      person.name = 'Bob';
+      should.equal(person.isDirty(), true);
+    });
+  });
+
   describe("#isShell", function () {
     it("should return true for shell models", function () {
       should.equal(Person(4).isShell(), true);

From 8023fbeab5bf136db3340b2f2c767bd5b243264e Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Mon, 26 Jun 2023 17:44:35 +0200
Subject: [PATCH 1243/1246] Update development dependencies to resolve security

---
 .github/workflows/ci.yml |    2 +-
 Changelog.md             |    4 +
 package-lock.json        | 2729 +++++++++++++++-----------------------
 package.json             |   14 +-
 4 files changed, 1050 insertions(+), 1699 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dc7e3c82..97dd26bf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: ['10', '12', '14', '16']
+        node-version: ['14', '16', '18']
 
     name: test on nodejs ${{ matrix.node-version }}
 
diff --git a/Changelog.md b/Changelog.md
index fe2a89c7..bb906174 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,7 @@
+### v7.1.1
+- Resolve most development-only security vulnerabilities (no production ones present) ([861](../../pull/861))
+- Don't run test on node 10 & 12 - dev deps don't work
+
 ### v7.1.0
 - Add `isDirty` function to instances ([859](../../pull/859))
 
diff --git a/package-lock.json b/package-lock.json
index 66013c86..b3d22717 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,406 +1,160 @@
 {
 	"name": "orm",
-	"version": "7.1.0",
+	"version": "7.1.1",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
-		"@babel/code-frame": {
-			"version": "7.15.8",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz",
-			"integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==",
-			"dev": true,
-			"requires": {
-				"@babel/highlight": "^7.14.5"
-			}
-		},
-		"@babel/compat-data": {
-			"version": "7.15.0",
-			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz",
-			"integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==",
+		"@bcoe/v8-coverage": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+			"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
 			"dev": true
 		},
-		"@babel/core": {
-			"version": "7.15.8",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.8.tgz",
-			"integrity": "sha512-3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og==",
+		"@gar/promisify": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz",
+			"integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==",
 			"dev": true,
-			"requires": {
-				"@babel/code-frame": "^7.15.8",
-				"@babel/generator": "^7.15.8",
-				"@babel/helper-compilation-targets": "^7.15.4",
-				"@babel/helper-module-transforms": "^7.15.8",
-				"@babel/helpers": "^7.15.4",
-				"@babel/parser": "^7.15.8",
-				"@babel/template": "^7.15.4",
-				"@babel/traverse": "^7.15.4",
-				"@babel/types": "^7.15.6",
-				"convert-source-map": "^1.7.0",
-				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.1.2",
-				"semver": "^6.3.0",
-				"source-map": "^0.5.0"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				}
-			}
-		},
-		"@babel/generator": {
-			"version": "7.15.8",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz",
-			"integrity": "sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.15.6",
-				"jsesc": "^2.5.1",
-				"source-map": "^0.5.0"
-			}
+			"optional": true
 		},
-		"@babel/helper-compilation-targets": {
-			"version": "7.15.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz",
-			"integrity": "sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==",
+		"@isaacs/cliui": {
+			"version": "8.0.2",
+			"resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+			"integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
 			"dev": true,
 			"requires": {
-				"@babel/compat-data": "^7.15.0",
-				"@babel/helper-validator-option": "^7.14.5",
-				"browserslist": "^4.16.6",
-				"semver": "^6.3.0"
+				"string-width": "^5.1.2",
+				"string-width-cjs": "npm:string-width@^4.2.0",
+				"strip-ansi": "^7.0.1",
+				"strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+				"wrap-ansi": "^8.1.0",
+				"wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
 			},
 			"dependencies": {
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+				"ansi-regex": {
+					"version": "6.0.1",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+					"integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
 					"dev": true
-				}
-			}
-		},
-		"@babel/helper-function-name": {
-			"version": "7.15.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz",
-			"integrity": "sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-get-function-arity": "^7.15.4",
-				"@babel/template": "^7.15.4",
-				"@babel/types": "^7.15.4"
-			}
-		},
-		"@babel/helper-get-function-arity": {
-			"version": "7.15.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz",
-			"integrity": "sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.15.4"
-			}
-		},
-		"@babel/helper-hoist-variables": {
-			"version": "7.15.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz",
-			"integrity": "sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.15.4"
-			}
-		},
-		"@babel/helper-member-expression-to-functions": {
-			"version": "7.15.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz",
-			"integrity": "sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.15.4"
-			}
-		},
-		"@babel/helper-module-imports": {
-			"version": "7.15.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz",
-			"integrity": "sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.15.4"
-			}
-		},
-		"@babel/helper-module-transforms": {
-			"version": "7.15.8",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.8.tgz",
-			"integrity": "sha512-DfAfA6PfpG8t4S6npwzLvTUpp0sS7JrcuaMiy1Y5645laRJIp/LiLGIBbQKaXSInK8tiGNI7FL7L8UvB8gdUZg==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-module-imports": "^7.15.4",
-				"@babel/helper-replace-supers": "^7.15.4",
-				"@babel/helper-simple-access": "^7.15.4",
-				"@babel/helper-split-export-declaration": "^7.15.4",
-				"@babel/helper-validator-identifier": "^7.15.7",
-				"@babel/template": "^7.15.4",
-				"@babel/traverse": "^7.15.4",
-				"@babel/types": "^7.15.6"
-			}
-		},
-		"@babel/helper-optimise-call-expression": {
-			"version": "7.15.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz",
-			"integrity": "sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.15.4"
-			}
-		},
-		"@babel/helper-replace-supers": {
-			"version": "7.15.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz",
-			"integrity": "sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-member-expression-to-functions": "^7.15.4",
-				"@babel/helper-optimise-call-expression": "^7.15.4",
-				"@babel/traverse": "^7.15.4",
-				"@babel/types": "^7.15.4"
-			}
-		},
-		"@babel/helper-simple-access": {
-			"version": "7.15.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz",
-			"integrity": "sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.15.4"
-			}
-		},
-		"@babel/helper-split-export-declaration": {
-			"version": "7.15.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz",
-			"integrity": "sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.15.4"
-			}
-		},
-		"@babel/helper-validator-identifier": {
-			"version": "7.15.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
-			"integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
-			"dev": true
-		},
-		"@babel/helper-validator-option": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz",
-			"integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==",
-			"dev": true
-		},
-		"@babel/helpers": {
-			"version": "7.15.4",
-			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz",
-			"integrity": "sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==",
-			"dev": true,
-			"requires": {
-				"@babel/template": "^7.15.4",
-				"@babel/traverse": "^7.15.4",
-				"@babel/types": "^7.15.4"
-			}
-		},
-		"@babel/highlight": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-			"integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-validator-identifier": "^7.14.5",
-				"chalk": "^2.0.0",
-				"js-tokens": "^4.0.0"
-			},
-			"dependencies": {
+				},
 				"ansi-styles": {
-					"version": "3.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^1.9.0"
-					}
+					"version": "6.2.1",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+					"integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+					"dev": true
+				},
+				"emoji-regex": {
+					"version": "9.2.2",
+					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+					"integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+					"dev": true
 				},
-				"chalk": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+				"string-width": {
+					"version": "5.1.2",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+					"integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
 					"dev": true,
 					"requires": {
-						"ansi-styles": "^3.2.1",
-						"escape-string-regexp": "^1.0.5",
-						"supports-color": "^5.3.0"
+						"eastasianwidth": "^0.2.0",
+						"emoji-regex": "^9.2.2",
+						"strip-ansi": "^7.0.1"
 					}
 				},
-				"color-convert": {
-					"version": "1.9.3",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-					"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+				"strip-ansi": {
+					"version": "7.1.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+					"integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
 					"dev": true,
 					"requires": {
-						"color-name": "1.1.3"
+						"ansi-regex": "^6.0.1"
 					}
 				},
-				"color-name": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-					"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-					"dev": true
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-					"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "5.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+				"wrap-ansi": {
+					"version": "8.1.0",
+					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+					"integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
 					"dev": true,
 					"requires": {
-						"has-flag": "^3.0.0"
+						"ansi-styles": "^6.1.0",
+						"string-width": "^5.0.1",
+						"strip-ansi": "^7.0.1"
 					}
 				}
 			}
 		},
-		"@babel/parser": {
-			"version": "7.15.8",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz",
-			"integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==",
+		"@istanbuljs/schema": {
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+			"integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
 			"dev": true
 		},
-		"@babel/template": {
-			"version": "7.15.4",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz",
-			"integrity": "sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==",
+		"@jridgewell/resolve-uri": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+			"integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+			"dev": true
+		},
+		"@jridgewell/sourcemap-codec": {
+			"version": "1.4.14",
+			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+			"integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+			"dev": true
+		},
+		"@jridgewell/trace-mapping": {
+			"version": "0.3.18",
+			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
+			"integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
 			"dev": true,
 			"requires": {
-				"@babel/code-frame": "^7.14.5",
-				"@babel/parser": "^7.15.4",
-				"@babel/types": "^7.15.4"
+				"@jridgewell/resolve-uri": "3.1.0",
+				"@jridgewell/sourcemap-codec": "1.4.14"
 			}
 		},
-		"@babel/traverse": {
-			"version": "7.15.4",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz",
-			"integrity": "sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==",
+		"@mapbox/node-pre-gyp": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz",
+			"integrity": "sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA==",
 			"dev": true,
 			"requires": {
-				"@babel/code-frame": "^7.14.5",
-				"@babel/generator": "^7.15.4",
-				"@babel/helper-function-name": "^7.15.4",
-				"@babel/helper-hoist-variables": "^7.15.4",
-				"@babel/helper-split-export-declaration": "^7.15.4",
-				"@babel/parser": "^7.15.4",
-				"@babel/types": "^7.15.4",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0"
+				"detect-libc": "^2.0.0",
+				"https-proxy-agent": "^5.0.0",
+				"make-dir": "^3.1.0",
+				"node-fetch": "^2.6.7",
+				"nopt": "^5.0.0",
+				"npmlog": "^5.0.1",
+				"rimraf": "^3.0.2",
+				"semver": "^7.3.5",
+				"tar": "^6.1.11"
 			}
 		},
-		"@babel/types": {
-			"version": "7.15.6",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz",
-			"integrity": "sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==",
+		"@npmcli/fs": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz",
+			"integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==",
 			"dev": true,
+			"optional": true,
 			"requires": {
-				"@babel/helper-validator-identifier": "^7.14.9",
-				"to-fast-properties": "^2.0.0"
+				"@gar/promisify": "^1.0.1",
+				"semver": "^7.3.5"
 			}
 		},
-		"@istanbuljs/load-nyc-config": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-			"integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+		"@npmcli/move-file": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
+			"integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
 			"dev": true,
+			"optional": true,
 			"requires": {
-				"camelcase": "^5.3.1",
-				"find-up": "^4.1.0",
-				"get-package-type": "^0.1.0",
-				"js-yaml": "^3.13.1",
-				"resolve-from": "^5.0.0"
-			},
-			"dependencies": {
-				"argparse": {
-					"version": "1.0.10",
-					"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-					"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-					"dev": true,
-					"requires": {
-						"sprintf-js": "~1.0.2"
-					}
-				},
-				"camelcase": {
-					"version": "5.3.1",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-					"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-					"dev": true
-				},
-				"find-up": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^5.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"js-yaml": {
-					"version": "3.14.1",
-					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-					"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-					"dev": true,
-					"requires": {
-						"argparse": "^1.0.7",
-						"esprima": "^4.0.0"
-					}
-				},
-				"locate-path": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^4.1.0"
-					}
-				},
-				"p-limit": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-					"dev": true,
-					"requires": {
-						"p-try": "^2.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^2.2.0"
-					}
-				}
+				"mkdirp": "^1.0.4",
+				"rimraf": "^3.0.2"
 			}
 		},
-		"@istanbuljs/schema": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-			"integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-			"dev": true
+		"@pkgjs/parseargs": {
+			"version": "0.11.0",
+			"resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+			"integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+			"dev": true,
+			"optional": true
 		},
 		"@sinonjs/commons": {
 			"version": "1.8.3",
@@ -437,6 +191,19 @@
 			"integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==",
 			"dev": true
 		},
+		"@tootallnate/once": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+			"integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+			"dev": true,
+			"optional": true
+		},
+		"@types/istanbul-lib-coverage": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
+			"integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==",
+			"dev": true
+		},
 		"@ungap/promise-all-settled": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
@@ -449,29 +216,38 @@
 			"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
 			"dev": true
 		},
+		"agent-base": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+			"integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+			"dev": true,
+			"requires": {
+				"debug": "4"
+			}
+		},
+		"agentkeepalive": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.3.0.tgz",
+			"integrity": "sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg==",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"debug": "^4.1.0",
+				"depd": "^2.0.0",
+				"humanize-ms": "^1.2.1"
+			}
+		},
 		"aggregate-error": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
 			"integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
 			"dev": true,
+			"optional": true,
 			"requires": {
 				"clean-stack": "^2.0.0",
 				"indent-string": "^4.0.0"
 			}
 		},
-		"ajv": {
-			"version": "6.12.6",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"fast-deep-equal": "^3.1.1",
-				"fast-json-stable-stringify": "^2.0.0",
-				"json-schema-traverse": "^0.4.1",
-				"uri-js": "^4.2.2"
-			}
-		},
 		"ansi-colors": {
 			"version": "4.1.1",
 			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
@@ -503,35 +279,48 @@
 				"picomatch": "^2.0.4"
 			}
 		},
-		"append-transform": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz",
-			"integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==",
-			"dev": true,
-			"requires": {
-				"default-require-extensions": "^3.0.0"
-			}
-		},
 		"aproba": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-			"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-			"dev": true
-		},
-		"archy": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-			"integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
+			"integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
 			"dev": true
 		},
 		"are-we-there-yet": {
-			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
-			"integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
+			"integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
 			"dev": true,
 			"requires": {
 				"delegates": "^1.0.0",
-				"readable-stream": "^2.0.6"
+				"readable-stream": "^3.6.0"
+			},
+			"dependencies": {
+				"readable-stream": {
+					"version": "3.6.2",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+					"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+					"dev": true,
+					"requires": {
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
+					}
+				},
+				"safe-buffer": {
+					"version": "5.2.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+					"dev": true
+				},
+				"string_decoder": {
+					"version": "1.3.0",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+					"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+					"dev": true,
+					"requires": {
+						"safe-buffer": "~5.2.0"
+					}
+				}
 			}
 		},
 		"argparse": {
@@ -540,65 +329,17 @@
 			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
 			"dev": true
 		},
-		"asn1": {
-			"version": "0.2.4",
-			"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-			"integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"safer-buffer": "~2.1.0"
-			}
-		},
-		"assert-plus": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-			"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-			"dev": true,
-			"optional": true
-		},
 		"async": {
 			"version": "3.2.3",
 			"resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
 			"integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="
 		},
-		"asynckit": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-			"dev": true,
-			"optional": true
-		},
-		"aws-sign2": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-			"integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-			"dev": true,
-			"optional": true
-		},
-		"aws4": {
-			"version": "1.11.0",
-			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-			"integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
-			"dev": true,
-			"optional": true
-		},
 		"balanced-match": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
 			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
 			"dev": true
 		},
-		"bcrypt-pbkdf": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-			"integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"tweetnacl": "^0.14.3"
-			}
-		},
 		"bignumber.js": {
 			"version": "9.0.0",
 			"resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.0.tgz",
@@ -611,16 +352,6 @@
 			"integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
 			"dev": true
 		},
-		"block-stream": {
-			"version": "0.0.9",
-			"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-			"integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"inherits": "~2.0.0"
-			}
-		},
 		"bluebird": {
 			"version": "3.5.1",
 			"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
@@ -651,19 +382,6 @@
 			"integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
 			"dev": true
 		},
-		"browserslist": {
-			"version": "4.17.5",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.5.tgz",
-			"integrity": "sha512-I3ekeB92mmpctWBoLXe0d5wPS2cBuRvvW0JyyJHMrk9/HmP2ZjrTboNAZ8iuGqaEIlKguljbQY32OkOJIRrgoA==",
-			"dev": true,
-			"requires": {
-				"caniuse-lite": "^1.0.30001271",
-				"electron-to-chromium": "^1.3.878",
-				"escalade": "^3.1.1",
-				"node-releases": "^2.0.1",
-				"picocolors": "^1.0.0"
-			}
-		},
 		"bson": {
 			"version": "0.2.22",
 			"resolved": "https://registry.npmjs.org/bson/-/bson-0.2.22.tgz",
@@ -679,16 +397,116 @@
 			"integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==",
 			"dev": true
 		},
-		"caching-transform": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz",
-			"integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==",
+		"c8": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/c8/-/c8-8.0.0.tgz",
+			"integrity": "sha512-XHA5vSfCLglAc0Xt8eLBZMv19lgiBSjnb1FLAQgnwkuhJYEonpilhEB4Ea3jPAbm0FhD6VVJrc0z73jPe7JyGQ==",
 			"dev": true,
 			"requires": {
-				"hasha": "^5.0.0",
-				"make-dir": "^3.0.0",
-				"package-hash": "^4.0.0",
-				"write-file-atomic": "^3.0.0"
+				"@bcoe/v8-coverage": "^0.2.3",
+				"@istanbuljs/schema": "^0.1.3",
+				"find-up": "^5.0.0",
+				"foreground-child": "^2.0.0",
+				"istanbul-lib-coverage": "^3.2.0",
+				"istanbul-lib-report": "^3.0.0",
+				"istanbul-reports": "^3.1.4",
+				"rimraf": "^3.0.2",
+				"test-exclude": "^6.0.0",
+				"v8-to-istanbul": "^9.0.0",
+				"yargs": "^16.2.0",
+				"yargs-parser": "^20.2.9"
+			},
+			"dependencies": {
+				"istanbul-reports": {
+					"version": "3.1.5",
+					"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz",
+					"integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==",
+					"dev": true,
+					"requires": {
+						"html-escaper": "^2.0.0",
+						"istanbul-lib-report": "^3.0.0"
+					}
+				},
+				"yargs-parser": {
+					"version": "20.2.9",
+					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+					"integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+					"dev": true
+				}
+			}
+		},
+		"cacache": {
+			"version": "15.3.0",
+			"resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz",
+			"integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"@npmcli/fs": "^1.0.0",
+				"@npmcli/move-file": "^1.0.1",
+				"chownr": "^2.0.0",
+				"fs-minipass": "^2.0.0",
+				"glob": "^7.1.4",
+				"infer-owner": "^1.0.4",
+				"lru-cache": "^6.0.0",
+				"minipass": "^3.1.1",
+				"minipass-collect": "^1.0.2",
+				"minipass-flush": "^1.0.5",
+				"minipass-pipeline": "^1.2.2",
+				"mkdirp": "^1.0.3",
+				"p-map": "^4.0.0",
+				"promise-inflight": "^1.0.1",
+				"rimraf": "^3.0.2",
+				"ssri": "^8.0.1",
+				"tar": "^6.0.2",
+				"unique-filename": "^1.1.1"
+			},
+			"dependencies": {
+				"glob": {
+					"version": "7.2.3",
+					"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+					"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"fs.realpath": "^1.0.0",
+						"inflight": "^1.0.4",
+						"inherits": "2",
+						"minimatch": "^3.1.1",
+						"once": "^1.3.0",
+						"path-is-absolute": "^1.0.0"
+					}
+				},
+				"minimatch": {
+					"version": "3.1.2",
+					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+					"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"brace-expansion": "^1.1.7"
+					}
+				},
+				"minipass": {
+					"version": "3.3.6",
+					"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+					"integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				},
+				"p-map": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+					"integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"aggregate-error": "^3.0.0"
+					}
+				}
 			}
 		},
 		"camelcase": {
@@ -697,19 +515,6 @@
 			"integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
 			"dev": true
 		},
-		"caniuse-lite": {
-			"version": "1.0.30001271",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001271.tgz",
-			"integrity": "sha512-BBruZFWmt3HFdVPS8kceTBIguKxu4f99n5JNp06OlPD/luoAMIaIK5ieV5YjnBLH3Nysai9sxj9rpJj4ZisXOA==",
-			"dev": true
-		},
-		"caseless": {
-			"version": "0.12.0",
-			"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-			"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-			"dev": true,
-			"optional": true
-		},
 		"chalk": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -737,16 +542,17 @@
 			}
 		},
 		"chownr": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-			"integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+			"integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
 			"dev": true
 		},
 		"clean-stack": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
 			"integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
 		"cliui": {
 			"version": "7.0.4",
@@ -759,12 +565,6 @@
 				"wrap-ansi": "^7.0.0"
 			}
 		},
-		"code-point-at": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-			"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-			"dev": true
-		},
 		"color-convert": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -780,20 +580,10 @@
 			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true
 		},
-		"combined-stream": {
-			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"delayed-stream": "~1.0.0"
-			}
-		},
-		"commondir": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-			"integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+		"color-support": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+			"integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
 			"dev": true
 		},
 		"concat-map": {
@@ -805,7 +595,7 @@
 		"console-control-strings": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-			"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+			"integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
 			"dev": true
 		},
 		"convert-source-map": {
@@ -834,16 +624,6 @@
 				"which": "^2.0.1"
 			}
 		},
-		"dashdash": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-			"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"assert-plus": "^1.0.0"
-			}
-		},
 		"debug": {
 			"version": "4.3.2",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
@@ -865,40 +645,25 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
 			"integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
-			"dev": true
-		},
-		"deep-extend": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-			"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-			"dev": true
-		},
-		"default-require-extensions": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.0.tgz",
-			"integrity": "sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg==",
-			"dev": true,
-			"requires": {
-				"strip-bom": "^4.0.0"
-			}
-		},
-		"delayed-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-			"dev": true,
-			"optional": true
+			"dev": true
 		},
 		"delegates": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-			"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+			"integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
 			"dev": true
 		},
+		"depd": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+			"integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+			"dev": true,
+			"optional": true
+		},
 		"detect-libc": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-			"integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
+			"integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
 			"dev": true
 		},
 		"diff": {
@@ -907,21 +672,10 @@
 			"integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
 			"dev": true
 		},
-		"ecc-jsbn": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-			"integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"jsbn": "~0.1.0",
-				"safer-buffer": "^2.1.0"
-			}
-		},
-		"electron-to-chromium": {
-			"version": "1.3.880",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.880.tgz",
-			"integrity": "sha512-iwIP/6WoeSimzUKJIQtjtpVDsK8Ir8qQCMXsUBwg+rxJR2Uh3wTNSbxoYRfs+3UWx/9MAnPIxVZCyWkm8MT0uw==",
+		"eastasianwidth": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+			"integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
 			"dev": true
 		},
 		"emoji-regex": {
@@ -930,16 +684,34 @@
 			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
 			"dev": true
 		},
+		"encoding": {
+			"version": "0.1.13",
+			"resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
+			"integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"iconv-lite": "^0.6.2"
+			}
+		},
 		"enforce": {
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/enforce/-/enforce-0.1.7.tgz",
 			"integrity": "sha1-r3zdP6mCsuyq4GrntcJZUX0ivj8="
 		},
-		"es6-error": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
-			"integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
-			"dev": true
+		"env-paths": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+			"integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+			"dev": true,
+			"optional": true
+		},
+		"err-code": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+			"integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
+			"dev": true,
+			"optional": true
 		},
 		"escalade": {
 			"version": "3.1.1",
@@ -953,40 +725,6 @@
 			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
 			"dev": true
 		},
-		"esprima": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-			"dev": true
-		},
-		"extend": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-			"dev": true,
-			"optional": true
-		},
-		"extsprintf": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-			"dev": true,
-			"optional": true
-		},
-		"fast-deep-equal": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-			"dev": true,
-			"optional": true
-		},
-		"fast-json-stable-stringify": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-			"dev": true,
-			"optional": true
-		},
 		"fill-range": {
 			"version": "7.0.1",
 			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -996,17 +734,6 @@
 				"to-regex-range": "^5.0.1"
 			}
 		},
-		"find-cache-dir": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-			"integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
-			"dev": true,
-			"requires": {
-				"commondir": "^1.0.1",
-				"make-dir": "^3.0.2",
-				"pkg-dir": "^4.1.0"
-			}
-		},
 		"find-up": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
@@ -1033,44 +760,30 @@
 				"signal-exit": "^3.0.2"
 			}
 		},
-		"forever-agent": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-			"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-			"dev": true,
-			"optional": true
-		},
-		"form-data": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-			"integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"asynckit": "^0.4.0",
-				"combined-stream": "^1.0.6",
-				"mime-types": "^2.1.12"
-			}
-		},
-		"fromentries": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz",
-			"integrity": "sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==",
-			"dev": true
-		},
 		"fs-minipass": {
-			"version": "1.2.7",
-			"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
-			"integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+			"integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
 			"dev": true,
 			"requires": {
-				"minipass": "^2.6.0"
+				"minipass": "^3.0.0"
+			},
+			"dependencies": {
+				"minipass": {
+					"version": "3.3.6",
+					"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+					"integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+					"dev": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				}
 			}
 		},
 		"fs.realpath": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+			"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
 			"dev": true
 		},
 		"fsevents": {
@@ -1080,114 +793,78 @@
 			"dev": true,
 			"optional": true
 		},
-		"fstream": {
-			"version": "1.0.12",
-			"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
-			"integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+		"gauge": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
+			"integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
 			"dev": true,
-			"optional": true,
 			"requires": {
-				"graceful-fs": "^4.1.2",
-				"inherits": "~2.0.0",
-				"mkdirp": ">=0.5 0",
-				"rimraf": "2"
+				"aproba": "^1.0.3 || ^2.0.0",
+				"color-support": "^1.1.2",
+				"console-control-strings": "^1.0.0",
+				"has-unicode": "^2.0.1",
+				"object-assign": "^4.1.1",
+				"signal-exit": "^3.0.0",
+				"string-width": "^4.2.3",
+				"strip-ansi": "^6.0.1",
+				"wide-align": "^1.1.2"
 			}
 		},
-		"gauge": {
-			"version": "2.7.4",
-			"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-			"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+		"get-caller-file": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+			"dev": true
+		},
+		"glob": {
+			"version": "10.3.0",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-10.3.0.tgz",
+			"integrity": "sha512-AQ1/SB9HH0yCx1jXAT4vmCbTOPe5RQ+kCurjbel5xSCGhebumUv+GJZfa1rEqor3XIViqwSEmlkZCQD43RWrBg==",
 			"dev": true,
 			"requires": {
-				"aproba": "^1.0.3",
-				"console-control-strings": "^1.0.0",
-				"has-unicode": "^2.0.0",
-				"object-assign": "^4.1.0",
-				"signal-exit": "^3.0.0",
-				"string-width": "^1.0.1",
-				"strip-ansi": "^3.0.1",
-				"wide-align": "^1.1.0"
+				"foreground-child": "^3.1.0",
+				"jackspeak": "^2.0.3",
+				"minimatch": "^9.0.1",
+				"minipass": "^5.0.0 || ^6.0.2",
+				"path-scurry": "^1.7.0"
 			},
 			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+				"brace-expansion": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+					"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
 					"dev": true,
 					"requires": {
-						"number-is-nan": "^1.0.0"
+						"balanced-match": "^1.0.0"
 					}
 				},
-				"string-width": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+				"foreground-child": {
+					"version": "3.1.1",
+					"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
+					"integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
 					"dev": true,
 					"requires": {
-						"code-point-at": "^1.0.0",
-						"is-fullwidth-code-point": "^1.0.0",
-						"strip-ansi": "^3.0.0"
+						"cross-spawn": "^7.0.0",
+						"signal-exit": "^4.0.1"
 					}
 				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+				"minimatch": {
+					"version": "9.0.2",
+					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.2.tgz",
+					"integrity": "sha512-PZOT9g5v2ojiTL7r1xF6plNHLtOeTpSlDI007As2NlA2aYBMfVom17yqa6QzhmDP8QOhn7LjHTg7DFCVSSa6yg==",
 					"dev": true,
 					"requires": {
-						"ansi-regex": "^2.0.0"
+						"brace-expansion": "^2.0.1"
 					}
+				},
+				"signal-exit": {
+					"version": "4.0.2",
+					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.0.2.tgz",
+					"integrity": "sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==",
+					"dev": true
 				}
 			}
 		},
-		"gensync": {
-			"version": "1.0.0-beta.2",
-			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-			"dev": true
-		},
-		"get-caller-file": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-			"dev": true
-		},
-		"get-package-type": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-			"integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-			"dev": true
-		},
-		"getpass": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"assert-plus": "^1.0.0"
-			}
-		},
-		"glob": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-			"integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-			"dev": true,
-			"requires": {
-				"fs.realpath": "^1.0.0",
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "^3.0.4",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
-			}
-		},
 		"glob-parent": {
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
@@ -1197,17 +874,12 @@
 				"is-glob": "^4.0.1"
 			}
 		},
-		"globals": {
-			"version": "11.12.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-			"dev": true
-		},
 		"graceful-fs": {
 			"version": "4.2.8",
 			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
 			"integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
 		"growl": {
 			"version": "1.10.5",
@@ -1215,24 +887,6 @@
 			"integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
 			"dev": true
 		},
-		"har-schema": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-			"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-			"dev": true,
-			"optional": true
-		},
-		"har-validator": {
-			"version": "5.1.5",
-			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
-			"integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"ajv": "^6.12.3",
-				"har-schema": "^2.0.0"
-			}
-		},
 		"has-flag": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -1242,19 +896,9 @@
 		"has-unicode": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-			"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+			"integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
 			"dev": true
 		},
-		"hasha": {
-			"version": "5.2.2",
-			"resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz",
-			"integrity": "sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==",
-			"dev": true,
-			"requires": {
-				"is-stream": "^2.0.0",
-				"type-fest": "^0.8.0"
-			}
-		},
 		"hat": {
 			"version": "0.0.3",
 			"resolved": "https://registry.npmjs.org/hat/-/hat-0.0.3.tgz",
@@ -1272,52 +916,80 @@
 			"integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
 			"dev": true
 		},
-		"http-signature": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-			"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+		"http-cache-semantics": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
+			"integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
+			"dev": true,
+			"optional": true
+		},
+		"http-proxy-agent": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+			"integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
 			"dev": true,
 			"optional": true,
 			"requires": {
-				"assert-plus": "^1.0.0",
-				"jsprim": "^1.2.2",
-				"sshpk": "^1.7.0"
+				"@tootallnate/once": "1",
+				"agent-base": "6",
+				"debug": "4"
 			}
 		},
-		"iconv-lite": {
-			"version": "0.4.24",
-			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+		"https-proxy-agent": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+			"integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
 			"dev": true,
 			"requires": {
-				"safer-buffer": ">= 2.1.2 < 3"
+				"agent-base": "6",
+				"debug": "4"
 			}
 		},
-		"ignore-walk": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz",
-			"integrity": "sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==",
+		"humanize-ms": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
+			"integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
 			"dev": true,
+			"optional": true,
 			"requires": {
-				"minimatch": "^3.0.4"
+				"ms": "^2.0.0"
+			}
+		},
+		"iconv-lite": {
+			"version": "0.6.3",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+			"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"safer-buffer": ">= 2.1.2 < 3.0.0"
 			}
 		},
 		"imurmurhash": {
 			"version": "0.1.4",
 			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
 			"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
 		"indent-string": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
 			"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-			"dev": true
+			"dev": true,
+			"optional": true
+		},
+		"infer-owner": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
+			"integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
+			"dev": true,
+			"optional": true
 		},
 		"inflight": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+			"integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
 			"dev": true,
 			"requires": {
 				"once": "^1.3.0",
@@ -1330,11 +1002,12 @@
 			"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
 			"dev": true
 		},
-		"ini": {
-			"version": "1.3.8",
-			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-			"dev": true
+		"ip": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
+			"integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==",
+			"dev": true,
+			"optional": true
 		},
 		"is-binary-path": {
 			"version": "2.1.0",
@@ -1366,6 +1039,13 @@
 				"is-extglob": "^2.1.1"
 			}
 		},
+		"is-lambda": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
+			"integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
+			"dev": true,
+			"optional": true
+		},
 		"is-number": {
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -1378,30 +1058,12 @@
 			"integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
 			"dev": true
 		},
-		"is-stream": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-			"dev": true
-		},
-		"is-typedarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-			"dev": true
-		},
 		"is-unicode-supported": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
 			"integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
 			"dev": true
 		},
-		"is-windows": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-			"dev": true
-		},
 		"isarray": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -1414,74 +1076,12 @@
 			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
 			"dev": true
 		},
-		"isstream": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-			"dev": true,
-			"optional": true
-		},
 		"istanbul-lib-coverage": {
 			"version": "3.2.0",
 			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
 			"integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
 			"dev": true
 		},
-		"istanbul-lib-hook": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz",
-			"integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==",
-			"dev": true,
-			"requires": {
-				"append-transform": "^2.0.0"
-			}
-		},
-		"istanbul-lib-instrument": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
-			"integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
-			"dev": true,
-			"requires": {
-				"@babel/core": "^7.7.5",
-				"@istanbuljs/schema": "^0.1.2",
-				"istanbul-lib-coverage": "^3.0.0",
-				"semver": "^6.3.0"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				}
-			}
-		},
-		"istanbul-lib-processinfo": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.2.tgz",
-			"integrity": "sha512-kOwpa7z9hme+IBPZMzQ5vdQj8srYgAtaRqeI48NGmAQ+/5yKiHLV0QbYqQpxsdEF0+w14SoB8YbnHKcXE2KnYw==",
-			"dev": true,
-			"requires": {
-				"archy": "^1.0.0",
-				"cross-spawn": "^7.0.0",
-				"istanbul-lib-coverage": "^3.0.0-alpha.1",
-				"make-dir": "^3.0.0",
-				"p-map": "^3.0.0",
-				"rimraf": "^3.0.0",
-				"uuid": "^3.3.3"
-			},
-			"dependencies": {
-				"rimraf": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-					"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-					"dev": true,
-					"requires": {
-						"glob": "^7.1.3"
-					}
-				}
-			}
-		},
 		"istanbul-lib-report": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
@@ -1490,107 +1090,26 @@
 			"requires": {
 				"istanbul-lib-coverage": "^3.0.0",
 				"make-dir": "^3.0.0",
-				"supports-color": "^7.1.0"
-			}
-		},
-		"istanbul-lib-source-maps": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-			"integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
-			"dev": true,
-			"requires": {
-				"debug": "^4.1.1",
-				"istanbul-lib-coverage": "^3.0.0",
-				"source-map": "^0.6.1"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				}
-			}
-		},
-		"istanbul-reports": {
-			"version": "3.0.5",
-			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.5.tgz",
-			"integrity": "sha512-5+19PlhnGabNWB7kOFnuxT8H3T/iIyQzIbQMxXsURmmvKg86P2sbkrGOT77VnHw0Qr0gc2XzRaRfMZYYbSQCJQ==",
-			"dev": true,
-			"requires": {
-				"html-escaper": "^2.0.0",
-				"istanbul-lib-report": "^3.0.0"
-			}
-		},
-		"js-tokens": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-			"dev": true
-		},
-		"js-yaml": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-			"dev": true,
-			"requires": {
-				"argparse": "^2.0.1"
-			}
-		},
-		"jsbn": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-			"dev": true,
-			"optional": true
-		},
-		"jsesc": {
-			"version": "2.5.2",
-			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-			"dev": true
-		},
-		"json-schema": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-			"dev": true,
-			"optional": true
-		},
-		"json-schema-traverse": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-			"dev": true,
-			"optional": true
-		},
-		"json-stringify-safe": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-			"dev": true,
-			"optional": true
+				"supports-color": "^7.1.0"
+			}
 		},
-		"json5": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-			"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+		"jackspeak": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.2.1.tgz",
+			"integrity": "sha512-MXbxovZ/Pm42f6cDIDkl3xpwv1AGwObKwfmjs2nQePiy85tP3fatofl3FC1aBsOtP/6fq5SbtgHwWcMsLP+bDw==",
 			"dev": true,
 			"requires": {
-				"minimist": "^1.2.5"
+				"@isaacs/cliui": "^8.0.2",
+				"@pkgjs/parseargs": "^0.11.0"
 			}
 		},
-		"jsprim": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-			"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+		"js-yaml": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
 			"dev": true,
-			"optional": true,
 			"requires": {
-				"assert-plus": "1.0.0",
-				"extsprintf": "1.3.0",
-				"json-schema": "0.2.3",
-				"verror": "1.10.0"
+				"argparse": "^2.0.1"
 			}
 		},
 		"just-extend": {
@@ -1620,12 +1139,6 @@
 			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
 			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
 		},
-		"lodash.flattendeep": {
-			"version": "4.4.0",
-			"resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
-			"integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
-			"dev": true
-		},
 		"lodash.get": {
 			"version": "4.4.2",
 			"resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
@@ -1668,80 +1181,198 @@
 				}
 			}
 		},
-		"mime-db": {
-			"version": "1.50.0",
-			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz",
-			"integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==",
-			"dev": true,
-			"optional": true
-		},
-		"mime-types": {
-			"version": "2.1.33",
-			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz",
-			"integrity": "sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==",
+		"make-fetch-happen": {
+			"version": "9.1.0",
+			"resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz",
+			"integrity": "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==",
 			"dev": true,
 			"optional": true,
 			"requires": {
-				"mime-db": "1.50.0"
+				"agentkeepalive": "^4.1.3",
+				"cacache": "^15.2.0",
+				"http-cache-semantics": "^4.1.0",
+				"http-proxy-agent": "^4.0.1",
+				"https-proxy-agent": "^5.0.0",
+				"is-lambda": "^1.0.1",
+				"lru-cache": "^6.0.0",
+				"minipass": "^3.1.3",
+				"minipass-collect": "^1.0.2",
+				"minipass-fetch": "^1.3.2",
+				"minipass-flush": "^1.0.5",
+				"minipass-pipeline": "^1.2.4",
+				"negotiator": "^0.6.2",
+				"promise-retry": "^2.0.1",
+				"socks-proxy-agent": "^6.0.0",
+				"ssri": "^8.0.0"
+			},
+			"dependencies": {
+				"minipass": {
+					"version": "3.3.6",
+					"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+					"integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				}
 			}
 		},
 		"minimatch": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
 			"dev": true,
 			"requires": {
 				"brace-expansion": "^1.1.7"
 			}
 		},
-		"minimist": {
-			"version": "1.2.6",
-			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-			"integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+		"minipass": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/minipass/-/minipass-6.0.2.tgz",
+			"integrity": "sha512-MzWSV5nYVT7mVyWCwn2o7JH13w2TBRmmSqSRCKzTw+lmft9X4z+3wjvs06Tzijo5z4W/kahUCDpRXTF+ZrmF/w==",
 			"dev": true
 		},
-		"minipass": {
-			"version": "2.9.0",
-			"resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
-			"integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
+		"minipass-collect": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
+			"integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
 			"dev": true,
+			"optional": true,
 			"requires": {
-				"safe-buffer": "^5.1.2",
-				"yallist": "^3.0.0"
+				"minipass": "^3.0.0"
 			},
 			"dependencies": {
-				"safe-buffer": {
-					"version": "5.2.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-					"dev": true
-				},
-				"yallist": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-					"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-					"dev": true
+				"minipass": {
+					"version": "3.3.6",
+					"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+					"integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
 				}
 			}
 		},
-		"minizlib": {
-			"version": "1.3.3",
-			"resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
-			"integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
+		"minipass-fetch": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz",
+			"integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"encoding": "^0.1.12",
+				"minipass": "^3.1.0",
+				"minipass-sized": "^1.0.3",
+				"minizlib": "^2.0.0"
+			},
+			"dependencies": {
+				"minipass": {
+					"version": "3.3.6",
+					"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+					"integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				}
+			}
+		},
+		"minipass-flush": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
+			"integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
 			"dev": true,
+			"optional": true,
 			"requires": {
-				"minipass": "^2.9.0"
+				"minipass": "^3.0.0"
+			},
+			"dependencies": {
+				"minipass": {
+					"version": "3.3.6",
+					"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+					"integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				}
 			}
 		},
-		"mkdirp": {
-			"version": "0.5.5",
-			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-			"integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+		"minipass-pipeline": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
+			"integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"minipass": "^3.0.0"
+			},
+			"dependencies": {
+				"minipass": {
+					"version": "3.3.6",
+					"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+					"integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				}
+			}
+		},
+		"minipass-sized": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
+			"integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"minipass": "^3.0.0"
+			},
+			"dependencies": {
+				"minipass": {
+					"version": "3.3.6",
+					"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+					"integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				}
+			}
+		},
+		"minizlib": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+			"integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
 			"dev": true,
 			"requires": {
-				"minimist": "^1.2.5"
+				"minipass": "^3.0.0",
+				"yallist": "^4.0.0"
+			},
+			"dependencies": {
+				"minipass": {
+					"version": "3.3.6",
+					"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+					"integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+					"dev": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				}
 			}
 		},
+		"mkdirp": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+			"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+			"dev": true
+		},
 		"mocha": {
 			"version": "9.2.2",
 			"resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz",
@@ -1791,6 +1422,31 @@
 						}
 					}
 				},
+				"glob": {
+					"version": "7.2.0",
+					"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+					"integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+					"dev": true,
+					"requires": {
+						"fs.realpath": "^1.0.0",
+						"inflight": "^1.0.4",
+						"inherits": "2",
+						"minimatch": "^3.0.4",
+						"once": "^1.3.0",
+						"path-is-absolute": "^1.0.0"
+					},
+					"dependencies": {
+						"minimatch": {
+							"version": "3.1.2",
+							"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+							"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+							"dev": true,
+							"requires": {
+								"brace-expansion": "^1.1.7"
+							}
+						}
+					}
+				},
 				"minimatch": {
 					"version": "4.2.1",
 					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-4.2.1.tgz",
@@ -1890,27 +1546,12 @@
 			"integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==",
 			"dev": true
 		},
-		"needle": {
-			"version": "2.9.1",
-			"resolved": "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz",
-			"integrity": "sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==",
+		"negotiator": {
+			"version": "0.6.3",
+			"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+			"integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
 			"dev": true,
-			"requires": {
-				"debug": "^3.2.6",
-				"iconv-lite": "^0.4.4",
-				"sax": "^1.2.4"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "3.2.7",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-					"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				}
-			}
+			"optional": true
 		},
 		"nise": {
 			"version": "5.1.0",
@@ -1926,385 +1567,185 @@
 			}
 		},
 		"node-addon-api": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
-			"integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz",
+			"integrity": "sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==",
 			"dev": true
 		},
-		"node-gyp": {
-			"version": "3.8.0",
-			"resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
-			"integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"fstream": "^1.0.0",
-				"glob": "^7.0.3",
-				"graceful-fs": "^4.1.2",
-				"mkdirp": "^0.5.0",
-				"nopt": "2 || 3",
-				"npmlog": "0 || 1 || 2 || 3 || 4",
-				"osenv": "0",
-				"request": "^2.87.0",
-				"rimraf": "2",
-				"semver": "~5.3.0",
-				"tar": "^2.0.0",
-				"which": "1"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-					"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-					"dev": true,
-					"optional": true
-				},
-				"which": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-					"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
-			}
-		},
-		"node-pre-gyp": {
-			"version": "0.11.0",
-			"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz",
-			"integrity": "sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q==",
-			"dev": true,
-			"requires": {
-				"detect-libc": "^1.0.2",
-				"mkdirp": "^0.5.1",
-				"needle": "^2.2.1",
-				"nopt": "^4.0.1",
-				"npm-packlist": "^1.1.6",
-				"npmlog": "^4.0.2",
-				"rc": "^1.2.7",
-				"rimraf": "^2.6.1",
-				"semver": "^5.3.0",
-				"tar": "^4"
-			},
-			"dependencies": {
-				"nopt": {
-					"version": "4.0.3",
-					"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
-					"integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
-					"dev": true,
-					"requires": {
-						"abbrev": "1",
-						"osenv": "^0.1.4"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.2.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-					"dev": true
-				},
-				"semver": {
-					"version": "5.7.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-					"dev": true
-				},
-				"tar": {
-					"version": "4.4.19",
-					"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz",
-					"integrity": "sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==",
-					"dev": true,
-					"requires": {
-						"chownr": "^1.1.4",
-						"fs-minipass": "^1.2.7",
-						"minipass": "^2.9.0",
-						"minizlib": "^1.3.3",
-						"mkdirp": "^0.5.5",
-						"safe-buffer": "^5.2.1",
-						"yallist": "^3.1.1"
-					}
-				},
-				"yallist": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-					"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-					"dev": true
-				}
-			}
-		},
-		"node-preload": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz",
-			"integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==",
+		"node-fetch": {
+			"version": "2.6.11",
+			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz",
+			"integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==",
 			"dev": true,
 			"requires": {
-				"process-on-spawn": "^1.0.0"
+				"whatwg-url": "^5.0.0"
 			}
 		},
-		"node-releases": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
-			"integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
-			"dev": true
-		},
-		"nopt": {
-			"version": "3.0.6",
-			"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-			"integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+		"node-gyp": {
+			"version": "8.4.1",
+			"resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz",
+			"integrity": "sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==",
 			"dev": true,
 			"optional": true,
 			"requires": {
-				"abbrev": "1"
-			}
-		},
-		"normalize-path": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-			"dev": true
-		},
-		"npm-bundled": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz",
-			"integrity": "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==",
-			"dev": true,
-			"requires": {
-				"npm-normalize-package-bin": "^1.0.1"
-			}
-		},
-		"npm-normalize-package-bin": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
-			"integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==",
-			"dev": true
-		},
-		"npm-packlist": {
-			"version": "1.4.8",
-			"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz",
-			"integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==",
-			"dev": true,
-			"requires": {
-				"ignore-walk": "^3.0.1",
-				"npm-bundled": "^1.0.1",
-				"npm-normalize-package-bin": "^1.0.1"
-			}
-		},
-		"npmlog": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-			"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-			"dev": true,
-			"requires": {
-				"are-we-there-yet": "~1.1.2",
-				"console-control-strings": "~1.1.0",
-				"gauge": "~2.7.3",
-				"set-blocking": "~2.0.0"
-			}
-		},
-		"number-is-nan": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-			"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-			"dev": true
-		},
-		"nyc": {
-			"version": "15.1.0",
-			"resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz",
-			"integrity": "sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==",
-			"dev": true,
-			"requires": {
-				"@istanbuljs/load-nyc-config": "^1.0.0",
-				"@istanbuljs/schema": "^0.1.2",
-				"caching-transform": "^4.0.0",
-				"convert-source-map": "^1.7.0",
-				"decamelize": "^1.2.0",
-				"find-cache-dir": "^3.2.0",
-				"find-up": "^4.1.0",
-				"foreground-child": "^2.0.0",
-				"get-package-type": "^0.1.0",
-				"glob": "^7.1.6",
-				"istanbul-lib-coverage": "^3.0.0",
-				"istanbul-lib-hook": "^3.0.0",
-				"istanbul-lib-instrument": "^4.0.0",
-				"istanbul-lib-processinfo": "^2.0.2",
-				"istanbul-lib-report": "^3.0.0",
-				"istanbul-lib-source-maps": "^4.0.0",
-				"istanbul-reports": "^3.0.2",
-				"make-dir": "^3.0.0",
-				"node-preload": "^0.2.1",
-				"p-map": "^3.0.0",
-				"process-on-spawn": "^1.0.0",
-				"resolve-from": "^5.0.0",
-				"rimraf": "^3.0.0",
-				"signal-exit": "^3.0.2",
-				"spawn-wrap": "^2.0.0",
-				"test-exclude": "^6.0.0",
-				"yargs": "^15.0.2"
+				"env-paths": "^2.2.0",
+				"glob": "^7.1.4",
+				"graceful-fs": "^4.2.6",
+				"make-fetch-happen": "^9.1.0",
+				"nopt": "^5.0.0",
+				"npmlog": "^6.0.0",
+				"rimraf": "^3.0.2",
+				"semver": "^7.3.5",
+				"tar": "^6.1.2",
+				"which": "^2.0.2"
 			},
 			"dependencies": {
-				"camelcase": {
-					"version": "5.3.1",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-					"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-					"dev": true
-				},
-				"cliui": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-					"integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+				"are-we-there-yet": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz",
+					"integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==",
 					"dev": true,
+					"optional": true,
 					"requires": {
-						"string-width": "^4.2.0",
-						"strip-ansi": "^6.0.0",
-						"wrap-ansi": "^6.2.0"
+						"delegates": "^1.0.0",
+						"readable-stream": "^3.6.0"
 					}
 				},
-				"decamelize": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-					"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-					"dev": true
-				},
-				"find-up": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+				"gauge": {
+					"version": "4.0.4",
+					"resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz",
+					"integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==",
 					"dev": true,
+					"optional": true,
 					"requires": {
-						"locate-path": "^5.0.0",
-						"path-exists": "^4.0.0"
+						"aproba": "^1.0.3 || ^2.0.0",
+						"color-support": "^1.1.3",
+						"console-control-strings": "^1.1.0",
+						"has-unicode": "^2.0.1",
+						"signal-exit": "^3.0.7",
+						"string-width": "^4.2.3",
+						"strip-ansi": "^6.0.1",
+						"wide-align": "^1.1.5"
 					}
 				},
-				"locate-path": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+				"glob": {
+					"version": "7.2.3",
+					"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+					"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
 					"dev": true,
+					"optional": true,
 					"requires": {
-						"p-locate": "^4.1.0"
+						"fs.realpath": "^1.0.0",
+						"inflight": "^1.0.4",
+						"inherits": "2",
+						"minimatch": "^3.1.1",
+						"once": "^1.3.0",
+						"path-is-absolute": "^1.0.0"
 					}
 				},
-				"p-limit": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+				"minimatch": {
+					"version": "3.1.2",
+					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+					"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
 					"dev": true,
+					"optional": true,
 					"requires": {
-						"p-try": "^2.0.0"
+						"brace-expansion": "^1.1.7"
 					}
 				},
-				"p-locate": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+				"npmlog": {
+					"version": "6.0.2",
+					"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz",
+					"integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
 					"dev": true,
+					"optional": true,
 					"requires": {
-						"p-limit": "^2.2.0"
+						"are-we-there-yet": "^3.0.0",
+						"console-control-strings": "^1.1.0",
+						"gauge": "^4.0.3",
+						"set-blocking": "^2.0.0"
 					}
 				},
-				"rimraf": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-					"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+				"readable-stream": {
+					"version": "3.6.2",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+					"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
 					"dev": true,
+					"optional": true,
 					"requires": {
-						"glob": "^7.1.3"
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
 					}
 				},
-				"wrap-ansi": {
-					"version": "6.2.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-					"integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+				"safe-buffer": {
+					"version": "5.2.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
 					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.0.0",
-						"string-width": "^4.1.0",
-						"strip-ansi": "^6.0.0"
-					}
-				},
-				"y18n": {
-					"version": "4.0.3",
-					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-					"integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-					"dev": true
+					"optional": true
 				},
-				"yargs": {
-					"version": "15.4.1",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-					"integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+				"signal-exit": {
+					"version": "3.0.7",
+					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+					"integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
 					"dev": true,
-					"requires": {
-						"cliui": "^6.0.0",
-						"decamelize": "^1.2.0",
-						"find-up": "^4.1.0",
-						"get-caller-file": "^2.0.1",
-						"require-directory": "^2.1.1",
-						"require-main-filename": "^2.0.0",
-						"set-blocking": "^2.0.0",
-						"string-width": "^4.2.0",
-						"which-module": "^2.0.0",
-						"y18n": "^4.0.0",
-						"yargs-parser": "^18.1.2"
-					}
+					"optional": true
 				},
-				"yargs-parser": {
-					"version": "18.1.3",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-					"integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+				"string_decoder": {
+					"version": "1.3.0",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+					"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
 					"dev": true,
+					"optional": true,
 					"requires": {
-						"camelcase": "^5.0.0",
-						"decamelize": "^1.2.0"
+						"safe-buffer": "~5.2.0"
 					}
 				}
 			}
 		},
-		"oauth-sign": {
-			"version": "0.9.0",
-			"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-			"integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+		"nopt": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+			"integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+			"dev": true,
+			"requires": {
+				"abbrev": "1"
+			}
+		},
+		"normalize-path": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+			"dev": true
+		},
+		"npmlog": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
+			"integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
 			"dev": true,
-			"optional": true
+			"requires": {
+				"are-we-there-yet": "^2.0.0",
+				"console-control-strings": "^1.1.0",
+				"gauge": "^3.0.0",
+				"set-blocking": "^2.0.0"
+			}
 		},
 		"object-assign": {
 			"version": "4.1.1",
 			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-			"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+			"integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
 			"dev": true
 		},
 		"once": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+			"integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
 			"dev": true,
 			"requires": {
 				"wrappy": "1"
 			}
 		},
-		"os-homedir": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-			"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-			"dev": true
-		},
-		"os-tmpdir": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-			"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-			"dev": true
-		},
-		"osenv": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-			"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-			"dev": true,
-			"requires": {
-				"os-homedir": "^1.0.0",
-				"os-tmpdir": "^1.0.0"
-			}
-		},
 		"p-limit": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
@@ -2323,33 +1764,6 @@
 				"p-limit": "^3.0.2"
 			}
 		},
-		"p-map": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
-			"integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
-			"dev": true,
-			"requires": {
-				"aggregate-error": "^3.0.0"
-			}
-		},
-		"p-try": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-			"dev": true
-		},
-		"package-hash": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz",
-			"integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "^4.1.15",
-				"hasha": "^5.0.0",
-				"lodash.flattendeep": "^4.4.0",
-				"release-zalgo": "^1.0.0"
-			}
-		},
 		"packet-reader": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz",
@@ -2373,6 +1787,24 @@
 			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
 			"dev": true
 		},
+		"path-scurry": {
+			"version": "1.9.2",
+			"resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.9.2.tgz",
+			"integrity": "sha512-qSDLy2aGFPm8i4rsbHd4MNyTcrzHFsLQykrtbuGRknZZCBBVXSv2tSCDN2Cg6Rt/GFRw8GoW9y9Ecw5rIPG1sg==",
+			"dev": true,
+			"requires": {
+				"lru-cache": "^9.1.1",
+				"minipass": "^5.0.0 || ^6.0.2"
+			},
+			"dependencies": {
+				"lru-cache": {
+					"version": "9.1.2",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.1.2.tgz",
+					"integrity": "sha512-ERJq3FOzJTxBbFjZ7iDs+NiK4VI9Wz+RdrrAB8dio1oV+YvdPzUEE4QNiT2VD51DkIbCYRUUzCRkssXCHqSnKQ==",
+					"dev": true
+				}
+			}
+		},
 		"path-to-regexp": {
 			"version": "1.8.0",
 			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
@@ -2390,13 +1822,6 @@
 				}
 			}
 		},
-		"performance-now": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-			"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-			"dev": true,
-			"optional": true
-		},
 		"pg": {
 			"version": "8.7.1",
 			"resolved": "https://registry.npmjs.org/pg/-/pg-8.7.1.tgz",
@@ -2458,66 +1883,12 @@
 				"split2": "^3.1.1"
 			}
 		},
-		"picocolors": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-			"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-			"dev": true
-		},
 		"picomatch": {
 			"version": "2.3.1",
 			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
 			"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
 			"dev": true
 		},
-		"pkg-dir": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-			"dev": true,
-			"requires": {
-				"find-up": "^4.0.0"
-			},
-			"dependencies": {
-				"find-up": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^5.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"locate-path": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^4.1.0"
-					}
-				},
-				"p-limit": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-					"dev": true,
-					"requires": {
-						"p-try": "^2.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^2.2.0"
-					}
-				}
-			}
-		},
 		"postgres-array": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
@@ -2549,37 +1920,26 @@
 			"version": "1.0.7",
 			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
 			"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-			"dev": true
-		},
-		"process-on-spawn": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz",
-			"integrity": "sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==",
-			"dev": true,
-			"requires": {
-				"fromentries": "^1.2.0"
-			}
-		},
-		"psl": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-			"integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
 			"dev": true,
 			"optional": true
 		},
-		"punycode": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+		"promise-inflight": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+			"integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==",
 			"dev": true,
 			"optional": true
 		},
-		"qs": {
-			"version": "6.5.2",
-			"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-			"integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+		"promise-retry": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
+			"integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
 			"dev": true,
-			"optional": true
+			"optional": true,
+			"requires": {
+				"err-code": "^2.0.2",
+				"retry": "^0.12.0"
+			}
 		},
 		"randombytes": {
 			"version": "2.1.0",
@@ -2590,31 +1950,12 @@
 				"safe-buffer": "^5.1.0"
 			}
 		},
-		"rc": {
-			"version": "1.2.8",
-			"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-			"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-			"dev": true,
-			"requires": {
-				"deep-extend": "^0.6.0",
-				"ini": "~1.3.0",
-				"minimist": "^1.2.0",
-				"strip-json-comments": "~2.0.1"
-			},
-			"dependencies": {
-				"strip-json-comments": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-					"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-					"dev": true
-				}
-			}
-		},
 		"readable-stream": {
 			"version": "2.3.3",
 			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
 			"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
 			"dev": true,
+			"optional": true,
 			"requires": {
 				"core-util-is": "~1.0.0",
 				"inherits": "~2.0.3",
@@ -2634,78 +1975,51 @@
 				"picomatch": "^2.2.1"
 			}
 		},
-		"release-zalgo": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz",
-			"integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=",
-			"dev": true,
-			"requires": {
-				"es6-error": "^4.0.1"
-			}
-		},
-		"request": {
-			"version": "2.88.2",
-			"resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-			"integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"aws-sign2": "~0.7.0",
-				"aws4": "^1.8.0",
-				"caseless": "~0.12.0",
-				"combined-stream": "~1.0.6",
-				"extend": "~3.0.2",
-				"forever-agent": "~0.6.1",
-				"form-data": "~2.3.2",
-				"har-validator": "~5.1.3",
-				"http-signature": "~1.2.0",
-				"is-typedarray": "~1.0.0",
-				"isstream": "~0.1.2",
-				"json-stringify-safe": "~5.0.1",
-				"mime-types": "~2.1.19",
-				"oauth-sign": "~0.9.0",
-				"performance-now": "^2.1.0",
-				"qs": "~6.5.2",
-				"safe-buffer": "^5.1.2",
-				"tough-cookie": "~2.5.0",
-				"tunnel-agent": "^0.6.0",
-				"uuid": "^3.3.2"
-			},
-			"dependencies": {
-				"safe-buffer": {
-					"version": "5.2.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-					"dev": true,
-					"optional": true
-				}
-			}
-		},
 		"require-directory": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
 			"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
 			"dev": true
 		},
-		"require-main-filename": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-			"integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-			"dev": true
-		},
-		"resolve-from": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-			"dev": true
+		"retry": {
+			"version": "0.12.0",
+			"resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+			"integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
+			"dev": true,
+			"optional": true
 		},
 		"rimraf": {
-			"version": "2.7.1",
-			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-			"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
 			"dev": true,
 			"requires": {
 				"glob": "^7.1.3"
+			},
+			"dependencies": {
+				"glob": {
+					"version": "7.2.3",
+					"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+					"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+					"dev": true,
+					"requires": {
+						"fs.realpath": "^1.0.0",
+						"inflight": "^1.0.4",
+						"inherits": "2",
+						"minimatch": "^3.1.1",
+						"once": "^1.3.0",
+						"path-is-absolute": "^1.0.0"
+					}
+				},
+				"minimatch": {
+					"version": "3.1.2",
+					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+					"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+					"dev": true,
+					"requires": {
+						"brace-expansion": "^1.1.7"
+					}
+				}
 			}
 		},
 		"safe-buffer": {
@@ -2718,18 +2032,13 @@
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
 			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-			"dev": true
-		},
-		"sax": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-			"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
 		"semver": {
-			"version": "7.3.5",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-			"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+			"version": "7.5.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
+			"integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
 			"dev": true,
 			"requires": {
 				"lru-cache": "^6.0.0"
@@ -2839,34 +2148,52 @@
 				"supports-color": "^7.2.0"
 			}
 		},
-		"source-map": {
-			"version": "0.5.7",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-			"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-			"dev": true
+		"smart-buffer": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+			"integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+			"dev": true,
+			"optional": true
 		},
-		"spawn-wrap": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz",
-			"integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==",
+		"socks": {
+			"version": "2.7.1",
+			"resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz",
+			"integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==",
 			"dev": true,
+			"optional": true,
 			"requires": {
-				"foreground-child": "^2.0.0",
-				"is-windows": "^1.0.2",
-				"make-dir": "^3.0.0",
-				"rimraf": "^3.0.0",
-				"signal-exit": "^3.0.2",
-				"which": "^2.0.1"
+				"ip": "^2.0.0",
+				"smart-buffer": "^4.2.0"
+			}
+		},
+		"socks-proxy-agent": {
+			"version": "6.2.1",
+			"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz",
+			"integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"agent-base": "^6.0.2",
+				"debug": "^4.3.3",
+				"socks": "^2.6.2"
 			},
 			"dependencies": {
-				"rimraf": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-					"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+				"debug": {
+					"version": "4.3.4",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+					"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
 					"dev": true,
+					"optional": true,
 					"requires": {
-						"glob": "^7.1.3"
+						"ms": "2.1.2"
 					}
+				},
+				"ms": {
+					"version": "2.1.2",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+					"dev": true,
+					"optional": true
 				}
 			}
 		},
@@ -2907,12 +2234,6 @@
 				}
 			}
 		},
-		"sprintf-js": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-			"dev": true
-		},
 		"sql-ddl-sync": {
 			"version": "0.3.18",
 			"resolved": "https://registry.npmjs.org/sql-ddl-sync/-/sql-ddl-sync-0.3.18.tgz",
@@ -2927,14 +2248,15 @@
 			"integrity": "sha512-XXK6W6n0D18YspS/7TziKln8ij9RUnpDzl+qr2hUOqEqrhuilGPhbKBYQ1dkfYoQ0ViNtr2y8RKut06nkAkx2w=="
 		},
 		"sqlite3": {
-			"version": "5.0.2",
-			"resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.2.tgz",
-			"integrity": "sha512-1SdTNo+BVU211Xj1csWa8lV6KM0CtucDwRyA0VHl91wEH1Mgh7RxUpI4rVvG7OhHrzCSGaVyW5g8vKvlrk9DJA==",
+			"version": "5.1.6",
+			"resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.6.tgz",
+			"integrity": "sha512-olYkWoKFVNSSSQNvxVUfjiVbz3YtBwTJj+mfV5zpHmqW3sELx2Cf4QCdirMelhM5Zh+KDVaKgQHqCxrqiWHybw==",
 			"dev": true,
 			"requires": {
-				"node-addon-api": "^3.0.0",
-				"node-gyp": "3.x",
-				"node-pre-gyp": "^0.11.0"
+				"@mapbox/node-pre-gyp": "^1.0.0",
+				"node-addon-api": "^4.2.0",
+				"node-gyp": "8.x",
+				"tar": "^6.1.11"
 			}
 		},
 		"sqlstring": {
@@ -2943,22 +2265,26 @@
 			"integrity": "sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A=",
 			"dev": true
 		},
-		"sshpk": {
-			"version": "1.16.1",
-			"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-			"integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+		"ssri": {
+			"version": "8.0.1",
+			"resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
+			"integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
 			"dev": true,
 			"optional": true,
 			"requires": {
-				"asn1": "~0.2.3",
-				"assert-plus": "^1.0.0",
-				"bcrypt-pbkdf": "^1.0.0",
-				"dashdash": "^1.12.0",
-				"ecc-jsbn": "~0.1.1",
-				"getpass": "^0.1.1",
-				"jsbn": "~0.1.0",
-				"safer-buffer": "^2.0.2",
-				"tweetnacl": "~0.14.0"
+				"minipass": "^3.1.1"
+			},
+			"dependencies": {
+				"minipass": {
+					"version": "3.3.6",
+					"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+					"integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				}
 			}
 		},
 		"string-width": {
@@ -2972,11 +2298,23 @@
 				"strip-ansi": "^6.0.1"
 			}
 		},
+		"string-width-cjs": {
+			"version": "npm:string-width@4.2.3",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+			"dev": true,
+			"requires": {
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.1"
+			}
+		},
 		"string_decoder": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
 			"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
 			"dev": true,
+			"optional": true,
 			"requires": {
 				"safe-buffer": "~5.1.0"
 			}
@@ -2990,11 +2328,14 @@
 				"ansi-regex": "^5.0.1"
 			}
 		},
-		"strip-bom": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-			"integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-			"dev": true
+		"strip-ansi-cjs": {
+			"version": "npm:strip-ansi@6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+			"dev": true,
+			"requires": {
+				"ansi-regex": "^5.0.1"
+			}
 		},
 		"strip-json-comments": {
 			"version": "3.1.1",
@@ -3012,15 +2353,25 @@
 			}
 		},
 		"tar": {
-			"version": "2.2.2",
-			"resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
-			"integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
+			"version": "6.1.15",
+			"resolved": "https://registry.npmjs.org/tar/-/tar-6.1.15.tgz",
+			"integrity": "sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==",
 			"dev": true,
-			"optional": true,
 			"requires": {
-				"block-stream": "*",
-				"fstream": "^1.0.12",
-				"inherits": "2"
+				"chownr": "^2.0.0",
+				"fs-minipass": "^2.0.0",
+				"minipass": "^5.0.0",
+				"minizlib": "^2.1.1",
+				"mkdirp": "^1.0.3",
+				"yallist": "^4.0.0"
+			},
+			"dependencies": {
+				"minipass": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
+					"integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+					"dev": true
+				}
 			}
 		},
 		"test-exclude": {
@@ -3032,14 +2383,35 @@
 				"@istanbuljs/schema": "^0.1.2",
 				"glob": "^7.1.4",
 				"minimatch": "^3.0.4"
+			},
+			"dependencies": {
+				"glob": {
+					"version": "7.2.3",
+					"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+					"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+					"dev": true,
+					"requires": {
+						"fs.realpath": "^1.0.0",
+						"inflight": "^1.0.4",
+						"inherits": "2",
+						"minimatch": "^3.1.1",
+						"once": "^1.3.0",
+						"path-is-absolute": "^1.0.0"
+					},
+					"dependencies": {
+						"minimatch": {
+							"version": "3.1.2",
+							"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+							"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+							"dev": true,
+							"requires": {
+								"brace-expansion": "^1.1.7"
+							}
+						}
+					}
+				}
 			}
 		},
-		"to-fast-properties": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-			"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-			"dev": true
-		},
 		"to-regex-range": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -3049,33 +2421,11 @@
 				"is-number": "^7.0.0"
 			}
 		},
-		"tough-cookie": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-			"integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"psl": "^1.1.28",
-				"punycode": "^2.1.1"
-			}
-		},
-		"tunnel-agent": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"safe-buffer": "^5.0.1"
-			}
-		},
-		"tweetnacl": {
-			"version": "0.14.5",
-			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-			"dev": true,
-			"optional": true
+		"tr46": {
+			"version": "0.0.3",
+			"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+			"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+			"dev": true
 		},
 		"type-detect": {
 			"version": "4.0.8",
@@ -3083,29 +2433,24 @@
 			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
 			"dev": true
 		},
-		"type-fest": {
-			"version": "0.8.1",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-			"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-			"dev": true
-		},
-		"typedarray-to-buffer": {
-			"version": "3.1.5",
-			"resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-			"integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+		"unique-filename": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+			"integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
 			"dev": true,
+			"optional": true,
 			"requires": {
-				"is-typedarray": "^1.0.0"
+				"unique-slug": "^2.0.0"
 			}
 		},
-		"uri-js": {
-			"version": "4.4.1",
-			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+		"unique-slug": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
+			"integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
 			"dev": true,
 			"optional": true,
 			"requires": {
-				"punycode": "^2.1.0"
+				"imurmurhash": "^0.1.4"
 			}
 		},
 		"util-deprecate": {
@@ -3114,22 +2459,31 @@
 			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
 			"dev": true
 		},
-		"uuid": {
-			"version": "3.4.0",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-			"integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+		"v8-to-istanbul": {
+			"version": "9.1.0",
+			"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz",
+			"integrity": "sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==",
+			"dev": true,
+			"requires": {
+				"@jridgewell/trace-mapping": "^0.3.12",
+				"@types/istanbul-lib-coverage": "^2.0.1",
+				"convert-source-map": "^1.6.0"
+			}
+		},
+		"webidl-conversions": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+			"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
 			"dev": true
 		},
-		"verror": {
-			"version": "1.10.0",
-			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+		"whatwg-url": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+			"integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
 			"dev": true,
-			"optional": true,
 			"requires": {
-				"assert-plus": "^1.0.0",
-				"core-util-is": "1.0.2",
-				"extsprintf": "^1.2.0"
+				"tr46": "~0.0.3",
+				"webidl-conversions": "^3.0.0"
 			}
 		},
 		"which": {
@@ -3141,12 +2495,6 @@
 				"isexe": "^2.0.0"
 			}
 		},
-		"which-module": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-			"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-			"dev": true
-		},
 		"wide-align": {
 			"version": "1.1.5",
 			"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
@@ -3173,24 +2521,23 @@
 				"strip-ansi": "^6.0.0"
 			}
 		},
+		"wrap-ansi-cjs": {
+			"version": "npm:wrap-ansi@7.0.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+			"dev": true,
+			"requires": {
+				"ansi-styles": "^4.0.0",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0"
+			}
+		},
 		"wrappy": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+			"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
 			"dev": true
 		},
-		"write-file-atomic": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-			"integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-			"dev": true,
-			"requires": {
-				"imurmurhash": "^0.1.4",
-				"is-typedarray": "^1.0.0",
-				"signal-exit": "^3.0.2",
-				"typedarray-to-buffer": "^3.1.5"
-			}
-		},
 		"xtend": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
diff --git a/package.json b/package.json
index b2fa2785..83525649 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "sqlite",
     "mongodb"
   ],
-  "version": "7.1.0",
+  "version": "7.1.1",
   "license": "MIT",
   "homepage": "http://dresende.github.io/node-orm2",
   "repository": "http://github.com/dresende/node-orm2.git",
@@ -54,7 +54,7 @@
   ],
   "main": "./lib/ORM",
   "scripts": {
-    "test": "nyc make test"
+    "test": "c8 make test"
   },
   "engines": {
     "node": ">= 6.0.0"
@@ -71,20 +71,20 @@
     "sql-query": "0.1.27"
   },
   "devDependencies": {
+    "c8": "~8.0.0",
     "chalk": "~4.1.2",
-    "glob": "~7.2.0",
+    "glob": "~10.3.0",
     "mocha": "~9.2.2",
     "mongodb": "~1.4.10",
     "mysql": "~2.18.1",
-    "nyc": "~15.1.0",
     "pg": "~8.7.1",
-    "semver": "~7.3.5",
+    "semver": "^7.5.3",
     "should": "~13.2.3",
     "sinon": "~11.1.2",
-    "sqlite3": "~5.0.2"
+    "sqlite3": "~5.1.6"
   },
   "optionalDependencies": {},
-  "nyc": {
+  "c8": {
     "check-coverage": true,
     "statements": 89.22,
     "branches": 79.76,

From a426118dbe746157891b622d73491d7707133dac Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 27 Jun 2023 11:30:51 +0200
Subject: [PATCH 1244/1246] Add rows to hasMany join table in order provided

Previously, they were added in reverse order
---
 Changelog.md                            |  3 ++
 lib/Associations/Many.js                | 40 ++++++++++---------------
 lib/Associations/One.js                 | 34 +++++++--------------
 lib/Hook.js                             | 40 ++++++++++++-------------
 package-lock.json                       |  2 +-
 package.json                            |  2 +-
 test/integration/association-hasmany.js | 18 +++++++++++
 7 files changed, 70 insertions(+), 69 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index bb906174..d0bab257 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### v8.0.0
+- [POSSIBLY BREAKING] Add rows to hasMany join table in order provided (previously, they were added in reverse order) ([862](../../pull/862))
+
 ### v7.1.1
 - Resolve most development-only security vulnerabilities (no production ones present) ([861](../../pull/861))
 - Don't run test on node 10 & 12 - dev deps don't work
diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
index 684dbae2..265f4ef5 100644
--- a/lib/Associations/Many.js
+++ b/lib/Associations/Many.js
@@ -1,4 +1,5 @@
 var _                   = require("lodash");
+var async               = require("async");
 var Hook                = require("../Hook");
 var Settings            = require("../Settings");
 var Property            = require("../Property");
@@ -369,17 +370,13 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
     value: function () {
       var Associations = [];
       var opts = {};
-      var cb = noOperation;
+      var next = noOperation;
 
       var run = function () {
-        var savedAssociations = [];
-        var saveNextAssociation = function () {
-          if (Associations.length === 0) {
-            return cb(null, savedAssociations);
-          }
+        var saveAssociation = function (Association, cb) {
+          const hookOpts = Object.keys(association.props).length > 0 ? opts : undefined;
 
-          var Association = Associations.pop();
-          var saveAssociation = function (err) {
+          Hook.wait(Association, association.hooks.beforeSave, function (err) {
             if (err) {
               return cb(err);
             }
@@ -405,9 +402,7 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
                     return cb(err);
                   }
 
-                  savedAssociations.push(Association);
-
-                  return saveNextAssociation();
+                  return cb();
                 });
               }
 
@@ -419,27 +414,24 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
                   return cb(err);
                 }
 
-                savedAssociations.push(Association);
-
-                return saveNextAssociation();
+                return cb();
               });
             });
-          };
-
-          if (Object.keys(association.props).length) {
-            Hook.wait(Association, association.hooks.beforeSave, saveAssociation, opts);
-          } else {
-            Hook.wait(Association, association.hooks.beforeSave, saveAssociation);
-          }
+          }, hookOpts);
         };
 
-        return saveNextAssociation();
+        async.eachSeries(Associations, saveAssociation, function (err) {
+          if (err) {
+            return next(err);
+          }
+          next(null, Associations);
+        });
       };
 
       for (var i = 0; i < arguments.length; i++) {
         switch (typeof arguments[i]) {
           case "function":
-            cb = arguments[i];
+            next = arguments[i];
             break;
           case "object":
             if (Array.isArray(arguments[i])) {
@@ -462,7 +454,7 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
       } else {
         this.save(function (err) {
           if (err) {
-            return cb(err);
+            return next(err);
           }
 
           return run();
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
index e9a3d3f8..5f08eacc 100644
--- a/lib/Associations/One.js
+++ b/lib/Associations/One.js
@@ -1,4 +1,5 @@
 var _          = require("lodash");
+var async      = require("async");
 var util       = require("../Utilities");
 var ORMError   = require("../Error");
 var Accessors  = { "get": "get", "set": "set", "has": "has", "del": "remove" };
@@ -214,52 +215,39 @@ function extendInstance(Model, Instance, Driver, association) {
     writable: true
   });
   Object.defineProperty(Instance, association.setAccessor, {
-    value: function (OtherInstance, cb) {
+    value: function (OtherInstance, next) {
       if (association.reversed) {
         Instance.save(function (err) {
           if (err) {
-            return cb(err);
+            return next(err);
           }
 
           if (!Array.isArray(OtherInstance)) {
             util.populateConditions(Model, Object.keys(association.field), Instance, OtherInstance, true);
 
-            return OtherInstance.save({}, { saveAssociations: false }, cb);
+            return OtherInstance.save({}, { saveAssociations: false }, next);
           }
 
-          var associations = _.clone(OtherInstance);
-
-          var saveNext = function () {
-            if (!associations.length) {
-              return cb();
-            }
-
-            var other = associations.pop();
+          var saveAssociation = function (otherInstance, cb) {
+            util.populateConditions(Model, Object.keys(association.field), Instance, otherInstance, true);
 
-            util.populateConditions(Model, Object.keys(association.field), Instance, other, true);
-
-            other.save({}, { saveAssociations: false }, function (err) {
-              if (err) {
-                return cb(err);
-              }
-
-              saveNext();
-            });
+            otherInstance.save({}, { saveAssociations: false }, cb);
           };
 
-          return saveNext();
+          var associations = _.clone(OtherInstance);
+          async.eachSeries(associations, saveAssociation, next);
         });
       } else {
         OtherInstance.save({}, { saveAssociations: false }, function (err) {
           if (err) {
-            return cb(err);
+            return next(err);
           }
 
           Instance[association.name] = OtherInstance;
 
           util.populateConditions(association.model, Object.keys(association.field), OtherInstance, Instance);
 
-          return Instance.save({}, { saveAssociations: false }, cb);
+          return Instance.save({}, { saveAssociations: false }, next);
         });
       }
 
diff --git a/lib/Hook.js b/lib/Hook.js
index 22285460..3466305b 100644
--- a/lib/Hook.js
+++ b/lib/Hook.js
@@ -8,30 +8,30 @@ exports.trigger = function () {
   }
 };
 
-exports.wait = function () {
-  var args = Array.prototype.slice.apply(arguments);
-  var self = args.shift();
-  var hook = args.shift();
-  var next = args.shift();
+exports.wait = function (self, hook, next, opts) {
+  if (typeof hook !== "function") {
+    return next();
+  }
 
-  args.push(next);
-  if (typeof hook === "function") {
-    var hookValue = hook.apply(self, args);
+  var hookDoesntExpectCallback = hook.length < 1;
+  var hookValue;
+  if (opts) {
+    hookValue = hook.call(self, opts, next);
+    hookDoesntExpectCallback = hook.length < 2;
+  } else {
+    hookValue = hook.call(self, next);
+  }
 
-    var hookDoesntExpectCallback = hook.length < args.length;
-    var isPromise = hookValue && typeof(hookValue.then) === "function";
+  var isPromise = hookValue && typeof(hookValue.then) === "function";
 
-    if (hookDoesntExpectCallback) {
-      if (isPromise) {
-        return hookValue
-          .then(function () {
-            next();
-          })
-          .catch(next);
-      }
-      return next();
+  if (hookDoesntExpectCallback) {
+    if (isPromise) {
+      return hookValue
+        .then(function () {
+          next();
+        })
+        .catch(next);
     }
-  } else {
     return next();
   }
 };
diff --git a/package-lock.json b/package-lock.json
index b3d22717..987051f2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "orm",
-	"version": "7.1.1",
+	"version": "8.0.0",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
diff --git a/package.json b/package.json
index 83525649..6ef4c8bd 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "sqlite",
     "mongodb"
   ],
-  "version": "7.1.1",
+  "version": "8.0.0",
   "license": "MIT",
   "homepage": "http://dresende.github.io/node-orm2",
   "repository": "http://github.com/dresende/node-orm2.git",
diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
index 3170b07e..6d870e20 100644
--- a/test/integration/association-hasmany.js
+++ b/test/integration/association-hasmany.js
@@ -513,6 +513,24 @@ describe("hasMany", function () {
         });
       });
 
+      it("should add rows to join tables in order provided", async function () {
+        const pets = await Pet.createAsync([{ name: 'Fluffy' }, { name: 'Quacky' }, { name: 'Horsey' }]);
+        const Justin = await Person.oneAsync({ name: "Justin" });
+        const justinsPetsBefore = await Justin.getPetsAsync();
+        await Justin.addPetsAsync(pets);
+        const justinsPetsAfter = await Justin.getPetsAsync();
+
+        should.equal(justinsPetsBefore.length, justinsPetsAfter.length - 3);
+
+        const joinRows = await db.driver.execQueryAsync("SELECT * FROM person_pets");
+
+        should.deepEqual(
+          // Mysql returns array of RowDataPacket. Concert to plain object.
+          joinRows.slice(-pets.length).map((item) => Object.assign({}, item)),
+          pets.map(function (pet) { return { person_id: Justin.id, pets_id: pet.id }; }),
+        );
+      });
+
       it("should throw if no items passed", function (done) {
         Person.one(function (err, person) {
           should.equal(err, null);

From f4b49383ceba003a07d706e4b4ab265a37de9cc9 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Tue, 27 Jun 2023 12:36:16 +0200
Subject: [PATCH 1245/1246] Suggest typeorm instead of bookshelf

bookshelf isn't maintained
---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index fbf65827..4dda9d88 100755
--- a/Readme.md
+++ b/Readme.md
@@ -9,7 +9,7 @@
 ## This package is not actively maintained
 
 If you're starting a new project, consider using one of the following instead as they have a more active community:
-* https://github.com/bookshelf/bookshelf
+* https://github.com/typeorm/typeorm
 * https://github.com/sequelize/sequelize
 
 

From 749d424b0ec521f06c9fff1fa5ca0229beefe713 Mon Sep 17 00:00:00 2001
From: Arek W <arek01@gmail.com>
Date: Thu, 13 Mar 2025 14:27:11 +0100
Subject: [PATCH 1246/1246] Bump sql-query to remove util.isDate use

It's been deprecated in node 21/22
---
 .github/workflows/ci.yml |   2 +-
 Changelog.md             |   4 ++
 package-lock.json        | 144 +++++++++++++++++++++++++++++----------
 package.json             |   4 +-
 4 files changed, 116 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 97dd26bf..1f12469e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: ['14', '16', '18']
+        node-version: ['14', '16', '18', '20', '22']
 
     name: test on nodejs ${{ matrix.node-version }}
 
diff --git a/Changelog.md b/Changelog.md
index d0bab257..e0ba94b1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,7 @@
+### v8.0.1
+- Remove usage of deprecated `util.isDate` in `sql-query` ([863](../../pull/863))
+- Add node 20 & 22 to test matrix
+
 ### v8.0.0
 - [POSSIBLY BREAKING] Add rows to hasMany join table in order provided (previously, they were added in reverse order) ([862](../../pull/862))
 
diff --git a/package-lock.json b/package-lock.json
index 987051f2..137af144 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "orm",
-	"version": "8.0.0",
+	"version": "8.0.1",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -60,6 +60,40 @@
 						"strip-ansi": "^7.0.1"
 					}
 				},
+				"string-width-cjs": {
+					"version": "npm:string-width@4.2.3",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+					"dev": true,
+					"requires": {
+						"emoji-regex": "^8.0.0",
+						"is-fullwidth-code-point": "^3.0.0",
+						"strip-ansi": "^6.0.1"
+					},
+					"dependencies": {
+						"ansi-regex": {
+							"version": "5.0.1",
+							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+							"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+							"dev": true
+						},
+						"emoji-regex": {
+							"version": "8.0.0",
+							"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+							"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+							"dev": true
+						},
+						"strip-ansi": {
+							"version": "6.0.1",
+							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+							"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+							"dev": true,
+							"requires": {
+								"ansi-regex": "^5.0.1"
+							}
+						}
+					}
+				},
 				"strip-ansi": {
 					"version": "7.1.0",
 					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
@@ -69,6 +103,23 @@
 						"ansi-regex": "^6.0.1"
 					}
 				},
+				"strip-ansi-cjs": {
+					"version": "npm:strip-ansi@6.0.1",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+					"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "^5.0.1"
+					},
+					"dependencies": {
+						"ansi-regex": {
+							"version": "5.0.1",
+							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+							"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+							"dev": true
+						}
+					}
+				},
 				"wrap-ansi": {
 					"version": "8.1.0",
 					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
@@ -79,6 +130,60 @@
 						"string-width": "^5.0.1",
 						"strip-ansi": "^7.0.1"
 					}
+				},
+				"wrap-ansi-cjs": {
+					"version": "npm:wrap-ansi@7.0.0",
+					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+					"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "^4.0.0",
+						"string-width": "^4.1.0",
+						"strip-ansi": "^6.0.0"
+					},
+					"dependencies": {
+						"ansi-regex": {
+							"version": "5.0.1",
+							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+							"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+							"dev": true
+						},
+						"ansi-styles": {
+							"version": "4.3.0",
+							"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+							"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+							"dev": true,
+							"requires": {
+								"color-convert": "^2.0.1"
+							}
+						},
+						"emoji-regex": {
+							"version": "8.0.0",
+							"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+							"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+							"dev": true
+						},
+						"string-width": {
+							"version": "4.2.3",
+							"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+							"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+							"dev": true,
+							"requires": {
+								"emoji-regex": "^8.0.0",
+								"is-fullwidth-code-point": "^3.0.0",
+								"strip-ansi": "^6.0.1"
+							}
+						},
+						"strip-ansi": {
+							"version": "6.0.1",
+							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+							"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+							"dev": true,
+							"requires": {
+								"ansi-regex": "^5.0.1"
+							}
+						}
+					}
 				}
 			}
 		},
@@ -2243,9 +2348,9 @@
 			}
 		},
 		"sql-query": {
-			"version": "0.1.27",
-			"resolved": "https://registry.npmjs.org/sql-query/-/sql-query-0.1.27.tgz",
-			"integrity": "sha512-XXK6W6n0D18YspS/7TziKln8ij9RUnpDzl+qr2hUOqEqrhuilGPhbKBYQ1dkfYoQ0ViNtr2y8RKut06nkAkx2w=="
+			"version": "0.1.28",
+			"resolved": "https://registry.npmjs.org/sql-query/-/sql-query-0.1.28.tgz",
+			"integrity": "sha512-u4LZHEG8Xy41SyTEj1dbUfuVH59h+kmu0Q3l4j83AhnRrosdLw97Yy9dEBxVhATPqqUQzOv8fkawHCylfy4qbg=="
 		},
 		"sqlite3": {
 			"version": "5.1.6",
@@ -2298,17 +2403,6 @@
 				"strip-ansi": "^6.0.1"
 			}
 		},
-		"string-width-cjs": {
-			"version": "npm:string-width@4.2.3",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-			"dev": true,
-			"requires": {
-				"emoji-regex": "^8.0.0",
-				"is-fullwidth-code-point": "^3.0.0",
-				"strip-ansi": "^6.0.1"
-			}
-		},
 		"string_decoder": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
@@ -2328,15 +2422,6 @@
 				"ansi-regex": "^5.0.1"
 			}
 		},
-		"strip-ansi-cjs": {
-			"version": "npm:strip-ansi@6.0.1",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-			"dev": true,
-			"requires": {
-				"ansi-regex": "^5.0.1"
-			}
-		},
 		"strip-json-comments": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -2521,17 +2606,6 @@
 				"strip-ansi": "^6.0.0"
 			}
 		},
-		"wrap-ansi-cjs": {
-			"version": "npm:wrap-ansi@7.0.0",
-			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-			"dev": true,
-			"requires": {
-				"ansi-styles": "^4.0.0",
-				"string-width": "^4.1.0",
-				"strip-ansi": "^6.0.0"
-			}
-		},
 		"wrappy": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
diff --git a/package.json b/package.json
index 6ef4c8bd..fed14b79 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "sqlite",
     "mongodb"
   ],
-  "version": "8.0.0",
+  "version": "8.0.1",
   "license": "MIT",
   "homepage": "http://dresende.github.io/node-orm2",
   "repository": "http://github.com/dresende/node-orm2.git",
@@ -68,7 +68,7 @@
     "lodash": "^4.17.21",
     "path-is-absolute": "1.0.1",
     "sql-ddl-sync": "0.3.18",
-    "sql-query": "0.1.27"
+    "sql-query": "0.1.28"
   },
   "devDependencies": {
     "c8": "~8.0.0",