From 44ece140354cd1184591310fecfc8c3176695e50 Mon Sep 17 00:00:00 2001 From: Andy Arthur Date: Mon, 28 Jun 2021 14:24:31 -0700 Subject: [PATCH] fix --- go/cmd/dolt/commands/sqlserver/server.go | 1 - go/go.mod | 2 +- go/libraries/doltcore/sqle/database_provider.go | 5 +---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/go/cmd/dolt/commands/sqlserver/server.go b/go/cmd/dolt/commands/sqlserver/server.go index 7c400b5e53..edf1870d82 100644 --- a/go/cmd/dolt/commands/sqlserver/server.go +++ b/go/cmd/dolt/commands/sqlserver/server.go @@ -215,7 +215,6 @@ func newSessionBuilder(sqlEngine *sqle.Engine, username, email string, autocommi } } - func dbsAsDSQLDBs(dbs []sql.Database) []dsqle.Database { dsqlDBs := make([]dsqle.Database, 0, len(dbs)) diff --git a/go/go.mod b/go/go.mod index c02d66f238..ec04dda8be 100644 --- a/go/go.mod +++ b/go/go.mod @@ -82,6 +82,6 @@ require ( replace github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi => ./gen/proto/dolt/services/eventsapi -replace github.com/dolthub/go-mysql-server => ../../go-mysql-server +//replace github.com/dolthub/go-mysql-server => ../../go-mysql-server go 1.15 diff --git a/go/libraries/doltcore/sqle/database_provider.go b/go/libraries/doltcore/sqle/database_provider.go index 49281483cb..ab11bbdc32 100644 --- a/go/libraries/doltcore/sqle/database_provider.go +++ b/go/libraries/doltcore/sqle/database_provider.go @@ -1,12 +1,9 @@ - - package sqle import ( "github.com/dolthub/go-mysql-server/sql" ) - type DoltDatabaseProvider struct { databases map[string]sql.Database } @@ -51,5 +48,5 @@ func (p DoltDatabaseProvider) AddDatabase(db sql.Database) { } func (p DoltDatabaseProvider) DropDatabase(name string) { - delete(p.databases, name) + delete(p.databases, name) }