Apache DataFusion SQL Query Engine
[sql]: remove deprecated TableReference re-exports (#23102)
Megakaizoed91337ae208
diff --git a/datafusion/core/src/execution/session_state.rs b/datafusion/core/src/execution/session_state.rsindex ad525ac7b1..f1f5465212 100644--- a/datafusion/core/src/execution/session_state.rs+++ b/datafusion/core/src/execution/session_state.rs@@ -2354,13 +2354,11 @@ mod tests {use crate::logical_expr::{AggregateUDF, ScalarUDF, TableSource, WindowUDF};use crate::physical_plan::ExecutionPlan;use crate::sql::planner::ContextProvider;- use crate::sql::{ResolvedTableReference, TableReference};use arrow::array::{ArrayRef, Int32Array, RecordBatch, StringArray};use arrow::datatypes::{DataType, Field, Schema};use datafusion_catalog::MemoryCatalogProviderList;- use datafusion_common::DFSchema;- use datafusion_common::Result;use datafusion_common::config::Dialect;+ use datafusion_common::{DFSchema, ResolvedTableReference, Result, TableReference};use datafusion_execution::config::SessionConfig;use datafusion_expr::Expr;use datafusion_expr::HigherOrderUDF;diff --git a/datafusion/optimizer/src/analyzer/type_coercion.rs b/datafusion/optimizer/src/analyzer/type_coercion.rsindex 032fe25240..2503fc8072 100644--- a/datafusion/optimizer/src/analyzer/type_coercion.rs+++ b/datafusion/optimizer/src/analyzer/type_coercion.rs@@ -1322,7 +1322,9 @@ mod test {use crate::assert_analyzed_plan_with_config_eq_snapshot;use datafusion_common::config::ConfigOptions;use datafusion_common::tree_node::{TransformedResult, TreeNode};- use datafusion_common::{DFSchema, DFSchemaRef, Result, ScalarValue, Spans};+ use datafusion_common::{+ DFSchema, DFSchemaRef, Result, ScalarValue, Spans, TableReference,+ };use datafusion_expr::expr::{self, InSubquery, Like, ScalarFunction};use datafusion_expr::logical_plan::{EmptyRelation, Projection, Sort};use datafusion_expr::test::function_stub::avg_udaf;@@ -1333,7 +1335,6 @@ mod test {col, create_udaf, is_true, lit,};use datafusion_functions_aggregate::average::AvgAccumulator;- use datafusion_sql::TableReference;fn empty() -> Arc<LogicalPlan> {Arc::new(LogicalPlan::EmptyRelation(EmptyRelation {diff --git a/datafusion/sql/src/lib.rs b/datafusion/sql/src/lib.rsindex 7fef670933..95601acac2 100644--- a/datafusion/sql/src/lib.rs+++ b/datafusion/sql/src/lib.rs@@ -57,9 +57,4 @@ mod statement;pub mod unparser;pub mod utils;mod values;-#[deprecated(- since = "46.0.0",- note = "use datafusion_common::{ResolvedTableReference, TableReference}"-)]-pub use datafusion_common::{ResolvedTableReference, TableReference};pub use sqlparser;diff --git a/datafusion/sql/src/resolve.rs b/datafusion/sql/src/resolve.rsindex 955dbb8660..d1c172502f 100644--- a/datafusion/sql/src/resolve.rs+++ b/datafusion/sql/src/resolve.rs@@ -20,9 +20,9 @@ use std::ops::ControlFlow;use datafusion_common::{DataFusionError, Result};-use crate::TableReference;use crate::parser::{CopyToSource, CopyToStatement, Statement as DFStatement};use crate::planner::object_name_to_table_reference;+use datafusion_common::TableReference;use sqlparser::ast::*;// following constants are used in `resolve_table_references`diff --git a/datafusion/substrait/src/logical_plan/consumer/utils.rs b/datafusion/substrait/src/logical_plan/consumer/utils.rsindex c654cc0709..824c79452d 100644--- a/datafusion/substrait/src/logical_plan/consumer/utils.rs+++ b/datafusion/substrait/src/logical_plan/consumer/utils.rs@@ -18,12 +18,11 @@use crate::logical_plan::consumer::SubstraitConsumer;use datafusion::arrow::datatypes::{DataType, Field, Schema, TimeUnit, UnionFields};use datafusion::common::{- DFSchema, DFSchemaRef, exec_err, not_impl_err, substrait_datafusion_err,- substrait_err,+ DFSchema, DFSchemaRef, TableReference, exec_err, not_impl_err,+ substrait_datafusion_err, substrait_err,};use datafusion::logical_expr::expr::Sort;use datafusion::logical_expr::{Cast, Expr, ExprSchemable};-use datafusion::sql::TableReference;use std::collections::HashSet;use std::sync::Arc;use substrait::proto::SortField;@@ -570,12 +569,11 @@ pub(crate) mod tests {use crate::extensions::Extensions;use crate::logical_plan::consumer::DefaultSubstraitConsumer;use datafusion::arrow::datatypes::{DataType, Field, Fields, Schema};- use datafusion::common::DFSchema;+ use datafusion::common::{DFSchema, TableReference};use datafusion::error::Result;use datafusion::execution::SessionState;use datafusion::logical_expr::{Expr, col};use datafusion::prelude::SessionContext;- use datafusion::sql::TableReference;use std::collections::HashMap;use std::sync::{Arc, LazyLock};