sqlmesh 0.189.3.dev16__tar.gz → 0.189.3.dev18__tar.gz

{sqlmesh-0.189.3.dev16 → sqlmesh-0.189.3.dev18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlmesh
-Version: 0.189.3.dev16
+Version: 0.189.3.dev18
 Summary: Next-generation data transformation framework
 Author-email: "TobikoData Inc." <engineering@tobikodata.com>
 License:                                  Apache License

{sqlmesh-0.189.3.dev16 → sqlmesh-0.189.3.dev18}/examples/sushi/models/customers.sql

@@ -33,7 +33,8 @@ LEFT JOIN (
   WITH current_marketing AS (
     SELECT
       customer_id,
-      status
+      status,
+      @ADD_ONE(1) AS another_column,
     FROM current_marketing_outer
   )
   SELECT * FROM current_marketing

{sqlmesh-0.189.3.dev16 → sqlmesh-0.189.3.dev18}/sqlmesh/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.189.3.dev16'
-__version_tuple__ = version_tuple = (0, 189, 3, 'dev16')
+__version__ = version = '0.189.3.dev18'
+__version_tuple__ = version_tuple = (0, 189, 3, 'dev18')

{sqlmesh-0.189.3.dev16 → sqlmesh-0.189.3.dev18}/sqlmesh/lsp/reference.py

@@ -450,75 +450,76 @@ def get_model_find_all_references(
     Returns:
         A list of references to the model across all files
     """
-    # First, get the references in the current file to determine what model we're looking for
-    current_file_references = [
-        ref
-        for ref in get_model_definitions_for_a_path(lint_context, document_uri)
-        if isinstance(ref, LSPModelReference)
-    ]
-
     # Find the model reference at the cursor position
-    target_model_uri: t.Optional[str] = None
-    for ref in current_file_references:
-        if _position_within_range(position, ref.range):
-            # This is a model reference, get the target model URI
-            target_model_uri = ref.uri
-            break
+    model_at_position = next(
+        filter(
+            lambda ref: isinstance(ref, LSPModelReference)
+            and _position_within_range(position, ref.range),
+            get_model_definitions_for_a_path(lint_context, document_uri),
+        ),
+        None,
+    )
 
-    if target_model_uri is None:
+    if not model_at_position:
         return []
 
+    assert isinstance(model_at_position, LSPModelReference)  # for mypy
+
+    target_model_uri = model_at_position.uri
+
     # Start with the model definition
     all_references: t.List[LSPModelReference] = [
         LSPModelReference(
-            uri=ref.uri,
+            uri=model_at_position.uri,
             range=Range(
                 start=Position(line=0, character=0),
                 end=Position(line=0, character=0),
             ),
-            markdown_description=ref.markdown_description,
+            markdown_description=model_at_position.markdown_description,
         )
     ]
 
-    # Then add the original reference
-    for ref in current_file_references:
-        if ref.uri == target_model_uri and isinstance(ref, LSPModelReference):
-            all_references.append(
-                LSPModelReference(
-                    uri=document_uri.value,
-                    range=ref.range,
-                    markdown_description=ref.markdown_description,
-                )
+    # Then add references from the current file
+    current_file_refs = filter(
+        lambda ref: isinstance(ref, LSPModelReference) and ref.uri == target_model_uri,
+        get_model_definitions_for_a_path(lint_context, document_uri),
+    )
+
+    for ref in current_file_refs:
+        assert isinstance(ref, LSPModelReference)  # for mypy
+
+        all_references.append(
+            LSPModelReference(
+                uri=document_uri.value,
+                range=ref.range,
+                markdown_description=ref.markdown_description,
             )
+        )
 
     # Search through the models in the project
-    for path, target in lint_context.map.items():
-        if not isinstance(target, (ModelTarget, AuditTarget)):
-            continue
-
+    for path, _ in lint_context.map.items():
         file_uri = URI.from_path(path)
 
         # Skip current file, already processed
         if file_uri.value == document_uri.value:
             continue
 
-        # Get model references for this file
-        file_references = [
-            ref
-            for ref in get_model_definitions_for_a_path(lint_context, file_uri)
-            if isinstance(ref, LSPModelReference)
-        ]
-
-        # Add references that point to the target model file
-        for ref in file_references:
-            if ref.uri == target_model_uri and isinstance(ref, LSPModelReference):
-                all_references.append(
-                    LSPModelReference(
-                        uri=file_uri.value,
-                        range=ref.range,
-                        markdown_description=ref.markdown_description,
-                    )
+        # Get model references that point to the target model
+        matching_refs = filter(
+            lambda ref: isinstance(ref, LSPModelReference) and ref.uri == target_model_uri,
+            get_model_definitions_for_a_path(lint_context, file_uri),
+        )
+
+        for ref in matching_refs:
+            assert isinstance(ref, LSPModelReference)  # for mypy
+
+            all_references.append(
+                LSPModelReference(
+                    uri=file_uri.value,
+                    range=ref.range,
+                    markdown_description=ref.markdown_description,
                 )
+            )
 
     return all_references
 
@@ -587,13 +588,83 @@ def get_cte_references(
     return matching_references
 
 
+def get_macro_find_all_references(
+    lsp_context: LSPContext, document_uri: URI, position: Position
+) -> t.List[LSPMacroReference]:
+    """
+    Get all references to a macro at a specific position in a document.
+
+    This function finds all usages of a macro across the entire project.
+
+    Args:
+        lsp_context: The LSP context
+        document_uri: The URI of the document
+        position: The position to check for macro references
+
+    Returns:
+        A list of references to the macro across all files
+    """
+    # Find the macro reference at the cursor position
+    macro_at_position = next(
+        filter(
+            lambda ref: isinstance(ref, LSPMacroReference)
+            and _position_within_range(position, ref.range),
+            get_macro_definitions_for_a_path(lsp_context, document_uri),
+        ),
+        None,
+    )
+
+    if not macro_at_position:
+        return []
+
+    assert isinstance(macro_at_position, LSPMacroReference)  # for mypy
+
+    target_macro_uri = macro_at_position.uri
+    target_macro_target_range = macro_at_position.target_range
+
+    # Start with the macro definition
+    all_references: t.List[LSPMacroReference] = [
+        LSPMacroReference(
+            uri=target_macro_uri,
+            range=target_macro_target_range,
+            target_range=target_macro_target_range,
+            markdown_description=None,
+        )
+    ]
+
+    # Search through all SQL and audit files in the project
+    for path, _ in lsp_context.map.items():
+        file_uri = URI.from_path(path)
+
+        # Get macro references that point to the same macro definition
+        matching_refs = filter(
+            lambda ref: isinstance(ref, LSPMacroReference)
+            and ref.uri == target_macro_uri
+            and ref.target_range == target_macro_target_range,
+            get_macro_definitions_for_a_path(lsp_context, file_uri),
+        )
+
+        for ref in matching_refs:
+            assert isinstance(ref, LSPMacroReference)  # for mypy
+            all_references.append(
+                LSPMacroReference(
+                    uri=file_uri.value,
+                    range=ref.range,
+                    target_range=ref.target_range,
+                    markdown_description=ref.markdown_description,
+                )
+            )
+
+    return all_references
+
+
 def get_all_references(
     lint_context: LSPContext, document_uri: URI, position: Position
 ) -> t.Sequence[Reference]:
     """
     Get all references of a symbol at a specific position in a document.
 
-    This function determines the type of reference (CTE, model for now) at the cursor
+    This function determines the type of reference (CTE, model or macro) at the cursor
     position and returns all references to that symbol across the project.
 
     Args:
@@ -612,6 +683,10 @@ def get_all_references(
     if model_references := get_model_find_all_references(lint_context, document_uri, position):
         return model_references
 
+    # Finally try macro references (across files)
+    if macro_references := get_macro_find_all_references(lint_context, document_uri, position):
+        return macro_references
+
     return []
 
 

{sqlmesh-0.189.3.dev16 → sqlmesh-0.189.3.dev18}/sqlmesh.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlmesh
-Version: 0.189.3.dev16
+Version: 0.189.3.dev18
 Summary: Next-generation data transformation framework
 Author-email: "TobikoData Inc." <engineering@tobikodata.com>
 License:                                  Apache License

{sqlmesh-0.189.3.dev16 → sqlmesh-0.189.3.dev18}/sqlmesh.egg-info/SOURCES.txt

@@ -658,6 +658,7 @@ tests/lsp/test_reference.py
 tests/lsp/test_reference_cte.py
 tests/lsp/test_reference_cte_find_all.py
 tests/lsp/test_reference_macro.py
+tests/lsp/test_reference_macro_find_all.py
 tests/lsp/test_reference_macro_multi.py
 tests/lsp/test_reference_model_find_all.py
 tests/schedulers/__init__.py
@@ -817,50 +818,50 @@ web/client/tailwind.config.cjs
 web/client/tsconfig.json
 web/client/vite.config.ts
 web/client/dist/index.html
-web/client/dist/assets/Audits-Bvr7M5Cg.js
-web/client/dist/assets/Banner-B_rJvh8O.js
-web/client/dist/assets/ChevronDownIcon-SZg7zD3B.js
-web/client/dist/assets/ChevronRightIcon-BGlTDFlW.js
-web/client/dist/assets/Content-BX5bHEIM.js
-web/client/dist/assets/Content-DuTflNnu.js
-web/client/dist/assets/Data--_LvHKB5.js
-web/client/dist/assets/DataCatalog-CDUa7UBO.js
-web/client/dist/assets/Editor---NX-EOB.js
-web/client/dist/assets/Editor-ClU6zMcH.js
-web/client/dist/assets/Errors-lzXHPiom.js
-web/client/dist/assets/FileExplorer-CB7x6Zt5.js
-web/client/dist/assets/Footer-C0X7AnA5.js
-web/client/dist/assets/Header-T0redAYU.js
-web/client/dist/assets/Input-BQqcM0yt.js
-web/client/dist/assets/Lineage-Z_rKyQjf.js
-web/client/dist/assets/ListboxShow-DrRCf9sL.js
-web/client/dist/assets/ModelLineage-DC1kbGVO.js
-web/client/dist/assets/Models-nG2g7q6-.js
-web/client/dist/assets/Page-BQKUIqng.js
-web/client/dist/assets/Plan-C0T4Faqg.js
-web/client/dist/assets/PlusCircleIcon-BDES6aDU.js
-web/client/dist/assets/ReportErrors-Cuv4D77y.js
-web/client/dist/assets/Root-q1MHWtlB.js
-web/client/dist/assets/SearchList-BU76SGzL.js
-web/client/dist/assets/SelectEnvironment-BtI6wkY7.js
-web/client/dist/assets/SourceList-C1RxJTpZ.js
-web/client/dist/assets/SourceListItem-BTqd6jLB.js
-web/client/dist/assets/SplitPane-zgn_nUAw.js
-web/client/dist/assets/Tests-CK6uzr59.js
-web/client/dist/assets/Welcome-DKlRE9Lt.js
+web/client/dist/assets/Audits-Pgs8N6IE.js
+web/client/dist/assets/Banner-DVsKo_4f.js
+web/client/dist/assets/ChevronDownIcon-nW8Gsfc8.js
+web/client/dist/assets/ChevronRightIcon-dV0VWg50.js
+web/client/dist/assets/Content-C0JdHN-F.js
+web/client/dist/assets/Content-DV3whS9M.js
+web/client/dist/assets/Data-CGN0CnIX.js
+web/client/dist/assets/DataCatalog-dshO8o7W.js
+web/client/dist/assets/Editor-BV_q4XNs.js
+web/client/dist/assets/Editor-UXlx6hNl.js
+web/client/dist/assets/Errors-BZn1A8l3.js
+web/client/dist/assets/FileExplorer-Bc12UBVw.js
+web/client/dist/assets/Footer-BEjDDaSE.js
+web/client/dist/assets/Header-BUnVQQzm.js
+web/client/dist/assets/Input-CYkPiHdu.js
+web/client/dist/assets/Lineage-Bb_XDi8Z.js
+web/client/dist/assets/ListboxShow-BoQTSdAK.js
+web/client/dist/assets/ModelLineage-Bkj5mIkh.js
+web/client/dist/assets/Models-DnL6WJTs.js
+web/client/dist/assets/Page-CGKYDGz-.js
+web/client/dist/assets/Plan-DcGriIiA.js
+web/client/dist/assets/PlusCircleIcon-G0dx9NQm.js
+web/client/dist/assets/ReportErrors-B7Mr6CPy.js
+web/client/dist/assets/Root-B7VWZ_LH.js
+web/client/dist/assets/SearchList-BGwZi6Iv.js
+web/client/dist/assets/SelectEnvironment-Bq5yNhkA.js
+web/client/dist/assets/SourceList-ChD1dovq.js
+web/client/dist/assets/SourceListItem-BSGVpkoq.js
+web/client/dist/assets/SplitPane-3okSokAv.js
+web/client/dist/assets/Tests-itL38hJI.js
+web/client/dist/assets/Welcome-BP7z8PA1.js
 web/client/dist/assets/_commonjs-dynamic-modules-TDtrdbi3.js
-web/client/dist/assets/context-CHLxBWS9.js
-web/client/dist/assets/context-CzXAuYu4.js
-web/client/dist/assets/editor-A537AE0N.js
-web/client/dist/assets/file-DfM1ePvm.js
-web/client/dist/assets/floating-ui.react-dom-DhdjjAk5.js
+web/client/dist/assets/context-D1hHNguh.js
+web/client/dist/assets/context-DxH8yaYv.js
+web/client/dist/assets/editor-CiPjHBto.js
+web/client/dist/assets/file-CafyWkYy.js
+web/client/dist/assets/floating-ui.react-dom-C8DFRCmP.js
 web/client/dist/assets/help-6Q7f7fjd.js
-web/client/dist/assets/help-DtSFwTCR.js
-web/client/dist/assets/index-BBxFj1Oj.js
-web/client/dist/assets/index-DvOWtL0R.js
-web/client/dist/assets/plan-Bm6MqEdG.js
-web/client/dist/assets/popover-nHJ-KXbz.js
-web/client/dist/assets/project-B1HtWBfw.js
+web/client/dist/assets/help-ClwWI4Vm.js
+web/client/dist/assets/index-Cd9H4oK_.js
+web/client/dist/assets/index-GDI1mjkA.js
+web/client/dist/assets/plan-YZ0KB3_p.js
+web/client/dist/assets/popover-Cy5cZxvQ.js
+web/client/dist/assets/project-BDbQ0VpX.js
 web/client/dist/css/base.css
 web/client/dist/css/design.css
 web/client/dist/favicons/favicon.svg

{sqlmesh-0.189.3.dev16 → sqlmesh-0.189.3.dev18}/tests/integrations/github/cicd/test_integration.py

@@ -1684,7 +1684,7 @@ def test_overlapping_changes_models(
 
 +++ 
 
-@@ -25,7 +25,8 @@
+@@ -29,7 +29,8 @@
 
  SELECT DISTINCT
    CAST(o.customer_id AS INT) AS customer_id,

sqlmesh-0.189.3.dev18/tests/lsp/test_reference_macro_find_all.py

@@ -0,0 +1,191 @@
+from lsprotocol.types import Position
+from sqlmesh.core.context import Context
+from sqlmesh.lsp.context import LSPContext, ModelTarget
+from sqlmesh.lsp.reference import (
+    get_macro_find_all_references,
+    get_macro_definitions_for_a_path,
+)
+from sqlmesh.lsp.uri import URI
+from sqlmesh.core.linter.helpers import (
+    read_range_from_file,
+    Range as SQLMeshRange,
+    Position as SQLMeshPosition,
+)
+
+
+def test_find_all_references_for_macro_add_one():
+    """Test finding all references to the @ADD_ONE macro."""
+    context = Context(paths=["examples/sushi"])
+    lsp_context = LSPContext(context)
+
+    # Find the top_waiters model that uses @ADD_ONE macro
+    top_waiters_path = next(
+        path
+        for path, info in lsp_context.map.items()
+        if isinstance(info, ModelTarget) and "sushi.top_waiters" in info.names
+    )
+
+    top_waiters_uri = URI.from_path(top_waiters_path)
+    macro_references = get_macro_definitions_for_a_path(lsp_context, top_waiters_uri)
+
+    # Find the @ADD_ONE reference
+    add_one_ref = next((ref for ref in macro_references if ref.range.start.line == 12), None)
+    assert add_one_ref is not None, "Should find @ADD_ONE reference in top_waiters"
+
+    # Click on the @ADD_ONE macro at line 13, character 5 (the @ symbol)
+    position = Position(line=12, character=5)
+
+    all_references = get_macro_find_all_references(lsp_context, top_waiters_uri, position)
+
+    # Should find at least 2 references: the definition and the usage in top_waiters
+    assert len(all_references) >= 2, f"Expected at least 2 references, found {len(all_references)}"
+
+    # Verify the macro definition is included
+    definition_refs = [ref for ref in all_references if "utils.py" in ref.uri]
+    assert len(definition_refs) >= 1, "Should include the macro definition in utils.py"
+
+    # Verify the usage in top_waiters is included
+    usage_refs = [ref for ref in all_references if "top_waiters" in ref.uri]
+    assert len(usage_refs) >= 1, "Should include the usage in top_waiters.sql"
+
+    expected_files = {
+        "utils.py": {"pattern": r"def add_one", "expected_content": "def add_one"},
+        "customers.sql": {"pattern": r"@ADD_ONE\s*\(", "expected_content": "ADD_ONE"},
+        "top_waiters.sql": {"pattern": r"@ADD_ONE\s*\(", "expected_content": "ADD_ONE"},
+    }
+
+    for expected_file, expectations in expected_files.items():
+        file_refs = [ref for ref in all_references if expected_file in ref.uri]
+        assert len(file_refs) >= 1, f"Should find at least one reference in {expected_file}"
+
+        file_ref = file_refs[0]
+        file_path = URI(file_ref.uri).to_path()
+
+        sqlmesh_range = SQLMeshRange(
+            start=SQLMeshPosition(
+                line=file_ref.range.start.line, character=file_ref.range.start.character
+            ),
+            end=SQLMeshPosition(
+                line=file_ref.range.end.line, character=file_ref.range.end.character
+            ),
+        )
+
+        # Read the content at the reference location
+        content = read_range_from_file(file_path, sqlmesh_range)
+        assert content.startswith(expectations["expected_content"]), (
+            f"Expected content to start with '{expectations['expected_content']}', got: {content}"
+        )
+
+
+def test_find_all_references_for_macro_multiply():
+    """Test finding all references to the @MULTIPLY macro."""
+    context = Context(paths=["examples/sushi"])
+    lsp_context = LSPContext(context)
+
+    # Find the top_waiters model that uses @MULTIPLY macro
+    top_waiters_path = next(
+        path
+        for path, info in lsp_context.map.items()
+        if isinstance(info, ModelTarget) and "sushi.top_waiters" in info.names
+    )
+
+    top_waiters_uri = URI.from_path(top_waiters_path)
+    macro_references = get_macro_definitions_for_a_path(lsp_context, top_waiters_uri)
+
+    # Find the @MULTIPLY reference
+    multiply_ref = next((ref for ref in macro_references if ref.range.start.line == 13), None)
+    assert multiply_ref is not None, "Should find @MULTIPLY reference in top_waiters"
+
+    # Click on the @MULTIPLY macro at line 14, character 5 (the @ symbol)
+    position = Position(line=13, character=5)
+    all_references = get_macro_find_all_references(lsp_context, top_waiters_uri, position)
+
+    # Should find at least 2 references: the definition and the usage
+    assert len(all_references) >= 2, f"Expected at least 2 references, found {len(all_references)}"
+
+    # Verify both definition and usage are included
+    assert any("utils.py" in ref.uri for ref in all_references), "Should include macro definition"
+    assert any("top_waiters" in ref.uri for ref in all_references), "Should include usage"
+
+
+def test_find_all_references_for_sql_literal_macro():
+    """Test finding references to @SQL_LITERAL macro ."""
+    context = Context(paths=["examples/sushi"])
+    lsp_context = LSPContext(context)
+
+    # Find the top_waiters model that uses @SQL_LITERAL macro
+    top_waiters_path = next(
+        path
+        for path, info in lsp_context.map.items()
+        if isinstance(info, ModelTarget) and "sushi.top_waiters" in info.names
+    )
+
+    top_waiters_uri = URI.from_path(top_waiters_path)
+    macro_references = get_macro_definitions_for_a_path(lsp_context, top_waiters_uri)
+
+    # Find the @SQL_LITERAL reference
+    sql_literal_ref = next((ref for ref in macro_references if ref.range.start.line == 14), None)
+    assert sql_literal_ref is not None, "Should find @SQL_LITERAL reference in top_waiters"
+
+    # Click on the @SQL_LITERAL macro
+    position = Position(line=14, character=5)
+    all_references = get_macro_find_all_references(lsp_context, top_waiters_uri, position)
+
+    # For user-defined macros in utils.py, should find references
+    assert len(all_references) >= 2, f"Expected at least 2 references, found {len(all_references)}"
+
+
+def test_find_references_from_outside_macro_position():
+    """Test that clicking outside a macro doesn't return macro references."""
+    context = Context(paths=["examples/sushi"])
+    lsp_context = LSPContext(context)
+
+    top_waiters_path = next(
+        path
+        for path, info in lsp_context.map.items()
+        if isinstance(info, ModelTarget) and "sushi.top_waiters" in info.names
+    )
+
+    top_waiters_uri = URI.from_path(top_waiters_path)
+
+    # Click on a position that is not on a macro
+    position = Position(line=0, character=0)  # First line, which is a comment
+    all_references = get_macro_find_all_references(lsp_context, top_waiters_uri, position)
+
+    # Should return empty list when not on a macro
+    assert len(all_references) == 0, "Should not find macro references when not on a macro"
+
+
+def test_multi_repo_macro_references():
+    """Test finding macro references across multiple repositories."""
+    context = Context(paths=["examples/multi/repo_1", "examples/multi/repo_2"], gateway="memory")
+    lsp_context = LSPContext(context)
+
+    # Find model 'd' which uses macros from repo_2
+    d_path = next(
+        path
+        for path, info in lsp_context.map.items()
+        if isinstance(info, ModelTarget) and "silver.d" in info.names
+    )
+
+    d_uri = URI.from_path(d_path)
+    macro_references = get_macro_definitions_for_a_path(lsp_context, d_uri)
+
+    if macro_references:
+        # Click on the second macro reference which appears under the same name in repo_1 ('dup')
+        first_ref = macro_references[1]
+        position = Position(
+            line=first_ref.range.start.line, character=first_ref.range.start.character + 1
+        )
+        all_references = get_macro_find_all_references(lsp_context, d_uri, position)
+
+        # Should find the definition and usage
+        assert len(all_references) == 2, f"Expected 2 references, found {len(all_references)}"
+
+        # Verify references from repo_2
+        assert any("repo_2" in ref.uri for ref in all_references), "Should find macro in repo_2"
+
+        # But not references in repo_1 since despite identical name they're different macros
+        assert not any("repo_1" in ref.uri for ref in all_references), (
+            "Shouldn't find macro in repo_1"
+        )

{sqlmesh-0.189.3.dev16 → sqlmesh-0.189.3.dev18}/tests/test_forking.py

@@ -46,12 +46,14 @@ LEFT JOIN (
   WITH "current_marketing" AS (
     SELECT
       "current_marketing_outer"."customer_id" AS "customer_id",
-      "current_marketing_outer"."status" AS "status"
+      "current_marketing_outer"."status" AS "status",
+      2 AS "another_column"
     FROM "current_marketing_outer" AS "current_marketing_outer"
   )
   SELECT
     "current_marketing"."customer_id" AS "customer_id",
-    "current_marketing"."status" AS "status"
+    "current_marketing"."status" AS "status",
+    "current_marketing"."another_column" AS "another_column"
   FROM "current_marketing" AS "current_marketing"
 ) AS "m"
   ON "m"."customer_id" = "o"."customer_id"

{sqlmesh-0.189.3.dev16 → sqlmesh-0.189.3.dev18}/tests/web/test_lineage.py

@@ -62,12 +62,14 @@ LEFT JOIN (
   WITH "current_marketing" AS (
     SELECT
       "current_marketing_outer"."customer_id" AS "customer_id",
-      "current_marketing_outer"."status" AS "status"
+      "current_marketing_outer"."status" AS "status",
+      2 AS "another_column"
     FROM "current_marketing_outer" AS "current_marketing_outer"
   )
   SELECT
     "current_marketing"."customer_id" AS "customer_id",
-    "current_marketing"."status" AS "status"
+    "current_marketing"."status" AS "status",
+    "current_marketing"."another_column" AS "another_column"
   FROM "current_marketing" AS "current_marketing"
 ) AS "m"
   ON "m"."customer_id" = "o"."customer_id"