Fixed index editor test for transactions

This commit is contained in:
Zach Musgrave
2021-06-07 16:06:36 -07:00
parent 6e14c94471
commit f6fc79d709

View File

@@ -31,16 +31,12 @@ import (
"github.com/dolthub/dolt/go/store/types"
)
var index_dEnv *env.DoltEnv
var index_initialRoot *doltdb.RootValue
func init() {
index_dEnv = dtestutils.CreateTestEnv()
func setupEditorIndexTest(t *testing.T) (*env.DoltEnv, *doltdb.RootValue){
index_dEnv := dtestutils.CreateTestEnv()
root, err := index_dEnv.WorkingRoot(context.Background())
if err != nil {
panic(err)
}
index_initialRoot, err = ExecuteSql(index_dEnv, root, `
require.NoError(t, err)
index_initialRoot, err := ExecuteSql(index_dEnv, root, `
CREATE TABLE onepk (
pk1 BIGINT PRIMARY KEY,
v1 BIGINT,
@@ -70,9 +66,10 @@ CREATE INDEX idx_v2v1 ON twopk(v2, v1);
CREATE UNIQUE INDEX idx_v1 ON oneuni(v1);
CREATE UNIQUE INDEX idx_v1v2 ON twouni(v1, v2);
`)
if err != nil {
panic(err)
}
require.NoError(t, err)
return index_dEnv, index_initialRoot
}
func TestTableEditorIndexResults(t *testing.T) {
@@ -122,10 +119,12 @@ UPDATE onepk SET pk1 = v1 + pk1 ORDER BY pk1 DESC;
for _, test := range tests {
t.Run(test.sqlStatement, func(t *testing.T) {
root := index_initialRoot
dEnv, initialRoot := setupEditorIndexTest(t)
root := initialRoot
for _, sqlStatement := range strings.Split(test.sqlStatement, ";") {
var err error
root, err = executeModify(context.Background(), index_dEnv, root, sqlStatement)
root, err = executeModify(context.Background(), dEnv, root, sqlStatement)
require.NoError(t, err)
}
@@ -278,10 +277,12 @@ UPDATE oneuni SET v1 = v1 + pk1;
for _, test := range tests {
t.Run(test.sqlStatement, func(t *testing.T) {
root := index_initialRoot
dEnv, initialRoot := setupEditorIndexTest(t)
root := initialRoot
var err error
for _, sqlStatement := range strings.Split(test.sqlStatement, ";") {
root, err = executeModify(context.Background(), index_dEnv, root, sqlStatement)
root, err = executeModify(context.Background(), dEnv, root, sqlStatement)
if err != nil {
break
}