Fix datetime checks [TO SQUASH]

Attempt to fix datetime checks for custom structs.

Author: ligurio

datetime/config.lua

@@ -54,7 +54,8 @@ box.once("init", function()
     s_3:create_index('primary', {
         type = 'tree',
         parts = {
-            {1, 'uint'}
+            {1, 'uint'},
+            {2, 'datetime'}
         },
         if_not_exists = true
     })

datetime/datetime_test.go

@@ -240,7 +240,7 @@ func TestDatetimeReplace(t *testing.T) {
 }
 
 type Event struct {
-	Datetime time.Time
+	Datetime DateTime
 	Location string
 }
 
@@ -260,7 +260,7 @@ type Tuple2 struct {
 }
 
 type Tuple3 struct {
-	Datetime time.Time
+	Datetime DateTime
 }
 
 func (t *Tuple3) EncodeMsgpack(e *msgpack.Encoder) error {
@@ -318,7 +318,7 @@ func (ev *Event) DecodeMsgpack(d *msgpack.Decoder) error {
 	if err != nil {
 		return err
 	}
-	ev.Datetime = res.(time.Time)
+	ev.Datetime = res.(DateTime)
 	return nil
 }
 
@@ -371,30 +371,33 @@ func TestCustomEncodeDecodeTuple1(t *testing.T) {
 
 	dt1, _ := time.Parse(time.RFC3339, "2010-05-24T17:51:56.000000009Z")
 	dt2, _ := time.Parse(time.RFC3339, "2022-05-24T17:51:56.000000009Z")
+	const cid = 13
+	const orig = "orig"
 
-	tuple := Tuple{Cid: 13, Orig: "orig", Events: []Event{{dt1, "Minsk"}, {dt2, "Moscow"}}}
+	tuple := Tuple{Cid: cid, Orig: orig, Events: []Event{{NewDateTime(dt1), "Minsk"}, {NewDateTime(dt2), "Moscow"}}}
 	resp, err := conn.Replace("testDatetime_3", &tuple)
 	if err != nil || resp.Code != 0 {
 		t.Fatalf("Failed to replace: %s", err.Error())
-		return
 	}
 	if len(resp.Data) != 1 {
 		t.Fatalf("Response Body len != 1")
 	}
-	if tpl, ok := resp.Data[0].([]interface{}); !ok {
-		t.Errorf("Unexpected body of Replace")
-	} else {
-		if len(tpl) != 3 {
-			t.Fatalf("Unexpected body of Replace (tuple len)")
-		}
-		if id, ok := tpl[0].(uint64); !ok || id != 13 {
-			t.Fatalf("Unexpected body of Replace (13)")
-		}
-		if o, ok := tpl[1].(string); !ok || o != "orig" {
-			t.Fatalf("Unexpected body of Replace (orig)")
-		}
+
+	tpl, ok := resp.Data[0].([]interface{})
+	if !ok {
+		t.Fatalf("Unexpected body of Replace")
 	}
 
+	if len(tpl) != 3 {
+		t.Fatalf("Unexpected body of Replace (tuple len)")
+	}
+	if id, ok := tpl[0].(uint64); !ok || id != cid {
+		t.Fatalf("Unexpected body of Replace (%d)", cid)
+	}
+	if o, ok := tpl[1].(string); !ok || o != orig {
+		t.Fatalf("Unexpected body of Replace (%s)", orig)
+	}
+	fmt.Printf("%+v\n", tpl[2]) // FIXME
 }
 
 func TestCustomEncodeDecodeTuple2(t *testing.T) {
@@ -418,6 +421,7 @@ func TestCustomEncodeDecodeTuple2(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Failed to SelectTyped(): %s", err.Error())
 	}
+	fmt.Printf("%+v", tuples)
 
 	// Teardown: delete a value.
 	_, err = conn.Delete(space, index, []interface{}{&dt})
@@ -437,17 +441,33 @@ func TestCustomEncodeDecodeTuple3(t *testing.T) {
 	// Setup: insert a value.
 	tm := time.Unix(0, 0)
 	dt := NewDateTime(tm)
-	_, err := conn.Insert(space, []interface{}{&dt})
+	resp, err := conn.Insert(space, []interface{}{&dt})
 	if err != nil {
 		t.Fatalf("Datetime insert failed: %s", err.Error())
 	}
 
+	fmt.Printf("%+v\n", resp.Data[0])
+
 	var tuples2 []Tuple2
-	err = conn.SelectTyped("testDatetime_2", index, 0, 1, IterEq, []interface{}{1, &dt}, &tuples2)
+	err = conn.SelectTyped("testDatetime_2", index, 0, 1, IterEq, []interface{}{1, dt}, &tuples2)
 	if err != nil {
 		t.Fatalf("Failed to SelectTyped: %s", err.Error())
 		return
 	}
+	if len(tuples2) == 0 {
+		t.Fatalf("Wrong tuples length") // FIXME
+	}
+	if cid := tuples2[0].Cid; cid != 5 {
+		t.Fatalf("Wrong Cid (%d), should be 5", cid)
+	}
+	if orig := tuples2[0].Orig; orig != "Poyekhali!" {
+		t.Fatalf("Wrong Orig (%s), should be 'Hello, there!'", orig)
+	}
+	/*
+	if dt := tuples2[0].Datetime; dt.IsZero() {
+		t.Fatalf("Achtung!")
+	}
+	*/
 
 	// Teardown: delete a value.
 	_, err = conn.Delete(space, index, []interface{}{&dt})
@@ -477,6 +497,25 @@ func TestCustomDecodeFunction(t *testing.T) {
 	if orig := tuples[0].Orig; orig != "Poyekhali!" {
 		t.Fatalf("Wrong Orig (%s), should be 'Hello, there!'", orig)
 	}
+
+	events := tuples[0].Events
+	if len(events) != 3 {
+		t.Fatalf("Wrong a number of Events (%d), should be 3", len(events))
+	}
+	/*
+	if ev1 := events[0]; ev1.Location != "Klushino" || ev1.Datetime.IsZero() {
+		fmt.Println(ev1.Datetime)
+		t.Fatalf("Klushino") // FIXME
+	}
+	if ev2 := events[0]; ev2.Location != "Baikonur" || ev2.Datetime.IsZero() {
+		fmt.Println(ev2.Datetime)
+		t.Fatalf("Baikonur") // FIXME
+	}
+	if ev3 := events[0]; ev3.Location != "Novoselovo" || ev3.Datetime.IsZero() {
+		fmt.Println(ev3.Datetime)
+		t.Fatalf("Novoselovo") // FIXME
+	}
+	*/
 }
 
 func TestCustomEncodeDecodeTuple5(t *testing.T) {