Merge branch 'release/5.0.10'

gobuffalo · Apr 5, 2020 · 59331d3 · 59331d3
2 parents 8d4ccc9 + ceed59d
commit 59331d3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/dialect_mysql.go b/dialect_mysql.go
@@ -107,8 +107,9 @@ func (m *mysql) CreateDB() error {
 		return errors.Wrapf(err, "error creating MySQL database %s", deets.Database)
 	}
 	defer db.Close()
+	charset := defaults.String(deets.Options["charset"], "utf8mb4")
 	encoding := defaults.String(deets.Options["collation"], "utf8mb4_general_ci")
-	query := fmt.Sprintf("CREATE DATABASE `%s` DEFAULT COLLATE `%s`", deets.Database, encoding)
+	query := fmt.Sprintf("CREATE DATABASE `%s` DEFAULT CHARSET `%s` DEFAULT COLLATE `%s`", deets.Database, charset, encoding)
 	log(logging.SQL, query)
 
 	_, err = db.Exec(query)

diff --git a/soda/cmd/version.go b/soda/cmd/version.go
@@ -1,4 +1,4 @@
 package cmd
 
 // Version defines the current Pop version.
-const Version = "v5.0.9"
+const Version = "v5.0.10"