← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/message/statement_transform.cc

Merge with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/message/statement_transform.cc
1374
1374
  case Table::Field::DATE:
1375
1375
    destination.append(" DATE", 5);
1376
1376
    break;
1377
 
  case Table::Field::TIMESTAMP:
 
1377
  case Table::Field::EPOCH:
1378
1378
    destination.append(" TIMESTAMP",  10);
1379
1379
    break;
1380
1380
  case Table::Field::DATETIME:
1381
1381
    destination.append(" DATETIME",  9);
1382
1382
    break;
 
1383
  case Table::Field::TIME:
 
1384
    destination.append(" TIME",  9);
 
1385
    break;
1383
1386
  }
1384
1387
 
1385
1388
  if (field.type() == Table::Field::INTEGER || 
1409
1412
  {
1410
1413
    destination.append(" NOT NULL", 9);
1411
1414
  }
1412
 
  else if (field.type() == Table::Field::TIMESTAMP)
 
1415
  else if (field.type() == Table::Field::EPOCH)
1413
1416
    destination.append(" NULL", 5);
1414
1417
 
1415
1418
  if (field.type() == Table::Field::INTEGER || 
1495
1498
    assert(false); /* Not a user definable type */
1496
1499
    return Table::Field::INTEGER; /* unreachable */
1497
1500
  case DRIZZLE_TYPE_TIMESTAMP:
1498
 
    return Table::Field::TIMESTAMP;
 
1501
    return Table::Field::EPOCH;
1499
1502
  case DRIZZLE_TYPE_LONGLONG:
1500
1503
    return Table::Field::BIGINT;
1501
1504
  case DRIZZLE_TYPE_DATETIME:
1502
1505
    return Table::Field::DATETIME;
 
1506
  case DRIZZLE_TYPE_TIME:
 
1507
    return Table::Field::TIME;
1503
1508
  case DRIZZLE_TYPE_DATE:
1504
1509
    return Table::Field::DATE;
1505
1510
  case DRIZZLE_TYPE_VARCHAR: