From 7e3b53c37be8d9959fbffb23b6c6eb965386c5fd Mon Sep 17 00:00:00 2001 From: Florian Orben Date: Fri, 6 Nov 2015 00:07:44 +0100 Subject: [PATCH] fix alter table command for postgres --- store/sql_post_store.go | 8 +++++++- web/web.go | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/store/sql_post_store.go b/store/sql_post_store.go index 7978408a26..a523b33209 100644 --- a/store/sql_post_store.go +++ b/store/sql_post_store.go @@ -42,7 +42,13 @@ func NewSqlPostStore(sqlStore *SqlStore) PostStore { func (s SqlPostStore) UpgradeSchemaIfNeeded() { colType := s.GetColumnDataType("Posts", "Props") if colType != "text" { - _, err := s.GetMaster().Exec("ALTER TABLE Posts MODIFY COLUMN Props TEXT") + + query := "ALTER TABLE Posts MODIFY COLUMN Props TEXT" + if utils.Cfg.SqlSettings.DriverName == model.DATABASE_DRIVER_POSTGRES { + query = "ALTER TABLE Posts ALTER COLUMN Props TYPE text" + } + + _, err := s.GetMaster().Exec(query) if err != nil { l4g.Critical("Failed to alter column Posts.Props to TEXT: " + err.Error()) time.Sleep(time.Second) diff --git a/web/web.go b/web/web.go index bd01545420..1b2f5f742f 100644 --- a/web/web.go +++ b/web/web.go @@ -992,6 +992,7 @@ func incomingWebhook(c *api.Context, w http.ResponseWriter, r *http.Request) { channelName := parsedRequest.ChannelName webhookType := parsedRequest.Type + //attachments is in here for slack compatibility if parsedRequest.Attachments != nil { if len(parsedRequest.Props) == 0 { parsedRequest.Props = make(model.StringInterface)