From 01b2f76fee03e005e8188ded25a16371ac30cf78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Dziepak?= <pdziepak@cloudius-systems.com>
Date: Tue, 14 Jul 2015 13:50:30 +0200
Subject: [PATCH] transport: send back only the requested columns
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

result_set may contain more columns than user requested (for instance if
some of them were needed to properly sort output). The additional columns
are always the last ones and are not included in metadata::column_count().

Signed-off-by: Paweł Dziepak <pdziepak@cloudius-systems.com>
---
 transport/server.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/transport/server.cc b/transport/server.cc
index f6a28e1d2b..522c4064ec 100644
--- a/transport/server.cc
+++ b/transport/server.cc
@@ -9,6 +9,7 @@
 #include <boost/bimap.hpp>
 #include <boost/assign.hpp>
 #include <boost/locale/encoding_utf.hpp>
+#include <boost/range/adaptor/sliced.hpp>
 
 #include "db/consistency_level.hh"
 #include "core/future-util.hh"
@@ -575,7 +576,7 @@ public:
         _response->write(rs.get_metadata());
         _response->write_int(rs.size());
         for (auto&& row : rs.rows()) {
-            for (auto&& cell : row) {
+            for (auto&& cell : row | boost::adaptors::sliced(0, rs.get_metadata().column_count())) {
                 _response->write_value(cell);
             }
         }