From f7afade22902fc251a251eb7aaaecd27e4cb3ba2 Mon Sep 17 00:00:00 2001 From: Raymond Feng Date: Wed, 2 Jul 2014 12:20:56 -0700 Subject: [PATCH 1/3] Make sure 'upsert' is used as the remote operation name See https://github.com/strongloop/loopback/issues/359 --- lib/dao.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/dao.js b/lib/dao.js index 131be88c..7e8194cb 100644 --- a/lib/dao.js +++ b/lib/dao.js @@ -222,7 +222,10 @@ function stillConnecting(dataSource, obj, args) { * @param {Object} data The model instance data * @param {Function} callback The callback function (optional). */ -DataAccessObject.upsert = DataAccessObject.updateOrCreate = function upsert(data, callback) { +// [FIXME] rfeng: This is a hack to set up 'upsert' first so that +// 'upsert' will be used as the name for strong-remoting to keep it backward +// compatible for angular SDK +DataAccessObject.updateOrCreate = DataAccessObject.upsert = function upsert(data, callback) { if (stillConnecting(this.getDataSource(), this, arguments)) { return; } From 0296ef113d1d57fbdd03e779d140ef2d31c55be9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Bajto=C5=A1?= Date: Thu, 3 Jul 2014 08:17:01 +0200 Subject: [PATCH 2/3] Make sure 'deleteById' is used as the remote operation name See strongloop/loopback#359 --- lib/dao.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/dao.js b/lib/dao.js index 7e8194cb..bc04d80b 100644 --- a/lib/dao.js +++ b/lib/dao.js @@ -897,7 +897,10 @@ DataAccessObject.remove = DataAccessObject.deleteAll = DataAccessObject.destroyA * @param {Function} cb Callback called with (err) */ -DataAccessObject.removeById = DataAccessObject.deleteById = DataAccessObject.destroyById = function deleteById(id, cb) { +// [FIXME] rfeng: This is a hack to set up 'deleteById' first so that +// 'deleteById' will be used as the name for strong-remoting to keep it backward +// compatible for angular SDK +DataAccessObject.removeById = DataAccessObject.destroyById = DataAccessObject.deleteById = function deleteById(id, cb) { if (stillConnecting(this.getDataSource(), this, arguments)) return; var Model = this; From 1e3be7f474b0c903fa0fcb2bf58c73e12c85c307 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Bajto=C5=A1?= Date: Thu, 3 Jul 2014 08:41:31 +0200 Subject: [PATCH 3/3] 1.6.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ace15d4e..6d46bf66 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "loopback-datasource-juggler", - "version": "1.6.2", + "version": "1.6.3", "description": "LoopBack DataSoure Juggler", "keywords": [ "StrongLoop",