Support database with ~/Dropbox/etc in name.
Merge branch 'support_minus_in_database_name'