Merge branch 'master' into c-sql

core/tarantool_lua.m

@@ -67,6 +67,7 @@ static char format_to_opcode(char format)
 	case '&': return 2;
 	case '|': return 3;
 	case '^': return 4;
+	case ':': return 5;
 	default: return format;
 	}
 }
@@ -148,6 +149,7 @@ lbox_pack(struct lua_State *L)
 		case '&': /* set field&=val */
 		case '|': /* set field|=val */
 		case '^': /* set field^=val */
+		case ':': /* splice */
 			u32buf= (u32) lua_tointeger(L, i); /* field no */
 			luaL_addlstring(&b, (char *) &u32buf, sizeof(u32));
 			luaL_addchar(&b, format_to_opcode(*format));

test/box/lua.test

@@ -154,3 +154,7 @@ exec admin "lua box.fiber.cancel(box.fiber.self())"
 exec admin "lua f:id(), box.fiber.self():id()"
 exec admin "lua g = box.fiber.self()"
 exec admin "lua f==g"
+exec admin "lua box.space[0]:insert('test', 'something to splice')"
+exec admin "lua box.space[0]:update('test', ':p', 1, box.pack('ppp', 0, 4, 'no'))"
+exec admin "lua box.space[0]:update('test', ':p', 1, box.pack('ppp', 0, 2, 'every'))"
+exec admin "lua box.space[0]:truncate()"