Merge "change raw database quoting to use addQuotes"