forked from ent/contrib
-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
Chore/upstream merge #13
Open
thejensemann
wants to merge
27
commits into
master
Choose a base branch
from
chore/upstream-merge
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.7.0 to 0.9.1. - [Release notes](https://github.com/golang/tools/releases) - [Commits](golang/tools@v0.7.0...v0.9.1) --- updated-dependencies: - dependency-name: golang.org/x/tools dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* entgql: fixed Paginate query for count * Update entgql/template/pagination.tmpl Co-authored-by: Ariel Mashraki <7413593+a8m@users.noreply.github.com> * entgql: codegen --------- Co-authored-by: Ariel Mashraki <7413593+a8m@users.noreply.github.com>
* entproto: support json for integer type slices * adding int slices to grpc test suite --------- Co-authored-by: jamslinger <80337165+jamslinger@users.noreply.github.com>
* privatize columns used in cursors predicates * add tests
* fix: rename variable when iterating through p.order to prevent conflict with $r that starts with "O" character * fix: run go generate on entgql
* entgql: upgrade gqlgen and disable getters * entgql: codegen * chore: fixed go.mod
* chore: upgrade ent and atlas * fix: bump go version to 1.20 * .ci: upgrade golangci * chore: codegen
Also when order field is set on an edge
No need to limit per node, when a single node is returned in a path
Improves variable name collision avoidance in the `toCursor` method of the pager types in the `gql_pagination` template by suffixing all hard-coded variables names with an underscore.
# Conflicts: # .github/workflows/ci.yml # entgql/internal/todo/ent.graphql # entgql/internal/todo/ent.resolvers.go # entgql/internal/todo/ent/gql_collection.go # entgql/internal/todo/ent/gql_edge.go # entgql/internal/todo/generated.go # entgql/internal/todofed/ent/gql_collection.go # entgql/internal/todofed/generated.go # entgql/internal/todofed/todo.resolvers.go # entgql/internal/todogotype/ent.resolvers.go # entgql/internal/todogotype/ent/gql_collection.go # entgql/internal/todogotype/ent/gql_edge.go # entgql/internal/todogotype/generated.go # entgql/internal/todogotype/models_gen.go # entgql/internal/todopulid/ent.resolvers.go # entgql/internal/todopulid/ent/gql_collection.go # entgql/internal/todopulid/ent/gql_edge.go # entgql/internal/todopulid/generated.go # entgql/internal/todopulid/models_gen.go # entgql/internal/todouuid/ent.resolvers.go # entgql/internal/todouuid/ent/gql_collection.go # entgql/internal/todouuid/ent/gql_edge.go # entgql/internal/todouuid/generated.go # entgql/internal/todouuid/models_gen.go # entgql/schema_test.go # entgql/template.go # entgql/template/collection.tmpl # entgql/testdata/schema_output.graphql # entgql/testdata/schema_relay.graphql # entgql/testdata/schema_relay_output.graphql
Hiroki6
approved these changes
Jun 4, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we should test if this merge works as expected for us
When I prepared that PR I did not have time to test, but at least we have it in case we need to update contrib in case we encounter a some bug. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.