Fix db connection string & cmdline arg

Author: m-kus

cmdline/commandline.go

@@ -11,7 +11,7 @@ type Args struct {
 // Parse -
 func Parse() (args Args) {
 	flag.BoolVar(&args.Help, "h", false, "Show usage")
-	flag.StringVar(&args.Config, "f", "config.yaml", "Path to YAML config file")
+	flag.StringVar(&args.Config, "c", "dipdup.yml", "Path to YAML config file")
 
 	flag.Parse()
 

config/config.go

@@ -41,8 +41,14 @@ type Contract struct {
 
 // Database
 type Database struct {
-	Path string `yaml:"path"`
-	Kind string `yaml:"kind"`
+	Path       string `yaml:"path"`
+	Kind       string `yaml:"kind"`
+	Host       string `yaml:"host"`
+	Port       int    `yaml:"port"`
+	User       string `yaml:"user"`
+	Password   string `yaml:"password"`
+	Database   string `yaml:"database"`
+	SchemaName string `yaml:"schema_name"`
 }
 
 // Hasura -
@@ -53,12 +59,28 @@ type Hasura struct {
 
 // Validate -
 func (db *Database) Validate() error {
-	for _, valid := range []string{
-		DBKindClickHouse, DBKindMysql, DBKindPostgres, DBKindSqlServer, DBKindSqlite,
-	} {
-		if valid == db.Kind {
-			return nil
+	if db.Kind == DBKindSqlite {
+		if db.Path == "" {
+			return errors.Wrap(ErrMissingField, "Path")
+		}
+		return nil
+	} else if db.Kind == DBKindPostgres || db.Kind == DBKindMysql {
+		if db.Host == "" {
+			return errors.Wrap(ErrMissingField, "Host")
+		}
+		if db.Port == 0 {
+			return errors.Wrap(ErrMissingField, "Port")
+		}
+		if db.User == "" {
+			return errors.Wrap(ErrMissingField, "User")
+		}
+		if db.Password == "" {
+			return errors.Wrap(ErrMissingField, "Password")
+		}
+		if db.Database == "" {
+			return errors.Wrap(ErrMissingField, "Database")
 		}
+		return nil
 	}
 	return errors.Wrap(ErrUnsupportedDB, db.Kind)
 }

config/consts.go

@@ -4,13 +4,12 @@ import "github.com/pkg/errors"
 
 // Supported database kinds
 const (
-	DBKindSqlite     = "sqlite"
-	DBKindPostgres   = "postgres"
-	DBKindMysql      = "mysql"
-	DBKindClickHouse = "clickhouse"
-	DBKindSqlServer  = "sqlserver"
+	DBKindSqlite   = "sqlite"
+	DBKindPostgres = "postgres"
+	DBKindMysql    = "mysql"
 )
 
 var (
 	ErrUnsupportedDB = errors.New("Unsupported database")
+	ErrMissingField  = errors.New("Missing field")
 )

state/db.go

@@ -1,45 +1,40 @@
 package state
 
 import (
+	"fmt"
 	"log"
 	"os"
 	"time"
 
+	"github.com/dipdup-net/go-lib/config"
 	"github.com/pkg/errors"
-	"gorm.io/driver/clickhouse"
 	"gorm.io/driver/mysql"
 	"gorm.io/driver/postgres"
 	"gorm.io/driver/sqlite"
-	"gorm.io/driver/sqlserver"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
 )
 
-// Supported database kinds
-const (
-	DBKindSqlite     = "sqlite"
-	DBKindPostgres   = "postgres"
-	DBKindMysql      = "mysql"
-	DBKindClickHouse = "clickhouse"
-	DBKindSqlServer  = "sqlserver"
-)
-
 // OpenConnection -
-func OpenConnection(kind, path string) (*gorm.DB, error) {
+func OpenConnection(cfg config.Database) (*gorm.DB, error) {
 	var dialector gorm.Dialector
-	switch kind {
-	case DBKindSqlite:
-		dialector = sqlite.Open(path)
-	case DBKindPostgres:
-		dialector = postgres.Open(path)
-	case DBKindMysql:
-		dialector = mysql.Open(path)
-	case DBKindClickHouse:
-		dialector = clickhouse.Open(path)
-	case DBKindSqlServer:
-		dialector = sqlserver.Open(path)
+	switch cfg.Kind {
+	case config.DBKindSqlite:
+		dialector = sqlite.Open(cfg.Path)
+	case config.DBKindPostgres:
+		connString := fmt.Sprintf(
+			"host=%s user=%s password=%s dbname=%s port=%d",
+			cfg.Host, cfg.User, cfg.Password, cfg.Database, cfg.Port,
+		)
+		dialector = postgres.Open(connString)
+	case config.DBKindMysql:
+		connString := fmt.Sprintf(
+			"%s:%s@tcp(%s:%d)/%s",
+			cfg.User, cfg.Password, cfg.Host, cfg.Port, cfg.Database,
+		)
+		dialector = mysql.Open(connString)
 	default:
-		return nil, errors.Errorf("Unsupported database %s", kind)
+		return nil, errors.Errorf("Unsupported database kind %s", cfg.Kind)
 	}
 
 	return gorm.Open(dialector, &gorm.Config{