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

Fixed column order #430

Merged
merged 2 commits into from
Aug 27, 2019

Conversation

duckbrain
Copy link
Contributor

Resolves #429

Adds a colNames function that returns a []string sorted. This allows the column names to be modified before being strung together, while ensuring that weird quirks don't cause them to be sorted in a different way. For example: "a" < "a_" < "a``"

@duckbrain duckbrain requested a review from a team as a code owner August 26, 2019 18:26
@stanislas-m stanislas-m self-requested a review August 27, 2019 06:58
@stanislas-m stanislas-m changed the base branch from master to development August 27, 2019 07:00
@stanislas-m
Copy link
Member

@duckbrain Thanks! Can I ask you to rebase your branch on development? All changes must go to development first, then we cherry-pick to master the bugfixes.

@duckbrain duckbrain reopened this Aug 27, 2019
@duckbrain
Copy link
Contributor Author

My bad. Not sure why GitHub decided to close it when I pushed, but I rebased it and reopened.

Curiosity question: Do master and development ever get merged? Doing a real rebase caused a lot of merge conflicts unrelated to my changes, so I reset --hard to development and cherry-picked my changes. I think that should be effectively the same.

@stanislas-m
Copy link
Member

Thanks!

Curiosity question: Do master and development ever get merged? Doing a real rebase caused a lot of merge conflicts unrelated to my changes, so I reset --hard to development and cherry-picked my changes. I think that should be effectively the same.

development gets merged into master on every minor release. Maybe something went wrong when I changed the base branch on your PR? :)

@stanislas-m stanislas-m merged commit 535a7bd into gobuffalo:development Aug 27, 2019
@stanislas-m stanislas-m added this to the Next milestone Aug 27, 2019
stanislas-m pushed a commit that referenced this pull request Aug 27, 2019
* Add test to demonstrate INSERT fails with a suffix on quoted column name #429

* Ensure columns are sorted the same way each time.
@stanislas-m stanislas-m modified the milestones: Next, v4.11.5 Aug 27, 2019
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.

None yet

2 participants