Fixed an ordering problem in test queries and

formatting differences due to new psql.

Jan

diff --git a/src/pl/tcl/test/test.expected b/src/pl/tcl/test/test.expected
index dd324a635e0d24f8c5ffc2a46bbdfb3285640c15..351643ade41cbf5fb2081a39b8c92700a44e97c7 100644 (file)
--- a/src/pl/tcl/test/test.expected
+++ b/src/pl/tcl/test/test.expected
@@ -152,23 +152,23 @@ select 100 @< 4;
  f
 (1 row)
 
-select * from T_pkey1 order by key1 using @<;
+select * from T_pkey1 order by key1, key2 using @<;
  key1 |         key2         |                   txt                    
 ------+----------------------+------------------------------------------
-    1 | key1-2               | test key                                
     1 | key1-1               | test key                                
+    1 | key1-2               | test key                                
     1 | key1-3               | test key                                
     1 | KEY1-3               | should work                             
-    2 | key2-9               | test key                                
     2 | key2-3               | test key                                
+    2 | key2-9               | test key                                
 (6 rows)
 
-select * from T_pkey2 order by key1 using @<;
+select * from T_pkey2 order by key1, key2 using @<;
  key1 |         key2         |                   txt                    
 ------+----------------------+------------------------------------------
     1 | KEY1-3               | test key                                
     1 | KEY1-9               | test key                                
-    2 | KEY2-9               | test key                                
     2 | KEY2-3               | test key                                
+    2 | KEY2-9               | test key                                
 (4 rows)
 

diff --git a/src/pl/tcl/test/test_queries.sql b/src/pl/tcl/test/test_queries.sql
index ff652135a5760e106f3af61dd2d195523a278423..ba584765ea6b323cce2e616e29ad7f91ed0ab356 100644 (file)
--- a/src/pl/tcl/test/test_queries.sql
+++ b/src/pl/tcl/test/test_queries.sql
@@ -68,6 +68,6 @@ select tcl_sum(key1) from T_pkey1 where key1 = 99;
 select 1 @< 2;
 select 100 @< 4;
 
-select * from T_pkey1 order by key1 using @<;
-select * from T_pkey2 order by key1 using @<;
+select * from T_pkey1 order by key1, key2 using @<;
+select * from T_pkey2 order by key1, key2 using @<;