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

Fix non-lazy conditional evaluation #4533

Merged
merged 17 commits into from
Jun 29, 2024
Merged

Fix non-lazy conditional evaluation #4533

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
40ef351
add issue test
MaceWindu Jun 17, 2024
55319b9
Improved condition handling.
sdanyliv Jun 17, 2024
8f27318
Added translation of DefaultValueExpression.
sdanyliv Jun 18, 2024
d197be4
Another case for subquery optimization.
sdanyliv Jun 19, 2024
5ca380c
Fixed boolean columns usage.
sdanyliv Jun 26, 2024
73171d5
Merge branch 'master' into issue/conditional-evaluation
sdanyliv Jun 27, 2024
0131581
Added better compatibility handler at the end of the query. Added two…
sdanyliv Jun 27, 2024
9fefda9
Merge branch 'master' into issue/conditional-evaluation
sdanyliv Jun 27, 2024
3e43e9d
Fixed found regressions.
sdanyliv Jun 28, 2024
e3ad4b9
Additional SqlCondtition Optimization/
sdanyliv Jun 28, 2024
edce310
Fix query validation logic.
sdanyliv Jun 28, 2024
2732019
Cleanup.
sdanyliv Jun 28, 2024
6189bc3
Update Source/LinqToDB/Linq/Builder/ExpressionBuilder.Expressions.cs
sdanyliv Jun 28, 2024
1c945e4
Update Source/LinqToDB/Linq/Builder/ExpressionBuilder.SqlBuilder.cs
sdanyliv Jun 28, 2024
f381dd0
Update Source/LinqToDB/Linq/Builder/ExpressionBuilder.SqlBuilder.cs
sdanyliv Jun 28, 2024
5306a2f
Cosmetic changes.
sdanyliv Jun 28, 2024
ae89457
Merge branch 'issue/conditional-evaluation' of https://github.com/lin…
sdanyliv Jun 28, 2024
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
Prev Previous commit
Next Next commit
Cosmetic changes.
  • Loading branch information
@sdanyliv
sdanyliv committed Jun 28, 2024
commit 5306a2f22b303f32f058dd74ecd320aa774e8a68
6 changes: 3 additions & 3 deletions Source/LinqToDB/DataProvider/Informix/InformixSqlExpressionConvertVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,14 @@ protected override ISqlExpression WrapColumnExpression(ISqlExpression expr)
{
var columnExpression = base.WrapColumnExpression(expr);

if (SqlProviderFlags != null && columnExpression.SystemType == typeof(bool) && QueryHelper.UnwrapNullablity(columnExpression) is not (SqlCastExpression or SqlColumn or SqlField))
if (SqlProviderFlags != null
&& columnExpression.SystemType == typeof(bool)
&& QueryHelper.UnwrapNullablity(columnExpression) is not (SqlCastExpression or SqlColumn or SqlField))
{
columnExpression = new SqlCastExpression(columnExpression, new DbDataType(columnExpression.SystemType!, DataType.Boolean), null, isMandatory: true);
}

return columnExpression;
}


}
}
7 changes: 6 additions & 1 deletion Source/LinqToDB/Linq/Builder/ExpressionBuilder.SqlBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,12 @@ public bool IsSupportedSubquery(IBuildContext parent, IBuildContext context, out
evaluationContext : new EvaluationContext()
);

if (!SqlProviderHelper.IsValidQuery(optimizedQuery, parentQuery: null, fakeJoin: fakeJoin, forColumn: false, parent.Builder.DataContext.SqlProviderFlags, out errorMessage))
if (!SqlProviderHelper.IsValidQuery(optimizedQuery,
parentQuery: null,
fakeJoin: fakeJoin,
forColumn: false,
parent.Builder.DataContext.SqlProviderFlags,
out errorMessage))
{
return false;
}
Expand Down
27 changes: 18 additions & 9 deletions Source/LinqToDB/SqlQuery/Visitors/SqlQueryValidatorVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,22 +119,31 @@ bool IsDependsOnOuterSources()
}
}

if (!_providerFlags.IsSubQueryTakeSupported && selectQuery.Select.TakeValue != null && IsDependsOnOuterSources())
if (!_providerFlags.IsSubQueryTakeSupported && selectQuery.Select.TakeValue != null)
{
errorMessage = ErrorHelper.Error_Take_in_Subquery;
return false;
if (_parentQuery?.From.Tables.Count > 0 || IsDependsOnOuterSources())
{
errorMessage = ErrorHelper.Error_Take_in_Subquery;
return false;
}
}

if (!_providerFlags.IsSubQuerySkipSupported && selectQuery.Select.SkipValue != null && IsDependsOnOuterSources())
if (!_providerFlags.IsSubQuerySkipSupported && selectQuery.Select.SkipValue != null)
{
errorMessage = ErrorHelper.Error_Skip_in_Subquery;
return false;
if (_parentQuery?.From.Tables.Count > 0 || IsDependsOnOuterSources())
{
errorMessage = ErrorHelper.Error_Skip_in_Subquery;
return false;
}
}

if (!_providerFlags.IsSubQueryOrderBySupported && !selectQuery.OrderBy.IsEmpty && IsDependsOnOuterSources())
if (!_providerFlags.IsSubQueryOrderBySupported && !selectQuery.OrderBy.IsEmpty)
{
errorMessage = ErrorHelper.Error_OrderBy_in_Subquery;
return false;
if (_parentQuery?.From.Tables.Count > 0 || IsDependsOnOuterSources())
{
errorMessage = ErrorHelper.Error_OrderBy_in_Subquery;
return false;
}
}

if (!_providerFlags.IsSubqueryWithParentReferenceInJoinConditionSupported)
Expand Down