Skip to content

Remove limitation about on conflict and returning #1803

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

Merged
merged 2 commits into from
Aug 9, 2017

Conversation

jseldess
Copy link
Contributor

@jseldess jseldess commented Aug 9, 2017

Fixes #1693

@jseldess jseldess requested a review from couchand August 9, 2017 11:36
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@cockroach-teamcity
Copy link
Member

@jseldess
Copy link
Contributor Author

jseldess commented Aug 9, 2017

@couchand, this just involved removing text stating that on conflict with returning is not supported. I don't see the need for anything else. Do you?

@Amruta-Ranade, the language around returning nothing in the upsert and insert docs, and probably in other sql statement docs, needs to be revisited once your Parallel Statement Execution PR is further along.

@couchand
Copy link
Contributor

couchand commented Aug 9, 2017

@jseldess LGTM

I'll also draw your attention to cockroachdb/cockroach#17435, which I don't think needs anything in particular, since we hadn't documented the missing functionality anyway. But it might be nice, for those unfamiliar with the details of PGSQL and uninclined to dig into the SQL syntax page, to point out that the DO UPDATE can have a WHERE filter after the SET clause.

@jseldess
Copy link
Contributor Author

jseldess commented Aug 9, 2017

TFTR, @couchand. I also added an example showing DO UPDATE SET with a WHERE filter and called it out as new in 1.1.

@cockroach-teamcity
Copy link
Member

@jseldess
Copy link
Contributor Author

jseldess commented Aug 9, 2017

TC only failing on what should be valid links to old cockroach prs. Overriding TC and merging in the hope that the GitHub hiccup will pass.

@jseldess jseldess merged commit b933af0 into master Aug 9, 2017
@jseldess jseldess deleted the on-conflict-returning branch August 9, 2017 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants