db query should be empty string, not nil

Fixes TypeError - can't convert nil into String when trying to append
nil to the db_uri later down in the code

Change-Id: I3722829c5393a3f60dede078be131baf96288c2a
Merge "db query should be empty string, not nil"