← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/message/table.proto

Merge Stewarts cleanup for proto on tinyint

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/message/table.proto
30
30
    optional uint64 auto_increment = 1;
31
31
    optional string collation = 2;
32
32
    optional uint32 collation_id = 3;
33
 
    optional string connect_string = 4;
34
33
    optional string data_file_name = 5;
35
34
    optional string index_file_name = 6;
36
35
    optional uint64 max_rows = 7;
86
85
      TIME = 8;
87
86
      TIMESTAMP = 9;
88
87
      DATETIME = 10;
89
 
      TINYINT = 11;
90
 
      VIRTUAL = 12;
91
88
    }
92
89
 
93
90
    enum FieldFormatType {
136
133
      repeated bytes field_value = 4;
137
134
    }
138
135
 
139
 
    message VirtualFieldOptions {
140
 
      required FieldType type = 1;
141
 
      required bool physically_stored = 2;
142
 
      /* optional as we could optimise some cases in future */
143
 
      optional string expression = 3;
144
 
    }
145
 
 
146
136
    required string name = 1;
147
137
    required FieldType type = 2;
148
138
    optional FieldFormatType format = 3;
150
140
    optional FieldConstraints constraints = 5;
151
141
    optional NumericFieldOptions numeric_options = 6;
152
142
    optional StringFieldOptions string_options = 7;
153
 
    optional VirtualFieldOptions virtual_options = 8;
154
143
 
155
144
    optional string comment = 16; /* Reserve 0-15 for frequently accessed attributes */
156
145
    optional SetFieldOptions set_options = 17;