PR Feedback 3

Author: VaggelisD

sqlmesh/core/engine_adapter/base.py

@@ -148,18 +148,22 @@ def __init__(
         self.correlation_id = correlation_id
 
     def with_settings(self, **kwargs: t.Any) -> EngineAdapter:
+        extra_kwargs = {
+            "null_connection": True,
+            "execute_log_level": kwargs.pop("execute_log_level", self._execute_log_level),
+            **self._extra_config,
+            **kwargs,
+        }
+
         adapter = self.__class__(
             self._connection_pool,
             dialect=self.dialect,
             sql_gen_kwargs=self._sql_gen_kwargs,
             default_catalog=self._default_catalog,
-            execute_log_level=kwargs.pop("execute_log_level", self._execute_log_level),
             register_comments=self._register_comments,
-            null_connection=self._extra_config.pop("null_connection", True),
             multithreaded=self._multithreaded,
             pretty_sql=self._pretty_sql,
-            **self._extra_config,
-            **kwargs,
+            **extra_kwargs,
         )
 
         return adapter

sqlmesh/core/plan/evaluator.py

@@ -110,6 +110,7 @@ def evaluate(
         else:
             analytics.collector.on_plan_apply_end(plan_id=plan.plan_id)
         finally:
+            self.snapshot_evaluator.recycle()
             self.console.stop_plan_evaluation()
 
     def _evaluate_stages(