Merge pull request #8 from dgraph-io/chore/dgdao-typed-client-parity

Adopt the dgdao v0.9.0 API

Author: mlwelles

CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project are documented here. The format follows
 [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
+## [0.2.4] - 2026-07-19
+
+### Changed
+
+- Bump the `github.com/dgraph-io/dgdao` dependency to v0.9.0, which renames the
+  transaction surface (`Txn`/`ClientTxn`), the consume operations
+  (`GetOrInsert`/`GetAndDelete`), and the record bridge (`AsRecord`). Schema rendering
+  follows the `AsRecord` rename; no behavior change in migrate itself.
+
 ## [0.2.3] - 2026-07-17
 
 ### Changed

go.mod

@@ -3,7 +3,7 @@ module github.com/dgraph-io/dgdao-migrate
 go 1.26.4
 
 require (
-	github.com/dgraph-io/dgdao v0.8.0
+	github.com/dgraph-io/dgdao v0.9.0
 	github.com/dgraph-io/dgo/v250 v250.0.0
 	github.com/dolan-in/dgman/v2 v2.2.0
 	github.com/stretchr/testify v1.11.1

go.sum

@@ -118,8 +118,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgraph-io/badger/v4 v4.9.4 h1:bcw+waCpzRZ2nmcSPbnPvDVhiEsn98TKmvnAhK7r7LM=
 github.com/dgraph-io/badger/v4 v4.9.4/go.mod h1:nJjaJTUOSsQEBhsq209FmwCvMJzEA3e74RjZw6V2pQI=
-github.com/dgraph-io/dgdao v0.8.0 h1:XktasJioJtpKCUT3LaM1zXeW3b34jBT3SEbAgWea3uw=
-github.com/dgraph-io/dgdao v0.8.0/go.mod h1:r3u8mdH7x4XfXnmMZFf/bMwPe7E+IYEg1eAZRjLcaqs=
+github.com/dgraph-io/dgdao v0.9.0 h1:OVY1tciW+RCjBWqH1DF8k66NEXLZRUCcgshQtdrmoDQ=
+github.com/dgraph-io/dgdao v0.9.0/go.mod h1:r3u8mdH7x4XfXnmMZFf/bMwPe7E+IYEg1eAZRjLcaqs=
 github.com/dgraph-io/dgo/v250 v250.0.0 h1:zkVj8EOgNOK3s5XFEK7CJKRdftWqg5K6qGs4HEH5TcY=
 github.com/dgraph-io/dgo/v250 v250.0.0/go.mod h1:OVSaapUnuqaY4beLe98CajukINwbVm0JRNp0SRBCz/w=
 github.com/dgraph-io/dgraph/v25 v25.3.8 h1:jDEj7zt16PZ7PGylisciEpF/lbKNGbciSORkEDcSx0Y=

migrate/fake_test.go

@@ -123,11 +123,10 @@ type stubClient struct {
 }
 
 func (c *stubClient) Insert(context.Context, any) error                         { return nil }
-func (c *stubClient) InsertRaw(context.Context, any) error                      { return nil }
 func (c *stubClient) Upsert(context.Context, any, ...string) error              { return nil }
 func (c *stubClient) Update(context.Context, any) error                         { return nil }
-func (c *stubClient) LoadOrStore(context.Context, any, ...string) (bool, error) { return false, nil }
-func (c *stubClient) LoadAndDelete(context.Context, any, any, ...string) (bool, error) {
+func (c *stubClient) GetOrInsert(context.Context, any, ...string) (bool, error) { return false, nil }
+func (c *stubClient) GetAndDelete(context.Context, any, any, ...string) (bool, error) {
 	return false, nil
 }
 func (c *stubClient) Get(context.Context, any, string) error     { return nil }
@@ -146,5 +145,5 @@ func (c *stubClient) DgraphClient() (*dgo.Dgraph, func(), error) { return nil, f
 func (c *stubClient) WithRetry(_ context.Context, _ mg.RetryPolicy, fn func() error) error {
 	return fn()
 }
-func (c *stubClient) InTxn(*mg.TxnContext) mg.Client               { return c }
-func (c *stubClient) NewTxnContext(context.Context) *mg.TxnContext { return nil }
+func (c *stubClient) InTxn(tx *mg.Txn) *mg.ClientTxn { return mg.InTxn(tx) }
+func (c *stubClient) NewTxn(context.Context) *mg.Txn { return nil }

migrate/schema.go

@@ -46,7 +46,7 @@ func MarshalSchema(models ...any) (string, error) {
 	for _, m := range models {
 		name := modelName(m)
 		ts := dg.NewTypeSchema()
-		ts.Marshal("", mg.UnwrapSchema(m))
+		ts.Marshal("", mg.AsRecord(m))
 
 		for pred, s := range ts.Schema {
 			decl := strings.TrimSpace(s.String())