Merge "Leave table names with numbers untouched in DatabaseBase::generalizeSQL"