bugfix: protect against nil exceptions

Signed-off-by: Andres Taylor <andres@planetscale.com>
vitessio · Dec 18, 2024 · 3abdf60 · 3abdf60
1 parent 1e7fbe3
commit 3abdf60
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/go/vt/vtgate/scatter_conn.go b/go/vt/vtgate/scatter_conn.go
@@ -188,8 +188,13 @@ func (stc *ScatterConn) ExecuteMultiShard(
 				opts = session.Session.Options
 			}
 
-			// TODO reset this?
-			opts.FetchLastInsertId = fetchLastInsertID
+			if fetchLastInsertID {
+				if opts == nil {
+					opts = &querypb.ExecuteOptions{FetchLastInsertId: fetchLastInsertID}
+				} else {
+					opts.FetchLastInsertId = fetchLastInsertID
+				}
+			}
 
 			if autocommit {
 				// As this is auto-commit, the transactionID is supposed to be zero.
@@ -410,7 +415,11 @@ func (stc *ScatterConn) StreamExecuteMulti(
 			}
 
 			if fetchLastInsertID {
-				opts.FetchLastInsertId = true
+				if opts == nil {
+					opts = &querypb.ExecuteOptions{FetchLastInsertId: fetchLastInsertID}
+				} else {
+					opts.FetchLastInsertId = fetchLastInsertID
+				}
 			}
 
 			if autocommit {