🥦 Minor fixes

- remove unused params
- describe new functionality in readme

Author: im-kulikov

README.md

@@ -13,16 +13,22 @@ Configuration:
 - yaml example
 ```yaml
 posgres:
-    address: string
+    hostname: string
     username: string
     password: string
     database: string
     debug: bool
     pool_size: int
+    options: # optional
+      host: string
+      sslkey: string
+      sslmode: string
+      sslcert: string
+      sslrootcert: string
 ```
 - env example
 ```
-POSTGRES_ADDRESS=string
+POSTGRES_HOSTNAME=string
 POSTGRES_USERNAME=string
 POSTGRES_PASSWORD=string
 POSTGRES_DATABASE=string

orm.go

@@ -109,7 +109,7 @@ func NewDefaultConfig(v *viper.Viper) (*Config, error) {
 }
 
 // NewConnection returns database connection
-func NewConnection(cfg *Config, l *zap.Logger, v *viper.Viper) (db *pg.DB, err error) {
+func NewConnection(cfg *Config, l *zap.Logger) (db *pg.DB, err error) {
 	if cfg == nil {
 		err = ErrEmptyConfig
 		return

orm_test.go

@@ -39,8 +39,7 @@ func TestNewDefaultConfig(t *testing.T) {
 		})
 
 		t.Run("should fail for empty config", func(t *testing.T) {
-			v := viper.New()
-			con, err := NewConnection(nil, l, v)
+			con, err := NewConnection(nil, l)
 			require.Nil(t, con)
 			require.EqualError(t, err, ErrEmptyConfig.Error())
 		})
@@ -54,7 +53,7 @@ func TestNewDefaultConfig(t *testing.T) {
 			require.NoError(t, err)
 			require.Equal(t, hostname, cfg.Hostname)
 
-			cli, err := NewConnection(cfg, nil, v)
+			cli, err := NewConnection(cfg, nil)
 			require.Nil(t, cli)
 			require.EqualError(t, err, ErrEmptyLogger.Error())
 		})
@@ -68,7 +67,7 @@ func TestNewDefaultConfig(t *testing.T) {
 			cfg, err := NewDefaultConfig(v)
 			require.NoError(t, err)
 
-			cli, err := NewConnection(cfg, l, v)
+			cli, err := NewConnection(cfg, l)
 			require.Error(t, err)
 			require.Nil(t, cli)
 		})
@@ -86,7 +85,7 @@ func TestNewDefaultConfig(t *testing.T) {
 			require.Equal(t, "postgres", cfg.Password)
 			require.Equal(t, "postgres", cfg.Database)
 
-			cli, err := NewConnection(cfg, l, v)
+			cli, err := NewConnection(cfg, l)
 			require.NoError(t, err)
 			require.NotNil(t, cli)
 
@@ -125,7 +124,7 @@ func TestNewDefaultConfig(t *testing.T) {
 				require.Equal(t, "postgres", cfg.Password)
 				require.Equal(t, "postgres", cfg.Database)
 
-				_, _ = NewConnection(cfg, l, v)
+				_, _ = NewConnection(cfg, l)
 			}
 		})
 
@@ -150,7 +149,7 @@ func TestNewDefaultConfig(t *testing.T) {
 			require.Equal(t, "postgres", cfg.Password)
 			require.Equal(t, "postgres", cfg.Database)
 
-			cli, err := NewConnection(cfg, l, v)
+			cli, err := NewConnection(cfg, l)
 			require.Nil(t, cli)
 			require.Error(t, err)
 
@@ -174,7 +173,7 @@ func TestNewDefaultConfig(t *testing.T) {
 			require.Equal(t, "postgres", cfg.Password)
 			require.Equal(t, "postgres", cfg.Database)
 
-			cli, err := NewConnection(cfg, l, v)
+			cli, err := NewConnection(cfg, l)
 			require.Nil(t, cli)
 			require.Error(t, err)
 		})
@@ -225,7 +224,7 @@ func TestNewDefaultConfig(t *testing.T) {
 			for _, mode := range modes {
 				require.NoError(t, file.Chmod(mode))
 
-				cli, err := NewConnection(cfg, l, v)
+				cli, err := NewConnection(cfg, l)
 				require.Nil(t, cli)
 				require.Error(t, err)
 			}
@@ -247,7 +246,7 @@ func TestNewDefaultConfig(t *testing.T) {
 			require.Equal(t, "postgres", cfg.Password)
 			require.Equal(t, "postgres", cfg.Database)
 
-			cli, err := NewConnection(cfg, l, v)
+			cli, err := NewConnection(cfg, l)
 			require.NoError(t, err)
 			require.NotNil(t, cli)