Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.Common;
Expand Down Expand Up @@ -40,7 +41,7 @@ public async Task<DbDataReader> ExecuteQueryAsync(string sqltext, IDictionary<st
{
var parameter = cmd.CreateParameter();
parameter.ParameterName = "@" + parameterEntry.Key;
parameter.Value = parameterEntry.Value;
parameter.Value = parameterEntry.Value ?? DBNull.Value;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mbhaskar do we need to track similar work for Cosmos DB default args as well?

cmd.Parameters.Add(parameter);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,43 @@ private bool isInnerObject(IMiddlewareContext context)
return context.Selection.Field.Type.IsObjectType() && context.Parent<JsonDocument>() != default;
}

static private object ArgumentValue(IValueNode value)
{
if (value.Kind == SyntaxKind.IntValue)
{
var intValue = (IntValueNode)value;
return intValue.ToInt64();
}
else
{
return value.Value;
}
}

private IDictionary<string, object> GetParametersFromContext(IMiddlewareContext context)
{
IReadOnlyList<ArgumentNode> arguments = context.Selection.SyntaxNode.Arguments;
IDictionary<string, object> parameters = new Dictionary<string, object>();
IEnumerator<ArgumentNode> enumerator = arguments.GetEnumerator();
while (enumerator.MoveNext())

// Fill the parameters dictionary with the default argument values
IFieldCollection<IInputField> availableArguments = context.Selection.Field.Arguments;
foreach (var argument in availableArguments)
{
if (argument.DefaultValue == null)
{
parameters.Add(argument.Name.Value, null);
}
else
{
parameters.Add(argument.Name.Value, ArgumentValue(argument.DefaultValue));
}
}


// Overwrite the default values with the passed in arguments
IReadOnlyList<ArgumentNode> passedArguments = context.Selection.SyntaxNode.Arguments;
foreach (var argument in passedArguments)
{
ArgumentNode current = enumerator.Current;
parameters.Add(current.Name.Value, current.Value.Value);
parameters[argument.Name.Value] = ArgumentValue(argument.Value);
}

return parameters;
Expand Down
2 changes: 1 addition & 1 deletion Cosmos.GraphQL.Service/Cosmos.GraphQL.Service/schema.gql
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
type Query {
characterList: [Character]
characterById (id : ID!): Character
planetById (id: ID!): Planet
planetById (id: ID! = 1): Planet
planetList: [Planet]
}

Expand Down