← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/ident.cc

  • Committer: Brian Aker
  • Date: 2009-01-17 02:46:52 UTC
  • Revision ID: brian@gir-3.local-20090117024652-4ducefje08ajbs1q
Refactor append_identifier and remove dead OPTION_QUOTE_SHOW_CREATE option
(we always quote).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/ident.cc
112
112
void Item_ident::print(String *str,
113
113
                       enum_query_type)
114
114
{
115
 
  Session *session= current_session;
116
115
  char d_name_buff[MAX_ALIAS_NAME], t_name_buff[MAX_ALIAS_NAME];
117
116
  const char *d_name= db_name, *t_name= table_name;
118
117
  if (lower_case_table_names== 1 ||
136
135
  {
137
136
    const char *nm= (field_name && field_name[0]) ?
138
137
                      field_name : name ? name : "tmp_field";
139
 
    append_identifier(session, str, nm, (uint) strlen(nm));
 
138
    str->append_identifier(nm, (uint) strlen(nm));
 
139
 
140
140
    return;
141
141
  }
142
142
  if (db_name && db_name[0] && !alias_name_used)
143
143
  {
144
144
    {
145
 
      append_identifier(session, str, d_name, (uint)strlen(d_name));
 
145
      str->append_identifier(d_name, (uint)strlen(d_name));
146
146
      str->append('.');
147
147
    }
148
 
    append_identifier(session, str, t_name, (uint)strlen(t_name));
 
148
    str->append_identifier(t_name, (uint)strlen(t_name));
149
149
    str->append('.');
150
 
    append_identifier(session, str, field_name, (uint)strlen(field_name));
 
150
    str->append_identifier(field_name, (uint)strlen(field_name));
151
151
  }
152
152
  else
153
153
  {
154
154
    if (table_name[0])
155
155
    {
156
 
      append_identifier(session, str, t_name, (uint) strlen(t_name));
 
156
      str->append_identifier(t_name, (uint) strlen(t_name));
157
157
      str->append('.');
158
 
      append_identifier(session, str, field_name, (uint) strlen(field_name));
 
158
      str->append_identifier(field_name, (uint) strlen(field_name));
159
159
    }
160
160
    else
161
 
      append_identifier(session, str, field_name, (uint) strlen(field_name));
 
161
      str->append_identifier(field_name, (uint) strlen(field_name));
162
162
  }
163
163
}
164
164