Skip to content

Commit 7b10a53

Browse files
authored
Merge pull request #9131 from dolthub/fulghum-b02d6d57
[auto-bump] [no-release-notes] dependency by fulghum
2 parents 5b9f7f3 + e563198 commit 7b10a53

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

go/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ require (
6060
github.com/creasty/defaults v1.6.0
6161
github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12
6262
github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
63-
github.com/dolthub/go-mysql-server v0.19.1-0.20250418000153-af677a1ae566
63+
github.com/dolthub/go-mysql-server v0.19.1-0.20250418184029-b02d6d577682
6464
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63
6565
github.com/esote/minmaxheap v1.0.0
6666
github.com/goccy/go-json v0.10.2

go/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,8 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U=
221221
github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0=
222222
github.com/dolthub/go-icu-regex v0.0.0-20250327004329-6799764f2dad h1:66ZPawHszNu37VPQckdhX1BPPVzREsGgNxQeefnlm3g=
223223
github.com/dolthub/go-icu-regex v0.0.0-20250327004329-6799764f2dad/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA=
224-
github.com/dolthub/go-mysql-server v0.19.1-0.20250418000153-af677a1ae566 h1:/OQR7jwfvt2z3J85bYA9i7ed+WGrRZNJqz42E64kyzE=
225-
github.com/dolthub/go-mysql-server v0.19.1-0.20250418000153-af677a1ae566/go.mod h1:AK7fdF0U5kK492FJ1Q260hgs2pHYS8psEXbtcH5ep5A=
224+
github.com/dolthub/go-mysql-server v0.19.1-0.20250418184029-b02d6d577682 h1:c/DukYN5vohc/VIi+0nK8S6XNuTpN04OZTmG8V1OTDY=
225+
github.com/dolthub/go-mysql-server v0.19.1-0.20250418184029-b02d6d577682/go.mod h1:AK7fdF0U5kK492FJ1Q260hgs2pHYS8psEXbtcH5ep5A=
226226
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI=
227227
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q=
228228
github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE=

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)