Merge pull request #394 from Zariel/udt-proto-lt3

Return a helpful error when using UDT in proto 2

marshal.go

@@ -7,12 +7,14 @@ package gocql
 import (
 	"bytes"
 	"encoding/binary"
+	"errors"
 	"fmt"
 	"math"
 	"math/big"
 	"net"
 	"reflect"
 	"strconv"
+	"strings"
 	"time"
 
 	"speter.net/go/exp/math/dec/inf"
@@ -22,6 +24,10 @@ var (
 	bigOne = big.NewInt(1)
 )
 
+var (
+	ErrorUDTUnavailable = errors.New("UDT are not available on protocols less than 3, please update config")
+)
+
 // Marshaler is the interface implemented by objects that can marshal
 // themselves into values understood by Cassandra.
 type Marshaler interface {
@@ -86,6 +92,12 @@ func Marshal(info TypeInfo, value interface{}) ([]byte, error) {
 	case TypeUDT:
 		return marshalUDT(info, value)
 	}
+
+	// detect protocol 2 UDT
+	if strings.HasPrefix(info.Custom(), "org.apache.cassandra.db.marshal.UserType") && info.Version() < 3 {
+		return nil, ErrorUDTUnavailable
+	}
+
 	// TODO(tux21b): add the remaining types
 	return nil, fmt.Errorf("can not marshal %T into %s", value, info)
 }
@@ -135,6 +147,12 @@ func Unmarshal(info TypeInfo, data []byte, value interface{}) error {
 	case TypeUDT:
 		return unmarshalUDT(info, data, value)
 	}
+
+	// detect protocol 2 UDT
+	if strings.HasPrefix(info.Custom(), "org.apache.cassandra.db.marshal.UserType") && info.Version() < 3 {
+		return ErrorUDTUnavailable
+	}
+
 	// TODO(tux21b): add the remaining types
 	return fmt.Errorf("can not unmarshal %s into %T", info, value)
 }

udt_test.go

@@ -86,12 +86,13 @@ func TestUDT_Marshaler(t *testing.T) {
 		t.Errorf("expeceted lon to be be %d got %d", expLon, pos.Lon)
 	}
 }
+
 func TestUDT_Reflect(t *testing.T) {
-	// Uses reflection instead of implementing the marshaling type
 	if *flagProto < protoVersion3 {
 		t.Skip("UDT are only available on protocol >= 3")
 	}
 
+	// Uses reflection instead of implementing the marshaling type
 	session := createSession(t)
 	defer session.Close()
 
@@ -137,3 +138,52 @@ func TestUDT_Reflect(t *testing.T) {
 		t.Fatal("exepcted to get %+v got %+v", insertedHorse, retrievedHorse)
 	}
 }
+
+func TestUDT_Proto2error(t *testing.T) {
+	if *flagProto < protoVersion3 {
+		t.Skip("UDT are only available on protocol >= 3")
+	}
+
+	cluster := createCluster()
+	cluster.ProtoVersion = 2
+	cluster.Keyspace = "gocql_test"
+
+	// Uses reflection instead of implementing the marshaling type
+	session, err := cluster.CreateSession()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer session.Close()
+
+	err = createTable(session, `CREATE TYPE fish(
+		name text,
+		owner text);`)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = createTable(session, `CREATE TABLE fish_race(
+		position int,
+		fish frozen<fish>,
+
+		primary key(position)
+	);`)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	type fish struct {
+		Name  string `cql:"name"`
+		Owner string `cql:"owner"`
+	}
+
+	insertedFish := &fish{
+		Name:  "pony",
+		Owner: "jim",
+	}
+
+	err = session.Query("INSERT INTO fish_race(position, fish) VALUES(?, ?)", 1, insertedFish).Exec()
+	if err != ErrorUDTUnavailable {
+		t.Fatalf("expected to get %v got %v", ErrorUDTUnavailable, err)
+	}
+}