Skip to content

Commit bcd56ed

Browse files
i4004i4004
committed
[add] Changelog
[R] Package meta info [R] Expression body methods [R] Nullable
1 parent f26f4d7 commit bcd56ed

File tree

9 files changed

+89
-89
lines changed

9 files changed

+89
-89
lines changed

‎src/Simplify.FluentNHibernate/CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Changelog
2+
3+
## [2.5.1] - 2021-10-27
4+
5+
### Fixed
6+
7+
- MsSQL provider: NRE when UserPassword is null (#310)
8+
9+
### Dependencies
10+
11+
- Switch to Microsoft.Extensions.Configuration.Abstractions 5.0.0 from Microsoft.Extensions.Configuration

‎src/Simplify.FluentNHibernate/ConfigurationExtensions.cs‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public static class ConfigurationExtensions
2727
/// <exception cref="ArgumentNullException">fluentConfiguration</exception>
2828
public static FluentConfiguration InitializeFromConfigOracleClient(this FluentConfiguration fluentConfiguration,
2929
string configSectionName = "DatabaseConnectionSettings",
30-
Action<OracleDataClientConfiguration> additionalClientConfiguration = null)
30+
Action<OracleDataClientConfiguration>? additionalClientConfiguration = null)
3131
{
3232
if (fluentConfiguration == null) throw new ArgumentNullException(nameof(fluentConfiguration));
3333

@@ -52,7 +52,7 @@ public static FluentConfiguration InitializeFromConfigOracleClient(this FluentCo
5252
public static FluentConfiguration InitializeFromConfigOracleClient(this FluentConfiguration fluentConfiguration,
5353
IConfiguration configuration,
5454
string configSectionName = "DatabaseConnectionSettings",
55-
Action<OracleDataClientConfiguration> additionalClientConfiguration = null)
55+
Action<OracleDataClientConfiguration>? additionalClientConfiguration = null)
5656
{
5757
if (fluentConfiguration == null) throw new ArgumentNullException(nameof(fluentConfiguration));
5858
if (configuration == null) throw new ArgumentNullException(nameof(configuration));
@@ -66,7 +66,7 @@ public static FluentConfiguration InitializeFromConfigOracleClient(this FluentCo
6666

6767
private static void InitializeFromConfigOracleClient(FluentConfiguration fluentConfiguration,
6868
DbConnectionSettings settings,
69-
Action<OracleDataClientConfiguration> additionalClientConfiguration = null)
69+
Action<OracleDataClientConfiguration>? additionalClientConfiguration = null)
7070
{
7171
var clientConfiguration = OracleDataClientConfiguration.Oracle10.ConnectionString(c =>
7272
c.Server(settings.ServerName)
@@ -96,7 +96,7 @@ private static void InitializeFromConfigOracleClient(FluentConfiguration fluentC
9696
/// <exception cref="ArgumentNullException">fluentConfiguration</exception>
9797
public static FluentConfiguration InitializeFromConfigOracleOdpNetNative(this FluentConfiguration fluentConfiguration,
9898
string configSectionName = "DatabaseConnectionSettings",
99-
Action<OracleDataClientConfiguration> additionalClientConfiguration = null)
99+
Action<OracleDataClientConfiguration>? additionalClientConfiguration = null)
100100
{
101101
if (fluentConfiguration == null) throw new ArgumentNullException(nameof(fluentConfiguration));
102102

@@ -123,7 +123,7 @@ public static FluentConfiguration InitializeFromConfigOracleOdpNetNative(this Fl
123123
public static FluentConfiguration InitializeFromConfigOracleOdpNetNative(this FluentConfiguration fluentConfiguration,
124124
IConfiguration configuration,
125125
string configSectionName = "DatabaseConnectionSettings",
126-
Action<OracleDataClientConfiguration> additionalClientConfiguration = null)
126+
Action<OracleDataClientConfiguration>? additionalClientConfiguration = null)
127127
{
128128
if (fluentConfiguration == null) throw new ArgumentNullException(nameof(fluentConfiguration));
129129
if (configuration == null) throw new ArgumentNullException(nameof(configuration));
@@ -137,7 +137,7 @@ public static FluentConfiguration InitializeFromConfigOracleOdpNetNative(this Fl
137137

138138
private static void InitializeFromConfigOracleOdpNetNative(FluentConfiguration fluentConfiguration,
139139
DbConnectionSettings settings,
140-
Action<OracleDataClientConfiguration> additionalClientConfiguration = null)
140+
Action<OracleDataClientConfiguration>? additionalClientConfiguration = null)
141141
{
142142
var clientConfiguration = OracleDataClientConfiguration.Oracle10.ConnectionString(c => c
143143
.Server(settings.ServerName)
@@ -168,7 +168,7 @@ private static void InitializeFromConfigOracleOdpNetNative(FluentConfiguration f
168168
/// <exception cref="ArgumentNullException">fluentConfiguration</exception>
169169
public static FluentConfiguration InitializeFromConfigOracleOdpNet(this FluentConfiguration fluentConfiguration,
170170
string configSectionName = "DatabaseConnectionSettings",
171-
Action<OracleManagedDataClientConfiguration> additionalClientConfiguration = null)
171+
Action<OracleManagedDataClientConfiguration>? additionalClientConfiguration = null)
172172
{
173173
if (fluentConfiguration == null) throw new ArgumentNullException(nameof(fluentConfiguration));
174174

@@ -195,7 +195,7 @@ public static FluentConfiguration InitializeFromConfigOracleOdpNet(this FluentCo
195195
public static FluentConfiguration InitializeFromConfigOracleOdpNet(this FluentConfiguration fluentConfiguration,
196196
IConfiguration configuration,
197197
string configSectionName = "DatabaseConnectionSettings",
198-
Action<OracleManagedDataClientConfiguration> additionalClientConfiguration = null)
198+
Action<OracleManagedDataClientConfiguration>? additionalClientConfiguration = null)
199199
{
200200
if (fluentConfiguration == null) throw new ArgumentNullException(nameof(fluentConfiguration));
201201
if (configuration == null) throw new ArgumentNullException(nameof(configuration));
@@ -209,7 +209,7 @@ public static FluentConfiguration InitializeFromConfigOracleOdpNet(this FluentCo
209209

210210
private static void InitializeFromConfigOracleOdpNet(FluentConfiguration fluentConfiguration,
211211
DbConnectionSettings settings,
212-
Action<OracleManagedDataClientConfiguration> additionalClientConfiguration = null)
212+
Action<OracleManagedDataClientConfiguration>? additionalClientConfiguration = null)
213213
{
214214
var clientConfiguration = OracleManagedDataClientConfiguration.Oracle10.ConnectionString(c => c
215215
.Server(settings.ServerName)
@@ -240,7 +240,7 @@ private static void InitializeFromConfigOracleOdpNet(FluentConfiguration fluentC
240240
/// <exception cref="ArgumentNullException">fluentConfiguration</exception>
241241
public static FluentConfiguration InitializeFromConfigMySql(this FluentConfiguration fluentConfiguration,
242242
string configSectionName = "DatabaseConnectionSettings",
243-
Action<MySQLConfiguration> additionalClientConfiguration = null)
243+
Action<MySQLConfiguration>? additionalClientConfiguration = null)
244244
{
245245
if (fluentConfiguration == null) throw new ArgumentNullException(nameof(fluentConfiguration));
246246

@@ -267,7 +267,7 @@ public static FluentConfiguration InitializeFromConfigMySql(this FluentConfigura
267267
public static FluentConfiguration InitializeFromConfigMySql(this FluentConfiguration fluentConfiguration,
268268
IConfiguration configuration,
269269
string configSectionName = "DatabaseConnectionSettings",
270-
Action<MySQLConfiguration> additionalClientConfiguration = null)
270+
Action<MySQLConfiguration>? additionalClientConfiguration = null)
271271
{
272272
if (fluentConfiguration == null) throw new ArgumentNullException(nameof(fluentConfiguration));
273273
if (configuration == null) throw new ArgumentNullException(nameof(configuration));
@@ -281,7 +281,7 @@ public static FluentConfiguration InitializeFromConfigMySql(this FluentConfigura
281281

282282
private static void InitializeFromConfigMySql(FluentConfiguration fluentConfiguration,
283283
DbConnectionSettings settings,
284-
Action<MySQLConfiguration> additionalClientConfiguration = null)
284+
Action<MySQLConfiguration>? additionalClientConfiguration = null)
285285
{
286286
var clientConfiguration = MySQLConfiguration.Standard.ConnectionString(c => c
287287
.Server(settings.ServerName)
@@ -310,7 +310,7 @@ private static void InitializeFromConfigMySql(FluentConfiguration fluentConfigur
310310
/// <exception cref="ArgumentNullException">fluentConfiguration</exception>
311311
public static FluentConfiguration InitializeFromConfigMsSql(this FluentConfiguration fluentConfiguration,
312312
string configSectionName = "DatabaseConnectionSettings",
313-
Action<MsSqlConfiguration> additionalClientConfiguration = null)
313+
Action<MsSqlConfiguration>? additionalClientConfiguration = null)
314314
{
315315
if (fluentConfiguration == null) throw new ArgumentNullException(nameof(fluentConfiguration));
316316

@@ -337,7 +337,7 @@ public static FluentConfiguration InitializeFromConfigMsSql(this FluentConfigura
337337
public static FluentConfiguration InitializeFromConfigMsSql(this FluentConfiguration fluentConfiguration,
338338
IConfiguration configuration,
339339
string configSectionName = "DatabaseConnectionSettings",
340-
Action<MsSqlConfiguration> additionalClientConfiguration = null)
340+
Action<MsSqlConfiguration>? additionalClientConfiguration = null)
341341
{
342342
if (fluentConfiguration == null) throw new ArgumentNullException(nameof(fluentConfiguration));
343343
if (configuration == null) throw new ArgumentNullException(nameof(configuration));
@@ -351,7 +351,7 @@ public static FluentConfiguration InitializeFromConfigMsSql(this FluentConfigura
351351

352352
private static void InitializeFromConfigMsSql(FluentConfiguration fluentConfiguration,
353353
DbConnectionSettings settings,
354-
Action<MsSqlConfiguration> additionalClientConfiguration = null)
354+
Action<MsSqlConfiguration>? additionalClientConfiguration = null)
355355
{
356356
var clientConfiguration = MsSqlConfiguration.MsSql2008.ConnectionString(c => c
357357
.Server(settings.ServerName)
@@ -380,7 +380,7 @@ private static void InitializeFromConfigMsSql(FluentConfiguration fluentConfigur
380380
/// <exception cref="ArgumentNullException">fluentConfiguration</exception>
381381
public static FluentConfiguration InitializeFromConfigPostgreSql(this FluentConfiguration fluentConfiguration,
382382
string configSectionName = "DatabaseConnectionSettings",
383-
Action<PostgreSQLConfiguration> additionalClientConfiguration = null)
383+
Action<PostgreSQLConfiguration>? additionalClientConfiguration = null)
384384
{
385385
if (fluentConfiguration == null) throw new ArgumentNullException(nameof(fluentConfiguration));
386386

@@ -407,7 +407,7 @@ public static FluentConfiguration InitializeFromConfigPostgreSql(this FluentConf
407407
public static FluentConfiguration InitializeFromConfigPostgreSql(this FluentConfiguration fluentConfiguration,
408408
IConfiguration configuration,
409409
string configSectionName = "DatabaseConnectionSettings",
410-
Action<PostgreSQLConfiguration> additionalClientConfiguration = null)
410+
Action<PostgreSQLConfiguration>? additionalClientConfiguration = null)
411411
{
412412
if (fluentConfiguration == null) throw new ArgumentNullException(nameof(fluentConfiguration));
413413
if (configuration == null) throw new ArgumentNullException(nameof(configuration));
@@ -421,7 +421,7 @@ public static FluentConfiguration InitializeFromConfigPostgreSql(this FluentConf
421421

422422
private static void InitializeFromConfigPostgreSql(FluentConfiguration fluentConfiguration,
423423
DbConnectionSettings settings,
424-
Action<PostgreSQLConfiguration> additionalClientConfiguration = null)
424+
Action<PostgreSQLConfiguration>? additionalClientConfiguration = null)
425425
{
426426
var clientConfiguration = PostgreSQLConfiguration.PostgreSQL82.ConnectionString(c => c
427427
.Host(settings.ServerName)
@@ -457,7 +457,7 @@ private static void InitializeFromConfigPostgreSql(FluentConfiguration fluentCon
457457
public static FluentConfiguration InitializeFromConfigSqLite(this FluentConfiguration fluentConfiguration,
458458
string fileName,
459459
bool showSql = false,
460-
Action<SQLiteConfiguration> additionalClientConfiguration = null)
460+
Action<SQLiteConfiguration>? additionalClientConfiguration = null)
461461
{
462462
if (fluentConfiguration == null) throw new ArgumentNullException(nameof(fluentConfiguration));
463463
if (fileName == null) throw new ArgumentNullException(nameof(fileName));
@@ -487,7 +487,7 @@ public static FluentConfiguration InitializeFromConfigSqLite(this FluentConfigur
487487
/// <exception cref="ArgumentNullException">fluentConfiguration</exception>
488488
public static FluentConfiguration InitializeFromConfigSqLiteInMemory(this FluentConfiguration fluentConfiguration,
489489
bool showSql = false,
490-
Action<SQLiteConfiguration> additionalClientConfiguration = null)
490+
Action<SQLiteConfiguration>? additionalClientConfiguration = null)
491491
{
492492
if (fluentConfiguration == null) throw new ArgumentNullException(nameof(fluentConfiguration));
493493

‎src/Simplify.FluentNHibernate/Conventions/ForeignKeyConstraintNameConvention.cs‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,48 +15,35 @@ public class ForeignKeyConstraintNameConvention : IHasManyToManyConvention, IRef
1515
/// Note: 'HasMany' with 'Element' foreign key constraint name is not supported, it should be set manually by 'ForeignKeyConstraintName'
1616
/// </summary>
1717
/// <returns></returns>
18-
public static ForeignKeyConstraintNameConvention WithConstraintNameConvention()
19-
{
20-
return new ForeignKeyConstraintNameConvention();
21-
}
18+
public static ForeignKeyConstraintNameConvention WithConstraintNameConvention() => new ForeignKeyConstraintNameConvention();
2219

2320
/// <summary>
2421
/// Applies the IManyToOneInstance instance.
2522
/// </summary>
2623
/// <param name="instance">The instance.</param>
27-
public void Apply(IManyToOneInstance instance)
28-
{
24+
public void Apply(IManyToOneInstance instance) =>
2925
instance.ForeignKey(
3026
GetForeignConstraintName(
3127
instance.EntityType.Name,
3228
instance.Columns.First().Name));
33-
}
3429

3530
/// <summary>
3631
/// Applies the IManyToManyCollectionInstance instance.
3732
/// </summary>
3833
/// <param name="instance">The instance.</param>
39-
public void Apply(IManyToManyCollectionInstance instance)
40-
{
34+
public void Apply(IManyToManyCollectionInstance instance) =>
4135
instance.Relationship?.ForeignKey(
4236
GetForeignConstraintName(
4337
instance.TableName,
4438
instance.Relationship.Columns.First().Name));
45-
}
4639

4740
/// <summary>
4841
/// Applies the IOneToOneInstance instance.
4942
/// </summary>
5043
/// <param name="instance">The instance.</param>
5144
/// <exception cref="System.NotImplementedException"></exception>
52-
public void Apply(IOneToOneInstance instance)
53-
{
54-
instance.ForeignKey(GetForeignConstraintName(instance.EntityType.Name, instance.Name));
55-
}
45+
public void Apply(IOneToOneInstance instance) => instance.ForeignKey(GetForeignConstraintName(instance.EntityType.Name, instance.Name));
5646

57-
private static string GetForeignConstraintName(string targetTableName, string sourceTableColumnName)
58-
{
59-
return $"FK_{targetTableName}_{sourceTableColumnName}";
60-
}
47+
private static string GetForeignConstraintName(string targetTableName, string sourceTableColumnName) => $"FK_{targetTableName}_{sourceTableColumnName}";
6148
}
6249
}

‎src/Simplify.FluentNHibernate/FluentConfigurationExtension.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public static void ExportSchema(this FluentConfiguration configuration)
1818
{
1919
if (configuration == null) throw new ArgumentNullException(nameof(configuration));
2020

21-
Configuration config = null;
21+
Configuration? config = null;
2222
configuration.ExposeConfiguration(c => config = c);
2323
var factory = configuration.BuildSessionFactory();
2424

@@ -32,15 +32,15 @@ public static void ExportSchema(this FluentConfiguration configuration)
3232
/// <param name="configuration">The configuration.</param>
3333
/// <param name="configurationAddons">The configuration addition setup.</param>
3434
/// <exception cref="ArgumentNullException">configuration</exception>
35-
public static void UpdateSchema(this FluentConfiguration configuration, Action<Configuration> configurationAddons = null)
35+
public static void UpdateSchema(this FluentConfiguration configuration, Action<Configuration>? configurationAddons = null)
3636
{
3737
if (configuration == null) throw new ArgumentNullException(nameof(configuration));
3838

39-
Configuration config = null;
39+
Configuration? config = null;
4040
configuration.ExposeConfiguration(c => config = c);
4141
configuration.BuildSessionFactory();
4242

43-
configurationAddons?.Invoke(config);
43+
configurationAddons?.Invoke(config!);
4444

4545
var updater = new SchemaUpdate(config);
4646
updater.Execute(true, true);

0 commit comments

Comments
 (0)