Column not found: 1054 Unknown column 'e.vocabulary_machine_name' in 'where clause'

Terms were recently changed to support entityCondition('bundle', $bundle), can we maybe switch to that?

Oh, we're using a direct query and not EFQ. So ignore what I said.

Right, then this makes sense. The only thing I'm not sure about is if we should move this into the function that actually does the query. You can see that we already have a special case for comments in there. so we could simply add another one that switches the key as necessary. Should be a much easier patch.

And comment could be improved to to a join to the node table and then add the type condition there :)

Not sure I follow your argument, we already have a special case for comments in there (that could be improved) so why not do the same for taxonomy terms there?

I'm using the patch in #0 for now.

Martin, can you please make sure this goes in. Check with Berdir about how the solution should look like.

Here's an updated patch. Also updated the comments comment there a bit, as I got confused and didn't see the stuff below initially.

Tests, including tests for the new bundle column.

Commited and pushed.