Merge branch 'main' into max/stats-iter-change

Author: max-hoffman

enginetest/queries/foreign_key_queries.go

@@ -380,6 +380,22 @@ var ForeignKeyTests = []ScriptTest{
 			},
 		},
 	},
+	{
+		Name: "DROP TABLE, with multiple tables, sorts by foreign key dependencies",
+		SetUpScript: []string{
+			"create table grandparent1 (pk int primary key);",
+			"create table parent1 (pk int primary key, c1 int references grandparent(pk));",
+			"create table parent2 (pk int primary key);",
+			"create table child1 (pk int primary key, c1 int, c2 int, foreign key (c1) references parent1(pk), foreign key (c2) references parent2(pk));",
+			"create table selfref (pk int primary key, c1 int, foreign key (c1) references selfref(pk));",
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query:    "DROP TABLE grandparent1, parent1, parent2, selfref, child1;",
+				Expected: []sql.Row{{types.NewOkResult(0)}},
+			},
+		},
+	},
 	{
 		Name: "Indexes used by foreign keys can't be dropped",
 		SetUpScript: []string{

enginetest/queries/imdb_plans.go

@@ -10171,6 +10171,18 @@ from typestable`,
 			{2},
 		},
 	},
+	{
+		Query: "select ''",
+		Expected: []sql.Row{
+			{""},
+		},
+	},
+	{
+		Query: "select '' from dual",
+		Expected: []sql.Row{
+			{""},
+		},
+	},
 
 	{
 		Query: "select @@sql_mode = 1",

enginetest/queries/integration_plans.go

@@ -931,6 +931,37 @@ END;`,
 			},
 		},
 	},
+	{
+		Name: "trigger before update with table alias",
+		SetUpScript: []string{
+			"CREATE TABLE test (i INT, j INT);",
+			"INSERT INTO test VALUES (1, 1);",
+			`
+CREATE TRIGGER before_test_update BEFORE UPDATE ON test
+FOR EACH ROW
+BEGIN
+	SET new.j = new.i * 100;
+END;`,
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query:       "update test t set test.i = 2 where test.i = 1;",
+				ExpectedErr: sql.ErrTableNotFound,
+			},
+			{
+				Query: "update test t set t.i = 2 where t.i = 1;",
+				Expected: []sql.Row{
+					{types.OkResult{RowsAffected: 1, Info: plan.UpdateInfo{Matched: 1, Updated: 1}}},
+				},
+			},
+			{
+				Query: "select * from test;",
+				Expected: []sql.Row{
+					{2, 200},
+				},
+			},
+		},
+	},
 
 	// DELETE triggers
 	{

enginetest/queries/queries.go

@@ -273,6 +273,12 @@ func getForeignKeyReferences(ctx *sql.Context, a *Analyzer, tbl sql.ForeignKeyTa
 		if err != nil {
 			return nil, err
 		}
+
+		typeConversions, err := plan.GetForeignKeyTypeConversions(parentTbl.Schema(), tblSch, fk, plan.ChildToParent)
+		if err != nil {
+			return nil, err
+		}
+
 		var selfCols map[string]int
 		if fk.IsSelfReferential() {
 			selfCols = make(map[string]int)
@@ -284,11 +290,12 @@ func getForeignKeyReferences(ctx *sql.Context, a *Analyzer, tbl sql.ForeignKeyTa
 			ForeignKey: fk,
 			SelfCols:   selfCols,
 			RowMapper: plan.ForeignKeyRowMapper{
-				Index:          parentIndex,
-				Updater:        parentUpdater,
-				SourceSch:      tblSch,
-				IndexPositions: indexPositions,
-				AppendTypes:    appendTypes,
+				Index:                 parentIndex,
+				Updater:               parentUpdater,
+				SourceSch:             tblSch,
+				TargetTypeConversions: typeConversions,
+				IndexPositions:        indexPositions,
+				AppendTypes:           appendTypes,
 			},
 		}
 	}
@@ -379,6 +386,11 @@ func getForeignKeyRefActions(ctx *sql.Context, a *Analyzer, tbl sql.ForeignKeyTa
 			return nil, err
 		}
 
+		typeConversions, err := plan.GetForeignKeyTypeConversions(tblSch, childTblSch, fk, plan.ParentToChild)
+		if err != nil {
+			return nil, err
+		}
+
 		childEditor, err := getForeignKeyEditor(ctx, a, childTbl, cache, fkChain.AddForeignKey(fk.Name), checkRows)
 		if err != nil {
 			return nil, err
@@ -402,11 +414,12 @@ func getForeignKeyRefActions(ctx *sql.Context, a *Analyzer, tbl sql.ForeignKeyTa
 		}
 		fkEditor.RefActions[i] = plan.ForeignKeyRefActionData{
 			RowMapper: &plan.ForeignKeyRowMapper{
-				Index:          childIndex,
-				Updater:        childUpdater,
-				SourceSch:      tblSch,
-				IndexPositions: indexPositions,
-				AppendTypes:    appendTypes,
+				Index:                 childIndex,
+				Updater:               childUpdater,
+				SourceSch:             tblSch,
+				TargetTypeConversions: typeConversions,
+				IndexPositions:        indexPositions,
+				AppendTypes:           appendTypes,
 			},
 			Editor:             childEditor,
 			ForeignKey:         fk,

enginetest/queries/trigger_queries.go

@@ -17,6 +17,8 @@ package analyzer
 import (
 	"strings"
 
+	"github.com/dolthub/go-mysql-server/memory"
+
 	"github.com/dolthub/go-mysql-server/sql"
 	"github.com/dolthub/go-mysql-server/sql/expression"
 	"github.com/dolthub/go-mysql-server/sql/plan"
@@ -43,7 +45,9 @@ func eraseProjection(ctx *sql.Context, a *Analyzer, node sql.Node, scope *plan.S
 	return transform.Node(node, func(node sql.Node) (sql.Node, transform.TreeIdentity, error) {
 		project, ok := node.(*plan.Project)
 		if ok {
-			if project.Schema().CaseSensitiveEquals(project.Child.Schema()) {
+			projSch := project.Schema()
+			childSch := project.Child.Schema()
+			if projSch.CaseSensitiveEquals(childSch) && !childSch.Equals(memory.DualTableSchema.Schema) {
 				a.Log("project erased")
 				return project.Child, transform.NewTree, nil
 			}