Fix Limit (#2274)

The limit column is being passed in as Text in graphql calls, which is not valid. Instead, we can just keep it as an option, where NULL is the same as no limit. Fixes #2273. Signed-off-by: Joe Grund <jgrund@whamcloud.io>
whamcloud · Sep 24, 2020 · 6b1b229 · 6b1b229
1 parent 8f6e699
commit 6b1b229
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/iml-api/src/graphql.rs b/iml-api/src/graphql.rs
@@ -178,9 +178,7 @@ impl QueryRoot {
                 OFFSET $2 LIMIT $3"#,
             dir.deref(),
             offset.unwrap_or(0) as i64,
-            limit
-                .map(|x| x.to_string())
-                .unwrap_or_else(|| "ALL".to_string()) as String
+            limit.map(|x| x as i64),
         )
         .fetch_all(&context.pg_pool)
         .await?;
@@ -215,9 +213,7 @@ impl QueryRoot {
                     CASE WHEN $3 = 'desc' THEN t.name END DESC
                 OFFSET $1 LIMIT $2"#,
             offset.unwrap_or(0) as i64,
-            limit
-                .map(|x| x.to_string())
-                .unwrap_or_else(|| "ALL".to_string()) as String,
+            limit.map(|x| x as i64),
             dir.deref()
         )
         .fetch_all(&context.pg_pool)
@@ -325,7 +321,7 @@ impl QueryRoot {
                         CASE WHEN $3 = 'desc' THEN s.create_time END DESC
                     OFFSET $1 LIMIT $2"#,
                 offset.unwrap_or(0) as i64,
-                limit.map(|x| x.to_string()).unwrap_or_else(|| "ALL".to_string()) as String,
+                limit.map(|x| x as i64),
                 dir.deref(),
                 fsname,
                 name,
@@ -374,9 +370,7 @@ impl QueryRoot {
                     CASE WHEN $3 = 'desc' THEN c.id END DESC
                 OFFSET $1 LIMIT $2 "#,
             offset.unwrap_or(0) as i64,
-            limit
-                .map(|x| x.to_string())
-                .unwrap_or_else(|| "ALL".to_string()) as String,
+            limit.map(|x| x as i64),
             dir.deref(),
             is_completed,
             msg,