added expected time values

Author: angelamayxie

enginetest/enginetests.go

@@ -6148,6 +6148,9 @@ func TestSQLLogicTests(t *testing.T, harness Harness) {
 }
 
 func TestTimeQueryTests(t *testing.T, harness Harness) {
+	// "America/Phoenix" is a non-UTC time zone that does not observe daylight savings time
+	phoenixTimeZone, _ := time.LoadLocation("America/Phoenix")
+	mockNow := time.Date(2025, time.July, 23, 9, 43, 0, 0, phoenixTimeZone)
 	for _, script := range queries.TimeQueryTests {
 		if sh, ok := harness.(SkippingHarness); ok {
 			if sh.SkipQueryTest(script.Name) {
@@ -6157,7 +6160,10 @@ func TestTimeQueryTests(t *testing.T, harness Harness) {
 				continue
 			}
 		}
-		TestScript(t, harness, script)
+		sql.RunWithNowFunc(func() time.Time { return mockNow }, func() error {
+			TestScript(t, harness, script)
+			return nil
+		})
 	}
 }
 

enginetest/queries/time_queries.go

@@ -3,6 +3,7 @@ package queries
 import (
 	"github.com/dolthub/go-mysql-server/sql"
 	"github.com/dolthub/go-mysql-server/sql/types"
+	"time"
 )
 
 var TimeQueryTests = []ScriptTest{
@@ -18,24 +19,24 @@ var TimeQueryTests = []ScriptTest{
 			},
 			{
 				Query:    "select now()",
-				Expected: []sql.Row{{""}}, // july 23, 2025 16:43
+				Expected: []sql.Row{{time.Date(2025, time.July, 23, 16, 43, 0, 0, time.UTC)}},
 			},
 			{
 				Query:    "set time_zone='-5:00'",
 				Expected: []sql.Row{{types.NewOkResult(0)}},
 			},
 			{
 				Query:    "select now()",
-				Expected: []sql.Row{{""}}, // july 23, 2025 11:43
+				Expected: []sql.Row{{time.Date(2025, time.July, 23, 11, 43, 0, 0, time.UTC)}},
 			},
 			{
-				// doesn't observe daylight savings time so time zone does not change
+				// doesn't observe daylight savings time
 				Query:    "set time_zone='Pacific/Honolulu'",
 				Expected: []sql.Row{{types.NewOkResult(0)}},
 			},
 			{
 				Query:    "select now()",
-				Expected: []sql.Row{{""}}, // july 23, 2025 6:43am
+				Expected: []sql.Row{{time.Date(2025, time.July, 23, 6, 43, 0, 0, time.UTC)}},
 			},
 			{
 				// https://github.com/dolthub/dolt/issues/9559

sql/time.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package time contains low-level utility functions for working with time.Time values and timezones.
+// Contains low-level utility functions for working with time.Time values and timezones.
 package sql
 
 import (
@@ -29,6 +29,8 @@ var offsetRegex = regexp.MustCompile(`(?m)^([+\-])(\d{1,2}):(\d{2})$`)
 // ConvertTimeZone converts |datetime| from one timezone to another. |fromLocation| and |toLocation| can be either
 // the name of a timezone (e.g. "UTC") or a MySQL-formatted timezone offset (e.g. "+01:00"). If the time was converted
 // successfully, then the second return value will be true, otherwise the time was not able to be converted.
+// TODO: This function relies on ConvertTimeToLocation functioning incorrectly to get the correct result. The resulting
+// time is still the same location as the original time, just with time values shifted.
 func ConvertTimeZone(datetime time.Time, fromLocation string, toLocation string) (time.Time, bool) {
 	if fromLocation == toLocation {
 		return datetime, true
@@ -97,6 +99,8 @@ func SecondsToMySQLOffset(offset int) string {
 // ConvertTimeToLocation converts |datetime| to the given |location|. |location| can be either the name of a timezone
 // (e.g. "UTC") or a MySQL-formatted timezone offset (e.g. "+01:00"). If the time was converted successfully, then
 // the converted time is returned, otherwise an error is returned.
+// TODO: this function does not work as expected. it takes the current time and converts it to what UTC would be if the
+// datetime is in the given location. The converted time also assumes UTC as its location.
 func ConvertTimeToLocation(datetime time.Time, location string) (time.Time, error) {
 	// Try to load the timezone location string first
 	loc, err := time.LoadLocation(location)