Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Improve workspace error messages (#74944)

Alexander Polyankin8fa3fa576f04
diff --git a/enterprise/frontend/src/metabase-enterprise/api/workspace.ts b/enterprise/frontend/src/metabase-enterprise/api/workspace.ts
index 6c20639213b..18862d794a7 100644
--- a/enterprise/frontend/src/metabase-enterprise/api/workspace.ts
+++ b/enterprise/frontend/src/metabase-enterprise/api/workspace.ts
@@ -101,6 +101,7 @@ export const workspaceApi = EnterpriseApi.injectEndpoints({
export const {
useListWorkspacesQuery,
useGetWorkspaceQuery,
+ useLazyGetWorkspaceQuery,
useCreateWorkspaceMutation,
useUpdateWorkspaceMutation,
useDeleteWorkspaceMutation,
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/components/AdminConnectionInfoSection/AdminConnectionInfoSection.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/components/AdminConnectionInfoSection/AdminConnectionInfoSection.tsx
index 74926a8815b..b5f3ce2560b 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/components/AdminConnectionInfoSection/AdminConnectionInfoSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/components/AdminConnectionInfoSection/AdminConnectionInfoSection.tsx
@@ -8,6 +8,7 @@ import {
} from "metabase/admin/databases/components/DatabaseInfoSection";
import { useUpdateDatabaseMutation } from "metabase/api";
import { useConfirmation } from "metabase/common/hooks/use-confirmation";
+import { useToast } from "metabase/common/hooks/use-toast";
import {
hasDbRoutingEnabled,
hasFeature,
@@ -23,6 +24,7 @@ export function AdminConnectionInfoSection({
const hasAdminConnection = database.admin_details != null;
const [updateDatabase] = useUpdateDatabaseMutation();
const { modalContent, show: showConfirmation } = useConfirmation();
+ const [sendToast] = useToast();
const isDbRoutingEnabled = hasDbRoutingEnabled(database);
if (!isDbModifiable(database) || !hasFeature(database, "workspace")) {
@@ -35,10 +37,18 @@ export function AdminConnectionInfoSection({
message: t`This will remove the admin connection for this database. Any features that depend on it will stop working.`,
confirmButtonText: t`Remove`,
onConfirm: async () => {
- await updateDatabase({
- id: database.id,
- admin_details: null,
- }).unwrap();
+ try {
+ await updateDatabase({
+ id: database.id,
+ admin_details: null,
+ }).unwrap();
+ } catch {
+ sendToast({
+ message: t`Failed to remove admin connection`,
+ toastColor: "error",
+ icon: "warning",
+ });
+ }
},
});
};
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/components/AdminConnectionInfoSection/AdminConnectionInfoSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/components/AdminConnectionInfoSection/AdminConnectionInfoSection.unit.spec.tsx
index fe7410233bd..7e2a59142f7 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/components/AdminConnectionInfoSection/AdminConnectionInfoSection.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/components/AdminConnectionInfoSection/AdminConnectionInfoSection.unit.spec.tsx
@@ -1,5 +1,12 @@
-import { setupDatabaseEndpoints } from "__support__/server-mocks/database";
+import userEvent from "@testing-library/user-event";
+
+import {
+ setupDatabaseHealthcheckEndpoint,
+ setupUpdateDatabaseEndpoint,
+ setupUpdateDatabaseEndpointError,
+} from "__support__/server-mocks/database";
import { renderWithProviders, screen } from "__support__/ui";
+import { UndoListing } from "metabase/common/components/UndoListing";
import type { Database } from "metabase-types/api";
import { createMockDatabase } from "metabase-types/api/mocks";
@@ -7,13 +14,25 @@ import { AdminConnectionInfoSection } from "./AdminConnectionInfoSection";
interface SetupOpts {
database?: Database;
+ withError?: boolean;
}
function setup({
database = createMockDatabase({ features: ["workspace"] }),
+ withError = false,
}: SetupOpts = {}) {
- setupDatabaseEndpoints(database);
- renderWithProviders(<AdminConnectionInfoSection database={database} />);
+ setupDatabaseHealthcheckEndpoint(database.id);
+ if (withError) {
+ setupUpdateDatabaseEndpointError(database.id);
+ } else {
+ setupUpdateDatabaseEndpoint(database);
+ }
+ renderWithProviders(
+ <>
+ <AdminConnectionInfoSection database={database} />
+ <UndoListing />
+ </>,
+ );
}
describe("AdminConnectionInfoSection", () => {
@@ -80,4 +99,23 @@ describe("AdminConnectionInfoSection", () => {
),
).not.toBeInTheDocument();
});
+
+ it("should show an error toast when removing the admin connection fails", async () => {
+ const database = createMockDatabase({
+ features: ["workspace"],
+ admin_details: { user: "admin" },
+ });
+ setup({ database, withError: true });
+
+ await userEvent.click(
+ screen.getByRole("button", { name: "Remove admin connection" }),
+ );
+ await userEvent.click(
+ await screen.findByRole("button", { name: "Remove" }),
+ );
+
+ expect(
+ await screen.findByText("Failed to remove admin connection"),
+ ).toBeInTheDocument();
+ });
});
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/components/DeleteWorkspaceModal/DeleteWorkspaceModal.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/components/DeleteWorkspaceModal/DeleteWorkspaceModal.tsx
new file mode 100644
index 00000000000..510e7d6761b
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/components/DeleteWorkspaceModal/DeleteWorkspaceModal.tsx
@@ -0,0 +1,81 @@
+import { t } from "ttag";
+
+import {
+ Form,
+ FormErrorMessage,
+ FormProvider,
+ FormSubmitButton,
+} from "metabase/forms";
+import { Button, FocusTrap, Group, Modal, Stack, Text } from "metabase/ui";
+import { useDeleteWorkspaceMutation } from "metabase-enterprise/api";
+import type { Workspace } from "metabase-types/api";
+
+export type DeleteWorkspaceModalProps = {
+ workspace: Workspace;
+ opened: boolean;
+ onDelete: () => void;
+ onClose: () => void;
+};
+
+export function DeleteWorkspaceModal({
+ workspace,
+ opened,
+ onDelete,
+ onClose,
+}: DeleteWorkspaceModalProps) {
+ return (
+ <Modal
+ title={t`Delete this workspace?`}
+ opened={opened}
+ padding="xl"
+ onClose={onClose}
+ >
+ <FocusTrap.InitialFocus />
+ <DeleteWorkspaceForm
+ workspace={workspace}
+ onDelete={onDelete}
+ onClose={onClose}
+ />
+ </Modal>
+ );
+}
+
+type DeleteWorkspaceFormProps = {
+ workspace: Workspace;
+ onDelete: () => void;
+ onClose: () => void;
+};
+
+function DeleteWorkspaceForm({
+ workspace,
+ onDelete,
+ onClose,
+}: DeleteWorkspaceFormProps) {
+ const [deleteWorkspace] = useDeleteWorkspaceMutation();
+
+ const handleSubmit = async () => {
+ await deleteWorkspace(workspace.id).unwrap();
+ onDelete();
+ };
+
+ return (
+ <FormProvider initialValues={{}} onSubmit={handleSubmit}>
+ <Form>
+ <Stack gap="lg">
+ <Text>
+ {t`This will delete the workspace as well as the temporary database users and schemas that were created for this workspace. This can't be undone.`}
+ </Text>
+ <FormErrorMessage />
+ <Group justify="flex-end">
+ <Button onClick={onClose}>{t`Cancel`}</Button>
+ <FormSubmitButton
+ label={t`Delete workspace`}
+ variant="filled"
+ color="danger"
+ />
+ </Group>
+ </Stack>
+ </Form>
+ </FormProvider>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/components/DeleteWorkspaceModal/DeleteWorkspaceModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/components/DeleteWorkspaceModal/DeleteWorkspaceModal.unit.spec.tsx
new file mode 100644
index 00000000000..e75be30cadb
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/components/DeleteWorkspaceModal/DeleteWorkspaceModal.unit.spec.tsx
@@ -0,0 +1,68 @@
+import userEvent from "@testing-library/user-event";
+import fetchMock from "fetch-mock";
+
+import {
+ setupDeleteWorkspaceEndpoint,
+ setupDeleteWorkspaceEndpointError,
+} from "__support__/server-mocks";
+import { renderWithProviders, screen, waitFor } from "__support__/ui";
+import { createMockWorkspace } from "metabase-types/api/mocks";
+
+import { DeleteWorkspaceModal } from "./DeleteWorkspaceModal";
+
+const WORKSPACE = createMockWorkspace({ id: 1, name: "My workspace" });
+
+function setup({ withError = false }: { withError?: boolean } = {}) {
+ if (withError) {
+ setupDeleteWorkspaceEndpointError(WORKSPACE.id);
+ } else {
+ setupDeleteWorkspaceEndpoint(WORKSPACE.id);
+ }
+
+ const onDelete = jest.fn();
+ const onClose = jest.fn();
+
+ renderWithProviders(
+ <DeleteWorkspaceModal
+ workspace={WORKSPACE}
+ opened
+ onDelete={onDelete}
+ onClose={onClose}
+ />,
+ );
+
+ return { onDelete, onClose };
+}
+
+describe("DeleteWorkspaceModal", () => {
+ it("should delete the workspace and call the callback when the confirm button is clicked", async () => {
+ const { onDelete } = setup();
+
+ await userEvent.click(
+ screen.getByRole("button", { name: "Delete workspace" }),
+ );
+
+ await waitFor(() => {
+ expect(
+ fetchMock.callHistory.called(
+ `path:/api/ee/workspace-manager/${WORKSPACE.id}`,
+ { method: "DELETE" },
+ ),
+ ).toBe(true);
+ });
+ await waitFor(() => expect(onDelete).toHaveBeenCalled());
+ });
+
+ it("should show an error message and not call the callback when the request fails", async () => {
+ const { onDelete } = setup({ withError: true });
+
+ await userEvent.click(
+ screen.getByRole("button", { name: "Delete workspace" }),
+ );
+
+ expect(await screen.findByRole("alert")).toHaveTextContent(
+ "An error occurred",
+ );
+ expect(onDelete).not.toHaveBeenCalled();
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/components/DeleteWorkspaceModal/index.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/components/DeleteWorkspaceModal/index.ts
new file mode 100644
index 00000000000..a3307e8c5c3
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/components/DeleteWorkspaceModal/index.ts
@@ -0,0 +1 @@
+export * from "./DeleteWorkspaceModal";
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/hooks/index.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/hooks/index.ts
deleted file mode 100644
index 997c4528a9e..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/hooks/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./use-delete-database";
-export * from "./use-delete-workspace";
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/hooks/use-delete-database.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/hooks/use-delete-database.tsx
deleted file mode 100644
index e24afa6e7be..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/hooks/use-delete-database.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import { t } from "ttag";
-
-import { useConfirmation } from "metabase/common/hooks/use-confirmation";
-import { useDeleteWorkspaceDatabaseMutation } from "metabase-enterprise/api";
-import type {
- Database,
- Workspace,
- WorkspaceDatabase,
-} from "metabase-types/api";
-
-export type DeleteDatabaseProps = {
- database: Database | undefined;
- onSuccess?: () => void;
-};
-
-export function useDeleteDatabase({
- database,
- onSuccess,
-}: DeleteDatabaseProps) {
- const { modalContent, show } = useConfirmation();
- const [deleteWorkspaceDatabase] = useDeleteWorkspaceDatabaseMutation();
-
- const handleDelete = (
- workspace: Workspace,
- workspaceDatabase: WorkspaceDatabase,
- ) => {
- show({
- title: t`Remove ${database?.name} from this workspace?`,
- message: t`This will delete the temporary user and schema from this database.`,
- confirmButtonText: t`Remove`,
- confirmButtonProps: { color: "danger" },
- onConfirm: async () => {
- await deleteWorkspaceDatabase({
- id: workspace.id,
- database_id: workspaceDatabase.database_id,
- }).unwrap();
- onSuccess?.();
- },
- });
- };
-
- return { handleDelete, modalContent };
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/hooks/use-delete-workspace.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/hooks/use-delete-workspace.tsx
deleted file mode 100644
index 56a8ecc0659..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/hooks/use-delete-workspace.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { t } from "ttag";
-
-import { useConfirmation } from "metabase/common/hooks/use-confirmation";
-import { useDeleteWorkspaceMutation } from "metabase-enterprise/api";
-import type { Workspace } from "metabase-types/api";
-
-export type DeleteWorkspaceProps = {
- onSuccess?: () => void;
-};
-
-export function useDeleteWorkspace({ onSuccess }: DeleteWorkspaceProps = {}) {
- const { modalContent, show } = useConfirmation();
- const [deleteWorkspace] = useDeleteWorkspaceMutation();
-
- const handleDelete = (workspace: Workspace) => {
- show({
- title: t`Delete this workspace?`,
- message: t`This will delete the workspace as well as the temporary database users and schemas that were created for this workspace. This can’t be undone.`,
- confirmButtonText: t`Delete workspace`,
- confirmButtonProps: { color: "danger" },
- onConfirm: async () => {
- await deleteWorkspace(workspace.id).unwrap();
- onSuccess?.();
- },
- });
- };
-
- return { handleDelete, modalContent };
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseEmptyState/DatabaseEmptyState.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseEmptyState/DatabaseEmptyState.unit.spec.tsx
index 9d648ee32b3..0e263123052 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseEmptyState/DatabaseEmptyState.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseEmptyState/DatabaseEmptyState.unit.spec.tsx
@@ -4,6 +4,7 @@ import fetchMock from "fetch-mock";
import {
setupCreateWorkspaceDatabaseEndpoint,
setupDatabasesEndpoints,
+ setupGetWorkspaceEndpoint,
} from "__support__/server-mocks";
import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
import type { Workspace } from "metabase-types/api";
@@ -41,6 +42,7 @@ function setup({
} = {}) {
setupDatabasesEndpoints([TEST_DATABASE]);
setupCreateWorkspaceDatabaseEndpoint(createdWorkspace);
+ setupGetWorkspaceEndpoint(createdWorkspace);
renderWithProviders(
<DatabaseEmptyState
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseItem/DatabaseItem.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseItem/DatabaseItem.tsx
index 0b8404efc09..774b2500522 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseItem/DatabaseItem.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseItem/DatabaseItem.tsx
@@ -10,7 +10,7 @@ import type {
} from "metabase-types/api";
import { DatabaseInfo } from "../../../../components/DatabaseInfo";
-import { useDeleteDatabase } from "../../../../hooks";
+import { DeleteDatabaseModal } from "../DeleteDatabaseModal";
import { UpdateDatabaseModal } from "../UpdateDatabaseModal";
export type DatabaseItemProps = {
@@ -24,8 +24,10 @@ export function DatabaseItem({
workspaceDatabase,
database,
}: DatabaseItemProps) {
- const [opened, { open, close }] = useDisclosure(false);
- const { handleDelete, modalContent } = useDeleteDatabase({ database });
+ const [editOpened, { open: openEdit, close: closeEdit }] =
+ useDisclosure(false);
+ const [deleteOpened, { open: openDelete, close: closeDelete }] =
+ useDisclosure(false);
const supportsSchemas = database != null && hasFeature(database, "schemas");
return (
@@ -52,12 +54,12 @@ export function DatabaseItem({
{supportsSchemas && (
<Menu.Item
leftSection={<FixedSizeIcon name="pencil" aria-hidden />}
- onClick={open}
+ onClick={openEdit}
>{t`Edit`}</Menu.Item>
)}
<Menu.Item
leftSection={<FixedSizeIcon name="trash" aria-hidden />}
- onClick={() => handleDelete(workspace, workspaceDatabase)}
+ onClick={openDelete}
>{t`Remove`}</Menu.Item>
</Menu.Dropdown>
</Menu>
@@ -67,12 +69,19 @@ export function DatabaseItem({
workspace={workspace}
workspaceDatabase={workspaceDatabase}
database={database}
- opened={opened}
- onUpdate={close}
- onClose={close}
+ opened={editOpened}
+ onUpdate={closeEdit}
+ onClose={closeEdit}
/>
)}
- {modalContent}
+ <DeleteDatabaseModal
+ workspace={workspace}
+ workspaceDatabase={workspaceDatabase}
+ database={database}
+ opened={deleteOpened}
+ onDelete={closeDelete}
+ onClose={closeDelete}
+ />
</Card>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseItem/DatabaseItem.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseItem/DatabaseItem.unit.spec.tsx
index 3419d1c160e..3962ad7aefc 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseItem/DatabaseItem.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DatabaseItem/DatabaseItem.unit.spec.tsx
@@ -4,6 +4,7 @@ import fetchMock from "fetch-mock";
import {
setupDatabasesEndpoints,
setupDeleteWorkspaceDatabaseEndpoint,
+ setupGetWorkspaceEndpoint,
setupUpdateWorkspaceDatabaseEndpoint,
} from "__support__/server-mocks";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
@@ -39,6 +40,7 @@ function setup() {
setupDatabasesEndpoints([TEST_DATABASE]);
setupUpdateWorkspaceDatabaseEndpoint(WORKSPACE, TEST_DATABASE.id);
setupDeleteWorkspaceDatabaseEndpoint(WORKSPACE, TEST_DATABASE.id);
+ setupGetWorkspaceEndpoint(WORKSPACE);
renderWithProviders(
<DatabaseItem
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DeleteDatabaseModal/DeleteDatabaseModal.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DeleteDatabaseModal/DeleteDatabaseModal.tsx
new file mode 100644
index 00000000000..c9130f9b229
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DeleteDatabaseModal/DeleteDatabaseModal.tsx
@@ -0,0 +1,100 @@
+import { t } from "ttag";
+
+import {
+ Form,
+ FormErrorMessage,
+ FormProvider,
+ FormSubmitButton,
+} from "metabase/forms";
+import { Button, FocusTrap, Group, Modal, Stack, Text } from "metabase/ui";
+import {
+ useDeleteWorkspaceDatabaseMutation,
+ useLazyGetWorkspaceQuery,
+} from "metabase-enterprise/api";
+import type {
+ Database,
+ Workspace,
+ WorkspaceDatabase,
+} from "metabase-types/api";
+
+export type DeleteDatabaseModalProps = {
+ workspace: Workspace;
+ workspaceDatabase: WorkspaceDatabase;
+ database: Database | undefined;
+ opened: boolean;
+ onDelete: () => void;
+ onClose: () => void;
+};
+
+export function DeleteDatabaseModal({
+ workspace,
+ workspaceDatabase,
+ database,
+ opened,
+ onDelete,
+ onClose,
+}: DeleteDatabaseModalProps) {
+ return (
+ <Modal
+ title={t`Remove ${database?.name} from this workspace?`}
+ opened={opened}
+ padding="xl"
+ onClose={onClose}
+ >
+ <FocusTrap.InitialFocus />
+ <DeleteDatabaseForm
+ workspace={workspace}
+ workspaceDatabase={workspaceDatabase}
+ onDelete={onDelete}
+ onClose={onClose}
+ />
+ </Modal>
+ );
+}
+
+type DeleteDatabaseFormProps = {
+ workspace: Workspace;
+ workspaceDatabase: WorkspaceDatabase;
+ onDelete: () => void;
+ onClose: () => void;
+};
+
+function DeleteDatabaseForm({
+ workspace,
+ workspaceDatabase,
+ onDelete,
+ onClose,
+}: DeleteDatabaseFormProps) {
+ const [deleteWorkspaceDatabase] = useDeleteWorkspaceDatabaseMutation();
+ const [getWorkspace] = useLazyGetWorkspaceQuery();
+
+ const handleSubmit = async () => {
+ await deleteWorkspaceDatabase({
+ id: workspace.id,
+ database_id: workspaceDatabase.database_id,
+ }).unwrap();
+ await getWorkspace(workspace.id).unwrap();
+ onDelete();
+ };
+
+ return (
+ <FormProvider initialValues={{}} onSubmit={handleSubmit}>
+ <Form>
+ <Stack gap="lg">
+ <Text>
+ {t`This will delete the temporary user and schema from this database.`}
+ </Text>
+ <FormErrorMessage />
+ <Group justify="flex-end">
+ <Button onClick={onClose}>{t`Cancel`}</Button>
+ <FormSubmitButton
+ label={t`Remove`}
+ variant="filled"
+ color="danger"
+ />
+ </Group>
+ </Stack>
+ </Form>
+ </FormProvider>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DeleteDatabaseModal/DeleteDatabaseModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DeleteDatabaseModal/DeleteDatabaseModal.unit.spec.tsx
new file mode 100644
index 00000000000..4a6b1111f70
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DeleteDatabaseModal/DeleteDatabaseModal.unit.spec.tsx
@@ -0,0 +1,82 @@
+import userEvent from "@testing-library/user-event";
+import fetchMock from "fetch-mock";
+
+import {
+ setupDeleteWorkspaceDatabaseEndpoint,
+ setupDeleteWorkspaceDatabaseEndpointError,
+ setupGetWorkspaceEndpoint,
+} from "__support__/server-mocks";
+import { renderWithProviders, screen, waitFor } from "__support__/ui";
+import {
+ createMockDatabase,
+ createMockWorkspace,
+ createMockWorkspaceDatabase,
+} from "metabase-types/api/mocks";
+
+import { DeleteDatabaseModal } from "./DeleteDatabaseModal";
+
+const DATABASE = createMockDatabase({ id: 10, name: "Postgres" });
+
+const WORKSPACE_DATABASE = createMockWorkspaceDatabase({
+ database_id: DATABASE.id,
+ input_schemas: ["public"],
+});
+
+const WORKSPACE = createMockWorkspace({
+ id: 1,
+ databases: [WORKSPACE_DATABASE],
+});
+
+function setup({ withError = false }: { withError?: boolean } = {}) {
+ if (withError) {
+ setupDeleteWorkspaceDatabaseEndpointError(WORKSPACE.id, DATABASE.id);
+ } else {
+ setupDeleteWorkspaceDatabaseEndpoint(WORKSPACE, DATABASE.id);
+ }
+ setupGetWorkspaceEndpoint(WORKSPACE);
+
+ const onDelete = jest.fn();
+ const onClose = jest.fn();
+
+ renderWithProviders(
+ <DeleteDatabaseModal
+ workspace={WORKSPACE}
+ workspaceDatabase={WORKSPACE_DATABASE}
+ database={DATABASE}
+ opened
+ onDelete={onDelete}
+ onClose={onClose}
+ />,
+ );
+
+ return { onDelete, onClose };
+}
+
+describe("DeleteDatabaseModal", () => {
+ it("should delete the workspace database and call the callback when the confirm button is clicked", async () => {
+ const { onDelete } = setup();
+
+ await userEvent.click(screen.getByRole("button", { name: "Remove" }));
+
+ await waitFor(() => {
+ expect(
+ fetchMock.callHistory.called(
+ `path:/api/ee/workspace-manager/${WORKSPACE.id}/database/${DATABASE.id}`,
+ { method: "DELETE" },
+ ),
+ ).toBe(true);
+ });
+ await waitFor(() => expect(onDelete).toHaveBeenCalled());
+ });
+
+ it("should show an error message and not call the callback when the request fails", async () => {
+ const { onDelete } = setup({ withError: true });
+
+ await userEvent.click(screen.getByRole("button", { name: "Remove" }));
+
+ expect(await screen.findByRole("alert")).toHaveTextContent(
+ "An error occurred",
+ );
+ expect(onDelete).not.toHaveBeenCalled();
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DeleteDatabaseModal/index.ts b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DeleteDatabaseModal/index.ts
new file mode 100644
index 00000000000..57029b6386e
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/DeleteDatabaseModal/index.ts
@@ -0,0 +1 @@
+export * from "./DeleteDatabaseModal";
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/NewDatabaseModal/NewDatabaseModal.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/NewDatabaseModal/NewDatabaseModal.tsx
index 15346d2c1e0..4ad943fd8c0 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/NewDatabaseModal/NewDatabaseModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/NewDatabaseModal/NewDatabaseModal.tsx
@@ -20,7 +20,10 @@ import {
Text,
} from "metabase/ui";
import * as Errors from "metabase/utils/errors";
-import { useCreateWorkspaceDatabaseMutation } from "metabase-enterprise/api";
+import {
+ useCreateWorkspaceDatabaseMutation,
+ useLazyGetWorkspaceQuery,
+} from "metabase-enterprise/api";
import type { Database, DatabaseId, Workspace } from "metabase-types/api";
import { trackWorkspaceDatabaseAdded } from "../../../../analytics";
@@ -100,6 +103,7 @@ function NewDatabaseForm({
onClose,
}: NewDatabaseFormProps) {
const [createWorkspaceDatabase] = useCreateWorkspaceDatabaseMutation();
+ const [getWorkspace] = useLazyGetWorkspaceQuery();
const initialValues: NewDatabaseFormValues = {
database_id: availableDatabases.find(supportsWorkspaces)?.id ?? null,
@@ -120,6 +124,7 @@ function NewDatabaseForm({
database_id: values.database_id,
input_schemas: values.input_schemas,
}).unwrap();
+ await getWorkspace(workspace.id).unwrap();
trackWorkspaceDatabaseAdded({ workspaceId: workspace.id });
onCreate(updated);
};
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/NewDatabaseModal/NewDatabaseModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/NewDatabaseModal/NewDatabaseModal.unit.spec.tsx
index ce819672aae..137c9b29c18 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/NewDatabaseModal/NewDatabaseModal.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/NewDatabaseModal/NewDatabaseModal.unit.spec.tsx
@@ -4,6 +4,7 @@ import fetchMock from "fetch-mock";
import {
setupCreateWorkspaceDatabaseEndpoint,
setupDatabasesEndpoints,
+ setupGetWorkspaceEndpoint,
} from "__support__/server-mocks";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import type { Database, Workspace } from "metabase-types/api";
@@ -63,6 +64,7 @@ function setup({
setupDatabasesEndpoints(availableDatabases);
setupCreateWorkspaceDatabaseEndpoint(createdWorkspace);
+ setupGetWorkspaceEndpoint(createdWorkspace);
renderWithProviders(
<NewDatabaseModal
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/UpdateDatabaseModal/UpdateDatabaseModal.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/UpdateDatabaseModal/UpdateDatabaseModal.tsx
index e10ac20c1d8..bb4c4f680e3 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/UpdateDatabaseModal/UpdateDatabaseModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/UpdateDatabaseModal/UpdateDatabaseModal.tsx
@@ -8,7 +8,10 @@ import {
FormSubmitButton,
} from "metabase/forms";
import { Button, FocusTrap, Group, Modal, Stack, Text } from "metabase/ui";
-import { useUpdateWorkspaceDatabaseMutation } from "metabase-enterprise/api";
+import {
+ useLazyGetWorkspaceQuery,
+ useUpdateWorkspaceDatabaseMutation,
+} from "metabase-enterprise/api";
import type {
Database,
Workspace,
@@ -74,6 +77,7 @@ function UpdateDatabaseForm({
onClose,
}: UpdateDatabaseFormProps) {
const [updateWorkspaceDatabase] = useUpdateWorkspaceDatabaseMutation();
+ const [getWorkspace] = useLazyGetWorkspaceQuery();
const initialValues: UpdateDatabaseFormValues = {
input_schemas: workspaceDatabase.input_schemas,
@@ -85,6 +89,7 @@ function UpdateDatabaseForm({
database_id: workspaceDatabase.database_id,
input_schemas: values.input_schemas,
}).unwrap();
+ await getWorkspace(workspace.id).unwrap();
onUpdate(updated);
};
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/UpdateDatabaseModal/UpdateDatabaseModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/UpdateDatabaseModal/UpdateDatabaseModal.unit.spec.tsx
index 3b9c2fa31bc..ee9bfc5209c 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/UpdateDatabaseModal/UpdateDatabaseModal.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/DatabaseSection/UpdateDatabaseModal/UpdateDatabaseModal.unit.spec.tsx
@@ -2,6 +2,7 @@ import userEvent from "@testing-library/user-event";
import {
setupDatabasesEndpoints,
+ setupGetWorkspaceEndpoint,
setupUpdateWorkspaceDatabaseEndpoint,
} from "__support__/server-mocks";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
@@ -62,6 +63,7 @@ function setup({
setupDatabasesEndpoints([TEST_DATABASE]);
setupUpdateWorkspaceDatabaseEndpoint(updatedWorkspace, TEST_DATABASE.id);
+ setupGetWorkspaceEndpoint(updatedWorkspace);
renderWithProviders(
<UpdateDatabaseModal
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/WorkspaceHeader/WorkspaceHeader.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/WorkspaceHeader/WorkspaceHeader.tsx
index 0d952518670..a8684a74126 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/WorkspaceHeader/WorkspaceHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspacePage/WorkspaceHeader/WorkspaceHeader.tsx
@@ -1,3 +1,4 @@
+import { useDisclosure } from "@mantine/hooks";
import type { ReactNode } from "react";
import { Link } from "react-router";
import { push } from "react-router-redux";
@@ -15,7 +16,7 @@ import * as Urls from "metabase/urls";
import { useUpdateWorkspaceMutation } from "metabase-enterprise/api";
import type { Workspace } from "metabase-types/api";
-import { useDeleteWorkspace } from "../../../hooks";
+import { DeleteWorkspaceModal } from "../../../components/DeleteWorkspaceModal";
export type WorkspaceHeaderProps = {
workspace: Workspace;
@@ -68,9 +69,8 @@ type WorkspaceHeaderMenuProps = {
function WorkspaceHeaderMenu({ workspace }: WorkspaceHeaderMenuProps) {
const dispatch = useDispatch();
- const { handleDelete, modalContent } = useDeleteWorkspace({
- onSuccess: () => dispatch(push(Urls.workspaces())),
- });
+ const [modalOpened, { open: openModal, close: closeModal }] =
+ useDisclosure(false);
return (
<>
@@ -83,13 +83,21 @@ function WorkspaceHeaderMenu({ workspace }: WorkspaceHeaderMenuProps) {
<Menu.Dropdown>
<Menu.Item
leftSection={<FixedSizeIcon name="trash" aria-hidden />}
- onClick={() => handleDelete(workspace)}
+ onClick={openModal}
>
{t`Delete`}
</Menu.Item>
</Menu.Dropdown>
</Menu>
- {modalContent}
+ <DeleteWorkspaceModal
+ workspace={workspace}
+ opened={modalOpened}
+ onDelete={() => {
+ closeModal();
+ dispatch(push(Urls.workspaces()));
+ }}
+ onClose={closeModal}
+ />
</>
);
}
diff --git a/frontend/test/__support__/server-mocks/database.ts b/frontend/test/__support__/server-mocks/database.ts
index 0384b66439a..b10c5d7174a 100644
--- a/frontend/test/__support__/server-mocks/database.ts
+++ b/frontend/test/__support__/server-mocks/database.ts
@@ -31,13 +31,26 @@ export function setupDatabaseEndpoints(db: Database) {
setupSchemaEndpoints(db);
setupDatabaseIdFieldsEndpoints({ database: db });
db.tables?.forEach((table) => setupTableEndpoints({ ...table, db }));
+ setupUpdateDatabaseEndpoint(db);
+}
+export function setupUpdateDatabaseEndpoint(db: Database) {
fetchMock.put(`path:/api/database/${db.id}`, async (call) => {
const body = await call?.request?.json();
return { ...db, ...body };
});
}
+export function setupUpdateDatabaseEndpointError(databaseId: Database["id"]) {
+ fetchMock.put(`path:/api/database/${databaseId}`, { status: 500 });
+}
+
+export function setupDatabaseHealthcheckEndpoint(databaseId: Database["id"]) {
+ fetchMock.get(`path:/api/database/${databaseId}/healthcheck`, {
+ body: { status: "ok" },
+ });
+}
+
export function setupDatabaseUsageInfoEndpoint(
db: Database,
usageInfo: DatabaseUsageInfo,
diff --git a/frontend/test/__support__/server-mocks/workspace-manager.ts b/frontend/test/__support__/server-mocks/workspace-manager.ts
index 19bb62701fa..ffeda820af6 100644
--- a/frontend/test/__support__/server-mocks/workspace-manager.ts
+++ b/frontend/test/__support__/server-mocks/workspace-manager.ts
@@ -27,6 +27,10 @@ export function setupDeleteWorkspaceEndpoint(workspaceId: WorkspaceId) {
});
}
+export function setupDeleteWorkspaceEndpointError(workspaceId: WorkspaceId) {
+ fetchMock.delete(`${BASE_URL}/${workspaceId}`, { status: 500 });
+}
+
export function setupCreateWorkspaceDatabaseEndpoint(workspace: Workspace) {
fetchMock.post(`${BASE_URL}/${workspace.id}/database`, workspace);
}
@@ -50,3 +54,12 @@ export function setupDeleteWorkspaceDatabaseEndpoint(
workspace,
);
}
+
+export function setupDeleteWorkspaceDatabaseEndpointError(
+ workspaceId: WorkspaceId,
+ databaseId: DatabaseId,
+) {
+ fetchMock.delete(`${BASE_URL}/${workspaceId}/database/${databaseId}`, {
+ status: 500,
+ });
+}
diff --git a/modules/drivers/bigquery-cloud-sdk/src/metabase/driver/bigquery_cloud_sdk/workspaces.clj b/modules/drivers/bigquery-cloud-sdk/src/metabase/driver/bigquery_cloud_sdk/workspaces.clj
index ce151174370..4f8c156aa39 100644
--- a/modules/drivers/bigquery-cloud-sdk/src/metabase/driver/bigquery_cloud_sdk/workspaces.clj
+++ b/modules/drivers/bigquery-cloud-sdk/src/metabase/driver/bigquery_cloud_sdk/workspaces.clj
@@ -10,6 +10,7 @@
[metabase.driver :as driver]
[metabase.driver.bigquery-cloud-sdk.common :as bigquery.common]
[metabase.driver.connection :as driver.conn]
+ [metabase.driver.sql.util :as sql.u]
[metabase.driver.util :as driver.u]
[metabase.util :as u]
[metabase.util.i18n :refer [tru]]
@@ -34,6 +35,8 @@
(set! *warn-on-reflection* true)
+(defn- quote-schema [s] (sql.u/quote-name :bigquery-cloud-sdk :schema s))
+
(defn create-dataset!
"Create `dataset-name` in `project-id` via `client`. Idempotent — no-op when
the dataset already exists. `:description` (in `opts`) is optional metadata.
@@ -662,7 +665,7 @@
[(:schema test-table)])
(catch Exception e
(throw (ex-info (tru "Failed to grant read access to dataset {0}: {1}"
- (:schema test-table) (ex-message e))
+ (quote-schema (:schema test-table)) (ex-message e))
{:step :grant :table test-table} e)))))
(try
(driver/destroy-workspace-isolation! driver database workspace-with-details)
diff --git a/modules/drivers/clickhouse/src/metabase/driver/clickhouse.clj b/modules/drivers/clickhouse/src/metabase/driver/clickhouse.clj
index 7a537092d88..7f07a6e1d5c 100644
--- a/modules/drivers/clickhouse/src/metabase/driver/clickhouse.clj
+++ b/modules/drivers/clickhouse/src/metabase/driver/clickhouse.clj
@@ -34,6 +34,9 @@
(defmethod driver/display-name :clickhouse [_] "ClickHouse")
+(defn- quote-schema [s] (sql.u/quote-name :clickhouse :schema s))
+(defn- quote-field [s] (sql.u/quote-name :clickhouse :field s))
+
(defmethod driver/prettify-native-form :clickhouse
[_ native-form]
(sql.u/format-sql-and-fix-params :mysql native-form))
@@ -384,7 +387,7 @@
(defmethod driver/create-schema-if-needed! :clickhouse
[driver conn-spec schema]
- (let [sql [[(format "CREATE DATABASE IF NOT EXISTS `%s`;" schema)]]]
+ (let [sql [[(format "CREATE DATABASE IF NOT EXISTS %s;" (quote-schema schema))]]]
(driver/execute-raw-queries! driver conn-spec sql)))
#_{:clj-kondo/ignore [:deprecated-var]}
@@ -407,19 +410,23 @@
(defmethod driver/init-workspace-isolation! :clickhouse
[_driver database workspace]
- (let [db-name (driver.u/workspace-isolation-namespace-name workspace)
- canonical-db (:db (driver.conn/effective-details database))
- read-user {:user (driver.u/workspace-isolation-user-name workspace)
- :password (driver.u/random-workspace-password)}]
+ (let [db-name (driver.u/workspace-isolation-namespace-name workspace)
+ canonical-db (:db (driver.conn/effective-details database))
+ read-user {:user (driver.u/workspace-isolation-user-name workspace)
+ :password (driver.u/random-workspace-password)}
+ quoted-db (quote-schema db-name)
+ quoted-user (quote-field (:user read-user))
+ quoted-canonical-db (when-not (str/blank? canonical-db)
+ (quote-schema canonical-db))]
(jdbc/with-db-transaction [t-conn (sql-jdbc.conn/db->pooled-connection-spec (:id database))]
(with-open [stmt (.createStatement ^Connection (:connection t-conn))]
- (doseq [sql (cond-> [(format "CREATE DATABASE IF NOT EXISTS `%s`" db-name)
- (format "CREATE USER IF NOT EXISTS `%s` IDENTIFIED BY '%s'"
- (:user read-user) (:password read-user))
- (format "GRANT ALL ON `%s`.* TO `%s`" db-name (:user read-user))]
- (not (str/blank? canonical-db))
- (conj (format "GRANT SHOW DATABASES ON `%s`.* TO `%s`"
- canonical-db (:user read-user))))]
+ (doseq [sql (cond-> [(format "CREATE DATABASE IF NOT EXISTS %s" quoted-db)
+ (format "CREATE USER IF NOT EXISTS %s IDENTIFIED BY '%s'"
+ quoted-user (:password read-user))
+ (format "GRANT ALL ON %s.* TO %s" quoted-db quoted-user)]
+ quoted-canonical-db
+ (conj (format "GRANT SHOW DATABASES ON %s.* TO %s"
+ quoted-canonical-db quoted-user)))]
(.addBatch ^Statement stmt ^String sql))
(try
(.executeBatch ^Statement stmt)
@@ -431,20 +438,20 @@
(defmethod driver/grant-workspace-read-access! :clickhouse
[_driver database workspace schemas]
(let [read-user-name (-> workspace :database_details :user)
- qu (sql.u/quote-name :clickhouse :field read-user-name)]
+ quoted-user (quote-field read-user-name)]
(when-not read-user-name
- (throw (ex-info (tru "Workspace isolation is not properly initialized - missing read user name")
+ (throw (ex-info (tru "Cannot grant workspace read access. Workspace details have no read user — initialization may have failed. Re-run workspace initialization and retry.")
{:workspace-id (:id workspace) :step :grant})))
;; ClickHouse `qualified-name-components` is `[:schema]` — each entry in
;; `schemas` is a database-as-schema. Grant `*` covers all tables in the
;; database; ClickHouse re-resolves `*` so future tables get coverage too.
(let [sqls (for [schema schemas
:let [_ (when (str/blank? schema)
- (throw (ex-info (tru "ClickHouse workspace input schema is blank")
+ (throw (ex-info (tru "Cannot grant workspace read access. Input schema name is blank. Remove the blank entry from the workspace input schemas and retry.")
{:database-id (:id database) :step :grant})))]]
(format "GRANT SELECT ON %s.* TO %s"
- (sql.u/quote-name :clickhouse :schema schema)
- qu))]
+ (quote-schema schema)
+ quoted-user))]
(jdbc/with-db-transaction [t-conn (sql-jdbc.conn/db->pooled-connection-spec (:id database))]
(with-open [stmt (.createStatement ^Connection (:connection t-conn))]
(doseq [sql sqls]
@@ -453,13 +460,15 @@
(defmethod driver/destroy-workspace-isolation! :clickhouse
[_driver database workspace]
- (let [db-name (driver.u/workspace-isolation-namespace-name workspace)
- username (driver.u/workspace-isolation-user-name workspace)]
+ (let [db-name (driver.u/workspace-isolation-namespace-name workspace)
+ username (driver.u/workspace-isolation-user-name workspace)
+ quoted-db (quote-schema db-name)
+ quoted-user (quote-field username)]
(jdbc/with-db-transaction [t-conn (sql-jdbc.conn/db->pooled-connection-spec (:id database))]
(with-open [stmt (.createStatement ^Connection (:connection t-conn))]
(doseq [sql [;; DROP DATABASE cascades to all tables within it
- (format "DROP DATABASE IF EXISTS `%s`" db-name)
- (format "DROP USER IF EXISTS `%s`" username)]]
+ (format "DROP DATABASE IF EXISTS %s" quoted-db)
+ (format "DROP USER IF EXISTS %s" quoted-user)]]
(.addBatch ^Statement stmt ^String sql))
(.executeBatch ^Statement stmt)))))
diff --git a/modules/drivers/redshift/src/metabase/driver/redshift.clj b/modules/drivers/redshift/src/metabase/driver/redshift.clj
index 79691497779..80ede003803 100644
--- a/modules/drivers/redshift/src/metabase/driver/redshift.clj
+++ b/modules/drivers/redshift/src/metabase/driver/redshift.clj
@@ -755,6 +755,9 @@
AND privilege_type = 'CREATE'"
schema-name]))))
+(defn- quote-schema [s] (sql.u/quote-name :redshift :schema s))
+(defn- quote-field [s] (sql.u/quote-name :redshift :field s))
+
(defn- assert-no-public-create-grant!
[conn schema-name]
(when (public-create-grant? conn schema-name)
@@ -762,19 +765,21 @@
(defmethod driver/init-workspace-isolation! :redshift
[_driver database workspace]
- (let [schema-name (driver.u/workspace-isolation-namespace-name workspace)
- read-user {:user (driver.u/workspace-isolation-user-name workspace)
- :password (driver.u/random-workspace-password)}]
+ (let [schema-name (driver.u/workspace-isolation-namespace-name workspace)
+ read-user {:user (driver.u/workspace-isolation-user-name workspace)
+ :password (driver.u/random-workspace-password)}
+ quoted-schema (quote-schema schema-name)
+ quoted-user (quote-field (:user read-user))]
(jdbc/with-db-transaction [t-conn (sql-jdbc.conn/db->pooled-connection-spec (:id database))]
(let [user-sql (if (user-exists? t-conn (:user read-user))
- (format "ALTER USER \"%s\" WITH PASSWORD '%s'" (:user read-user) (:password read-user))
- (format "CREATE USER \"%s\" WITH PASSWORD '%s'" (:user read-user) (:password read-user)))]
+ (format "ALTER USER %s WITH PASSWORD '%s'" quoted-user (:password read-user))
+ (format "CREATE USER %s WITH PASSWORD '%s'" quoted-user (:password read-user)))]
(with-open [^Statement stmt (.createStatement ^Connection (:connection t-conn))]
- (doseq [sql [(format "CREATE SCHEMA IF NOT EXISTS \"%s\"" schema-name)
+ (doseq [sql [(format "CREATE SCHEMA IF NOT EXISTS %s" quoted-schema)
user-sql
- (format "GRANT ALL PRIVILEGES ON SCHEMA \"%s\" TO \"%s\"" schema-name (:user read-user))
- (format "ALTER DEFAULT PRIVILEGES IN SCHEMA \"%s\" GRANT ALL ON TABLES TO \"%s\""
- schema-name (:user read-user))]]
+ (format "GRANT ALL PRIVILEGES ON SCHEMA %s TO %s" quoted-schema quoted-user)
+ (format "ALTER DEFAULT PRIVILEGES IN SCHEMA %s GRANT ALL ON TABLES TO %s"
+ quoted-schema quoted-user)]]
(.addBatch ^Statement stmt ^String sql))
(try
(.executeBatch ^Statement stmt)
@@ -786,7 +791,7 @@
(defmethod driver/grant-workspace-read-access! :redshift
[_driver database workspace schemas]
(let [username (-> workspace :database_details :user)
- qu (sql.u/quote-name :postgres :field username)
+ quoted-user (quote-field username)
source-schemas (set schemas)
spec (sql-jdbc.conn/db->pooled-connection-spec (:id database))]
;; Pre-flight check (read-only) can run in its own transaction. Only the
@@ -799,14 +804,16 @@
;; Grants run as auto-commit per statement so privileges are immediately
;; observable to a subsequent describe-database from a different connection.
(doseq [s source-schemas
- :let [sq (sql.u/quote-name :postgres :schema s)]
- sql [(format "GRANT USAGE ON SCHEMA %s TO %s" sq qu)
- (format "REVOKE CREATE ON SCHEMA %s FROM %s" sq qu)
- (format "REVOKE INSERT, UPDATE, DELETE, REFERENCES ON ALL TABLES IN SCHEMA %s FROM %s" sq qu)
+ :let [quoted-schema (quote-schema s)]
+ sql [(format "GRANT USAGE ON SCHEMA %s TO %s" quoted-schema quoted-user)
+ (format "REVOKE CREATE ON SCHEMA %s FROM %s" quoted-schema quoted-user)
+ (format "REVOKE INSERT, UPDATE, DELETE, REFERENCES ON ALL TABLES IN SCHEMA %s FROM %s"
+ quoted-schema quoted-user)
;; Schema-wide SELECT — workspace-scoped users receive whole-schema access.
;; Per-table granularity intentionally discarded (API contract is namespace-grained).
- (format "GRANT SELECT ON ALL TABLES IN SCHEMA %s TO %s" sq qu)
- (format "ALTER DEFAULT PRIVILEGES IN SCHEMA %s GRANT SELECT ON TABLES TO %s" sq qu)]]
+ (format "GRANT SELECT ON ALL TABLES IN SCHEMA %s TO %s" quoted-schema quoted-user)
+ (format "ALTER DEFAULT PRIVILEGES IN SCHEMA %s GRANT SELECT ON TABLES TO %s"
+ quoted-schema quoted-user)]]
(jdbc/execute! spec [sql]))))
(defn- schema-exists?
@@ -825,8 +832,10 @@
(defmethod driver/destroy-workspace-isolation! :redshift
[_driver database workspace]
- (let [schema-name (:schema workspace)
- username (-> workspace :database_details :user)]
+ (let [schema-name (:schema workspace)
+ username (-> workspace :database_details :user)
+ quoted-user (quote-field username)
+ quoted-schema (quote-schema schema-name)]
(jdbc/with-db-transaction [t-conn (sql-jdbc.conn/db->pooled-connection-spec (:id database))]
(let [user-exists (user-exists? t-conn username)
schema-exists (schema-exists? t-conn schema-name)
@@ -835,13 +844,14 @@
(with-open [^Statement stmt (.createStatement ^Connection (:connection t-conn))]
;; Only revoke if user exists
(when user-exists
- (doseq [schema granted-schemas]
+ (doseq [schema granted-schemas
+ :let [quoted-granted-schema (quote-schema schema)]]
(.addBatch ^Statement stmt
- ^String (format "REVOKE ALL PRIVILEGES ON ALL TABLES IN SCHEMA \"%s\" FROM \"%s\""
- schema username))
+ ^String (format "REVOKE ALL PRIVILEGES ON ALL TABLES IN SCHEMA %s FROM %s"
+ quoted-granted-schema quoted-user))
(.addBatch ^Statement stmt
- ^String (format "REVOKE ALL PRIVILEGES ON SCHEMA \"%s\" FROM \"%s\""
- schema username))
+ ^String (format "REVOKE ALL PRIVILEGES ON SCHEMA %s FROM %s"
+ quoted-granted-schema quoted-user))
;; `grant-workspace-read-access!` issues `ALTER DEFAULT PRIVILEGES IN SCHEMA <s>
;; GRANT SELECT ON TABLES TO <iso-user>` on every input schema. Those default-priv
;; entries are owned by the granting role (metabase_ci) but reference the iso-user;
@@ -849,18 +859,18 @@
;; because some objects depend on it / privileges for default privileges on new
;; relations belonging to user <grantor> in schema <input-schema>".
(.addBatch ^Statement stmt
- ^String (format "ALTER DEFAULT PRIVILEGES IN SCHEMA \"%s\" REVOKE ALL ON TABLES FROM \"%s\""
- schema username)))
+ ^String (format "ALTER DEFAULT PRIVILEGES IN SCHEMA %s REVOKE ALL ON TABLES FROM %s"
+ quoted-granted-schema quoted-user)))
;; Only revoke default privileges if both user and schema exist
(when schema-exists
(.addBatch ^Statement stmt
- ^String (format "ALTER DEFAULT PRIVILEGES IN SCHEMA \"%s\" REVOKE ALL ON TABLES FROM \"%s\""
- schema-name username))))
+ ^String (format "ALTER DEFAULT PRIVILEGES IN SCHEMA %s REVOKE ALL ON TABLES FROM %s"
+ quoted-schema quoted-user))))
;; These are safe with IF EXISTS
(.addBatch ^Statement stmt
- ^String (format "DROP SCHEMA IF EXISTS \"%s\" CASCADE" schema-name))
+ ^String (format "DROP SCHEMA IF EXISTS %s CASCADE" quoted-schema))
(.addBatch ^Statement stmt
- ^String (format "DROP USER IF EXISTS \"%s\"" username))
+ ^String (format "DROP USER IF EXISTS %s" quoted-user))
(.executeBatch ^Statement stmt))))))
(defmethod driver/llm-sql-dialect-resource :redshift [_]
diff --git a/modules/drivers/snowflake/src/metabase/driver/snowflake.clj b/modules/drivers/snowflake/src/metabase/driver/snowflake.clj
index 56020d182cc..e577ced867b 100644
--- a/modules/drivers/snowflake/src/metabase/driver/snowflake.clj
+++ b/modules/drivers/snowflake/src/metabase/driver/snowflake.clj
@@ -76,6 +76,9 @@
:workspace false}]
(defmethod driver/database-supports? [:snowflake feature] [_driver _feature _db] supported?))
+(defn- quote-schema [s] (sql.u/quote-name :snowflake :schema s))
+(defn- quote-field [s] (sql.u/quote-name :snowflake :field s))
+
(defmethod driver/humanize-connection-error-message :snowflake
[_ messages]
(let [message (first messages)]
@@ -788,8 +791,8 @@
;; So we avoid using it here.
(-> (jdbc/query
{:connection conn}
- [(format "SHOW DYNAMIC TABLES LIKE '%s' IN SCHEMA \"%s\".\"%s\";"
- table-name db-name schema-name)])
+ [(format "SHOW DYNAMIC TABLES LIKE '%s' IN SCHEMA %s.%s;"
+ table-name (quote-schema db-name) (quote-schema schema-name))])
first
some?)
(catch SnowflakeSQLException e
@@ -902,7 +905,7 @@
(and ((get-method driver/can-connect? :sql-jdbc) driver details)
(sql-jdbc.conn/with-connection-spec-for-testing-connection [spec [driver details]]
;; jdbc/query is used to see if we throw, we want to ignore the results
- (jdbc/query spec (format "SHOW SCHEMAS IN DATABASE \"%s\";" db))
+ (jdbc/query spec (format "SHOW SCHEMAS IN DATABASE %s;" (quote-schema db)))
true))))
(defn- normalize-details
@@ -1006,7 +1009,7 @@
(defmethod driver/create-schema-if-needed! :snowflake
[driver conn-spec schema]
- (let [sql [[(format "CREATE SCHEMA IF NOT EXISTS \"%s\";" schema)]]]
+ (let [sql [[(format "CREATE SCHEMA IF NOT EXISTS %s;" (quote-schema schema))]]]
(driver/execute-raw-queries! driver conn-spec sql)))
(defmethod driver/rename-table! :snowflake
@@ -1064,35 +1067,41 @@
(defmethod driver/init-workspace-isolation! :snowflake
[_driver database workspace]
- (let [details (driver.conn/effective-details database)
- schema-name (driver.u/workspace-isolation-namespace-name workspace)
- db-name (:db details)
- warehouse (:warehouse details)
- role-name (isolation-role-name workspace)
- read-user {:user (driver.u/workspace-isolation-user-name workspace)
- :password (driver.u/random-workspace-password)}
- conn-spec (sql-jdbc.conn/db->pooled-connection-spec (:id database))]
+ (let [details (driver.conn/effective-details database)
+ schema-name (driver.u/workspace-isolation-namespace-name workspace)
+ db-name (:db details)
+ warehouse (:warehouse details)
+ role-name (isolation-role-name workspace)
+ read-user {:user (driver.u/workspace-isolation-user-name workspace)
+ :password (driver.u/random-workspace-password)}
+ conn-spec (sql-jdbc.conn/db->pooled-connection-spec (:id database))]
(when-not db-name
- (throw (ex-info (tru "Snowflake database configuration is missing required ''db'' (database name) setting")
+ (throw (ex-info (tru "Cannot initialize workspace. Snowflake connection details must include a ''db'' (database name). Set it in the database connection and retry.")
{:database-id (:id database) :step :init})))
(when-not warehouse
- (throw (ex-info (tru "Snowflake database configuration is missing required ''warehouse'' setting")
+ (throw (ex-info (tru "Cannot initialize workspace. Snowflake connection details must include a ''warehouse''. Set it in the database connection and retry.")
{:database-id (:id database) :step :init})))
- ;; Snowflake RBAC: create schema -> create role -> grant privileges to role -> create user -> grant role to user
- (try
- (doseq [sql [(format "CREATE SCHEMA IF NOT EXISTS \"%s\".\"%s\"" db-name schema-name)
- (format "CREATE ROLE IF NOT EXISTS \"%s\"" role-name)
- (format "GRANT USAGE ON DATABASE \"%s\" TO ROLE \"%s\"" db-name role-name)
- (format "GRANT USAGE ON WAREHOUSE \"%s\" TO ROLE \"%s\"" warehouse role-name)
- (format "GRANT USAGE ON SCHEMA \"%s\".\"%s\" TO ROLE \"%s\"" db-name schema-name role-name)
- (format "GRANT ALL PRIVILEGES ON SCHEMA \"%s\".\"%s\" TO ROLE \"%s\"" db-name schema-name role-name)
- (format "GRANT ALL ON FUTURE TABLES IN SCHEMA \"%s\".\"%s\" TO ROLE \"%s\"" db-name schema-name role-name)
- (format "CREATE USER IF NOT EXISTS \"%s\" PASSWORD = '%s' MUST_CHANGE_PASSWORD = FALSE DEFAULT_ROLE = \"%s\""
- (:user read-user) (:password read-user) role-name)
- (format "GRANT ROLE \"%s\" TO USER \"%s\"" role-name (:user read-user))]]
- (jdbc/execute! conn-spec [sql]))
- (catch Throwable t
- (throw (driver.u/scrub-exceptions t [(:password read-user)]))))
+ (let [quoted-db (quote-schema db-name)
+ quoted-warehouse (quote-field warehouse)
+ quoted-schema (quote-schema schema-name)
+ qualified-schema (str quoted-db "." quoted-schema)
+ quoted-role (quote-field role-name)
+ quoted-user (quote-field (:user read-user))]
+ ;; Snowflake RBAC: create schema -> create role -> grant privileges to role -> create user -> grant role to user
+ (try
+ (doseq [sql [(format "CREATE SCHEMA IF NOT EXISTS %s" qualified-schema)
+ (format "CREATE ROLE IF NOT EXISTS %s" quoted-role)
+ (format "GRANT USAGE ON DATABASE %s TO ROLE %s" quoted-db quoted-role)
+ (format "GRANT USAGE ON WAREHOUSE %s TO ROLE %s" quoted-warehouse quoted-role)
+ (format "GRANT USAGE ON SCHEMA %s TO ROLE %s" qualified-schema quoted-role)
+ (format "GRANT ALL PRIVILEGES ON SCHEMA %s TO ROLE %s" qualified-schema quoted-role)
+ (format "GRANT ALL ON FUTURE TABLES IN SCHEMA %s TO ROLE %s" qualified-schema quoted-role)
+ (format "CREATE USER IF NOT EXISTS %s PASSWORD = '%s' MUST_CHANGE_PASSWORD = FALSE DEFAULT_ROLE = %s"
+ quoted-user (:password read-user) quoted-role)
+ (format "GRANT ROLE %s TO USER %s" quoted-role quoted-user)]]
+ (jdbc/execute! conn-spec [sql]))
+ (catch Throwable t
+ (throw (driver.u/scrub-exceptions t [(:password read-user)])))))
{:schema schema-name
:database_details (assoc read-user :role role-name :use-password true)}))
@@ -1105,13 +1114,16 @@
username (driver.u/workspace-isolation-user-name workspace)
conn-spec (sql-jdbc.conn/db->pooled-connection-spec (:id database))]
(when-not db-name
- (throw (ex-info (tru "Snowflake database configuration is missing required ''db'' (database name) setting")
+ (throw (ex-info (tru "Cannot destroy workspace. Snowflake connection details must include a ''db'' (database name). Set it in the database connection and retry.")
{:database-id (:id database) :step :destroy})))
- ;; Drop in reverse order of creation: schema (CASCADE handles tables) -> user -> role
- (doseq [sql [(format "DROP SCHEMA IF EXISTS \"%s\".\"%s\" CASCADE" db-name schema-name)
- (format "DROP USER IF EXISTS \"%s\"" username)
- (format "DROP ROLE IF EXISTS \"%s\"" role-name)]]
- (jdbc/execute! conn-spec [sql]))))
+ (let [qualified-schema (str (quote-schema db-name) "." (quote-schema schema-name))
+ quoted-user (quote-field username)
+ quoted-role (quote-field role-name)]
+ ;; Drop in reverse order of creation: schema (CASCADE handles tables) -> user -> role
+ (doseq [sql [(format "DROP SCHEMA IF EXISTS %s CASCADE" qualified-schema)
+ (format "DROP USER IF EXISTS %s" quoted-user)
+ (format "DROP ROLE IF EXISTS %s" quoted-role)]]
+ (jdbc/execute! conn-spec [sql])))))
(defmethod driver/grant-workspace-read-access! :snowflake
[_driver database workspace schemas]
@@ -1119,25 +1131,27 @@
db-name (:db (driver.conn/effective-details database))
role-name (-> workspace :database_details :role)]
(when-not role-name
- (throw (ex-info (tru "Workspace isolation is not properly initialized - missing role name")
+ (throw (ex-info (tru "Cannot grant workspace read access. Workspace details have no role — initialization may have failed. Re-run workspace initialization and retry.")
{:workspace-id (:id workspace) :step :grant})))
(when (str/blank? db-name)
- (throw (ex-info (tru "Snowflake workspaces require an explicit database in connection details")
+ (throw (ex-info (tru "Cannot grant workspace read access. Snowflake connection details must include a ''db'' (database name). Set it in the database connection and retry.")
{:database-id (:id database) :step :grant})))
;; Each entry in `schemas` is a Snowflake schema in the bound database. The
;; catalog (`:db`) comes from connection details rather than per-input — a
;; Metabase `Database` row binds to one Snowflake database.
- (let [qr (sql.u/quote-name :snowflake :field role-name)
- qdb (sql.u/quote-name :snowflake :schema db-name)]
+ (let [quoted-role (quote-field role-name)
+ quoted-db (quote-schema db-name)]
(doseq [schema schemas]
(when (str/blank? schema)
- (throw (ex-info (tru "Snowflake workspace input schema is blank")
+ (throw (ex-info (tru "Cannot grant workspace read access. Input schema name is blank. Remove the blank entry from the workspace input schemas and retry.")
{:database-id (:id database) :step :grant})))
- (let [qs (sql.u/quote-name :snowflake :schema schema)]
- (doseq [sql [(format "GRANT USAGE ON DATABASE %s TO ROLE %s" qdb qr)
- (format "GRANT USAGE ON SCHEMA %s.%s TO ROLE %s" qdb qs qr)
- (format "GRANT SELECT ON ALL TABLES IN SCHEMA %s.%s TO ROLE %s" qdb qs qr)
- (format "GRANT SELECT ON FUTURE TABLES IN SCHEMA %s.%s TO ROLE %s" qdb qs qr)]]
+ (let [qualified-schema (str quoted-db "." (quote-schema schema))]
+ (doseq [sql [(format "GRANT USAGE ON DATABASE %s TO ROLE %s" quoted-db quoted-role)
+ (format "GRANT USAGE ON SCHEMA %s TO ROLE %s" qualified-schema quoted-role)
+ (format "GRANT SELECT ON ALL TABLES IN SCHEMA %s TO ROLE %s"
+ qualified-schema quoted-role)
+ (format "GRANT SELECT ON FUTURE TABLES IN SCHEMA %s TO ROLE %s"
+ qualified-schema quoted-role)]]
(jdbc/execute! conn-spec [sql])))))))
(defmethod driver/llm-sql-dialect-resource :snowflake [_]
diff --git a/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj b/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj
index 0bda2362395..795e18e6c93 100644
--- a/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj
+++ b/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj
@@ -101,6 +101,9 @@
[_]
"dbo")
+(defn- quote-schema [s] (sql.u/quote-name :sqlserver :schema s))
+(defn- quote-field [s] (sql.u/quote-name :sqlserver :field s))
+
(defmethod driver/prettify-native-form :sqlserver
[_ native-form]
(sql.u/format-sql-and-fix-params :tsql native-form))
@@ -1116,14 +1119,18 @@
(defmethod driver/create-schema-if-needed! :sqlserver
[driver conn-spec schema]
- (let [sql [[(format "IF NOT EXISTS (SELECT * FROM sys.schemas WHERE name = '%s') EXEC('CREATE SCHEMA [%s];');" schema schema)]]]
+ (let [sql [[(format "IF NOT EXISTS (SELECT * FROM sys.schemas WHERE name = '%s') EXEC('CREATE SCHEMA %s;');"
+ (sql.u/escape-sql schema :ansi)
+ (quote-schema schema))]]]
(driver/execute-raw-queries! driver conn-spec sql)))
(defmethod driver/rename-table! :sqlserver
[_driver db-id old-table-name new-table-name]
(jdbc/with-db-transaction [conn (sql-jdbc.conn/db->pooled-connection-spec db-id)]
(with-open [stmt (.createStatement ^java.sql.Connection (:connection conn))]
- (let [sql (format "EXEC sp_rename '%s', '%s';" (name old-table-name) (name new-table-name))]
+ (let [sql (format "EXEC sp_rename '%s', '%s';"
+ (sql.u/escape-sql (name old-table-name) :ansi)
+ (sql.u/escape-sql (name new-table-name) :ansi))]
(.execute stmt sql)))))
(defmethod driver/table-name-length-limit :sqlserver
@@ -1148,20 +1155,24 @@
username (driver.u/workspace-isolation-user-name workspace)
password (driver.u/random-workspace-password)
escaped-password (sql.u/escape-sql password :ansi)
+ escaped-username (sql.u/escape-sql username :ansi)
+ escaped-schema (sql.u/escape-sql schema-name :ansi)
+ quoted-user (quote-field username)
+ quoted-schema (quote-schema schema-name)
conn-spec (sql-jdbc.conn/db->pooled-connection-spec (:id database))]
;; SQL Server: create login (server level), then user (database level), then schema
(try
(doseq [sql [(format (str "IF NOT EXISTS (SELECT name FROM master.sys.server_principals WHERE name = '%s') "
- "CREATE LOGIN [%s] WITH PASSWORD = N'%s'")
- username username escaped-password)
- (format "IF NOT EXISTS (SELECT name FROM sys.database_principals WHERE name = '%s') CREATE USER [%s] FOR LOGIN [%s]"
- username username username)
- (format "IF NOT EXISTS (SELECT * FROM sys.schemas WHERE name = '%s') EXEC('CREATE SCHEMA [%s]')"
- schema-name schema-name)
+ "CREATE LOGIN %s WITH PASSWORD = N'%s'")
+ escaped-username quoted-user escaped-password)
+ (format "IF NOT EXISTS (SELECT name FROM sys.database_principals WHERE name = '%s') CREATE USER %s FOR LOGIN %s"
+ escaped-username quoted-user quoted-user)
+ (format "IF NOT EXISTS (SELECT * FROM sys.schemas WHERE name = '%s') EXEC('CREATE SCHEMA %s')"
+ escaped-schema quoted-schema)
;; CONTROL ON SCHEMA gives ALTER (needed for creating objects in schema)
- (format "GRANT CONTROL ON SCHEMA::[%s] TO [%s]" schema-name username)
+ (format "GRANT CONTROL ON SCHEMA::%s TO %s" quoted-schema quoted-user)
;; CREATE TABLE at database level is also required in SQL Server
- (format "GRANT CREATE TABLE TO [%s]" username)]]
+ (format "GRANT CREATE TABLE TO %s" quoted-user)]]
(jdbc/execute! conn-spec [sql]))
(catch Throwable t
(throw (driver.u/scrub-exceptions t [password escaped-password]))))
@@ -1171,26 +1182,30 @@
(defmethod driver/destroy-workspace-isolation! :sqlserver
[_driver database workspace]
- (let [schema-name (driver.u/workspace-isolation-namespace-name workspace)
- username (driver.u/workspace-isolation-user-name workspace)
- conn-spec (sql-jdbc.conn/db->pooled-connection-spec (:id database))]
+ (let [schema-name (driver.u/workspace-isolation-namespace-name workspace)
+ username (driver.u/workspace-isolation-user-name workspace)
+ escaped-schema (sql.u/escape-sql schema-name :ansi)
+ escaped-username (sql.u/escape-sql username :ansi)
+ quoted-schema (quote-schema schema-name)
+ quoted-user (quote-field username)
+ conn-spec (sql-jdbc.conn/db->pooled-connection-spec (:id database))]
(doseq [sql [(format (str "DECLARE @sql NVARCHAR(MAX) = ''; "
- "SELECT @sql += 'DROP TABLE [%s].[' + name + ']; ' "
+ "SELECT @sql += 'DROP TABLE %s.[' + name + ']; ' "
"FROM sys.tables WHERE schema_id = SCHEMA_ID('%s'); "
"EXEC sp_executesql @sql")
- schema-name schema-name)
- (format "IF EXISTS (SELECT * FROM sys.schemas WHERE name = '%s') DROP SCHEMA [%s]"
- schema-name schema-name)
- (format "IF EXISTS (SELECT * FROM sys.database_principals WHERE name = '%s') DROP USER [%s]"
- username username)
+ quoted-schema escaped-schema)
+ (format "IF EXISTS (SELECT * FROM sys.schemas WHERE name = '%s') DROP SCHEMA %s"
+ escaped-schema quoted-schema)
+ (format "IF EXISTS (SELECT * FROM sys.database_principals WHERE name = '%s') DROP USER %s"
+ escaped-username quoted-user)
;; Kill all sessions using this login before dropping it
(format (str "DECLARE @sql NVARCHAR(MAX) = ''; "
"SELECT @sql += 'KILL ' + CAST(session_id AS VARCHAR(10)) + '; ' "
"FROM sys.dm_exec_sessions WHERE login_name = '%s'; "
"EXEC sp_executesql @sql")
- username)
- (format "IF EXISTS (SELECT * FROM master.sys.server_principals WHERE name = '%s') DROP LOGIN [%s]"
- username username)]]
+ escaped-username)
+ (format "IF EXISTS (SELECT * FROM master.sys.server_principals WHERE name = '%s') DROP LOGIN %s"
+ escaped-username quoted-user)]]
(jdbc/execute! conn-spec [sql]))))
(defmethod driver/grant-workspace-read-access! :sqlserver
@@ -1199,22 +1214,22 @@
username (-> workspace :database_details :user)
db-name (:db (:details database))]
(when-not username
- (throw (ex-info (tru "Workspace isolation is not properly initialized - missing read user name")
+ (throw (ex-info (tru "Cannot grant workspace read access. Workspace details have no read user — initialization may have failed. Re-run workspace initialization and retry.")
{:workspace-id (:id workspace) :step :grant})))
(when (str/blank? db-name)
- (throw (ex-info (tru "SQL Server workspaces require an explicit database in connection details")
+ (throw (ex-info (tru "Cannot grant workspace read access. SQL Server connection details must include a ''db'' (database name). Set it in the database connection and retry.")
{:database-id (:id database) :step :grant})))
;; SQL Server connection is bound to one DB (`:db` in details). Per-schema
;; grant: SELECT on the schema covers existing + future objects within it.
- (let [qu (sql.u/quote-name :sqlserver :field username)]
+ (let [quoted-user (quote-field username)]
(doseq [schema schemas]
(when (str/blank? schema)
- (throw (ex-info (tru "SQL Server workspace input schema is blank")
+ (throw (ex-info (tru "Cannot grant workspace read access. Input schema name is blank. Remove the blank entry from the workspace input schemas and retry.")
{:database-id (:id database) :step :grant})))
(jdbc/execute! conn-spec
[(format "GRANT SELECT ON SCHEMA::%s TO %s"
- (sql.u/quote-name :sqlserver :schema schema)
- qu)])))))
+ (quote-schema schema)
+ quoted-user)])))))
(defmethod driver/llm-sql-dialect-resource :sqlserver [_]
"metabot/prompts/dialects/sqlserver.md")
diff --git a/src/metabase/driver/mysql.clj b/src/metabase/driver/mysql.clj
index adc67292698..d61ee96bb9b 100644
--- a/src/metabase/driver/mysql.clj
+++ b/src/metabase/driver/mysql.clj
@@ -1296,6 +1296,9 @@
;;; | Workspace Isolation |
;;; +----------------------------------------------------------------------------------------------------------------+
+(defn- quote-schema [s] (sql.u/quote-name :mysql :schema s))
+(defn- quote-field [s] (sql.u/quote-name :mysql :field s))
+
(defn- mysql-user-exists?
"Check if a MySQL user exists."
[conn username]
@@ -1308,19 +1311,21 @@
(let [db-name (driver.u/workspace-isolation-namespace-name workspace)
user (driver.u/workspace-isolation-user-name workspace)
password (driver.u/random-workspace-password)
- escaped-password (sql.u/escape-sql password :ansi)]
+ escaped-password (sql.u/escape-sql password :ansi)
+ quoted-db (quote-schema db-name)
+ quoted-user (quote-field user)]
(jdbc/with-db-transaction [t-conn (sql-jdbc.conn/db->pooled-connection-spec (:id database))]
(let [user-sql (if (mysql-user-exists? t-conn user)
- (format "ALTER USER `%s`@'%%' IDENTIFIED BY '%s'"
- user escaped-password)
- (format "CREATE USER `%s`@'%%' IDENTIFIED BY '%s'"
- user escaped-password))]
+ (format "ALTER USER %s@'%%' IDENTIFIED BY '%s'"
+ quoted-user escaped-password)
+ (format "CREATE USER %s@'%%' IDENTIFIED BY '%s'"
+ quoted-user escaped-password))]
(with-open [^Statement stmt (.createStatement ^Connection (:connection t-conn))]
(doseq [sql [;; Create the isolated database
- (format "CREATE DATABASE IF NOT EXISTS `%s`" db-name)
+ (format "CREATE DATABASE IF NOT EXISTS %s" quoted-db)
user-sql
;; Grant all privileges on the isolated database
- (format "GRANT ALL PRIVILEGES ON `%s`.* TO `%s`@'%%'" db-name user)]]
+ (format "GRANT ALL PRIVILEGES ON %s.* TO %s@'%%'" quoted-db quoted-user)]]
(.addBatch ^Statement stmt ^String sql))
(try
(.executeBatch ^Statement stmt)
@@ -1338,13 +1343,15 @@
(defmethod driver/destroy-workspace-isolation! :mysql
[_driver database workspace]
- (let [db-name (:schema workspace)
- username (-> workspace :database_details :user)]
+ (let [db-name (:schema workspace)
+ username (-> workspace :database_details :user)
+ quoted-db (quote-schema db-name)
+ quoted-user (quote-field username)]
(jdbc/with-db-transaction [t-conn (sql-jdbc.conn/db->pooled-connection-spec (:id database))]
(with-open [^Statement stmt (.createStatement ^Connection (:connection t-conn))]
- (doseq [sql (cond-> [(format "DROP DATABASE IF EXISTS `%s`" db-name)]
+ (doseq [sql (cond-> [(format "DROP DATABASE IF EXISTS %s" quoted-db)]
(mysql-user-exists? t-conn username)
- (conj (format "DROP USER IF EXISTS `%s`@'%%'" username)))]
+ (conj (format "DROP USER IF EXISTS %s@'%%'" quoted-user)))]
(.addBatch ^Statement stmt ^String sql))
(.executeBatch ^Statement stmt)))))
@@ -1354,11 +1361,11 @@
is `[]` — so each entry in `schemas` is interpreted as a database name.
Workspace-scoped users receive database-wide SELECT via `GRANT SELECT ON db.*`."
[username schemas]
- (let [qu (sql.u/quote-name :mysql :field username)
+ (let [quoted-user (quote-field username)
source-databases (set schemas)]
(perf/mapv (fn [db]
(format "GRANT SELECT ON %s.* TO %s@'%%'"
- (sql.u/quote-name :mysql :schema db) qu))
+ (quote-schema db) quoted-user))
source-databases)))
(defmethod driver/grant-workspace-read-access! :mysql
@@ -1408,7 +1415,7 @@
[(:schema test-table)])
(catch Exception e
(throw (ex-info (tru "Failed to grant read access to database {0}: {1}"
- (:schema test-table) (ex-message e))
+ (quote-schema (:schema test-table)) (ex-message e))
{:step :grant :table test-table} e)))))
(try
(driver/destroy-workspace-isolation! driver database workspace-with-details)
diff --git a/src/metabase/driver/postgres.clj b/src/metabase/driver/postgres.clj
index f5a573d11a8..4e56f291392 100644
--- a/src/metabase/driver/postgres.clj
+++ b/src/metabase/driver/postgres.clj
@@ -123,6 +123,10 @@
;;; | metabase.driver impls |
;;; +----------------------------------------------------------------------------------------------------------------+
+(defn- quote-schema [s] (sql.u/quote-name :postgres :schema s))
+(defn- quote-field [s] (sql.u/quote-name :postgres :field s))
+(defn- quote-table [s] (sql.u/quote-name :postgres :table s))
+
(defmethod driver/display-name :postgres [_] "PostgreSQL")
(defmethod driver/humanize-connection-error-message :postgres
@@ -1392,7 +1396,7 @@
;; Without the blank check, `format` stringifies nil to "null" and creates a schema
;; literally named "null" on the target DB.
(when-not (str/blank? schema)
- (let [sql [[(format "CREATE SCHEMA IF NOT EXISTS \"%s\";" schema)]]]
+ (let [sql [[(format "CREATE SCHEMA IF NOT EXISTS %s;" (quote-schema schema))]]]
(driver/execute-raw-queries! driver conn-spec sql))))
(defmethod driver/extra-info :postgres
@@ -1461,13 +1465,12 @@
between drivers (Postgres uses [[public-create-grant?]]; Redshift uses its
own check via `SVV_SCHEMA_PRIVILEGES`)."
[schema-name]
- (throw (ex-info (format (str "Schema \"%s\" grants CREATE to PUBLIC; workspace isolation cannot "
- "enforce input-schema read-only until this is revoked. Run:\n\n"
- " REVOKE CREATE ON SCHEMA %s FROM PUBLIC;\n\n"
- "then retry workspace provisioning.")
- schema-name schema-name)
- {:status-code 412
- :schema schema-name})))
+ (let [quoted-schema (quote-schema schema-name)]
+ (throw (ex-info (format (str "Schema %s grants CREATE to PUBLIC. This breaks workspace "
+ "isolation. Run `REVOKE CREATE ON SCHEMA %s FROM PUBLIC` and retry.")
+ quoted-schema quoted-schema)
+ {:status-code 412
+ :schema schema-name}))))
(defn assert-no-public-create-grant!
"Throws when `schema-name` has CREATE granted to PUBLIC on PostgreSQL. Called
@@ -1492,14 +1495,14 @@
(defn raise-missing-usage-grant-option!
"Throw the standard ex-info for the schema-USAGE-grant-option pre-condition."
[schema-name]
- (throw (ex-info (format (str "User lacks USAGE WITH GRANT OPTION on schema \"%s\"; workspace "
- "provisioning cannot grant USAGE to the workspace user. Have the "
- "schema owner run:\n\n"
- " GRANT USAGE ON SCHEMA \"%s\" TO CURRENT_USER WITH GRANT OPTION;\n\n"
- "then retry workspace provisioning.")
- schema-name schema-name)
- {:status-code 412
- :schema schema-name})))
+ (let [quoted-schema (quote-schema schema-name)]
+ (throw (ex-info (format (str "Current user lacks USAGE WITH GRANT OPTION on schema %s. "
+ "Cannot grant USAGE to the workspace user. Have the schema owner "
+ "run `GRANT USAGE ON SCHEMA %s TO CURRENT_USER WITH GRANT OPTION` "
+ "and retry.")
+ quoted-schema quoted-schema)
+ {:status-code 412
+ :schema schema-name}))))
(defn assert-has-usage-grant-option!
"Throws when the current PostgreSQL user lacks `USAGE WITH GRANT OPTION` on
@@ -1530,13 +1533,17 @@
"Throw the standard ex-info for the SELECT-WITH-GRANT-OPTION pre-condition,
naming the objects the current user cannot re-grant SELECT on."
[schema-name objects]
- (let [qualified (map #(format "\"%s\".\"%s\"" (:schema %) (:object %)) objects)]
- (throw (ex-info (format (str "User lacks SELECT WITH GRANT OPTION on %d object(s) in schema "
- "\"%s\": %s. Workspace provisioning cannot grant SELECT to the "
- "workspace user on these objects. Have the object owner run:\n\n"
- " GRANT SELECT ON ALL TABLES IN SCHEMA \"%s\" TO CURRENT_USER WITH GRANT OPTION;\n\n"
- "then retry workspace provisioning.")
- (count objects) schema-name (str/join ", " qualified) schema-name)
+ (let [qualified (map #(str (quote-schema (:schema %)) "." (quote-table (:object %)))
+ objects)
+ quoted-schema (quote-schema schema-name)]
+ (throw (ex-info (format (str "Current user lacks SELECT WITH GRANT OPTION on %d object(s) in "
+ "schema %s: %s. Cannot grant SELECT to the workspace user. "
+ "Have the object owner run `GRANT SELECT ON ALL TABLES IN SCHEMA "
+ "%s TO CURRENT_USER WITH GRANT OPTION` and retry.")
+ (count objects)
+ quoted-schema
+ (str/join ", " qualified)
+ quoted-schema)
{:status-code 412
:schema schema-name
:objects (vec qualified)}))))
@@ -1576,14 +1583,16 @@
"Throw the standard ex-info for the ALTER-DEFAULT-PRIVILEGES pre-condition,
naming the owner roles we cannot target with `FOR ROLE`."
[schema-name owners]
- (let [owner-names (map :owner owners)]
- (throw (ex-info (format (str "Current user is not a member of %d role(s) that own objects in "
- "schema \"%s\": %s. `ALTER DEFAULT PRIVILEGES IN SCHEMA \"%s\"` "
- "cannot cover future objects created by these roles, so the "
- "workspace user would lose access to new tables. Grant role "
- "membership to the current user (e.g. `GRANT \"<owner>\" TO "
- "CURRENT_USER`), then retry workspace provisioning.")
- (count owners) schema-name (str/join ", " owner-names) schema-name)
+ (let [owner-names (map :owner owners)
+ quoted-schema (quote-schema schema-name)
+ grants (str/join " "
+ (map #(format "GRANT %s TO CURRENT_USER;" (quote-field %))
+ owner-names))]
+ (throw (ex-info (format (str "Current user is not a member of %d role(s) owning objects in "
+ "schema %s: %s. The workspace user would lose access to "
+ "future tables created by these roles. Grant role membership "
+ "with `%s` and retry.")
+ (count owners) quoted-schema (str/join ", " owner-names) grants)
{:status-code 412
:schema schema-name
:owners (vec owner-names)}))))
@@ -1613,26 +1622,29 @@
(defmethod driver/init-workspace-isolation! :postgres
[_driver database workspace]
- (let [schema-name (driver.u/workspace-isolation-namespace-name workspace)
- read-user {:user (driver.u/workspace-isolation-user-name workspace)
- :password (driver.u/random-workspace-password)}]
+ (let [schema-name (driver.u/workspace-isolation-namespace-name workspace)
+ read-user {:user (driver.u/workspace-isolation-user-name workspace)
+ :password (driver.u/random-workspace-password)}
+ quoted-schema (quote-schema schema-name)
+ quoted-user (quote-field (:user read-user))]
(jdbc/with-db-transaction [t-conn (sql-jdbc.conn/db->pooled-connection-spec (:id database))]
;; Create user if not exists, otherwise update password
;; PostgreSQL doesn't support CREATE USER IF NOT EXISTS, so we need to check first
(let [user-sql (if (user-exists? t-conn (:user read-user))
- (format "ALTER USER \"%s\" WITH PASSWORD '%s'" (:user read-user) (:password read-user))
- (format "CREATE USER \"%s\" WITH PASSWORD '%s'" (:user read-user) (:password read-user)))]
+ (format "ALTER USER %s WITH PASSWORD '%s'" quoted-user (:password read-user))
+ (format "CREATE USER %s WITH PASSWORD '%s'" quoted-user (:password read-user)))]
(with-open [^Statement stmt (.createStatement ^Connection (:connection t-conn))]
(doseq [sql [;; PostgreSQL supports IF NOT EXISTS for schemas
- (format "CREATE SCHEMA IF NOT EXISTS \"%s\"" schema-name)
+ (format "CREATE SCHEMA IF NOT EXISTS %s" quoted-schema)
user-sql
;; grant schema access (CREATE to create tables, USAGE to access them)
;; GRANT is idempotent in PostgreSQL
- (format "GRANT ALL PRIVILEGES ON SCHEMA \"%s\" TO \"%s\"" schema-name (:user read-user))
+ (format "GRANT ALL PRIVILEGES ON SCHEMA %s TO %s" quoted-schema quoted-user)
;; grant all privileges on future tables created in this schema (by admin)
- (format "ALTER DEFAULT PRIVILEGES IN SCHEMA \"%s\" GRANT ALL ON TABLES TO \"%s\"" schema-name (:user read-user))
+ (format "ALTER DEFAULT PRIVILEGES IN SCHEMA %s GRANT ALL ON TABLES TO %s"
+ quoted-schema quoted-user)
;; grant role membership to admin so DROP OWNED BY works during cleanup
- (format "GRANT \"%s\" TO CURRENT_USER" (:user read-user))]]
+ (format "GRANT %s TO CURRENT_USER" quoted-user)]]
(.addBatch ^Statement stmt ^String sql))
(try
(.executeBatch ^Statement stmt)
@@ -1643,14 +1655,16 @@
(defmethod driver/destroy-workspace-isolation! :postgres
[_driver database workspace]
- (let [schema-name (:schema workspace)
- username (-> workspace :database_details :user)]
+ (let [schema-name (:schema workspace)
+ username (-> workspace :database_details :user)
+ quoted-schema (quote-schema schema-name)
+ quoted-user (quote-field username)]
(jdbc/with-db-transaction [t-conn (sql-jdbc.conn/db->pooled-connection-spec (:id database))]
(with-open [^Statement stmt (.createStatement ^Connection (:connection t-conn))]
- (doseq [sql (cond-> [(format "DROP SCHEMA IF EXISTS \"%s\" CASCADE" schema-name)]
+ (doseq [sql (cond-> [(format "DROP SCHEMA IF EXISTS %s CASCADE" quoted-schema)]
(user-exists? t-conn username)
- (into [(format "DROP OWNED BY \"%s\"" username)
- (format "DROP USER IF EXISTS \"%s\"" username)]))]
+ (into [(format "DROP OWNED BY %s" quoted-user)
+ (format "DROP USER IF EXISTS %s" quoted-user)]))]
(.addBatch ^Statement stmt ^String sql))
(.executeBatch ^Statement stmt)))))
@@ -1661,13 +1675,14 @@
and an ALTER DEFAULT PRIVILEGES covering future tables created by the granting
role."
[username schemas]
- (let [qu (sql.u/quote-name :postgres :field username)
+ (let [quoted-user (quote-field username)
source-schemas (set schemas)]
(mapcat (fn [s]
- (let [qs (sql.u/quote-name :postgres :schema s)]
- [(format "GRANT USAGE ON SCHEMA %s TO %s" qs qu)
- (format "GRANT SELECT ON ALL TABLES IN SCHEMA %s TO %s" qs qu)
- (format "ALTER DEFAULT PRIVILEGES IN SCHEMA %s GRANT SELECT ON TABLES TO %s" qs qu)]))
+ (let [quoted-schema (quote-schema s)]
+ [(format "GRANT USAGE ON SCHEMA %s TO %s" quoted-schema quoted-user)
+ (format "GRANT SELECT ON ALL TABLES IN SCHEMA %s TO %s" quoted-schema quoted-user)
+ (format "ALTER DEFAULT PRIVILEGES IN SCHEMA %s GRANT SELECT ON TABLES TO %s"
+ quoted-schema quoted-user)]))
source-schemas)))
(defmethod driver/grant-workspace-read-access! :postgres
diff --git a/src/metabase/transforms/util.clj b/src/metabase/transforms/util.clj
index ce0d0c447c8..ad5d437c3b7 100644
--- a/src/metabase/transforms/util.clj
+++ b/src/metabase/transforms/util.clj
@@ -117,7 +117,8 @@
[run-id transform driver {:keys [db-id conn-spec output-schema]} run-transform! & {:keys [ex-message-fn] :or {ex-message-fn ex-message}}]
;; local run is responsible for status, using canceling lifecycle
(try
- (when-not (driver/schema-exists? driver db-id output-schema)
+ (when (and (not (str/blank? output-schema))
+ (not (driver/schema-exists? driver db-id output-schema)))
(driver/create-schema-if-needed! driver conn-spec output-schema))
(let [source-range-params (transforms-base.u/get-source-range-params transform)
transform-timeout (transforms.settings/transform-timeout)
diff --git a/src/metabase/transforms_base/query.clj b/src/metabase/transforms_base/query.clj
index 8fc4572fec3..4c5858cb963 100644
--- a/src/metabase/transforms_base/query.clj
+++ b/src/metabase/transforms_base/query.clj
@@ -4,6 +4,7 @@
This namespace handles MBQL/native query transform execution and returns
results in memory rather than writing to transform_run rows."
(:require
+ [clojure.string :as str]
[metabase.driver :as driver]
[metabase.driver.util :as driver.u]
[metabase.lib.schema.common :as schema.common]
@@ -126,7 +127,8 @@
{:driver driver, :database database, :features features})))
(log/info "Executing transform" id "with target" (pr-str target))
;; Create schema if needed
- (when-not (driver/schema-exists? driver db (:schema target))
+ (when (and (not (str/blank? (:schema target)))
+ (not (driver/schema-exists? driver db (:schema target))))
(driver/create-schema-if-needed! driver (:conn-spec transform-details) (:schema target)))
;; Check cancellation before running query
(when (and cancelled? (cancelled?))
diff --git a/test/metabase/driver/postgres_test.clj b/test/metabase/driver/postgres_test.clj
index bbf0645374f..c2d7747f4b7 100644
--- a/test/metabase/driver/postgres_test.clj
+++ b/test/metabase/driver/postgres_test.clj
@@ -31,6 +31,7 @@
[metabase.driver.sql-jdbc.sync.interface :as sql-jdbc.sync.interface]
[metabase.driver.sql.query-processor :as sql.qp]
[metabase.driver.sql.query-processor-test-util :as sql.qp-test-util]
+ [metabase.driver.sql.util :as sql.u]
[metabase.lib.convert :as lib.convert]
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
@@ -2367,7 +2368,8 @@
~@body
(finally
(jdbc/execute! ~admin-spec
- [(format "DROP SCHEMA IF EXISTS \"%s\" CASCADE" ~schema)]))))
+ [(format "DROP SCHEMA IF EXISTS %s CASCADE"
+ (sql.u/quote-name :postgres :schema ~schema))]))))
(defmacro ^:private with-drop-role!
"Run `body`, ensuring `role` is dropped on `admin-spec` afterward."
@@ -2376,7 +2378,8 @@
~@body
(finally
(jdbc/execute! ~admin-spec
- [(format "DROP ROLE IF EXISTS \"%s\"" ~role)]))))
+ [(format "DROP ROLE IF EXISTS %s"
+ (sql.u/quote-name :postgres :field ~role))]))))
(deftest workspace-precondition-usage-grant-option-test
(mt/test-driver :postgres
@@ -2388,22 +2391,26 @@
password (str (random-uuid))]
(with-drop-role! admin-spec role
(with-drop-schema! admin-spec schema
- (jdbc/execute! admin-spec
- [(str "CREATE ROLE \"" role "\" WITH LOGIN PASSWORD '" password "'; "
- "CREATE SCHEMA \"" schema "\"; "
- ;; USAGE without WITH GRANT OPTION
- "GRANT USAGE ON SCHEMA \"" schema "\" TO \"" role "\";")])
- (sql-jdbc.conn/with-connection-spec-for-testing-connection
- [user-spec [:postgres (assoc (:details (mt/db)) :user role :password password)]]
- (testing "fails when grant option is missing"
- (is (thrown-with-msg?
- clojure.lang.ExceptionInfo
- #"USAGE WITH GRANT OPTION"
- (postgres/assert-has-usage-grant-option! user-spec schema))))
- (testing "passes once WITH GRANT OPTION is granted"
- (jdbc/execute! admin-spec
- [(str "GRANT USAGE ON SCHEMA \"" schema "\" TO \"" role "\" WITH GRANT OPTION")])
- (is (nil? (postgres/assert-has-usage-grant-option! user-spec schema))))))))))))
+ (let [qrole (sql.u/quote-name :postgres :field role)
+ qschema (sql.u/quote-name :postgres :schema schema)]
+ (jdbc/execute! admin-spec
+ [(format (str "CREATE ROLE %s WITH LOGIN PASSWORD '%s'; "
+ "CREATE SCHEMA %s; "
+ ;; USAGE without WITH GRANT OPTION
+ "GRANT USAGE ON SCHEMA %s TO %s;")
+ qrole password qschema qschema qrole)])
+ (sql-jdbc.conn/with-connection-spec-for-testing-connection
+ [user-spec [:postgres (assoc (:details (mt/db)) :user role :password password)]]
+ (testing "fails when grant option is missing"
+ (is (thrown-with-msg?
+ clojure.lang.ExceptionInfo
+ #"USAGE WITH GRANT OPTION"
+ (postgres/assert-has-usage-grant-option! user-spec schema))))
+ (testing "passes once WITH GRANT OPTION is granted"
+ (jdbc/execute! admin-spec
+ [(format "GRANT USAGE ON SCHEMA %s TO %s WITH GRANT OPTION"
+ qschema qrole)])
+ (is (nil? (postgres/assert-has-usage-grant-option! user-spec schema)))))))))))))
(deftest workspace-precondition-table-grant-option-test
(mt/test-driver :postgres
@@ -2416,25 +2423,31 @@
password (str (random-uuid))]
(with-drop-role! admin-spec role
(with-drop-schema! admin-spec schema
- (jdbc/execute! admin-spec
- [(str "CREATE ROLE \"" role "\" WITH LOGIN PASSWORD '" password "'; "
- "CREATE SCHEMA \"" schema "\"; "
- "CREATE TABLE \"" schema "\".\"" table "\" (id INT); "
- ;; Pass the schema-USAGE precondition so we test the table check in isolation.
- "GRANT USAGE ON SCHEMA \"" schema "\" TO \"" role "\" WITH GRANT OPTION; "
- ;; SELECT *without* WITH GRANT OPTION
- "GRANT SELECT ON \"" schema "\".\"" table "\" TO \"" role "\";")])
- (sql-jdbc.conn/with-connection-spec-for-testing-connection
- [user-spec [:postgres (assoc (:details (mt/db)) :user role :password password)]]
- (testing "fails and names the offending table"
- (is (thrown-with-msg?
- clojure.lang.ExceptionInfo
- #"SELECT WITH GRANT OPTION"
- (postgres/assert-has-grant-option! user-spec schema))))
- (testing "passes once SELECT WITH GRANT OPTION is granted"
- (jdbc/execute! admin-spec
- [(str "GRANT SELECT ON \"" schema "\".\"" table "\" TO \"" role "\" WITH GRANT OPTION")])
- (is (nil? (postgres/assert-has-grant-option! user-spec schema))))))))))))
+ (let [qrole (sql.u/quote-name :postgres :field role)
+ qschema (sql.u/quote-name :postgres :schema schema)
+ qtable (sql.u/quote-name :postgres :table table)
+ qobject (str qschema "." qtable)]
+ (jdbc/execute! admin-spec
+ [(format (str "CREATE ROLE %s WITH LOGIN PASSWORD '%s'; "
+ "CREATE SCHEMA %s; "
+ "CREATE TABLE %s (id INT); "
+ ;; Pass the schema-USAGE precondition so we test the table check in isolation.
+ "GRANT USAGE ON SCHEMA %s TO %s WITH GRANT OPTION; "
+ ;; SELECT *without* WITH GRANT OPTION
+ "GRANT SELECT ON %s TO %s;")
+ qrole password qschema qobject qschema qrole qobject qrole)])
+ (sql-jdbc.conn/with-connection-spec-for-testing-connection
+ [user-spec [:postgres (assoc (:details (mt/db)) :user role :password password)]]
+ (testing "fails and names the offending table"
+ (is (thrown-with-msg?
+ clojure.lang.ExceptionInfo
+ #"SELECT WITH GRANT OPTION"
+ (postgres/assert-has-grant-option! user-spec schema))))
+ (testing "passes once SELECT WITH GRANT OPTION is granted"
+ (jdbc/execute! admin-spec
+ [(format "GRANT SELECT ON %s TO %s WITH GRANT OPTION"
+ qobject qrole)])
+ (is (nil? (postgres/assert-has-grant-option! user-spec schema)))))))))))))
(deftest workspace-precondition-alter-default-privileges-test
(mt/test-driver :postgres
@@ -2449,21 +2462,26 @@
(with-drop-role! admin-spec role
(with-drop-role! admin-spec owner
(with-drop-schema! admin-spec schema
- (jdbc/execute! admin-spec
- [(str "CREATE ROLE \"" role "\" WITH LOGIN PASSWORD '" password "'; "
- "CREATE ROLE \"" owner "\"; "
- "CREATE SCHEMA \"" schema "\"; "
- "GRANT USAGE ON SCHEMA \"" schema "\" TO \"" role "\" WITH GRANT OPTION; "
- "CREATE TABLE \"" schema "\".\"" table "\" (id INT); "
- "ALTER TABLE \"" schema "\".\"" table "\" OWNER TO \"" owner "\";")])
- (sql-jdbc.conn/with-connection-spec-for-testing-connection
- [user-spec [:postgres (assoc (:details (mt/db)) :user role :password password)]]
- (testing "fails and names the unmemberable owner"
- (is (thrown-with-msg?
- clojure.lang.ExceptionInfo
- #"ALTER DEFAULT PRIVILEGES"
- (postgres/assert-can-alter-default-privileges! user-spec schema))))
- (testing "passes once the current_user becomes a member of the owner role"
- (jdbc/execute! admin-spec
- [(str "GRANT \"" owner "\" TO \"" role "\"")])
- (is (nil? (postgres/assert-can-alter-default-privileges! user-spec schema)))))))))))))
+ (let [qrole (sql.u/quote-name :postgres :field role)
+ qowner (sql.u/quote-name :postgres :field owner)
+ qschema (sql.u/quote-name :postgres :schema schema)
+ qobject (str qschema "." (sql.u/quote-name :postgres :table table))]
+ (jdbc/execute! admin-spec
+ [(format (str "CREATE ROLE %s WITH LOGIN PASSWORD '%s'; "
+ "CREATE ROLE %s; "
+ "CREATE SCHEMA %s; "
+ "GRANT USAGE ON SCHEMA %s TO %s WITH GRANT OPTION; "
+ "CREATE TABLE %s (id INT); "
+ "ALTER TABLE %s OWNER TO %s;")
+ qrole password qowner qschema qschema qrole qobject qobject qowner)])
+ (sql-jdbc.conn/with-connection-spec-for-testing-connection
+ [user-spec [:postgres (assoc (:details (mt/db)) :user role :password password)]]
+ (testing "fails and names the unmemberable owner"
+ (is (thrown-with-msg?
+ clojure.lang.ExceptionInfo
+ #"not a member of \d+ role"
+ (postgres/assert-can-alter-default-privileges! user-spec schema))))
+ (testing "passes once the current_user becomes a member of the owner role"
+ (jdbc/execute! admin-spec
+ [(format "GRANT %s TO %s" qowner qrole)])
+ (is (nil? (postgres/assert-can-alter-default-privileges! user-spec schema))))))))))))))