Skip to content

Query: Fixes LINQ ToString got absorbed during translation #3385

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

Merged
ealsur merged 13 commits into from
Oct 13, 2022
Merged

Query: Fixes LINQ ToString got absorbed during translation #3385

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
deb1cca
Fix ToString bug,
Aug 15, 2022
51ee3dc
Merge branch 'master' into users/leminh/LinqToStringFix
ealsur Aug 22, 2022
b652ba9
address code review 1
Sep 19, 2022
4f379b7
Merge branch 'users/leminh/LinqToStringFix' of https://github.com/Azu…
Sep 19, 2022
b2275be
Address code review
Oct 10, 2022
b7ff60d
Merge branch 'master' into users/leminh/LinqToStringFix
leminh98 Oct 10, 2022
ccf034b
move guid under no assign warning disable
Oct 10, 2022
0055210
Merge branch 'users/leminh/LinqToStringFix' of https://github.com/Azu…
Oct 10, 2022
4fbea97
address test errors
Oct 11, 2022
829a193
Merge branch 'master' into users/leminh/LinqToStringFix
leminh98 Oct 12, 2022
7ea3227
Commented out some test that was differed but expected
Oct 12, 2022
2cfceac
Merge branch 'users/leminh/LinqToStringFix' of https://github.com/Azu…
Oct 12, 2022
6566b4c
Merge branch 'master' into users/leminh/LinqToStringFix
ealsur Oct 13, 2022
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
15 changes: 5 additions & 10 deletions Microsoft.Azure.Cosmos/src/Linq/BuiltinFunctions/BuiltinFunctionVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,11 @@ public static SqlScalarExpression VisitBuiltinFunctionCall(MethodCallExpression
return MathBuiltinFunctions.Visit(methodCallExpression, context);
}

// String functions
if (declaringType == typeof(string))
// String functions or ToString with Objects (String and Guid only)
if ((declaringType == typeof(string)) ||
(methodCallExpression.Method.Name == "ToString" &&
methodCallExpression.Arguments.Count == 0 &&
methodCallExpression.Object != null))
{
return StringBuiltinFunctions.Visit(methodCallExpression, context);
}
Expand All @@ -83,14 +86,6 @@ public static SqlScalarExpression VisitBuiltinFunctionCall(MethodCallExpression
return SpatialBuiltinFunctions.Visit(methodCallExpression, context);
}

// ToString with Objects (String and Guid only)
if (methodCallExpression.Method.Name == "ToString" &&
methodCallExpression.Arguments.Count == 0 &&
methodCallExpression.Object != null)
{
return ExpressionToSql.VisitNonSubqueryScalarExpression(methodCallExpression.Object, context);
}

throw new DocumentQueryException(string.Format(CultureInfo.CurrentCulture, ClientResources.MethodNotSupported, methodCallExpression.Method.Name));
}

Expand Down
25 changes: 25 additions & 0 deletions Microsoft.Azure.Cosmos/src/Linq/BuiltinFunctions/StringBuiltinFunctions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,27 @@ protected override SqlScalarExpression VisitExplicit(MethodCallExpression method
}
}

private class StringVisitToString : SqlBuiltinFunctionVisitor
{
public StringVisitToString()
: base("ToString",
true,
null)
{
}

protected override SqlScalarExpression VisitImplicit(MethodCallExpression methodCallExpression, TranslationContext context)
{
if ((methodCallExpression.Arguments.Count == 0) && (methodCallExpression.Object != null))
{
SqlScalarExpression str = ExpressionToSql.VisitNonSubqueryScalarExpression(methodCallExpression.Object, context);
return SqlFunctionCallScalarExpression.CreateBuiltin(SqlFunctionCallScalarExpression.Names.ToString, str);
}

return null;
}
}

static StringBuiltinFunctions()
{
StringBuiltinFunctionDefinitions = new Dictionary<string, BuiltinFunctionVisitor>
Expand Down Expand Up @@ -386,6 +407,10 @@ static StringBuiltinFunctions()
"Reverse",
new StringVisitReverse()
},
{
"ToString",
new StringVisitToString()
},
{
"TrimEnd",
new StringVisitTrimEnd()
Expand Down
2 changes: 1 addition & 1 deletion ...mulatorTests/BaselineTest/TestBaseline/LinqGeneralBaselineTests.TestThenByTranslation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ JOIN (
SELECT VALUE MAX(t0["Amount"])
FROM root
JOIN t0 IN root["Records"]["Transactions"])) AS v0
ORDER BY (root["IsRegistered"] ? root["FamilyId"] : root["Int"]) DESC, (v0[0] % 1000) ASC
ORDER BY (root["IsRegistered"] ? root["FamilyId"] : ToString(root["Int"])) DESC, (v0[0] % 1000) ASC
]]></SqlQuery>
<ErrorMessage><![CDATA[Status Code: BadRequest,{"errors":[{"severity":"Error","code":2206,"message":"Unsupported ORDER BY clause. ORDER BY item expression could not be mapped to a document path."}]},0x800A0B00]]></ErrorMessage>
</Output>
Expand Down
2 changes: 1 addition & 1 deletion ....EmulatorTests/BaselineTest/TestBaseline/LinqGeneralBaselineTests.ValidateLinqQueries.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ WHERE (root["id"] = "098aa945-7ed8-4c50-b7b8-bd99eddb54bc")]]></SqlQuery>
<SqlQuery><![CDATA[
SELECT VALUE root
FROM root
WHERE (root["id"] = "098aa945-7ed8-4c50-b7b8-bd99eddb54bc")]]></SqlQuery>
WHERE (ToString(root["id"]) = "098aa945-7ed8-4c50-b7b8-bd99eddb54bc")]]></SqlQuery>
</Output>
</Result>
<Result>
Expand Down
2 changes: 1 addition & 1 deletion ...ulatorTests/BaselineTest/TestBaseline/LinqTranslationBaselineTests.TestSpecialMethods.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ FROM root]]></SqlQuery>
</Input>
<Output>
<SqlQuery><![CDATA[
SELECT VALUE root["StringField"]
SELECT VALUE ToString(root["StringField"])
FROM root]]></SqlQuery>
</Output>
</Result>
Expand Down
11 changes: 11 additions & 0 deletions ...latorTests/BaselineTest/TestBaseline/LinqTranslationBaselineTests.TestStringFunctions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,17 @@ FROM root]]></SqlQuery>
<Output>
<SqlQuery><![CDATA[
SELECT VALUE SUBSTRING(root["StringField"], 0, 1)
FROM root]]></SqlQuery>
</Output>
</Result>
<Result>
<Input>
<Description><![CDATA[Substring]]></Description>
<Expression><![CDATA[query.Select(doc => doc.StringField.ToString())]]></Expression>
</Input>
<Output>
<SqlQuery><![CDATA[
SELECT VALUE ToString(root["StringField"])
FROM root]]></SqlQuery>
</Output>
</Result>
Expand Down
2 changes: 2 additions & 0 deletions ...t.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/LinqTranslationBaselineTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,6 +757,8 @@ public void TestStringFunctions()
new LinqTestInput("String constant StartsWith (case-insensitive)", b => getQuery(b).Select(doc => "sTr".StartsWith(doc.StringField, StringComparison.OrdinalIgnoreCase))),
// Substring
new LinqTestInput("Substring", b => getQuery(b).Select(doc => doc.StringField.Substring(0, 1))),
// ToString
new LinqTestInput("Substring", b => getQuery(b).Select(doc => doc.StringField.ToString())),
// ToUpper
new LinqTestInput("ToUpper", b => getQuery(b).Select(doc => doc.StringField.ToUpper()))
};
Expand Down