Skip to content

Cultural Invariant Conversion of datatypes during mutation #2307

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
merged 6 commits into from
Jul 31, 2024
Merged

Cultural Invariant Conversion of datatypes during mutation #2307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c9f9e46
Added CultureInfo.InvariantCulture when using Convert
sourabh1007 Jul 25, 2024
0f34b18
add test
sourabh1007 Jul 25, 2024
34ba19c
format fix
sourabh1007 Jul 25, 2024
7e73fdd
fix the changes
sourabh1007 Jul 26, 2024
feeb9a7
Merge branch 'main' into users/sourabhjain/culturalbug
sourabh1007 Jul 26, 2024
a0e8e89
Merge branch 'main' into users/sourabhjain/culturalbug
sourabh1007 Jul 27, 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
9 changes: 5 additions & 4 deletions src/Core/Services/TypeHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System.Data;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.Net;
using Azure.DataApiBuilder.Core.Services.OpenAPI;
using Azure.DataApiBuilder.Service.Exceptions;
Expand Down Expand Up @@ -304,12 +305,12 @@ public static bool TryGetDbTypeFromSqlDbDateTimeType(SqlDbType sqlDbType, [NotNu
SyntaxKind valueKind = node.Kind;
return valueKind switch
{
SyntaxKind.IntValue => Convert.ToInt32(node.Value), // spec
SyntaxKind.FloatValue => Convert.ToDouble(node.Value), // spec
SyntaxKind.IntValue => Convert.ToInt32(node.Value, CultureInfo.InvariantCulture), // spec
SyntaxKind.FloatValue => Convert.ToDouble(node.Value, CultureInfo.InvariantCulture), // spec
SyntaxKind.BooleanValue => Convert.ToBoolean(node.Value), // spec
SyntaxKind.StringValue => Convert.ToString(node.Value), // spec
SyntaxKind.StringValue => Convert.ToString(node.Value, CultureInfo.InvariantCulture), // spec
SyntaxKind.NullValue => null, // spec
_ => Convert.ToString(node.Value)
_ => Convert.ToString(node.Value, CultureInfo.InvariantCulture)
};
}

Expand Down
26 changes: 26 additions & 0 deletions src/Service.Tests/CosmosTests/MutationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Net.Http;
using System.Text.Json;
Expand Down Expand Up @@ -1074,6 +1075,31 @@ public async Task CanPatchMoreThan10AttributesInAnItemWithVariables()
Assert.AreEqual(patchResponse.GetProperty("moons").ToString(), JsonSerializer.Serialize(update.moons));
}

[TestMethod]
[DataRow("en-US")]
[DataRow("en-DE")]
public async Task CanCreateItemWithCultureInvariant(string cultureInfo)
{
CultureInfo ci = new(cultureInfo);
CultureInfo.DefaultThreadCurrentCulture = ci;

// Run mutation Add planet;
string id = Guid.NewGuid().ToString();
const string name = "test_name";
string mutation = $@"
mutation {{
createPlanet (item: {{ id: ""{id}"", name: ""{name}"", age: 10.15 }}) {{
id
name
age
}}
}}";
JsonElement response = await ExecuteGraphQLRequestAsync("createPlanet", mutation, variables: new());

// Validate results
Assert.AreEqual(Convert.ToDouble(10.15, CultureInfo.InvariantCulture), response.GetProperty("age").GetDouble());
}

/// <summary>
/// Runs once after all tests in this class are executed
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion src/Service.Tests/CosmosTests/TestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ type Planet @model(name:""PlanetAlias"") {
id : ID!,
name : String,
character: Character,
age : Int,
age : Float,
dimension : String,
earth: Earth,
tags: [String!],
Expand Down