fix: try setting maxLifeTime parameter

Author: adrienaury

internal/app/query/cli.go

@@ -3,6 +3,7 @@ package query
 import (
 	"fmt"
 	"os"
+	"time"
 
 	"github.com/cgi-fr/lino/internal/app/urlbuilder"
 	infra "github.com/cgi-fr/lino/internal/infra/query"
@@ -27,27 +28,31 @@ func Inject(
 
 // NewCommand implements the cli analyse command
 func NewCommand(fullName string, err *os.File, out *os.File, in *os.File) *cobra.Command {
+	var maxLifeTime time.Duration
+
 	cmd := &cobra.Command{
 		Use:     "query",
 		Short:   "Execute direct query",
 		Example: fmt.Sprintf("  %[1]s", fullName),
 		Args:    cobra.ExactArgs(2),
 		Run: func(cmd *cobra.Command, args []string) {
-			if er := execute(cmd, args[0], args[1]); er != nil {
+			if er := execute(cmd, args[0], args[1], maxLifeTime); er != nil {
 				fmt.Fprintln(err, er.Error())
 				os.Exit(1)
 			}
 		},
 	}
 
+	cmd.Flags().DurationVarP(&maxLifeTime, "timeout", "t", 4*time.Minute, "sets the maximum amount of time a connection may be reused")
+
 	cmd.SetOut(out)
 	cmd.SetErr(err)
 	cmd.SetIn(in)
 
 	return cmd
 }
 
-func execute(cmd *cobra.Command, dataconnectorName string, querystr string) error {
+func execute(cmd *cobra.Command, dataconnectorName string, querystr string, maxLifeTime time.Duration) error {
 	alias, e1 := dataconnector.Get(dataconnectorStorage, dataconnectorName)
 	if e1 != nil {
 		return e1
@@ -64,7 +69,7 @@ func execute(cmd *cobra.Command, dataconnectorName string, querystr string) erro
 		return fmt.Errorf("no extractor found for database type")
 	}
 
-	driver := query.NewDriver(dataSourceFactory.New(u.URL.String()), infra.NewJSONWriter(cmd.OutOrStdout()))
+	driver := query.NewDriver(dataSourceFactory.New(u.URL.String(), maxLifeTime), infra.NewJSONWriter(cmd.OutOrStdout()))
 
 	if err := driver.Open(); err != nil {
 		return fmt.Errorf("%w", err)

internal/infra/query/sql.go

@@ -2,6 +2,7 @@ package query
 
 import (
 	"fmt"
+	"time"
 
 	"github.com/cgi-fr/lino/pkg/query"
 	"github.com/jmoiron/sqlx"
@@ -54,8 +55,9 @@ func (dr *DataReader) Error() error {
 }
 
 type DataSource struct {
-	url string
-	dbx *sqlx.DB
+	url         string
+	dbx         *sqlx.DB
+	maxLifeTime time.Duration
 }
 
 func (ds *DataSource) Open() error {
@@ -71,6 +73,8 @@ func (ds *DataSource) Open() error {
 
 	ds.dbx = sqlx.NewDb(db, u.UnaliasedDriver)
 
+	ds.dbx.SetConnMaxLifetime(ds.maxLifeTime)
+
 	err = ds.dbx.Ping()
 	if err != nil {
 		return fmt.Errorf("%w", err)
@@ -88,23 +92,22 @@ func (ds *DataSource) Close() error {
 }
 
 func (ds *DataSource) Query(query string) (query.DataReader, error) {
-	result, err := ds.dbx.Exec(query)
+	rows, err := ds.dbx.Queryx(query)
 	if err != nil {
 		return nil, fmt.Errorf("%w", err)
 	}
 
-	if nbrows, err := result.RowsAffected(); err != nil {
-		log.Info().Str("query", query).Int64("rows", nbrows).Msg("success executing SQL query")
-	}
+	log.Info().Str("query", query).Msg("success executing SQL query")
 
-	return nil, nil
+	return &DataReader{rows, nil, nil}, nil
 }
 
 type DataSourceFactory struct{}
 
-func (dsf DataSourceFactory) New(url string) query.DataSource {
+func (dsf DataSourceFactory) New(url string, maxLifeTime time.Duration) query.DataSource {
 	return &DataSource{
-		url: url,
-		dbx: nil,
+		url:         url,
+		dbx:         nil,
+		maxLifeTime: maxLifeTime,
 	}
 }