File tree Expand file tree Collapse file tree 1 file changed +14
-2
lines changed Expand file tree Collapse file tree 1 file changed +14
-2
lines changed Original file line number Diff line number Diff line change @@ -307,6 +307,11 @@ pub fn flatten_objects_for_count(objects: Vec<Value>) -> Vec<Value> {
307
307
. unwrap ( )
308
308
. keys ( )
309
309
. all ( |key| key. starts_with ( "COUNT" ) )
310
+ } ) && objects. iter ( ) . all ( |obj| {
311
+ obj. as_object ( )
312
+ . unwrap ( )
313
+ . keys ( )
314
+ . all ( |key| key == objects[ 0 ] . as_object ( ) . unwrap ( ) . keys ( ) . next ( ) . unwrap ( ) )
310
315
} ) ;
311
316
312
317
if flag {
@@ -365,7 +370,7 @@ mod tests {
365
370
}
366
371
367
372
#[ test]
368
- fn test_flat ( ) {
373
+ fn test_flat_simple ( ) {
369
374
let val = vec ! [
370
375
json!( {
371
376
"COUNT(*)" : 1
@@ -390,12 +395,19 @@ mod tests {
390
395
}
391
396
392
397
#[ test]
393
- fn test_flat_single ( ) {
398
+ fn test_flat_same_multi ( ) {
394
399
let val = vec ! [ json!( { "COUNT(ALPHA)" : 1 } ) , json!( { "COUNT(ALPHA)" : 2 } ) ] ;
395
400
let out = flatten_objects_for_count ( val. clone ( ) ) ;
396
401
assert_eq ! ( vec![ json!( { "COUNT(ALPHA)" : 3 } ) ] , out) ;
397
402
}
398
403
404
+ #[ test]
405
+ fn test_flat_diff_multi ( ) {
406
+ let val = vec ! [ json!( { "COUNT(ALPHA)" : 1 } ) , json!( { "COUNT(BETA)" : 2 } ) ] ;
407
+ let out = flatten_objects_for_count ( val. clone ( ) ) ;
408
+ assert_eq ! ( out, val) ;
409
+ }
410
+
399
411
#[ test]
400
412
fn test_flat_fail ( ) {
401
413
let val = vec ! [
You can’t perform that action at this time.
0 commit comments