Skip to content

Commit a0af54c

Browse files
committed
remove duplicate getTableName function
1 parent dc2d5d6 commit a0af54c

File tree

2 files changed

+3
-24
lines changed

2 files changed

+3
-24
lines changed

sql/analyzer/tables.go

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"github.com/dolthub/go-mysql-server/sql/transform"
2323
)
2424

25-
// Returns the underlying table name for the node given
25+
// Returns the underlying table name, unaliased, for the node given
2626
func getTableName(node sql.Node) string {
2727
var tableName string
2828
transform.Inspect(node, func(node sql.Node) bool {
@@ -43,27 +43,6 @@ func getTableName(node sql.Node) string {
4343
return tableName
4444
}
4545

46-
// Returns the underlying table name for the node given, ignoring table aliases
47-
func getUnaliasedTableName(node sql.Node) string {
48-
var tableName string
49-
transform.Inspect(node, func(node sql.Node) bool {
50-
switch node := node.(type) {
51-
case *plan.ResolvedTable:
52-
tableName = node.Name()
53-
return false
54-
case *plan.UnresolvedTable:
55-
tableName = node.Name()
56-
return false
57-
case *plan.IndexedTableAccess:
58-
tableName = node.Name()
59-
return false
60-
}
61-
return true
62-
})
63-
64-
return tableName
65-
}
66-
6746
// Finds first table node that is a descendant of the node given
6847
func getTable(node sql.Node) sql.Table {
6948
var table sql.Table

sql/analyzer/triggers.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -512,8 +512,8 @@ func validateNoCircularUpdates(trigger *plan.CreateTrigger, n sql.Node, scope *p
512512
switch node := node.(type) {
513513
case *plan.Update, *plan.InsertInto, *plan.DeleteFrom:
514514
for _, n := range append([]sql.Node{n}, scope.MemoNodes()...) {
515-
invokingTableName := getUnaliasedTableName(n)
516-
updatedTable := getUnaliasedTableName(node)
515+
invokingTableName := getTableName(n)
516+
updatedTable := getTableName(node)
517517
// TODO: need to compare DB as well
518518
if updatedTable == invokingTableName {
519519
circularRef = sql.ErrTriggerTableInUse.New(updatedTable)

0 commit comments

Comments
 (0)