← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/ident.cc

  • Committer: Olaf van der Spek
  • Date: 2011-06-28 20:49:18 UTC
  • mto: This revision was merged to the branch mainline in revision 2362.
  • Revision ID: olafvdspek@gmail.com-20110628204918-vfv1oj3bfae72v3b
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/ident.cc
26
26
 
27
27
using namespace std;
28
28
 
29
 
namespace drizzled
30
 
{
 
29
namespace drizzled {
31
30
 
32
31
const uint32_t NO_CACHED_FIELD_INDEX= UINT32_MAX;
33
32
 
101
100
      snprintf(tmp, tmp_len, "%s.%s", table_name, field_name);
102
101
    }
103
102
    else
104
 
      tmp= (char*) field_name;
 
103
      return field_name;
105
104
  }
106
105
  return tmp;
107
106
}
114
113
  if (table_name && table_name[0])
115
114
  {
116
115
    t_name.assign(table_name);
117
 
    std::transform(t_name.begin(), t_name.end(),
118
 
                   t_name.begin(), ::tolower);
 
116
    std::transform(t_name.begin(), t_name.end(), t_name.begin(), ::tolower);
119
117
  }
120
118
 
121
119
  if (db_name && db_name[0])
123
121
    d_name.assign(db_name);
124
122
    // Keeping the std:: prefix here, since Item_ident has a transform
125
123
    // method
126
 
      std::transform(d_name.begin(), d_name.end(),
127
 
                     d_name.begin(), ::tolower);
 
124
    std::transform(d_name.begin(), d_name.end(), d_name.begin(), ::tolower);
128
125
  }
129
126
 
130
127
  if (!table_name || !field_name || !field_name[0])
131
128
  {
132
 
    const char *nm= (field_name && field_name[0]) ?
133
 
                      field_name : name ? name : "tmp_field";
 
129
    const char *nm= (field_name && field_name[0]) ? field_name : name ? name : "tmp_field";
134
130
    str->append_identifier(nm, (uint32_t) strlen(nm));
135
131
 
136
132
    return;