← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field.cc

  • Committer: David Axmark
  • Date: 2008-11-05 05:50:56 UTC
  • mto: (584.1.3 devel)
  • mto: This revision was merged to the branch mainline in revision 586.
  • Revision ID: davida@davids-laptop-20081105055056-bt8ajhvihu0j28kp
Changed NEWDATE to DATE. One failing test but I think its somewhere else in the code 
(func_math).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field.cc
61
61
    DRIZZLE_TYPE_VARCHAR,
62
62
    //DRIZZLE_TYPE_DATETIME
63
63
    DRIZZLE_TYPE_VARCHAR,
64
 
    //DRIZZLE_TYPE_NEWDATE
 
64
    //DRIZZLE_TYPE_DATE
65
65
    DRIZZLE_TYPE_VARCHAR,
66
66
    //DRIZZLE_TYPE_VARCHAR
67
67
    DRIZZLE_TYPE_VARCHAR,
92
92
    DRIZZLE_TYPE_VARCHAR,
93
93
    //DRIZZLE_TYPE_DATETIME
94
94
    DRIZZLE_TYPE_VARCHAR,
95
 
    //DRIZZLE_TYPE_NEWDATE
 
95
    //DRIZZLE_TYPE_DATE
96
96
    DRIZZLE_TYPE_VARCHAR,
97
97
    //DRIZZLE_TYPE_VARCHAR
98
98
    DRIZZLE_TYPE_VARCHAR,
123
123
    DRIZZLE_TYPE_VARCHAR,
124
124
    //DRIZZLE_TYPE_DATETIME
125
125
    DRIZZLE_TYPE_VARCHAR,
126
 
    //DRIZZLE_TYPE_NEWDATE
 
126
    //DRIZZLE_TYPE_DATE
127
127
    DRIZZLE_TYPE_VARCHAR,
128
128
    //DRIZZLE_TYPE_VARCHAR
129
129
    DRIZZLE_TYPE_VARCHAR,
154
154
    DRIZZLE_TYPE_TIME,
155
155
    //DRIZZLE_TYPE_DATETIME
156
156
    DRIZZLE_TYPE_DATETIME,
157
 
    //DRIZZLE_TYPE_NEWDATE
158
 
    DRIZZLE_TYPE_NEWDATE,
 
157
    //DRIZZLE_TYPE_DATE
 
158
    DRIZZLE_TYPE_DATE,
159
159
    //DRIZZLE_TYPE_VARCHAR
160
160
    DRIZZLE_TYPE_VARCHAR,
161
161
    //DRIZZLE_TYPE_VIRTUAL
185
185
    DRIZZLE_TYPE_DATETIME,
186
186
    //DRIZZLE_TYPE_DATETIME
187
187
    DRIZZLE_TYPE_DATETIME,
188
 
    //DRIZZLE_TYPE_NEWDATE
189
 
    DRIZZLE_TYPE_NEWDATE,
 
188
    //DRIZZLE_TYPE_DATE
 
189
    DRIZZLE_TYPE_DATE,
190
190
    //DRIZZLE_TYPE_VARCHAR
191
191
    DRIZZLE_TYPE_VARCHAR,
192
192
    //DRIZZLE_TYPE_VIRTUAL
216
216
    DRIZZLE_TYPE_VARCHAR,
217
217
    //DRIZZLE_TYPE_DATETIME
218
218
    DRIZZLE_TYPE_VARCHAR,
219
 
    //DRIZZLE_TYPE_NEWDATE
220
 
    DRIZZLE_TYPE_NEWDATE,
 
219
    //DRIZZLE_TYPE_DATE
 
220
    DRIZZLE_TYPE_DATE,
221
221
    //DRIZZLE_TYPE_VARCHAR
222
222
    DRIZZLE_TYPE_VARCHAR,
223
223
    //DRIZZLE_TYPE_VIRTUAL
247
247
    DRIZZLE_TYPE_TIME,
248
248
    //DRIZZLE_TYPE_DATETIME
249
249
    DRIZZLE_TYPE_DATETIME,
250
 
    //DRIZZLE_TYPE_NEWDATE
251
 
    DRIZZLE_TYPE_NEWDATE,
 
250
    //DRIZZLE_TYPE_DATE
 
251
    DRIZZLE_TYPE_DATE,
252
252
    //DRIZZLE_TYPE_VARCHAR
253
253
    DRIZZLE_TYPE_VARCHAR,
254
254
    //DRIZZLE_TYPE_VIRTUAL
278
278
    DRIZZLE_TYPE_DATETIME,
279
279
    //DRIZZLE_TYPE_DATETIME
280
280
    DRIZZLE_TYPE_DATETIME,
281
 
    //DRIZZLE_TYPE_NEWDATE
282
 
    DRIZZLE_TYPE_NEWDATE,
 
281
    //DRIZZLE_TYPE_DATE
 
282
    DRIZZLE_TYPE_DATE,
283
283
    //DRIZZLE_TYPE_VARCHAR
284
284
    DRIZZLE_TYPE_VARCHAR,
285
285
    //DRIZZLE_TYPE_VIRTUAL
291
291
    //DRIZZLE_TYPE_BLOB
292
292
    DRIZZLE_TYPE_BLOB,
293
293
  },
294
 
  /* DRIZZLE_TYPE_NEWDATE -> */
 
294
  /* DRIZZLE_TYPE_DATE -> */
295
295
  {
296
296
    //DRIZZLE_TYPE_TINY
297
297
    DRIZZLE_TYPE_VARCHAR,
300
300
    //DRIZZLE_TYPE_DOUBLE
301
301
    DRIZZLE_TYPE_VARCHAR,
302
302
    //DRIZZLE_TYPE_NULL
303
 
    DRIZZLE_TYPE_NEWDATE,
 
303
    DRIZZLE_TYPE_DATE,
304
304
    //DRIZZLE_TYPE_TIMESTAMP
305
305
    DRIZZLE_TYPE_DATETIME,
306
306
    //DRIZZLE_TYPE_LONGLONG
309
309
    DRIZZLE_TYPE_DATETIME,
310
310
    //DRIZZLE_TYPE_DATETIME
311
311
    DRIZZLE_TYPE_DATETIME,
312
 
    //DRIZZLE_TYPE_NEWDATE
313
 
    DRIZZLE_TYPE_NEWDATE,
 
312
    //DRIZZLE_TYPE_DATE
 
313
    DRIZZLE_TYPE_DATE,
314
314
    //DRIZZLE_TYPE_VARCHAR
315
315
    DRIZZLE_TYPE_VARCHAR,
316
316
    //DRIZZLE_TYPE_VIRTUAL
340
340
    DRIZZLE_TYPE_VARCHAR,
341
341
    //DRIZZLE_TYPE_DATETIME
342
342
    DRIZZLE_TYPE_VARCHAR,
343
 
    //DRIZZLE_TYPE_NEWDATE
 
343
    //DRIZZLE_TYPE_DATE
344
344
    DRIZZLE_TYPE_VARCHAR,
345
345
    //DRIZZLE_TYPE_VARCHAR
346
346
    DRIZZLE_TYPE_VARCHAR,
371
371
    DRIZZLE_TYPE_VIRTUAL,
372
372
    //DRIZZLE_TYPE_DATETIME
373
373
    DRIZZLE_TYPE_VIRTUAL,
374
 
    //DRIZZLE_TYPE_NEWDATE
 
374
    //DRIZZLE_TYPE_DATE
375
375
    DRIZZLE_TYPE_VIRTUAL,
376
376
    //DRIZZLE_TYPE_VARCHAR
377
377
    DRIZZLE_TYPE_VIRTUAL,
402
402
    DRIZZLE_TYPE_VARCHAR,
403
403
    //DRIZZLE_TYPE_DATETIME
404
404
    DRIZZLE_TYPE_VARCHAR,
405
 
    //DRIZZLE_TYPE_NEWDATE
 
405
    //DRIZZLE_TYPE_DATE
406
406
    DRIZZLE_TYPE_VARCHAR,
407
407
    //DRIZZLE_TYPE_VARCHAR
408
408
    DRIZZLE_TYPE_VARCHAR,
433
433
    DRIZZLE_TYPE_VARCHAR,
434
434
    //DRIZZLE_TYPE_DATETIME
435
435
    DRIZZLE_TYPE_VARCHAR,
436
 
    //DRIZZLE_TYPE_NEWDATE
 
436
    //DRIZZLE_TYPE_DATE
437
437
    DRIZZLE_TYPE_VARCHAR,
438
438
    //DRIZZLE_TYPE_VARCHAR
439
439
    DRIZZLE_TYPE_VARCHAR,
464
464
    DRIZZLE_TYPE_BLOB,
465
465
    //DRIZZLE_TYPE_DATETIME
466
466
    DRIZZLE_TYPE_BLOB,
467
 
    //DRIZZLE_TYPE_NEWDATE
 
467
    //DRIZZLE_TYPE_DATE
468
468
    DRIZZLE_TYPE_BLOB,
469
469
    //DRIZZLE_TYPE_VARCHAR
470
470
    DRIZZLE_TYPE_BLOB,
516
516
  STRING_RESULT,
517
517
  //DRIZZLE_TYPE_DATETIME
518
518
  STRING_RESULT,
519
 
  //DRIZZLE_TYPE_NEWDATE
 
519
  //DRIZZLE_TYPE_DATE
520
520
  STRING_RESULT,
521
521
  //DRIZZLE_TYPE_VARCHAR
522
522
  STRING_RESULT,
1518
1518
                                              Field::NONE));
1519
1519
    }
1520
1520
    break;
1521
 
  case DRIZZLE_TYPE_NEWDATE:
 
1521
  case DRIZZLE_TYPE_DATE:
1522
1522
    length= 10;
1523
1523
    break;
1524
1524
  case DRIZZLE_TYPE_TIME:
1586
1586
  switch (type) {
1587
1587
  case DRIZZLE_TYPE_VARCHAR:     return (length + (length < 256 ? 1: 2));
1588
1588
  case DRIZZLE_TYPE_TINY        : return 1;
1589
 
  case DRIZZLE_TYPE_NEWDATE:
 
1589
  case DRIZZLE_TYPE_DATE:
1590
1590
  case DRIZZLE_TYPE_TIME:   return 3;
1591
1591
  case DRIZZLE_TYPE_TIMESTAMP:
1592
1592
  case DRIZZLE_TYPE_LONG        : return 4;
1637
1637
  }
1638
1638
 
1639
1639
  switch (field_type) {
1640
 
  case DRIZZLE_TYPE_NEWDATE:
 
1640
  case DRIZZLE_TYPE_DATE:
1641
1641
  case DRIZZLE_TYPE_TIME:
1642
1642
  case DRIZZLE_TYPE_DATETIME:
1643
1643
  case DRIZZLE_TYPE_TIMESTAMP:
1708
1708
    return new Field_timestamp(ptr,field_length, null_pos, null_bit,
1709
1709
                               unireg_check, field_name, share,
1710
1710
                               field_charset);
1711
 
  case DRIZZLE_TYPE_NEWDATE:
1712
 
    return new Field_newdate(ptr,null_pos,null_bit,
 
1711
  case DRIZZLE_TYPE_DATE:
 
1712
    return new Field_date(ptr,null_pos,null_bit,
1713
1713
                             unireg_check, field_name, field_charset);
1714
1714
  case DRIZZLE_TYPE_TIME:
1715
1715
    return new Field_time(ptr,null_pos,null_bit,