Skip to content
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
wants to merge 27 commits into
base: master
Choose a base branch
from
Open

Chore/upstream merge #13

wants to merge 27 commits into from

Conversation

thejensemann
Copy link

No description provided.

a8m and others added 26 commits April 29, 2023 21:00
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
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
@thejensemann thejensemann requested a review from dtunikov April 19, 2024 18:31
@github-actions github-actions bot added the chore label Apr 19, 2024
@thejensemann thejensemann requested a review from Hiroki6 April 19, 2024 18:31
Copy link
Collaborator

@Hiroki6 Hiroki6 left a 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

@thejensemann
Copy link
Author

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
Labels
Development

Successfully merging this pull request may close these issues.