.

prisma · Sep 13, 2022 · bca9a35 · bca9a35
1 parent a8fc378
commit bca9a35
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/query-engine/connector-test-kit-rs/query-engine-tests/tests/new/regressions/prisma_13097.rs b/query-engine/connector-test-kit-rs/query-engine-tests/tests/new/regressions/prisma_13097.rs
@@ -24,10 +24,13 @@ model App {
     #[connector_test]
     async fn group_by_enum_array(runner: Runner) -> TestResult<()> {
         // Insert some data first
-        run_query!(runner, r#"mutation { createManyApp(data: [{slug:"a",categories:[calendar,other]},{slug:"b",categories:[]},{slug:"c",categories:[calendar,other]},{slug:"d",categories:[messaging, payment]}]) { count } }"#);
+        run_query!(
+            runner,
+            r#"mutation { createManyApp(data: [{slug:"a",categories:[calendar,other]},{slug:"b",categories:[]},{slug:"c",categories:[calendar,other]},{slug:"d",categories:[messaging, payment]}]) { count } }"#
+        );
 
         let result = run_query!(runner, r#"{groupByApp(by: [categories, slug]) { slug categories }}"#);
-        assert_eq!(result, "meow");
+        assert_eq!(result, "{\"data\":{\"groupByApp\":[{\"slug\":\"a\",\"categories\":[\"calendar\",\"other\"]},{\"slug\":\"b\",\"categories\":[]},{\"slug\":\"c\",\"categories\":[\"calendar\",\"other\"]},{\"slug\":\"d\",\"categories\":[\"messaging\",\"payment\"]}]}}");
 
         Ok(())
     }

diff --git a/query-engine/connectors/query-connector/src/interface.rs b/query-engine/connectors/query-connector/src/interface.rs
@@ -119,7 +119,7 @@ impl AggregationSelection {
             AggregationSelection::Field(field) => vec![(
                 field.db_name().to_owned(),
                 field.type_identifier.clone(),
-                FieldArity::Required,
+                field.arity,
             )],
 
             AggregationSelection::Count { all, fields } => {

diff --git a/query-engine/connectors/sql-query-connector/src/row.rs b/query-engine/connectors/sql-query-connector/src/row.rs
@@ -122,7 +122,7 @@ impl ToSqlRow for ResultRow {
     }
 }
 
-pub fn row_value_to_prisma_value(p_value: Value, meta: ColumnMetadata<'_>) -> Result<PrismaValue, SqlError> {
+fn row_value_to_prisma_value(p_value: Value, meta: ColumnMetadata<'_>) -> Result<PrismaValue, SqlError> {
     let create_error = |value: &Value| {
         let message = match meta.name() {
             Some(name) => {