Use data file name as table name during import

db/sql/00_msar.sql

@@ -2899,27 +2899,37 @@ table will always have our default 'id' column as its first column.
 DECLARE
   schema_name text;
   table_count integer;
+  prefix text;
   uq_table_name text;
   fq_table_name text;
   created_table_id oid;
   column_defs __msar.col_def[];
   constraint_defs __msar.con_def[];
 BEGIN
   schema_name := msar.get_schema_name(sch_id);
-  IF NULLIF(tab_name, '') IS NOT NULL THEN
+  IF NULLIF(tab_name, '') IS NOT NULL AND NOT EXISTS(
+      SELECT oid FROM pg_catalog.pg_class WHERE relname = tab_name AND relnamespace = sch_id
+    )
+  THEN
     fq_table_name := format('%I.%I', schema_name, tab_name);
   ELSE
+    -- determine what prefix to use for table name generation
+    IF NULLIF(tab_name, '') IS NOT NULL THEN
+      prefix := tab_name || ' ';
+    ELSE
+      prefix := 'Table ';
+    END IF;
     -- generate a table name if one doesn't exist
     SELECT COUNT(*) + 1 INTO table_count
     FROM pg_catalog.pg_class
     WHERE relkind = 'r' AND relnamespace = sch_id;
-    uq_table_name := 'Table ' || table_count;
+    uq_table_name := prefix || table_count;
     -- avoid name collisions
     WHILE EXISTS (
       SELECT oid FROM pg_catalog.pg_class WHERE relname = uq_table_name AND relnamespace = sch_id
     ) LOOP
       table_count := table_count + 1;
-      uq_table_name := 'Table ' || table_count;
+      uq_table_name := prefix || table_count;
     END LOOP;
     fq_table_name := format('%I.%I', schema_name, uq_table_name);
   END IF;

db/tables/operations/import_.py

@@ -15,6 +15,8 @@ def import_csv(data_file_id, table_name, schema_oid, conn, comment=None):
     data_file = DataFile.objects.get(id=data_file_id)
     file_path = data_file.file.path
     header = data_file.header
+    if table_name is None or table_name == '':
+        table_name = data_file.base_name
     dialect = csv.dialect.SimpleDialect(
         data_file.delimiter,
         data_file.quotechar,
@@ -25,7 +27,7 @@ def import_csv(data_file_id, table_name, schema_oid, conn, comment=None):
     with open(file_path, 'rb') as csv_file:
         csv_reader = get_sv_reader(csv_file, header, dialect)
         column_names = process_column_names(csv_reader.fieldnames)
-    copy_sql, table_oid, table_name = prepare_table_for_import(
+    copy_sql, table_oid, db_table_name = prepare_table_for_import(
         table_name,
         schema_oid,
         column_names,
@@ -44,7 +46,7 @@ def import_csv(data_file_id, table_name, schema_oid, conn, comment=None):
         conversion_encoding,
         conn
     )
-    return {"oid": table_oid, "name": table_name}
+    return {"oid": table_oid, "name": db_table_name}
 
 
 def insert_csv_records(

mathesar/tests/api/test_table_api.py

@@ -817,6 +817,7 @@ def test_table_create_non_unicode(client, non_unicode_file_path, filename, first
     )
 
 
+@pytest.mark.skip(reason="msar.add_mathesar_table no longer raises an exception if a table with the same name already exists in the database.")
 def test_table_create_with_same_name(client, schema):
     table_name = 'test_table_duplicate'
     body = {

mathesar/tests/imports/test_csv.py

@@ -143,6 +143,7 @@ def test_col_headers_empty_csv(col_headers_empty_data_file, schema):
     )
 
 
+@pytest.mark.skip(reason="msar.add_mathesar_table no longer raises an exception if a table with the same name already exists in the database.")
 def test_csv_upload_with_duplicate_table_name(data_file, schema):
     table_name = "NASA 2"
 

mathesar/tests/imports/test_excel.py

@@ -57,6 +57,7 @@ def test_excel_upload(data_file, engine_with_schema):
     )
 
 
+@pytest.mark.skip(reason="msar.add_mathesar_table no longer raises an exception if a table with the same name already exists in the database.")
 def test_excel_upload_with_duplicate_table_name(data_file, engine_with_schema):
     table_name = "NASA 2"
 

mathesar/tests/imports/test_json.py

@@ -67,6 +67,7 @@ def test_json_upload(data_file, schema):
     )
 
 
+@pytest.mark.skip(reason="msar.add_mathesar_table no longer raises an exception if a table with the same name already exists in the database.")
 def test_json_upload_with_duplicate_table_name(data_file, schema):
     table_name = "NASA 2"