Support specifying the driver (#42)

* Support specifying the driver

* Fix CS

* Fix order

* Try and fix tests

* Linting

* Map driver

* Fix test

* Formatting tidy

Co-authored-by: Jack Barton <jack.barton@inviqa.com>

Author: dantleech

config/builder.go

@@ -12,6 +12,7 @@ type Builder struct {
 	dBSchema            string
 	dBUser              string
 	dBPass              string
+	dBDriver            string
 	useDbForRetries     bool
 	maintenanceInterval time.Duration
 	topicNameGenerator  topicNameGenerator
@@ -24,6 +25,7 @@ func NewBuilder() *Builder {
 		topicNameGenerator:  defaultTopicNameGenerator,
 		maintenanceInterval: defaultMaintenanceInterval,
 		dBPort:              5432,
+		dBDriver:            "postgres",
 	}
 }
 

config/builder_test.go

@@ -17,6 +17,7 @@ func TestNewBuilder(t *testing.T) {
 		dBPort:              5432,
 		maintenanceInterval: time.Hour * 1,
 		topicNameGenerator:  defaultTopicNameGenerator,
+		dBDriver:            "postgres",
 	}
 
 	got := NewBuilder()
@@ -65,6 +66,7 @@ func TestBuilder_Config(t *testing.T) {
 				},
 			},
 			db: Database{
+				Driver: "postgres",
 				Host:   "postgres",
 				Port:   15432,
 				Schema: "schema",
@@ -125,6 +127,7 @@ func TestBuilder_Config(t *testing.T) {
 				"product": {},
 			},
 			db: Database{
+				Driver: "postgres",
 				Host:   "postgres",
 				Port:   5432,
 				Schema: "schema",

config/config.go

@@ -47,6 +47,7 @@ type Database struct {
 	Schema string
 	User   string
 	Pass   string
+	Driver string
 }
 
 type TopicKey string
@@ -162,7 +163,15 @@ func (cfg *Config) dsn() string {
 		sslMode = "verify-full"
 	}
 
-	return fmt.Sprintf("postgres://%s@%s:%d/%s?sslmode=%s", url.UserPassword(cfg.db.User, cfg.db.Pass), cfg.db.Host, cfg.db.Port, cfg.db.Schema, sslMode)
+	return fmt.Sprintf(
+		"%s://%s@%s:%d/%s?sslmode=%s",
+		cfg.db.Driver,
+		url.UserPassword(cfg.db.User, cfg.db.Pass),
+		cfg.db.Host,
+		cfg.db.Port,
+		cfg.db.Schema,
+		sslMode,
+	)
 }
 
 func (cfg *Config) addTopics(topics []*KafkaTopic) {
@@ -187,6 +196,7 @@ func (cfg *Config) loadFromBuilder(b *Builder) error {
 	cfg.db.Pass = b.dBPass
 	cfg.db.Schema = b.dBSchema
 	cfg.db.Port = b.dBPort
+	cfg.db.Driver = b.dBDriver
 	cfg.MaintenanceInterval = b.maintenanceInterval
 	cfg.topicNameGenerator = b.topicNameGenerator
 

config/config_test.go

@@ -330,6 +330,7 @@ func TestConfig_dsn(t *testing.T) {
 			name: "without TLS enabled",
 			cfg: Config{
 				db: Database{
+					Driver: "postgres",
 					Host:   "postgres-db",
 					Port:   5002,
 					Schema: "data",
@@ -343,6 +344,7 @@ func TestConfig_dsn(t *testing.T) {
 			name: "with TLS enabled",
 			cfg: Config{
 				db: Database{
+					Driver: "postgres",
 					Host:   "postgres-db",
 					Port:   5002,
 					Schema: "data",
@@ -357,6 +359,7 @@ func TestConfig_dsn(t *testing.T) {
 			name: "with password that should be encoded",
 			cfg: Config{
 				db: Database{
+					Driver: "postgres",
 					Host:   "postgres-db",
 					Port:   5002,
 					Schema: "data",