This is an automated email from the ASF dual-hosted git repository.
lidavidm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git
The following commit(s) were added to refs/heads/main by this push:
new 22f0f4a94 test: rename references to avoid conflict with installed
drivers (#4643)
22f0f4a94 is described below
commit 22f0f4a94603c0e4ae7e7545fb88def3d43923d8
Author: David Li <[email protected]>
AuthorDate: Tue Aug 4 10:26:11 2026 +0900
test: rename references to avoid conflict with installed drivers (#4643)
Closes #4588.
Assisted-by: GPT-5.6 Sol <[email protected]>
---------
Co-authored-by: Bryce Mecum <[email protected]>
---
.github/workflows/java.yml | 8 ++---
c/driver_manager/adbc_driver_manager_test.cc | 40 +++++++++++-----------
ci/scripts/python_venv_test.sh | 16 ++++-----
.../driver/jni/MultiDriverIntegrationTest.java | 6 ++--
.../adbc/driver/jni/SqlServerIntegrationTest.java | 4 +--
.../adbc_driver_manager/_dbapi_backend.py | 2 +-
.../adbc_driver_manager/dbapi.py | 5 ++-
.../tests/test_dbapi_polars_nopyarrow.py | 6 ++--
8 files changed, 43 insertions(+), 44 deletions(-)
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
index 3a0696737..1eea72513 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -354,10 +354,10 @@ jobs:
tar xvf mssql_linux_amd64_v1.4.0.tar.gz
mkdir -p ~/.config/adbc/drivers/
mv libadbc_driver_mssql.so ~/.config/adbc/drivers/
- echo "manifest_version = 1" > ~/.config/adbc/drivers/mssql.toml
- echo "[Driver]" >> ~/.config/adbc/drivers/mssql.toml
- echo "shared = '$HOME/.config/adbc/drivers/libadbc_driver_mssql.so'"
>> ~/.config/adbc/drivers/mssql.toml
- cat ~/.config/adbc/drivers/mssql.toml
+ echo "manifest_version = 1" > ~/.config/adbc/drivers/test_mssql.toml
+ echo "[Driver]" >> ~/.config/adbc/drivers/test_mssql.toml
+ echo "shared = '$HOME/.config/adbc/drivers/libadbc_driver_mssql.so'"
>> ~/.config/adbc/drivers/test_mssql.toml
+ cat ~/.config/adbc/drivers/test_mssql.toml
- name: Test
run: |
diff --git a/c/driver_manager/adbc_driver_manager_test.cc
b/c/driver_manager/adbc_driver_manager_test.cc
index 750b7fea7..cecfc4b10 100644
--- a/c/driver_manager/adbc_driver_manager_test.cc
+++ b/c/driver_manager/adbc_driver_manager_test.cc
@@ -753,28 +753,28 @@ class DriverManifest : public ::testing::Test {
};
TEST_F(DriverManifest, LoadDriverEnv) {
- ASSERT_THAT(AdbcFindLoadDriver("sqlite", nullptr, ADBC_VERSION_1_1_0,
+ ASSERT_THAT(AdbcFindLoadDriver("test_sqlite", nullptr, ADBC_VERSION_1_1_0,
ADBC_LOAD_FLAG_DEFAULT, nullptr, &driver,
&error),
Not(IsOkStatus(&error)));
- std::ofstream test_manifest_file(temp_dir / "sqlite.toml");
+ std::ofstream test_manifest_file(temp_dir / "test_sqlite.toml");
ASSERT_TRUE(test_manifest_file.is_open());
test_manifest_file << simple_manifest;
test_manifest_file.close();
SetDriverPath(temp_dir.string().c_str());
- ASSERT_THAT(AdbcFindLoadDriver("sqlite", nullptr, ADBC_VERSION_1_1_0,
+ ASSERT_THAT(AdbcFindLoadDriver("test_sqlite", nullptr, ADBC_VERSION_1_1_0,
ADBC_LOAD_FLAG_DEFAULT, nullptr, &driver,
&error),
IsOkStatus(&error));
- ASSERT_TRUE(std::filesystem::remove(temp_dir / "sqlite.toml"));
+ ASSERT_TRUE(std::filesystem::remove(temp_dir / "test_sqlite.toml"));
UnsetDriverPath();
}
TEST_F(DriverManifest, LoadNonAsciiPath) {
- ASSERT_THAT(AdbcFindLoadDriver("sqlite", nullptr, ADBC_VERSION_1_1_0,
+ ASSERT_THAT(AdbcFindLoadDriver("test_sqlite", nullptr, ADBC_VERSION_1_1_0,
ADBC_LOAD_FLAG_DEFAULT, nullptr, &driver,
&error),
Not(IsOkStatus(&error)));
@@ -786,24 +786,24 @@ TEST_F(DriverManifest, LoadNonAsciiPath) {
ASSERT_TRUE(std::filesystem::create_directories(non_ascii_dir));
- std::ofstream test_manifest_file(non_ascii_dir / "sqlite.toml");
+ std::ofstream test_manifest_file(non_ascii_dir / "test_sqlite.toml");
ASSERT_TRUE(test_manifest_file.is_open());
test_manifest_file << simple_manifest;
test_manifest_file.close();
SetDriverPath(non_ascii_dir.string().c_str());
- ASSERT_THAT(AdbcFindLoadDriver("sqlite", nullptr, ADBC_VERSION_1_1_0,
+ ASSERT_THAT(AdbcFindLoadDriver("test_sqlite", nullptr, ADBC_VERSION_1_1_0,
ADBC_LOAD_FLAG_DEFAULT, nullptr, &driver,
&error),
IsOkStatus(&error));
- ASSERT_TRUE(std::filesystem::remove(non_ascii_dir / "sqlite.toml"));
+ ASSERT_TRUE(std::filesystem::remove(non_ascii_dir / "test_sqlite.toml"));
UnsetDriverPath();
}
TEST_F(DriverManifest, DisallowEnvConfig) {
- std::ofstream test_manifest_file(temp_dir / "sqlite.toml");
+ std::ofstream test_manifest_file(temp_dir / "test_sqlite.toml");
ASSERT_TRUE(test_manifest_file.is_open());
test_manifest_file << simple_manifest;
test_manifest_file.close();
@@ -811,11 +811,11 @@ TEST_F(DriverManifest, DisallowEnvConfig) {
SetDriverPath(temp_dir.string().c_str());
auto load_options = ADBC_LOAD_FLAG_DEFAULT & ~ADBC_LOAD_FLAG_SEARCH_ENV;
- ASSERT_THAT(AdbcFindLoadDriver("sqlite", nullptr, ADBC_VERSION_1_1_0,
load_options,
+ ASSERT_THAT(AdbcFindLoadDriver("test_sqlite", nullptr, ADBC_VERSION_1_1_0,
load_options,
nullptr, &driver, &error),
Not(IsOkStatus(&error)));
- ASSERT_TRUE(std::filesystem::remove(temp_dir / "sqlite.toml"));
+ ASSERT_TRUE(std::filesystem::remove(temp_dir / "test_sqlite.toml"));
UnsetDriverPath();
}
@@ -1036,7 +1036,7 @@ TEST_F(DriverManifest,
ManifestDriverMissingArchAdbcDatabase) {
// Similar test as above but with AdbcDatabaseInit path and using the
// additional search path.
// Create a manifest without the "Driver" section
- auto filepath = temp_dir / "sqlite.toml";
+ auto filepath = temp_dir / "test_sqlite.toml";
toml::table manifest_without_driver = simple_manifest;
manifest_without_driver.erase("Driver");
manifest_without_driver.insert("Driver",
@@ -1055,7 +1055,7 @@ TEST_F(DriverManifest,
ManifestDriverMissingArchAdbcDatabase) {
adbc_validation::Handle<struct AdbcDatabase> database;
ASSERT_THAT(AdbcDatabaseNew(&database.value, &error), IsOkStatus(&error));
- ASSERT_THAT(AdbcDatabaseSetOption(&database.value, "driver", "sqlite",
&error),
+ ASSERT_THAT(AdbcDatabaseSetOption(&database.value, "driver", "test_sqlite",
&error),
IsOkStatus(&error));
ASSERT_THAT(AdbcDriverManagerDatabaseSetLoadFlags(&database.value,
ADBC_LOAD_FLAG_DEFAULT,
&error),
@@ -1066,7 +1066,7 @@ TEST_F(DriverManifest,
ManifestDriverMissingArchAdbcDatabase) {
IsOkStatus(&error));
ASSERT_THAT(AdbcDatabaseInit(&database.value, &error),
IsStatus(ADBC_STATUS_NOT_FOUND, &error));
- ASSERT_THAT(error.message, ::testing::HasSubstr("sqlite.toml but:"));
+ ASSERT_THAT(error.message, ::testing::HasSubstr("test_sqlite.toml but:"));
ASSERT_THAT(error.message,
::testing::HasSubstr("Architectures found: non-existent
windows-alpha64"));
@@ -1077,7 +1077,7 @@ TEST_F(DriverManifest, ManifestDriverPointsNowhere) {
// Similar test as above but with AdbcDatabaseInit path and using the
// additional search path.
// Create a manifest without the "Driver" section
- auto filepath = temp_dir / "sqlite.toml";
+ auto filepath = temp_dir / "test_sqlite.toml";
toml::table manifest_without_driver = simple_manifest;
manifest_without_driver.erase("Driver");
// The idea is that we can find the manifest, but not the driver it points
to.
@@ -1100,7 +1100,7 @@ TEST_F(DriverManifest, ManifestDriverPointsNowhere) {
adbc_validation::Handle<struct AdbcDatabase> database;
ASSERT_THAT(AdbcDatabaseNew(&database.value, &error), IsOkStatus(&error));
- ASSERT_THAT(AdbcDatabaseSetOption(&database.value, "driver", "sqlite",
&error),
+ ASSERT_THAT(AdbcDatabaseSetOption(&database.value, "driver", "test_sqlite",
&error),
IsOkStatus(&error));
ASSERT_THAT(AdbcDriverManagerDatabaseSetLoadFlags(&database.value,
ADBC_LOAD_FLAG_DEFAULT,
&error),
@@ -1111,7 +1111,7 @@ TEST_F(DriverManifest, ManifestDriverPointsNowhere) {
IsOkStatus(&error));
ASSERT_THAT(AdbcDatabaseInit(&database.value, &error),
IsStatus(ADBC_STATUS_NOT_FOUND, &error));
- ASSERT_THAT(error.message, ::testing::HasSubstr("sqlite.toml but:"));
+ ASSERT_THAT(error.message, ::testing::HasSubstr("test_sqlite.toml but:"));
// Message is platform-specific but something like "dlopen() failed:
// adbc-goosedb: cannot open shared object file..."
ASSERT_THAT(error.message, ::testing::HasSubstr("adbc-goosedb"));
@@ -1337,7 +1337,7 @@ TEST_F(DriverManifest, CondaPrefix) {
std::cerr << "ADBC_CONDA_BUILD: " << (is_conda_build ? "defined" : "not
defined")
<< std::endl;
- auto filepath = temp_dir / "etc" / "adbc" / "drivers" / "sqlite.toml";
+ auto filepath = temp_dir / "etc" / "adbc" / "drivers" / "test_sqlite.toml";
std::filesystem::create_directories(filepath.parent_path());
std::ofstream test_manifest_file(filepath);
ASSERT_TRUE(test_manifest_file.is_open());
@@ -1351,8 +1351,8 @@ TEST_F(DriverManifest, CondaPrefix) {
#endif // _WIN32
AdbcStatusCode result =
- AdbcFindLoadDriver("sqlite", nullptr, ADBC_VERSION_1_1_0,
ADBC_LOAD_FLAG_DEFAULT,
- nullptr, &driver, &error);
+ AdbcFindLoadDriver("test_sqlite", nullptr, ADBC_VERSION_1_1_0,
+ ADBC_LOAD_FLAG_DEFAULT, nullptr, &driver, &error);
if constexpr (is_conda_build) {
ASSERT_THAT(result, IsOkStatus(&error));
diff --git a/ci/scripts/python_venv_test.sh b/ci/scripts/python_venv_test.sh
index a0400ea38..727e5be3e 100755
--- a/ci/scripts/python_venv_test.sh
+++ b/ci/scripts/python_venv_test.sh
@@ -32,16 +32,16 @@ main() {
"${scratch}"/.venv/bin/python -m pip install pyarrow
mkdir -p "${scratch}/.venv/etc/adbc/drivers/"
- cat >"${scratch}/.venv/etc/adbc/drivers/sqlite.toml" <<EOF
+ cat >"${scratch}/.venv/etc/adbc/drivers/test_sqlite.toml" <<EOF
name = "SQLite"
[Driver]
shared = "${sqlite_driver}"
EOF
- mkdir -p "${scratch}/.venv/etc/adbc/profiles/sqlite/"
- cat >"${scratch}/.venv/etc/adbc/profiles/sqlite/dev.toml" <<EOF
+ mkdir -p "${scratch}/.venv/etc/adbc/profiles/test_sqlite/"
+ cat >"${scratch}/.venv/etc/adbc/profiles/test_sqlite/dev.toml" <<EOF
profile_version = 1
-driver = "sqlite"
+driver = "test_sqlite"
[Options]
uri = "file:///tmp/test.db"
EOF
@@ -49,7 +49,7 @@ EOF
cat >"${scratch}/test.py" <<EOF
import adbc_driver_manager.dbapi
-with adbc_driver_manager.dbapi.connect(driver="sqlite") as con:
+with adbc_driver_manager.dbapi.connect(driver="test_sqlite") as con:
with con.cursor() as cur:
cur.execute("SELECT 1")
assert cur.fetchall() == [(1,)]
@@ -77,7 +77,7 @@ EOF
cat >"${scratch}/test3.py" <<EOF
import adbc_driver_manager.dbapi
-with adbc_driver_manager.dbapi.connect(profile="sqlite/dev") as con:
+with adbc_driver_manager.dbapi.connect(profile="test_sqlite/dev") as con:
with con.cursor() as cur:
cur.execute("SELECT 1")
assert cur.fetchall() == [(1,)]
@@ -95,7 +95,7 @@ import adbc_driver_manager.dbapi
db_kwargs = {
"additional_profile_search_path_list": "/",
}
-with adbc_driver_manager.dbapi.connect(profile="sqlite/dev",
db_kwargs=db_kwargs) as con:
+with adbc_driver_manager.dbapi.connect(profile="test_sqlite/dev",
db_kwargs=db_kwargs) as con:
with con.cursor() as cur:
cur.execute("SELECT 1")
assert cur.fetchall() == [(1,)]
@@ -113,7 +113,7 @@ import adbc_driver_manager.dbapi
db_kwargs = {
"additional_manifest_search_path_list": "/",
}
-with adbc_driver_manager.dbapi.connect(driver="sqlite", db_kwargs=db_kwargs)
as con:
+with adbc_driver_manager.dbapi.connect(driver="test_sqlite",
db_kwargs=db_kwargs) as con:
with con.cursor() as cur:
cur.execute("SELECT 1")
assert cur.fetchall() == [(1,)]
diff --git
a/java/driver/jni-validation/src/test/java/org/apache/arrow/adbc/driver/jni/MultiDriverIntegrationTest.java
b/java/driver/jni-validation/src/test/java/org/apache/arrow/adbc/driver/jni/MultiDriverIntegrationTest.java
index 7eba840a0..06700ab7d 100644
---
a/java/driver/jni-validation/src/test/java/org/apache/arrow/adbc/driver/jni/MultiDriverIntegrationTest.java
+++
b/java/driver/jni-validation/src/test/java/org/apache/arrow/adbc/driver/jni/MultiDriverIntegrationTest.java
@@ -73,7 +73,7 @@ public class MultiDriverIntegrationTest {
{
System.err.println("Connecting to MSSQL with URI: " +
SqlServerIntegrationTest.URI);
Map<String, Object> parameters = new HashMap<>();
- JniDriver.PARAM_DRIVER.set(parameters, "mssql");
+ JniDriver.PARAM_DRIVER.set(parameters, "test_mssql");
AdbcDriver.PARAM_URI.set(parameters, SqlServerIntegrationTest.URI);
mssqlDb = driver.open(parameters);
mssqlConn = mssqlDb.connect();
@@ -126,7 +126,7 @@ public class MultiDriverIntegrationTest {
@Test
void errorFailedConnection() throws Exception {
Map<String, Object> parameters = new HashMap<>();
- JniDriver.PARAM_DRIVER.set(parameters, "mssql");
+ JniDriver.PARAM_DRIVER.set(parameters, "test_mssql");
AdbcDriver.PARAM_URI.set(parameters, "mssql://localhost:9999");
try (var db = driver.open(parameters)) {
assertThatThrownBy(db::connect).hasMessageContaining("Could not get
connection");
@@ -136,7 +136,7 @@ public class MultiDriverIntegrationTest {
@Test
void errorBadConnectionParameter() throws Exception {
Map<String, Object> parameters = new HashMap<>();
- JniDriver.PARAM_DRIVER.set(parameters, "mssql");
+ JniDriver.PARAM_DRIVER.set(parameters, "test_mssql");
parameters.put("this parameter does not exist", "");
AdbcDriver.PARAM_URI.set(parameters, "mssql://localhost:9999");
assertThatThrownBy(() -> driver.open(parameters))
diff --git
a/java/driver/jni-validation/src/test/java/org/apache/arrow/adbc/driver/jni/SqlServerIntegrationTest.java
b/java/driver/jni-validation/src/test/java/org/apache/arrow/adbc/driver/jni/SqlServerIntegrationTest.java
index e059f92fa..acf1d9907 100644
---
a/java/driver/jni-validation/src/test/java/org/apache/arrow/adbc/driver/jni/SqlServerIntegrationTest.java
+++
b/java/driver/jni-validation/src/test/java/org/apache/arrow/adbc/driver/jni/SqlServerIntegrationTest.java
@@ -86,7 +86,7 @@ class SqlServerIntegrationTest {
allocator = new RootAllocator();
driver = new JniDriver(allocator);
Map<String, Object> parameters = new HashMap<>();
- JniDriver.PARAM_DRIVER.set(parameters, "mssql");
+ JniDriver.PARAM_DRIVER.set(parameters, "test_mssql");
AdbcDriver.PARAM_URI.set(parameters, URI);
db = driver.open(parameters);
conn = db.connect();
@@ -104,7 +104,7 @@ class SqlServerIntegrationTest {
File profile = tempDir.resolve("myprofile.toml").toFile();
Files.writeString(
profile.toPath(),
- String.format("profile_version =
1\ndriver=\"mssql\"\n[Options]\nuri=\"%s\"\n", URI));
+ String.format("profile_version =
1\ndriver=\"test_mssql\"\n[Options]\nuri=\"%s\"\n", URI));
Map<String, Object> parameters = new HashMap<>();
JniDriver.PARAM_PROFILE.set(parameters, "myprofile");
diff --git a/python/adbc_driver_manager/adbc_driver_manager/_dbapi_backend.py
b/python/adbc_driver_manager/adbc_driver_manager/_dbapi_backend.py
index 06c5fe995..36b669106 100644
--- a/python/adbc_driver_manager/adbc_driver_manager/_dbapi_backend.py
+++ b/python/adbc_driver_manager/adbc_driver_manager/_dbapi_backend.py
@@ -212,7 +212,7 @@ try:
def import_array_stream(
self, handle: _lib.ArrowArrayStreamHandle
) -> typing.Any:
- return polars.from_arrow(handle)
+ return polars.DataFrame(handle) # pyright:
ignore[reportArgumentType]
def import_schema(self, handle: _lib.ArrowSchemaHandle) -> typing.Any:
raise _lib.NotSupportedError("Polars does not support
__arrow_c_schema__")
diff --git a/python/adbc_driver_manager/adbc_driver_manager/dbapi.py
b/python/adbc_driver_manager/adbc_driver_manager/dbapi.py
index 254ab34f5..4af2e3a50 100644
--- a/python/adbc_driver_manager/adbc_driver_manager/dbapi.py
+++ b/python/adbc_driver_manager/adbc_driver_manager/dbapi.py
@@ -1540,9 +1540,8 @@ class _RowIterator(_Closeable):
import polars
return _blocking_call(
- lambda: typing.cast(
- polars.DataFrame,
- polars.from_arrow(self.fetch_arrow()),
+ lambda: polars.DataFrame(
+ self.fetch_arrow() # pyright: ignore[reportArgumentType]
),
(),
{},
diff --git a/python/adbc_driver_manager/tests/test_dbapi_polars_nopyarrow.py
b/python/adbc_driver_manager/tests/test_dbapi_polars_nopyarrow.py
index de3bfc363..7277b3d7e 100644
--- a/python/adbc_driver_manager/tests/test_dbapi_polars_nopyarrow.py
+++ b/python/adbc_driver_manager/tests/test_dbapi_polars_nopyarrow.py
@@ -83,7 +83,7 @@ def test_query(sqlite: dbapi.Connection) -> None:
with sqlite.cursor() as cursor:
cursor.execute("SELECT 1 AS theresult")
capsule = cursor.fetch_arrow()
- df = polars.from_arrow(capsule)
+ df = polars.DataFrame(capsule)
polars.testing.assert_frame_equal(
df,
polars.DataFrame(
@@ -274,7 +274,7 @@ def test_query_not_permitted(sqlite: dbapi.Connection) ->
None:
capsule = cursor.fetch_arrow()
# Import the result to free memory
- polars.from_arrow(capsule)
+ polars.DataFrame(capsule)
def test_query_double_capsule(sqlite: dbapi.Connection) -> None:
@@ -287,7 +287,7 @@ def test_query_double_capsule(sqlite: dbapi.Connection) ->
None:
cursor.fetch_arrow()
# Import the result to free memory
- polars.from_arrow(capsule)
+ polars.DataFrame(capsule)
@pytest.mark.xfail(raises=dbapi.NotSupportedError)
