Skip to content

Commit

Permalink
Merge 77c8b29 into f5df8bb
Browse files Browse the repository at this point in the history
  • Loading branch information
@josenavas
josenavas committed May 30, 2014
2 parents f5df8bb + 77c8b29 commit 16fca32
Show file tree
Hide file tree
Showing 3 changed files with 1,106 additions and 1,130 deletions.
78 changes: 39 additions & 39 deletions qiita_db/support_files/qiita-db.dbs
View file
Expand Up @@ -197,13 +197,13 @@
<index name="idx_required_prep_info_3" unique="NORMAL" >
<column name="data_type_id" />
</index>
<fk name="fk_required_prep_info_raw_data" to_schema="qiita" to_table="raw_data" delete_action="cascade" >
<fk name="fk_required_prep_info_raw_data" to_schema="qiita" to_table="raw_data" >
<fk_column name="raw_data_id" pk="raw_data_id" />
</fk>
<fk name="fk_required_prep_info_emp_status" to_schema="qiita" to_table="emp_status" >
<fk_column name="emp_status_id" pk="emp_status_id" />
</fk>
<fk name="fk_required_prep_info" to_schema="qiita" to_table="required_sample_info" delete_action="cascade" >
<fk name="fk_required_prep_info" to_schema="qiita" to_table="required_sample_info" >
<fk_column name="sample_id" pk="sample_id" />
</fk>
<fk name="fk_required_prep_info_0" to_schema="qiita" to_table="data_type" >
Expand Down Expand Up @@ -277,7 +277,7 @@
<index name="idx_filepath" unique="NORMAL" >
<column name="filepath_type_id" />
</index>
<fk name="fk_filepath" to_schema="qiita" to_table="filepath_type" delete_action="cascade" >
<fk name="fk_filepath" to_schema="qiita" to_table="filepath_type" >
<fk_column name="filepath_type_id" pk="filepath_type_id" />
</fk>
</table>
Expand Down Expand Up @@ -331,7 +331,7 @@ An investigation comprises one or more individual studies.</comment>
<fk name="fk_investigation_study" to_schema="qiita" to_table="investigation" >
<fk_column name="investigation_id" pk="investigation_id" />
</fk>
<fk name="fk_investigation_study_study" to_schema="qiita" to_table="study" delete_action="cascade" >
<fk name="fk_investigation_study_study" to_schema="qiita" to_table="study" >
<fk_column name="study_id" pk="study_id" />
</fk>
</table>
Expand Down Expand Up @@ -470,7 +470,7 @@ Linked by y being raw_data_id from raw data table.</comment>
<index name="idx_preprocessed_data" unique="NORMAL" >
<column name="raw_data_id" />
</index>
<fk name="fk_preprocessed_data_raw_data" to_schema="qiita" to_table="raw_data" delete_action="cascade" >
<fk name="fk_preprocessed_data_raw_data" to_schema="qiita" to_table="raw_data" >
<fk_column name="raw_data_id" pk="raw_data_id" />
</fk>
</table>
Expand All @@ -487,10 +487,10 @@ Linked by y being raw_data_id from raw data table.</comment>
<index name="idx_preprocessed_filepath_1" unique="NORMAL" >
<column name="filepath_id" />
</index>
<fk name="fk_preprocessed_filepath" to_schema="qiita" to_table="preprocessed_data" delete_action="cascade" >
<fk name="fk_preprocessed_filepath" to_schema="qiita" to_table="preprocessed_data" >
<fk_column name="preprocessed_data_id" pk="preprocessed_data_id" />
</fk>
<fk name="fk_preprocessed_filepath_0" to_schema="qiita" to_table="filepath" delete_action="cascade" >
<fk name="fk_preprocessed_filepath_0" to_schema="qiita" to_table="filepath" >
<fk_column name="filepath_id" pk="filepath_id" />
</fk>
</table>
Expand Down Expand Up @@ -540,7 +540,7 @@ Linked by y being raw_data_id from raw data table.</comment>
<index name="pk_processed_data" unique="PRIMARY_KEY" >
<column name="processed_data_id" />
</index>
<fk name="fk_processed_data" to_schema="qiita" to_table="preprocessed_data" delete_action="cascade" >
<fk name="fk_processed_data" to_schema="qiita" to_table="preprocessed_data" >
<fk_column name="preprocessed_data_id" pk="preprocessed_data_id" />
</fk>
</table>
Expand All @@ -553,10 +553,10 @@ Linked by y being raw_data_id from raw data table.</comment>
<index name="idx_processed_data_filepath" unique="NORMAL" >
<column name="filepath_id" />
</index>
<fk name="fk_processed_data_filepath" to_schema="qiita" to_table="processed_data" delete_action="cascade" >
<fk name="fk_processed_data_filepath" to_schema="qiita" to_table="processed_data" >
<fk_column name="processed_data_id" pk="processed_data_id" />
</fk>
<fk name="fk_processed_data_filepath_0" to_schema="qiita" to_table="filepath" delete_action="cascade" >
<fk name="fk_processed_data_filepath_0" to_schema="qiita" to_table="filepath" >
<fk_column name="filepath_id" pk="filepath_id" />
</fk>
</table>
Expand Down Expand Up @@ -628,7 +628,7 @@ Linked by y being raw_data_id from raw data table.</comment>
<index name="idx_raw_data" unique="NORMAL" >
<column name="filetype_id" />
</index>
<fk name="fk_raw_data_filetype" to_schema="qiita" to_table="filetype" delete_action="cascade" >
<fk name="fk_raw_data_filetype" to_schema="qiita" to_table="filetype" >
<fk_column name="filetype_id" pk="filetype_id" />
</fk>
</table>
Expand All @@ -645,7 +645,7 @@ Linked by y being raw_data_id from raw data table.</comment>
<index name="idx_prep_columns" unique="NORMAL" >
<column name="raw_data_id" />
</index>
<fk name="fk_prep_columns_raw_data" to_schema="qiita" to_table="raw_data" delete_action="cascade" >
<fk name="fk_prep_columns_raw_data" to_schema="qiita" to_table="raw_data" >
<fk_column name="raw_data_id" pk="raw_data_id" />
</fk>
</table>
Expand All @@ -662,10 +662,10 @@ Linked by y being raw_data_id from raw data table.</comment>
<index name="idx_raw_filepath_1" unique="NORMAL" >
<column name="raw_data_id" />
</index>
<fk name="fk_raw_filepath" to_schema="qiita" to_table="filepath" delete_action="cascade" >
<fk name="fk_raw_filepath" to_schema="qiita" to_table="filepath" >
<fk_column name="filepath_id" pk="filepath_id" />
</fk>
<fk name="fk_raw_filepath_0" to_schema="qiita" to_table="raw_data" delete_action="cascade" >
<fk name="fk_raw_filepath_0" to_schema="qiita" to_table="raw_data" >
<fk_column name="raw_data_id" pk="raw_data_id" />
</fk>
</table>
Expand Down Expand Up @@ -720,7 +720,7 @@ Linked by y being raw_data_id from raw data table.</comment>
<index name="pk_required_sample_info" unique="UNIQUE" >
<column name="sample_id" />
</index>
<fk name="fk_required_sample_info_study" to_schema="qiita" to_table="study" delete_action="cascade" >
<fk name="fk_required_sample_info_study" to_schema="qiita" to_table="study" >
<fk_column name="study_id" pk="study_id" />
</fk>
<fk name="fk_required_sample_info" to_schema="qiita" to_table="required_sample_info_status" >
Expand Down Expand Up @@ -842,7 +842,7 @@ Controlled Vocabulary]]></comment>
<index name="idx_study_experimental_factor_0" unique="NORMAL" >
<column name="study_id" />
</index>
<fk name="fk_study_experimental_factor" to_schema="qiita" to_table="study" delete_action="cascade" >
<fk name="fk_study_experimental_factor" to_schema="qiita" to_table="study" >
<fk_column name="study_id" pk="study_id" />
</fk>
</table>
Expand All @@ -868,7 +868,7 @@ Controlled Vocabulary]]></comment>
<index name="idx_study_pmid_0" unique="NORMAL" >
<column name="study_id" />
</index>
<fk name="fk_study_pmid_study" to_schema="qiita" to_table="study" delete_action="cascade" >
<fk name="fk_study_pmid_study" to_schema="qiita" to_table="study" >
<fk_column name="study_id" pk="study_id" />
</fk>
</table>
Expand All @@ -883,10 +883,10 @@ Controlled Vocabulary]]></comment>
<column name="study_id" />
<column name="raw_data_id" />
</index>
<fk name="fk_study_raw_data_study" to_schema="qiita" to_table="study" delete_action="cascade" >
<fk name="fk_study_raw_data_study" to_schema="qiita" to_table="study" >
<fk_column name="study_id" pk="study_id" />
</fk>
<fk name="fk_study_raw_data_raw_data" to_schema="qiita" to_table="raw_data" delete_action="cascade" >
<fk name="fk_study_raw_data_raw_data" to_schema="qiita" to_table="raw_data" >
<fk_column name="raw_data_id" pk="raw_data_id" />
</fk>
</table>
Expand All @@ -903,7 +903,7 @@ Controlled Vocabulary]]></comment>
<index name="idx_study_mapping_columns_study_id" unique="NORMAL" >
<column name="study_id" />
</index>
<fk name="fk_study_mapping_columns_study" to_schema="qiita" to_table="study" delete_action="cascade" >
<fk name="fk_study_mapping_columns_study" to_schema="qiita" to_table="study" >
<fk_column name="study_id" pk="study_id" />
</fk>
</table>
Expand All @@ -929,7 +929,7 @@ Controlled Vocabulary]]></comment>
<index name="idx_study_users_1" unique="NORMAL" >
<column name="email" />
</index>
<fk name="fk_study_users_study" to_schema="qiita" to_table="study" delete_action="cascade" >
<fk name="fk_study_users_study" to_schema="qiita" to_table="study" >
<fk_column name="study_id" pk="study_id" />
</fk>
<fk name="fk_study_users_user" to_schema="qiita" to_table="qiita_user" >
Expand Down Expand Up @@ -1076,6 +1076,7 @@ Controlled Vocabulary]]></comment>
<entity schema="qiita" name="job_status" color="d0def5" x="210" y="645" />
<entity schema="qiita" name="analysis_status" color="d0def5" x="390" y="420" />
<entity schema="qiita" name="analysis_sample" color="d0def5" x="360" y="630" />
<entity schema="qiita" name="study_experimental_factor" color="c0d4f3" x="1605" y="240" />
<entity schema="qiita" name="preprocessed_sequence_454_params" color="c0d4f3" x="915" y="600" />
<entity schema="qiita" name="analysis_job" color="d0def5" x="45" y="390" />
<entity schema="qiita" name="ontology" color="d0def5" x="465" y="990" />
Expand All @@ -1089,6 +1090,7 @@ Controlled Vocabulary]]></comment>
<entity schema="qiita" name="column_ontology" color="d0def5" x="225" y="1380" />
<entity schema="qiita" name="column_controlled_vocabularies" color="d0def5" x="210" y="990" />
<entity schema="qiita" name="controlled_vocabularies" color="d0def5" x="45" y="990" />
<entity schema="qiita" name="investigation_study" color="c0d4f3" x="1395" y="120" />
<entity schema="qiita" name="term_path" color="d0def5" x="735" y="990" />
<entity schema="qiita" name="term_relationship" color="d0def5" x="735" y="1350" />
<entity schema="qiita" name="analysis_users" color="d0def5" x="390" y="525" />
Expand All @@ -1098,40 +1100,38 @@ Controlled Vocabulary]]></comment>
<entity schema="qiita" name="logging" color="c0d4f3" x="945" y="990" />
<entity schema="qiita" name="portal_type" color="c0d4f3" x="1605" y="525" />
<entity schema="qiita" name="study" color="d0def5" x="1365" y="240" />
<entity schema="qiita" name="study_sample_columns" color="d0def5" x="1605" y="405" />
<entity schema="qiita" name="timeseries_type" color="c0d4f3" x="1440" y="645" />
<entity schema="qiita" name="data_type" color="d0def5" x="435" y="765" />
<entity schema="qiita" name="emp_status" color="c0d4f3" x="825" y="765" />
<entity schema="qiita" name="raw_data_prep_columns" color="d0def5" x="750" y="540" />
<entity schema="qiita" name="command" color="d0def5" x="210" y="540" />
<entity schema="qiita" name="common_prep_info" color="d0def5" x="615" y="690" />
<entity schema="qiita" name="filetype" color="d0def5" x="645" y="540" />
<entity schema="qiita" name="preprocessed_data" color="c0d4f3" x="885" y="360" />
<entity schema="qiita" name="investigation" color="c0d4f3" x="1200" y="45" />
<entity schema="qiita" name="study_users" color="d0def5" x="630" y="45" />
<entity schema="qiita" name="study_raw_data" color="d0def5" x="630" y="135" />
<entity schema="qiita" name="raw_filepath" color="c0d4f3" x="705" y="255" />
<entity schema="qiita" name="preprocessed_filepath" color="c0d4f3" x="900" y="270" />
<entity schema="qiita" name="filepath_type" color="c0d4f3" x="885" y="75" />
<entity schema="qiita" name="filepath" color="c0d4f3" x="915" y="165" />
<entity schema="qiita" name="study_pmid" color="c0d4f3" x="1605" y="330" />
<entity schema="qiita" name="preprocessed_spectra_params" color="d0def5" x="915" y="675" />
<entity schema="qiita" name="preprocessed_sequence_illumina_params" color="d0def5" x="915" y="480" />
<entity schema="qiita" name="sample_x" color="d0def5" x="1425" y="810" />
<entity schema="qiita" name="prep_y" color="d0def5" x="1335" y="825" />
<entity schema="qiita" name="study_person" color="c0d4f3" x="1305" y="690" />
<entity schema="qiita" name="reference" color="c0d4f3" x="1170" y="555" />
<entity schema="qiita" name="raw_data" color="d0def5" x="630" y="360" />
<entity schema="qiita" name="processed_params_uclust" color="d0def5" x="1170" y="435" />
<entity schema="qiita" name="processed_filepath" color="c0d4f3" x="1155" y="195" />
<entity schema="qiita" name="user_level" color="d0def5" x="180" y="120" />
<entity schema="qiita" name="study_status" color="c0d4f3" x="1605" y="135" />
<entity schema="qiita" name="required_sample_info_status" color="c0d4f3" x="1605" y="825" />
<entity schema="qiita" name="qiita_user" color="d0def5" x="345" y="120" />
<entity schema="qiita" name="study_experimental_factor" color="c0d4f3" x="1605" y="240" />
<entity schema="qiita" name="study_pmid" color="c0d4f3" x="1605" y="330" />
<entity schema="qiita" name="study_sample_columns" color="d0def5" x="1605" y="405" />
<entity schema="qiita" name="study_person" color="c0d4f3" x="1305" y="690" />
<entity schema="qiita" name="investigation_study" color="c0d4f3" x="1395" y="120" />
<entity schema="qiita" name="processed_filepath" color="c0d4f3" x="1155" y="195" />
<entity schema="qiita" name="processed_data" color="d0def5" x="1185" y="300" />
<entity schema="qiita" name="reference" color="c0d4f3" x="1170" y="555" />
<entity schema="qiita" name="filepath" color="c0d4f3" x="915" y="165" />
<entity schema="qiita" name="preprocessed_filepath" color="c0d4f3" x="900" y="270" />
<entity schema="qiita" name="preprocessed_data" color="c0d4f3" x="885" y="360" />
<entity schema="qiita" name="raw_data_prep_columns" color="d0def5" x="750" y="540" />
<entity schema="qiita" name="raw_data" color="d0def5" x="630" y="360" />
<entity schema="qiita" name="raw_filepath" color="c0d4f3" x="705" y="255" />
<entity schema="qiita" name="study_raw_data" color="d0def5" x="630" y="135" />
<entity schema="qiita" name="study_users" color="d0def5" x="630" y="45" />
<entity schema="qiita" name="common_prep_info" color="d0def5" x="615" y="690" />
<entity schema="qiita" name="required_sample_info" color="d0def5" x="1605" y="615" />
<entity schema="qiita" name="processed_data" color="d0def5" x="1185" y="300" />
<entity schema="qiita" name="qiita_user" color="d0def5" x="345" y="120" />
<group name="Group_analyses" color="c4e0f9" >
<comment>analysis tables</comment>
<entity schema="qiita" name="analysis" />
Expand Down

0 comments on commit 16fca32

Please sign in to comment.