← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item.cc

  • Committer: Brian Aker
  • Date: 2010-12-18 02:08:04 UTC
  • mto: (2015.1.1 clean)
  • mto: This revision was merged to the branch mainline in revision 2018.
  • Revision ID: brian@tangent.org-20101218020804-mh3lga9uv7jlajwy
Merge in first pass of TIME type (closer to EPOCH time).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item.cc
44
44
#include "drizzled/field/long.h"
45
45
#include "drizzled/field/int64_t.h"
46
46
#include "drizzled/field/num.h"
 
47
#include "drizzled/field/time.h"
47
48
#include "drizzled/field/timestamp.h"
48
49
#include "drizzled/field/datetime.h"
49
50
#include "drizzled/field/varstring.h"
1054
1055
{
1055
1056
  switch (field_type())
1056
1057
  {
 
1058
    case DRIZZLE_TYPE_TIME:
1057
1059
    case DRIZZLE_TYPE_DATE:
1058
1060
    case DRIZZLE_TYPE_DATETIME:
1059
1061
    case DRIZZLE_TYPE_TIMESTAMP:
1194
1196
  case DRIZZLE_TYPE_DATETIME:
1195
1197
    field= new Field_datetime(maybe_null, name, &my_charset_bin);
1196
1198
    break;
 
1199
  case DRIZZLE_TYPE_TIME:
 
1200
    field= new field::Time(maybe_null, name, &my_charset_bin);
 
1201
    break;
1197
1202
  case DRIZZLE_TYPE_UUID:
1198
1203
  case DRIZZLE_TYPE_ENUM:
1199
1204
  case DRIZZLE_TYPE_VARCHAR:
1379
1384
        result= client->store(nr, decimals, buffer);
1380
1385
      break;
1381
1386
    }
 
1387
  case DRIZZLE_TYPE_TIME:
1382
1388
  case DRIZZLE_TYPE_DATETIME:
1383
1389
  case DRIZZLE_TYPE_TIMESTAMP:
1384
1390
    {
1598
1604
      To preserve type they needed to be handled separately.
1599
1605
    */
1600
1606
    if ((type= item->field_type()) == DRIZZLE_TYPE_DATETIME ||
 
1607
        type == DRIZZLE_TYPE_TIME ||
1601
1608
        type == DRIZZLE_TYPE_DATE ||
1602
1609
        type == DRIZZLE_TYPE_TIMESTAMP)
1603
1610
    {