drivers_buffer_fill returns SqlResult<()>

pacman82 · Sep 26, 2022 · c37869f · c37869f
1 parent f1c9cba
commit c37869f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -7,6 +7,7 @@
 * `SqlResult` has now a new variant `SqlResult::NoData`.
 * `SqlResult::into_result_with_trunaction_check` has been replaced by `SqlResult::into_result_with`.
 * `handles::Environment::driver_connect` now returns `SqlResult<()>` instead of `SqlResult<bool>`.
+* `handles::Environment::drivers_buffer_fill` now returns `SqlResult<()>` instead of `SqlResult<bool>`.
 * `handles::Statement::fetch` now returns now returns `SqlResult<()>` instead of `SqlResult<bool>`.
 
 ### Non Breaking

diff --git a/odbc-api/src/environment.rs b/odbc-api/src/environment.rs
@@ -480,7 +480,7 @@ impl Environment {
                     desc_buf.mut_buf(),
                     attr_buf.mut_buf(),
                 )
-                .into_result(&self.environment)?
+                .into_result_bool(&self.environment)?
             {
                 let description = desc_buf.to_utf8();
                 let attributes = attr_buf.to_utf8();

diff --git a/odbc-api/src/handles/environment.rs b/odbc-api/src/handles/environment.rs
@@ -138,8 +138,8 @@ impl Environment {
         self.handle
     }
 
-    /// List drivers descriptions and driver attribute keywords. Returns `None` to indicate the end
-    /// of the list.
+    /// List drivers descriptions and driver attribute keywords. Returns `NoData` to indicate the
+    /// end of the list.
     ///
     /// # Safety
     ///
@@ -168,7 +168,7 @@ impl Environment {
         direction: FetchOrientation,
         buffer_description: &mut [SqlChar],
         buffer_attributes: &mut [SqlChar],
-    ) -> SqlResult<bool> {
+    ) -> SqlResult<()> {
         sql_drivers(
             self.handle,
             direction,
@@ -179,7 +179,7 @@ impl Environment {
             buffer_attributes.len().try_into().unwrap(),
             null_mut(),
         )
-        .into_sql_result_bool("SQLDrivers")
+        .into_sql_result("SQLDrivers")
     }
 
     /// Use together with [`Environment::drivers_buffer_fill`] to list drivers descriptions and