Merge branch 'master' into test_put_overwrite

snowflakedb · Nov 22, 2024 · d7de5fd · d7de5fd
2 parents e781ed2 + ce3db31
commit d7de5fd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/auth_test.go b/auth_test.go
@@ -979,7 +979,6 @@ func TestOktaRetryWithNewToken(t *testing.T) {
 }
 
 func TestContextPropagatedToAuthWhenUsingOpen(t *testing.T) {
-	t.Skip("dsnConnector loses context when opening using sql.Open")
 	db, err := sql.Open("snowflake", dsn)
 	assertNilF(t, err)
 	defer db.Close()

diff --git a/connector.go b/connector.go
@@ -20,7 +20,7 @@ type Connector struct {
 }
 
 // NewConnector creates a new connector with the given SnowflakeDriver and Config.
-func NewConnector(driver InternalSnowflakeDriver, config Config) Connector {
+func NewConnector(driver InternalSnowflakeDriver, config Config) driver.Connector {
 	return Connector{driver, config}
 }
 

diff --git a/driver.go b/driver.go
@@ -33,6 +33,15 @@ func (d SnowflakeDriver) Open(dsn string) (driver.Conn, error) {
 	return d.OpenWithConfig(ctx, *cfg)
 }
 
+// OpenConnector creates a new connector with parsed DSN.
+func (d SnowflakeDriver) OpenConnector(dsn string) (driver.Connector, error) {
+	cfg, err := ParseDSN(dsn)
+	if err != nil {
+		return Connector{}, err
+	}
+	return NewConnector(d, *cfg), nil
+}
+
 // OpenWithConfig creates a new connection with the given Config.
 func (d SnowflakeDriver) OpenWithConfig(ctx context.Context, config Config) (driver.Conn, error) {
 	if err := config.Validate(); err != nil {