Skip to content

add get_date and get_time for null_if func #612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

add get_date and get_time for null_if func #612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions mysql-test/r/func_if.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,3 +367,21 @@ COALESCE(CASE WHEN x THEN NULL ELSE NULL END, x)
SELECT COALESCE(COALESCE(NULL, NULL), x) FROM t EXCEPT SELECT 1;
COALESCE(COALESCE(NULL, NULL), x)
DROP TABLE t;
#
# Bug #0000: WRONG RESULT WHEN CAST RESULT OF NULLIF AS DATE OR TIME
#
SELECT CAST(NULLIF('1996-11-21 19:40:27', '') AS DATE);
CAST(NULLIF('1996-11-21 19:40:27', '') AS DATE)
1996-11-21
SELECT CAST(NULLIF('1996-11-21 19:40:27', '') AS DATETIME);
CAST(NULLIF('1996-11-21 19:40:27', '') AS DATETIME)
1996-11-21 19:40:27
SELECT CAST(NULLIF('19:40:27', '') AS TIME);
CAST(NULLIF('19:40:27', '') AS TIME)
19:40:27
SELECT CAST(NULLIF('1996-11-21', '1996-11-21') AS DATE);
CAST(NULLIF('1996-11-21', '1996-11-21') AS DATE)
NULL
SELECT CAST(NULLIF(19961121, 0) AS DATE);
CAST(NULLIF(19961121, 0) AS DATE)
1996-11-21
11 changes: 11 additions & 0 deletions mysql-test/t/func_if.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,3 +322,14 @@ SELECT COALESCE(IF(x, NULL, NULL), x) FROM t EXCEPT SELECT 1;
SELECT COALESCE(CASE WHEN x THEN NULL ELSE NULL END, x) FROM t EXCEPT SELECT 1;
SELECT COALESCE(COALESCE(NULL, NULL), x) FROM t EXCEPT SELECT 1;
DROP TABLE t;


--echo #
--echo # Bug #0000: WRONG RESULT WHEN CAST RESULT OF NULLIF AS DATE OR TIME
--echo #

SELECT CAST(NULLIF('1996-11-21 19:40:27', '') AS DATE);
SELECT CAST(NULLIF('1996-11-21 19:40:27', '') AS DATETIME);
SELECT CAST(NULLIF('19:40:27', '') AS TIME);
SELECT CAST(NULLIF('1996-11-21', '1996-11-21') AS DATE);
SELECT CAST(NULLIF(19961121, 0) AS DATE);
17 changes: 17 additions & 0 deletions sql/item_cmpfunc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3917,6 +3917,23 @@ bool Item_func_nullif::val_json(Json_wrapper *wr) {
return res;
}

bool Item_func_nullif::get_date(MYSQL_TIME *res, my_time_flags_t fuzzy_date) {
assert(fixed);
if (!cmp.compare()) {
null_value = true;
return true;
}
return get_arg0_date(res, fuzzy_date);
}
bool Item_func_nullif::get_time(MYSQL_TIME *res) {
assert(fixed);
if (!cmp.compare()) {
null_value = true;
return true;
}
return get_arg0_time(res);
}

bool Item_func_nullif::is_null() {
const int result = cmp.compare();
if (current_thd->is_error()) {
Expand Down
2 changes: 2 additions & 0 deletions sql/item_cmpfunc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1607,6 +1607,8 @@ class Item_func_nullif final : public Item_bool_func2 {
String *val_str(String *str) override;
my_decimal *val_decimal(my_decimal *) override;
bool val_json(Json_wrapper *wr) override;
bool get_date(MYSQL_TIME *res, my_time_flags_t fuzzy_date) override;
bool get_time(MYSQL_TIME *ltime) override;
Item_result result_type() const override { return cached_result_type; }
enum_field_types default_data_type() const override {
return MYSQL_TYPE_VARCHAR;
Expand Down