mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-20 02:24:58 -05:00
Code Issues Packages Projects Releases 156 Wiki Activity

some feedback

Browse Source
This commit is contained in:
James Cor
2022-10-27 10:49:37 -07:00
parent a9b0e28b91
commit ad966508a3
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
go/libraries/doltcore/doltdb/foreign_key_coll.go
View File

@@ -183,7 +183,7 @@ func (fk ForeignKey) ValidateReferencedTableSchema(sch schema.Schema) error {
fk.Name, fk.ReferencedTableName)
}
}
if (fk.ReferencedTableIndex != "" && !sch.Indexes().Contains(fk.ReferencedTableIndex)) || (fk.ReferencedTableIndex == "" && sch.GetPKCols().Size() == 0) {
if (fk.ReferencedTableIndex != "" && !sch.Indexes().Contains(fk.ReferencedTableIndex)) || (fk.ReferencedTableIndex == "" && sch.GetPKCols().Size() >= len(fk.ReferencedTableColumns)) {
return fmt.Errorf("foreign key `%s` has entered an invalid state, referenced table `%s` is missing the index `%s`",
fk.Name, fk.ReferencedTableName, fk.ReferencedTableIndex)
}
@@ -203,7 +203,7 @@ func (fk ForeignKey) ValidateTableSchema(sch schema.Schema) error {
return fmt.Errorf("foreign key `%s` has entered an invalid state, table `%s` has unexpected schema", fk.Name, fk.TableName)
}
}
if (fk.TableIndex != "" && !sch.Indexes().Contains(fk.TableIndex)) || (fk.TableIndex == "" && sch.GetPKCols().Size() == 0) {
if (fk.TableIndex != "" && !sch.Indexes().Contains(fk.TableIndex)) || (fk.TableIndex == "" && sch.GetPKCols().Size() >= len(fk.TableColumns)) {
return fmt.Errorf("foreign key `%s` has entered an invalid state, table `%s` is missing the index `%s`",
fk.Name, fk.TableName, fk.TableIndex)
}

6
go/libraries/doltcore/schema/index.go
View File

@@ -69,16 +69,16 @@ type indexImpl struct {
}
func NewIndex(name string, tags, allTags []uint64, indexColl IndexCollection, props IndexProperties) Index {
var idxColl *indexCollectionImpl
var indexCollImpl *indexCollectionImpl
if indexColl != nil {
idxColl = indexColl.(*indexCollectionImpl)
indexCollImpl = indexColl.(*indexCollectionImpl)
}
return &indexImpl{
name: name,
tags: tags,
allTags: allTags,
indexColl: idxColl,
indexColl: indexCollImpl,
isUnique: props.IsUnique,
isUserDefined: props.IsUserDefined,
comment: props.Comment,