Attempting to override database_name turned out to have inconsistent results with mysql2 in production. Changed to current_database_name to ensure we don't step on other codes toes