Upsert finished

Author: KlonD90

README.md

@@ -77,7 +77,7 @@ Promise resolve an array of deleted tuples.
 
 **update(spaceId: Number or String, indexId: Number or String, key: tuple, ops) : Promise(Array of tuples)**
 
-Ops: http://tarantool.org/doc/book/box/box_space.html(search for update here).
+Ops: http://tarantool.org/doc/book/box/box_space.html (search for update here).
 
 Promise resolve an array of updated tuples.
 
@@ -87,12 +87,14 @@ So it's insert. More you can read here: http://tarantool.org/doc/book/box/box_sp
 
 Promise resolve a new tuple.
 
-**upsert(spaceId: Number or String, tuple: tuple) : Promise(Tuple)**
+**upsert(spaceId: Number or String, key: tuple, ops: array of operations, tuple: tuple) : Promise()**
 
-So it's insert. More you can read here: http://tarantool.org/doc/book/box/box_space.html
+About operation: https://github.com/tarantool/tarantool/issues/905
 
-Promise resolve a new tuple.
+Ops: http://tarantool.org/doc/book/box/box_space.html (search for update here).
 
+Promise resolve nothing.   
+Knowing issues if it cannot be updated by your ops it wouldn't return error just only at tarantool side but not at protocol. See https://github.com/tarantool/tarantool/issues/966
 
 **replace(spaceId: Number or String, tuple: tuple) : Promise(Tuple)**
 
@@ -145,6 +147,12 @@ Then just a use **npm test** and it will use mocha and launch test.
 
 It's ok you can do whatever you need. I add log options for some technical information it can be help for you. If i don't answer i just miss email :( it's a lot emails from github so please write me to newbiecraft@gmail.com directly if i don't answer in one day.
 
+##Changelog
+
+###0.3.0
+Add upsert operation.  
+Key is now can be just a number.
+
 ##ToDo
 
 Test **eval** methods and make benchmarks and improve performance.

lib/connection.js

@@ -423,11 +423,11 @@ TarantoolConnection.prototype.upsert = function(spaceId, key, ops, tuple){
         if (Number.isInteger(key))
             key = [key];
         if (Array.isArray(ops) && Array.isArray(key)){
-            if (typeof(spaceId)=='string' || typeof(indexId)=='string')
+            if (typeof(spaceId)=='string')
             {
-                return this._getMetadata(spaceId, indexId)
+                return this._getMetadata(spaceId, 0)
                     .then(function(info){
-                        return this.update(info[0], info[1],  key, ops);
+                        return this.upsert(info[0],  key, ops, tuple);
                     }.bind(this))
                     .then(resolve)
                     .catch(reject);
@@ -444,9 +444,10 @@ TarantoolConnection.prototype.upsert = function(spaceId, key, ops, tuple){
             var body = Buffer.concat([new Buffer([0x84,tarantoolConstants.KeysCode.space_id]), buffered.spaceId,
                 //new Buffer([tarantoolConstants.KeysCode.index_id]), buffered.indexId,
                 new Buffer([tarantoolConstants.KeysCode.key]), buffered.key,
-                new Buffer([tarantoolConstants.KeysCode.tuple]), buffered.ops,
-                new Buffer([tarantoolConstants.KeysCode.def_tuple]), buffered.tuple]);
-            console.log(body);
+                new Buffer([tarantoolConstants.KeysCode.def_tuple]), buffered.ops,
+                new Buffer([tarantoolConstants.KeysCode.tuple]), buffered.tuple]);
+            if (this.options.log)
+                console.log(body);
             this._request(header, body);
             this.commandsQueue.push([tarantoolConstants.RequestCode.rqUpsert, reqId, {resolve: resolve, reject: reject}]);
         }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tarantool-driver",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "description": "Tarantool driver for 1.6",
   "main": "index.js",
   "scripts": {

test/app.js

@@ -242,13 +242,14 @@ describe('Tarantool Connection tests', function(){
 		var conn;
 		before(function(done){
 			try{
-				conn = new TarantoolConnection({port: 33013, log: true});
+				conn = new TarantoolConnection({port: 33013});
 				conn.connect().then(function(){
 					return conn.auth('test', 'test');
 				}, function(e){ throw 'not connected'; done();})
 					.then(function(){
 						return Promise.all([
-							conn.delete('upstest', 'primary', 1)
+							conn.delete('upstest', 'primary', 1),
+							conn.delete('upstest', 'primary', 2)
 						]);
 					})
 					.then(function(){
@@ -262,16 +263,38 @@ describe('Tarantool Connection tests', function(){
 				console.log(e);
 			}
 		});
-		it('try', function(done){
-			conn.upsert(517, [1], [['+', 3, 3]], [1, 2, 3])
-				.then(function(tuple){
-					assert.deepEqual(tuple, [1, 2, 3]);
+		it('insert', function(done){
+			conn.upsert('upstest', 1, [['+', 3, 3]], [1, 2, 3])
+				.then(function() {
+					return conn.select('upstest', 'primary', 1, 0, 'eq', 1);
+				})
+				.then(function(tuples){
+					assert.equal(tuples.length, 1);
+					assert.deepEqual(tuples[0], [1, 2, 3]);
 					done();
 				})
 
 				.catch(function(e){
 					done(e);
 				})
-		})
+		});
+		it('update', function(done){
+			conn.upsert('upstest', 2, [['+', 2, 2]], [2, 4, 3])
+				.then(function(){
+					return conn.upsert('upstest', 2, [['+', 2, 2]], [2, 4, 3]);
+				})
+				.then(function() {
+					return conn.select('upstest', 'primary', 1, 0, 'eq', 2)	;
+				})
+				.then(function(tuples){
+					assert.equal(tuples.length, 1);
+					assert.deepEqual(tuples[0], [2, 4, 5]);
+					done();
+				})
+
+				.catch(function(e){
+					done(e);
+				})
+		});
 	});
 });