Skip to content

D
dex
Unverified Commit 8f3cca7b authored by Stephan Renatus's avatar Stephan Renatus Committed by GitHub
Browse files
Options

Revert "retry on serialization errors"

parent f3acec0b
Show whitespace changes
Inline Side-by-side
Showing with 419 additions and 1311 deletions
glide.lock
View file @ 8f3cca7b
hash: 70e399f3424964c1535cefb66bce0e47af25ea6bb0f32a254e83e91bd774b5f2 hash: e5972bbdf15ad612d99ce8cd34e19537b9eacb5ff53688f339e0da285eb8ec22
updated: 2018-11-20T09:49:19.83565589-05:00 updated: 2018-11-12T19:38:56.235070564+01:00
imports: imports:
- name: github.com/beevik/etree - name: github.com/beevik/etree
version: 4cd0dd976db869f817248477718071a28e978df0 version: 4cd0dd976db869f817248477718071a28e978df0
...@@ -54,7 +54,7 @@ imports: ...@@ -54,7 +54,7 @@ imports:
- diff - diff
- pretty - pretty
- name: github.com/lib/pq - name: github.com/lib/pq
version: 9eb73efc1fcc404148b56765b0d3f61d9a5ef8ee version: 50761b0867bd1d9d069276790bcd4a3bccf2324a
subpackages: subpackages:
- oid - oid
- name: github.com/mattn/go-sqlite3 - name: github.com/mattn/go-sqlite3
......
glide.yaml
View file @ 8f3cca7b
...@@ -114,7 +114,7 @@ import: ...@@ -114,7 +114,7 @@ import:
- package: github.com/mattn/go-sqlite3 - package: github.com/mattn/go-sqlite3
version: 3fb7a0e792edd47bf0cf1e919dfc14e2be412e15 version: 3fb7a0e792edd47bf0cf1e919dfc14e2be412e15
- package: github.com/lib/pq - package: github.com/lib/pq
version: 9eb73efc1fcc404148b56765b0d3f61d9a5ef8ee version: 50761b0867bd1d9d069276790bcd4a3bccf2324a
# etcd driver # etcd driver
- package: github.com/coreos/etcd - package: github.com/coreos/etcd
......
storage/sql/crud.go
View file @ 8f3cca7b
...@@ -134,7 +134,7 @@ func (c *conn) CreateAuthRequest(a storage.AuthRequest) error { ...@@ -134,7 +134,7 @@ func (c *conn) CreateAuthRequest(a storage.AuthRequest) error {
} }
func (c *conn) UpdateAuthRequest(id string, updater func(a storage.AuthRequest) (storage.AuthRequest, error)) error { func (c *conn) UpdateAuthRequest(id string, updater func(a storage.AuthRequest) (storage.AuthRequest, error)) error {
err := c.ExecTx(func(tx *trans) error { return c.ExecTx(func(tx *trans) error {
r, err := getAuthRequest(tx, id) r, err := getAuthRequest(tx, id)
if err != nil { if err != nil {
return err return err
...@@ -144,7 +144,6 @@ func (c *conn) UpdateAuthRequest(id string, updater func(a storage.AuthRequest) ...@@ -144,7 +144,6 @@ func (c *conn) UpdateAuthRequest(id string, updater func(a storage.AuthRequest)
if err != nil { if err != nil {
return err return err
} }
_, err = tx.Exec(` _, err = tx.Exec(`
update auth_request update auth_request
set set
...@@ -164,26 +163,16 @@ func (c *conn) UpdateAuthRequest(id string, updater func(a storage.AuthRequest) ...@@ -164,26 +163,16 @@ func (c *conn) UpdateAuthRequest(id string, updater func(a storage.AuthRequest)
a.ConnectorID, a.ConnectorData, a.ConnectorID, a.ConnectorData,
a.Expiry, r.ID, a.Expiry, r.ID,
) )
return err
})
if err != nil { if err != nil {
return fmt.Errorf("update auth request: %v", err) return fmt.Errorf("update auth request: %v", err)
} }
return nil return nil
})
} }
func (c *conn) GetAuthRequest(id string) (storage.AuthRequest, error) { func (c *conn) GetAuthRequest(id string) (storage.AuthRequest, error) {
req, err := getAuthRequest(c, id) return getAuthRequest(c, id)
if err != nil {
if err == sql.ErrNoRows {
return storage.AuthRequest{}, storage.ErrNotFound
}
return storage.AuthRequest{}, fmt.Errorf("select auth request: %v", err)
}
return req, nil
} }
func getAuthRequest(q querier, id string) (a storage.AuthRequest, err error) { func getAuthRequest(q querier, id string) (a storage.AuthRequest, err error) {
...@@ -203,7 +192,10 @@ func getAuthRequest(q querier, id string) (a storage.AuthRequest, err error) { ...@@ -203,7 +192,10 @@ func getAuthRequest(q querier, id string) (a storage.AuthRequest, err error) {
&a.ConnectorID, &a.ConnectorData, &a.Expiry, &a.ConnectorID, &a.ConnectorData, &a.Expiry,
) )
if err != nil { if err != nil {
return a, err if err == sql.ErrNoRows {
return a, storage.ErrNotFound
}
return a, fmt.Errorf("select auth request: %v", err)
} }
return a, nil return a, nil
} }
...@@ -277,22 +269,20 @@ func (c *conn) CreateRefresh(r storage.RefreshToken) error { ...@@ -277,22 +269,20 @@ func (c *conn) CreateRefresh(r storage.RefreshToken) error {
if c.alreadyExistsCheck(err) { if c.alreadyExistsCheck(err) {
return storage.ErrAlreadyExists return storage.ErrAlreadyExists
} }
return fmt.Errorf("insert refresh token: %v", err) return fmt.Errorf("insert refresh_token: %v", err)
} }
return nil return nil
} }
func (c *conn) UpdateRefreshToken(id string, updater func(old storage.RefreshToken) (storage.RefreshToken, error)) error { func (c *conn) UpdateRefreshToken(id string, updater func(old storage.RefreshToken) (storage.RefreshToken, error)) error {
err := c.ExecTx(func(tx *trans) error { return c.ExecTx(func(tx *trans) error {
r, err := getRefresh(tx, id) r, err := getRefresh(tx, id)
if err != nil { if err != nil {
return err return err
} }
if r, err = updater(r); err != nil { if r, err = updater(r); err != nil {
return err return err
} }
_, err = tx.Exec(` _, err = tx.Exec(`
update refresh_token update refresh_token
set set
...@@ -318,25 +308,15 @@ func (c *conn) UpdateRefreshToken(id string, updater func(old storage.RefreshTok ...@@ -318,25 +308,15 @@ func (c *conn) UpdateRefreshToken(id string, updater func(old storage.RefreshTok
r.ConnectorID, r.ConnectorData, r.ConnectorID, r.ConnectorData,
r.Token, r.CreatedAt, r.LastUsed, id, r.Token, r.CreatedAt, r.LastUsed, id,
) )
return err
})
if err != nil { if err != nil {
return fmt.Errorf("update refresh token: %v", err) return fmt.Errorf("update refresh token: %v", err)
} }
return nil return nil
})
} }
func (c *conn) GetRefresh(id string) (storage.RefreshToken, error) { func (c *conn) GetRefresh(id string) (storage.RefreshToken, error) {
req, err := getRefresh(c, id) return getRefresh(c, id)
if err != nil {
if err == sql.ErrNoRows {
return storage.RefreshToken{}, storage.ErrNotFound
}
return storage.RefreshToken{}, fmt.Errorf("get refresh token: %v", err)
}
return req, nil
} }
func getRefresh(q querier, id string) (storage.RefreshToken, error) { func getRefresh(q querier, id string) (storage.RefreshToken, error) {
...@@ -362,15 +342,14 @@ func (c *conn) ListRefreshTokens() ([]storage.RefreshToken, error) { ...@@ -362,15 +342,14 @@ func (c *conn) ListRefreshTokens() ([]storage.RefreshToken, error) {
from refresh_token; from refresh_token;
`) `)
if err != nil { if err != nil {
return nil, fmt.Errorf("select refresh tokens: %v", err) return nil, fmt.Errorf("query: %v", err)
} }
var tokens []storage.RefreshToken var tokens []storage.RefreshToken
for rows.Next() { for rows.Next() {
r, err := scanRefresh(rows) r, err := scanRefresh(rows)
if err != nil { if err != nil {
return nil, fmt.Errorf("scan refresh token: %s", err) return nil, err
} }
tokens = append(tokens, r) tokens = append(tokens, r)
} }
if err := rows.Err(); err != nil { if err := rows.Err(); err != nil {
...@@ -388,7 +367,10 @@ func scanRefresh(s scanner) (r storage.RefreshToken, err error) { ...@@ -388,7 +367,10 @@ func scanRefresh(s scanner) (r storage.RefreshToken, err error) {
&r.Token, &r.CreatedAt, &r.LastUsed, &r.Token, &r.CreatedAt, &r.LastUsed,
) )
if err != nil { if err != nil {
return r, err if err == sql.ErrNoRows {
return r, storage.ErrNotFound
}
return r, fmt.Errorf("scan refresh_token: %v", err)
} }
return r, nil return r, nil
} }
...@@ -399,11 +381,12 @@ func (c *conn) UpdateKeys(updater func(old storage.Keys) (storage.Keys, error)) ...@@ -399,11 +381,12 @@ func (c *conn) UpdateKeys(updater func(old storage.Keys) (storage.Keys, error))
// TODO(ericchiang): errors may cause a transaction be rolled back by the SQL // TODO(ericchiang): errors may cause a transaction be rolled back by the SQL
// server. Test this, and consider adding a COUNT() command beforehand. // server. Test this, and consider adding a COUNT() command beforehand.
old, err := getKeys(tx) old, err := getKeys(tx)
if err == sql.ErrNoRows { if err != nil {
if err != storage.ErrNotFound {
return fmt.Errorf("get keys: %v", err)
}
firstUpdate = true firstUpdate = true
old = storage.Keys{} old = storage.Keys{}
} else if err != nil {
return err
} }
nk, err := updater(old) nk, err := updater(old)
...@@ -422,7 +405,7 @@ func (c *conn) UpdateKeys(updater func(old storage.Keys) (storage.Keys, error)) ...@@ -422,7 +405,7 @@ func (c *conn) UpdateKeys(updater func(old storage.Keys) (storage.Keys, error))
encoder(nk.SigningKeyPub), nk.NextRotation, encoder(nk.SigningKeyPub), nk.NextRotation,
) )
if err != nil { if err != nil {
return err return fmt.Errorf("insert: %v", err)
} }
} else { } else {
_, err = tx.Exec(` _, err = tx.Exec(`
...@@ -438,24 +421,15 @@ func (c *conn) UpdateKeys(updater func(old storage.Keys) (storage.Keys, error)) ...@@ -438,24 +421,15 @@ func (c *conn) UpdateKeys(updater func(old storage.Keys) (storage.Keys, error))
encoder(nk.SigningKeyPub), nk.NextRotation, keysRowID, encoder(nk.SigningKeyPub), nk.NextRotation, keysRowID,
) )
if err != nil { if err != nil {
return err return fmt.Errorf("update: %v", err)
} }
} }
return nil return nil
}) })
} }
func (c *conn) GetKeys() (storage.Keys, error) { func (c *conn) GetKeys() (keys storage.Keys, err error) {
keys, err := getKeys(c) return getKeys(c)
if err != nil {
if err == sql.ErrNoRows {
return storage.Keys{}, storage.ErrNotFound
}
return storage.Keys{}, fmt.Errorf("select keys: %s", err)
}
return keys, nil
} }
func getKeys(q querier) (keys storage.Keys, err error) { func getKeys(q querier) (keys storage.Keys, err error) {
...@@ -469,18 +443,20 @@ func getKeys(q querier) (keys storage.Keys, err error) { ...@@ -469,18 +443,20 @@ func getKeys(q querier) (keys storage.Keys, err error) {
decoder(&keys.SigningKeyPub), &keys.NextRotation, decoder(&keys.SigningKeyPub), &keys.NextRotation,
) )
if err != nil { if err != nil {
return keys, err if err == sql.ErrNoRows {
return keys, storage.ErrNotFound
}
return keys, fmt.Errorf("query keys: %v", err)
} }
return keys, nil return keys, nil
} }
func (c *conn) UpdateClient(id string, updater func(old storage.Client) (storage.Client, error)) error { func (c *conn) UpdateClient(id string, updater func(old storage.Client) (storage.Client, error)) error {
err := c.ExecTx(func(tx *trans) error { return c.ExecTx(func(tx *trans) error {
cli, err := getClient(tx, id) cli, err := getClient(tx, id)
if err != nil { if err != nil {
return err return err
} }
nc, err := updater(cli) nc, err := updater(cli)
if err != nil { if err != nil {
return err return err
...@@ -498,13 +474,11 @@ func (c *conn) UpdateClient(id string, updater func(old storage.Client) (storage ...@@ -498,13 +474,11 @@ func (c *conn) UpdateClient(id string, updater func(old storage.Client) (storage
where id = $7; where id = $7;
`, nc.Secret, encoder(nc.RedirectURIs), encoder(nc.TrustedPeers), nc.Public, nc.Name, nc.LogoURL, id, `, nc.Secret, encoder(nc.RedirectURIs), encoder(nc.TrustedPeers), nc.Public, nc.Name, nc.LogoURL, id,
) )
return err
})
if err != nil { if err != nil {
return fmt.Errorf("update client: %v", err) return fmt.Errorf("update client: %v", err)
} }
return nil return nil
})
} }
func (c *conn) CreateClient(cli storage.Client) error { func (c *conn) CreateClient(cli storage.Client) error {
...@@ -535,16 +509,7 @@ func getClient(q querier, id string) (storage.Client, error) { ...@@ -535,16 +509,7 @@ func getClient(q querier, id string) (storage.Client, error) {
} }
func (c *conn) GetClient(id string) (storage.Client, error) { func (c *conn) GetClient(id string) (storage.Client, error) {
client, err := getClient(c, id) return getClient(c, id)
if err != nil {
if err == sql.ErrNoRows {
return storage.Client{}, storage.ErrNotFound
}
return storage.Client{}, fmt.Errorf("select client: %v", err)
}
return client, nil
} }
func (c *conn) ListClients() ([]storage.Client, error) { func (c *conn) ListClients() ([]storage.Client, error) {
...@@ -560,12 +525,12 @@ func (c *conn) ListClients() ([]storage.Client, error) { ...@@ -560,12 +525,12 @@ func (c *conn) ListClients() ([]storage.Client, error) {
for rows.Next() { for rows.Next() {
cli, err := scanClient(rows) cli, err := scanClient(rows)
if err != nil { if err != nil {
return nil, fmt.Errorf("scan client: %s", err) return nil, err
} }
clients = append(clients, cli) clients = append(clients, cli)
} }
if err := rows.Err(); err != nil { if err := rows.Err(); err != nil {
return nil, fmt.Errorf("scan: %s", err) return nil, err
} }
return clients, nil return clients, nil
} }
...@@ -576,7 +541,10 @@ func scanClient(s scanner) (cli storage.Client, err error) { ...@@ -576,7 +541,10 @@ func scanClient(s scanner) (cli storage.Client, err error) {
&cli.Public, &cli.Name, &cli.LogoURL, &cli.Public, &cli.Name, &cli.LogoURL,
) )
if err != nil { if err != nil {
return cli, err if err == sql.ErrNoRows {
return cli, storage.ErrNotFound
}
return cli, fmt.Errorf("get client: %v", err)
} }
return cli, nil return cli, nil
} }
...@@ -603,7 +571,7 @@ func (c *conn) CreatePassword(p storage.Password) error { ...@@ -603,7 +571,7 @@ func (c *conn) CreatePassword(p storage.Password) error {
} }
func (c *conn) UpdatePassword(email string, updater func(p storage.Password) (storage.Password, error)) error { func (c *conn) UpdatePassword(email string, updater func(p storage.Password) (storage.Password, error)) error {
err := c.ExecTx(func(tx *trans) error { return c.ExecTx(func(tx *trans) error {
p, err := getPassword(tx, email) p, err := getPassword(tx, email)
if err != nil { if err != nil {
return err return err
...@@ -613,7 +581,6 @@ func (c *conn) UpdatePassword(email string, updater func(p storage.Password) (st ...@@ -613,7 +581,6 @@ func (c *conn) UpdatePassword(email string, updater func(p storage.Password) (st
if err != nil { if err != nil {
return err return err
} }
_, err = tx.Exec(` _, err = tx.Exec(`
update password update password
set set
...@@ -622,25 +589,15 @@ func (c *conn) UpdatePassword(email string, updater func(p storage.Password) (st ...@@ -622,25 +589,15 @@ func (c *conn) UpdatePassword(email string, updater func(p storage.Password) (st
`, `,
np.Hash, np.Username, np.UserID, p.Email, np.Hash, np.Username, np.UserID, p.Email,
) )
return err
})
if err != nil { if err != nil {
return fmt.Errorf("update password: %v", err) return fmt.Errorf("update password: %v", err)
} }
return nil return nil
})
} }
func (c *conn) GetPassword(email string) (storage.Password, error) { func (c *conn) GetPassword(email string) (storage.Password, error) {
pass, err := getPassword(c, email) return getPassword(c, email)
if err != nil {
if err == sql.ErrNoRows {
return storage.Password{}, storage.ErrNotFound
}
return storage.Password{}, fmt.Errorf("get password: %s", err)
}
return pass, nil
} }
func getPassword(q querier, email string) (p storage.Password, err error) { func getPassword(q querier, email string) (p storage.Password, err error) {
...@@ -665,12 +622,12 @@ func (c *conn) ListPasswords() ([]storage.Password, error) { ...@@ -665,12 +622,12 @@ func (c *conn) ListPasswords() ([]storage.Password, error) {
for rows.Next() { for rows.Next() {
p, err := scanPassword(rows) p, err := scanPassword(rows)
if err != nil { if err != nil {
return nil, fmt.Errorf("scan password: %s", err) return nil, err
} }
passwords = append(passwords, p) passwords = append(passwords, p)
} }
if err := rows.Err(); err != nil { if err := rows.Err(); err != nil {
return nil, fmt.Errorf("scan: %s", err) return nil, err
} }
return passwords, nil return passwords, nil
} }
...@@ -680,7 +637,10 @@ func scanPassword(s scanner) (p storage.Password, err error) { ...@@ -680,7 +637,10 @@ func scanPassword(s scanner) (p storage.Password, err error) {
&p.Email, &p.Hash, &p.Username, &p.UserID, &p.Email, &p.Hash, &p.Username, &p.UserID,
) )
if err != nil { if err != nil {
return p, err if err == sql.ErrNoRows {
return p, storage.ErrNotFound
}
return p, fmt.Errorf("select password: %v", err)
} }
return p, nil return p, nil
} }
...@@ -706,7 +666,7 @@ func (c *conn) CreateOfflineSessions(s storage.OfflineSessions) error { ...@@ -706,7 +666,7 @@ func (c *conn) CreateOfflineSessions(s storage.OfflineSessions) error {
} }
func (c *conn) UpdateOfflineSessions(userID string, connID string, updater func(s storage.OfflineSessions) (storage.OfflineSessions, error)) error { func (c *conn) UpdateOfflineSessions(userID string, connID string, updater func(s storage.OfflineSessions) (storage.OfflineSessions, error)) error {
err := c.ExecTx(func(tx *trans) error { return c.ExecTx(func(tx *trans) error {
s, err := getOfflineSessions(tx, userID, connID) s, err := getOfflineSessions(tx, userID, connID)
if err != nil { if err != nil {
return err return err
...@@ -716,7 +676,6 @@ func (c *conn) UpdateOfflineSessions(userID string, connID string, updater func( ...@@ -716,7 +676,6 @@ func (c *conn) UpdateOfflineSessions(userID string, connID string, updater func(
if err != nil { if err != nil {
return err return err
} }
_, err = tx.Exec(` _, err = tx.Exec(`
update offline_session update offline_session
set set
...@@ -725,26 +684,15 @@ func (c *conn) UpdateOfflineSessions(userID string, connID string, updater func( ...@@ -725,26 +684,15 @@ func (c *conn) UpdateOfflineSessions(userID string, connID string, updater func(
`, `,
encoder(newSession.Refresh), s.UserID, s.ConnID, encoder(newSession.Refresh), s.UserID, s.ConnID,
) )
return err
})
if err != nil { if err != nil {
return fmt.Errorf("update offline session: %v", err) return fmt.Errorf("update offline session: %v", err)
} }
return nil return nil
})
} }
func (c *conn) GetOfflineSessions(userID string, connID string) (storage.OfflineSessions, error) { func (c *conn) GetOfflineSessions(userID string, connID string) (storage.OfflineSessions, error) {
sessions, err := getOfflineSessions(c, userID, connID) return getOfflineSessions(c, userID, connID)
if err != nil {
if err == sql.ErrNoRows {
return storage.OfflineSessions{}, storage.ErrNotFound
}
return storage.OfflineSessions{}, fmt.Errorf("get offline sessions: %s", err)
}
return sessions, nil
} }
func getOfflineSessions(q querier, userID string, connID string) (storage.OfflineSessions, error) { func getOfflineSessions(q querier, userID string, connID string) (storage.OfflineSessions, error) {
...@@ -761,7 +709,10 @@ func scanOfflineSessions(s scanner) (o storage.OfflineSessions, err error) { ...@@ -761,7 +709,10 @@ func scanOfflineSessions(s scanner) (o storage.OfflineSessions, err error) {
&o.UserID, &o.ConnID, decoder(&o.Refresh), &o.UserID, &o.ConnID, decoder(&o.Refresh),
) )
if err != nil { if err != nil {
return o, err if err == sql.ErrNoRows {
return o, storage.ErrNotFound
}
return o, fmt.Errorf("select offline session: %v", err)
} }
return o, nil return o, nil
} }
...@@ -787,7 +738,7 @@ func (c *conn) CreateConnector(connector storage.Connector) error { ...@@ -787,7 +738,7 @@ func (c *conn) CreateConnector(connector storage.Connector) error {
} }
func (c *conn) UpdateConnector(id string, updater func(s storage.Connector) (storage.Connector, error)) error { func (c *conn) UpdateConnector(id string, updater func(s storage.Connector) (storage.Connector, error)) error {
err := c.ExecTx(func(tx *trans) error { return c.ExecTx(func(tx *trans) error {
connector, err := getConnector(tx, id) connector, err := getConnector(tx, id)
if err != nil { if err != nil {
return err return err
...@@ -797,7 +748,6 @@ func (c *conn) UpdateConnector(id string, updater func(s storage.Connector) (sto ...@@ -797,7 +748,6 @@ func (c *conn) UpdateConnector(id string, updater func(s storage.Connector) (sto
if err != nil { if err != nil {
return err return err
} }
_, err = tx.Exec(` _, err = tx.Exec(`
update connector update connector
set set
...@@ -809,26 +759,15 @@ func (c *conn) UpdateConnector(id string, updater func(s storage.Connector) (sto ...@@ -809,26 +759,15 @@ func (c *conn) UpdateConnector(id string, updater func(s storage.Connector) (sto
`, `,
newConn.Type, newConn.Name, newConn.ResourceVersion, newConn.Config, connector.ID, newConn.Type, newConn.Name, newConn.ResourceVersion, newConn.Config, connector.ID,
) )
return err
})
if err != nil { if err != nil {
return fmt.Errorf("update connector: %v", err) return fmt.Errorf("update connector: %v", err)
} }
return nil return nil
})
} }
func (c *conn) GetConnector(id string) (storage.Connector, error) { func (c *conn) GetConnector(id string) (storage.Connector, error) {
connector, err := getConnector(c, id) return getConnector(c, id)
if err != nil {
if err == sql.ErrNoRows {
return storage.Connector{}, storage.ErrNotFound
}
return storage.Connector{}, fmt.Errorf("get connector: %s", err)
}
return connector, nil
} }
func getConnector(q querier, id string) (storage.Connector, error) { func getConnector(q querier, id string) (storage.Connector, error) {
...@@ -845,7 +784,10 @@ func scanConnector(s scanner) (c storage.Connector, err error) { ...@@ -845,7 +784,10 @@ func scanConnector(s scanner) (c storage.Connector, err error) {
&c.ID, &c.Type, &c.Name, &c.ResourceVersion, &c.Config, &c.ID, &c.Type, &c.Name, &c.ResourceVersion, &c.Config,
) )
if err != nil { if err != nil {
return c, err if err == sql.ErrNoRows {
return c, storage.ErrNotFound
}
return c, fmt.Errorf("select connector: %v", err)
} }
return c, nil return c, nil
} }
...@@ -863,12 +805,12 @@ func (c *conn) ListConnectors() ([]storage.Connector, error) { ...@@ -863,12 +805,12 @@ func (c *conn) ListConnectors() ([]storage.Connector, error) {
for rows.Next() { for rows.Next() {
conn, err := scanConnector(rows) conn, err := scanConnector(rows)
if err != nil { if err != nil {
return nil, fmt.Errorf("scan connector: %s", err) return nil, err
} }
connectors = append(connectors, conn) connectors = append(connectors, conn)
} }
if err := rows.Err(); err != nil { if err := rows.Err(); err != nil {
return nil, fmt.Errorf("scan: %s", err) return nil, err
} }
return connectors, nil return connectors, nil
} }
......
storage/sql/sql.go
View file @ 8f3cca7b
...@@ -2,15 +2,14 @@ ...@@ -2,15 +2,14 @@
package sql package sql
import ( import (
"context"
"database/sql" "database/sql"
"regexp" "regexp"
"time" "time"
"github.com/lib/pq"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
// import third party drivers // import third party drivers
_ "github.com/lib/pq"
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
) )
...@@ -40,66 +39,31 @@ func matchLiteral(s string) *regexp.Regexp { ...@@ -40,66 +39,31 @@ func matchLiteral(s string) *regexp.Regexp {
return regexp.MustCompile(`\b` + regexp.QuoteMeta(s) + `\b`) return regexp.MustCompile(`\b` + regexp.QuoteMeta(s) + `\b`)
} }
// Detect a serialization failure, which should trigger retrying the
// transaction according to PostgreSQL docs:
//
// https://www.postgresql.org/docs/current/transaction-iso.html#XACT-SERIALIZABLE
//
// "applications using this level must be prepared to retry transactions due to
// serialization failures"
func isRetryableSerializationFailure(err error) bool {
if pqErr, ok := err.(*pq.Error); ok {
return pqErr.Code.Name() == "serialization_failure"
}
return false
}
var ( var (
// The "github.com/lib/pq" driver is the default flavor. All others are // The "github.com/lib/pq" driver is the default flavor. All others are
// translations of this. // translations of this.
flavorPostgres = flavor{ flavorPostgres = flavor{
// The default behavior for Postgres transactions is consistent reads, not // The default behavior for Postgres transactions is consistent reads, not consistent writes.
// consistent writes. For each transaction opened, ensure it has the // For each transaction opened, ensure it has the correct isolation level.
// correct isolation level.
// //
// See: https://www.postgresql.org/docs/9.3/static/sql-set-transaction.html // See: https://www.postgresql.org/docs/9.3/static/sql-set-transaction.html
// //
// Be careful not to wrap sql errors in the callback 'fn', otherwise // NOTE(ericchiang): For some reason using `SET SESSION CHARACTERISTICS AS TRANSACTION` at a
// serialization failures will not be detected and retried. // session level didn't work for some edge cases. Might be something worth exploring.
executeTx: func(db *sql.DB, fn func(sqlTx *sql.Tx) error) error { executeTx: func(db *sql.DB, fn func(sqlTx *sql.Tx) error) error {
ctx, cancel := context.WithCancel(context.TODO()) tx, err := db.Begin()
defer cancel()
opts := &sql.TxOptions{
Isolation: sql.LevelSerializable,
}
for {
tx, err := db.BeginTx(ctx, opts)
if err != nil { if err != nil {
return err return err
} }
defer tx.Rollback()
if err := fn(tx); err != nil { if _, err := tx.Exec(`SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;`); err != nil {
if isRetryableSerializationFailure(err) {
continue
}
return err return err
} }
if err := fn(tx); err != nil {
err = tx.Commit()
if err != nil {
if isRetryableSerializationFailure(err) {
continue
}
return err return err
} }
return tx.Commit()
return nil
}
}, },
supportsTimezones: true, supportsTimezones: true,
......
vendor/github.com/lib/pq/array.go
View file @ 8f3cca7b
...@@ -13,7 +13,7 @@ import ( ...@@ -13,7 +13,7 @@ import (
var typeByteSlice = reflect.TypeOf([]byte{}) var typeByteSlice = reflect.TypeOf([]byte{})
var typeDriverValuer = reflect.TypeOf((*driver.Valuer)(nil)).Elem() var typeDriverValuer = reflect.TypeOf((*driver.Valuer)(nil)).Elem()
var typeSQLScanner = reflect.TypeOf((*sql.Scanner)(nil)).Elem() var typeSqlScanner = reflect.TypeOf((*sql.Scanner)(nil)).Elem()
// Array returns the optimal driver.Valuer and sql.Scanner for an array or // Array returns the optimal driver.Valuer and sql.Scanner for an array or
// slice of any dimension. // slice of any dimension.
...@@ -70,9 +70,6 @@ func (a *BoolArray) Scan(src interface{}) error { ...@@ -70,9 +70,6 @@ func (a *BoolArray) Scan(src interface{}) error {
return a.scanBytes(src) return a.scanBytes(src)
case string: case string:
return a.scanBytes([]byte(src)) return a.scanBytes([]byte(src))
case nil:
*a = nil
return nil
} }
return fmt.Errorf("pq: cannot convert %T to BoolArray", src) return fmt.Errorf("pq: cannot convert %T to BoolArray", src)
...@@ -83,7 +80,7 @@ func (a *BoolArray) scanBytes(src []byte) error { ...@@ -83,7 +80,7 @@ func (a *BoolArray) scanBytes(src []byte) error {
if err != nil { if err != nil {
return err return err
} }
if *a != nil && len(elems) == 0 { if len(elems) == 0 {
*a = (*a)[:0] *a = (*a)[:0]
} else { } else {
b := make(BoolArray, len(elems)) b := make(BoolArray, len(elems))
...@@ -144,9 +141,6 @@ func (a *ByteaArray) Scan(src interface{}) error { ...@@ -144,9 +141,6 @@ func (a *ByteaArray) Scan(src interface{}) error {
return a.scanBytes(src) return a.scanBytes(src)
case string: case string:
return a.scanBytes([]byte(src)) return a.scanBytes([]byte(src))
case nil:
*a = nil
return nil
} }
return fmt.Errorf("pq: cannot convert %T to ByteaArray", src) return fmt.Errorf("pq: cannot convert %T to ByteaArray", src)
...@@ -157,7 +151,7 @@ func (a *ByteaArray) scanBytes(src []byte) error { ...@@ -157,7 +151,7 @@ func (a *ByteaArray) scanBytes(src []byte) error {
if err != nil { if err != nil {
return err return err
} }
if *a != nil && len(elems) == 0 { if len(elems) == 0 {
*a = (*a)[:0] *a = (*a)[:0]
} else { } else {
b := make(ByteaArray, len(elems)) b := make(ByteaArray, len(elems))
...@@ -216,9 +210,6 @@ func (a *Float64Array) Scan(src interface{}) error { ...@@ -216,9 +210,6 @@ func (a *Float64Array) Scan(src interface{}) error {
return a.scanBytes(src) return a.scanBytes(src)
case string: case string:
return a.scanBytes([]byte(src)) return a.scanBytes([]byte(src))
case nil:
*a = nil
return nil
} }
return fmt.Errorf("pq: cannot convert %T to Float64Array", src) return fmt.Errorf("pq: cannot convert %T to Float64Array", src)
...@@ -229,7 +220,7 @@ func (a *Float64Array) scanBytes(src []byte) error { ...@@ -229,7 +220,7 @@ func (a *Float64Array) scanBytes(src []byte) error {
if err != nil { if err != nil {
return err return err
} }
if *a != nil && len(elems) == 0 { if len(elems) == 0 {
*a = (*a)[:0] *a = (*a)[:0]
} else { } else {
b := make(Float64Array, len(elems)) b := make(Float64Array, len(elems))
...@@ -278,7 +269,7 @@ func (GenericArray) evaluateDestination(rt reflect.Type) (reflect.Type, func([]b ...@@ -278,7 +269,7 @@ func (GenericArray) evaluateDestination(rt reflect.Type) (reflect.Type, func([]b
// TODO calculate the assign function for other types // TODO calculate the assign function for other types
// TODO repeat this section on the element type of arrays or slices (multidimensional) // TODO repeat this section on the element type of arrays or slices (multidimensional)
{ {
if reflect.PtrTo(rt).Implements(typeSQLScanner) { if reflect.PtrTo(rt).Implements(typeSqlScanner) {
// dest is always addressable because it is an element of a slice. // dest is always addressable because it is an element of a slice.
assign = func(src []byte, dest reflect.Value) (err error) { assign = func(src []byte, dest reflect.Value) (err error) {
ss := dest.Addr().Interface().(sql.Scanner) ss := dest.Addr().Interface().(sql.Scanner)
...@@ -329,11 +320,6 @@ func (a GenericArray) Scan(src interface{}) error { ...@@ -329,11 +320,6 @@ func (a GenericArray) Scan(src interface{}) error {
return a.scanBytes(src, dv) return a.scanBytes(src, dv)
case string: case string:
return a.scanBytes([]byte(src), dv) return a.scanBytes([]byte(src), dv)
case nil:
if dv.Kind() == reflect.Slice {
dv.Set(reflect.Zero(dv.Type()))
return nil
}
} }
return fmt.Errorf("pq: cannot convert %T to %s", src, dv.Type()) return fmt.Errorf("pq: cannot convert %T to %s", src, dv.Type())
...@@ -400,13 +386,7 @@ func (a GenericArray) Value() (driver.Value, error) { ...@@ -400,13 +386,7 @@ func (a GenericArray) Value() (driver.Value, error) {
rv := reflect.ValueOf(a.A) rv := reflect.ValueOf(a.A)
switch rv.Kind() { if k := rv.Kind(); k != reflect.Array && k != reflect.Slice {
case reflect.Slice:
if rv.IsNil() {
return nil, nil
}
case reflect.Array:
default:
return nil, fmt.Errorf("pq: Unable to convert %T to array", a.A) return nil, fmt.Errorf("pq: Unable to convert %T to array", a.A)
} }
...@@ -432,9 +412,6 @@ func (a *Int64Array) Scan(src interface{}) error { ...@@ -432,9 +412,6 @@ func (a *Int64Array) Scan(src interface{}) error {
return a.scanBytes(src) return a.scanBytes(src)
case string: case string:
return a.scanBytes([]byte(src)) return a.scanBytes([]byte(src))
case nil:
*a = nil
return nil
} }
return fmt.Errorf("pq: cannot convert %T to Int64Array", src) return fmt.Errorf("pq: cannot convert %T to Int64Array", src)
...@@ -445,7 +422,7 @@ func (a *Int64Array) scanBytes(src []byte) error { ...@@ -445,7 +422,7 @@ func (a *Int64Array) scanBytes(src []byte) error {
if err != nil { if err != nil {
return err return err
} }
if *a != nil && len(elems) == 0 { if len(elems) == 0 {
*a = (*a)[:0] *a = (*a)[:0]
} else { } else {
b := make(Int64Array, len(elems)) b := make(Int64Array, len(elems))
...@@ -493,9 +470,6 @@ func (a *StringArray) Scan(src interface{}) error { ...@@ -493,9 +470,6 @@ func (a *StringArray) Scan(src interface{}) error {
return a.scanBytes(src) return a.scanBytes(src)
case string: case string:
return a.scanBytes([]byte(src)) return a.scanBytes([]byte(src))
case nil:
*a = nil
return nil
} }
return fmt.Errorf("pq: cannot convert %T to StringArray", src) return fmt.Errorf("pq: cannot convert %T to StringArray", src)
...@@ -506,7 +480,7 @@ func (a *StringArray) scanBytes(src []byte) error { ...@@ -506,7 +480,7 @@ func (a *StringArray) scanBytes(src []byte) error {
if err != nil { if err != nil {
return err return err
} }
if *a != nil && len(elems) == 0 { if len(elems) == 0 {
*a = (*a)[:0] *a = (*a)[:0]
} else { } else {
b := make(StringArray, len(elems)) b := make(StringArray, len(elems))
...@@ -587,7 +561,7 @@ func appendArrayElement(b []byte, rv reflect.Value) ([]byte, string, error) { ...@@ -587,7 +561,7 @@ func appendArrayElement(b []byte, rv reflect.Value) ([]byte, string, error) {
} }
} }
var del = "," var del string = ","
var err error var err error
var iv interface{} = rv.Interface() var iv interface{} = rv.Interface()
...@@ -665,9 +639,6 @@ Element: ...@@ -665,9 +639,6 @@ Element:
for i < len(src) { for i < len(src) {
switch src[i] { switch src[i] {
case '{': case '{':
if depth == len(dims) {
break Element
}
depth++ depth++
dims[depth-1] = 0 dims[depth-1] = 0
i++ i++
...@@ -709,11 +680,11 @@ Element: ...@@ -709,11 +680,11 @@ Element:
} }
for i < len(src) { for i < len(src) {
if bytes.HasPrefix(src[i:], del) && depth > 0 { if bytes.HasPrefix(src[i:], del) {
dims[depth-1]++ dims[depth-1]++
i += len(del) i += len(del)
goto Element goto Element
} else if src[i] == '}' && depth > 0 { } else if src[i] == '}' {
dims[depth-1]++ dims[depth-1]++
depth-- depth--
i++ i++
......
vendor/github.com/lib/pq/conn.go
View file @ 8f3cca7b
...@@ -3,12 +3,15 @@ package pq ...@@ -3,12 +3,15 @@ package pq
import ( import (
"bufio" "bufio"
"crypto/md5" "crypto/md5"
"crypto/tls"
"crypto/x509"
"database/sql" "database/sql"
"database/sql/driver" "database/sql/driver"
"encoding/binary" "encoding/binary"
"errors" "errors"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"net" "net"
"os" "os"
"os/user" "os/user"
...@@ -27,26 +30,18 @@ var ( ...@@ -27,26 +30,18 @@ var (
ErrNotSupported = errors.New("pq: Unsupported command") ErrNotSupported = errors.New("pq: Unsupported command")
ErrInFailedTransaction = errors.New("pq: Could not complete operation in a failed transaction") ErrInFailedTransaction = errors.New("pq: Could not complete operation in a failed transaction")
ErrSSLNotSupported = errors.New("pq: SSL is not enabled on the server") ErrSSLNotSupported = errors.New("pq: SSL is not enabled on the server")
ErrSSLKeyHasWorldPermissions = errors.New("pq: Private key file has group or world access. Permissions should be u=rw (0600) or less") ErrSSLKeyHasWorldPermissions = errors.New("pq: Private key file has group or world access. Permissions should be u=rw (0600) or less.")
ErrCouldNotDetectUsername = errors.New("pq: Could not detect default username. Please provide one explicitly") ErrCouldNotDetectUsername = errors.New("pq: Could not detect default username. Please provide one explicitly.")
errUnexpectedReady = errors.New("unexpected ReadyForQuery")
errNoRowsAffected = errors.New("no RowsAffected available after the empty statement")
errNoLastInsertID = errors.New("no LastInsertId available after the empty statement")
) )
// Driver is the Postgres database driver. type drv struct{}
type Driver struct{}
// Open opens a new connection to the database. name is a connection string. func (d *drv) Open(name string) (driver.Conn, error) {
// Most users should only use it through database/sql package from the standard
// library.
func (d *Driver) Open(name string) (driver.Conn, error) {
return Open(name) return Open(name)
} }
func init() { func init() {
sql.Register("postgres", &Driver{}) sql.Register("postgres", &drv{})
} }
type parameterStatus struct { type parameterStatus struct {
...@@ -82,8 +77,6 @@ func (s transactionStatus) String() string { ...@@ -82,8 +77,6 @@ func (s transactionStatus) String() string {
panic("not reached") panic("not reached")
} }
// Dialer is the dialer interface. It can be used to obtain more control over
// how pq creates network connections.
type Dialer interface { type Dialer interface {
Dial(network, address string) (net.Conn, error) Dial(network, address string) (net.Conn, error)
DialTimeout(network, address string, timeout time.Duration) (net.Conn, error) DialTimeout(network, address string, timeout time.Duration) (net.Conn, error)
...@@ -104,15 +97,6 @@ type conn struct { ...@@ -104,15 +97,6 @@ type conn struct {
namei int namei int
scratch [512]byte scratch [512]byte
txnStatus transactionStatus txnStatus transactionStatus
txnFinish func()
// Save connection arguments to use during CancelRequest.
dialer Dialer
opts values
// Cancellation key data for use with CancelRequest messages.
processID int
secretKey int
parameterStatus parameterStatus parameterStatus parameterStatus
...@@ -131,15 +115,12 @@ type conn struct { ...@@ -131,15 +115,12 @@ type conn struct {
// Whether to always send []byte parameters over as binary. Enables single // Whether to always send []byte parameters over as binary. Enables single
// round-trip mode for non-prepared Query calls. // round-trip mode for non-prepared Query calls.
binaryParameters bool binaryParameters bool
// If true this connection is in the middle of a COPY
inCopy bool
} }
// Handle driver-side settings in parsed connection string. // Handle driver-side settings in parsed connection string.
func (cn *conn) handleDriverSettings(o values) (err error) { func (c *conn) handleDriverSettings(o values) (err error) {
boolSetting := func(key string, val *bool) error { boolSetting := func(key string, val *bool) error {
if value, ok := o[key]; ok { if value := o.Get(key); value != "" {
if value == "yes" { if value == "yes" {
*val = true *val = true
} else if value == "no" { } else if value == "no" {
...@@ -151,32 +132,32 @@ func (cn *conn) handleDriverSettings(o values) (err error) { ...@@ -151,32 +132,32 @@ func (cn *conn) handleDriverSettings(o values) (err error) {
return nil return nil
} }
err = boolSetting("disable_prepared_binary_result", &cn.disablePreparedBinaryResult) err = boolSetting("disable_prepared_binary_result", &c.disablePreparedBinaryResult)
if err != nil {
return err
}
err = boolSetting("binary_parameters", &c.binaryParameters)
if err != nil { if err != nil {
return err return err
} }
return boolSetting("binary_parameters", &cn.binaryParameters) return nil
} }
func (cn *conn) handlePgpass(o values) { func (c *conn) handlePgpass(o values) {
// if a password was supplied, do not process .pgpass // if a password was supplied, do not process .pgpass
if _, ok := o["password"]; ok { _, ok := o["password"]
if ok {
return return
} }
filename := os.Getenv("PGPASSFILE") filename := os.Getenv("PGPASSFILE")
if filename == "" { if filename == "" {
// XXX this code doesn't work on Windows where the default filename is // XXX this code doesn't work on Windows where the default filename is
// XXX %APPDATA%\postgresql\pgpass.conf // XXX %APPDATA%\postgresql\pgpass.conf
// Prefer $HOME over user.Current due to glibc bug: golang.org/issue/13470
userHome := os.Getenv("HOME")
if userHome == "" {
user, err := user.Current() user, err := user.Current()
if err != nil { if err != nil {
return return
} }
userHome = user.HomeDir filename = filepath.Join(user.HomeDir, ".pgpass")
}
filename = filepath.Join(userHome, ".pgpass")
} }
fileinfo, err := os.Stat(filename) fileinfo, err := os.Stat(filename)
if err != nil { if err != nil {
...@@ -193,11 +174,11 @@ func (cn *conn) handlePgpass(o values) { ...@@ -193,11 +174,11 @@ func (cn *conn) handlePgpass(o values) {
} }
defer file.Close() defer file.Close()
scanner := bufio.NewScanner(io.Reader(file)) scanner := bufio.NewScanner(io.Reader(file))
hostname := o["host"] hostname := o.Get("host")
ntw, _ := network(o) ntw, _ := network(o)
port := o["port"] port := o.Get("port")
db := o["dbname"] db := o.Get("dbname")
username := o["user"] username := o.Get("user")
// From: https://github.com/tg/pgpass/blob/master/reader.go // From: https://github.com/tg/pgpass/blob/master/reader.go
getFields := func(s string) []string { getFields := func(s string) []string {
fs := make([]string, 0, 5) fs := make([]string, 0, 5)
...@@ -236,22 +217,18 @@ func (cn *conn) handlePgpass(o values) { ...@@ -236,22 +217,18 @@ func (cn *conn) handlePgpass(o values) {
} }
} }
func (cn *conn) writeBuf(b byte) *writeBuf { func (c *conn) writeBuf(b byte) *writeBuf {
cn.scratch[0] = b c.scratch[0] = b
return &writeBuf{ return &writeBuf{
buf: cn.scratch[:5], buf: c.scratch[:5],
pos: 1, pos: 1,
} }
} }
// Open opens a new connection to the database. name is a connection string.
// Most users should only use it through database/sql package from the standard
// library.
func Open(name string) (_ driver.Conn, err error) { func Open(name string) (_ driver.Conn, err error) {
return DialOpen(defaultDialer{}, name) return DialOpen(defaultDialer{}, name)
} }
// DialOpen opens a new connection to the database using a dialer.
func DialOpen(d Dialer, name string) (_ driver.Conn, err error) { func DialOpen(d Dialer, name string) (_ driver.Conn, err error) {
// Handle any panics during connection initialization. Note that we // Handle any panics during connection initialization. Note that we
// specifically do *not* want to use errRecover(), as that would turn any // specifically do *not* want to use errRecover(), as that would turn any
...@@ -266,13 +243,13 @@ func DialOpen(d Dialer, name string) (_ driver.Conn, err error) { ...@@ -266,13 +243,13 @@ func DialOpen(d Dialer, name string) (_ driver.Conn, err error) {
// * Very low precedence defaults applied in every situation // * Very low precedence defaults applied in every situation
// * Environment variables // * Environment variables
// * Explicitly passed connection information // * Explicitly passed connection information
o["host"] = "localhost" o.Set("host", "localhost")
o["port"] = "5432" o.Set("port", "5432")
// N.B.: Extra float digits should be set to 3, but that breaks // N.B.: Extra float digits should be set to 3, but that breaks
// Postgres 8.4 and older, where the max is 2. // Postgres 8.4 and older, where the max is 2.
o["extra_float_digits"] = "2" o.Set("extra_float_digits", "2")
for k, v := range parseEnviron(os.Environ()) { for k, v := range parseEnviron(os.Environ()) {
o[k] = v o.Set(k, v)
} }
if strings.HasPrefix(name, "postgres://") || strings.HasPrefix(name, "postgresql://") { if strings.HasPrefix(name, "postgres://") || strings.HasPrefix(name, "postgresql://") {
...@@ -287,9 +264,9 @@ func DialOpen(d Dialer, name string) (_ driver.Conn, err error) { ...@@ -287,9 +264,9 @@ func DialOpen(d Dialer, name string) (_ driver.Conn, err error) {
} }
// Use the "fallback" application name if necessary // Use the "fallback" application name if necessary
if fallback, ok := o["fallback_application_name"]; ok { if fallback := o.Get("fallback_application_name"); fallback != "" {
if _, ok := o["application_name"]; !ok { if !o.Isset("application_name") {
o["application_name"] = fallback o.Set("application_name", fallback)
} }
} }
...@@ -300,35 +277,33 @@ func DialOpen(d Dialer, name string) (_ driver.Conn, err error) { ...@@ -300,35 +277,33 @@ func DialOpen(d Dialer, name string) (_ driver.Conn, err error) {
// parsing its value is not worth it. Instead, we always explicitly send // parsing its value is not worth it. Instead, we always explicitly send
// client_encoding as a separate run-time parameter, which should override // client_encoding as a separate run-time parameter, which should override
// anything set in options. // anything set in options.
if enc, ok := o["client_encoding"]; ok && !isUTF8(enc) { if enc := o.Get("client_encoding"); enc != "" && !isUTF8(enc) {
return nil, errors.New("client_encoding must be absent or 'UTF8'") return nil, errors.New("client_encoding must be absent or 'UTF8'")
} }
o["client_encoding"] = "UTF8" o.Set("client_encoding", "UTF8")
// DateStyle needs a similar treatment. // DateStyle needs a similar treatment.
if datestyle, ok := o["datestyle"]; ok { if datestyle := o.Get("datestyle"); datestyle != "" {
if datestyle != "ISO, MDY" { if datestyle != "ISO, MDY" {
panic(fmt.Sprintf("setting datestyle must be absent or %v; got %v", panic(fmt.Sprintf("setting datestyle must be absent or %v; got %v",
"ISO, MDY", datestyle)) "ISO, MDY", datestyle))
} }
} else { } else {
o["datestyle"] = "ISO, MDY" o.Set("datestyle", "ISO, MDY")
} }
// If a user is not provided by any other means, the last // If a user is not provided by any other means, the last
// resort is to use the current operating system provided user // resort is to use the current operating system provided user
// name. // name.
if _, ok := o["user"]; !ok { if o.Get("user") == "" {
u, err := userCurrent() u, err := userCurrent()
if err != nil { if err != nil {
return nil, err return nil, err
} else {
o.Set("user", u)
} }
o["user"] = u
} }
cn := &conn{ cn := &conn{}
opts: o,
dialer: d,
}
err = cn.handleDriverSettings(o) err = cn.handleDriverSettings(o)
if err != nil { if err != nil {
return nil, err return nil, err
...@@ -339,28 +314,14 @@ func DialOpen(d Dialer, name string) (_ driver.Conn, err error) { ...@@ -339,28 +314,14 @@ func DialOpen(d Dialer, name string) (_ driver.Conn, err error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
cn.ssl(o)
err = cn.ssl(o)
if err != nil {
return nil, err
}
// cn.startup panics on error. Make sure we don't leak cn.c.
panicking := true
defer func() {
if panicking {
cn.c.Close()
}
}()
cn.buf = bufio.NewReader(cn.c) cn.buf = bufio.NewReader(cn.c)
cn.startup(o) cn.startup(o)
// reset the deadline, in case one was set (see dial) // reset the deadline, in case one was set (see dial)
if timeout, ok := o["connect_timeout"]; ok && timeout != "0" { if timeout := o.Get("connect_timeout"); timeout != "" && timeout != "0" {
err = cn.c.SetDeadline(time.Time{}) err = cn.c.SetDeadline(time.Time{})
} }
panicking = false
return cn, err return cn, err
} }
...@@ -372,7 +333,7 @@ func dial(d Dialer, o values) (net.Conn, error) { ...@@ -372,7 +333,7 @@ func dial(d Dialer, o values) (net.Conn, error) {
} }
// Zero or not specified means wait indefinitely. // Zero or not specified means wait indefinitely.
if timeout, ok := o["connect_timeout"]; ok && timeout != "0" { if timeout := o.Get("connect_timeout"); timeout != "" && timeout != "0" {
seconds, err := strconv.ParseInt(timeout, 10, 0) seconds, err := strconv.ParseInt(timeout, 10, 0)
if err != nil { if err != nil {
return nil, fmt.Errorf("invalid value for parameter connect_timeout: %s", err) return nil, fmt.Errorf("invalid value for parameter connect_timeout: %s", err)
...@@ -394,18 +355,31 @@ func dial(d Dialer, o values) (net.Conn, error) { ...@@ -394,18 +355,31 @@ func dial(d Dialer, o values) (net.Conn, error) {
} }
func network(o values) (string, string) { func network(o values) (string, string) {
host := o["host"] host := o.Get("host")
if strings.HasPrefix(host, "/") { if strings.HasPrefix(host, "/") {
sockPath := path.Join(host, ".s.PGSQL."+o["port"]) sockPath := path.Join(host, ".s.PGSQL."+o.Get("port"))
return "unix", sockPath return "unix", sockPath
} }
return "tcp", net.JoinHostPort(host, o["port"]) return "tcp", net.JoinHostPort(host, o.Get("port"))
} }
type values map[string]string type values map[string]string
func (vs values) Set(k, v string) {
vs[k] = v
}
func (vs values) Get(k string) (v string) {
return vs[k]
}
func (vs values) Isset(k string) bool {
_, ok := vs[k]
return ok
}
// scanner implements a tokenizer for libpq-style option strings. // scanner implements a tokenizer for libpq-style option strings.
type scanner struct { type scanner struct {
s []rune s []rune
...@@ -476,7 +450,7 @@ func parseOpts(name string, o values) error { ...@@ -476,7 +450,7 @@ func parseOpts(name string, o values) error {
// Skip any whitespace after the = // Skip any whitespace after the =
if r, ok = s.SkipSpaces(); !ok { if r, ok = s.SkipSpaces(); !ok {
// If we reach the end here, the last value is just an empty string as per libpq. // If we reach the end here, the last value is just an empty string as per libpq.
o[string(keyRunes)] = "" o.Set(string(keyRunes), "")
break break
} }
...@@ -511,7 +485,7 @@ func parseOpts(name string, o values) error { ...@@ -511,7 +485,7 @@ func parseOpts(name string, o values) error {
} }
} }
o[string(keyRunes)] = string(valRunes) o.Set(string(keyRunes), string(valRunes))
} }
return nil return nil
...@@ -530,17 +504,13 @@ func (cn *conn) checkIsInTransaction(intxn bool) { ...@@ -530,17 +504,13 @@ func (cn *conn) checkIsInTransaction(intxn bool) {
} }
func (cn *conn) Begin() (_ driver.Tx, err error) { func (cn *conn) Begin() (_ driver.Tx, err error) {
return cn.begin("")
}
func (cn *conn) begin(mode string) (_ driver.Tx, err error) {
if cn.bad { if cn.bad {
return nil, driver.ErrBadConn return nil, driver.ErrBadConn
} }
defer cn.errRecover(&err) defer cn.errRecover(&err)
cn.checkIsInTransaction(false) cn.checkIsInTransaction(false)
_, commandTag, err := cn.simpleExec("BEGIN" + mode) _, commandTag, err := cn.simpleExec("BEGIN")
if err != nil { if err != nil {
return nil, err return nil, err
} }
...@@ -555,14 +525,7 @@ func (cn *conn) begin(mode string) (_ driver.Tx, err error) { ...@@ -555,14 +525,7 @@ func (cn *conn) begin(mode string) (_ driver.Tx, err error) {
return cn, nil return cn, nil
} }
func (cn *conn) closeTxn() {
if finish := cn.txnFinish; finish != nil {
finish()
}
}
func (cn *conn) Commit() (err error) { func (cn *conn) Commit() (err error) {
defer cn.closeTxn()
if cn.bad { if cn.bad {
return driver.ErrBadConn return driver.ErrBadConn
} }
...@@ -598,7 +561,6 @@ func (cn *conn) Commit() (err error) { ...@@ -598,7 +561,6 @@ func (cn *conn) Commit() (err error) {
} }
func (cn *conn) Rollback() (err error) { func (cn *conn) Rollback() (err error) {
defer cn.closeTxn()
if cn.bad { if cn.bad {
return driver.ErrBadConn return driver.ErrBadConn
} }
...@@ -636,16 +598,11 @@ func (cn *conn) simpleExec(q string) (res driver.Result, commandTag string, err ...@@ -636,16 +598,11 @@ func (cn *conn) simpleExec(q string) (res driver.Result, commandTag string, err
res, commandTag = cn.parseComplete(r.string()) res, commandTag = cn.parseComplete(r.string())
case 'Z': case 'Z':
cn.processReadyForQuery(r) cn.processReadyForQuery(r)
if res == nil && err == nil {
err = errUnexpectedReady
}
// done // done
return return
case 'E': case 'E':
err = parseError(r) err = parseError(r)
case 'I': case 'T', 'D', 'I':
res = emptyRows
case 'T', 'D':
// ignore any results // ignore any results
default: default:
cn.bad = true cn.bad = true
...@@ -678,12 +635,6 @@ func (cn *conn) simpleQuery(q string) (res *rows, err error) { ...@@ -678,12 +635,6 @@ func (cn *conn) simpleQuery(q string) (res *rows, err error) {
cn: cn, cn: cn,
} }
} }
// Set the result and tag to the last command complete if there wasn't a
// query already run. Although queries usually return from here and cede
// control to Next, a query with zero results does not.
if t == 'C' && res.colNames == nil {
res.result, res.tag = cn.parseComplete(r.string())
}
res.done = true res.done = true
case 'Z': case 'Z':
cn.processReadyForQuery(r) cn.processReadyForQuery(r)
...@@ -715,23 +666,9 @@ func (cn *conn) simpleQuery(q string) (res *rows, err error) { ...@@ -715,23 +666,9 @@ func (cn *conn) simpleQuery(q string) (res *rows, err error) {
} }
} }
type noRows struct{}
var emptyRows noRows
var _ driver.Result = noRows{}
func (noRows) LastInsertId() (int64, error) {
return 0, errNoLastInsertID
}
func (noRows) RowsAffected() (int64, error) {
return 0, errNoRowsAffected
}
// Decides which column formats to use for a prepared statement. The input is // Decides which column formats to use for a prepared statement. The input is
// an array of type oids, one element per result column. // an array of type oids, one element per result column.
func decideColumnFormats(colTyps []fieldDesc, forceText bool) (colFmts []format, colFmtData []byte) { func decideColumnFormats(colTyps []oid.Oid, forceText bool) (colFmts []format, colFmtData []byte) {
if len(colTyps) == 0 { if len(colTyps) == 0 {
return nil, colFmtDataAllText return nil, colFmtDataAllText
} }
...@@ -743,8 +680,8 @@ func decideColumnFormats(colTyps []fieldDesc, forceText bool) (colFmts []format, ...@@ -743,8 +680,8 @@ func decideColumnFormats(colTyps []fieldDesc, forceText bool) (colFmts []format,
allBinary := true allBinary := true
allText := true allText := true
for i, t := range colTyps { for i, o := range colTyps {
switch t.OID { switch o {
// This is the list of types to use binary mode for when receiving them // This is the list of types to use binary mode for when receiving them
// through a prepared statement. If a type appears in this list, it // through a prepared statement. If a type appears in this list, it
// must also be implemented in binaryDecode in encode.go. // must also be implemented in binaryDecode in encode.go.
...@@ -755,8 +692,6 @@ func decideColumnFormats(colTyps []fieldDesc, forceText bool) (colFmts []format, ...@@ -755,8 +692,6 @@ func decideColumnFormats(colTyps []fieldDesc, forceText bool) (colFmts []format,
case oid.T_int4: case oid.T_int4:
fallthrough fallthrough
case oid.T_int2: case oid.T_int2:
fallthrough
case oid.T_uuid:
colFmts[i] = formatBinary colFmts[i] = formatBinary
allText = false allText = false
...@@ -808,45 +743,32 @@ func (cn *conn) Prepare(q string) (_ driver.Stmt, err error) { ...@@ -808,45 +743,32 @@ func (cn *conn) Prepare(q string) (_ driver.Stmt, err error) {
defer cn.errRecover(&err) defer cn.errRecover(&err)
if len(q) >= 4 && strings.EqualFold(q[:4], "COPY") { if len(q) >= 4 && strings.EqualFold(q[:4], "COPY") {
s, err := cn.prepareCopyIn(q) return cn.prepareCopyIn(q)
if err == nil {
cn.inCopy = true
}
return s, err
} }
return cn.prepareTo(q, cn.gname()), nil return cn.prepareTo(q, cn.gname()), nil
} }
func (cn *conn) Close() (err error) { func (cn *conn) Close() (err error) {
// Skip cn.bad return here because we always want to close a connection. if cn.bad {
defer cn.errRecover(&err) return driver.ErrBadConn
// Ensure that cn.c.Close is always run. Since error handling is done with
// panics and cn.errRecover, the Close must be in a defer.
defer func() {
cerr := cn.c.Close()
if err == nil {
err = cerr
} }
}() defer cn.errRecover(&err)
// Don't go through send(); ListenerConn relies on us not scribbling on the // Don't go through send(); ListenerConn relies on us not scribbling on the
// scratch buffer of this connection. // scratch buffer of this connection.
return cn.sendSimpleMessage('X') err = cn.sendSimpleMessage('X')
} if err != nil {
return err
}
// Implement the "Queryer" interface return cn.c.Close()
func (cn *conn) Query(query string, args []driver.Value) (driver.Rows, error) {
return cn.query(query, args)
} }
func (cn *conn) query(query string, args []driver.Value) (_ *rows, err error) { // Implement the "Queryer" interface
func (cn *conn) Query(query string, args []driver.Value) (_ driver.Rows, err error) {
if cn.bad { if cn.bad {
return nil, driver.ErrBadConn return nil, driver.ErrBadConn
} }
if cn.inCopy {
return nil, errCopyInProgress
}
defer cn.errRecover(&err) defer cn.errRecover(&err)
// Check to see if we can use the "simpleQuery" interface, which is // Check to see if we can use the "simpleQuery" interface, which is
...@@ -864,7 +786,7 @@ func (cn *conn) query(query string, args []driver.Value) (_ *rows, err error) { ...@@ -864,7 +786,7 @@ func (cn *conn) query(query string, args []driver.Value) (_ *rows, err error) {
rows.colNames, rows.colFmts, rows.colTyps = cn.readPortalDescribeResponse() rows.colNames, rows.colFmts, rows.colTyps = cn.readPortalDescribeResponse()
cn.postExecuteWorkaround() cn.postExecuteWorkaround()
return rows, nil return rows, nil
} } else {
st := cn.prepareTo(query, "") st := cn.prepareTo(query, "")
st.exec(args) st.exec(args)
return &rows{ return &rows{
...@@ -873,6 +795,7 @@ func (cn *conn) query(query string, args []driver.Value) (_ *rows, err error) { ...@@ -873,6 +795,7 @@ func (cn *conn) query(query string, args []driver.Value) (_ *rows, err error) {
colTyps: st.colTyps, colTyps: st.colTyps,
colFmts: st.colFmts, colFmts: st.colFmts,
}, nil }, nil
}
} }
// Implement the optional "Execer" interface for one-shot queries // Implement the optional "Execer" interface for one-shot queries
...@@ -899,7 +822,7 @@ func (cn *conn) Exec(query string, args []driver.Value) (res driver.Result, err ...@@ -899,7 +822,7 @@ func (cn *conn) Exec(query string, args []driver.Value) (res driver.Result, err
cn.postExecuteWorkaround() cn.postExecuteWorkaround()
res, _, err = cn.readExecuteResponse("Execute") res, _, err = cn.readExecuteResponse("Execute")
return res, err return res, err
} } else {
// Use the unnamed statement to defer planning until bind // Use the unnamed statement to defer planning until bind
// time, or else value-based selectivity estimates cannot be // time, or else value-based selectivity estimates cannot be
// used. // used.
...@@ -909,6 +832,7 @@ func (cn *conn) Exec(query string, args []driver.Value) (res driver.Result, err ...@@ -909,6 +832,7 @@ func (cn *conn) Exec(query string, args []driver.Value) (res driver.Result, err
panic(err) panic(err)
} }
return r, err return r, err
}
} }
func (cn *conn) send(m *writeBuf) { func (cn *conn) send(m *writeBuf) {
...@@ -918,9 +842,16 @@ func (cn *conn) send(m *writeBuf) { ...@@ -918,9 +842,16 @@ func (cn *conn) send(m *writeBuf) {
} }
} }
func (cn *conn) sendStartupPacket(m *writeBuf) error { func (cn *conn) sendStartupPacket(m *writeBuf) {
// sanity check
if m.buf[0] != 0 {
panic("oops")
}
_, err := cn.c.Write((m.wrap())[1:]) _, err := cn.c.Write((m.wrap())[1:])
return err if err != nil {
panic(err)
}
} }
// Send a message of type typ to the server on the other end of cn. The // Send a message of type typ to the server on the other end of cn. The
...@@ -1033,35 +964,165 @@ func (cn *conn) recv1() (t byte, r *readBuf) { ...@@ -1033,35 +964,165 @@ func (cn *conn) recv1() (t byte, r *readBuf) {
return t, r return t, r
} }
func (cn *conn) ssl(o values) error { func (cn *conn) ssl(o values) {
upgrade, err := ssl(o) verifyCaOnly := false
if err != nil { tlsConf := tls.Config{}
return err switch mode := o.Get("sslmode"); mode {
// "require" is the default.
case "", "require":
// We must skip TLS's own verification since it requires full
// verification since Go 1.3.
tlsConf.InsecureSkipVerify = true
// From http://www.postgresql.org/docs/current/static/libpq-ssl.html:
// Note: For backwards compatibility with earlier versions of PostgreSQL, if a
// root CA file exists, the behavior of sslmode=require will be the same as
// that of verify-ca, meaning the server certificate is validated against the
// CA. Relying on this behavior is discouraged, and applications that need
// certificate validation should always use verify-ca or verify-full.
if _, err := os.Stat(o.Get("sslrootcert")); err == nil {
verifyCaOnly = true
} else {
o.Set("sslrootcert", "")
}
case "verify-ca":
// We must skip TLS's own verification since it requires full
// verification since Go 1.3.
tlsConf.InsecureSkipVerify = true
verifyCaOnly = true
case "verify-full":
tlsConf.ServerName = o.Get("host")
case "disable":
return
default:
errorf(`unsupported sslmode %q; only "require" (default), "verify-full", "verify-ca", and "disable" supported`, mode)
} }
if upgrade == nil { cn.setupSSLClientCertificates(&tlsConf, o)
// Nothing to do cn.setupSSLCA(&tlsConf, o)
return nil
}
w := cn.writeBuf(0) w := cn.writeBuf(0)
w.int32(80877103) w.int32(80877103)
if err = cn.sendStartupPacket(w); err != nil { cn.sendStartupPacket(w)
return err
}
b := cn.scratch[:1] b := cn.scratch[:1]
_, err = io.ReadFull(cn.c, b) _, err := io.ReadFull(cn.c, b)
if err != nil { if err != nil {
return err panic(err)
} }
if b[0] != 'S' { if b[0] != 'S' {
return ErrSSLNotSupported panic(ErrSSLNotSupported)
} }
cn.c, err = upgrade(cn.c) client := tls.Client(cn.c, &tlsConf)
return err if verifyCaOnly {
cn.verifyCA(client, &tlsConf)
}
cn.c = client
}
// verifyCA carries out a TLS handshake to the server and verifies the
// presented certificate against the effective CA, i.e. the one specified in
// sslrootcert or the system CA if sslrootcert was not specified.
func (cn *conn) verifyCA(client *tls.Conn, tlsConf *tls.Config) {
err := client.Handshake()
if err != nil {
panic(err)
}
certs := client.ConnectionState().PeerCertificates
opts := x509.VerifyOptions{
DNSName: client.ConnectionState().ServerName,
Intermediates: x509.NewCertPool(),
Roots: tlsConf.RootCAs,
}
for i, cert := range certs {
if i == 0 {
continue
}
opts.Intermediates.AddCert(cert)
}
_, err = certs[0].Verify(opts)
if err != nil {
panic(err)
}
}
// This function sets up SSL client certificates based on either the "sslkey"
// and "sslcert" settings (possibly set via the environment variables PGSSLKEY
// and PGSSLCERT, respectively), or if they aren't set, from the .postgresql
// directory in the user's home directory. If the file paths are set
// explicitly, the files must exist. The key file must also not be
// world-readable, or this function will panic with
// ErrSSLKeyHasWorldPermissions.
func (cn *conn) setupSSLClientCertificates(tlsConf *tls.Config, o values) {
var missingOk bool
sslkey := o.Get("sslkey")
sslcert := o.Get("sslcert")
if sslkey != "" && sslcert != "" {
// If the user has set an sslkey and sslcert, they *must* exist.
missingOk = false
} else {
// Automatically load certificates from ~/.postgresql.
user, err := user.Current()
if err != nil {
// user.Current() might fail when cross-compiling. We have to
// ignore the error and continue without client certificates, since
// we wouldn't know where to load them from.
return
}
sslkey = filepath.Join(user.HomeDir, ".postgresql", "postgresql.key")
sslcert = filepath.Join(user.HomeDir, ".postgresql", "postgresql.crt")
missingOk = true
}
// Check that both files exist, and report the error or stop, depending on
// which behaviour we want. Note that we don't do any more extensive
// checks than this (such as checking that the paths aren't directories);
// LoadX509KeyPair() will take care of the rest.
keyfinfo, err := os.Stat(sslkey)
if err != nil && missingOk {
return
} else if err != nil {
panic(err)
}
_, err = os.Stat(sslcert)
if err != nil && missingOk {
return
} else if err != nil {
panic(err)
}
// If we got this far, the key file must also have the correct permissions
kmode := keyfinfo.Mode()
if kmode != kmode&0600 {
panic(ErrSSLKeyHasWorldPermissions)
}
cert, err := tls.LoadX509KeyPair(sslcert, sslkey)
if err != nil {
panic(err)
}
tlsConf.Certificates = []tls.Certificate{cert}
}
// Sets up RootCAs in the TLS configuration if sslrootcert is set.
func (cn *conn) setupSSLCA(tlsConf *tls.Config, o values) {
if sslrootcert := o.Get("sslrootcert"); sslrootcert != "" {
tlsConf.RootCAs = x509.NewCertPool()
cert, err := ioutil.ReadFile(sslrootcert)
if err != nil {
panic(err)
}
ok := tlsConf.RootCAs.AppendCertsFromPEM(cert)
if !ok {
errorf("couldn't parse pem in sslrootcert")
}
}
} }
// isDriverSetting returns true iff a setting is purely for configuring the // isDriverSetting returns true iff a setting is purely for configuring the
...@@ -1110,15 +1171,12 @@ func (cn *conn) startup(o values) { ...@@ -1110,15 +1171,12 @@ func (cn *conn) startup(o values) {
w.string(v) w.string(v)
} }
w.string("") w.string("")
if err := cn.sendStartupPacket(w); err != nil { cn.sendStartupPacket(w)
panic(err)
}
for { for {
t, r := cn.recv() t, r := cn.recv()
switch t { switch t {
case 'K': case 'K':
cn.processBackendKeyData(r)
case 'S': case 'S':
cn.processParameterStatus(r) cn.processParameterStatus(r)
case 'R': case 'R':
...@@ -1138,7 +1196,7 @@ func (cn *conn) auth(r *readBuf, o values) { ...@@ -1138,7 +1196,7 @@ func (cn *conn) auth(r *readBuf, o values) {
// OK // OK
case 3: case 3:
w := cn.writeBuf('p') w := cn.writeBuf('p')
w.string(o["password"]) w.string(o.Get("password"))
cn.send(w) cn.send(w)
t, r := cn.recv() t, r := cn.recv()
...@@ -1152,7 +1210,7 @@ func (cn *conn) auth(r *readBuf, o values) { ...@@ -1152,7 +1210,7 @@ func (cn *conn) auth(r *readBuf, o values) {
case 5: case 5:
s := string(r.next(4)) s := string(r.next(4))
w := cn.writeBuf('p') w := cn.writeBuf('p')
w.string("md5" + md5s(md5s(o["password"]+o["user"])+s)) w.string("md5" + md5s(md5s(o.Get("password")+o.Get("user"))+s))
cn.send(w) cn.send(w)
t, r := cn.recv() t, r := cn.recv()
...@@ -1174,10 +1232,10 @@ const formatText format = 0 ...@@ -1174,10 +1232,10 @@ const formatText format = 0
const formatBinary format = 1 const formatBinary format = 1
// One result-column format code with the value 1 (i.e. all binary). // One result-column format code with the value 1 (i.e. all binary).
var colFmtDataAllBinary = []byte{0, 1, 0, 1} var colFmtDataAllBinary []byte = []byte{0, 1, 0, 1}
// No result-column format codes (i.e. all text). // No result-column format codes (i.e. all text).
var colFmtDataAllText = []byte{0, 0} var colFmtDataAllText []byte = []byte{0, 0}
type stmt struct { type stmt struct {
cn *conn cn *conn
...@@ -1185,7 +1243,7 @@ type stmt struct { ...@@ -1185,7 +1243,7 @@ type stmt struct {
colNames []string colNames []string
colFmts []format colFmts []format
colFmtData []byte colFmtData []byte
colTyps []fieldDesc colTyps []oid.Oid
paramTyps []oid.Oid paramTyps []oid.Oid
closed bool closed bool
} }
...@@ -1346,32 +1404,21 @@ func (cn *conn) parseComplete(commandTag string) (driver.Result, string) { ...@@ -1346,32 +1404,21 @@ func (cn *conn) parseComplete(commandTag string) (driver.Result, string) {
type rows struct { type rows struct {
cn *conn cn *conn
finish func()
colNames []string colNames []string
colTyps []fieldDesc colTyps []oid.Oid
colFmts []format colFmts []format
done bool done bool
rb readBuf rb readBuf
result driver.Result
tag string
} }
func (rs *rows) Close() error { func (rs *rows) Close() error {
if finish := rs.finish; finish != nil {
defer finish()
}
// no need to look at cn.bad as Next() will // no need to look at cn.bad as Next() will
for { for {
err := rs.Next(nil) err := rs.Next(nil)
switch err { switch err {
case nil: case nil:
case io.EOF: case io.EOF:
// rs.Next can return io.EOF on both 'Z' (ready for query) and 'T' (row
// description, used with HasNextResultSet). We need to fetch messages until
// we hit a 'Z', which is done by waiting for done to be set.
if rs.done {
return nil return nil
}
default: default:
return err return err
} }
...@@ -1382,17 +1429,6 @@ func (rs *rows) Columns() []string { ...@@ -1382,17 +1429,6 @@ func (rs *rows) Columns() []string {
return rs.colNames return rs.colNames
} }
func (rs *rows) Result() driver.Result {
if rs.result == nil {
return emptyRows
}
return rs.result
}
func (rs *rows) Tag() string {
return rs.tag
}
func (rs *rows) Next(dest []driver.Value) (err error) { func (rs *rows) Next(dest []driver.Value) (err error) {
if rs.done { if rs.done {
return io.EOF return io.EOF
...@@ -1410,9 +1446,6 @@ func (rs *rows) Next(dest []driver.Value) (err error) { ...@@ -1410,9 +1446,6 @@ func (rs *rows) Next(dest []driver.Value) (err error) {
case 'E': case 'E':
err = parseError(&rs.rb) err = parseError(&rs.rb)
case 'C', 'I': case 'C', 'I':
if t == 'C' {
rs.result, rs.tag = conn.parseComplete(rs.rb.string())
}
continue continue
case 'Z': case 'Z':
conn.processReadyForQuery(&rs.rb) conn.processReadyForQuery(&rs.rb)
...@@ -1436,33 +1469,21 @@ func (rs *rows) Next(dest []driver.Value) (err error) { ...@@ -1436,33 +1469,21 @@ func (rs *rows) Next(dest []driver.Value) (err error) {
dest[i] = nil dest[i] = nil
continue continue
} }
dest[i] = decode(&conn.parameterStatus, rs.rb.next(l), rs.colTyps[i].OID, rs.colFmts[i]) dest[i] = decode(&conn.parameterStatus, rs.rb.next(l), rs.colTyps[i], rs.colFmts[i])
} }
return return
case 'T':
rs.colNames, rs.colFmts, rs.colTyps = parsePortalRowDescribe(&rs.rb)
return io.EOF
default: default:
errorf("unexpected message after execute: %q", t) errorf("unexpected message after execute: %q", t)
} }
} }
} }
func (rs *rows) HasNextResultSet() bool {
return !rs.done
}
func (rs *rows) NextResultSet() error {
return nil
}
// QuoteIdentifier quotes an "identifier" (e.g. a table or a column name) to be // QuoteIdentifier quotes an "identifier" (e.g. a table or a column name) to be
// used as part of an SQL statement. For example: // used as part of an SQL statement. For example:
// //
// tblname := "my_table" // tblname := "my_table"
// data := "my_data" // data := "my_data"
// quoted := pq.QuoteIdentifier(tblname) // err = db.Exec(fmt.Sprintf("INSERT INTO %s VALUES ($1)", pq.QuoteIdentifier(tblname)), data)
// err := db.Exec(fmt.Sprintf("INSERT INTO %s VALUES ($1)", quoted), data)
// //
// Any double quotes in name will be escaped. The quoted identifier will be // Any double quotes in name will be escaped. The quoted identifier will be
// case sensitive when used in a query. If the input string contains a zero // case sensitive when used in a query. If the input string contains a zero
...@@ -1543,7 +1564,7 @@ func (cn *conn) sendBinaryModeQuery(query string, args []driver.Value) { ...@@ -1543,7 +1564,7 @@ func (cn *conn) sendBinaryModeQuery(query string, args []driver.Value) {
cn.send(b) cn.send(b)
} }
func (cn *conn) processParameterStatus(r *readBuf) { func (c *conn) processParameterStatus(r *readBuf) {
var err error var err error
param := r.string() param := r.string()
...@@ -1554,13 +1575,13 @@ func (cn *conn) processParameterStatus(r *readBuf) { ...@@ -1554,13 +1575,13 @@ func (cn *conn) processParameterStatus(r *readBuf) {
var minor int var minor int
_, err = fmt.Sscanf(r.string(), "%d.%d.%d", &major1, &major2, &minor) _, err = fmt.Sscanf(r.string(), "%d.%d.%d", &major1, &major2, &minor)
if err == nil { if err == nil {
cn.parameterStatus.serverVersion = major1*10000 + major2*100 + minor c.parameterStatus.serverVersion = major1*10000 + major2*100 + minor
} }
case "TimeZone": case "TimeZone":
cn.parameterStatus.currentLocation, err = time.LoadLocation(r.string()) c.parameterStatus.currentLocation, err = time.LoadLocation(r.string())
if err != nil { if err != nil {
cn.parameterStatus.currentLocation = nil c.parameterStatus.currentLocation = nil
} }
default: default:
...@@ -1568,8 +1589,8 @@ func (cn *conn) processParameterStatus(r *readBuf) { ...@@ -1568,8 +1589,8 @@ func (cn *conn) processParameterStatus(r *readBuf) {
} }
} }
func (cn *conn) processReadyForQuery(r *readBuf) { func (c *conn) processReadyForQuery(r *readBuf) {
cn.txnStatus = transactionStatus(r.byte()) c.txnStatus = transactionStatus(r.byte())
} }
func (cn *conn) readReadyForQuery() { func (cn *conn) readReadyForQuery() {
...@@ -1584,11 +1605,6 @@ func (cn *conn) readReadyForQuery() { ...@@ -1584,11 +1605,6 @@ func (cn *conn) readReadyForQuery() {
} }
} }
func (cn *conn) processBackendKeyData(r *readBuf) {
cn.processID = r.int32()
cn.secretKey = r.int32()
}
func (cn *conn) readParseResponse() { func (cn *conn) readParseResponse() {
t, r := cn.recv1() t, r := cn.recv1()
switch t { switch t {
...@@ -1604,7 +1620,7 @@ func (cn *conn) readParseResponse() { ...@@ -1604,7 +1620,7 @@ func (cn *conn) readParseResponse() {
} }
} }
func (cn *conn) readStatementDescribeResponse() (paramTyps []oid.Oid, colNames []string, colTyps []fieldDesc) { func (cn *conn) readStatementDescribeResponse() (paramTyps []oid.Oid, colNames []string, colTyps []oid.Oid) {
for { for {
t, r := cn.recv1() t, r := cn.recv1()
switch t { switch t {
...@@ -1630,7 +1646,7 @@ func (cn *conn) readStatementDescribeResponse() (paramTyps []oid.Oid, colNames [ ...@@ -1630,7 +1646,7 @@ func (cn *conn) readStatementDescribeResponse() (paramTyps []oid.Oid, colNames [
} }
} }
func (cn *conn) readPortalDescribeResponse() (colNames []string, colFmts []format, colTyps []fieldDesc) { func (cn *conn) readPortalDescribeResponse() (colNames []string, colFmts []format, colTyps []oid.Oid) {
t, r := cn.recv1() t, r := cn.recv1()
switch t { switch t {
case 'T': case 'T':
...@@ -1704,9 +1720,6 @@ func (cn *conn) readExecuteResponse(protocolState string) (res driver.Result, co ...@@ -1704,9 +1720,6 @@ func (cn *conn) readExecuteResponse(protocolState string) (res driver.Result, co
res, commandTag = cn.parseComplete(r.string()) res, commandTag = cn.parseComplete(r.string())
case 'Z': case 'Z':
cn.processReadyForQuery(r) cn.processReadyForQuery(r)
if res == nil && err == nil {
err = errUnexpectedReady
}
return res, commandTag, err return res, commandTag, err
case 'E': case 'E':
err = parseError(r) err = parseError(r)
...@@ -1715,9 +1728,6 @@ func (cn *conn) readExecuteResponse(protocolState string) (res driver.Result, co ...@@ -1715,9 +1728,6 @@ func (cn *conn) readExecuteResponse(protocolState string) (res driver.Result, co
cn.bad = true cn.bad = true
errorf("unexpected %q after error %s", t, err) errorf("unexpected %q after error %s", t, err)
} }
if t == 'I' {
res = emptyRows
}
// ignore any results // ignore any results
default: default:
cn.bad = true cn.bad = true
...@@ -1726,33 +1736,31 @@ func (cn *conn) readExecuteResponse(protocolState string) (res driver.Result, co ...@@ -1726,33 +1736,31 @@ func (cn *conn) readExecuteResponse(protocolState string) (res driver.Result, co
} }
} }
func parseStatementRowDescribe(r *readBuf) (colNames []string, colTyps []fieldDesc) { func parseStatementRowDescribe(r *readBuf) (colNames []string, colTyps []oid.Oid) {
n := r.int16() n := r.int16()
colNames = make([]string, n) colNames = make([]string, n)
colTyps = make([]fieldDesc, n) colTyps = make([]oid.Oid, n)
for i := range colNames { for i := range colNames {
colNames[i] = r.string() colNames[i] = r.string()
r.next(6) r.next(6)
colTyps[i].OID = r.oid() colTyps[i] = r.oid()
colTyps[i].Len = r.int16() r.next(6)
colTyps[i].Mod = r.int32()
// format code not known when describing a statement; always 0 // format code not known when describing a statement; always 0
r.next(2) r.next(2)
} }
return return
} }
func parsePortalRowDescribe(r *readBuf) (colNames []string, colFmts []format, colTyps []fieldDesc) { func parsePortalRowDescribe(r *readBuf) (colNames []string, colFmts []format, colTyps []oid.Oid) {
n := r.int16() n := r.int16()
colNames = make([]string, n) colNames = make([]string, n)
colFmts = make([]format, n) colFmts = make([]format, n)
colTyps = make([]fieldDesc, n) colTyps = make([]oid.Oid, n)
for i := range colNames { for i := range colNames {
colNames[i] = r.string() colNames[i] = r.string()
r.next(6) r.next(6)
colTyps[i].OID = r.oid() colTyps[i] = r.oid()
colTyps[i].Len = r.int16() r.next(6)
colTyps[i].Mod = r.int32()
colFmts[i] = format(r.int16()) colFmts[i] = format(r.int16())
} }
return return
......
vendor/github.com/lib/pq/conn_go18.go deleted 100644 → 0
View file @ f3acec0b
package pq
import (
"context"
"database/sql"
"database/sql/driver"
"fmt"
"io"
"io/ioutil"
)
// Implement the "QueryerContext" interface
func (cn *conn) QueryContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Rows, error) {
list := make([]driver.Value, len(args))
for i, nv := range args {
list[i] = nv.Value
}
finish := cn.watchCancel(ctx)
r, err := cn.query(query, list)
if err != nil {
if finish != nil {
finish()
}
return nil, err
}
r.finish = finish
return r, nil
}
// Implement the "ExecerContext" interface
func (cn *conn) ExecContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Result, error) {
list := make([]driver.Value, len(args))
for i, nv := range args {
list[i] = nv.Value
}
if finish := cn.watchCancel(ctx); finish != nil {
defer finish()
}
return cn.Exec(query, list)
}
// Implement the "ConnBeginTx" interface
func (cn *conn) BeginTx(ctx context.Context, opts driver.TxOptions) (driver.Tx, error) {
var mode string
switch sql.IsolationLevel(opts.Isolation) {
case sql.LevelDefault:
// Don't touch mode: use the server's default
case sql.LevelReadUncommitted:
mode = " ISOLATION LEVEL READ UNCOMMITTED"
case sql.LevelReadCommitted:
mode = " ISOLATION LEVEL READ COMMITTED"
case sql.LevelRepeatableRead:
mode = " ISOLATION LEVEL REPEATABLE READ"
case sql.LevelSerializable:
mode = " ISOLATION LEVEL SERIALIZABLE"
default:
return nil, fmt.Errorf("pq: isolation level not supported: %d", opts.Isolation)
}
if opts.ReadOnly {
mode += " READ ONLY"
} else {
mode += " READ WRITE"
}
tx, err := cn.begin(mode)
if err != nil {
return nil, err
}
cn.txnFinish = cn.watchCancel(ctx)
return tx, nil
}
func (cn *conn) watchCancel(ctx context.Context) func() {
if done := ctx.Done(); done != nil {
finished := make(chan struct{})
go func() {
select {
case <-done:
_ = cn.cancel()
finished <- struct{}{}
case <-finished:
}
}()
return func() {
select {
case <-finished:
case finished <- struct{}{}:
}
}
}
return nil
}
func (cn *conn) cancel() error {
c, err := dial(cn.dialer, cn.opts)
if err != nil {
return err
}
defer c.Close()
{
can := conn{
c: c,
}
err = can.ssl(cn.opts)
if err != nil {
return err
}
w := can.writeBuf(0)
w.int32(80877102) // cancel request code
w.int32(cn.processID)
w.int32(cn.secretKey)
if err := can.sendStartupPacket(w); err != nil {
return err
}
}
// Read until EOF to ensure that the server received the cancel.
{
_, err := io.Copy(ioutil.Discard, c)
return err
}
}
vendor/github.com/lib/pq/connector.go deleted 100644 → 0
View file @ f3acec0b
// +build go1.10
package pq
import (
"context"
"database/sql/driver"
)
// Connector represents a fixed configuration for the pq driver with a given
// name. Connector satisfies the database/sql/driver Connector interface and
// can be used to create any number of DB Conn's via the database/sql OpenDB
// function.
//
// See https://golang.org/pkg/database/sql/driver/#Connector.
// See https://golang.org/pkg/database/sql/#OpenDB.
type connector struct {
name string
}
// Connect returns a connection to the database using the fixed configuration
// of this Connector. Context is not used.
func (c *connector) Connect(_ context.Context) (driver.Conn, error) {
return (&Driver{}).Open(c.name)
}
// Driver returnst the underlying driver of this Connector.
func (c *connector) Driver() driver.Driver {
return &Driver{}
}
var _ driver.Connector = &connector{}
// NewConnector returns a connector for the pq driver in a fixed configuration
// with the given name. The returned connector can be used to create any number
// of equivalent Conn's. The returned connector is intended to be used with
// database/sql.OpenDB.
//
// See https://golang.org/pkg/database/sql/driver/#Connector.
// See https://golang.org/pkg/database/sql/#OpenDB.
func NewConnector(name string) (driver.Connector, error) {
return &connector{name: name}, nil
}
vendor/github.com/lib/pq/copy.go
View file @ 8f3cca7b
...@@ -13,7 +13,6 @@ var ( ...@@ -13,7 +13,6 @@ var (
errBinaryCopyNotSupported = errors.New("pq: only text format supported for COPY") errBinaryCopyNotSupported = errors.New("pq: only text format supported for COPY")
errCopyToNotSupported = errors.New("pq: COPY TO is not supported") errCopyToNotSupported = errors.New("pq: COPY TO is not supported")
errCopyNotSupportedOutsideTxn = errors.New("pq: COPY is only allowed inside a transaction") errCopyNotSupportedOutsideTxn = errors.New("pq: COPY is only allowed inside a transaction")
errCopyInProgress = errors.New("pq: COPY in progress")
) )
// CopyIn creates a COPY FROM statement which can be prepared with // CopyIn creates a COPY FROM statement which can be prepared with
...@@ -97,13 +96,13 @@ awaitCopyInResponse: ...@@ -97,13 +96,13 @@ awaitCopyInResponse:
err = parseError(r) err = parseError(r)
case 'Z': case 'Z':
if err == nil { if err == nil {
ci.setBad() cn.bad = true
errorf("unexpected ReadyForQuery in response to COPY") errorf("unexpected ReadyForQuery in response to COPY")
} }
cn.processReadyForQuery(r) cn.processReadyForQuery(r)
return nil, err return nil, err
default: default:
ci.setBad() cn.bad = true
errorf("unknown response for copy query: %q", t) errorf("unknown response for copy query: %q", t)
} }
} }
...@@ -122,7 +121,7 @@ awaitCopyInResponse: ...@@ -122,7 +121,7 @@ awaitCopyInResponse:
cn.processReadyForQuery(r) cn.processReadyForQuery(r)
return nil, err return nil, err
default: default:
ci.setBad() cn.bad = true
errorf("unknown response for CopyFail: %q", t) errorf("unknown response for CopyFail: %q", t)
} }
} }
...@@ -143,7 +142,7 @@ func (ci *copyin) resploop() { ...@@ -143,7 +142,7 @@ func (ci *copyin) resploop() {
var r readBuf var r readBuf
t, err := ci.cn.recvMessage(&r) t, err := ci.cn.recvMessage(&r)
if err != nil { if err != nil {
ci.setBad() ci.cn.bad = true
ci.setError(err) ci.setError(err)
ci.done <- true ci.done <- true
return return
...@@ -161,7 +160,7 @@ func (ci *copyin) resploop() { ...@@ -161,7 +160,7 @@ func (ci *copyin) resploop() {
err := parseError(&r) err := parseError(&r)
ci.setError(err) ci.setError(err)
default: default:
ci.setBad() ci.cn.bad = true
ci.setError(fmt.Errorf("unknown response during CopyIn: %q", t)) ci.setError(fmt.Errorf("unknown response during CopyIn: %q", t))
ci.done <- true ci.done <- true
return return
...@@ -169,19 +168,6 @@ func (ci *copyin) resploop() { ...@@ -169,19 +168,6 @@ func (ci *copyin) resploop() {
} }
} }
func (ci *copyin) setBad() {
ci.Lock()
ci.cn.bad = true
ci.Unlock()
}
func (ci *copyin) isBad() bool {
ci.Lock()
b := ci.cn.bad
ci.Unlock()
return b
}
func (ci *copyin) isErrorSet() bool { func (ci *copyin) isErrorSet() bool {
ci.Lock() ci.Lock()
isSet := (ci.err != nil) isSet := (ci.err != nil)
...@@ -219,7 +205,7 @@ func (ci *copyin) Exec(v []driver.Value) (r driver.Result, err error) { ...@@ -219,7 +205,7 @@ func (ci *copyin) Exec(v []driver.Value) (r driver.Result, err error) {
return nil, errCopyInClosed return nil, errCopyInClosed
} }
if ci.isBad() { if ci.cn.bad {
return nil, driver.ErrBadConn return nil, driver.ErrBadConn
} }
defer ci.cn.errRecover(&err) defer ci.cn.errRecover(&err)
...@@ -257,7 +243,7 @@ func (ci *copyin) Close() (err error) { ...@@ -257,7 +243,7 @@ func (ci *copyin) Close() (err error) {
} }
ci.closed = true ci.closed = true
if ci.isBad() { if ci.cn.bad {
return driver.ErrBadConn return driver.ErrBadConn
} }
defer ci.cn.errRecover(&err) defer ci.cn.errRecover(&err)
...@@ -272,7 +258,6 @@ func (ci *copyin) Close() (err error) { ...@@ -272,7 +258,6 @@ func (ci *copyin) Close() (err error) {
} }
<-ci.done <-ci.done
ci.cn.inCopy = false
if ci.isErrorSet() { if ci.isErrorSet() {
err = ci.err err = ci.err
......
vendor/github.com/lib/pq/doc.go
View file @ 8f3cca7b
...@@ -11,8 +11,7 @@ using this package directly. For example: ...@@ -11,8 +11,7 @@ using this package directly. For example:
) )
func main() { func main() {
connStr := "user=pqgotest dbname=pqgotest sslmode=verify-full" db, err := sql.Open("postgres", "user=pqgotest dbname=pqgotest sslmode=verify-full")
db, err := sql.Open("postgres", connStr)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
...@@ -24,8 +23,7 @@ using this package directly. For example: ...@@ -24,8 +23,7 @@ using this package directly. For example:
You can also connect to a database using a URL. For example: You can also connect to a database using a URL. For example:
connStr := "postgres://pqgotest:password@localhost/pqgotest?sslmode=verify-full" db, err := sql.Open("postgres", "postgres://pqgotest:password@localhost/pqgotest?sslmode=verify-full")
db, err := sql.Open("postgres", connStr)
Connection String Parameters Connection String Parameters
...@@ -45,28 +43,21 @@ supported: ...@@ -45,28 +43,21 @@ supported:
* dbname - The name of the database to connect to * dbname - The name of the database to connect to
* user - The user to sign in as * user - The user to sign in as
* password - The user's password * password - The user's password
* host - The host to connect to. Values that start with / are for unix * host - The host to connect to. Values that start with / are for unix domain sockets. (default is localhost)
domain sockets. (default is localhost)
* port - The port to bind to. (default is 5432) * port - The port to bind to. (default is 5432)
* sslmode - Whether or not to use SSL (default is require, this is not * sslmode - Whether or not to use SSL (default is require, this is not the default for libpq)
the default for libpq)
* fallback_application_name - An application_name to fall back to if one isn't provided. * fallback_application_name - An application_name to fall back to if one isn't provided.
* connect_timeout - Maximum wait for connection, in seconds. Zero or * connect_timeout - Maximum wait for connection, in seconds. Zero or not specified means wait indefinitely.
not specified means wait indefinitely.
* sslcert - Cert file location. The file must contain PEM encoded data. * sslcert - Cert file location. The file must contain PEM encoded data.
* sslkey - Key file location. The file must contain PEM encoded data. * sslkey - Key file location. The file must contain PEM encoded data.
* sslrootcert - The location of the root certificate file. The file * sslrootcert - The location of the root certificate file. The file must contain PEM encoded data.
must contain PEM encoded data.
Valid values for sslmode are: Valid values for sslmode are:
* disable - No SSL * disable - No SSL
* require - Always SSL (skip verification) * require - Always SSL (skip verification)
* verify-ca - Always SSL (verify that the certificate presented by the * verify-ca - Always SSL (verify that the certificate presented by the server was signed by a trusted CA)
server was signed by a trusted CA) * verify-full - Always SSL (verify that the certification presented by the server was signed by a trusted CA and the server host name matches the one in the certificate)
* verify-full - Always SSL (verify that the certification presented by
the server was signed by a trusted CA and the server host name
matches the one in the certificate)
See http://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-CONNSTRING See http://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-CONNSTRING
for more information about connection string parameters. for more information about connection string parameters.
...@@ -77,7 +68,7 @@ Use single quotes for values that contain whitespace: ...@@ -77,7 +68,7 @@ Use single quotes for values that contain whitespace:
A backslash will escape the next character in values: A backslash will escape the next character in values:
"user=space\ man password='it\'s valid'" "user=space\ man password='it\'s valid'
Note that the connection parameter client_encoding (which sets the Note that the connection parameter client_encoding (which sets the
text encoding for the connection) may be set but must be "UTF8", text encoding for the connection) may be set but must be "UTF8",
...@@ -98,10 +89,8 @@ provided connection parameters. ...@@ -98,10 +89,8 @@ provided connection parameters.
The pgpass mechanism as described in http://www.postgresql.org/docs/current/static/libpq-pgpass.html The pgpass mechanism as described in http://www.postgresql.org/docs/current/static/libpq-pgpass.html
is supported, but on Windows PGPASSFILE must be specified explicitly. is supported, but on Windows PGPASSFILE must be specified explicitly.
Queries Queries
database/sql does not dictate any specific format for parameter database/sql does not dictate any specific format for parameter
markers in query strings, and pq uses the Postgres-native ordinal markers, markers in query strings, and pq uses the Postgres-native ordinal markers,
as shown above. The same marker can be reused for the same parameter: as shown above. The same marker can be reused for the same parameter:
...@@ -125,30 +114,8 @@ For more details on RETURNING, see the Postgres documentation: ...@@ -125,30 +114,8 @@ For more details on RETURNING, see the Postgres documentation:
For additional instructions on querying see the documentation for the database/sql package. For additional instructions on querying see the documentation for the database/sql package.
Data Types
Parameters pass through driver.DefaultParameterConverter before they are handled
by this package. When the binary_parameters connection option is enabled,
[]byte values are sent directly to the backend as data in binary format.
This package returns the following types for values from the PostgreSQL backend:
- integer types smallint, integer, and bigint are returned as int64
- floating-point types real and double precision are returned as float64
- character types char, varchar, and text are returned as string
- temporal types date, time, timetz, timestamp, and timestamptz are
returned as time.Time
- the boolean type is returned as bool
- the bytea type is returned as []byte
All other types are returned directly from the backend as []byte values in text format.
Errors Errors
pq may return errors of type *pq.Error which can be interrogated for error details: pq may return errors of type *pq.Error which can be interrogated for error details:
if err, ok := err.(*pq.Error); ok { if err, ok := err.(*pq.Error); ok {
...@@ -239,7 +206,7 @@ for more information). Note that the channel name will be truncated to 63 ...@@ -239,7 +206,7 @@ for more information). Note that the channel name will be truncated to 63
bytes by the PostgreSQL server. bytes by the PostgreSQL server.
You can find a complete, working example of Listener usage at You can find a complete, working example of Listener usage at
https://godoc.org/github.com/lib/pq/example/listen. http://godoc.org/github.com/lib/pq/listen_example.
*/ */
package pq package pq
vendor/github.com/lib/pq/encode.go
View file @ 8f3cca7b
...@@ -76,12 +76,6 @@ func binaryDecode(parameterStatus *parameterStatus, s []byte, typ oid.Oid) inter ...@@ -76,12 +76,6 @@ func binaryDecode(parameterStatus *parameterStatus, s []byte, typ oid.Oid) inter
return int64(int32(binary.BigEndian.Uint32(s))) return int64(int32(binary.BigEndian.Uint32(s)))
case oid.T_int2: case oid.T_int2:
return int64(int16(binary.BigEndian.Uint16(s))) return int64(int16(binary.BigEndian.Uint16(s)))
case oid.T_uuid:
b, err := decodeUUIDBinary(s)
if err != nil {
panic(err)
}
return b
default: default:
errorf("don't know how to decode binary parameter of type %d", uint32(typ)) errorf("don't know how to decode binary parameter of type %d", uint32(typ))
...@@ -367,15 +361,8 @@ func ParseTimestamp(currentLocation *time.Location, str string) (time.Time, erro ...@@ -367,15 +361,8 @@ func ParseTimestamp(currentLocation *time.Location, str string) (time.Time, erro
timeSep := daySep + 3 timeSep := daySep + 3
day := p.mustAtoi(str, daySep+1, timeSep) day := p.mustAtoi(str, daySep+1, timeSep)
minLen := monSep + len("01-01") + 1
isBC := strings.HasSuffix(str, " BC")
if isBC {
minLen += 3
}
var hour, minute, second int var hour, minute, second int
if len(str) > minLen { if len(str) > monSep+len("01-01")+1 {
p.expect(str, ' ', timeSep) p.expect(str, ' ', timeSep)
minSep := timeSep + 3 minSep := timeSep + 3
p.expect(str, ':', minSep) p.expect(str, ':', minSep)
...@@ -431,8 +418,7 @@ func ParseTimestamp(currentLocation *time.Location, str string) (time.Time, erro ...@@ -431,8 +418,7 @@ func ParseTimestamp(currentLocation *time.Location, str string) (time.Time, erro
tzOff = tzSign * ((tzHours * 60 * 60) + (tzMin * 60) + tzSec) tzOff = tzSign * ((tzHours * 60 * 60) + (tzMin * 60) + tzSec)
} }
var isoYear int var isoYear int
if remainderIdx+3 <= len(str) && str[remainderIdx:remainderIdx+3] == " BC" {
if isBC {
isoYear = 1 - year isoYear = 1 - year
remainderIdx += 3 remainderIdx += 3
} else { } else {
...@@ -485,7 +471,7 @@ func FormatTimestamp(t time.Time) []byte { ...@@ -485,7 +471,7 @@ func FormatTimestamp(t time.Time) []byte {
t = t.AddDate((-t.Year())*2+1, 0, 0) t = t.AddDate((-t.Year())*2+1, 0, 0)
bc = true bc = true
} }
b := []byte(t.Format("2006-01-02 15:04:05.999999999Z07:00")) b := []byte(t.Format(time.RFC3339Nano))
_, offset := t.Zone() _, offset := t.Zone()
offset = offset % 60 offset = offset % 60
......
vendor/github.com/lib/pq/error.go
View file @ 8f3cca7b
...@@ -153,7 +153,6 @@ var errorCodeNames = map[ErrorCode]string{ ...@@ -153,7 +153,6 @@ var errorCodeNames = map[ErrorCode]string{
"22004": "null_value_not_allowed", "22004": "null_value_not_allowed",
"22002": "null_value_no_indicator_parameter", "22002": "null_value_no_indicator_parameter",
"22003": "numeric_value_out_of_range", "22003": "numeric_value_out_of_range",
"2200H": "sequence_generator_limit_exceeded",
"22026": "string_data_length_mismatch", "22026": "string_data_length_mismatch",
"22001": "string_data_right_truncation", "22001": "string_data_right_truncation",
"22011": "substring_error", "22011": "substring_error",
...@@ -460,11 +459,6 @@ func errorf(s string, args ...interface{}) { ...@@ -460,11 +459,6 @@ func errorf(s string, args ...interface{}) {
panic(fmt.Errorf("pq: %s", fmt.Sprintf(s, args...))) panic(fmt.Errorf("pq: %s", fmt.Sprintf(s, args...)))
} }
// TODO(ainar-g) Rename to errorf after removing panics.
func fmterrorf(s string, args ...interface{}) error {
return fmt.Errorf("pq: %s", fmt.Sprintf(s, args...))
}
func errRecoverNoErrBadConn(err *error) { func errRecoverNoErrBadConn(err *error) {
e := recover() e := recover()
if e == nil { if e == nil {
...@@ -493,8 +487,7 @@ func (c *conn) errRecover(err *error) { ...@@ -493,8 +487,7 @@ func (c *conn) errRecover(err *error) {
*err = v *err = v
} }
case *net.OpError: case *net.OpError:
c.bad = true *err = driver.ErrBadConn
*err = v
case error: case error:
if v == io.EOF || v.(error).Error() == "remote error: handshake failure" { if v == io.EOF || v.(error).Error() == "remote error: handshake failure" {
*err = driver.ErrBadConn *err = driver.ErrBadConn
......
vendor/github.com/lib/pq/notify.go
View file @ 8f3cca7b
...@@ -60,7 +60,7 @@ type ListenerConn struct { ...@@ -60,7 +60,7 @@ type ListenerConn struct {
replyChan chan message replyChan chan message
} }
// NewListenerConn creates a new ListenerConn. Use NewListener instead. // Creates a new ListenerConn. Use NewListener instead.
func NewListenerConn(name string, notificationChan chan<- *Notification) (*ListenerConn, error) { func NewListenerConn(name string, notificationChan chan<- *Notification) (*ListenerConn, error) {
return newDialListenerConn(defaultDialer{}, name, notificationChan) return newDialListenerConn(defaultDialer{}, name, notificationChan)
} }
...@@ -214,17 +214,17 @@ func (l *ListenerConn) listenerConnMain() { ...@@ -214,17 +214,17 @@ func (l *ListenerConn) listenerConnMain() {
// this ListenerConn is done // this ListenerConn is done
} }
// Listen sends a LISTEN query to the server. See ExecSimpleQuery. // Send a LISTEN query to the server. See ExecSimpleQuery.
func (l *ListenerConn) Listen(channel string) (bool, error) { func (l *ListenerConn) Listen(channel string) (bool, error) {
return l.ExecSimpleQuery("LISTEN " + QuoteIdentifier(channel)) return l.ExecSimpleQuery("LISTEN " + QuoteIdentifier(channel))
} }
// Unlisten sends an UNLISTEN query to the server. See ExecSimpleQuery. // Send an UNLISTEN query to the server. See ExecSimpleQuery.
func (l *ListenerConn) Unlisten(channel string) (bool, error) { func (l *ListenerConn) Unlisten(channel string) (bool, error) {
return l.ExecSimpleQuery("UNLISTEN " + QuoteIdentifier(channel)) return l.ExecSimpleQuery("UNLISTEN " + QuoteIdentifier(channel))
} }
// UnlistenAll sends an `UNLISTEN *` query to the server. See ExecSimpleQuery. // Send `UNLISTEN *` to the server. See ExecSimpleQuery.
func (l *ListenerConn) UnlistenAll() (bool, error) { func (l *ListenerConn) UnlistenAll() (bool, error) {
return l.ExecSimpleQuery("UNLISTEN *") return l.ExecSimpleQuery("UNLISTEN *")
} }
...@@ -267,8 +267,8 @@ func (l *ListenerConn) sendSimpleQuery(q string) (err error) { ...@@ -267,8 +267,8 @@ func (l *ListenerConn) sendSimpleQuery(q string) (err error) {
return nil return nil
} }
// ExecSimpleQuery executes a "simple query" (i.e. one with no bindable // Execute a "simple query" (i.e. one with no bindable parameters) on the
// parameters) on the connection. The possible return values are: // connection. The possible return values are:
// 1) "executed" is true; the query was executed to completion on the // 1) "executed" is true; the query was executed to completion on the
// database server. If the query failed, err will be set to the error // database server. If the query failed, err will be set to the error
// returned by the database, otherwise err will be nil. // returned by the database, otherwise err will be nil.
...@@ -333,7 +333,6 @@ func (l *ListenerConn) ExecSimpleQuery(q string) (executed bool, err error) { ...@@ -333,7 +333,6 @@ func (l *ListenerConn) ExecSimpleQuery(q string) (executed bool, err error) {
} }
} }
// Close closes the connection.
func (l *ListenerConn) Close() error { func (l *ListenerConn) Close() error {
l.connectionLock.Lock() l.connectionLock.Lock()
if l.err != nil { if l.err != nil {
...@@ -347,7 +346,7 @@ func (l *ListenerConn) Close() error { ...@@ -347,7 +346,7 @@ func (l *ListenerConn) Close() error {
return l.cn.c.Close() return l.cn.c.Close()
} }
// Err returns the reason the connection was closed. It is not safe to call // Err() returns the reason the connection was closed. It is not safe to call
// this function until l.Notify has been closed. // this function until l.Notify has been closed.
func (l *ListenerConn) Err() error { func (l *ListenerConn) Err() error {
return l.err return l.err
...@@ -355,43 +354,32 @@ func (l *ListenerConn) Err() error { ...@@ -355,43 +354,32 @@ func (l *ListenerConn) Err() error {
var errListenerClosed = errors.New("pq: Listener has been closed") var errListenerClosed = errors.New("pq: Listener has been closed")
// ErrChannelAlreadyOpen is returned from Listen when a channel is already
// open.
var ErrChannelAlreadyOpen = errors.New("pq: channel is already open") var ErrChannelAlreadyOpen = errors.New("pq: channel is already open")
// ErrChannelNotOpen is returned from Unlisten when a channel is not open.
var ErrChannelNotOpen = errors.New("pq: channel is not open") var ErrChannelNotOpen = errors.New("pq: channel is not open")
// ListenerEventType is an enumeration of listener event types.
type ListenerEventType int type ListenerEventType int
const ( const (
// ListenerEventConnected is emitted only when the database connection // Emitted only when the database connection has been initially
// has been initially initialized. The err argument of the callback // initialized. err will always be nil.
// will always be nil.
ListenerEventConnected ListenerEventType = iota ListenerEventConnected ListenerEventType = iota
// ListenerEventDisconnected is emitted after a database connection has // Emitted after a database connection has been lost, either because of an
// been lost, either because of an error or because Close has been // error or because Close has been called. err will be set to the reason
// called. The err argument will be set to the reason the database // the database connection was lost.
// connection was lost.
ListenerEventDisconnected ListenerEventDisconnected
// ListenerEventReconnected is emitted after a database connection has // Emitted after a database connection has been re-established after
// been re-established after connection loss. The err argument of the // connection loss. err will always be nil. After this event has been
// callback will always be nil. After this event has been emitted, a // emitted, a nil pq.Notification is sent on the Listener.Notify channel.
// nil pq.Notification is sent on the Listener.Notify channel.
ListenerEventReconnected ListenerEventReconnected
// ListenerEventConnectionAttemptFailed is emitted after a connection // Emitted after a connection to the database was attempted, but failed.
// to the database was attempted, but failed. The err argument will be // err will be set to an error describing why the connection attempt did
// set to an error describing why the connection attempt did not // not succeed.
// succeed.
ListenerEventConnectionAttemptFailed ListenerEventConnectionAttemptFailed
) )
// EventCallbackType is the event callback type. See also ListenerEventType
// constants' documentation.
type EventCallbackType func(event ListenerEventType, err error) type EventCallbackType func(event ListenerEventType, err error)
// Listener provides an interface for listening to notifications from a // Listener provides an interface for listening to notifications from a
...@@ -466,9 +454,9 @@ func NewDialListener(d Dialer, ...@@ -466,9 +454,9 @@ func NewDialListener(d Dialer,
return l return l
} }
// NotificationChannel returns the notification channel for this listener. // Returns the notification channel for this listener. This is the same
// This is the same channel as Notify, and will not be recreated during the // channel as Notify, and will not be recreated during the life time of the
// life time of the Listener. // Listener.
func (l *Listener) NotificationChannel() <-chan *Notification { func (l *Listener) NotificationChannel() <-chan *Notification {
return l.Notify return l.Notify
} }
...@@ -637,7 +625,7 @@ func (l *Listener) disconnectCleanup() error { ...@@ -637,7 +625,7 @@ func (l *Listener) disconnectCleanup() error {
// after the connection has been established. // after the connection has been established.
func (l *Listener) resync(cn *ListenerConn, notificationChan <-chan *Notification) error { func (l *Listener) resync(cn *ListenerConn, notificationChan <-chan *Notification) error {
doneChan := make(chan error) doneChan := make(chan error)
go func(notificationChan <-chan *Notification) { go func() {
for channel := range l.channels { for channel := range l.channels {
// If we got a response, return that error to our caller as it's // If we got a response, return that error to our caller as it's
// going to be more descriptive than cn.Err(). // going to be more descriptive than cn.Err().
...@@ -651,14 +639,14 @@ func (l *Listener) resync(cn *ListenerConn, notificationChan <-chan *Notificatio ...@@ -651,14 +639,14 @@ func (l *Listener) resync(cn *ListenerConn, notificationChan <-chan *Notificatio
// close and then return the error message from the connection, as // close and then return the error message from the connection, as
// per ListenerConn's interface. // per ListenerConn's interface.
if err != nil { if err != nil {
for range notificationChan { for _ = range notificationChan {
} }
doneChan <- cn.Err() doneChan <- cn.Err()
return return
} }
} }
doneChan <- nil doneChan <- nil
}(notificationChan) }()
// Ignore notifications while synchronization is going on to avoid // Ignore notifications while synchronization is going on to avoid
// deadlocks. We have to send a nil notification over Notify anyway as // deadlocks. We have to send a nil notification over Notify anyway as
...@@ -725,9 +713,6 @@ func (l *Listener) Close() error { ...@@ -725,9 +713,6 @@ func (l *Listener) Close() error {
} }
l.isClosed = true l.isClosed = true
// Unblock calls to Listen()
l.reconnectCond.Broadcast()
return nil return nil
} }
...@@ -787,7 +772,7 @@ func (l *Listener) listenerConnLoop() { ...@@ -787,7 +772,7 @@ func (l *Listener) listenerConnLoop() {
} }
l.emitEvent(ListenerEventDisconnected, err) l.emitEvent(ListenerEventDisconnected, err)
time.Sleep(time.Until(nextReconnect)) time.Sleep(nextReconnect.Sub(time.Now()))
} }
} }
......
vendor/github.com/lib/pq/oid/gen.go
View file @ 8f3cca7b
...@@ -10,22 +10,10 @@ import ( ...@@ -10,22 +10,10 @@ import (
"log" "log"
"os" "os"
"os/exec" "os/exec"
"strings"
_ "github.com/lib/pq" _ "github.com/lib/pq"
) )
// OID represent a postgres Object Identifier Type.
type OID struct {
ID int
Type string
}
// Name returns an upper case version of the oid type.
func (o OID) Name() string {
return strings.ToUpper(o.Type)
}
func main() { func main() {
datname := os.Getenv("PGDATABASE") datname := os.Getenv("PGDATABASE")
sslmode := os.Getenv("PGSSLMODE") sslmode := os.Getenv("PGSSLMODE")
...@@ -42,25 +30,6 @@ func main() { ...@@ -42,25 +30,6 @@ func main() {
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
rows, err := db.Query(`
SELECT typname, oid
FROM pg_type WHERE oid < 10000
ORDER BY oid;
`)
if err != nil {
log.Fatal(err)
}
oids := make([]*OID, 0)
for rows.Next() {
var oid OID
if err = rows.Scan(&oid.Type, &oid.ID); err != nil {
log.Fatal(err)
}
oids = append(oids, &oid)
}
if err = rows.Err(); err != nil {
log.Fatal(err)
}
cmd := exec.Command("gofmt") cmd := exec.Command("gofmt")
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
w, err := cmd.StdinPipe() w, err := cmd.StdinPipe()
...@@ -76,18 +45,30 @@ func main() { ...@@ -76,18 +45,30 @@ func main() {
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
fmt.Fprintln(w, "// Code generated by gen.go. DO NOT EDIT.") fmt.Fprintln(w, "// generated by 'go run gen.go'; do not edit")
fmt.Fprintln(w, "\npackage oid") fmt.Fprintln(w, "\npackage oid")
fmt.Fprintln(w, "const (") fmt.Fprintln(w, "const (")
for _, oid := range oids { rows, err := db.Query(`
fmt.Fprintf(w, "T_%s Oid = %d\n", oid.Type, oid.ID) SELECT typname, oid
FROM pg_type WHERE oid < 10000
ORDER BY oid;
`)
if err != nil {
log.Fatal(err)
} }
fmt.Fprintln(w, ")") var name string
fmt.Fprintln(w, "var TypeName = map[Oid]string{") var oid int
for _, oid := range oids { for rows.Next() {
fmt.Fprintf(w, "T_%s: \"%s\",\n", oid.Type, oid.Name()) err = rows.Scan(&name, &oid)
if err != nil {
log.Fatal(err)
}
fmt.Fprintf(w, "T_%s Oid = %d\n", name, oid)
} }
fmt.Fprintln(w, "}") if err = rows.Err(); err != nil {
log.Fatal(err)
}
fmt.Fprintln(w, ")")
w.Close() w.Close()
cmd.Wait() cmd.Wait()
} }
vendor/github.com/lib/pq/oid/types.go
View file @ 8f3cca7b
// Code generated by gen.go. DO NOT EDIT. // generated by 'go run gen.go'; do not edit
package oid package oid
...@@ -18,7 +18,6 @@ const ( ...@@ -18,7 +18,6 @@ const (
T_xid Oid = 28 T_xid Oid = 28
T_cid Oid = 29 T_cid Oid = 29
T_oidvector Oid = 30 T_oidvector Oid = 30
T_pg_ddl_command Oid = 32
T_pg_type Oid = 71 T_pg_type Oid = 71
T_pg_attribute Oid = 75 T_pg_attribute Oid = 75
T_pg_proc Oid = 81 T_pg_proc Oid = 81
...@@ -29,7 +28,6 @@ const ( ...@@ -29,7 +28,6 @@ const (
T_pg_node_tree Oid = 194 T_pg_node_tree Oid = 194
T__json Oid = 199 T__json Oid = 199
T_smgr Oid = 210 T_smgr Oid = 210
T_index_am_handler Oid = 325
T_point Oid = 600 T_point Oid = 600
T_lseg Oid = 601 T_lseg Oid = 601
T_path Oid = 602 T_path Oid = 602
...@@ -135,9 +133,6 @@ const ( ...@@ -135,9 +133,6 @@ const (
T__uuid Oid = 2951 T__uuid Oid = 2951
T_txid_snapshot Oid = 2970 T_txid_snapshot Oid = 2970
T_fdw_handler Oid = 3115 T_fdw_handler Oid = 3115
T_pg_lsn Oid = 3220
T__pg_lsn Oid = 3221
T_tsm_handler Oid = 3310
T_anyenum Oid = 3500 T_anyenum Oid = 3500
T_tsvector Oid = 3614 T_tsvector Oid = 3614
T_tsquery Oid = 3615 T_tsquery Oid = 3615
...@@ -149,8 +144,6 @@ const ( ...@@ -149,8 +144,6 @@ const (
T__regconfig Oid = 3735 T__regconfig Oid = 3735
T_regdictionary Oid = 3769 T_regdictionary Oid = 3769
T__regdictionary Oid = 3770 T__regdictionary Oid = 3770
T_jsonb Oid = 3802
T__jsonb Oid = 3807
T_anyrange Oid = 3831 T_anyrange Oid = 3831
T_event_trigger Oid = 3838 T_event_trigger Oid = 3838
T_int4range Oid = 3904 T_int4range Oid = 3904
...@@ -165,179 +158,4 @@ const ( ...@@ -165,179 +158,4 @@ const (
T__daterange Oid = 3913 T__daterange Oid = 3913
T_int8range Oid = 3926 T_int8range Oid = 3926
T__int8range Oid = 3927 T__int8range Oid = 3927
T_pg_shseclabel Oid = 4066
T_regnamespace Oid = 4089
T__regnamespace Oid = 4090
T_regrole Oid = 4096
T__regrole Oid = 4097
) )
var TypeName = map[Oid]string{
T_bool: "BOOL",
T_bytea: "BYTEA",
T_char: "CHAR",
T_name: "NAME",
T_int8: "INT8",
T_int2: "INT2",
T_int2vector: "INT2VECTOR",
T_int4: "INT4",
T_regproc: "REGPROC",
T_text: "TEXT",
T_oid: "OID",
T_tid: "TID",
T_xid: "XID",
T_cid: "CID",
T_oidvector: "OIDVECTOR",
T_pg_ddl_command: "PG_DDL_COMMAND",
T_pg_type: "PG_TYPE",
T_pg_attribute: "PG_ATTRIBUTE",
T_pg_proc: "PG_PROC",
T_pg_class: "PG_CLASS",
T_json: "JSON",
T_xml: "XML",
T__xml: "_XML",
T_pg_node_tree: "PG_NODE_TREE",
T__json: "_JSON",
T_smgr: "SMGR",
T_index_am_handler: "INDEX_AM_HANDLER",
T_point: "POINT",
T_lseg: "LSEG",
T_path: "PATH",
T_box: "BOX",
T_polygon: "POLYGON",
T_line: "LINE",
T__line: "_LINE",
T_cidr: "CIDR",
T__cidr: "_CIDR",
T_float4: "FLOAT4",
T_float8: "FLOAT8",
T_abstime: "ABSTIME",
T_reltime: "RELTIME",
T_tinterval: "TINTERVAL",
T_unknown: "UNKNOWN",
T_circle: "CIRCLE",
T__circle: "_CIRCLE",
T_money: "MONEY",
T__money: "_MONEY",
T_macaddr: "MACADDR",
T_inet: "INET",
T__bool: "_BOOL",
T__bytea: "_BYTEA",
T__char: "_CHAR",
T__name: "_NAME",
T__int2: "_INT2",
T__int2vector: "_INT2VECTOR",
T__int4: "_INT4",
T__regproc: "_REGPROC",
T__text: "_TEXT",
T__tid: "_TID",
T__xid: "_XID",
T__cid: "_CID",
T__oidvector: "_OIDVECTOR",
T__bpchar: "_BPCHAR",
T__varchar: "_VARCHAR",
T__int8: "_INT8",
T__point: "_POINT",
T__lseg: "_LSEG",
T__path: "_PATH",
T__box: "_BOX",
T__float4: "_FLOAT4",
T__float8: "_FLOAT8",
T__abstime: "_ABSTIME",
T__reltime: "_RELTIME",
T__tinterval: "_TINTERVAL",
T__polygon: "_POLYGON",
T__oid: "_OID",
T_aclitem: "ACLITEM",
T__aclitem: "_ACLITEM",
T__macaddr: "_MACADDR",
T__inet: "_INET",
T_bpchar: "BPCHAR",
T_varchar: "VARCHAR",
T_date: "DATE",
T_time: "TIME",
T_timestamp: "TIMESTAMP",
T__timestamp: "_TIMESTAMP",
T__date: "_DATE",
T__time: "_TIME",
T_timestamptz: "TIMESTAMPTZ",
T__timestamptz: "_TIMESTAMPTZ",
T_interval: "INTERVAL",
T__interval: "_INTERVAL",
T__numeric: "_NUMERIC",
T_pg_database: "PG_DATABASE",
T__cstring: "_CSTRING",
T_timetz: "TIMETZ",
T__timetz: "_TIMETZ",
T_bit: "BIT",
T__bit: "_BIT",
T_varbit: "VARBIT",
T__varbit: "_VARBIT",
T_numeric: "NUMERIC",
T_refcursor: "REFCURSOR",
T__refcursor: "_REFCURSOR",
T_regprocedure: "REGPROCEDURE",
T_regoper: "REGOPER",
T_regoperator: "REGOPERATOR",
T_regclass: "REGCLASS",
T_regtype: "REGTYPE",
T__regprocedure: "_REGPROCEDURE",
T__regoper: "_REGOPER",
T__regoperator: "_REGOPERATOR",
T__regclass: "_REGCLASS",
T__regtype: "_REGTYPE",
T_record: "RECORD",
T_cstring: "CSTRING",
T_any: "ANY",
T_anyarray: "ANYARRAY",
T_void: "VOID",
T_trigger: "TRIGGER",
T_language_handler: "LANGUAGE_HANDLER",
T_internal: "INTERNAL",
T_opaque: "OPAQUE",
T_anyelement: "ANYELEMENT",
T__record: "_RECORD",
T_anynonarray: "ANYNONARRAY",
T_pg_authid: "PG_AUTHID",
T_pg_auth_members: "PG_AUTH_MEMBERS",
T__txid_snapshot: "_TXID_SNAPSHOT",
T_uuid: "UUID",
T__uuid: "_UUID",
T_txid_snapshot: "TXID_SNAPSHOT",
T_fdw_handler: "FDW_HANDLER",
T_pg_lsn: "PG_LSN",
T__pg_lsn: "_PG_LSN",
T_tsm_handler: "TSM_HANDLER",
T_anyenum: "ANYENUM",
T_tsvector: "TSVECTOR",
T_tsquery: "TSQUERY",
T_gtsvector: "GTSVECTOR",
T__tsvector: "_TSVECTOR",
T__gtsvector: "_GTSVECTOR",
T__tsquery: "_TSQUERY",
T_regconfig: "REGCONFIG",
T__regconfig: "_REGCONFIG",
T_regdictionary: "REGDICTIONARY",
T__regdictionary: "_REGDICTIONARY",
T_jsonb: "JSONB",
T__jsonb: "_JSONB",
T_anyrange: "ANYRANGE",
T_event_trigger: "EVENT_TRIGGER",
T_int4range: "INT4RANGE",
T__int4range: "_INT4RANGE",
T_numrange: "NUMRANGE",
T__numrange: "_NUMRANGE",
T_tsrange: "TSRANGE",
T__tsrange: "_TSRANGE",
T_tstzrange: "TSTZRANGE",
T__tstzrange: "_TSTZRANGE",
T_daterange: "DATERANGE",
T__daterange: "_DATERANGE",
T_int8range: "INT8RANGE",
T__int8range: "_INT8RANGE",
T_pg_shseclabel: "PG_SHSECLABEL",
T_regnamespace: "REGNAMESPACE",
T__regnamespace: "_REGNAMESPACE",
T_regrole: "REGROLE",
T__regrole: "_REGROLE",
}
vendor/github.com/lib/pq/rows.go deleted 100644 → 0
View file @ f3acec0b
package pq
import (
"math"
"reflect"
"time"
"github.com/lib/pq/oid"
)
const headerSize = 4
type fieldDesc struct {
// The object ID of the data type.
OID oid.Oid
// The data type size (see pg_type.typlen).
// Note that negative values denote variable-width types.
Len int
// The type modifier (see pg_attribute.atttypmod).
// The meaning of the modifier is type-specific.
Mod int
}
func (fd fieldDesc) Type() reflect.Type {
switch fd.OID {
case oid.T_int8:
return reflect.TypeOf(int64(0))
case oid.T_int4:
return reflect.TypeOf(int32(0))
case oid.T_int2:
return reflect.TypeOf(int16(0))
case oid.T_varchar, oid.T_text:
return reflect.TypeOf("")
case oid.T_bool:
return reflect.TypeOf(false)
case oid.T_date, oid.T_time, oid.T_timetz, oid.T_timestamp, oid.T_timestamptz:
return reflect.TypeOf(time.Time{})
case oid.T_bytea:
return reflect.TypeOf([]byte(nil))
default:
return reflect.TypeOf(new(interface{})).Elem()
}
}
func (fd fieldDesc) Name() string {
return oid.TypeName[fd.OID]
}
func (fd fieldDesc) Length() (length int64, ok bool) {
switch fd.OID {
case oid.T_text, oid.T_bytea:
return math.MaxInt64, true
case oid.T_varchar, oid.T_bpchar:
return int64(fd.Mod - headerSize), true
default:
return 0, false
}
}
func (fd fieldDesc) PrecisionScale() (precision, scale int64, ok bool) {
switch fd.OID {
case oid.T_numeric, oid.T__numeric:
mod := fd.Mod - headerSize
precision = int64((mod >> 16) & 0xffff)
scale = int64(mod & 0xffff)
return precision, scale, true
default:
return 0, 0, false
}
}
// ColumnTypeScanType returns the value type that can be used to scan types into.
func (rs *rows) ColumnTypeScanType(index int) reflect.Type {
return rs.colTyps[index].Type()
}
// ColumnTypeDatabaseTypeName return the database system type name.
func (rs *rows) ColumnTypeDatabaseTypeName(index int) string {
return rs.colTyps[index].Name()
}
// ColumnTypeLength returns the length of the column type if the column is a
// variable length type. If the column is not a variable length type ok
// should return false.
func (rs *rows) ColumnTypeLength(index int) (length int64, ok bool) {
return rs.colTyps[index].Length()
}
// ColumnTypePrecisionScale should return the precision and scale for decimal
// types. If not applicable, ok should be false.
func (rs *rows) ColumnTypePrecisionScale(index int) (precision, scale int64, ok bool) {
return rs.colTyps[index].PrecisionScale()
}
vendor/github.com/lib/pq/ssl.go deleted 100644 → 0
View file @ f3acec0b
package pq
import (
"crypto/tls"
"crypto/x509"
"io/ioutil"
"net"
"os"
"os/user"
"path/filepath"
)
// ssl generates a function to upgrade a net.Conn based on the "sslmode" and
// related settings. The function is nil when no upgrade should take place.
func ssl(o values) (func(net.Conn) (net.Conn, error), error) {
verifyCaOnly := false
tlsConf := tls.Config{}
switch mode := o["sslmode"]; mode {
// "require" is the default.
case "", "require":
// We must skip TLS's own verification since it requires full
// verification since Go 1.3.
tlsConf.InsecureSkipVerify = true
// From http://www.postgresql.org/docs/current/static/libpq-ssl.html:
//
// Note: For backwards compatibility with earlier versions of
// PostgreSQL, if a root CA file exists, the behavior of
// sslmode=require will be the same as that of verify-ca, meaning the
// server certificate is validated against the CA. Relying on this
// behavior is discouraged, and applications that need certificate
// validation should always use verify-ca or verify-full.
if sslrootcert, ok := o["sslrootcert"]; ok {
if _, err := os.Stat(sslrootcert); err == nil {
verifyCaOnly = true
} else {
delete(o, "sslrootcert")
}
}
case "verify-ca":
// We must skip TLS's own verification since it requires full
// verification since Go 1.3.
tlsConf.InsecureSkipVerify = true
verifyCaOnly = true
case "verify-full":
tlsConf.ServerName = o["host"]
case "disable":
return nil, nil
default:
return nil, fmterrorf(`unsupported sslmode %q; only "require" (default), "verify-full", "verify-ca", and "disable" supported`, mode)
}
err := sslClientCertificates(&tlsConf, o)
if err != nil {
return nil, err
}
err = sslCertificateAuthority(&tlsConf, o)
if err != nil {
return nil, err
}
// Accept renegotiation requests initiated by the backend.
//
// Renegotiation was deprecated then removed from PostgreSQL 9.5, but
// the default configuration of older versions has it enabled. Redshift
// also initiates renegotiations and cannot be reconfigured.
tlsConf.Renegotiation = tls.RenegotiateFreelyAsClient
return func(conn net.Conn) (net.Conn, error) {
client := tls.Client(conn, &tlsConf)
if verifyCaOnly {
err := sslVerifyCertificateAuthority(client, &tlsConf)
if err != nil {
return nil, err
}
}
return client, nil
}, nil
}
// sslClientCertificates adds the certificate specified in the "sslcert" and
// "sslkey" settings, or if they aren't set, from the .postgresql directory
// in the user's home directory. The configured files must exist and have
// the correct permissions.
func sslClientCertificates(tlsConf *tls.Config, o values) error {
// user.Current() might fail when cross-compiling. We have to ignore the
// error and continue without home directory defaults, since we wouldn't
// know from where to load them.
user, _ := user.Current()
// In libpq, the client certificate is only loaded if the setting is not blank.
//
// https://github.com/postgres/postgres/blob/REL9_6_2/src/interfaces/libpq/fe-secure-openssl.c#L1036-L1037
sslcert := o["sslcert"]
if len(sslcert) == 0 && user != nil {
sslcert = filepath.Join(user.HomeDir, ".postgresql", "postgresql.crt")
}
// https://github.com/postgres/postgres/blob/REL9_6_2/src/interfaces/libpq/fe-secure-openssl.c#L1045
if len(sslcert) == 0 {
return nil
}
// https://github.com/postgres/postgres/blob/REL9_6_2/src/interfaces/libpq/fe-secure-openssl.c#L1050:L1054
if _, err := os.Stat(sslcert); os.IsNotExist(err) {
return nil
} else if err != nil {
return err
}
// In libpq, the ssl key is only loaded if the setting is not blank.
//
// https://github.com/postgres/postgres/blob/REL9_6_2/src/interfaces/libpq/fe-secure-openssl.c#L1123-L1222
sslkey := o["sslkey"]
if len(sslkey) == 0 && user != nil {
sslkey = filepath.Join(user.HomeDir, ".postgresql", "postgresql.key")
}
if len(sslkey) > 0 {
if err := sslKeyPermissions(sslkey); err != nil {
return err
}
}
cert, err := tls.LoadX509KeyPair(sslcert, sslkey)
if err != nil {
return err
}
tlsConf.Certificates = []tls.Certificate{cert}
return nil
}
// sslCertificateAuthority adds the RootCA specified in the "sslrootcert" setting.
func sslCertificateAuthority(tlsConf *tls.Config, o values) error {
// In libpq, the root certificate is only loaded if the setting is not blank.
//
// https://github.com/postgres/postgres/blob/REL9_6_2/src/interfaces/libpq/fe-secure-openssl.c#L950-L951
if sslrootcert := o["sslrootcert"]; len(sslrootcert) > 0 {
tlsConf.RootCAs = x509.NewCertPool()
cert, err := ioutil.ReadFile(sslrootcert)
if err != nil {
return err
}
if !tlsConf.RootCAs.AppendCertsFromPEM(cert) {
return fmterrorf("couldn't parse pem in sslrootcert")
}
}
return nil
}
// sslVerifyCertificateAuthority carries out a TLS handshake to the server and
// verifies the presented certificate against the CA, i.e. the one specified in
// sslrootcert or the system CA if sslrootcert was not specified.
func sslVerifyCertificateAuthority(client *tls.Conn, tlsConf *tls.Config) error {
err := client.Handshake()
if err != nil {
return err
}
certs := client.ConnectionState().PeerCertificates
opts := x509.VerifyOptions{
DNSName: client.ConnectionState().ServerName,
Intermediates: x509.NewCertPool(),
Roots: tlsConf.RootCAs,
}
for i, cert := range certs {
if i == 0 {
continue
}
opts.Intermediates.AddCert(cert)
}
_, err = certs[0].Verify(opts)
return err
}
vendor/github.com/lib/pq/ssl_permissions.go deleted 100644 → 0
View file @ f3acec0b
// +build !windows
package pq
import "os"
// sslKeyPermissions checks the permissions on user-supplied ssl key files.
// The key file should have very little access.
//
// libpq does not check key file permissions on Windows.
func sslKeyPermissions(sslkey string) error {
info, err := os.Stat(sslkey)
if err != nil {
return err
}
if info.Mode().Perm()&0077 != 0 {
return ErrSSLKeyHasWorldPermissions
}
return nil
}
vendor/github.com/lib/pq/ssl_windows.go deleted 100644 → 0
View file @ f3acec0b
// +build windows
package pq
// sslKeyPermissions checks the permissions on user-supplied ssl key files.
// The key file should have very little access.
//
// libpq does not check key file permissions on Windows.
func sslKeyPermissions(string) error { return nil }
vendor/github.com/lib/pq/uuid.go deleted 100644 → 0
View file @ f3acec0b
package pq
import (
"encoding/hex"
"fmt"
)
// decodeUUIDBinary interprets the binary format of a uuid, returning it in text format.
func decodeUUIDBinary(src []byte) ([]byte, error) {
if len(src) != 16 {
return nil, fmt.Errorf("pq: unable to decode uuid; bad length: %d", len(src))
}
dst := make([]byte, 36)
dst[8], dst[13], dst[18], dst[23] = '-', '-', '-', '-'
hex.Encode(dst[0:], src[0:4])
hex.Encode(dst[9:], src[4:6])
hex.Encode(dst[14:], src[6:8])
hex.Encode(dst[19:], src[8:10])
hex.Encode(dst[24:], src[10:16])
return dst, nil
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment