← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/temporal_interval.cc

  • Committer: Brian Aker
  • Date: 2011-02-22 06:12:02 UTC
  • mfrom: (2190.1.6 drizzle-build)
  • Revision ID: brian@tangent.org-20110222061202-k03czxykqy4x9hjs
List update, header fixes, multiple symbols, and David deletes some code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/temporal_interval.cc
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include "config.h"
21
 
#include "drizzled/internal/m_string.h"
22
 
#include "drizzled/error.h"
23
 
#include "drizzled/session.h"
24
 
#include "config.h"
25
 
#include "drizzled/function/time/date.h"
26
 
#include "drizzled/temporal_interval.h"
27
 
#include "drizzled/time_functions.h"
 
20
#include <config.h>
 
21
 
 
22
#include <drizzled/internal/m_string.h>
 
23
#include <drizzled/error.h>
 
24
#include <drizzled/session.h>
 
25
#include <drizzled/current_session.h>
 
26
#include <drizzled/function/time/date.h>
 
27
#include <drizzled/temporal_interval.h>
 
28
#include <drizzled/time_functions.h>
28
29
 
29
30
namespace drizzled
30
31
{
186
187
  return false;
187
188
}
188
189
 
189
 
bool TemporalInterval::addDate(DRIZZLE_TIME *ltime, interval_type int_type)
 
190
bool TemporalInterval::addDate(type::Time *ltime, interval_type int_type)
190
191
{
191
192
  long period, sign;
192
193
 
211
212
  case INTERVAL_DAY_MINUTE:
212
213
  case INTERVAL_DAY_HOUR:
213
214
    int64_t sec, days, daynr, microseconds, extra_sec;
214
 
    ltime->time_type= DRIZZLE_TIMESTAMP_DATETIME; // Return full date
 
215
    ltime->time_type= type::DRIZZLE_TIMESTAMP_DATETIME; // Return full date
215
216
    microseconds= ltime->second_part + sign*second_part;
216
217
    extra_sec= microseconds/1000000L;
217
218
    microseconds= microseconds%1000000L;
241
242
    /* Day number from year 0 to 9999-12-31 */
242
243
    if ((uint64_t) daynr > MAX_DAY_NUMBER)
243
244
      goto invalid_date;
244
 
    get_date_from_daynr((long) daynr, &ltime->year, &ltime->month,
245
 
        &ltime->day);
 
245
    get_date_from_daynr((long) daynr, &ltime->year, &ltime->month, &ltime->day);
246
246
    break;
247
247
  case INTERVAL_DAY:
248
248
  case INTERVAL_WEEK:
286
286
 
287
287
invalid_date:
288
288
  push_warning_printf(current_session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
289
 
      ER_DATETIME_FUNCTION_OVERFLOW,
290
 
      ER(ER_DATETIME_FUNCTION_OVERFLOW),
291
 
      "datetime");
 
289
                      ER_DATETIME_FUNCTION_OVERFLOW,
 
290
                      ER(ER_DATETIME_FUNCTION_OVERFLOW),
 
291
                      "datetime");
292
292
null_date:
293
293
  return 1;
294
294
}