From 5342e8d44375707902ab97e85b36cde0fa435c91 Mon Sep 17 00:00:00 2001
From: Stuart Cam <stuart.cam@elastic.co>
Date: Fri, 2 Aug 2019 16:10:16 +1000
Subject: [PATCH 1/2] Introduce the columnar option for SQL REST requests.

Implements https://github.com/elastic/elasticsearch/pull/39287
---
 src/Nest/XPack/Sql/QuerySql/QuerySqlRequest.cs | 18 +++++++++++++++++-
 .../XPack/Sql/QuerySql/QuerySqlResponse.cs     |  9 +++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/Nest/XPack/Sql/QuerySql/QuerySqlRequest.cs b/src/Nest/XPack/Sql/QuerySql/QuerySqlRequest.cs
index 7219f42c6a7..fedd371c5d6 100644
--- a/src/Nest/XPack/Sql/QuerySql/QuerySqlRequest.cs
+++ b/src/Nest/XPack/Sql/QuerySql/QuerySqlRequest.cs
@@ -15,8 +15,15 @@ public partial interface IQuerySqlRequest : ISqlRequest
 		/// Unlike scroll, receiving the last page is enough to guarantee that the Elasticsearch state is cleared.
 		/// </para>
 		/// </summary>
-		[DataMember(Name ="cursor")]
+		[DataMember(Name="cursor")]
 		string Cursor { get; set; }
+
+		/// <summary>
+		/// Return the results in a columnar fashion: one row represents all the values of a certain column from the current page of results.
+		/// The following formats can be returned in columnar orientation: json, yaml, cbor and smile.
+		/// </summary>
+		[DataMember(Name="columnar")]
+		bool? Columnar { get; set; }
 	}
 
 	public partial class QuerySqlRequest
@@ -25,6 +32,10 @@ public partial class QuerySqlRequest
 		/// >
 		public string Cursor { get; set; }
 
+		/// <inheritdoc cref="IQuerySqlRequest.Columnar" />
+		/// >
+		public bool? Columnar { get; set; }
+
 		/// <inheritdoc cref="ISqlRequest.FetchSize" />
 		/// >
 		public int? FetchSize { get; set; }
@@ -45,6 +56,7 @@ public partial class QuerySqlRequest
 	public partial class QuerySqlDescriptor
 	{
 		string IQuerySqlRequest.Cursor { get; set; }
+		bool? IQuerySqlRequest.Columnar { get; set; }
 		int? ISqlRequest.FetchSize { get; set; }
 		QueryContainer ISqlRequest.Filter { get; set; }
 		string ISqlRequest.Query { get; set; }
@@ -70,5 +82,9 @@ public QuerySqlDescriptor Filter<T>(Func<QueryContainerDescriptor<T>, QueryConta
 		/// <inheritdoc cref="IQuerySqlRequest.Cursor" />
 		/// >
 		public QuerySqlDescriptor Cursor(string cursor) => Assign(cursor, (a, v) => a.Cursor = v);
+
+		/// <inheritdoc cref="IQuerySqlRequest.Columnar" />
+		/// >
+		public QuerySqlDescriptor Columnar(bool? columnar) => Assign(columnar, (a, v) => a.Columnar = v);
 	}
 }
diff --git a/src/Nest/XPack/Sql/QuerySql/QuerySqlResponse.cs b/src/Nest/XPack/Sql/QuerySql/QuerySqlResponse.cs
index 62287f378bd..9199963078d 100644
--- a/src/Nest/XPack/Sql/QuerySql/QuerySqlResponse.cs
+++ b/src/Nest/XPack/Sql/QuerySql/QuerySqlResponse.cs
@@ -20,7 +20,16 @@ public class QuerySqlResponse : ResponseBase
 		[DataMember(Name = "cursor")]
 		public string Cursor { get; internal set; }
 
+		/// <summary>
+		/// If <see cref="IQuerySqlRequest.Columnar"/> has been set to false, this property will contain the row values
+		/// </summary>
 		[DataMember(Name = "rows")]
 		public IReadOnlyCollection<SqlRow> Rows { get; internal set; } = EmptyReadOnly<SqlRow>.Collection;
+
+		/// <summary>
+		/// If <see cref="IQuerySqlRequest.Columnar"/> has been set to true, this property will contain the column values
+		/// </summary>
+		[DataMember(Name = "values")]
+		public IReadOnlyCollection<SqlRow> Values { get; internal set; } = EmptyReadOnly<SqlRow>.Collection;
 	}
 }

From de222ac497cea052f3606eaf1b88e2da7248820b Mon Sep 17 00:00:00 2001
From: Stuart Cam <stuart.cam@elastic.co>
Date: Thu, 8 Aug 2019 16:29:16 +1000
Subject: [PATCH 2/2] Update src/Nest/XPack/Sql/QuerySql/QuerySqlRequest.cs

Co-Authored-By: Russ Cam <russ.cam@elastic.co>
---
 src/Nest/XPack/Sql/QuerySql/QuerySqlRequest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Nest/XPack/Sql/QuerySql/QuerySqlRequest.cs b/src/Nest/XPack/Sql/QuerySql/QuerySqlRequest.cs
index fedd371c5d6..d7331442705 100644
--- a/src/Nest/XPack/Sql/QuerySql/QuerySqlRequest.cs
+++ b/src/Nest/XPack/Sql/QuerySql/QuerySqlRequest.cs
@@ -85,6 +85,6 @@ public QuerySqlDescriptor Filter<T>(Func<QueryContainerDescriptor<T>, QueryConta
 
 		/// <inheritdoc cref="IQuerySqlRequest.Columnar" />
 		/// >
-		public QuerySqlDescriptor Columnar(bool? columnar) => Assign(columnar, (a, v) => a.Columnar = v);
+		public QuerySqlDescriptor Columnar(bool? columnar = true) => Assign(columnar, (a, v) => a.Columnar = v);
 	}
 }