fix: [#270] Optimize postgres DNS (#309)

* fix: [#270] Optimize postgres DNS * Fix unit test
goravel · Oct 5, 2023 · 9d8d413 · 9d8d413
1 parent d174dcb
commit 9d8d413
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/database/db/dsn.go b/database/db/dsn.go
@@ -48,8 +48,8 @@ func (d *DsnImpl) Postgresql(config databasecontract.Config) string {
 	sslmode := d.config.GetString("database.connections." + d.connection + ".sslmode")
 	timezone := d.config.GetString("database.connections." + d.connection + ".timezone")
 
-	return fmt.Sprintf("host=%s user=%s password=%s dbname=%s port=%d sslmode=%s TimeZone=%s",
-		host, config.Username, config.Password, config.Database, config.Port, sslmode, timezone)
+	return fmt.Sprintf("postgres://%s:%s@%s:%d/%s?sslmode=%s&timezone=%s",
+		config.Username, config.Password, host, config.Port, config.Database, sslmode, timezone)
 }
 
 func (d *DsnImpl) Sqlite(config databasecontract.Config) string {

diff --git a/database/db/dsn_test.go b/database/db/dsn_test.go
@@ -60,8 +60,8 @@ func (s *DsnTestSuite) TestPostgresql() {
 	s.mockConfig.On("GetString", fmt.Sprintf("database.connections.%s.sslmode", connection)).Return(sslmode).Once()
 	s.mockConfig.On("GetString", fmt.Sprintf("database.connections.%s.timezone", connection)).Return(timezone).Once()
 
-	s.Equal(fmt.Sprintf("host=%s user=%s password=%s dbname=%s port=%d sslmode=%s TimeZone=%s",
-		testHost, testUsername, testPassword, testDatabase, testPort, sslmode, timezone), dsn.Postgresql(testConfig))
+	s.Equal(fmt.Sprintf("postgres://%s:%s@%s:%d/%s?sslmode=%s&timezone=%s",
+		testUsername, testPassword, testHost, testPort, testDatabase, sslmode, timezone), dsn.Postgresql(testConfig))
 }
 
 func (s *DsnTestSuite) TestSqlite() {

diff --git a/database/gorm/dialector_test.go b/database/gorm/dialector_test.go
@@ -63,8 +63,8 @@ func (s *DialectorTestSuite) TestPostgresql() {
 		Return("UTC").Once()
 	dialectors, err := dialector.Make([]databasecontract.Config{s.config})
 	s.Equal(postgres.New(postgres.Config{
-		DSN: fmt.Sprintf("host=%s user=%s password=%s dbname=%s port=%d sslmode=%s TimeZone=%s",
-			s.config.Host, s.config.Username, s.config.Password, s.config.Database, s.config.Port, "disable", "UTC"),
+		DSN: fmt.Sprintf("postgres://%s:%s@%s:%d/%s?sslmode=%s&timezone=%s",
+			s.config.Username, s.config.Password, s.config.Host, s.config.Port, s.config.Database, "disable", "UTC"),
 	}), dialectors[0])
 	s.Nil(err)
 }

diff --git a/database/gorm/utils_test.go b/database/gorm/utils_test.go
@@ -4,8 +4,6 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-
-	"github.com/goravel/framework/support/debug"
 )
 
 func TestCopyStruct(t *testing.T) {
@@ -15,7 +13,7 @@ func TestCopyStruct(t *testing.T) {
 	}
 
 	data := copyStruct(Data{Name: "name", age: 18})
-	debug.Dump(data)
+
 	assert.Equal(t, "name", data.Field(0).Interface().(string))
 	assert.Panics(t, func() {
 		data.Field(1).Interface()

diff --git a/go.mod b/go.mod
@@ -143,7 +143,7 @@ require (
 	golang.org/x/oauth2 v0.10.0 // indirect
 	golang.org/x/sync v0.3.0 // indirect
 	golang.org/x/sys v0.12.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
+	golang.org/x/text v0.13.0
 	golang.org/x/tools v0.9.1 // indirect
 	google.golang.org/api v0.126.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect