tomi/Scripts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix query formatting on export option

Browse Source
This commit is contained in:
Tomi Eckert
2026-05-20 11:39:35 +02:00
parent 6f285d6bd0
commit 47b57b5d3c
3 changed files with 38 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hanatui/publish/hanatui
BIN
View File
Binary file not shown.
hanatui/src/Hana/HdbCliRunner.cs
+27 -29
View File
@@ -13,28 +13,19 @@ public sealed class HdbCliRunner
/// </summary>
public static List<HdbUserstoreKey> ListKeys()
{
var result = RunAndCapture(HdbClientLocator.HdbUserstore, "list");
var result = RunAndCapture(HdbClientLocator.HdbUserstore, ["list"]);
if (!result.Success)
return [];
return HdbUserstoreKey.ParseFrom(result.Output);
}
/// <summary>
/// Tests a key connection by running a trivial SELECT against DUMMY.
/// Returns true on success.
/// </summary>
public static bool TestKey(string key)
{
var result = RunAndCapture(
HdbClientLocator.HdbSql,
$"-U \"{key}\" \"SELECT 'ok' FROM DUMMY\"");
var result = RunAndCapture(HdbClientLocator.HdbSql,
["-U", key, "SELECT 'ok' FROM DUMMY"]);
return result.Success && result.Output.Contains("ok");
}
/// <summary>
/// Lists eligible schemas for the given userstore key.
/// </summary>
public static (bool Success, List<string> Schemas, string Error) ListSchemas(string key)
{
const string query =
@@ -42,7 +33,7 @@ public sealed class HdbCliRunner
"WHERE SCHEMA_OWNER = 'SYSTEM' " +
"AND SCHEMA_NAME NOT IN ('_SYS_SECURITY', 'IFSERV', 'B1if', 'SYSTEM', 'RSP');";
var result = RunAndCapture(HdbClientLocator.HdbSql, $"-U \"{key}\" \"{query}\"");
var result = RunAndCapture(HdbClientLocator.HdbSql, ["-U", key, query]);
if (!result.Success)
return (false, [], result.Output);
@@ -73,9 +64,11 @@ public sealed class HdbCliRunner
Action<string> onOutputLine,
CancellationToken ct)
{
// Use ArgumentList (not Arguments) so args are passed directly to the process
// without shell quoting — double quotes inside SQL won't break the argument boundary.
return await RunStreamingAsync(
HdbClientLocator.HdbSql,
$"-U \"{key}\" \"{sql}\"",
["-U", key, sql],
onOutputLine,
ct);
}
@@ -90,23 +83,29 @@ public sealed class HdbCliRunner
Action<string> onOutputLine,
CancellationToken ct)
{
return await RunStreamingAsync(executable, arguments, onOutputLine, ct);
// Shell commands (tar, pigz) need shell parsing for things like -I "pigz -p N",
// so we use a bash -c wrapper to ensure correct tokenisation.
return await RunStreamingAsync(
"/bin/bash",
["-c", arguments],
onOutputLine,
ct);
}
// -------------------------------------------------------------------------
private static (bool Success, string Output) RunAndCapture(string exe, string args)
private static (bool Success, string Output) RunAndCapture(string exe, string[] args)
{
try
{
var psi = new ProcessStartInfo(exe)
{
Arguments = args,
RedirectStandardOutput = true,
RedirectStandardError = true,
UseShellExecute = false,
CreateNoWindow = true,
RedirectStandardError = true,
UseShellExecute = false,
CreateNoWindow = true,
};
foreach (var a in args) psi.ArgumentList.Add(a);
using var proc = Process.Start(psi);
if (proc is null)
@@ -116,10 +115,9 @@ public sealed class HdbCliRunner
var stderr = proc.StandardError.ReadToEnd();
proc.WaitForExit();
if (proc.ExitCode == 0)
return (true, stdout);
else
return (false, string.IsNullOrWhiteSpace(stderr) ? stdout : stderr);
return proc.ExitCode == 0
? (true, stdout)
: (false, string.IsNullOrWhiteSpace(stderr) ? stdout : stderr);
}
catch (Exception ex)
{
@@ -129,18 +127,18 @@ public sealed class HdbCliRunner
private static async Task<int> RunStreamingAsync(
string exe,
string args,
string[] args,
Action<string> onOutputLine,
CancellationToken ct)
{
var psi = new ProcessStartInfo(exe)
{
Arguments = args,
RedirectStandardOutput = true,
RedirectStandardError = true,
UseShellExecute = false,
CreateNoWindow = true,
RedirectStandardError = true,
UseShellExecute = false,
CreateNoWindow = true,
};
foreach (var a in args) psi.ArgumentList.Add(a);
Process? proc;
try
hanatui/src/Hana/SchemaService.cs
+11 -11
View File
@@ -357,7 +357,7 @@ public sealed class SchemaService(string userKey)
private async Task<string> GetTenantNameAsync()
{
var sql = SqlQueryBuilder.GetTenantName();
var (success, output) = RunCapture(HdbClientLocator.HdbSql, $"-U \"{_key}\" \"{sql}\"");
var (success, output) = RunCapture(HdbClientLocator.HdbSql, ["-U", _key, sql]);
if (!success) return "";
foreach (var line in output.Split('\n'))
@@ -373,19 +373,19 @@ public sealed class SchemaService(string userKey)
return "";
}
private static (bool, string) RunCapture(string exe, string args)
private static (bool, string) RunCapture(string exe, string[] args)
{
try
{
var psi = new SysDiag.ProcessStartInfo(exe)
{
Arguments = args,
RedirectStandardOutput = true,
RedirectStandardError = true,
UseShellExecute = false,
CreateNoWindow = true,
};
using var proc = SysDiag.Process.Start(psi);
var psi = new SysDiag.ProcessStartInfo(exe)
{
RedirectStandardOutput = true,
RedirectStandardError = true,
UseShellExecute = false,
CreateNoWindow = true,
};
foreach (var a in args) psi.ArgumentList.Add(a);
using var proc = SysDiag.Process.Start(psi);
if (proc is null) return (false, "");
var stdout = proc.StandardOutput.ReadToEnd();
var stderr = proc.StandardError.ReadToEnd();