File upload:

- Change forms fileds names for columnar and excel form views so they both use the same database DOM element as CSV form.
- Update our tests and the places where columnar and excel upload where using the not very descriptive "con" field

superset/views/database/forms.py

@@ -293,7 +293,7 @@ class ExcelToDatabaseForm(UploadToDatabaseForm):
         widget=BS3TextFieldWidget(),
     )
 
-    con = QuerySelectField(
+    database = QuerySelectField(
         _("Database"),
         query_factory=UploadToDatabaseForm.file_allowed_dbs,
         get_pk=lambda a: a.id,
@@ -424,7 +424,7 @@ class ColumnarToDatabaseForm(UploadToDatabaseForm):
         ],
     )
 
-    con = QuerySelectField(
+    database = QuerySelectField(
         _("Database"),
         query_factory=UploadToDatabaseForm.file_allowed_dbs,
         get_pk=lambda a: a.id,

superset/views/database/views.py

@@ -262,7 +262,7 @@ def form_get(self, form: ExcelToDatabaseForm) -> None:
         form.sheet_name.data = ""
 
     def form_post(self, form: ExcelToDatabaseForm) -> Response:
-        database = form.con.data
+        database = form.database.data
         excel_table = Table(table=form.name.data, schema=form.schema.data)
 
         if not schema_allows_file_upload(database, excel_table.schema):
@@ -301,7 +301,7 @@ def form_post(self, form: ExcelToDatabaseForm) -> Response:
 
             database = (
                 db.session.query(models.Database)
-                .filter_by(id=form.data.get("con").data.get("id"))
+                .filter_by(id=form.data.get("database").data.get("id"))
                 .one()
             )
 
@@ -378,7 +378,7 @@ def form_post(self, form: ExcelToDatabaseForm) -> Response:
         flash(message, "info")
         event_logger.log_with_context(
             action="successful_excel_upload",
-            database=form.con.data.name,
+            database=form.database.data.name,
             schema=form.schema.data,
             table=form.name.data,
         )
@@ -397,7 +397,7 @@ def form_get(self, form: ColumnarToDatabaseForm) -> None:
     def form_post(  # pylint: disable=too-many-locals
         self, form: ColumnarToDatabaseForm
     ) -> Response:
-        database = form.con.data
+        database = form.database.data
         columnar_table = Table(table=form.name.data, schema=form.schema.data)
         files = form.columnar_file.data
         file_type = {file.filename.split(".")[-1] for file in files}
@@ -442,7 +442,7 @@ def form_post(  # pylint: disable=too-many-locals
 
             database = (
                 db.session.query(models.Database)
-                .filter_by(id=form.data.get("con").data.get("id"))
+                .filter_by(id=form.data.get("database").data.get("id"))
                 .one()
             )
 
@@ -519,7 +519,7 @@ def form_post(  # pylint: disable=too-many-locals
         flash(message, "info")
         event_logger.log_with_context(
             action="successful_columnar_upload",
-            database=form.con.data.name,
+            database=form.database.data.name,
             schema=form.schema.data,
             table=form.name.data,
         )

tests/integration_tests/csv_upload_tests.py

@@ -144,7 +144,7 @@ def upload_excel(
     form_data = {
         "excel_file": open(filename, "rb"),
         "name": table_name,
-        "con": excel_upload_db_id,
+        "database": excel_upload_db_id,
         "sheet_name": "Sheet1",
         "if_exists": "fail",
         "index_label": "test_label",
@@ -165,7 +165,7 @@ def upload_columnar(
     form_data = {
         "columnar_file": open(filename, "rb"),
         "name": table_name,
-        "con": columnar_upload_db_id,
+        "database": columnar_upload_db_id,
         "if_exists": "fail",
         "index_label": "test_label",
     }