From a94edc0a6dc64b0f1d333076c1154ce6dcaa09f2 Mon Sep 17 00:00:00 2001
From: Alan Cai <caialan@amazon.com>
Date: Mon, 31 Jul 2023 16:46:25 -0700
Subject: [PATCH] Add error catching before .expect() in name_resolver

---
 partiql-ast-passes/src/name_resolver.rs | 12 +++++++++++-
 partiql-conformance-tests/partiql-tests |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/partiql-ast-passes/src/name_resolver.rs b/partiql-ast-passes/src/name_resolver.rs
index 70596c51..edbd2a78 100644
--- a/partiql-ast-passes/src/name_resolver.rs
+++ b/partiql-ast-passes/src/name_resolver.rs
@@ -387,9 +387,19 @@ impl<'ast> Visitor<'ast> for NameResolver {
         self.enter_keyref();
         let id = *self.current_node();
 
+        if self
+            .enclosing_clause
+            .get(&EnclosingClause::FromLet)
+            .is_none()
+        {
+            self.errors.push(AstTransformError::IllegalState(
+                "group_key expects a FromLet enclosing clause".to_string(),
+            ))
+        }
+
         self.enclosing_clause
             .get(&EnclosingClause::FromLet)
-            .unwrap()
+            .expect("EnclosingClause::FromLet")
             .iter()
             .for_each(|enclosing_clause| {
                 self.in_scope
diff --git a/partiql-conformance-tests/partiql-tests b/partiql-conformance-tests/partiql-tests
index 8b543073..d23e0261 160000
--- a/partiql-conformance-tests/partiql-tests
+++ b/partiql-conformance-tests/partiql-tests
@@ -1 +1 @@
-Subproject commit 8b54307319bfa91b311ffcd9da0dfe2596bceba7
+Subproject commit d23e0261c08164a10c47f35e4f9727f83fb1008f