Merge branch 'hotfix/v15.54.1' into develop

2021-03-05 08:08:11 +01:00
parent 2c98731293 5c8660f5ef
commit 8112f8322a
1 changed files with 1 additions and 1 deletions
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -2562,7 +2562,7 @@ def read_cols_df_sql(ids, columns, convertnewtons=True):
        try:
            df = pd.concat(data,axis=0)
        except ValueError:
-            df = pd.DataFrame()
+            return pd.DataFrame(), extracols


    df = df.fillna(value=0)