Merge branch 'master' into bowen/#280-5

console/application_test.go

@@ -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))
@@ -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)

database/gorm/event.go

@@ -92,7 +92,7 @@ func (e *Event) IsDirty(columns ...string) bool {
 }
 
 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) {
@@ -101,6 +101,10 @@ func (e *Event) SetAttribute(key string, value any) {
 	}
 
 	destOfMap := e.getDestOfMap()
+	if destOfMap == nil {
+		return
+	}
+
 	destOfMap[e.toDBColumnName(key)] = value
 	e.destOfMap = destOfMap
 

database/gorm/query.go

@@ -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"
@@ -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,
 		queries:    make(map[string]*Query),
 	}
 
@@ -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 {
@@ -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 {
@@ -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) {
@@ -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
 	}
 
 	return query.new(query.instance.Model(r.conditions.model))
@@ -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()
@@ -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 {
@@ -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
 		}

database/gorm/query_test.go

@@ -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() {

database/gorm/test_utils.go

@@ -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 (
@@ -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),
@@ -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,
@@ -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]
 	}
@@ -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 {
@@ -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)
 }
 
 func getMockDriver(docker testing.DatabaseDriver, mockConfig *mocksconfig.Config, connection string) testMockDriver {

database/gorm/to_sql.go

@@ -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,
 	}
@@ -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
 	}