← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/ident.cc

  • Committer: Monty Taylor
  • Date: 2009-02-13 10:40:47 UTC
  • mto: This revision was merged to the branch mainline in revision 885.
  • Revision ID: mordred@inaugust.com-20090213104047-89r7yhlrks86mjeh
Shortened a small chunk of code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/ident.cc
114
114
void Item_ident::print(String *str,
115
115
                       enum_query_type)
116
116
{
117
 
  string d_name_buff, t_name_buff;
118
 
  const char *d_name= db_name, *t_name= table_name;
119
 
  if (db_name)
120
 
    d_name_buff.assign(db_name);
121
 
  if (table_name)
122
 
    t_name_buff.assign(table_name);
 
117
  string d_name, t_name;
123
118
 
124
 
  if (lower_case_table_names== 1 ||
125
 
      (lower_case_table_names == 2 && !alias_name_used))
126
 
  {
127
 
    if (table_name && table_name[0])
128
 
    {
129
 
      std::transform(t_name_buff.begin(), t_name_buff.end(), t_name_buff.begin(), (int(*)(int))tolower);
130
 
      t_name= t_name_buff.c_str();
131
 
    }
132
 
    if (db_name && db_name[0])
133
 
    {
134
 
      std::transform(d_name_buff.begin(), d_name_buff.end(), d_name_buff.begin(), (int(*)(int))tolower);
135
 
      d_name= d_name_buff.c_str();
136
 
    }
 
119
  if (table_name && table_name[0])
 
120
  {
 
121
    t_name.assign(table_name);
 
122
    if (lower_case_table_names== 1 ||
 
123
        (lower_case_table_names == 2 && !alias_name_used))
 
124
      // Keeping the std:: here, since Item_ident has a transform method
 
125
      std::transform(t_name.begin(), t_name.end(),
 
126
                     t_name.begin(), ::tolower);
 
127
  }
 
128
 
 
129
  if (db_name && db_name[0])
 
130
  {
 
131
    d_name.assign(db_name);
 
132
    if (lower_case_table_names== 1 ||
 
133
        (lower_case_table_names == 2 && !alias_name_used))
 
134
      // Keeping the std:: prefix here, since Item_ident has a transform method
 
135
      std::transform(d_name.begin(), d_name.end(),
 
136
                     d_name.begin(), ::tolower);
137
137
  }
138
138
 
139
139
  if (!table_name || !field_name || !field_name[0])
147
147
  if (db_name && db_name[0] && !alias_name_used)
148
148
  {
149
149
    {
150
 
      str->append_identifier(d_name, (uint)strlen(d_name));
 
150
      str->append_identifier(d_name.c_str(), d_name.length());
151
151
      str->append('.');
152
152
    }
153
 
    str->append_identifier(t_name, (uint)strlen(t_name));
 
153
    str->append_identifier(t_name.c_str(), t_name.length());
154
154
    str->append('.');
155
155
    str->append_identifier(field_name, (uint)strlen(field_name));
156
156
  }
158
158
  {
159
159
    if (table_name[0])
160
160
    {
161
 
      str->append_identifier(t_name, (uint) strlen(t_name));
 
161
      str->append_identifier(t_name.c_str(), t_name.length());
162
162
      str->append('.');
163
163
      str->append_identifier(field_name, (uint) strlen(field_name));
164
164
    }