← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/message/table_reader.cc

Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/message/table_reader.cc
47
47
 
48
48
  message::Table::Field::FieldType field_type= field.type();
49
49
 
50
 
  if(field_type==message::Table::Field::VIRTUAL)
51
 
  {
52
 
    cout << " VIRTUAL"; // FIXME
53
 
    field_type= field.virtual_options().type();
54
 
  }
55
 
 
56
50
  switch (field_type)
57
51
  {
58
52
    case message::Table::Field::DOUBLE:
82
76
      cout << ") ";
83
77
      break;
84
78
    }
85
 
  case message::Table::Field::TINYINT:
86
 
    cout << " TINYINT ";
87
 
    break;
88
79
  case message::Table::Field::INTEGER:
89
80
    cout << " INT" ;
90
81
    break;
106
97
  case message::Table::Field::DATETIME:
107
98
    cout << " DATETIME ";
108
99
    break;
109
 
  case message::Table::Field::VIRTUAL:
110
 
    abort(); // handled above.
111
 
  }
112
 
 
113
 
  if(field.type()==message::Table::Field::VIRTUAL)
114
 
  {
115
 
    cout << " AS (" << field.virtual_options().expression() << ") ";
116
 
    if(field.virtual_options().physically_stored())
117
 
      cout << " STORED ";
118
100
  }
119
101
 
120
102
  if (field.type() == message::Table::Field::INTEGER
121
 
      || field.type() == message::Table::Field::BIGINT
122
 
      || field.type() == message::Table::Field::TINYINT)
 
103
      || field.type() == message::Table::Field::BIGINT)
123
104
  {
124
105
    if (field.has_constraints()
125
106
        && field.constraints().has_is_unsigned())
217
198
  if (options.has_collation_id())
218
199
    cout << "-- collation_id = " << options.collation_id() << endl;
219
200
  
220
 
  if (options.has_connect_string())
221
 
    cout << " CONNECT_STRING = '" << options.connect_string() << "'"<<endl;
222
 
 
223
201
  if (options.has_row_type())
224
202
    cout << " ROW_TYPE = " << options.row_type() << endl;
225
203