PR feedback

Author: tbantle22

go/libraries/doltcore/sqle/database.go

@@ -314,6 +314,10 @@ func (db Database) GetTableInsensitiveAsOf(ctx *sql.Context, tableName string, a
 	}
 }
 
+func isDoltSystemTable(tableName string) bool {
+	return doltdb.HasDoltPrefix(tableName) || !resolve.UseSearchPath
+}
+
 func (db Database) getTableInsensitive(ctx *sql.Context, head *doltdb.Commit, ds *dsess.DoltSession, root doltdb.RootValue, tblName string, asOf interface{}) (sql.Table, bool, error) {
 	lwrName := strings.ToLower(tblName)
 
@@ -422,11 +426,11 @@ func (db Database) getTableInsensitive(ctx *sql.Context, head *doltdb.Commit, ds
 	tname := doltdb.TableName{Name: lwrName, Schema: db.schemaName}
 	switch lwrName {
 	case doltdb.GetLogTableName(), doltdb.LogTableName:
-		systemTable, err := resolve.SystemTable(ctx, tname, root)
+		systemTable, err := resolve.IsSystemTable(ctx, tname, root)
 		if err != nil {
 			return nil, false, err
 		}
-		if systemTable {
+		if isDoltSystemTable(lwrName) && systemTable {
 			if head == nil {
 				var err error
 				head, err = ds.GetHeadCommit(ctx, db.RevisionQualifiedName())
@@ -464,11 +468,11 @@ func (db Database) getTableInsensitive(ctx *sql.Context, head *doltdb.Commit, ds
 	case doltdb.SchemaConflictsTableName:
 		dt, found = dtables.NewSchemaConflictsTable(ctx, db.RevisionQualifiedName(), db.ddb), true
 	case doltdb.GetBranchesTableName(), doltdb.BranchesTableName:
-		systemTable, err := resolve.SystemTable(ctx, tname, root)
+		systemTable, err := resolve.IsSystemTable(ctx, tname, root)
 		if err != nil {
 			return nil, false, err
 		}
-		if systemTable {
+		if isDoltSystemTable(lwrName) && systemTable {
 			dt, found = dtables.NewBranchesTable(ctx, db), true
 		}
 	case doltdb.RemoteBranchesTableName:
@@ -480,11 +484,11 @@ func (db Database) getTableInsensitive(ctx *sql.Context, head *doltdb.Commit, ds
 	case doltdb.CommitAncestorsTableName:
 		dt, found = dtables.NewCommitAncestorsTable(ctx, db.Name(), db.ddb), true
 	case doltdb.GetStatusTableName(), doltdb.StatusTableName:
-		systemTable, err := resolve.SystemTable(ctx, tname, root)
+		systemTable, err := resolve.IsSystemTable(ctx, tname, root)
 		if err != nil {
 			return nil, false, err
 		}
-		if systemTable {
+		if isDoltSystemTable(lwrName) && systemTable {
 			sess := dsess.DSessFromSess(ctx.Session)
 			adapter := dsess.NewSessionStateAdapter(
 				sess, db.RevisionQualifiedName(),
@@ -501,11 +505,11 @@ func (db Database) getTableInsensitive(ctx *sql.Context, head *doltdb.Commit, ds
 	case doltdb.MergeStatusTableName:
 		dt, found = dtables.NewMergeStatusTable(db.RevisionQualifiedName()), true
 	case doltdb.GetTagsTableName(), doltdb.TagsTableName:
-		systemTable, err := resolve.SystemTable(ctx, tname, root)
+		systemTable, err := resolve.IsSystemTable(ctx, tname, root)
 		if err != nil {
 			return nil, false, err
 		}
-		if systemTable {
+		if isDoltSystemTable(lwrName) && systemTable {
 			dt, found = dtables.NewTagsTable(ctx, db.ddb), true
 		}
 	case dtables.AccessTableName:
@@ -534,11 +538,11 @@ func (db Database) getTableInsensitive(ctx *sql.Context, head *doltdb.Commit, ds
 			dt, found = dtables.NewIgnoreTable(ctx, versionableTable), true
 		}
 	case doltdb.GetDocTableName(), doltdb.DocTableName:
-		systemTable, err := resolve.SystemTable(ctx, tname, root)
+		systemTable, err := resolve.IsSystemTable(ctx, tname, root)
 		if err != nil {
 			return nil, false, err
 		}
-		if systemTable {
+		if isDoltSystemTable(lwrName) && systemTable {
 			if resolve.UseSearchPath && lwrName == doltdb.DocTableName {
 				db.schemaName = "dolt"
 			}

go/libraries/doltcore/sqle/resolve/search_path.go

@@ -79,32 +79,28 @@ func FirstExistingSchemaOnSearchPath(ctx *sql.Context, root doltdb.RootValue) (s
 	return schemaName, nil
 }
 
-// SystemTable returns whether a table is a system table or not
-func SystemTable(ctx *sql.Context, tableName doltdb.TableName, root doltdb.RootValue) (bool, error) {
-	if doltdb.HasDoltPrefix(tableName.Name) || !UseSearchPath || tableName.Schema == "dolt" {
+// IsSystemTable returns whether a table is a system table or not
+func IsSystemTable(ctx *sql.Context, tableName doltdb.TableName, root doltdb.RootValue) (bool, error) {
+	if tableName.Schema == "dolt" {
 		return true, nil
 	}
 
-	if tableName.Schema == "" {
-		schemasToSearch, err := SearchPath(ctx)
-		if err != nil {
-			return false, nil
+	schemasToSearch, err := SearchPath(ctx)
+	if err != nil {
+		return false, nil
+	}
+	for _, schemaName := range schemasToSearch {
+		if schemaName == "dolt" {
+			return true, nil
 		}
-		for _, schemaName := range schemasToSearch {
-			if schemaName != "dolt" {
-				tablesInSchema, err := root.GetTableNames(ctx, schemaName)
-				if err != nil {
-					return false, err
-				}
-				for _, table := range tablesInSchema {
-					if table == tableName.Name {
-						return false, nil
-					}
-				}
-			}
 
-			if schemaName == "dolt" {
-				return true, nil
+		tablesInSchema, err := root.GetTableNames(ctx, schemaName)
+		if err != nil {
+			return false, err
+		}
+		for _, table := range tablesInSchema {
+			if strings.EqualFold(table, tableName.Name) {
+				return false, nil
 			}
 		}
 	}