|
@@ -362,10 +362,11 @@ def drop_table(request, database):
|
|
|
if request.method == 'POST':
|
|
if request.method == 'POST':
|
|
|
tables = request.POST.getlist('table_selection')
|
|
tables = request.POST.getlist('table_selection')
|
|
|
tables_objects = [db.get_table(database, table) for table in tables]
|
|
tables_objects = [db.get_table(database, table) for table in tables]
|
|
|
|
|
+ skip_trash = request.POST.get('skip_trash') == 'on'
|
|
|
try:
|
|
try:
|
|
|
# Can't be simpler without an important refactoring
|
|
# Can't be simpler without an important refactoring
|
|
|
design = SavedQuery.create_empty(app_name='beeswax', owner=request.user, data=hql_query('').dumps())
|
|
design = SavedQuery.create_empty(app_name='beeswax', owner=request.user, data=hql_query('').dumps())
|
|
|
- query_history = db.drop_tables(database, tables_objects, design)
|
|
|
|
|
|
|
+ query_history = db.drop_tables(database, tables_objects, design, skip_trash=skip_trash)
|
|
|
url = reverse('beeswax:watch_query_history', kwargs={'query_history_id': query_history.id}) + '?on_success_url=' + reverse('metastore:show_tables', kwargs={'database': database})
|
|
url = reverse('beeswax:watch_query_history', kwargs={'query_history_id': query_history.id}) + '?on_success_url=' + reverse('metastore:show_tables', kwargs={'database': database})
|
|
|
return redirect(url)
|
|
return redirect(url)
|
|
|
except Exception, ex:
|
|
except Exception, ex:
|