Browse Source

[catalog] Fix create database tests

Romain Rigaux 12 years ago
parent
commit
3d6c013

+ 1 - 3
apps/beeswax/src/beeswax/create_database.py

@@ -28,7 +28,6 @@ from desktop.lib.django_util import render
 
 
 from beeswax.design import hql_query
 from beeswax.design import hql_query
 from beeswax.forms import CreateDatabaseForm
 from beeswax.forms import CreateDatabaseForm
-from beeswax.server import dbms
 from beeswax.views import execute_directly
 from beeswax.views import execute_directly
 
 
 
 
@@ -36,7 +35,6 @@ LOG = logging.getLogger(__name__)
 
 
 
 
 def create_database(request):
 def create_database(request):
-  db = dbms.get(request.user)
 
 
   if request.method == "POST":
   if request.method == "POST":
     data = request.POST.copy()
     data = request.POST.copy()
@@ -50,7 +48,7 @@ def create_database(request):
       # Mako outputs bytestring in utf8
       # Mako outputs bytestring in utf8
       proposed_query = proposed_query.decode('utf-8')
       proposed_query = proposed_query.decode('utf-8')
       query = hql_query(proposed_query)
       query = hql_query(proposed_query)
-      return execute_directly(request, query, on_success_url=reverse('catalog:show_databases'))
+      return execute_directly(request, query, on_success_url=reverse('catalog:databases'))
   else:
   else:
     form = CreateDatabaseForm()
     form = CreateDatabaseForm()
 
 

+ 1 - 1
apps/catalog/src/catalog/views.py

@@ -67,7 +67,7 @@ def drop_database(request):
       # 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)
       design = SavedQuery.create_empty(app_name='beeswax', owner=request.user)
       query_history = db.drop_databases(databases, design)
       query_history = db.drop_databases(databases, design)
-      url = reverse('beeswax:watch_query', args=[query_history.id]) + '?on_success_url=' + reverse('catalog:show_databases')
+      url = reverse('beeswax:watch_query', args=[query_history.id]) + '?on_success_url=' + reverse('catalog:databases')
       return redirect(url)
       return redirect(url)
     except Exception, ex:
     except Exception, ex:
       error_message, log = dbms.expand_exception(ex, db)
       error_message, log = dbms.expand_exception(ex, db)