improve-findById

lib/model.js

@@ -260,17 +260,35 @@ Model.prototype.where = function(condition) {
  * @param [withJson]
  * @returns {*}
  */
-Model.prototype.findById = function(_id, callback, withJson) {
+Model.prototype.findById = function (_id, callback, withJson) {
     var id = _id;
-    if(this.primaryKeys.length === 1 && typeof _id !== "object") {
+    var self = this;
+    if (this.primaryKeys.length === 1 && typeof _id !== "object") {
         id = {};
         id[this.primaryKeys[0].name] = _id;
     }
 
-    if(typeof id !== "object") {
+    if (typeof id !== "object") {
         return callback(new Error("You should pass a valid IDs object."));
     }
 
+    if (this.cache) {
+        return this.cache.getData(this.toshihiko.database, this.name, id, function (err, data) {
+            if (err) {
+                data = [];
+            }
+            if (data.length !== 0) {
+                var yukari = new Yukari(self, "query");
+                yukari._initRow(data[0],true);
+                if (withJson) {
+                    yukari = yukari.toJSON();
+                }
+                return callback(null, yukari);
+            }
+            return self.where(id).findOne(callback, withJson);
+        })
+    }
+
     return this.where(id).findOne(callback, withJson);
 };
 

test/model.js

@@ -130,6 +130,14 @@ describe("model", function () {
                 should(err).not.be.ok;
                 data.should.hasOwnProperty("key1").eql(3);
                 done();
+            },true);
+        });
+
+        it("findById return null", function(done) {
+            Model.findById(100, function(err, data) {
+                should(err).not.be.ok;
+                should.not.exist(data);
+                done();
             });
         });