← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/string.cc

  • Committer: Brian Aker
  • Date: 2010-01-22 00:53:13 UTC
  • Revision ID: brian@gaz-20100122005313-jmizcbcdi1lt4tcx
Revert db patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/string.cc
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2008 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2008 Sun Microsystems
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include <config.h>
21
 
 
 
20
#include "config.h"
 
21
#include CSTDINT_H
22
22
#include <drizzled/session.h>
23
23
#include <drizzled/error.h>
24
24
#include <drizzled/item/string.h>
25
25
 
26
 
namespace drizzled
27
 
{
28
 
 
29
26
Item *Item_string::safe_charset_converter(const CHARSET_INFO * const tocs)
30
27
{
31
28
  Item_string *conv;
32
 
  size_t conv_errors;
 
29
  uint32_t conv_errors;
33
30
  char *ptr;
34
31
  String tmp, cstr, *ostr= val_str(&tmp);
35
32
  cstr.copy(ostr->ptr(), ostr->length(), ostr->charset(), tocs, &conv_errors);
45
42
    */
46
43
    return NULL;
47
44
  }
48
 
 
49
 
  if (!(ptr= getSession().strmake(cstr.ptr(), cstr.length())))
 
45
  if (!(ptr= current_session->strmake(cstr.ptr(), cstr.length())))
50
46
    return NULL;
51
 
 
52
47
  conv->str_value.set(ptr, cstr.length(), cstr.charset());
53
48
  /* Ensure that no one is going to change the result string */
54
49
  conv->str_value.mark_as_const();
59
54
Item *Item_static_string_func::safe_charset_converter(const CHARSET_INFO * const tocs)
60
55
{
61
56
  Item_string *conv;
62
 
  size_t conv_errors;
 
57
  uint32_t conv_errors;
63
58
  String tmp, cstr, *ostr= val_str(&tmp);
64
59
  cstr.copy(ostr->ptr(), ostr->length(), ostr->charset(), tocs, &conv_errors);
65
60
  if (conv_errors ||
127
122
      We can use str_value.ptr() here as Item_string is gurantee to put an
128
123
      end \0 here.
129
124
    */
130
 
    push_warning_printf(&getSession(), DRIZZLE_ERROR::WARN_LEVEL_WARN,
 
125
    push_warning_printf(current_session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
131
126
                        ER_TRUNCATED_WRONG_VALUE,
132
127
                        ER(ER_TRUNCATED_WRONG_VALUE), "DOUBLE",
133
128
                        str_value.ptr());
156
151
  if (err > 0 ||
157
152
      (end != org_end && !check_if_only_end_space(cs, end, org_end)))
158
153
  {
159
 
    push_warning_printf(&getSession(), DRIZZLE_ERROR::WARN_LEVEL_WARN,
 
154
    push_warning_printf(current_session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
160
155
                        ER_TRUNCATED_WRONG_VALUE,
161
156
                        ER(ER_TRUNCATED_WRONG_VALUE), "INTEGER",
162
157
                        str_value.ptr());
164
159
  return tmp;
165
160
}
166
161
 
167
 
type::Decimal *Item_string::val_decimal(type::Decimal *decimal_value)
 
162
my_decimal *Item_string::val_decimal(my_decimal *decimal_value)
168
163
{
169
164
  return val_decimal_from_string(decimal_value);
170
165
}
177
172
}
178
173
 
179
174
 
180
 
} /* namespace drizzled */
 
175