Skip to content

Commit ef36e1d

Browse files
committed
Adding context to R.Fail() calls
1 parent 0548435 commit ef36e1d

5 files changed

+8
-8
lines changed

src/Rqlite.Client/RqliteClient.ExecuteAsync.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Func<HttpRequestMessage, Task<Result<List<ExecuteResponseResult>>>> send
3232
{
3333
if (!commands.Any())
3434
{
35-
return R.Fail("You must pass at least one command.");
35+
return R.Fail(nameof(RqliteClient), nameof(ExecuteAsync), "You must pass at least one command.");
3636
}
3737

3838
if (asSingleTransaction)

src/Rqlite.Client/RqliteClient.GetResultsAsync.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ internal async Task<Result<List<T>>> GetResultsAsync<T>(HttpRequestMessage reque
3434
x => x.Errors.Count switch
3535
{
3636
> 0 =>
37-
R.Fail(string.Join(Environment.NewLine, x.Errors)),
37+
R.Fail(nameof(RqliteClient), nameof(GetResultsAsync), string.Join(Environment.NewLine, x.Errors)),
3838

3939
_ =>
4040
R.Wrap(x.Results)
@@ -43,7 +43,7 @@ internal async Task<Result<List<T>>> GetResultsAsync<T>(HttpRequestMessage reque
4343
}
4444
catch (Exception ex)
4545
{
46-
return R.Fail(ex);
46+
return R.Fail(nameof(RqliteClient), nameof(GetResultsAsync), ex);
4747
}
4848
}
4949
}

src/Rqlite.Client/RqliteClient.GetScalarAsync.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ Func<HttpRequestMessage, Task<Result<List<ScalarResponseResult<TValue>>>>> send
4444
)
4545
.BindAsync(
4646
x => x.SelectMany(y => y.Values ?? new()).SelectMany(z => z).SingleOrNone().Match(
47-
none: R.Fail("Did not receive exactly one value."),
47+
none: R.Fail(nameof(RqliteClient), nameof(GetScalarAsync), "Did not receive exactly one value."),
4848
some: R.Wrap
4949
)
5050
);
5151
}
5252
catch (Exception ex)
5353
{
54-
return R.Fail(ex);
54+
return R.Fail(nameof(RqliteClient), nameof(GetScalarAsync), ex);
5555
}
5656
}
5757

src/Rqlite.Client/RqliteClient.QueryAsync.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Func<HttpRequestMessage, Task<Result<List<QueryResponseResult<TModel>>>>> send
3131
{
3232
if (!queries.Any())
3333
{
34-
return R.Fail("You must pass at least one query.");
34+
return R.Fail(nameof(RqliteClient), nameof(QueryAsync), "You must pass at least one query.");
3535
}
3636

3737
uriBuilder.AddQueryVar("associative");
@@ -55,7 +55,7 @@ Func<HttpRequestMessage, Task<Result<List<QueryResponseResult<TModel>>>>> send
5555
}
5656
catch (Exception ex)
5757
{
58-
return R.Fail(ex);
58+
return R.Fail(nameof(RqliteClient), nameof(QueryAsync), ex);
5959
}
6060
}
6161

src/Rqlite.Client/RqliteClient.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ internal async Task<Result<T>> SendAsync<T>(HttpRequestMessage request)
7070
var rqliteResponse = JsonSerializer.Deserialize<T>(json, JsonContent.SerialiserOptions);
7171
if (rqliteResponse is null)
7272
{
73-
return R.Fail($"'{json}' deserialised to a null value.");
73+
return R.Fail(nameof(RqliteClient), nameof(SendAsync), "'{JSON}' deserialised to a null value.", json);
7474
}
7575

7676
// Return response

0 commit comments

Comments
 (0)