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.

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

Jump to bottom

refactor nested insert mutation and fix returning (fix #844) #852

Merged
merged 11 commits into from
Nov 2, 2018
Merged

refactor nested insert mutation and fix returning (fix #844) #852

merged 11 commits into from
Nov 2, 2018

Commits on Oct 24, 2018

  1. improved nested insert execution logic

    @rakeshkky
    rakeshkky committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    27142a9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into nested-insert-refactor 

    Resolve Conflicts:
	server/src-lib/Hasura/GraphQL/Resolve/Insert.hs
    @rakeshkky
    rakeshkky committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    9e3ae6b View commit details
    Browse the repository at this point in the history

  3. integrate error path, improve executing 'withExp' and improve tests

    @rakeshkky
    rakeshkky committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    56b3ecc View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2018

  1. Merge branch 'master' into issue-844 

    Resolve Conflicts:
	server/src-lib/Hasura/GraphQL/Resolve/Context.hs
	server/src-lib/Hasura/GraphQL/Resolve/Insert.hs
	server/src-lib/Hasura/GraphQL/Resolve/Mutation.hs
	server/src-lib/Hasura/RQL/DML/Returning.hs
	server/src-lib/Hasura/RQL/DML/Select.hs
    @rakeshkky
    rakeshkky committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    4f6d186 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2018

  1. Merge branch 'master' into issue-844 

    Resolve Conflicts:
	server/src-lib/Hasura/GraphQL/Resolve/Insert.hs
    @rakeshkky
    rakeshkky committed Oct 29, 2018
    Configuration menu
    Copy the full SHA
    ada9451 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2018

  1. Merge branch 'master' into issue-844 

    Resolve Conflicts:
	server/src-lib/Hasura/GraphQL/Resolve/Insert.hs
	server/src-lib/Hasura/GraphQL/Resolve/Mutation.hs
	server/src-lib/Hasura/RQL/DML/Returning.hs
	server/src-lib/Hasura/RQL/DML/Select.hs
    @rakeshkky
    rakeshkky committed Nov 2, 2018
    Configuration menu
    Copy the full SHA
    3debf8b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into issue-844

    @0x777
    0x777 committed Nov 2, 2018
    Configuration menu
    Copy the full SHA
    ad411b3 View commit details
    Browse the repository at this point in the history

  3. add more readable types in '/Resolve/Insert.hs'

    @rakeshkky
    rakeshkky committed Nov 2, 2018
    Configuration menu
    Copy the full SHA
    3e3a2d5 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'issue-844' of github.com:rakeshkky/graphql-engine into … 

    …issue-844
    @rakeshkky
    rakeshkky committed Nov 2, 2018
    Configuration menu
    Copy the full SHA
    790fbfc View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into issue-844

    @0x777
    0x777 committed Nov 2, 2018
    Configuration menu
    Copy the full SHA
    5b99f03 View commit details
    Browse the repository at this point in the history

  6. set conflict context just before executing WITH expression

    @rakeshkky
    rakeshkky committed Nov 2, 2018
    Configuration menu
    Copy the full SHA
    db278ef View commit details
    Browse the repository at this point in the history