support multi-inherit #2738
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -331,85 +331,136 @@ func assignColumnIndexesInSchema(schema sql.Schema) sql.Schema { | |
| return newSch | ||
| } | ||
|
|
||
| func (b *Builder) getIndexDefs(table sql.Table) sql.IndexDefs { | ||
| idxTbl, isIdxTbl := table.(sql.IndexAddressableTable) | ||
| if !isIdxTbl { | ||
| return nil | ||
| } | ||
| var idxDefs sql.IndexDefs | ||
| idxs, err := idxTbl.GetIndexes(b.ctx) | ||
| if err != nil { | ||
| b.handleErr(err) | ||
| } | ||
| for _, idx := range idxs { | ||
| if idx.IsGenerated() { | ||
| continue | ||
| } | ||
| constraint := sql.IndexConstraint_None | ||
| if idx.IsUnique() { | ||
| if idx.ID() == "PRIMARY" { | ||
| constraint = sql.IndexConstraint_Primary | ||
| } else { | ||
| constraint = sql.IndexConstraint_Unique | ||
| } | ||
| } | ||
| columns := make([]sql.IndexColumn, len(idx.Expressions())) | ||
| for i, col := range idx.Expressions() { | ||
| // TODO: find a better way to get only the column name if the table is present | ||
| col = strings.TrimPrefix(col, idxTbl.Name()+".") | ||
| columns[i] = sql.IndexColumn{Name: col} | ||
| } | ||
| idxDefs = append(idxDefs, &sql.IndexDef{ | ||
| Name: idx.ID(), | ||
| Storage: sql.IndexUsing_Default, | ||
| Constraint: constraint, | ||
| Columns: columns, | ||
| Comment: idx.Comment(), | ||
| }) | ||
| } | ||
| return idxDefs | ||
| } | ||
|
|
||
| func (b *Builder) buildCreateTableLike(inScope *scope, ct *ast.DDL) *scope { | ||
| database := b.resolveDbForTable(ct.Table) | ||
| newTableName := strings.ToLower(ct.Table.Name.String()) | ||
|
|
||
| var pkSch sql.PrimaryKeySchema | ||
| var coll sql.CollationID | ||
| var comment string | ||
| outScope := inScope.push() | ||
| if ct.TableSpec != nil { | ||
| pkSch, coll, _ = b.tableSpecToSchema(inScope, outScope, database, strings.ToLower(ct.Table.Name.String()), ct.TableSpec, false) | ||
| } | ||
|
|
||
| var ok bool | ||
| var pkOrdinals []int | ||
| var newSch sql.Schema | ||
| newSchMap := make(map[string]struct{}) | ||
| var idxDefs sql.IndexDefs | ||
| var checkDefs []*sql.CheckConstraint | ||
| for _, likeTable := range ct.OptLike.LikeTables { | ||
| outScope, ok = b.buildTablescan(outScope, likeTable, nil) | ||
| if !ok { | ||
| b.handleErr(sql.ErrTableNotFound.New(likeTable.Name.String())) | ||
| } | ||
| lTable, isResTbl := outScope.node.(*plan.ResolvedTable) | ||
| if !isResTbl { | ||
| err := fmt.Errorf("expected resolved table: %s", likeTable.Name.String()) | ||
| b.handleErr(err) | ||
| } | ||
|
|
||
| if coll == sql.Collation_Unspecified { | ||
| coll = lTable.Collation() | ||
| } | ||
|
|
||
| if comment == "" { | ||
| comment = lTable.Comment() | ||
| } | ||
|
|
||
| schOff := len(newSch) | ||
| hasSkippedCols := false | ||
| for _, col := range lTable.Schema() { | ||
| newCol := *col | ||
| name := strings.ToLower(newCol.Name) | ||
| if _, ok := newSchMap[name]; ok { | ||
| // TODO: throw warning | ||
| hasSkippedCols = true | ||
| continue | ||
| } | ||
| newSchMap[name] = struct{}{} | ||
| newCol.Source = newTableName | ||
| newSch = append(newSch, &newCol) | ||
| } | ||
|
|
||
| // if a column was skipped due to duplicates, don't copy over PK ords, idxDefs, or checkDefs | ||
| // since they might be incorrect | ||
| if hasSkippedCols { | ||
| continue | ||
| } | ||
|
|
||
| // Copy over primary key schema ordinals | ||
| if pkTable, isPkTable := lTable.Table.(sql.PrimaryKeyTable); isPkTable { | ||
| for _, pkOrd := range pkTable.PrimaryKeySchema().PkOrdinals { | ||
| pkOrdinals = append(pkOrdinals, schOff+pkOrd) | ||
| } | ||
| } | ||
|
|
||
| // Load index definitions | ||
| idxDefs = append(idxDefs, b.getIndexDefs(lTable.Table)...) | ||
|
|
||
| // Load check constraints | ||
| newCheckDefs := b.loadChecksFromTable(outScope, lTable.Table) | ||
| for _, check := range newCheckDefs { | ||
| // Prevent a name collision between old and new checks. | ||
| // New check name will be assigned a name during building. | ||
| check.Name = "" | ||
| } | ||
| checkDefs = append(checkDefs, newCheckDefs...) | ||
| } | ||
|
|
||
| var hasSkippedCols bool | ||
| for _, col := range pkSch.Schema { | ||
|
There was a problem hiding this comment. is explicit schema not incompatible with the LIKE list? There was a problem hiding this comment. do we have tests for this? |
||
| name := strings.ToLower(col.Name) | ||
| if _, ok := newSchMap[name]; ok { | ||
| // TODO: throw warning | ||
| hasSkippedCols = true | ||
| continue | ||
| } | ||
| newSch = append(newSch, col) | ||
| } | ||
| if !hasSkippedCols { | ||
| for _, pkOrd := range pkSch.PkOrdinals { | ||
| pkOrdinals = append(pkOrdinals, len(newSch)+pkOrd) | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -420,13 +471,13 @@ func (b *Builder) buildCreateTableLike(inScope *scope, ct *ast.DDL) *scope { | |
| Schema: pkSchema, | ||
| IdxDefs: idxDefs, | ||
| ChDefs: checkDefs, | ||
| Collation: coll, | ||
| Comment: comment, | ||
| } | ||
|
|
||
| b.qFlags.Set(sql.QFlagSetDatabase) | ||
|
|
||
| outScope.setTableAlias(newTableName) | ||
|
There was a problem hiding this comment. I think this is probably incorrect strictly speaking, as you'll only have the columns in the last table in the list in this scope. Not sure when it matters though. @max-hoffman ? There was a problem hiding this comment. it's definitely an abuse of the model...a more reasonable pass might accumulate the table cols into a top-level output scope or return an empty scope |
||
| outScope.node = plan.NewCreateTable(database, newTableName, ct.IfNotExists, ct.Temporary, tableSpec) | ||
| return outScope | ||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
are the semantics really this simple? seems like you'd need way more testing to figure out correct behavior