← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/schema_dictionary/tables.cc

  • Committer: lbieber
  • Date: 2010-10-06 02:01:43 UTC
  • mfrom: (1814.1.1 build)
  • Revision ID: lbieber@orisndriz08-20101006020143-gho0wsmd346m02f9
Merge Brian - fix bug 654905 - DATA_DICTIONARY.TABLE.TYPE not returning BASE or VIEW (it reports the port type).

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/schema_dictionary/tables.cc
48
48
  add_field("TABLE_SCHEMA");
49
49
  add_field("TABLE_NAME");
50
50
  add_field("TABLE_TYPE");
 
51
  add_field("TABLE_ARCHETYPE");
51
52
  add_field("ENGINE");
52
53
  add_field("ROW_FORMAT", 10);
53
54
  add_field("TABLE_COLLATION");
55
56
  add_field("TABLE_UPDATE_TIME");
56
57
  add_field("TABLE_COMMENT", plugin::TableFunction::STRING, 2048, true);
57
58
  add_field("AUTO_INCREMENT", plugin::TableFunction::NUMBER, 0, false);
 
59
  add_field("TABLE_UUID", plugin::TableFunction::STRING, 36, true);
 
60
  add_field("TABLE_VERSION", plugin::TableFunction::NUMBER, 0, true);
58
61
}
59
62
 
60
63
TablesTool::Generator::Generator(Field **arg) :
138
141
  push(getTableMessage().name());
139
142
 
140
143
  /* TABLE_TYPE */
 
144
  if (drizzled::TableIdentifier::isView(getTableMessage().type()))
 
145
  {
 
146
    push("VIEW");
 
147
  }
 
148
  else
 
149
  {
 
150
    push("BASE");
 
151
  }
 
152
 
 
153
  /* TABLE_ARCHETYPE */
141
154
  {
142
155
    switch (getTableMessage().type())
143
156
    {
193
206
 
194
207
  /* AUTO_INCREMENT */
195
208
  push(getTableMessage().options().auto_increment_value());
 
209
 
 
210
  /* TABLE_UUID */
 
211
  push(getTableMessage().uuid());
 
212
 
 
213
  /* TABLE_VERSION */
 
214
  push(getTableMessage().version());
196
215
}