Address comments.

superset/models.py

@@ -910,7 +910,10 @@ def link(self):
 
     @property
     def schema_perm(self):
-        return "[{obj.database}].[{obj.schema}]".format(obj=self)
+        """Returns schema permission if present, database one otherwise."""
+        if self.schema:
+            return "[{obj.database}].[{obj.schema}]".format(obj=self)
+        return self.database.perm
 
     def get_perm(self):
         return (
@@ -1630,10 +1633,20 @@ def num_cols(self):
     def name(self):
         return self.datasource_name
 
+    @property
+    def schema(self):
+        name_pieces = self.datasource_name.split('.')
+        if len(name_pieces) > 1:
+            return name_pieces[0]
+        else:
+            return None
+
     @property
     def schema_perm(self):
-        """Is not used. Created for consistency with SqlaTable."""
-        return "[{obj.database}]".format(obj=self)
+        """Returns schema permission if present, cluster one otherwise."""
+        if self.schema:
+            return "[{obj.database}].[{obj.schema}]".format(obj=self)
+        return self.cluster.perm
 
     def get_perm(self):
         return (

superset/security.py

@@ -186,7 +186,9 @@ def sync_role_definitions():
     for datasource in datasources:
         perm = datasource.get_perm()
         sm.add_permission_view_menu('datasource_access', perm)
-        sm.add_permission_view_menu('schema_access', datasource.schema_perm)
+        if datasource.schema:
+            sm.add_permission_view_menu(
+                'schema_access', datasource.schema_perm)
         if perm != datasource.perm:
             datasource.perm = perm