remove DSN func and use ConnString

streamingfast · Jul 10, 2023 · 9285db8 · 9285db8
1 parent 0bec73d
commit 9285db8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/cmd/substreams-sink-postgres/inject_csv.go b/cmd/substreams-sink-postgres/inject_csv.go
@@ -64,7 +64,7 @@ func injectCSVE(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("unable to create input store: %w", err)
 	}
 
-	pool, err := pgxpool.Connect(ctx, fmt.Sprintf("%s pool_min_conns=%d pool_max_conns=%d", postgresDSN.DSN(), 2, 3))
+	pool, err := pgxpool.Connect(ctx, fmt.Sprintf("%s pool_min_conns=%d pool_max_conns=%d", postgresDSN.ConnString(), 2, 3))
 	if err != nil {
 		return fmt.Errorf("connecting to postgres: %w", err)
 	}

diff --git a/db/dsn.go b/db/dsn.go
@@ -23,14 +23,6 @@ type DSN struct {
 	options  []string
 }
 
-func (c *DSN) DSN() string {
-	out := fmt.Sprintf("host=%s port=%d user=%s dbname=%s %s", c.host, c.port, c.username, c.database, strings.Join(c.options, " "))
-	if c.password != "" {
-		out = out + " password=" + c.password
-	}
-	return out
-}
-
 func ParseDSN(dsn string) (*DSN, error) {
 	expanded, err := envsubst.Eval(dsn, os.Getenv)
 	if err != nil {
@@ -87,7 +79,7 @@ func ParseDSN(dsn string) (*DSN, error) {
 	return d, nil
 }
 
-func (c *DSN) connString() string {
+func (c *DSN) ConnString() string {
 	out := fmt.Sprintf("host=%s port=%d user=%s dbname=%s %s", c.host, c.port, c.username, c.database, strings.Join(c.options, " "))
 	if c.password != "" {
 		out = out + " password=" + c.password