Skip to content

Commit

Permalink
Use odpic-sys and remove binding code to ODPI-C
Browse files Browse the repository at this point in the history
  • Loading branch information
kubo committed Nov 16, 2024
1 parent ae2d839 commit 5bfb962
Show file tree
Hide file tree
Showing 27 changed files with 57 additions and 6,705 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
name = "oracle"
version = "0.6.3-dev"
authors = ["Kubo Takehiro <[email protected]>"]
build = "build.rs"
repository = "https://github.com/kubo/rust-oracle"
license = "UPL-1.0/Apache-2.0"
keywords = ["oracle", "database"]
Expand All @@ -25,6 +24,7 @@ once_cell = "1.19.0"
paste = "1.0.5"
chrono = { version = "0.4.20", optional = true, default-features = false, features = ["clock"] }
oracle_procmacro = { version = "0.1.2", path = "./oracle_procmacro" }
odpic-sys = "=0.1.0" # ODPI-C 5.4.0

[target.'cfg(windows)'.dependencies]
rustversion = "1.0"
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ This is an [Oracle database][] driver for [Rust][] based on [ODPI-C][].

See [ChangeLog.md](https://github.com/kubo/rust-oracle/blob/master/ChangeLog.md).

## Build-time Requirements
## Compile-time Requirements

* C compiler. See `Compile-time Requirements` in [this document](https://github.com/alexcrichton/cc-rs#compile-time-requirements).
* C compiler. See [`Compile-time Requirements`](https://docs.rs/cc/latest/cc/#compile-time-requirements).

## Run-time Requirements

Expand Down Expand Up @@ -259,7 +259,7 @@ Oracle-related crates:

## License

Rust-oracle and ODPI-C bundled in rust-oracle are under the terms of:
Rust-oracle is under the terms of:

1. [the Universal Permissive License v 1.0 or at your option, any later version](http://oss.oracle.com/licenses/upl); and/or
2. [the Apache License v 2.0](http://www.apache.org/licenses/LICENSE-2.0).
Expand Down
18 changes: 0 additions & 18 deletions build.rs

This file was deleted.

24 changes: 0 additions & 24 deletions run-bindgen.sh

This file was deleted.

2 changes: 1 addition & 1 deletion src/aq.rs
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@
//! # Ok::<(), Error>(())
//! ```
use crate::binding::*;
use crate::chkerr;
use crate::connection::Conn;
use crate::sql_type::Object;
Expand All @@ -116,6 +115,7 @@ use crate::DpiQueue;
use crate::Error;
use crate::OdpiStr;
use crate::Result;
use odpic_sys::*;
use std::borrow::ToOwned;
use std::fmt;
use std::marker::PhantomData;
Expand Down
2 changes: 1 addition & 1 deletion src/batch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
// authors and should not be interpreted as representing official policies, either expressed
// or implied, of the authors.

use crate::binding::*;
use crate::chkerr;
use crate::error::DPI_ERR_BUFFER_SIZE_TOO_SMALL;
use crate::private;
Expand All @@ -48,6 +47,7 @@ use crate::SqlValue;
#[cfg(doc)]
use crate::Statement;
use crate::StatementType;
use odpic_sys::*;
use std::convert::TryFrom;
use std::fmt;
use std::mem::MaybeUninit;
Expand Down
21 changes: 0 additions & 21 deletions src/binding.rs

This file was deleted.

Loading

0 comments on commit 5bfb962

Please sign in to comment.