Skip to content

Fix delete sample prep analysis refactor #2155

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

Merged
merged 5 commits into from
Jun 26, 2017
Merged

Fix delete sample prep analysis refactor #2155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e819ca2
fix delete sample prep
antgonza Jun 26, 2017
705b2b9
fix del col
antgonza Jun 26, 2017
8db7a84
fixing format/%
antgonza Jun 26, 2017
0e3f453
Merge pull request #2154 from antgonza/fix-delete-sample-prep
josenavas Jun 26, 2017
93f2d3d
Merge branch 'analysis-refactor' of https://github.com/biocore/qiita …
antgonza Jun 26, 2017
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
12 changes: 12 additions & 0 deletions qiita_db/metadata_template/base_metadata_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,9 +619,15 @@ def _common_delete_sample_steps(self, sample_name):
self._table_name(self._id))
qdb.sql_connection.TRN.add(sql, [sample_name])

sql = 'ALTER TABLE qiita.{0} DISABLE TRIGGER ALL'.format(
self._table)
qdb.sql_connection.TRN.add(sql)
sql = "DELETE FROM qiita.{0} WHERE sample_id=%s AND {1}=%s".format(
self._table, self._id_column)
qdb.sql_connection.TRN.add(sql, [sample_name, self.id])
sql = 'ALTER TABLE qiita.{0} ENABLE TRIGGER ALL'.format(
self._table)
qdb.sql_connection.TRN.add(sql)

qdb.sql_connection.TRN.execute()

Expand Down Expand Up @@ -649,9 +655,15 @@ def delete_column(self, column_name):
raise qdb.exceptions.QiitaDBOperationNotPermittedError(
'%s cannot be deleted' % column_name)
with qdb.sql_connection.TRN:
sql = ('ALTER TABLE qiita.%s%d DISABLE TRIGGER ALL' % (
self._table_prefix, self._id))
qdb.sql_connection.TRN.add(sql)
sql = 'ALTER TABLE qiita.%s%d DROP COLUMN %s' % (
self._table_prefix, self._id, column_name)
qdb.sql_connection.TRN.add(sql)
sql = ('ALTER TABLE qiita.%s%d ENABLE TRIGGER ALL' % (
self._table_prefix, self._id))
qdb.sql_connection.TRN.add(sql)
qdb.sql_connection.TRN.execute()

self.generate_files()
Expand Down
8 changes: 8 additions & 0 deletions qiita_db/metadata_template/prep_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,14 +256,22 @@ def delete(cls, id_):
qdb.sql_connection.TRN.add(sql, args)

# Remove the row from study_prep_template
sql = 'ALTER TABLE qiita.study_prep_template DISABLE TRIGGER ALL'
qdb.sql_connection.TRN.add(sql)
sql = """DELETE FROM qiita.study_prep_template
WHERE {0} = %s""".format(cls._id_column)
qdb.sql_connection.TRN.add(sql, args)
sql = 'ALTER TABLE qiita.study_prep_template ENABLE TRIGGER ALL'
qdb.sql_connection.TRN.add(sql)

# Remove the row from prep_template
sql = 'ALTER TABLE qiita.prep_template DISABLE TRIGGER ALL'
qdb.sql_connection.TRN.add(sql)
sql = "DELETE FROM qiita.prep_template WHERE {0} = %s".format(
cls._id_column)
qdb.sql_connection.TRN.add(sql, args)
sql = 'ALTER TABLE qiita.prep_template ENABLE TRIGGER ALL'
qdb.sql_connection.TRN.add(sql)

qdb.sql_connection.TRN.execute()

Expand Down
6 changes: 6 additions & 0 deletions qiita_db/metadata_template/sample_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,15 @@ def delete(cls, id_):
sql = "DROP TABLE qiita.{0}".format(table_name)
qdb.sql_connection.TRN.add(sql)

sql = 'ALTER TABLE qiita.{0} DISABLE TRIGGER ALL'.format(
cls._table)
qdb.sql_connection.TRN.add(sql)
sql = "DELETE FROM qiita.{0} WHERE {1} = %s".format(
cls._table, cls._id_column)
qdb.sql_connection.TRN.add(sql, args)
sql = 'ALTER TABLE qiita.{0} ENABLE TRIGGER ALL'.format(
cls._table)
qdb.sql_connection.TRN.add(sql)

qdb.sql_connection.TRN.execute()

Expand Down