tweak array constructor

Author: tyt2y3

src/value/hashable_value.rs

@@ -322,22 +322,14 @@ mod tests {
     #[cfg(feature = "postgres-array")]
     #[test]
     fn test_hash_value_array() {
-        use crate::ArrayType;
-
         assert_eq!(
             Into::<Value>::into(vec![0i32, 1, 2]),
-            Value::array(
-                ArrayType::Int,
-                vec![Value::int(0), Value::int(1), Value::int(2)]
-            )
+            Value::array(vec![0i32, 1, 2])
         );
 
         assert_eq!(
             Into::<Value>::into(vec![0f32, 1.0, 2.0]),
-            Value::array(
-                ArrayType::Float,
-                vec![Value::float(0f32), Value::float(1.0), Value::float(2.0)]
-            )
+            Value::array(vec![0f32, 1.0, 2.0])
         );
 
         let hash_set: std::collections::HashSet<Value> = [

src/value/tests.rs

@@ -410,14 +410,21 @@ fn test_decimal_value() {
 fn test_array_value() {
     let array = vec![1, 2, 3, 4, 5];
     let v: Value = array.into();
+    assert_eq!(v, Value::array(vec![1, 2, 3, 4, 5]));
     let out: Vec<i32> = v.unwrap();
     assert_eq!(out, vec![1, 2, 3, 4, 5]);
+
+    let array = vec!["1".to_owned(), "2".to_owned()];
+    let v: Value = array.clone().into();
+    assert_eq!(v, Value::array(array));
 }
 
 #[test]
 #[cfg(feature = "postgres-array")]
 fn test_option_array_value() {
-    let v: Value = Value::array(ArrayType::Int, None);
+    let v: Value = Option::<Vec<i32>>::None.into();
+    assert_eq!(v, Value::array_null::<i32>());
+    assert!(matches!(v, Value::Array(_, _)));
     let out: Option<Vec<i32>> = v.unwrap();
     assert_eq!(out, None);
 }

src/value/with_array.rs

@@ -81,10 +81,7 @@ where
     T: Into<Value> + NotU8 + ValueType,
 {
     fn from(x: Vec<T>) -> Value {
-        Value::array(
-            T::array_type(),
-            x.into_iter().map(|e| e.into()).collect::<Vec<_>>(),
-        )
+        Value::array(x)
     }
 }
 
@@ -93,7 +90,7 @@ where
     T: Into<Value> + NotU8 + ValueType,
 {
     fn null() -> Value {
-        Value::array(T::array_type(), None)
+        Value::array_null::<T>()
     }
 }
 
@@ -126,8 +123,22 @@ where
 
 impl Value {
     #[inline]
-    pub fn array<T: Into<Option<Vec<Value>>>>(array_type: ArrayType, value: T) -> Self {
-        Self::Array(array_type, value.into().map(Box::new))
+    pub fn array<T: Into<Value> + NotU8 + ValueType, I: IntoIterator<Item = T>>(values: I) -> Self {
+        Self::Array(
+            T::array_type(),
+            Some(
+                values
+                    .into_iter()
+                    .map(|v| v.into())
+                    .collect::<Vec<_>>()
+                    .into(),
+            ),
+        )
+    }
+
+    #[inline]
+    pub fn array_null<T: Into<Value> + NotU8 + ValueType>() -> Self {
+        Self::Array(T::array_type(), None)
     }
 
     pub fn is_array(&self) -> bool {