Do not depends on arrow directly

Author: tyt2y3

sea-orm-sync/src/entity/active_model.rs

@@ -535,7 +535,7 @@ pub trait ActiveModelTrait: Clone + Debug {
     /// are attempted first. If the model uses time-crate types, the conversion
     /// automatically falls back to the time-crate representation.
     #[cfg(feature = "with-arrow")]
-    fn from_arrow(batch: &arrow::array::RecordBatch) -> Result<Vec<Self>, DbErr> {
+    fn from_arrow(batch: &sea_orm_arrow::arrow::array::RecordBatch) -> Result<Vec<Self>, DbErr> {
         use crate::{IdenStatic, Iterable, with_arrow::arrow_array_to_value};
 
         let num_rows = batch.num_rows();
@@ -602,12 +602,12 @@ pub trait ActiveModelTrait: Clone + Debug {
     #[cfg(feature = "with-arrow")]
     fn to_arrow(
         models: &[Self],
-        schema: &arrow::datatypes::Schema,
-    ) -> Result<arrow::array::RecordBatch, DbErr> {
+        schema: &sea_orm_arrow::arrow::datatypes::Schema,
+    ) -> Result<sea_orm_arrow::arrow::array::RecordBatch, DbErr> {
         use crate::{Iterable, with_arrow::option_values_to_arrow_array};
         use std::sync::Arc;
 
-        let mut columns: Vec<Arc<dyn arrow::array::Array>> =
+        let mut columns: Vec<Arc<dyn sea_orm_arrow::arrow::array::Array>> =
             Vec::with_capacity(schema.fields().len());
 
         for field in schema.fields() {
@@ -630,12 +630,13 @@ pub trait ActiveModelTrait: Clone + Debug {
                 columns.push(array);
             } else {
                 // Field in schema but not in entity → null column
-                let array = arrow::array::new_null_array(field.data_type(), models.len());
+                let array =
+                    sea_orm_arrow::arrow::array::new_null_array(field.data_type(), models.len());
                 columns.push(array);
             }
         }
 
-        arrow::array::RecordBatch::try_new(Arc::new(schema.clone()), columns)
+        sea_orm_arrow::arrow::array::RecordBatch::try_new(Arc::new(schema.clone()), columns)
             .map_err(|e| DbErr::Type(format!("Failed to create RecordBatch: {e}")))
     }
 

sea-orm-sync/src/entity/arrow_schema.rs

@@ -1,5 +1,5 @@
 /// Trait for Entities with Arrow integration
 pub trait ArrowSchema {
     /// Get the Arrow schema for this Entity
-    fn arrow_schema() -> arrow::datatypes::Schema;
+    fn arrow_schema() -> sea_orm_arrow::arrow::datatypes::Schema;
 }

sea-orm-sync/src/entity/with_arrow.rs

@@ -1,5 +1,5 @@
 use crate::DbErr;
-use arrow::array::Array;
+use sea_orm_arrow::arrow::array::Array;
 use sea_query::{ColumnType, Value};
 
 pub use sea_orm_arrow::ArrowError;
@@ -33,7 +33,7 @@ pub(crate) fn is_datetime_column(col_type: &ColumnType) -> bool {
 
 pub(crate) fn option_values_to_arrow_array(
     values: &[Option<Value>],
-    data_type: &arrow::datatypes::DataType,
+    data_type: &sea_orm_arrow::arrow::datatypes::DataType,
 ) -> Result<std::sync::Arc<dyn Array>, DbErr> {
     sea_orm_arrow::option_values_to_arrow_array(values, data_type).map_err(Into::into)
 }

sea-orm-sync/src/lib.rs

@@ -749,7 +749,7 @@ pub use sea_orm_macros::EnumIter;
 pub use strum;
 
 #[cfg(feature = "with-arrow")]
-pub use arrow;
+pub use sea_orm_arrow::arrow;
 
 #[cfg(feature = "sqlx-dep")]
 pub use sqlx;

src/entity/active_model.rs

@@ -543,7 +543,7 @@ pub trait ActiveModelTrait: Clone + Debug {
     /// are attempted first. If the model uses time-crate types, the conversion
     /// automatically falls back to the time-crate representation.
     #[cfg(feature = "with-arrow")]
-    fn from_arrow(batch: &arrow::array::RecordBatch) -> Result<Vec<Self>, DbErr> {
+    fn from_arrow(batch: &sea_orm_arrow::arrow::array::RecordBatch) -> Result<Vec<Self>, DbErr> {
         use crate::{IdenStatic, Iterable, with_arrow::arrow_array_to_value};
 
         let num_rows = batch.num_rows();
@@ -610,12 +610,12 @@ pub trait ActiveModelTrait: Clone + Debug {
     #[cfg(feature = "with-arrow")]
     fn to_arrow(
         models: &[Self],
-        schema: &arrow::datatypes::Schema,
-    ) -> Result<arrow::array::RecordBatch, DbErr> {
+        schema: &sea_orm_arrow::arrow::datatypes::Schema,
+    ) -> Result<sea_orm_arrow::arrow::array::RecordBatch, DbErr> {
         use crate::{Iterable, with_arrow::option_values_to_arrow_array};
         use std::sync::Arc;
 
-        let mut columns: Vec<Arc<dyn arrow::array::Array>> =
+        let mut columns: Vec<Arc<dyn sea_orm_arrow::arrow::array::Array>> =
             Vec::with_capacity(schema.fields().len());
 
         for field in schema.fields() {
@@ -638,12 +638,13 @@ pub trait ActiveModelTrait: Clone + Debug {
                 columns.push(array);
             } else {
                 // Field in schema but not in entity → null column
-                let array = arrow::array::new_null_array(field.data_type(), models.len());
+                let array =
+                    sea_orm_arrow::arrow::array::new_null_array(field.data_type(), models.len());
                 columns.push(array);
             }
         }
 
-        arrow::array::RecordBatch::try_new(Arc::new(schema.clone()), columns)
+        sea_orm_arrow::arrow::array::RecordBatch::try_new(Arc::new(schema.clone()), columns)
             .map_err(|e| DbErr::Type(format!("Failed to create RecordBatch: {e}")))
     }
 

src/entity/arrow_schema.rs

@@ -1,5 +1,5 @@
 /// Trait for Entities with Arrow integration
 pub trait ArrowSchema {
     /// Get the Arrow schema for this Entity
-    fn arrow_schema() -> arrow::datatypes::Schema;
+    fn arrow_schema() -> sea_orm_arrow::arrow::datatypes::Schema;
 }

src/entity/with_arrow.rs

@@ -33,7 +33,7 @@ pub(crate) fn is_datetime_column(col_type: &ColumnType) -> bool {
 
 pub(crate) fn option_values_to_arrow_array(
     values: &[Option<Value>],
-    data_type: &arrow::datatypes::DataType,
+    data_type: &sea_orm_arrow::arrow::datatypes::DataType,
 ) -> Result<std::sync::Arc<dyn Array>, DbErr> {
     sea_orm_arrow::option_values_to_arrow_array(values, data_type).map_err(Into::into)
 }

src/lib.rs

@@ -749,7 +749,7 @@ pub use sea_orm_macros::EnumIter;
 pub use strum;
 
 #[cfg(feature = "with-arrow")]
-pub use arrow;
+pub use sea_orm_arrow::arrow;
 
 #[cfg(feature = "sqlx-dep")]
 pub use sqlx;