From 448178b2642da2233c17414f442bd34383bf23f3 Mon Sep 17 00:00:00 2001
From: Zach Musgrave <zach@dolthub.com>
Date: Thu, 16 Oct 2025 16:54:47 -0700
Subject: [PATCH 1/2] Failing tests for nullability in result schemas

---
 enginetest/evaluation.go      |  2 ++
 enginetest/queries/queries.go | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/enginetest/evaluation.go b/enginetest/evaluation.go
index f1ceaed6cf..ac15a52072 100644
--- a/enginetest/evaluation.go
+++ b/enginetest/evaluation.go
@@ -868,6 +868,7 @@ func checkResultsDefault(t *testing.T, ctx *sql.Context, expected []sql.Row, exp
 type resultSchemaCol struct {
 	Name string
 	Type querypb.Type
+	Nullable bool
 }
 
 func simplifyResultSchema(s sql.Schema) []resultSchemaCol {
@@ -876,6 +877,7 @@ func simplifyResultSchema(s sql.Schema) []resultSchemaCol {
 		fields[i] = resultSchemaCol{
 			Name: c.Name,
 			Type: c.Type.Type(),
+			Nullable: c.Nullable,
 		}
 	}
 	return fields
diff --git a/enginetest/queries/queries.go b/enginetest/queries/queries.go
index 186d7ad058..f477f09192 100644
--- a/enginetest/queries/queries.go
+++ b/enginetest/queries/queries.go
@@ -1072,6 +1072,17 @@ var QueryTests = []QueryTest{
 		Query:    "select sum(1) from emptytable",
 		Expected: []sql.Row{{nil}},
 	},
+	{
+		Query:    "select sum(1) as s from emptytable",
+		Expected: []sql.Row{{nil}},
+		ExpectedColumns: sql.Schema{
+			{
+				Name: "s",
+				Type: types.Float64,
+				Nullable: true,
+			},
+		},
+	},
 	{
 		Query:    "select * from (select count(*) from xy) dt",
 		Expected: []sql.Row{{4}},

From 740447000ec87d63b75b7a5c024a539ee5333bbc Mon Sep 17 00:00:00 2001
From: zachmu <zachmu@users.noreply.github.com>
Date: Thu, 16 Oct 2025 23:57:11 +0000
Subject: [PATCH 2/2] [ga-format-pr] Run ./format_repo.sh to fix formatting

---
 enginetest/evaluation.go      | 8 ++++----
 enginetest/queries/queries.go | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/enginetest/evaluation.go b/enginetest/evaluation.go
index ac15a52072..96bb0f109e 100644
--- a/enginetest/evaluation.go
+++ b/enginetest/evaluation.go
@@ -866,8 +866,8 @@ func checkResultsDefault(t *testing.T, ctx *sql.Context, expected []sql.Row, exp
 }
 
 type resultSchemaCol struct {
-	Name string
-	Type querypb.Type
+	Name     string
+	Type     querypb.Type
 	Nullable bool
 }
 
@@ -875,8 +875,8 @@ func simplifyResultSchema(s sql.Schema) []resultSchemaCol {
 	fields := make([]resultSchemaCol, len(s))
 	for i, c := range s {
 		fields[i] = resultSchemaCol{
-			Name: c.Name,
-			Type: c.Type.Type(),
+			Name:     c.Name,
+			Type:     c.Type.Type(),
 			Nullable: c.Nullable,
 		}
 	}
diff --git a/enginetest/queries/queries.go b/enginetest/queries/queries.go
index f477f09192..6b1dcfb4dc 100644
--- a/enginetest/queries/queries.go
+++ b/enginetest/queries/queries.go
@@ -1077,8 +1077,8 @@ var QueryTests = []QueryTest{
 		Expected: []sql.Row{{nil}},
 		ExpectedColumns: sql.Schema{
 			{
-				Name: "s",
-				Type: types.Float64,
+				Name:     "s",
+				Type:     types.Float64,
 				Nullable: true,
 			},
 		},