Add support for field names in update/upsert

closes gh-46

Author: bigbes

.gitignore

@@ -9,3 +9,7 @@
 sophia
 *.egg-info
 .tox
+
+*.xlog
+*.snap
+*.vylog

tarantool/connection.py

@@ -4,14 +4,15 @@
 This module provides low-level API for Tarantool
 '''
 
+import os
 import six
+import copy
 import time
 import errno
 import ctypes
 import ctypes.util
 import socket
 import msgpack
-import os
 
 try:
     from ctypes import c_ssize_t
@@ -429,6 +430,15 @@ class JoinState:
                 if state == JoinState.Done:
                     return
 
+    def _ops_process(self, space, update_ops):
+        new_ops = []
+        for op in update_ops:
+            if isinstance(op[1], six.string_types):
+                op = list(op)
+                op[1] = self.schema.get_field(space, op[1])['id']
+            new_ops.append(op)
+        return new_ops
+
     def join(self, server_uuid):
         self._opt_reconnect()
         if self.version_id < version_id(1, 7, 0):
@@ -555,6 +565,7 @@ def upsert(self, space_name, tuple_value, op_list, **kwargs):
             space_name = self.schema.get_space(space_name).sid
         if isinstance(index_name, six.string_types):
             index_name = self.schema.get_index(space_name, index_name).iid
+        op_list = self._ops_process(space_name, op_list)
         request = RequestUpsert(self, space_name, index_name, tuple_value,
                                 op_list)
         return self._send_request(request)
@@ -629,6 +640,7 @@ def update(self, space_name, key, op_list, **kwargs):
             space_name = self.schema.get_space(space_name).sid
         if isinstance(index_name, six.string_types):
             index_name = self.schema.get_index(space_name, index_name).iid
+        op_list = self._ops_process(space_name, op_list)
         request = RequestUpdate(self, space_name, index_name, key, op_list)
         return self._send_request(request)
 

tarantool/schema.py

@@ -52,6 +52,11 @@ def __init__(self, space_row, schema):
         self.schema[self.sid] = self
         if self.name:
             self.schema[self.name] = self
+        self.format = dict()
+        for part_id, part in enumerate(space_row[6]):
+            part['id'] = part_id
+            self.format[part['name']] = part
+            self.format[part_id     ] = part
 
     def flush(self):
         del self.schema[self.sid]
@@ -189,5 +194,18 @@ def fetch_index_from(self, space, index):
 
         return index_row
 
+    def get_field(self, space, field):
+        _space = self.get_space(space)
+        try:
+            return _space.format[field]
+        except:
+            tp = 'name' if isinstance(field, six.string_types) else 'id'
+            errmsg = "There's no field with {2} '{0}' in space '{1}'".format(
+                    field, _space.name, tp
+            )
+            raise SchemaError(errmsg)
+
+        return field
+
     def flush(self):
         self.schema.clear()

tests/suites/lib/tarantool_server.py

@@ -85,7 +85,7 @@ def __exit__(self, type, value, tb):
         self.disconnect()
 
     def __call__(self, command):
-        return self.execute(command)
+        return self.execute(' '.join(command.split('\n')))
 
     def execute_no_reconnect(self, command):
         if not command:

tests/suites/test_dml.py

@@ -241,6 +241,28 @@ def test_11_select_all_hash(self):
         with self.assertRaises(tarantool.error.DatabaseError):
             space.select((), iterator=tarantool.const.ITERATOR_EQ)
 
+    def test_12_update_fields(self):
+        self.srv.admin(
+        """
+        do
+            local sp = box.schema.create_space('sp', {
+                format = {
+                    { name = 'fir', type = 'unsigned' },
+                    { name = 'sec', type = 'string'   },
+                    { name = 'thi', type = 'unsigned' },
+                }
+            })
+            sp:create_index('pr', {
+                parts = {1, 'unsigned'}
+            })
+        end
+        """)
+        self.con.insert('sp', [2, 'help', 4])
+        self.assertSequenceEqual(
+            self.con.update('sp', (2,), [('+', 'thi', 3)]),
+            [[2, 'help', 7]]
+        )
+
     @classmethod
     def tearDownClass(self):
         self.srv.stop()