← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/field.cc

  • Committer: Stewart Smith
  • Date: 2010-02-15 01:56:32 UTC
  • mto: (1273.13.96 build)
  • mto: This revision was merged to the branch mainline in revision 1308.
  • Revision ID: stewart@flamingspork.com-20100215015632-pm7lnxfq5j5uh8kj
move DATABASE() to function plugin. modify parser so that it looks for a function named 'database' when DATABASE() is called. Special case still needed in parser due to hilarity of not-really-reserved words.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/field.cc
136
136
  Item_field (this is important in prepared statements).
137
137
*/
138
138
 
139
 
Item_field::Item_field(Session *,
140
 
                       Name_resolution_context *context_arg,
141
 
                       Field *f) :
142
 
  Item_ident(context_arg,
143
 
             f->table->s->getSchemaName(),
144
 
             *f->table_name,
145
 
             f->field_name),
146
 
   item_equal(0),
147
 
   no_const_subst(0),
148
 
   have_privileges(0),
149
 
   any_privileges(0)
 
139
Item_field::Item_field(Session *, Name_resolution_context *context_arg,
 
140
                       Field *f)
 
141
  :Item_ident(context_arg, f->table->s->db.str, *f->table_name, f->field_name),
 
142
   item_equal(0), no_const_subst(0),
 
143
   have_privileges(0), any_privileges(0)
150
144
{
151
145
  set_field(f);
152
146
}
154
148
 
155
149
Item_field::Item_field(Name_resolution_context *context_arg,
156
150
                       const char *db_arg,const char *table_name_arg,
157
 
                       const char *field_name_arg) :
158
 
  Item_ident(context_arg, db_arg,table_name_arg,field_name_arg),
159
 
   field(0),
160
 
   result_field(0),
161
 
   item_equal(0),
162
 
   no_const_subst(0),
163
 
   have_privileges(0),
164
 
   any_privileges(0)
 
151
                       const char *field_name_arg)
 
152
  :Item_ident(context_arg, db_arg,table_name_arg,field_name_arg),
 
153
   field(0), result_field(0), item_equal(0), no_const_subst(0),
 
154
   have_privileges(0), any_privileges(0)
165
155
{
166
156
  Select_Lex *select= current_session->lex->current_select;
167
157
  collation.set(DERIVATION_IMPLICIT);
168
 
 
169
158
  if (select && select->parsing_place != IN_HAVING)
170
159
      select->select_n_where_fields++;
171
160
}
174
163
  Constructor need to process subselect with temporary tables (see Item)
175
164
*/
176
165
 
177
 
Item_field::Item_field(Session *session, Item_field *item) :
178
 
  Item_ident(session, item),
179
 
  field(item->field),
180
 
  result_field(item->result_field),
181
 
  item_equal(item->item_equal),
182
 
  no_const_subst(item->no_const_subst),
183
 
  have_privileges(item->have_privileges),
184
 
  any_privileges(item->any_privileges)
 
166
Item_field::Item_field(Session *session, Item_field *item)
 
167
  :Item_ident(session, item),
 
168
   field(item->field),
 
169
   result_field(item->result_field),
 
170
   item_equal(item->item_equal),
 
171
   no_const_subst(item->no_const_subst),
 
172
   have_privileges(item->have_privileges),
 
173
   any_privileges(item->any_privileges)
185
174
{
186
175
  collation.set(DERIVATION_IMPLICIT);
187
176
}
194
183
  max_length= field_par->max_display_length();
195
184
  table_name= *field_par->table_name;
196
185
  field_name= field_par->field_name;
197
 
  db_name= field_par->table->s->getSchemaName();
 
186
  db_name= field_par->table->s->db.str;
198
187
  alias_name_used= field_par->table->alias_name_used;
199
188
  unsigned_flag=test(field_par->flags & UNSIGNED_FLAG);
200
189
  collation.set(field_par->charset(), field_par->derivation());
201
190
  fixed= 1;
 
191
  if (field->table->s->tmp_table == SYSTEM_TMP_TABLE)
 
192
    any_privileges= 0;
202
193
}
203
194
 
204
195
 
365
356
           (!my_strcasecmp(table_alias_charset, item_field->table_name,
366
357
                           table_name) &&
367
358
            (!item_field->db_name || !db_name ||
368
 
             (item_field->db_name && !strcasecmp(item_field->db_name,
 
359
             (item_field->db_name && !strcmp(item_field->db_name,
369
360
                                             db_name))))));
370
361
}
371
362