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
Expand Up @@ -81,6 +81,7 @@
import com.introproventures.graphql.jpa.query.schema.impl.EntityIntrospector.EntityIntrospectionResult.AttributePropertyDescriptor;
import com.introproventures.graphql.jpa.query.schema.impl.PredicateFilter.Criteria;
import com.introproventures.graphql.jpa.query.support.GraphQLSupport;

import graphql.GraphQLException;
import graphql.execution.MergedField;
import graphql.execution.ValuesResolver;
Expand Down Expand Up @@ -419,7 +420,8 @@ protected TypedQuery<Object[]> getBatchQuery(DataFetchingEnvironment environment
);

// optionally add default ordering
mayBeAddDefaultOrderBy(query, join, cb);
// FIXME need to extract correct id attribute from collection entity
// mayBeAddDefaultOrderBy(query, join, cb);

return entityManager.createQuery(query.distinct(isDistinct));
}
Expand Down Expand Up @@ -1576,7 +1578,7 @@ else if (FloatValue.class.isInstance(value)) {
return (T) FloatValue.class.cast(value).getValue();
}
else if (NullValue.class.isInstance(value)) {
return (T) null;
return null;
}

throw new IllegalArgumentException("Not supported");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ public void testInstrumentationDisabled() {
ExecutionResult result = executor.execute(query);

// then
assertThat(result.getExtensions()).isNull();
assertThat(result.getExtensions().get("tracing")).isNull();
}

}