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

Commit 4876a54

Browse files
committed
code clean up
1 parent f5c9e8f commit 4876a54

File tree

5 files changed

+18
-9
lines changed

5 files changed

+18
-9
lines changed

src/ServiceStack.OrmLite.MySql/MySqlDialectProviderBase.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,8 @@ public override string GetQuotedValue(string paramValue)
356356

357357
public override string GetQuotedValue(object value, Type fieldType)
358358
{
359-
if (value == null) return "NULL";
359+
if (value == null)
360+
return "NULL";
360361

361362
if (fieldType == typeof(byte[]))
362363
return "0x" + BitConverter.ToString((byte[])value).Replace("-", "");

src/ServiceStack.OrmLite.VistaDB/VistaDbDialectProvider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ public override string ToExistStatement(Type fromTableType, object objWithProper
266266
sql.Append(sqlFilter);
267267
}
268268

269-
return string.Format("SELECT EXISTS({0});", StringBuilderCache.ReturnAndFree(sql));
269+
return $"SELECT EXISTS({StringBuilderCache.ReturnAndFree(sql)});";
270270
}
271271

272272
public override string GetQuotedValue(object value, Type fieldType)
@@ -275,7 +275,7 @@ public override string GetQuotedValue(object value, Type fieldType)
275275
return "NULL";
276276

277277
if (fieldType == typeof(Guid))
278-
return string.Format("CAST('{0}' AS UNIQUEIDENTIFIER)", (Guid)value);
278+
return $"CAST('{(Guid) value}' AS UNIQUEIDENTIFIER)";
279279

280280
return base.GetQuotedValue(value, fieldType);
281281
}

src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1584,7 +1584,8 @@ protected virtual string FkOptionToString(OnFkOption option)
15841584

15851585
public virtual string GetQuotedValue(object value, Type fieldType)
15861586
{
1587-
if (value == null) return "NULL";
1587+
if (value == null)
1588+
return "NULL";
15881589

15891590
var converter = value.GetType().IsEnum
15901591
? EnumConverter

src/ServiceStack.OrmLite/OrmLiteUtils.cs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,10 @@ public static string StripQuotedStrings(this string text, char quote = '\'')
544544

545545
public static string SqlJoin<T>(this List<T> values, IOrmLiteDialectProvider dialect = null)
546546
{
547-
dialect = dialect ?? OrmLiteConfig.DialectProvider;
547+
if (values == null)
548+
return string.Empty;
549+
550+
dialect ??= OrmLiteConfig.DialectProvider;
548551

549552
var sb = StringBuilderCache.Allocate();
550553
foreach (var value in values)
@@ -558,12 +561,16 @@ public static string SqlJoin<T>(this List<T> values, IOrmLiteDialectProvider dia
558561

559562
public static string SqlJoin(IEnumerable values, IOrmLiteDialectProvider dialect = null)
560563
{
561-
dialect = (dialect ?? OrmLiteConfig.DialectProvider);
564+
if (values == null)
565+
return string.Empty;
566+
567+
dialect ??= OrmLiteConfig.DialectProvider;
562568

563569
var sb = StringBuilderCache.Allocate();
564570
foreach (var value in values)
565571
{
566-
if (sb.Length > 0) sb.Append(",");
572+
if (sb.Length > 0)
573+
sb.Append(",");
567574
sb.Append(dialect.GetQuotedValue(value, value.GetType()));
568575
}
569576

tests/ServiceStack.OrmLite.Tests/SqlDialectTests.cs renamed to tests/ServiceStack.OrmLite.Tests/SqlServerDialectTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ public class Sqltest
1414
}
1515

1616
[TestFixtureOrmLiteDialects(Dialect.AnySqlServer)]
17-
public class SqlDialectTests : OrmLiteProvidersTestBase
17+
public class SqlServerDialectTests : OrmLiteProvidersTestBase
1818
{
19-
public SqlDialectTests(DialectContext context) : base(context) {}
19+
public SqlServerDialectTests(DialectContext context) : base(context) {}
2020

2121
[Test]
2222
public void Does_concat_values()

0 commit comments

Comments
 (0)