Skip to content

Commit 226f5d4

Browse files
committed
Merge branch 'main' of https://github.com/dolthub/go-mysql-server into angela/pk_join
2 parents 0aa88ab + d1dee70 commit 226f5d4

File tree

8 files changed

+369
-55
lines changed

8 files changed

+369
-55
lines changed

enginetest/queries/foreign_key_queries.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2807,21 +2807,18 @@ var CreateForeignKeyTests = []ScriptTest{
28072807
ExpectedErrStr: "string 'abc' is too large for column 'c'",
28082808
},
28092809
{
2810-
Skip: true,
28112810
Query: "create table child_varchar_10 (vc varchar(10), foreign key (vc) references parent(c));",
28122811
Expected: []sql.Row{
28132812
{types.NewOkResult(0)},
28142813
},
28152814
},
28162815
{
2817-
Skip: true,
28182816
Query: "insert into child_varchar_10 values ('abc');",
28192817
Expected: []sql.Row{
28202818
{types.NewOkResult(1)},
28212819
},
28222820
},
28232821
{
2824-
Skip: true,
28252822
Query: "insert into child_varchar_10 values ('abcdefghij');",
28262823
ExpectedErr: sql.ErrForeignKeyChildViolation,
28272824
},
@@ -2850,21 +2847,18 @@ var CreateForeignKeyTests = []ScriptTest{
28502847
ExpectedErrStr: "string 'abc' is too large for column 'b'",
28512848
},
28522849
{
2853-
Skip: true,
28542850
Query: "create table child_varbinary_10 (vb varbinary(10), foreign key (vb) references parent(b));",
28552851
Expected: []sql.Row{
28562852
{types.NewOkResult(0)},
28572853
},
28582854
},
28592855
{
2860-
Skip: true,
28612856
Query: "insert into child_varbinary_10 values ('abc');",
28622857
Expected: []sql.Row{
28632858
{types.NewOkResult(1)},
28642859
},
28652860
},
28662861
{
2867-
Skip: true,
28682862
Query: "insert into child_varbinary_10 values ('abcdefghij');",
28692863
ExpectedErr: sql.ErrForeignKeyChildViolation,
28702864
},

enginetest/queries/index_queries.go

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4512,4 +4512,25 @@ var IndexQueries = []ScriptTest{
45124512
},
45134513
},
45144514
},
4515+
{
4516+
Name: "aggregates using indexes with false filter",
4517+
SetUpScript: []string{
4518+
"create table pk_tbl (i int primary key);",
4519+
"create table unq_tbl (i int unique key);",
4520+
},
4521+
Assertions: []ScriptTestAssertion{
4522+
{
4523+
Query: "select count(*) from pk_tbl where (i = 0 and i = 1);",
4524+
Expected: []sql.Row{
4525+
{0},
4526+
},
4527+
},
4528+
{
4529+
Query: "select count(*) from unq_tbl where (i = 0 and i = 1);",
4530+
Expected: []sql.Row{
4531+
{0},
4532+
},
4533+
},
4534+
},
4535+
},
45154536
}

0 commit comments

Comments
 (0)