Skip to content

Commit 7e78cdd

Browse files
committed
refactor: rename internals to internal
1 parent 77ae8db commit 7e78cdd

20 files changed

Lines changed: 37 additions & 43 deletions
Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -18,82 +18,82 @@ type dbAndUserTestCase struct {
1818

1919
func TestResolveDBAndUser(t *testing.T) {
2020
testcases := []struct {
21-
name string
22-
input dbAndUserTestCase
23-
} {
21+
name string
22+
input dbAndUserTestCase
23+
}{
2424
{
2525
name: "Both flags provided, args ignored",
2626
input: dbAndUserTestCase{
27-
dbnameOpt: "flagDB",
28-
userOpt: "flagUser",
29-
argDB: "argDB",
30-
argUser: "argUser",
27+
dbnameOpt: "flagDB",
28+
userOpt: "flagUser",
29+
argDB: "argDB",
30+
argUser: "argUser",
3131
expectedDB: "flagDB",
3232
expectedUser: "flagUser",
3333
},
3434
},
3535
{
3636
name: "Only dbname flag provided",
3737
input: dbAndUserTestCase{
38-
dbnameOpt: "flagDB",
39-
userOpt: "",
40-
argDB: "argDB",
41-
argUser: "argUser",
38+
dbnameOpt: "flagDB",
39+
userOpt: "",
40+
argDB: "argDB",
41+
argUser: "argUser",
4242
expectedDB: "flagDB",
4343
expectedUser: "argUser",
4444
},
4545
},
4646
{
4747
name: "Only username flag provided",
4848
input: dbAndUserTestCase{
49-
dbnameOpt: "",
50-
userOpt: "flagUser",
51-
argDB: "argDB",
52-
argUser: "argUser",
49+
dbnameOpt: "",
50+
userOpt: "flagUser",
51+
argDB: "argDB",
52+
argUser: "argUser",
5353
expectedDB: "argDB",
5454
expectedUser: "flagUser",
5555
},
5656
},
5757
{
5858
name: "No flags provided, args used",
5959
input: dbAndUserTestCase{
60-
dbnameOpt: "",
61-
userOpt: "",
62-
argDB: "argDB",
63-
argUser: "argUser",
60+
dbnameOpt: "",
61+
userOpt: "",
62+
argDB: "argDB",
63+
argUser: "argUser",
6464
expectedDB: "argDB",
6565
expectedUser: "argUser",
6666
},
6767
},
6868
{
6969
name: "No flags or args provided",
7070
input: dbAndUserTestCase{
71-
dbnameOpt: "",
72-
userOpt: "",
73-
argDB: "",
74-
argUser: "",
71+
dbnameOpt: "",
72+
userOpt: "",
73+
argDB: "",
74+
argUser: "",
7575
expectedDB: "",
7676
expectedUser: "",
7777
},
7878
},
7979
{
8080
name: "Only dbname flag and argDB provided",
8181
input: dbAndUserTestCase{
82-
dbnameOpt: "flagDB",
83-
userOpt: "",
84-
argDB: "argDB",
85-
argUser: "",
82+
dbnameOpt: "flagDB",
83+
userOpt: "",
84+
argDB: "argDB",
85+
argUser: "",
8686
expectedDB: "flagDB",
8787
expectedUser: "argDB",
8888
},
8989
},
9090
{
9191
name: "Only username flag and argUser provided",
9292
input: dbAndUserTestCase{
93-
dbnameOpt: "",
94-
userOpt: "flagUser",
95-
argDB: "",
96-
argUser: "argUser",
93+
dbnameOpt: "",
94+
userOpt: "flagUser",
95+
argDB: "",
96+
argUser: "argUser",
9797
expectedDB: "",
9898
expectedUser: "flagUser",
9999
},
@@ -106,5 +106,5 @@ func TestResolveDBAndUser(t *testing.T) {
106106
assert.Equal(t, tc.input.expectedDB, actualDB, "finalDB does not match expected value")
107107
assert.Equal(t, tc.input.expectedUser, actualUser, "finalUser does not match expected value")
108108
})
109-
}
109+
}
110110
}
Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ const (
2525
MaxLenPrompt = 30
2626
)
2727

28-
29-
3028
type Postgres struct {
3129
CurrentBD string
3230
Executor *Executor
@@ -35,7 +33,7 @@ type Postgres struct {
3533
ctx context.Context
3634
Config config.Config
3735

38-
now time.Time
36+
now time.Time
3937
}
4038

4139
func New(neverPasswordPrompt, forcePasswordPrompt bool, ctx context.Context, cfg config.Config) *Postgres {
@@ -45,13 +43,11 @@ func New(neverPasswordPrompt, forcePasswordPrompt bool, ctx context.Context, cfg
4543
ForcePasswordPrompt: forcePasswordPrompt,
4644
ctx: ctx,
4745
Config: cfg,
48-
now: time.Now(),
46+
now: time.Now(),
4947
}
5048
return postgres
5149
}
5250

53-
54-
5551
func (p *Postgres) Connect(host, user, password, database, dsn string, port uint16) error {
5652

5753
if user == "" {
@@ -132,7 +128,6 @@ func (p *Postgres) GetConnectionInfo() {
132128
)
133129
}
134130

135-
136131
func (p *Postgres) ChangeDatabase(dbName string) error {
137132
if !p.IsConnected() {
138133
return fmt.Errorf("not connected to any database")
@@ -277,8 +272,8 @@ func (p *Postgres) getPrompt() string {
277272
} else {
278273
str = strings.ReplaceAll(str, "\\p", "5432")
279274
}
280-
281-
str = strings.ReplaceAll(str, "\\n", "\n" )
275+
276+
str = strings.ReplaceAll(str, "\\n", "\n")
282277

283278
return str
284279
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func NewConfigConnector(host, database, user, password string, port uint16) *Con
4444
Password: password,
4545
Port: port,
4646
}
47-
}
47+
}
4848

4949
func (c *ConfigConnector) Connect(ctx context.Context) (*pgx.Conn, error) {
5050
connConfig, err := pgx.ParseConfig("")

0 commit comments

Comments
 (0)