Allow giving a database name with the -a option

Per request from Hervé Werner