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

entc/gen: resolve merge conflicts on global id file (#4312)

Browse Source
This commit is contained in:
Jannik Clausen
2025-01-23 13:59:47 +01:00
committed by GitHub
parent ec5bfadcab
commit 0edce5f3d6
9 changed files with 137 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dialect/sql/schema/atlas.go
View File

@@ -860,7 +860,7 @@ func (a *Atlas) tables(tables []*Table) ([]*schema.Table, error) {
}
a.sqlDialect.atIncrementT(at, r)
case et.Annotation != nil && et.Annotation.IncrementStart != nil:
a.sqlDialect.atIncrementT(at, *et.Annotation.IncrementStart)
a.sqlDialect.atIncrementT(at, int64(*et.Annotation.IncrementStart))
}
if err := a.aColumns(et, at); err != nil {
return nil, err

2
dialect/sql/schema/migrate_test.go
View File

@@ -376,7 +376,7 @@ func TestAtlas_StateReader(t *testing.T) {
{Name: "active", Type: field.TypeBool},
},
Annotation: &entsql.Annotation{
IncrementStart: func(i int64) *int64 { return &i }(100),
IncrementStart: func(i int) *int { return &i }(100),
},
}).ReadState(context.Background())
require.NoError(t, err)