Optimistic DB Insert and Update (go-rel#33)

* wip changing changes signature

* wip: implement apply on basic modifier

* wip: implementation on map, now panics instead of returning errors

* removed error return from apply changes

* fix test

* removed StaleIDs

* removed AssocChanges

* refactored changes as modification

* apply structset if it's to another struct

* optimistic inserts

* fix test

* renamed ChangeFragment to SetFragment

* optimistic update

* apply has many for map

* simplify InsertAll api

* wip optimistic have save many

* optimistic save has many

* fix structset

* try fix timezone

* fix ordering when id increment is negative

* simplify modifcation struct

* adjust adapter

* sanity test

* fix tests

* try reuse repository logic

* fix postgres adapter

* use timestamptz

* fix time location issue

* try

* upgrade

* fix timezone

* more fix

* removed todo, current insert api doesn't allow that op

* use affected rows to determine update and delete error

* renamed NoResultError to NotFoundError to fits better in the context of update and delete

* hack coverage

* fix

* improve coverage

* improve coverage

* add reload modifier

* refactor applyAssoc

* refactor duplicate assertion

* more test

* reuse ChangeIncOp for decrement

* refactor SetValue

* refactor applyValue

Author: Fs02

.travis.yml

@@ -2,7 +2,7 @@ env:
   global:
     - CC_TEST_REPORTER_ID=045e6c8f64f873901bacc868224b418d9fc72dd73c40feb1af50faf3e96de15d
     - MYSQL_DATABASE=root@(127.0.0.1:3306)/rel_test
-    - POSTGRESQL_DATABASE=postgres://postgres@localhost/rel_test?sslmode=disable
+    - POSTGRESQL_DATABASE=postgres://postgres@localhost/rel_test
 
 language: go
 go:

Gopkg.lock

@@ -4,10 +4,10 @@ package rel
 type Adapter interface {
 	Aggregate(query Query, mode string, field string, loggers ...Logger) (int, error)
 	Query(query Query, loggers ...Logger) (Cursor, error)
-	Insert(query Query, changes Changes, loggers ...Logger) (interface{}, error)
-	InsertAll(query Query, fields []string, changes []Changes, loggers ...Logger) ([]interface{}, error)
-	Update(query Query, changes Changes, loggers ...Logger) error
-	Delete(query Query, loggers ...Logger) error
+	Insert(query Query, modifies map[string]Modify, loggers ...Logger) (interface{}, error)
+	InsertAll(query Query, fields []string, bulkModifies []map[string]Modify, loggers ...Logger) ([]interface{}, error)
+	Update(query Query, modifies map[string]Modify, loggers ...Logger) (int, error)
+	Delete(query Query, loggers ...Logger) (int, error)
 
 	Begin() (Adapter, error)
 	Commit() error

adapter.go

@@ -25,7 +25,7 @@ func init() {
 	_, _, err = adapter.Exec(`CREATE TABLE users (
 		id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
 		name VARCHAR(30) NOT NULL DEFAULT '',
-		gender VARCHAR(10) NOT NULL DEFAULT 'male',
+		gender VARCHAR(10) NOT NULL DEFAULT '',
 		age INT NOT NULL DEFAULT 0,
 		note varchar(50),
 		created_at DATETIME,
@@ -124,12 +124,12 @@ func TestAdapter_specs(t *testing.T) {
 // 	defer adapter.Close()
 
 // 	fields := []string{"notexist"}
-// 	allchanges := []map[string]interface{}{
+// 	modifications := []map[string]interface{}{
 // 		{"notexist": "12"},
 // 		{"notexist": "13"},
 // 	}
 
-// 	_, err = adapter.InsertAll(rel.Repo{}.From("users"), fields, allchanges)
+// 	_, err = adapter.InsertAll(rel.Repo{}.From("users"), fields, modifications)
 
 // 	assert.NotNil(t, err)
 // }

adapter/mysql/mysql_test.go

@@ -48,10 +48,10 @@ func Open(dsn string) (*Adapter, error) {
 }
 
 // Insert inserts a record to database and returns its id.
-func (adapter *Adapter) Insert(query rel.Query, changes rel.Changes, loggers ...rel.Logger) (interface{}, error) {
+func (adapter *Adapter) Insert(query rel.Query, modifies map[string]rel.Modify, loggers ...rel.Logger) (interface{}, error) {
 	var (
 		id              int64
-		statement, args = sql.NewBuilder(adapter.Config).Returning("id").Insert(query.Table, changes)
+		statement, args = sql.NewBuilder(adapter.Config).Returning("id").Insert(query.Table, modifies)
 		rows, err       = adapter.query(statement, args, loggers)
 	)
 
@@ -64,10 +64,10 @@ func (adapter *Adapter) Insert(query rel.Query, changes rel.Changes, loggers ...
 }
 
 // InsertAll inserts multiple records to database and returns its ids.
-func (adapter *Adapter) InsertAll(query rel.Query, fields []string, allchanges []rel.Changes, loggers ...rel.Logger) ([]interface{}, error) {
+func (adapter *Adapter) InsertAll(query rel.Query, fields []string, bulkModifies []map[string]rel.Modify, loggers ...rel.Logger) ([]interface{}, error) {
 	var (
 		ids             []interface{}
-		statement, args = sql.NewBuilder(adapter.Config).Returning("id").InsertAll(query.Table, fields, allchanges)
+		statement, args = sql.NewBuilder(adapter.Config).Returning("id").InsertAll(query.Table, fields, bulkModifies)
 		rows, err       = adapter.query(statement, args, loggers)
 	)
 

adapter/postgres/postgres.go

@@ -3,6 +3,7 @@ package postgres
 import (
 	"os"
 	"testing"
+	"time"
 
 	"github.com/Fs02/go-paranoid"
 	"github.com/Fs02/rel"
@@ -27,11 +28,11 @@ func init() {
 		id SERIAL NOT NULL PRIMARY KEY,
 		slug VARCHAR(30) DEFAULT NULL,
 		name VARCHAR(30) NOT NULL DEFAULT '',
-		gender VARCHAR(10) NOT NULL DEFAULT 'male',
+		gender VARCHAR(10) NOT NULL DEFAULT '',
 		age INT NOT NULL DEFAULT 0,
 		note varchar(50),
-		created_at TIMESTAMP,
-		updated_at TIMESTAMP,
+		created_at TIMESTAMPTZ,
+		updated_at TIMESTAMPTZ,
 		UNIQUE(slug)
 	);`, nil)
 	paranoid.Panic(err, "failed creating users table")
@@ -40,8 +41,8 @@ func init() {
 		id SERIAL NOT NULL PRIMARY KEY,
 		user_id INTEGER REFERENCES users(id),
 		name VARCHAR(60) NOT NULL DEFAULT '',
-		created_at TIMESTAMP,
-		updated_at TIMESTAMP
+		created_at TIMESTAMPTZ,
+		updated_at TIMESTAMPTZ
 	);`, nil)
 	paranoid.Panic(err, "failed creating addresses table")
 
@@ -52,14 +53,18 @@ func init() {
 		score INTEGER DEFAULT 0 CHECK (score>=0 AND score<=100)
 	);`, nil)
 	paranoid.Panic(err, "failed creating extras table")
+
+	// hack to make sure location it has the same location object as returned by pq driver.
+	time.Local, err = time.LoadLocation("Asia/Jakarta")
+	paranoid.Panic(err, "failed loading time location")
 }
 
 func dsn() string {
 	if os.Getenv("POSTGRESQL_DATABASE") != "" {
-		return os.Getenv("POSTGRESQL_DATABASE")
+		return os.Getenv("POSTGRESQL_DATABASE") + "?sslmode=disable&timezone=Asia/Jakarta"
 	}
 
-	return "postgres://rel@localhost:9920/rel_test?sslmode=disable"
+	return "postgres://rel@localhost:9920/rel_test?sslmode=disable&timezone=Asia/Jakarta"
 }
 
 func TestAdapter_specs(t *testing.T) {
@@ -127,12 +132,12 @@ func TestAdapter_specs(t *testing.T) {
 // 	defer adapter.Close()
 
 // 	fields := []string{"notexist"}
-// 	allchanges := []map[string]interface{}{
+// 	modifications := []map[string]interface{}{
 // 		{"notexist": "12"},
 // 		{"notexist": "13"},
 // 	}
 
-// 	_, err = adapter.InsertAll(rel.Repo{}.From("users"), fields, allchanges)
+// 	_, err = adapter.InsertAll(rel.Repo{}.From("users"), fields, modifications)
 
 // 	assert.NotNil(t, err)
 // }

adapter/postgres/postgres_test.go

@@ -48,9 +48,7 @@ func Aggregate(t *testing.T, repo rel.Repository) {
 	}
 
 	for _, query := range tests {
-		statement, _ := builder.Find(query.Select("count(id) AS count"))
-
-		t.Run("Aggregate|"+statement, func(t *testing.T) {
+		t.Run("Aggregate", func(t *testing.T) {
 			count, err := repo.Aggregate(query, "count", "id")
 			assert.Nil(t, err)
 			assert.True(t, count >= 0)

adapter/specs/aggregate.go

@@ -18,7 +18,7 @@ func Delete(t *testing.T, repo rel.Repository) {
 	assert.NotEqual(t, 0, user.ID)
 
 	assert.Nil(t, repo.Delete(&user))
-	assert.Equal(t, rel.NoResultError{}, repo.Find(&user, where.Eq("id", user.ID)))
+	assert.Equal(t, rel.NotFoundError{}, repo.Find(&user, where.Eq("id", user.ID)))
 }
 
 // DeleteAll tests delete specifications.
@@ -43,8 +43,7 @@ func DeleteAll(t *testing.T, repo rel.Repository) {
 	}
 
 	for _, query := range tests {
-		statement, _ := builder.Delete(query.Table, query.WhereQuery)
-		t.Run("Delete|"+statement, func(t *testing.T) {
+		t.Run("Delete", func(t *testing.T) {
 			var result []User
 			assert.Nil(t, repo.FindAll(&result, query))
 			assert.NotEqual(t, 0, len(result))

adapter/specs/delete.go

@@ -1,7 +1,6 @@
 package specs
 
 import (
-	"reflect"
 	"testing"
 
 	"github.com/Fs02/rel"
@@ -157,17 +156,26 @@ func Inserts(t *testing.T, repo rel.Repository) {
 	}
 
 	for _, record := range tests {
-		var (
-			changes      = rel.BuildChanges(rel.NewStructset(record, false))
-			statement, _ = builder.Insert("collection", changes)
-		)
-
-		t.Run("Insert|"+statement, func(t *testing.T) {
+		t.Run("Insert", func(t *testing.T) {
 			assert.Nil(t, repo.Insert(record))
+			assertRecord(t, repo, record)
 		})
 	}
 }
 
+func assertRecord(t *testing.T, repo rel.Repository, record interface{}) {
+	switch v := record.(type) {
+	case *User:
+		var found User
+		repo.MustFind(&found, where.Eq("id", v.ID))
+		assert.Equal(t, found, *v)
+	case *Address:
+		var found Address
+		repo.MustFind(&found, where.Eq("id", v.ID))
+		assert.Equal(t, found, *v)
+	}
+}
+
 // InsertAll tests insert multiple specifications.
 func InsertAll(t *testing.T, repo rel.Repository) {
 	var (
@@ -178,26 +186,48 @@ func InsertAll(t *testing.T, repo rel.Repository) {
 	repo.MustInsert(&user)
 
 	tests := []interface{}{
-		// &[]User{{}},
+		&[]User{{}},
 		&[]User{{Name: "insert", Age: 100}},
 		&[]User{{Name: "insert", Age: 100, Note: &note}},
 		&[]User{{Note: &note}},
-		// &[]Address{{}},
+		&[]User{{Name: "insert", Age: 100}, {Name: "insert too"}},
+		&[]Address{{}},
 		&[]Address{{Name: "work"}},
 		&[]Address{{UserID: &user.ID}},
 		&[]Address{{Name: "work", UserID: &user.ID}},
+		&[]Address{{Name: "work"}, {Name: "home"}},
 	}
 
 	for _, record := range tests {
-		// var (
-		// 	changes      = rel.BuildChanges(rel.Struct(record))
-		// 	statement, _ = builder.Insert("collection", changes)
-		// )
-
 		t.Run("InsertAll", func(t *testing.T) {
-			// multiple insert
 			assert.Nil(t, repo.InsertAll(record))
-			assert.Equal(t, 1, reflect.ValueOf(record).Elem().Len())
+
+			switch v := record.(type) {
+			case *[]User:
+				var (
+					found []User
+					ids   = make([]int, len(*v))
+				)
+
+				for i := range *v {
+					ids[i] = int((*v)[i].ID)
+				}
+
+				repo.MustFindAll(&found, where.InInt("id", ids))
+				assert.Equal(t, found, *v)
+			case *[]Address:
+				var (
+					found []Address
+					ids   = make([]int, len(*v))
+				)
+
+				for i := range *v {
+					ids[i] = int((*v)[i].ID)
+				}
+
+				repo.MustFindAll(&found, where.InInt("id", ids))
+				assert.Equal(t, found, *v)
+			}
 		})
 	}
 }