Merge pull request #1346 from hyperledger/ffi-conflict

Fix uniqueness check in InsertOrGetFFI to match indexes
hyperledger · Jun 19, 2023 · fbd88de · fbd88de
2 parents 2fbd5b6 + 197c4d4
commit fbd88de
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/internal/database/sqlcommon/ffi_sql.go b/internal/database/sqlcommon/ffi_sql.go
@@ -133,8 +133,8 @@ func (s *SQLCommon) InsertOrGetFFI(ctx context.Context, ffi *fftypes.FFI) (exist
 		sq.Eq{"namespace": ffi.Namespace},
 		sq.Or{
 			sq.Eq{"id": ffi.ID},
-			sq.Eq{"name": ffi.Name},
-			sq.Eq{"network_name": ffi.NetworkName},
+			sq.Eq{"name": ffi.Name, "version": ffi.Version},
+			sq.Eq{"network_name": ffi.NetworkName, "version": ffi.Version},
 		},
 	})
 	if queryErr != nil || existing != nil {