fix polling with unixODBC

odbc-api/src/buffers.rs

@@ -9,6 +9,7 @@ mod indicator;
 mod item;
 mod text_column;
 
+#[allow(deprecated)]
 pub use self::{
     any_buffer::{
         AnyBuffer, AnyColumnBuffer, AnyColumnSliceMut, AnyColumnView, AnySlice, AnySliceMut,

odbc-api/src/cursor.rs

@@ -5,7 +5,7 @@ use crate::{
     error::ExtendResult,
     handles::{AsStatementRef, SqlResult, State, Statement, StatementRef},
     parameter::{VarBinarySliceMut, VarCharSliceMut},
-    sleep::{poll_until_completed, Sleep},
+    sleep::{wait_for, Sleep},
     Error, OutputParameter, ResultSetMetadata,
 };
 
@@ -567,8 +567,7 @@ where
     ) -> Result<Option<&B>, Error> {
         let mut stmt = self.cursor.as_stmt_ref();
         unsafe {
-            let mut result = stmt.fetch();
-            poll_until_completed(&mut result, "SQLFetch", &mut stmt, &mut sleep).await?;
+            let result = wait_for(|| stmt.fetch(), &mut sleep).await;
             let has_row = error_handling_for_fetch(result, stmt, error_for_truncation)?;
             Ok(has_row.then_some(&self.buffer))
         }

odbc-api/src/execute.rs

@@ -3,7 +3,7 @@ use std::intrinsics::transmute;
 use crate::{
     handles::{AsStatementRef, SqlText, Statement},
     parameter::Blob,
-    sleep::{poll_until_completed, wait_for},
+    sleep::wait_for,
     CursorImpl, CursorPolling, Error, ParameterCollectionRef, Sleep,
 };
 
@@ -145,16 +145,14 @@ where
     S: AsStatementRef,
 {
     let mut stmt = statement.as_stmt_ref();
-    let mut result = if let Some(sql) = query {
+    let result = if let Some(sql) = query {
         // We execute an unprepared "one shot query"
-        stmt.exec_direct(sql)
+        wait_for(|| stmt.exec_direct(sql), &mut sleep).await
     } else {
         // We execute a prepared query
-        stmt.execute()
+        wait_for(|| stmt.execute(), &mut sleep).await
     };
 
-    poll_until_completed(&mut result, "execute", &mut stmt, &mut sleep).await?;
-
     // If delayed parameters (e.g. input streams) are bound we might need to put data in order to
     // execute.
     let need_data =
@@ -171,9 +169,7 @@ where
             let blob_ref = &mut *blob_ptr;
             // Loop over all batches within each blob
             while let Some(batch) = blob_ref.next_batch().map_err(Error::FailedReadingInput)? {
-                let mut result = stmt.put_binary_batch(batch);
-                poll_until_completed(&mut result, "put_binary_batch", &mut stmt, &mut sleep)
-                    .await?;
+                let result = wait_for(|| stmt.put_binary_batch(batch), &mut sleep).await;
                 result.into_result(&stmt)?;
             }
         }

odbc-api/src/sleep.rs

@@ -1,9 +1,6 @@
 use std::future::Future;
 
-use crate::{
-    handles::{SqlResult, Statement},
-    Error,
-};
+use crate::handles::SqlResult;
 
 /// Governs the behaviour of of polling in async functions.
 ///
@@ -41,16 +38,3 @@ where
     }
     ret
 }
-
-pub async fn poll_until_completed(
-    result: &mut SqlResult<()>,
-    function_name: &'static str,
-    stmt: &mut impl Statement,
-    sleep: &mut impl Sleep,
-) -> Result<(), Error> {
-    while *result == SqlResult::StillExecuting {
-        sleep.next_poll().await;
-        *result = stmt.complete_async(function_name).into_result(stmt)?;
-    }
-    Ok(())
-}