mirror of
				https://github.com/optim-enterprises-bv/vault.git
				synced 2025-11-03 20:17:59 +00:00 
			
		
		
		
	postgres: replace the package lib/pq with pgx (#15343)
* WIP replacing lib/pq * change timezome param to be URI format * add changelog * add changelog for redshift * update changelog * add test for DSN style connection string * more parseurl and quoteidentify to sdk; include copyright and license * call dbutil.ParseURL instead, fix import ordering Co-authored-by: Calvin Leung Huang <1883212+calvn@users.noreply.github.com>
This commit is contained in:
		@@ -13,7 +13,6 @@ import (
 | 
			
		||||
	logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical"
 | 
			
		||||
	postgreshelper "github.com/hashicorp/vault/helper/testhelpers/postgresql"
 | 
			
		||||
	"github.com/hashicorp/vault/sdk/logical"
 | 
			
		||||
	"github.com/lib/pq"
 | 
			
		||||
	"github.com/mitchellh/mapstructure"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
@@ -272,14 +271,8 @@ func testAccStepReadCreds(t *testing.T, b logical.Backend, s logical.Storage, na
 | 
			
		||||
				return err
 | 
			
		||||
			}
 | 
			
		||||
			log.Printf("[TRACE] Generated credentials: %v", d)
 | 
			
		||||
			conn, err := pq.ParseURL(connURL)
 | 
			
		||||
			if err != nil {
 | 
			
		||||
				t.Fatal(err)
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			conn += " timezone=utc"
 | 
			
		||||
 | 
			
		||||
			db, err := sql.Open("postgres", conn)
 | 
			
		||||
			db, err := sql.Open("pgx", connURL+"&timezone=utc")
 | 
			
		||||
			if err != nil {
 | 
			
		||||
				t.Fatal(err)
 | 
			
		||||
			}
 | 
			
		||||
@@ -356,14 +349,8 @@ func testAccStepCreateTable(t *testing.T, b logical.Backend, s logical.Storage,
 | 
			
		||||
				return err
 | 
			
		||||
			}
 | 
			
		||||
			log.Printf("[TRACE] Generated credentials: %v", d)
 | 
			
		||||
			conn, err := pq.ParseURL(connURL)
 | 
			
		||||
			if err != nil {
 | 
			
		||||
				t.Fatal(err)
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			conn += " timezone=utc"
 | 
			
		||||
 | 
			
		||||
			db, err := sql.Open("postgres", conn)
 | 
			
		||||
			db, err := sql.Open("pgx", connURL+"&timezone=utc")
 | 
			
		||||
			if err != nil {
 | 
			
		||||
				t.Fatal(err)
 | 
			
		||||
			}
 | 
			
		||||
@@ -410,14 +397,8 @@ func testAccStepDropTable(t *testing.T, b logical.Backend, s logical.Storage, na
 | 
			
		||||
				return err
 | 
			
		||||
			}
 | 
			
		||||
			log.Printf("[TRACE] Generated credentials: %v", d)
 | 
			
		||||
			conn, err := pq.ParseURL(connURL)
 | 
			
		||||
			if err != nil {
 | 
			
		||||
				t.Fatal(err)
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			conn += " timezone=utc"
 | 
			
		||||
 | 
			
		||||
			db, err := sql.Open("postgres", conn)
 | 
			
		||||
			db, err := sql.Open("pgx", connURL+"&timezone=utc")
 | 
			
		||||
			if err != nil {
 | 
			
		||||
				t.Fatal(err)
 | 
			
		||||
			}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user