vitalif
/
imposm3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

return errors from newTxRouter

master
Oliver Tonnhofer 2013-12-02 14:01:58 +01:00
parent 3901c5d8c4
commit 804da8614b
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
database/postgis/postgis.go
View File

@ -543,13 +543,15 @@ func (pg *PostGIS) EnableGeneralizeUpdates() {
}
func (pg *PostGIS) Begin() error {
pg.txRouter = newTxRouter(pg, false)
return nil
var err error
pg.txRouter, err = newTxRouter(pg, false)
return err
}
func (pg *PostGIS) BeginBulk() error {
pg.txRouter = newTxRouter(pg, true)
return nil
var err error
pg.txRouter, err = newTxRouter(pg, true)
return err
}
func (pg *PostGIS) Abort() error {

10
database/postgis/router.go
View File

@ -10,7 +10,7 @@ type TxRouter struct {
tx *sql.Tx
}
func newTxRouter(pg *PostGIS, bulkImport bool) *TxRouter {
func newTxRouter(pg *PostGIS, bulkImport bool) (*TxRouter, error) {
txr := TxRouter{
Tables: make(map[string]TableTx),
}
@ -20,7 +20,7 @@ func newTxRouter(pg *PostGIS, bulkImport bool) *TxRouter {
tt := NewBulkTableTx(pg, table)
err := tt.Begin(nil)
if err != nil {
panic(err) // TODO
return nil, err
}
txr.Tables[tableName] = tt
}
@ -34,7 +34,7 @@ func newTxRouter(pg *PostGIS, bulkImport bool) *TxRouter {
tt := NewSynchronousTableTx(pg, table.FullName, table)
err := tt.Begin(tx)
if err != nil {
panic(err) // TODO
return nil, err
}
txr.Tables[tableName] = tt
}
@ -42,13 +42,13 @@ func newTxRouter(pg *PostGIS, bulkImport bool) *TxRouter {
tt := NewSynchronousTableTx(pg, table.FullName, table)
err := tt.Begin(tx)
if err != nil {
panic(err) // TODO
return nil, err
}
txr.Tables[tableName] = tt
}
}
return &txr
return &txr, nil
}
func (txr *TxRouter) End() error {