Merge branch 'master' of https://github.com/Hixon10/mongo-go-driver into master

Change-Id: Iadec329fcdcc8443cd935c2bd5fc896ea7ad3931

Author: skriptble

bson/constructor.go

@@ -11,6 +11,7 @@ import (
 	"fmt"
 	"math"
 	"reflect"
+	"time"
 
 	"github.com/mongodb/mongo-go-driver/bson/decimal"
 	"github.com/mongodb/mongo-go-driver/bson/elements"
@@ -325,6 +326,7 @@ func (ElementConstructor) Boolean(key string, b bool) *Element {
 }
 
 // DateTime creates a datetime element with the given key and value.
+// dt represents milliseconds since the Unix epoch
 func (ElementConstructor) DateTime(key string, dt int64) *Element {
 	size := uint32(1 + len(key) + 1 + 8)
 	elem := newElement(0, 1+uint32(len(key))+1)
@@ -338,6 +340,11 @@ func (ElementConstructor) DateTime(key string, dt int64) *Element {
 	return elem
 }
 
+// Time creates a datetime element with the given key and value.
+func (c ElementConstructor) Time(key string, time time.Time) *Element {
+	return c.DateTime(key, time.Unix()*1000)
+}
+
 // Null creates a null element with the given key.
 func (ElementConstructor) Null(key string) *Element {
 	size := uint32(1 + len(key) + 1)

bson/constructor_test.go

@@ -9,6 +9,7 @@ package bson
 import (
 	"bytes"
 	"testing"
+	"time"
 
 	"github.com/mongodb/mongo-go-driver/bson/decimal"
 	"github.com/stretchr/testify/require"
@@ -271,6 +272,26 @@ func TestConstructor(t *testing.T) {
 			requireElementsEqual(t, expected, actual)
 		})
 
+		t.Run("time", func(t *testing.T) {
+			buf := []byte{
+				// type
+				0x9,
+				// key
+				0x66, 0x6f, 0x6f, 0x0,
+				// value
+				0xC8, 0x6C, 0x3C, 0xAF, 0x60, 0x1, 0x0, 0x0,
+			}
+
+			expected := &Element{&Value{start: 0, offset: 5, data: buf, d: nil}}
+
+			date := time.Date(2018, 1, 1, 1, 1, 1, 1, time.UTC)
+			actualTime := EC.Time("foo", date)
+			actualDateTime := EC.DateTime("foo", date.Unix()*1000)
+
+			requireElementsEqual(t, expected, actualTime)
+			requireElementsEqual(t, expected, actualDateTime)
+		})
+
 		t.Run("Null", func(t *testing.T) {
 			buf := []byte{
 				// type