diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0a130cb8481..92d09e5c5f7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ avro = "1.11.3"
 awssdk = "2.24.5"
 # See dependency matrix for particular gRPC versions at https://github.com/grpc/grpc-java/blob/master/SECURITY.md#netty
 boringssl = "2.0.61.Final"
-calcite = "1.36.0"
+calcite = "1.37.0"
 classgraph = "4.8.165"
 commons-compress = "1.26.0"
 commons-io = "2.11.0"
diff --git a/sql/build.gradle b/sql/build.gradle
index a041810df00..acd6ceedc75 100644
--- a/sql/build.gradle
+++ b/sql/build.gradle
@@ -9,13 +9,6 @@ description = 'The Deephaven SQL parser'
 dependencies {
     api project(':qst')
     implementation libs.calcite.core
-    constraints {
-        // This constraint can be removed once calcite-core has next release and we can
-        // pick up the fixed dependency transitively.
-        implementation('com.jayway.jsonpath:json-path:2.9.0') {
-            because 'json-path Out-of-bounds Write vulnerability, CVE-2023-51074'
-        }
-    }
 
     compileOnly project(':util-immutables')
     annotationProcessor libs.immutables.value
diff --git a/sql/src/main/java/io/deephaven/sql/RexVisitorBase.java b/sql/src/main/java/io/deephaven/sql/RexVisitorBase.java
index dab3dee61cb..574d1b40f65 100644
--- a/sql/src/main/java/io/deephaven/sql/RexVisitorBase.java
+++ b/sql/src/main/java/io/deephaven/sql/RexVisitorBase.java
@@ -8,6 +8,8 @@
 import org.apache.calcite.rex.RexDynamicParam;
 import org.apache.calcite.rex.RexFieldAccess;
 import org.apache.calcite.rex.RexInputRef;
+import org.apache.calcite.rex.RexLambda;
+import org.apache.calcite.rex.RexLambdaRef;
 import org.apache.calcite.rex.RexLiteral;
 import org.apache.calcite.rex.RexLocalRef;
 import org.apache.calcite.rex.RexNode;
@@ -79,6 +81,16 @@ public T visitPatternFieldRef(RexPatternFieldRef fieldRef) {
         throw unsupported(fieldRef);
     }
 
+    @Override
+    public T visitLambda(RexLambda fieldRef) {
+        throw unsupported(fieldRef);
+    }
+
+    @Override
+    public T visitLambdaRef(RexLambdaRef fieldRef) {
+        throw unsupported(fieldRef);
+    }
+
     private UnsupportedOperationException unsupported(RexNode node) {
         return new UnsupportedOperationException(String.format("%s: %s", getClass().getName(), node.toString()));
     }