From ff68e9e3e7a74469875874806ee946ab1ec8fc22 Mon Sep 17 00:00:00 2001
From: Robert Kopaczewski <rk@23doors.com>
Date: Thu, 13 Aug 2020 17:23:36 +0200
Subject: [PATCH] fix: JSON as string

---
 database/fields/json.go  | 7 ++++++-
 database/fields/jsonb.go | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/database/fields/json.go b/database/fields/json.go
index 85142e3..d075e0d 100644
--- a/database/fields/json.go
+++ b/database/fields/json.go
@@ -30,7 +30,12 @@ func (j JSON) Value() (driver.Value, error) {
 		return string(b), e
 	}
 
-	return j.JSON.Value()
+	v, e := j.JSON.Value()
+	if e != nil {
+		return v, e
+	}
+
+	return string(v.([]byte)), e
 }
 
 func (j *JSON) Get() interface{} {
diff --git a/database/fields/jsonb.go b/database/fields/jsonb.go
index ff80125..be08829 100644
--- a/database/fields/jsonb.go
+++ b/database/fields/jsonb.go
@@ -30,7 +30,12 @@ func (j JSONB) Value() (driver.Value, error) {
 		return string(b), e
 	}
 
-	return j.JSONB.Value()
+	v, e := j.JSONB.Value()
+	if e != nil {
+		return v, e
+	}
+
+	return string(v.([]byte)), e
 }
 
 func (j *JSONB) Get() interface{} {