Merge pull request #51 from GiGainfosystems/fix/make_alias_syntax_configurable

Make alias syntax configurable

Author: weiznich

Cargo.toml

@@ -5,7 +5,7 @@ authors = [
     "Daniel Buse <[email protected]>",
 ]
 name = "diesel-oci"
-version = "0.2.0"
+version = "0.2.1"
 license = "MIT OR Apache-2.0"
 description = "A oci database adapter for diesel"
 readme = "README.md"
@@ -52,3 +52,6 @@ chrono = ["chrono-time", "diesel/chrono"]
 r2d2 = ["diesel/r2d2"]
 dynamic-schema = ["diesel-dynamic-schema"]
 gst = []
+
+[patch.crates-io]
+diesel = { git = "https://github.com/weiznich/diesel", rev = "e632a7ca4fa12b76d7638392aeaff7522f57adef" }

src/oracle/backend.rs

@@ -39,9 +39,11 @@ impl SqlDialect for Oracle {
     type ConcatClause = sql_dialect::concat_clause::ConcatWithPipesClause;
     type ArrayComparison = sql_dialect::array_comparison::AnsiSqlArrayComparison;
     type SelectStatementSyntax = sql_dialect::select_statement_syntax::AnsiSqlSelectStatement;
+    type AliasSyntax = OracleAliasSyntax;
 }
 
 pub struct OracleStyleBatchInsert;
 pub struct OracleReturningClause;
 pub struct OracleDualForEmptySelectClause;
 pub struct OracleExistsSyntax;
+pub struct OracleAliasSyntax;

src/oracle/query_builder/alias.rs

@@ -54,3 +54,17 @@ where
         out.push_identifier(&self.alias)
     }
 }
+
+impl<S> QueryFragment<Oracle, crate::oracle::backend::OracleAliasSyntax>
+    for diesel::query_source::Alias<S>
+where
+    S: diesel::query_source::AliasSource,
+    S::Target: QueryFragment<Oracle>,
+{
+    fn walk_ast<'b>(&'b self, mut pass: AstPass<'_, 'b, Oracle>) -> QueryResult<()> {
+        self.source.target().walk_ast(pass.reborrow())?;
+        pass.push_sql(" ");
+        pass.push_identifier(S::NAME)?;
+        Ok(())
+    }
+}

src/test/mod.rs

@@ -2394,5 +2394,43 @@ fn batch_insert_1() {
     assert_eq!(res[1].big, Some(-3));
 }
 
+#[test]
+fn alias() {
+    let mut conn = init_testing();
+    create_gst_types_table(&mut conn);
+
+    ::diesel::insert_into(gst_types::table)
+        .values(Newgst_types::new(
+            Some(1),
+            Some(2),
+            Some(3),
+            Some(4),
+            Some("foo".into()),
+            Some(b"bar".to_vec()),
+            Some(1.23),
+            Some(3.14),
+            Some("bac".into()),
+        ))
+        .execute(&mut conn)
+        .unwrap();
+
+    let test_alias = diesel::alias!(gst_types as test_alias);
+    let res = test_alias
+        .filter(test_alias.field(gst_types::big).eq(1))
+        .load::<GSTTypes>(&mut conn)
+        .unwrap();
+
+    assert_eq!(res.len(), 1);
+    assert_eq!(res[0].big, Some(1));
+    assert_eq!(res[0].big2, Some(2));
+    assert_eq!(res[0].small, Some(3));
+    assert_eq!(res[0].normal, Some(4));
+    assert_eq!(res[0].text, Some("foo".to_owned()));
+    assert_eq!(res[0].byte, Some(b"bar".to_vec()));
+    assert_eq!(res[0].d, Some(1.23));
+    assert_eq!(res[0].r, Some(3.14));
+    assert_eq!(res[0].v, Some("bac".to_owned()));
+}
+
 #[cfg(feature = "dynamic-schema")]
 mod dynamic_select;