Fixed SQL Server JSON support

Closes #298
documize · Jul 18, 2019 · b31f330 · b31f330
1 parent 69077ce
commit b31f330
Show file tree

Hide file tree

Showing 5 changed files with 1,060 additions and 1,058 deletions.
diff --git a/domain/setting/endpoint.go b/domain/setting/endpoint.go
@@ -110,6 +110,7 @@ func (h *Handler) SetSMTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	cfg := GetSMTPConfig(h.Store)
+	h.Runtime.Log.Infof("%v", cfg)
 	dialer, err := smtp.Connect(cfg)
 	em := smtp.EmailMessage{}
 	em.Subject = "Documize SMTP Test"

diff --git a/domain/setting/store.go b/domain/setting/store.go
@@ -16,8 +16,9 @@ import (
 	"database/sql"
 	"fmt"
 
-	"github.com/documize/community/domain/store"
 	"github.com/pkg/errors"
+
+	"github.com/documize/community/domain/store"
 )
 
 // Store provides data access to user permission information.

diff --git a/edition/community.go b/edition/community.go
@@ -41,8 +41,8 @@ func main() {
 	rt.Product = domain.Product{}
 	rt.Product.Major = "3"
 	rt.Product.Minor = "1"
-	rt.Product.Patch = "0"
-	rt.Product.Revision = "190629131646"
+	rt.Product.Patch = "1"
+	rt.Product.Revision = "190718095543"
 	rt.Product.Version = fmt.Sprintf("%s.%s.%s", rt.Product.Major, rt.Product.Minor, rt.Product.Patch)
 	rt.Product.Edition = domain.CommunityEdition
 	rt.Product.Title = fmt.Sprintf("%s Edition", rt.Product.Edition)

diff --git a/edition/storage/sqlserver.go b/edition/storage/sqlserver.go
@@ -329,7 +329,7 @@ func (p SQLServerProvider) JSONEmpty() string {
 // Typically used in SELECT <my_json_field> query.
 func (p SQLServerProvider) JSONGetValue(column, attribute string) string {
 	if len(attribute) > 0 {
-		return fmt.Sprintf("JSON_VALUE(%s, '$.%s'", column, attribute)
+		return fmt.Sprintf("JSON_VALUE(%s, '$.%s')", column, attribute)
 	}
 
 	return fmt.Sprintf("JSON_QUERY(%s)", column)