Fake then and catch functions on non-promise classes break duck typing

The non-promise version of Query defines fake then and catch functions that do nothing more than throwing an error with additional information about using the promise wrapper.
This works great for catching these kind of mistakes but it prevents the use of duck-typing to differentiate between promise- and non-promise api's.

The library I'm trying to use uses this check to test if an implementation is promise-based:

// '_' provided by the underscore module
if (promise && _.isFunction(promise.then) && _.isFunction(promise.catch)) {
	// Probably a promise.
	promise.then(function() {
		done(null);
	}).catch(function(error) {
		done(error);
	});
}

The non-promise implementation of Query passes this test because it defines these two functions. However, these methods do nothing more than throwing an error, which isn't particularly useful in this case.

I suggest removing these 'fake' methods to re-enable duck typing. I feel like the absence of then and catch when using them would be a clear enough sign to the user that the API they're using is not promise based. The process of using the API that is promise based is clearly documented, I don't think people will have trouble finding it. Additionally, I feel like it's just not the best practice to define a function whose only purpose is to notify the user that they shouldn't be using it, especially if that function is characteristic for a certain type of class.

Start by reading the non-promise Query implementation in lib/commands/query.js, especially the linked then and catch definitions. Confirm how the non-promise and promise APIs are distinguished, then verify that the non-promise Query no longer passes the promise duck-typing check while its documented error behavior remains clear.