Fix tests, add case insensitivity tests

tbantle22 · tbantle22 · commit f426cb090c29 · 2024-11-05T16:33:41.000-08:00
diff --git a/go/libraries/doltcore/sqle/dtables/blame_view.go b/go/libraries/doltcore/sqle/dtables/blame_view.go
@@ -68,13 +68,12 @@ const (
 // The DOLT_BLAME system view is a view on the DOLT_DIFF system table that shows the latest commit
 // for each primary key in the specified table.
 func NewBlameView(ctx *sql.Context, tableName doltdb.TableName, root doltdb.RootValue) (string, error) {
-	table, _, ok, err := doltdb.GetTableInsensitive(ctx, root, tableName)
+	var table *doltdb.Table
+	var err error
+	table, tableName, err = mustGetTableInsensitive(ctx, root, tableName)
 	if err != nil {
 		return "", err
 	}
-	if !ok {
-		return "", doltdb.ErrTableNotFound
-	}
 
 	sch, err := table.GetSchema(ctx)
 	if err != nil {
diff --git a/go/libraries/doltcore/sqle/dtables/commit_diff_table.go b/go/libraries/doltcore/sqle/dtables/commit_diff_table.go
@@ -60,13 +60,12 @@ var _ sql.StatisticsTable = (*CommitDiffTable)(nil)
 func NewCommitDiffTable(ctx *sql.Context, dbName string, tblName doltdb.TableName, ddb *doltdb.DoltDB, wRoot, sRoot doltdb.RootValue) (sql.Table, error) {
 	diffTblName := doltdb.DoltCommitDiffTablePrefix + tblName.Name
 
-	table, tableExists, err := wRoot.GetTable(ctx, tblName)
+	var table *doltdb.Table
+	var err error
+	table, tblName, err = mustGetTableInsensitive(ctx, wRoot, tblName)
 	if err != nil {
 		return nil, err
 	}
-	if !tableExists {
-		return nil, sql.ErrTableNotFound.New(diffTblName)
-	}
 
 	sch, err := table.GetSchema(ctx)
 	if err != nil {
diff --git a/go/libraries/doltcore/sqle/dtables/conflicts_tables.go b/go/libraries/doltcore/sqle/dtables/conflicts_tables.go
@@ -29,11 +29,11 @@ import (
 
 // NewConflictsTable returns a new ConflictsTable instance
 func NewConflictsTable(ctx *sql.Context, tblName doltdb.TableName, srcTbl sql.Table, root doltdb.RootValue, rs RootSetter) (sql.Table, error) {
-	tbl, ok, err := root.GetTable(ctx, tblName)
+	var tbl *doltdb.Table
+	var err error
+	tbl, tblName, err = mustGetTableInsensitive(ctx, root, tblName)
 	if err != nil {
 		return nil, err
-	} else if !ok {
-		return nil, sql.ErrTableNotFound.New(tblName)
 	}
 
 	if types.IsFormat_DOLT(tbl.Format()) {
diff --git a/go/libraries/doltcore/sqle/dtables/constraint_violations.go b/go/libraries/doltcore/sqle/dtables/constraint_violations.go
@@ -36,11 +36,11 @@ func NewConstraintViolationsTable(ctx *sql.Context, tblName doltdb.TableName, ro
 }
 
 func newNomsCVTable(ctx *sql.Context, tblName doltdb.TableName, root doltdb.RootValue, rs RootSetter) (sql.Table, error) {
-	tbl, _, ok, err := doltdb.GetTableInsensitive(ctx, root, tblName)
+	var tbl *doltdb.Table
+	var err error
+	tbl, tblName, err = mustGetTableInsensitive(ctx, root, tblName)
 	if err != nil {
 		return nil, err
-	} else if !ok {
-		return nil, sql.ErrTableNotFound.New(tblName)
 	}
 	cvSch, err := tbl.GetConstraintViolationsSchema(ctx)
 	if err != nil {
diff --git a/go/libraries/doltcore/sqle/dtables/constraint_violations_prolly.go b/go/libraries/doltcore/sqle/dtables/constraint_violations_prolly.go
@@ -33,11 +33,11 @@ import (
 )
 
 func newProllyCVTable(ctx *sql.Context, tblName doltdb.TableName, root doltdb.RootValue, rs RootSetter) (sql.Table, error) {
-	tbl, ok, err := root.GetTable(ctx, tblName)
+	var tbl *doltdb.Table
+	var err error
+	tbl, tblName, err = mustGetTableInsensitive(ctx, root, tblName)
 	if err != nil {
 		return nil, err
-	} else if !ok {
-		return nil, sql.ErrTableNotFound.New(tblName)
 	}
 	cvSch, err := tbl.GetConstraintViolationsSchema(ctx)
 	if err != nil {
diff --git a/go/libraries/doltcore/sqle/dtables/diff_table.go b/go/libraries/doltcore/sqle/dtables/diff_table.go
@@ -86,16 +86,28 @@ var PrimaryKeyChangeWarning = "cannot render full diff between commits %s and %s
 
 const PrimaryKeyChangeWarningCode int = 1105 // Since this is our own custom warning we'll use 1105, the code for an unknown error
 
+func mustGetTableInsensitive(ctx *sql.Context, root doltdb.RootValue, tblName doltdb.TableName) (*doltdb.Table, doltdb.TableName, error) {
+	table, correctedTableName, tableExists, err := doltdb.GetTableInsensitive(ctx, root, tblName)
+	if err != nil {
+		return nil, tblName, err
+	}
+	if !tableExists {
+		return nil, tblName, sql.ErrTableNotFound.New(tblName.String())
+	}
+	tblName.Name = correctedTableName
+	return table, tblName, nil
+}
+
 func NewDiffTable(ctx *sql.Context, dbName string, tblName doltdb.TableName, ddb *doltdb.DoltDB, root doltdb.RootValue, head *doltdb.Commit) (sql.Table, error) {
 	diffTblName := doltdb.DoltDiffTablePrefix + tblName.Name
 
-	table, tableExists, err := root.GetTable(ctx, tblName)
+	var table *doltdb.Table
+	var err error
+	table, tblName, err = mustGetTableInsensitive(ctx, root, tblName)
 	if err != nil {
 		return nil, err
 	}
-	if !tableExists {
-		return nil, sql.ErrTableNotFound.New(diffTblName)
-	}
+
 	sch, err := table.GetSchema(ctx)
 	if err != nil {
 		return nil, err
diff --git a/go/libraries/doltcore/sqle/dtables/workspace_table.go b/go/libraries/doltcore/sqle/dtables/workspace_table.go
@@ -410,7 +410,7 @@ func NewWorkspaceTable(ctx *sql.Context, workspaceTableName string, tableName do
 	if err != nil {
 		return nil, err
 	}
-	finalSch, err := sqlutil.FromDoltSchema("", tableName.Name, totalSch)
+	finalSch, err := sqlutil.FromDoltSchema("", workspaceTableName, totalSch)
 	if err != nil {
 		return nil, err
 	}
@@ -527,7 +527,7 @@ func (w *WorkspacePartition) Key() []byte {
 }
 
 func (wt *WorkspaceTable) Partitions(ctx *sql.Context) (sql.PartitionIter, error) {
-	baseTable, baseTableExists, err := wt.head.GetTable(ctx, wt.userTblName)
+	baseTable, _, baseTableExists, err := doltdb.GetTableInsensitive(ctx, wt.head, wt.userTblName)
 	if err != nil {
 		return nil, err
 	}
@@ -538,7 +538,7 @@ func (wt *WorkspaceTable) Partitions(ctx *sql.Context) (sql.PartitionIter, error
 		}
 	}
 
-	stagingTable, stagingTableExists, err := wt.ws.StagedRoot().GetTable(ctx, wt.userTblName)
+	stagingTable, _, stagingTableExists, err := doltdb.GetTableInsensitive(ctx, wt.ws.StagedRoot(), wt.userTblName)
 	if err != nil {
 		return nil, err
 	}
@@ -549,7 +549,7 @@ func (wt *WorkspaceTable) Partitions(ctx *sql.Context) (sql.PartitionIter, error
 		}
 	}
 
-	workingTable, workingTableExists, err := wt.ws.WorkingRoot().GetTable(ctx, wt.userTblName)
+	workingTable, _, workingTableExists, err := doltdb.GetTableInsensitive(ctx, wt.ws.WorkingRoot(), wt.userTblName)
 	if err != nil {
 		return nil, err
 	}
diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_queries.go b/go/libraries/doltcore/sqle/enginetest/dolt_queries.go
@@ -1276,6 +1276,13 @@ var DoltScripts = []queries.ScriptTest{
 					{"zzz", 4, "add rows"},
 				},
 			},
+			{
+				// Test case-insensitive table name
+				Query: "SELECT count(*) FROM dolt_blame_T",
+				Expected: []sql.Row{
+					{8},
+				},
+			},
 		},
 	},
 	{
diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_queries_diff.go b/go/libraries/doltcore/sqle/enginetest/dolt_queries_diff.go
@@ -38,6 +38,11 @@ var DiffSystemTableScriptTests = []queries.ScriptTest{
 				Query:    "SELECT COUNT(*) FROM DOLT_DIFF_t;",
 				Expected: []sql.Row{{2}},
 			},
+			{
+				// Test case-insensitive table name
+				Query:    "SELECT COUNT(*) FROM DOLT_DIFF_T;",
+				Expected: []sql.Row{{2}},
+			},
 			{
 				Query: "SELECT to_pk, to_c1, to_c2, from_pk, from_c1, from_c2, diff_type FROM DOLT_DIFF_t WHERE TO_COMMIT=@Commit1 ORDER BY to_pk, to_c2, to_c2, from_pk, from_c1, from_c2, diff_type;",
 				Expected: []sql.Row{
@@ -4750,6 +4755,14 @@ var CommitDiffSystemTableScriptTests = []queries.ScriptTest{
 					{4, 5, 6, nil, nil, nil, "added"},
 				},
 			},
+			{
+				// Test case-insensitive table name
+				Query: "SELECT to_pk, to_c1, to_c2, from_pk, from_c1, from_c2, diff_type FROM DOLT_COMMIT_DIFF_T WHERE TO_COMMIT=@Commit1 and FROM_COMMIT=@Commit0;",
+				Expected: []sql.Row{
+					{1, 2, 3, nil, nil, nil, "added"},
+					{4, 5, 6, nil, nil, nil, "added"},
+				},
+			},
 			{
 				Query: "SELECT to_pk, to_c1, to_c2, from_pk, from_c1, from_c2, diff_type FROM DOLT_COMMIT_DIFF_t WHERE TO_COMMIT=@Commit2 and FROM_COMMIT=@Commit1 ORDER BY to_pk;",
 				Expected: []sql.Row{
diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_queries_merge.go b/go/libraries/doltcore/sqle/enginetest/dolt_queries_merge.go
@@ -1077,6 +1077,11 @@ var MergeScripts = []queries.ScriptTest{
 				Query:    "SELECT count(*) from dolt_conflicts_test",
 				Expected: []sql.Row{{1}},
 			},
+			{
+				// Test case-insensitive table name
+				Query:    "SELECT count(*) from dolt_conflicts_TeST",
+				Expected: []sql.Row{{1}},
+			},
 			{
 				Query:    "CALL DOLT_MERGE('--abort')",
 				Expected: []sql.Row{{"", 0, 0, "merge aborted"}},
@@ -1275,6 +1280,11 @@ var MergeScripts = []queries.ScriptTest{
 				Query:    "SELECT violation_type, pk, parent_fk from dolt_constraint_violations_child;",
 				Expected: []sql.Row{{"foreign key", 1, 1}},
 			},
+			{
+				// Test case-insensitive table name
+				Query:    "SELECT violation_type, pk, parent_fk from dolt_constraint_violations_CHILD;",
+				Expected: []sql.Row{{"foreign key", 1, 1}},
+			},
 			{
 				Query: "select * from dolt_status;",
 				Expected: []sql.Row{
diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_queries_workspace.go b/go/libraries/doltcore/sqle/enginetest/dolt_queries_workspace.go
@@ -40,6 +40,13 @@ var DoltWorkspaceScriptTests = []queries.ScriptTest{
 					{0, true, "modified", 42, 51, 42, 42},
 				},
 			},
+			{
+				// Test case-insensitive table name
+				Query: "select * from dolt_workspace_TBL",
+				Expected: []sql.Row{
+					{0, true, "modified", 42, 51, 42, 42},
+				},
+			},
 			{
 				Query: "update tbl set val= 108 where pk = 42;",
 			},

Original file line number	Diff line number	Diff line change
`@@ -36,11 +36,11 @@ func NewConstraintViolationsTable(ctx *sql.Context, tblName doltdb.TableName, ro`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`func newNomsCVTable(ctx *sql.Context, tblName doltdb.TableName, root doltdb.RootValue, rs RootSetter) (sql.Table, error) {`
`39`		`- tbl, _, ok, err := doltdb.GetTableInsensitive(ctx, root, tblName)`
	`39`	`+ var tbl *doltdb.Table`
	`40`	`+ var err error`
	`41`	`+ tbl, tblName, err = mustGetTableInsensitive(ctx, root, tblName)`
`40`	`42`	`if err != nil {`
`41`	`43`	`return nil, err`
`42`		`- } else if !ok {`
`43`		`- return nil, sql.ErrTableNotFound.New(tblName)`
`44`	`44`	`}`
`45`	`45`	`cvSch, err := tbl.GetConstraintViolationsSchema(ctx)`
`46`	`46`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -33,11 +33,11 @@ import (`
`33`	`33`	`)`
`34`	`34`
`35`	`35`	`func newProllyCVTable(ctx *sql.Context, tblName doltdb.TableName, root doltdb.RootValue, rs RootSetter) (sql.Table, error) {`
`36`		`- tbl, ok, err := root.GetTable(ctx, tblName)`
	`36`	`+ var tbl *doltdb.Table`
	`37`	`+ var err error`
	`38`	`+ tbl, tblName, err = mustGetTableInsensitive(ctx, root, tblName)`
`37`	`39`	`if err != nil {`
`38`	`40`	`return nil, err`
`39`		`- } else if !ok {`
`40`		`- return nil, sql.ErrTableNotFound.New(tblName)`
`41`	`41`	`}`
`42`	`42`	`cvSch, err := tbl.GetConstraintViolationsSchema(ctx)`
`43`	`43`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -410,7 +410,7 @@ func NewWorkspaceTable(ctx *sql.Context, workspaceTableName string, tableName do`
`410`	`410`	`if err != nil {`
`411`	`411`	`return nil, err`
`412`	`412`	`}`
`413`		`- finalSch, err := sqlutil.FromDoltSchema("", tableName.Name, totalSch)`
	`413`	`+ finalSch, err := sqlutil.FromDoltSchema("", workspaceTableName, totalSch)`
`414`	`414`	`if err != nil {`
`415`	`415`	`return nil, err`
`416`	`416`	`}`
`@@ -527,7 +527,7 @@ func (w *WorkspacePartition) Key() []byte {`
`527`	`527`	`}`
`528`	`528`
`529`	`529`	`func (wt WorkspaceTable) Partitions(ctx sql.Context) (sql.PartitionIter, error) {`
`530`		`- baseTable, baseTableExists, err := wt.head.GetTable(ctx, wt.userTblName)`
	`530`	`+ baseTable, _, baseTableExists, err := doltdb.GetTableInsensitive(ctx, wt.head, wt.userTblName)`
`531`	`531`	`if err != nil {`
`532`	`532`	`return nil, err`
`533`	`533`	`}`
`@@ -538,7 +538,7 @@ func (wt WorkspaceTable) Partitions(ctx sql.Context) (sql.PartitionIter, error`
`538`	`538`	`}`
`539`	`539`	`}`
`540`	`540`
`541`		`- stagingTable, stagingTableExists, err := wt.ws.StagedRoot().GetTable(ctx, wt.userTblName)`
	`541`	`+ stagingTable, _, stagingTableExists, err := doltdb.GetTableInsensitive(ctx, wt.ws.StagedRoot(), wt.userTblName)`
`542`	`542`	`if err != nil {`
`543`	`543`	`return nil, err`
`544`	`544`	`}`
`@@ -549,7 +549,7 @@ func (wt WorkspaceTable) Partitions(ctx sql.Context) (sql.PartitionIter, error`
`549`	`549`	`}`
`550`	`550`	`}`
`551`	`551`
`552`		`- workingTable, workingTableExists, err := wt.ws.WorkingRoot().GetTable(ctx, wt.userTblName)`
	`552`	`+ workingTable, _, workingTableExists, err := doltdb.GetTableInsensitive(ctx, wt.ws.WorkingRoot(), wt.userTblName)`
`553`	`553`	`if err != nil {`
`554`	`554`	`return nil, err`
`555`	`555`	`}`