Remove deprecated top level functions Get and Select

Signed-off-by: Michał Matczuk <michal@scylladb.com>

iterx.go

@@ -17,20 +17,6 @@ import (
 // missing fields for all queries. See Unsafe below for more information.
 var DefaultUnsafe bool
 
-// Get is a convenience function for creating iterator and calling Get.
-//
-// DEPRECATED use Queryx.Get or Queryx.GetRelease.
-func Get(dest interface{}, q *gocql.Query) error {
-	return Iter(q).Get(dest)
-}
-
-// Select is a convenience function for creating iterator and calling Select.
-//
-// DEPRECATED use Queryx.Select or Queryx.SelectRelease.
-func Select(dest interface{}, q *gocql.Query) error {
-	return Iter(q).Select(dest)
-}
-
 // Iterx is a wrapper around gocql.Iter which adds struct scanning capabilities.
 type Iterx struct {
 	*gocql.Iter

iterx_test.go

@@ -125,7 +125,7 @@ func TestStruct(t *testing.T) {
 
 	t.Run("get", func(t *testing.T) {
 		var v StructTable
-		if err := gocqlx.Get(&v, session.Query(`SELECT * FROM struct_table`)); err != nil {
+		if err := gocqlx.Query(session.Query(`SELECT * FROM struct_table`), nil).Get(&v); err != nil {
 			t.Fatal("get failed", err)
 		}
 
@@ -136,7 +136,7 @@ func TestStruct(t *testing.T) {
 
 	t.Run("select", func(t *testing.T) {
 		var v []StructTable
-		if err := gocqlx.Select(&v, session.Query(`SELECT * FROM struct_table`)); err != nil {
+		if err := gocqlx.Query(session.Query(`SELECT * FROM struct_table`), nil).Select(&v); err != nil {
 			t.Fatal("select failed", err)
 		}
 
@@ -151,7 +151,7 @@ func TestStruct(t *testing.T) {
 
 	t.Run("select ptr", func(t *testing.T) {
 		var v []*StructTable
-		if err := gocqlx.Select(&v, session.Query(`SELECT * FROM struct_table`)); err != nil {
+		if err := gocqlx.Query(session.Query(`SELECT * FROM struct_table`), nil).Select(&v); err != nil {
 			t.Fatal("select failed", err)
 		}
 
@@ -179,7 +179,7 @@ func TestScannable(t *testing.T) {
 
 	t.Run("get", func(t *testing.T) {
 		var v FullName
-		if err := gocqlx.Get(&v, session.Query(`SELECT testfullname FROM scannable_table`)); err != nil {
+		if err := gocqlx.Query(session.Query(`SELECT testfullname FROM scannable_table`), nil).Get(&v); err != nil {
 			t.Fatal("get failed", err)
 		}
 
@@ -190,8 +190,8 @@ func TestScannable(t *testing.T) {
 
 	t.Run("select", func(t *testing.T) {
 		var v []FullName
-		if err := gocqlx.Select(&v, session.Query(`SELECT testfullname FROM scannable_table`)); err != nil {
+		if err := gocqlx.Query(session.Query(`SELECT testfullname FROM scannable_table`), nil).Select(&v); err != nil {
-			t.Fatal("get failed", err)
+			t.Fatal("select failed", err)
 		}
 
 		if len(v) != 1 {
@@ -205,8 +205,8 @@ func TestScannable(t *testing.T) {
 
 	t.Run("select ptr", func(t *testing.T) {
 		var v []*FullName
-		if err := gocqlx.Select(&v, session.Query(`SELECT testfullname FROM scannable_table`)); err != nil {
+		if err := gocqlx.Query(session.Query(`SELECT testfullname FROM scannable_table`), nil).Select(&v); err != nil {
-			t.Fatal("get failed", err)
+			t.Fatal("select failed", err)
 		}
 
 		if len(v) != 1 {

migrate/migrate.go

@@ -69,17 +69,20 @@ func List(ctx context.Context, session *gocql.Session) ([]*Info, error) {
 		return nil, err
 	}
 
+	q := gocqlx.Query(session.Query(selectInfo).WithContext(ctx), nil)
+
 	var v []*Info
-	err := gocqlx.Select(&v, session.Query(selectInfo).WithContext(ctx))
+	if err := q.SelectRelease(&v); err == gocql.ErrNotFound {
-	if err == gocql.ErrNotFound {
 		return nil, nil
+	} else if err != nil {
+		return v, err
 	}
 
 	sort.Slice(v, func(i, j int) bool {
 		return v[i].Name < v[j].Name
 	})
 
-	return v, err
+	return v, nil
 }
 
 func ensureInfoTable(ctx context.Context, session *gocql.Session) error {