Skip to content

Commit 775a3e2

Browse files
committed
Merge branch 'main' of github.com:ahirner/datafusion-table-providers into upgrade_datafusion
related to datafusion-contrib#324
2 parents 234b1d4 + 633d7ba commit 775a3e2

16 files changed

Lines changed: 1352 additions & 140 deletions

File tree

.github/workflows/pr.yaml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,3 +107,34 @@ jobs:
107107
108108
- name: Run tests
109109
run: make test
110+
111+
python-integration-test:
112+
name: Python Tests
113+
runs-on: ubuntu-latest
114+
115+
steps:
116+
- uses: actions/checkout@v4
117+
118+
- uses: dtolnay/rust-toolchain@stable
119+
120+
- uses: astral-sh/setup-uv@v5
121+
with:
122+
enable-cache: true
123+
124+
- name: Install ODBC, Sqlite and Roapi
125+
run: |
126+
sudo apt-get install -y unixodbc-dev libsqliteodbc
127+
sudo apt-get install -y libsqlite3-dev
128+
cargo install --locked --git https://github.com/roapi/roapi --branch main --bins roapi
129+
130+
- name: Build Python package
131+
run: |
132+
cd python
133+
uv sync --dev --no-install-package datafusion
134+
uv run --no-project maturin develop --uv
135+
136+
137+
- name: Run Python tests
138+
run: |
139+
cd python/python/tests
140+
uv run --no-project pytest -v .

Cargo.lock

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

core/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fundu = "2.0.1"
5050
futures = "0.3"
5151
geo-types = "0.7"
5252
itertools = "0.14.0"
53-
mysql_async = { version = "0.35", features = [
53+
mysql_async = { version = "0.36", features = [
5454
"native-tls-tls",
5555
"chrono",
5656
"time",
@@ -80,7 +80,7 @@ serde_json = "1.0"
8080
sha2 = "0.10"
8181
snafu = "0.8"
8282
time = "0.3"
83-
tokio = { version = "1.44", features = ["macros", "fs"] }
83+
tokio = { version = "1.45", features = ["macros", "fs"] }
8484
tokio-postgres = { version = "0.7", features = [
8585
"with-chrono-0_4",
8686
"with-uuid-1",
@@ -101,7 +101,7 @@ uuid = { version = "1.16", optional = true }
101101
anyhow = "1.0"
102102
bollard = "0.18.1"
103103
geozero = { version = "0.14.0", features = ["with-wkb"] }
104-
insta = { version = "1.42.0", features = ["filters"] }
104+
insta = { version = "1.43.1", features = ["filters"] }
105105
prost = { version = "0.13" }
106106
rand = "0.9"
107107
reqwest = "0.12"

core/src/sql/arrow_sql_gen/statement.rs

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

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

0 commit comments

Comments
 (0)