Merge pull request ClickHouse#60898 from ClickHouse/revert-60514-show…

…-index-sorting

Revert "Fix wacky primary key sorting in `SHOW INDEX`"

src/Interpreters/InterpreterShowIndexesQuery.cpp

@@ -37,7 +37,7 @@ FROM (
             name AS table,
             1 AS non_unique,
             'PRIMARY' AS key_name,
-            row_number() over (order by null) AS seq_in_index,
+            row_number() over (order by column_name) AS seq_in_index,
             arrayJoin(splitByString(', ', primary_key)) AS column_name,
             'A' AS collation,
             0 AS cardinality,
@@ -75,7 +75,7 @@ FROM (
             database = '{0}'
             AND table = '{1}'))
 {2}
-ORDER BY index_type, expression, seq_in_index;)", database, table, where_expression);
+ORDER BY index_type, expression, column_name, seq_in_index;)", database, table, where_expression);
 
     /// Sorting is strictly speaking not necessary but 1. it is convenient for users, 2. SQL currently does not allow to
     /// sort the output of SHOW INDEXES otherwise (SELECT * FROM (SHOW INDEXES ...) ORDER BY ...) is rejected) and 3. some

tests/queries/0_stateless/02724_show_indexes.reference

@@ -2,33 +2,33 @@
 tbl	1	blf_idx	1		\N	0	\N	\N	\N	BLOOM_FILTER			YES	d, b
 tbl	1	mm1_idx	1		\N	0	\N	\N	\N	MINMAX			YES	a, c, d
 tbl	1	mm2_idx	1		\N	0	\N	\N	\N	MINMAX			YES	c, d, e
-tbl	1	PRIMARY	1	c	A	0	\N	\N	\N	PRIMARY			YES	
-tbl	1	PRIMARY	2	a	A	0	\N	\N	\N	PRIMARY			YES	
+tbl	1	PRIMARY	1	a	A	0	\N	\N	\N	PRIMARY			YES	
+tbl	1	PRIMARY	2	c	A	0	\N	\N	\N	PRIMARY			YES	
 tbl	1	set_idx	1		\N	0	\N	\N	\N	SET			YES	e
 tbl	1	blf_idx	1		\N	0	\N	\N	\N	BLOOM_FILTER			YES	d, b
 tbl	1	mm1_idx	1		\N	0	\N	\N	\N	MINMAX			YES	a, c, d
 tbl	1	mm2_idx	1		\N	0	\N	\N	\N	MINMAX			YES	c, d, e
-tbl	1	PRIMARY	1	c	A	0	\N	\N	\N	PRIMARY			YES	
-tbl	1	PRIMARY	2	a	A	0	\N	\N	\N	PRIMARY			YES	
+tbl	1	PRIMARY	1	a	A	0	\N	\N	\N	PRIMARY			YES	
+tbl	1	PRIMARY	2	c	A	0	\N	\N	\N	PRIMARY			YES	
 tbl	1	set_idx	1		\N	0	\N	\N	\N	SET			YES	e
 tbl	1	blf_idx	1		\N	0	\N	\N	\N	BLOOM_FILTER			YES	d, b
 tbl	1	mm1_idx	1		\N	0	\N	\N	\N	MINMAX			YES	a, c, d
 tbl	1	mm2_idx	1		\N	0	\N	\N	\N	MINMAX			YES	c, d, e
-tbl	1	PRIMARY	1	c	A	0	\N	\N	\N	PRIMARY			YES	
-tbl	1	PRIMARY	2	a	A	0	\N	\N	\N	PRIMARY			YES	
+tbl	1	PRIMARY	1	a	A	0	\N	\N	\N	PRIMARY			YES	
+tbl	1	PRIMARY	2	c	A	0	\N	\N	\N	PRIMARY			YES	
 tbl	1	set_idx	1		\N	0	\N	\N	\N	SET			YES	e
 tbl	1	blf_idx	1		\N	0	\N	\N	\N	BLOOM_FILTER			YES	d, b
 tbl	1	mm1_idx	1		\N	0	\N	\N	\N	MINMAX			YES	a, c, d
 tbl	1	mm2_idx	1		\N	0	\N	\N	\N	MINMAX			YES	c, d, e
-tbl	1	PRIMARY	1	c	A	0	\N	\N	\N	PRIMARY			YES	
-tbl	1	PRIMARY	2	a	A	0	\N	\N	\N	PRIMARY			YES	
+tbl	1	PRIMARY	1	a	A	0	\N	\N	\N	PRIMARY			YES	
+tbl	1	PRIMARY	2	c	A	0	\N	\N	\N	PRIMARY			YES	
 tbl	1	set_idx	1		\N	0	\N	\N	\N	SET			YES	e
 --- EXTENDED
 tbl	1	blf_idx	1		\N	0	\N	\N	\N	BLOOM_FILTER			YES	d, b
 tbl	1	mm1_idx	1		\N	0	\N	\N	\N	MINMAX			YES	a, c, d
 tbl	1	mm2_idx	1		\N	0	\N	\N	\N	MINMAX			YES	c, d, e
-tbl	1	PRIMARY	1	c	A	0	\N	\N	\N	PRIMARY			YES	
-tbl	1	PRIMARY	2	a	A	0	\N	\N	\N	PRIMARY			YES	
+tbl	1	PRIMARY	1	a	A	0	\N	\N	\N	PRIMARY			YES	
+tbl	1	PRIMARY	2	c	A	0	\N	\N	\N	PRIMARY			YES	
 tbl	1	set_idx	1		\N	0	\N	\N	\N	SET			YES	e
 --- WHERE
 --- Check with weird table names
@@ -40,8 +40,8 @@ NULL	1	PRIMARY	1	c	A	0	\N	\N	\N	PRIMARY			YES
 tbl	1	blf_idx	1		\N	0	\N	\N	\N	BLOOM_FILTER			YES	d, b
 tbl	1	mm1_idx	1		\N	0	\N	\N	\N	MINMAX			YES	a, c, d
 tbl	1	mm2_idx	1		\N	0	\N	\N	\N	MINMAX			YES	c, d, e
-tbl	1	PRIMARY	1	c	A	0	\N	\N	\N	PRIMARY			YES	
-tbl	1	PRIMARY	2	a	A	0	\N	\N	\N	PRIMARY			YES	
+tbl	1	PRIMARY	1	a	A	0	\N	\N	\N	PRIMARY			YES	
+tbl	1	PRIMARY	2	c	A	0	\N	\N	\N	PRIMARY			YES	
 tbl	1	set_idx	1		\N	0	\N	\N	\N	SET			YES	e
 --- Equally named table in other database
 tbl	1	mmi_idx	1		\N	0	\N	\N	\N	MINMAX			YES	b