mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-11 18:49:14 -06:00
Code Issues Packages Projects Releases 128 Wiki Activity

Moved a lot of things around to mostly eliminate the sqltestutil package, as well as everything else in the old sql package, and then get rid of import cycles.

Browse Source 
Signed-off-by: Zach Musgrave <zach@liquidata.co>
This commit is contained in:
Zach Musgrave
2020-04-28 16:28:43 -07:00
parent b15b881254
commit 2178d674e8
38 changed files with 433 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
go/cmd/dolt/commands/diff.go
View File

@@ -17,6 +17,7 @@ package commands
import (
"context"
"fmt"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/sqlfmt"
"reflect"
"strconv"
"strings"
@@ -35,7 +36,6 @@ import (
"github.com/liquidata-inc/dolt/go/libraries/doltcore/row"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/rowconv"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/sql"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/table/pipeline"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped/fwt"
@@ -463,21 +463,21 @@ func tabularSchemaDiff(tableName string, tags []uint64, diffs map[uint64]diff.Sc
switch dff.DiffType {
case diff.SchDiffNone:
if dff.New.IsPartOfPK {
newPks = append(newPks, sql.QuoteIdentifier(dff.New.Name))
oldPks = append(oldPks, sql.QuoteIdentifier(dff.Old.Name))
newPks = append(newPks, sqlfmt.QuoteIdentifier(dff.New.Name))
oldPks = append(oldPks, sqlfmt.QuoteIdentifier(dff.Old.Name))
}
cli.Println(sql.FmtCol(4, 0, 0, *dff.New))
cli.Println(sqlfmt.FmtCol(4, 0, 0, *dff.New))
case diff.SchDiffColAdded:
if dff.New.IsPartOfPK {
newPks = append(newPks, sql.QuoteIdentifier(dff.New.Name))
newPks = append(newPks, sqlfmt.QuoteIdentifier(dff.New.Name))
}
cli.Println(color.GreenString("+ " + sql.FmtCol(2, 0, 0, *dff.New)))
cli.Println(color.GreenString("+ " + sqlfmt.FmtCol(2, 0, 0, *dff.New)))
case diff.SchDiffColRemoved:
// removed from sch2
if dff.Old.IsPartOfPK {
oldPks = append(oldPks, sql.QuoteIdentifier(dff.Old.Name))
oldPks = append(oldPks, sqlfmt.QuoteIdentifier(dff.Old.Name))
}
cli.Println(color.RedString("- " + sql.FmtCol(2, 0, 0, *dff.Old)))
cli.Println(color.RedString("- " + sqlfmt.FmtCol(2, 0, 0, *dff.Old)))
case diff.SchDiffColModified:
// changed in sch2
oldSqlType := dff.Old.TypeInfo.ToSqlType()
@@ -503,14 +503,14 @@ func tabularSchemaDiff(tableName string, tags []uint64, diffs map[uint64]diff.Sc
if pk0 != pk1 {
if pk0 && !pk1 {
oldPks = append(oldPks, sql.QuoteIdentifier(n0))
oldPks = append(oldPks, sqlfmt.QuoteIdentifier(n0))
} else {
newPks = append(newPks, sql.QuoteIdentifier(n1))
newPks = append(newPks, sqlfmt.QuoteIdentifier(n1))
}
cli.Println(sql.FmtCol(4, 0, 0, *dff.New))
cli.Println(sqlfmt.FmtCol(4, 0, 0, *dff.New))
} else {
cli.Println("< " + sql.FmtColWithNameAndType(2, nameLen, typeLen, n0, t0, *dff.Old))
cli.Println("> " + sql.FmtColWithNameAndType(2, nameLen, typeLen, n1, t1, *dff.New))
cli.Println("< " + sqlfmt.FmtColWithNameAndType(2, nameLen, typeLen, n0, t0, *dff.Old))
cli.Println("> " + sqlfmt.FmtColWithNameAndType(2, nameLen, typeLen, n1, t1, *dff.New))
}
}
}
@@ -519,10 +519,10 @@ func tabularSchemaDiff(tableName string, tags []uint64, diffs map[uint64]diff.Sc
newPKStr := strings.Join(newPks, ", ")
if oldPKStr != newPKStr {
cli.Print("< " + color.YellowString(sql.FmtColPrimaryKey(2, oldPKStr)))
cli.Print("> " + color.YellowString(sql.FmtColPrimaryKey(2, newPKStr)))
cli.Print("< " + color.YellowString(sqlfmt.FmtColPrimaryKey(2, oldPKStr)))
cli.Print("> " + color.YellowString(sqlfmt.FmtColPrimaryKey(2, newPKStr)))
} else {
cli.Print(sql.FmtColPrimaryKey(4, oldPKStr))
cli.Print(sqlfmt.FmtColPrimaryKey(4, oldPKStr))
}
cli.Println(" );")
@@ -536,11 +536,11 @@ func sqlSchemaDiff(tableName string, tags []uint64, diffs map[uint64]diff.Schema
switch dff.DiffType {
case diff.SchDiffNone:
case diff.SchDiffColAdded:
cli.Println(sql.AlterTableAddColStmt(tableName, sql.FmtCol(0, 0, 0, *dff.New)))
cli.Println(sqlfmt.AlterTableAddColStmt(tableName, sqlfmt.FmtCol(0, 0, 0, *dff.New)))
case diff.SchDiffColRemoved:
cli.Print(sql.AlterTableDropColStmt(tableName, dff.Old.Name))
cli.Print(sqlfmt.AlterTableDropColStmt(tableName, dff.Old.Name))
case diff.SchDiffColModified:
cli.Print(sql.AlterTableRenameColStmt(tableName, dff.Old.Name, dff.New.Name))
cli.Print(sqlfmt.AlterTableRenameColStmt(tableName, dff.Old.Name, dff.New.Name))
}
}
}

4
go/cmd/dolt/commands/schcmds/import.go
View File

@@ -16,6 +16,7 @@ package schcmds
import (
"context"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/sqlfmt"
"os"
"path/filepath"
"strconv"
@@ -33,7 +34,6 @@ import (
"github.com/liquidata-inc/dolt/go/libraries/doltcore/env/actions"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/encoding"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/sql"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/table"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped/csv"
"github.com/liquidata-inc/dolt/go/libraries/utils/argparser"
@@ -278,7 +278,7 @@ func importSchema(ctx context.Context, dEnv *env.DoltEnv, apr *argparser.ArgPars
return verr
}
cli.Println(sql.SchemaAsCreateStmt(tblName, sch))
cli.Println(sqlfmt.SchemaAsCreateStmt(tblName, sch))
if !apr.Contains(dryRunFlag) {
schVal, err := encoding.MarshalSchemaAsNomsValue(context.Background(), root.VRW(), sch)

4
go/cmd/dolt/commands/schcmds/show.go
View File

@@ -16,6 +16,7 @@ package schcmds
import (
"context"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/sqlfmt"
"github.com/fatih/color"
@@ -25,7 +26,6 @@ import (
eventsapi "github.com/liquidata-inc/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1"
"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/doltcore/sql"
"github.com/liquidata-inc/dolt/go/libraries/utils/argparser"
"github.com/liquidata-inc/dolt/go/libraries/utils/filesys"
)
@@ -165,6 +165,6 @@ func printTblSchema(ctx context.Context, cmStr string, tblName string, tbl *dolt
return errhand.BuildDError("unable to get schema").AddCause(err).Build()
}
cli.Println(sql.SchemaAsCreateStmt(tblName, sch))
cli.Println(sqlfmt.SchemaAsCreateStmt(tblName, sch))
return nil
}

3
go/cmd/dolt/commands/sql.go
View File

@@ -39,7 +39,6 @@ import (
"github.com/liquidata-inc/dolt/go/libraries/doltcore/env"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/row"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema"
dsql "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql"
dsqle "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle"
_ "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/dfunctions"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/table"
@@ -713,7 +712,7 @@ func newCompleter(ctx context.Context, dEnv *env.DoltEnv) (*sqlCompleter, error)
}
}
completionWords = append(completionWords, dsql.CommonKeywords...)
completionWords = append(completionWords, dsqle.CommonKeywords...)
return &sqlCompleter{
allWords: completionWords,

2
go/cmd/dolt/dolt.go
View File

@@ -146,7 +146,7 @@ func runMain() int {
restoreIO := cli.InitIO()
defer restoreIO()
warnIfMaxFilesTooLow()
//warnIfMaxFilesTooLow()
dEnv := env.Load(context.TODO(), env.GetCurrentUserHomeDir, filesys.LocalFS, doltdb.LocalDirDoltDB, Version)

16
go/libraries/doltcore/diff/sql_diff.go
View File

@@ -24,7 +24,7 @@ import (
"github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/row"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/sql"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/sqlfmt"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/table/pipeline"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/table/typed/noms"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped/nullprinter"
@@ -83,7 +83,7 @@ func (sds *SQLDiffSink) ProcRowWithProps(r row.Row, props pipeline.ReadableMap)
if dt, convertedOK := prop.(DiffChType); convertedOK {
switch dt {
case DiffAdded:
stmt, err := sql.RowAsInsertStmt(r, sds.tableName, sds.sch)
stmt, err := sqlfmt.RowAsInsertStmt(r, sds.tableName, sds.sch)
if err != nil {
return err
@@ -91,7 +91,7 @@ func (sds *SQLDiffSink) ProcRowWithProps(r row.Row, props pipeline.ReadableMap)
return iohelp.WriteLine(sds.wr, stmt)
case DiffRemoved:
stmt, err := sql.RowAsDeleteStmt(r, sds.tableName, sds.sch)
stmt, err := sqlfmt.RowAsDeleteStmt(r, sds.tableName, sds.sch)
if err != nil {
return err
@@ -102,7 +102,7 @@ func (sds *SQLDiffSink) ProcRowWithProps(r row.Row, props pipeline.ReadableMap)
return nil
case DiffModifiedNew:
// TODO: minimize update statement to modified rows
stmt, err := sql.RowAsUpdateStmt(r, sds.tableName, sds.sch)
stmt, err := sqlfmt.RowAsUpdateStmt(r, sds.tableName, sds.sch)
if err != nil {
return err
@@ -120,7 +120,7 @@ func (sds *SQLDiffSink) ProcRowWithProps(r row.Row, props pipeline.ReadableMap)
// ProcRowWithProps satisfies pipeline.SinkFunc; it writes rows as SQL statements.
func (sds *SQLDiffSink) ProcRowForExport(r row.Row, _ pipeline.ReadableMap) error {
stmt, err := sql.RowAsInsertStmt(r, sds.tableName, sds.sch)
stmt, err := sqlfmt.RowAsInsertStmt(r, sds.tableName, sds.sch)
if err != nil {
return err
@@ -158,13 +158,13 @@ func PrintSqlTableDiffs(ctx context.Context, r1, r2 *doltdb.RootValue, wr io.Wri
}
for k, v := range renames {
if err = iohelp.WriteLine(wr, sql.RenameTableStmt(k, v)); err != nil {
if err = iohelp.WriteLine(wr, sqlfmt.RenameTableStmt(k, v)); err != nil {
return err
}
}
for _, tblName := range drops {
if err = iohelp.WriteLine(wr, sql.DropTableStmt(tblName)); err != nil {
if err = iohelp.WriteLine(wr, sqlfmt.DropTableStmt(tblName)); err != nil {
return err
}
}
@@ -179,7 +179,7 @@ func PrintSqlTableDiffs(ctx context.Context, r1, r2 *doltdb.RootValue, wr io.Wri
if sch, err := tbl.GetSchema(ctx); err != nil {
return errors.New("error unable to get schema for table " + tblName)
} else {
stmt := sql.SchemaAsCreateStmt(tblName, sch)
stmt := sqlfmt.SchemaAsCreateStmt(tblName, sch)
if err = iohelp.WriteLine(wr, stmt); err != nil {
return err
}

8
go/libraries/doltcore/diff/sql_diff_test.go
View File

@@ -16,6 +16,7 @@ package diff
import (
"context"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/sqlfmt"
"strings"
"testing"
@@ -27,7 +28,6 @@ import (
"github.com/liquidata-inc/dolt/go/libraries/doltcore/row"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/alterschema"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/sql"
)
const name = "Jeffery Williams"
@@ -67,7 +67,7 @@ func TestSqlTableDiffAdd(t *testing.T) {
var stringWr StringBuilderCloser
_ = PrintSqlTableDiffs(ctx, newRoot, oldRoot, &stringWr)
expectedOutput := sql.SchemaAsCreateStmt("addTable", sch) + "\n"
expectedOutput := sqlfmt.SchemaAsCreateStmt("addTable", sch) + "\n"
assert.Equal(t, expectedOutput, stringWr.String())
}
@@ -88,7 +88,7 @@ func TestSqlTableDiffAddThenInsert(t *testing.T) {
var stringWr StringBuilderCloser
_ = PrintSqlTableDiffs(ctx, newRoot, oldRoot, &stringWr)
expectedOutput := sql.SchemaAsCreateStmt("addTable", sch) + "\n"
expectedOutput := sqlfmt.SchemaAsCreateStmt("addTable", sch) + "\n"
expectedOutput = expectedOutput +
"INSERT INTO `addTable` (`id`,`name`,`age`,`is_married`,`title`) " +
"VALUES (\"00000000-0000-0000-0000-000000000000\",\"Big Billy\",77,FALSE,\"Doctor\");\n"
@@ -149,7 +149,7 @@ func TestSqlTableDiffRenameChangedTable(t *testing.T) {
_ = PrintSqlTableDiffs(ctx, newRoot, oldRoot, &stringWr)
expectedOutput := "DROP TABLE `renameTable`;\n"
expectedOutput = expectedOutput +
sql.SchemaAsCreateStmt("newTableName", sch) + "\n" +
sqlfmt.SchemaAsCreateStmt("newTableName", sch) + "\n" +
"INSERT INTO `newTableName` (`id`,`name`,`age`,`is_married`,`title`) " +
"VALUES (\"00000000-0000-0000-0000-000000000000\",\"Big Billy\",77,FALSE,\"Doctor\");\n"
assert.Equal(t, expectedOutput, stringWr.String())

100
go/libraries/doltcore/sql/sqltestutil/data.go
View File

@@ -1,16 +1,18 @@
// Copyright 2019 Liquidata, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/*
* // Copyright 2020 Liquidata, Inc.
* //
* // Licensed under the Apache License, Version 2.0 (the "License");
* // you may not use this file except in compliance with the License.
* // You may obtain a copy of the License at
* //
* // http://www.apache.org/licenses/LICENSE-2.0
* //
* // Unless required by applicable law or agreed to in writing, software
* // distributed under the License is distributed on an "AS IS" BASIS,
* // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* // See the License for the specific language governing permissions and
* // limitations under the License.
*/
package sqltestutil
@@ -65,12 +67,12 @@ const (
)
const (
homerId = iota
margeId
bartId
lisaId
moeId
barneyId
HomerId = iota
MargeId
BartId
LisaId
MoeId
BarneyId
)
var PeopleTestSchema = createPeopleTestSchema()
@@ -149,7 +151,7 @@ func newEpsRow(id int, name string, airdate string, rating float64) row.Row {
vals := row.TaggedValues{
EpisodeIdTag: types.Int(id),
EpNameTag: types.String(name),
EpAirDateTag: types.Timestamp(datetimeStrToTimestamp(airdate)),
EpAirDateTag: types.Timestamp(DatetimeStrToTimestamp(airdate)),
EpRatingTag: types.Float(rating),
}
@@ -162,7 +164,7 @@ func newEpsRow(id int, name string, airdate string, rating float64) row.Row {
return r
}
func datetimeStrToTimestamp(datetime string) time.Time {
func DatetimeStrToTimestamp(datetime string) time.Time {
time, err := time.Parse("2006-01-02 15:04:05", datetime)
if err != nil {
panic(fmt.Sprintf("unable to parse datetime %s", datetime))
@@ -209,12 +211,12 @@ func NewPeopleRowWithOptionalFields(id int, first, last string, isMarried bool,
}
// 6 characters
var Homer = NewPeopleRow(homerId, "Homer", "Simpson", true, 40, 8.5)
var Marge = NewPeopleRowWithOptionalFields(margeId, "Marge", "Simpson", true, 38, 8, uuid.MustParse("00000000-0000-0000-0000-000000000001"), 111)
var Bart = NewPeopleRowWithOptionalFields(bartId, "Bart", "Simpson", false, 10, 9, uuid.MustParse("00000000-0000-0000-0000-000000000002"), 222)
var Lisa = NewPeopleRowWithOptionalFields(lisaId, "Lisa", "Simpson", false, 8, 10, uuid.MustParse("00000000-0000-0000-0000-000000000003"), 333)
var Moe = NewPeopleRowWithOptionalFields(moeId, "Moe", "Szyslak", false, 48, 6.5, uuid.MustParse("00000000-0000-0000-0000-000000000004"), 444)
var Barney = NewPeopleRowWithOptionalFields(barneyId, "Barney", "Gumble", false, 40, 4, uuid.MustParse("00000000-0000-0000-0000-000000000005"), 555)
var Homer = NewPeopleRow(HomerId, "Homer", "Simpson", true, 40, 8.5)
var Marge = NewPeopleRowWithOptionalFields(MargeId, "Marge", "Simpson", true, 38, 8, uuid.MustParse("00000000-0000-0000-0000-000000000001"), 111)
var Bart = NewPeopleRowWithOptionalFields(BartId, "Bart", "Simpson", false, 10, 9, uuid.MustParse("00000000-0000-0000-0000-000000000002"), 222)
var Lisa = NewPeopleRowWithOptionalFields(LisaId, "Lisa", "Simpson", false, 8, 10, uuid.MustParse("00000000-0000-0000-0000-000000000003"), 333)
var Moe = NewPeopleRowWithOptionalFields(MoeId, "Moe", "Szyslak", false, 48, 6.5, uuid.MustParse("00000000-0000-0000-0000-000000000004"), 444)
var Barney = NewPeopleRowWithOptionalFields(BarneyId, "Barney", "Gumble", false, 40, 4, uuid.MustParse("00000000-0000-0000-0000-000000000005"), 555)
var AllPeopleRows = Rs(Homer, Marge, Bart, Lisa, Moe, Barney)
// Actually the first 4 episodes of the show
@@ -225,16 +227,16 @@ var Ep4 = newEpsRow(4, "There's No Disgrace Like Home", "1990-01-29 03:00:00", 8
var AllEpsRows = Rs(Ep1, Ep2, Ep3, Ep4)
// These are made up, not the actual show data
var app1 = newAppsRow(homerId, 1, "Homer is great in this one")
var app2 = newAppsRow(margeId, 1, "Marge is here too")
var app3 = newAppsRow(homerId, 2, "Homer is great in this one too")
var app4 = newAppsRow(bartId, 2, "This episode is named after Bart")
var app5 = newAppsRow(lisaId, 2, "Lisa is here too")
var app6 = newAppsRow(moeId, 2, "I think there's a prank call scene")
var app7 = newAppsRow(homerId, 3, "Homer is in every episode")
var app8 = newAppsRow(margeId, 3, "Marge shows up a lot too")
var app9 = newAppsRow(lisaId, 3, "Lisa is the best Simpson")
var app10 = newAppsRow(barneyId, 3, "I'm making this all up")
var app1 = newAppsRow(HomerId, 1, "Homer is great in this one")
var app2 = newAppsRow(MargeId, 1, "Marge is here too")
var app3 = newAppsRow(HomerId, 2, "Homer is great in this one too")
var app4 = newAppsRow(BartId, 2, "This episode is named after Bart")
var app5 = newAppsRow(LisaId, 2, "Lisa is here too")
var app6 = newAppsRow(MoeId, 2, "I think there's a prank call scene")
var app7 = newAppsRow(HomerId, 3, "Homer is in every episode")
var app8 = newAppsRow(MargeId, 3, "Marge shows up a lot too")
var app9 = newAppsRow(LisaId, 3, "Lisa is the best Simpson")
var app10 = newAppsRow(BarneyId, 3, "I'm making this all up")
// nobody in episode 4, that one was terrible
// Unlike the other tables, you can't count on the order of these rows matching the insertion order.
@@ -373,7 +375,7 @@ var addrColTag3TypeStr = schema.NewColumn("addr", 3, types.StringKind, false)
var ageColTag4TypeInt = schema.NewColumn("age", 4, types.IntKind, false)
var ageColTag5TypeUint = schema.NewColumn("age", 5, types.UintKind, false)
var diffSchema = dtestutils.MustSchema(
var DiffSchema = dtestutils.MustSchema(
schema.NewColumn("to_id", 0, types.IntKind, false),
schema.NewColumn("to_first_name", 1, types.StringKind, false),
schema.NewColumn("to_last_name", 2, types.StringKind, false),
@@ -391,7 +393,7 @@ var diffSchema = dtestutils.MustSchema(
schema.NewColumn("diff_type", 14, types.StringKind, false),
)
const tblName = "test_table"
const TableWithHistoryName = "test_table"
var InitialHistSch = dtestutils.MustSchema(idColTag0TypeUUID, firstColTag1TypeStr, lastColTag2TypeStr)
var AddAddrAt3HistSch = dtestutils.MustSchema(idColTag0TypeUUID, firstColTag1TypeStr, lastColTag2TypeStr, addrColTag3TypeStr)
@@ -406,7 +408,7 @@ func CreateHistory(ctx context.Context, dEnv *env.DoltEnv, t *testing.T) []envte
Branch: "seed",
CommitMsg: "Seeding with initial user data",
Updates: map[string]envtestutils.TableUpdate{
tblName: {
TableWithHistoryName: {
NewSch: InitialHistSch,
NewRowData: dtestutils.MustRowData(t, ctx, vrw, InitialHistSch, []row.TaggedValues{
{0: types.Int(0), 1: types.String("Aaron"), 2: types.String("Son")},
@@ -420,7 +422,7 @@ func CreateHistory(ctx context.Context, dEnv *env.DoltEnv, t *testing.T) []envte
Branch: "add-age",
CommitMsg: "Adding int age to users with tag 3",
Updates: map[string]envtestutils.TableUpdate{
tblName: {
TableWithHistoryName: {
NewSch: AddAgeAt4HistSch,
NewRowData: dtestutils.MustRowData(t, ctx, vrw, AddAgeAt4HistSch, []row.TaggedValues{
{0: types.Int(0), 1: types.String("Aaron"), 2: types.String("Son"), 4: types.Int(35)},
@@ -436,7 +438,7 @@ func CreateHistory(ctx context.Context, dEnv *env.DoltEnv, t *testing.T) []envte
Branch: "master",
CommitMsg: "Adding string address to users with tag 3",
Updates: map[string]envtestutils.TableUpdate{
tblName: {
TableWithHistoryName: {
NewSch: AddAddrAt3HistSch,
NewRowData: dtestutils.MustRowData(t, ctx, vrw, AddAddrAt3HistSch, []row.TaggedValues{
{0: types.Int(0), 1: types.String("Aaron"), 2: types.String("Son"), 3: types.String("123 Fake St")},
@@ -452,7 +454,7 @@ func CreateHistory(ctx context.Context, dEnv *env.DoltEnv, t *testing.T) []envte
Branch: "master",
CommitMsg: "Re-add age as a uint with tag 4",
Updates: map[string]envtestutils.TableUpdate{
tblName: {
TableWithHistoryName: {
NewSch: ReaddAgeAt5HistSch,
NewRowData: dtestutils.MustRowData(t, ctx, vrw, ReaddAgeAt5HistSch, []row.TaggedValues{
{0: types.Int(0), 1: types.String("Aaron"), 2: types.String("Son"), 3: types.String("123 Fake St"), 5: types.Uint(35)},
@@ -472,15 +474,3 @@ func CreateHistory(ctx context.Context, dEnv *env.DoltEnv, t *testing.T) []envte
},
}
}
func CreateWorkingRootUpdate() map[string]envtestutils.TableUpdate {
return map[string]envtestutils.TableUpdate{
tblName: {
RowUpdates: []row.Row{
mustRow(row.New(types.Format_Default, ReaddAgeAt5HistSch, row.TaggedValues{
0: types.Int(6), 1: types.String("Katie"), 2: types.String("McCulloch"),
})),
},
},
}
}

78
go/libraries/doltcore/sqle/common_test.go
View File

@@ -1,21 +1,27 @@
// Copyright 2019 Liquidata, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/*
* // Copyright 2020 Liquidata, Inc.
* //
* // Licensed under the Apache License, Version 2.0 (the "License");
* // you may not use this file except in compliance with the License.
* // You may obtain a copy of the License at
* //
* // http://www.apache.org/licenses/LICENSE-2.0
* //
* // Unless required by applicable law or agreed to in writing, software
* // distributed under the License is distributed on an "AS IS" BASIS,
* // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* // See the License for the specific language governing permissions and
* // limitations under the License.
*/
package sqle
import (
"context"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/envtestutils"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/row"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/sql/sqltestutil"
"github.com/liquidata-inc/dolt/go/store/types"
"io"
"testing"
@@ -24,15 +30,13 @@ import (
"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/doltcore/row"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo"
"github.com/liquidata-inc/dolt/go/store/types"
)
// Runs the query given and returns the result. The schema result of the query's execution is currently ignored, and
// the targetSchema given is used to prepare all rows.
func executeSelect(ctx context.Context, dEnv *env.DoltEnv, targetSch schema.Schema, root *doltdb.RootValue, query string) ([]row.Row, schema.Schema, error) {
func executeSelect(ctx context.Context, dEnv *env.DoltEnv, root *doltdb.RootValue, query string) ([]sql.Row, sql.Schema, error) {
var err error
db := NewDatabase("dolt", dEnv.DoltDB, dEnv.RepoState, dEnv.RepoStateWriter())
engine, sqlCtx, err := NewTestEngine(ctx, db, root)
@@ -45,31 +49,26 @@ func executeSelect(ctx context.Context, dEnv *env.DoltEnv, targetSch schema.Sche
return nil, nil, err
}
var resultSch schema.Schema
if sch != nil {
resultSch, err = SqlSchemaToDoltResultSchema(sch)
if err != nil {
return nil, nil, err
}
}
doltRows := make([]row.Row, 0)
sqlRows := make([]sql.Row, 0)
var r sql.Row
for r, err = iter.Next(); err == nil; r, err = iter.Next() {
sqlR, err := SqlRowToDoltRow(types.Format_7_18, r, resultSch)
if err != nil {
return nil, nil, err
}
doltRows = append(doltRows, sqlR)
sqlRows = append(sqlRows, r)
}
if err != io.EOF {
return nil, nil, err
}
return doltRows, resultSch, nil
return sqlRows, sch, nil
}
// Compresses each of the rows given ala compressRow
func ToSqlRows(sch schema.Schema, rs ...row.Row) []sql.Row {
sqlRows := make([]sql.Row, len(rs))
for i := range rs {
sqlRows[i], _ = DoltRowToSqlRow(rs[i], sch)
}
return sqlRows
}
// Runs the query given and returns the error (if any).
@@ -97,3 +96,16 @@ func schemaNewColumn(t *testing.T, name string, tag uint64, sqlType sql.Type, pa
require.NoError(t, err)
return col
}
// TODO: this shouldn't be here
func CreateWorkingRootUpdate() map[string]envtestutils.TableUpdate {
return map[string]envtestutils.TableUpdate{
sqltestutil.TableWithHistoryName: {
RowUpdates: []row.Row{
mustRow(row.New(types.Format_Default, sqltestutil.ReaddAgeAt5HistSch, row.TaggedValues{
0: types.Int(6), 1: types.String("Katie"), 2: types.String("McCulloch"),
})),
},
},
}
}

30
go/libraries/doltcore/sql/constants.go → go/libraries/doltcore/sqle/constants.go
View File

@@ -1,18 +1,20 @@
// Copyright 2019 Liquidata, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/*
* // Copyright 2020 Liquidata, Inc.
* //
* // Licensed under the Apache License, Version 2.0 (the "License");
* // you may not use this file except in compliance with the License.
* // You may obtain a copy of the License at
* //
* // http://www.apache.org/licenses/LICENSE-2.0
* //
* // Unless required by applicable law or agreed to in writing, software
* // distributed under the License is distributed on an "AS IS" BASIS,
* // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* // See the License for the specific language governing permissions and
* // limitations under the License.
*/
package sql
package sqle
// SQL keyword constants for use in switches and comparisons
const (

4
go/libraries/doltcore/sqle/database.go
View File

@@ -17,6 +17,7 @@ package sqle
import (
"context"
"fmt"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/sqlfmt"
"io"
"strings"
"sync"
@@ -33,7 +34,6 @@ import (
"github.com/liquidata-inc/dolt/go/libraries/doltcore/env/actions/commitwalk"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/alterschema"
dsql "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql"
"github.com/liquidata-inc/dolt/go/store/hash"
)
@@ -765,7 +765,7 @@ func RegisterSchemaFragments(ctx *sql.Context, db Database, root *doltdb.RootVal
if r[0] == "view" {
name := r[1].(string)
definition := r[2].(string)
cv, err := parse.Parse(ctx, fmt.Sprintf("create view %s as %s", dsql.QuoteIdentifier(name), definition))
cv, err := parse.Parse(ctx, fmt.Sprintf("create view %s as %s", sqlfmt.QuoteIdentifier(name), definition))
if err != nil {
parseErrors = append(parseErrors, err)
} else {

64
go/libraries/doltcore/sql/sqltestutil/deletequeries.go → go/libraries/doltcore/sqle/deletequeries_test.go
View File

@@ -1,22 +1,26 @@
// Copyright 2019 Liquidata, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/*
* // Copyright 2020 Liquidata, Inc.
* //
* // Licensed under the Apache License, Version 2.0 (the "License");
* // you may not use this file except in compliance with the License.
* // You may obtain a copy of the License at
* //
* // http://www.apache.org/licenses/LICENSE-2.0
* //
* // Unless required by applicable law or agreed to in writing, software
* // distributed under the License is distributed on an "AS IS" BASIS,
* // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* // See the License for the specific language governing permissions and
* // limitations under the License.
*/
package sqltestutil
package sqle
import (
"github.com/liquidata-inc/dolt/go/libraries/doltcore/row"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema"
"github.com/src-d/go-mysql-server/sql"
. "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql/sqltestutil"
)
// Structure for a test of a insert query
@@ -30,7 +34,7 @@ type DeleteTest struct {
// The schema of the result of the query, nil if an error is expected
ExpectedSchema schema.Schema
// The rows this query should return, nil if an error is expected
ExpectedRows []row.Row
ExpectedRows []sql.Row
// An expected error string
ExpectedErr string
// Setup logic to run before executing this test, after initial tables have been created and populated
@@ -46,98 +50,98 @@ var BasicDeleteTests = []DeleteTest{
Name: "delete everything",
DeleteQuery: "delete from people",
SelectQuery: "select * from people",
ExpectedRows: Rs(),
ExpectedRows: nil,
ExpectedSchema: CompressSchema(PeopleTestSchema),
},
{
Name: "delete where id equals",
DeleteQuery: "delete from people where id = 2",
SelectQuery: "select * from people",
ExpectedRows: CompressRows(PeopleTestSchema, Homer, Marge, Lisa, Moe, Barney),
ExpectedRows: ToSqlRows(PeopleTestSchema, Homer, Marge, Lisa, Moe, Barney),
ExpectedSchema: CompressSchema(PeopleTestSchema),
},
{
Name: "delete where id less than",
DeleteQuery: "delete from people where id < 3",
SelectQuery: "select * from people",
ExpectedRows: CompressRows(PeopleTestSchema, Lisa, Moe, Barney),
ExpectedRows: ToSqlRows(PeopleTestSchema, Lisa, Moe, Barney),
ExpectedSchema: CompressSchema(PeopleTestSchema),
},
{
Name: "delete where id greater than",
DeleteQuery: "delete from people where id > 3",
SelectQuery: "select * from people",
ExpectedRows: CompressRows(PeopleTestSchema, Homer, Marge, Bart, Lisa),
ExpectedRows: ToSqlRows(PeopleTestSchema, Homer, Marge, Bart, Lisa),
ExpectedSchema: CompressSchema(PeopleTestSchema),
},
{
Name: "delete where id less than or equal",
DeleteQuery: "delete from people where id <= 3",
SelectQuery: "select * from people",
ExpectedRows: CompressRows(PeopleTestSchema, Moe, Barney),
ExpectedRows: ToSqlRows(PeopleTestSchema, Moe, Barney),
ExpectedSchema: CompressSchema(PeopleTestSchema),
},
{
Name: "delete where id greater than or equal",
DeleteQuery: "delete from people where id >= 3",
SelectQuery: "select * from people",
ExpectedRows: CompressRows(PeopleTestSchema, Homer, Marge, Bart),
ExpectedRows: ToSqlRows(PeopleTestSchema, Homer, Marge, Bart),
ExpectedSchema: CompressSchema(PeopleTestSchema),
},
{
Name: "delete where id equals nothing",
DeleteQuery: "delete from people where id = 9999",
SelectQuery: "select * from people",
ExpectedRows: CompressRows(PeopleTestSchema, Homer, Marge, Bart, Lisa, Moe, Barney),
ExpectedRows: ToSqlRows(PeopleTestSchema, Homer, Marge, Bart, Lisa, Moe, Barney),
ExpectedSchema: CompressSchema(PeopleTestSchema),
},
{
Name: "delete where last_name matches some =",
DeleteQuery: "delete from people where last_name = 'Simpson'",
SelectQuery: "select * from people",
ExpectedRows: CompressRows(PeopleTestSchema, Moe, Barney),
ExpectedRows: ToSqlRows(PeopleTestSchema, Moe, Barney),
ExpectedSchema: CompressSchema(PeopleTestSchema),
},
{
Name: "delete where last_name matches some <>",
DeleteQuery: "delete from people where last_name <> 'Simpson'",
SelectQuery: "select * from people",
ExpectedRows: CompressRows(PeopleTestSchema, Homer, Marge, Bart, Lisa),
ExpectedRows: ToSqlRows(PeopleTestSchema, Homer, Marge, Bart, Lisa),
ExpectedSchema: CompressSchema(PeopleTestSchema),
},
{
Name: "delete where last_name matches some like",
DeleteQuery: "delete from people where last_name like '%pson'",
SelectQuery: "select * from people",
ExpectedRows: CompressRows(PeopleTestSchema, Moe, Barney),
ExpectedRows: ToSqlRows(PeopleTestSchema, Moe, Barney),
ExpectedSchema: CompressSchema(PeopleTestSchema),
},
{
Name: "delete order by",
DeleteQuery: "delete from people order by id",
SelectQuery: "select * from people",
ExpectedRows: Rs(),
ExpectedRows: nil,
ExpectedSchema: CompressSchema(PeopleTestSchema),
},
{
Name: "delete order by asc limit",
DeleteQuery: "delete from people order by id asc limit 3",
SelectQuery: "select * from people",
ExpectedRows: CompressRows(PeopleTestSchema, Lisa, Moe, Barney),
ExpectedRows: ToSqlRows(PeopleTestSchema, Lisa, Moe, Barney),
ExpectedSchema: CompressSchema(PeopleTestSchema),
},
{
Name: "delete order by desc limit",
DeleteQuery: "delete from people order by id desc limit 3",
SelectQuery: "select * from people",
ExpectedRows: CompressRows(PeopleTestSchema, Homer, Marge, Bart),
ExpectedRows: ToSqlRows(PeopleTestSchema, Homer, Marge, Bart),
ExpectedSchema: CompressSchema(PeopleTestSchema),
},
{
Name: "delete order by desc limit",
DeleteQuery: "delete from people order by id desc limit 3 offset 1",
SelectQuery: "select * from people",
ExpectedRows: CompressRows(PeopleTestSchema, Homer, Marge, Barney),
ExpectedRows: ToSqlRows(PeopleTestSchema, Homer, Marge, Barney),
ExpectedSchema: CompressSchema(PeopleTestSchema),
},
{

2
go/libraries/doltcore/sqle/diff_table.go
View File

@@ -277,7 +277,7 @@ func (itr *diffRowItr) Next() (sql.Row, error) {
return nil, err
}
sqlRow, err := doltRowToSqlRow(r, itr.sch)
sqlRow, err := DoltRowToSqlRow(r, itr.sch)
if err != nil {
return nil, err

2
go/libraries/doltcore/sqle/history_table.go
View File

@@ -434,7 +434,7 @@ func (tblItr *rowItrForTableAtCommit) Next() (sql.Row, error) {
}
}
return doltRowToSqlRow(r, tblItr.sch)
return DoltRowToSqlRow(r, tblItr.sch)
}
// Close the iterator.

2
go/libraries/doltcore/sqle/indexes.go
View File

@@ -264,7 +264,7 @@ func (i *indexLookupRowIterAdapter) Next() (sql.Row, error) {
return nil, io.EOF
}
return doltRowToSqlRow(r, i.indexLookup.idx.sch)
return DoltRowToSqlRow(r, i.indexLookup.idx.sch)
}
func (*indexLookupRowIterAdapter) Close() error {

32
go/libraries/doltcore/sql/sqltestutil/insertqueries.go → go/libraries/doltcore/sqle/insertqueries_test.go
View File

@@ -1,18 +1,20 @@
// Copyright 2019 Liquidata, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/*
* // Copyright 2020 Liquidata, Inc.
* //
* // Licensed under the Apache License, Version 2.0 (the "License");
* // you may not use this file except in compliance with the License.
* // You may obtain a copy of the License at
* //
* // http://www.apache.org/licenses/LICENSE-2.0
* //
* // Unless required by applicable law or agreed to in writing, software
* // distributed under the License is distributed on an "AS IS" BASIS,
* // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* // See the License for the specific language governing permissions and
* // limitations under the License.
*/
package sqltestutil
package sqle
import (
"github.com/google/uuid"
@@ -20,6 +22,8 @@ import (
"github.com/liquidata-inc/dolt/go/libraries/doltcore/row"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema"
"github.com/liquidata-inc/dolt/go/store/types"
. "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql/sqltestutil"
)
// Structure for a test of a insert query

4
go/libraries/doltcore/sqle/query_catalog_table_test.go
View File

@@ -16,6 +16,7 @@ package sqle
import (
"context"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/sql/sqltestutil"
"testing"
"github.com/src-d/go-mysql-server/sql"
@@ -24,12 +25,11 @@ import (
"github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils"
. "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql/sqltestutil"
)
func TestInsertIntoQueryCatalogTable(t *testing.T) {
dEnv := dtestutils.CreateTestEnv()
CreateTestDatabase(dEnv, t)
sqltestutil.CreateTestDatabase(dEnv, t)
ctx := context.Background()
root, _ := dEnv.WorkingRoot(ctx)

32
go/libraries/doltcore/sql/sqltestutil/replacequeries.go → go/libraries/doltcore/sqle/replacequeries_test.go
View File

@@ -1,18 +1,20 @@
// Copyright 2019 Liquidata, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/*
* // Copyright 2020 Liquidata, Inc.
* //
* // Licensed under the Apache License, Version 2.0 (the "License");
* // you may not use this file except in compliance with the License.
* // You may obtain a copy of the License at
* //
* // http://www.apache.org/licenses/LICENSE-2.0
* //
* // Unless required by applicable law or agreed to in writing, software
* // distributed under the License is distributed on an "AS IS" BASIS,
* // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* // See the License for the specific language governing permissions and
* // limitations under the License.
*/
package sqltestutil
package sqle
import (
"github.com/google/uuid"
@@ -20,6 +22,8 @@ import (
"github.com/liquidata-inc/dolt/go/libraries/doltcore/row"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema"
"github.com/liquidata-inc/dolt/go/store/types"
. "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql/sqltestutil"
)
// Structure for a test of a replace query

4
go/libraries/doltcore/sqle/rows.go
View File

@@ -69,7 +69,7 @@ func (itr *doltTableRowIter) Next() (sql.Row, error) {
return nil, err
}
return doltRowToSqlRow(doltRow, itr.table.sch)
return DoltRowToSqlRow(doltRow, itr.table.sch)
}
// Close required by sql.RowIter interface
@@ -78,7 +78,7 @@ func (itr *doltTableRowIter) Close() error {
}
// Returns a SQL row representation for the dolt row given.
func doltRowToSqlRow(doltRow row.Row, sch schema.Schema) (sql.Row, error) {
func DoltRowToSqlRow(doltRow row.Row, sch schema.Schema) (sql.Row, error) {
colVals := make(sql.Row, sch.GetAllCols().Size())
i := 0

6
go/libraries/doltcore/sqle/schema.go
View File

@@ -17,6 +17,7 @@ package sqle
import (
"context"
"fmt"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/sqlfmt"
"strconv"
"strings"
@@ -25,7 +26,6 @@ import (
"github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo"
dsql "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql"
"github.com/liquidata-inc/dolt/go/store/types"
)
@@ -169,9 +169,9 @@ func extractTag(col *sql.Column) uint64 {
return schema.InvalidTag
}
i := strings.Index(col.Comment, dsql.TagCommentPrefix)
i := strings.Index(col.Comment, sqlfmt.TagCommentPrefix)
if i >= 0 {
startIdx := i + len(dsql.TagCommentPrefix)
startIdx := i + len(sqlfmt.TagCommentPrefix)
tag, err := strconv.ParseUint(col.Comment[startIdx:], 10, 64)
if err != nil {
return schema.InvalidTag

8
go/libraries/doltcore/sqle/schema_table.go
View File

@@ -15,22 +15,22 @@
package sqle
import (
"github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/sqlfmt"
"github.com/src-d/go-mysql-server/sql"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb"
dsql "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql"
)
// The fixed schema for the `dolt_schemas` table.
func SchemasTableSchema() sql.Schema {
return []*sql.Column{
// Currently: `view`.
{Name: doltdb.SchemasTablesTypeCol, Type: sql.Text, Source: doltdb.SchemasTableName, PrimaryKey: true, Comment: dsql.FmtColTagComment(doltdb.DoltSchemasTypeTag)},
{Name: doltdb.SchemasTablesTypeCol, Type: sql.Text, Source: doltdb.SchemasTableName, PrimaryKey: true, Comment: sqlfmt.FmtColTagComment(doltdb.DoltSchemasTypeTag)},
// The name of the database entity.
{Name: doltdb.SchemasTablesNameCol, Type: sql.Text, Source: doltdb.SchemasTableName, PrimaryKey: true, Comment: dsql.FmtColTagComment(doltdb.DoltSchemasNameTag)},
{Name: doltdb.SchemasTablesNameCol, Type: sql.Text, Source: doltdb.SchemasTableName, PrimaryKey: true, Comment: sqlfmt.FmtColTagComment(doltdb.DoltSchemasNameTag)},
// The schema fragment associated with the database entity.
// For example, the SELECT statement for a CREATE VIEW.
{Name: doltdb.SchemasTablesFragmentCol, Type: sql.Text, Source: doltdb.SchemasTableName, PrimaryKey: false, Comment: dsql.FmtColTagComment(doltdb.DoltSchemasFragmentTag)},
{Name: doltdb.SchemasTablesFragmentCol, Type: sql.Text, Source: doltdb.SchemasTableName, PrimaryKey: false, Comment: sqlfmt.FmtColTagComment(doltdb.DoltSchemasFragmentTag)},
}
}

33
go/libraries/doltcore/sql/schema_test.go → go/libraries/doltcore/sqle/schema_test.go
View File

@@ -1,21 +1,24 @@
// Copyright 2019 Liquidata, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/*
* // Copyright 2020 Liquidata, Inc.
* //
* // Licensed under the Apache License, Version 2.0 (the "License");
* // you may not use this file except in compliance with the License.
* // You may obtain a copy of the License at
* //
* // http://www.apache.org/licenses/LICENSE-2.0
* //
* // Unless required by applicable law or agreed to in writing, software
* // distributed under the License is distributed on an "AS IS" BASIS,
* // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* // See the License for the specific language governing permissions and
* // limitations under the License.
*/
package sql
package sqle
import (
"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/sqlfmt"
"github.com/liquidata-inc/dolt/go/store/types"
"testing"
@@ -63,7 +66,7 @@ func TestFmtCol(t *testing.T) {
for _, test := range tests {
t.Run(test.Expected, func(t *testing.T) {
actual := FmtCol(test.Indent, test.NameWidth, test.TypeWidth, test.Col)
actual := sqlfmt.FmtCol(test.Indent, test.NameWidth, test.TypeWidth, test.Col)
assert.Equal(t, test.Expected, actual)
})
}

2
go/libraries/doltcore/sql/sqltestutil/schema.go → go/libraries/doltcore/sqle/schema_util_test.go
View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package sqltestutil
package sqle
import (
"fmt"

66
go/libraries/doltcore/sql/sqltestutil/selectqueries.go → go/libraries/doltcore/sqle/selectqueries_test.go
View File

@@ -1,18 +1,20 @@
// Copyright 2019 Liquidata, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/*
* // Copyright 2020 Liquidata, Inc.
* //
* // Licensed under the Apache License, Version 2.0 (the "License");
* // you may not use this file except in compliance with the License.
* // You may obtain a copy of the License at
* //
* // http://www.apache.org/licenses/LICENSE-2.0
* //
* // Unless required by applicable law or agreed to in writing, software
* // distributed under the License is distributed on an "AS IS" BASIS,
* // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* // See the License for the specific language governing permissions and
* // limitations under the License.
*/
package sqltestutil
package sqle
import (
"testing"
@@ -25,6 +27,8 @@ import (
"github.com/liquidata-inc/dolt/go/libraries/doltcore/row"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema"
"github.com/liquidata-inc/dolt/go/store/types"
. "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql/sqltestutil"
)
func mustRow(r row.Row, err error) row.Row {
@@ -755,36 +759,36 @@ var SelectDiffTests = []SelectTest{
Name: "select * from diff system table",
Query: "select * from dolt_diff_test_table",
ExpectedRows: []row.Row{
mustRow(row.New(types.Format_7_18, diffSchema, row.TaggedValues{0: types.Int(6), 1: types.String("Katie"), 2: types.String("McCulloch"), 13: types.String("current"), 6: types.String("HEAD"), 14: types.String("added")})),
mustRow(row.New(types.Format_7_18, DiffSchema, row.TaggedValues{0: types.Int(6), 1: types.String("Katie"), 2: types.String("McCulloch"), 13: types.String("current"), 6: types.String("HEAD"), 14: types.String("added")})),
},
ExpectedSchema: diffSchema,
ExpectedSchema: DiffSchema,
},
{
Name: "select * from diff system table with from commit",
Query: "select * from dolt_diff_test_table where from_commit = 'add-age'",
ExpectedRows: []row.Row{
mustRow(row.New(types.Format_7_18, diffSchema, row.TaggedValues{7: types.Int(0), 8: types.String("Aaron"), 9: types.String("Son"), 11: types.Int(35), 0: types.Int(0), 1: types.String("Aaron"), 2: types.String("Son"), 3: types.String("123 Fake St"), 5: types.Uint(35), 13: types.String("add-age"), 6: types.String("HEAD"), 14: types.String("modified")})),
mustRow(row.New(types.Format_7_18, diffSchema, row.TaggedValues{7: types.Int(1), 8: types.String("Brian"), 9: types.String("Hendriks"), 11: types.Int(38), 0: types.Int(1), 1: types.String("Brian"), 2: types.String("Hendriks"), 3: types.String("456 Bull Ln"), 5: types.Uint(38), 13: types.String("add-age"), 6: types.String("HEAD"), 14: types.String("modified")})),
mustRow(row.New(types.Format_7_18, diffSchema, row.TaggedValues{7: types.Int(2), 8: types.String("Tim"), 9: types.String("Sehn"), 11: types.Int(37), 0: types.Int(2), 1: types.String("Tim"), 2: types.String("Sehn"), 3: types.String("789 Not Real Ct"), 5: types.Uint(37), 13: types.String("add-age"), 6: types.String("HEAD"), 14: types.String("modified")})),
mustRow(row.New(types.Format_7_18, diffSchema, row.TaggedValues{7: types.Int(3), 8: types.String("Zach"), 9: types.String("Musgrave"), 11: types.Int(37), 0: types.Int(3), 1: types.String("Zach"), 2: types.String("Musgrave"), 3: types.String("-1 Imaginary Wy"), 5: types.Uint(37), 13: types.String("add-age"), 6: types.String("HEAD"), 14: types.String("modified")})),
mustRow(row.New(types.Format_7_18, diffSchema, row.TaggedValues{0: types.Int(4), 1: types.String("Matt"), 2: types.String("Jesuele"), 3: types.NullValue, 13: types.String("add-age"), 6: types.String("HEAD"), 14: types.String("added")})),
mustRow(row.New(types.Format_7_18, diffSchema, row.TaggedValues{0: types.Int(5), 1: types.String("Daylon"), 2: types.String("Wilkins"), 3: types.NullValue, 13: types.String("add-age"), 6: types.String("HEAD"), 14: types.String("added")})),
mustRow(row.New(types.Format_7_18, diffSchema, row.TaggedValues{0: types.Int(6), 1: types.String("Katie"), 2: types.String("McCulloch"), 13: types.String("add-age"), 6: types.String("HEAD"), 14: types.String("added")})),
mustRow(row.New(types.Format_7_18, DiffSchema, row.TaggedValues{7: types.Int(0), 8: types.String("Aaron"), 9: types.String("Son"), 11: types.Int(35), 0: types.Int(0), 1: types.String("Aaron"), 2: types.String("Son"), 3: types.String("123 Fake St"), 5: types.Uint(35), 13: types.String("add-age"), 6: types.String("HEAD"), 14: types.String("modified")})),
mustRow(row.New(types.Format_7_18, DiffSchema, row.TaggedValues{7: types.Int(1), 8: types.String("Brian"), 9: types.String("Hendriks"), 11: types.Int(38), 0: types.Int(1), 1: types.String("Brian"), 2: types.String("Hendriks"), 3: types.String("456 Bull Ln"), 5: types.Uint(38), 13: types.String("add-age"), 6: types.String("HEAD"), 14: types.String("modified")})),
mustRow(row.New(types.Format_7_18, DiffSchema, row.TaggedValues{7: types.Int(2), 8: types.String("Tim"), 9: types.String("Sehn"), 11: types.Int(37), 0: types.Int(2), 1: types.String("Tim"), 2: types.String("Sehn"), 3: types.String("789 Not Real Ct"), 5: types.Uint(37), 13: types.String("add-age"), 6: types.String("HEAD"), 14: types.String("modified")})),
mustRow(row.New(types.Format_7_18, DiffSchema, row.TaggedValues{7: types.Int(3), 8: types.String("Zach"), 9: types.String("Musgrave"), 11: types.Int(37), 0: types.Int(3), 1: types.String("Zach"), 2: types.String("Musgrave"), 3: types.String("-1 Imaginary Wy"), 5: types.Uint(37), 13: types.String("add-age"), 6: types.String("HEAD"), 14: types.String("modified")})),
mustRow(row.New(types.Format_7_18, DiffSchema, row.TaggedValues{0: types.Int(4), 1: types.String("Matt"), 2: types.String("Jesuele"), 3: types.NullValue, 13: types.String("add-age"), 6: types.String("HEAD"), 14: types.String("added")})),
mustRow(row.New(types.Format_7_18, DiffSchema, row.TaggedValues{0: types.Int(5), 1: types.String("Daylon"), 2: types.String("Wilkins"), 3: types.NullValue, 13: types.String("add-age"), 6: types.String("HEAD"), 14: types.String("added")})),
mustRow(row.New(types.Format_7_18, DiffSchema, row.TaggedValues{0: types.Int(6), 1: types.String("Katie"), 2: types.String("McCulloch"), 13: types.String("add-age"), 6: types.String("HEAD"), 14: types.String("added")})),
},
ExpectedSchema: diffSchema,
ExpectedSchema: DiffSchema,
},
{
Name: "select * from diff system table with from and to commit and test insensitive name",
Query: "select * from dolt_diff_TeSt_TaBlE where from_commit = 'add-age' and to_commit = 'master'",
ExpectedRows: []row.Row{
mustRow(row.New(types.Format_7_18, diffSchema, row.TaggedValues{7: types.Int(0), 8: types.String("Aaron"), 9: types.String("Son"), 11: types.Int(35), 0: types.Int(0), 1: types.String("Aaron"), 2: types.String("Son"), 3: types.String("123 Fake St"), 5: types.Uint(35), 13: types.String("add-age"), 6: types.String("master"), 14: types.String("modified")})),
mustRow(row.New(types.Format_7_18, diffSchema, row.TaggedValues{7: types.Int(1), 8: types.String("Brian"), 9: types.String("Hendriks"), 11: types.Int(38), 0: types.Int(1), 1: types.String("Brian"), 2: types.String("Hendriks"), 3: types.String("456 Bull Ln"), 5: types.Uint(38), 13: types.String("add-age"), 6: types.String("master"), 14: types.String("modified")})),
mustRow(row.New(types.Format_7_18, diffSchema, row.TaggedValues{7: types.Int(2), 8: types.String("Tim"), 9: types.String("Sehn"), 11: types.Int(37), 0: types.Int(2), 1: types.String("Tim"), 2: types.String("Sehn"), 3: types.String("789 Not Real Ct"), 5: types.Uint(37), 13: types.String("add-age"), 6: types.String("master"), 14: types.String("modified")})),
mustRow(row.New(types.Format_7_18, diffSchema, row.TaggedValues{7: types.Int(3), 8: types.String("Zach"), 9: types.String("Musgrave"), 11: types.Int(37), 0: types.Int(3), 1: types.String("Zach"), 2: types.String("Musgrave"), 3: types.String("-1 Imaginary Wy"), 5: types.Uint(37), 13: types.String("add-age"), 6: types.String("master"), 14: types.String("modified")})),
mustRow(row.New(types.Format_7_18, diffSchema, row.TaggedValues{0: types.Int(4), 1: types.String("Matt"), 2: types.String("Jesuele"), 3: types.NullValue, 13: types.String("add-age"), 6: types.String("master"), 14: types.String("added")})),
mustRow(row.New(types.Format_7_18, diffSchema, row.TaggedValues{0: types.Int(5), 1: types.String("Daylon"), 2: types.String("Wilkins"), 3: types.NullValue, 13: types.String("add-age"), 6: types.String("master"), 14: types.String("added")})),
mustRow(row.New(types.Format_7_18, DiffSchema, row.TaggedValues{7: types.Int(0), 8: types.String("Aaron"), 9: types.String("Son"), 11: types.Int(35), 0: types.Int(0), 1: types.String("Aaron"), 2: types.String("Son"), 3: types.String("123 Fake St"), 5: types.Uint(35), 13: types.String("add-age"), 6: types.String("master"), 14: types.String("modified")})),
mustRow(row.New(types.Format_7_18, DiffSchema, row.TaggedValues{7: types.Int(1), 8: types.String("Brian"), 9: types.String("Hendriks"), 11: types.Int(38), 0: types.Int(1), 1: types.String("Brian"), 2: types.String("Hendriks"), 3: types.String("456 Bull Ln"), 5: types.Uint(38), 13: types.String("add-age"), 6: types.String("master"), 14: types.String("modified")})),
mustRow(row.New(types.Format_7_18, DiffSchema, row.TaggedValues{7: types.Int(2), 8: types.String("Tim"), 9: types.String("Sehn"), 11: types.Int(37), 0: types.Int(2), 1: types.String("Tim"), 2: types.String("Sehn"), 3: types.String("789 Not Real Ct"), 5: types.Uint(37), 13: types.String("add-age"), 6: types.String("master"), 14: types.String("modified")})),
mustRow(row.New(types.Format_7_18, DiffSchema, row.TaggedValues{7: types.Int(3), 8: types.String("Zach"), 9: types.String("Musgrave"), 11: types.Int(37), 0: types.Int(3), 1: types.String("Zach"), 2: types.String("Musgrave"), 3: types.String("-1 Imaginary Wy"), 5: types.Uint(37), 13: types.String("add-age"), 6: types.String("master"), 14: types.String("modified")})),
mustRow(row.New(types.Format_7_18, DiffSchema, row.TaggedValues{0: types.Int(4), 1: types.String("Matt"), 2: types.String("Jesuele"), 3: types.NullValue, 13: types.String("add-age"), 6: types.String("master"), 14: types.String("added")})),
mustRow(row.New(types.Format_7_18, DiffSchema, row.TaggedValues{0: types.Int(5), 1: types.String("Daylon"), 2: types.String("Wilkins"), 3: types.NullValue, 13: types.String("add-age"), 6: types.String("master"), 14: types.String("added")})),
},
ExpectedSchema: diffSchema,
ExpectedSchema: DiffSchema,
},
}

3
go/libraries/doltcore/sqle/sqlbatch_test.go
View File

@@ -27,8 +27,9 @@ import (
"github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/row"
. "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql/sqltestutil"
"github.com/liquidata-inc/dolt/go/store/types"
. "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql/sqltestutil"
)
func TestSqlBatchInserts(t *testing.T) {

36
go/libraries/doltcore/sqle/sqldelete_test.go
View File

@@ -16,6 +16,8 @@ package sqle
import (
"context"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema"
sql "github.com/src-d/go-mysql-server/sql"
"testing"
"github.com/stretchr/testify/assert"
@@ -24,7 +26,6 @@ import (
"github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/env"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/row"
. "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql/sqltestutil"
"github.com/liquidata-inc/dolt/go/store/types"
)
@@ -67,7 +68,7 @@ var systemTableDeleteTests = []DeleteTest{
NewRow(types.String("abc123"), types.Uint(1), types.String("example"), types.String("select 2+2 from dual"), types.String("description"))),
DeleteQuery: "delete from dolt_query_catalog",
SelectQuery: "select * from dolt_query_catalog",
ExpectedRows: CompressRows(DoltQueryCatalogSchema),
ExpectedRows: ToSqlRows(DoltQueryCatalogSchema),
ExpectedSchema: CompressSchema(DoltQueryCatalogSchema),
},
{
@@ -77,7 +78,7 @@ var systemTableDeleteTests = []DeleteTest{
NewRowWithPks([]types.Value{types.String("view"), types.String("name")}, types.String("select 2+2 from dual"))),
DeleteQuery: "delete from dolt_schemas",
SelectQuery: "select * from dolt_schemas",
ExpectedRows: []row.Row{},
ExpectedRows: nil,
ExpectedSchema: schemasTableDoltSchema(),
},
}
@@ -114,9 +115,34 @@ func testDeleteQuery(t *testing.T, test DeleteTest) {
require.NoError(t, err)
}
actualRows, sch, err := executeSelect(context.Background(), dEnv, test.ExpectedSchema, root, test.SelectQuery)
actualRows, sch, err := executeSelect(context.Background(), dEnv, root, test.SelectQuery)
require.NoError(t, err)
assert.Equal(t, test.ExpectedRows, actualRows)
assert.Equal(t, test.ExpectedSchema, sch)
assertSchemasEqual(t, mustSqlSchema(test.ExpectedSchema), sch)
}
func mustSqlSchema(sch schema.Schema) sql.Schema {
sqlSchema, err := doltSchemaToSqlSchema("", sch)
if err != nil {
panic(err)
}
return sqlSchema
}
func reduceSchema(sch sql.Schema) sql.Schema {
newSch := make(sql.Schema, len(sch))
for i, column := range sch {
newSch[i] = &sql.Column{
Name: column.Name,
Type: column.Type,
}
}
return newSch
}
// Asserts that the two schemas are equal, comparing only names and types of columns.
func assertSchemasEqual(t *testing.T, expected, actual sql.Schema) {
assert.Equal(t, reduceSchema(expected), reduceSchema(actual))
}

30
go/libraries/doltcore/sql/schema.go → go/libraries/doltcore/sqle/sqlfmt/schema_fmt.go
View File

@@ -1,18 +1,20 @@
// Copyright 2019 Liquidata, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/*
* // Copyright 2020 Liquidata, Inc.
* //
* // Licensed under the Apache License, Version 2.0 (the "License");
* // you may not use this file except in compliance with the License.
* // You may obtain a copy of the License at
* //
* // http://www.apache.org/licenses/LICENSE-2.0
* //
* // Unless required by applicable law or agreed to in writing, software
* // distributed under the License is distributed on an "AS IS" BASIS,
* // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* // See the License for the specific language governing permissions and
* // limitations under the License.
*/
package sql
package sqlfmt
import (
"fmt"

30
go/libraries/doltcore/sql/sqlstatements.go → go/libraries/doltcore/sqle/sqlfmt/sqlstatements.go
View File

@@ -1,18 +1,20 @@
// Copyright 2019 Liquidata, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/*
* // Copyright 2020 Liquidata, Inc.
* //
* // Licensed under the Apache License, Version 2.0 (the "License");
* // you may not use this file except in compliance with the License.
* // You may obtain a copy of the License at
* //
* // http://www.apache.org/licenses/LICENSE-2.0
* //
* // Unless required by applicable law or agreed to in writing, software
* // distributed under the License is distributed on an "AS IS" BASIS,
* // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* // See the License for the specific language governing permissions and
* // limitations under the License.
*/
package sql
package sqlfmt
import (
"fmt"

32
go/libraries/doltcore/sql/sqlstatements_test.go → go/libraries/doltcore/sqle/sqlfmt/sqlstatements_test.go
View File

@@ -1,26 +1,28 @@
// Copyright 2019 Liquidata, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/*
* // Copyright 2020 Liquidata, Inc.
* //
* // Licensed under the Apache License, Version 2.0 (the "License");
* // you may not use this file except in compliance with the License.
* // You may obtain a copy of the License at
* //
* // http://www.apache.org/licenses/LICENSE-2.0
* //
* // Unless required by applicable law or agreed to in writing, software
* // distributed under the License is distributed on an "AS IS" BASIS,
* // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* // See the License for the specific language governing permissions and
* // limitations under the License.
*/
package sql
package sqlfmt
import (
"github.com/liquidata-inc/dolt/go/libraries/doltcore/sql/sqltestutil"
"testing"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/row"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/sql/sqltestutil"
"github.com/liquidata-inc/dolt/go/store/types"
"github.com/google/uuid"

5
go/libraries/doltcore/sqle/sqlinsert_test.go
View File

@@ -25,8 +25,9 @@ import (
"github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/env"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema"
. "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql/sqltestutil"
"github.com/liquidata-inc/dolt/go/store/types"
. "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql/sqltestutil"
)
// Set to the name of a single test to run just that test, useful for debugging
@@ -135,7 +136,7 @@ func testInsertQuery(t *testing.T, test InsertTest) {
require.NoError(t, err)
}
actualRows, sch, err := executeSelect(context.Background(), dEnv, test.ExpectedSchema, root, test.SelectQuery)
actualRows, sch, err := executeSelect(context.Background(), dEnv, root, test.SelectQuery)
require.NoError(t, err)
assert.Equal(t, test.ExpectedRows, actualRows)

2
go/libraries/doltcore/sqle/sqlreplace_test.go
View File

@@ -117,7 +117,7 @@ func testReplaceQuery(t *testing.T, test ReplaceTest) {
require.NoError(t, err)
}
actualRows, sch, err := executeSelect(context.Background(), dEnv, test.ExpectedSchema, root, test.SelectQuery)
actualRows, sch, err := executeSelect(context.Background(), dEnv, root, test.SelectQuery)
require.NoError(t, err)
assert.Equal(t, test.ExpectedRows, actualRows)

45
go/libraries/doltcore/sqle/sqlselect_test.go
View File

@@ -16,7 +16,6 @@ package sqle
import (
"context"
"fmt"
"testing"
"time"
@@ -27,7 +26,6 @@ import (
"github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/env"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/envtestutils"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/row"
. "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql/sqltestutil"
"github.com/liquidata-inc/dolt/go/store/types"
)
@@ -173,7 +171,7 @@ func testSelectQuery(t *testing.T, test SelectTest) {
}
root, _ := dEnv.WorkingRoot(context.Background())
actualRows, sch, err := executeSelect(context.Background(), dEnv, test.ExpectedSchema, root, test.Query)
actualRows, sch, err := executeSelect(context.Background(), dEnv, root, test.Query)
if len(test.ExpectedErr) > 0 {
require.Error(t, err)
// Too much work to synchronize error messages between the two implementations, so for now we'll just assert that an error occurred.
@@ -236,7 +234,7 @@ func testSelectDiffQuery(t *testing.T, test SelectTest) {
err = dEnv.UpdateWorkingRoot(ctx, root)
require.NoError(t, err)
actualRows, sch, err := executeSelect(ctx, dEnv, test.ExpectedSchema, root, test.Query)
actualRows, sch, err := executeSelect(ctx, dEnv, root, test.Query)
if len(test.ExpectedErr) > 0 {
require.Error(t, err)
// Too much work to synchronize error messages between the two implementations, so for now we'll just assert that an error occurred.
@@ -248,23 +246,24 @@ func testSelectDiffQuery(t *testing.T, test SelectTest) {
assert.Equal(t, test.ExpectedSchema, sch)
require.Equal(t, len(test.ExpectedRows), len(actualRows))
for i := 0; i < len(test.ExpectedRows); i++ {
eq := row.AreEqual(test.ExpectedRows[i], actualRows[i], test.ExpectedSchema)
if !eq {
expVal, err := test.ExpectedRows[i].NomsMapValue(test.ExpectedSchema).Value(ctx)
require.NoError(t, err)
expValStr, err := types.EncodedValue(ctx, expVal)
require.NoError(t, err)
actVal, err := actualRows[i].NomsMapValue(test.ExpectedSchema).Value(ctx)
require.NoError(t, err)
actValStr, err := types.EncodedValue(ctx, actVal)
require.NoError(t, err)
assert.Fail(t, fmt.Sprintf("%s\n\t!=\n%s", expValStr, actValStr))
}
}
// TODO: fix
// for i := 0; i < len(test.ExpectedRows); i++ {
// eq := row.AreEqual(test.ExpectedRows[i], actualRows[i], test.ExpectedSchema)
//
// if !eq {
// expVal, err := test.ExpectedRows[i].NomsMapValue(test.ExpectedSchema).Value(ctx)
// require.NoError(t, err)
//
// expValStr, err := types.EncodedValue(ctx, expVal)
// require.NoError(t, err)
//
// actVal, err := actualRows[i].NomsMapValue(test.ExpectedSchema).Value(ctx)
// require.NoError(t, err)
//
// actValStr, err := types.EncodedValue(ctx, actVal)
// require.NoError(t, err)
//
// assert.Fail(t, fmt.Sprintf("%s\n\t!=\n%s", expValStr, actValStr))
// }
// }
}

2
go/libraries/doltcore/sqle/sqlupdate_test.go
View File

@@ -126,7 +126,7 @@ func testUpdateQuery(t *testing.T, test UpdateTest) {
require.NoError(t, err)
}
actualRows, sch, err := executeSelect(context.Background(), dEnv, test.ExpectedSchema, root, test.SelectQuery)
actualRows, sch, err := executeSelect(context.Background(), dEnv, root, test.SelectQuery)
require.NoError(t, err)
assert.Equal(t, test.ExpectedSchema, sch)

4
go/libraries/doltcore/sqle/table_editor_test.go
View File

@@ -178,7 +178,7 @@ func TestTableEditor(t *testing.T) {
root, err = db.GetRoot(ctx)
require.NoError(t, err)
actualRows, _, err := executeSelect(context.Background(), dEnv, CompressSchema(PeopleTestSchema), root, test.selectQuery)
actualRows, _, err := executeSelect(context.Background(), dEnv, root, test.selectQuery)
require.NoError(t, err)
assert.Equal(t, test.expectedRows, actualRows)
})
@@ -186,7 +186,7 @@ func TestTableEditor(t *testing.T) {
}
func r(row row.Row, sch schema.Schema) sql.Row {
sqlRow, err := doltRowToSqlRow(row, sch)
sqlRow, err := DoltRowToSqlRow(row, sch)
if err != nil {
panic(err)
}

58
go/libraries/doltcore/sql/sqltestutil/updatequeries.go → go/libraries/doltcore/sqle/updatequeries_test.go
View File

@@ -1,24 +1,28 @@
// Copyright 2019 Liquidata, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/*
* // Copyright 2020 Liquidata, Inc.
* //
* // Licensed under the Apache License, Version 2.0 (the "License");
* // you may not use this file except in compliance with the License.
* // You may obtain a copy of the License at
* //
* // http://www.apache.org/licenses/LICENSE-2.0
* //
* // Unless required by applicable law or agreed to in writing, software
* // distributed under the License is distributed on an "AS IS" BASIS,
* // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* // See the License for the specific language governing permissions and
* // limitations under the License.
*/
package sqltestutil
package sqle
import (
"github.com/google/uuid"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/row"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema"
. "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql/sqltestutil"
)
// Structure for a test of an update query
@@ -176,7 +180,7 @@ var BasicUpdateTests = []UpdateTest{
UpdateQuery: `update episodes set air_date = "1993-03-24 20:00:00" where id = 1`,
SelectQuery: `select * from episodes where id = 1`,
ExpectedRows: CompressRows(EpisodesTestSchema,
MutateRow(EpisodesTestSchema, Ep1, EpAirDateTag, datetimeStrToTimestamp("1993-03-24 20:00:00")),
MutateRow(EpisodesTestSchema, Ep1, EpAirDateTag, DatetimeStrToTimestamp("1993-03-24 20:00:00")),
),
ExpectedSchema: CompressSchema(EpisodesTestSchema),
},
@@ -269,12 +273,12 @@ var BasicUpdateTests = []UpdateTest{
UpdateQuery: `update people set id = id + 1 order by id desc`,
SelectQuery: `select * from people`,
ExpectedRows: CompressRows(PeopleTestSchema,
MutateRow(PeopleTestSchema, Homer, IdTag, homerId+1),
MutateRow(PeopleTestSchema, Marge, IdTag, margeId+1),
MutateRow(PeopleTestSchema, Bart, IdTag, bartId+1),
MutateRow(PeopleTestSchema, Lisa, IdTag, lisaId+1),
MutateRow(PeopleTestSchema, Moe, IdTag, moeId+1),
MutateRow(PeopleTestSchema, Barney, IdTag, barneyId+1),
MutateRow(PeopleTestSchema, Homer, IdTag, HomerId+1),
MutateRow(PeopleTestSchema, Marge, IdTag, MargeId+1),
MutateRow(PeopleTestSchema, Bart, IdTag, BartId+1),
MutateRow(PeopleTestSchema, Lisa, IdTag, LisaId+1),
MutateRow(PeopleTestSchema, Moe, IdTag, MoeId+1),
MutateRow(PeopleTestSchema, Barney, IdTag, BarneyId+1),
),
ExpectedSchema: CompressSchema(PeopleTestSchema),
},
@@ -283,12 +287,12 @@ var BasicUpdateTests = []UpdateTest{
UpdateQuery: `update people set id = id + 1 order by id asc`,
SelectQuery: `select * from people order by id`,
ExpectedRows: CompressRows(PeopleTestSchema,
MutateRow(PeopleTestSchema, Homer, IdTag, homerId+1),
MutateRow(PeopleTestSchema, Marge, IdTag, margeId+1),
MutateRow(PeopleTestSchema, Bart, IdTag, bartId+1),
MutateRow(PeopleTestSchema, Lisa, IdTag, lisaId+1),
MutateRow(PeopleTestSchema, Moe, IdTag, moeId+1),
MutateRow(PeopleTestSchema, Barney, IdTag, barneyId+1),
MutateRow(PeopleTestSchema, Homer, IdTag, HomerId+1),
MutateRow(PeopleTestSchema, Marge, IdTag, MargeId+1),
MutateRow(PeopleTestSchema, Bart, IdTag, BartId+1),
MutateRow(PeopleTestSchema, Lisa, IdTag, LisaId+1),
MutateRow(PeopleTestSchema, Moe, IdTag, MoeId+1),
MutateRow(PeopleTestSchema, Barney, IdTag, BarneyId+1),
),
ExpectedSchema: CompressSchema(PeopleTestSchema),
},

4
go/libraries/doltcore/sqle/views_test.go
View File

@@ -23,7 +23,6 @@ import (
"github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/row"
. "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql/sqltestutil"
"github.com/liquidata-inc/dolt/go/store/types"
)
@@ -44,13 +43,12 @@ func TestViews(t *testing.T) {
root, err = ExecuteSql(dEnv, root, "create view plus1 as select a + 1 from test")
require.NoError(t, err)
expectedSchema := NewResultSetSchema("a", types.IntKind)
expectedRows := []row.Row{
NewResultSetRow(types.Int(2)),
NewResultSetRow(types.Int(3)),
NewResultSetRow(types.Int(4)),
}
rows, _, err := executeSelect(context.Background(), dEnv, expectedSchema, root, "select * from plus1")
rows, _, err := executeSelect(context.Background(), dEnv, root, "select * from plus1")
require.NoError(t, err)
assert.Equal(t, expectedRows, rows)

8
go/libraries/doltcore/table/untyped/sqlexport/sqlwriter.go
View File

@@ -16,6 +16,7 @@ package sqlexport
import (
"context"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/sqlfmt"
"io"
"os"
"path/filepath"
@@ -23,7 +24,6 @@ import (
"github.com/liquidata-inc/dolt/go/libraries/doltcore/row"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/sql"
"github.com/liquidata-inc/dolt/go/libraries/utils/filesys"
"github.com/liquidata-inc/dolt/go/libraries/utils/iohelp"
)
@@ -68,7 +68,7 @@ func (w *SqlExportWriter) WriteRow(ctx context.Context, r row.Row) error {
return err
}
stmt, err := sql.RowAsInsertStmt(r, w.tableName, w.sch)
stmt, err := sqlfmt.RowAsInsertStmt(r, w.tableName, w.sch)
if err != nil {
return err
@@ -80,9 +80,9 @@ func (w *SqlExportWriter) WriteRow(ctx context.Context, r row.Row) error {
func (w *SqlExportWriter) maybeWriteDropCreate() error {
if !w.writtenFirstRow {
var b strings.Builder
b.WriteString(sql.DropTableIfExistsStmt(w.tableName))
b.WriteString(sqlfmt.DropTableIfExistsStmt(w.tableName))
b.WriteRune('\n')
b.WriteString(sql.SchemaAsCreateStmt(w.tableName, w.sch))
b.WriteString(sqlfmt.SchemaAsCreateStmt(w.tableName, w.sch))
if err := iohelp.WriteLine(w.wr, b.String()); err != nil {
return err
}

7
go/libraries/doltcore/table/untyped/sqlexport/sqlwriter_test.go
View File

@@ -16,18 +16,17 @@ package sqlexport
import (
"context"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/sqlfmt"
"strings"
"testing"
"github.com/google/uuid"
"github.com/stretchr/testify/assert"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/row"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/sql"
)
type StringBuilderCloser struct {
strings.Builder
}
@@ -47,7 +46,7 @@ func TestEndToEnd(t *testing.T) {
id := uuid.MustParse("00000000-0000-0000-0000-000000000000")
tableName := "people"
dropCreateStatement := sql.DropTableIfExistsStmt(tableName) + "\n" + sql.SchemaAsCreateStmt(tableName, dtestutils.TypedSchema)
dropCreateStatement := sqlfmt.DropTableIfExistsStmt(tableName) + "\n" + sqlfmt.SchemaAsCreateStmt(tableName, dtestutils.TypedSchema)
type test struct {
name string