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

mysql_deepmerge should treat underscore and dash equivalently, as mysql does #428

Merged

Conversation

radford
Copy link
Contributor

@radford radford commented Jan 24, 2014

No description provided.

@@ -12,6 +12,8 @@ module Puppet::Parser::Functions

When there is a duplicate key that is a hash, they are recursively merged.
When there is a duplicate key that is not a hash, the key in the rightmost hash will "win."
When there are conficting uses of dashes and underscores in two keys (which mysql would otherwise equate),
the rightmost style will win.
Copy link
Contributor

Choose a reason for hiding this comment

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

why's that indented?

@radford
Copy link
Contributor Author

radford commented Jan 24, 2014

To avoid ruining the symmetry of the three Whens. It looked like the previous two Whens were consciously not wrapped so I kept that, but then some people don't like long lines so I indented it. Which way would you like it? I wasn't sure what format the docs were it of if they were parsed by some tool or other.

@apenney
Copy link
Contributor

apenney commented Jan 24, 2014

Oh MySQL, the most complex of beasts.

apenney pushed a commit that referenced this pull request Jan 24, 2014
mysql_deepmerge should treat underscore and dash equivalently, as mysql does
@apenney apenney merged commit 3f9f0f6 into puppetlabs:master Jan 24, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants