Disabling multiline queries by default (#3436)

Author: sfc-gh-daviwang

src/snowflake/snowpark/session.py

@@ -659,11 +659,13 @@ def __init__(
         )
         self._generate_multiline_queries: bool = (
             self._conn._get_client_side_session_parameter(
-                _PYTHON_SNOWPARK_GENERATE_MULTILINE_QUERIES, True
+                _PYTHON_SNOWPARK_GENERATE_MULTILINE_QUERIES, False
             )
         )
         if self._generate_multiline_queries:
             self._enable_multiline_queries()
+        else:
+            self._disable_multiline_queries()
 
         self._large_query_breakdown_enabled: bool = self.is_feature_enabled_for_version(
             _PYTHON_SNOWPARK_USE_LARGE_QUERY_BREAKDOWN_OPTIMIZATION_VERSION
@@ -788,12 +790,14 @@ def __str__(self):
     def _enable_multiline_queries(self):
         import snowflake.snowpark._internal.analyzer.analyzer_utils as analyzer_utils
 
+        self._generate_multiline_queries = True
         analyzer_utils.NEW_LINE = "\n"
         analyzer_utils.TAB = "    "
 
     def _disable_multiline_queries(self):
         import snowflake.snowpark._internal.analyzer.analyzer_utils as analyzer_utils
 
+        self._generate_multiline_queries = False
         analyzer_utils.NEW_LINE = ""
         analyzer_utils.TAB = ""
 

tests/integ/conftest.py

@@ -278,6 +278,8 @@ def session(
     session._cte_optimization_enabled = cte_optimization_enabled
     session._join_alias_fix = join_alias_fix
     session.ast_enabled = ast_enabled
+    if not session._generate_multiline_queries:
+        session._enable_multiline_queries()
 
     if (RUNNING_ON_GH or RUNNING_ON_JENKINS) and not local_testing_mode:
         set_up_external_access_integration_resources(

tests/unit/conftest.py

@@ -81,4 +81,5 @@ def mock_session(mock_analyzer) -> Session:
     fake_session._analyzer = mock_analyzer
     fake_session._plan_lock = mock.MagicMock()
     mock_analyzer.session = fake_session
+    fake_session._enable_multiline_queries()
     return fake_session

tests/unit/test_analyzer_util_suite.py

@@ -42,6 +42,19 @@
 )
 from snowflake.snowpark._internal.utils import EMPTY_STRING
 
+import snowflake.snowpark._internal.analyzer.analyzer_utils as analyzer_utils
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    original_new_line = analyzer_utils.NEW_LINE
+    original_tab = analyzer_utils.TAB
+    analyzer_utils.NEW_LINE = "\n"
+    analyzer_utils.TAB = "    "
+    yield
+    analyzer_utils.NEW_LINE = original_new_line
+    analyzer_utils.TAB = original_tab
+
 
 def test_generate_scoped_temp_objects():
     temp_file_format_name = "SNOWPARK_TEMP_FILE_FORMAT_E0ZW8Z9WMY"