fix SQL generation to explicitly use provided database name; re-org DB related code into single class