[#2036] use database_port in the connection string, had been missing
[#2038] skip creating the database if it does not exist