Skip to content

Commit 9a4cda8

Browse files
committed
[ga-format-pr] Run ./format_repo.sh to fix formatting
1 parent 6ef235b commit 9a4cda8

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

server/handler_test.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1956,7 +1956,7 @@ func TestLoggerFieldsSetup(t *testing.T) {
19561956
session := handler.sm.session(conn)
19571957
logger := session.GetLogger()
19581958
require.NotNil(t, logger, "Session should have a logger")
1959-
1959+
19601960
// Verify that the logger has the expected fields
19611961
require.Contains(t, logger.Data, sql.ConnectTimeLogKey, "Logger should contain connect time")
19621962
require.Contains(t, logger.Data, sql.ConnectionIdLogField, "Logger should contain connection ID")
@@ -1975,7 +1975,7 @@ func TestLoggerFieldsSetup(t *testing.T) {
19751975
func TestQueryTimeConstantDefined(t *testing.T) {
19761976
// Verify the constant exists and has the expected value
19771977
require.Equal(t, "queryTime", sql.QueryTimeLogKey, "QueryTimeLogKey constant should be defined as 'queryTime'")
1978-
1978+
19791979
// Verify it's different from other log keys
19801980
require.NotEqual(t, sql.QueryTimeLogKey, sql.ConnectTimeLogKey, "QueryTimeLogKey should be different from ConnectTimeLogKey")
19811981
require.NotEqual(t, sql.QueryTimeLogKey, sql.ConnectionIdLogField, "QueryTimeLogKey should be different from ConnectionIdLogField")
@@ -2012,7 +2012,7 @@ func TestHandlerDoQueryIntegration(t *testing.T) {
20122012
// Verify that the session has a logger with the expected fields
20132013
session := handler.sm.session(conn)
20142014
require.NotNil(t, session, "Session should exist")
2015-
2015+
20162016
logger := session.GetLogger()
20172017
require.NotNil(t, logger, "Session should have a logger")
20182018

@@ -2024,14 +2024,14 @@ func TestHandlerDoQueryIntegration(t *testing.T) {
20242024
connectTime, ok := logger.Data[sql.ConnectTimeLogKey].(time.Time)
20252025
require.True(t, ok, "Connect time should be a time.Time")
20262026
require.False(t, connectTime.IsZero(), "Connect time should not be zero")
2027-
require.True(t, connectTime.Before(time.Now()) || connectTime.Equal(time.Now()),
2027+
require.True(t, connectTime.Before(time.Now()) || connectTime.Equal(time.Now()),
20282028
"Connect time should be before or equal to current time")
20292029

20302030
// Verify connection ID matches
20312031
connID, ok := logger.Data[sql.ConnectionIdLogField].(uint32)
20322032
require.True(t, ok, "Connection ID should be a uint32")
20332033
require.Equal(t, conn.ConnectionID, connID, "Connection ID should match the connection")
2034-
2034+
20352035
// The test verifies that our code changes compile and execute without error
20362036
// The actual query time field will be set temporarily during query execution in doQuery
20372037
// but won't persist in the session logger (which is the expected behavior)
@@ -2042,30 +2042,30 @@ func TestQueryTimeLoggerBehavior(t *testing.T) {
20422042
// Test demonstrates that the QueryTimeLogKey constant is available and can be used
20432043
// for setting up logger fields with time.Now() calls during query execution
20442044
require.NotEmpty(t, sql.QueryTimeLogKey, "QueryTimeLogKey should not be empty")
2045-
2045+
20462046
// Create a time value like what would be used in query logging
20472047
queryTime := time.Now()
2048-
2048+
20492049
// Simulate what happens during query execution: create a logger with query time field
20502050
baseLogger := &logrus.Entry{
20512051
Data: make(logrus.Fields),
20522052
}
20532053
baseLogger.Data[sql.ConnectTimeLogKey] = time.Now().Add(-1 * time.Minute) // connection established 1 minute ago
20542054
baseLogger.Data[sql.ConnectionIdLogField] = uint32(123)
2055-
2055+
20562056
// Add query time field using time.Now() (this is what our modified handler does)
20572057
loggerWithQueryTime := baseLogger.WithField(sql.QueryTimeLogKey, queryTime)
2058-
2058+
20592059
// Verify the query time field was added
20602060
require.Contains(t, loggerWithQueryTime.Data, sql.QueryTimeLogKey, "Logger should contain query time")
20612061
require.Contains(t, loggerWithQueryTime.Data, sql.ConnectTimeLogKey, "Logger should still contain connect time")
20622062
require.Contains(t, loggerWithQueryTime.Data, sql.ConnectionIdLogField, "Logger should still contain connection ID")
2063-
2063+
20642064
// Verify the query time value
20652065
actualQueryTime, ok := loggerWithQueryTime.Data[sql.QueryTimeLogKey].(time.Time)
20662066
require.True(t, ok, "Query time should be a time.Time")
20672067
require.Equal(t, queryTime, actualQueryTime, "Query time should match the set value")
2068-
2068+
20692069
// Verify that query time and connect time are different (as expected)
20702070
connectTime := loggerWithQueryTime.Data[sql.ConnectTimeLogKey].(time.Time)
20712071
require.True(t, queryTime.After(connectTime), "Query time should be after connect time")

0 commit comments

Comments
 (0)