fix test

goravel · Dec 18, 2024 · ee8c73a · ee8c73a
1 parent d09e194
commit ee8c73a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/contracts/database/config.go b/contracts/database/config.go
@@ -21,7 +21,7 @@ type Config struct {
 	Database string
 	Username string
 	Password string
-	// Only for Postgres and Sqlserver
+	// Only for Postgres
 	Schema string
 }
 

diff --git a/database/gorm/test_utils.go b/database/gorm/test_utils.go
@@ -341,7 +341,9 @@ func (r *MockMysql) WithPrefixAndSingular() {
 	r.basic()
 }
 
-func (r *MockMysql) WithSchema(schema string) {}
+func (r *MockMysql) WithSchema(schema string) {
+	panic("mysql does not support schema")
+}
 
 func (r *MockMysql) basic() {
 	r.mockConfig.On("GetBool", "app.debug").Return(true)
@@ -488,7 +490,9 @@ func (r *MockSqlite) WithPrefixAndSingular() {
 	r.basic()
 }
 
-func (r *MockSqlite) WithSchema(schema string) {}
+func (r *MockSqlite) WithSchema(schema string) {
+	panic("sqlite does not support schema")
+}
 
 func (r *MockSqlite) basic() {
 	r.mockConfig.On("GetBool", "app.debug").Return(true)
@@ -552,7 +556,9 @@ func (r *MockSqlserver) WithPrefixAndSingular() {
 	r.basic()
 }
 
-func (r *MockSqlserver) WithSchema(schema string) {}
+func (r *MockSqlserver) WithSchema(schema string) {
+	panic("sqlserver does not support schema for now")
+}
 
 func (r *MockSqlserver) basic() {
 	r.mockConfig.On("GetBool", "app.debug").Return(true)

diff --git a/database/migration/default_migrator_test.go b/database/migration/default_migrator_test.go
@@ -2,14 +2,14 @@ package migration
 
 import (
 	"errors"
-	"github.com/stretchr/testify/require"
 	"io"
 	"os"
 	"path/filepath"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
 	contractsdatabase "github.com/goravel/framework/contracts/database"

diff --git a/database/schema/schema_test.go b/database/schema/schema_test.go
@@ -1,12 +1,12 @@
 package schema
 
 import (
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 	"testing"
 	"time"
 
 	"github.com/spf13/cast"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
 	"github.com/goravel/framework/contracts/database"

diff --git a/foundation/application_test.go b/foundation/application_test.go
@@ -331,6 +331,7 @@ func (s *ApplicationTestSuite) TestMakeOrm() {
 	mockConfig.EXPECT().GetString("database.connections.postgres.sslmode").Return("disable").Twice()
 	mockConfig.EXPECT().GetString("database.connections.postgres.timezone").Return("UTC").Twice()
 	mockConfig.EXPECT().GetString("database.connections.postgres.database").Return(config.Database).Twice()
+	mockConfig.EXPECT().GetString("database.connections.postgres.schema", "public").Return("public").Twice()
 	mockConfig.EXPECT().GetBool("app.debug").Return(true).Once()
 	mockConfig.EXPECT().GetInt("database.pool.max_idle_conns", 10).Return(10).Once()
 	mockConfig.EXPECT().GetInt("database.pool.max_open_conns", 100).Return(100).Once()