← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/create.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/item/create.cc
20
20
  Functions to create an item. Used by sql_yac.yy
21
21
*/
22
22
 
23
 
#include "config.h"
 
23
#include <config.h>
24
24
#include <drizzled/item/create.h>
25
25
#include <drizzled/item/func.h>
26
26
#include <drizzled/error.h>
27
27
 
28
 
#include "drizzled/function_container.h"
 
28
#include <drizzled/function_container.h>
29
29
 
30
30
#include <drizzled/function/str/binary.h>
31
31
#include <drizzled/function/str/concat.h>
83
83
#include <drizzled/function/math/tan.h>
84
84
#include <drizzled/function/units.h>
85
85
 
86
 
#include "drizzled/function/cast/signed.h"
87
 
#include "drizzled/function/cast/time.h"
88
 
#include "drizzled/function/cast/unsigned.h"
 
86
#include <drizzled/function/cast/boolean.h>
 
87
#include <drizzled/function/cast/signed.h>
 
88
#include <drizzled/function/cast/time.h>
 
89
#include <drizzled/function/cast/unsigned.h>
89
90
 
90
91
using namespace std;
91
92
 
1052
1053
  if (params)
1053
1054
  {
1054
1055
    Item *param;
1055
 
    List_iterator<Item> it(*params);
 
1056
    List<Item>::iterator it(params->begin());
1056
1057
    while ((param= it++))
1057
1058
    {
1058
1059
      if (! param->is_autogenerated_name)
2046
2047
  {
2047
2048
    func_name.assign(func->name.str, func->name.length);
2048
2049
 
2049
 
    FunctionContainer::getMap()[func_name]= func;
 
2050
    FunctionContainer::getMap()[func_name]= func->builder;
2050
2051
  }
2051
2052
 
2052
2053
  return 0;
2056
2057
Create_func *
2057
2058
find_native_function_builder(LEX_STRING name)
2058
2059
{
2059
 
  Native_func_registry *func;
2060
2060
  Create_func *builder= NULL;
2061
2061
 
2062
2062
  string func_name(name.str, name.length);
2063
2063
 
2064
 
  NativeFunctionsMap::iterator func_iter=
 
2064
  FunctionContainer::Map::iterator func_iter=
2065
2065
    FunctionContainer::getMap().find(func_name);
2066
2066
 
2067
2067
  if (func_iter != FunctionContainer::getMap().end())
2068
2068
  {
2069
 
    func= (*func_iter).second;
2070
 
    builder= func->builder;
 
2069
    builder= (*func_iter).second;
2071
2070
  }
2072
2071
 
2073
2072
  return builder;
2104
2103
    res= new (session->mem_root) Item_func_binary(a);
2105
2104
    break;
2106
2105
 
 
2106
  case ITEM_CAST_BOOLEAN:
 
2107
    res= new (session->mem_root) function::cast::Boolean(a);
 
2108
    break;
 
2109
 
2107
2110
  case ITEM_CAST_TIME:
2108
2111
    res= new (session->mem_root) function::cast::Time(a);
2109
2112
    break;
2120
2123
    {
2121
2124
      len= c_len ? atoi(c_len) : 0;
2122
2125
      dec= c_dec ? atoi(c_dec) : 0;
2123
 
      my_decimal_trim(&len, &dec);
 
2126
      class_decimal_trim(&len, &dec);
2124
2127
      if (len < dec)
2125
2128
      {
2126
2129
        my_error(ER_M_BIGGER_THAN_D, MYF(0), "");