[#487] [add] MS SQL dialect

[#487] [edit] version/changelog
SimplifyNet · Jan 14, 2024 · 20bdbb6 · 20bdbb6
1 parent d9fa031
commit 20bdbb6
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 10 deletions.
diff --git a/src/Simplify.FluentNHibernate/CHANGELOG.md b/src/Simplify.FluentNHibernate/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## [3.0.0] - 2024-01-14
+
+### Added
+
+- InitializeFromConfig* methods selectable dialect (#487)
+- CompositeInterceptor (#483)
+
+### Changed
+
+- Default PostgreSQL83 dialect set for PostgreSQL connections
+- Default MsSql2012 dialect set for MS SQL connections
+- InitializeFromConfigMsSql null password exception
+- SessionFactoryBuilderBase dispose with GC.SuppressFinalize
+
 ## [2.6.0] - 2023-08-07
 
 ### Removed

diff --git a/src/Simplify.FluentNHibernate/ConfigurationExtensions.cs b/src/Simplify.FluentNHibernate/ConfigurationExtensions.cs
@@ -372,17 +372,19 @@ private static void InitializeFromConfigMySql(FluentConfiguration fluentConfigur
 	/// <param name="fluentConfiguration">The fluentNHibernate configuration.</param>
 	/// <param name="configSectionName">Configuration section name in App.config or Web.config file.</param>
 	/// <param name="additionalClientConfiguration">The additional client configuration.</param>
-	/// <returns></returns>
+	/// <param name="dialect">The dialect.</param>
 	/// <exception cref="ArgumentNullException">fluentConfiguration</exception>
 	public static FluentConfiguration InitializeFromConfigMsSql(this FluentConfiguration fluentConfiguration,
 		string configSectionName = "DatabaseConnectionSettings",
-		Action<MsSqlConfiguration>? additionalClientConfiguration = null)
+		Action<MsSqlConfiguration>? additionalClientConfiguration = null,
+		MsSqlDialect dialect = MsSqlDialect.MsSql2012)
 	{
 		if (fluentConfiguration == null) throw new ArgumentNullException(nameof(fluentConfiguration));
 
 		InitializeFromConfigMsSql(fluentConfiguration,
 			new ConfigurationManagerBasedDbConnectionSettings(configSectionName),
-			additionalClientConfiguration);
+			additionalClientConfiguration,
+			dialect);
 
 		return fluentConfiguration;
 	}
@@ -394,7 +396,7 @@ public static FluentConfiguration InitializeFromConfigMsSql(this FluentConfigura
 	/// <param name="configuration">The configuration containing database config section.</param>
 	/// <param name="configSectionName">Database configuration section name in configuration.</param>
 	/// <param name="additionalClientConfiguration">The additional client configuration.</param>
-	/// <returns></returns>
+	/// <param name="dialect">The dialect.</param>
 	/// <exception cref="ArgumentNullException">
 	/// fluentConfiguration
 	/// or
@@ -403,27 +405,39 @@ public static FluentConfiguration InitializeFromConfigMsSql(this FluentConfigura
 	public static FluentConfiguration InitializeFromConfigMsSql(this FluentConfiguration fluentConfiguration,
 		IConfiguration configuration,
 		string configSectionName = "DatabaseConnectionSettings",
-		Action<MsSqlConfiguration>? additionalClientConfiguration = null)
+		Action<MsSqlConfiguration>? additionalClientConfiguration = null,
+		MsSqlDialect dialect = MsSqlDialect.MsSql2012)
 	{
 		if (fluentConfiguration == null) throw new ArgumentNullException(nameof(fluentConfiguration));
 		if (configuration == null) throw new ArgumentNullException(nameof(configuration));
 
 		InitializeFromConfigMsSql(fluentConfiguration,
 			new ConfigurationBasedDbConnectionSettings(configuration, configSectionName),
-			additionalClientConfiguration);
+			additionalClientConfiguration,
+			dialect);
 
 		return fluentConfiguration;
 	}
 
 	private static void InitializeFromConfigMsSql(FluentConfiguration fluentConfiguration,
 		DbConnectionSettings settings,
-		Action<MsSqlConfiguration>? additionalClientConfiguration = null)
+		Action<MsSqlConfiguration>? additionalClientConfiguration = null,
+		MsSqlDialect dialect = MsSqlDialect.MsSql2012)
 	{
-		var clientConfiguration = MsSqlConfiguration.MsSql2008.ConnectionString(c => c
+		var clientConfiguration = dialect switch
+		{
+			MsSqlDialect.MsSql2000 => MsSqlConfiguration.MsSql2000,
+			MsSqlDialect.MsSql2005 => MsSqlConfiguration.MsSql2005,
+			MsSqlDialect.MsSql2008 => MsSqlConfiguration.MsSql2008,
+			MsSqlDialect.MsSql7 => MsSqlConfiguration.MsSql7,
+			_ => throw new InvalidOperationException()
+		};
+
+		clientConfiguration.ConnectionString(c => c
 			.Server(settings.ServerName)
 			.Database(settings.DataBaseName)
 			.Username(settings.UserName)
-			.Password(settings.UserPassword ?? throw new ArgumentNullException(nameof(settings.UserPassword))));
+			.Password(settings.UserPassword ?? throw new ArgumentException($"{nameof(settings.UserPassword)} is null")));
 
 		additionalClientConfiguration?.Invoke(clientConfiguration);
 

diff --git a/src/Simplify.FluentNHibernate/Dialects/MsSqlDialect.cs b/src/Simplify.FluentNHibernate/Dialects/MsSqlDialect.cs
@@ -0,0 +1,28 @@
+namespace Simplify.FluentNHibernate.Dialects;
+
+/// <summary>
+/// Provides MS SQL DBMS dialect
+/// </summary>
+public enum MsSqlDialect
+{
+	/// <summary>
+	/// The MS SQL 2000 dialect
+	/// </summary>
+	MsSql2000,
+	/// <summary>
+	/// The MS SQL 2005 dialect
+	/// </summary>
+	MsSql2005,
+	/// <summary>
+	/// The MS SQL 2008 dialect
+	/// </summary>
+	MsSql2008,
+	/// <summary>
+	/// The MS SQL 2012 dialect
+	/// </summary>
+	MsSql2012,
+	/// <summary>
+	/// The MS SQL 7 dialect
+	/// </summary>
+	MsSql7
+}
diff --git a/src/Simplify.FluentNHibernate/Simplify.FluentNHibernate.csproj b/src/Simplify.FluentNHibernate/Simplify.FluentNHibernate.csproj
@@ -8,7 +8,7 @@
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 
-		<Version>2.6</Version>
+		<Version>3.0</Version>
 
 		<Authors>Alexander Krylkov</Authors>
 		<Product>Simplify</Product>