Cluster Discovery store sqlx migration (#18605)

Automatic Merge

store/sqlstore/cluster_discovery_store.go

@@ -35,7 +35,13 @@ func (s sqlClusterDiscoveryStore) Save(ClusterDiscovery *model.ClusterDiscovery)
 		return err
 	}
 
-	if err := s.GetMaster().Insert(ClusterDiscovery); err != nil {
+	if _, err := s.GetMasterX().NamedExec(`
+		INSERT INTO 
+			ClusterDiscovery
+			(Id, Type, ClusterName, Hostname, GossipPort, Port, CreateAt, LastPingAt)
+		VALUES
+			(:Id, :Type, :ClusterName, :Hostname, :GossipPort, :Port, :CreateAt, :LastPingAt)
+	`, ClusterDiscovery); err != nil {
 		return errors.Wrap(err, "failed to save ClusterDiscovery")
 	}
 	return nil
@@ -53,10 +59,16 @@ func (s sqlClusterDiscoveryStore) Delete(ClusterDiscovery *model.ClusterDiscover
 		return false, errors.Wrap(err, "cluster_discovery_tosql")
 	}
 
-	count, err := s.GetMaster().SelectInt(queryString, args...)
+	res, err := s.GetMasterX().Exec(queryString, args...)
 	if err != nil {
 		return false, errors.Wrap(err, "failed to delete ClusterDiscovery")
 	}
+
+	count, err := res.RowsAffected()
+	if err != nil {
+		return false, errors.Wrap(err, "failed to count rows affected")
+	}
+
 	if count == 0 {
 		return false, nil
 	}
@@ -76,8 +88,8 @@ func (s sqlClusterDiscoveryStore) Exists(ClusterDiscovery *model.ClusterDiscover
 		return false, errors.Wrap(err, "cluster_discovery_tosql")
 	}
 
-	count, err := s.GetMaster().SelectInt(queryString, args...)
-	if err != nil {
+	var count int
+	if err := s.GetMasterX().Get(&count, queryString, args...); err != nil {
 		return false, errors.Wrap(err, "failed to count ClusterDiscovery")
 	}
 	if count == 0 {
@@ -99,9 +111,9 @@ func (s sqlClusterDiscoveryStore) GetAll(ClusterDiscoveryType, clusterName strin
 		return nil, errors.Wrap(err, "cluster_discovery_tosql")
 	}
 
-	var list []*model.ClusterDiscovery
-	if _, err := s.GetMaster().Select(&list, queryString, args...); err != nil {
-		return nil, errors.Wrapf(err, "failed to find ClusterDiscovery")
+	list := []*model.ClusterDiscovery{}
+	if err := s.GetMasterX().Select(&list, queryString, args...); err != nil {
+		return nil, errors.Wrap(err, "failed to find ClusterDiscovery")
 	}
 	return list, nil
 }
@@ -119,7 +131,7 @@ func (s sqlClusterDiscoveryStore) SetLastPingAt(ClusterDiscovery *model.ClusterD
 		return errors.Wrap(err, "cluster_discovery_tosql")
 	}
 
-	if _, err := s.GetMaster().Exec(queryString, args...); err != nil {
+	if _, err := s.GetMasterX().Exec(queryString, args...); err != nil {
 		return errors.Wrap(err, "failed to update ClusterDiscovery")
 	}
 	return nil
@@ -135,7 +147,7 @@ func (s sqlClusterDiscoveryStore) Cleanup() error {
 		return errors.Wrap(err, "cluster_discovery_tosql")
 	}
 
-	if _, err := s.GetMaster().Exec(queryString, args...); err != nil {
+	if _, err := s.GetMasterX().Exec(queryString, args...); err != nil {
 		return errors.Wrap(err, "failed to delete ClusterDiscoveries")
 	}
 	return nil