Skip to content

add support for plan9 #744

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
mjl- wants to merge 3 commits into
base: master
Choose a base branch
from
Open

add support for plan9 #744

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79faadd
make this compile & work on plan 9
mjl- Apr 23, 2018
2f21bf3
TestCloseBadConn: use environment variable overrides if available
mjl- Apr 23, 2018
064cf3c
use net.JoinHostPort
mjl- Apr 24, 2018
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
12 changes: 11 additions & 1 deletion conn_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,17 @@ func TestBadConn(t *testing.T) {
// TestCloseBadConn tests that the underlying connection can be closed with
// Close after an error.
func TestCloseBadConn(t *testing.T) {
nc, err := net.Dial("tcp", "localhost:5432")
env := parseEnviron(os.Environ())
host := env["host"]
port := env["port"]
if host == "" {
host = "localhost"
}
if port == "" {
port = "5432"
}
addr := host + ":" + port
Copy link

@rogerhub rogerhub Apr 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

net.JoinHostPort? (in case host is v6 for some reason)

nc, err := net.Dial("tcp", addr)
if err != nil {
t.Fatal(err)
}
Expand Down
24 changes: 24 additions & 0 deletions user_plan9.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// Package pq is a pure Go Postgres driver for the database/sql package.

// +build plan9

package pq

import (
"os"
"os/user"
)

func userCurrent() (string, error) {
u, err := user.Current()
if err == nil {
return u.Username, nil
}

name := os.Getenv("user")
if name != "" {
return name, nil
}

return "", ErrCouldNotDetectUsername
}