mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
d096079d33
We pretended that TIMEDIFF() would always return positive results; this gave strange results in comparisons of the TIMEDIFF(low,hi)<TIME(0) type that rendered a negative result, but still gave false in comparison. We also inadvertantly dropped the sign when converting times to decimal. CAST(time AS DECIMAL) handles signs of the times correctly. TIMEDIFF() marked up as signed. Time/date comparison code switched to signed for clarity. mysql-test/r/func_sapdb.result: show that time-related comparisons work with negative time values now. show that converting time to DECIMAL no longer drops sign. mysql-test/t/func_sapdb.test: show that time-related comparisons work with negative time values now. show that converting time to DECIMAL no longer drops sign. sql/item_cmpfunc.cc: signed returns sql/item_cmpfunc.h: signed now (time/date < > =) sql/item_func.cc: signed now sql/item_timefunc.h: Functions such as TIMEDIFF() return signed results! The file-comments pretended we were doing that all along, anyway... sql/my_decimal.cc: heed sign when converting time to my_decimal; times may actually be negative! Needed for SELECT CAST(time('-73:42:12') AS DECIMAL); sql/mysql_priv.h: using signed for dates and times now
272 lines
7.5 KiB
C++
272 lines
7.5 KiB
C++
/* Copyright (C) 2005-2006 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#include "mysql_priv.h"
|
|
#include <time.h>
|
|
|
|
|
|
#ifndef MYSQL_CLIENT
|
|
/*
|
|
report result of decimal operation
|
|
|
|
SYNOPSIS
|
|
decimal_operation_results()
|
|
result decimal library return code (E_DEC_* see include/decimal.h)
|
|
|
|
TODO
|
|
Fix error messages
|
|
|
|
RETURN
|
|
result
|
|
*/
|
|
|
|
int decimal_operation_results(int result)
|
|
{
|
|
switch (result) {
|
|
case E_DEC_OK:
|
|
break;
|
|
case E_DEC_TRUNCATED:
|
|
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
|
WARN_DATA_TRUNCATED, ER(WARN_DATA_TRUNCATED),
|
|
"", (long)-1);
|
|
break;
|
|
case E_DEC_OVERFLOW:
|
|
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
|
|
ER_TRUNCATED_WRONG_VALUE,
|
|
ER(ER_TRUNCATED_WRONG_VALUE),
|
|
"DECIMAL", "");
|
|
break;
|
|
case E_DEC_DIV_ZERO:
|
|
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
|
|
ER_DIVISION_BY_ZERO, ER(ER_DIVISION_BY_ZERO));
|
|
break;
|
|
case E_DEC_BAD_NUM:
|
|
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
|
|
ER_TRUNCATED_WRONG_VALUE_FOR_FIELD,
|
|
ER(ER_TRUNCATED_WRONG_VALUE_FOR_FIELD),
|
|
"decimal", "", "", (long)-1);
|
|
break;
|
|
case E_DEC_OOM:
|
|
my_error(ER_OUT_OF_RESOURCES, MYF(0));
|
|
break;
|
|
default:
|
|
DBUG_ASSERT(0);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
|
|
/**
|
|
@brief Converting decimal to string
|
|
|
|
@details Convert given my_decimal to String; allocate buffer as needed.
|
|
|
|
@param[in] mask what problems to warn on (mask of E_DEC_* values)
|
|
@param[in] d the decimal to print
|
|
@param[in] fixed_prec overall number of digits if ZEROFILL, 0 otherwise
|
|
@param[in] fixed_dec number of decimal places (if fixed_prec != 0)
|
|
@param[in] filler what char to pad with (ZEROFILL et al.)
|
|
@param[out] *str where to store the resulting string
|
|
|
|
@return error coce
|
|
@retval E_DEC_OK
|
|
@retval E_DEC_TRUNCATED
|
|
@retval E_DEC_OVERFLOW
|
|
@retval E_DEC_OOM
|
|
*/
|
|
|
|
int my_decimal2string(uint mask, const my_decimal *d,
|
|
uint fixed_prec, uint fixed_dec,
|
|
char filler, String *str)
|
|
{
|
|
/*
|
|
Calculate the size of the string: For DECIMAL(a,b), fixed_prec==a
|
|
holds true iff the type is also ZEROFILL, which in turn implies
|
|
UNSIGNED. Hence the buffer for a ZEROFILLed value is the length
|
|
the user requested, plus one for a possible decimal point, plus
|
|
one if the user only wanted decimal places, but we force a leading
|
|
zero on them. Because the type is implicitly UNSIGNED, we do not
|
|
need to reserve a character for the sign. For all other cases,
|
|
fixed_prec will be 0, and my_decimal_string_length() will be called
|
|
instead to calculate the required size of the buffer.
|
|
*/
|
|
int length= (fixed_prec
|
|
? (fixed_prec + ((fixed_prec == fixed_dec) ? 1 : 0) + 1)
|
|
: my_decimal_string_length(d));
|
|
int result;
|
|
if (str->alloc(length))
|
|
return check_result(mask, E_DEC_OOM);
|
|
result= decimal2string((decimal_t*) d, (char*) str->ptr(),
|
|
&length, (int)fixed_prec, fixed_dec,
|
|
filler);
|
|
str->length(length);
|
|
return check_result(mask, result);
|
|
}
|
|
|
|
|
|
/*
|
|
Convert from decimal to binary representation
|
|
|
|
SYNOPSIS
|
|
my_decimal2binary()
|
|
mask error processing mask
|
|
d number for conversion
|
|
bin pointer to buffer where to write result
|
|
prec overall number of decimal digits
|
|
scale number of decimal digits after decimal point
|
|
|
|
NOTE
|
|
Before conversion we round number if it need but produce truncation
|
|
error in this case
|
|
|
|
RETURN
|
|
E_DEC_OK
|
|
E_DEC_TRUNCATED
|
|
E_DEC_OVERFLOW
|
|
*/
|
|
|
|
int my_decimal2binary(uint mask, const my_decimal *d, char *bin, int prec,
|
|
int scale)
|
|
{
|
|
int err1= E_DEC_OK, err2;
|
|
my_decimal rounded;
|
|
my_decimal2decimal(d, &rounded);
|
|
rounded.frac= decimal_actual_fraction(&rounded);
|
|
if (scale < rounded.frac)
|
|
{
|
|
err1= E_DEC_TRUNCATED;
|
|
/* decimal_round can return only E_DEC_TRUNCATED */
|
|
decimal_round(&rounded, &rounded, scale, HALF_UP);
|
|
}
|
|
err2= decimal2bin(&rounded, bin, prec, scale);
|
|
if (!err2)
|
|
err2= err1;
|
|
return check_result(mask, err2);
|
|
}
|
|
|
|
|
|
/*
|
|
Convert string for decimal when string can be in some multibyte charset
|
|
|
|
SYNOPSIS
|
|
str2my_decimal()
|
|
mask error processing mask
|
|
from string to process
|
|
length length of given string
|
|
charset charset of given string
|
|
decimal_value buffer for result storing
|
|
|
|
RESULT
|
|
E_DEC_OK
|
|
E_DEC_TRUNCATED
|
|
E_DEC_OVERFLOW
|
|
E_DEC_BAD_NUM
|
|
E_DEC_OOM
|
|
*/
|
|
|
|
int str2my_decimal(uint mask, const char *from, uint length,
|
|
CHARSET_INFO *charset, my_decimal *decimal_value)
|
|
{
|
|
char *end, *from_end;
|
|
int err;
|
|
char buff[STRING_BUFFER_USUAL_SIZE];
|
|
String tmp(buff, sizeof(buff), &my_charset_bin);
|
|
if (charset->mbminlen > 1)
|
|
{
|
|
uint dummy_errors;
|
|
tmp.copy(from, length, charset, &my_charset_latin1, &dummy_errors);
|
|
from= tmp.ptr();
|
|
length= tmp.length();
|
|
charset= &my_charset_bin;
|
|
}
|
|
from_end= end= (char*) from+length;
|
|
err= string2decimal((char *)from, (decimal_t*) decimal_value, &end);
|
|
if (end != from_end && !err)
|
|
{
|
|
/* Give warning if there is something other than end space */
|
|
for ( ; end < from_end; end++)
|
|
{
|
|
if (!my_isspace(&my_charset_latin1, *end))
|
|
{
|
|
err= E_DEC_TRUNCATED;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
check_result_and_overflow(mask, err, decimal_value);
|
|
return err;
|
|
}
|
|
|
|
|
|
my_decimal *date2my_decimal(MYSQL_TIME *ltime, my_decimal *dec)
|
|
{
|
|
longlong date;
|
|
date = (ltime->year*100L + ltime->month)*100L + ltime->day;
|
|
if (ltime->time_type > MYSQL_TIMESTAMP_DATE)
|
|
date= ((date*100L + ltime->hour)*100L+ ltime->minute)*100L + ltime->second;
|
|
if (int2my_decimal(E_DEC_FATAL_ERROR, ltime->neg ? -date : date, FALSE, dec))
|
|
return dec;
|
|
if (ltime->second_part)
|
|
{
|
|
dec->buf[(dec->intg-1) / 9 + 1]= ltime->second_part * 1000;
|
|
dec->frac= 6;
|
|
}
|
|
return dec;
|
|
}
|
|
|
|
|
|
#ifndef DBUG_OFF
|
|
/* routines for debugging print */
|
|
|
|
/* print decimal */
|
|
void
|
|
print_decimal(const my_decimal *dec)
|
|
{
|
|
fprintf(DBUG_FILE,
|
|
"\nDecimal: sign: %d intg: %d frac: %d \n\
|
|
%09d,%09d,%09d,%09d,%09d,%09d,%09d,%09d\n",
|
|
dec->sign(), dec->intg, dec->frac,
|
|
dec->buf[0], dec->buf[1], dec->buf[2], dec->buf[3],
|
|
dec->buf[4], dec->buf[5], dec->buf[6], dec->buf[7]);
|
|
}
|
|
|
|
|
|
/* print decimal with its binary representation */
|
|
void
|
|
print_decimal_buff(const my_decimal *dec, const byte* ptr, int length)
|
|
{
|
|
print_decimal(dec);
|
|
fprintf(DBUG_FILE, "Record: ");
|
|
for (int i= 0; i < length; i++)
|
|
{
|
|
fprintf(DBUG_FILE, "%02X ", (uint)((uchar *)ptr)[i]);
|
|
}
|
|
fprintf(DBUG_FILE, "\n");
|
|
}
|
|
|
|
|
|
const char *dbug_decimal_as_string(char *buff, const my_decimal *val)
|
|
{
|
|
int length= DECIMAL_MAX_STR_LENGTH;
|
|
if (!val)
|
|
return "NULL";
|
|
(void)decimal2string((decimal_t*) val, buff, &length, 0,0,0);
|
|
return buff;
|
|
}
|
|
|
|
#endif /*DBUG_OFF*/
|
|
|
|
|
|
#endif /*MYSQL_CLIENT*/
|