Skip to content

Commit

Permalink
Cherry-pick 2642bea with conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
vitess-bot[bot] committed Jan 24, 2024
1 parent cc346e2 commit e959783
Show file tree
Hide file tree
Showing 5 changed files with 1,626 additions and 0 deletions.
7 changes: 7 additions & 0 deletions go/vt/vtgate/planbuilder/plan_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,13 @@ func setFks(t *testing.T, vschema *vindexes.VSchema) {
// FK from tblrefDef referencing tbl20 that is shard scoped of SET-Default types.
_ = vschema.AddForeignKey("sharded_fk_allow", "tblrefDef", createFkDefinition([]string{"ref"}, "tbl20", []string{"col2"}, sqlparser.SetDefault, sqlparser.SetDefault))

<<<<<<< HEAD
=======
// FK from tbl_auth referencing tbl20 that is shard scoped of CASCADE types.
_ = vschema.AddForeignKey("sharded_fk_allow", "tbl_auth", createFkDefinition([]string{"id"}, "tbl20", []string{"col2"}, sqlparser.Cascade, sqlparser.Cascade))
addPKs(t, vschema, "sharded_fk_allow", []string{"tbl1", "tbl2", "tbl3", "tbl4", "tbl5", "tbl6", "tbl7", "tbl9", "tbl10",
"multicol_tbl1", "multicol_tbl2", "tbl_auth", "tblrefDef", "tbl20"})
>>>>>>> 2642bea6b1 (Fix panic for unknown columns in foreign key managed mode (#15025))
}
if vschema.Keyspaces["unsharded_fk_allow"] != nil {
// u_tbl2(col2) -> u_tbl1(col1) Cascade.
Expand Down
Loading

0 comments on commit e959783

Please sign in to comment.