Skip to content

Conversation

@nexdrew
Copy link
Contributor

@nexdrew nexdrew commented Jul 3, 2018

Also reinstate "i" as the "case-insensitive" flag and preserve alphabetical order of flags in table.

Closes #27107.

@nexdrew nexdrew requested a review from a team July 3, 2018 16:52
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@CLAassistant
Copy link

CLAassistant commented Jul 3, 2018

CLA assistant check
All committers have signed the CLA.

@benesch
Copy link
Contributor

benesch commented Jul 4, 2018

Thanks for the contribution! The build is failing the auto-generated HTML version of these docs, in docs/generated/sql/functions.md, that needs to be updated. If you run make build, you should see a diff like this get generated:

--- a/docs/generated/sql/functions.md
+++ b/docs/generated/sql/functions.md
@@ -777,8 +777,12 @@ has no relationship with the commit order of concurrent transactions.</p>
 <td>Case-sensitive matching</td>
 </tr>
 <tr>
+<td><strong>g</strong></td>
+<td>Global matching (match each substring instead of only the first)</td>
+</tr>
+<tr>
 <td><strong>i</strong></td>
-<td>Global matching (match each substring instead of only the first).</td>
+<td>Case-insensitive matching</td>
 </tr>
 <tr>
 <td><strong>m</strong> or <strong>n</strong></td>

Commit that, amend, and push and we'll be good to go. (You can also hit the "Allow edits from maintainers" checkbox on GitHub to allow us to make the change ourselves.)

@benesch benesch self-assigned this Jul 4, 2018
@nexdrew
Copy link
Contributor Author

nexdrew commented Jul 4, 2018

@benesch Done. Thanks for the tip!

@benesch
Copy link
Contributor

benesch commented Jul 4, 2018

Thank you! Looks good. One last nit: we like to keep our commit history tidy, so could you squash those two commits into one? (Again, happy to do this on your behalf if you check that box.)

@nexdrew
Copy link
Contributor Author

nexdrew commented Jul 5, 2018

Ok, but why not just Squash and Merge in GitHub?

Also, from my end, it looks like the checkbox is checked.

The global matching flag is "r", not "i". Reinstate "i" as the
"case-insensitive" flag.
@benesch
Copy link
Contributor

benesch commented Jul 5, 2018

Ok, but why not just Squash and Merge in GitHub?

We use a merge bot, Bors—who'll you'll meet shortly—to prevent merge skew, and Bors doesn't support squashing, unfortunately.

Also, from my end, it looks like the checkbox is checked.

Oh, you're absolutely right. My apologies. I seem to have been pushing to the wrong branch on your remote. I've squashed it now.

Thanks again for your contribution, @nexdrew!

bors r+

craig bot pushed a commit that referenced this pull request Jul 5, 2018
27128: docs: fix the "global matching" regex flag to "g" r=benesch a=nexdrew

Also reinstate "i" as the "case-insensitive" flag and preserve alphabetical order of flags in table.

Closes #27107.

Co-authored-by: nexdrew <andrewbgoode@gmail.com>
@craig
Copy link
Contributor

craig bot commented Jul 5, 2018

Build succeeded

@craig craig bot merged commit 5750385 into cockroachdb:master Jul 5, 2018
@nexdrew nexdrew deleted the fix-27107-docs branch July 6, 2018 13:44
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.

4 participants