Skip to content

Commit

Permalink
Merge branch 'release/1.1.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
axllent committed Jul 11, 2023
2 parents 345cafe + 06e45c6 commit 2fd8e1e
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 2 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## [1.1.3]

- Prevent errors on import due to `STRICT_TRANS_TABLES` and `STRICT_ALL_TABLES`


## [1.1.2]

- Allow .env loading to be skipped, and overwriting variables via environment (@ZaneA #6)
Expand Down
2 changes: 1 addition & 1 deletion utils/fs_unix.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build !windows
//go:build !windows

package utils

Expand Down
2 changes: 1 addition & 1 deletion utils/fs_windows.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build windows
//go:build windows

package utils

Expand Down
6 changes: 6 additions & 0 deletions utils/mysql.go
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,12 @@ func MySQLLoadFromGz(gzipSQLFile string) error {

app.Log(fmt.Sprintf("Importing database to '%s'", app.DB.Name))

// ensure compatibility between MySQL & Mariadb, including older versions caused by
// `STRICT_TRANS_TABLES` and `STRICT_ALL_TABLES`
if _, err := db.Exec("SET sql_mode = '';"); err != nil {
return err
}

sql := ""

for fileScanner.Scan() {
Expand Down

0 comments on commit 2fd8e1e

Please sign in to comment.