From 0638d51a26beda9bff5d14d663863956533be89e Mon Sep 17 00:00:00 2001 From: Lily Kuang Date: Wed, 2 Feb 2022 15:34:16 -0800 Subject: [PATCH 1/5] add embedded dashboard --- ...fbb1a5849b_add_embedded_dahshoard_table.py | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 superset/migrations/versions/5afbb1a5849b_add_embedded_dahshoard_table.py diff --git a/superset/migrations/versions/5afbb1a5849b_add_embedded_dahshoard_table.py b/superset/migrations/versions/5afbb1a5849b_add_embedded_dahshoard_table.py new file mode 100644 index 0000000000000..a06a500f989fd --- /dev/null +++ b/superset/migrations/versions/5afbb1a5849b_add_embedded_dahshoard_table.py @@ -0,0 +1,49 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +"""add_embedded_dahshoard_table + +Revision ID: 5afbb1a5849b +Revises: 5fd49410a97a +Create Date: 2022-01-28 16:03:02.944080 + +""" + +# revision identifiers, used by Alembic. +revision = '5afbb1a5849b' +down_revision = '5fd49410a97a' + +from alembic import op +import sqlalchemy as sa + + +def upgrade(): + op.create_table( + "embedded_dashboards", + sa.Column("created_on", sa.DateTime(), nullable=True), + sa.Column("changed_on", sa.DateTime(), nullable=True), + sa.Column("allow_domain_list",git, nullable=True), + sa.Column("id", sa.Integer(), nullable=False), + sa.Column( + "dashboard_id", sa.Integer(), sa.ForeignKey("dashboards.id"), nullable=False + ), + sa.Column("changed_by_fk", sa.Integer(), nullable=True), + sa.Column("created_by_fk", sa.Integer(), nullable=True), + ) + + +def downgrade(): + op.drop_table("embedded_dashboards") From 9ad4118bce5f9466d2077406b392efc93ca79637 Mon Sep 17 00:00:00 2001 From: Lily Kuang Date: Wed, 2 Feb 2022 15:42:11 -0800 Subject: [PATCH 2/5] json --- .../versions/5afbb1a5849b_add_embedded_dahshoard_table.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/superset/migrations/versions/5afbb1a5849b_add_embedded_dahshoard_table.py b/superset/migrations/versions/5afbb1a5849b_add_embedded_dahshoard_table.py index a06a500f989fd..4b4a2e4e78f33 100644 --- a/superset/migrations/versions/5afbb1a5849b_add_embedded_dahshoard_table.py +++ b/superset/migrations/versions/5afbb1a5849b_add_embedded_dahshoard_table.py @@ -35,7 +35,7 @@ def upgrade(): "embedded_dashboards", sa.Column("created_on", sa.DateTime(), nullable=True), sa.Column("changed_on", sa.DateTime(), nullable=True), - sa.Column("allow_domain_list",git, nullable=True), + sa.Column("allow_domain_list", sa.JSON(), nullable=True), sa.Column("id", sa.Integer(), nullable=False), sa.Column( "dashboard_id", sa.Integer(), sa.ForeignKey("dashboards.id"), nullable=False From 84ba926fca2c8a205d74c44bfe1b54e2608cdfe6 Mon Sep 17 00:00:00 2001 From: Lily Kuang Date: Wed, 2 Feb 2022 16:11:17 -0800 Subject: [PATCH 3/5] lint --- .../versions/5afbb1a5849b_add_embedded_dahshoard_table.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/superset/migrations/versions/5afbb1a5849b_add_embedded_dahshoard_table.py b/superset/migrations/versions/5afbb1a5849b_add_embedded_dahshoard_table.py index 4b4a2e4e78f33..36f71379bc882 100644 --- a/superset/migrations/versions/5afbb1a5849b_add_embedded_dahshoard_table.py +++ b/superset/migrations/versions/5afbb1a5849b_add_embedded_dahshoard_table.py @@ -23,11 +23,11 @@ """ # revision identifiers, used by Alembic. -revision = '5afbb1a5849b' -down_revision = '5fd49410a97a' +revision = "5afbb1a5849b" +down_revision = "5fd49410a97a" -from alembic import op import sqlalchemy as sa +from alembic import op def upgrade(): From c357d56faf888f01f3a38d235eab27546acaa13c Mon Sep 17 00:00:00 2001 From: Lily Kuang Date: Fri, 4 Feb 2022 10:46:06 -0800 Subject: [PATCH 4/5] change json to text --- .../versions/5afbb1a5849b_add_embedded_dahshoard_table.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/superset/migrations/versions/5afbb1a5849b_add_embedded_dahshoard_table.py b/superset/migrations/versions/5afbb1a5849b_add_embedded_dahshoard_table.py index 36f71379bc882..7b22e2d694186 100644 --- a/superset/migrations/versions/5afbb1a5849b_add_embedded_dahshoard_table.py +++ b/superset/migrations/versions/5afbb1a5849b_add_embedded_dahshoard_table.py @@ -35,7 +35,7 @@ def upgrade(): "embedded_dashboards", sa.Column("created_on", sa.DateTime(), nullable=True), sa.Column("changed_on", sa.DateTime(), nullable=True), - sa.Column("allow_domain_list", sa.JSON(), nullable=True), + sa.Column("allow_domain_list", sa.Text(), nullable=True), sa.Column("id", sa.Integer(), nullable=False), sa.Column( "dashboard_id", sa.Integer(), sa.ForeignKey("dashboards.id"), nullable=False From 5c277aa95f8eea826942f198ca138a0c51f8d196 Mon Sep 17 00:00:00 2001 From: Lily Kuang Date: Mon, 7 Feb 2022 11:01:20 -0800 Subject: [PATCH 5/5] uuid --- .../versions/5afbb1a5849b_add_embedded_dahshoard_table.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/superset/migrations/versions/5afbb1a5849b_add_embedded_dahshoard_table.py b/superset/migrations/versions/5afbb1a5849b_add_embedded_dahshoard_table.py index 7b22e2d694186..1f1c62782bbe2 100644 --- a/superset/migrations/versions/5afbb1a5849b_add_embedded_dahshoard_table.py +++ b/superset/migrations/versions/5afbb1a5849b_add_embedded_dahshoard_table.py @@ -26,8 +26,11 @@ revision = "5afbb1a5849b" down_revision = "5fd49410a97a" +from uuid import uuid4 + import sqlalchemy as sa from alembic import op +from sqlalchemy_utils import UUIDType def upgrade(): @@ -36,7 +39,7 @@ def upgrade(): sa.Column("created_on", sa.DateTime(), nullable=True), sa.Column("changed_on", sa.DateTime(), nullable=True), sa.Column("allow_domain_list", sa.Text(), nullable=True), - sa.Column("id", sa.Integer(), nullable=False), + sa.Column("uuid", UUIDType(binary=True), default=uuid4), sa.Column( "dashboard_id", sa.Integer(), sa.ForeignKey("dashboards.id"), nullable=False ),