added check for if schema contains columns with the same name

Author: angelamayxie

enginetest/queries/script_queries.go

@@ -514,15 +514,15 @@ SET entity_test.value = joined.value;`,
 				Expected: []sql.Row{{1, "john", "doe", 0, 42}},
 			},
 			{
-				Query:    "UPDATE test_users JOIN (SELECT id, 1 FROM test_users) AS tu SET test_users.favorite_number = 420;",
+				Query:    "UPDATE test_users JOIN (SELECT 1 FROM test_users) AS tu SET test_users.favorite_number = 420;",
 				Expected: []sql.Row{{NewUpdateResult(1, 1)}},
 			},
 			{
 				Query:    "select * from test_users;",
 				Expected: []sql.Row{{1, "john", "doe", 0, 420}},
 			},
 			{
-				Query:    "UPDATE test_users JOIN (SELECT id, 1 FROM test_users) AS tu SET test_users.deleted = 1;",
+				Query:    "UPDATE test_users JOIN (SELECT 1 FROM test_users) AS tu SET test_users.deleted = 1;",
 				Expected: []sql.Row{{NewUpdateResult(1, 1)}},
 			},
 			{

enginetest/queries/update_queries.go

@@ -534,7 +534,7 @@ var UpdateScriptTests = []ScriptTest{
 		Name:    "UPDATE join – multiple tables, with trigger",
 		SetUpScript: []string{
 			"CREATE TABLE a (id INT PRIMARY KEY, x INT);",
-			"CREATE TABLE b (id INT PRIMARY KEY, y INT);",
+			"CREATE TABLE b (pk INT PRIMARY KEY, y INT);",
 			"CREATE TABLE logbook (entry TEXT);",
 			`CREATE TRIGGER trig_a AFTER UPDATE ON a FOR EACH ROW
 		 BEGIN
@@ -550,7 +550,7 @@ var UpdateScriptTests = []ScriptTest{
 		Assertions: []ScriptTestAssertion{
 			{
 				Query: `UPDATE a
-					JOIN b ON a.id = 5 AND b.id = 6
+					JOIN b ON a.id = 5 AND b.pk = 6
 					SET a.x = 101, b.y = 201;`,
 			},
 			{
@@ -562,6 +562,82 @@ var UpdateScriptTests = []ScriptTest{
 			},
 		},
 	},
+	{
+		Dialect: "mysql",
+		Name:    "UPDATE join – multiple tables with triggers that reference row values",
+		SetUpScript: []string{
+			"create table customers (id int primary key, name text, tier text)",
+			"create table orders (order_id int primary key, customer_id int, status text)",
+			"create table trigger_log (msg text)",
+			`CREATE TRIGGER after_orders_update after update on orders for each row
+				begin
+					insert into trigger_log (msg) values(
+						concat('Order ', OLD.order_id, ' status changed from ', OLD.status, ' to ', NEW.status));
+				end;`,
+			`Create trigger after_customers_update after update on customers for each row
+					begin
+						insert into trigger_log (msg) values(
+							concat('Customer ', OLD.id, ' tier changed from ', OLD.tier, ' to ', NEW.tier));
+					end;`,
+			"insert into customers values(1, 'Alice', 'silver'), (2, 'Bob', 'gold');",
+			"insert into orders values (101, 1, 'pending'), (102, 2, 'pending');",
+			"update customers c join orders o on c.id = o.customer_id " +
+				"set c.tier = 'platinum', o.status = 'shipped' where o.status = 'pending'",
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query: "SELECT * FROM trigger_log order by msg;",
+				Expected: []sql.Row{
+					{"Customer 1 tier changed from silver to platinum"},
+					{"Customer 2 tier changed from gold to platinum"},
+					{"Order 101 status changed from pending to shipped"},
+					{"Order 102 status changed from pending to shipped"},
+				},
+			},
+		},
+	},
+	{
+		Dialect: "mysql",
+		Name:    "UPDATE join – multiple tables with same column names with triggers",
+		SetUpScript: []string{
+			"create table customers (id int primary key, name text, tier text)",
+			"create table orders (id int primary key, customer_id int, status text)",
+			"create table trigger_log (msg text)",
+			`CREATE TRIGGER after_orders_update after update on orders for each row
+				begin
+					insert into trigger_log (msg) values(
+						concat('Order ', OLD.id, ' status changed from ', OLD.status, ' to ', NEW.status));
+				end;`,
+			`Create trigger after_customers_update after update on customers for each row
+					begin
+						insert into trigger_log (msg) values(
+							concat('Customer ', OLD.id, ' tier changed from ', OLD.tier, ' to ', NEW.tier));
+					end;`,
+			"insert into customers values(1, 'Alice', 'silver'), (2, 'Bob', 'gold');",
+			"insert into orders values (101, 1, 'pending'), (102, 2, 'pending');",
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query: "update customers c join orders o on c.id = o.customer_id " +
+					"set c.tier = 'platinum', o.status = 'shipped' where o.status = 'pending'",
+				// TODO: we shouldn't expect an error once we're able to handle conflicting column names
+				// https://github.com/dolthub/dolt/issues/9403
+				ExpectedErrStr: "Unable to apply triggers when joined tables have columns with the same name",
+			},
+			{
+				// TODO: unskip once we're able to handle conflicting column names
+				// https://github.com/dolthub/dolt/issues/9403
+				Skip:  true,
+				Query: "SELECT * FROM trigger_log order by msg;",
+				Expected: []sql.Row{
+					{"Customer 1 tier changed from silver to platinum"},
+					{"Customer 2 tier changed from gold to platinum"},
+					{"Order 101 status changed from pending to shipped"},
+					{"Order 102 status changed from pending to shipped"},
+				},
+			},
+		},
+	},
 }
 
 var SpatialUpdateTests = []WriteQueryTest{

sql/analyzer/triggers.go

@@ -15,6 +15,7 @@
 package analyzer
 
 import (
+	"errors"
 	"fmt"
 	"strings"
 
@@ -479,6 +480,12 @@ func getTriggerLogic(ctx *sql.Context, a *Analyzer, n sql.Node, scope *plan.Scop
 				),
 			)
 		} else {
+			// TODO: We should be able to handle duplicate column names by masking columns that aren't part of the
+			// triggered table https://github.com/dolthub/dolt/issues/9403
+			err = validateNoConflictingColumnNames(updateSrc.Child)
+			if err != nil {
+				return nil, err
+			}
 			// The scopeNode for an UpdateJoin should contain every node in the updateSource as new and old.
 			scopeNode = plan.NewProject(
 				[]sql.Expression{expression.NewStar()},
@@ -504,6 +511,20 @@ func getTriggerLogic(ctx *sql.Context, a *Analyzer, n sql.Node, scope *plan.Scop
 	return triggerLogic, err
 }
 
+// validateNoConflictingColumnNames checks the columns of a joined table to make sure there are no conflicting column
+// names
+func validateNoConflictingColumnNames(n sql.Node) error {
+	sch := n.Schema()
+	columnNames := make(map[string]string)
+	for _, col := range sch {
+		if sourceName, ok := columnNames[col.Name]; ok && sourceName != col.Source {
+			return errors.New("Unable to apply triggers when joined tables have columns with the same name")
+		}
+		columnNames[col.Name] = col.Source
+	}
+	return nil
+}
+
 // validateNoCircularUpdates returns an error if the trigger logic attempts to update the table that invoked it (or any
 // table being updated in an outer scope of this analysis)
 func validateNoCircularUpdates(trigger *plan.CreateTrigger, n sql.Node, scope *plan.Scope) error {