Merge pull request #215 from gobuffalo/task/support-unix-timestamp

Add support for UNIX timestamps (CreatedAt & UpdatedAt)
gobuffalo · Aug 22, 2018 · 85d15df · 85d15df
2 parents 2540a72 + 0d2af90
commit 85d15df
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 36 deletions.
diff --git a/benchmarks_test.go b/benchmarks_test.go
@@ -90,7 +90,7 @@ func translateOne(sql string) string {
 			for _, char := range str {
 				out = append(out, byte(char))
 			}
-			curr += 1
+			curr++
 		} else {
 			out = append(out, sql[i])
 		}

diff --git a/finders_test.go b/finders_test.go
@@ -615,87 +615,87 @@ func Test_Count_Disregards_Pagination(t *testing.T) {
 			r.NoError(err)
 		}
 
-		first_users := Users{}
-		second_users := Users{}
+		firstUsers := Users{}
+		secondUsers := Users{}
 
 		q := tx.Paginate(1, 3)
-		q.All(&first_users)
+		q.All(&firstUsers)
 		r.Equal(len(names), q.Paginator.TotalEntriesSize) //ensure paginator populates count
-		r.Equal(3, len(first_users))
+		r.Equal(3, len(firstUsers))
 
-		first_users = Users{}
+		firstUsers = Users{}
 		q = tx.RawQuery("select * from users").Paginate(1, 3)
-		q.All(&first_users)
+		q.All(&firstUsers)
 		r.Equal(1, q.Paginator.Page)
 		r.Equal(3, q.Paginator.PerPage)
 		r.Equal(len(names), q.Paginator.TotalEntriesSize) //ensure paginator populates count
 
-		r.Equal(3, len(first_users))
+		r.Equal(3, len(firstUsers))
 		totalFirstPage := q.Paginator.TotalPages
 
 		q = tx.Paginate(2, 3)
-		q.All(&second_users)
+		q.All(&secondUsers)
 
-		r.Equal(3, len(second_users))
+		r.Equal(3, len(secondUsers))
 		totalSecondPage := q.Paginator.TotalPages
 
 		r.NotEqual(0, totalFirstPage)
 		r.NotEqual(0, totalSecondPage)
 		r.Equal(totalFirstPage, totalSecondPage)
 
-		first_users = Users{}
+		firstUsers = Users{}
 		q = tx.RawQuery("select * from users limit  2").Paginate(1, 5)
-		err := q.All(&first_users)
+		err := q.All(&firstUsers)
 		r.NoError(err)
-		r.Equal(2, len(first_users)) //raw query limit applies
+		r.Equal(2, len(firstUsers)) //raw query limit applies
 
-		first_users = Users{}
+		firstUsers = Users{}
 		q = tx.RawQuery("select * from users limit 2 offset 1").Paginate(1, 5)
-		err = q.All(&first_users)
+		err = q.All(&firstUsers)
 		r.NoError(err)
-		r.Equal(2, len(first_users))
+		r.Equal(2, len(firstUsers))
 
-		first_users = Users{}
+		firstUsers = Users{}
 		q = tx.RawQuery("select * from users limit 2 offset\t1").Paginate(1, 5)
-		err = q.All(&first_users)
+		err = q.All(&firstUsers)
 		r.NoError(err)
-		r.Equal(2, len(first_users))
+		r.Equal(2, len(firstUsers))
 
-		first_users = Users{}
+		firstUsers = Users{}
 		q = tx.RawQuery(`select * from users limit 2 offset
 			1`).Paginate(1, 5)
-		err = q.All(&first_users)
+		err = q.All(&firstUsers)
 		r.NoError(err)
-		r.Equal(2, len(first_users))
+		r.Equal(2, len(firstUsers))
 
-		first_users = Users{}
+		firstUsers = Users{}
 		q = tx.RawQuery(`select * from users limit 2 offset
 			1
 			`).Paginate(1, 5) //ending space and tab
-		err = q.All(&first_users)
+		err = q.All(&firstUsers)
 		r.NoError(err)
-		r.Equal(2, len(first_users))
+		r.Equal(2, len(firstUsers))
 
 		if tx.Dialect.Name() == "sqlite" {
-			first_users = Users{}
+			firstUsers = Users{}
 			q = tx.RawQuery("select * from users limit 2,1").Paginate(1, 5)
-			err = q.All(&first_users)
+			err = q.All(&firstUsers)
 			r.NoError(err)
-			r.Equal(2, len(first_users))
+			r.Equal(2, len(firstUsers))
 
-			first_users = Users{}
+			firstUsers = Users{}
 			q = tx.RawQuery("select * from users limit 2 , 1").Paginate(1, 5)
-			err = q.All(&first_users)
+			err = q.All(&firstUsers)
 			r.NoError(err)
-			r.Equal(2, len(first_users))
+			r.Equal(2, len(firstUsers))
 		}
 
 		if tx.Dialect.Name() == "postgresql" {
-			first_users = Users{}
+			firstUsers = Users{}
 			q = tx.RawQuery("select * from users FETCH FIRST 3 rows only").Paginate(1, 5)
-			err = q.All(&first_users)
+			err = q.All(&firstUsers)
 			r.NoError(err)
-			r.Equal(3, len(first_users)) //should fetch only 3
+			r.Equal(3, len(firstUsers)) //should fetch only 3
 		}
 	})
 }

diff --git a/model.go b/model.go
@@ -142,14 +142,26 @@ func (m *Model) setID(i interface{}) {
 func (m *Model) touchCreatedAt() {
 	fbn, err := m.fieldByName("CreatedAt")
 	if err == nil {
-		fbn.Set(reflect.ValueOf(time.Now()))
+		now := time.Now()
+		switch fbn.Kind() {
+		case reflect.Int, reflect.Int64:
+			fbn.SetInt(now.Unix())
+		default:
+			fbn.Set(reflect.ValueOf(now))
+		}
 	}
 }
 
 func (m *Model) touchUpdatedAt() {
 	fbn, err := m.fieldByName("UpdatedAt")
 	if err == nil {
-		fbn.Set(reflect.ValueOf(time.Now()))
+		now := time.Now()
+		switch fbn.Kind() {
+		case reflect.Int, reflect.Int64:
+			fbn.SetInt(now.Unix())
+		default:
+			fbn.Set(reflect.ValueOf(now))
+		}
 	}
 }
 

diff --git a/model_test.go b/model_test.go
@@ -2,6 +2,7 @@ package pop
 
 import (
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
 )
@@ -48,3 +49,37 @@ func Test_TableName_With_Array(t *testing.T) {
 	m := Model{Value: []tn{}}
 	r.Equal("this is my table name", m.TableName())
 }
+
+type TimeTimestamp struct {
+	ID        int       `db:"id"`
+	CreatedAt time.Time `db:"created_at"`
+	UpdatedAt time.Time `db:"updated_at"`
+}
+
+type UnixTimestamp struct {
+	ID        int `db:"id"`
+	CreatedAt int `db:"created_at"`
+	UpdatedAt int `db:"updated_at"`
+}
+
+func Test_Touch_Time_Timestamp(t *testing.T) {
+	r := require.New(t)
+
+	m := Model{Value: &TimeTimestamp{}}
+	m.touchCreatedAt()
+	m.touchUpdatedAt()
+	v := m.Value.(*TimeTimestamp)
+	r.NotZero(v.CreatedAt)
+	r.NotZero(v.UpdatedAt)
+}
+
+func Test_Touch_Unix_Timestamp(t *testing.T) {
+	r := require.New(t)
+
+	m := Model{Value: &UnixTimestamp{}}
+	m.touchCreatedAt()
+	m.touchUpdatedAt()
+	v := m.Value.(*UnixTimestamp)
+	r.NotZero(v.CreatedAt)
+	r.NotZero(v.UpdatedAt)
+}