Merge pull request #54 from GiGainfosystems/bump/oracle_0_6_0

Bump oracle version to 0.6.0

Author: weiznich

.github/workflows/ci.yml

@@ -66,8 +66,8 @@ jobs:
           curl -Lo basic.zip https://download.oracle.com/otn_software/linux/instantclient/instantclient-basic-linuxx64.zip
           curl -Lo sqlplus.zip https://download.oracle.com/otn_software/linux/instantclient/instantclient-sqlplus-linuxx64.zip
           mkdir linux
-          unzip basic.zip -d linux
-          unzip sqlplus.zip -d linux
+          unzip -o basic.zip -d linux
+          unzip -o sqlplus.zip -d linux
           IC_DIR=$PWD/$(ls -d linux/instantclient*)
           mkdir windows
           echo LD_LIBRARY_PATH=$IC_DIR:$LD_LIBRARY_PATH >> $GITHUB_ENV

Cargo.toml

@@ -16,7 +16,7 @@ repository = "https://github.com/GiGainfosystems/diesel-oci/"
 documentation = "https://docs.rs/diesel-oci"
 
 [dependencies]
-oracle = {version = "0.5.6", features = ["chrono"]}
+oracle = {version = "0.6.0", features = ["chrono"]}
 url = "2"
 percent-encoding = "2"
 

src/oracle/connection/mod.rs

@@ -23,6 +23,7 @@ use diesel::query_builder::{InsertStatement, QueryId, ValuesClause};
 use diesel::sql_types::HasSqlType;
 use diesel::RunQueryDsl;
 use diesel::{result::*, Table};
+use oracle::ErrorKind;
 
 mod oracle_value;
 pub(crate) use self::oracle_value::InnerValue;
@@ -161,51 +162,49 @@ impl From<oracle::Error> for ErrorHelper {
 
 impl From<ErrorHelper> for diesel::result::Error {
     fn from(ErrorHelper(e): ErrorHelper) -> Self {
-        match e {
-            oracle::Error::OciError(_) => {
+        match (e.kind(), e.db_error()) {
+            (ErrorKind::OciError, _) => {
                 // TODO: better handling here
                 diesel::result::Error::QueryBuilderError(e.into())
             }
-            oracle::Error::DpiError(_) => {
+            (ErrorKind::DpiError, _) => {
                 // TODO: better handling here
                 diesel::result::Error::QueryBuilderError(e.into())
             }
-            oracle::Error::NullValue => diesel::result::Error::DeserializationError(
+            (ErrorKind::NullValue, _) => diesel::result::Error::DeserializationError(
                 diesel::result::UnexpectedNullError.into(),
             ),
-            oracle::Error::ParseError(e) => diesel::result::Error::SerializationError(e),
-            oracle::Error::OutOfRange(e) => diesel::result::Error::DeserializationError(e.into()),
-            oracle::Error::InvalidTypeConversion(from, to) => {
-                diesel::result::Error::DeserializationError(
-                    format!("Cannot convert from {} to {}", from, to).into(),
-                )
+            (ErrorKind::ParseError, _) => diesel::result::Error::SerializationError(e.into()),
+            (ErrorKind::OutOfRange | ErrorKind::InvalidTypeConversion, _) => {
+                diesel::result::Error::DeserializationError(e.into())
             }
-            oracle::Error::InvalidBindIndex(e) => diesel::result::Error::QueryBuilderError(
+            (ErrorKind::InvalidBindIndex, Some(e)) => diesel::result::Error::QueryBuilderError(
                 format!("Invalid bind with index: {}", e).into(),
             ),
-            oracle::Error::InvalidBindName(e) => diesel::result::Error::QueryBuilderError(
+            (ErrorKind::InvalidBindName, Some(e)) => diesel::result::Error::QueryBuilderError(
                 format!("Invalid bind with name: {}", e).into(),
             ),
-            oracle::Error::InvalidColumnIndex(_) => diesel::result::Error::DeserializationError(
+            (ErrorKind::InvalidColumnIndex, _) => diesel::result::Error::DeserializationError(
                 diesel::result::UnexpectedEndOfRow.into(),
             ),
-            oracle::Error::InvalidColumnName(c) => diesel::result::Error::DeserializationError(
-                format!("Invalid column name: {}", c).into(),
+            (ErrorKind::InvalidColumnName, _) => diesel::result::Error::DeserializationError(
+                format!("Invalid column name: {}", e).into(),
             ),
-            oracle::Error::InvalidAttributeName(e) => diesel::result::Error::QueryBuilderError(
+            (ErrorKind::InvalidAttributeName, _) => diesel::result::Error::QueryBuilderError(
                 format!("Invalid attribute name: {}", e).into(),
             ),
-            oracle::Error::InvalidOperation(e) => {
+            (ErrorKind::InvalidOperation, _) => {
                 diesel::result::Error::QueryBuilderError(format!("Invalid operation: {}", e).into())
             }
-            oracle::Error::UninitializedBindValue => {
+            (ErrorKind::UninitializedBindValue, _) => {
                 diesel::result::Error::QueryBuilderError("Uninitialized bind value".into())
             }
-            oracle::Error::NoDataFound => diesel::result::Error::NotFound,
-            oracle::Error::InternalError(e) => diesel::result::Error::QueryBuilderError(e.into()),
-            oracle::Error::BatchErrors(_e) => {
+            (ErrorKind::NoDataFound, _) => diesel::result::Error::NotFound,
+            (ErrorKind::InternalError, _) => diesel::result::Error::QueryBuilderError(e.into()),
+            (ErrorKind::BatchErrors, _) => {
                 diesel::result::Error::QueryBuilderError("Batch error".into())
             }
+            _ => unimplemented!(),
         }
     }
 }
@@ -405,7 +404,7 @@ impl OciConnection {
     fn with_prepared_statement<'conn, 'query, T, R>(
         &'conn mut self,
         query: &T,
-        callback: impl FnOnce(oracle::Statement<'conn>, OracleBindCollector) -> QueryResult<R>,
+        callback: impl FnOnce(oracle::Statement, OracleBindCollector) -> QueryResult<R>,
     ) -> Result<R, Error>
     where
         T: QueryFragment<Oracle> + QueryId + 'query,

src/oracle/connection/oracle_value.rs

@@ -9,7 +9,7 @@ pub struct OracleValue<'a> {
 #[derive(Debug, Clone)]
 pub(crate) enum InnerValue<'a> {
     Raw {
-        raw_value: &'a oracle::SqlValue,
+        raw_value: &'a oracle::SqlValue<'a>,
         tpe: oracle::sql_type::OracleType,
     },
     SmallInt(i16),
@@ -172,6 +172,10 @@ impl<'a> OracleValue<'a> {
             | Raw {
                 tpe: oracle::sql_type::OracleType::Json,
                 ..
+            }
+            | Raw {
+                tpe: oracle::sql_type::OracleType::Xml,
+                ..
             } => unimplemented!(),
             // e =>
             // {