Adds db.ping() (#57)

dresende · Mar 4, 2013 · af2f640 · af2f640
1 parent 392535a
commit af2f640
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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();
+	});
+});