Skip to content

Commit b7f3cfa

Browse files
mgravellmgravell
committed
fixup SqlBuilder; use is null / is not null
1 parent 2b53709 commit b7f3cfa

31 files changed

+274
-265
lines changed

‎Dapper.EntityFramework/DbGeographyHandler.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class DbGeographyHandler : SqlMapper.TypeHandler<DbGeography>
3030
public override void SetValue(IDbDataParameter parameter, DbGeography? value)
3131
{
3232
object? parsed = null;
33-
if (value != null)
33+
if (value is not null)
3434
{
3535
parsed = SqlGeography.STGeomFromWKB(new SqlBytes(value.AsBinary()), value.CoordinateSystemId);
3636
}
@@ -48,7 +48,7 @@ public override void SetValue(IDbDataParameter parameter, DbGeography? value)
4848
/// <returns>The typed value.</returns>
4949
public override DbGeography? Parse(object? value)
5050
{
51-
if (value == null || value is DBNull) return null;
51+
if (value is null || value is DBNull) return null;
5252
if (value is SqlGeography geo)
5353
{
5454
return DbGeography.FromBinary(geo.STAsBinary().Value, geo.STSrid.Value);

‎Dapper.EntityFramework/DbGeometryHandler.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class DbGeometryHandler : SqlMapper.TypeHandler<DbGeometry>
3030
public override void SetValue(IDbDataParameter parameter, DbGeometry? value)
3131
{
3232
object? parsed = null;
33-
if (value != null)
33+
if (value is not null)
3434
{
3535
parsed = SqlGeometry.STGeomFromWKB(new SqlBytes(value.AsBinary()), value.CoordinateSystemId);
3636
}
@@ -48,7 +48,7 @@ public override void SetValue(IDbDataParameter parameter, DbGeometry? value)
4848
/// <returns>The typed value.</returns>
4949
public override DbGeometry? Parse(object? value)
5050
{
51-
if (value == null || value is DBNull) return null;
51+
if (value is null || value is DBNull) return null;
5252
if (value is SqlGeometry geo)
5353
{
5454
return DbGeometry.FromBinary(geo.STAsBinary().Value, geo.STSrid.Value);

‎Dapper.ProviderTools/BulkCopy.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public abstract class BulkCopy : IDisposable
2020
/// </summary>
2121
public static BulkCopy? TryCreate(DbConnection connection)
2222
{
23-
if (connection == null) return null;
23+
if (connection is null) return null;
2424
var type = connection.GetType();
2525
if (!s_bcpFactory.TryGetValue(type, out var func))
2626
{
@@ -36,9 +36,9 @@ public abstract class BulkCopy : IDisposable
3636
public static BulkCopy Create(DbConnection connection)
3737
{
3838
var bcp = TryCreate(connection);
39-
if (bcp == null)
39+
if (bcp is null)
4040
{
41-
if (connection == null) throw new ArgumentNullException(nameof(connection));
41+
if (connection is null) throw new ArgumentNullException(nameof(connection));
4242
throw new NotSupportedException("Unable to create BulkCopy for " + connection.GetType().FullName);
4343
}
4444
return bcp;
@@ -64,10 +64,10 @@ private static readonly ConcurrentDictionary<Type, Func<DbConnection, object>?>
6464
{
6565
var prefix = match.Groups[1].Value;
6666
var bcpType = connectionType.Assembly.GetType($"{connectionType.Namespace}.{prefix}BulkCopy");
67-
if (bcpType != null)
67+
if (bcpType is not null)
6868
{
6969
var ctor = bcpType.GetConstructor(new[] { connectionType });
70-
if (ctor == null) return null;
70+
if (ctor is null) return null;
7171

7272
var p = Expression.Parameter(typeof(DbConnection), "conn");
7373
var body = Expression.New(ctor, Expression.Convert(p, connectionType));

‎Dapper.ProviderTools/DbConnectionExtensions.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@ public static class DbConnectionExtensions
1717
public static bool TryGetClientConnectionId(this DbConnection connection, out Guid clientConnectionId)
1818
{
1919
clientConnectionId = default;
20-
return connection != null && ByTypeHelpers.Get(connection.GetType()).TryGetClientConnectionId(
20+
return connection is not null && ByTypeHelpers.Get(connection.GetType()).TryGetClientConnectionId(
2121
connection, out clientConnectionId);
2222
}
2323

2424
/// <summary>
2525
/// Clear all pools associated with the provided connection type
2626
/// </summary>
2727
public static bool TryClearAllPools(this DbConnection connection)
28-
=> connection != null && ByTypeHelpers.Get(connection.GetType()).TryClearAllPools();
28+
=> connection is not null && ByTypeHelpers.Get(connection.GetType()).TryClearAllPools();
2929

3030
/// <summary>
3131
/// Clear the pools associated with the provided connection
3232
/// </summary>
3333
public static bool TryClearPool(this DbConnection connection)
34-
=> connection != null && ByTypeHelpers.Get(connection.GetType()).TryClearPool(connection);
34+
=> connection is not null && ByTypeHelpers.Get(connection.GetType()).TryClearPool(connection);
3535

3636
private sealed class ByTypeHelpers
3737
{
@@ -44,7 +44,7 @@ private static readonly ConcurrentDictionary<Type, ByTypeHelpers> s_byType
4444

4545
public bool TryGetClientConnectionId(DbConnection connection, out Guid clientConnectionId)
4646
{
47-
if (_getClientConnectionId == null)
47+
if (_getClientConnectionId is null)
4848
{
4949
clientConnectionId = default;
5050
return false;
@@ -55,14 +55,14 @@ public bool TryGetClientConnectionId(DbConnection connection, out Guid clientCon
5555

5656
public bool TryClearPool(DbConnection connection)
5757
{
58-
if (_clearPool == null) return false;
58+
if (_clearPool is null) return false;
5959
_clearPool(connection);
6060
return true;
6161
}
6262

6363
public bool TryClearAllPools()
6464
{
65-
if (_clearAllPools == null) return false;
65+
if (_clearAllPools is null) return false;
6666
_clearAllPools();
6767
return true;
6868
}
@@ -84,7 +84,7 @@ private ByTypeHelpers(Type type)
8484
{
8585
var clearAllPools = type.GetMethod("ClearAllPools", BindingFlags.Public | BindingFlags.Static,
8686
null, Type.EmptyTypes, null);
87-
if (clearAllPools != null)
87+
if (clearAllPools is not null)
8888
{
8989
_clearAllPools = (Action)Delegate.CreateDelegate(typeof(Action), clearAllPools);
9090
}
@@ -95,7 +95,7 @@ private ByTypeHelpers(Type type)
9595
{
9696
var clearPool = type.GetMethod("ClearPool", BindingFlags.Public | BindingFlags.Static,
9797
null, new[] { type }, null);
98-
if (clearPool != null)
98+
if (clearPool is not null)
9999
{
100100
var p = Expression.Parameter(typeof(DbConnection), "connection");
101101
var body = Expression.Call(clearPool, Expression.Convert(p, type));
@@ -111,7 +111,7 @@ private ByTypeHelpers(Type type)
111111
try
112112
{
113113
var prop = type.GetProperty(name, BindingFlags.Public | BindingFlags.Instance);
114-
if (prop == null || !prop.CanRead) return null;
114+
if (prop is null || !prop.CanRead) return null;
115115
if (prop.PropertyType != typeof(T)) return null;
116116

117117
var p = Expression.Parameter(typeof(DbConnection), "connection");

‎Dapper.ProviderTools/DbExceptionExtensions.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public static class DbExceptionExtensions
1515
/// Indicates whether the provided exception has an integer Number property with the supplied value
1616
/// </summary>
1717
public static bool IsNumber(this DbException exception, int number)
18-
=> exception != null && ByTypeHelpers.Get(exception.GetType()).IsNumber(exception, number);
18+
=> exception is not null && ByTypeHelpers.Get(exception.GetType()).IsNumber(exception, number);
1919

2020

2121
private sealed class ByTypeHelpers
@@ -25,7 +25,7 @@ private static readonly ConcurrentDictionary<Type, ByTypeHelpers> s_byType
2525
private readonly Func<DbException, int>? _getNumber;
2626

2727
public bool IsNumber(DbException exception, int number)
28-
=> _getNumber != null && _getNumber(exception) == number;
28+
=> _getNumber is not null && _getNumber(exception) == number;
2929

3030
public static ByTypeHelpers Get(Type type)
3131
{
@@ -46,7 +46,7 @@ private ByTypeHelpers(Type type)
4646
try
4747
{
4848
var prop = type.GetProperty(name, BindingFlags.Public | BindingFlags.Instance);
49-
if (prop == null || !prop.CanRead) return null;
49+
if (prop is null || !prop.CanRead) return null;
5050
if (prop.PropertyType != typeof(T)) return null;
5151

5252
var p = Expression.Parameter(typeof(DbException), "exception");

‎Dapper.ProviderTools/Internal/DynamicBulkCopy.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Dapper.ProviderTools.Internal
99
internal sealed class DynamicBulkCopy : BulkCopy
1010
{
1111
internal static BulkCopy? Create(object? wrapped)
12-
=> wrapped == null ? null : new DynamicBulkCopy(wrapped);
12+
=> wrapped is null ? null : new DynamicBulkCopy(wrapped);
1313

1414
private DynamicBulkCopy(object wrapped)
1515
=> _wrapped = wrapped;

‎Dapper.SqlBuilder/Dapper.SqlBuilder.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<TargetFrameworks>net461;netstandard2.0;net5.0</TargetFrameworks>
99
<GenerateDocumentationFile>false</GenerateDocumentationFile>
1010
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
11+
<Nullable>enable</Nullable>
1112
</PropertyGroup>
1213
<ItemGroup>
1314
<ProjectReference Include="..\Dapper\Dapper.csproj" />

‎Dapper.SqlBuilder/PublicAPI.Shipped.txt‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
Dapper.SqlBuilder
2-
Dapper.SqlBuilder.AddClause(string name, string sql, object parameters, string joiner, string prefix = "", string postfix = "", bool isInclusive = false) -> Dapper.SqlBuilder
3-
Dapper.SqlBuilder.AddParameters(dynamic parameters) -> Dapper.SqlBuilder
4-
Dapper.SqlBuilder.AddTemplate(string sql, dynamic parameters = null) -> Dapper.SqlBuilder.Template
5-
Dapper.SqlBuilder.GroupBy(string sql, dynamic parameters = null) -> Dapper.SqlBuilder
6-
Dapper.SqlBuilder.Having(string sql, dynamic parameters = null) -> Dapper.SqlBuilder
7-
Dapper.SqlBuilder.InnerJoin(string sql, dynamic parameters = null) -> Dapper.SqlBuilder
8-
Dapper.SqlBuilder.Intersect(string sql, dynamic parameters = null) -> Dapper.SqlBuilder
9-
Dapper.SqlBuilder.Join(string sql, dynamic parameters = null) -> Dapper.SqlBuilder
10-
Dapper.SqlBuilder.LeftJoin(string sql, dynamic parameters = null) -> Dapper.SqlBuilder
11-
Dapper.SqlBuilder.OrderBy(string sql, dynamic parameters = null) -> Dapper.SqlBuilder
12-
Dapper.SqlBuilder.OrWhere(string sql, dynamic parameters = null) -> Dapper.SqlBuilder
13-
Dapper.SqlBuilder.RightJoin(string sql, dynamic parameters = null) -> Dapper.SqlBuilder
14-
Dapper.SqlBuilder.Select(string sql, dynamic parameters = null) -> Dapper.SqlBuilder
15-
Dapper.SqlBuilder.Set(string sql, dynamic parameters = null) -> Dapper.SqlBuilder
1+
#nullable enable
2+
Dapper.SqlBuilder
3+
Dapper.SqlBuilder.AddClause(string! name, string! sql, object? parameters, string! joiner, string! prefix = "", string! postfix = "", bool isInclusive = false) -> Dapper.SqlBuilder!
4+
Dapper.SqlBuilder.AddParameters(dynamic! parameters) -> Dapper.SqlBuilder!
5+
Dapper.SqlBuilder.AddTemplate(string! sql, dynamic? parameters = null) -> Dapper.SqlBuilder.Template!
6+
Dapper.SqlBuilder.GroupBy(string! sql, dynamic? parameters = null) -> Dapper.SqlBuilder!
7+
Dapper.SqlBuilder.Having(string! sql, dynamic? parameters = null) -> Dapper.SqlBuilder!
8+
Dapper.SqlBuilder.InnerJoin(string! sql, dynamic? parameters = null) -> Dapper.SqlBuilder!
9+
Dapper.SqlBuilder.Intersect(string! sql, dynamic? parameters = null) -> Dapper.SqlBuilder!
10+
Dapper.SqlBuilder.Join(string! sql, dynamic? parameters = null) -> Dapper.SqlBuilder!
11+
Dapper.SqlBuilder.LeftJoin(string! sql, dynamic? parameters = null) -> Dapper.SqlBuilder!
12+
Dapper.SqlBuilder.OrderBy(string! sql, dynamic? parameters = null) -> Dapper.SqlBuilder!
13+
Dapper.SqlBuilder.OrWhere(string! sql, dynamic? parameters = null) -> Dapper.SqlBuilder!
14+
Dapper.SqlBuilder.RightJoin(string! sql, dynamic? parameters = null) -> Dapper.SqlBuilder!
15+
Dapper.SqlBuilder.Select(string! sql, dynamic? parameters = null) -> Dapper.SqlBuilder!
16+
Dapper.SqlBuilder.Set(string! sql, dynamic? parameters = null) -> Dapper.SqlBuilder!
1617
Dapper.SqlBuilder.SqlBuilder() -> void
1718
Dapper.SqlBuilder.Template
18-
Dapper.SqlBuilder.Template.Parameters.get -> object
19-
Dapper.SqlBuilder.Template.RawSql.get -> string
20-
Dapper.SqlBuilder.Template.Template(Dapper.SqlBuilder builder, string sql, dynamic parameters) -> void
21-
Dapper.SqlBuilder.Where(string sql, dynamic parameters = null) -> Dapper.SqlBuilder
19+
Dapper.SqlBuilder.Template.Parameters.get -> object?
20+
Dapper.SqlBuilder.Template.RawSql.get -> string!
21+
Dapper.SqlBuilder.Template.Template(Dapper.SqlBuilder! builder, string! sql, dynamic? parameters) -> void
22+
Dapper.SqlBuilder.Where(string! sql, dynamic? parameters = null) -> Dapper.SqlBuilder!

‎Dapper.SqlBuilder/PublicAPI.Unshipped.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-

1+
#nullable enable

0 commit comments

Comments
 (0)