diff --strip-trailing-cr -U3 C:/cirrus/contrib/hstore/expected/hstore.out C:/cirrus/build/testrun/hstore/regress/results/hstore.out
--- C:/cirrus/contrib/hstore/expected/hstore.out	2025-02-13 15:32:07.983545800 +0000
+++ C:/cirrus/build/testrun/hstore/regress/results/hstore.out	2025-02-13 15:38:24.732504700 +0000
@@ -1597,30 +1597,27 @@
 -- Test subscripting
 insert into test_json_agg default values;
 select f2['d'], f2['x'] is null as x_isnull from test_json_agg;
-   f2   | x_isnull 
---------+----------
- 12345  | t
- -12345 | t
-        | t
-(3 rows)
-
+ERROR:  hstore allows only one subscript
 select f2['d']['e'] from test_json_agg;  -- error
 ERROR:  hstore allows only one subscript
 select f2['d':'e'] from test_json_agg;  -- error
 ERROR:  hstore allows only one subscript
 update test_json_agg set f2['d'] = f2['e'], f2['x'] = 'xyzzy';
+ERROR:  hstore allows only one subscript
 select f2 from test_json_agg;
-                                                         f2                                                          
----------------------------------------------------------------------------------------------------------------------
- "b"=>"t", "c"=>NULL, "d"=>"012345", "e"=>"012345", "f"=>"1.234", "g"=>"2.345e+4", "x"=>"xyzzy", "a key"=>"1"
- "b"=>"f", "c"=>"null", "d"=>"012345.6", "e"=>"012345.6", "f"=>"-1.234", "g"=>"0.345e-4", "x"=>"xyzzy", "a key"=>"2"
- "d"=>NULL, "x"=>"xyzzy"
+                                                 f2                                                  
+-----------------------------------------------------------------------------------------------------
+ "b"=>"t", "c"=>NULL, "d"=>"12345", "e"=>"012345", "f"=>"1.234", "g"=>"2.345e+4", "a key"=>"1"
+ "b"=>"f", "c"=>"null", "d"=>"-12345", "e"=>"012345.6", "f"=>"-1.234", "g"=>"0.345e-4", "a key"=>"2"
+ 
 (3 rows)
 
 -- Test subscripting in plpgsql
 do $$ declare h hstore;
 begin h['a'] := 'b'; raise notice 'h = %, h[a] = %', h, h['a']; end $$;
-NOTICE:  h = "a"=>"b", h[a] = b
+ERROR:  hstore allows only one subscript
+CONTEXT:  PL/pgSQL assignment "h['a'] := 'b'"
+PL/pgSQL function inline_code_block line 2 at assignment
 -- Check the hstore_hash() and hstore_hash_extended() function explicitly.
 SELECT v as value, hstore_hash(v)::bit(32) as standard,
        hstore_hash_extended(v, 0)::bit(32) as extended0,