Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions cmd/dbc/install_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,41 @@ func (suite *SubcommandTestSuite) TestInstallVenv() {
"\nInstalled test-driver-1 1.1.0 to "+filepath.Join(suite.tempdir, "etc", "adbc", "drivers")+"\n", suite.runCmd(m))
}

func (suite *SubcommandTestSuite) TestInstallEnvironmentPrecedence() {
// Like the driver managers, dbc follows a precedence chain when
// ADBC_DRIVER_MANAGER, VIRTUAL_ENV, and CONDA_PREFIX are set with each
// variable overriding the next.
driver_path := filepath.Join(suite.tempdir, "driver_path")
venv_path := filepath.Join(suite.tempdir, "venv_path")
conda_path := filepath.Join(suite.tempdir, "conda_path")
os.Setenv("ADBC_DRIVER_PATH", driver_path)
os.Setenv("VIRTUAL_ENV", venv_path)
os.Setenv("CONDA_PREFIX", conda_path)

m := InstallCmd{Driver: "test-driver-1", Level: config.ConfigEnv}.
GetModelCustom(baseModel{getDriverList: getTestDriverList, downloadPkg: downloadTestPkg})
suite.runCmd(m)

suite.FileExists(filepath.Join(driver_path, "test-driver-1.toml"))
suite.NoFileExists(filepath.Join(venv_path, "test-driver-1.toml"))
suite.NoFileExists(filepath.Join(conda_path, "test-driver-1.toml"))

os.Unsetenv("ADBC_DRIVER_PATH")
m = InstallCmd{Driver: "test-driver-1", Level: config.ConfigEnv}.
GetModelCustom(baseModel{getDriverList: getTestDriverList, downloadPkg: downloadTestPkg})
suite.runCmd(m)
suite.FileExists(filepath.Join(venv_path, "etc", "adbc", "drivers", "test-driver-1.toml"))
suite.NoFileExists(filepath.Join(conda_path, "etc", "adbc", "drivers", "test-driver-1.toml"))

os.Unsetenv("VIRTUAL_ENV")
m = InstallCmd{Driver: "test-driver-1", Level: config.ConfigEnv}.
GetModelCustom(baseModel{getDriverList: getTestDriverList, downloadPkg: downloadTestPkg})
suite.runCmd(m)
suite.FileExists(filepath.Join(conda_path, "etc", "adbc", "drivers", "test-driver-1.toml"))

os.Unsetenv("CONDA_PREFIX")
}

func (suite *SubcommandTestSuite) TestInstallCondaPrefix() {
os.Unsetenv("ADBC_DRIVER_PATH")
os.Setenv("CONDA_PREFIX", suite.tempdir)
Expand Down
6 changes: 5 additions & 1 deletion config/dirs_unixlike.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,11 @@ func GetDriver(cfg Config, driverName string) (DriverInfo, error) {
}

func CreateManifest(cfg Config, driver DriverInfo) (err error) {
return createDriverManifest(cfg.Location, driver)
loc, err := EnsureLocation(cfg)
if err != nil {
return err
}
return createDriverManifest(loc, driver)
}

func UninstallDriver(cfg Config, info DriverInfo) error {
Expand Down
6 changes: 5 additions & 1 deletion config/dirs_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,11 @@ func CreateManifest(cfg Config, driver DriverInfo) (err error) {
if cfg.Location == "" {
return fmt.Errorf("cannot write manifest to env config without %s set", adbcEnvVar)
}
return createDriverManifest(cfg.Location, driver)
loc, err := EnsureLocation(cfg)
if err != nil {
return err
}
return createDriverManifest(loc, driver)
}

var k registry.Key
Expand Down
Loading