Fix error reporting in seqcli query

src/SeqCli/Apps/Hosting/AppContainer.cs

@@ -15,7 +15,6 @@
 using System;
 using System.Globalization;
 using System.IO;
-using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Newtonsoft.Json;

src/SeqCli/Apps/Hosting/AppHost.cs

@@ -14,7 +14,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Net;
 using System.Threading.Tasks;
 using Seq.Apps;
 using Serilog;

src/SeqCli/Cli/Commands/ApiKey/ListCommand.cs

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using System.Linq;
 using System.Threading.Tasks;
 using SeqCli.Api;

src/SeqCli/Cli/Commands/ApiKey/RemoveCommand.cs

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using System.Linq;
 using System.Threading.Tasks;
 using SeqCli.Api;

src/SeqCli/Cli/Commands/App/DefineCommand.cs

@@ -16,7 +16,6 @@
 using System.Threading.Tasks;
 using SeqCli.Apps;
 using SeqCli.Apps.Definitions;
-using SeqCli.Cli.Features;
 using SeqCli.Util;
 
 namespace SeqCli.Cli.Commands.App;

src/SeqCli/Cli/Commands/App/InstallCommand.cs

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using SeqCli.Api;

src/SeqCli/Cli/Commands/App/ListCommand.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 using SeqCli.Api;
 using SeqCli.Cli.Features;

src/SeqCli/Cli/Commands/App/UninstallCommand.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Linq;
 using System.Threading.Tasks;
 using SeqCli.Api;

src/SeqCli/Cli/Commands/App/UpdateCommand.cs

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 using System;
-using System.Globalization;
 using System.Threading.Tasks;
 using SeqCli.Api;
 using SeqCli.Cli.Features;

src/SeqCli/Cli/Commands/AppInstance/CreateCommand.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Seq.Api.Model.AppInstances;

src/SeqCli/Cli/Commands/AppInstance/ListCommand.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 using SeqCli.Api;
 using SeqCli.Cli.Features;

src/SeqCli/Cli/Commands/AppInstance/RemoveCommand.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 using SeqCli.Api;
 using SeqCli.Cli.Features;

src/SeqCli/Cli/Commands/Bench/BenchCommand.cs

@@ -13,14 +13,12 @@
 // limitations under the License.
 
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Seq.Api;
-using Seq.Api.Model.Data;
 using Seq.Api.Model.Signals;
 using SeqCli.Api;
 using SeqCli.Cli.Features;

src/SeqCli/Cli/Commands/Config/SetCommand.cs

@@ -12,12 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-using System.IO;
 using System.Threading.Tasks;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using Serilog;
 
 // ReSharper disable once UnusedType.Global
 

src/SeqCli/Cli/Commands/Dashboard/ListCommand.cs

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using System.Linq;
 using System.Threading.Tasks;
 using SeqCli.Api;

src/SeqCli/Cli/Commands/Dashboard/RemoveCommand.cs

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using System.Linq;
 using System.Threading.Tasks;
 using SeqCli.Api;

src/SeqCli/Cli/Commands/Dashboard/RenderCommand.cs

@@ -15,7 +15,6 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
 using Seq.Api.Model.Dashboarding;
 using Seq.Api.Model.Signals;
 using SeqCli.Api;
@@ -158,20 +157,10 @@ protected override async Task<int> Run()
         var timeout = _timeout.ApplyTimeout(connection.Client.HttpClient);
 
         var output = _output.GetOutputFormat(config);
-        if (output.Json)
-        {
-            var result = await connection.Data.QueryAsync(q, signal: signal, timeout: timeout);
-
-            // Some friendlier JSON output is definitely possible here
-            Console.WriteLine(JsonConvert.SerializeObject(result));
-        }
-        else
-        {
-            var result = await connection.Data.QueryCsvAsync(q, signal: signal, timeout: timeout);
-            output.WriteCsv(result);
-        }
-
-        return 0;
+        var result = await connection.Data.TryQueryAsync(q, signal: signal, timeout: timeout);
+        output.WriteQueryResult(result);
+
+        return string.IsNullOrWhiteSpace(result.Error) ? 0 : 1;
     }
 
     static string BuildSqlQuery(ChartQueryPart query, DateTime rangeStart, DateTime rangeEnd, TimeSpan? timeGrouping)

src/SeqCli/Cli/Commands/ExpressionIndex/CreateCommand.cs

@@ -12,14 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using System.Threading.Tasks;
-using Seq.Api.Model.Signals;
 using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Signals;
-using SeqCli.Syntax;
 using SeqCli.Util;
 using Serilog;
 

src/SeqCli/Cli/Commands/ExpressionIndex/ListCommand.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Threading.Tasks;
 using SeqCli.Api;
 using SeqCli.Cli.Features;

src/SeqCli/Cli/Commands/Feed/ListCommand.cs

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using System.Linq;
 using System.Threading.Tasks;
 using SeqCli.Api;

src/SeqCli/Cli/Commands/Feed/RemoveCommand.cs

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using System.Linq;
 using System.Threading.Tasks;
 using SeqCli.Api;

src/SeqCli/Cli/Commands/Index/ListCommand.cs

@@ -12,11 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
-using Seq.Api.Model.Indexes;
 using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;

src/SeqCli/Cli/Commands/Index/SuppressCommand.cs

@@ -12,9 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using System.Threading.Tasks;
-using Seq.Api.Model.Indexes;
 using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;

src/SeqCli/Cli/Commands/License/ShowCommand.cs

@@ -1,14 +1,7 @@
-using System;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
-using Seq.Api.Model;
-using Seq.Api.Model.License;
+using System.Threading.Tasks;
 using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Util;
-using Serilog;
 
 // ReSharper disable once UnusedType.Global
 

src/SeqCli/Cli/Commands/Node/ListCommand.cs

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using System.Linq;
 using System.Threading.Tasks;
 using SeqCli.Api;

src/SeqCli/Cli/Commands/QueryCommand.cs

@@ -12,9 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using System.Threading.Tasks;
-using Seq.Api.Client;
 using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
@@ -24,7 +22,7 @@
 
 namespace SeqCli.Cli.Commands;
 
-[Command("query", "Execute an SQL query and receive results in CSV format",
+[Command("query", "Execute a query and receive results in CSV, JSON, or native format",
     Example = "seqcli query -q \"select count(*) from stream group by @Level\" --start=\"2018-02-28T13:00Z\"")]
 class QueryCommand : Command
 {
@@ -39,7 +37,7 @@ class QueryCommand : Command
 
     public QueryCommand()
     {
-        Options.Add("q=|query=", "The query to execute", v => _query = v);
+        Options.Add("q=|query=", "The Seq query to execute", v => _query = v);
         _range = Enable<DateRangeFeature>();
         _signal = Enable<SignalExpressionFeature>();
         _timeout = Enable<TimeoutFeature>();
@@ -63,18 +61,9 @@ protected override async Task<int> Run()
         var timeout = _timeout.ApplyTimeout(connection.Client.HttpClient);
 
         var output = _output.GetOutputFormat(config);
-        if (output.Text)
-        {
-            // We can fold this into the `WriteQueryResult` case once that path supports themes.
-            var result = await connection.Data.QueryCsvAsync(_query, _range.Start, _range.End, _signal.Signal, timeout: timeout, trace: _trace);
-            output.WriteCsv(result);
-        }
-        else
-        {
-            var result = await connection.Data.QueryAsync(_query, _range.Start, _range.End, _signal.Signal, timeout: timeout, trace: _trace);
-            output.WriteQueryResult(result);
-        }
+        var result = await connection.Data.TryQueryAsync(_query, _range.Start, _range.End, _signal.Signal, timeout: timeout, trace: _trace);
+        output.WriteQueryResult(result);
 
-        return 0;
+        return string.IsNullOrWhiteSpace(result.Error) ? 0 : 1;
     }
 }

src/SeqCli/Cli/Commands/RetentionPolicy/ListCommand.cs

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using System.Threading.Tasks;
 using SeqCli.Api;
 using SeqCli.Cli.Features;

src/SeqCli/Cli/Commands/RetentionPolicy/RemoveCommand.cs

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using System.Threading.Tasks;
 using SeqCli.Api;
 using SeqCli.Cli.Features;

src/SeqCli/Cli/Commands/Sample/SetupCommand.cs

@@ -15,7 +15,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Threading.Tasks;
 using SeqCli.Cli.Features;
 using SeqCli.Templates.Ast;

src/SeqCli/Cli/Commands/Settings/ClearCommand.cs

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using System.Threading.Tasks;
 using SeqCli.Api;
 using SeqCli.Cli.Features;

src/SeqCli/Cli/Commands/Signal/ListCommand.cs

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using System.Linq;
 using System.Threading.Tasks;
 using SeqCli.Api;

src/SeqCli/Cli/Commands/Signal/RemoveCommand.cs

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using System.Linq;
 using System.Threading.Tasks;
 using SeqCli.Api;

src/SeqCli/Cli/Commands/Template/ExportCommand.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using SeqCli.Api;

src/SeqCli/Cli/Commands/User/ListCommand.cs

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using System.Linq;
 using System.Threading.Tasks;
 using SeqCli.Api;

src/SeqCli/Cli/Commands/User/RemoveCommand.cs

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using System.Linq;
 using System.Threading.Tasks;
 using SeqCli.Api;

src/SeqCli/Cli/Commands/View/CreateCommand.cs

@@ -17,7 +17,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Seq.Api.Model.Shared;
-using Seq.Api.Model.Signals;
 using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;

src/SeqCli/Cli/Commands/View/ListCommand.cs

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using System.Linq;
 using System.Threading.Tasks;
 using SeqCli.Api;

src/SeqCli/Cli/Commands/View/RemoveCommand.cs

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using System.Linq;
 using System.Threading.Tasks;
 using SeqCli.Api;