Annotate Statement::complete_async with odbc 3.8

pacman82 · Apr 4, 2023 · 4efbb4b · 4efbb4b
1 parent b0c388f
commit 4efbb4b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.56.1
+
+* Fix: `Statement::complete_async` is now annotated to be only available in ODBC version 3.8. This missing annotation prevented compilation then specifying ODBC version 3.5.
+
 ## 0.56.0
 
 * `CursorRow::get_variadic` is now private as it was always intended to be a private implemenatation detail.

diff --git a/odbc-api/Cargo.toml b/odbc-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "odbc-api"
-version = "0.56.0"
+version = "0.56.1"
 authors = ["Markus Klein"]
 edition = "2021"
 license = "MIT"

diff --git a/odbc-api/src/handles/statement.rs b/odbc-api/src/handles/statement.rs
@@ -11,12 +11,15 @@ use super::{
 };
 use odbc_sys::{
     Desc, FreeStmtOption, HDbc, HStmt, Handle, HandleType, Len, ParamType, Pointer, SQLBindCol,
-    SQLBindParameter, SQLCloseCursor, SQLCompleteAsync, SQLDescribeParam, SQLExecute, SQLFetch,
+    SQLBindParameter, SQLCloseCursor, SQLDescribeParam, SQLExecute, SQLFetch,
     SQLFreeStmt, SQLGetData, SQLMoreResults, SQLNumParams, SQLNumResultCols, SQLParamData,
     SQLPutData, SQLRowCount, SqlDataType, SqlReturn, StatementAttribute, IS_POINTER,
 };
 use std::{ffi::c_void, marker::PhantomData, mem::ManuallyDrop, ptr::null_mut};
 
+#[cfg(feature="odbc_version_3_80")]
+use odbc_sys::SQLCompleteAsync;
+
 #[cfg(feature = "narrow")]
 use odbc_sys::{
     SQLColAttribute as sql_col_attribute, SQLColumns as sql_columns,
@@ -882,6 +885,7 @@ pub trait Statement: AsHandle {
     /// to notification mode) the driver manager has not notified the application.
     ///
     /// See: <https://learn.microsoft.com/en-us/sql/odbc/reference/syntax/sqlcompleteasync-function>
+    #[cfg(feature="odbc_version_3_80")]
     fn complete_async(&mut self, function_name: &'static str) -> SqlResult<SqlResult<()>> {
         let mut ret = SqlReturn::ERROR;
         unsafe {

diff --git a/odbcsv/Cargo.toml b/odbcsv/Cargo.toml
@@ -29,7 +29,7 @@ readme = "Readme.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-odbc-api = { version = "0.56.0", path = "../odbc-api" }
+odbc-api = { version = "0.56.1", path = "../odbc-api" }
 csv = "1.2.1"
 anyhow = "1.0.70"
 stderrlog = "0.5.4"