fix st_intersectsextent/st_intersects_extent confusion and format

Author: Maxxen

src/spatial/index/rtree/rtree_index_plan_scan.cpp

@@ -218,7 +218,7 @@ class RTreeIndexScanOptimizer : public OptimizerExtension {
 
 		unordered_set<string> spatial_predicates = {
 		    "ST_Equals",   "ST_Intersects", "ST_Touches",   "ST_Crosses",          "ST_Within", "ST_Contains",
-		    "ST_Overlaps", "ST_Covers",     "ST_CoveredBy", "ST_ContainsProperly", "&&",        "ST_IntersectsExtent"};
+		    "ST_Overlaps", "ST_Covers",     "ST_CoveredBy", "ST_ContainsProperly", "&&",        "ST_Intersects_Extent"};
 
 		table_info.BindIndexes(context, RTreeIndex::TYPE_NAME);
 

src/spatial/modules/main/spatial_functions_scalar.cpp

@@ -6481,10 +6481,10 @@ struct ST_Intersects {
 };
 
 //======================================================================================================================
-// ST_IntersectsExtent
+// ST_Intersects_Extent
 //======================================================================================================================
 
-struct ST_IntersectsExtent {
+struct ST_Intersects_Extent {
 
 	//------------------------------------------------------------------------------------------------------------------
 	// GEOMETRY
@@ -9527,7 +9527,7 @@ void RegisterSpatialScalarFunctions(ExtensionLoader &loader) {
 	ST_InteriorRingN::Register(loader);
 	ST_InterpolatePoint::Register(loader);
 	ST_Intersects::Register(loader);
-	ST_IntersectsExtent::Register(loader);
+	ST_Intersects_Extent::Register(loader);
 	ST_IsClosed::Register(loader);
 	ST_IsEmpty::Register(loader);
 	ST_Length::Register(loader);

src/spatial/modules/proj/proj_module.cpp

@@ -223,7 +223,7 @@ struct ST_Transform {
 		}
 
 		static void Serialize(Serializer &serializer, const optional_ptr<FunctionData> bind_data_p,
-				  const ScalarFunction &function) {
+		                      const ScalarFunction &function) {
 			auto &bind_data = bind_data_p->Cast<TypedBindData>();
 			serializer.WritePropertyWithDefault(100, "normalize", bind_data.normalize);
 			serializer.WritePropertyWithDefault(101, "source", bind_data.source_crs);
@@ -325,7 +325,6 @@ struct ST_Transform {
 		return std::move(result);
 	}
 
-
 	//------------------------------------------------------------------------------------------------------------------
 	// Local State
 	//------------------------------------------------------------------------------------------------------------------

src/spatial/operators/spatial_join_optimizer.cpp

@@ -16,26 +16,37 @@ namespace duckdb {
 
 // All of these imply bounding box intersection
 static const case_insensitive_set_t spatial_predicate_map = {
-    "&&",           "ST_IntersectsExtent", "ST_Equals",         "ST_Intersects", "ST_Touches",
-    "ST_Crosses",   "ST_Within",           "ST_Contains",       "ST_Overlaps",   "ST_Covers",
-    "ST_CoveredBy", "ST_ContainsProperly", "ST_WithinProperly", "ST_DWithin",
+    "&&",
+    "ST_Intersects_Extent",
+    "ST_Equals",
+    "ST_Intersects",
+    "ST_Touches",
+    "ST_Crosses",
+    "ST_Within",
+    "ST_Contains",
+    "ST_Overlaps",
+    "ST_Covers",
+    "ST_CoveredBy",
+    "ST_ContainsProperly",
+    "ST_WithinProperly",
+    "ST_DWithin",
 };
 
 static const case_insensitive_map_t<string> spatial_predicate_inverse_map = {
     {"ST_Equals", "ST_Equals"},
-    {"&&", "&&"},                                   // Symmetric
-    {"ST_IntersectsExtent", "ST_IntersectsExtent"}, // Symmetric
-    {"ST_Intersects", "ST_Intersects"},             // Symmetric
-    {"ST_Touches", "ST_Touches"},                   // Symmetric
-    {"ST_Crosses", "ST_Crosses"},                   // Symmetric
-    {"ST_Within", "ST_Contains"},                   // Inverse
-    {"ST_Contains", "ST_Within"},                   // Inverse
-    {"ST_Overlaps", "ST_Overlaps"},                 // Symmetric
-    {"ST_Covers", "ST_CoveredBy"},                  // Inverse
-    {"ST_CoveredBy", "ST_Covers"},                  // Inverse
-    {"ST_WithinProperly", "ST_ContainsProperly"},   // Inverse
-    {"ST_ContainsProperly", "ST_WithinProperly"},   // Inverse
-    {"ST_DWithin", "ST_DWithin"},                   // Symmetric (when distance is constant)
+    {"&&", "&&"},                                     // Symmetric
+    {"ST_Intersects_Extent", "ST_Intersects_Extent"}, // Symmetric
+    {"ST_Intersects", "ST_Intersects"},               // Symmetric
+    {"ST_Touches", "ST_Touches"},                     // Symmetric
+    {"ST_Crosses", "ST_Crosses"},                     // Symmetric
+    {"ST_Within", "ST_Contains"},                     // Inverse
+    {"ST_Contains", "ST_Within"},                     // Inverse
+    {"ST_Overlaps", "ST_Overlaps"},                   // Symmetric
+    {"ST_Covers", "ST_CoveredBy"},                    // Inverse
+    {"ST_CoveredBy", "ST_Covers"},                    // Inverse
+    {"ST_WithinProperly", "ST_ContainsProperly"},     // Inverse
+    {"ST_ContainsProperly", "ST_WithinProperly"},     // Inverse
+    {"ST_DWithin", "ST_DWithin"},                     // Symmetric (when distance is constant)
 };
 
 static bool HasInversePredicate(const string &func_name) {