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

Update the documentation for UPSERT and INSERT #4215

Merged
merged 1 commit into from
Dec 31, 2018

Conversation

knz
Copy link
Contributor

@knz knz commented Dec 28, 2018

As was discussed with @andy-kimball.

@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Contributor

@jseldess jseldess left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained


v2.1/insert.md, line 661 at r1 (raw file):

~~~

### Importing data with duplicates rows using `ON CONFLICT`

To be consistent with other example titles, change Importing to Import.

Also change duplicates to duplicate.


v2.1/upsert.md, line 18 at r1 (raw file):

- A single [multi-row `UPSERT`](#upsert-multiple-rows) statement is faster than multiple single-row `UPSERT` statements. Whenever possible, use multi-row `UPSERT` instead of multiple single-row `UPSERT` statements.

- If the input data contains duplicates, see [Importing data with duplicate rows](#importing-data-with-duplicate-rows) below.

You'll need to update the link as well.


v2.1/upsert.md, line 22 at r1 (raw file):

## Required privileges

The user must have the `INSERT`, `SELECT` and `UPDATE` [privileges](authorization.html#assign-privileges) on the table.

Unfortunately, @Amruta-Ranade hasn't yet ported the security doc changes from 2.2 to 2.1 yet, so this link is broken. Instead, please just use privileges.html, and Amruta will fix this when she handles the backporting.


v2.1/upsert.md, line 238 at r1 (raw file):

~~~

### Importing data with duplicate rows

To be consistent with other example titles, change Importing to Import.


v2.2/insert.md, line 661 at r1 (raw file):

~~~

### Importing data with duplicates rows using `ON CONFLICT`

To be consistent with other example titles, change Importing to Import.

Also change duplicates to duplicate.


v2.2/upsert.md, line 18 at r1 (raw file):

- A single [multi-row `UPSERT`](#upsert-multiple-rows) statement is faster than multiple single-row `UPSERT` statements. Whenever possible, use multi-row `UPSERT` instead of multiple single-row `UPSERT` statements.

- If the input data contains duplicates, see [Importing data with duplicate rows](#importing-data-with-duplicate-rows) below.

Same as above.


v2.2/upsert.md, line 238 at r1 (raw file):

~~~

### Importing data with duplicate rows

To be consistent with other example titles, change Importing to Import.

@knz knz force-pushed the 20181228-insert-upsert branch from f1ccc15 to bd3123c Compare December 30, 2018 13:19
Copy link
Contributor Author

@knz knz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained


v2.1/insert.md, line 661 at r1 (raw file):

Previously, jseldess (Jesse Seldess) wrote…

To be consistent with other example titles, change Importing to Import.

Also change duplicates to duplicate.

Done.


v2.1/upsert.md, line 18 at r1 (raw file):

Previously, jseldess (Jesse Seldess) wrote…

You'll need to update the link as well.

Done.


v2.1/upsert.md, line 22 at r1 (raw file):

Previously, jseldess (Jesse Seldess) wrote…

Unfortunately, @Amruta-Ranade hasn't yet ported the security doc changes from 2.2 to 2.1 yet, so this link is broken. Instead, please just use privileges.html, and Amruta will fix this when she handles the backporting.

Done.


v2.1/upsert.md, line 238 at r1 (raw file):

Previously, jseldess (Jesse Seldess) wrote…

To be consistent with other example titles, change Importing to Import.

Done.


v2.2/insert.md, line 661 at r1 (raw file):

Previously, jseldess (Jesse Seldess) wrote…

To be consistent with other example titles, change Importing to Import.

Also change duplicates to duplicate.

Done.


v2.2/upsert.md, line 18 at r1 (raw file):

Previously, jseldess (Jesse Seldess) wrote…

Same as above.

Done.


v2.2/upsert.md, line 238 at r1 (raw file):

Previously, jseldess (Jesse Seldess) wrote…

To be consistent with other example titles, change Importing to Import.

Done.

Copy link
Contributor

@jseldess jseldess left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained

@knz
Copy link
Contributor Author

knz commented Dec 31, 2018

thanks :)

@knz knz merged commit c555faa into cockroachdb:master Dec 31, 2018
@knz knz removed the in progress label Dec 31, 2018
@knz knz deleted the 20181228-insert-upsert branch December 31, 2018 11:00
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