Skip to content

Commit 5bfb962

Browse files
committed
Use odpic-sys and remove binding code to ODPI-C
1 parent ae2d839 commit 5bfb962

27 files changed

+57
-6705
lines changed

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
name = "oracle"
55
version = "0.6.3-dev"
66
authors = ["Kubo Takehiro <[email protected]>"]
7-
build = "build.rs"
87
repository = "https://github.com/kubo/rust-oracle"
98
license = "UPL-1.0/Apache-2.0"
109
keywords = ["oracle", "database"]
@@ -25,6 +24,7 @@ once_cell = "1.19.0"
2524
paste = "1.0.5"
2625
chrono = { version = "0.4.20", optional = true, default-features = false, features = ["clock"] }
2726
oracle_procmacro = { version = "0.1.2", path = "./oracle_procmacro" }
27+
odpic-sys = "=0.1.0" # ODPI-C 5.4.0
2828

2929
[target.'cfg(windows)'.dependencies]
3030
rustversion = "1.0"

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ This is an [Oracle database][] driver for [Rust][] based on [ODPI-C][].
1010

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

13-
## Build-time Requirements
13+
## Compile-time Requirements
1414

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

1717
## Run-time Requirements
1818

@@ -259,7 +259,7 @@ Oracle-related crates:
259259

260260
## License
261261

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

264264
1. [the Universal Permissive License v 1.0 or at your option, any later version](http://oss.oracle.com/licenses/upl); and/or
265265
2. [the Apache License v 2.0](http://www.apache.org/licenses/LICENSE-2.0).

build.rs

-18
This file was deleted.

run-bindgen.sh

-24
This file was deleted.

src/aq.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@
100100
//! # Ok::<(), Error>(())
101101
//! ```
102102
103-
use crate::binding::*;
104103
use crate::chkerr;
105104
use crate::connection::Conn;
106105
use crate::sql_type::Object;
@@ -116,6 +115,7 @@ use crate::DpiQueue;
116115
use crate::Error;
117116
use crate::OdpiStr;
118117
use crate::Result;
118+
use odpic_sys::*;
119119
use std::borrow::ToOwned;
120120
use std::fmt;
121121
use std::marker::PhantomData;

src/batch.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
// authors and should not be interpreted as representing official policies, either expressed
3131
// or implied, of the authors.
3232

33-
use crate::binding::*;
3433
use crate::chkerr;
3534
use crate::error::DPI_ERR_BUFFER_SIZE_TOO_SMALL;
3635
use crate::private;
@@ -48,6 +47,7 @@ use crate::SqlValue;
4847
#[cfg(doc)]
4948
use crate::Statement;
5049
use crate::StatementType;
50+
use odpic_sys::*;
5151
use std::convert::TryFrom;
5252
use std::fmt;
5353
use std::mem::MaybeUninit;

src/binding.rs

-21
This file was deleted.

0 commit comments

Comments
 (0)