alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Another PG bug.

Browse Source
This commit is contained in:
Travis Reeder
2016-08-10 15:02:43 -07:00
parent 63bb215cd2
commit f3d2aa09ef
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/datastore/postgres/postgres.go
View File

@@ -76,8 +76,10 @@ func (ds *PostgresDatastore) StoreApp(app *models.App) (*models.App, error) {
_, err := ds.db.Exec(` _, err := ds.db.Exec(`
INSERT INTO apps (name) INSERT INTO apps (name)
VALUES ($1) VALUES ($1)
ON CONFLICT (name) DO NOTHING
RETURNING name; RETURNING name;
`, app.Name) `, app.Name)
// todo: after we support headers, the conflict should update the headers.
if err != nil { if err != nil {
return nil, err return nil, err
@@ -240,6 +242,7 @@ func (ds *PostgresDatastore) GetRoutes(filter *models.RouteFilter) ([]*models.Ro
res := []*models.Route{} res := []*models.Route{}
filterQuery := buildFilterQuery(filter) filterQuery := buildFilterQuery(filter)
rows, err := ds.db.Query(fmt.Sprintf("%s %s", routeSelector, filterQuery)) rows, err := ds.db.Query(fmt.Sprintf("%s %s", routeSelector, filterQuery))
// todo: check for no rows so we don't respond with a sql 500 err
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -306,8 +309,9 @@ func (ds *PostgresDatastore) Get(key []byte) ([]byte, error) {
var value []byte var value []byte
err := row.Scan(&value) err := row.Scan(&value)
if err == sql.ErrNoRows {
if err != nil { return nil, nil
} else if err != nil {
return nil, err return nil, err
} }