[finish #60508176] - use a single database connection