File tree Expand file tree Collapse file tree 3 files changed +15
-5
lines changed Expand file tree Collapse file tree 3 files changed +15
-5
lines changed Original file line number Diff line number Diff line change 30
30
ErrInFailedTransaction = errors .New ("pq: Could not complete operation in a failed transaction" )
31
31
ErrSSLNotSupported = errors .New ("pq: SSL is not enabled on the server" )
32
32
ErrSSLKeyHasWorldPermissions = errors .New ("pq: Private key file has group or world access. Permissions should be u=rw (0600) or less." )
33
+ ErrCouldNotDetectUsername = errors .New ("pq: Could not detect default username. Please provide one explicitly." )
33
34
)
34
35
35
36
type drv struct {}
Original file line number Diff line number Diff line change 4
4
5
5
package pq
6
6
7
- import "os/user"
7
+ import (
8
+ "os"
9
+ "os/user"
10
+ )
8
11
9
12
func userCurrent () (string , error ) {
10
13
u , err := user .Current ()
11
- if err ! = nil {
12
- return "" , err
14
+ if err = = nil {
15
+ return u . Username , nil
13
16
}
14
- return u .Username , nil
17
+
18
+ name := os .Getenv ("USER" )
19
+ if name != "" {
20
+ return name , nil
21
+ }
22
+
23
+ return "" , ErrCouldNotDetectUsername
15
24
}
Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ func userCurrent() (string, error) {
19
19
pwname_size := uint32 (len (pw_name )) - 1
20
20
err := syscall .GetUserNameEx (syscall .NameSamCompatible , & pw_name [0 ], & pwname_size )
21
21
if err != nil {
22
- return "" , err
22
+ return "" , ErrCouldNotDetectUsername
23
23
}
24
24
s := syscall .UTF16ToString (pw_name )
25
25
u := filepath .Base (s )
You can’t perform that action at this time.
0 commit comments