Merge branch 'master' of https://github.com/faide/go-kallax

Signed-off-by: Florent Aide <florent.aide@gmail.com>

Author: faide

benchmarks/bench_test.go

@@ -22,9 +22,10 @@ func envOrDefault(key string, def string) string {
 
 func dbURL() string {
 	return fmt.Sprintf(
-		"postgres://%s:%s@0.0.0.0:5432/%s?sslmode=disable",
+		"postgres://%s:%s@%s/%s?sslmode=disable",
 		envOrDefault("DBUSER", "testing"),
 		envOrDefault("DBPASS", "testing"),
+		envOrDefault("DBHOST", "0.0.0.0:5432"),
 		envOrDefault("DBNAME", "testing"),
 	)
 }

common_test.go

@@ -19,9 +19,10 @@ func envOrDefault(key string, def string) string {
 
 func openTestDB() (*sql.DB, error) {
 	return sql.Open("postgres", fmt.Sprintf(
-		"postgres://%s:%s@0.0.0.0:5432/%s?sslmode=disable",
+		"postgres://%s:%s@%s/%s?sslmode=disable",
 		envOrDefault("DBUSER", "testing"),
 		envOrDefault("DBPASS", "testing"),
+		envOrDefault("DBHOST", "0.0.0.0:5432"),
 		envOrDefault("DBNAME", "testing"),
 	))
 }

model.go

@@ -2,12 +2,11 @@ package kallax
 
 import (
 	"bytes"
+	"crypto/rand"
 	"database/sql"
 	"database/sql/driver"
 	"encoding/hex"
 	"fmt"
-	"math/rand"
-	"sync"
 	"time"
 
 	"github.com/oklog/ulid"
@@ -227,13 +226,6 @@ type Record interface {
 	Saveable
 }
 
-var randPool = &sync.Pool{
-	New: func() interface{} {
-		seed := time.Now().UnixNano() + rand.Int63()
-		return rand.NewSource(seed)
-	},
-}
-
 // ULID is an ID type provided by kallax that is a lexically sortable UUID.
 // The internal representation is an ULID (https://github.com/oklog/ulid).
 // It already implements sql.Scanner and driver.Valuer, so it's perfectly
@@ -242,11 +234,7 @@ type ULID uuid.UUID
 
 // NewULID returns a new ULID, which is a lexically sortable UUID.
 func NewULID() ULID {
-	entropy := randPool.Get().(rand.Source)
-	id := ULID(ulid.MustNew(ulid.Timestamp(time.Now()), rand.New(entropy)))
-	randPool.Put(entropy)
-
-	return id
+	return ULID(ulid.MustNew(ulid.Timestamp(time.Now()), rand.Reader))
 }
 
 // NewULIDFromText creates a new ULID from its string representation. Will

types/slices_test.go

@@ -217,9 +217,10 @@ func envOrDefault(key string, def string) string {
 
 func openTestDB() (*sql.DB, error) {
 	return sql.Open("postgres", fmt.Sprintf(
-		"postgres://%s:%s@0.0.0.0:5432/%s?sslmode=disable",
+		"postgres://%s:%s@%s/%s?sslmode=disable",
 		envOrDefault("DBUSER", "testing"),
 		envOrDefault("DBPASS", "testing"),
+		envOrDefault("DBHOST", "0.0.0.0:5432"),
 		envOrDefault("DBNAME", "testing"),
 	))
 }

types/types_test.go

@@ -139,7 +139,8 @@ func TestNullable(t *testing.T) {
 		PtrDuration *time.Duration
 	)
 	tim := time.Now().UTC()
-	tim = time.Date(tim.Year(), tim.Month(), tim.Day(), tim.Hour(), tim.Minute(), tim.Second(), 0, tim.Location())
+	tim = time.Date(tim.Year(), tim.Month(), tim.Day(), tim.Hour(),
+		tim.Minute(), tim.Second(), 0, tim.Location())
 	s := require.New(t)
 	url, err := url.Parse("http://foo.me")
 	s.NoError(err)
@@ -431,7 +432,14 @@ func TestNullable(t *testing.T) {
 		if c.isPtr {
 			elem = elem.Elem()
 		}
-		s.Equal(c.nonNullInput, elem.Interface(), c.name)
+
+		result := elem.Interface()
+		switch v := result.(type) {
+		case time.Time:
+			result = v.UTC()
+		}
+
+		s.Equal(c.nonNullInput, result, c.name)
 
 		_, err = db.Exec("DROP TABLE foo")
 		s.Nil(err, c.name)