Merge branch 'fix_eq_any_nullability' into array_subselect

diesel/src/expression/array_comparison.rs

@@ -14,7 +14,7 @@ use crate::query_builder::{
 };
 use crate::result::QueryResult;
 use crate::serialize::ToSql;
-use crate::sql_types::{Bool, HasSqlType, SingleValue, SqlType};
+use crate::sql_types::{self, HasSqlType, SingleValue, SqlType};
 use std::marker::PhantomData;
 
 /// Query dsl node that represents a `left IN (values)`
@@ -73,16 +73,28 @@ impl<T, U> Expression for In<T, U>
 where
     T: Expression,
     U: InExpression<SqlType = T::SqlType>,
+    T::SqlType: SqlType,
+    sql_types::is_nullable::IsSqlTypeNullable<T::SqlType>:
+        sql_types::MaybeNullableType<sql_types::Bool>,
 {
-    type SqlType = Bool;
+    type SqlType = sql_types::is_nullable::MaybeNullable<
+        sql_types::is_nullable::IsSqlTypeNullable<T::SqlType>,
+        sql_types::Bool,
+    >;
 }
 
 impl<T, U> Expression for NotIn<T, U>
 where
     T: Expression,
     U: InExpression<SqlType = T::SqlType>,
+    T::SqlType: SqlType,
+    sql_types::is_nullable::IsSqlTypeNullable<T::SqlType>:
+        sql_types::MaybeNullableType<sql_types::Bool>,
 {
-    type SqlType = Bool;
+    type SqlType = sql_types::is_nullable::MaybeNullable<
+        sql_types::is_nullable::IsSqlTypeNullable<T::SqlType>,
+        sql_types::Bool,
+    >;
 }
 
 impl<T, U, DB> QueryFragment<DB> for In<T, U>

diesel_compile_tests/tests/fail/eq_any_is_nullable.rs

@@ -0,0 +1,20 @@
+extern crate diesel;
+
+use diesel::*;
+
+table! {
+    users{
+       id -> Integer,
+       name -> Nullable<Text>,
+    }
+}
+
+fn main() {
+    let mut conn = PgConnection::establish("").unwrap();
+    // Should not be allowed because `users::name` is nullable, so the result of `eq_any` is
+    // nullable as well.
+    let _: Vec<bool> = users::table
+        .select(users::name.eq_any(["foo", "bar"]))
+        .load(&mut conn)
+        .unwrap();
+}