File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -478,15 +478,14 @@ def _simplify_expression(
478478 ) -> list [expr_internal .Expr ]:
479479 expr_list = []
480480 for expr in exprs :
481- if isinstance (expr , Expr ):
482- expr_list .append (expr .expr )
483- elif isinstance (expr , Iterable ) and not isinstance (expr , (str , Expr )):
484- for inner_expr in expr :
485- if not isinstance (inner_expr , Expr ):
486- raise TypeError (_EXPR_TYPE_ERROR )
487- expr_list .append (inner_expr .expr )
488- else :
481+ if isinstance (expr , str ):
489482 raise TypeError (_EXPR_TYPE_ERROR )
483+ if isinstance (expr , Iterable ) and not isinstance (expr , Expr ):
484+ if any (not isinstance (inner_expr , Expr ) for inner_expr in expr ):
485+ raise TypeError (_EXPR_TYPE_ERROR )
486+ elif not isinstance (expr , Expr ):
487+ raise TypeError (_EXPR_TYPE_ERROR )
488+ expr_list .extend (expr_list_to_raw_expr_list (expr ))
490489 if named_exprs :
491490 for alias , expr in named_exprs .items ():
492491 if not isinstance (expr , Expr ):
You can’t perform that action at this time.
0 commit comments