← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/generator/all_tables.h

  • Committer: Brian Aker
  • Date: 2011-02-22 06:12:02 UTC
  • mfrom: (2190.1.6 drizzle-build)
  • Revision ID: brian@tangent.org-20110222061202-k03czxykqy4x9hjs
List update, header fixes, multiple symbols, and David deletes some code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/generator/all_tables.h
21
21
#ifndef DRIZZLED_GENERATOR_ALL_TABLES_H
22
22
#define DRIZZLED_GENERATOR_ALL_TABLES_H
23
23
 
24
 
#include "drizzled/plugin/storage_engine.h"
 
24
#include <drizzled/plugin/storage_engine.h>
25
25
 
26
26
namespace drizzled {
27
27
namespace generator {
29
29
class AllTables
30
30
{
31
31
  Session &session;
32
 
  message::table::shared_ptr table;
33
32
 
34
 
  TableIdentifier::vector table_names;
35
 
  TableIdentifier::vector::const_iterator table_iterator;
 
33
  identifier::Table::vector table_names;
 
34
  identifier::Table::vector::const_iterator table_iterator;
36
35
 
37
36
  drizzled::generator::Schema schema_generator;
38
 
  const drizzled::SchemaIdentifier *schema_ptr;
 
37
  const drizzled::identifier::Schema *schema_ptr;
39
38
 
40
39
  bool table_setup();
41
40
 
50
49
    do {
51
50
      while (table_iterator != table_names.end())
52
51
      {
53
 
        bool is_table_parsed= plugin::StorageEngine::getTableDefinition(session, *table_iterator, table);
 
52
        message::table::shared_ptr table;
 
53
        table= plugin::StorageEngine::getTableMessage(session, *table_iterator);
54
54
        table_iterator++;
55
55
 
56
 
        if (is_table_parsed)
 
56
        if (table)
57
57
          return table;
58
58
      }
59
59
    } while ((schema_ptr= schema_generator) && table_setup());
61
61
    return message::table::shared_ptr();
62
62
  }
63
63
 
64
 
  operator const drizzled::TableIdentifier*()
 
64
  operator const drizzled::identifier::Table*()
65
65
  {
66
66
    do {
67
67
      while (table_iterator != table_names.end())
68
68
      {
69
 
        const drizzled::TableIdentifier *_ptr= &(*table_iterator);
 
69
        const drizzled::identifier::Table *_ptr= &(*table_iterator);
70
70
        table_iterator++;
71
71
 
72
72
        return _ptr;