Skip to content

Commit e2a9073

Browse files
Merge branch 'main' into dependabot/cargo/rand-0.9.1
2 parents 91f2357 + dd12c1c commit e2a9073

4 files changed

Lines changed: 20 additions & 17 deletions

File tree

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/src/sql/arrow_sql_gen/statement.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ pub struct InsertBuilder {
183183
}
184184

185185
pub fn use_json_insert_for_type<T: QueryBuilder + 'static>(
186-
data_type: &DataType,
187-
query_builder: &T,
186+
#[allow(unused_variables)] data_type: &DataType,
187+
#[allow(unused_variables)] query_builder: &T,
188188
) -> bool {
189189
#[cfg(feature = "sqlite")]
190190
{

core/src/sql/sql_provider_datafusion/federation.rs

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,25 @@ use datafusion::{
1313
arrow::datatypes::SchemaRef,
1414
error::{DataFusionError, Result as DataFusionResult},
1515
physical_plan::{stream::RecordBatchStreamAdapter, SendableRecordBatchStream},
16-
sql::{unparser::dialect::Dialect, TableReference},
16+
sql::{
17+
unparser::dialect::{DefaultDialect, Dialect},
18+
TableReference,
19+
},
1720
};
1821

1922
impl<T, P> SqlTable<T, P> {
23+
// Return the current memory location of the object as a unique identifier
24+
fn unique_id(&self) -> usize {
25+
std::ptr::from_ref(self) as usize
26+
}
27+
28+
fn arc_dialect(&self) -> Arc<dyn Dialect + Send + Sync> {
29+
match &self.dialect {
30+
Some(dialect) => Arc::clone(dialect),
31+
None => Arc::new(DefaultDialect {}),
32+
}
33+
}
34+
2035
fn create_federated_table_source(
2136
self: Arc<Self>,
2237
) -> DataFusionResult<Arc<dyn FederatedTableSource>> {

core/src/sql/sql_provider_datafusion/mod.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,6 @@ impl<T, P> SqlTable<T, P> {
156156
)?))
157157
}
158158

159-
// Return the current memory location of the object as a unique identifier
160-
fn unique_id(&self) -> usize {
161-
std::ptr::from_ref(self) as usize
162-
}
163-
164159
#[must_use]
165160
pub fn with_dialect(self, dialect: Arc<dyn Dialect + Send + Sync>) -> Self {
166161
Self {
@@ -185,13 +180,6 @@ impl<T, P> SqlTable<T, P> {
185180
None => &DefaultDialect {},
186181
}
187182
}
188-
189-
fn arc_dialect(&self) -> Arc<dyn Dialect + Send + Sync> {
190-
match &self.dialect {
191-
Some(dialect) => Arc::clone(dialect),
192-
None => Arc::new(DefaultDialect {}),
193-
}
194-
}
195183
}
196184

197185
#[async_trait]

0 commit comments

Comments
 (0)