This replaces the previous patch.  The `sql-product-interactive' call
was still using the modified signature and does no longer.