Merge pull request #73 from vortec/master

Add callback support for sync()
dresende · Oct 25, 2012 · 7206c75 · 7206c75
2 parents 74a6d41 + 18bef91
commit 7206c75
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/lib/databases/mongodb.js b/lib/databases/mongodb.js
@@ -26,9 +26,13 @@ DBClient.prototype.getCollection = function (collection, cb) {
 	})(this));
 };
 
-DBClient.prototype.createCollection = function (collection, fields, assocs) {
+DBClient.prototype.createCollection = function (collection, fields, assocs, callback) {
 	var _collection = collection.toLowerCase(collection);
-	this._client.createCollection(_collection, function () {});
+	this._client.createCollection(_collection, function () {
+		if (callback !== undefined) {
+			callback(true);
+		}
+	});
 
 	return;
 };

diff --git a/lib/databases/mysql.js b/lib/databases/mysql.js
@@ -6,7 +6,7 @@ function DBClient(client) {
 DBClient.prototype.getClient = function () {
 	return this._client;
 };
-DBClient.prototype.createCollection = function (collection, fields, assocs, opts) {
+DBClient.prototype.createCollection = function (collection, fields, assocs, opts, callback) {
 	var _table = collection.toLowerCase();
 	var _query = "", _fields = [], _indexes = [];
 	var k, assoc_fields;
@@ -125,11 +125,10 @@ DBClient.prototype.createCollection = function (collection, fields, assocs, opts
 	_query = _query.replace("%values", _fields.join(", "));
 
 	this._client.query(_query, function (err, info) {
-		/*
+		if (callback !== undefined) {
-		console.log(err);
+			var success = !err;
-		console.log(info);
+			callback(success);
-		console.log("collection synced");
+		}
-		*/
 	});
 };
 DBClient.prototype.selectRecords = function (collection, config) {

diff --git a/lib/databases/postgresql.js b/lib/databases/postgresql.js
@@ -30,7 +30,7 @@ DBClient.prototype.getClient = function () {
 	return this._client;
 };
 
-DBClient.prototype.createCollection = function (collection, fields, assocs, opts) { /* opts not used yet */
+DBClient.prototype.createCollection = function (collection, fields, assocs, opts, callback) { /* opts not used yet */
 	var _table = collection.toLowerCase();
 	var _query = "CREATE TABLE \"%table\" (%values)", _fields = [], _indexes = [];
 	_query = _query.replace("%table", _table);
@@ -129,6 +129,11 @@ DBClient.prototype.createCollection = function (collection, fields, assocs, opts
 				self._client.query("CREATE INDEX \"" + _table + "_" + _indexes[i] + "_idx\" " + "ON \"" + _table + "\"(" + _indexes[i] + ")", emptycb);
 			}
 		}
+
+		if (callback !== undefined) {
+			var success = !err;
+			callback(success);
+		}
 	});
 };
 DBClient.prototype.selectRecords = function (collection, config) {

diff --git a/lib/orm.js b/lib/orm.js
@@ -365,7 +365,7 @@ ORM.prototype.define = function (model, fields, colParams) {
 
 		return this;
 	};
-	Model.sync = function (opts) {
+	Model.sync = function (opts, callback) {
 		for (var i = 0; i < associations.length; i++) {
 			if (!associations[i].hasOwnProperty("opts") || !associations[i].opts.hasOwnProperty("properties")) continue;
 
@@ -387,7 +387,7 @@ ORM.prototype.define = function (model, fields, colParams) {
 				}
 			}
 		}
-		orm._db.createCollection(model, fields, associations, opts);
+		orm._db.createCollection(model, fields, associations, opts, callback);
 	};
 	Model.clear = function (callback) {
 		orm._db.clearRecords(model, {