Fix some errors from jsonb functions patch.

The catalog version should have been bumped, and the alternative
regression result file was not up to date with the name of jsonb_pretty.

diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index 80176dd287a3d991eca095a6a927b0efe51004aa..a350832423685b35c2546bb7aa36b9746599dcd2 100644 (file)
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -53,6 +53,6 @@
  */
 
 /*                                                     yyyymmddN */
-#define CATALOG_VERSION_NO     201505111
+#define CATALOG_VERSION_NO     201505121
 
 #endif

diff --git a/src/test/regress/expected/jsonb_1.out b/src/test/regress/expected/jsonb_1.out
index 8c5759414666f760c00d0b39407750ad5888ad2e..c8cb513391ad87d54905605c59b66664f55c5731 100644 (file)
--- a/src/test/regress/expected/jsonb_1.out
+++ b/src/test/regress/expected/jsonb_1.out
@@ -2753,8 +2753,8 @@ select jsonb_strip_nulls('{"a": {"b": null, "c": null}, "d": {} }');
  {"a": {}, "d": {}}
 (1 row)
 
-select jsonb_indent('{"a": "test", "b": [1, 2, 3], "c": "test3", "d":{"dd": "test4", "dd2":{"ddd": "test5"}}}');
-        jsonb_indent        
+select jsonb_pretty('{"a": "test", "b": [1, 2, 3], "c": "test3", "d":{"dd": "test4", "dd2":{"ddd": "test5"}}}');
+        jsonb_pretty        
 ----------------------------
  {                         +
      "a": "test",          +
@@ -2773,8 +2773,8 @@ select jsonb_indent('{"a": "test", "b": [1, 2, 3], "c": "test3", "d":{"dd": "tes
  }
 (1 row)
 
-select jsonb_indent('[{"f1":1,"f2":null},2,null,[[{"x":true},6,7],8],3]');
-       jsonb_indent        
+select jsonb_pretty('[{"f1":1,"f2":null},2,null,[[{"x":true},6,7],8],3]');
+       jsonb_pretty        
 ---------------------------
  [                        +
      {                    +
@@ -2797,8 +2797,8 @@ select jsonb_indent('[{"f1":1,"f2":null},2,null,[[{"x":true},6,7],8],3]');
  ]
 (1 row)
 
-select jsonb_indent('{"a":["b", "c"], "d": {"e":"f"}}');
-   jsonb_indent   
+select jsonb_pretty('{"a":["b", "c"], "d": {"e":"f"}}');
+   jsonb_pretty   
 ------------------
  {               +
      "a": [      +