Moved files

arrow-odbc-integration-testing/src/lib.rs

@@ -1,6 +1,7 @@
 #![cfg(test)]
 
 mod read;
+//mod write;
 
 use arrow2::io::odbc::api::{Connection, Environment, Error as OdbcError};
 use lazy_static::lazy_static;

arrow-odbc-integration-testing/src/read.rs

@@ -5,7 +5,7 @@ use arrow2::chunk::Chunk;
 use arrow2::datatypes::Field;
 use arrow2::error::Result;
 use arrow2::io::odbc::api::{Connection, Cursor};
-use arrow2::io::odbc::{buffer_from_metadata, deserialize, infer_schema};
+use arrow2::io::odbc::read::{buffer_from_metadata, deserialize, infer_schema};
 
 use super::{setup_empty_table, ENV, MSSQL};
 
@@ -110,7 +110,7 @@ fn test(
     Ok(())
 }
 
-fn read(
+pub fn read(
     connection: &Connection<'_>,
     query: &str,
 ) -> Result<(Vec<Field>, Vec<Chunk<Box<dyn Array>>>)> {

src/io/odbc/mod.rs

@@ -1,37 +1,5 @@
-//! API to connect to ODBC
+//! API to serialize and deserialize data from and to ODBC
 pub use odbc_api as api;
 
-mod deserialize;
-mod schema;
-
-pub use deserialize::deserialize;
-pub use schema::infer_schema;
-
-/// Creates a [`api::buffers::ColumnarBuffer`] from the metadata.
-/// # Errors
-/// Iff the driver provides an incorrect [`ResultSetMetadata`]
-pub fn buffer_from_metadata(
-    resut_set_metadata: &impl api::ResultSetMetadata,
-    max_batch_size: usize,
-) -> std::result::Result<api::buffers::ColumnarBuffer<api::buffers::AnyColumnBuffer>, api::Error> {
-    let num_cols: u16 = resut_set_metadata.num_result_cols()? as u16;
-
-    let descs = (0..num_cols)
-        .map(|index| {
-            let mut column_description = api::ColumnDescription::default();
-
-            resut_set_metadata.describe_col(index + 1, &mut column_description)?;
-
-            Ok(api::buffers::BufferDescription {
-                nullable: column_description.could_be_nullable(),
-                kind: api::buffers::BufferKind::from_data_type(column_description.data_type)
-                    .unwrap(),
-            })
-        })
-        .collect::<std::result::Result<Vec<_>, api::Error>>()?;
-
-    Ok(api::buffers::buffer_from_description(
-        max_batch_size,
-        descs.into_iter(),
-    ))
-}
+pub mod read;
+//pub mod write;

src/io/odbc/deserialize.rs → src/io/odbc/read/deserialize.rs

@@ -6,7 +6,7 @@ use crate::buffer::Buffer;
 use crate::datatypes::DataType;
 use crate::types::NativeType;
 
-use super::api::buffers::AnyColumnView;
+use super::super::api::buffers::AnyColumnView;
 
 /// Deserializes a [`AnyColumnView`] into an array of [`DataType`].
 /// This is CPU-bounded

src/io/odbc/read/mod.rs

@@ -0,0 +1,37 @@
+//! APIs to read from ODBC
+mod deserialize;
+mod schema;
+
+pub use deserialize::deserialize;
+pub use schema::infer_schema;
+
+use super::api;
+
+/// Creates a [`api::buffers::ColumnarBuffer`] from the metadata.
+/// # Errors
+/// Iff the driver provides an incorrect [`ResultSetMetadata`]
+pub fn buffer_from_metadata(
+    resut_set_metadata: &impl api::ResultSetMetadata,
+    max_batch_size: usize,
+) -> std::result::Result<api::buffers::ColumnarBuffer<api::buffers::AnyColumnBuffer>, api::Error> {
+    let num_cols: u16 = resut_set_metadata.num_result_cols()? as u16;
+
+    let descs = (0..num_cols)
+        .map(|index| {
+            let mut column_description = api::ColumnDescription::default();
+
+            resut_set_metadata.describe_col(index + 1, &mut column_description)?;
+
+            Ok(api::buffers::BufferDescription {
+                nullable: column_description.could_be_nullable(),
+                kind: api::buffers::BufferKind::from_data_type(column_description.data_type)
+                    .unwrap(),
+            })
+        })
+        .collect::<std::result::Result<Vec<_>, api::Error>>()?;
+
+    Ok(api::buffers::buffer_from_description(
+        max_batch_size,
+        descs.into_iter(),
+    ))
+}

src/io/odbc/schema.rs → src/io/odbc/read/schema.rs

@@ -1,8 +1,8 @@
-use super::api;
-use super::api::ResultSetMetadata;
-
 use crate::datatypes::{DataType, Field, TimeUnit};
-use crate::error::Result;
+use crate::error::{ArrowError, Result};
+
+use super::super::api;
+use super::super::api::ResultSetMetadata;
 
 /// Infers the Arrow [`Field`]s from a [`ResultSetMetadata`]
 pub fn infer_schema(resut_set_metadata: &impl ResultSetMetadata) -> Result<Vec<Field>> {