From 1f2d574e77357949badee923e7195b6b8aca5fc2 Mon Sep 17 00:00:00 2001 From: Roman Odermatt Date: Wed, 17 Nov 2021 09:55:51 +0100 Subject: [PATCH] updating golden-files --- test/proto/join/test.sqlmap.go | 12 +++++++++--- test/proto/jsonb/test.sqlmap.go | 4 ++++ test/proto/simple/create/test.sqlmap.go | 4 ++++ test/proto/simple/delete/test.sqlmap.go | 4 ++++ test/proto/simple/read/test.sqlmap.go | 4 ++++ test/proto/simple/update/test.sqlmap.go | 4 ++++ 6 files changed, 29 insertions(+), 3 deletions(-) diff --git a/test/proto/join/test.sqlmap.go b/test/proto/join/test.sqlmap.go index 754fef2..c052e9e 100644 --- a/test/proto/join/test.sqlmap.go +++ b/test/proto/join/test.sqlmap.go @@ -37,6 +37,10 @@ func (m *Employee) Value() (driver.Value, error) { return m.EmployeeID, nil } +func (m *Employee) GetIdentifier() interface{} { + return m.EmployeeID +} + type queryEmployeeConfig struct { Store *TestStore filter pg.Where @@ -80,9 +84,11 @@ func EmployeeWithManager(opts ...EmployeeOption) EmployeeOption { EmployeeOnRow(func(row *Employee) { // one-to-one - item := mapManager[row.EmployeeID] - if config.rows[item.EmployeeID] != nil { - config.rows[item.EmployeeID].Manager = row + item, ok := mapManager[row.EmployeeID] + if ok && item != nil { + if config.rows[item.EmployeeID] != nil { + config.rows[item.EmployeeID].Manager = row + } } }), diff --git a/test/proto/jsonb/test.sqlmap.go b/test/proto/jsonb/test.sqlmap.go index b574595..93a780c 100644 --- a/test/proto/jsonb/test.sqlmap.go +++ b/test/proto/jsonb/test.sqlmap.go @@ -37,6 +37,10 @@ func (m *Product) Value() (driver.Value, error) { return m.ProductID, nil } +func (m *Product) GetIdentifier() interface{} { + return m.ProductID +} + type queryProductConfig struct { Store *TestStore filter pg.Where diff --git a/test/proto/simple/create/test.sqlmap.go b/test/proto/simple/create/test.sqlmap.go index 78f3327..9902100 100644 --- a/test/proto/simple/create/test.sqlmap.go +++ b/test/proto/simple/create/test.sqlmap.go @@ -37,6 +37,10 @@ func (m *Employee) Value() (driver.Value, error) { return m.Id, nil } +func (m *Employee) GetIdentifier() interface{} { + return m.Id +} + func (m *Employee) Insert(s *TestStore, ctx context.Context) error { ins := pg.NewInsert() ins.Add(m.Firstname, m.Lastname) diff --git a/test/proto/simple/delete/test.sqlmap.go b/test/proto/simple/delete/test.sqlmap.go index f202b86..1c80550 100644 --- a/test/proto/simple/delete/test.sqlmap.go +++ b/test/proto/simple/delete/test.sqlmap.go @@ -37,6 +37,10 @@ func (m *Employee) Value() (driver.Value, error) { return m.Id, nil } +func (m *Employee) GetIdentifier() interface{} { + return m.Id +} + func (m *Employee) Delete(s *TestStore, ctx context.Context) error { stmt, err := s.conn.PrepareContext(ctx, ` diff --git a/test/proto/simple/read/test.sqlmap.go b/test/proto/simple/read/test.sqlmap.go index 0b40218..1313220 100644 --- a/test/proto/simple/read/test.sqlmap.go +++ b/test/proto/simple/read/test.sqlmap.go @@ -37,6 +37,10 @@ func (m *Employee) Value() (driver.Value, error) { return m.Id, nil } +func (m *Employee) GetIdentifier() interface{} { + return m.Id +} + type queryEmployeeConfig struct { Store *TestStore filter pg.Where diff --git a/test/proto/simple/update/test.sqlmap.go b/test/proto/simple/update/test.sqlmap.go index d2ad68e..768e98e 100644 --- a/test/proto/simple/update/test.sqlmap.go +++ b/test/proto/simple/update/test.sqlmap.go @@ -37,6 +37,10 @@ func (m *Employee) Value() (driver.Value, error) { return m.Id, nil } +func (m *Employee) GetIdentifier() interface{} { + return m.Id +} + func (m *Employee) Update(s *TestStore, ctx context.Context, conf *pg.UpdateSQL) error { base := 1 if conf == nil {