Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit 34fa22a

Browse files
mythzmythz
committed
C# 8-ify
1 parent e818b16 commit 34fa22a

File tree

9 files changed

+305
-366
lines changed

9 files changed

+305
-366
lines changed

‎tests/ServiceStack.OrmLite.Tests/Async/Legacy/ApiSqliteLegacyTestsAsync.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public ApiSqliteLegacyTestsAsync(DialectContext context) : base(context) {}
1414
[Test]
1515
public async Task API_Sqlite_Legacy_Examples_Async()
1616
{
17-
var db = OpenDbConnection();
17+
var db = await OpenDbConnectionAsync();
1818
db.DropAndCreateTable<Person>();
1919
db.DropAndCreateTable<PersonWithAutoId>();
2020

‎tests/ServiceStack.OrmLite.Tests/ConflictResolutionTests.cs‎

Lines changed: 37 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -12,83 +12,72 @@ public ConflictResolutionTests(DialectContext context) : base(context) {}
1212
[Test]
1313
public void Can_change_conflict_resolution_with_Insert()
1414
{
15-
using (var db = OpenDbConnection())
16-
{
17-
db.DropAndCreateTable<ModelWithIdAndName>();
15+
using var db = OpenDbConnection();
16+
db.DropAndCreateTable<ModelWithIdAndName>();
1817

19-
var row = new ModelWithIdAndName(1);
20-
db.Insert(row, dbCmd => dbCmd.OnConflictIgnore());
18+
var row = new ModelWithIdAndName(1);
19+
db.Insert(row, dbCmd => dbCmd.OnConflictIgnore());
2120

22-
//Equivalent to:
23-
db.Insert(row, dbCmd => dbCmd.OnConflict(ConflictResolution.Ignore));
24-
}
21+
//Equivalent to:
22+
db.Insert(row, dbCmd => dbCmd.OnConflict(ConflictResolution.Ignore));
2523
}
2624

2725
[Test]
2826
public async Task Can_change_conflict_resolution_with_Insert_Async()
2927
{
30-
using (var db = OpenDbConnection())
31-
{
32-
db.DropAndCreateTable<ModelWithIdAndName>();
28+
using var db = await OpenDbConnectionAsync();
29+
db.DropAndCreateTable<ModelWithIdAndName>();
3330

34-
var row = new ModelWithIdAndName(1);
35-
await db.InsertAsync(row, dbCmd => dbCmd.OnConflictIgnore());
31+
var row = new ModelWithIdAndName(1);
32+
await db.InsertAsync(row, dbCmd => dbCmd.OnConflictIgnore());
3633

37-
//Equivalent to:
38-
await db.InsertAsync(row, dbCmd => dbCmd.OnConflict(ConflictResolution.Ignore));
39-
}
34+
//Equivalent to:
35+
await db.InsertAsync(row, dbCmd => dbCmd.OnConflict(ConflictResolution.Ignore));
4036
}
4137

4238
[Test]
43-
public void Can_change_conflict_resolutiion_with_Insert_AutoIncrement()
39+
public void Can_change_conflict_resolution_with_Insert_AutoIncrement()
4440
{
45-
using (var db = OpenDbConnection())
46-
{
47-
db.DropAndCreateTable<ModelWithIdAndName>();
48-
49-
var row = new ModelWithIdAndName(1);
50-
var insertId = db.Insert(row, dbCmd => dbCmd.OnConflictIgnore(), selectIdentity: true);
51-
Assert.That(insertId, Is.GreaterThan(0));
52-
}
41+
using var db = OpenDbConnection();
42+
db.DropAndCreateTable<ModelWithIdAndName>();
43+
44+
var row = new ModelWithIdAndName(1);
45+
var insertId = db.Insert(row, dbCmd => dbCmd.OnConflictIgnore(), selectIdentity: true);
46+
Assert.That(insertId, Is.GreaterThan(0));
5347
}
5448

5549
[Test]
56-
public async Task Can_change_conflict_resolutiion_with_Insert_AutoIncrement_Async()
50+
public async Task Can_change_conflict_resolution_with_Insert_AutoIncrement_Async()
5751
{
58-
using (var db = OpenDbConnection())
59-
{
60-
db.DropAndCreateTable<ModelWithIdAndName>();
61-
62-
var row = new ModelWithIdAndName(1);
63-
var insertId = await db.InsertAsync(row, dbCmd => dbCmd.OnConflictIgnore(), selectIdentity: true);
64-
Assert.That(insertId, Is.GreaterThan(0));
65-
}
52+
using var db = await OpenDbConnectionAsync();
53+
db.DropAndCreateTable<ModelWithIdAndName>();
54+
55+
var row = new ModelWithIdAndName(1);
56+
var insertId = await db.InsertAsync(row, dbCmd => dbCmd.OnConflictIgnore(), selectIdentity: true);
57+
Assert.That(insertId, Is.GreaterThan(0));
6658
}
6759

6860
[Test]
69-
public void Can_change_conflict_resolutiion_with_InsertAll()
61+
public void Can_change_conflict_resolution_with_InsertAll()
7062
{
71-
using (var db = OpenDbConnection())
72-
{
73-
var rows = 5.Times(i => new ModelWithIdAndName(i));
63+
using var db = OpenDbConnection();
64+
var rows = 5.Times(i => new ModelWithIdAndName(i));
7465

75-
db.DropAndCreateTable<ModelWithIdAndName>();
66+
db.DropAndCreateTable<ModelWithIdAndName>();
7667

77-
db.InsertAll(rows, dbCmd => dbCmd.OnConflictIgnore());
78-
}
68+
db.InsertAll(rows, dbCmd => dbCmd.OnConflictIgnore());
7969
}
8070

8171
[Test]
82-
public async Task Can_change_conflict_resolutiion_with_InsertAll_Async()
72+
public async Task Can_change_conflict_resolution_with_InsertAll_Async()
8373
{
84-
using (var db = OpenDbConnection())
85-
{
86-
var rows = 5.Times(i => new ModelWithIdAndName(i));
74+
OrmLiteUtils.PrintSql();
75+
using var db = await OpenDbConnectionAsync();
76+
var rows = 5.Times(i => new ModelWithIdAndName(i));
8777

88-
db.DropAndCreateTable<ModelWithIdAndName>();
78+
db.DropAndCreateTable<ModelWithIdAndName>();
8979

90-
await db.InsertAllAsync(rows, dbCmd => dbCmd.OnConflictIgnore());
91-
}
80+
await db.InsertAllAsync(rows, dbCmd => dbCmd.OnConflictIgnore());
9281
}
9382
}
9483
}

‎tests/ServiceStack.OrmLite.Tests/CustomSqlTests.cs‎

Lines changed: 83 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -79,57 +79,51 @@ public CustomSqlTests(DialectContext context) : base(context) {}
7979
public void Can_create_field_with_custom_sql()
8080
{
8181
OrmLiteConfig.BeforeExecFilter = cmd => cmd.GetDebugString().Print();
82-
83-
using (var db = OpenDbConnection())
84-
{
85-
db.DropAndCreateTable<PocoTable>();
8682

87-
var createTableSql = db.GetLastSql().NormalizeSql();
83+
using var db = OpenDbConnection();
84+
db.DropAndCreateTable<PocoTable>();
8885

89-
createTableSql.Print();
86+
var createTableSql = db.GetLastSql().NormalizeSql();
9087

91-
if (Dialect != Dialect.Firebird)
92-
{
93-
Assert.That(createTableSql, Does.Contain("charcolumn char(20) null"));
94-
Assert.That(createTableSql, Does.Contain("decimalcolumn decimal(18,4) null"));
95-
}
96-
else
97-
{
98-
Assert.That(createTableSql, Does.Contain("charcolumn char(20)"));
99-
Assert.That(createTableSql, Does.Contain("decimalcolumn decimal(18,4)"));
100-
}
88+
createTableSql.Print();
89+
90+
if (Dialect != Dialect.Firebird)
91+
{
92+
Assert.That(createTableSql, Does.Contain("charcolumn char(20) null"));
93+
Assert.That(createTableSql, Does.Contain("decimalcolumn decimal(18,4) null"));
94+
}
95+
else
96+
{
97+
Assert.That(createTableSql, Does.Contain("charcolumn char(20)"));
98+
Assert.That(createTableSql, Does.Contain("decimalcolumn decimal(18,4)"));
10199
}
102100
}
103101

104102
[Test]
105103
public void Does_execute_CustomSql_before_table_created()
106104
{
107-
using (var db = OpenDbConnection())
105+
using var db = OpenDbConnection();
106+
try
108107
{
109-
try
110-
{
111-
db.CreateTable<ModelWithPreCreateSql>();
112-
Assert.Fail("Should throw");
113-
}
114-
catch (Exception)
115-
{
116-
Assert.That(!db.TableExists("ModelWithPreCreateSql".SqlColumn(DialectProvider)));
117-
}
108+
db.CreateTable<ModelWithPreCreateSql>();
109+
Assert.Fail("Should throw");
110+
}
111+
catch (Exception)
112+
{
113+
Assert.That(!db.TableExists("ModelWithPreCreateSql".SqlColumn(DialectProvider)));
118114
}
119115
}
120116

121117
[Test]
122118
[IgnoreDialect(Dialect.AnyOracle | Dialect.AnyPostgreSql, "multiple SQL statements need to be wrapped in an anonymous block")]
123119
public void Does_execute_CustomSql_after_table_created()
124120
{
125-
using (var db = OpenDbConnection())
126-
{
127-
db.DropAndCreateTable<ModelWithSeedDataSql>();
121+
using var db = OpenDbConnection();
122+
db.DropAndCreateTable<ModelWithSeedDataSql>();
128123

129-
var seedDataNames = db.Select<ModelWithSeedDataSql>().ConvertAll(x => x.Name);
124+
var seedDataNames = db.Select<ModelWithSeedDataSql>().ConvertAll(x => x.Name);
130125

131-
Assert.That(seedDataNames, Is.EquivalentTo(new[] {"Foo", "Bar"}));
132-
}
126+
Assert.That(seedDataNames, Is.EquivalentTo(new[] {"Foo", "Bar"}));
133127
}
134128

135129
[Test]
@@ -141,49 +135,43 @@ public void Does_execute_CustomSql_after_table_created_using_dynamic_attribute()
141135
"INSERT INTO {0} (Name) VALUES ('Foo');".Fmt("DynamicAttributeSeedData".SqlTable(DialectProvider)) +
142136
"INSERT INTO {0} (Name) VALUES ('Bar');".Fmt("DynamicAttributeSeedData".SqlTable(DialectProvider))));
143137

144-
using (var db = OpenDbConnection())
145-
{
146-
db.DropAndCreateTable<DynamicAttributeSeedData>();
138+
using var db = OpenDbConnection();
139+
db.DropAndCreateTable<DynamicAttributeSeedData>();
147140

148-
var seedDataNames = db.Select<DynamicAttributeSeedData>().ConvertAll(x => x.Name);
141+
var seedDataNames = db.Select<DynamicAttributeSeedData>().ConvertAll(x => x.Name);
149142

150-
Assert.That(seedDataNames, Is.EquivalentTo(new[] {"Foo", "Bar"}));
151-
}
143+
Assert.That(seedDataNames, Is.EquivalentTo(new[] {"Foo", "Bar"}));
152144
}
153145

154146
[Test]
155147
public void Does_execute_CustomSql_before_table_dropped()
156148
{
157-
using (var db = OpenDbConnection())
149+
using var db = OpenDbConnection();
150+
db.CreateTable<ModelWithPreDropSql>();
151+
try
158152
{
159-
db.CreateTable<ModelWithPreDropSql>();
160-
try
161-
{
162-
db.DropTable<ModelWithPreDropSql>();
163-
Assert.Fail("Should throw");
164-
}
165-
catch (Exception)
166-
{
167-
Assert.That(db.TableExists("ModelWithPreDropSql".SqlTableRaw(DialectProvider)));
168-
}
153+
db.DropTable<ModelWithPreDropSql>();
154+
Assert.Fail("Should throw");
155+
}
156+
catch (Exception)
157+
{
158+
Assert.That(db.TableExists("ModelWithPreDropSql".SqlTableRaw(DialectProvider)));
169159
}
170160
}
171161

172162
[Test]
173163
public void Does_execute_CustomSql_after_table_dropped()
174164
{
175-
using (var db = OpenDbConnection())
165+
using var db = OpenDbConnection();
166+
db.CreateTable<ModelWithPostDropSql>();
167+
try
176168
{
177-
db.CreateTable<ModelWithPostDropSql>();
178-
try
179-
{
180-
db.DropTable<ModelWithPostDropSql>();
181-
Assert.Fail("Should throw");
182-
}
183-
catch (Exception)
184-
{
185-
Assert.That(!db.TableExists("ModelWithPostDropSql"));
186-
}
169+
db.DropTable<ModelWithPostDropSql>();
170+
Assert.Fail("Should throw");
171+
}
172+
catch (Exception)
173+
{
174+
Assert.That(!db.TableExists("ModelWithPostDropSql"));
187175
}
188176
}
189177

@@ -200,69 +188,62 @@ public class CustomSelectTest
200188
[Test]
201189
public void Can_select_custom_field_expressions()
202190
{
203-
using (var db = OpenDbConnection())
204-
{
205-
db.DropAndCreateTable<CustomSelectTest>();
191+
using var db = OpenDbConnection();
192+
db.DropAndCreateTable<CustomSelectTest>();
206193

207-
db.Insert(new CustomSelectTest {Id = 1, Width = 10, Height = 5});
194+
db.Insert(new CustomSelectTest {Id = 1, Width = 10, Height = 5});
208195

209-
var row = db.SingleById<CustomSelectTest>(1);
196+
var row = db.SingleById<CustomSelectTest>(1);
210197

211-
Assert.That(row.Area, Is.EqualTo(10 * 5));
212-
}
198+
Assert.That(row.Area, Is.EqualTo(10 * 5));
213199
}
214200

215201
[Test]
216202
public void Can_Count_Distinct()
217203
{
218-
using (var db = OpenDbConnection())
219-
{
220-
db.DropAndCreateTable<LetterFrequency>();
204+
using var db = OpenDbConnection();
205+
db.DropAndCreateTable<LetterFrequency>();
221206

222-
var rows = "A,B,B,C,C,C,D,D,E".Split(',').Map(x => new LetterFrequency {Letter = x});
207+
var rows = "A,B,B,C,C,C,D,D,E".Split(',').Map(x => new LetterFrequency {Letter = x});
223208

224-
db.InsertAll(rows);
209+
db.InsertAll(rows);
225210

226-
var count = db.Count(db.From<LetterFrequency>().Select(x => x.Letter));
227-
Assert.That(count, Is.EqualTo(rows.Count));
211+
var count = db.Count(db.From<LetterFrequency>().Select(x => x.Letter));
212+
Assert.That(count, Is.EqualTo(rows.Count));
228213

229-
count = db.Scalar<long>(db.From<LetterFrequency>().Select(x => Sql.Count(x.Letter)));
230-
Assert.That(count, Is.EqualTo(rows.Count));
214+
count = db.Scalar<long>(db.From<LetterFrequency>().Select(x => Sql.Count(x.Letter)));
215+
Assert.That(count, Is.EqualTo(rows.Count));
231216

232-
var distinctCount = db.Scalar<long>(db.From<LetterFrequency>().Select(x => Sql.CountDistinct(x.Letter)));
233-
Assert.That(distinctCount, Is.EqualTo(rows.Map(x => x.Letter).Distinct().Count()));
217+
var distinctCount = db.Scalar<long>(db.From<LetterFrequency>().Select(x => Sql.CountDistinct(x.Letter)));
218+
Assert.That(distinctCount, Is.EqualTo(rows.Map(x => x.Letter).Distinct().Count()));
234219

235-
distinctCount = db.Scalar<long>(db.From<LetterFrequency>().Select("COUNT(DISTINCT Letter)"));
236-
Assert.That(distinctCount, Is.EqualTo(rows.Map(x => x.Letter).Distinct().Count()));
237-
}
220+
distinctCount = db.Scalar<long>(db.From<LetterFrequency>().Select("COUNT(DISTINCT Letter)"));
221+
Assert.That(distinctCount, Is.EqualTo(rows.Map(x => x.Letter).Distinct().Count()));
238222
}
239223

240224
[Test]
241225
public void Does_select_aliases_on_constant_expressions()
242226
{
243-
using (var db = OpenDbConnection())
244-
{
245-
db.DropAndCreateTable<LetterFrequency>();
246-
db.Insert(new LetterFrequency { Letter = "A" });
247-
248-
var q = db.From<LetterFrequency>()
249-
.Select(x => new
250-
{
251-
param = 1,
252-
descr = x.Letter,
253-
str = "hi",
254-
date = DateTime.UtcNow
255-
});
256-
257-
var results = db.Select<Dictionary<string,object>>(q)[0];
227+
using var db = OpenDbConnection();
228+
db.DropAndCreateTable<LetterFrequency>();
229+
db.Insert(new LetterFrequency { Letter = "A" });
230+
231+
var q = db.From<LetterFrequency>()
232+
.Select(x => new
233+
{
234+
param = 1,
235+
descr = x.Letter,
236+
str = "hi",
237+
date = DateTime.UtcNow
238+
});
239+
240+
var results = db.Select<Dictionary<string,object>>(q)[0];
258241

259-
Assert.That(results["param"], Is.EqualTo(1));
260-
Assert.That(results["descr"], Is.EqualTo("A"));
261-
Assert.That(results["str"], Is.EqualTo("hi"));
262-
Assert.That(results["date"], Is.Not.Empty);
263-
}
242+
Assert.That(results["param"], Is.EqualTo(1));
243+
Assert.That(results["descr"], Is.EqualTo("A"));
244+
Assert.That(results["str"], Is.EqualTo("hi"));
245+
Assert.That(results["date"], Is.Not.Empty);
264246
}
265247

266-
267248
}
268249
}

0 commit comments

Comments
 (0)