From 9761da43a70fd812881b6b358c3aa1015eaf2ec2 Mon Sep 17 00:00:00 2001 From: Marko Grujic Date: Tue, 31 Dec 2024 09:55:32 +0100 Subject: [PATCH] Pin the nightly version to avoid slipping linting and compiler errors --- .github/workflows/ci.yml | 2 +- .github/workflows/nightly.yml | 4 ++-- src/context/mod.rs | 10 ++++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 54d2708d..f0c93d1e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,7 @@ jobs: - name: Install minimal nightly with clippy and rustfmt uses: dtolnay/rust-toolchain@master with: - toolchain: nightly + toolchain: nightly-2024-12-30 components: rustfmt, clippy - name: Install tool for formatting Cargo.toml files diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 4d4459d4..26befd84 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -43,8 +43,8 @@ jobs: - name: Checkout the repository uses: actions/checkout@v4 - run: | - rustup toolchain install nightly --profile minimal - rustup default nightly + rustup toolchain install nightly-2024-12-30 --profile minimal + rustup default nightly-2024-12-30 - uses: Swatinem/rust-cache@v2 with: diff --git a/src/context/mod.rs b/src/context/mod.rs index 91b6f1fe..03a912cc 100644 --- a/src/context/mod.rs +++ b/src/context/mod.rs @@ -152,7 +152,8 @@ impl SeafowlContext { &self, table_name: impl Into, ) -> Result { - let table_provider = self.inner.table_provider(table_name).await?; + let table_ref = table_name.into(); + let table_provider = self.inner.table_provider(table_ref.clone()).await?; let table_provider_any = table_provider.as_any(); if let Some(a) = table_provider_any.downcast_ref::() { @@ -163,7 +164,7 @@ impl SeafowlContext { } Err(DataFusionError::Execution( - "Table {table_name} not found".to_string(), + format!("Table {table_ref} not found").to_string(), )) } @@ -172,10 +173,11 @@ impl SeafowlContext { &self, table_name: impl Into, ) -> Result { - match self.get_lakehouse_table_provider(table_name).await? { + let table_ref = table_name.into(); + match self.get_lakehouse_table_provider(table_ref.clone()).await? { LakehouseTableProvider::Delta(delta_table) => Ok(delta_table), _ => Err(DataFusionError::Execution( - "Delta table {table_name} not found".to_string(), + format!("Delta table {table_ref} not found").to_string(), )), } }