simplify the logic in testconn. thanks @xrmx

caravel/views.py

@@ -1241,7 +1241,7 @@ def add_slices(self, dashboard_id):
     def testconn(self):
         """Tests a sqla connection"""
         try:
-            request_uri = request.json.get('uri')
+            uri = request.json.get('uri')
             database_name = request.json.get('database_name')
             if database_name:
                 database = (
@@ -1250,16 +1250,10 @@ def testconn(self):
                     .filter_by(database_name=database_name)
                     .first()
                 )
-                if request_uri != database.safe_sqlalchemy_uri():
-                    # the user altered the SQLAlchemy URI field
-                    # so use that for testing the connection
-                    uri = request_uri
-                else:
+                if uri == database.safe_sqlalchemy_uri():
+                    # the password-masked uri was passed
                     # use the URI associated with this database
                     uri = database.sqlalchemy_uri_decrypted
-            else:
-                # database_name was not passed as an argument
-                uri = request_uri
             connect_args = (
                 request.json
                 .get('extras', {})