Merge pull request qiita-spots#60 from squirrelo/dbfix

Thanks @squirrelo!!
josenavas · May 29, 2014 · f880690 · f880690
2 parents c05e85d + a18a6e2
commit f880690
Show file tree

Hide file tree

Showing 4 changed files with 188 additions and 196 deletions.
diff --git a/qiita_db/support_files/populate_test_db.sql b/qiita_db/support_files/populate_test_db.sql
@@ -1,18 +1,18 @@
 -- Insert some users in the system. Passwords are 'password' for all users
 INSERT INTO qiita.qiita_user (email, user_level_id, password, name,
-	affiliation, address, phone, salt) VALUES
+	affiliation, address, phone) VALUES
 	('test@foo.bar', 4,
 	'$2a$12$gnUi8Qg.0tvW243v889BhOBhWLIHyIJjjgaG6dxuRJkUM8nXG9Efe', 'Dude',
 	'Nowhere University', '123 fake st, Apt 0, Faketown, CO 80302',
-	'111-222-3344', '$2a$12$VEcWB1J9BbMZvoNOZXaBwu'),
+	'111-222-3344'),
 	('shared@foo.bar', 4,
 	'$2a$12$gnUi8Qg.0tvW243v889BhOBhWLIHyIJjjgaG6dxuRJkUM8nXG9Efe', 'Shared',
 	'Nowhere University', '123 fake st, Apt 0, Faketown, CO 80302',
-	'111-222-3344', '$2a$12$VEcWB1J9BbMZvoNOZXaBwu'),
+	'111-222-3344'),
 	('admin@foo.bar', 4,
 	'$2a$12$gnUi8Qg.0tvW243v889BhOBhWLIHyIJjjgaG6dxuRJkUM8nXG9Efe', 'Admin',
 	'Owner University', '312 noname st, Apt K, Nonexistantown, CO 80302',
-	'222-444-6789', '$2a$12$VEcWB1J9BbMZvoNOZXaBwu');
+	'222-444-6789');
 
 -- Insert some study persons
 INSERT INTO qiita.study_person (name, email, address, phone) VALUES
@@ -293,7 +293,7 @@ INSERT INTO qiita.preprocessed_filepath (preprocessed_data_id, filepath_id) VALU
 INSERT INTO qiita.preprocessed_sequence_illumina_params (trim_length) VALUES (151);
 
 -- Insert processed information for study 0 and processed data 1
-INSERT INTO qiita.processed_data (preprocessed_data_id, processed_params_table, processed_params_id, processed_date) VALUES (1, 'processed_params_uclust', 1, '2012-10-01');
+INSERT INTO qiita.processed_data (preprocessed_data_id, processed_params_table, processed_params_id, processed_date) VALUES (1, 'processed_params_uclust', 1, 'Mon Oct 1 09:30:27 2012');
 
 -- Populate the reference table
 INSERT INTO qiita.reference (reference_name, reference_version, sequence_filepath, taxonomy_filepath, tree_filepath) VALUES ('GreenGenes', '4feb2011', '$QIITA_TEST_FOLDER/gg_97_otus_4feb2011.fasta', '$QIITA_TEST_FOLDER/greengenes_tax.txt', '$QIITA_TEST_FOLDER/gg_97_otus_4feb2011.tre');

diff --git a/qiita_db/support_files/qiita-db.dbs b/qiita_db/support_files/qiita-db.dbs
@@ -536,7 +536,7 @@ Linked by y being raw_data_id from raw data table.</comment>
 			<column name="processed_params_id" type="bigint" jt="-5" mandatory="y" >
 				<comment><![CDATA[Link to a table with the parameters used to generate processed data]]></comment>
 			</column>
-			<column name="processed_date" type="date" jt="91" mandatory="y" />
+			<column name="processed_date" type="timestamp" jt="93" mandatory="y" />
 			<index name="pk_processed_data" unique="PRIMARY_KEY" >
 				<column name="processed_data_id" />
 			</index>
@@ -597,7 +597,6 @@ Linked by y being raw_data_id from raw data table.</comment>
 			<column name="affiliation" type="varchar" jt="12" />
 			<column name="address" type="varchar" jt="12" />
 			<column name="phone" type="varchar" jt="12" />
-			<column name="salt" type="varchar" jt="12" mandatory="y" />
 			<column name="user_verify_code" type="varchar" jt="12" >
 				<comment><![CDATA[Code for initial user email verification]]></comment>
 			</column>
@@ -1106,12 +1105,10 @@ Controlled Vocabulary]]></comment>
 		<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="qiita_user" color="d0def5" x="345" y="120" />
 		<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="processed_data" color="d0def5" x="1185" y="300" />
 		<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" />
@@ -1133,6 +1130,8 @@ Controlled Vocabulary]]></comment>
 		<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="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" />