Skip to content

Commit

Permalink
Merge pull request #8073 from dolthub/daylon/index-schema
Browse files Browse the repository at this point in the history 
Added schema to index creation
  • Loading branch information
@Hydrocharged
Hydrocharged committed Jun 26, 2024
2 parents 45d6b0c + b40bfe8 commit 0c4b3f9
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 27 deletions.
18 changes: 2 additions & 16 deletions go/libraries/doltcore/sqle/database.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -722,26 +722,12 @@ func (db Database) getTable(ctx *sql.Context, root doltdb.RootValue, tableName s
// case-insensitive manner. The table is returned along with its case-sensitive matched name. An error is returned if
// no such table exists.
func (db Database) resolveUserTable(ctx *sql.Context, root doltdb.RootValue, tableName string) (doltdb.TableName, *doltdb.Table, bool, error) {
var tbl *doltdb.Table
var tblName doltdb.TableName
var tblExists bool

// TODO: dolt_schemas needs work to be compatible with multiple schemas
if resolve.UseSearchPath && db.schemaName == "" && !doltdb.HasDoltPrefix(tableName) {
var err error
tblName, tbl, tblExists, err = resolve.TableWithSearchPath(ctx, root, tableName)
if err != nil {
return doltdb.TableName{}, nil, false, err
}
return resolve.TableWithSearchPath(ctx, root, tableName)
} else {
var err error
tblName, tbl, tblExists, err = db.tableInsensitive(ctx, root, tableName)
if err != nil {
return doltdb.TableName{}, nil, false, err
}
return db.tableInsensitive(ctx, root, tableName)
}

return tblName, tbl, tblExists, nil
}

// tableInsensitive returns the name of this table in the root given with the db's schema name, if it exists.
Expand Down
21 changes: 10 additions & 11 deletions go/libraries/doltcore/sqle/tables.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -887,7 +887,7 @@ func (t *WritableDoltTable) Truncate(ctx *sql.Context) (int, error) {
if err != nil {
return 0, err
}
newRoot, err := root.PutTable(ctx, doltdb.TableName{Name: t.tableName}, newTable)
newRoot, err := root.PutTable(ctx, doltdb.TableName{Name: t.tableName, Schema: t.db.schemaName}, newTable)
if err != nil {
return 0, err
}
Expand Down Expand Up @@ -1504,7 +1504,7 @@ func (t *AlterableDoltTable) AddColumn(ctx *sql.Context, column *sql.Column, ord
ait.AddNewTable(t.tableName)
}

newRoot, err := root.PutTable(ctx, doltdb.TableName{Name: t.tableName}, updatedTable)
newRoot, err := root.PutTable(ctx, doltdb.TableName{Name: t.tableName, Schema: t.db.schemaName}, updatedTable)
if err != nil {
return err
}
Expand Down Expand Up @@ -1700,7 +1700,7 @@ func (t *AlterableDoltTable) RewriteInserter(
return nil, err
}

newRoot, err := ws.WorkingRoot().PutTable(ctx, doltdb.TableName{Name: t.Name()}, dt)
newRoot, err := ws.WorkingRoot().PutTable(ctx, doltdb.TableName{Name: t.Name(), Schema: t.db.schemaName}, dt)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -2234,7 +2234,7 @@ func (t *AlterableDoltTable) ModifyColumn(ctx *sql.Context, columnName string, c
}
}

newRoot, err := root.PutTable(ctx, doltdb.TableName{Name: t.tableName}, updatedTable)
newRoot, err := root.PutTable(ctx, doltdb.TableName{Name: t.tableName, Schema: t.db.schemaName}, updatedTable)
if err != nil {
return err
}
Expand Down Expand Up @@ -2354,7 +2354,7 @@ func (t *AlterableDoltTable) DropIndex(ctx *sql.Context, indexName string) error
if err != nil {
return err
}
newRoot, err := root.PutTable(ctx, doltdb.TableName{Name: t.tableName}, newTable)
newRoot, err := root.PutTable(ctx, doltdb.TableName{Name: t.tableName, Schema: t.db.schemaName}, newTable)
if err != nil {
return err
}
Expand Down Expand Up @@ -2394,7 +2394,7 @@ func (t *AlterableDoltTable) RenameIndex(ctx *sql.Context, fromIndexName string,
if err != nil {
return err
}
newRoot, err := root.PutTable(ctx, doltdb.TableName{Name: t.tableName}, newTable)
newRoot, err := root.PutTable(ctx, doltdb.TableName{Name: t.tableName, Schema: t.db.schemaName}, newTable)
if err != nil {
return err
}
Expand Down Expand Up @@ -2489,13 +2489,12 @@ func (t *AlterableDoltTable) createIndex(ctx *sql.Context, idx sql.IndexDef, key
return err
}
}
newRoot, err := root.PutTable(ctx, doltdb.TableName{Name: t.tableName}, ret.NewTable)
newRoot, err := root.PutTable(ctx, doltdb.TableName{Name: t.tableName, Schema: t.db.schemaName}, ret.NewTable)
if err != nil {
return err
}

err = t.setRoot(ctx, newRoot)

if err != nil {
return err
}
Expand Down Expand Up @@ -3010,7 +3009,7 @@ func (t *AlterableDoltTable) CreateCheck(ctx *sql.Context, check *sql.CheckDefin
return err
}

newRoot, err := root.PutTable(ctx, doltdb.TableName{Name: t.tableName}, newTable)
newRoot, err := root.PutTable(ctx, doltdb.TableName{Name: t.tableName, Schema: t.db.schemaName}, newTable)
if err != nil {
return err
}
Expand Down Expand Up @@ -3057,7 +3056,7 @@ func (t *AlterableDoltTable) DropCheck(ctx *sql.Context, chName string) error {
return err
}

newRoot, err := root.PutTable(ctx, doltdb.TableName{Name: t.tableName}, newTable)
newRoot, err := root.PutTable(ctx, doltdb.TableName{Name: t.tableName, Schema: t.db.schemaName}, newTable)
if err != nil {
return err
}
Expand Down Expand Up @@ -3101,7 +3100,7 @@ func (t *AlterableDoltTable) ModifyDefaultCollation(ctx *sql.Context, collation
if err != nil {
return err
}
newRoot, err := root.PutTable(ctx, doltdb.TableName{Name: t.tableName}, newTable)
newRoot, err := root.PutTable(ctx, doltdb.TableName{Name: t.tableName, Schema: t.db.schemaName}, newTable)
if err != nil {
return err
}
Expand Down

0 comments on commit 0c4b3f9

Please sign in to comment.