From d04becc1a39f226709ec529d836847a2cdb37971 Mon Sep 17 00:00:00 2001
From: HarveyKandola <harvey@documize.com>
Date: Tue, 25 Jun 2019 15:26:38 +0100
Subject: [PATCH] Improved backup/restore compatibility between DB providers

---
 domain/backup/restore.go  |  1 +
 domain/search/endpoint.go |  1 +
 domain/search/search.go   |  4 ++--
 edition/storage/mysql.go  | 10 ++++++++--
 server/routing/routes.go  |  2 +-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/domain/backup/restore.go b/domain/backup/restore.go
index 7cec8dd0..53903a16 100644
--- a/domain/backup/restore.go
+++ b/domain/backup/restore.go
@@ -1531,6 +1531,7 @@ func (r *restoreHandler) dmzDocAttachment() (err error) {
 		if err != nil {
 			r.Context.Transaction.Rollback()
 			err = errors.Wrap(err, fmt.Sprintf("unable to insert %s %s", filename, at[i].RefID))
+			r.Runtime.Log.Error("warning", err)
 			return
 		}
 	}
diff --git a/domain/search/endpoint.go b/domain/search/endpoint.go
index aaa27fe5..fffdbe48 100644
--- a/domain/search/endpoint.go
+++ b/domain/search/endpoint.go
@@ -38,6 +38,7 @@ func (h *Handler) Reindex(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	h.Runtime.Log.Info("Building search index")
 	go h.Indexer.Rebuild(ctx)
 
 	response.WriteEmpty(w)
diff --git a/domain/search/search.go b/domain/search/search.go
index 138fc081..eabb03fe 100644
--- a/domain/search/search.go
+++ b/domain/search/search.go
@@ -129,7 +129,7 @@ func (m *Indexer) Rebuild(ctx domain.RequestContext) {
 		return
 	}
 
-	m.runtime.Log.Info(fmt.Sprintf("Search re-index started for %d documents", len(docs)))
+	m.runtime.Log.Info(fmt.Sprintf("Search re-indexing started for %d documents", len(docs)))
 
 	for i := range docs {
 		d := docs[i]
@@ -163,7 +163,7 @@ func (m *Indexer) Rebuild(ctx domain.RequestContext) {
 		}
 	}
 
-	m.runtime.Log.Info(fmt.Sprintf("Search re-index finished for %d documents", len(docs)))
+	m.runtime.Log.Info(fmt.Sprintf("Search re-indexing finished for %d documents", len(docs)))
 }
 
 // FilterCategoryProtected removes search results that cannot be seen by user
diff --git a/edition/storage/mysql.go b/edition/storage/mysql.go
index da0d02ea..84987ed8 100644
--- a/edition/storage/mysql.go
+++ b/edition/storage/mysql.go
@@ -30,13 +30,13 @@ import (
 	label "github.com/documize/community/domain/label"
 	link "github.com/documize/community/domain/link"
 	meta "github.com/documize/community/domain/meta"
+	"github.com/documize/community/domain/onboard"
 	org "github.com/documize/community/domain/organization"
 	page "github.com/documize/community/domain/page"
 	permission "github.com/documize/community/domain/permission"
 	pin "github.com/documize/community/domain/pin"
 	search "github.com/documize/community/domain/search"
 	setting "github.com/documize/community/domain/setting"
-	"github.com/documize/community/domain/onboard"
 	space "github.com/documize/community/domain/space"
 	"github.com/documize/community/domain/store"
 	user "github.com/documize/community/domain/user"
@@ -192,8 +192,14 @@ func (p MySQLProvider) Params() map[string]string {
 	return map[string]string{
 		"charset":          "utf8mb4",
 		"parseTime":        "True",
-		"maxAllowedPacket": "104857600", // 4194304 // 16777216 = 16MB // 104857600 = 100MB
+		"maxAllowedPacket": "0",
 	}
+
+	// maxAllowedPacket
+	// default is 4194304
+	// 16777216 = 16MB
+	// 104857600 = 100MB
+	// 0 means fetch value from server
 }
 
 // Example holds storage provider specific connection string format
diff --git a/server/routing/routes.go b/server/routing/routes.go
index 67828270..afaf8fd7 100644
--- a/server/routing/routes.go
+++ b/server/routing/routes.go
@@ -61,7 +61,7 @@ func RegisterEndpoints(rt *env.Runtime, s *store.Store) {
 	block := block.Handler{Runtime: rt, Store: s}
 	group := group.Handler{Runtime: rt, Store: s}
 	label := label.Handler{Runtime: rt, Store: s}
-	backup := backup.Handler{Runtime: rt, Store: s}
+	backup := backup.Handler{Runtime: rt, Store: s, Indexer: indexer}
 	section := section.Handler{Runtime: rt, Store: s}
 	setting := setting.Handler{Runtime: rt, Store: s}
 	category := category.Handler{Runtime: rt, Store: s}