Changeset: 0194ec38bb36 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0194ec38bb36
Modified Files:
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: oscar
Log Message:
Approve upgrade.
diffs (truncated from 2660 to 300 lines):
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -5777,12 +5777,130 @@ DROP AGGREGATE "json"."output"(json);
delete from privileges where obj_id in (select obj_id from privileges left
join functions on privileges.obj_id = functions.id where functions.id is null
and privileges.obj_id not in ((SELECT tables.id from tables), 0));
delete from functions where name in ('sql_sub','sql_add') and func in
('+','-') and id in (select func_id from args where name = 'res_0' and type in
('sec_interval','month_interval'));
delete from args where id in (select args.id from args left join functions on
args.func_id = functions.id where functions.id is null);
-update sys.functions set semantics = false where type <> 6 and ((func not
ilike '%CREATE FUNCTION%' and name in
('length','octet_length','>','>=','<','<=','min','max','sql_min','sql_max','least','greatest','sum','prod','mod','and',
-'xor','not','sql_mul','sql_div','sql_sub','sql_add','bit_and','bit_or','bit_xor','bit_not','left_shift','right_shift','abs','sign','scale_up','scale_down','round','power','floor','ceil','ceiling','sin','cos','tan','asin',
-'acos','atan','sinh','cot','cosh','tanh','sqrt','exp','log','ln','log10','log2','pi','curdate','current_date','curtime','current_time','current_timestamp','localtime','localtimestamp','local_timezone','century','decade','year',
-'quarter','month','day','dayofyear','weekofyear','dayofweek','dayofmonth','week','hour','minute','second','strings','locate','charindex','splitpart','substring','substr','truncate','concat','ascii','code','right','left','upper',
-'ucase','lower','lcase','trim','ltrim','rtrim','lpad','rpad','insert','replace','repeat','space','char_length','character_length','soundex','qgramnormalize','degrees','radians'))
or
-(system = true and name in
('like','ilike','str_to_date','date_to_str','str_to_time','time_to_str','str_to_timestamp','timestamp_to_str','date_trunc','epoch','reverse')));
+UPDATE sys.functions set semantics = false WHERE (name, func) IN (VALUES
+('length', 'nitems'),
+('octet_length', 'nitems'),
+('>', '>'),
+('>=', '>='),
+('<', '<'),
+('<=', '<='),
+('min', 'min'),
+('max', 'max'),
+('sql_min', 'min'),
+('sql_max', 'max'),
+('least', 'min_no_nil'),
+('greatest', 'max_no_nil'),
+('sum', 'sum'),
+('prod', 'prod'),
+('mod', '%'),
+('and', 'and'),
+('xor', 'xor'),
+('not', 'not'),
+('sql_mul', '*'),
+('sql_div', '/'),
+('sql_sub', '-'),
+('sql_add', '+'),
+('bit_and', 'and'),
+('bit_or', 'or'),
+('bit_xor', 'xor'),
+('bit_not', 'not'),
+('left_shift', '<<'),
+('right_shift', '>>'),
+('abs', 'abs'),
+('sign', 'sign'),
+('scale_up', '*'),
+('scale_down', 'dec_round'),
+('round', 'round'),
+('power', 'pow'),
+('floor', 'floor'),
+('ceil', 'ceil'),
+('ceiling', 'ceil'),
+('sin', 'sin'),
+('cos', 'cos'),
+('tan', 'tan'),
+('asin', 'asin'),
+('acos', 'acos'),
+('atan', 'atan'),
+('atan', 'atan2'),
+('sinh', 'sinh'),
+('cot', 'cot'),
+('cosh', 'cosh'),
+('tanh', 'tanh'),
+('sqrt', 'sqrt'),
+('exp', 'exp'),
+('log', 'log'),
+('ln', 'log'),
+('log10', 'log10'),
+('log2', 'log2'),
+('degrees', 'degrees'),
+('radians', 'radians'),
+('pi', 'pi'),
+('curdate', 'current_date'),
+('current_date', 'current_date'),
+('curtime', 'current_time'),
+('current_time', 'current_time'),
+('current_timestamp', 'current_timestamp'),
+('localtime', 'current_time'),
+('localtimestamp', 'current_timestamp'),
+('sql_sub', 'diff'),
+('sql_sub', 'date_sub_msec_interval'),
+('sql_sub', 'date_sub_month_interval'),
+('sql_sub', 'time_sub_msec_interval'),
+('sql_sub', 'timestamp_sub_msec_interval'),
+('sql_sub', 'timestamp_sub_month_interval'),
+('sql_add', 'date_add_msec_interval'),
+('sql_add', 'addmonths'),
+('sql_add', 'timestamp_add_msec_interval'),
+('sql_add', 'timestamp_add_month_interval'),
+('sql_add', 'time_add_msec_interval'),
+('local_timezone', 'local_timezone'),
+('century', 'century'),
+('decade', 'decade'),
+('year', 'year'),
+('quarter', 'quarter'),
+('month', 'month'),
+('day', 'day'),
+('dayofyear', 'dayofyear'),
+('weekofyear', 'weekofyear'),
+('dayofweek', 'dayofweek'),
+('dayofmonth', 'day'),
+('week', 'weekofyear'),
+('hour', 'hours'),
+('minute', 'minutes'),
+('second', 'sql_seconds'),
+('second', 'seconds'),
+('strings', 'strings'),
+('locate', 'locate'),
+('charindex', 'locate'),
+('splitpart', 'splitpart'),
+('substring', 'substring'),
+('substr', 'substring'),
+('truncate', 'stringleft'),
+('concat', '+'),
+('ascii', 'ascii'),
+('code', 'unicode'),
+('length', 'length'),
+('right', 'stringright'),
+('left', 'stringleft'),
+('upper', 'toUpper'),
+('ucase', 'toUpper'),
+('lower', 'toLower'),
+('lcase', 'toLower'),
+('trim', 'trim'),
+('ltrim', 'ltrim'),
+('rtrim', 'rtrim'),
+('lpad', 'lpad'),
+('rpad', 'rpad'),
+('insert', 'insert'),
+('replace', 'replace'),
+('repeat', 'repeat'),
+('space', 'space'),
+('char_length', 'length'),
+('character_length', 'length'),
+('octet_length', 'nbytes'),
+('soundex', 'soundex'),
+('qgramnormalize', 'qgramnormalize')
+);
set schema "sys";
# MonetDB/SQL module loaded
diff --git
a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
@@ -5777,12 +5777,130 @@ DROP AGGREGATE "json"."output"(json);
delete from privileges where obj_id in (select obj_id from privileges left
join functions on privileges.obj_id = functions.id where functions.id is null
and privileges.obj_id not in ((SELECT tables.id from tables), 0));
delete from functions where name in ('sql_sub','sql_add') and func in
('+','-') and id in (select func_id from args where name = 'res_0' and type in
('sec_interval','month_interval'));
delete from args where id in (select args.id from args left join functions on
args.func_id = functions.id where functions.id is null);
-update sys.functions set semantics = false where type <> 6 and ((func not
ilike '%CREATE FUNCTION%' and name in
('length','octet_length','>','>=','<','<=','min','max','sql_min','sql_max','least','greatest','sum','prod','mod','and',
-'xor','not','sql_mul','sql_div','sql_sub','sql_add','bit_and','bit_or','bit_xor','bit_not','left_shift','right_shift','abs','sign','scale_up','scale_down','round','power','floor','ceil','ceiling','sin','cos','tan','asin',
-'acos','atan','sinh','cot','cosh','tanh','sqrt','exp','log','ln','log10','log2','pi','curdate','current_date','curtime','current_time','current_timestamp','localtime','localtimestamp','local_timezone','century','decade','year',
-'quarter','month','day','dayofyear','weekofyear','dayofweek','dayofmonth','week','hour','minute','second','strings','locate','charindex','splitpart','substring','substr','truncate','concat','ascii','code','right','left','upper',
-'ucase','lower','lcase','trim','ltrim','rtrim','lpad','rpad','insert','replace','repeat','space','char_length','character_length','soundex','qgramnormalize','degrees','radians'))
or
-(system = true and name in
('like','ilike','str_to_date','date_to_str','str_to_time','time_to_str','str_to_timestamp','timestamp_to_str','date_trunc','epoch','reverse')));
+UPDATE sys.functions set semantics = false WHERE (name, func) IN (VALUES
+('length', 'nitems'),
+('octet_length', 'nitems'),
+('>', '>'),
+('>=', '>='),
+('<', '<'),
+('<=', '<='),
+('min', 'min'),
+('max', 'max'),
+('sql_min', 'min'),
+('sql_max', 'max'),
+('least', 'min_no_nil'),
+('greatest', 'max_no_nil'),
+('sum', 'sum'),
+('prod', 'prod'),
+('mod', '%'),
+('and', 'and'),
+('xor', 'xor'),
+('not', 'not'),
+('sql_mul', '*'),
+('sql_div', '/'),
+('sql_sub', '-'),
+('sql_add', '+'),
+('bit_and', 'and'),
+('bit_or', 'or'),
+('bit_xor', 'xor'),
+('bit_not', 'not'),
+('left_shift', '<<'),
+('right_shift', '>>'),
+('abs', 'abs'),
+('sign', 'sign'),
+('scale_up', '*'),
+('scale_down', 'dec_round'),
+('round', 'round'),
+('power', 'pow'),
+('floor', 'floor'),
+('ceil', 'ceil'),
+('ceiling', 'ceil'),
+('sin', 'sin'),
+('cos', 'cos'),
+('tan', 'tan'),
+('asin', 'asin'),
+('acos', 'acos'),
+('atan', 'atan'),
+('atan', 'atan2'),
+('sinh', 'sinh'),
+('cot', 'cot'),
+('cosh', 'cosh'),
+('tanh', 'tanh'),
+('sqrt', 'sqrt'),
+('exp', 'exp'),
+('log', 'log'),
+('ln', 'log'),
+('log10', 'log10'),
+('log2', 'log2'),
+('degrees', 'degrees'),
+('radians', 'radians'),
+('pi', 'pi'),
+('curdate', 'current_date'),
+('current_date', 'current_date'),
+('curtime', 'current_time'),
+('current_time', 'current_time'),
+('current_timestamp', 'current_timestamp'),
+('localtime', 'current_time'),
+('localtimestamp', 'current_timestamp'),
+('sql_sub', 'diff'),
+('sql_sub', 'date_sub_msec_interval'),
+('sql_sub', 'date_sub_month_interval'),
+('sql_sub', 'time_sub_msec_interval'),
+('sql_sub', 'timestamp_sub_msec_interval'),
+('sql_sub', 'timestamp_sub_month_interval'),
+('sql_add', 'date_add_msec_interval'),
+('sql_add', 'addmonths'),
+('sql_add', 'timestamp_add_msec_interval'),
+('sql_add', 'timestamp_add_month_interval'),
+('sql_add', 'time_add_msec_interval'),
+('local_timezone', 'local_timezone'),
+('century', 'century'),
+('decade', 'decade'),
+('year', 'year'),
+('quarter', 'quarter'),
+('month', 'month'),
+('day', 'day'),
+('dayofyear', 'dayofyear'),
+('weekofyear', 'weekofyear'),
+('dayofweek', 'dayofweek'),
+('dayofmonth', 'day'),
+('week', 'weekofyear'),
+('hour', 'hours'),
+('minute', 'minutes'),
+('second', 'sql_seconds'),
+('second', 'seconds'),
+('strings', 'strings'),
+('locate', 'locate'),
+('charindex', 'locate'),
+('splitpart', 'splitpart'),
+('substring', 'substring'),
+('substr', 'substring'),
+('truncate', 'stringleft'),
+('concat', '+'),
+('ascii', 'ascii'),
+('code', 'unicode'),
+('length', 'length'),
+('right', 'stringright'),
+('left', 'stringleft'),
+('upper', 'toUpper'),
+('ucase', 'toUpper'),
+('lower', 'toLower'),
+('lcase', 'toLower'),
+('trim', 'trim'),
+('ltrim', 'ltrim'),
+('rtrim', 'rtrim'),
+('lpad', 'lpad'),
+('rpad', 'rpad'),
+('insert', 'insert'),
+('replace', 'replace'),
+('repeat', 'repeat'),
+('space', 'space'),
+('char_length', 'length'),
+('character_length', 'length'),
+('octet_length', 'nbytes'),
+('soundex', 'soundex'),
+('qgramnormalize', 'qgramnormalize')
+);
set schema "sys";
# MonetDB/SQL module loaded
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
@@ -5019,12 +5019,130 @@ DROP AGGREGATE "json"."output"(json);
delete from privileges where obj_id in (select obj_id from privileges left
join functions on privileges.obj_id = functions.id where functions.id is null
and privileges.obj_id not in ((SELECT tables.id from tables), 0));
delete from functions where name in ('sql_sub','sql_add') and func in
('+','-') and id in (select func_id from args where name = 'res_0' and type in
('sec_interval','month_interval'));
delete from args where id in (select args.id from args left join functions on
args.func_id = functions.id where functions.id is null);
-update sys.functions set semantics = false where type <> 6 and ((func not
ilike '%CREATE FUNCTION%' and name in
('length','octet_length','>','>=','<','<=','min','max','sql_min','sql_max','least','greatest','sum','prod','mod','and',
-'xor','not','sql_mul','sql_div','sql_sub','sql_add','bit_and','bit_or','bit_xor','bit_not','left_shift','right_shift','abs','sign','scale_up','scale_down','round','power','floor','ceil','ceiling','sin','cos','tan','asin',
-'acos','atan','sinh','cot','cosh','tanh','sqrt','exp','log','ln','log10','log2','pi','curdate','current_date','curtime','current_time','current_timestamp','localtime','localtimestamp','local_timezone','century','decade','year',
-'quarter','month','day','dayofyear','weekofyear','dayofweek','dayofmonth','week','hour','minute','second','strings','locate','charindex','splitpart','substring','substr','truncate','concat','ascii','code','right','left','upper',
-'ucase','lower','lcase','trim','ltrim','rtrim','lpad','rpad','insert','replace','repeat','space','char_length','character_length','soundex','qgramnormalize','degrees','radians'))
or
-(system = true and name in
('like','ilike','str_to_date','date_to_str','str_to_time','time_to_str','str_to_timestamp','timestamp_to_str','date_trunc','epoch','reverse')));
+UPDATE sys.functions set semantics = false WHERE (name, func) IN (VALUES
+('length', 'nitems'),
+('octet_length', 'nitems'),
+('>', '>'),
+('>=', '>='),
+('<', '<'),
+('<=', '<='),
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
