Skip to content

Commit b31f330

Browse files
committed
Fixed SQL Server JSON support
Closes #298
1 parent 69077ce commit b31f330

File tree

5 files changed

+1060
-1058
lines changed

5 files changed

+1060
-1058
lines changed

domain/setting/endpoint.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ func (h *Handler) SetSMTP(w http.ResponseWriter, r *http.Request) {
110110
}
111111

112112
cfg := GetSMTPConfig(h.Store)
113+
h.Runtime.Log.Infof("%v", cfg)
113114
dialer, err := smtp.Connect(cfg)
114115
em := smtp.EmailMessage{}
115116
em.Subject = "Documize SMTP Test"

domain/setting/store.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ import (
1616
"database/sql"
1717
"fmt"
1818

19-
"github.com/documize/community/domain/store"
2019
"github.com/pkg/errors"
20+
21+
"github.com/documize/community/domain/store"
2122
)
2223

2324
// Store provides data access to user permission information.

edition/community.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ func main() {
4141
rt.Product = domain.Product{}
4242
rt.Product.Major = "3"
4343
rt.Product.Minor = "1"
44-
rt.Product.Patch = "0"
45-
rt.Product.Revision = "190629131646"
44+
rt.Product.Patch = "1"
45+
rt.Product.Revision = "190718095543"
4646
rt.Product.Version = fmt.Sprintf("%s.%s.%s", rt.Product.Major, rt.Product.Minor, rt.Product.Patch)
4747
rt.Product.Edition = domain.CommunityEdition
4848
rt.Product.Title = fmt.Sprintf("%s Edition", rt.Product.Edition)

edition/storage/sqlserver.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ func (p SQLServerProvider) JSONEmpty() string {
329329
// Typically used in SELECT <my_json_field> query.
330330
func (p SQLServerProvider) JSONGetValue(column, attribute string) string {
331331
if len(attribute) > 0 {
332-
return fmt.Sprintf("JSON_VALUE(%s, '$.%s'", column, attribute)
332+
return fmt.Sprintf("JSON_VALUE(%s, '$.%s')", column, attribute)
333333
}
334334

335335
return fmt.Sprintf("JSON_QUERY(%s)", column)

0 commit comments

Comments
 (0)