From 02ac630207427174002e8c4899e18698ee763369 Mon Sep 17 00:00:00 2001
From: Paul Rosenzweig <paulrosenzweig@users.noreply.github.com>
Date: Thu, 9 Apr 2020 17:45:55 -0400
Subject: [PATCH] use null for schema-less db schema name rather than ""
(#12299)
---
frontend/src/metabase/admin/permissions/routes.jsx | 4 ++--
frontend/src/metabase/admin/permissions/selectors.js | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/frontend/src/metabase/admin/permissions/routes.jsx b/frontend/src/metabase/admin/permissions/routes.jsx
index 1f6a667d0cb..b9ba8ae0772 100644
--- a/frontend/src/metabase/admin/permissions/routes.jsx
+++ b/frontend/src/metabase/admin/permissions/routes.jsx
@@ -31,7 +31,7 @@ const getRoutes = store => (
</Route>
{/* TABLES NO SCHEMA */}
- {/* NOTE: this route is to support null schemas, inject the empty string as the schemaName */}
+ {/* NOTE: this route is to support null schemas */}
<Route
path=":databaseId/tables"
component={(
@@ -39,7 +39,7 @@ const getRoutes = store => (
) => (
<TablesPermissionsApp
{...props}
- params={{ ...props.params, schemaName: "" }}
+ params={{ ...props.params, schemaName: null }}
/>
)}
>
diff --git a/frontend/src/metabase/admin/permissions/selectors.js b/frontend/src/metabase/admin/permissions/selectors.js
index 965b36cfa0a..9ff1b4be987 100644
--- a/frontend/src/metabase/admin/permissions/selectors.js
+++ b/frontend/src/metabase/admin/permissions/selectors.js
@@ -662,7 +662,7 @@ export const getDatabasesPermissionsGrid = createSelector(
},
name: database.name,
link:
- schemas.length === 0 || (schemas.length === 1 && schemas[0] === "")
+ schemas.length === 0 || (schemas.length === 1 && schemas[0] == null)
? {
name: t`View tables`,
url: `/admin/permissions/databases/${database.id}/tables`,
--
GitLab