Fix windows file paths for dropping databases (#7494)

This commit is contained in:
James Cor
2024-02-14 15:13:54 -08:00
committed by GitHub
parent 3483a0871d
commit 4849f996b3
2 changed files with 13 additions and 9 deletions

View File

@@ -18,6 +18,7 @@ import (
"context"
"errors"
"fmt"
"path/filepath"
"sort"
"strings"
"sync"
@@ -589,7 +590,7 @@ func (p *DoltDatabaseProvider) DropDatabase(ctx *sql.Context, name string) error
}
// If this database is re-created, we don't want to return any cached results.
err = dbfactory.DeleteFromSingletonCache(dropDbLoc + "/.dolt/noms")
err = dbfactory.DeleteFromSingletonCache(filepath.ToSlash(dropDbLoc + "/.dolt/noms"))
if err != nil {
return err
}

View File

@@ -75,8 +75,6 @@ SQL
}
@test "sql-create-database: drop database" {
skiponwindows "failing with file in use error"
dolt sql <<SQL
create database mydb;
use mydb;
@@ -99,6 +97,17 @@ SQL
[ ! -d mydb ]
}
@test "sql-create-database: drop and recreate database" {
run dolt sql <<SQL
create database mydb;
drop database mydb;
create database mydb;
SQL
[ "$status" -eq 0 ]
[ -d mydb ]
}
@test "sql-create-database: with data-dir" {
skiponwindows "failing with file in use error"
@@ -195,8 +204,6 @@ SQL
}
@test "sql-create-database: create and drop new database in same session" {
skiponwindows "failing with file in use error"
run dolt sql << SQL
CREATE DATABASE mydb;
DROP DATABASE mydb;
@@ -211,8 +218,6 @@ SQL
}
@test "sql-create-database: create new database IF NOT EXISTS" {
skiponwindows "failing with file in use error"
# Test bad syntax.
run dolt sql -q "CREATE DATABASE IF EXISTS test;"
[ "$status" -eq 1 ]
@@ -290,8 +295,6 @@ SQL
}
@test "sql-create-database: SHOW DATABASES works after CREATE and DROP" {
skiponwindows "failing with file in use error"
run dolt sql -q "SHOW DATABASES"
before=$output