Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: nilaway #667

Merged
merged 5 commits into from
Oct 4, 2024
Merged

fix: nilaway #667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c0d65d
fix: nilaway
hwbrzzl Oct 3, 2024
392a7ec
fix: nilaway
hwbrzzl Oct 3, 2024
be6ba92
fix: nilaway
hwbrzzl Oct 3, 2024
3108aab
fix test
hwbrzzl Oct 3, 2024
54305c5
fix test
hwbrzzl Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions console/application_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ func TestFlagsToCliFlags(t *testing.T) {

// Convert command flags to CLI flags
cliFlags := flagsToCliFlags(flags)
assert.NotNil(t, cliFlags)

// Assert that the number of CLI flags matches the number of command flags
assert.Equal(t, len(cliFlags), len(flags))
Expand All @@ -49,6 +50,7 @@ func TestFlagsToCliFlags(t *testing.T) {
case command.FlagTypeBool:
boolFlag := flag.(*command.BoolFlag)
cliBoolFlag := cliFlags[i].(*cli.BoolFlag)

assert.Equal(t, boolFlag.Name, cliBoolFlag.Name)
assert.Equal(t, boolFlag.Aliases, cliBoolFlag.Aliases)
assert.Equal(t, boolFlag.Usage, cliBoolFlag.Usage)
Expand Down
6 changes: 5 additions & 1 deletion database/gorm/event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
}

func (e *Event) Query() orm.Query {
return NewQuery(e.query.ctx, e.query.config, e.query.fullConfig, e.query.instance.Session(&gorm.Session{NewDB: true}), nil)
return NewQuery(e.query.ctx, e.query.config, e.query.fullConfig, e.query.instance.Session(&gorm.Session{NewDB: true}), e.query.log, nil)
}

func (e *Event) SetAttribute(key string, value any) {
Expand All @@ -101,6 +101,10 @@
}

destOfMap := e.getDestOfMap()
if destOfMap == nil {
return

Check warning on line 105 in database/gorm/event.go

View check run for this annotation

Codecov / codecov/patch

database/gorm/event.go#L105 

Added line #L105 was not covered by tests
}

destOfMap[e.toDBColumnName(key)] = value
e.destOfMap = destOfMap

Expand Down
26 changes: 15 additions & 11 deletions database/gorm/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"github.com/goravel/framework/contracts/config"
contractsdatabase "github.com/goravel/framework/contracts/database"
contractsorm "github.com/goravel/framework/contracts/database/orm"
"github.com/goravel/framework/contracts/log"
"github.com/goravel/framework/database/db"
"github.com/goravel/framework/database/gorm/hints"
"github.com/goravel/framework/database/orm"
Expand All @@ -29,15 +30,17 @@ type Query struct {
ctx context.Context
fullConfig contractsdatabase.FullConfig
instance *gormio.DB
log log.Log
queries map[string]*Query
}

func NewQuery(ctx context.Context, config config.Config, fullConfig contractsdatabase.FullConfig, db *gormio.DB, conditions *Conditions) *Query {
func NewQuery(ctx context.Context, config config.Config, fullConfig contractsdatabase.FullConfig, db *gormio.DB, log log.Log, conditions *Conditions) *Query {
queryImpl := &Query{
config: config,
ctx: ctx,
fullConfig: fullConfig,
instance: db,
log: log,
hwbrzzl marked this conversation as resolved.
Show resolved Hide resolved
queries: make(map[string]*Query),
}

Expand All @@ -48,7 +51,7 @@ func NewQuery(ctx context.Context, config config.Config, fullConfig contractsdat
return queryImpl
}

func BuildQuery(ctx context.Context, config config.Config, connection string) (*Query, error) {
func BuildQuery(ctx context.Context, config config.Config, connection string, log log.Log) (*Query, error) {
configBuilder := db.NewConfigBuilder(config, connection)
writeConfigs := configBuilder.Writes()
if len(writeConfigs) == 0 {
Expand All @@ -60,7 +63,7 @@ func BuildQuery(ctx context.Context, config config.Config, connection string) (*
return nil, err
}

return NewQuery(ctx, config, writeConfigs[0], gorm, nil), nil
return NewQuery(ctx, config, writeConfigs[0], gorm, log, nil), nil
}

func (r *Query) Association(association string) contractsorm.Association {
Expand Down Expand Up @@ -727,11 +730,11 @@ func (r *Query) Table(name string, args ...any) contractsorm.Query {
}

func (r *Query) ToSql() contractsorm.ToSql {
return NewToSql(r.setConditions(r.conditions), false)
return NewToSql(r.setConditions(r.conditions), r.log, false)
}

func (r *Query) ToRawSql() contractsorm.ToSql {
return NewToSql(r.setConditions(r.conditions), true)
return NewToSql(r.setConditions(r.conditions), r.log, true)
}

func (r *Query) Update(column any, value ...any) (*contractsorm.Result, error) {
Expand Down Expand Up @@ -984,7 +987,10 @@ func (r *Query) buildModel() *Query {

query, err := r.refreshConnection(r.conditions.model)
if err != nil {
return nil
query = r.new(r.instance.Session(&gormio.Session{}))
_ = query.instance.AddError(err)

return query
hwbrzzl marked this conversation as resolved.
Show resolved Hide resolved
}

return query.new(query.instance.Model(r.conditions.model))
Expand Down Expand Up @@ -1122,7 +1128,7 @@ func (r *Query) buildWith(db *gormio.DB) *gormio.DB {
if arg, ok := item.args[0].(func(contractsorm.Query) contractsorm.Query); ok {
newArgs := []any{
func(tx *gormio.DB) *gormio.DB {
queryImpl := NewQuery(r.ctx, r.config, r.fullConfig, tx, nil)
queryImpl := NewQuery(r.ctx, r.config, r.fullConfig, tx, r.log, nil)
query := arg(queryImpl)
queryImpl = query.(*Query)
queryImpl = queryImpl.buildConditions()
Expand Down Expand Up @@ -1256,9 +1262,7 @@ func (r *Query) event(event contractsorm.EventType, model, dest any) error {
}

func (r *Query) new(db *gormio.DB) *Query {
query := NewQuery(r.ctx, r.config, r.fullConfig, db, &r.conditions)

return query
return NewQuery(r.ctx, r.config, r.fullConfig, db, r.log, &r.conditions)
}

func (r *Query) omitCreate(value any) error {
Expand Down Expand Up @@ -1323,7 +1327,7 @@ func (r *Query) refreshConnection(model any) (*Query, error) {
query, ok := r.queries[connection]
if !ok {
var err error
query, err = BuildQuery(r.ctx, r.config, connection)
query, err = BuildQuery(r.ctx, r.config, connection, r.log)
if err != nil {
return nil, err
}
Expand Down
15 changes: 15 additions & 0 deletions database/gorm/query_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2545,6 +2545,21 @@ func (s *QueryTestSuite) TestLoadMissing() {
}
}

func (s *QueryTestSuite) TestModel() {
for driver, query := range s.queries {
s.Run(driver.String(), func() {
// model is valid
user := User{Name: "model_user"}
s.Nil(query.Query().Model(&User{}).Create(&user))
s.True(user.ID > 0)

// model is invalid
user1 := User{Name: "model_user"}
s.EqualError(query.Query().Model("users").Create(&user1), "invalid model")
})
}
}

func (s *QueryTestSuite) TestRaw() {
for driver, query := range s.queries {
s.Run(driver.String(), func() {
Expand Down
23 changes: 6 additions & 17 deletions database/gorm/test_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,6 @@ import (
supportdocker "github.com/goravel/framework/support/docker"
)

// Define different test model, to improve the local testing speed.
// The minimum model only initials one Sqlite and two Postgres,
// and the normal model initials one Mysql, two Postgres, one Sqlite and one Sqlserver.
const (
TestModelMinimum = iota
TestModelNormal

// Switch this value to control the test model.
TestModel = TestModelNormal
)

type TestTable int

const (
Expand Down Expand Up @@ -64,7 +53,7 @@ type TestQueries struct {
}

func NewTestQueries() *TestQueries {
if TestModel == TestModelMinimum {
if supportdocker.TestModel == supportdocker.TestModelMinimum {
return &TestQueries{
sqliteDockers: supportdocker.Sqlites(2),
postgresDockers: supportdocker.Postgreses(2),
Expand Down Expand Up @@ -111,7 +100,7 @@ func (r *TestQueries) QueriesOfReadWrite() map[contractsdatabase.Driver]map[stri
panic(err)
}

if TestModel == TestModelMinimum {
if supportdocker.TestModel == supportdocker.TestModelMinimum {
return map[contractsdatabase.Driver]map[string]orm.Query{
contractsdatabase.DriverPostgres: {
"mix": postgresQuery,
Expand Down Expand Up @@ -197,7 +186,7 @@ func (r *TestQueries) queries(withPrefixAndSingular bool) map[contractsdatabase.
contractsdatabase.DriverSqlite: r.sqliteDockers[0],
}

if TestModel != TestModelMinimum {
if supportdocker.TestModel != supportdocker.TestModelMinimum {
driverToDocker[contractsdatabase.DriverMysql] = r.mysqlDockers[0]
driverToDocker[contractsdatabase.DriverSqlserver] = r.sqlserverDockers[0]
}
hwbrzzl marked this conversation as resolved.
Show resolved Hide resolved
Expand Down Expand Up @@ -234,10 +223,10 @@ func NewTestQuery(docker testing.DatabaseDriver, withPrefixAndSingular ...bool)
)
if len(withPrefixAndSingular) > 0 && withPrefixAndSingular[0] {
mockDriver.WithPrefixAndSingular()
query, err = BuildQuery(testContext, mockConfig, docker.Driver().String())
query, err = BuildQuery(testContext, mockConfig, docker.Driver().String(), nil)
} else {
mockDriver.Common()
query, err = BuildQuery(testContext, mockConfig, docker.Driver().String())
query, err = BuildQuery(testContext, mockConfig, docker.Driver().String(), nil)
}

if err != nil {
Expand Down Expand Up @@ -276,7 +265,7 @@ func (r *TestQuery) QueryOfReadWrite(config TestReadWriteConfig) (orm.Query, err
mockDriver := getMockDriver(r.Docker(), mockConfig, r.Docker().Driver().String())
mockDriver.ReadWrite(config)

return BuildQuery(testContext, mockConfig, r.docker.Driver().String())
return BuildQuery(testContext, mockConfig, r.docker.Driver().String(), nil)
hwbrzzl marked this conversation as resolved.
Show resolved Hide resolved
}

func getMockDriver(docker testing.DatabaseDriver, mockConfig *mocksconfig.Config, connection string) testMockDriver {
Expand Down
9 changes: 8 additions & 1 deletion database/gorm/to_sql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,19 @@ package gorm

import (
"gorm.io/gorm"

"github.com/goravel/framework/contracts/log"
)

type ToSql struct {
log log.Log
query *Query
raw bool
}

func NewToSql(query *Query, raw bool) *ToSql {
func NewToSql(query *Query, log log.Log, raw bool) *ToSql {
return &ToSql{
log: log,
query: query,
raw: raw,
}
Expand Down Expand Up @@ -105,6 +109,9 @@ func (r *ToSql) Update(column any, value ...any) string {

func (r *ToSql) sql(db *gorm.DB) string {
sql := db.Statement.SQL.String()
if db.Statement.Error != nil {
r.log.Errorf("failed to get sql: %v", db.Statement.Error)
}
if !r.raw {
return sql
}
Expand Down
Loading
Loading