golang/ent
1
0
Fork 0
mirror of https://github.com/ent/ent.git synced 2026-05-24 09:31:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

entc/internal: catch syntax error due to conflict marker (#1163)

Browse Source
This commit is contained in:
BrentChesny
2021-01-12 17:22:48 +01:00
committed by GitHub
parent 13b61ff455
commit ab9b2ae967
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
entc/internal/snapshot.go
View File

@@ -218,7 +218,13 @@ func IsBuildError(err error) bool {
if strings.HasPrefix(err.Error(), "entc/load: #") {
return true
}
for _, s := range []string{"syntax error", "previous declaration", "invalid character", "could not import"} {
for _, s := range []string{
"syntax error",
"previous declaration",
"invalid character",
"could not import",
"found '<<'",
} {
if strings.Contains(err.Error(), s) {
return true
}