Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More fixes to issue #864 #870

Merged
merged 1 commit into from
Sep 7, 2021
Merged

More fixes to issue #864 #870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 34 additions & 11 deletions RepoDb.Core/RepoDb/Extensions/StringExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,19 +329,42 @@ internal static string AsJoinQualifier(this string value,
string leftAlias,
string rightAlias,
bool considerNulls,
IDbSetting dbSetting)
{
var qualifiers = string.Concat(leftAlias, StringConstant.Period, value.AsQuoted(true, true, dbSetting), " = ",
rightAlias, StringConstant.Period, value.AsQuoted(true, true, dbSetting));
IDbSetting dbSetting) =>
considerNulls ? AsJoinQualifierWithNullChecks(value, leftAlias, rightAlias, dbSetting) :
AsJoinQualifierWithoutNullChecks(value, leftAlias, rightAlias, dbSetting);

if (considerNulls)
{
qualifiers = string.Concat("(", qualifiers, " OR (",
leftAlias, StringConstant.Period, value.AsQuoted(true, true, dbSetting), " IS NULL AND ",
rightAlias, StringConstant.Period, value.AsQuoted(true, true, dbSetting), " IS NULL))");
}
/// <summary>
///
/// </summary>
/// <param name="value"></param>
/// <param name="leftAlias"></param>
/// <param name="rightAlias"></param>
/// <param name="dbSetting"></param>
/// <returns></returns>
private static string AsJoinQualifierWithoutNullChecks(this string value,
string leftAlias,
string rightAlias,
IDbSetting dbSetting) =>
string.Concat(leftAlias, StringConstant.Period, value.AsQuoted(true, true, dbSetting), " = ",
rightAlias, StringConstant.Period, value.AsQuoted(true, true, dbSetting));

return qualifiers;
/// <summary>
///
/// </summary>
/// <param name="value"></param>
/// <param name="leftAlias"></param>
/// <param name="rightAlias"></param>
/// <param name="dbSetting"></param>
/// <returns></returns>
private static string AsJoinQualifierWithNullChecks(this string value,
string leftAlias,
string rightAlias,
IDbSetting dbSetting)
{
var qualifiersWithoutNullChecks = AsJoinQualifierWithoutNullChecks(value, leftAlias, rightAlias, dbSetting);
var qualifiersWithNullChecks = string.Concat("(", leftAlias, StringConstant.Period, value.AsQuoted(true, true, dbSetting), " IS NULL",
" AND ", rightAlias, StringConstant.Period, value.AsQuoted(true, true, dbSetting), " IS NULL)");
return string.Concat("(", qualifiersWithoutNullChecks, " OR ", qualifiersWithNullChecks, ")");
}

/// <summary>
Expand Down
6 changes: 2 additions & 4 deletions RepoDb.Core/RepoDb/QueryBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,10 +520,8 @@ public QueryBuilder JoinQualifiersFrom(Field field,
string leftAlias,
string rightAlias,
bool considerNulls,
IDbSetting dbSetting)
{
return Append(field.AsJoinQualifier(leftAlias, rightAlias, considerNulls, dbSetting));
}
IDbSetting dbSetting) =>
Append(field.AsJoinQualifier(leftAlias, rightAlias, considerNulls, dbSetting));

/// <summary>
/// Appends a word MERGE to the SQL Query Statement.
Expand Down
36 changes: 2 additions & 34 deletions ...RepoDb.SqlServer.BulkOperations/RepoDb.SqlServer.BulkOperations/SqlConnectionExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,8 +677,7 @@ private static string GetBulkMergeSqlText(string tableName,
.OpenParen()
.WriteText(qualifiers
.Select(
field => /*field.AsJoinQualifier("S", "T", true, dbSetting)*/
AsFieldQualifier(field.Name, "S", "T", true, dbSetting))
field => field.AsJoinQualifier("S", "T", true, dbSetting))
.Join(" AND "))
.CloseParen();

Expand Down Expand Up @@ -729,36 +728,6 @@ private static string GetBulkMergeSqlText(string tableName,
return builder.ToString();
}

/// <summary>
///
/// </summary>
/// <param name="value"></param>
/// <param name="leftAlias"></param>
/// <param name="rightAlias"></param>
/// <param name="considerNulls"></param>
/// <param name="dbSetting"></param>
/// <returns></returns>
///
[Obsolete("Only a temporary hotfix for #864.")]
private static string AsFieldQualifier(string value,
string leftAlias,
string rightAlias,
bool considerNulls,
IDbSetting dbSetting)
{
var qualifiers = string.Concat(leftAlias, ".", value.AsQuoted(true, true, dbSetting), " = ",
rightAlias, ".", value.AsQuoted(true, true, dbSetting));

if (considerNulls)
{
qualifiers = string.Concat("(", qualifiers, " OR (",
leftAlias, ".", value.AsQuoted(true, true, dbSetting), " IS NULL AND ",
rightAlias, ".", value.AsQuoted(true, true, dbSetting), " IS NULL))");
}

return qualifiers;
}

/// <summary>
///
/// </summary>
Expand Down Expand Up @@ -818,8 +787,7 @@ private static string GetBulkUpdateSqlText(string tableName,
.WriteText("ON")
.WriteText(qualifiers
.Select(
field => /*field.AsJoinQualifier("S", "T", true, dbSetting)*/
AsFieldQualifier(field.Name, "S", "T", true, dbSetting))
field => field.AsJoinQualifier("S", "T", true, dbSetting))
.Join(" AND "))
.End();

Expand Down
Loading