Functions: fixing S4 ORM (smartcontractkit#10596)

* Functions: fixing S4 ORM * Functions: fixing S4 ORM * Fixed test
sivathanuk · Sep 12, 2023 · 079f749 · 079f749
1 parent 3ac616a
commit 079f749
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git a/core/services/s4/postgres_orm.go b/core/services/s4/postgres_orm.go
@@ -71,7 +71,7 @@ RETURNING id;`, o.tableName)
 	if errors.Is(err, sql.ErrNoRows) {
 		return ErrVersionTooLow
 	}
-	return nil
+	return err
 }
 
 func (o orm) DeleteExpired(limit uint, utcNow time.Time, qopts ...pg.QOpt) (int64, error) {

diff --git a/core/services/s4/postgres_orm_test.go b/core/services/s4/postgres_orm_test.go
@@ -2,6 +2,7 @@ package s4_test
 
 import (
 	"errors"
+	"math"
 	"testing"
 	"time"
 
@@ -257,3 +258,22 @@ func TestPostgresORM_Namespace(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Len(t, snapshotA, n)
 }
+
+func TestPostgresORM_BigIntVersion(t *testing.T) {
+	t.Parallel()
+
+	orm := setupORM(t, "test")
+	row := generateTestRows(t, 1)[0]
+	row.Version = math.MaxUint64 - 10
+
+	err := orm.Update(row)
+	assert.NoError(t, err)
+
+	row.Version++
+	err = orm.Update(row)
+	assert.NoError(t, err)
+
+	gotRow, err := orm.Get(row.Address, row.SlotId)
+	assert.NoError(t, err)
+	assert.Equal(t, row, gotRow)
+}
diff --git a/core/store/migrate/migrations/0193_s4_alter_version_type.sql b/core/store/migrate/migrations/0193_s4_alter_version_type.sql
@@ -0,0 +1,7 @@
+-- +goose Up
+
+ALTER TABLE "s4".shared ALTER COLUMN version TYPE NUMERIC;
+
+-- +goose Down
+
+ALTER TABLE "s4".shared ALTER COLUMN version TYPE INT USING version::integer;