Skip to content

feat: to use const variables at all codes #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: to use const variables at all codes #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 37 additions & 27 deletions connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,44 +25,47 @@ type connection struct {

// Begin implements driver.Conn
func (c *connection) Begin() (driver.Tx, error) {
lvl, start, id := LevelDebug, time.Now(), c.logger.opt.uidGenerator.UniqueID()
msg := MessageBegin
lvl, start, id := getDefaultLevelByMessage(msg, nil), time.Now(), c.logger.opt.uidGenerator.UniqueID()
logs := append(c.logData(), c.logger.withUID(c.logger.opt.txIDFieldname, id))
connTx, err := c.Conn.Begin() // nolint // disable static check on deprecated driver method

if err != nil {
lvl = LevelError
}

c.logger.log(context.Background(), lvl, "Begin", start, err, logs...)
c.logger.log(context.Background(), lvl, msg, start, err, logs...)

return c.transaction(connTx, err, id)
}

// Prepare implements driver.Conn
func (c *connection) Prepare(query string) (driver.Stmt, error) {
lvl, start, id := c.logger.opt.preparerLevel, time.Now(), c.logger.opt.uidGenerator.UniqueID()
msg := MessagePrepare
lvl, start, id := getDefaultLevelByMessage(msg, &c.logger.opt.preparerLevel), time.Now(), c.logger.opt.uidGenerator.UniqueID()
logs := append(c.logData(), c.logger.withQuery(query), c.logger.withUID(c.logger.opt.stmtIDFieldname, id))
driverStmt, err := c.Conn.Prepare(query)

if err != nil {
lvl = LevelError
}

c.logger.log(context.Background(), lvl, "Prepare", start, err, logs...)
c.logger.log(context.Background(), lvl, msg, start, err, logs...)

return c.statement(driverStmt, err, id, query)
}

// Prepare implements driver.Conn
// Close implements driver.Conn
func (c *connection) Close() error {
lvl, start := LevelDebug, time.Now()
msg := MessageClose
lvl, start := getDefaultLevelByMessage(msg, nil), time.Now()
err := c.Conn.Close()

if err != nil {
lvl = LevelError
}

c.logger.log(context.Background(), lvl, "Close", start, err, c.logData()...)
c.logger.log(context.Background(), lvl, msg, start, err, c.logData()...)

return err
}
Expand All @@ -74,15 +77,16 @@ func (c *connection) BeginTx(ctx context.Context, opts driver.TxOptions) (driver
return nil, driver.ErrSkip
}

lvl, start, id := LevelDebug, time.Now(), c.logger.opt.uidGenerator.UniqueID()
msg := MessageBeginTx
lvl, start, id := getDefaultLevelByMessage(msg, nil), time.Now(), c.logger.opt.uidGenerator.UniqueID()
logs := append(c.logData(), c.logger.withUID(c.logger.opt.txIDFieldname, id))
connTx, err := drvTx.BeginTx(ctx, opts)

if err != nil {
lvl = LevelError
}

c.logger.log(ctx, lvl, "BeginTx", start, err, logs...)
c.logger.log(ctx, lvl, msg, start, err, logs...)

return c.transaction(connTx, err, id)
}
Expand All @@ -94,16 +98,16 @@ func (c *connection) PrepareContext(ctx context.Context, query string) (driver.S
return nil, driver.ErrSkip
}

lvl, start, id := c.logger.opt.preparerLevel, time.Now(), c.logger.opt.uidGenerator.UniqueID()
msg := MessagePrepareContext
lvl, start, id := getDefaultLevelByMessage(msg, &c.logger.opt.preparerLevel), time.Now(), c.logger.opt.uidGenerator.UniqueID()
logs := append(c.logData(), c.logger.withQuery(query), c.logger.withUID(c.logger.opt.stmtIDFieldname, id))
driverStmt, err := driverPrep.PrepareContext(ctx, query)

if err != nil {
lvl = LevelError
}

c.logger.log(ctx, lvl, "PrepareContext", start, err, logs...)

c.logger.log(ctx, lvl, MessagePrepareContext, start, err, logs...)
return c.statement(driverStmt, err, id, query)
}

Expand All @@ -114,14 +118,15 @@ func (c *connection) Ping(ctx context.Context) error {
return driver.ErrSkip
}

lvl, start := LevelDebug, time.Now()
msg := MessagePing
lvl, start := getDefaultLevelByMessage(msg, nil), time.Now()
err := driverPinger.Ping(ctx)

if err != nil {
lvl = LevelError
}

c.logger.log(ctx, lvl, "Ping", start, err, c.logData()...)
c.logger.log(ctx, lvl, msg, start, err, c.logData()...)

return err
}
Expand All @@ -135,14 +140,15 @@ func (c *connection) Exec(query string, args []driver.Value) (driver.Result, err
}

logs := append(c.logData(), c.logger.withQuery(query), c.logger.withArgs(args))
lvl, start := c.logger.opt.execerLevel, time.Now()
msg := MessageExec
lvl, start := getDefaultLevelByMessage(msg, &c.logger.opt.execerLevel), time.Now()
res, err := driverExecer.Exec(query, args)

if err != nil {
lvl = LevelError
}

c.logger.log(context.Background(), lvl, "Exec", start, err, logs...)
c.logger.log(context.Background(), lvl, msg, start, err, logs...)

return c.result(res, err, query, args)
}
Expand All @@ -156,14 +162,15 @@ func (c *connection) ExecContext(ctx context.Context, query string, args []drive

logArgs := namedValuesToValues(args)
logs := append(c.logData(), c.logger.withQuery(query), c.logger.withArgs(logArgs))
lvl, start := c.logger.opt.execerLevel, time.Now()
msg := MessageExecContext
lvl, start := getDefaultLevelByMessage(msg, &c.logger.opt.execerLevel), time.Now()
res, err := driverExecerContext.ExecContext(ctx, query, args)

if err != nil {
lvl = LevelError
}

c.logger.log(ctx, lvl, "ExecContext", start, err, logs...)
c.logger.log(ctx, lvl, msg, start, err, logs...)

return c.result(res, err, query, logArgs)
}
Expand All @@ -177,15 +184,15 @@ func (c *connection) Query(query string, args []driver.Value) (driver.Rows, erro
}

logs := append(c.logData(), c.logger.withQuery(query), c.logger.withArgs(args))
lvl, start := c.logger.opt.queryerLevel, time.Now()
msg := MessageQuery
lvl, start := getDefaultLevelByMessage(msg, &c.logger.opt.queryerLevel), time.Now()
res, err := driverQueryer.Query(query, args)

if err != nil {
lvl = LevelError
}

c.logger.log(context.Background(), lvl, "Query", start, err, logs...)

c.logger.log(context.Background(), lvl, msg, start, err, logs...)
return c.rows(res, err, query, args)
}

Expand All @@ -198,14 +205,15 @@ func (c *connection) QueryContext(ctx context.Context, query string, args []driv

logArgs := namedValuesToValues(args)
logs := append(c.logData(), c.logger.withQuery(query), c.logger.withArgs(logArgs))
lvl, start := c.logger.opt.queryerLevel, time.Now()
msg := MessageQueryContext
lvl, start := getDefaultLevelByMessage(msg, &c.logger.opt.queryerLevel), time.Now()
res, err := driverQueryerContext.QueryContext(ctx, query, args)

if err != nil {
lvl = LevelError
}

c.logger.log(ctx, lvl, "QueryContext", start, err, logs...)
c.logger.log(ctx, lvl, msg, start, err, logs...)

return c.rows(res, err, query, logArgs)
}
Expand All @@ -217,14 +225,15 @@ func (c *connection) ResetSession(ctx context.Context) error {
return driver.ErrSkip
}

lvl, start := LevelTrace, time.Now()
msg := MessageResetSession
lvl, start := getDefaultLevelByMessage(msg, nil), time.Now()
err := resetter.ResetSession(ctx)

if err != nil {
lvl = LevelError
}

c.logger.log(context.Background(), lvl, "ResetSession", start, err, c.logData()...)
c.logger.log(context.Background(), lvl, msg, start, err, c.logData()...)

return err
}
Expand All @@ -236,14 +245,15 @@ func (c *connection) CheckNamedValue(nm *driver.NamedValue) error {
return driver.ErrSkip
}

lvl, start := LevelTrace, time.Now()
msg := MessageCheckNamedValue
lvl, start := getDefaultLevelByMessage(msg, nil), time.Now()
err := checker.CheckNamedValue(nm)

if err != nil {
lvl = LevelError
}

c.logger.log(context.Background(), lvl, "CheckNamedValue", start, err, c.logData()...)
c.logger.log(context.Background(), lvl, msg, start, err, c.logData()...)

return err
}
Expand Down
Loading