← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field_iterator.h

  • Committer: Monty Taylor
  • Date: 2008-12-06 22:41:03 UTC
  • mto: (656.1.7 devel)
  • mto: This revision was merged to the branch mainline in revision 665.
  • Revision ID: monty@inaugust.com-20081206224103-jdouqwt9hb0f01y1
Moved non-working tests into broken suite for easier running of working tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field_iterator.h
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2008 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2008 Sun Microsystems
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
21
21
#ifndef DRIZZLED_FIELD_ITERATOR_H
22
22
#define DRIZZLED_FIELD_ITERATOR_H
23
23
 
24
 
#include <drizzled/memory/sql_alloc.h>
 
24
#include <drizzled/sql_alloc.h>
25
25
#include <drizzled/sql_list.h>
26
26
#include <drizzled/natural_join_column.h>
27
27
 
28
 
namespace drizzled
29
 
{
30
 
 
31
28
class Table;
32
29
class TableList;
33
30
 
35
32
  Iterator over the fields of a generic table reference.
36
33
*/
37
34
 
38
 
class Field_iterator: public memory::SqlAlloc
 
35
class Field_iterator: public Sql_alloc
39
36
{
40
37
public:
41
38
  Field_iterator() {}                         /* Remove gcc warning */
49
46
};
50
47
 
51
48
 
52
 
/*
 
49
/* 
53
50
  Iterator over the fields of a base table, view with temporary
54
51
  table, or subquery.
55
52
*/
78
75
 
79
76
class Field_iterator_natural_join: public Field_iterator
80
77
{
81
 
  List<Natural_join_column>::iterator column_ref_it;
 
78
  List_iterator_fast<Natural_join_column> column_ref_it;
82
79
  Natural_join_column *cur_column_ref;
83
80
public:
84
81
  Field_iterator_natural_join() :cur_column_ref(NULL) {}
131
128
  Natural_join_column *get_natural_column_ref();
132
129
};
133
130
 
134
 
} /* namespace drizzled */
135
131
 
136
132
#endif /* DRIZZLED_FIELD_ITERATOR_H */