Changeset: ccc9fc310534 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/ccc9fc310534 Modified Files: sql/test/emptydb/Tests/check.stable.out.int128 Branch: balanced_union Log Message:
Adjusts emptydb check output (labels changes and alias propagation) diffs (truncated from 639 to 300 lines): diff --git a/sql/test/emptydb/Tests/check.stable.out.int128 b/sql/test/emptydb/Tests/check.stable.out.int128 --- a/sql/test/emptydb/Tests/check.stable.out.int128 +++ b/sql/test/emptydb/Tests/check.stable.out.int128 @@ -5195,8 +5195,8 @@ select 'null in fkeys.delete_action', de % %1, name, name, start, minvalue, maxvalue, increment, cacheinc, cycle, comment # name % varchar, varchar, varchar, bigint, bigint, bigint, bigint, bigint, boolean, varchar # type % 0, 0, 0, 1, 1, 1, 1, 1, 5, 0 # length -% .%17 # table_name -% %17 # name +% .%16 # table_name +% %16 # name % bigint # type % 1 # length [ 0 ] @@ -5676,16 +5676,16 @@ select 'null in fkeys.delete_action', de % %2, %1, id # name % varchar, bigint, int # type % 0, 1, 1 # length -% .%11, sys.%7, sys.tables # table_name -% %11, %7, id # name +% .%7, sys.%6, sys.tables # table_name +% %7, %6, id # name % varchar, bigint, int # type % 0, 1, 1 # length % .%2, sys.%1, sys._columns # table_name % %2, %1, id # name % varchar, bigint, int # type % 0, 1, 1 # length -% .%10, sys.%6, sys.columns # table_name -% %10, %6, id # name +% .%6, sys.%5, sys.columns # table_name +% %6, %5, id # name % varchar, bigint, int # type % 0, 1, 1 # length % .%2, sys.%1, sys.functions # table_name @@ -5768,8 +5768,8 @@ select 'null in fkeys.delete_action', de % %2, %1, name # name % varchar, bigint, varchar # type % 0, 1, 0 # length -% .%23, .%17, .statistics # table_name -% %23, %17, column_id # name +% .%22, .%16, .statistics # table_name +% %22, %16, column_id # name % varchar, bigint, int # type % 0, 1, 1 # length % .%3, .%2, .%1, .%1, .%1 # table_name @@ -5816,12 +5816,12 @@ select 'null in fkeys.delete_action', de % %2, %1, id # name % varchar, bigint, int # type % 0, 1, 1 # length -% .%175, .%167, .ids # table_name -% %175, %167, id # name +% .%150, .%147, .ids # table_name +% %150, %147, id # name % varchar, bigint, int # type % 0, 1, 1 # length -% .%105, .%104, .var_values # table_name -% %105, %104, var_name # name +% .%75, .%74, .var_values # table_name +% %75, %74, var_name # name % varchar, bigint, varchar # type % 0, 1, 0 # length % .%2, sys.%1, sys.table_partitions # table_name @@ -5848,8 +5848,8 @@ select 'null in fkeys.delete_action', de % %2, %1, action_id # name % varchar, bigint, smallint # type % 0, 1, 1 # length -% .%13, .%12, .fkeys # table_name -% %13, %12, id # name +% .%12, .%11, .fkeys # table_name +% %12, %11, id # name % varchar, bigint, int # type % 0, 1, 1 # length % .%2, sys.%1, sys.schemas # table_name @@ -5860,32 +5860,32 @@ select 'null in fkeys.delete_action', de % %2, %1, schema_id, name # name % varchar, bigint, int, varchar # type % 0, 1, 1, 0 # length -% .%11, sys.%7, sys.tables, sys.tables # table_name -% %11, %7, schema_id, name # name +% .%7, sys.%6, sys.tables, sys.tables # table_name +% %7, %6, schema_id, name # name % varchar, bigint, int, varchar # type % 0, 1, 1, 0 # length % .%2, sys.%1, sys._columns, sys._columns # table_name % %2, %1, table_id, name # name % varchar, bigint, int, varchar # type % 0, 1, 1, 0 # length -% .%10, sys.%6, sys.columns, sys.columns # table_name -% %10, %6, table_id, name # name +% .%6, sys.%5, sys.columns, sys.columns # table_name +% %6, %5, table_id, name # name % varchar, bigint, int, varchar # type % 0, 1, 1, 0 # length % .%2, sys.%1, sys._columns, sys._columns # table_name % %2, %1, table_id, number # name % varchar, bigint, int, int # type % 0, 1, 1, 1 # length -% .%10, sys.%6, sys.columns, sys.columns # table_name -% %10, %6, table_id, number # name +% .%6, sys.%5, sys.columns, sys.columns # table_name +% %6, %5, table_id, number # name % varchar, bigint, int, int # type % 0, 1, 1, 1 # length -% .%21, .%20, .t # table_name -% %21, %20, id # name +% .%16, .%15, .t # table_name +% %16, %15, id # name % varchar, bigint, int # type % 0, 1, 1 # length -% .%36, .%33, .t # table_name -% %36, %33, id # name +% .%27, .%26, .t # table_name +% %27, %26, id # name % varchar, bigint, int # type % 0, 1, 1 # length % .%2, sys.%1, sys.f, sys.f, sys.f, sys.f, sys.f, sys.f, sys.f, sys.f, sys.f, sys.a # table_name @@ -5976,8 +5976,8 @@ select 'null in fkeys.delete_action', de % %2, %1, action_name # name % varchar, bigint, varchar # type % 0, 1, 0 # length -% .%13, .%12, .fkeys, .fkeys # table_name -% %13, %12, table_id, name # name +% .%12, .%11, .fkeys, .fkeys # table_name +% %12, %11, table_id, name # name % varchar, bigint, int, varchar # type % 0, 1, 1, 0 # length % .%5, sys.schemas, sys.schemas, sys.schemas, sys.schemas, sys.schemas, sys.schemas # table_name @@ -5992,32 +5992,32 @@ select 'null in fkeys.delete_action', de % %5, schema_id, id, name, schema_id, query, type, system, commit_action, access # name % varchar, int, int, varchar, int, varchar, smallint, boolean, smallint, smallint # type % 0, 1, 1, 0, 1, 0, 1, 5, 1, 1 # length -% .%13, sys.tables, sys.tables, sys.tables, sys.tables, sys.tables, .tables, sys.tables, sys.tables, sys.tables, .tables # table_name -% %13, schema_id, id, name, schema_id, query, type, system, commit_action, access, temporary # name +% .%12, sys.tables, sys.tables, sys.tables, sys.tables, sys.tables, .tables, sys.tables, sys.tables, sys.tables, .tables # table_name +% %12, schema_id, id, name, schema_id, query, type, system, commit_action, access, temporary # name % varchar, int, int, varchar, int, varchar, smallint, boolean, smallint, smallint, tinyint # type % 0, 1, 1, 0, 1, 0, 1, 5, 1, 1, 1 # length % .%5, sys._tables, sys._tables, sys._tables, sys._tables, sys._tables, sys._tables, sys._tables, sys._tables, sys._tables # table_name % %5, type, id, name, schema_id, query, type, system, commit_action, access # name % varchar, smallint, int, varchar, int, varchar, smallint, boolean, smallint, smallint # type % 0, 1, 1, 0, 1, 0, 1, 5, 1, 1 # length -% .%13, .tables, sys.tables, sys.tables, sys.tables, sys.tables, .tables, sys.tables, sys.tables, sys.tables, .tables # table_name -% %13, type, id, name, schema_id, query, type, system, commit_action, access, temporary # name +% .%12, .tables, sys.tables, sys.tables, sys.tables, sys.tables, .tables, sys.tables, sys.tables, sys.tables, .tables # table_name +% %12, type, id, name, schema_id, query, type, system, commit_action, access, temporary # name % varchar, smallint, int, varchar, int, varchar, smallint, boolean, smallint, smallint, tinyint # type % 0, 1, 1, 0, 1, 0, 1, 5, 1, 1, 1 # length % .%5, sys._columns, sys._columns, sys._columns, sys._columns, sys._columns, sys._columns, sys._columns, sys._columns, sys._columns, sys._columns, sys._columns # table_name % %5, table_id, id, name, type, type_digits, type_scale, table_id, default, null, number, storage # name % varchar, int, int, varchar, varchar, int, int, int, varchar, boolean, int, varchar # type % 0, 1, 1, 0, 0, 1, 1, 1, 0, 5, 1, 0 # length -% .%20, sys.columns, sys.columns, sys.columns, sys.columns, sys.columns, sys.columns, sys.columns, sys.columns, sys.columns, sys.columns, sys.columns # table_name -% %20, table_id, id, name, type, type_digits, type_scale, table_id, default, null, number, storage # name +% .%16, sys.columns, sys.columns, sys.columns, sys.columns, sys.columns, sys.columns, sys.columns, sys.columns, sys.columns, sys.columns, sys.columns # table_name +% %16, table_id, id, name, type, type_digits, type_scale, table_id, default, null, number, storage # name % varchar, int, int, varchar, varchar, int, int, int, varchar, boolean, int, varchar # type % 0, 1, 1, 0, 0, 1, 1, 1, 0, 5, 1, 0 # length % .%5, sys._columns, sys._columns, sys._columns, sys._columns, sys._columns, sys._columns, sys._columns, sys._columns, sys._columns, sys._columns, sys._columns # table_name % %5, type, id, name, type, type_digits, type_scale, table_id, default, null, number, storage # name % varchar, varchar, int, varchar, varchar, int, int, int, varchar, boolean, int, varchar # type % 0, 0, 1, 0, 0, 1, 1, 1, 0, 5, 1, 0 # length -% .%12, sys.columns, sys.columns, sys.columns, sys.columns, sys.columns, sys.columns, sys.columns, sys.columns, sys.columns, sys.columns, sys.columns # table_name -% %12, type, id, name, type, type_digits, type_scale, table_id, default, null, number, storage # name +% .%11, sys.columns, sys.columns, sys.columns, sys.columns, sys.columns, sys.columns, sys.columns, sys.columns, sys.columns, sys.columns, sys.columns # table_name +% %11, type, id, name, type, type_digits, type_scale, table_id, default, null, number, storage # name % varchar, varchar, int, varchar, varchar, int, int, int, varchar, boolean, int, varchar # type % 0, 0, 1, 0, 0, 1, 1, 1, 0, 5, 1, 0 # length % .%5, sys.functions, sys.functions, sys.functions, sys.functions, sys.functions, sys.functions, sys.functions, sys.functions, sys.functions, sys.functions, sys.functions, sys.functions, sys.functions # table_name @@ -6048,12 +6048,12 @@ select 'null in fkeys.delete_action', de % %5, schema_id, id, systemname, sqlname, digits, scale, radix, eclass, schema_id # name % varchar, int, int, varchar, varchar, int, int, int, int, int # type % 0, 1, 1, 0, 0, 1, 1, 1, 1, 1 # length -% .%200, sys.objects, sys.objects, sys.objects, sys.objects, sys.objects # table_name -% %200, id, id, name, nr, sub # name +% .%153, sys.objects, sys.objects, sys.objects, sys.objects, sys.objects # table_name +% %153, id, id, name, nr, sub # name % varchar, int, int, varchar, int, int # type % 0, 1, 1, 0, 1, 1 # length -% .%237, .ids, .ids, .ids, .ids, .ids, .ids, .ids, .ids, .ids # table_name -% %237, id, id, name, schema_id, table_id, table_name, obj_type, sys_table, system # name +% .%212, .ids, .ids, .ids, .ids, .ids, .ids, .ids, .ids, .ids # table_name +% %212, id, id, name, schema_id, table_id, table_name, obj_type, sys_table, system # name % varchar, int, int, varchar, int, int, varchar, varchar, varchar, boolean # type % 0, 1, 1, 0, 1, 1, 0, 0, 0, 5 # length % .%5, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys # table_name @@ -6064,8 +6064,8 @@ select 'null in fkeys.delete_action', de % %5, table_id, id, table_id, type, name, rkey, action # name % varchar, int, int, int, int, varchar, int, int # type % 0, 1, 1, 1, 1, 0, 1, 1 # length -% .%13, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys # table_name -% %13, table_id, id, table_id, type, name, rkey, action # name +% .%12, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys # table_name +% %12, table_id, id, table_id, type, name, rkey, action # name % varchar, int, int, int, int, varchar, int, int # type % 0, 1, 1, 1, 1, 0, 1, 1 # length % .%5, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys # table_name @@ -6084,8 +6084,8 @@ select 'null in fkeys.delete_action', de % %5, table_id, id, table_id, type, name # name % varchar, int, int, int, int, varchar # type % 0, 1, 1, 1, 1, 0 # length -% .%13, sys.idxs, sys.idxs, sys.idxs, sys.idxs, sys.idxs # table_name -% %13, table_id, id, table_id, type, name # name +% .%12, sys.idxs, sys.idxs, sys.idxs, sys.idxs, sys.idxs # table_name +% %12, table_id, id, table_id, type, name # name % varchar, int, int, int, int, varchar # type % 0, 1, 1, 1, 1, 0 # length % .%5, sys.idxs, sys.idxs, sys.idxs, sys.idxs, sys.idxs # table_name @@ -6100,28 +6100,28 @@ select 'null in fkeys.delete_action', de % %5, table_id, id, name, table_id, time, orientation, event, old_name, new_name, condition, statement # name % varchar, int, int, varchar, int, smallint, smallint, smallint, varchar, varchar, varchar, varchar # type % 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0 # length -% .%13, sys.triggers, sys.triggers, sys.triggers, sys.triggers, sys.triggers, sys.triggers, sys.triggers, sys.triggers, sys.triggers, sys.triggers, sys.triggers # table_name -% %13, table_id, id, name, table_id, time, orientation, event, old_name, new_name, condition, statement # name +% .%12, sys.triggers, sys.triggers, sys.triggers, sys.triggers, sys.triggers, sys.triggers, sys.triggers, sys.triggers, sys.triggers, sys.triggers, sys.triggers # table_name +% %12, table_id, id, name, table_id, time, orientation, event, old_name, new_name, condition, statement # name % varchar, int, int, varchar, int, smallint, smallint, smallint, varchar, varchar, varchar, varchar # type % 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0 # length -% .%200, sys.comments, sys.comments, sys.comments # table_name -% %200, id, id, remark # name +% .%153, sys.comments, sys.comments, sys.comments # table_name +% %153, id, id, remark # name % varchar, int, int, varchar # type % 0, 1, 1, 0 # length -% .%200, sys.dependencies, sys.dependencies, sys.dependencies, sys.dependencies # table_name -% %200, id, id, depend_id, depend_type # name +% .%153, sys.dependencies, sys.dependencies, sys.dependencies, sys.dependencies # table_name +% %153, id, id, depend_id, depend_type # name % varchar, int, int, int, smallint # type % 0, 1, 1, 1, 1 # length -% .%200, sys.dependencies, sys.dependencies, sys.dependencies, sys.dependencies # table_name -% %200, depend_id, id, depend_id, depend_type # name +% .%153, sys.dependencies, sys.dependencies, sys.dependencies, sys.dependencies # table_name +% %153, depend_id, id, depend_id, depend_type # name % varchar, int, int, int, smallint # type % 0, 1, 1, 1, 1 # length % .%5, sys.dependencies, sys.dependencies, sys.dependencies, sys.dependencies # table_name % %5, depend_type, id, depend_id, depend_type # name % varchar, smallint, int, int, smallint # type % 0, 1, 1, 1, 1 # length -% .%401, sys.dependencies, sys.dependencies, sys.dependencies, sys.dependencies, sys.dependencies, sys.dependencies # table_name -% %401, id, depend_id, depend_type, id, depend_id, depend_type # name +% .%327, sys.dependencies, sys.dependencies, sys.dependencies, sys.dependencies, sys.dependencies, sys.dependencies # table_name +% %327, id, depend_id, depend_type, id, depend_id, depend_type # name % varchar, int, int, smallint, int, int, smallint # type % 0, 1, 1, 1, 1, 1, 1 # length % .%5, sys.auths, sys.auths, sys.auths, sys.auths # table_name @@ -6164,8 +6164,8 @@ select 'null in fkeys.delete_action', de % %11, role_id, login_id, role_id # name % varchar, int, int, int # type % 0, 1, 1, 1 # length -% .%24, sys.privileges, sys.privileges, sys.privileges, sys.privileges, sys.privileges, sys.privileges # table_name -% %24, obj_id, obj_id, auth_id, privileges, grantor, grantable # name +% .%21, sys.privileges, sys.privileges, sys.privileges, sys.privileges, sys.privileges, sys.privileges # table_name +% %21, obj_id, obj_id, auth_id, privileges, grantor, grantable # name % varchar, int, int, int, int, int, int # type % 0, 1, 1, 1, 1, 1, 1 # length % .%5, sys.privileges, sys.privileges, sys.privileges, sys.privileges, sys.privileges, sys.privileges # table_name @@ -6212,68 +6212,68 @@ select 'null in fkeys.delete_action', de % %7, optimizer, sessionid, username, login, idle, optimizer, sessiontimeout, querytimeout, workerlimit, memorylimit # name % varchar, varchar, int, varchar, timestamp, timestamp, varchar, int, int, int, int # type % 0, 0, 1, 0, 26, 26, 0, 1, 1, 1, 1 # length -% .%33, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics # table_name -% %33, column_id, column_id, schema, table, column, type, width, count, unique, nils, minval, maxval, sorted, revsorted # name +% .%31, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics # table_name +% %31, column_id, column_id, schema, table, column, type, width, count, unique, nils, minval, maxval, sorted, revsorted # name % varchar, int, int, varchar, varchar, varchar, varchar, int, bigint, boolean, boolean, varchar, varchar, boolean, boolean # type % 0, 1, 1, 0, 0, 0, 0, 1, 1, 5, 5, 0, 0, 5, 5 # length -% .%26, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics # table_name -% %26, type, column_id, schema, table, column, type, width, count, unique, nils, minval, maxval, sorted, revsorted # name +% .%25, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics, .statistics # table_name +% %25, type, column_id, schema, table, column, type, width, count, unique, nils, minval, maxval, sorted, revsorted # name % varchar, varchar, int, varchar, varchar, varchar, varchar, int, bigint, boolean, boolean, varchar, varchar, boolean, boolean # type % 0, 0, 1, 0, 0, 0, 0, 1, 1, 5, 5, 0, 0, 5, 5 # length % .%6, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1 # table_name % %6, schema, schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, revsorted, unique, orderidx # name % varchar, varchar, varchar, varchar, varchar, varchar, varchar, varchar, bigint, int, bigint, bigint, bigint, boolean, bigint, boolean, boolean, boolean, bigint # type % 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 5, 1, 5, 5, 5, 1 # length -% .%13, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1 # table_name -% %13, table, schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, revsorted, unique, orderidx # name +% .%12, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1 # table_name +% %12, table, schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, revsorted, unique, orderidx # name % varchar, varchar, varchar, varchar, varchar, varchar, varchar, varchar, bigint, int, bigint, bigint, bigint, boolean, bigint, boolean, boolean, boolean, bigint # type % 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 5, 1, 5, 5, 5, 1 # length -% .%20, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1 # table_name -% %20, schema, table, schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, revsorted, unique, orderidx # name +% .%17, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1 # table_name +% %17, schema, table, schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, revsorted, unique, orderidx # name % varchar, varchar, varchar, varchar, varchar, varchar, varchar, varchar, varchar, bigint, int, bigint, bigint, bigint, boolean, bigint, boolean, boolean, boolean, bigint # type % 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 5, 1, 5, 5, 5, 1 # length -% .%37, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1 # table_name -% %37, column, schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, revsorted, unique, orderidx # name +% .%32, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1 # table_name +% %32, column, schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, revsorted, unique, orderidx # name % varchar, varchar, varchar, varchar, varchar, varchar, varchar, varchar, bigint, int, bigint, bigint, bigint, boolean, bigint, boolean, boolean, boolean, bigint # type % 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 5, 1, 5, 5, 5, 1 # length % .%6, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1, .%1 # table_name % %6, type, schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, revsorted, unique, orderidx # name % varchar, varchar, varchar, varchar, varchar, varchar, varchar, varchar, bigint, int, bigint, bigint, bigint, boolean, bigint, boolean, boolean, boolean, bigint # type % 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 5, 1, 5, 5, 5, 1 # length _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
