Skip to content

feat: support postgresql #286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
houqp merged 11 commits into from
Aug 29, 2023
Merged

feat: support postgresql #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
320105c
feat: support postgresql
holicc Jul 20, 2023
7e7c271
fix: foramt
holicc Jul 23, 2023
676fb2a
fix test and build
holicc Jul 27, 2023
1cd54b6
Merge branch 'roapi:main' into main
holicc Jul 27, 2023
b1cd480
Merge branch 'roapi:main' into main
holicc Aug 23, 2023
e985220
Merge branch 'roapi:main' into main
holicc Aug 28, 2023
c54fcc5
fix: try fix macos build error
holicc Aug 29, 2023
ac5f943
fix mac_cross_build
holicc Aug 29, 2023
6bdcc1d
fix typo in build.yml
holicc Aug 29, 2023
272864e
lint codes
holicc Aug 29, 2023
a9c8474
fix lint
holicc Aug 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ jobs:
# set SDKROOT for C dependencies
export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
cd roapi && \
cargo build --bin roapi --features database --target aarch64-apple-darwin
cargo build --bin roapi --features database-sqlite,database-mysql --target aarch64-apple-darwin
- name: Trim cache
run: |
which cargo-cache || cargo install cargo-cache
Expand Down
91 changes: 85 additions & 6 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ Data layer:
- [x] Google spreadsheet
- [x] MySQL
- [x] SQLite
- [ ] Postgres
- [x] Postgres
- [ ] Airtable
- Data format
- [x] CSV
Expand Down
7 changes: 5 additions & 2 deletions columnq/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ path = "src/lib.rs"
[dependencies]
# pulling arrow-schema manually to enable the serde feature.
# TODO: add serde feature in datafusion to avoid this workaround
arrow-schema = { version ="37.0.0", features = ["serde"] }
arrow-schema = { version = "37.0.0", features = ["serde"] }

datafusion = "23"
object_store = { version = "0.5.6", features = ["aws_profile", "gcp", "azure"] }
Expand All @@ -24,7 +24,7 @@ log = "0"
regex = "1"
lazy_static = "1"
graphql-parser = "0"
sqlparser = "0.33" # version need to be in sync with convergence
sqlparser = "0.33" # version need to be in sync with convergence
yup-oauth2 = { version = "6.2", default-features = false, features = [
"service_account",
] }
Expand All @@ -44,6 +44,7 @@ tokio = { version = "1", features = ["rt-multi-thread"] }
futures = "0.3"
hyper-tls = { version = "0.5.0", default-features = false, optional = true }
hyper-rustls = { version = "0.23.2", default-features = false, optional = true }
tokio-postgres = { version = "0.7.8", optional = true }

[dependencies.deltalake]
default-features = false
Expand Down Expand Up @@ -92,7 +93,9 @@ native-tls = [
simd = ["datafusion/simd"]
database-sqlite = ["connectorx/src_sqlite"]
database-mysql = ["connectorx/src_mysql"]
database-postgres = ["connectorx/src_postgres", "dep:tokio-postgres"]
database = [
"database-sqlite",
"database-mysql",
"database-postgres"
]
Loading