← Back to branch summary

~xnox/ubuntu/saucy/drizzle/merge

« back to all changes in this revision

Viewing changes to drizzled/create_field.cc

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2011-01-01 13:55:03 UTC
  • Revision ID: james.westby@ubuntu.com-20110101135503-x2ub1akxoisgwi6z
Tags: 2010.12.06-0ubuntu4
* Fixed missing build depends.
* Added Lee to uploaders.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/create_field.cc
31
31
#include "drizzled/field/str.h"
32
32
#include "drizzled/field/num.h"
33
33
#include "drizzled/field/blob.h"
 
34
#include "drizzled/field/boolean.h"
34
35
#include "drizzled/field/enum.h"
35
36
#include "drizzled/field/null.h"
36
37
#include "drizzled/field/date.h"
40
41
#include "drizzled/field/int32.h"
41
42
#include "drizzled/field/int64.h"
42
43
#include "drizzled/field/num.h"
43
 
#include "drizzled/field/timestamp.h"
 
44
#include "drizzled/field/epoch.h"
44
45
#include "drizzled/field/datetime.h"
45
46
#include "drizzled/field/varstring.h"
46
47
#include "drizzled/field/uuid.h"
142
143
      break;
143
144
    case DRIZZLE_TYPE_DECIMAL:
144
145
      key_length= pack_length=
145
 
        my_decimal_get_binary_size(my_decimal_length_to_precision(length,
 
146
        class_decimal_get_binary_size(class_decimal_length_to_precision(length,
146
147
                  decimals,
147
148
                  flags &
148
149
                  UNSIGNED_FLAG),
248
249
    case DRIZZLE_TYPE_NULL:
249
250
      break;
250
251
    case DRIZZLE_TYPE_DECIMAL:
251
 
      my_decimal_trim(&length, &decimals);
 
252
      class_decimal_trim(&length, &decimals);
252
253
      if (length > DECIMAL_MAX_PRECISION)
253
254
      {
254
255
        my_error(ER_TOO_BIG_PRECISION, MYF(0), length, fld_name,
260
261
        my_error(ER_M_BIGGER_THAN_D, MYF(0), fld_name);
261
262
        return(true);
262
263
      }
263
 
      length= my_decimal_precision_to_length(length, decimals, fld_type_modifier & UNSIGNED_FLAG);
264
 
      pack_length= my_decimal_get_binary_size(length, decimals);
 
264
      length= class_decimal_precision_to_length(length, decimals, fld_type_modifier & UNSIGNED_FLAG);
 
265
      pack_length= class_decimal_get_binary_size(length, decimals);
265
266
      break;
266
267
    case DRIZZLE_TYPE_VARCHAR:
267
268
      /*
356
357
    case DRIZZLE_TYPE_UUID:
357
358
      length= field::Uuid::max_string_length();
358
359
      break;
 
360
    case DRIZZLE_TYPE_BOOLEAN:
 
361
      length= field::Boolean::max_string_length();
 
362
      break;
359
363
    case DRIZZLE_TYPE_DATETIME:
360
364
      length= DateTime::MAX_STRING_LENGTH;
361
365
      break;
 
366
    case DRIZZLE_TYPE_TIME:
 
367
      length= DateTime::MAX_STRING_LENGTH;
 
368
      break;
362
369
    case DRIZZLE_TYPE_ENUM:
363
370
      {
364
371
        /* Should be safe. */