From 51b4963e2eaa6caff8ed4702453b9af371cf6914 Mon Sep 17 00:00:00 2001 From: LazyDBA247-Anyvision Date: Sun, 14 Feb 2021 13:14:36 +0200 Subject: postgres2 & memsql2 add escape (quote identifiers) for the dynamic sql so tables (collections) with special characters will work. --- weed/filer/mysql/mysql_store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'weed/filer/mysql/mysql_store.go') diff --git a/weed/filer/mysql/mysql_store.go b/weed/filer/mysql/mysql_store.go index 686628740..23b3bef11 100644 --- a/weed/filer/mysql/mysql_store.go +++ b/weed/filer/mysql/mysql_store.go @@ -47,7 +47,7 @@ func (store *MysqlStore) initialize(user, password, hostname string, port int, d store.SupportBucketTable = false store.SqlGenerator = &SqlGenMysql{ CreateTableSqlTemplate: "", - DropTableSqlTemplate: "drop table %s", + DropTableSqlTemplate: "drop table `%s`", } sqlUrl := fmt.Sprintf(CONNECTION_URL_PATTERN, user, password, hostname, port, database) -- cgit v1.2.3 From 3f8b0da6772ea99b600303bb1ad3f6430a45290a Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Wed, 17 Feb 2021 02:13:50 -0800 Subject: filer: do not print password on error fix https://github.com/chrislusf/seaweedfs/issues/1809 --- weed/filer/mysql/mysql_store.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'weed/filer/mysql/mysql_store.go') diff --git a/weed/filer/mysql/mysql_store.go b/weed/filer/mysql/mysql_store.go index 23b3bef11..022a8d72d 100644 --- a/weed/filer/mysql/mysql_store.go +++ b/weed/filer/mysql/mysql_store.go @@ -51,8 +51,10 @@ func (store *MysqlStore) initialize(user, password, hostname string, port int, d } sqlUrl := fmt.Sprintf(CONNECTION_URL_PATTERN, user, password, hostname, port, database) + adaptedSqlUrl := fmt.Sprintf(CONNECTION_URL_PATTERN, user, "", hostname, port, database) if interpolateParams { sqlUrl += "&interpolateParams=true" + adaptedSqlUrl += "&interpolateParams=true" } var dbErr error @@ -60,7 +62,7 @@ func (store *MysqlStore) initialize(user, password, hostname string, port int, d if dbErr != nil { store.DB.Close() store.DB = nil - return fmt.Errorf("can not connect to %s error:%v", sqlUrl, err) + return fmt.Errorf("can not connect to %s error:%v", adaptedSqlUrl, err) } store.DB.SetMaxIdleConns(maxIdle) -- cgit v1.2.3 From 3575d41009e4367658e75e6ae780c6260b80daf9 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Wed, 17 Feb 2021 20:57:08 -0800 Subject: go fmt --- weed/filer/mysql/mysql_store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'weed/filer/mysql/mysql_store.go') diff --git a/weed/filer/mysql/mysql_store.go b/weed/filer/mysql/mysql_store.go index 022a8d72d..501ab1d39 100644 --- a/weed/filer/mysql/mysql_store.go +++ b/weed/filer/mysql/mysql_store.go @@ -47,7 +47,7 @@ func (store *MysqlStore) initialize(user, password, hostname string, port int, d store.SupportBucketTable = false store.SqlGenerator = &SqlGenMysql{ CreateTableSqlTemplate: "", - DropTableSqlTemplate: "drop table `%s`", + DropTableSqlTemplate: "drop table `%s`", } sqlUrl := fmt.Sprintf(CONNECTION_URL_PATTERN, user, password, hostname, port, database) -- cgit v1.2.3