Merge pull request #130 from microsoft/shueybubbles/128

fix SQL_VARIANT type handling

Author: stuartpa

pkg/sqlcmd/format.go

@@ -402,8 +402,14 @@ func calcColumnDetails(cols []*sql.ColumnType, fixed int64, variable int64) ([]c
 			} else {
 				columnDetails[i].displayWidth = variable
 			}
+		case "SQL_VARIANT":
+			if fixed > 0 {
+				columnDetails[i].displayWidth = min64(fixed, 8000)
+			} else {
+				columnDetails[i].displayWidth = 8000
+			}
 		// Fixed length types
-		case "CHAR", "NCHAR", "VARIANT":
+		case "CHAR", "NCHAR":
 			if fixed > 0 {
 				length = min64(fixed, length)
 			}

pkg/sqlcmd/sqlcmd_test.go

@@ -452,6 +452,16 @@ func TestDateTimeFormats(t *testing.T) {
 	}
 }
 
+func TestQueryServerPropertyReturnsColumnName(t *testing.T) {
+	s, buf := setupSqlCmdWithMemoryOutput(t)
+	s.vars.Set(SQLCMDMAXVARTYPEWIDTH, "100")
+	defer buf.Close()
+	err := runSqlCmd(t, s, []string{"select SERVERPROPERTY('EngineEdition') AS DatabaseEngineEdition", "GO"})
+	if assert.NoError(t, err, "select should succeed") {
+		assert.Contains(t, buf.buf.String(), "DatabaseEngineEdition", "Column name missing from output")
+	}
+}
+
 // runSqlCmd uses lines as input for sqlcmd instead of relying on file or console input
 func runSqlCmd(t testing.TB, s *Sqlcmd, lines []string) error {
 	t.Helper()