Fixed SQLQueryCompiler extensions.

glecchi · Nov 20, 2024 · d796465 · d796465
1 parent b22b7d2
commit d796465
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 24 deletions.
diff --git a/Lib/CSQLQueryExpress/CSQLQueryExpress.csproj b/Lib/CSQLQueryExpress/CSQLQueryExpress.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <Title>CSQLQueryExpress</Title>
-    <Version>1.3.7</Version>
+    <Version>1.3.8</Version>
     <Description>A simple c# library to compile TSQL queries</Description>
     <PackageProjectUrl></PackageProjectUrl>
     <PackageReadmeFile>README.md</PackageReadmeFile>

diff --git a/Lib/CSQLQueryExpress/Compiler/SQLQueryCompiler.cs b/Lib/CSQLQueryExpress/Compiler/SQLQueryCompiler.cs
@@ -13,13 +13,14 @@ public static class SQLQueryCompiler
         /// <summary>
         /// Compile a <see cref="ISQLQuery"/> instance in a <see cref="SQLQueryCompiled"/>.
         /// </summary>
-        /// <param name="query">SQL query expression built with <see cref="SQLQuery"/>,</param>
+        /// <param name="query">SQL query expression built with <see cref="SQLQuery"/></param>
+        /// <param name="settings">[OPTIONAL] SQL query compiler setting <see cref="SQLQueryCompilerSettings"/></param>
         /// <returns>A compiled expression <see cref="SQLQueryCompiled"/>.</returns>
-        public static SQLQueryCompiled Compile(ISQLQuery query)
+        public static SQLQueryCompiled Compile(ISQLQuery query, SQLQueryCompilerSettings settings = null)
         {
-            var settings = new SQLQueryCompilerSettings();
-            var parameterBuilder = new SQLQueryParametersBuilder(settings);
-            var tableNameResolver = new SQLQueryTableNameResolver(settings);
+            var compilerSettings = settings ?? new SQLQueryCompilerSettings();
+            var parameterBuilder = new SQLQueryParametersBuilder(compilerSettings);
+            var tableNameResolver = new SQLQueryTableNameResolver(compilerSettings);
 
             return Compile(query, parameterBuilder, tableNameResolver);
         }

diff --git a/Lib/CSQLQueryExpress/Compiler/SQLQueryExtensions.cs b/Lib/CSQLQueryExpress/Compiler/SQLQueryExtensions.cs
@@ -5,11 +5,12 @@ public static class SQLQueryExtensions
         /// <summary>
         /// Compile a <see cref="ISQLQuery"/> instance in a <see cref="SQLQueryCompiled"/>.
         /// </summary>
-        /// <param name="query">SQL query expression built with <see cref="SQLQuery"/>,</param>
+        /// <param name="query">SQL query expression built with <see cref="SQLQuery"/></param>
+        /// <param name="settings">[OPTIONAL] SQL query compiler setting <see cref="SQLQueryCompilerSettings"/></param>
         /// <returns>A compiled expression <see cref="SQLQueryCompiled"/>.</returns>
-        public static SQLQueryCompiled Compile(this ISQLQuery query)
+        public static SQLQueryCompiled Compile(this ISQLQuery query, SQLQueryCompilerSettings settings = null)
         {
-            return SQLQueryCompiler.Compile(query);
+            return SQLQueryCompiler.Compile(query, settings);
         }
 
         /// <summary>

diff --git a/Lib/CSQLQueryExpress/Compiler/SQLQueryParametersBuilder.cs b/Lib/CSQLQueryExpress/Compiler/SQLQueryParametersBuilder.cs
@@ -3,9 +3,9 @@
 
 namespace CSQLQueryExpress
 {
-    internal class SQLQueryParametersBuilder : ISQLQueryParametersBuilder
+    public sealed class SQLQueryParametersBuilder : ISQLQueryParametersBuilder
     {
-        public IDictionary<string, SQLQueryParameter> Parameters { get; } = new Dictionary<string, SQLQueryParameter>();
+        IDictionary<string, SQLQueryParameter> ISQLQueryParametersBuilder.Parameters { get; } = new Dictionary<string, SQLQueryParameter>();
 
         private readonly SQLQueryCompilerSettings _settings;
 
@@ -14,22 +14,22 @@ public SQLQueryParametersBuilder(SQLQueryCompilerSettings settings)
             _settings = settings;
         }
 
-        public void Initialize()
+        void ISQLQueryParametersBuilder.Initialize()
         {
-            Parameters.Clear();
+            ((ISQLQueryParametersBuilder)this).Parameters.Clear();
         }
 
-        public string AddParameter(object value)
+        string ISQLQueryParametersBuilder.AddParameter(object value)
         {
-            var parameterName = $"{_settings.QueryParameterPrefix}{Parameters.Count}";
-            Parameters.Add(parameterName, new SQLQueryParameter(parameterName, value));
+            var parameterName = $"{_settings.QueryParameterPrefix}{((ISQLQueryParametersBuilder)this).Parameters.Count}";
+            ((ISQLQueryParametersBuilder)this).Parameters.Add(parameterName, new SQLQueryParameter(parameterName, value));
             return parameterName;
         }
 
-        public string AddStoredProcedureParameter(string name, object value, SQLQueryParameterDirection direction)
+        string ISQLQueryParametersBuilder.AddStoredProcedureParameter(string name, object value, SQLQueryParameterDirection direction)
         {
             var parameterName = $"{_settings.StoredProcedureParameterPrefix}{name}";
-            Parameters.Add(parameterName, new SQLQueryParameter(parameterName, value, direction));
+            ((ISQLQueryParametersBuilder)this).Parameters.Add(parameterName, new SQLQueryParameter(parameterName, value, direction));
             return parameterName;
         }
     }

diff --git a/Lib/CSQLQueryExpress/Compiler/SQLQueryTableNameResolver.cs b/Lib/CSQLQueryExpress/Compiler/SQLQueryTableNameResolver.cs
@@ -6,7 +6,7 @@
 
 namespace CSQLQueryExpress
 {
-    internal class SQLQueryTableNameResolver : ISQLQueryTableNameResolver
+    public sealed class SQLQueryTableNameResolver : ISQLQueryTableNameResolver
     {
         private readonly SQLQueryCompilerSettings _settings;
 
@@ -19,13 +19,13 @@ public SQLQueryTableNameResolver(SQLQueryCompilerSettings settings)
             _settings = settings;
         }
 
-        public void Initialize()
+        void ISQLQueryTableNameResolver.Initialize()
         {
             Alias.Clear();
             MembersTypes.Clear();
         }
 
-        public SQLQueryTableName ResolveTableName(Type objType)
+        SQLQueryTableName ISQLQueryTableNameResolver.ResolveTableName(Type objType)
         {
             if (!Alias.TryGetValue(objType, out SQLQueryTableName alias))
             {
@@ -59,14 +59,14 @@ public SQLQueryTableName ResolveTableName(Type objType)
             return alias;
         }
 
-        public string ResolveTableNameAsAlias(Type objType)
+        string ISQLQueryTableNameResolver.ResolveTableNameAsAlias(Type objType)
         {
-            var tableAlias = ResolveTableName(objType);
+            var tableAlias = ((ISQLQueryTableNameResolver)this).ResolveTableName(objType);
 
             return $"{tableAlias.TableName} AS {tableAlias.TableAlias}";
         }
 
-        public string ResolveColumnName(Type objType, MemberInfo member)
+        string ISQLQueryTableNameResolver.ResolveColumnName(Type objType, MemberInfo member)
         {
             if (!MembersTypes.TryGetValue(member.DeclaringType, out IDictionary<MemberInfo, string> members))
             {