← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/show_dictionary/show_schemas.h

Merge Joe, plus I updated the tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/show_dictionary/show_schemas.h
21
21
#ifndef PLUGIN_SHOW_DICTIONARY_SHOW_SCHEMAS_H
22
22
#define PLUGIN_SHOW_DICTIONARY_SHOW_SCHEMAS_H
23
23
 
24
 
class ShowSchemas : public show_dictionary::Show
 
24
class ShowSchemas : public drizzled::plugin::TableFunction
25
25
{
26
26
public:
27
27
 
28
28
  ShowSchemas();
29
29
 
30
 
  class Generator : public show_dictionary::Show::Generator 
 
30
  ShowSchemas(const char *schema_arg, const char *table_arg) :
 
31
    drizzled::plugin::TableFunction(schema_arg, table_arg)
 
32
  { }
 
33
 
 
34
  class Generator : public drizzled::plugin::TableFunction::Generator 
31
35
  {
 
36
    drizzled::SchemaIdentifiers schema_names;
 
37
    drizzled::SchemaIdentifiers::const_iterator schema_iterator;
 
38
 
 
39
    bool is_schema_primed;
 
40
 
 
41
    virtual void fill();
 
42
    virtual bool checkSchema();
 
43
 
32
44
  public:
33
45
    Generator(drizzled::Field **arg);
34
46
 
35
47
    bool populate();
36
 
 
37
 
  private:
38
 
    drizzled::generator::Schema schema_generator;
 
48
    bool nextSchemaCore();
 
49
    bool nextSchema();
 
50
    bool isSchemaPrimed()
 
51
    {
 
52
      return is_schema_primed;
 
53
    }
39
54
  };
40
55
 
41
56
  Generator *generator(drizzled::Field **arg)