Fix findOne/0

1602 · Jul 24, 2016 · 62eb1e8 · 62eb1e8
1 parent 53d57f7
commit 62eb1e8
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/lib/model.js b/lib/model.js
@@ -380,20 +380,26 @@ AbstractClass.findOrCreate = function findOrCreate(query, data, callback) {
     if (typeof query === 'undefined') {
         query = {where: {}};
     }
+
     if (typeof data === 'function' || typeof data === 'undefined') {
         callback = data;
         data = query && query.where;
     }
-    if (typeof callback === 'undefined') {
-        callback = function() {};
+
+    if (typeof query === 'function') {
+        callback = query;
+        query = { where: {} };
     }
 
     var t = this;
-    this.findOne(query, function(err, record) {
-        if (err) return callback(err);
-        if (record) return callback(null, record);
-        t.create(data, callback);
-    });
+    this.findOne(query)
+        .then(function(record) {
+            if (record) {
+                return callback(null, record);
+            }
+            t.create(data, callback);
+        })
+        .catch(callback);
 };
 
 /**