From 710f921b79c2912a5ec65a49565effecce38dbcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Matczuk?= <michal@scylladb.com>
Date: Fri, 17 Jan 2020 14:41:56 +0100
Subject: [PATCH] Remove deprecated top level functions Get and Select
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Matczuk <michal@scylladb.com>
---
 iterx.go           | 14 --------------
 iterx_test.go      | 16 ++++++++--------
 migrate/migrate.go |  9 ++++++---
 3 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/iterx.go b/iterx.go
index b6bbc18..0155c41 100644
--- a/iterx.go
+++ b/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
diff --git a/iterx_test.go b/iterx_test.go
index 64a7608..e2259db 100644
--- a/iterx_test.go
+++ b/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 {
-			t.Fatal("get failed", err)
+		if err := gocqlx.Query(session.Query(`SELECT testfullname FROM scannable_table`), nil).Select(&v); err != nil {
+			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 {
-			t.Fatal("get failed", err)
+		if err := gocqlx.Query(session.Query(`SELECT testfullname FROM scannable_table`), nil).Select(&v); err != nil {
+			t.Fatal("select failed", err)
 		}
 
 		if len(v) != 1 {
diff --git a/migrate/migrate.go b/migrate/migrate.go
index ef581f1..3e566b8 100644
--- a/migrate/migrate.go
+++ b/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 == gocql.ErrNotFound {
+	if err := q.SelectRelease(&v); 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 {