chore: update lance dependency to v2.0.0-beta.10

2026-09-04 04:28:44 +00:00 · 2026-01-19 08:14:18 +00:00
53 changed files with 886 additions and 1290 deletions
@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "0.24.1"
+current_version = "0.23.1"
 parse = """(?x)
    (?P<major>0|[1-9]\\d*)\\.
    (?P<minor>0|[1-9]\\d*)\\.
@@ -75,13 +75,6 @@ jobs:
          VERSION="${VERSION#v}"
          BRANCH_NAME="codex/update-lance-${VERSION//[^a-zA-Z0-9]/-}"

-          # Use "chore" for beta/rc versions, "feat" for stable releases
-          if [[ "${VERSION}" == *beta* ]] || [[ "${VERSION}" == *rc* ]]; then
-            COMMIT_TYPE="chore"
-          else
-            COMMIT_TYPE="feat"
-          fi
-
          cat <<EOF >/tmp/codex-prompt.txt
          You are running inside the lancedb repository on a GitHub Actions runner. Update the Lance dependency to version ${VERSION} and prepare a pull request for maintainers to review.

@@ -91,10 +84,10 @@ jobs:
          3. After clippy succeeds, run "cargo fmt --all" to format the workspace.
          4. Ensure the repository is clean except for intentional changes. Inspect "git status --short" and "git diff" to confirm the dependency update and any required fixes.
          5. Create and switch to a new branch named "${BRANCH_NAME}" (replace any duplicated hyphens if necessary).
-          6. Stage all relevant files with "git add -A". Commit using the message "${COMMIT_TYPE}: update lance dependency to v${VERSION}".
+          6. Stage all relevant files with "git add -A". Commit using the message "chore: update lance dependency to v${VERSION}".
          7. Push the branch to origin. If the branch already exists, force-push your changes.
          8. env "GH_TOKEN" is available, use "gh" tools for github related operations like creating pull request.
-          9. Create a pull request targeting "main" with title "${COMMIT_TYPE}: update lance dependency to v${VERSION}". First, write the PR body to /tmp/pr-body.md using a heredoc (cat <<'EOF' > /tmp/pr-body.md). The body should summarize the dependency bump, clippy/fmt verification, and link the triggering tag (${TAG}). Then run "gh pr create --body-file /tmp/pr-body.md".
+          9. Create a pull request targeting "main" with title "chore: update lance dependency to v${VERSION}". In the body, summarize the dependency bump, clippy/fmt verification, and link the triggering tag (${TAG}).
          10. After creating the PR, display the PR URL, "git status --short", and a concise summary of the commands run and their results.

          Constraints:
@@ -48,8 +48,6 @@ jobs:
        run: cargo fmt --all -- --check
      - name: Run clippy
        run: cargo clippy --profile ci --workspace --tests --all-features -- -D warnings
-      - name: Run clippy (without remote feature)
-        run: cargo clippy --profile ci --workspace --tests -- -D warnings

  build-no-lock:
    runs-on: ubuntu-24.04
@@ -183,7 +181,7 @@ jobs:
    runs-on: ubuntu-24.04
    strategy:
      matrix:
-        msrv: ["1.88.0"] # This should match up with rust-version in Cargo.toml
+        msrv: ["1.78.0"] # This should match up with rust-version in Cargo.toml
    env:
      # Need up-to-date compilers for kernels
      CC: clang-18
@@ -214,6 +212,4 @@ jobs:
          cargo update -p aws-sdk-sts --precise 1.51.0
          cargo update -p home --precise 0.5.9
      - name: cargo +${{ matrix.msrv }} check
-        env:
-          RUSTUP_TOOLCHAIN: ${{ matrix.msrv }}
        run: cargo check --profile ci --workspace --tests --benches --all-features
@@ -12,42 +12,42 @@ repository = "https://github.com/lancedb/lancedb"
 description = "Serverless, low-latency vector database for AI applications"
 keywords = ["lancedb", "lance", "database", "vector", "search"]
 categories = ["database-implementations"]
-rust-version = "1.88.0"
+rust-version = "1.78.0"

 [workspace.dependencies]
-lance = { "version" = "=1.0.4", default-features = false, "tag" = "v1.0.4", "git" = "https://github.com/lance-format/lance.git" }
-lance-core = { "version" = "=1.0.4", "tag" = "v1.0.4", "git" = "https://github.com/lance-format/lance.git" }
-lance-datagen = { "version" = "=1.0.4", "tag" = "v1.0.4", "git" = "https://github.com/lance-format/lance.git" }
-lance-file = { "version" = "=1.0.4", "tag" = "v1.0.4", "git" = "https://github.com/lance-format/lance.git" }
-lance-io = { "version" = "=1.0.4", default-features = false, "tag" = "v1.0.4", "git" = "https://github.com/lance-format/lance.git" }
-lance-index = { "version" = "=1.0.4", "tag" = "v1.0.4", "git" = "https://github.com/lance-format/lance.git" }
-lance-linalg = { "version" = "=1.0.4", "tag" = "v1.0.4", "git" = "https://github.com/lance-format/lance.git" }
-lance-namespace = { "version" = "=1.0.4", "tag" = "v1.0.4", "git" = "https://github.com/lance-format/lance.git" }
-lance-namespace-impls = { "version" = "=1.0.4", default-features = false, "tag" = "v1.0.4", "git" = "https://github.com/lance-format/lance.git" }
-lance-table = { "version" = "=1.0.4", "tag" = "v1.0.4", "git" = "https://github.com/lance-format/lance.git" }
-lance-testing = { "version" = "=1.0.4", "tag" = "v1.0.4", "git" = "https://github.com/lance-format/lance.git" }
-lance-datafusion = { "version" = "=1.0.4", "tag" = "v1.0.4", "git" = "https://github.com/lance-format/lance.git" }
-lance-encoding = { "version" = "=1.0.4", "tag" = "v1.0.4", "git" = "https://github.com/lance-format/lance.git" }
-lance-arrow = { "version" = "=1.0.4", "tag" = "v1.0.4", "git" = "https://github.com/lance-format/lance.git" }
+lance = { "version" = "=2.0.0-beta.10", default-features = false, "tag" = "v2.0.0-beta.10", "git" = "https://github.com/lance-format/lance.git" }
+lance-core = { "version" = "=2.0.0-beta.10", "tag" = "v2.0.0-beta.10", "git" = "https://github.com/lance-format/lance.git" }
+lance-datagen = { "version" = "=2.0.0-beta.10", "tag" = "v2.0.0-beta.10", "git" = "https://github.com/lance-format/lance.git" }
+lance-file = { "version" = "=2.0.0-beta.10", "tag" = "v2.0.0-beta.10", "git" = "https://github.com/lance-format/lance.git" }
+lance-io = { "version" = "=2.0.0-beta.10", default-features = false, "tag" = "v2.0.0-beta.10", "git" = "https://github.com/lance-format/lance.git" }
+lance-index = { "version" = "=2.0.0-beta.10", "tag" = "v2.0.0-beta.10", "git" = "https://github.com/lance-format/lance.git" }
+lance-linalg = { "version" = "=2.0.0-beta.10", "tag" = "v2.0.0-beta.10", "git" = "https://github.com/lance-format/lance.git" }
+lance-namespace = { "version" = "=2.0.0-beta.10", "tag" = "v2.0.0-beta.10", "git" = "https://github.com/lance-format/lance.git" }
+lance-namespace-impls = { "version" = "=2.0.0-beta.10", default-features = false, "tag" = "v2.0.0-beta.10", "git" = "https://github.com/lance-format/lance.git" }
+lance-table = { "version" = "=2.0.0-beta.10", "tag" = "v2.0.0-beta.10", "git" = "https://github.com/lance-format/lance.git" }
+lance-testing = { "version" = "=2.0.0-beta.10", "tag" = "v2.0.0-beta.10", "git" = "https://github.com/lance-format/lance.git" }
+lance-datafusion = { "version" = "=2.0.0-beta.10", "tag" = "v2.0.0-beta.10", "git" = "https://github.com/lance-format/lance.git" }
+lance-encoding = { "version" = "=2.0.0-beta.10", "tag" = "v2.0.0-beta.10", "git" = "https://github.com/lance-format/lance.git" }
+lance-arrow = { "version" = "=2.0.0-beta.10", "tag" = "v2.0.0-beta.10", "git" = "https://github.com/lance-format/lance.git" }
 ahash = "0.8"
 # Note that this one does not include pyarrow
-arrow = { version = "56.2", optional = false }
-arrow-array = "56.2"
-arrow-data = "56.2"
-arrow-ipc = "56.2"
-arrow-ord = "56.2"
-arrow-schema = "56.2"
-arrow-select = "56.2"
-arrow-cast = "56.2"
+arrow = { version = "57.2", optional = false }
+arrow-array = "57.2"
+arrow-data = "57.2"
+arrow-ipc = "57.2"
+arrow-ord = "57.2"
+arrow-schema = "57.2"
+arrow-select = "57.2"
+arrow-cast = "57.2"
 async-trait = "0"
-datafusion = { version = "50.1", default-features = false }
-datafusion-catalog = "50.1"
-datafusion-common = { version = "50.1", default-features = false }
-datafusion-execution = "50.1"
-datafusion-expr = "50.1"
-datafusion-physical-plan = "50.1"
+datafusion = { version = "51.0", default-features = false }
+datafusion-catalog = "51.0"
+datafusion-common = { version = "51.0", default-features = false }
+datafusion-execution = "51.0"
+datafusion-expr = "51.0"
+datafusion-physical-plan = "51.0"
 env_logger = "0.11"
-half = { "version" = "2.6.0", default-features = false, features = [
+half = { "version" = "2.7.1", default-features = false, features = [
    "num-traits",
 ] }
 futures = "0"
@@ -59,7 +59,7 @@ rand = "0.9"
 snafu = "0.8"
 url = "2"
 num-traits = "0.2"
-regex = "1.10"
+regex = "1.12"
 lazy_static = "1"
 semver = "1.0.25"
 chrono = "0.4"
@@ -14,7 +14,7 @@ Add the following dependency to your `pom.xml`:
 <dependency>
    <groupId>com.lancedb</groupId>
    <artifactId>lancedb-core</artifactId>
-    <version>0.24.1</version>
+    <version>0.23.1</version>
 </dependency>
 ```

@@ -8,7 +8,7 @@
    <parent>
      <groupId>com.lancedb</groupId>
      <artifactId>lancedb-parent</artifactId>
-      <version>0.24.1-final.0</version>
+      <version>0.23.1-final.0</version>
      <relativePath>../pom.xml</relativePath>
    </parent>

@@ -6,7 +6,7 @@

    <groupId>com.lancedb</groupId>
    <artifactId>lancedb-parent</artifactId>
-    <version>0.24.1-final.0</version>
+    <version>0.23.1-final.0</version>
    <packaging>pom</packaging>
    <name>${project.artifactId}</name>
    <description>LanceDB Java SDK Parent POM</description>
@@ -1,7 +1,7 @@
 [package]
 name = "lancedb-nodejs"
 edition.workspace = true
-version = "0.24.1"
+version = "0.23.1"
 license.workspace = true
 description.workspace = true
 repository.workspace = true
@@ -538,35 +538,6 @@ export abstract class Table {
   *
   */
  abstract stats(): Promise<TableStatistics>;
-
-  /**
-   * Get the initial storage options that were passed in when opening this table.
-   *
-   * For dynamically refreshed options (e.g., credential vending), use
-   * {@link Table.latestStorageOptions}.
-   *
-   * Warning: This is an internal API and the return value is subject to change.
-   *
-   * @returns The storage options, or undefined if no storage options were configured.
-   */
-  abstract initialStorageOptions(): Promise<
-    Record<string, string> | null | undefined
-  >;
-
-  /**
-   * Get the latest storage options, refreshing from provider if configured.
-   *
-   * This method is useful for credential vending scenarios where storage options
-   * may be refreshed dynamically. If no dynamic provider is configured, this
-   * returns the initial static options.
-   *
-   * Warning: This is an internal API and the return value is subject to change.
-   *
-   * @returns The storage options, or undefined if no storage options were configured.
-   */
-  abstract latestStorageOptions(): Promise<
-    Record<string, string> | null | undefined
-  >;
 }

 export class LocalTable extends Table {
@@ -887,18 +858,6 @@ export class LocalTable extends Table {
    return await this.inner.stats();
  }

-  async initialStorageOptions(): Promise<
-    Record<string, string> | null | undefined
-  > {
-    return await this.inner.initialStorageOptions();
-  }
-
-  async latestStorageOptions(): Promise<
-    Record<string, string> | null | undefined
-  > {
-    return await this.inner.latestStorageOptions();
-  }
-
  mergeInsert(on: string | string[]): MergeInsertBuilder {
    on = Array.isArray(on) ? on : [on];
    return new MergeInsertBuilder(this.inner.mergeInsert(on), this.schema());
@@ -1,6 +1,6 @@
 {
 	"name": "@lancedb/lancedb-darwin-arm64",
-	"version": "0.24.1",
+	"version": "0.23.1",
 	"os": ["darwin"],
 	"cpu": ["arm64"],
 	"main": "lancedb.darwin-arm64.node",
@@ -1,6 +1,6 @@
 {
 	"name": "@lancedb/lancedb-darwin-x64",
-	"version": "0.24.1",
+	"version": "0.23.1",
 	"os": ["darwin"],
 	"cpu": ["x64"],
 	"main": "lancedb.darwin-x64.node",
@@ -1,6 +1,6 @@
 {
 	"name": "@lancedb/lancedb-linux-arm64-gnu",
-	"version": "0.24.1",
+	"version": "0.23.1",
 	"os": ["linux"],
 	"cpu": ["arm64"],
 	"main": "lancedb.linux-arm64-gnu.node",
@@ -1,6 +1,6 @@
 {
 	"name": "@lancedb/lancedb-linux-arm64-musl",
-	"version": "0.24.1",
+	"version": "0.23.1",
 	"os": ["linux"],
 	"cpu": ["arm64"],
 	"main": "lancedb.linux-arm64-musl.node",
@@ -1,6 +1,6 @@
 {
 	"name": "@lancedb/lancedb-linux-x64-gnu",
-	"version": "0.24.1",
+	"version": "0.23.1",
 	"os": ["linux"],
 	"cpu": ["x64"],
 	"main": "lancedb.linux-x64-gnu.node",
@@ -1,6 +1,6 @@
 {
 	"name": "@lancedb/lancedb-linux-x64-musl",
-	"version": "0.24.1",
+	"version": "0.23.1",
 	"os": ["linux"],
 	"cpu": ["x64"],
 	"main": "lancedb.linux-x64-musl.node",
@@ -1,6 +1,6 @@
 {
  "name": "@lancedb/lancedb-win32-arm64-msvc",
-  "version": "0.24.1",
+  "version": "0.23.1",
  "os": [
    "win32"
  ],
@@ -1,6 +1,6 @@
 {
 	"name": "@lancedb/lancedb-win32-x64-msvc",
-	"version": "0.24.1",
+	"version": "0.23.1",
 	"os": ["win32"],
 	"cpu": ["x64"],
 	"main": "lancedb.win32-x64-msvc.node",
@@ -1,12 +1,12 @@
 {
  "name": "@lancedb/lancedb",
-  "version": "0.24.1",
+  "version": "0.23.1",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@lancedb/lancedb",
-      "version": "0.24.1",
+      "version": "0.23.1",
      "cpu": [
        "x64",
        "arm64"
@@ -11,7 +11,7 @@
    "ann"
  ],
  "private": false,
-  "version": "0.24.1",
+  "version": "0.23.1",
  "main": "dist/index.js",
  "exports": {
    ".": "./dist/index.js",
@@ -166,19 +166,6 @@ impl Table {
        Ok(stats.into())
    }

-    #[napi(catch_unwind)]
-    pub async fn initial_storage_options(&self) -> napi::Result<Option<HashMap<String, String>>> {
-        Ok(self.inner_ref()?.initial_storage_options().await)
-    }
-
-    #[napi(catch_unwind)]
-    pub async fn latest_storage_options(&self) -> napi::Result<Option<HashMap<String, String>>> {
-        self.inner_ref()?
-            .latest_storage_options()
-            .await
-            .default_error()
-    }
-
    #[napi(catch_unwind)]
    pub async fn update(
        &self,
@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "0.27.1"
+current_version = "0.26.1"
 parse = """(?x)
    (?P<major>0|[1-9]\\d*)\\.
    (?P<minor>0|[1-9]\\d*)\\.
@@ -1,28 +1,28 @@
 [package]
 name = "lancedb-python"
-version = "0.27.1"
+version = "0.26.1"
 edition.workspace = true
 description = "Python bindings for LanceDB"
 license.workspace = true
 repository.workspace = true
 keywords.workspace = true
 categories.workspace = true
-rust-version = "1.88.0"
+rust-version = "1.75.0"

 [lib]
 name = "_lancedb"
 crate-type = ["cdylib"]

 [dependencies]
-arrow = { version = "56.2", features = ["pyarrow"] }
+arrow = { version = "57.2", features = ["pyarrow"] }
 async-trait = "0.1"
 lancedb = { path = "../rust/lancedb", default-features = false }
 lance-core.workspace = true
 lance-namespace.workspace = true
 lance-io.workspace = true
 env_logger.workspace = true
-pyo3 = { version = "0.25", features = ["extension-module", "abi3-py39"] }
-pyo3-async-runtimes = { version = "0.25", features = [
+pyo3 = { version = "0.26", features = ["extension-module", "abi3-py39"] }
+pyo3-async-runtimes = { version = "0.26", features = [
    "attributes",
    "tokio-runtime",
 ] }
@@ -32,7 +32,7 @@ snafu.workspace = true
 tokio = { version = "1.40", features = ["sync"] }

 [build-dependencies]
-pyo3-build-config = { version = "0.25", features = [
+pyo3-build-config = { version = "0.26", features = [
    "extension-module",
    "abi3-py39",
 ] }
@@ -179,9 +179,6 @@ class Table:
        cleanup_since_ms: Optional[int] = None,
        delete_unverified: Optional[bool] = None,
    ) -> OptimizeStats: ...
-    async def uri(self) -> str: ...
-    async def initial_storage_options(self) -> Optional[Dict[str, str]]: ...
-    async def latest_storage_options(self) -> Optional[Dict[str, str]]: ...
    @property
    def tags(self) -> Tags: ...
    def query(self) -> Query: ...
@@ -961,22 +961,27 @@ class LanceQueryBuilder(ABC):
        >>> query = [100, 100]
        >>> plan = table.search(query).analyze_plan()
        >>> print(plan)  # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE
-        AnalyzeExec verbose=true, metrics=[], cumulative_cpu=...
-          TracedExec, metrics=[], cumulative_cpu=...
-            ProjectionExec: expr=[...], metrics=[...], cumulative_cpu=...
-              GlobalLimitExec: skip=0, fetch=10, metrics=[...], cumulative_cpu=...
-                FilterExec: _distance@2 IS NOT NULL,
-                metrics=[output_rows=..., elapsed_compute=...], cumulative_cpu=...
-                  SortExec: TopK(fetch=10), expr=[...],
+        AnalyzeExec verbose=true, elapsed=..., metrics=...
+          TracedExec, elapsed=..., metrics=...
+            ProjectionExec: elapsed=..., expr=[...],
+            metrics=[output_rows=..., elapsed_compute=..., output_bytes=...]
+              GlobalLimitExec: elapsed=..., skip=0, fetch=10,
+              metrics=[output_rows=..., elapsed_compute=..., output_bytes=...]
+                FilterExec: elapsed=..., _distance@2 IS NOT NULL, metrics=[...]
+                  SortExec: elapsed=..., TopK(fetch=10), expr=[...],
                  preserve_partitioning=[...],
-                  metrics=[output_rows=..., elapsed_compute=..., row_replacements=...],
-                  cumulative_cpu=...
-                    KNNVectorDistance: metric=l2,
-                    metrics=[output_rows=..., elapsed_compute=..., output_batches=...],
-                    cumulative_cpu=...
-                      LanceRead: uri=..., projection=[vector], ...
-                      metrics=[output_rows=..., elapsed_compute=...,
-                      bytes_read=..., iops=..., requests=...], cumulative_cpu=...
+                  metrics=[output_rows=..., elapsed_compute=...,
+                  output_bytes=..., row_replacements=...]
+                    KNNVectorDistance: elapsed=..., metric=l2,
+                    metrics=[output_rows=..., elapsed_compute=...,
+                    output_bytes=..., output_batches=...]
+                      LanceRead: elapsed=..., uri=..., projection=[vector],
+                      num_fragments=..., range_before=None, range_after=None,
+                      row_id=true, row_addr=false,
+                      full_filter=--, refine_filter=--,
+                      metrics=[output_rows=..., elapsed_compute=..., output_bytes=...,
+                      fragments_scanned=..., ranges_scanned=1, rows_scanned=1,
+                      bytes_read=..., iops=..., requests=..., task_wait_time=...]

        Returns
        -------
@@ -655,14 +655,6 @@ class RemoteTable(Table):
    def stats(self):
        return LOOP.run(self._table.stats())

-    @property
-    def uri(self) -> str:
-        """The table URI (storage location).
-
-        For remote tables, this fetches the location from the server via describe.
-        """
-        return LOOP.run(self._table.uri())
-
    def take_offsets(self, offsets: list[int]) -> LanceTakeQueryBuilder:
        return LanceTakeQueryBuilder(self._table.take_offsets(offsets))

@@ -2218,41 +2218,6 @@ class LanceTable(Table):
    def stats(self) -> TableStatistics:
        return LOOP.run(self._table.stats())

-    @property
-    def uri(self) -> str:
-        return LOOP.run(self._table.uri())
-
-    def initial_storage_options(self) -> Optional[Dict[str, str]]:
-        """Get the initial storage options that were passed in when opening this table.
-
-        For dynamically refreshed options (e.g., credential vending), use
-        :meth:`latest_storage_options`.
-
-        Warning: This is an internal API and the return value is subject to change.
-
-        Returns
-        -------
-        Optional[Dict[str, str]]
-            The storage options, or None if no storage options were configured.
-        """
-        return LOOP.run(self._table.initial_storage_options())
-
-    def latest_storage_options(self) -> Optional[Dict[str, str]]:
-        """Get the latest storage options, refreshing from provider if configured.
-
-        This method is useful for credential vending scenarios where storage options
-        may be refreshed dynamically. If no dynamic provider is configured, this
-        returns the initial static options.
-
-        Warning: This is an internal API and the return value is subject to change.
-
-        Returns
-        -------
-        Optional[Dict[str, str]]
-            The storage options, or None if no storage options were configured.
-        """
-        return LOOP.run(self._table.latest_storage_options())
-
    def create_scalar_index(
        self,
        column: str,
@@ -3641,51 +3606,6 @@ class AsyncTable:
        """
        return await self._inner.stats()

-    async def uri(self) -> str:
-        """
-        Get the table URI (storage location).
-
-        For remote tables, this fetches the location from the server via describe.
-        For local tables, this returns the dataset URI.
-
-        Returns
-        -------
-        str
-            The full storage location of the table (e.g., S3/GCS path).
-        """
-        return await self._inner.uri()
-
-    async def initial_storage_options(self) -> Optional[Dict[str, str]]:
-        """Get the initial storage options that were passed in when opening this table.
-
-        For dynamically refreshed options (e.g., credential vending), use
-        :meth:`latest_storage_options`.
-
-        Warning: This is an internal API and the return value is subject to change.
-
-        Returns
-        -------
-        Optional[Dict[str, str]]
-            The storage options, or None if no storage options were configured.
-        """
-        return await self._inner.initial_storage_options()
-
-    async def latest_storage_options(self) -> Optional[Dict[str, str]]:
-        """Get the latest storage options, refreshing from provider if configured.
-
-        This method is useful for credential vending scenarios where storage options
-        may be refreshed dynamically. If no dynamic provider is configured, this
-        returns the initial static options.
-
-        Warning: This is an internal API and the return value is subject to change.
-
-        Returns
-        -------
-        Optional[Dict[str, str]]
-            The storage options, or None if no storage options were configured.
-        """
-        return await self._inner.latest_storage_options()
-
    async def add(
        self,
        data: DATA,
@@ -2,27 +2,12 @@
 # SPDX-FileCopyrightText: Copyright The LanceDB Authors

 from datetime import timedelta
-
 from lancedb.db import AsyncConnection, DBConnection
 import lancedb
 import pytest
 import pytest_asyncio


-def pandas_string_type():
-    """Return the PyArrow string type that pandas uses for string columns.
-
-    pandas 3.0+ uses large_string for string columns, pandas 2.x uses string.
-    """
-    import pandas as pd
-    import pyarrow as pa
-
-    version = tuple(int(x) for x in pd.__version__.split(".")[:2])
-    if version >= (3, 0):
-        return pa.large_utf8()
-    return pa.utf8()
-
-
 # Use an in-memory database for most tests.
@pytest.fixture
 def mem_db() -> DBConnection:
@@ -268,8 +268,6 @@ async def test_create_table_from_iterator_async(mem_db_async: lancedb.AsyncConne


 def test_create_exist_ok(tmp_db: lancedb.DBConnection):
-    from conftest import pandas_string_type
-
    data = pd.DataFrame(
        {
            "vector": [[3.1, 4.1], [5.9, 26.5]],
@@ -288,11 +286,10 @@ def test_create_exist_ok(tmp_db: lancedb.DBConnection):
    assert tbl.schema == tbl2.schema
    assert len(tbl) == len(tbl2)

-    # pandas 3.0+ uses large_string, pandas 2.x uses string
    schema = pa.schema(
        [
            pa.field("vector", pa.list_(pa.float32(), list_size=2)),
-            pa.field("item", pandas_string_type()),
+            pa.field("item", pa.utf8()),
            pa.field("price", pa.float64()),
        ]
    )
@@ -302,7 +299,7 @@ def test_create_exist_ok(tmp_db: lancedb.DBConnection):
    bad_schema = pa.schema(
        [
            pa.field("vector", pa.list_(pa.float32(), list_size=2)),
-            pa.field("item", pandas_string_type()),
+            pa.field("item", pa.utf8()),
            pa.field("price", pa.float64()),
            pa.field("extra", pa.float32()),
        ]
@@ -368,8 +365,6 @@ async def test_create_mode_async(tmp_db_async: lancedb.AsyncConnection):

@pytest.mark.asyncio
 async def test_create_exist_ok_async(tmp_db_async: lancedb.AsyncConnection):
-    from conftest import pandas_string_type
-
    data = pd.DataFrame(
        {
            "vector": [[3.1, 4.1], [5.9, 26.5]],
@@ -387,11 +382,10 @@ async def test_create_exist_ok_async(tmp_db_async: lancedb.AsyncConnection):
    assert tbl.name == tbl2.name
    assert await tbl.schema() == await tbl2.schema()

-    # pandas 3.0+ uses large_string, pandas 2.x uses string
    schema = pa.schema(
        [
            pa.field("vector", pa.list_(pa.float32(), list_size=2)),
-            pa.field("item", pandas_string_type()),
+            pa.field("item", pa.utf8()),
            pa.field("price", pa.float64()),
        ]
    )
@@ -601,8 +595,6 @@ def test_open_table_sync(tmp_db: lancedb.DBConnection):

@pytest.mark.asyncio
 async def test_open_table(tmp_path):
-    from conftest import pandas_string_type
-
    db = await lancedb.connect_async(tmp_path)
    data = pd.DataFrame(
        {
@@ -622,11 +614,10 @@ async def test_open_table(tmp_path):
        )
        is not None
    )
-    # pandas 3.0+ uses large_string, pandas 2.x uses string
    assert await tbl.schema() == pa.schema(
        {
            "vector": pa.list_(pa.float32(), list_size=2),
-            "item": pandas_string_type(),
+            "item": pa.utf8(),
            "price": pa.float64(),
        }
    )
@@ -26,8 +26,6 @@ import pytest
 from lance_namespace import (
    CreateEmptyTableRequest,
    CreateEmptyTableResponse,
-    DeclareTableRequest,
-    DeclareTableResponse,
    DescribeTableRequest,
    DescribeTableResponse,
    LanceNamespace,
@@ -162,19 +160,6 @@ class TrackingNamespace(LanceNamespace):

        return modified

-    def declare_table(self, request: DeclareTableRequest) -> DeclareTableResponse:
-        """Track declare_table calls and inject rotating credentials."""
-        with self.lock:
-            self.create_call_count += 1
-            count = self.create_call_count
-
-        response = self.inner.declare_table(request)
-        response.storage_options = self._modify_storage_options(
-            response.storage_options, count
-        )
-
-        return response
-
    def create_empty_table(
        self, request: CreateEmptyTableRequest
    ) -> CreateEmptyTableResponse:
@@ -1967,9 +1967,3 @@ def test_add_table_with_empty_embeddings(tmp_path):
        on_bad_vectors="drop",
    )
    assert table.count_rows() == 1
-
-
-def test_table_uri(tmp_path):
-    db = lancedb.connect(tmp_path)
-    table = db.create_table("my_table", data=[{"x": 0}])
-    assert table.uri == str(tmp_path / "my_table.lance")
@@ -528,19 +528,12 @@ def test_sanitize_data(
        else:
            expected_schema = schema
    else:
-        from conftest import pandas_string_type
-
-        # polars uses large_string, pandas 3.0+ uses large_string, others use string
-        if isinstance(data, pl.DataFrame):
-            text_type = pa.large_utf8()
-        elif isinstance(data, pd.DataFrame):
-            text_type = pandas_string_type()
-        else:
-            text_type = pa.string()
        expected_schema = pa.schema(
            {
                "id": pa.int64(),
-                "text": text_type,
+                "text": pa.large_utf8()
+                if isinstance(data, pl.DataFrame)
+                else pa.string(),
                "vector": pa.list_(pa.float32(), 10),
            }
        )
@@ -10,8 +10,7 @@ use arrow::{
 use futures::stream::StreamExt;
 use lancedb::arrow::SendableRecordBatchStream;
 use pyo3::{
-    exceptions::PyStopAsyncIteration, pyclass, pymethods, Bound, PyAny, PyObject, PyRef, PyResult,
-    Python,
+    exceptions::PyStopAsyncIteration, pyclass, pymethods, Bound, Py, PyAny, PyRef, PyResult, Python,
 };
 use pyo3_async_runtimes::tokio::future_into_py;

@@ -36,8 +35,11 @@ impl RecordBatchStream {
 #[pymethods]
 impl RecordBatchStream {
    #[getter]
-    pub fn schema(&self, py: Python) -> PyResult<PyObject> {
-        (*self.schema).clone().into_pyarrow(py)
+    pub fn schema(&self, py: Python) -> PyResult<Py<PyAny>> {
+        (*self.schema)
+            .clone()
+            .into_pyarrow(py)
+            .map(|obj| obj.unbind())
    }

    pub fn __aiter__(self_: PyRef<'_, Self>) -> PyRef<'_, Self> {
@@ -53,7 +55,12 @@ impl RecordBatchStream {
                .next()
                .await
                .ok_or_else(|| PyStopAsyncIteration::new_err(""))?;
-            Python::with_gil(|py| inner_next.infer_error()?.to_pyarrow(py))
+            #[allow(deprecated)]
+            let py_obj: Py<PyAny> = Python::with_gil(|py| -> PyResult<Py<PyAny>> {
+                let bound = inner_next.infer_error()?.to_pyarrow(py)?;
+                Ok(bound.unbind())
+            })?;
+            Ok(py_obj)
        })
    }
 }
@@ -12,7 +12,7 @@ use pyo3::{
    exceptions::{PyRuntimeError, PyValueError},
    pyclass, pyfunction, pymethods,
    types::{PyDict, PyDictMethods},
-    Bound, FromPyObject, Py, PyAny, PyObject, PyRef, PyResult, Python,
+    Bound, FromPyObject, Py, PyAny, PyRef, PyResult, Python,
 };
 use pyo3_async_runtimes::tokio::future_into_py;

@@ -114,7 +114,7 @@ impl Connection {
        data: Bound<'_, PyAny>,
        namespace: Vec<String>,
        storage_options: Option<HashMap<String, String>>,
-        storage_options_provider: Option<PyObject>,
+        storage_options_provider: Option<Py<PyAny>>,
        location: Option<String>,
    ) -> PyResult<Bound<'a, PyAny>> {
        let inner = self_.get_inner()?.clone();
@@ -152,7 +152,7 @@ impl Connection {
        schema: Bound<'_, PyAny>,
        namespace: Vec<String>,
        storage_options: Option<HashMap<String, String>>,
-        storage_options_provider: Option<PyObject>,
+        storage_options_provider: Option<Py<PyAny>>,
        location: Option<String>,
    ) -> PyResult<Bound<'a, PyAny>> {
        let inner = self_.get_inner()?.clone();
@@ -187,7 +187,7 @@ impl Connection {
        name: String,
        namespace: Vec<String>,
        storage_options: Option<HashMap<String, String>>,
-        storage_options_provider: Option<PyObject>,
+        storage_options_provider: Option<Py<PyAny>>,
        index_cache_size: Option<u32>,
        location: Option<String>,
    ) -> PyResult<Bound<'_, PyAny>> {
@@ -307,6 +307,7 @@ impl Connection {
                ..Default::default()
            };
            let response = inner.list_namespaces(request).await.infer_error()?;
+            #[allow(deprecated)]
            Python::with_gil(|py| -> PyResult<Py<PyDict>> {
                let dict = PyDict::new(py);
                dict.set_item("namespaces", response.namespaces)?;
@@ -327,8 +328,7 @@ impl Connection {
        let py = self_.py();
        future_into_py(py, async move {
            use lance_namespace::models::CreateNamespaceRequest;
-            // Mode is now a string field
-            let mode_str = mode.and_then(|m| match m.to_lowercase().as_str() {
+            let mode_enum = mode.and_then(|m| match m.to_lowercase().as_str() {
                "create" => Some("Create".to_string()),
                "exist_ok" => Some("ExistOk".to_string()),
                "overwrite" => Some("Overwrite".to_string()),
@@ -340,11 +340,12 @@ impl Connection {
                } else {
                    Some(namespace)
                },
-                mode: mode_str,
+                mode: mode_enum,
                properties,
                ..Default::default()
            };
            let response = inner.create_namespace(request).await.infer_error()?;
+            #[allow(deprecated)]
            Python::with_gil(|py| -> PyResult<Py<PyDict>> {
                let dict = PyDict::new(py);
                dict.set_item("properties", response.properties)?;
@@ -364,13 +365,12 @@ impl Connection {
        let py = self_.py();
        future_into_py(py, async move {
            use lance_namespace::models::DropNamespaceRequest;
-            // Mode and Behavior are now string fields
-            let mode_str = mode.and_then(|m| match m.to_uppercase().as_str() {
+            let mode_enum = mode.and_then(|m| match m.to_uppercase().as_str() {
                "SKIP" => Some("Skip".to_string()),
                "FAIL" => Some("Fail".to_string()),
                _ => None,
            });
-            let behavior_str = behavior.and_then(|b| match b.to_uppercase().as_str() {
+            let behavior_enum = behavior.and_then(|b| match b.to_uppercase().as_str() {
                "RESTRICT" => Some("Restrict".to_string()),
                "CASCADE" => Some("Cascade".to_string()),
                _ => None,
@@ -381,11 +381,12 @@ impl Connection {
                } else {
                    Some(namespace)
                },
-                mode: mode_str,
-                behavior: behavior_str,
+                mode: mode_enum,
+                behavior: behavior_enum,
                ..Default::default()
            };
            let response = inner.drop_namespace(request).await.infer_error()?;
+            #[allow(deprecated)]
            Python::with_gil(|py| -> PyResult<Py<PyDict>> {
                let dict = PyDict::new(py);
                dict.set_item("properties", response.properties)?;
@@ -413,6 +414,7 @@ impl Connection {
                ..Default::default()
            };
            let response = inner.describe_namespace(request).await.infer_error()?;
+            #[allow(deprecated)]
            Python::with_gil(|py| -> PyResult<Py<PyDict>> {
                let dict = PyDict::new(py);
                dict.set_item("properties", response.properties)?;
@@ -443,6 +445,7 @@ impl Connection {
                ..Default::default()
            };
            let response = inner.list_tables(request).await.infer_error()?;
+            #[allow(deprecated)]
            Python::with_gil(|py| -> PyResult<Py<PyDict>> {
                let dict = PyDict::new(py);
                dict.set_item("tables", response.tables)?;
@@ -40,31 +40,34 @@ impl<T> PythonErrorExt<T> for std::result::Result<T, LanceError> {
                    request_id,
                    source,
                    status_code,
-                } => Python::with_gil(|py| {
-                    let message = err.to_string();
-                    let http_err_cls = py
-                        .import(intern!(py, "lancedb.remote.errors"))?
-                        .getattr(intern!(py, "HttpError"))?;
-                    let err = http_err_cls.call1((
-                        message,
-                        request_id,
-                        status_code.map(|s| s.as_u16()),
-                    ))?;
-
-                    if let Some(cause) = source.source() {
-                        // The HTTP error already includes the first cause. But
-                        // we can add the rest of the chain if there is any more.
-                        let cause_err = http_from_rust_error(
-                            py,
-                            cause,
+                } => {
+                    #[allow(deprecated)]
+                    Python::with_gil(|py| {
+                        let message = err.to_string();
+                        let http_err_cls = py
+                            .import(intern!(py, "lancedb.remote.errors"))?
+                            .getattr(intern!(py, "HttpError"))?;
+                        let err = http_err_cls.call1((
+                            message,
                            request_id,
                            status_code.map(|s| s.as_u16()),
-                        )?;
-                        err.setattr(intern!(py, "__cause__"), cause_err)?;
-                    }
+                        ))?;

-                    Err(PyErr::from_value(err))
-                }),
+                        if let Some(cause) = source.source() {
+                            // The HTTP error already includes the first cause. But
+                            // we can add the rest of the chain if there is any more.
+                            let cause_err = http_from_rust_error(
+                                py,
+                                cause,
+                                request_id,
+                                status_code.map(|s| s.as_u16()),
+                            )?;
+                            err.setattr(intern!(py, "__cause__"), cause_err)?;
+                        }
+
+                        Err(PyErr::from_value(err))
+                    })
+                }
                LanceError::Retry {
                    request_id,
                    request_failures,
@@ -75,33 +78,37 @@ impl<T> PythonErrorExt<T> for std::result::Result<T, LanceError> {
                    max_read_failures,
                    source,
                    status_code,
-                } => Python::with_gil(|py| {
-                    let cause_err = http_from_rust_error(
-                        py,
-                        source.as_ref(),
-                        request_id,
-                        status_code.map(|s| s.as_u16()),
-                    )?;
+                } =>
+                {
+                    #[allow(deprecated)]
+                    Python::with_gil(|py| {
+                        let cause_err = http_from_rust_error(
+                            py,
+                            source.as_ref(),
+                            request_id,
+                            status_code.map(|s| s.as_u16()),
+                        )?;

-                    let message = err.to_string();
-                    let retry_error_cls = py
-                        .import(intern!(py, "lancedb.remote.errors"))?
-                        .getattr("RetryError")?;
-                    let err = retry_error_cls.call1((
-                        message,
-                        request_id,
-                        *request_failures,
-                        *connect_failures,
-                        *read_failures,
-                        *max_request_failures,
-                        *max_connect_failures,
-                        *max_read_failures,
-                        status_code.map(|s| s.as_u16()),
-                    ))?;
+                        let message = err.to_string();
+                        let retry_error_cls = py
+                            .import(intern!(py, "lancedb.remote.errors"))?
+                            .getattr("RetryError")?;
+                        let err = retry_error_cls.call1((
+                            message,
+                            request_id,
+                            *request_failures,
+                            *connect_failures,
+                            *read_failures,
+                            *max_request_failures,
+                            *max_connect_failures,
+                            *max_read_failures,
+                            status_code.map(|s| s.as_u16()),
+                        ))?;

-                    err.setattr(intern!(py, "__cause__"), cause_err)?;
-                    Err(PyErr::from_value(err))
-                }),
+                        err.setattr(intern!(py, "__cause__"), cause_err)?;
+                        Err(PyErr::from_value(err))
+                    })
+                }
                _ => self.runtime_error(),
            },
        }
@@ -12,6 +12,7 @@ pub struct PyHeaderProvider {

 impl Clone for PyHeaderProvider {
    fn clone(&self) -> Self {
+        #[allow(deprecated)]
        Python::with_gil(|py| Self {
            provider: self.provider.clone_ref(py),
        })
@@ -25,6 +26,7 @@ impl PyHeaderProvider {

    /// Get headers from the Python provider (internal implementation)
    fn get_headers_internal(&self) -> Result<HashMap<String, String>, String> {
+        #[allow(deprecated)]
        Python::with_gil(|py| {
            // Call the get_headers method
            let result = self.provider.call_method0(py, "get_headers");
@@ -19,7 +19,7 @@ use pyo3::{
    exceptions::PyRuntimeError,
    pyclass, pymethods,
    types::{PyAnyMethods, PyDict, PyDictMethods, PyType},
-    Bound, PyAny, PyRef, PyRefMut, PyResult, Python,
+    Bound, Py, PyAny, PyRef, PyRefMut, PyResult, Python,
 };
 use pyo3_async_runtimes::tokio::future_into_py;

@@ -281,7 +281,12 @@ impl PyPermutationReader {
        let reader = slf.reader.clone();
        future_into_py(slf.py(), async move {
            let schema = reader.output_schema(selection).await.infer_error()?;
-            Python::with_gil(|py| schema.to_pyarrow(py))
+            #[allow(deprecated)]
+            let py_obj: Py<PyAny> = Python::with_gil(|py| -> PyResult<Py<PyAny>> {
+                let bound = schema.to_pyarrow(py)?;
+                Ok(bound.unbind())
+            })?;
+            Ok(py_obj)
        })
    }

@@ -29,6 +29,7 @@ use pyo3::types::PyList;
 use pyo3::types::{PyDict, PyString};
 use pyo3::Bound;
 use pyo3::IntoPyObject;
+use pyo3::Py;
 use pyo3::PyAny;
 use pyo3::PyRef;
 use pyo3::PyResult;
@@ -453,7 +454,12 @@ impl Query {
        let inner = self_.inner.clone();
        future_into_py(self_.py(), async move {
            let schema = inner.output_schema().await.infer_error()?;
-            Python::with_gil(|py| schema.to_pyarrow(py))
+            #[allow(deprecated)]
+            let py_obj: Py<PyAny> = Python::with_gil(|py| -> PyResult<Py<PyAny>> {
+                let bound = schema.to_pyarrow(py)?;
+                Ok(bound.unbind())
+            })?;
+            Ok(py_obj)
        })
    }

@@ -532,7 +538,12 @@ impl TakeQuery {
        let inner = self_.inner.clone();
        future_into_py(self_.py(), async move {
            let schema = inner.output_schema().await.infer_error()?;
-            Python::with_gil(|py| schema.to_pyarrow(py))
+            #[allow(deprecated)]
+            let py_obj: Py<PyAny> = Python::with_gil(|py| -> PyResult<Py<PyAny>> {
+                let bound = schema.to_pyarrow(py)?;
+                Ok(bound.unbind())
+            })?;
+            Ok(py_obj)
        })
    }

@@ -627,7 +638,12 @@ impl FTSQuery {
        let inner = self_.inner.clone();
        future_into_py(self_.py(), async move {
            let schema = inner.output_schema().await.infer_error()?;
-            Python::with_gil(|py| schema.to_pyarrow(py))
+            #[allow(deprecated)]
+            let py_obj: Py<PyAny> = Python::with_gil(|py| -> PyResult<Py<PyAny>> {
+                let bound = schema.to_pyarrow(py)?;
+                Ok(bound.unbind())
+            })?;
+            Ok(py_obj)
        })
    }

@@ -806,7 +822,12 @@ impl VectorQuery {
        let inner = self_.inner.clone();
        future_into_py(self_.py(), async move {
            let schema = inner.output_schema().await.infer_error()?;
-            Python::with_gil(|py| schema.to_pyarrow(py))
+            #[allow(deprecated)]
+            let py_obj: Py<PyAny> = Python::with_gil(|py| -> PyResult<Py<PyAny>> {
+                let bound = schema.to_pyarrow(py)?;
+                Ok(bound.unbind())
+            })?;
+            Ok(py_obj)
        })
    }

@@ -17,11 +17,12 @@ use pyo3::types::PyDict;
 /// Internal wrapper around a Python object implementing StorageOptionsProvider
 pub struct PyStorageOptionsProvider {
    /// The Python object implementing fetch_storage_options()
-    inner: PyObject,
+    inner: Py<PyAny>,
 }

 impl Clone for PyStorageOptionsProvider {
    fn clone(&self) -> Self {
+        #[allow(deprecated)]
        Python::with_gil(|py| Self {
            inner: self.inner.clone_ref(py),
        })
@@ -29,7 +30,8 @@ impl Clone for PyStorageOptionsProvider {
 }

 impl PyStorageOptionsProvider {
-    pub fn new(obj: PyObject) -> PyResult<Self> {
+    pub fn new(obj: Py<PyAny>) -> PyResult<Self> {
+        #[allow(deprecated)]
        Python::with_gil(|py| {
            // Verify the object has a fetch_storage_options method
            if !obj.bind(py).hasattr("fetch_storage_options")? {
@@ -37,7 +39,9 @@ impl PyStorageOptionsProvider {
                    "StorageOptionsProvider must implement fetch_storage_options() method",
                ));
            }
-            Ok(Self { inner: obj })
+            Ok(Self {
+                inner: obj.clone_ref(py),
+            })
        })
    }
 }
@@ -60,6 +64,7 @@ impl StorageOptionsProvider for PyStorageOptionsProviderWrapper {
        let py_provider = self.py_provider.clone();

        tokio::task::spawn_blocking(move || {
+            #[allow(deprecated)]
            Python::with_gil(|py| {
                // Call the Python fetch_storage_options method
                let result = py_provider
@@ -119,6 +124,7 @@ impl StorageOptionsProvider for PyStorageOptionsProviderWrapper {
    }

    fn provider_id(&self) -> String {
+        #[allow(deprecated)]
        Python::with_gil(|py| {
            // Call provider_id() method on the Python object
            let obj = self.py_provider.inner.bind(py);
@@ -143,7 +149,7 @@ impl std::fmt::Debug for PyStorageOptionsProviderWrapper {
 /// This is the main entry point for converting Python StorageOptionsProvider objects
 /// to Rust trait objects that can be used by the Lance ecosystem.
 pub fn py_object_to_storage_options_provider(
-    py_obj: PyObject,
+    py_obj: Py<PyAny>,
 ) -> PyResult<Arc<dyn StorageOptionsProvider>> {
    let py_provider = PyStorageOptionsProvider::new(py_obj)?;
    Ok(Arc::new(PyStorageOptionsProviderWrapper::new(py_provider)))
@@ -21,7 +21,7 @@ use pyo3::{
    exceptions::{PyKeyError, PyRuntimeError, PyValueError},
    pyclass, pymethods,
    types::{IntoPyDict, PyAnyMethods, PyDict, PyDictMethods},
-    Bound, FromPyObject, PyAny, PyRef, PyResult, Python,
+    Bound, FromPyObject, Py, PyAny, PyRef, PyResult, Python,
 };
 use pyo3_async_runtimes::tokio::future_into_py;

@@ -287,7 +287,12 @@ impl Table {
        let inner = self_.inner_ref()?.clone();
        future_into_py(self_.py(), async move {
            let schema = inner.schema().await.infer_error()?;
-            Python::with_gil(|py| schema.to_pyarrow(py))
+            #[allow(deprecated)]
+            let py_obj: Py<PyAny> = Python::with_gil(|py| -> PyResult<Py<PyAny>> {
+                let bound = schema.to_pyarrow(py)?;
+                Ok(bound.unbind())
+            })?;
+            Ok(py_obj)
        })
    }

@@ -437,6 +442,7 @@ impl Table {
        future_into_py(self_.py(), async move {
            let stats = inner.index_stats(&index_name).await.infer_error()?;
            if let Some(stats) = stats {
+                #[allow(deprecated)]
                Python::with_gil(|py| {
                    let dict = PyDict::new(py);
                    dict.set_item("num_indexed_rows", stats.num_indexed_rows)?;
@@ -467,6 +473,7 @@ impl Table {
        let inner = self_.inner_ref()?.clone();
        future_into_py(self_.py(), async move {
            let stats = inner.stats().await.infer_error()?;
+            #[allow(deprecated)]
            Python::with_gil(|py| {
                let dict = PyDict::new(py);
                dict.set_item("total_bytes", stats.total_bytes)?;
@@ -497,25 +504,6 @@ impl Table {
        })
    }

-    pub fn uri(self_: PyRef<'_, Self>) -> PyResult<Bound<'_, PyAny>> {
-        let inner = self_.inner_ref()?.clone();
-        future_into_py(self_.py(), async move { inner.uri().await.infer_error() })
-    }
-
-    pub fn initial_storage_options(self_: PyRef<'_, Self>) -> PyResult<Bound<'_, PyAny>> {
-        let inner = self_.inner_ref()?.clone();
-        future_into_py(self_.py(), async move {
-            Ok(inner.initial_storage_options().await)
-        })
-    }
-
-    pub fn latest_storage_options(self_: PyRef<'_, Self>) -> PyResult<Bound<'_, PyAny>> {
-        let inner = self_.inner_ref()?.clone();
-        future_into_py(self_.py(), async move {
-            inner.latest_storage_options().await.infer_error()
-        })
-    }
-
    pub fn __repr__(&self) -> String {
        match &self.inner {
            None => format!("ClosedTable({})", self.name),
@@ -535,6 +523,7 @@ impl Table {
        let inner = self_.inner_ref()?.clone();
        future_into_py(self_.py(), async move {
            let versions = inner.list_versions().await.infer_error()?;
+            #[allow(deprecated)]
            let versions_as_dict = Python::with_gil(|py| {
                versions
                    .iter()
@@ -886,6 +875,7 @@ impl Tags {
            let tags = inner.tags().await.infer_error()?;
            let res = tags.list().await.infer_error()?;

+            #[allow(deprecated)]
            Python::with_gil(|py| {
                let py_dict = PyDict::new(py);
                for (key, contents) in res {
@@ -1,6 +1,6 @@
 [package]
 name = "lancedb"
-version = "0.24.1"
+version = "0.23.1"
 edition.workspace = true
 description = "LanceDB: A serverless, low-latency vector database for AI applications"
 license.workspace = true
@@ -9,6 +9,7 @@ use std::sync::Arc;
 use arrow_array::RecordBatchReader;
 use arrow_schema::{Field, SchemaRef};
 use lance::dataset::ReadParams;
+use lance::io::ObjectStoreParams;
 use lance_namespace::models::{
    CreateNamespaceRequest, CreateNamespaceResponse, DescribeNamespaceRequest,
    DescribeNamespaceResponse, DropNamespaceRequest, DropNamespaceResponse, ListNamespacesRequest,
@@ -36,7 +37,6 @@ use crate::remote::{
 };
 use crate::table::{TableDefinition, WriteOptions};
 use crate::Table;
-use lance::io::ObjectStoreParams;
 pub use lance_encoding::version::LanceFileVersion;
 #[cfg(feature = "remote")]
 use lance_io::object_store::StorageOptions;
@@ -46,31 +46,57 @@ fn merge_storage_options(
    store_params: &mut ObjectStoreParams,
    pairs: impl IntoIterator<Item = (String, String)>,
 ) {
-    let mut options = store_params.storage_options().cloned().unwrap_or_default();
+    let mut storage_options = store_params.storage_options().cloned().unwrap_or_default();
    for (key, value) in pairs {
-        options.insert(key, value);
+        storage_options.insert(key, value);
    }
-    let provider = store_params
-        .storage_options_accessor
-        .as_ref()
-        .and_then(|accessor| accessor.provider().cloned());
-    let accessor = if let Some(provider) = provider {
-        StorageOptionsAccessor::with_initial_and_provider(options, provider)
+    store_params.storage_options_accessor = Some(Arc::new(
+        StorageOptionsAccessor::with_static_options(storage_options),
+    ));
+}
+
+fn apply_storage_options_provider(
+    store_params: &mut ObjectStoreParams,
+    provider: Option<Arc<dyn StorageOptionsProvider>>,
+) {
+    let Some(provider) = provider else {
+        return;
+    };
+    let storage_options = store_params.storage_options().cloned().unwrap_or_default();
+    let accessor = if storage_options.is_empty() {
+        StorageOptionsAccessor::with_provider(provider)
    } else {
-        StorageOptionsAccessor::with_static_options(options)
+        StorageOptionsAccessor::with_initial_and_provider(storage_options, provider)
    };
    store_params.storage_options_accessor = Some(Arc::new(accessor));
 }

-fn set_storage_options_provider(
-    store_params: &mut ObjectStoreParams,
-    provider: Arc<dyn StorageOptionsProvider>,
+fn apply_storage_options_provider_to_write_options(
+    write_options: &mut WriteOptions,
+    provider: Option<Arc<dyn StorageOptionsProvider>>,
 ) {
-    let accessor = match store_params.storage_options().cloned() {
-        Some(options) => StorageOptionsAccessor::with_initial_and_provider(options, provider),
-        None => StorageOptionsAccessor::with_provider(provider),
+    let Some(provider) = provider else {
+        return;
    };
-    store_params.storage_options_accessor = Some(Arc::new(accessor));
+    let store_params = write_options
+        .lance_write_params
+        .get_or_insert_with(Default::default)
+        .store_params
+        .get_or_insert_with(Default::default);
+    apply_storage_options_provider(store_params, Some(provider));
+}
+
+fn apply_storage_options_provider_to_read_params(
+    read_params: &mut ReadParams,
+    provider: Option<Arc<dyn StorageOptionsProvider>>,
+) {
+    let Some(provider) = provider else {
+        return;
+    };
+    let store_params = read_params
+        .store_options
+        .get_or_insert_with(Default::default);
+    apply_storage_options_provider(store_params, Some(provider));
 }

 /// A builder for configuring a [`Connection::table_names`] operation
@@ -138,6 +164,7 @@ pub struct CreateTableBuilder<const HAS_DATA: bool> {
    embeddings: Vec<(EmbeddingDefinition, Arc<dyn EmbeddingFunction>)>,
    embedding_registry: Arc<dyn EmbeddingRegistry>,
    request: CreateTableRequest,
+    storage_options_provider: Option<Arc<dyn StorageOptionsProvider>>,
    // This is a bit clumsy but we defer errors until `execute` is called
    // to maintain backwards compatibility
    data: CreateTableBuilderInitialData,
@@ -160,6 +187,7 @@ impl CreateTableBuilder<true> {
            ),
            embeddings: Vec::new(),
            embedding_registry,
+            storage_options_provider: None,
            data: CreateTableBuilderInitialData::Iterator(data.into_arrow()),
        }
    }
@@ -179,6 +207,7 @@ impl CreateTableBuilder<true> {
            ),
            embeddings: Vec::new(),
            embedding_registry,
+            storage_options_provider: None,
            data: CreateTableBuilderInitialData::Stream(data.into_arrow()),
        }
    }
@@ -200,20 +229,30 @@ impl CreateTableBuilder<true> {
            match self.data {
                CreateTableBuilderInitialData::Iterator(maybe_iter) => {
                    let data = maybe_iter?;
-                    Ok(CreateTableRequest {
+                    let mut request = CreateTableRequest {
                        data: CreateTableData::Data(data),
                        ..self.request
-                    })
+                    };
+                    apply_storage_options_provider_to_write_options(
+                        &mut request.write_options,
+                        self.storage_options_provider,
+                    );
+                    Ok(request)
                }
                CreateTableBuilderInitialData::None => {
                    unreachable!("No data provided for CreateTableBuilder<true>")
                }
                CreateTableBuilderInitialData::Stream(maybe_stream) => {
                    let data = maybe_stream?;
-                    Ok(CreateTableRequest {
+                    let mut request = CreateTableRequest {
                        data: CreateTableData::StreamingData(data),
                        ..self.request
-                    })
+                    };
+                    apply_storage_options_provider_to_write_options(
+                        &mut request.write_options,
+                        self.storage_options_provider,
+                    );
+                    Ok(request)
                }
            }
        } else {
@@ -222,10 +261,15 @@ impl CreateTableBuilder<true> {
            };
            let data = maybe_iter?;
            let data = Box::new(WithEmbeddings::new(data, self.embeddings));
-            Ok(CreateTableRequest {
+            let mut request = CreateTableRequest {
                data: CreateTableData::Data(data),
                ..self.request
-            })
+            };
+            apply_storage_options_provider_to_write_options(
+                &mut request.write_options,
+                self.storage_options_provider,
+            );
+            Ok(request)
        }
    }
 }
@@ -245,13 +289,19 @@ impl CreateTableBuilder<false> {
            data: CreateTableBuilderInitialData::None,
            embeddings: Vec::default(),
            embedding_registry,
+            storage_options_provider: None,
        }
    }

    /// Execute the create table operation
    pub async fn execute(self) -> Result<Table> {
        let parent = self.parent.clone();
-        let table = parent.create_table(self.request).await?;
+        let mut request = self.request;
+        apply_storage_options_provider_to_write_options(
+            &mut request.write_options,
+            self.storage_options_provider,
+        );
+        let table = parent.create_table(request).await?;
        Ok(Table::new(table, parent))
    }
 }
@@ -306,10 +356,13 @@ impl<const HAS_DATA: bool> CreateTableBuilder<HAS_DATA> {
            .get_or_insert(Default::default())
            .store_params
            .get_or_insert(Default::default());
-        let updates = pairs
-            .into_iter()
-            .map(|(key, value)| (key.into(), value.into()));
-        merge_storage_options(store_params, updates);
+
+        merge_storage_options(
+            store_params,
+            pairs
+                .into_iter()
+                .map(|(key, value)| (key.into(), value.into())),
+        );
        self
    }

@@ -407,14 +460,7 @@ impl<const HAS_DATA: bool> CreateTableBuilder<HAS_DATA> {
    /// This allows tables to automatically refresh cloud storage credentials
    /// when they expire, enabling long-running operations on remote storage.
    pub fn storage_options_provider(mut self, provider: Arc<dyn StorageOptionsProvider>) -> Self {
-        let store_params = self
-            .request
-            .write_options
-            .lance_write_params
-            .get_or_insert(Default::default())
-            .store_params
-            .get_or_insert(Default::default());
-        set_storage_options_provider(store_params, provider);
+        self.storage_options_provider = Some(provider);
        self
    }
 }
@@ -424,6 +470,7 @@ pub struct OpenTableBuilder {
    parent: Arc<dyn Database>,
    request: OpenTableRequest,
    embedding_registry: Arc<dyn EmbeddingRegistry>,
+    storage_options_provider: Option<Arc<dyn StorageOptionsProvider>>,
 }

 impl OpenTableBuilder {
@@ -443,6 +490,7 @@ impl OpenTableBuilder {
                namespace_client: None,
            },
            embedding_registry,
+            storage_options_provider: None,
        }
    }

@@ -503,10 +551,13 @@ impl OpenTableBuilder {
            .get_or_insert(Default::default())
            .store_options
            .get_or_insert(Default::default());
-        let updates = pairs
-            .into_iter()
-            .map(|(key, value)| (key.into(), value.into()));
-        merge_storage_options(store_params, updates);
+
+        merge_storage_options(
+            store_params,
+            pairs
+                .into_iter()
+                .map(|(key, value)| (key.into(), value.into())),
+        );
        self
    }

@@ -530,19 +581,23 @@ impl OpenTableBuilder {
    /// This allows tables to automatically refresh cloud storage credentials
    /// when they expire, enabling long-running operations on remote storage.
    pub fn storage_options_provider(mut self, provider: Arc<dyn StorageOptionsProvider>) -> Self {
-        let store_params = self
-            .request
-            .lance_read_params
-            .get_or_insert(Default::default())
-            .store_options
-            .get_or_insert(Default::default());
-        set_storage_options_provider(store_params, provider);
+        self.storage_options_provider = Some(provider);
        self
    }

    /// Open the table
    pub async fn execute(self) -> Result<Table> {
-        let table = self.parent.open_table(self.request).await?;
+        let mut request = self.request;
+        if let Some(provider) = self.storage_options_provider {
+            if let Some(read_params) = request.lance_read_params.as_mut() {
+                apply_storage_options_provider_to_read_params(read_params, Some(provider));
+            } else {
+                let mut read_params = ReadParams::default();
+                apply_storage_options_provider_to_read_params(&mut read_params, Some(provider));
+                request.lance_read_params = Some(read_params);
+            }
+        }
+        let table = self.parent.open_table(request).await?;
        Ok(Table::new_with_embedding_registry(
            table,
            self.parent,
@@ -892,10 +947,6 @@ pub struct ConnectBuilder {
    embedding_registry: Option<Arc<dyn EmbeddingRegistry>>,
 }

-#[cfg(feature = "remote")]
-const ENV_VARS_TO_STORAGE_OPTS: [(&str, &str); 1] =
-    [("AZURE_STORAGE_ACCOUNT_NAME", "azure_storage_account_name")];
-
 impl ConnectBuilder {
    /// Create a new [`ConnectOptions`] with the given database URI.
    pub fn new(uri: &str) -> Self {
@@ -1079,27 +1130,11 @@ impl ConnectBuilder {
        self
    }

-    #[cfg(feature = "remote")]
-    fn apply_env_defaults(
-        env_var_to_remote_storage_option: &[(&str, &str)],
-        options: &mut HashMap<String, String>,
-    ) {
-        for (env_key, opt_key) in env_var_to_remote_storage_option {
-            if let Ok(env_value) = std::env::var(env_key) {
-                if !options.contains_key(*opt_key) {
-                    options.insert((*opt_key).to_string(), env_value);
-                }
-            }
-        }
-    }
-
    #[cfg(feature = "remote")]
    fn execute_remote(self) -> Result<Connection> {
        use crate::remote::db::RemoteDatabaseOptions;

-        let mut merged_options = self.request.options.clone();
-        Self::apply_env_defaults(&ENV_VARS_TO_STORAGE_OPTS, &mut merged_options);
-        let options = RemoteDatabaseOptions::parse_from_map(&merged_options)?;
+        let options = RemoteDatabaseOptions::parse_from_map(&self.request.options)?;

        let region = options.region.ok_or_else(|| Error::InvalidInput {
            message: "A region is required when connecting to LanceDb Cloud".to_string(),
@@ -1321,6 +1356,8 @@ mod test_utils {

 #[cfg(test)]
 mod tests {
+    use std::fs::create_dir_all;
+
    use crate::database::listing::{ListingDatabaseOptions, NewTableConfig};
    use crate::query::QueryBase;
    use crate::query::{ExecutableQuery, QueryExecutionOptions};
@@ -1344,23 +1381,6 @@ mod tests {
        assert_eq!(tc.connection.uri(), tc.uri);
    }

-    #[cfg(feature = "remote")]
-    #[test]
-    fn test_apply_env_defaults() {
-        let env_key = "TEST_APPLY_ENV_DEFAULTS_ENVIRONMENT_VARIABLE_ENV_KEY";
-        let env_val = "TEST_APPLY_ENV_DEFAULTS_ENVIRONMENT_VARIABLE_ENV_VAL";
-        let opts_key = "test_apply_env_defaults_environment_variable_opts_key";
-        std::env::set_var(env_key, env_val);
-
-        let mut options = HashMap::new();
-        ConnectBuilder::apply_env_defaults(&[(env_key, opts_key)], &mut options);
-        assert_eq!(Some(&env_val.to_string()), options.get(opts_key));
-
-        options.insert(opts_key.to_string(), "EXPLICIT-VALUE".to_string());
-        ConnectBuilder::apply_env_defaults(&[(env_key, opts_key)], &mut options);
-        assert_eq!(Some(&"EXPLICIT-VALUE".to_string()), options.get(opts_key));
-    }
-
    #[cfg(not(windows))]
    #[tokio::test]
    async fn test_connect_relative() {
@@ -1585,27 +1605,18 @@ mod tests {

    #[tokio::test]
    async fn drop_table() {
-        let tc = new_test_connection().await.unwrap();
-        let db = tc.connection;
+        let tmp_dir = tempdir().unwrap();

-        if tc.is_remote {
-            // All the typical endpoints such as s3:///, file-object-store:///, etc. treat drop_table
-            // as idempotent.
-            assert!(db.drop_table("invalid_table", &[]).await.is_ok());
-        } else {
-            // The behavior of drop_table when using a file:/// endpoint differs from all other
-            // object providers, in that it returns an error when deleting a non-existent table.
-            assert!(matches!(
-                db.drop_table("invalid_table", &[]).await,
-                Err(crate::Error::TableNotFound { .. }),
-            ));
-        }
+        let uri = tmp_dir.path().to_str().unwrap();
+        let db = connect(uri).execute().await.unwrap();

-        let schema = Arc::new(Schema::new(vec![Field::new("x", DataType::Int32, false)]));
-        db.create_empty_table("table1", schema.clone())
-            .execute()
-            .await
-            .unwrap();
+        // drop non-exist table
+        assert!(matches!(
+            db.drop_table("invalid_table", &[]).await,
+            Err(crate::Error::TableNotFound { .. }),
+        ));
+
+        create_dir_all(tmp_dir.path().join("table1.lance")).unwrap();
        db.drop_table("table1", &[]).await.unwrap();

        let tables = db.table_names().execute().await.unwrap();
@@ -42,6 +42,49 @@ pub const OPT_NEW_TABLE_STORAGE_VERSION: &str = "new_table_data_storage_version"
 pub const OPT_NEW_TABLE_V2_MANIFEST_PATHS: &str = "new_table_enable_v2_manifest_paths";
 pub const OPT_NEW_TABLE_ENABLE_STABLE_ROW_IDS: &str = "new_table_enable_stable_row_ids";

+fn build_storage_options_accessor(
+    options: Option<HashMap<String, String>>,
+    provider: Option<Arc<dyn StorageOptionsProvider>>,
+) -> Option<Arc<StorageOptionsAccessor>> {
+    match (options, provider) {
+        (Some(opts), Some(provider)) => Some(Arc::new(
+            StorageOptionsAccessor::with_initial_and_provider(opts, provider),
+        )),
+        (None, Some(provider)) => Some(Arc::new(StorageOptionsAccessor::with_provider(provider))),
+        (Some(opts), None) => Some(Arc::new(StorageOptionsAccessor::with_static_options(opts))),
+        (None, None) => None,
+    }
+}
+
+fn merge_storage_options(
+    store_params: &mut ObjectStoreParams,
+    pairs: impl IntoIterator<Item = (String, String)>,
+) {
+    let mut storage_options = store_params.storage_options().cloned().unwrap_or_default();
+    for (key, value) in pairs {
+        storage_options.insert(key, value);
+    }
+    store_params.storage_options_accessor = Some(Arc::new(
+        StorageOptionsAccessor::with_static_options(storage_options),
+    ));
+}
+
+fn apply_storage_options_provider(
+    store_params: &mut ObjectStoreParams,
+    provider: Option<Arc<dyn StorageOptionsProvider>>,
+) {
+    let Some(provider) = provider else {
+        return;
+    };
+    let storage_options = store_params.storage_options().cloned().unwrap_or_default();
+    let accessor = if storage_options.is_empty() {
+        StorageOptionsAccessor::with_provider(provider)
+    } else {
+        StorageOptionsAccessor::with_initial_and_provider(storage_options, provider)
+    };
+    store_params.storage_options_accessor = Some(Arc::new(accessor));
+}
+
 /// Controls how new tables should be created
 #[derive(Clone, Debug, Default)]
 pub struct NewTableConfig {
@@ -356,13 +399,10 @@ impl ListingDatabase {
                    .clone()
                    .unwrap_or_else(|| Arc::new(lance::session::Session::default()));
                let os_params = ObjectStoreParams {
-                    storage_options_accessor: if options.storage_options.is_empty() {
-                        None
-                    } else {
-                        Some(Arc::new(StorageOptionsAccessor::with_static_options(
-                            options.storage_options.clone(),
-                        )))
-                    },
+                    storage_options_accessor: build_storage_options_accessor(
+                        Some(options.storage_options.clone()),
+                        None,
+                    ),
                    ..Default::default()
                };
                let (object_store, base_path) = ObjectStore::from_uri_and_params(
@@ -469,20 +509,9 @@ impl ListingDatabase {
        validate_table_name(name)?;

        let mut uri = self.uri.clone();
-        // If the URI does not end with a path separator, add one
-        // Use forward slash for URIs (http://, s3://, gs://, file://, etc.)
-        // Use platform-specific separator for local paths without scheme
-        let has_scheme = uri.contains("://");
-        let ends_with_separator = uri.ends_with('/') || uri.ends_with('\\');
-
-        if !ends_with_separator {
-            if has_scheme {
-                // URIs always use forward slash
-                uri.push('/');
-            } else {
-                // Local path without scheme - use platform separator
-                uri.push(std::path::MAIN_SEPARATOR);
-            }
+        // If the URI does not end with a slash, add one
+        if !uri.ends_with('/') {
+            uri.push('/');
        }
        // Append the table name with the lance file extension
        uri.push_str(&format!("{}.{}", name, LANCE_FILE_EXTENSION));
@@ -498,13 +527,10 @@ impl ListingDatabase {

    async fn drop_tables(&self, names: Vec<String>) -> Result<()> {
        let object_store_params = ObjectStoreParams {
-            storage_options_accessor: if self.storage_options.is_empty() {
-                None
-            } else {
-                Some(Arc::new(StorageOptionsAccessor::with_static_options(
-                    self.storage_options.clone(),
-                )))
-            },
+            storage_options_accessor: build_storage_options_accessor(
+                Some(self.storage_options.clone()),
+                self.storage_options_provider.clone(),
+            ),
            ..Default::default()
        };
        let mut uri = self.uri.clone();
@@ -604,20 +630,21 @@ impl ListingDatabase {
        // will cause a new connection to be created, and that connection will
        // be dropped from the cache when python GCs the table object, which
        // confounds reuse across tables.
-        if !self.storage_options.is_empty() || self.storage_options_provider.is_some() {
+        if !self.storage_options.is_empty() {
            let store_params = write_params
                .store_params
                .get_or_insert_with(Default::default);
-            let mut storage_options = store_params.storage_options().cloned().unwrap_or_default();
-            if !self.storage_options.is_empty() {
-                self.inherit_storage_options(&mut storage_options);
-            }
-            let accessor = if let Some(ref provider) = self.storage_options_provider {
-                StorageOptionsAccessor::with_initial_and_provider(storage_options, provider.clone())
-            } else {
-                StorageOptionsAccessor::with_static_options(storage_options)
-            };
-            store_params.storage_options_accessor = Some(Arc::new(accessor));
+            let mut inherited = store_params.storage_options().cloned().unwrap_or_default();
+            self.inherit_storage_options(&mut inherited);
+            merge_storage_options(store_params, inherited);
+        }
+
+        // Set storage options provider if available
+        if self.storage_options_provider.is_some() {
+            let store_params = write_params
+                .store_params
+                .get_or_insert_with(Default::default);
+            apply_storage_options_provider(store_params, self.storage_options_provider.clone());
        }

        write_params.data_storage_version = self
@@ -903,13 +930,10 @@ impl Database for ListingDatabase {
        validate_table_name(&request.target_table_name)?;

        let storage_params = ObjectStoreParams {
-            storage_options_accessor: if self.storage_options.is_empty() {
-                None
-            } else {
-                Some(Arc::new(StorageOptionsAccessor::with_static_options(
-                    self.storage_options.clone(),
-                )))
-            },
+            storage_options_accessor: build_storage_options_accessor(
+                Some(self.storage_options.clone()),
+                self.storage_options_provider.clone(),
+            ),
            ..Default::default()
        };
        let read_params = ReadParams {
@@ -973,28 +997,25 @@ impl Database for ListingDatabase {
        // will cause a new connection to be created, and that connection will
        // be dropped from the cache when python GCs the table object, which
        // confounds reuse across tables.
-        if !self.storage_options.is_empty() || self.storage_options_provider.is_some() {
+        if !self.storage_options.is_empty() {
            let store_params = request
                .lance_read_params
                .get_or_insert_with(Default::default)
                .store_options
                .get_or_insert_with(Default::default);
-            let mut storage_options = store_params.storage_options().cloned().unwrap_or_default();
-            if !self.storage_options.is_empty() {
-                self.inherit_storage_options(&mut storage_options);
-            }
-            // Preserve request-level provider if no connection-level provider exists
-            let request_provider = store_params
-                .storage_options_accessor
-                .as_ref()
-                .and_then(|a| a.provider().cloned());
-            let provider = self.storage_options_provider.clone().or(request_provider);
-            let accessor = if let Some(provider) = provider {
-                StorageOptionsAccessor::with_initial_and_provider(storage_options, provider)
-            } else {
-                StorageOptionsAccessor::with_static_options(storage_options)
-            };
-            store_params.storage_options_accessor = Some(Arc::new(accessor));
+            let mut inherited = store_params.storage_options().cloned().unwrap_or_default();
+            self.inherit_storage_options(&mut inherited);
+            merge_storage_options(store_params, inherited);
+        }
+
+        // Set storage options provider if available
+        if self.storage_options_provider.is_some() {
+            let store_params = request
+                .lance_read_params
+                .get_or_insert_with(Default::default)
+                .store_options
+                .get_or_insert_with(Default::default);
+            apply_storage_options_provider(store_params, self.storage_options_provider.clone());
        }

        // Some ReadParams are exposed in the OpenTableBuilder, but we also
@@ -1102,7 +1123,6 @@ mod tests {
    use crate::table::{Table, TableDefinition};
    use arrow_array::{Int32Array, RecordBatch, StringArray};
    use arrow_schema::{DataType, Field, Schema};
-    use std::path::PathBuf;
    use tempfile::tempdir;

    async fn setup_database() -> (tempfile::TempDir, ListingDatabase) {
@@ -2082,19 +2102,6 @@ mod tests {
        assert_eq!(db_options.new_table_config.enable_stable_row_ids, None);
    }

-    #[tokio::test]
-    async fn test_table_uri() {
-        let (_tempdir, db) = setup_database().await;
-
-        let mut pb = PathBuf::new();
-        pb.push(db.uri.clone());
-        pb.push("test.lance");
-
-        let expected = pb.to_str().unwrap();
-        let uri = db.table_uri("test").ok().unwrap();
-        assert_eq!(uri, expected);
-    }
-
    #[tokio::test]
    async fn test_namespace_client() {
        let (_tempdir, db) = setup_database().await;
@@ -9,15 +9,14 @@ use std::sync::Arc;
 use async_trait::async_trait;
 use lance_namespace::{
    models::{
-        CreateEmptyTableRequest, CreateNamespaceRequest, CreateNamespaceResponse,
-        DeclareTableRequest, DescribeNamespaceRequest, DescribeNamespaceResponse,
-        DescribeTableRequest, DropNamespaceRequest, DropNamespaceResponse, DropTableRequest,
-        ListNamespacesRequest, ListNamespacesResponse, ListTablesRequest, ListTablesResponse,
+        CreateNamespaceRequest, CreateNamespaceResponse, DeclareTableRequest,
+        DescribeNamespaceRequest, DescribeNamespaceResponse, DescribeTableRequest,
+        DropNamespaceRequest, DropNamespaceResponse, DropTableRequest, ListNamespacesRequest,
+        ListNamespacesResponse, ListTablesRequest, ListTablesResponse,
    },
    LanceNamespace,
 };
 use lance_namespace_impls::ConnectBuilder;
-use log::warn;

 use crate::database::ReadConsistency;
 use crate::error::{Error, Result};
@@ -155,6 +154,7 @@ impl Database for LanceNamespaceDatabase {
        table_id.push(request.name.clone());
        let describe_request = DescribeTableRequest {
            id: Some(table_id.clone()),
+            version: None,
            ..Default::default()
        };

@@ -205,53 +205,26 @@ impl Database for LanceNamespaceDatabase {
        let mut table_id = request.namespace.clone();
        table_id.push(request.name.clone());

-        // Try declare_table first, falling back to create_empty_table for backwards
-        // compatibility with older namespace clients that don't support declare_table
-        let declare_request = DeclareTableRequest {
+        let create_empty_request = DeclareTableRequest {
            id: Some(table_id.clone()),
+            location: None,
+            vend_credentials: None,
            ..Default::default()
        };

-        let location = match self.namespace.declare_table(declare_request).await {
-            Ok(response) => response.location.ok_or_else(|| Error::Runtime {
-                message: "Table location is missing from declare_table response".to_string(),
-            })?,
-            Err(e) => {
-                // Check if the error is "not supported" and try create_empty_table as fallback
-                let err_str = e.to_string().to_lowercase();
-                if err_str.contains("not supported") || err_str.contains("not implemented") {
-                    warn!(
-                        "declare_table is not supported by the namespace client, \
-                        falling back to deprecated create_empty_table. \
-                        create_empty_table is deprecated and will be removed in Lance 3.0.0. \
-                        Please upgrade your namespace client to support declare_table."
-                    );
-                    #[allow(deprecated)]
-                    let create_empty_request = CreateEmptyTableRequest {
-                        id: Some(table_id.clone()),
-                        ..Default::default()
-                    };
+        let create_empty_response = self
+            .namespace
+            .declare_table(create_empty_request)
+            .await
+            .map_err(|e| Error::Runtime {
+                message: format!("Failed to declare table: {}", e),
+            })?;

-                    #[allow(deprecated)]
-                    let create_response = self
-                        .namespace
-                        .create_empty_table(create_empty_request)
-                        .await
-                        .map_err(|e| Error::Runtime {
-                            message: format!("Failed to create empty table: {}", e),
-                        })?;
-
-                    create_response.location.ok_or_else(|| Error::Runtime {
-                        message: "Table location is missing from create_empty_table response"
-                            .to_string(),
-                    })?
-                } else {
-                    return Err(Error::Runtime {
-                        message: format!("Failed to declare table: {}", e),
-                    });
-                }
-            }
-        };
+        let location = create_empty_response
+            .location
+            .ok_or_else(|| Error::Runtime {
+                message: "Table location is missing from create_empty_table response".to_string(),
+            })?;

        let native_table = NativeTable::create_from_namespace(
            self.namespace.clone(),
@@ -466,6 +439,8 @@ mod tests {
        // Create a child namespace first
        conn.create_namespace(CreateNamespaceRequest {
            id: Some(vec!["test_ns".into()]),
+            mode: None,
+            properties: None,
            ..Default::default()
        })
        .await
@@ -526,6 +501,8 @@ mod tests {
        // Create a child namespace first
        conn.create_namespace(CreateNamespaceRequest {
            id: Some(vec!["test_ns".into()]),
+            mode: None,
+            properties: None,
            ..Default::default()
        })
        .await
@@ -589,6 +566,8 @@ mod tests {
        // Create a child namespace first
        conn.create_namespace(CreateNamespaceRequest {
            id: Some(vec!["test_ns".into()]),
+            mode: None,
+            properties: None,
            ..Default::default()
        })
        .await
@@ -672,6 +651,8 @@ mod tests {
        // Create a child namespace first
        conn.create_namespace(CreateNamespaceRequest {
            id: Some(vec!["test_ns".into()]),
+            mode: None,
+            properties: None,
            ..Default::default()
        })
        .await
@@ -727,6 +708,8 @@ mod tests {
        // Create a child namespace first
        conn.create_namespace(CreateNamespaceRequest {
            id: Some(vec!["test_ns".into()]),
+            mode: None,
+            properties: None,
            ..Default::default()
        })
        .await
@@ -807,6 +790,8 @@ mod tests {
        // Create a child namespace first
        conn.create_namespace(CreateNamespaceRequest {
            id: Some(vec!["test_ns".into()]),
+            mode: None,
+            properties: None,
            ..Default::default()
        })
        .await
@@ -840,6 +825,8 @@ mod tests {
        // Create a child namespace first
        conn.create_namespace(CreateNamespaceRequest {
            id: Some(vec!["test_ns".into()]),
+            mode: None,
+            properties: None,
            ..Default::default()
        })
        .await
@@ -171,7 +171,7 @@ impl Shuffler {
            // This is kind of an annoying limitation but if we allow runt clumps from batches then
            // clumps will get unaligned and we will mess up the clumps when we do the in-memory
            // shuffle step.  If this is a problem we can probably figure out a better way to do this.
-            if !is_last && !(batch.num_rows() as u64).is_multiple_of(clump_size) {
+            if !is_last && batch.num_rows() as u64 % clump_size != 0 {
                return Err(Error::Runtime {
                    message: format!(
                        "Expected batch size ({}) to be divisible by clump size ({})",
@@ -1,9 +1,12 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: Copyright The LanceDB Authors

-use std::sync::{
-    atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering},
-    Arc,
+use std::{
+    iter,
+    sync::{
+        atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering},
+        Arc,
+    },
 };

 use arrow_array::{Array, BooleanArray, RecordBatch, UInt64Array};
@@ -155,7 +158,7 @@ impl Splitter {
                remaining_in_split
            };

-            split_ids.extend(std::iter::repeat_n(split_id as u64, rows_to_add as usize));
+            split_ids.extend(iter::repeat(split_id as u64).take(rows_to_add as usize));
            if done {
                // Quit early if we've run out of splits
                break;
@@ -659,7 +662,7 @@ mod tests {
        assert_eq!(split_batch.num_rows(), total_split_sizes as usize);
        let mut expected = Vec::with_capacity(total_split_sizes as usize);
        for (i, size) in expected_split_sizes.iter().enumerate() {
-            expected.extend(std::iter::repeat_n(i as u64, *size as usize));
+            expected.extend(iter::repeat(i as u64).take(*size as usize));
        }
        let expected = Arc::new(UInt64Array::from(expected)) as Arc<dyn Array>;

@@ -297,10 +297,10 @@ impl IvfPqIndexBuilder {
 }

 pub(crate) fn suggested_num_sub_vectors(dim: u32) -> u32 {
-    if dim.is_multiple_of(16) {
+    if dim % 16 == 0 {
        // Should be more aggressive than this default.
        dim / 16
-    } else if dim.is_multiple_of(8) {
+    } else if dim % 8 == 0 {
        dim / 8
    } else {
        log::warn!(
@@ -51,19 +51,24 @@
 //! - `s3://bucket/path/to/database` or `gs://bucket/path/to/database` - database on cloud object store
 //! - `db://dbname` - Lance Cloud
 //!
-//! You can also use [`ConnectBuilder`] to configure the connection to the database.
+//! You can also use [`ConnectOptions`] to configure the connection to the database.
 //!
 //! ```rust
+//! # #[cfg(feature = "aws")]
+//! # {
+//! use object_store::aws::AwsCredential;
 //! # tokio::runtime::Runtime::new().unwrap().block_on(async {
 //! let db = lancedb::connect("data/sample-lancedb")
-//!     .storage_options([
-//!         ("aws_access_key_id", "some_key"),
-//!         ("aws_secret_access_key", "some_secret"),
-//!     ])
+//!     .aws_creds(AwsCredential {
+//!         key_id: "some_key".to_string(),
+//!         secret_key: "some_secret".to_string(),
+//!         token: None,
+//!     })
 //!     .execute()
 //!     .await
 //!     .unwrap();
 //! # });
+//! # }
 //! ```
 //!
 //! LanceDB uses [arrow-rs](https://github.com/apache/arrow-rs) to define schema, data types and array itself.
@@ -1718,6 +1718,8 @@ mod tests {
            let namespace = vec!["test_ns".to_string()];
            conn.create_namespace(CreateNamespaceRequest {
                id: Some(namespace.clone()),
+                mode: None,
+                properties: None,
                ..Default::default()
            })
            .await
@@ -1743,6 +1745,8 @@ mod tests {
            let list_response = conn
                .list_tables(ListTablesRequest {
                    id: Some(namespace.clone()),
+                    page_token: None,
+                    limit: None,
                    ..Default::default()
                })
                .await
@@ -1754,6 +1758,8 @@ mod tests {
            let list_response = namespace_client
                .list_tables(ListTablesRequest {
                    id: Some(namespace.clone()),
+                    page_token: None,
+                    limit: None,
                    ..Default::default()
                })
                .await
@@ -1794,6 +1800,8 @@ mod tests {
            let namespace = vec!["multi_table_ns".to_string()];
            conn.create_namespace(CreateNamespaceRequest {
                id: Some(namespace.clone()),
+                mode: None,
+                properties: None,
                ..Default::default()
            })
            .await
@@ -1819,6 +1827,8 @@ mod tests {
            let list_response = conn
                .list_tables(ListTablesRequest {
                    id: Some(namespace.clone()),
+                    page_token: None,
+                    limit: None,
                    ..Default::default()
                })
                .await
@@ -204,7 +204,6 @@ pub struct RemoteTable<S: HttpSend = Sender> {
    server_version: ServerVersion,

    version: RwLock<Option<u64>>,
-    location: RwLock<Option<String>>,
 }

 impl<S: HttpSend> RemoteTable<S> {
@@ -222,7 +221,6 @@ impl<S: HttpSend> RemoteTable<S> {
            identifier,
            server_version,
            version: RwLock::new(None),
-            location: RwLock::new(None),
        }
    }

@@ -641,7 +639,6 @@ impl<S: HttpSend> RemoteTable<S> {
 struct TableDescription {
    version: u64,
    schema: JsonSchema,
-    location: Option<String>,
 }

 impl<S: HttpSend> std::fmt::Display for RemoteTable<S> {
@@ -670,7 +667,6 @@ mod test_utils {
                identifier: name,
                server_version: version.map(ServerVersion).unwrap_or_default(),
                version: RwLock::new(None),
-                location: RwLock::new(None),
            }
        }
    }
@@ -1465,42 +1461,14 @@ impl<S: HttpSend> BaseTable for RemoteTable<S> {
            message: "table_definition is not supported on LanceDB cloud.".into(),
        })
    }
-    async fn uri(&self) -> Result<String> {
-        // Check if we already have the location cached
-        {
-            let location = self.location.read().await;
-            if let Some(ref loc) = *location {
-                return Ok(loc.clone());
-            }
-        }
-
-        // Fetch from server via describe
-        let description = self.describe().await?;
-        let location = description.location.ok_or_else(|| Error::NotSupported {
-            message: "Table URI not supported by the server".into(),
-        })?;
-
-        // Cache the location for future use
-        {
-            let mut cached_location = self.location.write().await;
-            *cached_location = Some(location.clone());
-        }
-
-        Ok(location)
+    fn dataset_uri(&self) -> &str {
+        "NOT_SUPPORTED"
    }

    async fn storage_options(&self) -> Option<HashMap<String, String>> {
        None
    }

-    async fn initial_storage_options(&self) -> Option<HashMap<String, String>> {
-        None
-    }
-
-    async fn latest_storage_options(&self) -> Result<Option<HashMap<String, String>>> {
-        Ok(None)
-    }
-
    async fn stats(&self) -> Result<TableStatistics> {
        let request = self
            .client
@@ -3364,69 +3332,4 @@ mod tests {
        let result = table.drop_columns(&["old_col1", "old_col2"]).await.unwrap();
        assert_eq!(result.version, 5);
    }
-
-    #[tokio::test]
-    async fn test_uri() {
-        let table = Table::new_with_handler("my_table", |request| {
-            assert_eq!(request.method(), "POST");
-            assert_eq!(request.url().path(), "/v1/table/my_table/describe/");
-
-            http::Response::builder()
-                .status(200)
-                .body(r#"{"version": 1, "schema": {"fields": []}, "location": "s3://bucket/path/to/table"}"#)
-                .unwrap()
-        });
-
-        let uri = table.uri().await.unwrap();
-        assert_eq!(uri, "s3://bucket/path/to/table");
-    }
-
-    #[tokio::test]
-    async fn test_uri_missing_location() {
-        let table = Table::new_with_handler("my_table", |request| {
-            assert_eq!(request.method(), "POST");
-            assert_eq!(request.url().path(), "/v1/table/my_table/describe/");
-
-            // Server returns response without location field
-            http::Response::builder()
-                .status(200)
-                .body(r#"{"version": 1, "schema": {"fields": []}}"#)
-                .unwrap()
-        });
-
-        let result = table.uri().await;
-        assert!(result.is_err());
-        assert!(matches!(&result, Err(Error::NotSupported { .. })));
-    }
-
-    #[tokio::test]
-    async fn test_uri_caching() {
-        use std::sync::atomic::{AtomicUsize, Ordering};
-        use std::sync::Arc;
-
-        let call_count = Arc::new(AtomicUsize::new(0));
-        let call_count_clone = call_count.clone();
-
-        let table = Table::new_with_handler("my_table", move |request| {
-            assert_eq!(request.url().path(), "/v1/table/my_table/describe/");
-            call_count_clone.fetch_add(1, Ordering::SeqCst);
-
-            http::Response::builder()
-                .status(200)
-                .body(
-                    r#"{"version": 1, "schema": {"fields": []}, "location": "gs://bucket/table"}"#,
-                )
-                .unwrap()
-        });
-
-        // First call should fetch from server
-        let uri1 = table.uri().await.unwrap();
-        assert_eq!(uri1, "gs://bucket/table");
-        assert_eq!(call_count.load(Ordering::SeqCst), 1);
-
-        // Second call should use cached value
-        let uri2 = table.uri().await.unwrap();
-        assert_eq!(uri2, "gs://bucket/table");
-        assert_eq!(call_count.load(Ordering::SeqCst), 1); // Still 1, no new call
-    }
 }
@@ -608,20 +608,10 @@ pub trait BaseTable: std::fmt::Display + std::fmt::Debug + Send + Sync {
    async fn list_versions(&self) -> Result<Vec<Version>>;
    /// Get the table definition.
    async fn table_definition(&self) -> Result<TableDefinition>;
-    /// Get the table URI (storage location)
-    async fn uri(&self) -> Result<String>;
+    /// Get the table URI
+    fn dataset_uri(&self) -> &str;
    /// Get the storage options used when opening this table, if any.
-    #[deprecated(since = "0.25.0", note = "Use initial_storage_options() instead")]
    async fn storage_options(&self) -> Option<HashMap<String, String>>;
-    /// Get the initial storage options that were passed in when opening this table.
-    ///
-    /// For dynamically refreshed options (e.g., credential vending), use [`Self::latest_storage_options`].
-    async fn initial_storage_options(&self) -> Option<HashMap<String, String>>;
-    /// Get the latest storage options, refreshing from provider if configured.
-    ///
-    /// Returns `Ok(Some(options))` if storage options are available (static or refreshed),
-    /// `Ok(None)` if no storage options were configured, or `Err(...)` if refresh failed.
-    async fn latest_storage_options(&self) -> Result<Option<HashMap<String, String>>>;
    /// Poll until the columns are fully indexed. Will return Error::Timeout if the columns
    /// are not fully indexed within the timeout.
    async fn wait_for_index(
@@ -1327,43 +1317,20 @@ impl Table {
        self.inner.list_indices().await
    }

-    /// Get the table URI (storage location)
+    /// Get the underlying dataset URI
    ///
-    /// Returns the full storage location of the table (e.g., S3/GCS path).
-    /// For remote tables, this fetches the location from the server via describe.
-    pub async fn uri(&self) -> Result<String> {
-        self.inner.uri().await
+    /// Warning: This is an internal API and the return value is subject to change.
+    pub fn dataset_uri(&self) -> &str {
+        self.inner.dataset_uri()
    }

    /// Get the storage options used when opening this table, if any.
    ///
    /// Warning: This is an internal API and the return value is subject to change.
-    #[deprecated(since = "0.25.0", note = "Use initial_storage_options() instead")]
    pub async fn storage_options(&self) -> Option<HashMap<String, String>> {
-        #[allow(deprecated)]
        self.inner.storage_options().await
    }

-    /// Get the initial storage options that were passed in when opening this table.
-    ///
-    /// For dynamically refreshed options (e.g., credential vending), use [`Self::latest_storage_options`].
-    ///
-    /// Warning: This is an internal API and the return value is subject to change.
-    pub async fn initial_storage_options(&self) -> Option<HashMap<String, String>> {
-        self.inner.initial_storage_options().await
-    }
-
-    /// Get the latest storage options, refreshing from provider if configured.
-    ///
-    /// This method is useful for credential vending scenarios where storage options
-    /// may be refreshed dynamically. If no dynamic provider is configured, this
-    /// returns the initial static options.
-    ///
-    /// Warning: This is an internal API and the return value is subject to change.
-    pub async fn latest_storage_options(&self) -> Result<Option<HashMap<String, String>>> {
-        self.inner.latest_storage_options().await
-    }
-
    /// Get statistics about an index.
    /// Returns None if the index does not exist.
    pub async fn index_stats(
@@ -1457,7 +1424,9 @@ impl Table {
            })
            .collect::<Vec<_>>();

-        let unioned = Arc::new(UnionExec::new(projected_plans));
+        let unioned = UnionExec::try_new(projected_plans).map_err(|e| Error::Runtime {
+            message: format!("Failed to build union plan: {e}"),
+        })?;
        // We require 1 partition in the final output
        let repartitioned = RepartitionExec::try_new(
            unioned,
@@ -1909,13 +1878,9 @@ impl NativeTable {
        let store_params = params
            .store_params
            .get_or_insert_with(ObjectStoreParams::default);
-        let accessor = match store_params.storage_options().cloned() {
-            Some(options) => {
-                StorageOptionsAccessor::with_initial_and_provider(options, storage_options_provider)
-            }
-            None => StorageOptionsAccessor::with_provider(storage_options_provider),
-        };
-        store_params.storage_options_accessor = Some(Arc::new(accessor));
+        store_params.storage_options_accessor = Some(Arc::new(
+            StorageOptionsAccessor::with_provider(storage_options_provider),
+        ));

        // Patch the params if we have a write store wrapper
        let params = match write_store_wrapper.clone() {
@@ -2091,7 +2056,7 @@ impl NativeTable {
            return provided;
        }
        let suggested = suggested_num_sub_vectors(dim);
-        if num_bits.is_some_and(|num_bits| num_bits == 4) && !suggested.is_multiple_of(2) {
+        if num_bits.is_some_and(|num_bits| num_bits == 4) && suggested % 2 != 0 {
            // num_sub_vectors must be even when 4 bits are used
            suggested + 1
        } else {
@@ -2381,7 +2346,7 @@ impl NativeTable {
                };

                // Convert select to columns list
-                let columns = match &vq.base.select {
+                let columns: Option<Box<QueryTableRequestColumns>> = match &vq.base.select {
                    Select::All => None,
                    Select::Columns(cols) => Some(Box::new(QueryTableRequestColumns {
                        column_names: Some(cols.clone()),
@@ -2439,6 +2404,7 @@ impl NativeTable {
                    with_row_id: Some(vq.base.with_row_id),
                    bypass_vector_index: Some(!vq.use_index),
                    full_text_query,
+                    version: None,
                    ..Default::default()
                })
            }
@@ -2457,7 +2423,7 @@ impl NativeTable {
                    .map(|f| self.filter_to_sql(f))
                    .transpose()?;

-                let columns = match &q.select {
+                let columns: Option<Box<QueryTableRequestColumns>> = match &q.select {
                    Select::All => None,
                    Select::Columns(cols) => Some(Box::new(QueryTableRequestColumns {
                        column_names: Some(cols.clone()),
@@ -2501,10 +2467,18 @@ impl NativeTable {
                    columns,
                    prefilter: Some(q.prefilter),
                    offset: q.offset.map(|o| o as i32),
+                    ef: None,
+                    refine_factor: None,
+                    distance_type: None,
+                    nprobes: None,
                    vector_column: None, // No vector column for plain queries
                    with_row_id: Some(q.with_row_id),
                    bypass_vector_index: Some(true), // No vector index for plain queries
                    full_text_query,
+                    version: None,
+                    fast_search: None,
+                    lower_bound: None,
+                    upper_bound: None,
                    ..Default::default()
                })
            }
@@ -3258,15 +3232,11 @@ impl BaseTable for NativeTable {
        Ok(results.into_iter().flatten().collect())
    }

-    async fn uri(&self) -> Result<String> {
-        Ok(self.uri.clone())
+    fn dataset_uri(&self) -> &str {
+        self.uri.as_str()
    }

    async fn storage_options(&self) -> Option<HashMap<String, String>> {
-        self.initial_storage_options().await
-    }
-
-    async fn initial_storage_options(&self) -> Option<HashMap<String, String>> {
        self.dataset
            .get()
            .await
@@ -3274,11 +3244,6 @@ impl BaseTable for NativeTable {
            .and_then(|dataset| dataset.initial_storage_options().cloned())
    }

-    async fn latest_storage_options(&self) -> Result<Option<HashMap<String, String>>> {
-        let dataset = self.dataset.get().await?;
-        Ok(dataset.latest_storage_options().await?.map(|o| o.0))
-    }
-
    async fn index_stats(&self, index_name: &str) -> Result<Option<IndexStatistics>> {
        let stats = match self
            .dataset
@@ -3441,6 +3406,7 @@ pub struct FragmentSummaryStats {
 #[cfg(test)]
 #[allow(deprecated)]
 mod tests {
+    use std::iter;
    use std::sync::atomic::{AtomicBool, Ordering};
    use std::sync::Arc;
    use std::time::Duration;
@@ -4057,7 +4023,7 @@ mod tests {
                schema.clone(),
                vec![
                    Arc::new(Int32Array::from_iter_values(offset..(offset + 10))),
-                    Arc::new(Int32Array::from_iter_values(std::iter::repeat_n(age, 10))),
+                    Arc::new(Int32Array::from_iter_values(iter::repeat(age).take(10))),
                ],
            )],
            schema,
@@ -5185,16 +5151,15 @@ mod tests {
        let any_query = AnyQuery::VectorQuery(vq);
        let ns_request = table.convert_to_namespace_query(&any_query).unwrap();

+        let column_names = ns_request
+            .columns
+            .as_ref()
+            .and_then(|cols| cols.column_names.clone());
+
        assert_eq!(ns_request.k, 10);
        assert_eq!(ns_request.offset, Some(5));
        assert_eq!(ns_request.filter, Some("id > 0".to_string()));
-        assert_eq!(
-            ns_request
-                .columns
-                .as_ref()
-                .and_then(|c| c.column_names.as_ref()),
-            Some(&vec!["id".to_string()])
-        );
+        assert_eq!(column_names, Some(vec!["id".to_string()]));
        assert_eq!(ns_request.vector_column, Some("vector".to_string()));
        assert_eq!(ns_request.distance_type, Some("l2".to_string()));
        assert!(ns_request.vector.single_vector.is_some());
@@ -5231,17 +5196,16 @@ mod tests {
        let any_query = AnyQuery::Query(q);
        let ns_request = table.convert_to_namespace_query(&any_query).unwrap();

+        let column_names = ns_request
+            .columns
+            .as_ref()
+            .and_then(|cols| cols.column_names.clone());
+
        // Plain queries should pass an empty vector
        assert_eq!(ns_request.k, 20);
        assert_eq!(ns_request.offset, Some(5));
        assert_eq!(ns_request.filter, Some("id > 5".to_string()));
-        assert_eq!(
-            ns_request
-                .columns
-                .as_ref()
-                .and_then(|c| c.column_names.as_ref()),
-            Some(&vec!["id".to_string()])
-        );
+        assert_eq!(column_names, Some(vec!["id".to_string()]));
        assert_eq!(ns_request.with_row_id, Some(true));
        assert_eq!(ns_request.bypass_vector_index, Some(true));
        assert!(ns_request.vector_column.is_none()); // No vector column for plain queries
@@ -100,7 +100,8 @@ impl DatasetRef {
                let should_checkout = match &target_ref {
                    refs::Ref::Version(_, Some(target_ver)) => version != target_ver,
                    refs::Ref::Version(_, None) => true, // No specific version, always checkout
-                    refs::Ref::Tag(_) => true,           // Always checkout for tags
+                    refs::Ref::VersionNumber(target_ver) => version != target_ver,
+                    refs::Ref::Tag(_) => true, // Always checkout for tags
                };

                if should_checkout {
@@ -4,6 +4,7 @@
 use std::{
    borrow::Cow,
    collections::{HashMap, HashSet},
+    iter::repeat,
    sync::Arc,
 };

@@ -267,10 +268,9 @@ fn create_some_records() -> Result<impl IntoArrow> {
            schema.clone(),
            vec![
                Arc::new(Int32Array::from_iter_values(0..TOTAL as i32)),
-                Arc::new(StringArray::from_iter(std::iter::repeat_n(
-                    Some("hello world".to_string()),
-                    TOTAL,
-                ))),
+                Arc::new(StringArray::from_iter(
+                    repeat(Some("hello world".to_string())).take(TOTAL),
+                )),
            ],
        )
        .unwrap()]