Changeset: 4a5ff7db4481 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4a5ff7db4481
Modified Files:
sql/test/Tests/keys.sql
sql/test/Tests/keys.stable.out
Branch: Oct2020
Log Message:
Add ordering.
diffs (88 lines):
diff --git a/sql/test/Tests/keys.sql b/sql/test/Tests/keys.sql
--- a/sql/test/Tests/keys.sql
+++ b/sql/test/Tests/keys.sql
@@ -7,9 +7,11 @@ CREATE INDEX allnewtriples_predicate_idx
CREATE INDEX allnewtriples_object_idx ON allnewtriples ("object");
SELECT idxs.name, idxs."type", keys.name, keys."type"
-FROM sys.idxs LEFT JOIN sys.keys on idxs.name = keys.name;
+FROM sys.idxs LEFT JOIN sys.keys on idxs.name = keys.name
+ORDER BY idxs.name, keys.name;
SELECT idxs.name, idxs."type", keys.name, keys."type"
-FROM sys.idxs JOIN sys.keys on idxs.name = keys.name;
+FROM sys.idxs JOIN sys.keys on idxs.name = keys.name
+ORDER BY idxs.name, keys.name;
/* test elimination of distinct restriction on aggregates */
create table dummyme (a int primary key, b int);
diff --git a/sql/test/Tests/keys.stable.out b/sql/test/Tests/keys.stable.out
--- a/sql/test/Tests/keys.stable.out
+++ b/sql/test/Tests/keys.stable.out
@@ -60,27 +60,27 @@ stdout of test 'keys` in directory 'sql/
% name, type, name, type # name
% varchar, int, varchar, int # type
% 44, 1, 44, 1 # length
+[ "allnewtriples_object_idx", 0, NULL, NULL ]
+[ "allnewtriples_predicate_idx", 0, NULL, NULL ]
+[ "allnewtriples_subject_idx", 0, NULL, NULL ]
[ "comments_id_pkey", 0, "comments_id_pkey", 0 ]
[ "dependency_types_dependency_type_id_pkey", 0,
"dependency_types_dependency_type_id_pkey", 0 ]
[ "dependency_types_dependency_type_name_unique", 0,
"dependency_types_dependency_type_name_unique", 1 ]
-[ "spatial_ref_sys_srid_pkey", 0, "spatial_ref_sys_srid_pkey", 0
]
-[ "keywords_keyword_pkey", 0, "keywords_keyword_pkey", 0
]
-[ "table_types_table_type_id_pkey", 0,
"table_types_table_type_id_pkey", 0 ]
-[ "table_types_table_type_name_unique", 0,
"table_types_table_type_name_unique", 1 ]
-[ "function_types_function_type_id_pkey", 0,
"function_types_function_type_id_pkey", 0 ]
-[ "function_types_function_type_name_unique", 0,
"function_types_function_type_name_unique", 1 ]
[ "function_languages_language_id_pkey", 0,
"function_languages_language_id_pkey", 0 ]
[ "function_languages_language_name_unique", 0,
"function_languages_language_name_unique", 1 ]
-[ "key_types_key_type_id_pkey", 0, "key_types_key_type_id_pkey",
0 ]
-[ "key_types_key_type_name_unique", 0,
"key_types_key_type_name_unique", 1 ]
+[ "function_types_function_type_id_pkey", 0,
"function_types_function_type_id_pkey", 0 ]
+[ "function_types_function_type_name_unique", 0,
"function_types_function_type_name_unique", 1 ]
[ "index_types_index_type_id_pkey", 0,
"index_types_index_type_id_pkey", 0 ]
[ "index_types_index_type_name_unique", 0,
"index_types_index_type_name_unique", 1 ]
+[ "key_types_key_type_id_pkey", 0, "key_types_key_type_id_pkey",
0 ]
+[ "key_types_key_type_name_unique", 0,
"key_types_key_type_name_unique", 1 ]
+[ "keywords_keyword_pkey", 0, "keywords_keyword_pkey", 0
]
[ "privilege_codes_privilege_code_id_pkey", 0,
"privilege_codes_privilege_code_id_pkey", 0 ]
[ "privilege_codes_privilege_code_name_unique", 0,
"privilege_codes_privilege_code_name_unique", 1 ]
+[ "spatial_ref_sys_srid_pkey", 0, "spatial_ref_sys_srid_pkey", 0
]
+[ "table_types_table_type_id_pkey", 0,
"table_types_table_type_id_pkey", 0 ]
+[ "table_types_table_type_name_unique", 0,
"table_types_table_type_name_unique", 1 ]
[ "unique_key", 0, "unique_key", 1 ]
-[ "allnewtriples_subject_idx", 0, NULL, NULL ]
-[ "allnewtriples_predicate_idx", 0, NULL, NULL ]
-[ "allnewtriples_object_idx", 0, NULL, NULL ]
#SELECT idxs.name, idxs."type", keys.name, keys."type"
#FROM idxs JOIN keys on idxs.name = keys.name;
% sys.idxs, sys.idxs, sys.keys, sys.keys # table_name
@@ -90,20 +90,20 @@ stdout of test 'keys` in directory 'sql/
[ "comments_id_pkey", 0, "comments_id_pkey", 0 ]
[ "dependency_types_dependency_type_id_pkey", 0,
"dependency_types_dependency_type_id_pkey", 0 ]
[ "dependency_types_dependency_type_name_unique", 0,
"dependency_types_dependency_type_name_unique", 1 ]
-[ "spatial_ref_sys_srid_pkey", 0, "spatial_ref_sys_srid_pkey", 0
]
-[ "keywords_keyword_pkey", 0, "keywords_keyword_pkey", 0
]
-[ "table_types_table_type_id_pkey", 0,
"table_types_table_type_id_pkey", 0 ]
-[ "table_types_table_type_name_unique", 0,
"table_types_table_type_name_unique", 1 ]
+[ "function_languages_language_id_pkey", 0,
"function_languages_language_id_pkey", 0 ]
+[ "function_languages_language_name_unique", 0,
"function_languages_language_name_unique", 1 ]
[ "function_types_function_type_id_pkey", 0,
"function_types_function_type_id_pkey", 0 ]
[ "function_types_function_type_name_unique", 0,
"function_types_function_type_name_unique", 1 ]
-[ "function_languages_language_id_pkey", 0,
"function_languages_language_id_pkey", 0 ]
-[ "function_languages_language_name_unique", 0,
"function_languages_language_name_unique", 1 ]
+[ "index_types_index_type_id_pkey", 0,
"index_types_index_type_id_pkey", 0 ]
+[ "index_types_index_type_name_unique", 0,
"index_types_index_type_name_unique", 1 ]
[ "key_types_key_type_id_pkey", 0, "key_types_key_type_id_pkey",
0 ]
[ "key_types_key_type_name_unique", 0,
"key_types_key_type_name_unique", 1 ]
-[ "index_types_index_type_id_pkey", 0,
"index_types_index_type_id_pkey", 0 ]
-[ "index_types_index_type_name_unique", 0,
"index_types_index_type_name_unique", 1 ]
+[ "keywords_keyword_pkey", 0, "keywords_keyword_pkey", 0
]
[ "privilege_codes_privilege_code_id_pkey", 0,
"privilege_codes_privilege_code_id_pkey", 0 ]
[ "privilege_codes_privilege_code_name_unique", 0,
"privilege_codes_privilege_code_name_unique", 1 ]
+[ "spatial_ref_sys_srid_pkey", 0, "spatial_ref_sys_srid_pkey", 0
]
+[ "table_types_table_type_id_pkey", 0,
"table_types_table_type_id_pkey", 0 ]
+[ "table_types_table_type_name_unique", 0,
"table_types_table_type_name_unique", 1 ]
[ "unique_key", 0, "unique_key", 1 ]
#create table dummyme (a int primary key, b int);
#insert into dummyme values (1,1), (2,1), (3,1);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
