← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/definition/table.cc

  • Committer: Brian Aker
  • Date: 2010-12-24 16:11:53 UTC
  • mfrom: (2023.2.3 bool)
  • Revision ID: brian@tangent.org-20101224161153-aq2tqgalzur623c9
Merge in BOOLEAN

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/definition/table.cc
64
64
#include "drizzled/field/str.h"
65
65
#include "drizzled/field/num.h"
66
66
#include "drizzled/field/blob.h"
 
67
#include "drizzled/field/boolean.h"
67
68
#include "drizzled/field/enum.h"
68
69
#include "drizzled/field/null.h"
69
70
#include "drizzled/field/date.h"
270
271
  case message::Table::Field::UUID:
271
272
    field_type= DRIZZLE_TYPE_UUID;
272
273
    break;
 
274
  case message::Table::Field::BOOLEAN:
 
275
    field_type= DRIZZLE_TYPE_BOOLEAN;
 
276
    break;
273
277
  case message::Table::Field::TIME:
274
278
    field_type= DRIZZLE_TYPE_TIME;
275
279
    break;
317
321
  case DRIZZLE_TYPE_DATE:
318
322
  case DRIZZLE_TYPE_ENUM:
319
323
  case DRIZZLE_TYPE_UUID:
 
324
  case DRIZZLE_TYPE_BOOLEAN:
320
325
    default_item= new Item_string(default_value->c_str(),
321
326
                                  default_value->length(),
322
327
                                  system_charset_info);
1316
1321
    case DRIZZLE_TYPE_UUID:
1317
1322
      field_length= field::Uuid::max_string_length();
1318
1323
      break;
 
1324
    case DRIZZLE_TYPE_BOOLEAN:
 
1325
      field_length= field::Boolean::max_string_length();
 
1326
      break;
1319
1327
    case DRIZZLE_TYPE_TIMESTAMP:
1320
1328
      field_length= field::Epoch::max_string_length();
1321
1329
      break;
1326
1334
      abort(); // Programming error
1327
1335
    }
1328
1336
 
1329
 
    assert(enum_field_types_size == 13);
 
1337
    assert(enum_field_types_size == 14);
1330
1338
 
1331
1339
    Field* f= make_field(pfield,
1332
1340
                         record + field_offsets[fieldnr] + data_offset,
1359
1367
    case DRIZZLE_TYPE_LONGLONG:
1360
1368
    case DRIZZLE_TYPE_NULL:
1361
1369
    case DRIZZLE_TYPE_UUID:
 
1370
    case DRIZZLE_TYPE_BOOLEAN:
1362
1371
      break;
1363
1372
    }
1364
1373
 
2127
2136
                                       null_pos,
2128
2137
                                       null_bit,
2129
2138
                                       field_name);
 
2139
  case DRIZZLE_TYPE_BOOLEAN:
 
2140
    return new (&mem_root) field::Boolean(ptr,
 
2141
                                          field_length,
 
2142
                                          null_pos,
 
2143
                                          null_bit,
 
2144
                                          field_name,
 
2145
                                          is_unsigned);
2130
2146
  case DRIZZLE_TYPE_LONG:
2131
2147
    return new (&mem_root) field::Int32(ptr,
2132
2148
                                        field_length,