Skip to content

Commit e563198

Browse files
committed
Merge branch 'fulghum/fk_ref_actions' into fulghum-b02d6d57
2 parents 48cbd25 + 0f045d8 commit e563198

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

go/libraries/doltcore/doltdb/foreign_key_coll.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ const (
8383
ForeignKeyReferentialAction_NoAction
8484
ForeignKeyReferentialAction_Restrict
8585
ForeignKeyReferentialAction_SetNull
86+
ForeignKeyReferentialAction_SetDefault
8687
)
8788

8889
// ForeignKey is the complete, internal representation of a Foreign Key.
@@ -771,6 +772,8 @@ func (refOp ForeignKeyReferentialAction) String() string {
771772
return "RESTRICT"
772773
case ForeignKeyReferentialAction_SetNull:
773774
return "SET NULL"
775+
case ForeignKeyReferentialAction_SetDefault:
776+
return "SET DEFAULT"
774777
default:
775778
return "INVALID"
776779
}
@@ -786,6 +789,8 @@ func (refOp ForeignKeyReferentialAction) ReducedString() string {
786789
return "CASCADE"
787790
case ForeignKeyReferentialAction_SetNull:
788791
return "SET NULL"
792+
case ForeignKeyReferentialAction_SetDefault:
793+
return "SET DEFAULT"
789794
default:
790795
return "INVALID"
791796
}

go/libraries/doltcore/sqle/tables.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2998,6 +2998,8 @@ func toReferentialAction(opt doltdb.ForeignKeyReferentialAction) sql.ForeignKeyR
29982998
return sql.ForeignKeyReferentialAction_Restrict
29992999
case doltdb.ForeignKeyReferentialAction_SetNull:
30003000
return sql.ForeignKeyReferentialAction_SetNull
3001+
case doltdb.ForeignKeyReferentialAction_SetDefault:
3002+
return sql.ForeignKeyReferentialAction_SetDefault
30013003
default:
30023004
panic(fmt.Sprintf("Unhandled foreign key referential action %v", opt))
30033005
}
@@ -3016,7 +3018,7 @@ func ParseFkReferentialAction(refOp sql.ForeignKeyReferentialAction) (doltdb.For
30163018
case sql.ForeignKeyReferentialAction_SetNull:
30173019
return doltdb.ForeignKeyReferentialAction_SetNull, nil
30183020
case sql.ForeignKeyReferentialAction_SetDefault:
3019-
return doltdb.ForeignKeyReferentialAction_DefaultAction, sql.ErrForeignKeySetDefault.New()
3021+
return doltdb.ForeignKeyReferentialAction_SetDefault, nil
30203022
default:
30213023
return doltdb.ForeignKeyReferentialAction_DefaultAction, fmt.Errorf("unknown foreign key referential action: %v", refOp)
30223024
}

0 commit comments

Comments
 (0)