Diesel 2.3 compatiblity

This commit bumps all diesel dependencies to allow diesel-oci to be used
with diesel 2.3. It also contains the minimal necessary fixes to work
with the new features.

Author: weiznich

Cargo.toml

@@ -5,7 +5,7 @@ authors = [
     "Daniel Buse <daniel.buse@giga-infosystems.com>",
 ]
 name = "diesel-oci"
-version = "0.3.1"
+version = "0.4.0"
 license = "MIT OR Apache-2.0"
 description = "A oci database adapter for diesel"
 readme = "README.md"
@@ -29,15 +29,15 @@ package = "chrono"
 [dependencies.diesel]
 default-features = false
 features = ["i-implement-a-third-party-backend-and-opt-into-breaking-changes"]
-version = "~2.2.0"
+version = "~2.3.0"
 
 [dependencies.diesel_derives]
-version = "~2.2.0"
+version = "~2.3.0"
 
 [dependencies.diesel-dynamic-schema]
 optional = true
 default-features = false
-version = "0.2.1"
+version = "0.2.4"
 
 [dev-dependencies]
 log = "0.4"

src/oracle/backend.rs

@@ -40,6 +40,18 @@ impl SqlDialect for Oracle {
     type ArrayComparison = sql_dialect::array_comparison::AnsiSqlArrayComparison;
     type SelectStatementSyntax = sql_dialect::select_statement_syntax::AnsiSqlSelectStatement;
     type AliasSyntax = OracleAliasSyntax;
+
+    type WindowFrameClauseGroupSupport =
+        sql_dialect::window_frame_clause_group_support::NoGroupWindowFrameUnit;
+
+    type WindowFrameExclusionSupport =
+        sql_dialect::window_frame_exclusion_support::NoFrameFrameExclusionSupport;
+
+    type AggregateFunctionExpressions =
+        sql_dialect::aggregate_function_expressions::NoAggregateFunctionExpressions;
+
+    type BuiltInWindowFunctionRequireOrder =
+        sql_dialect::built_in_window_function_require_order::NoOrderRequired;
 }
 
 pub struct OracleStyleBatchInsert;

src/oracle/connection/mod.rs

@@ -330,6 +330,20 @@ impl Connection for OciConnection {
     fn set_instrumentation(&mut self, instrumentation: impl diesel::connection::Instrumentation) {
         self.instrumentation = Some(Box::new(instrumentation));
     }
+
+    fn set_prepared_statement_cache_size(&mut self, size: diesel::connection::CacheSize) {
+        match size {
+            diesel::connection::CacheSize::Unbounded => self
+                .raw
+                .set_stmt_cache_size(u32::MAX)
+                .expect("Setting the cache size failed"),
+            diesel::connection::CacheSize::Disabled => self
+                .raw
+                .set_stmt_cache_size(0)
+                .expect("Setting the cache size failed"),
+            _ => unreachable!("There are currently only these two variants defined in diesel"),
+        }
+    }
 }
 
 impl LoadConnection for OciConnection {

src/test/mod.rs

@@ -65,7 +65,7 @@ const DROP_INTERVALS_TABLE: &str = "DROP TABLE intervals";
 
 const TEST_VARCHAR: &str = "'blabla'";
 
-const CREATE_GST_TYPE_TABLE: &'static str = "CREATE TABLE gst_types (\
+const CREATE_GST_TYPE_TABLE: &str = "CREATE TABLE gst_types (\
         big NUMBER(19),
         big2 NUMBER(19),
         small NUMBER(5),
@@ -1226,15 +1226,15 @@ allow_tables_to_appear_in_same_query!(t1, t2);
 
 #[test]
 fn ambigious_col_names() {
-    const CREATE_T1: &'static str = "CREATE TABLE t1 (\
+    const CREATE_T1: &str = "CREATE TABLE t1 (\
             id NUMBER(10),
             name VARCHAR2(50),
             bol NUMBER(5) DEFAULT 0 NOT NULL,
             t2 VARCHAR2(50),
             bin blob,
             si NUMBER(5)
      )";
-    const CREATE_T2: &'static str = "CREATE TABLE t2 (\
+    const CREATE_T2: &str = "CREATE TABLE t2 (\
             id NUMBER(10),
             name VARCHAR2(50)
      )";
@@ -1309,7 +1309,7 @@ table! {
 
 #[test]
 fn timestamp() {
-    const CREATE_TS: &'static str = "CREATE TABLE TS (\
+    const CREATE_TS: &str = "CREATE TABLE TS (\
             id NUMBER(10),
             tis TIMESTAMP
      )";
@@ -1468,7 +1468,7 @@ fn props() {
 
 #[test]
 fn props_orig() {
-    const CREATE_TESTT: &'static str = "CREATE TABLE PROPS (\
+    const CREATE_TESTT: &str = "CREATE TABLE PROPS (\
             id NUMBER(10),
             is_based NUMBER(5)
      )";