From dff153b59e72b103b6ba1e3c8dbe0310512a3071 Mon Sep 17 00:00:00 2001
From: Yatsishin Ilya <2159081+qoega@users.noreply.github.com>
Date: Wed, 4 Sep 2024 11:48:22 +0000
Subject: [PATCH] Null supports no settings

---
 src/Interpreters/InterpreterCreateQuery.cpp   |  3 +++
 .../test_restore_external_engines/test.py     | 22 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/src/Interpreters/InterpreterCreateQuery.cpp b/src/Interpreters/InterpreterCreateQuery.cpp
index e9f40bdbaf5..3014deab286 100644
--- a/src/Interpreters/InterpreterCreateQuery.cpp
+++ b/src/Interpreters/InterpreterCreateQuery.cpp
@@ -1074,6 +1074,7 @@ namespace
         engine_ast->name = "Null";
         engine_ast->no_empty_args = true;
         storage.set(storage.engine, engine_ast);
+        storage.settings = nullptr;
     }
 
 }
@@ -1156,7 +1157,9 @@ void InterpreterCreateQuery::setEngine(ASTCreateQuery & create) const
         else if (getContext()->getSettingsRef().restore_replace_external_engines_to_null)
         {
             if (StorageFactory::instance().getStorageFeatures(create.storage->engine->name).source_access_type != AccessType::NONE)
+            {
                 setNullTableEngine(*create.storage);
+            }
         }
         return;
     }
diff --git a/tests/integration/test_restore_external_engines/test.py b/tests/integration/test_restore_external_engines/test.py
index cf189f2a6ed..a975db05020 100644
--- a/tests/integration/test_restore_external_engines/test.py
+++ b/tests/integration/test_restore_external_engines/test.py
@@ -70,6 +70,12 @@ def get_mysql_conn(cluster):
 def fill_tables(cluster, dbname):
     fill_nodes(nodes, dbname)
 
+    node1.query(
+        f"""CREATE TABLE {dbname}.example_s3_engine_table (name String, value UInt32)
+ENGINE = S3('https://clickhouse-public-datasets.s3.amazonaws.com/my-test-bucket-768/test-data.csv.gz', 'CSV', 'gzip')
+SETTINGS input_format_with_names_use_header = 0"""
+    )
+
     conn = get_mysql_conn(cluster)
 
     with conn.cursor() as cursor:
@@ -136,6 +142,7 @@ def test_restore_table(start_cluster):
 
     node2.query(f"BACKUP DATABASE replicated TO {backup_name}")
 
+    node2.query("DROP TABLE replicated.example_s3_engine_table")
     node2.query("DROP TABLE replicated.mysql_schema_inference_engine")
     node2.query("DROP TABLE replicated.mysql_schema_inference_function")
 
@@ -149,6 +156,13 @@ def test_restore_table(start_cluster):
     )
     node1.query(f"SYSTEM SYNC DATABASE REPLICA replicated")
 
+    assert (
+        node1.query(
+            "SELECT engine FROM system.tables where database = 'replicated' and name = 'example_s3_engine_table'"
+        )
+        == "S3\n"
+    )
+
     assert (
         node1.query(
             "SELECT count(), sum(id) FROM replicated.mysql_schema_inference_engine"
@@ -175,6 +189,7 @@ def test_restore_table_null(start_cluster):
 
     node2.query(f"BACKUP DATABASE replicated2 TO {backup_name}")
 
+    node2.query("DROP TABLE replicated2.example_s3_engine_table")
     node2.query("DROP TABLE replicated2.mysql_schema_inference_engine")
     node2.query("DROP TABLE replicated2.mysql_schema_inference_function")
 
@@ -188,6 +203,13 @@ def test_restore_table_null(start_cluster):
     )
     node1.query(f"SYSTEM SYNC DATABASE REPLICA replicated2")
 
+    assert (
+        node1.query(
+            "SELECT engine FROM system.tables where database = 'replicated2' and name = 'example_s3_engine_table'"
+        )
+        == "Null\n"
+    )
+
     assert (
         node1.query(
             "SELECT count(), sum(id) FROM replicated2.mysql_schema_inference_engine"