Merge remote-tracking branch 'origin/master'

Author: AsafMah

azkustodata/kql/query_parameters.go

@@ -4,6 +4,7 @@ import (
 	"github.com/Azure/azure-kusto-go/azkustodata/value"
 	"github.com/google/uuid"
 	"github.com/shopspring/decimal"
+	"sort"
 	"strings"
 	"time"
 )
@@ -84,15 +85,19 @@ func (q *Parameters) ToDeclarationString() string {
 
 	build.WriteString(declare)
 
-	comma := len(q.parameters)
-	for key, paramVals := range q.parameters {
+	keys := make([]string, 0, len(q.parameters))
+	for k := range q.parameters {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+
+	for i, key := range keys {
 		build.WriteString(key)
 		build.WriteString(":")
-		build.WriteString(string(paramVals.GetType()))
-		if comma > 1 {
+		build.WriteString(string(q.parameters[key].GetType()))
+		if i < len(keys)-1 {
 			build.WriteString(", ")
 		}
-		comma--
 	}
 	build.WriteString(closeStmt)
 	return build.String()

azkustodata/kql/query_parameters_test.go

@@ -5,7 +5,6 @@ import (
 	"github.com/google/uuid"
 	"github.com/shopspring/decimal"
 	"github.com/stretchr/testify/require"
-	"strings"
 	"testing"
 	"time"
 )
@@ -19,24 +18,21 @@ func TestQueryParameters(t *testing.T) {
 		name       string
 		b          *Builder
 		qp         *Parameters
-		dsExpected []string
+		dsExpected string
 		pcExpected map[string]string
 	}{
 		{
 			"Test empty",
 			New(""),
 			NewParameters(),
-			[]string{"\n"},
+			"\n",
 			map[string]string{}},
 		{
 			"Test single add",
 			New(""),
 			NewParameters().
 				AddString("foo", "bar"),
-			[]string{"declare",
-				"query_parameters(",
-				"foo:string",
-				");\n"},
+			"declare query_parameters(foo:string);\n",
 			map[string]string{"foo": "\"bar\""}},
 		{
 			"Test standard",
@@ -45,12 +41,7 @@ func TestQueryParameters(t *testing.T) {
 				AddString("databaseName", "foo_1").
 				AddString("tableName", "_bar").
 				AddString("txt", "txt_"),
-			[]string{"declare",
-				"query_parameters(",
-				"databaseName:string",
-				"tableName:string",
-				"txt:string",
-				");\ndatabase(databaseName).table(tableName) | where column == txt ;"},
+			"declare query_parameters(databaseName:string, tableName:string, txt:string);\ndatabase(databaseName).table(tableName) | where column == txt ;",
 			map[string]string{
 				"databaseName": "\"foo_1\"",
 				"tableName":    "\"_bar\"",
@@ -71,19 +62,7 @@ func TestQueryParameters(t *testing.T) {
 				AddReal("rl", 0.01).
 				AddLong("lg", 9223372036854775807).
 				AddGUID("guid", guid),
-			[]string{"declare",
-				"query_parameters(",
-				"foo:string",
-				"num:int",
-				"dec:decimal",
-				"dt:datetime",
-				"span:timespan",
-				"obj:dynamic",
-				"b:bool",
-				"rl:real",
-				"lg:long",
-				"guid:guid",
-				");\nwhere vnum == num and vdec == dec and vdate == dt and vspan == span and tostring(vobj) == tostring(obj) and vb == b and vreal == rl and vstr == str and vlong == lg and vguid == guid"},
+			"declare query_parameters(b:bool, dec:decimal, dt:datetime, foo:string, guid:guid, lg:long, num:int, obj:dynamic, rl:real, span:timespan);\nwhere vnum == num and vdec == dec and vdate == dt and vspan == span and tostring(vobj) == tostring(obj) and vb == b and vreal == rl and vstr == str and vlong == lg and vguid == guid",
 			map[string]string{
 				"foo":  "\"bar\"",
 				"num":  "int(1)",
@@ -103,12 +82,7 @@ func TestQueryParameters(t *testing.T) {
 				AddString("databaseName", "f\"\"o").
 				AddString("tableName", "b\a\r").
 				AddString("txt", "f_u_n\u1234c"),
-			[]string{"declare",
-				"query_parameters(",
-				"databaseName:string",
-				"tableName:string",
-				"txt:string",
-				");\ndatabase(databaseName).table(tableName) | where column == txt ;"},
+			"declare query_parameters(databaseName:string, tableName:string, txt:string);\ndatabase(databaseName).table(tableName) | where column == txt ;",
 			map[string]string{
 				"databaseName": `"f\"\"o"`,
 				"tableName":    `"b\a\r"`,
@@ -120,9 +94,7 @@ func TestQueryParameters(t *testing.T) {
 			q := test.b.String()
 			declarationString := test.qp.ToDeclarationString()
 			actual := fmt.Sprintf("%s\n%s", declarationString, q)
-			for _, sub := range test.dsExpected {
-				require.True(t, strings.Contains(actual, sub))
-			}
+			require.Equal(t, test.dsExpected, actual)
 
 			params := test.qp.ToParameterCollection()
 			require.Equal(t, test.pcExpected, params)