Merge branch 'sfu-db:main' into libgssapi

Author: kotval

connectorx-python/src/pandas/transports/oracle.rs

@@ -1,7 +1,7 @@
 use crate::errors::ConnectorXPythonError;
 use crate::pandas::destination::PandasDestination;
 use crate::pandas::typesystem::PandasTypeSystem;
-use chrono::{DateTime, NaiveDate, NaiveDateTime, Utc};
+use chrono::{DateTime, NaiveDateTime, Utc};
 use connectorx::{
     impl_transport,
     sources::oracle::{OracleSource, OracleTypeSystem},
@@ -27,18 +27,12 @@ impl_transport!(
         { Char[String]               => String[String]          | conversion none }
         { NVarChar[String]           => String[String]          | conversion none }
         { NChar[String]              => String[String]          | conversion none }
-        { Date[NaiveDate]            => DateTime[DateTime<Utc>] | conversion option }
-        { Timestamp[NaiveDateTime]   => DateTime[DateTime<Utc>] | conversion option }
+        { Date[NaiveDateTime]        => DateTime[DateTime<Utc>] | conversion option }
+        { Timestamp[NaiveDateTime]   => DateTime[DateTime<Utc>] | conversion none }
         { TimestampTz[DateTime<Utc>] => DateTime[DateTime<Utc>] | conversion auto }
     }
 );
 
-impl<'py> TypeConversion<NaiveDate, DateTime<Utc>> for OraclePandasTransport<'py> {
-    fn convert(val: NaiveDate) -> DateTime<Utc> {
-        DateTime::from_utc(val.and_hms(0, 0, 0), Utc)
-    }
-}
-
 impl<'py> TypeConversion<NaiveDateTime, DateTime<Utc>> for OraclePandasTransport<'py> {
     fn convert(val: NaiveDateTime) -> DateTime<Utc> {
         DateTime::from_utc(val, Utc)

connectorx/src/sources/mysql/typesystem.rs

@@ -115,6 +115,7 @@ impl<'a> From<(&'a ColumnType, &'a ColumnFlags)> for MySQLTypeSystem {
             ColumnType::MYSQL_TYPE_MEDIUM_BLOB => MediumBlob(null_ok),
             ColumnType::MYSQL_TYPE_LONG_BLOB => LongBlob(null_ok),
             ColumnType::MYSQL_TYPE_JSON => Json(null_ok),
+            ColumnType::MYSQL_TYPE_VARCHAR => VarChar(null_ok),
             _ => unimplemented!("{}", format!("{:?}", ty)),
         }
     }

connectorx/src/sources/oracle/typesystem.rs

@@ -1,4 +1,4 @@
-use chrono::{DateTime, NaiveDate, NaiveDateTime, Utc};
+use chrono::{DateTime, NaiveDateTime, Utc};
 use r2d2_oracle::oracle::sql_type::OracleType;
 
 #[derive(Copy, Clone, Debug)]
@@ -26,8 +26,7 @@ impl_typesystem! {
         { Float | NumFloat | BinaryFloat | BinaryDouble => f64 }
         { Blob => Vec<u8>}
         { Clob | VarChar | Char | NVarChar | NChar => String }
-        { Date => NaiveDate }
-        { Timestamp => NaiveDateTime }
+        { Date | Timestamp => NaiveDateTime }
         { TimestampTz => DateTime<Utc> }
     }
 }

connectorx/src/transports/oracle_arrow.rs

@@ -4,7 +4,7 @@ use crate::{
     sources::oracle::{OracleSource, OracleSourceError, OracleTypeSystem},
     typesystem::TypeConversion,
 };
-use chrono::{DateTime, NaiveDate, NaiveDateTime, Utc};
+use chrono::{DateTime, NaiveDateTime, Utc};
 use thiserror::Error;
 
 #[derive(Error, Debug)]
@@ -38,8 +38,8 @@ impl_transport!(
         { Char[String]               => LargeUtf8[String]          | conversion none }
         { NVarChar[String]           => LargeUtf8[String]          | conversion none }
         { NChar[String]              => LargeUtf8[String]          | conversion none }
-        { Date[NaiveDate]            => Date32[NaiveDate]          | conversion auto }
-        { Timestamp[NaiveDateTime]   => Date64[NaiveDateTime]      | conversion auto }
+        { Date[NaiveDateTime]        => Date64[NaiveDateTime]      | conversion auto }
+        { Timestamp[NaiveDateTime]   => Date64[NaiveDateTime]      | conversion none }
         { TimestampTz[DateTime<Utc>] => DateTimeTz[DateTime<Utc>]  | conversion auto }
     }
 );

connectorx/src/transports/oracle_arrow2.rs

@@ -6,7 +6,7 @@ use crate::{
     sources::oracle::{OracleSource, OracleSourceError, OracleTypeSystem},
     typesystem::TypeConversion,
 };
-use chrono::{DateTime, NaiveDate, NaiveDateTime, Utc};
+use chrono::{DateTime, NaiveDateTime, Utc};
 use thiserror::Error;
 
 #[derive(Error, Debug)]
@@ -40,8 +40,8 @@ impl_transport!(
         { Char[String]                  => LargeUtf8[String]            | conversion none }
         { NVarChar[String]              => LargeUtf8[String]            | conversion none }
         { NChar[String]                 => LargeUtf8[String]            | conversion none }
-        { Date[NaiveDate]               => Date32[NaiveDate]            | conversion auto }
-        { Timestamp[NaiveDateTime]      => Date64[NaiveDateTime]        | conversion auto }
+        { Date[NaiveDateTime]           => Date64[NaiveDateTime]        | conversion auto }
+        { Timestamp[NaiveDateTime]      => Date64[NaiveDateTime]        | conversion none }
         { TimestampTz[DateTime<Utc>]    => DateTimeTz[DateTime<Utc>]    | conversion auto }
     }
 );