Merge branch 'master' into bowen/sqlserver-schema

auth/service_provider.go

@@ -32,7 +32,8 @@ func (database *ServiceProvider) Register(app foundation.Application) {
 
 		ormFacade := app.MakeOrm()
 		if ormFacade == nil {
-			return nil, errors.OrmFacadeNotSet.SetModule(errors.ModuleAuth)
+			// The Orm module will print the error message, so it's safe to return nil.
+			return nil, nil
 		}
 
 		ctx, ok := parameters["ctx"].(http.Context)

database/gorm/dialector.go

@@ -19,7 +19,7 @@ func getDialectors(configs []database.FullConfig) ([]gorm.Dialector, error) {
 		var dialector gorm.Dialector
 		dsn := db.Dsn(config)
 		if dsn == "" {
-			return nil, errors.OrmFailedToGenerateDNS.Args(config.Connection)
+			return nil, errors.OrmFailedToGenerateDNS
 		}
 
 		switch config.Driver {

database/gorm/dialector_test.go

@@ -32,7 +32,7 @@ func TestGetDialectors(t *testing.T) {
 					Connection: "postgres",
 				},
 			},
-			expectError: errors.OrmFailedToGenerateDNS.Args("postgres"),
+			expectError: errors.OrmFailedToGenerateDNS,
 		},
 		{
 			name: "Happy path - mysql",

database/migration/sql_migrator.go

@@ -148,7 +148,7 @@ func getMigrator(configBuilder *databasedb.ConfigBuilder, table string) (*migrat
 	writeConfig := writeConfigs[0]
 	dsn := databasedb.Dsn(writeConfigs[0])
 	if dsn == "" {
-		return nil, errors.OrmFailedToGenerateDNS.Args(writeConfig.Connection)
+		return nil, errors.OrmFailedToGenerateDNS
 	}
 
 	var (

database/service_provider.go

@@ -13,6 +13,7 @@ import (
 	databaseschema "github.com/goravel/framework/database/schema"
 	databaseseeder "github.com/goravel/framework/database/seeder"
 	"github.com/goravel/framework/errors"
+	"github.com/goravel/framework/support/color"
 )
 
 type ServiceProvider struct {
@@ -32,9 +33,15 @@ func (r *ServiceProvider) Register(app foundation.Application) {
 		}
 
 		connection := config.GetString("database.default")
+		if connection == "" {
+			return nil, nil
+		}
+
 		orm, err := databaseorm.BuildOrm(ctx, config, connection, log, app.Refresh)
 		if err != nil {
-			return nil, errors.OrmInitConnection.Args(connection, err).SetModule(errors.ModuleOrm)
+			color.Warningln(errors.OrmInitConnection.Args(connection, err).SetModule(errors.ModuleOrm))
+
+			return nil, nil
 		}
 
 		return orm, nil
@@ -52,7 +59,8 @@ func (r *ServiceProvider) Register(app foundation.Application) {
 
 		orm := app.MakeOrm()
 		if orm == nil {
-			return nil, errors.OrmFacadeNotSet.SetModule(errors.ModuleSchema)
+			// The Orm module will print the error message, so it's safe to return an empty schema.
+			return &databaseschema.Schema{}, nil
 		}
 
 		return databaseschema.NewSchema(config, log, orm, nil), nil

errors/list.go

@@ -87,7 +87,7 @@ var (
 
 	OrmDatabaseConfigNotFound      = New("not found database configuration")
 	OrmDriverNotSupported          = New("invalid driver: %s, only support mysql, postgres, sqlite and sqlserver")
-	OrmFailedToGenerateDNS         = New("failed to generate DSN for connection: %s")
+	OrmFailedToGenerateDNS         = New("failed to generate DSN, please check the database configuration")
 	OrmFactoryMissingAttributes    = New("failed to get raw attributes")
 	OrmFactoryMissingMethod        = New("%s does not find factory method")
 	OrmInitConnection              = New("init %s connection error: %v")

foundation/container.go

@@ -102,6 +102,9 @@ func (c *Container) MakeAuth(ctx contractshttp.Context) contractsauth.Auth {
 		color.Errorln(err)
 		return nil
 	}
+	if instance == nil {
+		return nil
+	}
 
 	return instance.(contractsauth.Auth)
 }
@@ -214,6 +217,9 @@ func (c *Container) MakeOrm() contractsorm.Orm {
 		color.Errorln(err)
 		return nil
 	}
+	if instance == nil {
+		return nil
+	}
 
 	return instance.(contractsorm.Orm)
 }
@@ -264,6 +270,9 @@ func (c *Container) MakeSchema() contractsmigration.Schema {
 		color.Errorln(err)
 		return nil
 	}
+	if instance == nil {
+		return nil
+	}
 
 	return instance.(contractsmigration.Schema)
 }

support/color/color.go

@@ -3,6 +3,7 @@ package color
 import (
 	"bytes"
 	"io"
+	"os"
 
 	"github.com/pterm/pterm"
 
@@ -38,7 +39,14 @@ const (
 )
 
 var (
-	info    = pterm.Info
+	info = pterm.PrefixPrinter{
+		MessageStyle: &pterm.ThemeDefault.DefaultText,
+		Prefix: pterm.Prefix{
+			Style: &pterm.Style{pterm.FgBlack, pterm.BgLightWhite},
+			Text:  " INFO  ",
+		},
+		Writer: os.Stdout,
+	}
 	warning = pterm.Warning
 	err     = pterm.Error
 	debug   = pterm.Debug