mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-04 10:25:17 -06:00
Code Issues Packages Projects Releases 126 Wiki Activity

picked up latest master and go-mysql-server, repo fmt, cleanup

Browse Source
This commit is contained in:
Andy Arthur
2020-06-26 19:16:08 -05:00
parent 3355231fe1
commit 3aaa5cc041
4 changed files with 35 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
go/libraries/doltcore/diff/querydiff/query_differ.go
View File

@@ -17,14 +17,15 @@ package querydiff
import (
"context"
"fmt"
"io"
"math"
"strings"
sqle "github.com/liquidata-inc/go-mysql-server"
"github.com/liquidata-inc/go-mysql-server/sql"
"github.com/liquidata-inc/go-mysql-server/sql/expression/function"
"github.com/liquidata-inc/go-mysql-server/sql/parse"
"github.com/liquidata-inc/go-mysql-server/sql/plan"
"io"
"math"
"strings"
"vitess.io/vitess/go/vt/sqlparser"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb"
@@ -347,7 +348,7 @@ func validateQueryType(ctx *sql.Context, eng *sqle.Engine, query string) error {
}
func validateQueryPlan(ctx *sql.Context, eng *sqle.Engine, node sql.Node, query string) (err error) {
if node == plan.Nothing || node == plan.EmptyTable{
if node == plan.Nothing || node == plan.EmptyTable {
return errPrintQueryPlan(ctx, eng, query, "queries returning no rows are not supported")
}

25
go/libraries/doltcore/diff/querydiff/query_differ_test.go
View File

@@ -16,8 +16,6 @@ package querydiff_test
import (
"context"
"github.com/liquidata-inc/go-mysql-server/sql/expression"
"github.com/liquidata-inc/go-mysql-server/sql/plan"
"io"
"sort"
"strings"
@@ -25,6 +23,8 @@ import (
"github.com/liquidata-inc/go-mysql-server/enginetest"
"github.com/liquidata-inc/go-mysql-server/sql"
"github.com/liquidata-inc/go-mysql-server/sql/expression"
"github.com/liquidata-inc/go-mysql-server/sql/plan"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@@ -520,18 +520,11 @@ var engineTestSkipSet = []string{
// query diff doesn't handle mutlidb queries
`SELECT * FROM foo.other_table`,
"SELECT i FROM mytable WHERE i > 2;",
"SELECT i FROM mytable WHERE 2 < i;",
"SELECT i FROM mytable WHERE i < 2;",
"SELECT i FROM mytable WHERE 2 > i;",
"SELECT i FROM mytable WHERE i >= 2 ORDER BY 1",
"SELECT i FROM mytable WHERE 2 <= i ORDER BY 1",
// dolt panics on these queries for empty mytable
"SELECT i FROM mytable WHERE i < 2",
"SELECT i FROM mytable WHERE 2 > i",
"SELECT i FROM mytable WHERE i <= 2 ORDER BY 1",
"SELECT i FROM mytable WHERE 2 >= i ORDER BY 1",
"SELECT i FROM mytable WHERE i > 2",
"SELECT i FROM mytable WHERE i < 2",
"SELECT i FROM mytable WHERE i >= 2 OR i = 1 ORDER BY 1",
}
func skipEngineTest(test enginetest.QueryTest) bool {
@@ -548,7 +541,7 @@ func skipEngineTest(test enginetest.QueryTest) bool {
}
for _, q := range engineTestSkipSet {
if lowerQuery == strings.ToLower(q) {
if strings.Contains(lowerQuery, strings.ToLower(q)) {
return true
}
}
@@ -649,13 +642,13 @@ func sortExpectedResults(sch sql.Schema, rows []sql.Row) []sql.Row {
order := make([]plan.SortField, len(sch))
for i, col := range sch {
order[i] = plan.SortField{
Column: expression.NewGetField(i, col.Type, col.Name, col.Nullable),
Column: expression.NewGetField(i, col.Type, col.Name, col.Nullable),
}
}
s := &plan.Sorter{
SortFields: order,
Rows: rows,
Ctx: sql.NewContext(context.Background()),
Rows: rows,
Ctx: sql.NewContext(context.Background()),
}
sort.Stable(s)
return s.Rows