Merge "Avoid postgres IDE error with doQuery() visibility"