Commit 8746d743 authored by unknown's avatar unknown
Browse files

allow get_format(TIMESTAMP, ...) syntax

parent ce4e83e3

mysql-test/r/date_formats.result

+3 −0
Original line number Diff line number Diff line
@@ -379,6 +379,9 @@ a 
select get_format(DATETIME, 'eur') as a;

a

%Y-%m-%d %H.%i.%s

select get_format(TIMESTAMP, 'eur') as a;

a

%Y-%m-%d %H.%i.%s

select get_format(DATE, 'TEST') as a;

a

NULL

mysql-test/t/date_formats.test

+1 −0
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ drop table t1; 
select get_format(DATE, 'USA') as a;

select get_format(TIME, 'internal') as a;

select get_format(DATETIME, 'eur') as a;

select get_format(TIMESTAMP, 'eur') as a;

select get_format(DATE, 'TEST') as a;

select str_to_date('15-01-2001 12:59:59', GET_FORMAT(DATE,'USA'));

sql/sql_yacc.yy

+7 −4
Original line number Diff line number Diff line
@@ -3533,12 +3533,15 @@ interval: 
	| SECOND_MICROSECOND_SYM	{ $$=INTERVAL_SECOND_MICROSECOND; }

	| SECOND_SYM		{ $$=INTERVAL_SECOND; }

	| YEAR_MONTH_SYM	{ $$=INTERVAL_YEAR_MONTH; }

	| YEAR_SYM		{ $$=INTERVAL_YEAR; };

	| YEAR_SYM		{ $$=INTERVAL_YEAR; }

        ;



date_time_type:

          DATE_SYM              {$$=MYSQL_TIMESTAMP_DATE;}

        | TIME_SYM              {$$=MYSQL_TIMESTAMP_TIME;}

	| DATETIME		{$$=MYSQL_TIMESTAMP_DATETIME;};

        | DATETIME              {$$=MYSQL_TIMESTAMP_DATETIME;}

        | TIMESTAMP             {$$=MYSQL_TIMESTAMP_DATETIME;}

        ;



table_alias:

	/* empty */