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

Commit 399c5bd

Browse files
mythzmythz
committed
Replace typeof/nameof use interpolation & using var db
1 parent 2174db2 commit 399c5bd

File tree

10 files changed

+107
-130
lines changed

10 files changed

+107
-130
lines changed

‎src/ServiceStack.OrmLite.Oracle/OracleOrmLiteDialectProvider.cs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,7 @@ public override object ToDbValue(object value, Type type)
199199
}
200200
catch (Exception ex)
201201
{
202-
Log.Error("Error in {0}.ToDbValue() value '{1}' and Type '{2}'"
203-
.Fmt(converter.GetType().Name, value != null ? value.GetType().Name : "undefined", type.Name), ex);
202+
Log.Error($"Error in {converter?.GetType().Name}.ToDbValue() value '{value.GetType().Name}' and Type '{type.Name}'", ex);
204203
throw;
205204
}
206205

@@ -218,8 +217,8 @@ public override object ToDbValue(object value, Type type)
218217

219218
internal string GetQuotedDateTimeOffsetValue(DateTimeOffset dateValue)
220219
{
221-
var iso8601Format = string.Format("{0} {1}", GetIsoDateTimeFormat(dateValue.TimeOfDay), IsoTimeZoneFormat);
222-
var oracleFormat = string.Format("{0} {1}", GetOracleDateTimeFormat(dateValue.TimeOfDay), OracleTimeZoneFormat);
220+
var iso8601Format = $"{GetIsoDateTimeFormat(dateValue.TimeOfDay)} {IsoTimeZoneFormat}";
221+
var oracleFormat = $"{GetOracleDateTimeFormat(dateValue.TimeOfDay)} {OracleTimeZoneFormat}";
223222
return string.Format("TO_TIMESTAMP_TZ({0}, {1})", base.GetQuotedValue(dateValue.ToString(iso8601Format), typeof(string)), base.GetQuotedValue(oracleFormat, typeof(string)));
224223
}
225224

@@ -246,8 +245,8 @@ private string GetTimeFormat(TimeSpan timeOfDay, string dateFormat, string timeF
246245
if (isStartOfDay) return dateFormat;
247246
var hasFractionalSeconds = (timeOfDay.Milliseconds != 0) || ((timeOfDay.Ticks % TimeSpan.TicksPerMillisecond) != 0);
248247
return hasFractionalSeconds
249-
? string.Format("{0} {1}.{2}", dateFormat, timeFormat, millisecondFormat)
250-
: string.Format("{0} {1}", dateFormat, timeFormat);
248+
? $"{dateFormat} {timeFormat}.{millisecondFormat}"
249+
: $"{dateFormat} {timeFormat}";
251250
}
252251

253252
public override bool IsFullSelectStatement(string sqlFilter)

‎src/ServiceStack.OrmLite.SqlServer/SqlServerExpression.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ internal static void PrepareSqlServerUpdateStatement<T>(IDbCommand dbCmd, SqlExp
9696

9797
var strFields = StringBuilderCache.ReturnAndFree(setFields);
9898
if (strFields.Length == 0)
99-
throw new ArgumentException("No non-null or non-default values were provided for type: " + typeof(T).Name);
99+
throw new ArgumentException($"No non-null or non-default values were provided for type: {typeof(T).Name}");
100100

101101
dbCmd.CommandText = $"UPDATE {dialectProvider.GetQuotedTableName(modelDef)} SET {strFields} {q.WhereExpression}";
102102
}

‎src/ServiceStack.OrmLite/Expressions/SqlExpression.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1404,7 +1404,7 @@ public virtual void PrepareUpdateStatement(IDbCommand dbCmd, T item, bool exclud
14041404
}
14051405

14061406
if (setFields.Length == 0)
1407-
throw new ArgumentException("No non-null or non-default values were provided for type: " + typeof(T).Name);
1407+
throw new ArgumentException($"No non-null or non-default values were provided for type: {typeof(T).Name}");
14081408

14091409
var sql = $"UPDATE {DialectProvider.GetQuotedTableName(modelDef)} " +
14101410
$"SET {StringBuilderCache.ReturnAndFree(setFields)} {WhereExpression}";
@@ -1446,7 +1446,7 @@ public virtual void PrepareUpdateStatement(IDbCommand dbCmd, Dictionary<string,
14461446
}
14471447

14481448
if (setFields.Length == 0)
1449-
throw new ArgumentException("No non-null or non-default values were provided for type: " + typeof(T).Name);
1449+
throw new ArgumentException($"No non-null or non-default values were provided for type: {typeof(T).Name}");
14501450

14511451
var sql = $"UPDATE {DialectProvider.GetQuotedTableName(modelDef)} " +
14521452
$"SET {StringBuilderCache.ReturnAndFree(setFields)} {WhereExpression}";

‎src/ServiceStack.OrmLite/OrmLiteConfigExtensions.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ internal static ModelDefinition GetModelDefinition(this Type modelType)
102102
var isNullableType = propertyInfo.PropertyType.IsNullableType();
103103

104104
var isNullable = (!propertyInfo.PropertyType.IsValueType
105-
&& !propertyInfo.HasAttributeNamed(typeof(RequiredAttribute).Name))
105+
&& !propertyInfo.HasAttributeNamed(nameof(RequiredAttribute)))
106106
|| isNullableType;
107107

108108
var propertyType = isNullableType
@@ -129,7 +129,7 @@ internal static ModelDefinition GetModelDefinition(this Type modelType)
129129
var isAutoId = propertyInfo.HasAttributeCached<AutoIdAttribute>();
130130

131131
var isPrimaryKey = (!hasPkAttr && (propertyInfo.Name == OrmLiteConfig.IdField || (!hasIdField && isFirst)))
132-
|| propertyInfo.HasAttributeNamed(typeof(PrimaryKeyAttribute).Name)
132+
|| propertyInfo.HasAttributeNamed(nameof(PrimaryKeyAttribute))
133133
|| isAutoId;
134134

135135
var isAutoIncrement = isPrimaryKey && propertyInfo.HasAttributeCached<AutoIncrementAttribute>();

‎tests/ServiceStack.OrmLite.FirebirdTests/FB4CreateTableTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ public void Does_table_Exists()
2020
db.DropTable<ModelWithAutoIncrement>();
2121

2222
Assert.That(
23-
OrmLiteConfig.DialectProvider.DoesTableExist(db, typeof(ModelWithAutoIncrement).Name),
23+
OrmLiteConfig.DialectProvider.DoesTableExist(db, nameof(ModelWithAutoIncrement)),
2424
Is.False);
2525

2626
db.CreateTable<ModelWithAutoIncrement>(true);
2727

2828
Assert.That(
29-
OrmLiteConfig.DialectProvider.DoesTableExist(db, typeof(ModelWithAutoIncrement).Name),
29+
OrmLiteConfig.DialectProvider.DoesTableExist(db, nameof(ModelWithAutoIncrement)),
3030
Is.True);
3131
}
3232
}
@@ -38,12 +38,12 @@ public void Can_create_ModelWithAutoIncrement_table()
3838
{
3939
db.CreateTable<ModelWithAutoIncrement>(true);
4040
Assert.That(
41-
OrmLiteConfig.DialectProvider.DoesTableExist(db, typeof(ModelWithAutoIncrement).Name),
41+
OrmLiteConfig.DialectProvider.DoesTableExist(db, nameof(ModelWithAutoIncrement)),
4242
Is.True);
4343

4444
db.DropTable<ModelWithAutoIncrement>();
4545
Assert.That(
46-
OrmLiteConfig.DialectProvider.DoesTableExist(db, typeof(ModelWithAutoIncrement).Name),
46+
OrmLiteConfig.DialectProvider.DoesTableExist(db, nameof(ModelWithAutoIncrement)),
4747
Is.False);
4848
}
4949
}
@@ -55,12 +55,12 @@ public void Can_create_ModelWithAutoId_table()
5555
{
5656
db.CreateTable<ModelWithAutoId>(true);
5757
Assert.That(
58-
OrmLiteConfig.DialectProvider.DoesTableExist(db, typeof(ModelWithAutoId).Name),
58+
OrmLiteConfig.DialectProvider.DoesTableExist(db, nameof(ModelWithAutoId)),
5959
Is.True);
6060

6161
db.DropTable<ModelWithAutoId>();
6262
Assert.That(
63-
OrmLiteConfig.DialectProvider.DoesTableExist(db, typeof(ModelWithAutoId).Name),
63+
OrmLiteConfig.DialectProvider.DoesTableExist(db, nameof(ModelWithAutoId)),
6464
Is.False);
6565
}
6666
}

‎tests/ServiceStack.OrmLite.FirebirdTests/OrmLiteCreateTableTests.cs‎

Lines changed: 49 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -11,132 +11,114 @@ public class OrmLiteCreateTableTests : OrmLiteTestBase
1111
[Test]
1212
public void Does_table_Exists()
1313
{
14-
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
15-
{
16-
db.DropTable<ModelWithIdOnly>();
14+
using var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open();
15+
db.DropTable<ModelWithIdOnly>();
1716

18-
Assert.That(
19-
OrmLiteConfig.DialectProvider.DoesTableExist(db, typeof(ModelWithIdOnly).Name),
20-
Is.False);
17+
Assert.That(
18+
OrmLiteConfig.DialectProvider.DoesTableExist(db, nameof(ModelWithIdOnly)),
19+
Is.False);
2120

22-
db.CreateTable<ModelWithIdOnly>(true);
21+
db.CreateTable<ModelWithIdOnly>(true);
2322

24-
Assert.That(
25-
OrmLiteConfig.DialectProvider.DoesTableExist(db, typeof(ModelWithIdOnly).Name),
26-
Is.True);
27-
}
23+
Assert.That(
24+
OrmLiteConfig.DialectProvider.DoesTableExist(db, nameof(ModelWithIdOnly)),
25+
Is.True);
2826
}
2927

3028
[Test]
3129
public void Can_create_ModelWithIdOnly_table()
3230
{
33-
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
34-
{
35-
db.CreateTable<ModelWithIdOnly>(true);
36-
}
31+
using var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open();
32+
db.CreateTable<ModelWithIdOnly>(true);
3733
}
3834

3935
[Test]
4036
public void Can_create_ModelWithOnlyStringFields_table()
4137
{
42-
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
43-
{
44-
db.CreateTable<ModelWithOnlyStringFields>(true);
45-
}
38+
using var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open();
39+
db.CreateTable<ModelWithOnlyStringFields>(true);
4640
}
4741

4842
[Test]
4943
public void Can_create_ModelWithLongIdAndStringFields_table()
5044
{
51-
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
52-
{
53-
db.CreateTable<ModelWithLongIdAndStringFields>(true);
54-
}
45+
using var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open();
46+
db.CreateTable<ModelWithLongIdAndStringFields>(true);
5547
}
5648

5749
[Test]
5850
public void Can_create_ModelWithFieldsOfDifferentTypes_table()
5951
{
60-
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
61-
{
62-
db.CreateTable<ModelWithFieldsOfDifferentTypes>(true);
63-
}
52+
using var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open();
53+
db.CreateTable<ModelWithFieldsOfDifferentTypes>(true);
6454
}
6555

6656
[Test]
6757
public void Can_preserve_ModelWithIdOnly_table()
6858
{
69-
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
70-
{
71-
db.CreateTable<ModelWithIdOnly>(true);
59+
using var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open();
60+
db.CreateTable<ModelWithIdOnly>(true);
7261

73-
db.Insert(new ModelWithIdOnly(1));
74-
db.Insert(new ModelWithIdOnly(2));
62+
db.Insert(new ModelWithIdOnly(1));
63+
db.Insert(new ModelWithIdOnly(2));
7564

76-
db.CreateTable<ModelWithIdOnly>(false);
65+
db.CreateTable<ModelWithIdOnly>(false);
7766

78-
var rows = db.Select<ModelWithIdOnly>();
67+
var rows = db.Select<ModelWithIdOnly>();
7968

80-
Assert.That(rows, Has.Count.EqualTo(2));
81-
}
69+
Assert.That(rows, Has.Count.EqualTo(2));
8270
}
8371

8472
[Test]
8573
public void Can_preserve_ModelWithIdAndName_table()
8674
{
87-
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
88-
{
89-
db.CreateTable<ModelWithIdAndName>(true);
90-
db.DeleteAll<ModelWithIdAndName>();
75+
using var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open();
76+
db.CreateTable<ModelWithIdAndName>(true);
77+
db.DeleteAll<ModelWithIdAndName>();
9178

92-
db.Insert(new ModelWithIdAndName(0));
93-
db.Insert(new ModelWithIdAndName(0));
79+
db.Insert(new ModelWithIdAndName(0));
80+
db.Insert(new ModelWithIdAndName(0));
9481

95-
db.CreateTable<ModelWithIdAndName>(false);
82+
db.CreateTable<ModelWithIdAndName>(false);
9683

97-
var rows = db.Select<ModelWithIdAndName>();
84+
var rows = db.Select<ModelWithIdAndName>();
9885

99-
Assert.That(rows, Has.Count.EqualTo(2));
100-
}
86+
Assert.That(rows, Has.Count.EqualTo(2));
10187
}
10288

10389
[Test]
10490
public void Can_overwrite_ModelWithIdOnly_table()
10591
{
106-
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
107-
{
108-
db.CreateTable<ModelWithIdOnly>(true);
92+
using var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open();
93+
db.CreateTable<ModelWithIdOnly>(true);
10994

110-
db.Insert(new ModelWithIdOnly(1));
111-
db.Insert(new ModelWithIdOnly(2));
95+
db.Insert(new ModelWithIdOnly(1));
96+
db.Insert(new ModelWithIdOnly(2));
11297

113-
db.CreateTable<ModelWithIdOnly>(true);
98+
db.CreateTable<ModelWithIdOnly>(true);
11499

115-
var rows = db.Select<ModelWithIdOnly>();
100+
var rows = db.Select<ModelWithIdOnly>();
116101

117-
Assert.That(rows, Has.Count.EqualTo(0));
118-
}
102+
Assert.That(rows, Has.Count.EqualTo(0));
119103
}
120104

121105
[Test]
122106
public void Can_create_multiple_tables()
123107
{
124-
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
125-
{
126-
db.CreateTables(true, typeof(ModelWithIdOnly), typeof(ModelWithIdAndName));
108+
using var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open();
109+
db.CreateTables(true, typeof(ModelWithIdOnly), typeof(ModelWithIdAndName));
127110

128-
db.Insert(new ModelWithIdOnly(1));
129-
db.Insert(new ModelWithIdOnly(2));
111+
db.Insert(new ModelWithIdOnly(1));
112+
db.Insert(new ModelWithIdOnly(2));
130113

131-
db.Insert(new ModelWithIdAndName(0));
132-
db.Insert(new ModelWithIdAndName(0));
114+
db.Insert(new ModelWithIdAndName(0));
115+
db.Insert(new ModelWithIdAndName(0));
133116

134-
var rows1 = db.Select<ModelWithIdOnly>();
135-
var rows2 = db.Select<ModelWithIdOnly>();
117+
var rows1 = db.Select<ModelWithIdOnly>();
118+
var rows2 = db.Select<ModelWithIdOnly>();
136119

137-
Assert.That(rows1, Has.Count.EqualTo(2));
138-
Assert.That(rows2, Has.Count.EqualTo(2));
139-
}
120+
Assert.That(rows1, Has.Count.EqualTo(2));
121+
Assert.That(rows2, Has.Count.EqualTo(2));
140122
}
141123

142124

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public void Log_dialect_behavior()
161161
using (var cmd = db.OpenCommand())
162162
{
163163
cmd.CommandText = "INSERT INTO {0} VALUES({1}, {2})"
164-
.Fmt(typeof(DateTimeObject).Name.SqlTable(DialectProvider),
164+
.Fmt(nameof(DateTimeObject).SqlTable(DialectProvider),
165165
DialectProvider.GetParam("p1"),
166166
DialectProvider.GetParam("p2"));
167167

@@ -173,7 +173,7 @@ public void Log_dialect_behavior()
173173

174174
using (var cmd = db.OpenCommand())
175175
{
176-
cmd.CommandText = "SELECT * FROM {0}".Fmt(typeof(DateTimeObject).Name.SqlTable(DialectProvider));
176+
cmd.CommandText = "SELECT * FROM {0}".Fmt(nameof(DateTimeObject).SqlTable(DialectProvider));
177177

178178
using (var reader = cmd.ExecuteReader())
179179
{

‎tests/ServiceStack.OrmLite.Tests/Expression/SqlExpressionTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ public void Can_select_RowCount_with_db_params()
515515
db.GetLastSql().Print();
516516
Assert.That(rowCount, Is.EqualTo(4));
517517

518-
var table = typeof(LetterFrequency).Name.SqlTable(DialectProvider);
518+
var table = nameof(LetterFrequency).SqlTable(DialectProvider);
519519

520520
rowCount = db.RowCount("SELECT * FROM {0} WHERE Letter = @p1".PreNormalizeSql(db).Fmt(table), new { p1 = "B" });
521521
Assert.That(rowCount, Is.EqualTo(4));

0 commit comments

Comments
 (0)