← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/generator/table.h

  • Committer: Brian Aker
  • Date: 2011-02-04 09:29:39 UTC
  • mfrom: (2139.3.6 catalogs)
  • mto: This revision was merged to the branch mainline in revision 2144.
  • Revision ID: brian@tangent.org-20110204092939-nlwrimamw0fxxhgl
Main bit of this patch is that Inno now just uses the identifier so we only
have one spot to make changes for paths.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/generator/table.h
21
21
#ifndef DRIZZLED_GENERATOR_TABLE_H
22
22
#define DRIZZLED_GENERATOR_TABLE_H
23
23
 
24
 
#include <drizzled/plugin/storage_engine.h>
 
24
#include "drizzled/session.h"
 
25
#include "drizzled/plugin/storage_engine.h"
25
26
 
26
27
namespace drizzled {
27
 
 
28
 
class Session;
29
 
 
30
28
namespace generator {
31
29
 
32
30
class Table
33
31
{
34
32
  Session &session;
 
33
  message::table::shared_ptr table;
35
34
 
36
35
  identifier::Table::vector table_names;
37
36
  identifier::Table::vector::const_iterator table_iterator;
44
43
  {
45
44
    while (table_iterator != table_names.end())
46
45
    {
47
 
      message::table::shared_ptr table;
48
 
      table= plugin::StorageEngine::getTableMessage(session, *table_iterator);
 
46
      table->Clear();
 
47
      bool is_table_parsed= plugin::StorageEngine::getTableDefinition(session, *table_iterator, table);
49
48
      table_iterator++;
50
49
 
51
 
      if (table)
 
50
      if (is_table_parsed)
52
51
        return table;
53
52
    }
54
53