Apache DataFusion SQL Query Engine
Fix CTE reference resolution slt tests (#21049)
Jonah Gao85a34e93d969
diff --git a/datafusion/sqllogictest/src/test_context.rs b/datafusion/sqllogictest/src/test_context.rsindex 8bd0cabcb0..b286c43321 100644--- a/datafusion/sqllogictest/src/test_context.rs+++ b/datafusion/sqllogictest/src/test_context.rs@@ -98,9 +98,9 @@ impl TestContext {let file_name = relative_path.file_name().unwrap().to_str().unwrap();match file_name {- "cte_quoted_reference.slt" => {- info!("Registering strict catalog provider for CTE tests");- register_strict_orders_catalog(test_ctx.session_ctx());+ "cte.slt" => {+ info!("Registering strict schema provider for CTE tests");+ register_strict_schema_provider(test_ctx.session_ctx());}"information_schema_table_types.slt" => {info!("Registering local temporary table");@@ -178,10 +178,10 @@ impl TestContext {}// ==============================================================================-// Strict Catalog / Schema Provider (sqllogictest-only)+// Strict Schema Provider (sqllogictest-only)// ==============================================================================//-// The goal of `cte_quoted_reference.slt` is to exercise end-to-end query planning+// The goal of `StrictOrdersSchema` is to exercise end-to-end query planning// while detecting *unexpected* catalog lookups.//// Specifically, if DataFusion incorrectly treats a CTE reference (e.g. `"barbaz"`)@@ -192,26 +192,6 @@ impl TestContext {// This makes the "extra provider lookup" bug observable in an end-to-end test,// rather than being silently ignored by default providers that return `Ok(None)`// for unknown tables.--#[derive(Debug)]-struct StrictOrdersCatalog {- schema: Arc<dyn SchemaProvider>,-}--impl CatalogProvider for StrictOrdersCatalog {- fn as_any(&self) -> &dyn Any {- self- }-- fn schema_names(&self) -> Vec<String> {- vec!["public".to_string()]- }-- fn schema(&self, name: &str) -> Option<Arc<dyn SchemaProvider>> {- (name == "public").then(|| Arc::clone(&self.schema))- }-}-#[derive(Debug)]struct StrictOrdersSchema {orders: Arc<dyn TableProvider>,@@ -245,7 +225,7 @@ impl SchemaProvider for StrictOrdersSchema {}}-fn register_strict_orders_catalog(ctx: &SessionContext) {+fn register_strict_schema_provider(ctx: &SessionContext) {let schema = Arc::new(Schema::new(vec![Field::new("order_id",DataType::Int32,@@ -265,13 +245,14 @@ fn register_strict_orders_catalog(ctx: &SessionContext) {orders: Arc::new(orders),});- // Override the default "datafusion" catalog for this test file so that any- // unexpected lookup is caught immediately.- ctx.register_catalog(- "datafusion",- Arc::new(StrictOrdersCatalog {- schema: schema_provider,- }),+ let previous = ctx+ .catalog("datafusion")+ .expect("default catalog should exist")+ .register_schema("strict_schema", schema_provider)+ .expect("strict schema registration should succeed");+ assert!(+ previous.is_none(),+ "strict_schema unexpectedly already existed in datafusion catalog");}diff --git a/datafusion/sqllogictest/test_files/cte.slt b/datafusion/sqllogictest/test_files/cte.sltindex 65f694eb37..a0a541a826 100644--- a/datafusion/sqllogictest/test_files/cte.slt+++ b/datafusion/sqllogictest/test_files/cte.slt@@ -42,8 +42,6 @@ physical_planstatement error DataFusion error: Error during planning: WITH query name "a" specified more than onceWITH a AS (SELECT 1), a AS (SELECT 2) SELECT * FROM a;-statement ok-CREATE TABLE orders AS VALUES (1), (2);############ CTE Reference Resolution@@ -59,10 +57,14 @@ CREATE TABLE orders AS VALUES (1), (2);## Refs: https://github.com/apache/datafusion/issues/18932#-# NOTE: This test relies on a strict catalog/schema provider registered in+# NOTE: This test relies on a strict schema provider registered in# `datafusion/sqllogictest/src/test_context.rs` that provides only the `orders`# table and panics on unexpected lookups.+# Use the strict schema provider+statement ok+set datafusion.catalog.default_schema = "strict_schema";+statement okset datafusion.sql_parser.enable_ident_normalization = true;@@ -99,6 +101,17 @@ with barbaz as (select * from orders) select * from barbaz;12+# Reset to default configs+statement ok+set datafusion.sql_parser.enable_ident_normalization = true;++statement ok+set datafusion.catalog.default_schema = "public";++## CTE reference resolution tests end ##+++# Test disabling recursive CTEstatement okset datafusion.execution.enable_recursive_ctes = false;