From 39bc4eca655d0180b18378c175d4a9a77fe1602f Mon Sep 17 00:00:00 2001
From: Takeshi Nakata <takeshi.nakata@mixi.co.jp>
Date: Wed, 21 Jul 2021 16:16:47 +0900
Subject: [PATCH] feat(spanner/spansql): fix unstable SelectFromTable SQL
 (#4473)

https://github.com/googleapis/google-cloud-go/pull/4457 made unstable SQL string, and fail test sometimes like this.
Because map range result is unstable.
This PR makes the SQL output stable by sorting the Hints keys.
---
 spanner/spansql/sql.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spanner/spansql/sql.go b/spanner/spansql/sql.go
index 80289d864fa..e50eca5fb4e 100644
--- a/spanner/spansql/sql.go
+++ b/spanner/spansql/sql.go
@@ -25,6 +25,7 @@ package spansql
 
 import (
 	"fmt"
+	"sort"
 	"strconv"
 	"strings"
 	"time"
@@ -373,6 +374,7 @@ func (sft SelectFromTable) SQL() string {
 			kvs[i] = fmt.Sprintf("%s=%s", k, v)
 			i++
 		}
+		sort.Strings(kvs)
 		str += strings.Join(kvs, ",")
 		str += "}"
 	}