ExplicitStringLiteralTypes

Author: cincuranet

Provider/src/FirebirdSql.EntityFrameworkCore.Firebird/Infrastructure/FbDbContextOptionsBuilder.cs

@@ -29,5 +29,8 @@ public FbDbContextOptionsBuilder(DbContextOptionsBuilder optionsBuilder)
 
 		public virtual FbDbContextOptionsBuilder WithExplicitParameterTypes(bool explicitParameterTypes = true)
 			=> WithOption(e => e.WithExplicitParameterTypes(explicitParameterTypes));
+
+		public virtual FbDbContextOptionsBuilder WithExplicitStringLiteralTypes(bool explicitStringLiteralTypes = true)
+			=> WithOption(e => e.WithExplicitStringLiteralTypes(explicitStringLiteralTypes));
 	}
 }

Provider/src/FirebirdSql.EntityFrameworkCore.Firebird/Infrastructure/Internal/FbOptionsExtension.cs

@@ -25,6 +25,7 @@ public class FbOptionsExtension : RelationalOptionsExtension
 	{
 		private long? _serviceProviderHash;
 		private bool? _explicitParameterTypes;
+		private bool? _explicitStringLiteralTypes;
 
 		public FbOptionsExtension()
 		{ }
@@ -33,12 +34,14 @@ public FbOptionsExtension(FbOptionsExtension copyFrom)
 			: base(copyFrom)
 		{
 			_explicitParameterTypes = copyFrom._explicitParameterTypes;
+			_explicitStringLiteralTypes = copyFrom._explicitStringLiteralTypes;
 		}
 
 		protected override RelationalOptionsExtension Clone()
 			=> new FbOptionsExtension(this);
 
 		public virtual bool? ExplicitParameterTypes => _explicitParameterTypes;
+		public virtual bool? ExplicitStringLiteralTypes => _explicitStringLiteralTypes;
 
 		public virtual FbOptionsExtension WithExplicitParameterTypes(bool explicitParameterTypes)
 		{
@@ -47,12 +50,20 @@ public virtual FbOptionsExtension WithExplicitParameterTypes(bool explicitParame
 			return clone;
 		}
 
+		public virtual FbOptionsExtension WithExplicitStringLiteralTypes(bool explicitStringLiteralTypes)
+		{
+			var clone = (FbOptionsExtension)Clone();
+			clone._explicitStringLiteralTypes = explicitStringLiteralTypes;
+			return clone;
+		}
+
 		public override long GetServiceProviderHashCode()
 		{
 			if (_serviceProviderHash == null)
 			{
 				_serviceProviderHash = (base.GetServiceProviderHashCode() * 397)
-					^ (_explicitParameterTypes?.GetHashCode() ?? 0L);
+					^ (_explicitParameterTypes?.GetHashCode() ?? 0L)
+					^ (_explicitStringLiteralTypes?.GetHashCode() ?? 0L);
 			}
 			return _serviceProviderHash.Value;
 		}

Provider/src/FirebirdSql.EntityFrameworkCore.Firebird/Infrastructure/Internal/IFbOptions.cs

@@ -22,5 +22,6 @@ namespace FirebirdSql.EntityFrameworkCore.Firebird.Infrastructure.Internal
 	public interface IFbOptions : ISingletonOptions
 	{
 		bool ExplicitParameterTypes { get; }
+		bool ExplicitStringLiteralTypes { get; }
 	}
 }

Provider/src/FirebirdSql.EntityFrameworkCore.Firebird/Internal/FbOptions.cs

@@ -30,6 +30,7 @@ public virtual void Initialize(IDbContextOptions options)
 			var fbOptions = options.FindExtension<FbOptionsExtension>() ?? new FbOptionsExtension();
 
 			ExplicitParameterTypes = fbOptions.ExplicitParameterTypes ?? true;
+			ExplicitStringLiteralTypes = fbOptions.ExplicitStringLiteralTypes ?? true;
 		}
 
 		public virtual void Validate(IDbContextOptions options)
@@ -40,8 +41,13 @@ public virtual void Validate(IDbContextOptions options)
 			{
 				throw new InvalidOperationException($"A call was made to '{nameof(FbDbContextOptionsBuilder.WithExplicitParameterTypes)}' that changed an option that must be constant within a service provider, but Entity Framework is not building its own internal service provider. Either allow EF to build the service provider by removing the call to '{nameof(DbContextOptionsBuilder.UseInternalServiceProvider)}', or ensure that the configuration for '{nameof(FbDbContextOptionsBuilder.WithExplicitParameterTypes)}' does not change for all uses of a given service provider passed to '{nameof(DbContextOptionsBuilder.UseInternalServiceProvider)}'.");
 			}
+			if (ExplicitStringLiteralTypes != (fbOptions.ExplicitStringLiteralTypes ?? true))
+			{
+				throw new InvalidOperationException($"A call was made to '{nameof(FbDbContextOptionsBuilder.WithExplicitStringLiteralTypes)}' that changed an option that must be constant within a service provider, but Entity Framework is not building its own internal service provider. Either allow EF to build the service provider by removing the call to '{nameof(DbContextOptionsBuilder.UseInternalServiceProvider)}', or ensure that the configuration for '{nameof(FbDbContextOptionsBuilder.WithExplicitStringLiteralTypes)}' does not change for all uses of a given service provider passed to '{nameof(DbContextOptionsBuilder.UseInternalServiceProvider)}'.");
+			}
 		}
 
 		public virtual bool ExplicitParameterTypes { get; private set; }
+		public virtual bool ExplicitStringLiteralTypes { get; private set; }
 	}
 }

Provider/src/FirebirdSql.EntityFrameworkCore.Firebird/Query/Sql/Internal/FbQuerySqlGenerator.cs

@@ -173,13 +173,13 @@ protected override string GenerateOperator(Expression expression)
 		protected override Expression VisitConstant(ConstantExpression constantExpression)
 		{
 			var svalue = constantExpression.Value as string;
-			var isVarcharHack = constantExpression.Type == typeof(string) && svalue?.Length > 0;
-			if (isVarcharHack)
+			var explicitVarcharPossible = constantExpression.Type == typeof(string) && svalue?.Length > 0;
+			if (_fbOptions.ExplicitStringLiteralTypes && explicitVarcharPossible)
 			{
 				Sql.Append("CAST(");
 			}
 			base.VisitConstant(constantExpression);
-			if (isVarcharHack)
+			if (_fbOptions.ExplicitStringLiteralTypes && explicitVarcharPossible)
 			{
 				Sql.Append(" AS VARCHAR(");
 				Sql.Append(svalue.Length);