Merge pull request #78 from prisma/MoreEnums

More Enums
prisma · Feb 4, 2020 · 29a975d · 29a975d
2 parents 963189d + ddef301
commit 29a975d
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.2.0-alpha.2
+
+- Implement support for Arrays of Enums
+
 ## v0.2.0-alpha.1
 
 Breaking changes ahead

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "quaint"
-version = "0.2.0-alpha.1"
+version = "0.2.0-alpha.2"
 authors = [
     "Julius de Bruijn <bruijn@prisma.io>",
     "Katharina Fey <kookie@spacekookie.de>",

diff --git a/src/connector/postgres/conversion.rs b/src/connector/postgres/conversion.rs
@@ -221,10 +221,35 @@ impl GetRow for PostgresRow {
                     None => ParameterizedValue::Null,
                 },
                 ref x => match x.kind() {
-                    Kind::Enum(_) => {
-                        let val: EnumString = row.try_get(i)?;
-                        ParameterizedValue::Enum(val.value.into())
-                    }
+                    Kind::Enum(_) => match row.try_get(i)? {
+                        Some(val) => {
+                            let val: EnumString = val;
+                            ParameterizedValue::Enum(val.value.into())
+                        }
+                        None => ParameterizedValue::Null,
+                    },
+                    Kind::Array(inner) => match inner.kind() {
+                        Kind::Enum(_) => match row.try_get(i)? {
+                            Some(val) => {
+                                let val: Vec<EnumString> = val;
+                                ParameterizedValue::Array(
+                                    val.into_iter()
+                                        .map(|x| ParameterizedValue::Enum(x.value.into()))
+                                        .collect(),
+                                )
+                            }
+                            None => ParameterizedValue::Null,
+                        },
+                        _ => match row.try_get(i)? {
+                            Some(val) => {
+                                let val: Vec<String> = val;
+                                ParameterizedValue::Array(
+                                    val.into_iter().map(|x| ParameterizedValue::Text(x.into())).collect(),
+                                )
+                            }
+                            None => ParameterizedValue::Null,
+                        },
+                    },
                     _ => match row.try_get(i)? {
                         Some(val) => {
                             let val: String = val;