~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/info_schema/columns.cc

  • Committer: Padraig O'Sullivan
  • Date: 2009-11-25 16:55:42 UTC
  • mto: (1228.4.1 push)
  • mto: This revision was merged to the branch mainline in revision 1234.
  • Revision ID: osullivan.padraig@gmail.com-20091125165542-8vo6u1e7jgdjs2j5
Removed the redundant open table method parameter to columns associated with an I_S table.

Show diffs side-by-side

added added

removed removed

Lines of Context:
74
74
                                            DRIZZLE_TYPE_VARCHAR,
75
75
                                            0,
76
76
                                            1,
77
 
                                            "",
78
 
                                            OPEN_FRM_ONLY));
 
77
                                            ""));
79
78
 
80
79
  columns->push_back(new plugin::ColumnInfo("TABLE_SCHEMA",
81
80
                                            NAME_CHAR_LEN,
82
81
                                            DRIZZLE_TYPE_VARCHAR,
83
82
                                            0,
84
83
                                            0,
85
 
                                            "",
86
 
                                            OPEN_FRM_ONLY));
 
84
                                            ""));
87
85
 
88
86
  columns->push_back(new plugin::ColumnInfo("TABLE_NAME",
89
87
                                            NAME_CHAR_LEN,
90
88
                                            DRIZZLE_TYPE_VARCHAR,
91
89
                                            0,
92
90
                                            0,
93
 
                                            "",
94
 
                                            OPEN_FRM_ONLY));
 
91
                                            ""));
95
92
 
96
93
  columns->push_back(new plugin::ColumnInfo("COLUMN_NAME",
97
94
                                            NAME_CHAR_LEN,
98
95
                                            DRIZZLE_TYPE_VARCHAR,
99
96
                                            0,
100
97
                                            0,
101
 
                                            "Field",
102
 
                                            OPEN_FRM_ONLY));
 
98
                                            "Field"));
103
99
 
104
100
  columns->push_back(new plugin::ColumnInfo("ORDINAL_POSITION",
105
101
                                            MY_INT64_NUM_DECIMAL_DIGITS,
106
102
                                            DRIZZLE_TYPE_LONGLONG,
107
103
                                            0,
108
104
                                            MY_I_S_UNSIGNED,
109
 
                                            "",
110
 
                                            OPEN_FRM_ONLY));
 
105
                                            ""));
111
106
 
112
107
  columns->push_back(new plugin::ColumnInfo("COLUMN_DEFAULT",
113
108
                                            64,
115
110
                                            DRIZZLE_TYPE_VARCHAR,
116
111
                                            0,
117
112
                                            1,
118
 
                                            "Default",
119
 
                                            OPEN_FRM_ONLY));
 
113
                                            "Default"));
120
114
 
121
115
  columns->push_back(new plugin::ColumnInfo("IS_NULLABLE",
122
116
                                            3,
123
117
                                            DRIZZLE_TYPE_VARCHAR,
124
118
                                            0,
125
119
                                            0,
126
 
                                            "Null",
127
 
                                            OPEN_FRM_ONLY));
 
120
                                            "Null"));
128
121
 
129
122
  columns->push_back(new plugin::ColumnInfo("DATA_TYPE",
130
123
                                            NAME_CHAR_LEN,
131
124
                                            DRIZZLE_TYPE_VARCHAR,
132
125
                                            0,
133
126
                                            0,
134
 
                                            "",
135
 
                                            OPEN_FRM_ONLY));
 
127
                                            ""));
136
128
 
137
129
  columns->push_back(new plugin::ColumnInfo("CHARACTER_MAXIMUM_LENGTH",
138
130
                                           MY_INT64_NUM_DECIMAL_DIGITS,
139
131
                                           DRIZZLE_TYPE_LONGLONG,
140
132
                                           0,
141
133
                                           (MY_I_S_MAYBE_NULL | MY_I_S_UNSIGNED),
142
 
                                           "",
143
 
                                           OPEN_FRM_ONLY));
 
134
                                           ""));
144
135
 
145
136
  columns->push_back(new plugin::ColumnInfo("CHARACTER_OCTET_LENGTH",
146
137
                                            MY_INT64_NUM_DECIMAL_DIGITS,
147
138
                                            DRIZZLE_TYPE_LONGLONG,
148
139
                                            0,
149
140
                                            (MY_I_S_MAYBE_NULL | MY_I_S_UNSIGNED),
150
 
                                            "",
151
 
                                            OPEN_FRM_ONLY));
 
141
                                            ""));
152
142
 
153
143
  columns->push_back(new plugin::ColumnInfo("NUMERIC_PRECISION",
154
144
                                            MY_INT64_NUM_DECIMAL_DIGITS,
155
145
                                            DRIZZLE_TYPE_LONGLONG,
156
146
                                            0,
157
147
                                            (MY_I_S_MAYBE_NULL | MY_I_S_UNSIGNED),
158
 
                                            "",
159
 
                                            OPEN_FRM_ONLY));
 
148
                                            ""));
160
149
 
161
150
  columns->push_back(new plugin::ColumnInfo("NUMERIC_SCALE",
162
151
                                            MY_INT64_NUM_DECIMAL_DIGITS,
163
152
                                            DRIZZLE_TYPE_LONGLONG,
164
153
                                            0,
165
154
                                            (MY_I_S_MAYBE_NULL | MY_I_S_UNSIGNED),
166
 
                                            "",
167
 
                                            OPEN_FRM_ONLY));
 
155
                                            ""));
168
156
 
169
157
  columns->push_back(new plugin::ColumnInfo("CHARACTER_SET_NAME",
170
158
                                            64,
171
159
                                            DRIZZLE_TYPE_VARCHAR,
172
160
                                            0,
173
161
                                            1,
174
 
                                            "",
175
 
                                            OPEN_FRM_ONLY));
 
162
                                            ""));
176
163
 
177
164
  columns->push_back(new plugin::ColumnInfo("COLLATION_NAME",
178
165
                                            64,
179
166
                                            DRIZZLE_TYPE_VARCHAR,
180
167
                                            0,
181
168
                                            1,
182
 
                                            "Collation",
183
 
                                            OPEN_FRM_ONLY));
 
169
                                            "Collation"));
184
170
 
185
171
  columns->push_back(new plugin::ColumnInfo("COLUMN_TYPE",
186
172
                                            64,
188
174
                                            DRIZZLE_TYPE_VARCHAR,
189
175
                                            0,
190
176
                                            0,
191
 
                                            "Type",
192
 
                                            OPEN_FRM_ONLY));
 
177
                                            "Type"));
193
178
 
194
179
  columns->push_back(new plugin::ColumnInfo("COLUMN_KEY",
195
180
                                            3,
196
181
                                            DRIZZLE_TYPE_VARCHAR,
197
182
                                            0,
198
183
                                            0,
199
 
                                            "Key",
200
 
                                            OPEN_FRM_ONLY));
 
184
                                            "Key"));
201
185
 
202
186
  columns->push_back(new plugin::ColumnInfo("EXTRA",
203
187
                                            27,
204
188
                                            DRIZZLE_TYPE_VARCHAR,
205
189
                                            0,
206
190
                                            0,
207
 
                                            "Extra",
208
 
                                            OPEN_FRM_ONLY));
 
191
                                            "Extra"));
209
192
 
210
193
  columns->push_back(new plugin::ColumnInfo("PRIVILEGES",
211
194
                                            80,
212
195
                                            DRIZZLE_TYPE_VARCHAR,
213
196
                                            0,
214
197
                                            0,
215
 
                                            "Privileges",
216
 
                                            OPEN_FRM_ONLY));
 
198
                                            "Privileges"));
217
199
 
218
200
  columns->push_back(new plugin::ColumnInfo("COLUMN_COMMENT",
219
201
                                            COLUMN_COMMENT_MAXLEN,
220
202
                                            DRIZZLE_TYPE_VARCHAR,
221
203
                                            0,
222
204
                                            0,
223
 
                                            "Comment",
224
 
                                            OPEN_FRM_ONLY));
 
205
                                            "Comment"));
225
206
 
226
207
  columns->push_back(new plugin::ColumnInfo("STORAGE",
227
208
                                            8,
228
209
                                            DRIZZLE_TYPE_VARCHAR,
229
210
                                            0,
230
211
                                            0,
231
 
                                            "Storage",
232
 
                                            OPEN_FRM_ONLY));
 
212
                                            "Storage"));
233
213
 
234
214
  columns->push_back(new plugin::ColumnInfo("FORMAT",
235
215
                                            8,
236
216
                                            DRIZZLE_TYPE_VARCHAR,
237
217
                                            0,
238
218
                                            0,
239
 
                                            "Format",
240
 
                                            OPEN_FRM_ONLY));
 
219
                                            "Format"));
241
220
  return columns;
242
221
}
243
222