sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v10.21'

Browse Source
This commit is contained in:
Sander Roosendaal
2019-08-30 08:32:18 +02:00
parent 87f9a58550 a6e184958b
commit 3b9637a6ce
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rowers/dataprep.py
View File

@@ -1875,9 +1875,10 @@ def read_cols_df_sql(ids, columns, convertnewtons=True):
cls += column + ', ' cls += column + ', '
cls = cls[:-2] cls = cls[:-2]
if len(ids) == 0: if len(ids) == 0:
query = sa.text('SELECT {columns} FROM strokedata WHERE workoutid=0'.format( return pd.DataFrame(),extracols
columns=cls, # query = sa.text('SELECT {columns} FROM strokedata WHERE workoutid=0'.format(
)) # columns=cls,
# ))
elif len(ids) == 1: elif len(ids) == 1:
query = sa.text('SELECT {columns} FROM strokedata WHERE workoutid={id}'.format( query = sa.text('SELECT {columns} FROM strokedata WHERE workoutid={id}'.format(
id=ids[0], id=ids[0],

BIN
rowers/tests/testdata/testdata.csv.gz vendored
View File

Binary file not shown.