Skip to content

Commit 798eb2e

Browse files
SingleResultBeforeMapTests: switch expressions for the terminal helpers
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
1 parent 0de6c15 commit 798eb2e

1 file changed

Lines changed: 70 additions & 70 deletions

File tree

‎Tests/Open.Database.Extensions.Core.Tests/SingleResultBeforeMapTests.cs‎

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -101,102 +101,102 @@ await read(async (items, token) =>
101101

102102
static object? RunSync(MappedQuery<int> q, string terminal)
103103
{
104-
switch (terminal)
104+
return terminal switch
105105
{
106-
case "ToList": return q.ToList();
107-
case "ToArray": return q.ToArray();
108-
case "ToImmutableArray": return q.ToImmutableArray();
109-
case "FirstOrDefault": return q.FirstOrDefault();
110-
case "SingleOrDefault": return q.SingleOrDefault();
111-
case "ToDictionary": return q.ToDictionary(i => i);
112-
case "ToHashSet": return q.ToHashSet();
113-
case "Read": return Sum(q.Read);
114-
case "ReadResult": return q.Read(items => items.Sum());
115-
case "Skip": return q.Skip(1).ToList();
116-
case "Take": return q.Take(2).ToList();
117-
case "SkipTake": return q.Skip(1).Take(1).ToList();
118-
case "TakeFirst": return q.Take(2).FirstOrDefault();
119-
default: throw new ArgumentOutOfRangeException(nameof(terminal));
120-
}
106+
"ToList" => q.ToList(),
107+
"ToArray" => q.ToArray(),
108+
"ToImmutableArray" => q.ToImmutableArray(),
109+
"FirstOrDefault" => q.FirstOrDefault(),
110+
"SingleOrDefault" => q.SingleOrDefault(),
111+
"ToDictionary" => q.ToDictionary(i => i),
112+
"ToHashSet" => q.ToHashSet(),
113+
"Read" => Sum(q.Read),
114+
"ReadResult" => q.Read(items => items.Sum()),
115+
"Skip" => q.Skip(1).ToList(),
116+
"Take" => q.Take(2).ToList(),
117+
"SkipTake" => q.Skip(1).Take(1).ToList(),
118+
"TakeFirst" => q.Take(2).FirstOrDefault(),
119+
_ => throw new ArgumentOutOfRangeException(nameof(terminal)),
120+
};
121121
}
122122

123123
static object? RunSync(MappedCommand<int> q, string terminal)
124124
{
125-
switch (terminal)
125+
return terminal switch
126126
{
127-
case "ToList": return q.ToList();
128-
case "ToArray": return q.ToArray();
129-
case "ToImmutableArray": return q.ToImmutableArray();
130-
case "FirstOrDefault": return q.FirstOrDefault();
131-
case "SingleOrDefault": return q.SingleOrDefault();
132-
case "ToDictionary": return q.ToDictionary(i => i);
133-
case "ToHashSet": return q.ToHashSet();
134-
case "Read": return Sum(q.Read);
135-
case "ReadResult": return q.Read(items => items.Sum());
136-
case "Skip": return q.Skip(1).ToList();
137-
case "Take": return q.Take(2).ToList();
138-
case "SkipTake": return q.Skip(1).Take(1).ToList();
139-
case "TakeFirst": return q.Take(2).FirstOrDefault();
140-
default: throw new ArgumentOutOfRangeException(nameof(terminal));
141-
}
127+
"ToList" => q.ToList(),
128+
"ToArray" => q.ToArray(),
129+
"ToImmutableArray" => q.ToImmutableArray(),
130+
"FirstOrDefault" => q.FirstOrDefault(),
131+
"SingleOrDefault" => q.SingleOrDefault(),
132+
"ToDictionary" => q.ToDictionary(i => i),
133+
"ToHashSet" => q.ToHashSet(),
134+
"Read" => Sum(q.Read),
135+
"ReadResult" => q.Read(items => items.Sum()),
136+
"Skip" => q.Skip(1).ToList(),
137+
"Take" => q.Take(2).ToList(),
138+
"SkipTake" => q.Skip(1).Take(1).ToList(),
139+
"TakeFirst" => q.Take(2).FirstOrDefault(),
140+
_ => throw new ArgumentOutOfRangeException(nameof(terminal)),
141+
};
142142
}
143143

144144
static async Task<object?> RunAsync(MappedQuery<int> q, string terminal)
145145
{
146-
switch (terminal)
146+
return terminal switch
147147
{
148-
case "ToList": return await q.ToListAsync(Ct);
149-
case "ToArray": return await q.ToArrayAsync(Ct);
150-
case "ToImmutableArray": return await q.ToImmutableArrayAsync(Ct);
151-
case "FirstOrDefault": return await q.FirstOrDefaultAsync(Ct);
152-
case "SingleOrDefault": return await q.SingleOrDefaultAsync(Ct);
153-
case "ToDictionary": return await q.ToDictionaryAsync(i => i, null, Ct);
154-
case "ToHashSet": return await q.ToHashSetAsync(null, Ct);
155-
case "Read": return await SumAsync(handler => q.ReadAsync(handler, Ct));
156-
case "ReadResult":
157-
return await q.ReadAsync(
148+
"ToList" => await q.ToListAsync(Ct),
149+
"ToArray" => await q.ToArrayAsync(Ct),
150+
"ToImmutableArray" => await q.ToImmutableArrayAsync(Ct),
151+
"FirstOrDefault" => await q.FirstOrDefaultAsync(Ct),
152+
"SingleOrDefault" => await q.SingleOrDefaultAsync(Ct),
153+
"ToDictionary" => await q.ToDictionaryAsync(i => i, null, Ct),
154+
"ToHashSet" => await q.ToHashSetAsync(null, Ct),
155+
"Read" => await SumAsync(handler => q.ReadAsync(handler, Ct)),
156+
"ReadResult" =>
157+
await q.ReadAsync(
158158
async (items, token) =>
159159
{
160160
int sum = 0;
161161
await foreach (int i in items.WithCancellation(token)) sum += i;
162-
return sum;
162+
sum;
163163
},
164-
Ct);
165-
case "Skip": return await q.Skip(1).ToListAsync(Ct);
166-
case "Take": return await q.Take(2).ToListAsync(Ct);
167-
case "SkipTake": return await q.Skip(1).Take(1).ToListAsync(Ct);
168-
case "TakeFirst": return await q.Take(2).FirstOrDefaultAsync(Ct);
169-
default: throw new ArgumentOutOfRangeException(nameof(terminal));
170-
}
164+
Ct),
165+
"Skip" => await q.Skip(1).ToListAsync(Ct),
166+
"Take" => await q.Take(2).ToListAsync(Ct),
167+
"SkipTake" => await q.Skip(1).Take(1).ToListAsync(Ct),
168+
"TakeFirst" => await q.Take(2).FirstOrDefaultAsync(Ct),
169+
_ => throw new ArgumentOutOfRangeException(nameof(terminal)),
170+
};
171171
}
172172

173173
static async Task<object?> RunAsync(MappedCommand<int> q, string terminal)
174174
{
175-
switch (terminal)
175+
return terminal switch
176176
{
177-
case "ToList": return await q.ToListAsync(Ct);
178-
case "ToArray": return await q.ToArrayAsync(Ct);
179-
case "ToImmutableArray": return await q.ToImmutableArrayAsync(Ct);
180-
case "FirstOrDefault": return await q.FirstOrDefaultAsync(Ct);
181-
case "SingleOrDefault": return await q.SingleOrDefaultAsync(Ct);
182-
case "ToDictionary": return await q.ToDictionaryAsync(i => i, null, Ct);
183-
case "ToHashSet": return await q.ToHashSetAsync(null, Ct);
184-
case "Read": return await SumAsync(handler => q.ReadAsync(handler, Ct));
185-
case "ReadResult":
186-
return await q.ReadAsync(
177+
"ToList" => await q.ToListAsync(Ct),
178+
"ToArray" => await q.ToArrayAsync(Ct),
179+
"ToImmutableArray" => await q.ToImmutableArrayAsync(Ct),
180+
"FirstOrDefault" => await q.FirstOrDefaultAsync(Ct),
181+
"SingleOrDefault" => await q.SingleOrDefaultAsync(Ct),
182+
"ToDictionary" => await q.ToDictionaryAsync(i => i, null, Ct),
183+
"ToHashSet" => await q.ToHashSetAsync(null, Ct),
184+
"Read" => await SumAsync(handler => q.ReadAsync(handler, Ct)),
185+
"ReadResult" =>
186+
await q.ReadAsync(
187187
async (items, token) =>
188188
{
189189
int sum = 0;
190190
await foreach (int i in items.WithCancellation(token)) sum += i;
191-
return sum;
191+
sum;
192192
},
193-
Ct);
194-
case "Skip": return await q.Skip(1).ToListAsync(Ct);
195-
case "Take": return await q.Take(2).ToListAsync(Ct);
196-
case "SkipTake": return await q.Skip(1).Take(1).ToListAsync(Ct);
197-
case "TakeFirst": return await q.Take(2).FirstOrDefaultAsync(Ct);
198-
default: throw new ArgumentOutOfRangeException(nameof(terminal));
199-
}
193+
Ct),
194+
"Skip" => await q.Skip(1).ToListAsync(Ct),
195+
"Take" => await q.Take(2).ToListAsync(Ct),
196+
"SkipTake" => await q.Skip(1).Take(1).ToListAsync(Ct),
197+
"TakeFirst" => await q.Take(2).FirstOrDefaultAsync(Ct),
198+
_ => throw new ArgumentOutOfRangeException(nameof(terminal)),
199+
};
200200
}
201201

202202
// ---- an expressive command (IExecuteReader) ----

0 commit comments

Comments
 (0)