add indicator to TruncationDiagnostic

pacman82 · Sep 26, 2023 · 5017f76 · 5017f76
1 parent 8e6b3fb
commit 5017f76
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 7 deletions.
diff --git a/odbc-api/src/buffers/any_buffer.rs b/odbc-api/src/buffers/any_buffer.rs
@@ -4,9 +4,10 @@ use odbc_sys::{CDataType, Date, Time, Timestamp};
 
 use crate::{
     columnar_bulk_inserter::BoundInputSlice,
+    cursor::TruncationDiagnostics,
     error::TooLargeBufferSize,
     handles::{CData, CDataMut, HasDataType, StatementRef},
-    Bit, DataType, Error, cursor::TruncationDiagnostics,
+    Bit, DataType, Error,
 };
 
 use super::{

diff --git a/odbc-api/src/buffers/bin_column.rs b/odbc-api/src/buffers/bin_column.rs
@@ -1,9 +1,10 @@
 use crate::{
     buffers::Indicator,
     columnar_bulk_inserter::BoundInputSlice,
+    cursor::TruncationDiagnostics,
     error::TooLargeBufferSize,
     handles::{CData, CDataMut, HasDataType, Statement, StatementRef},
-    DataType, Error, cursor::TruncationDiagnostics,
+    DataType, Error,
 };
 
 use log::debug;
@@ -111,7 +112,12 @@ impl BinColumn {
             .iter()
             .copied()
             .take(num_rows)
-            .any(|indicator| Indicator::from_isize(indicator).is_truncated(self.max_len)).then_some(TruncationDiagnostics {  })
+            .find_map(|indicator| {
+                let indicator = Indicator::from_isize(indicator);
+                indicator
+                    .is_truncated(self.max_len)
+                    .then_some(TruncationDiagnostics { indicator })
+            })
     }
 
     /// Changes the maximum element length the buffer can hold. This operation is useful if you find

diff --git a/odbc-api/src/buffers/columnar.rs b/odbc-api/src/buffers/columnar.rs
@@ -6,11 +6,12 @@ use std::{
 
 use crate::{
     columnar_bulk_inserter::BoundInputSlice,
+    cursor::TruncationDiagnostics,
     fixed_sized::Pod,
     handles::{CDataMut, Statement, StatementRef},
     parameter::WithDataType,
     result_set_metadata::utf8_display_sizes,
-    Error, ResultSetMetadata, RowSetBuffer, cursor::TruncationDiagnostics,
+    Error, ResultSetMetadata, RowSetBuffer,
 };
 
 use super::{Indicator, TextColumn};

diff --git a/odbc-api/src/buffers/text_column.rs b/odbc-api/src/buffers/text_column.rs
@@ -1,8 +1,9 @@
 use crate::{
     columnar_bulk_inserter::BoundInputSlice,
+    cursor::TruncationDiagnostics,
     error::TooLargeBufferSize,
     handles::{CData, CDataMut, HasDataType, Statement, StatementRef},
-    DataType, Error, cursor::TruncationDiagnostics,
+    DataType, Error,
 };
 
 use super::{ColumnBuffer, Indicator};
@@ -146,7 +147,12 @@ impl<C> TextColumn<C> {
             .iter()
             .copied()
             .take(num_rows)
-            .any(|indicator| Indicator::from_isize(indicator).is_truncated(max_bin_length)).then_some(TruncationDiagnostics {  })
+            .find_map(|indicator| {
+                let indicator = Indicator::from_isize(indicator);
+                indicator
+                    .is_truncated(max_bin_length)
+                    .then_some(TruncationDiagnostics { indicator })
+            })
     }
 
     /// Changes the maximum string length the buffer can hold. This operation is useful if you find
@@ -336,7 +342,12 @@ where
             .iter()
             .copied()
             .take(num_rows)
-            .any(|indicator| Indicator::from_isize(indicator).is_truncated(max_bin_length)).then_some(TruncationDiagnostics {  })
+            .find_map(|indicator| {
+                let indicator = Indicator::from_isize(indicator);
+                indicator
+                    .is_truncated(max_bin_length)
+                    .then_some(TruncationDiagnostics { indicator })
+            })
     }
 }
 

diff --git a/odbc-api/src/cursor.rs b/odbc-api/src/cursor.rs
@@ -417,6 +417,8 @@ unsafe impl<T: RowSetBuffer> RowSetBuffer for &mut T {
 
 /// Additional information in case of writing a value into too short a buffer.
 pub struct TruncationDiagnostics {
+    /// Size indicator reported by the driver indicating the size of the complete value in the DBMS.
+    pub indicator: Indicator,
 }
 
 /// In order to save on network overhead, it is recommended to use block cursors instead of fetching