From ef4e632a9d73bcfe6f3e103ee28d4f41fd02986e Mon Sep 17 00:00:00 2001
From: Qishuai Liu <lqs@lqs.me>
Date: Tue, 23 Jul 2024 23:42:12 +0900
Subject: [PATCH] change duration to time.Duration in LoggerFunc

---
 database.go      | 22 ++++++++++------------
 database_test.go |  3 ++-
 transaction.go   | 12 ++++++------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/database.go b/database.go
index 31a3b97..4477c1b 100644
--- a/database.go
+++ b/database.go
@@ -81,7 +81,7 @@ type database struct {
 	interceptor      InterceptorFunc
 }
 
-type LoggerFunc func(sql string, durationNano int64, isTx bool, retry bool)
+type LoggerFunc func(sql string, duration time.Duration, isTx bool, retry bool)
 
 func (d *database) SetLogger(loggerFunc LoggerFunc) {
 	d.logger = loggerFunc
@@ -89,7 +89,7 @@ func (d *database) SetLogger(loggerFunc LoggerFunc) {
 
 // DefaultLogger is sqlingo default logger,
 // which print log to stderr and regard executing time gt 100ms as slow sql.
-func DefaultLogger(sql string, durationNano int64, isTx bool, retry bool) {
+func DefaultLogger(sql string, duration time.Duration, isTx bool, retry bool) {
 	// for finding code position, try once is enough
 	once.Do(func() {
 		// $GOPATH/pkg/mod/github.com/lqs/sqlingo@vX.X.X/database.go
@@ -111,8 +111,6 @@ func DefaultLogger(sql string, durationNano int64, isTx bool, retry bool) {
 		}
 	}
 
-	// convert durationNano (int64) to time.Duration
-	du := time.Duration(durationNano)
 	// todo shouldn't append ';' here
 	if !strings.HasSuffix(sql, ";") {
 		sql += ";"
@@ -121,7 +119,7 @@ func DefaultLogger(sql string, durationNano int64, isTx bool, retry bool) {
 	sb := strings.Builder{}
 	sb.Grow(32)
 	sb.WriteString("|")
-	sb.WriteString(du.String())
+	sb.WriteString(duration.String())
 	if isTx {
 		sb.WriteString("|transaction") // todo using something traceable
 	}
@@ -141,7 +139,7 @@ func DefaultLogger(sql string, durationNano int64, isTx bool, retry bool) {
 
 	// print to stderr
 	fmt.Fprintln(os.Stderr, blue+line1+reset)
-	if du < 100*time.Millisecond {
+	if duration < 100*time.Millisecond {
 		fmt.Fprintf(os.Stderr, "%s%s%s\n", green, sql, reset)
 	} else {
 		fmt.Fprintf(os.Stderr, "%s%s%s\n", red, sql, reset)
@@ -212,11 +210,11 @@ func (d database) queryContextOnce(ctx context.Context, sqlString string, retry
 	if ctx == nil {
 		ctx = context.Background()
 	}
-	startTime := time.Now().UnixNano()
+	startTime := time.Now()
 	defer func() {
-		endTime := time.Now().UnixNano()
+		endTime := time.Now()
 		if d.logger != nil {
-			d.logger(sqlString, endTime-startTime, false, retry)
+			d.logger(sqlString, endTime.Sub(startTime), false, retry)
 		}
 	}()
 
@@ -250,11 +248,11 @@ func (d database) ExecuteContext(ctx context.Context, sqlString string) (sql.Res
 		ctx = context.Background()
 	}
 	sqlStringWithCallerInfo := getCallerInfo(d, false) + sqlString
-	startTime := time.Now().UnixNano()
+	startTime := time.Now()
 	defer func() {
-		endTime := time.Now().UnixNano()
+		endTime := time.Now()
 		if d.logger != nil {
-			d.logger(sqlStringWithCallerInfo, endTime-startTime, false, false)
+			d.logger(sqlStringWithCallerInfo, endTime.Sub(startTime), false, false)
 		}
 	}()
 
diff --git a/database_test.go b/database_test.go
index 0fa496f..30d6a71 100644
--- a/database_test.go
+++ b/database_test.go
@@ -6,6 +6,7 @@ import (
 	"database/sql/driver"
 	"errors"
 	"testing"
+	"time"
 )
 
 func (m *mockConn) Prepare(query string) (driver.Stmt, error) {
@@ -72,7 +73,7 @@ func TestDatabase(t *testing.T) {
 		interceptorExecutedCount++
 		return invoker(ctx, sql)
 	})
-	db.SetLogger(func(sql string, durationNano int64, _, _ bool) {
+	db.SetLogger(func(sql string, _ time.Duration, _, _ bool) {
 		if sql != "SELECT 1" {
 			t.Error(sql)
 		}
diff --git a/transaction.go b/transaction.go
index 8b9ef15..5094c98 100644
--- a/transaction.go
+++ b/transaction.go
@@ -129,11 +129,11 @@ func (t transaction) queryContextOnce(ctx context.Context, sqlStringWithCallerIn
 	if ctx == nil {
 		ctx = context.Background()
 	}
-	startTime := time.Now().UnixNano()
+	startTime := time.Now()
 	defer func() {
-		endTime := time.Now().UnixNano()
+		endTime := time.Now()
 		if t.logger != nil {
-			t.logger(sqlStringWithCallerInfo, endTime-startTime, true, false)
+			t.logger(sqlStringWithCallerInfo, endTime.Sub(startTime), true, false)
 		}
 	}()
 
@@ -165,11 +165,11 @@ func (t transaction) ExecuteContext(ctx context.Context, sqlString string) (sql.
 		ctx = context.Background()
 	}
 	sqlStringWithCallerInfo := getTxCallerInfo(t, false) + sqlString
-	startTime := time.Now().UnixNano()
+	startTime := time.Now()
 	defer func() {
-		endTime := time.Now().UnixNano()
+		endTime := time.Now()
 		if t.logger != nil {
-			t.logger(sqlStringWithCallerInfo, endTime-startTime, true, false)
+			t.logger(sqlStringWithCallerInfo, endTime.Sub(startTime), true, false)
 		}
 	}()