Skip to content

Start improving search #988

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.

Sign up for GitHub

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

Closed
wants to merge 19 commits into from
Closed

Start improving search #988

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
8c37d53
break up search object and move stats to qiita_ware
squirrelo Mar 16, 2015
d1390c5
update sql connection handler
squirrelo Mar 16, 2015
ff58d42
add helper utilities
squirrelo Mar 16, 2015
0c2d23a
revert change to sqlconnectionhandler
squirrelo Mar 16, 2015
8ab20c7
add samples property to ProcessedData object
squirrelo Mar 16, 2015
929d27b
flake8
squirrelo Mar 16, 2015
de8a466
revamp search object to use giant join table
squirrelo Mar 17, 2015
ff6731d
search prep templates and data_types
squirrelo Mar 17, 2015
ae6dd10
bit of rearrangement
squirrelo Mar 17, 2015
586a18e
refine search more
squirrelo Mar 18, 2015
0de4037
update search for changes
squirrelo Mar 18, 2015
056d4d0
update qiita_ware search to reflect changes
squirrelo Mar 18, 2015
56f8175
merge upstream/master
squirrelo Mar 18, 2015
3d29605
remove unused imports
squirrelo Mar 18, 2015
58cabfa
update search help page
squirrelo Mar 18, 2015
4a1e37c
address comments
squirrelo Mar 18, 2015
112f73e
add disallowed column checks for sample and prep templates
squirrelo Mar 18, 2015
db3d334
add data patch to remove offending cols
squirrelo Mar 18, 2015
f8d3fce
rename instead of drop
squirrelo Mar 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
rename instead of drop
  • Loading branch information
@squirrelo
squirrelo committed Mar 18, 2015
commit f8d3fceecbc4f74707e51d27baab342ec4457677
7 changes: 5 additions & 2 deletions qiita_db/support_files/patches/python_patches/18.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,13 @@
# we know it has at least one of the columns, so drop both, and ignore
# error if dropping non-existant column
try:
conn_handler.execute("ALTER TABLE qiita.%s DROP COLUMN study_id" % t)
conn_handler.execute("ALTER TABLE qiita.%s RENAME COLUMN study_id TO "
"study_id_template" % t)
except PostgresError:
pass
try:
conn_handler.execute("ALTER TABLE qiita.%s DROP COLUMN processed_data_id" % t)
conn_handler.execute("ALTER TABLE qiita.%s RENAME COLUMN "
"processed_data_id TO "
"processed_data_id_template" % t)
except PostgresError:
pass