Skip to content

Commit

Permalink
Updated dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
lesichkovm committed Dec 31, 2023
1 parent bdf2700 commit fb20d0b
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 60 deletions.
8 changes: 4 additions & 4 deletions Cms.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"github.com/gouniverse/cachestore"
"github.com/gouniverse/entitystore"
"github.com/gouniverse/logstore"
"github.com/gouniverse/sb"
"github.com/gouniverse/sessionstore"
"github.com/gouniverse/settingstore"
sqldb "github.com/gouniverse/sql"
"github.com/gouniverse/taskstore"
"github.com/samber/lo"
)
Expand All @@ -17,7 +17,7 @@ type LanguageKey struct{}

// Cms defines the cms
type Cms struct {
Database *sqldb.Database
Database *sb.Database
// DbInstance *sql.DB
CacheStore *cachestore.Store
EntityStore *entitystore.Store
Expand Down Expand Up @@ -91,12 +91,12 @@ func configToCms(config Config) *Cms {
}

if config.Database == nil && config.DbInstance != nil {
config.Database = sqldb.NewDatabase(config.DbInstance, sqldb.DatabaseDriverName(config.DbInstance))
config.Database = sb.NewDatabase(config.DbInstance, sb.DatabaseDriverName(config.DbInstance))
}

if config.Database == nil && (config.DbDriver != "" && config.DbDsn != "") {
var errDatabase error
config.Database, errDatabase = sqldb.NewDatabaseFromDriver(config.DbDriver, config.DbDsn)
config.Database, errDatabase = sb.NewDatabaseFromDriver(config.DbDriver, config.DbDsn)
if errDatabase != nil {
panic("At CMS: " + errDatabase.Error())
}
Expand Down
4 changes: 2 additions & 2 deletions Config.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"database/sql"
"net/http"

sqldb "github.com/gouniverse/sql"
"github.com/gouniverse/sb"
)

type Config struct {
Database *sqldb.Database
Database *sb.Database
DbInstance *sql.DB
DbDriver string
DbDsn string
Expand Down
21 changes: 10 additions & 11 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@ require (
github.com/go-sql-driver/mysql v1.7.1
github.com/gouniverse/bs v0.10.1
github.com/gouniverse/cachestore v0.16.0
github.com/gouniverse/entitystore v0.60.0
github.com/gouniverse/hb v1.68.0
github.com/gouniverse/entitystore v0.61.0
github.com/gouniverse/hb v1.71.1
github.com/gouniverse/logstore v1.3.0
github.com/gouniverse/responses v0.3.0
github.com/gouniverse/sessionstore v0.20.0
github.com/gouniverse/sessionstore v0.21.0
github.com/gouniverse/settingstore v0.11.0
github.com/gouniverse/sql v0.9.0
github.com/gouniverse/taskstore v0.7.0
github.com/gouniverse/utils v1.35.0
github.com/gouniverse/utils v1.36.0
github.com/lib/pq v1.10.9
github.com/samber/lo v1.39.0
github.com/stretchr/testify v1.8.4
modernc.org/sqlite v1.28.0
)

require (
github.com/gouniverse/sql v0.9.0 // indirect
github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mingrammer/cfmt v1.1.0 // indirect
Expand All @@ -32,11 +32,11 @@ require (
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/georgysavva/scany v1.2.1 // indirect
github.com/golang-module/carbon/v2 v2.2.14 // indirect
github.com/golang-module/carbon/v2 v2.3.1 // indirect
github.com/gouniverse/cdn v0.14.0
github.com/gouniverse/maputils v0.7.0 // indirect
golang.org/x/crypto v0.16.0 // indirect
golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/exp v0.0.0-20231226003508-02704c960a9b // indirect
)

require (
Expand All @@ -45,6 +45,7 @@ require (
github.com/google/uuid v1.5.0 // indirect
github.com/gouniverse/api v1.5.0
github.com/gouniverse/icons v1.3.0
github.com/gouniverse/sb v0.1.0
github.com/gouniverse/shortcode v0.1.4
github.com/gouniverse/uid v1.4.0 // indirect
github.com/joho/godotenv v1.5.1 // indirect
Expand All @@ -53,8 +54,6 @@ require (
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
github.com/tdewolff/minify/v2 v2.20.9 // indirect
github.com/tdewolff/parse/v2 v2.7.6 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/sys v0.15.0 // indirect
Expand All @@ -64,7 +63,7 @@ require (
lukechampine.com/uint128 v1.3.0 // indirect
modernc.org/cc/v3 v3.41.0 // indirect
modernc.org/ccgo/v3 v3.16.15 // indirect
modernc.org/libc v1.37.5 // indirect
modernc.org/libc v1.38.0 // indirect
modernc.org/mathutil v1.6.0 // indirect
modernc.org/memory v1.7.2 // indirect
modernc.org/opt v0.1.3 // indirect
Expand Down
Loading

0 comments on commit fb20d0b

Please sign in to comment.