From ce970a051ed4dd23fd6d2c51657706eea1245834 Mon Sep 17 00:00:00 2001
From: Allen Short <ashort@mozilla.com>
Date: Tue, 8 Nov 2016 16:15:35 -0600
Subject: [PATCH] Enable documentation links and versions of data sources (re
 #6).

Refs #537, #553.

Co-authored-by: Marina Samuel <msamuel@mozilla.com>
Co-authored-by: Allen Short <ashort@mozilla.com>
---
 client/app/assets/less/redash/query.less   |   2 +
 client/app/pages/data-sources/list.html    |   2 +-
 client/app/pages/queries/query.html        |   4 +
 redash/handlers/api.py                     |   2 +-
 redash/models.py                           |   2 +
 redash/query_runner/__init__.py            |  56 +++++-----
 redash/query_runner/big_query.py           |  82 ++++++++-------
 redash/query_runner/cass.py                |  75 ++++++-------
 redash/query_runner/dynamodb_sql.py        |  39 +++----
 redash/query_runner/elasticsearch.py       |  41 ++++----
 redash/query_runner/google_spreadsheets.py |  26 ++---
 redash/query_runner/graphite.py            |   2 +-
 redash/query_runner/hive_ds.py             |  41 ++++----
 redash/query_runner/impala_ds.py           |  67 ++++++------
 redash/query_runner/influx_db.py           |  23 ++--
 redash/query_runner/mongodb.py             |  43 ++++----
 redash/query_runner/mssql.py               |  73 ++++++-------
 redash/query_runner/mysql.py               |  57 +++++-----
 redash/query_runner/oracle.py              |  50 ++++-----
 redash/query_runner/pg.py                  | 117 +++++++++++----------
 redash/query_runner/presto.py              |  47 +++++----
 redash/query_runner/python.py              |  32 +++---
 redash/query_runner/script.py              |  34 +++---
 redash/query_runner/sqlite.py              |  25 ++---
 redash/query_runner/treasuredata.py        |  53 +++++-----
 redash/query_runner/url.py                 |   1 -
 redash/query_runner/vertica.py             |  60 +++++------
 requirements.txt                           |   2 +-
 tests/handlers/test_data_sources.py        |   7 +-
 29 files changed, 558 insertions(+), 507 deletions(-)

diff --git a/client/app/assets/less/redash/query.less b/client/app/assets/less/redash/query.less
index 30231788a3..c689f05b05 100644
--- a/client/app/assets/less/redash/query.less
+++ b/client/app/assets/less/redash/query.less
@@ -458,6 +458,7 @@ a.label-tag {
 
 .datasource-small {
   visibility: hidden;
+  display: none !important;
 }
 
 .query-fullscreen .query-metadata__mobile {
@@ -576,6 +577,7 @@ nav .rg-bottom {
 
   .datasource-small {
     visibility: visible;
+    display: inline-block !important;
   }
 
   .query-fullscreen {
diff --git a/client/app/pages/data-sources/list.html b/client/app/pages/data-sources/list.html
index 56af90e071..fd23dfc516 100644
--- a/client/app/pages/data-sources/list.html
+++ b/client/app/pages/data-sources/list.html
@@ -9,7 +9,7 @@
       <div class="database-source">
         <a class="visual-card" ng-href="data_sources/{{dataSource.id}}" ng-repeat="dataSource in $ctrl.dataSources" title="{{dataSource.name}}">
           <img ng-src="/static/images/db-logos/{{dataSource.type}}.png" alt="{{dataSource.name}}">
-          <h3>{{dataSource.name}}</h3>
+          <h3>{{dataSource.name}}</h3> - {{dataSource.type_name}}
         </a>
       </div>
     </div>
diff --git a/client/app/pages/queries/query.html b/client/app/pages/queries/query.html
index 4ddcd01333..ba44ef1e96 100644
--- a/client/app/pages/queries/query.html
+++ b/client/app/pages/queries/query.html
@@ -84,6 +84,8 @@ <h3>
             {{ds.name}}
           </ui-select-choices>
         </ui-select>
+        <datasource-link datasource-id="query.data_source_id"></datasource-link>
+        <datasource-version datasource-id="query.data_source_id"></datasource-version>
       </div>
 
       <div class="editor__left__schema" ng-if="sourceMode">
@@ -168,6 +170,8 @@ <h3>
                     <select class="form-control datasource-small flex-fill w-100" ng-disabled="!isQueryOwner || !sourceMode" ng-model="query.data_source_id"
                       ng-change="updateDataSource()" ng-options="ds.id as ds.name for ds in dataSources"></select>
 
+                    <datasource-link datasource-id="query.data_source_id"></datasource-link>
+
                     <button class="btn btn-default m-l-5" ng-show="canEdit" ng-click="saveQuery()" title="Save" uib-tooltip-html="modKey + ' + S'"
                       tooltip-append-to-body="true">
                       <span class="fa fa-floppy-o"></span>
diff --git a/redash/handlers/api.py b/redash/handlers/api.py
index 49884e46e0..4518bffcce 100644
--- a/redash/handlers/api.py
+++ b/redash/handlers/api.py
@@ -6,7 +6,7 @@
 from redash.handlers.base import org_scoped_rule
 from redash.handlers.permissions import ObjectPermissionsListResource, CheckPermissionResource
 from redash.handlers.alerts import AlertResource, AlertListResource, AlertSubscriptionListResource, AlertSubscriptionResource
-from redash.handlers.dashboards import DashboardListResource, DashboardResource, DashboardShareResource, PublicDashboardResource 
+from redash.handlers.dashboards import DashboardListResource, DashboardResource, DashboardShareResource, PublicDashboardResource
 from redash.handlers.data_sources import DataSourceTypeListResource, DataSourceListResource, DataSourceSchemaResource, DataSourceResource, DataSourcePauseResource, DataSourceTestResource
 from redash.handlers.events import EventsResource
 from redash.handlers.queries import QueryForkResource, QueryRefreshResource, QueryListResource, QueryRecentResource, QuerySearchResource, QueryResource, MyQueriesResource, QueryVersionListResource, ChangeResource
diff --git a/redash/models.py b/redash/models.py
index fa702eb490..831e4c80fa 100644
--- a/redash/models.py
+++ b/redash/models.py
@@ -676,6 +676,8 @@ def add_group(self, group, view_only=False):
         db.session.add(dsg)
         return dsg
 
+        setattr(self, 'data_source_groups', dsg)
+
     def remove_group(self, group):
         db.session.query(DataSourceGroup).filter(
             DataSourceGroup.group == group,
diff --git a/redash/query_runner/__init__.py b/redash/query_runner/__init__.py
index cc00153c6a..5b317bcc79 100644
--- a/redash/query_runner/__init__.py
+++ b/redash/query_runner/__init__.py
@@ -53,6 +53,7 @@ class NotSupported(Exception):
 
 class BaseQueryRunner(object):
     noop_query = None
+    configuration_properties = None
 
     def __init__(self, configuration):
         self.syntax = 'sql'
@@ -78,6 +79,12 @@ def annotate_query(cls):
     def configuration_schema(cls):
         return {}
 
+    @classmethod
+    def add_configuration_property(cls, property, value):
+        if cls.configuration_properties is None:
+            raise NotImplementedError()
+        cls.configuration_properties[property] = value
+
     def test_connection(self):
         if self.noop_query is None:
             raise NotImplementedError()
@@ -151,35 +158,36 @@ class BaseHTTPQueryRunner(BaseQueryRunner):
     url_title = 'URL base path'
     username_title = 'HTTP Basic Auth Username'
     password_title = 'HTTP Basic Auth Password'
+    configuration_properties = {
+        'url': {
+            'type': 'string',
+            'title': url_title,
+        },
+        'username': {
+            'type': 'string',
+            'title': username_title,
+        },
+        'password': {
+            'type': 'string',
+            'title': password_title,
+        },
+        "toggle_table_string": {
+            "type": "string",
+            "title": "Toggle Table String",
+            "default": "_v",
+            "info": (
+                "This string will be used to toggle visibility of "
+                "tables in the schema browser when editing a query "
+                "in order to remove non-useful tables from sight."
+            ),
+        },
+    }
 
     @classmethod
     def configuration_schema(cls):
         schema = {
             'type': 'object',
-            'properties': {
-                'url': {
-                    'type': 'string',
-                    'title': cls.url_title,
-                },
-                'username': {
-                    'type': 'string',
-                    'title': cls.username_title,
-                },
-                'password': {
-                    'type': 'string',
-                    'title': cls.password_title,
-                },
-                "toggle_table_string": {
-                    "type": "string",
-                    "title": "Toggle Table String",
-                    "default": "_v",
-                    "info": (
-                        "This string will be used to toggle visibility of "
-                        "tables in the schema browser when editing a query "
-                        "in order to remove non-useful tables from sight."
-                    ),
-                }
-            },
+            'properties': cls.configuration_properties,
             'required': ['url'],
             'secret': ['password']
         }
diff --git a/redash/query_runner/big_query.py b/redash/query_runner/big_query.py
index cfae91249d..ed05fce526 100644
--- a/redash/query_runner/big_query.py
+++ b/redash/query_runner/big_query.py
@@ -83,6 +83,47 @@ def _get_query_results(jobs, project_id, location, job_id, start_index):
 
 class BigQuery(BaseQueryRunner):
     noop_query = "SELECT 1"
+    configuration_properties = {
+        'projectId': {
+            'type': 'string',
+            'title': 'Project ID'
+        },
+        'jsonKeyFile': {
+            "type": "string",
+            'title': 'JSON Key File'
+        },
+        'totalMBytesProcessedLimit': {
+            "type": "number",
+            'title': 'Scanned Data Limit (MB)'
+        },
+        'userDefinedFunctionResourceUri': {
+            "type": "string",
+            'title': 'UDF Source URIs (i.e. gs://bucket/date_utils.js, gs://bucket/string_utils.js )'
+        },
+        'useStandardSql': {
+            "type": "boolean",
+            'title': "Use Standard SQL (Beta)",
+        },
+        'location': {
+            "type": "string",
+            "title": "Processing Location",
+            "default": "US",
+        },
+        'loadSchema': {
+            "type": "boolean",
+            "title": "Load Schema"
+        },
+        'maximumBillingTier': {
+            "type": "number",
+            "title": "Maximum Billing Tier"
+        },
+        "toggle_table_string": {
+            "type": "string",
+            "title": "Toggle Table String",
+            "default": "_v",
+            "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
+        },
+    }
 
     @classmethod
     def enabled(cls):
@@ -92,46 +133,7 @@ def enabled(cls):
     def configuration_schema(cls):
         return {
             'type': 'object',
-            'properties': {
-                'projectId': {
-                    'type': 'string',
-                    'title': 'Project ID'
-                },
-                'jsonKeyFile': {
-                    "type": "string",
-                    'title': 'JSON Key File'
-                },
-                'totalMBytesProcessedLimit': {
-                    "type": "number",
-                    'title': 'Scanned Data Limit (MB)'
-                },
-                'userDefinedFunctionResourceUri': {
-                    "type": "string",
-                    'title': 'UDF Source URIs (i.e. gs://bucket/date_utils.js, gs://bucket/string_utils.js )'
-                },
-                'useStandardSql': {
-                    "type": "boolean",
-                    'title': "Use Standard SQL (Beta)",
-                },
-                'location': {
-                    "type": "string",
-                    "title": "Processing Location",
-                },
-                'loadSchema': {
-                    "type": "boolean",
-                    "title": "Load Schema"
-                },
-                'maximumBillingTier': {
-                    "type": "number",
-                    "title": "Maximum Billing Tier"
-                },
-                "toggle_table_string": {
-                    "type": "string",
-                    "title": "Toggle Table String",
-                    "default": "_v",
-                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
-                }
-            },
+            'properties': cls.configuration_properties,
             'required': ['jsonKeyFile', 'projectId'],
             "order": ['projectId', 'jsonKeyFile', 'loadSchema', 'useStandardSql', 'location', 'totalMBytesProcessedLimit', 'maximumBillingTier', 'userDefinedFunctionResourceUri'],
             'secret': ['jsonKeyFile']
diff --git a/redash/query_runner/cass.py b/redash/query_runner/cass.py
index 5863336c66..beac7f6192 100644
--- a/redash/query_runner/cass.py
+++ b/redash/query_runner/cass.py
@@ -27,6 +27,43 @@ def default(self, o):
 
 class Cassandra(BaseQueryRunner):
     noop_query = "SELECT dateof(now()) FROM system.local"
+    configuration_properties = {
+        'host': {
+            'type': 'string',
+        },
+        'port': {
+            'type': 'number',
+            'default': 9042,
+        },
+        'keyspace': {
+            'type': 'string',
+            'title': 'Keyspace name'
+        },
+        'username': {
+            'type': 'string',
+            'title': 'Username'
+        },
+        'password': {
+            'type': 'string',
+            'title': 'Password'
+        },
+        'protocol': {
+            'type': 'number',
+            'title': 'Protocol Version',
+            'default': 3
+        },
+        'timeout': {
+            'type': 'number',
+            'title': 'Timeout',
+            'default': 10
+        },
+        "toggle_table_string": {
+            "type": "string",
+            "title": "Toggle Table String",
+            "default": "_v",
+            "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
+        },
+    }
 
     @classmethod
     def enabled(cls):
@@ -36,43 +73,7 @@ def enabled(cls):
     def configuration_schema(cls):
         return {
             'type': 'object',
-            'properties': {
-                'host': {
-                    'type': 'string',
-                },
-                'port': {
-                    'type': 'number',
-                    'default': 9042,
-                },
-                'keyspace': {
-                    'type': 'string',
-                    'title': 'Keyspace name'
-                },
-                'username': {
-                    'type': 'string',
-                    'title': 'Username'
-                },
-                'password': {
-                    'type': 'string',
-                    'title': 'Password'
-                },
-                'protocol': {
-                    'type': 'number',
-                    'title': 'Protocol Version',
-                    'default': 3
-                },
-                'timeout': {
-                    'type': 'number',
-                    'title': 'Timeout',
-                    'default': 10
-                },
-                "toggle_table_string": {
-                    "type": "string",
-                    "title": "Toggle Table String",
-                    "default": "_v",
-                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
-                }
-            },
+            'properties': cls.configuration_properties,
             'required': ['keyspace', 'host']
         }
 
diff --git a/redash/query_runner/dynamodb_sql.py b/redash/query_runner/dynamodb_sql.py
index 15c3f4eac1..f17bf94023 100644
--- a/redash/query_runner/dynamodb_sql.py
+++ b/redash/query_runner/dynamodb_sql.py
@@ -33,28 +33,31 @@
 
 
 class DynamoDBSQL(BaseSQLQueryRunner):
+    noop_query = "SELECT 1"
+    configuration_properties = {
+        "region": {
+            "type": "string",
+            "default": "us-east-1"
+        },
+        "access_key": {
+            "type": "string",
+        },
+        "secret_key": {
+            "type": "string",
+        },
+        "toggle_table_string": {
+            "type": "string",
+            "title": "Toggle Table String",
+            "default": "_v",
+            "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
+        },
+    }
+
     @classmethod
     def configuration_schema(cls):
         return {
             "type": "object",
-            "properties": {
-                "region": {
-                    "type": "string",
-                    "default": "us-east-1"
-                },
-                "access_key": {
-                    "type": "string",
-                },
-                "secret_key": {
-                    "type": "string",
-                },
-                "toggle_table_string": {
-                    "type": "string",
-                    "title": "Toggle Table String",
-                    "default": "_v",
-                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
-                }
-            },
+            "properties": cls.configuration_properties,
             "required": ["access_key", "secret_key"],
             "secret": ["secret_key"]
         }
diff --git a/redash/query_runner/elasticsearch.py b/redash/query_runner/elasticsearch.py
index 3fed078a44..643122070c 100644
--- a/redash/query_runner/elasticsearch.py
+++ b/redash/query_runner/elasticsearch.py
@@ -45,31 +45,32 @@
 
 class BaseElasticSearch(BaseQueryRunner):
     DEBUG_ENABLED = False
+    configuration_properties = {
+        'server': {
+            'type': 'string',
+            'title': 'Base URL'
+        },
+        'basic_auth_user': {
+            'type': 'string',
+            'title': 'Basic Auth User'
+        },
+        'basic_auth_password': {
+            'type': 'string',
+            'title': 'Basic Auth Password'
+        },
+        "toggle_table_string": {
+            "type": "string",
+            "title": "Toggle Table String",
+            "default": "_v",
+            "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
+        },
+    }
 
     @classmethod
     def configuration_schema(cls):
         return {
             'type': 'object',
-            'properties': {
-                'server': {
-                    'type': 'string',
-                    'title': 'Base URL'
-                },
-                'basic_auth_user': {
-                    'type': 'string',
-                    'title': 'Basic Auth User'
-                },
-                'basic_auth_password': {
-                    'type': 'string',
-                    'title': 'Basic Auth Password'
-                },
-                "toggle_table_string": {
-                    "type": "string",
-                    "title": "Toggle Table String",
-                    "default": "_v",
-                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
-                }
-            },
+            'properties': cls.configuration_properties,
             "secret": ["basic_auth_password"],
             "required": ["server"]
         }
diff --git a/redash/query_runner/google_spreadsheets.py b/redash/query_runner/google_spreadsheets.py
index 73a6d352fb..c52952c603 100644
--- a/redash/query_runner/google_spreadsheets.py
+++ b/redash/query_runner/google_spreadsheets.py
@@ -148,6 +148,19 @@ def request(self, *args, **kwargs):
 
 
 class GoogleSpreadsheet(BaseQueryRunner):
+    configuration_properties = {
+        'jsonKeyFile': {
+            "type": "string",
+            'title': 'JSON Key File'
+        },
+        "toggle_table_string": {
+            "type": "string",
+            "title": "Toggle Table String",
+            "default": "_v",
+            "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
+        },
+    }
+
     @classmethod
     def annotate_query(cls):
         return False
@@ -164,18 +177,7 @@ def enabled(cls):
     def configuration_schema(cls):
         return {
             'type': 'object',
-            'properties': {
-                'jsonKeyFile': {
-                    "type": "string",
-                    'title': 'JSON Key File'
-                },
-                "toggle_table_string": {
-                    "type": "string",
-                    "title": "Toggle Table String",
-                    "default": "_v",
-                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
-                }
-            },
+            'properties': cls.configuration_properties,
             'required': ['jsonKeyFile'],
             'secret': ['jsonKeyFile']
         }
diff --git a/redash/query_runner/graphite.py b/redash/query_runner/graphite.py
index 217bd55a16..7ebcd47e6f 100644
--- a/redash/query_runner/graphite.py
+++ b/redash/query_runner/graphite.py
@@ -48,7 +48,7 @@ def configuration_schema(cls):
                     "title": "Toggle Table String",
                     "default": "_v",
                     "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
-                }
+                },
             },
             'required': ['url'],
             'secret': ['password']
diff --git a/redash/query_runner/hive_ds.py b/redash/query_runner/hive_ds.py
index 99d48723c0..ef6d60afcd 100644
--- a/redash/query_runner/hive_ds.py
+++ b/redash/query_runner/hive_ds.py
@@ -36,31 +36,32 @@
 
 class Hive(BaseSQLQueryRunner):
     noop_query = "SELECT 1"
+    configuration_properties = {
+        "host": {
+            "type": "string"
+        },
+        "port": {
+            "type": "number"
+        },
+        "database": {
+            "type": "string"
+        },
+        "username": {
+            "type": "string"
+        },
+        "toggle_table_string": {
+            "type": "string",
+            "title": "Toggle Table String",
+            "default": "_v",
+            "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
+        },
+    }
 
     @classmethod
     def configuration_schema(cls):
         return {
             "type": "object",
-            "properties": {
-                "host": {
-                    "type": "string"
-                },
-                "port": {
-                    "type": "number"
-                },
-                "database": {
-                    "type": "string"
-                },
-                "username": {
-                    "type": "string"
-                },
-                "toggle_table_string": {
-                    "type": "string",
-                    "title": "Toggle Table String",
-                    "default": "_v",
-                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
-                }
-            },
+            "properties": cls.configuration_properties,
             "required": ["host"]
         }
 
diff --git a/redash/query_runner/impala_ds.py b/redash/query_runner/impala_ds.py
index 73412316fc..6ff9087f33 100644
--- a/redash/query_runner/impala_ds.py
+++ b/redash/query_runner/impala_ds.py
@@ -36,44 +36,45 @@
 
 class Impala(BaseSQLQueryRunner):
     noop_query = "show schemas"
+    configuration_properties = {
+        "host": {
+            "type": "string"
+        },
+        "port": {
+            "type": "number"
+        },
+        "protocol": {
+            "type": "string",
+            "title": "Please specify beeswax or hiveserver2"
+        },
+        "database": {
+            "type": "string"
+        },
+        "use_ldap": {
+            "type": "boolean"
+        },
+        "ldap_user": {
+            "type": "string"
+        },
+        "ldap_password": {
+            "type": "string"
+        },
+        "timeout": {
+            "type": "number"
+        },
+        "toggle_table_string": {
+            "type": "string",
+            "title": "Toggle Table String",
+            "default": "_v",
+            "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
+        },
+    }
 
     @classmethod
     def configuration_schema(cls):
         return {
             "type": "object",
-            "properties": {
-                "host": {
-                    "type": "string"
-                },
-                "port": {
-                    "type": "number"
-                },
-                "protocol": {
-                    "type": "string",
-                    "title": "Please specify beeswax or hiveserver2"
-                },
-                "database": {
-                    "type": "string"
-                },
-                "use_ldap": {
-                    "type": "boolean"
-                },
-                "ldap_user": {
-                    "type": "string"
-                },
-                "ldap_password": {
-                    "type": "string"
-                },
-                "timeout": {
-                    "type": "number"
-                },
-                "toggle_table_string": {
-                    "type": "string",
-                    "title": "Toggle Table String",
-                    "default": "_v",
-                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
-                }
-            },
+            "properties": cls.configuration_properties,
             "required": ["host"],
             "secret": ["ldap_password"]
         }
diff --git a/redash/query_runner/influx_db.py b/redash/query_runner/influx_db.py
index 81a63d1c29..b7a75133fd 100644
--- a/redash/query_runner/influx_db.py
+++ b/redash/query_runner/influx_db.py
@@ -50,22 +50,23 @@ def _transform_result(results):
 
 class InfluxDB(BaseQueryRunner):
     noop_query = "show measurements limit 1"
+    configuration_properties = {
+        'url': {
+            'type': 'string'
+        },
+        "toggle_table_string": {
+            "type": "string",
+            "title": "Toggle Table String",
+            "default": "_v",
+            "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
+        },
+    }
 
     @classmethod
     def configuration_schema(cls):
         return {
             'type': 'object',
-            'properties': {
-                'url': {
-                    'type': 'string'
-                },
-                "toggle_table_string": {
-                    "type": "string",
-                    "title": "Toggle Table String",
-                    "default": "_v",
-                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
-                }
-            },
+            'properties': cls.configuration_properties,
             'required': ['url']
         }
 
diff --git a/redash/query_runner/mongodb.py b/redash/query_runner/mongodb.py
index fec546bd09..e17063ab0a 100644
--- a/redash/query_runner/mongodb.py
+++ b/redash/query_runner/mongodb.py
@@ -118,31 +118,32 @@ def parse_results(results):
 
 
 class MongoDB(BaseQueryRunner):
+    configuration_properties = {
+        'connectionString': {
+            'type': 'string',
+            'title': 'Connection String'
+        },
+        'dbName': {
+            'type': 'string',
+            'title': "Database Name"
+        },
+        'replicaSetName': {
+            'type': 'string',
+            'title': 'Replica Set Name'
+        },
+        "toggle_table_string": {
+            "type": "string",
+            "title": "Toggle Table String",
+            "default": "_v",
+            "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
+        },
+    }
+
     @classmethod
     def configuration_schema(cls):
         return {
             'type': 'object',
-            'properties': {
-                'connectionString': {
-                    'type': 'string',
-                    'title': 'Connection String'
-                },
-                'dbName': {
-                    'type': 'string',
-                    'title': "Database Name"
-                },
-                'replicaSetName': {
-                    'type': 'string',
-                    'title': 'Replica Set Name'
-                },
-                },
-                "toggle_table_string": {
-                    "type": "string",
-                    "title": "Toggle Table String",
-                    "default": "_v",
-                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
-                }
-            },
+            'properties': cls.configuration_properties,
             'required': ['connectionString', 'dbName']
         }
 
diff --git a/redash/query_runner/mssql.py b/redash/query_runner/mssql.py
index 05b14d247b..156de6eb95 100644
--- a/redash/query_runner/mssql.py
+++ b/redash/query_runner/mssql.py
@@ -35,47 +35,48 @@ def default(self, o):
 
 class SqlServer(BaseSQLQueryRunner):
     noop_query = "SELECT 1"
+    configuration_properties = {
+        "user": {
+            "type": "string"
+        },
+        "password": {
+            "type": "string"
+        },
+        "server": {
+            "type": "string",
+            "default": "127.0.0.1"
+        },
+        "port": {
+            "type": "number",
+            "default": 1433
+        },
+        "tds_version": {
+            "type": "string",
+            "default": "7.0",
+            "title": "TDS Version"
+        },
+        "charset": {
+            "type": "string",
+            "default": "UTF-8",
+            "title": "Character Set"
+        },
+        "db": {
+            "type": "string",
+            "title": "Database Name"
+        },
+        "toggle_table_string": {
+            "type": "string",
+            "title": "Toggle Table String",
+            "default": "_v",
+            "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
+        },
+    }
 
     @classmethod
     def configuration_schema(cls):
         return {
             "type": "object",
-            "properties": {
-                "user": {
-                    "type": "string"
-                },
-                "password": {
-                    "type": "string"
-                },
-                "server": {
-                    "type": "string",
-                    "default": "127.0.0.1"
-                },
-                "port": {
-                    "type": "number",
-                    "default": 1433
-                },
-                "tds_version": {
-                    "type": "string",
-                    "default": "7.0",
-                    "title": "TDS Version"
-                },
-                "charset": {
-                    "type": "string",
-                    "default": "UTF-8",
-                    "title": "Character Set"
-                },
-                "db": {
-                    "type": "string",
-                    "title": "Database Name"
-                },
-                "toggle_table_string": {
-                    "type": "string",
-                    "title": "Toggle Table String",
-                    "default": "_v",
-                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
-                }
-            },
+            "properties": cls.configuration_properties,
             "required": ["db"],
             "secret": ["password"]
         }
diff --git a/redash/query_runner/mysql.py b/redash/query_runner/mysql.py
index 50cbd9a19e..e3e78ef350 100644
--- a/redash/query_runner/mysql.py
+++ b/redash/query_runner/mysql.py
@@ -29,6 +29,33 @@
 
 class Mysql(BaseSQLQueryRunner):
     noop_query = "SELECT 1"
+    configuration_properties = {
+        'host': {
+            'type': 'string',
+            'default': '127.0.0.1'
+        },
+        'user': {
+            'type': 'string'
+        },
+        'passwd': {
+            'type': 'string',
+            'title': 'Password'
+        },
+        'db': {
+            'type': 'string',
+            'title': 'Database name'
+        },
+        'port': {
+            'type': 'number',
+            'default': 3306,
+        },
+        "toggle_table_string": {
+            "type": "string",
+            "title": "Toggle Table String",
+            "default": "_v",
+            "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
+        },
+    }
 
     @classmethod
     def configuration_schema(cls):
@@ -36,33 +63,7 @@ def configuration_schema(cls):
 
         schema = {
             'type': 'object',
-            'properties': {
-                'host': {
-                    'type': 'string',
-                    'default': '127.0.0.1'
-                },
-                'user': {
-                    'type': 'string'
-                },
-                'passwd': {
-                    'type': 'string',
-                    'title': 'Password'
-                },
-                'db': {
-                    'type': 'string',
-                    'title': 'Database name'
-                },
-                'port': {
-                    'type': 'number',
-                    'default': 3306,
-                },
-                "toggle_table_string": {
-                    "type": "string",
-                    "title": "Toggle Table String",
-                    "default": "_v",
-                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
-                }
-            },
+            'properties': cls.configuration_properties,
             "order": ['host', 'port', 'user', 'passwd', 'db'],
             'required': ['db'],
             'secret': ['passwd']
@@ -85,7 +86,7 @@ def configuration_schema(cls):
                 'ssl_key': {
                     'type': 'string',
                     'title': 'Path to private key file (SSL)'
-                }
+                },
             })
 
         return schema
diff --git a/redash/query_runner/oracle.py b/redash/query_runner/oracle.py
index 17fe7c19f5..fd28a18827 100644
--- a/redash/query_runner/oracle.py
+++ b/redash/query_runner/oracle.py
@@ -31,8 +31,33 @@
 
 logger = logging.getLogger(__name__)
 
+
 class Oracle(BaseSQLQueryRunner):
     noop_query = "SELECT 1 FROM dual"
+    configuration_properties = {
+        "user": {
+            "type": "string"
+        },
+        "password": {
+            "type": "string"
+        },
+        "host": {
+            "type": "string"
+        },
+        "port": {
+            "type": "number"
+        },
+        "servicename": {
+            "type": "string",
+            "title": "DSN Service Name"
+        },
+        "toggle_table_string": {
+            "type": "string",
+            "title": "Toggle Table String",
+            "default": "_v",
+            "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
+        },
+    }
 
     @classmethod
     def get_col_type(cls, col_type, scale):
@@ -49,30 +74,7 @@ def enabled(cls):
     def configuration_schema(cls):
         return {
             "type": "object",
-            "properties": {
-                "user": {
-                    "type": "string"
-                },
-                "password": {
-                    "type": "string"
-                },
-                "host": {
-                    "type": "string"
-                },
-                "port": {
-                    "type": "number"
-                },
-                "servicename": {
-                    "type": "string",
-                    "title": "DSN Service Name"
-                },
-                "toggle_table_string": {
-                    "type": "string",
-                    "title": "Toggle Table String",
-                    "default": "_v",
-                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
-                }
-            },
+            "properties": cls.configuration_properties,
             "required": ["servicename", "user", "password", "host", "port"],
             "secret": ["password"]
         }
diff --git a/redash/query_runner/pg.py b/redash/query_runner/pg.py
index 00b78f8b88..c9f7c3e6e1 100644
--- a/redash/query_runner/pg.py
+++ b/redash/query_runner/pg.py
@@ -47,42 +47,43 @@ def _wait(conn, timeout=None):
 
 class PostgreSQL(BaseSQLQueryRunner):
     noop_query = "SELECT 1"
+    configuration_properties = {
+        "user": {
+            "type": "string"
+        },
+        "password": {
+            "type": "string"
+        },
+        "host": {
+            "type": "string",
+            "default": "127.0.0.1"
+        },
+        "port": {
+            "type": "number",
+            "default": 5432
+        },
+        "dbname": {
+            "type": "string",
+            "title": "Database Name"
+        },
+        "sslmode": {
+           "type": "string",
+           "title": "SSL Mode",
+           "default": "prefer"
+        },
+        "toggle_table_string": {
+            "type": "string",
+            "title": "Toggle Table String",
+            "default": "_v",
+            "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
+        },
+    }
 
     @classmethod
     def configuration_schema(cls):
         return {
             "type": "object",
-            "properties": {
-                "user": {
-                    "type": "string"
-                },
-                "password": {
-                    "type": "string"
-                },
-                "host": {
-                    "type": "string",
-                    "default": "127.0.0.1"
-                },
-                "port": {
-                    "type": "number",
-                    "default": 5432
-                },
-                "dbname": {
-                    "type": "string",
-                    "title": "Database Name"
-                },
-                "sslmode": {
-                   "type": "string",
-                   "title": "SSL Mode",
-                   "default": "prefer"
-                },
-                "toggle_table_string": {
-                    "type": "string",
-                    "title": "Toggle Table String",
-                    "default": "_v",
-                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
-                }
-            },
+            "properties": cls.configuration_properties,
             "order": ['host', 'port', 'user', 'password'],
             "required": ["dbname"],
             "secret": ["password"]
@@ -196,6 +197,36 @@ def run_query(self, query, user):
 
 
 class Redshift(PostgreSQL):
+    configuration_properties = {
+        "user": {
+            "type": "string"
+        },
+        "password": {
+            "type": "string"
+        },
+        "host": {
+            "type": "string"
+        },
+        "port": {
+            "type": "number"
+        },
+        "dbname": {
+            "type": "string",
+            "title": "Database Name"
+        },
+        "sslmode": {
+           "type": "string",
+           "title": "SSL Mode",
+           "default": "prefer"
+        },
+        "toggle_table_string": {
+            "type": "string",
+            "title": "Toggle Table String",
+            "default": "_v",
+            "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
+        },
+    }
+
     @classmethod
     def type(cls):
         return "redshift"
@@ -219,29 +250,7 @@ def configuration_schema(cls):
 
         return {
             "type": "object",
-            "properties": {
-                "user": {
-                    "type": "string"
-                },
-                "password": {
-                    "type": "string"
-                },
-                "host": {
-                    "type": "string"
-                },
-                "port": {
-                    "type": "number"
-                },
-                "dbname": {
-                    "type": "string",
-                    "title": "Database Name"
-                },
-                "sslmode": {
-                   "type": "string",
-                   "title": "SSL Mode",
-                   "default": "prefer"
-                }
-            },
+            "properties": cls.configuration_properties,
             "order": ['host', 'port', 'user', 'password'],
             "required": ["dbname", "user", "password", "host", "port"],
             "secret": ["password"]
diff --git a/redash/query_runner/presto.py b/redash/query_runner/presto.py
index 0105cacd93..949c70da67 100644
--- a/redash/query_runner/presto.py
+++ b/redash/query_runner/presto.py
@@ -34,34 +34,35 @@
 
 class Presto(BaseQueryRunner):
     noop_query = 'SHOW TABLES'
+    configuration_properties = {
+        'host': {
+            'type': 'string'
+        },
+        'port': {
+            'type': 'number'
+        },
+        'schema': {
+            'type': 'string'
+        },
+        'catalog': {
+            'type': 'string'
+        },
+        'username': {
+            'type': 'string'
+        },
+        "toggle_table_string": {
+            "type": "string",
+            "title": "Toggle Table String",
+            "default": "_v",
+            "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
+        },
+    }
 
     @classmethod
     def configuration_schema(cls):
         return {
             'type': 'object',
-            'properties': {
-                'host': {
-                    'type': 'string'
-                },
-                'port': {
-                    'type': 'number'
-                },
-                'schema': {
-                    'type': 'string'
-                },
-                'catalog': {
-                    'type': 'string'
-                },
-                'username': {
-                    'type': 'string'
-                },
-                "toggle_table_string": {
-                    "type": "string",
-                    "title": "Toggle Table String",
-                    "default": "_v",
-                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
-                }
-            },
+            'properties': cls.configuration_properties,
             'required': ['host']
         }
 
diff --git a/redash/query_runner/python.py b/redash/query_runner/python.py
index 629d724755..dfb377fbc2 100644
--- a/redash/query_runner/python.py
+++ b/redash/query_runner/python.py
@@ -46,25 +46,27 @@ class Python(BaseQueryRunner):
         'tuple', 'set', 'list', 'dict', 'bool',
     )
 
+    configuration_properties = {
+        'allowedImportModules': {
+            'type': 'string',
+            'title': 'Modules to import prior to running the script'
+        },
+        'additionalModulesPaths': {
+            'type': 'string'
+        },
+        "toggle_table_string": {
+            "type": "string",
+            "title": "Toggle Table String",
+            "default": "_v",
+            "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
+        },
+    }
+
     @classmethod
     def configuration_schema(cls):
         return {
             'type': 'object',
-            'properties': {
-                'allowedImportModules': {
-                    'type': 'string',
-                    'title': 'Modules to import prior to running the script'
-                },
-                'additionalModulesPaths': {
-                    'type': 'string'
-                },
-                "toggle_table_string": {
-                    "type": "string",
-                    "title": "Toggle Table String",
-                    "default": "_v",
-                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
-                }
-            },
+            'properties': cls.configuration_properties
         }
 
     @classmethod
diff --git a/redash/query_runner/script.py b/redash/query_runner/script.py
index 87713b1861..1bf6cb9c48 100644
--- a/redash/query_runner/script.py
+++ b/redash/query_runner/script.py
@@ -29,6 +29,23 @@ def run_script(script, shell):
 
 
 class Script(BaseQueryRunner):
+    configuration_properties = {
+        'path': {
+            'type': 'string',
+            'title': 'Scripts path'
+        },
+        'shell': {
+            'type': 'boolean',
+            'title': 'Execute command through the shell'
+        },
+        "toggle_table_string": {
+            "type": "string",
+            "title": "Toggle Table String",
+            "default": "_v",
+            "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
+        },
+    }
+
     @classmethod
     def annotate_query(cls):
         return False
@@ -41,22 +58,7 @@ def enabled(cls):
     def configuration_schema(cls):
         return {
             'type': 'object',
-            'properties': {
-                'path': {
-                    'type': 'string',
-                    'title': 'Scripts path'
-                },
-                'shell': {
-                    'type': 'boolean',
-                    'title': 'Execute command through the shell'
-                },
-                "toggle_table_string": {
-                    "type": "string",
-                    "title": "Toggle Table String",
-                    "default": "_v",
-                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
-                }
-            },
+            'properties': cls.configuration_properties,
             'required': ['path']
         }
 
diff --git a/redash/query_runner/sqlite.py b/redash/query_runner/sqlite.py
index b9a43bf23a..a0c199e60c 100644
--- a/redash/query_runner/sqlite.py
+++ b/redash/query_runner/sqlite.py
@@ -13,23 +13,24 @@
 
 class Sqlite(BaseSQLQueryRunner):
     noop_query = "pragma quick_check"
+    configuration_properties = {
+        "dbpath": {
+            "type": "string",
+            "title": "Database Path"
+        },
+        "toggle_table_string": {
+            "type": "string",
+            "title": "Toggle Table String",
+            "default": "_v",
+            "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
+        },
+    }
 
     @classmethod
     def configuration_schema(cls):
         return {
             "type": "object",
-            "properties": {
-                "dbpath": {
-                    "type": "string",
-                    "title": "Database Path"
-                },
-                "toggle_table_string": {
-                    "type": "string",
-                    "title": "Toggle Table String",
-                    "default": "_v",
-                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
-                }
-            },
+            "properties": cls.configuration_properties,
             "required": ["dbpath"],
         }
 
diff --git a/redash/query_runner/treasuredata.py b/redash/query_runner/treasuredata.py
index 9fb2a426ca..ca05a67fcf 100644
--- a/redash/query_runner/treasuredata.py
+++ b/redash/query_runner/treasuredata.py
@@ -36,37 +36,38 @@
 
 class TreasureData(BaseQueryRunner):
     noop_query = "SELECT 1"
+    configuration_properties = {
+        'endpoint': {
+            'type': 'string'
+        },
+        'apikey': {
+            'type': 'string'
+        },
+        'type': {
+            'type': 'string'
+        },
+        'db': {
+            'type': 'string',
+            'title': 'Database Name'
+        },
+        'get_schema': {
+            'type': 'boolean',
+            'title': 'Auto Schema Retrieval',
+            'default': False
+        },
+        "toggle_table_string": {
+            "type": "string",
+            "title": "Toggle Table String",
+            "default": "_v",
+            "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
+        },
+    }
 
     @classmethod
     def configuration_schema(cls):
         return {
             'type': 'object',
-            'properties': {
-                'endpoint': {
-                    'type': 'string'
-                },
-                'apikey': {
-                    'type': 'string'
-                },
-                'type': {
-                    'type': 'string'
-                },
-                'db': {
-                    'type': 'string',
-                    'title': 'Database Name'
-                },
-                'get_schema': {
-                    'type': 'boolean',
-                    'title': 'Auto Schema Retrieval',
-                    'default': False
-                },
-                "toggle_table_string": {
-                    "type": "string",
-                    "title": "Toggle Table String",
-                    "default": "_v",
-                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
-                }
-            },
+            'properties': cls.configuration_properties,
             'required': ['apikey','db']
         }
 
diff --git a/redash/query_runner/url.py b/redash/query_runner/url.py
index 57f0afde35..26dd2002a6 100644
--- a/redash/query_runner/url.py
+++ b/redash/query_runner/url.py
@@ -2,7 +2,6 @@
 
 
 class Url(BaseHTTPQueryRunner):
-
     @classmethod
     def annotate_query(cls):
         return False
diff --git a/redash/query_runner/vertica.py b/redash/query_runner/vertica.py
index 9f7b48480c..6d13a7bcfd 100644
--- a/redash/query_runner/vertica.py
+++ b/redash/query_runner/vertica.py
@@ -30,41 +30,41 @@
 
 class Vertica(BaseSQLQueryRunner):
     noop_query = "SELECT 1"
+    configuration_properties = {
+        'host': {
+            'type': 'string'
+        },
+        'user': {
+            'type': 'string'
+        },
+        'password': {
+            'type': 'string',
+            'title': 'Password'
+        },
+        'database': {
+            'type': 'string',
+            'title': 'Database name'
+        },
+        "port": {
+            "type": "number"
+        },
+        "read_timeout": {
+            "type": "number",
+            "title": "Read Timeout"
+        },
+        "toggle_table_string": {
+            "type": "string",
+            "title": "Toggle Table String",
+            "default": "_v",
+            "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
+        },
+    }
 
     @classmethod
     def configuration_schema(cls):
         return {
             'type': 'object',
-            'properties': {
-                'host': {
-                    'type': 'string'
-                },
-                'user': {
-                    'type': 'string'
-                },
-                'password': {
-                    'type': 'string',
-                    'title': 'Password'
-                },
-                'database': {
-                    'type': 'string',
-                    'title': 'Database name'
-                },
-                "port": {
-                    "type": "number"
-                },
-                "read_timeout": {
-                    "type": "number",
-                    "title": "Read Timeout"
-                },
-                },
-                "toggle_table_string": {
-                    "type": "string",
-                    "title": "Toggle Table String",
-                    "default": "_v",
-                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
-                }
-            },
+            'properties': cls.configuration_properties,
             'required': ['database'],
             'secret': ['password']
         }
diff --git a/requirements.txt b/requirements.txt
index 04ec666800..834c9bc8a0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -55,4 +55,4 @@ disposable-email-domains
 # Uncomment the requirement for ldap3 if using ldap.
 # It is not included by default because of the GPL license conflict.
 # ldap3==2.2.4
-redash-stmo>=2018.8.1
+redash-stmo>=2018.9.1
diff --git a/tests/handlers/test_data_sources.py b/tests/handlers/test_data_sources.py
index f07a2b3719..4590056fd4 100644
--- a/tests/handlers/test_data_sources.py
+++ b/tests/handlers/test_data_sources.py
@@ -60,7 +60,8 @@ def test_updates_data_source(self):
         new_name = 'New Name'
         new_options = {"dbname": "newdb"}
         rv = self.make_request('post', self.path,
-                               data={'name': new_name, 'type': 'pg', 'options': new_options},
+                               data={'name': new_name, 'type': 'pg', 'options': new_options,
+                                     'doc_url': None},
                                user=admin)
 
         self.assertEqual(rv.status_code, 200)
@@ -101,7 +102,9 @@ def test_returns_400_when_configuration_invalid(self):
     def test_creates_data_source(self):
         admin = self.factory.create_admin()
         rv = self.make_request('post', '/api/data_sources',
-                               data={'name': 'DS 1', 'type': 'pg', 'options': {"dbname": "redash"}}, user=admin)
+                               data={'name': 'DS 1', 'type': 'pg',
+                                     'options': {"dbname": "redash"},
+                                     'doc_url': None}, user=admin)
 
         self.assertEqual(rv.status_code, 200)