← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/show_dictionary/show_columns.h

Merge Joe, plus I updated the tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/show_dictionary/show_columns.h
21
21
#ifndef PLUGIN_SHOW_DICTIONARY_SHOW_COLUMNS_H
22
22
#define PLUGIN_SHOW_DICTIONARY_SHOW_COLUMNS_H
23
23
 
24
 
class ShowColumns : public show_dictionary::Show
 
24
class ShowColumns : public drizzled::plugin::TableFunction
25
25
{
26
26
public:
27
27
  ShowColumns();
28
28
 
29
 
  bool visable() { return false; }
30
 
 
31
 
  class Generator : public show_dictionary::Show::Generator 
 
29
  class Generator : public drizzled::plugin::TableFunction::Generator 
32
30
  {
33
31
    bool is_tables_primed;
34
32
    bool is_columns_primed;
35
33
 
36
34
    int32_t column_iterator;
37
 
    drizzled::message::table::shared_ptr table_proto;
 
35
    drizzled::message::Table table_proto;
38
36
    drizzled::message::Table::Field column;
39
37
 
40
38
    bool nextColumnCore();
42
40
 
43
41
    std::string table_name;
44
42
 
45
 
    drizzled::message::table::shared_ptr getTableProto()
 
43
    const drizzled::message::Table& getTableProto()
46
44
    {
47
45
      return table_proto;
48
46
    }
57
55
      return table_name;
58
56
    }
59
57
 
60
 
    void pushType(drizzled::message::Table::Field::FieldType type, const std::string collation);
 
58
    void pushType(drizzled::message::Table::Field::FieldType type);
61
59
 
62
60
    void fill();
63
61