mirror of
https://github.com/dolthub/dolt.git
synced 2026-04-21 11:29:51 -05:00
go/doltcore/merge: outlined schema merge tests
This commit is contained in:
Andy Arthur
@@ -16,27 +16,41 @@ package merge_test
|
||||
|
||||
import (
|
||||
"context"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/dolthub/go-mysql-server/sql"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/dolthub/dolt/go/libraries/doltcore/doltdb"
|
||||
"github.com/dolthub/dolt/go/libraries/doltcore/dtestutils"
|
||||
"github.com/dolthub/dolt/go/libraries/doltcore/merge"
|
||||
"github.com/dolthub/dolt/go/libraries/doltcore/schema"
|
||||
"github.com/dolthub/dolt/go/libraries/doltcore/sqle"
|
||||
"github.com/dolthub/dolt/go/libraries/doltcore/sqle/sqlfmt"
|
||||
"github.com/dolthub/dolt/go/libraries/doltcore/sqle/sqlutil"
|
||||
"github.com/dolthub/dolt/go/libraries/doltcore/table/editor"
|
||||
"github.com/dolthub/dolt/go/store/hash"
|
||||
)
|
||||
|
||||
type schemaMergeTest struct {
|
||||
name string
|
||||
ancestor table
|
||||
left, right table
|
||||
result table
|
||||
merged table
|
||||
conflict bool
|
||||
}
|
||||
|
||||
type table struct {
|
||||
schema schema.Schema
|
||||
rows []sql.Row
|
||||
ns namedSchema
|
||||
rows []sql.Row
|
||||
}
|
||||
|
||||
type namedSchema struct {
|
||||
name string
|
||||
sch schema.Schema
|
||||
create string
|
||||
}
|
||||
|
||||
// TestMergeSchemas are schema merge integration tests from 2023
|
||||
@@ -70,7 +84,7 @@ var columnAddDropTests = []schemaMergeTest{
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY)"), row(1)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY)"), row(1)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY)"), row(1)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY)"), row(1)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY)"), row(1)),
|
||||
},
|
||||
// one side changes columns
|
||||
{
|
||||
@@ -78,28 +92,28 @@ var columnAddDropTests = []schemaMergeTest{
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, 2)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, 2)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, 2)),
|
||||
},
|
||||
{
|
||||
name: "left side column drop",
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, 2)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, 2)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
},
|
||||
{
|
||||
name: "right side column add",
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, 2)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, 2)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, 2)),
|
||||
},
|
||||
{
|
||||
name: "right side column drop",
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, 2)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, 2)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
},
|
||||
// both sides change columns
|
||||
{
|
||||
@@ -107,42 +121,42 @@ var columnAddDropTests = []schemaMergeTest{
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int) "), row(1, 2)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, b int) "), row(1, 3)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int, b int)"), row(1, 2, 3)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int, b int)"), row(1, 2, 3)),
|
||||
},
|
||||
{
|
||||
name: "independent column drops",
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int, b int)"), row(1, 2, 3)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int) "), row(1, 2)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, b int) "), row(1, 3)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
},
|
||||
{
|
||||
name: "convergent column adds",
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, nil)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, nil)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, nil)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, nil)),
|
||||
},
|
||||
{
|
||||
name: "convergent column drops",
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, 2)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
},
|
||||
{
|
||||
name: "convergent column adds, independent drops",
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int, b int)"), row(1, 2, 3)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, b int, c int)"), row(1, 3, 4)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int, c int)"), row(1, 2, 4)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, c int) "), row(1, 4)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, c int) "), row(1, 4)),
|
||||
},
|
||||
{
|
||||
name: "convergent column drops, independent adds",
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int) "), row(1, 2)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, b int) "), row(1, 3)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, c int) "), row(1, 4)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, b int, c int)"), row(1, 3, 4)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, b int, c int)"), row(1, 3, 4)),
|
||||
},
|
||||
// one side changes columns, the other inserts rows
|
||||
{
|
||||
@@ -150,28 +164,28 @@ var columnAddDropTests = []schemaMergeTest{
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, 2)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1), row(11)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, 2), row(11, nil)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, 2), row(11, nil)),
|
||||
},
|
||||
{
|
||||
name: "left side column drop, right side insert row",
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, 2)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, 2), row(11, 22)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1), row(11)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1), row(11)),
|
||||
},
|
||||
{
|
||||
name: "right side column add, left side insert row",
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1), row(11)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, 2)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, 2), row(11, nil)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, 2), row(11, nil)),
|
||||
},
|
||||
{
|
||||
name: "right side column drop, left side insert row",
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, 2)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, 2), row(11, 22)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1), row(11)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1), row(11)),
|
||||
},
|
||||
// both sides change columns and insert rows
|
||||
{
|
||||
@@ -179,42 +193,42 @@ var columnAddDropTests = []schemaMergeTest{
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int) "), row(1, 2), row(12, 22)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, b int) "), row(1, 3), row(13, 33)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int, b int)"), row(1, 2, 3), row(12, 22, nil), row(13, nil, 33)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int, b int)"), row(1, 2, 3), row(12, 22, nil), row(13, nil, 33)),
|
||||
},
|
||||
{
|
||||
name: "independent column drops, both sides insert independent rows",
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int, b int)"), row(1, 2, 3)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int) "), row(1, 2), row(12, 22)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, b int) "), row(1, 3), row(13, 33)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1), row(12), row(13)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1), row(12), row(13)),
|
||||
},
|
||||
{
|
||||
name: "convergent column adds, both sides insert independent rows",
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, nil), row(12, 22)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, nil), row(13, 33)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, nil), row(12, 22), row(13, 33)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, nil), row(12, 22), row(13, 33)),
|
||||
},
|
||||
{
|
||||
name: "convergent column drops, both sides insert independent rows",
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int)"), row(1, 2)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1), row(12)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1), row(13)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1), row(12), row(13)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1), row(12), row(13)),
|
||||
},
|
||||
{
|
||||
name: "independent column adds, both sides insert same row",
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int) "), row(1, 2), row(12, 22)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, b int) "), row(1, 3), row(12, 33)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int, b int)"), row(1, 2, 3), row(12, 22, 33)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int, b int)"), row(1, 2, 3), row(12, 22, 33)),
|
||||
},
|
||||
{
|
||||
name: "independent column drops, both sides insert same row",
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int, b int)"), row(1, 2, 3)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int) "), row(1, 2), row(12, 22)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, b int) "), row(1, 3), row(12, 33)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1), row(12)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1), row(12)),
|
||||
},
|
||||
}
|
||||
|
||||
@@ -224,42 +238,42 @@ var columnDefaultTests = []schemaMergeTest{
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int) ")),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int DEFAULT 42)")),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int) ")),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int DEFAULT 42)")),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int DEFAULT 42)")),
|
||||
},
|
||||
{
|
||||
name: "left side drop default",
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int DEFAULT 42)")),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int) ")),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int DEFAULT 42)")),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int) ")),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int) ")),
|
||||
},
|
||||
{
|
||||
name: "right side add default",
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int) ")),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int) ")),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int DEFAULT 42)")),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int DEFAULT 42)")),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int DEFAULT 42)")),
|
||||
},
|
||||
{
|
||||
name: "right side drop default",
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int DEFAULT 42)")),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int DEFAULT 42)")),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int) ")),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int) ")),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int) ")),
|
||||
},
|
||||
{
|
||||
name: "convergent add",
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int) ")),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int DEFAULT 42)")),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int DEFAULT 42)")),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int DEFAULT 42)")),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int DEFAULT 42)")),
|
||||
},
|
||||
{
|
||||
name: "convergent drop",
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int DEFAULT 42)")),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int) ")),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int) ")),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int) ")),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int) ")),
|
||||
},
|
||||
// one side changes columns, the other inserts rows
|
||||
{
|
||||
@@ -267,14 +281,14 @@ var columnDefaultTests = []schemaMergeTest{
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int DEFAULT 42)"), row(1, 42)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1), row(12)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int DEFAULT 42)"), row(1, 42), row(12, 42)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int DEFAULT 42)"), row(1, 42), row(12, 42)),
|
||||
},
|
||||
{
|
||||
name: "right side column add, left side insert row",
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1), row(11)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int DEFAULT 42)"), row(1, 42)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int DEFAULT 42)"), row(1, 42), row(11, 42)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int DEFAULT 42)"), row(1, 42), row(11, 42)),
|
||||
},
|
||||
// both sides change columns and insert rows
|
||||
{
|
||||
@@ -282,14 +296,14 @@ var columnDefaultTests = []schemaMergeTest{
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int DEFAULT 19) "), row(1, 2), row(12, 19)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, b int DEFAULT 17) "), row(1, 3), row(13, 17)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int DEFAULT 19, b int DEFAULT 17)"), row(1, 2, 3), row(12, 22, 17), row(13, 19, 33)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int DEFAULT 19, b int DEFAULT 17)"), row(1, 2, 3), row(12, 22, 17), row(13, 19, 33)),
|
||||
},
|
||||
{
|
||||
name: "convergent column adds, both sides insert independent rows",
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY) "), row(1)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int DEFAULT 19)"), row(1, 19)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int DEFAULT 19)"), row(1, 19)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int DEFAULT 19)"), row(1, 19)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int DEFAULT 19)"), row(1, 19)),
|
||||
},
|
||||
}
|
||||
|
||||
@@ -301,28 +315,28 @@ var typeChangeTests = []schemaMergeTest{
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int, b int) "), row(1, 2, 3)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a char(20), b int)"), row(1, "2", 3)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int, b int) "), row(1, 2, 3)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a char(20), b int)"), row(1, "2", 3)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a char(20), b int)"), row(1, "2", 3)),
|
||||
},
|
||||
{
|
||||
name: "modify column type on the right side",
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int, b int) "), row(1, 2, 3)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int, b int) "), row(1, 2, 3)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a char(20), b int)"), row(1, "2", 3)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a char(20), b int)"), row(1, "2", 3)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a char(20), b int)"), row(1, "2", 3)),
|
||||
},
|
||||
{
|
||||
name: "independently modify column type on the both sides",
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int, b int) "), row(1, 2, 3)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a char(20), b int) "), row(1, "2", 3)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int, b char(20)) "), row(1, 2, "3")),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a char(20), b char(20))"), row(1, "2", "3")),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a char(20), b char(20))"), row(1, "2", "3")),
|
||||
},
|
||||
{
|
||||
name: "convergently modify column type on the both sides",
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a int, b int) "), row(1, 2, 3)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a char(20), b int)"), row(1, "2", 3)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a char(20), b int)"), row(1, "2", 3)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a char(20), b int)"), row(1, "2", 3)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a char(20), b int)"), row(1, "2", 3)),
|
||||
},
|
||||
// column changes one side, data changes other side
|
||||
}
|
||||
@@ -333,91 +347,91 @@ var keyChangeTests = []schemaMergeTest{
|
||||
ancestor: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a)) "), row(1, "2", 3.0)),
|
||||
left: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a, b))"), row(1, "2", 3.0)),
|
||||
right: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a)) "), row(1, "2", 3.0)),
|
||||
result: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a, b))"), row(1, "2", 3.0)),
|
||||
merged: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a, b))"), row(1, "2", 3.0)),
|
||||
},
|
||||
{
|
||||
name: "add a trailing primary key column on right side",
|
||||
ancestor: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a)) "), row(1, "2", 3.0)),
|
||||
left: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a)) "), row(1, "2", 3.0)),
|
||||
right: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a, b))"), row(1, "2", 3.0)),
|
||||
result: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a, b))"), row(1, "2", 3.0)),
|
||||
merged: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a, b))"), row(1, "2", 3.0)),
|
||||
},
|
||||
{
|
||||
name: "add a leading primary key column on left side",
|
||||
ancestor: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a)) "), row(1, "2", 3.0)),
|
||||
left: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (b, a))"), row(1, "2", 3.0)),
|
||||
right: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a)) "), row(1, "2", 3.0)),
|
||||
result: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (b, a))"), row(1, "2", 3.0)),
|
||||
merged: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (b, a))"), row(1, "2", 3.0)),
|
||||
},
|
||||
{
|
||||
name: "add a leading primary key column on right side",
|
||||
ancestor: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a)) "), row(1, "2", 3.0)),
|
||||
left: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a)) "), row(1, "2", 3.0)),
|
||||
right: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (b, a))"), row(1, "2", 3.0)),
|
||||
result: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (b, a))"), row(1, "2", 3.0)),
|
||||
merged: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (b, a))"), row(1, "2", 3.0)),
|
||||
},
|
||||
{
|
||||
name: "remove a trailing primary key column on left side",
|
||||
ancestor: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a, b))"), row(1, "2", 3.0)),
|
||||
left: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a)) "), row(1, "2", 3.0)),
|
||||
right: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a, b))"), row(1, "2", 3.0)),
|
||||
result: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a)) "), row(1, "2", 3.0)),
|
||||
merged: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a)) "), row(1, "2", 3.0)),
|
||||
},
|
||||
{
|
||||
name: "remove a trailing primary key column on right side",
|
||||
ancestor: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a, b))"), row(1, "2", 3.0)),
|
||||
left: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a, b))"), row(1, "2", 3.0)),
|
||||
right: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a)) "), row(1, "2", 3.0)),
|
||||
result: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a)) "), row(1, "2", 3.0)),
|
||||
merged: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a)) "), row(1, "2", 3.0)),
|
||||
},
|
||||
{
|
||||
name: "remove a trailing primary key column on both sides",
|
||||
ancestor: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a, b))"), row(1, "2", 3.0)),
|
||||
left: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a)) "), row(1, "2", 3.0)),
|
||||
right: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a)) "), row(1, "2", 3.0)),
|
||||
result: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a)) "), row(1, "2", 3.0)),
|
||||
merged: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a)) "), row(1, "2", 3.0)),
|
||||
},
|
||||
{
|
||||
name: "remove a leading primary key column on left side",
|
||||
ancestor: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (b, a))"), row(1, "2", 3.0)),
|
||||
left: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a)) "), row(1, "2", 3.0)),
|
||||
right: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (b, a))"), row(1, "2", 3.0)),
|
||||
result: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a)) "), row(1, "2", 3.0)),
|
||||
merged: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a)) "), row(1, "2", 3.0)),
|
||||
},
|
||||
{
|
||||
name: "remove a leading primary key column on right side",
|
||||
ancestor: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (b, a))"), row(1, "2", 3.0)),
|
||||
left: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (b, a))"), row(1, "2", 3.0)),
|
||||
right: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a)) "), row(1, "2", 3.0)),
|
||||
result: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a)) "), row(1, "2", 3.0)),
|
||||
merged: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a)) "), row(1, "2", 3.0)),
|
||||
},
|
||||
{
|
||||
name: "remove a leading primary key column on both sides",
|
||||
ancestor: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (b, a))"), row(1, "2", 3.0)),
|
||||
left: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a)) "), row(1, "2", 3.0)),
|
||||
right: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a)) "), row(1, "2", 3.0)),
|
||||
result: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a)) "), row(1, "2", 3.0)),
|
||||
merged: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a)) "), row(1, "2", 3.0)),
|
||||
},
|
||||
{
|
||||
name: "convert left side to a keyless table",
|
||||
ancestor: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a))"), row(1, "2", 3.0)),
|
||||
left: tbl(sch("CREATE TABLE t (a int, b char(20), c float) "), row(1, "2", 3.0)),
|
||||
right: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a))"), row(1, "2", 3.0)),
|
||||
result: tbl(sch("CREATE TABLE t (a int, b char(20), c float) "), row(1, "2", 3.0)),
|
||||
merged: tbl(sch("CREATE TABLE t (a int, b char(20), c float) "), row(1, "2", 3.0)),
|
||||
},
|
||||
{
|
||||
name: "convert left side to a keyless table",
|
||||
ancestor: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a))"), row(1, "2", 3.0)),
|
||||
left: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a))"), row(1, "2", 3.0)),
|
||||
right: tbl(sch("CREATE TABLE t (a int, b char(20), c float) "), row(1, "2", 3.0)),
|
||||
result: tbl(sch("CREATE TABLE t (a int, b char(20), c float) "), row(1, "2", 3.0)),
|
||||
merged: tbl(sch("CREATE TABLE t (a int, b char(20), c float) "), row(1, "2", 3.0)),
|
||||
},
|
||||
{
|
||||
name: "convert both sides to keyless tables",
|
||||
ancestor: tbl(sch("CREATE TABLE t (a int, b char(20), c float, PRIMARY KEY (a))"), row(1, "2", 3.0)),
|
||||
left: tbl(sch("CREATE TABLE t (a int, b char(20), c float) "), row(1, "2", 3.0)),
|
||||
right: tbl(sch("CREATE TABLE t (a int, b char(20), c float) "), row(1, "2", 3.0)),
|
||||
result: tbl(sch("CREATE TABLE t (a int, b char(20), c float) "), row(1, "2", 3.0)),
|
||||
merged: tbl(sch("CREATE TABLE t (a int, b char(20), c float) "), row(1, "2", 3.0)),
|
||||
},
|
||||
}
|
||||
|
||||
@@ -427,21 +441,21 @@ var secondaryIndexTests = []schemaMergeTest{
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a char(20), b float) "), row(1, "2", 3.0)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a char(20), b float, INDEX (a)) "), row(1, "2", 3.0)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a char(20), b float, INDEX (b)) "), row(1, "2", 3.0)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a char(20), b float, INDEX (a), INDEX(b))"), row(1, "2", 3.0)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a char(20), b float, INDEX (a), INDEX(b))"), row(1, "2", 3.0)),
|
||||
},
|
||||
{
|
||||
name: "independent composite index adds",
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a char(20), b float) "), row(1, "2", 3.0)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a char(20), b float, INDEX (a, b)) "), row(1, "2", 3.0)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a char(20), b float, INDEX (b, a)) "), row(1, "2", 3.0)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a char(20), b float, INDEX (a, b), INDEX (b, a))"), row(1, "2", 3.0)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a char(20), b float, INDEX (a, b), INDEX (b, a))"), row(1, "2", 3.0)),
|
||||
},
|
||||
{
|
||||
name: "independent index drops",
|
||||
ancestor: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a char(20), b float, INDEX (a), INDEX (b))"), row(1, "2", 3.0)),
|
||||
left: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a char(20), b float, INDEX (a)) "), row(1, "2", 3.0)),
|
||||
right: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a char(20), b float, INDEX (b)) "), row(1, "2", 3.0)),
|
||||
result: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a char(20), b float) "), row(1, "2", 3.0)),
|
||||
merged: tbl(sch("CREATE TABLE t (id int PRIMARY KEY, a char(20), b float) "), row(1, "2", 3.0)),
|
||||
},
|
||||
}
|
||||
|
||||
@@ -492,30 +506,78 @@ var simpleConflictTests = []schemaMergeTest{
|
||||
}
|
||||
|
||||
func testSchemaMerge(t *testing.T, tests []schemaMergeTest) {
|
||||
var eo editor.Options
|
||||
var mo merge.MergeOpts
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
t.Skip("implement me")
|
||||
a := makeRoot(t, test.ancestor)
|
||||
l := makeRoot(t, test.left)
|
||||
r := makeRoot(t, test.right)
|
||||
m := makeRoot(t, test.merged)
|
||||
assertNoneNil(t, a, l, r, m)
|
||||
|
||||
ctx := context.Background()
|
||||
root, _, err := merge.MergeRoots(ctx, l, r, a, rootish{r}, rootish{a}, eo, mo)
|
||||
if err != nil {
|
||||
t.Skip()
|
||||
}
|
||||
assert.NoError(t, err)
|
||||
assert.NotNil(t, root)
|
||||
// todo: assert |root| == |m|
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func tbl(sch schema.Schema, rows ...sql.Row) table {
|
||||
return table{schema: sch, rows: rows}
|
||||
func tbl(ns namedSchema, rows ...sql.Row) table {
|
||||
return table{ns: ns, rows: rows}
|
||||
}
|
||||
|
||||
func sch(definition string) schema.Schema {
|
||||
func sch(definition string) namedSchema {
|
||||
denv := dtestutils.CreateTestEnv()
|
||||
vrw := denv.DoltDB.ValueReadWriter()
|
||||
ns := denv.DoltDB.NodeStore()
|
||||
ctx := context.Background()
|
||||
root, _ := doltdb.EmptyRootValue(ctx, vrw, ns)
|
||||
_, s, err := sqlutil.ParseCreateTableStatement(ctx, root, definition)
|
||||
name, s, err := sqlutil.ParseCreateTableStatement(ctx, root, definition)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
return s
|
||||
return namedSchema{name: name, sch: s, create: definition}
|
||||
}
|
||||
|
||||
func row(values ...any) sql.Row {
|
||||
return sql.NewRow(values...)
|
||||
}
|
||||
|
||||
func makeRoot(t *testing.T, tbl table) *doltdb.RootValue {
|
||||
var sb strings.Builder
|
||||
sb.WriteString(tbl.ns.create)
|
||||
for _, r := range tbl.rows {
|
||||
sb.WriteString(";\n")
|
||||
stmt, err := sqlfmt.SqlRowAsInsertStmt(r, tbl.ns.name, tbl.ns.sch)
|
||||
require.NoError(t, err)
|
||||
sb.WriteString(stmt)
|
||||
}
|
||||
denv := dtestutils.CreateTestEnv()
|
||||
root, err := sqle.ExecuteSql(denv, sb.String())
|
||||
assert.NoError(t, err)
|
||||
return root
|
||||
}
|
||||
|
||||
type rootish struct {
|
||||
rv *doltdb.RootValue
|
||||
}
|
||||
|
||||
func (r rootish) ResolveRootValue(ctx context.Context) (*doltdb.RootValue, error) {
|
||||
return r.rv, nil
|
||||
}
|
||||
|
||||
func (r rootish) HashOf() (hash.Hash, error) {
|
||||
return hash.Hash{}, nil
|
||||
}
|
||||
|
||||
func assertNoneNil(t *testing.T, objs ...any) {
|
||||
for i := range objs {
|
||||
assert.NotNil(t, objs[i])
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user