Changeset: e7845def2f56 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e7845def2f56
Modified Files:
sql/common/sql_types.c
sql/server/sql_parser.y
Branch: escape-sequences
Log Message:
clean up
diffs (30 lines):
diff --git a/sql/common/sql_types.c b/sql/common/sql_types.c
--- a/sql/common/sql_types.c
+++ b/sql/common/sql_types.c
@@ -1350,14 +1350,13 @@ sqltypeinit( sql_allocator *sa)
sql_create_func(sa, "sql_add", "mtime", "time_add_msec_interval",
FALSE, FALSE, SCALE_NONE, 0, TME, 2, TME, SECINT);
sql_create_func(sa, "sql_add", "mtime", "time_add_msec_interval",
FALSE, FALSE, SCALE_NONE, 0, TMETZ, 2, TMETZ, SECINT);
- // odbc timestampadd
+ // odbc timestampadd variants
sql_create_func(sa, "timestampadd", "mtime",
"timestamp_add_msec_interval", FALSE, FALSE, SCALE_NONE, 0, TMESTAMP, 2,
TMESTAMP, SECINT);
sql_create_func(sa, "timestampadd", "mtime",
"timestamp_add_msec_interval", FALSE, FALSE, SCALE_NONE, 0, TMESTAMP, 2,
TMESTAMP, DAYINT);
sql_create_func(sa, "timestampadd", "mtime",
"timestamp_add_month_interval", FALSE, FALSE, SCALE_NONE, 0, TMESTAMP, 2,
TMESTAMP, MONINT);
sql_create_func(sa, "timestampadd", "mtime",
"timestamp_add_msec_interval", FALSE, FALSE, SCALE_NONE, 0, TMESTAMPTZ, 2,
TMESTAMPTZ, SECINT);
sql_create_func(sa, "timestampadd", "mtime",
"timestamp_add_msec_interval", FALSE, FALSE, SCALE_NONE, 0, TMESTAMPTZ, 2,
TMESTAMPTZ, DAYINT);
sql_create_func(sa, "timestampadd", "mtime",
"timestamp_add_month_interval", FALSE, FALSE, SCALE_NONE, 0, TMESTAMPTZ, 2,
TMESTAMPTZ, MONINT);
- // corner cases as described in microsoft odbc timestampadd spec
sql_create_func(sa, "timestampadd", "mtime",
"odbc_timestamp_add_msec_time", FALSE, FALSE, SCALE_NONE, 0, TMESTAMP, 2, TME,
DAYINT);
sql_create_func(sa, "timestampadd", "mtime",
"odbc_timestamp_add_month_time", FALSE, FALSE, SCALE_NONE, 0, TMESTAMP, 2, TME,
MONINT);
sql_create_func(sa, "timestampadd", "mtime",
"odbc_timestamp_add_msec_date", FALSE, FALSE, SCALE_NONE, 0, TMESTAMP, 2, DTE,
SECINT);
diff --git a/sql/server/sql_parser.y b/sql/server/sql_parser.y
--- a/sql/server/sql_parser.y
+++ b/sql/server/sql_parser.y
@@ -6488,7 +6488,6 @@ odbc_datetime_func:
| TIMESTAMPDIFF '(' odbc_tsi_qualifier ',' search_condition ','
search_condition ')'
{ dlist *l = L();
switch($3) {
- // TODO implement other cases
case iyear:
append_list( l, append_string(L(), sa_strdup(SA,
"timestampdiff_year")));
break;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
