From 6e5da0552c87878137bf1f7fb52cf2172d55f77d Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Thu, 26 Sep 2019 13:53:02 +0200
Subject: [PATCH] [jOOQ/jOOQ#9283] DefaultBinding should return null on null
 JSON values, instead of JSON[B].valueOf(null)

---
 .../java/org/jooq/impl/DefaultBinding.java    | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java
index 80392d05a1..b55ff4d9cd 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java
@@ -4204,17 +4204,20 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
 
         @Override
         final JSON get0(BindingGetResultSetContext<U> ctx) throws SQLException {
-            return JSON.valueOf(ctx.resultSet().getString(ctx.index()));
+            String string = ctx.resultSet().getString(ctx.index());
+            return string == null ? null : JSON.valueOf(string);
         }
 
         @Override
         final JSON get0(BindingGetStatementContext<U> ctx) throws SQLException {
-            return JSON.valueOf(ctx.statement().getString(ctx.index()));
+            String string = ctx.statement().getString(ctx.index());
+            return string == null ? null : JSON.valueOf(string);
         }
 
         @Override
         final JSON get0(BindingGetSQLInputContext<U> ctx) throws SQLException {
-            return JSON.valueOf(ctx.input().readString());
+            String string = ctx.input().readString();
+            return string == null ? null : JSON.valueOf(string);
         }
 
         @Override
@@ -4296,7 +4299,9 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
 
 
 
-            return JSONB.valueOf(ctx.resultSet().getString(ctx.index()));
+
+            String string = ctx.resultSet().getString(ctx.index());
+            return string == null ? null : JSONB.valueOf(string);
         }
 
         @Override
@@ -4306,7 +4311,8 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
 
 
 
-            return JSONB.valueOf(ctx.statement().getString(ctx.index()));
+            String string = ctx.statement().getString(ctx.index());
+            return string == null ? null : JSONB.valueOf(string);
         }
 
         @Override
@@ -4316,7 +4322,8 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
 
 
 
-            return JSONB.valueOf(ctx.input().readString());
+            String string = ctx.input().readString();
+            return string == null ? null : JSONB.valueOf(string);
         }
 
         @Override