chore(pkg/database): retry database selection after registration

jeroiraz · jeroiraz · commit 23540d116beb · 2021-06-04T10:08:50.000-03:00
Signed-off-by: Jeronimo Irazabal &lt;jeronimo.irazabal@gmail.com&gt;

chore(pkg/database): remove duplicated error handling

Signed-off-by: Jeronimo Irazabal &lt;jeronimo.irazabal@gmail.com&gt;
diff --git a/pkg/database/database.go b/pkg/database/database.go
@@ -139,7 +139,9 @@ func OpenDb(op *DbOptions, catalogDB DB, log logger.Logger) (DB, error) {
 		}
 		log.Infof("Database '%s' successfully registered", dbDir)
 
-	} else if err != nil {
+		err = dbi.sqlEngine.UseDatabase(dbi.options.dbName)
+	}
+	if err != nil {
 		return nil, logErr(dbi.Logger, "Unable to open store: %s", err)
 	}
 
@@ -193,9 +195,6 @@ func NewDb(op *DbOptions, catalogDB DB, log logger.Logger) (DB, error) {
 	}
 
 	err = dbi.sqlEngine.UseDatabase(dbi.options.dbName)
-	if err == sql.ErrDatabaseDoesNotExist {
-		return nil, logErr(dbi.Logger, "Unable to open store: %s", err)
-	}
 	if err != nil {
 		return nil, logErr(dbi.Logger, "Unable to open store: %s", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,9 @@ func OpenDb(op *DbOptions, catalogDB DB, log logger.Logger) (DB, error) {`
`139`	`139`	`}`
`140`	`140`	`log.Infof("Database '%s' successfully registered", dbDir)`
`141`	`141`
`142`		`- } else if err != nil {`
	`142`	`+ err = dbi.sqlEngine.UseDatabase(dbi.options.dbName)`
	`143`	`+ }`
	`144`	`+ if err != nil {`
`143`	`145`	`return nil, logErr(dbi.Logger, "Unable to open store: %s", err)`
`144`	`146`	`}`
`145`	`147`
`@@ -193,9 +195,6 @@ func NewDb(op *DbOptions, catalogDB DB, log logger.Logger) (DB, error) {`
`193`	`195`	`}`
`194`	`196`
`195`	`197`	`err = dbi.sqlEngine.UseDatabase(dbi.options.dbName)`
`196`		`- if err == sql.ErrDatabaseDoesNotExist {`
`197`		`- return nil, logErr(dbi.Logger, "Unable to open store: %s", err)`
`198`		`- }`
`199`	`198`	`if err != nil {`
`200`	`199`	`return nil, logErr(dbi.Logger, "Unable to open store: %s", err)`
`201`	`200`	`}`