[#2228] add missing return statements to PGSQL and MySQL