summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2015-03-03 16:26:04 +0000
committerTom Lane2015-03-03 16:26:04 +0000
commitb67f1ce181910e012b3a8ec7a35ba20a48247757 (patch)
treea5a746a5c3fff3b640b3deb7c94d72e54ffc1f89
parente5f36902495d0c8d5dee9a5f43fb45d44540f795 (diff)
Reduce json <=> jsonb casts from explicit-only to assignment level.
There's no reason to make users write an explicit cast to store a json value in a jsonb column or vice versa. We could probably even make these implicit, but that might open us up to problems with ambiguous function calls, so for now just do this.
-rw-r--r--src/include/catalog/catversion.h2
-rw-r--r--src/include/catalog/pg_cast.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index 508741fd44..f416094380 100644
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -53,6 +53,6 @@
*/
/* yyyymmddN */
-#define CATALOG_VERSION_NO 201503011
+#define CATALOG_VERSION_NO 201503031
#endif
diff --git a/src/include/catalog/pg_cast.h b/src/include/catalog/pg_cast.h
index b3143694ab..c49fe263bb 100644
--- a/src/include/catalog/pg_cast.h
+++ b/src/include/catalog/pg_cast.h
@@ -360,7 +360,7 @@ DATA(insert ( 1562 1562 1687 i f ));
DATA(insert ( 1700 1700 1703 i f ));
/* json to/from jsonb */
-DATA(insert ( 114 3802 0 e i ));
-DATA(insert ( 3802 114 0 e i ));
+DATA(insert ( 114 3802 0 a i ));
+DATA(insert ( 3802 114 0 a i ));
#endif /* PG_CAST_H */