mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-21 11:29:51 -05:00
Code Issues Packages Projects Releases 156 Wiki Activity

[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

Browse Source
This commit is contained in:
zachmu
2023-06-13 21:24:26 +00:00
parent 0284e3b04b
commit 45b0f1213e
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/cmd/dolt/commands/sql.go
+1 -1
View File
@@ -1085,4 +1085,4 @@ func dbddl(ctx *sql.Context, queryist cli.Queryist, dbddl *sqlparser.DBDDL, quer
}
return sch, nil, nil
}
}
go/libraries/doltcore/sqle/dsess/session.go
+4 -3
View File
@@ -23,6 +23,9 @@ import (
"sync"
"time"
"github.com/dolthub/go-mysql-server/sql"
sqltypes "github.com/dolthub/go-mysql-server/sql/types"
"github.com/dolthub/dolt/go/cmd/dolt/cli"
"github.com/dolthub/dolt/go/libraries/doltcore/branch_control"
"github.com/dolthub/dolt/go/libraries/doltcore/doltdb"
@@ -35,8 +38,6 @@ import (
"github.com/dolthub/dolt/go/libraries/utils/config"
"github.com/dolthub/dolt/go/store/hash"
"github.com/dolthub/dolt/go/store/types"
"github.com/dolthub/go-mysql-server/sql"
sqltypes "github.com/dolthub/go-mysql-server/sql/types"
)
const (
@@ -355,7 +356,7 @@ func (d *DoltSession) CommitTransaction(ctx *sql.Context, tx sql.Transaction) (e
ctx.SetTransaction(nil)
}
}()
if TransactionsDisabled(ctx) {
return nil
}