Skip to content

Commit

Permalink
Merge branch 'master' into dev/yfievez/implem_ilike
Browse files Browse the repository at this point in the history
  • Loading branch information
yfievez authored Mar 24, 2021
2 parents 0f3a526 + 06ded05 commit dadc40f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions db.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ type DatabaseConfiguration struct {
MaxOpenConns int
MaxIdleConns int
ConnMaxLifetime time.Duration
ConnMaxIdleTime time.Duration
AutoCreateTables bool
// Dialect database dialect, leave empty for automatic guessing
Dialect gorp.Dialect
Expand Down Expand Up @@ -92,6 +93,7 @@ func RegisterDB(config *DatabaseConfiguration) error {
MaxIdleConns: config.MaxIdleConns,
MaxOpenConns: config.MaxOpenConns,
ConnMaxLifetime: config.ConnMaxLifetime,
ConnMaxIdleTime: config.ConnMaxIdleTime,
}

// Register database.
Expand Down

0 comments on commit dadc40f

Please sign in to comment.