Apply #6 to PostgreSQL and SQL Server drivers