← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/time/yearweek.cc

  • Committer: Jay Pipes
  • Date: 2009-02-04 15:25:30 UTC
  • mto: This revision was merged to the branch mainline in revision 830.
  • Revision ID: jpipes@serialcoder-20090204152530-27x7k0vjx1pd3g3o
default_week_format variable has gone the way of the Dodo, as have the
WEEK() and YEARWEEK() functions.  These two functions, along with week_mode
(default_week_format) were inconsistent with standards and made redundant
by the DATE_FORMAT() function.

Cleaned up the former week_number_from_gregorian_date() function into
a simpler, strftime()-based solution in sync with PosgreSQL and SQL/ISO standards.

Clean up of the EXTRACT() function to use new temporal system and produce
proper errors on bad temporal values.

NOTE: Test cases for EXTRACT and cleanup of the func_time.test case have not
yet been committed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/yearweek.cc
1
 
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
 
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
 
 *
4
 
 *  Copyright (C) 2008 Sun Microsystems
5
 
 *
6
 
 *  This program is free software; you can redistribute it and/or modify
7
 
 *  it under the terms of the GNU General Public License as published by
8
 
 *  the Free Software Foundation; version 2 of the License.
9
 
 *
10
 
 *  This program is distributed in the hope that it will be useful,
11
 
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
12
 
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
 
 *  GNU General Public License for more details.
14
 
 *
15
 
 *  You should have received a copy of the GNU General Public License
16
 
 *  along with this program; if not, write to the Free Software
17
 
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
 
 */
19
 
 
20
 
#include <drizzled/server_includes.h>
21
 
#include CSTDINT_H
22
 
#include <drizzled/function/time/yearweek.h>
23
 
#include <drizzled/function/time/week_mode.h>
24
 
 
25
 
int64_t Item_func_yearweek::val_int()
26
 
{
27
 
  assert(fixed == 1);
28
 
  uint32_t year,week;
29
 
  DRIZZLE_TIME ltime;
30
 
  if (get_arg0_date(&ltime, TIME_NO_ZERO_DATE))
31
 
    return 0;
32
 
  week= calc_week(&ltime,
33
 
                  (week_mode((uint) args[1]->val_int()) | WEEK_YEAR),
34
 
                  &year);
35
 
  return week+year*100;
36
 
}
37