Skip to content

Commit 39dbe07

Browse files
authored
Update DriverVersion in Config to 1.0.1 (#94)
## Description In this PR, we update the driver version to 1.0.1 to reflect the latest cut. We also move the DriverVersion to a more visible const in `driver.go`. (Already merged) Most of the code in `driver.go:Open` is the same as `driver.go:OpenConnector` so these are merged.
2 parents 75b54f0 + b7ea647 commit 39dbe07

File tree

5 files changed

+7
-1
lines changed

5 files changed

+7
-1
lines changed

connector.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ type connOption func(*config.Config)
8686
func NewConnector(options ...connOption) (driver.Connector, error) {
8787
// config with default options
8888
cfg := config.WithDefaults()
89+
cfg.DriverVersion = DriverVersion
8990

9091
for _, opt := range options {
9192
opt(cfg)

connector_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ func TestNewConnector(t *testing.T) {
5252
RetryWaitMax: 60 * time.Second,
5353
}
5454
expectedCfg := config.WithDefaults()
55+
expectedCfg.DriverVersion = DriverVersion
5556
expectedCfg.UserConfig = expectedUserConfig
5657
coni, ok := con.(*connector)
5758
require.True(t, ok)
@@ -85,6 +86,7 @@ func TestNewConnector(t *testing.T) {
8586
}
8687
expectedCfg := config.WithDefaults()
8788
expectedCfg.UserConfig = expectedUserConfig
89+
expectedCfg.DriverVersion = DriverVersion
8890
coni, ok := con.(*connector)
8991
require.True(t, ok)
9092
assert.Nil(t, err)
@@ -117,6 +119,7 @@ func TestNewConnector(t *testing.T) {
117119
RetryWaitMax: 0,
118120
}
119121
expectedCfg := config.WithDefaults()
122+
expectedCfg.DriverVersion = DriverVersion
120123
expectedCfg.UserConfig = expectedUserConfig
121124
coni, ok := con.(*connector)
122125
require.True(t, ok)

driver.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ func init() {
1313
sql.Register("databricks", &databricksDriver{})
1414
}
1515

16+
var DriverVersion = "1.0.1" // update version before each release
17+
1618
type databricksDriver struct{}
1719

1820
// Open returns a new connection to Databricks database with a DSN string.

driver_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ func TestOOpenConnector(t *testing.T) {
2626
}
2727
expectedCfg := config.WithDefaults()
2828
expectedCfg.UserConfig = expectedUserConfig.WithDefaults()
29+
expectedCfg.DriverVersion = DriverVersion
2930
d := &databricksDriver{}
3031
c, err := d.OpenConnector(fmt.Sprintf("token:%s@%s:%d/%s", accessToken, host, port, httpPath))
3132
require.NoError(t, err)

internal/config/config.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ func WithDefaults() *Config {
167167
PingTimeout: 60 * time.Second,
168168
CanUseMultipleCatalogs: true,
169169
DriverName: "godatabrickssqlconnector", // important. Do not change
170-
DriverVersion: "0.9.0",
171170
ThriftProtocol: "binary",
172171
ThriftTransport: "http",
173172
ThriftProtocolVersion: cli_service.TProtocolVersion_SPARK_CLI_SERVICE_PROTOCOL_V6,

0 commit comments

Comments
 (0)