From 321c232bd45fc5d5bf1a81c51ae6c6d09eb83795 Mon Sep 17 00:00:00 2001
From: James Cor <james@dolthub.com>
Date: Wed, 14 Feb 2024 12:07:31 -0800
Subject: [PATCH 1/3] fix drop/recreate database in windows, and unskip tests

---
 go/libraries/doltcore/sqle/database_provider.go | 3 ++-
 integration-tests/bats/sql-create-database.bats | 8 --------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/go/libraries/doltcore/sqle/database_provider.go b/go/libraries/doltcore/sqle/database_provider.go
index 818cd050588..a17bf37a066 100644
--- a/go/libraries/doltcore/sqle/database_provider.go
+++ b/go/libraries/doltcore/sqle/database_provider.go
@@ -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
 	}
diff --git a/integration-tests/bats/sql-create-database.bats b/integration-tests/bats/sql-create-database.bats
index 04cd4eabb9f..9640ef0e2b0 100644
--- a/integration-tests/bats/sql-create-database.bats
+++ b/integration-tests/bats/sql-create-database.bats
@@ -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;
@@ -195,8 +193,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 +207,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 +284,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
 

From 75b95f8ca54af64fda2664f78ec5995b6c8ee007 Mon Sep 17 00:00:00 2001
From: James Cor <james@dolthub.com>
Date: Wed, 14 Feb 2024 12:20:01 -0800
Subject: [PATCH 2/3] adding a bats test

---
 integration-tests/bats/sql-create-database.bats | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/integration-tests/bats/sql-create-database.bats b/integration-tests/bats/sql-create-database.bats
index 9640ef0e2b0..0f104e1fb71 100644
--- a/integration-tests/bats/sql-create-database.bats
+++ b/integration-tests/bats/sql-create-database.bats
@@ -97,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"
 

From c0dba84abe93d1c6fd28b749a0f1d2188309626b Mon Sep 17 00:00:00 2001
From: James Cor <james@dolthub.com>
Date: Wed, 14 Feb 2024 12:31:38 -0800
Subject: [PATCH 3/3] bad check

---
 integration-tests/bats/sql-create-database.bats | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/integration-tests/bats/sql-create-database.bats b/integration-tests/bats/sql-create-database.bats
index 0f104e1fb71..2a5325ad2d2 100644
--- a/integration-tests/bats/sql-create-database.bats
+++ b/integration-tests/bats/sql-create-database.bats
@@ -105,7 +105,7 @@ create database mydb;
 SQL
 
     [ "$status" -eq 0 ]
-    [ ! -d mydb ]
+    [ -d mydb ]
 }
 
 @test "sql-create-database: with data-dir" {