diff --git a/superset/translations/de/LC_MESSAGES/messages.json b/superset/translations/de/LC_MESSAGES/messages.json index 1c020467a646b..44d5d3009c3cd 100644 --- a/superset/translations/de/LC_MESSAGES/messages.json +++ b/superset/translations/de/LC_MESSAGES/messages.json @@ -2886,7 +2886,6 @@ "Manage email report": ["E-Mail-Bericht verwalten"], "Manage your databases": ["Verwalten Sie Ihre Datenbanken"], "Mandatory": ["Notwendig"], - "Mangle Duplicate Columns": ["Doppelte Spalten zusammenführen"], "Manually set min/max values for the y-axis.": [ "Min/Max-Werte für die y-Achse manuell festlegen." ], diff --git a/superset/translations/de/LC_MESSAGES/messages.po b/superset/translations/de/LC_MESSAGES/messages.po index 9234d0eaecc1b..6a1ff690194d8 100644 --- a/superset/translations/de/LC_MESSAGES/messages.po +++ b/superset/translations/de/LC_MESSAGES/messages.po @@ -9407,10 +9407,6 @@ msgstr "Verwalten Sie Ihre Datenbanken" msgid "Mandatory" msgstr "Notwendig" -#: superset/views/database/forms.py:360 -msgid "Mangle Duplicate Columns" -msgstr "Doppelte Spalten zusammenführen" - #: superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.jsx:297 msgid "Manually set min/max values for the y-axis." msgstr "Min/Max-Werte für die y-Achse manuell festlegen." diff --git a/superset/translations/en/LC_MESSAGES/messages.json b/superset/translations/en/LC_MESSAGES/messages.json index e87511b901d00..f1d035d43a865 100644 --- a/superset/translations/en/LC_MESSAGES/messages.json +++ b/superset/translations/en/LC_MESSAGES/messages.json @@ -2093,7 +2093,6 @@ "Manage email report": [""], "Manage your databases": [""], "Mandatory": [""], - "Mangle Duplicate Columns": [""], "Manually set min/max values for the y-axis.": [""], "Map": [""], "Map Style": [""], diff --git a/superset/translations/en/LC_MESSAGES/messages.po b/superset/translations/en/LC_MESSAGES/messages.po index 7a84f6d5de070..ee3b15bd9b37a 100644 --- a/superset/translations/en/LC_MESSAGES/messages.po +++ b/superset/translations/en/LC_MESSAGES/messages.po @@ -8797,10 +8797,6 @@ msgstr "" msgid "Mandatory" msgstr "" -#: superset/views/database/forms.py:360 -msgid "Mangle Duplicate Columns" -msgstr "" - #: superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.jsx:297 msgid "Manually set min/max values for the y-axis." msgstr "" diff --git a/superset/translations/es/LC_MESSAGES/messages.json b/superset/translations/es/LC_MESSAGES/messages.json index 57ae460a4f937..ea5636c0491e2 100644 --- a/superset/translations/es/LC_MESSAGES/messages.json +++ b/superset/translations/es/LC_MESSAGES/messages.json @@ -1801,7 +1801,6 @@ ], "Manage": ["Administrar"], "Mandatory": ["Oblugatorio"], - "Mangle Duplicate Columns": ["Manglar Columnas Duplicadas"], "MapBox": [""], "Mapbox": [""], "March": ["Marzo"], diff --git a/superset/translations/es/LC_MESSAGES/messages.po b/superset/translations/es/LC_MESSAGES/messages.po index b629d66601a03..df4efb9b4b4bc 100644 --- a/superset/translations/es/LC_MESSAGES/messages.po +++ b/superset/translations/es/LC_MESSAGES/messages.po @@ -9400,10 +9400,6 @@ msgstr "Nombre de tu fuente de datos" msgid "Mandatory" msgstr "Oblugatorio" -#: superset/views/database/forms.py:360 -msgid "Mangle Duplicate Columns" -msgstr "Manglar Columnas Duplicadas" - #: superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.jsx:297 #, fuzzy msgid "Manually set min/max values for the y-axis." diff --git a/superset/translations/fr/LC_MESSAGES/messages.json b/superset/translations/fr/LC_MESSAGES/messages.json index 5c000012face7..7f03dc9f92140 100644 --- a/superset/translations/fr/LC_MESSAGES/messages.json +++ b/superset/translations/fr/LC_MESSAGES/messages.json @@ -2065,7 +2065,6 @@ ], "Manage": ["Gestion"], "Mandatory": ["Obligatoire"], - "Mangle Duplicate Columns": ["Supprimer les colonnes en double"], "Manually set min/max values for the y-axis.": [""], "Mapbox": ["Mapbox"], "March": ["Mars"], diff --git a/superset/translations/fr/LC_MESSAGES/messages.po b/superset/translations/fr/LC_MESSAGES/messages.po index 6c4cdd69c4298..35382732ece1e 100644 --- a/superset/translations/fr/LC_MESSAGES/messages.po +++ b/superset/translations/fr/LC_MESSAGES/messages.po @@ -9574,10 +9574,6 @@ msgstr "Donner un nom à la base de données" msgid "Mandatory" msgstr "Obligatoire" -#: superset/views/database/forms.py:360 -msgid "Mangle Duplicate Columns" -msgstr "Supprimer les colonnes en double" - #: superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.jsx:297 msgid "Manually set min/max values for the y-axis." msgstr "" diff --git a/superset/translations/it/LC_MESSAGES/messages.json b/superset/translations/it/LC_MESSAGES/messages.json index c16648829654f..faacdd2ed08b5 100644 --- a/superset/translations/it/LC_MESSAGES/messages.json +++ b/superset/translations/it/LC_MESSAGES/messages.json @@ -1755,7 +1755,6 @@ ], "Manage": ["Gestisci"], "Mandatory": [""], - "Mangle Duplicate Columns": [""], "Manually set min/max values for the y-axis.": [""], "Map Style": [""], "Mapbox": ["Mapbox"], diff --git a/superset/translations/it/LC_MESSAGES/messages.po b/superset/translations/it/LC_MESSAGES/messages.po index 6dc5d8c1a8d7d..816904b50ccef 100644 --- a/superset/translations/it/LC_MESSAGES/messages.po +++ b/superset/translations/it/LC_MESSAGES/messages.po @@ -9152,10 +9152,6 @@ msgstr "Database" msgid "Mandatory" msgstr "" -#: superset/views/database/forms.py:360 -msgid "Mangle Duplicate Columns" -msgstr "" - #: superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.jsx:297 msgid "Manually set min/max values for the y-axis." msgstr "" diff --git a/superset/translations/ja/LC_MESSAGES/messages.json b/superset/translations/ja/LC_MESSAGES/messages.json index 3bccbe60ea9e0..dbec51427641f 100644 --- a/superset/translations/ja/LC_MESSAGES/messages.json +++ b/superset/translations/ja/LC_MESSAGES/messages.json @@ -1803,7 +1803,6 @@ ], "Manage": ["管理"], "Mandatory": [""], - "Mangle Duplicate Columns": [""], "Manually set min/max values for the y-axis.": [""], "Map Style": [""], "MapBox": [""], diff --git a/superset/translations/ja/LC_MESSAGES/messages.po b/superset/translations/ja/LC_MESSAGES/messages.po index 4f61d7121122b..a0522914322ce 100644 --- a/superset/translations/ja/LC_MESSAGES/messages.po +++ b/superset/translations/ja/LC_MESSAGES/messages.po @@ -9156,10 +9156,6 @@ msgstr "データベースのインポート" msgid "Mandatory" msgstr "" -#: superset/views/database/forms.py:360 -msgid "Mangle Duplicate Columns" -msgstr "" - #: superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.jsx:297 msgid "Manually set min/max values for the y-axis." msgstr "" diff --git a/superset/translations/ko/LC_MESSAGES/messages.json b/superset/translations/ko/LC_MESSAGES/messages.json index 17f4d50915cbf..58cbd4bccd979 100644 --- a/superset/translations/ko/LC_MESSAGES/messages.json +++ b/superset/translations/ko/LC_MESSAGES/messages.json @@ -1801,7 +1801,6 @@ ], "Manage": ["관리"], "Mandatory": [""], - "Mangle Duplicate Columns": [""], "Manually set min/max values for the y-axis.": [""], "Map Style": [""], "MapBox": [""], diff --git a/superset/translations/ko/LC_MESSAGES/messages.po b/superset/translations/ko/LC_MESSAGES/messages.po index e48301a1f8cef..16cb93d2956ea 100644 --- a/superset/translations/ko/LC_MESSAGES/messages.po +++ b/superset/translations/ko/LC_MESSAGES/messages.po @@ -9084,10 +9084,6 @@ msgstr "데이터베이스 선택" msgid "Mandatory" msgstr "" -#: superset/views/database/forms.py:360 -msgid "Mangle Duplicate Columns" -msgstr "" - #: superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.jsx:297 msgid "Manually set min/max values for the y-axis." msgstr "" diff --git a/superset/translations/messages.pot b/superset/translations/messages.pot index 8c1cc701f7f70..01b684883eae8 100644 --- a/superset/translations/messages.pot +++ b/superset/translations/messages.pot @@ -8796,10 +8796,6 @@ msgstr "" msgid "Mandatory" msgstr "" -#: superset/views/database/forms.py:360 -msgid "Mangle Duplicate Columns" -msgstr "" - #: superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.jsx:297 msgid "Manually set min/max values for the y-axis." msgstr "" diff --git a/superset/translations/nl/LC_MESSAGES/messages.json b/superset/translations/nl/LC_MESSAGES/messages.json index 7148c1d3f23f6..e77f0459ee78a 100644 --- a/superset/translations/nl/LC_MESSAGES/messages.json +++ b/superset/translations/nl/LC_MESSAGES/messages.json @@ -2214,7 +2214,6 @@ ], "Manage": ["Beheer"], "Mandatory": ["Verplicht"], - "Mangle Duplicate Columns": ["Dubbele kolommen verwijderen"], "Manually set min/max values for the y-axis.": [""], "Map": [""], "Map Style": [""], diff --git a/superset/translations/nl/LC_MESSAGES/messages.po b/superset/translations/nl/LC_MESSAGES/messages.po index b34df36498d11..6a6578d70590d 100644 --- a/superset/translations/nl/LC_MESSAGES/messages.po +++ b/superset/translations/nl/LC_MESSAGES/messages.po @@ -9110,10 +9110,6 @@ msgstr "Importeer databases" msgid "Mandatory" msgstr "Verplicht" -#: superset/views/database/forms.py:360 -msgid "Mangle Duplicate Columns" -msgstr "Dubbele kolommen verwijderen" - #: superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.jsx:297 msgid "Manually set min/max values for the y-axis." msgstr "" diff --git a/superset/translations/pt/LC_MESSAGES/message.json b/superset/translations/pt/LC_MESSAGES/message.json index 37b1e6f4ce5bc..12284400e1b77 100644 --- a/superset/translations/pt/LC_MESSAGES/message.json +++ b/superset/translations/pt/LC_MESSAGES/message.json @@ -876,7 +876,6 @@ "Column to use as the row labels of the dataframe. Leave empty if no index column.": [ "" ], - "Mangle Duplicate Columns": ["Coluna Datahora principal"], "Specify duplicate columns as \"X.0, X.1\".": [""], "Skip Initial Space": [""], "Skip spaces after delimiter.": [""], diff --git a/superset/translations/pt/LC_MESSAGES/messages.json b/superset/translations/pt/LC_MESSAGES/messages.json index 0b0d099b6c4c2..22cc78fa29b05 100644 --- a/superset/translations/pt/LC_MESSAGES/messages.json +++ b/superset/translations/pt/LC_MESSAGES/messages.json @@ -1730,7 +1730,6 @@ "Manage email report": [""], "Manage your databases": [""], "Mandatory": [""], - "Mangle Duplicate Columns": ["Coluna Datahora principal"], "Manually set min/max values for the y-axis.": [""], "Map Style": [""], "Mapbox": ["Mapbox"], diff --git a/superset/translations/pt/LC_MESSAGES/messages.po b/superset/translations/pt/LC_MESSAGES/messages.po index 5d2d4845ca58e..623233c405c0a 100644 --- a/superset/translations/pt/LC_MESSAGES/messages.po +++ b/superset/translations/pt/LC_MESSAGES/messages.po @@ -9263,10 +9263,6 @@ msgstr "" msgid "Mandatory" msgstr "" -#: superset/views/database/forms.py:360 -msgid "Mangle Duplicate Columns" -msgstr "Coluna Datahora principal" - #: superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.jsx:297 msgid "Manually set min/max values for the y-axis." msgstr "" diff --git a/superset/translations/pt_BR/LC_MESSAGES/messages.json b/superset/translations/pt_BR/LC_MESSAGES/messages.json index 6e3a7333ba139..08c1b1f776db1 100644 --- a/superset/translations/pt_BR/LC_MESSAGES/messages.json +++ b/superset/translations/pt_BR/LC_MESSAGES/messages.json @@ -2724,7 +2724,6 @@ "Manage email report": ["Gerenciar relatório de e-mail"], "Manage your databases": ["Gerenciar seus bancos de dados"], "Mandatory": ["Obrigatório"], - "Mangle Duplicate Columns": ["Emaranhar colunas duplicadas"], "Manually set min/max values for the y-axis.": [ "Definir manualmente os valores mínimo/máximo para o eixo y." ], diff --git a/superset/translations/pt_BR/LC_MESSAGES/messages.po b/superset/translations/pt_BR/LC_MESSAGES/messages.po index 639b2d42c227e..d6d922df307cf 100644 --- a/superset/translations/pt_BR/LC_MESSAGES/messages.po +++ b/superset/translations/pt_BR/LC_MESSAGES/messages.po @@ -9396,10 +9396,6 @@ msgstr "Gerenciar seus bancos de dados" msgid "Mandatory" msgstr "Obrigatório" -#: superset/views/database/forms.py:360 -msgid "Mangle Duplicate Columns" -msgstr "Emaranhar colunas duplicadas" - #: superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.jsx:297 msgid "Manually set min/max values for the y-axis." msgstr "Definir manualmente os valores mínimo/máximo para o eixo y." diff --git a/superset/translations/ru/LC_MESSAGES/messages.json b/superset/translations/ru/LC_MESSAGES/messages.json index 616630b37a3cd..91907df1ef328 100644 --- a/superset/translations/ru/LC_MESSAGES/messages.json +++ b/superset/translations/ru/LC_MESSAGES/messages.json @@ -2678,7 +2678,6 @@ "Manage email report": ["Управление рассылкой по почте"], "Manage your databases": ["Управляйте своими базами данных"], "Mandatory": ["Обязательно"], - "Mangle Duplicate Columns": ["Управление повторяющимися столбцами"], "Manually set min/max values for the y-axis.": [ "Вручную задать мин./макс. значения для оси Y" ], diff --git a/superset/translations/ru/LC_MESSAGES/messages.po b/superset/translations/ru/LC_MESSAGES/messages.po index 8d666021c72a5..bef790f515f6f 100644 --- a/superset/translations/ru/LC_MESSAGES/messages.po +++ b/superset/translations/ru/LC_MESSAGES/messages.po @@ -9259,10 +9259,6 @@ msgstr "Управляйте своими базами данных" msgid "Mandatory" msgstr "Обязательно" -#: superset/views/database/forms.py:360 -msgid "Mangle Duplicate Columns" -msgstr "Управление повторяющимися столбцами" - #: superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.jsx:297 msgid "Manually set min/max values for the y-axis." msgstr "Вручную задать мин./макс. значения для оси Y" diff --git a/superset/translations/sk/LC_MESSAGES/messages.json b/superset/translations/sk/LC_MESSAGES/messages.json index 43be893edfd81..6a3291fe740f5 100644 --- a/superset/translations/sk/LC_MESSAGES/messages.json +++ b/superset/translations/sk/LC_MESSAGES/messages.json @@ -2089,7 +2089,6 @@ "Manage email report": [""], "Manage your databases": [""], "Mandatory": [""], - "Mangle Duplicate Columns": [""], "Manually set min/max values for the y-axis.": [""], "Map": [""], "Map Style": [""], diff --git a/superset/translations/sk/LC_MESSAGES/messages.po b/superset/translations/sk/LC_MESSAGES/messages.po index 9c8141b1d5697..3d2e044ccdbe9 100644 --- a/superset/translations/sk/LC_MESSAGES/messages.po +++ b/superset/translations/sk/LC_MESSAGES/messages.po @@ -8841,10 +8841,6 @@ msgstr "" msgid "Mandatory" msgstr "" -#: superset/views/database/forms.py:360 -msgid "Mangle Duplicate Columns" -msgstr "" - #: superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.jsx:297 msgid "Manually set min/max values for the y-axis." msgstr "" diff --git a/superset/translations/sl/LC_MESSAGES/messages.json b/superset/translations/sl/LC_MESSAGES/messages.json index 4d2c51fa75123..1f50e6a301704 100644 --- a/superset/translations/sl/LC_MESSAGES/messages.json +++ b/superset/translations/sl/LC_MESSAGES/messages.json @@ -2484,7 +2484,6 @@ "Manage email report": ["Upravljaj e-poštno poročilo"], "Manage your databases": ["Upravljajte podatkovne baze"], "Mandatory": ["Obvezno"], - "Mangle Duplicate Columns": ["Odstrani podvojene stolpce"], "Map": ["Zemljevid"], "Map Style": ["Slog zemljevida"], "MapBox": ["MapBox"], diff --git a/superset/translations/sl/LC_MESSAGES/messages.po b/superset/translations/sl/LC_MESSAGES/messages.po index f6ba479f82e11..0841a840cd4bd 100644 --- a/superset/translations/sl/LC_MESSAGES/messages.po +++ b/superset/translations/sl/LC_MESSAGES/messages.po @@ -9418,10 +9418,6 @@ msgstr "Upravljajte podatkovne baze" msgid "Mandatory" msgstr "Obvezno" -#: superset/views/database/forms.py:360 -msgid "Mangle Duplicate Columns" -msgstr "Odstrani podvojene stolpce" - #: superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.jsx:297 #, fuzzy msgid "Manually set min/max values for the y-axis." diff --git a/superset/translations/zh/LC_MESSAGES/messages.json b/superset/translations/zh/LC_MESSAGES/messages.json index 41fdda34f3bc6..e66218a493ee8 100644 --- a/superset/translations/zh/LC_MESSAGES/messages.json +++ b/superset/translations/zh/LC_MESSAGES/messages.json @@ -1974,7 +1974,6 @@ "Manage": ["管理"], "Manage your databases": ["管理你的数据库"], "Mandatory": ["必填参数"], - "Mangle Duplicate Columns": ["混合重复列"], "Map": ["地图"], "Map Style": ["地图样式"], "MapBox": ["MapBox地图"], diff --git a/superset/translations/zh/LC_MESSAGES/messages.po b/superset/translations/zh/LC_MESSAGES/messages.po index e05a11e2e9299..e21a83f32b05c 100644 --- a/superset/translations/zh/LC_MESSAGES/messages.po +++ b/superset/translations/zh/LC_MESSAGES/messages.po @@ -9138,10 +9138,6 @@ msgstr "管理你的数据库" msgid "Mandatory" msgstr "必填参数" -#: superset/views/database/forms.py:360 -msgid "Mangle Duplicate Columns" -msgstr "混合重复列" - #: superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.jsx:297 #, fuzzy msgid "Manually set min/max values for the y-axis." diff --git a/superset/views/database/forms.py b/superset/views/database/forms.py index 9e3ba500af465..f8e528c4e3b63 100644 --- a/superset/views/database/forms.py +++ b/superset/views/database/forms.py @@ -357,10 +357,6 @@ class ExcelToDatabaseForm(UploadToDatabaseForm): validators=[Optional(), NumberRange(min=0)], widget=BS3TextFieldWidget(), ) - mangle_dupe_cols = BooleanField( - _("Mangle Duplicate Columns"), - description=_('Specify duplicate columns as "X.0, X.1".'), - ) skiprows = IntegerField( _("Skip Rows"), description=_("Number of rows to skip at start of file."), diff --git a/superset/views/database/views.py b/superset/views/database/views.py index 0a91df2d6f087..9f54ae8b78a37 100644 --- a/superset/views/database/views.py +++ b/superset/views/database/views.py @@ -307,7 +307,6 @@ class ExcelToDatabaseView(SimpleFormView): def form_get(self, form: ExcelToDatabaseForm) -> None: form.header.data = 0 - form.mangle_dupe_cols.data = True form.decimal.data = "." form.if_exists.data = "fail" form.sheet_name.data = "" @@ -343,7 +342,7 @@ def form_post(self, form: ExcelToDatabaseForm) -> Response: index_col=form.index_col.data, io=form.excel_file.data, keep_default_na=not form.null_values.data, - na_values=form.null_values.data if form.null_values.data else None, + na_values=form.null_values.data if form.null_values.data else [], parse_dates=form.parse_dates.data, skiprows=form.skiprows.data, sheet_name=form.sheet_name.data if form.sheet_name.data else 0, diff --git a/tests/integration_tests/csv_upload_tests.py b/tests/integration_tests/csv_upload_tests.py index 9bc204ff06b45..741f4c1bc952c 100644 --- a/tests/integration_tests/csv_upload_tests.py +++ b/tests/integration_tests/csv_upload_tests.py @@ -165,7 +165,6 @@ def upload_excel( "sheet_name": "Sheet1", "if_exists": "fail", "index_label": "test_label", - "mangle_dupe_cols": False, } if schema := utils.get_example_default_schema(): form_data["schema"] = schema