Make license endpoint return number of nodes in existing orgs #444
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -20,7 +20,7 @@ | |||
| {ping, <<"SELECT 'pong' as ping LIMIT 1">>}. | |||
|
|
|||
| %% Query to count the number of nodes for license checks | |||
| {count_nodes, <<"SELECT COUNT(*) as count FROM nodes">>}. | |||
| {count_nodes, <<"SELECT COUNT(*) as count FROM nodes as n LEFT JOIN orgs as o ON n.org_id = o.id WHERE o.id IS NOT NULL;">>}. | |||
There was a problem hiding this comment.
Might be clearer to SELECT COUNT(*) as count FROM nodes, orgs WHERE orgs.id = nodes.org_id?
There was a problem hiding this comment.
Alt if you wanna get all ANSI-compliant: SELECT COUNT(*) FROM nodes INNER JOIN orgs ON orgs.id = nodes.org_id
jeremiahsnapp
force-pushed
the
jhs/fix_license_endpoint
branch
from
ed72fd2 to
b2eac6a
Compare
|
Thanks @marcparadise for hitting me in the head with the "obvious" stick. 😄 I updated the commit with your ANSI-compliant option. |
|
👍 |
jeremiahsnapp
force-pushed
the
jhs/fix_license_endpoint
branch
from
b2eac6a to
eb95cfa
Compare
|
I'll merge once this passes: http://wilson.ci.chef.co/job/chef-server-12-build/1352 |
marcparadise
added a commit
that referenced
this pull request
Aug 12, 2015
Make license endpoint return number of nodes in existing orgs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@stevendanna This fixes #437.