Commit 795b51b

authored

Add isUnicode parameter to StringLiteralQueryType function (#1192)

1 parent 4d174f3 commit 795b51bCopy full SHA for 795b51b

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -191,8 +191,9 @@ protected override Expression VisitSqlConstant(SqlConstantExpression sqlConstant`
`191`	`191`	`base.VisitSqlConstant(sqlConstantExpression);`
`192`	`192`	`if (shouldExplicitStringLiteralTypes)`
`193`	`193`	`{`
	`194`	`+ var isUnicode = FbTypeMappingSource.IsUnicode(sqlConstantExpression.TypeMapping);`
`194`	`195`	`Sql.Append(" AS ");`
`195`		`- Sql.Append(((IFbSqlGenerationHelper)Dependencies.SqlGenerationHelper).StringLiteralQueryType(sqlConstantExpression.Value as string));`
	`196`	`+ Sql.Append(((IFbSqlGenerationHelper)Dependencies.SqlGenerationHelper).StringLiteralQueryType(sqlConstantExpression.Value as string,isUnicode));`
`196`	`197`	`Sql.Append(")");`
`197`	`198`	`}`
`198`	`199`	`return sqlConstantExpression;`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,11 @@ public FbSqlGenerationHelper(RelationalSqlGenerationHelperDependencies dependenc`
`27`	`27`	`: base(dependencies)`
`28`	`28`	`{ }`
`29`	`29`
`30`		`- public virtual string StringLiteralQueryType(string s)`
	`30`	`+ public virtual string StringLiteralQueryType(string s,boolisUnicode=true)`
`31`	`31`	`{`
`32`	`32`	`var length = MinimumStringQueryTypeLength(s);`
`33`		`- EnsureStringLiteralQueryTypeLength(length);`
`34`		`- return $"VARCHAR({length}) CHARACTER SET UTF8";`
	`33`	`+ varcharset=isUnicode?" CHARACTER SET UTF8":string.Empty;`
	`34`	`+ return $"VARCHAR({length}){charset}";`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public virtual string StringParameterQueryType(bool isUnicode)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ namespace FirebirdSql.EntityFrameworkCore.Firebird.Storage.Internal;`
`22`	`22`
`23`	`23`	`public interface IFbSqlGenerationHelper : ISqlGenerationHelper`
`24`	`24`	`{`
`25`		`- string StringLiteralQueryType(string s);`
	`25`	`+ string StringLiteralQueryType(string s,boolisUnicode);`
`26`	`26`	`string StringParameterQueryType(bool isUnicode);`
`27`	`27`	`void GenerateBlockParameterName(StringBuilder builder, string name);`
`28`	`28`	`string AlternativeStatementTerminator { get; }`

Comments

(0)