fix build error

Author: gilsonjoanelo

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

@@ -171,16 +171,9 @@ protected override Expression VisitSqlParameter(SqlParameterExpression sqlParame
 			{
 				var storeTypeNameBase = sqlParameterExpression.TypeMapping.StoreTypeNameBase;
 				var size = sqlParameterExpression.TypeMapping.Size;
+				var isUnicode = FbTypeMappingSource.IsUnicode(sqlParameterExpression.TypeMapping);
 
-				if (storeTypeNameBase != null && size != null)
-				{
-					Sql.Append($"{storeTypeNameBase}({size})");
-				}
-				else
-				{
-					var isUnicode = FbTypeMappingSource.IsUnicode(sqlParameterExpression.TypeMapping);
-					Sql.Append(((IFbSqlGenerationHelper)Dependencies.SqlGenerationHelper).StringParameterQueryType(isUnicode));
-				}
+				Sql.Append(((IFbSqlGenerationHelper)Dependencies.SqlGenerationHelper).StringParameterQueryType(isUnicode, storeTypeNameBase, size));
 			}
 			else
 			{
@@ -203,17 +196,14 @@ protected override Expression VisitSqlConstant(SqlConstantExpression sqlConstant
 		{
 			var storeTypeNameBase = sqlConstantExpression.TypeMapping.StoreTypeNameBase;
 			var size = sqlConstantExpression.TypeMapping.Size;
+			var isUnicode = FbTypeMappingSource.IsUnicode(sqlConstantExpression.TypeMapping);
 
-			if (storeTypeNameBase != null && size != null)
-			{
-				Sql.Append($"{storeTypeNameBase}({size})");
-			}
-			else
-			{
-				var isUnicode = FbTypeMappingSource.IsUnicode(sqlConstantExpression.TypeMapping);
-				Sql.Append(" AS ");
-				Sql.Append(((IFbSqlGenerationHelper)Dependencies.SqlGenerationHelper).StringLiteralQueryType(sqlConstantExpression.Value as string, isUnicode));
-			}
+			Sql.Append(" AS ");
+			Sql.Append(((IFbSqlGenerationHelper)Dependencies.SqlGenerationHelper).StringLiteralQueryType(
+				sqlConstantExpression.Value as string,
+				isUnicode,
+				storeTypeNameBase,
+				size));
 			Sql.Append(")");
 		}
 		return sqlConstantExpression;

src/FirebirdSql.EntityFrameworkCore.Firebird/Storage/Internal/FbSqlGenerationHelper.cs

@@ -27,17 +27,19 @@ public FbSqlGenerationHelper(RelationalSqlGenerationHelperDependencies dependenc
 		: base(dependencies)
 	{ }
 
-	public virtual string StringLiteralQueryType(string s, bool isUnicode = true)
+	public virtual string StringLiteralQueryType(string s, bool isUnicode = true, string? storeTypeNameBase = null, int? size = null)
 	{
-		var length = MinimumStringQueryTypeLength(s);
+		var length = size ?? MinimumStringQueryTypeLength(s);
 		var charset = isUnicode ? " CHARACTER SET UTF8" : string.Empty;
-		return $"VARCHAR({length}){charset}";
+		var storeTypeName = storeTypeNameBase ?? "VARCHAR";
+		return $"{storeTypeName}({length}){charset}";
 	}
 
-	public virtual string StringParameterQueryType(bool isUnicode)
+	public virtual string StringParameterQueryType(bool isUnicode, string? storeTypeNameBase = null, int? size = null)
 	{
-		var size = isUnicode ? FbTypeMappingSource.UnicodeVarcharMaxSize : FbTypeMappingSource.VarcharMaxSize;
-		return $"VARCHAR({size})";
+		var maxSize = size ?? (isUnicode ? FbTypeMappingSource.UnicodeVarcharMaxSize : FbTypeMappingSource.VarcharMaxSize);
+		var storeTypeName = storeTypeNameBase ?? "VARCHAR";
+		return $"{storeTypeName}({size})";
 	}
 
 	public virtual void GenerateBlockParameterName(StringBuilder builder, string name)

src/FirebirdSql.EntityFrameworkCore.Firebird/Storage/Internal/IFbSqlGenerationHelper.cs

@@ -22,8 +22,8 @@ namespace FirebirdSql.EntityFrameworkCore.Firebird.Storage.Internal;
 
 public interface IFbSqlGenerationHelper : ISqlGenerationHelper
 {
-	string StringLiteralQueryType(string s, bool isUnicode);
-	string StringParameterQueryType(bool isUnicode);
+	string StringLiteralQueryType(string s, bool isUnicode, string? storeTypeNameBase = null, int? size = null);
+	string StringParameterQueryType(bool isUnicode, string? storeTypeNameBase = null, int? size = null);
 	void GenerateBlockParameterName(StringBuilder builder, string name);
 	string AlternativeStatementTerminator { get; }
 }