Skip to content

Commit 9eb74b2

Browse files
committed
fix: imports
1 parent 4eedba8 commit 9eb74b2

1 file changed

Lines changed: 7 additions & 8 deletions

File tree

pkg/framework/lockr/session.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@ package lockr
22

33
import (
44
"context"
5+
"database/sql"
56
"errors"
67
"fmt"
78
"log/slog"
89
"sync"
910
"sync/atomic"
1011

11-
dbsql "database/sql"
12-
1312
"entgo.io/ent/dialect"
14-
"entgo.io/ent/dialect/sql"
13+
entsql "entgo.io/ent/dialect/sql"
1514

1615
"github.com/openmeterio/openmeter/pkg/framework/pgdriver"
1716
)
@@ -32,7 +31,7 @@ type SessionLockerConfig struct {
3231

3332
type SessionLocker struct {
3433
logger *slog.Logger
35-
conn *dbsql.Conn
34+
conn *sql.Conn
3635

3736
closed atomic.Bool
3837
closer func()
@@ -80,8 +79,8 @@ func (l *SessionLocker) lock(ctx context.Context, key Key, nonblocking bool) (Re
8079
lockFunc = "pg_try_advisory_lock"
8180
}
8281

83-
q, args := sql.Dialect(dialect.Postgres).
84-
SelectExpr(sql.ExprFunc(func(b *sql.Builder) {
82+
q, args := entsql.Dialect(dialect.Postgres).
83+
SelectExpr(entsql.ExprFunc(func(b *entsql.Builder) {
8584
b.WriteString(lockFunc)
8685
b.WriteString("(")
8786
b.Arg(int64(key.Hash64()))
@@ -147,8 +146,8 @@ func (l *SessionLocker) Lock(ctx context.Context, key Key) (Releaser, error) {
147146
}
148147

149148
func (l *SessionLocker) Release(ctx context.Context, key Key) error {
150-
q, args := sql.Dialect(dialect.Postgres).
151-
SelectExpr(sql.ExprFunc(func(b *sql.Builder) {
149+
q, args := entsql.Dialect(dialect.Postgres).
150+
SelectExpr(entsql.ExprFunc(func(b *entsql.Builder) {
152151
b.WriteString("pg_advisory_unlock")
153152
b.WriteString("(")
154153
b.Arg(int64(key.Hash64()))

0 commit comments

Comments
 (0)