Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Data issue #125

Merged
merged 8 commits into from
Jun 20, 2014
Merged

Data issue #125

merged 8 commits into from
Jun 20, 2014

Conversation

josenavas
Copy link
Contributor

This changes the SQL layout to support (pre)processed data without raw/preprocessed data.
It fixes any relevant code involved on thath

@coveralls
Copy link

Coverage Status

Coverage increased (+0.09%) when pulling 33bd6a5 on josenavas:data_issue into 7588f11 on biocore:master.

@josenavas
Copy link
Contributor Author

This PR is blocking development in 2 other PR, it would be great if it can be reviewed/merged

@@ -269,7 +269,7 @@ def test_create(self):
"SELECT * FROM qiita.processed_data WHERE processed_data_id=2")
# processed_data_id, preprocessed_data_id, processed_params_table,
# processed_params_id, processed_date
exp = [[2, 1, "processed_params_uclust", 1, self.date]]
exp = [[2, "processed_params_uclust", 1, self.date]]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes me think: should we add "version" (as in, program version) to the processed_params_* tables? E.g., to make sure we know what version of the program the params were applied to.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that makes sense. I've created an issue to keep track of it: #128

Right now this table only holds the minimal data, but this is something that we will need to visit...

@adamrp
Copy link
Contributor

adamrp commented Jun 20, 2014

Minor comments on the code, but looks good after those small corrections are addressed! Should we open an issue about the version thing, or am I overlooking some other place the version information could be stored?

self.params_id, self.filepaths)
ProcessedData.create("processed_params_", self.params_id,
self.filepaths,
preprocessed_data=self.preprocessed_data)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I might be misunderstanding something here, but isn't this explicitly testing that those tables don't exist?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it is, that is why they're under the context manager. They don't actually need the preprocessed_data params, but this was one of the errors that I was getting and I just changed it fast.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah! I was missing something: I neglected to notice that the name of the test ends in _error! Okay, this looks good then.

@josenavas
Copy link
Contributor Author

Thanks @adamrp changes done!

@adamrp
Copy link
Contributor

adamrp commented Jun 20, 2014

Awesome! thanks @josenavas. 👍

@coveralls
Copy link

Coverage Status

Coverage increased (+0.17%) when pulling be3eac8 on josenavas:data_issue into 7588f11 on biocore:master.

@adamrp
Copy link
Contributor

adamrp commented Jun 20, 2014

Can someone else review? @ElDeveloper @squirrelo @teravest @antgonza? This is blocking, and would be good to get finished off; I'd like to work on some of the load_processed_data stuff tonight -- I can get a start without this, but can't get too far

teravest added a commit that referenced this pull request Jun 20, 2014
@teravest teravest merged commit ed57160 into qiita-spots:master Jun 20, 2014
@adamrp
Copy link
Contributor

adamrp commented Jun 20, 2014

Thanks @teravest!

@josenavas josenavas deleted the data_issue branch June 21, 2014 04:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants