[Engine-devel] Move SQL out of stored procedures