Skip to content

Query: Fixes Parsing Error in SQL DOM when CultureInfo is available #3832

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
5 commits merged into from
May 2, 2023
Merged

Query: Fixes Parsing Error in SQL DOM when CultureInfo is available #3832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7e1adc4
add fix
Apr 14, 2023
e6f8efb
Add cultural info to test to verify correct behavior
May 1, 2023
7ab56ae
address pr review to restore to restore culture
May 2, 2023
2eabd5d
fix comment
May 2, 2023
58f8f76
Merge branch 'master' into users/leminh/ParserCultureFix
leminh98 May 2, 2023
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
3 changes: 2 additions & 1 deletion Microsoft.Azure.Cosmos/src/Query/Core/Parser/CstToAstVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ namespace Microsoft.Azure.Cosmos.Query.Core.Parser
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Diagnostics.Contracts;
using System.Globalization;
using Antlr4.Runtime.Misc;
using Antlr4.Runtime.Tree;
using Microsoft.Azure.Cosmos.SqlObjects;
Expand Down Expand Up @@ -963,7 +964,7 @@ private static Number64 GetNumber64ValueFromNode(IParseTree parseTree)
}
else
{
number64 = double.Parse(text);
number64 = double.Parse(text, CultureInfo.InvariantCulture);
}

return number64;
Expand Down
21 changes: 21 additions & 0 deletions ...ft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Query/Parser/SqlParserBaselineTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
namespace Microsoft.Azure.Cosmos.Tests.Query.Parser
{
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Threading;
using System.Xml;
using Microsoft.Azure.Cosmos.Query.Core.Monads;
using Microsoft.Azure.Cosmos.Query.Core.Parser;
Expand All @@ -17,6 +20,8 @@ public abstract class SqlParserBaselineTests : BaselineTests<SqlParserBaselineTe
{
public override SqlParserBaselineTestOutput ExecuteTest(SqlParserBaselineTestInput input)
{
CultureInfo defaultCulture = Thread.CurrentThread.CurrentCulture;

TryCatch<SqlQuery> parseQueryMonad = SqlQueryParser.Monadic.Parse(input.Query);
if (parseQueryMonad.Succeeded)
{
Expand All @@ -26,6 +31,22 @@ public override SqlParserBaselineTestOutput ExecuteTest(SqlParserBaselineTestInp
Assert.AreEqual(parseQueryMonad.Result, parseQueryMonad2.Result);
}

// Set culture to non-standard (US) to catch any parsing error
foreach (string culture in new List<string> { "en-US", "fr-FR", "jp-JP" })
{
Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo(culture);
TryCatch<SqlQuery> parseQueryMonadCulture = SqlQueryParser.Monadic.Parse(input.Query);
if (parseQueryMonadCulture.Succeeded)
{
// Addtional round trip for extra validation
TryCatch<SqlQuery> parseQueryMonadCulture2 = SqlQueryParser.Monadic.Parse(parseQueryMonad.Result.ToString());
Assert.IsTrue(parseQueryMonadCulture2.Succeeded);
Assert.AreEqual(parseQueryMonadCulture2.Result, parseQueryMonadCulture2.Result);
}
}

// return thread to default culture
Thread.CurrentThread.CurrentCulture = defaultCulture;
return new SqlParserBaselineTestOutput(parseQueryMonad);
}
}
Expand Down