/go/libraries/doltcore/sqle/logictest/dolt: Initial test for dolt harness

go/libraries/doltcore/sqle/logictest/dolt/doltharness.go

@@ -57,6 +57,18 @@ func (h *DoltHarness) Init() error {
 		panic("Current directory must be a valid dolt repository")
 	}
 
+	return innerInit(h, dEnv)
+}
+
+func (h *DoltHarness) ExecuteStatement(statement string) error {
+	return executeStatement(h, statement)
+}
+
+func (h *DoltHarness) ExecuteQuery(statement string) (schema string, results []string, err error) {
+	return executeQuery(h, statement)
+}
+
+func innerInit(h *DoltHarness, dEnv *env.DoltEnv) error {
 	root, verr := commands.GetWorkingWithVErr(dEnv)
 	if verr != nil {
 		return verr
@@ -108,24 +120,6 @@ func (h *DoltHarness) Init() error {
 	return nil
 }
 
-func (h *DoltHarness) ExecuteStatement(statement string) error {
-	ctx := sql.NewContext(
-		context.Background(),
-		sql.WithPid(rand.Uint64()),
-		sql.WithIndexRegistry(h.idxReg),
-		sql.WithViewRegistry(h.viewReg),
-		sql.WithSession(h.sess))
-
-	statement = normalizeStatement(statement)
-
-	_, rowIter, err := h.engine.Query(ctx, statement)
-	if err != nil {
-		return err
-	}
-
-	return drainIterator(rowIter)
-}
-
 // We cheat a little at these tests. A great many of them use tables without primary keys, which we don't currently
 // support. Until we do, we just make every column in such tables part of the primary key.
 func normalizeStatement(statement string) string {
@@ -157,7 +151,25 @@ func normalizeStatement(statement string) string {
 	return normalized
 }
 
-func (h *DoltHarness) ExecuteQuery(statement string) (schema string, results []string, err error) {
+func executeStatement(h *DoltHarness, statement string) error {
+	ctx := sql.NewContext(
+		context.Background(),
+		sql.WithPid(rand.Uint64()),
+		sql.WithIndexRegistry(h.idxReg),
+		sql.WithViewRegistry(h.viewReg),
+		sql.WithSession(h.sess))
+
+	statement = normalizeStatement(statement)
+
+	_, rowIter, err := h.engine.Query(ctx, statement)
+	if err != nil {
+		return err
+	}
+
+	return drainIterator(rowIter)
+}
+
+func executeQuery(h *DoltHarness, statement string) (schema string, results []string, err error) {
 	pid := rand.Uint32()
 	ctx := sql.NewContext(
 		context.Background(),

go/libraries/doltcore/sqle/logictest/dolt/doltharness_test.go

@@ -0,0 +1,75 @@
+package dolt
+
+import (
+	"context"
+	"github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb"
+	"github.com/liquidata-inc/dolt/go/libraries/doltcore/env"
+	"github.com/liquidata-inc/dolt/go/libraries/utils/filesys"
+	"github.com/liquidata-inc/dolt/go/store/types"
+	"github.com/stretchr/testify/assert"
+	"path/filepath"
+	"testing"
+)
+
+func createTestEnvWithFS(fs filesys.Filesys, workingDir string) *env.DoltEnv {
+	testHomeDirFunc := func() (string, error) { return workingDir, nil }
+	const name = "test mcgibbins"
+	const email = "bigfakeytester@fake.horse"
+	dEnv := env.Load(context.Background(), testHomeDirFunc, fs, doltdb.InMemDoltDB, "test")
+	err := dEnv.InitRepo(context.Background(), types.Format_Default, name, email)
+	if err != nil {
+		panic("Failed to initialize environment")
+	}
+	return dEnv
+}
+
+func TestDoltHarness(t *testing.T) {
+	t.Run("should execute simple query against dolt", func(t *testing.T) {
+		h := &DoltHarness{}
+		home := "/home"
+		wd := filepath.Join(home, "/harnesstester")
+		fs := filesys.NewInMemFS([]string{}, nil, home)
+		dEnv := createTestEnvWithFS(fs, wd)
+
+		err := innerInit(h, dEnv)
+		assert.Equal(t, nil, err)
+
+		ct := "CREATE TABLE t1(a INTEGER, b INTEGER, c INTEGER, d INTEGER, e INTEGER);"
+		i1 := "INSERT INTO t1(e,c,b,d,a) VALUES(103,102,100,101,104);"
+		i2 := "INSERT INTO t1(a,c,d,e,b) VALUES(107,106,108,109,105);"
+
+		q1 := "SELECT a,c,e FROM t1;"
+		q2 := "SELECT b,d FROM t1;"
+		q3 := "SELECT * FROM t1 WHERE d < 107;"
+		q4 := "SELECT * FROM t1 WHERE d > 102;"
+
+		err = executeStatement(h, ct)
+		assert.Equal(t, nil, err)
+
+		err = executeStatement(h, i1)
+		assert.Equal(t, nil, err)
+
+		err = executeStatement(h, i2)
+		assert.Equal(t, nil, err)
+
+		schema, results, err := executeQuery(h, q1)
+		assert.Equal(t, nil, err)
+		assert.Equal(t, schema, "III")
+		assert.Equal(t, []string{"104", "102", "103", "107", "106", "109"}, results)
+
+		schema, results, err = executeQuery(h, q2)
+		assert.Equal(t, nil, err)
+		assert.Equal(t, schema, "II")
+		assert.Equal(t, []string{"100", "101", "105", "108"}, results)
+
+		schema, results, err = executeQuery(h, q3)
+		assert.Equal(t, nil, err)
+		assert.Equal(t, "IIIII", schema)
+		assert.Equal(t, []string{"104", "100", "102", "101", "103"}, results)
+
+		schema, results, err = executeQuery(h, q4)
+		assert.Equal(t, nil, err)
+		assert.Equal(t, "IIIII", schema)
+		assert.Equal(t, []string{"107", "105", "106", "108", "109"}, results)
+	})
+}