@@ -1956,7 +1956,7 @@ func TestLoggerFieldsSetup(t *testing.T) {
1956
1956
session := handler .sm .session (conn )
1957
1957
logger := session .GetLogger ()
1958
1958
require .NotNil (t , logger , "Session should have a logger" )
1959
-
1959
+
1960
1960
// Verify that the logger has the expected fields
1961
1961
require .Contains (t , logger .Data , sql .ConnectTimeLogKey , "Logger should contain connect time" )
1962
1962
require .Contains (t , logger .Data , sql .ConnectionIdLogField , "Logger should contain connection ID" )
@@ -1975,7 +1975,7 @@ func TestLoggerFieldsSetup(t *testing.T) {
1975
1975
func TestQueryTimeConstantDefined (t * testing.T ) {
1976
1976
// Verify the constant exists and has the expected value
1977
1977
require .Equal (t , "queryTime" , sql .QueryTimeLogKey , "QueryTimeLogKey constant should be defined as 'queryTime'" )
1978
-
1978
+
1979
1979
// Verify it's different from other log keys
1980
1980
require .NotEqual (t , sql .QueryTimeLogKey , sql .ConnectTimeLogKey , "QueryTimeLogKey should be different from ConnectTimeLogKey" )
1981
1981
require .NotEqual (t , sql .QueryTimeLogKey , sql .ConnectionIdLogField , "QueryTimeLogKey should be different from ConnectionIdLogField" )
@@ -2012,7 +2012,7 @@ func TestHandlerDoQueryIntegration(t *testing.T) {
2012
2012
// Verify that the session has a logger with the expected fields
2013
2013
session := handler .sm .session (conn )
2014
2014
require .NotNil (t , session , "Session should exist" )
2015
-
2015
+
2016
2016
logger := session .GetLogger ()
2017
2017
require .NotNil (t , logger , "Session should have a logger" )
2018
2018
@@ -2024,14 +2024,14 @@ func TestHandlerDoQueryIntegration(t *testing.T) {
2024
2024
connectTime , ok := logger .Data [sql .ConnectTimeLogKey ].(time.Time )
2025
2025
require .True (t , ok , "Connect time should be a time.Time" )
2026
2026
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 ()),
2028
2028
"Connect time should be before or equal to current time" )
2029
2029
2030
2030
// Verify connection ID matches
2031
2031
connID , ok := logger .Data [sql .ConnectionIdLogField ].(uint32 )
2032
2032
require .True (t , ok , "Connection ID should be a uint32" )
2033
2033
require .Equal (t , conn .ConnectionID , connID , "Connection ID should match the connection" )
2034
-
2034
+
2035
2035
// The test verifies that our code changes compile and execute without error
2036
2036
// The actual query time field will be set temporarily during query execution in doQuery
2037
2037
// but won't persist in the session logger (which is the expected behavior)
@@ -2042,30 +2042,30 @@ func TestQueryTimeLoggerBehavior(t *testing.T) {
2042
2042
// Test demonstrates that the QueryTimeLogKey constant is available and can be used
2043
2043
// for setting up logger fields with time.Now() calls during query execution
2044
2044
require .NotEmpty (t , sql .QueryTimeLogKey , "QueryTimeLogKey should not be empty" )
2045
-
2045
+
2046
2046
// Create a time value like what would be used in query logging
2047
2047
queryTime := time .Now ()
2048
-
2048
+
2049
2049
// Simulate what happens during query execution: create a logger with query time field
2050
2050
baseLogger := & logrus.Entry {
2051
2051
Data : make (logrus.Fields ),
2052
2052
}
2053
2053
baseLogger .Data [sql .ConnectTimeLogKey ] = time .Now ().Add (- 1 * time .Minute ) // connection established 1 minute ago
2054
2054
baseLogger .Data [sql .ConnectionIdLogField ] = uint32 (123 )
2055
-
2055
+
2056
2056
// Add query time field using time.Now() (this is what our modified handler does)
2057
2057
loggerWithQueryTime := baseLogger .WithField (sql .QueryTimeLogKey , queryTime )
2058
-
2058
+
2059
2059
// Verify the query time field was added
2060
2060
require .Contains (t , loggerWithQueryTime .Data , sql .QueryTimeLogKey , "Logger should contain query time" )
2061
2061
require .Contains (t , loggerWithQueryTime .Data , sql .ConnectTimeLogKey , "Logger should still contain connect time" )
2062
2062
require .Contains (t , loggerWithQueryTime .Data , sql .ConnectionIdLogField , "Logger should still contain connection ID" )
2063
-
2063
+
2064
2064
// Verify the query time value
2065
2065
actualQueryTime , ok := loggerWithQueryTime .Data [sql .QueryTimeLogKey ].(time.Time )
2066
2066
require .True (t , ok , "Query time should be a time.Time" )
2067
2067
require .Equal (t , queryTime , actualQueryTime , "Query time should match the set value" )
2068
-
2068
+
2069
2069
// Verify that query time and connect time are different (as expected)
2070
2070
connectTime := loggerWithQueryTime .Data [sql .ConnectTimeLogKey ].(time.Time )
2071
2071
require .True (t , queryTime .After (connectTime ), "Query time should be after connect time" )
0 commit comments