Skip to content

Commit 0118f5b

Browse files
committed
refactor: use constant for Trino driver name and clean up code formatting
1 parent e7f7574 commit 0118f5b

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

database/trino/trino.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ var (
2121
ErrNilConfig = fmt.Errorf("no config")
2222
)
2323

24+
const TrinoDriverName = "trino"
25+
2426
type Config struct {
2527
MigrationsTable string
2628
MigrationsSchema string
@@ -29,7 +31,7 @@ type Config struct {
2931
}
3032

3133
func init() {
32-
database.Register("trino", &Trino{})
34+
database.Register(TrinoDriverName, &Trino{})
3335
}
3436

3537
func WithInstance(conn *sql.DB, config *Config) (database.Driver, error) {
@@ -67,9 +69,9 @@ func (t *Trino) Open(dsn string) (database.Driver, error) {
6769

6870
// Filter custom parameters and handle scheme conversion
6971
q := migrate.FilterCustomQuery(purl)
70-
72+
7173
// Convert trino:// scheme to http:// or https:// based on ssl parameter
72-
if q.Scheme == "trino" {
74+
if q.Scheme == TrinoDriverName {
7375
// Check ssl parameter (default is true)
7476
ssl := purl.Query().Get("ssl")
7577
if ssl == "" || ssl == "true" {
@@ -86,7 +88,7 @@ func (t *Trino) Open(dsn string) (database.Driver, error) {
8688
}
8789
q.RawQuery = query.Encode()
8890

89-
conn, err := sql.Open("trino", q.String())
91+
conn, err := sql.Open(TrinoDriverName, q.String())
9092
if err != nil {
9193
return nil, err
9294
}

database/trino/trino_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,15 @@ func isReady(ctx context.Context, c dktest.ContainerInfo) bool {
9797
time.Sleep(2 * time.Second)
9898
continue
9999
}
100-
100+
101101
// Test a simple query to ensure Trino is fully ready
102102
var result int
103103
if err = db.QueryRowContext(readyCtx, "SELECT 1").Scan(&result); err != nil {
104104
log.Printf("trino query test attempt %d error: %v", i+1, err)
105105
time.Sleep(2 * time.Second)
106106
continue
107107
}
108-
108+
109109
log.Printf("trino ready after %d attempts", i+1)
110110
// Give Trino a moment to stabilize before tests start
111111
time.Sleep(3 * time.Second)
@@ -333,7 +333,7 @@ func TestTrinoSchemeConversion(t *testing.T) {
333333
if err != nil {
334334
t.Fatal(err)
335335
}
336-
336+
337337
// Apply the same logic as in the Open function
338338
q := migrate.FilterCustomQuery(purl)
339339
if q.Scheme == "trino" {
@@ -344,7 +344,7 @@ func TestTrinoSchemeConversion(t *testing.T) {
344344
q.Scheme = "http"
345345
}
346346
}
347-
347+
348348
if q.Scheme != tc.expectedScheme {
349349
t.Errorf("Expected scheme %s, got %s for URL %s", tc.expectedScheme, q.Scheme, tc.inputURL)
350350
}
@@ -367,7 +367,7 @@ func TestTrinoLockConcurrency(t *testing.T) {
367367
if err != nil {
368368
t.Fatal(err)
369369
}
370-
defer d.Close()
370+
defer func() { _ = d.Close() }()
371371

372372
// Test basic locking functionality
373373
if err := d.Lock(); err != nil {

0 commit comments

Comments
 (0)