diff --git a/schemas/dbt/manifest/v12.json b/schemas/dbt/manifest/v12.json index 9c6413db316..987a94355ab 100644 --- a/schemas/dbt/manifest/v12.json +++ b/schemas/dbt/manifest/v12.json @@ -622,6 +622,15 @@ } ], "default": null + }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } } }, "additionalProperties": true, @@ -730,6 +739,15 @@ "type": "string", "default": "" }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } + }, "root_path": { "anyOf": [ { @@ -1667,6 +1685,15 @@ } ], "default": null + }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } } }, "additionalProperties": true, @@ -1775,6 +1802,15 @@ "type": "string", "default": "" }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } + }, "language": { "type": "string", "default": "sql" @@ -2321,6 +2357,15 @@ } ], "default": null + }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } } }, "additionalProperties": true, @@ -2429,6 +2474,15 @@ "type": "string", "default": "" }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } + }, "language": { "type": "string", "default": "sql" @@ -3115,6 +3169,15 @@ } ], "default": null + }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } } }, "additionalProperties": true, @@ -3223,6 +3286,15 @@ "type": "string", "default": "" }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } + }, "language": { "type": "string", "default": "sql" @@ -3928,6 +4000,15 @@ } ], "default": null + }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } } }, "additionalProperties": true, @@ -4036,6 +4117,15 @@ "type": "string", "default": "" }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } + }, "language": { "type": "string", "default": "sql" @@ -5336,6 +5426,15 @@ } ], "default": null + }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } } }, "additionalProperties": true, @@ -5444,6 +5543,15 @@ "type": "string", "default": "" }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } + }, "language": { "type": "string", "default": "sql" @@ -5990,6 +6098,15 @@ } ], "default": null + }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } } }, "additionalProperties": true, @@ -6098,6 +6215,15 @@ "type": "string", "default": "" }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } + }, "language": { "type": "string", "default": "sql" @@ -6979,6 +7105,15 @@ } ], "default": null + }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } } }, "additionalProperties": true, @@ -7087,6 +7222,15 @@ "type": "string", "default": "" }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } + }, "language": { "type": "string", "default": "sql" @@ -8172,6 +8316,15 @@ } ], "default": null + }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } } }, "additionalProperties": true, @@ -8546,6 +8699,12 @@ { "type": "string" }, + { + "type": "array", + "items": { + "type": "string" + } + }, { "type": "null" } @@ -9903,6 +10062,12 @@ { "type": "string" }, + { + "type": "array", + "items": { + "type": "string" + } + }, { "type": "null" } @@ -10471,6 +10636,15 @@ } ], "default": null + }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } } }, "additionalProperties": true, @@ -10579,6 +10753,15 @@ "type": "string", "default": "" }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } + }, "root_path": { "anyOf": [ { @@ -11516,6 +11699,15 @@ } ], "default": null + }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } } }, "additionalProperties": true, @@ -11624,6 +11816,15 @@ "type": "string", "default": "" }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } + }, "language": { "type": "string", "default": "sql" @@ -12170,6 +12371,15 @@ } ], "default": null + }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } } }, "additionalProperties": true, @@ -12278,6 +12488,15 @@ "type": "string", "default": "" }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } + }, "language": { "type": "string", "default": "sql" @@ -12964,6 +13183,15 @@ } ], "default": null + }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } } }, "additionalProperties": true, @@ -13072,6 +13300,15 @@ "type": "string", "default": "" }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } + }, "language": { "type": "string", "default": "sql" @@ -13777,6 +14014,15 @@ } ], "default": null + }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } } }, "additionalProperties": true, @@ -13885,6 +14131,15 @@ "type": "string", "default": "" }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } + }, "language": { "type": "string", "default": "sql" @@ -15185,6 +15440,15 @@ } ], "default": null + }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } } }, "additionalProperties": true, @@ -15293,6 +15557,15 @@ "type": "string", "default": "" }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } + }, "language": { "type": "string", "default": "sql" @@ -15839,6 +16112,15 @@ } ], "default": null + }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } } }, "additionalProperties": true, @@ -15947,6 +16229,15 @@ "type": "string", "default": "" }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } + }, "language": { "type": "string", "default": "sql" @@ -16828,6 +17119,15 @@ } ], "default": null + }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } } }, "additionalProperties": true, @@ -16936,6 +17236,15 @@ "type": "string", "default": "" }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } + }, "language": { "type": "string", "default": "sql" @@ -18012,6 +18321,15 @@ } ], "default": null + }, + "doc_blocks": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } } }, "additionalProperties": true, @@ -18184,6 +18502,12 @@ { "type": "string" }, + { + "type": "array", + "items": { + "type": "string" + } + }, { "type": "null" } diff --git a/tests/functional/artifacts/expected_manifest.py b/tests/functional/artifacts/expected_manifest.py index 02db1905443..a37d0393cf8 100644 --- a/tests/functional/artifacts/expected_manifest.py +++ b/tests/functional/artifacts/expected_manifest.py @@ -316,6 +316,7 @@ def expected_seeded_manifest(project, model_database=None, quote_model=False): "tags": [], "constraints": [], "granularity": None, + "doc_blocks": [], }, "first_name": { "name": "first_name", @@ -326,6 +327,7 @@ def expected_seeded_manifest(project, model_database=None, quote_model=False): "tags": [], "constraints": [], "granularity": None, + "doc_blocks": [], }, "email": { "name": "email", @@ -336,6 +338,7 @@ def expected_seeded_manifest(project, model_database=None, quote_model=False): "tags": [], "constraints": [], "granularity": None, + "doc_blocks": [], }, "ip_address": { "name": "ip_address", @@ -346,6 +349,7 @@ def expected_seeded_manifest(project, model_database=None, quote_model=False): "tags": [], "constraints": [], "granularity": None, + "doc_blocks": [], }, "updated_at": { "name": "updated_at", @@ -356,6 +360,7 @@ def expected_seeded_manifest(project, model_database=None, quote_model=False): "tags": [], "constraints": [], "granularity": None, + "doc_blocks": [], }, }, "contract": {"checksum": None, "enforced": False, "alias_types": True}, @@ -373,6 +378,7 @@ def expected_seeded_manifest(project, model_database=None, quote_model=False): "latest_version": None, "time_spine": None, "freshness": None, + "doc_blocks": [], }, "model.test.second_model": { "compiled_path": os.path.join(compiled_model_path, "second_model.sql"), @@ -416,6 +422,7 @@ def expected_seeded_manifest(project, model_database=None, quote_model=False): "tags": [], "constraints": [], "granularity": None, + "doc_blocks": [], }, "first_name": { "name": "first_name", @@ -426,6 +433,7 @@ def expected_seeded_manifest(project, model_database=None, quote_model=False): "tags": [], "constraints": [], "granularity": None, + "doc_blocks": [], }, "email": { "name": "email", @@ -436,6 +444,7 @@ def expected_seeded_manifest(project, model_database=None, quote_model=False): "tags": [], "constraints": [], "granularity": None, + "doc_blocks": [], }, "ip_address": { "name": "ip_address", @@ -446,6 +455,7 @@ def expected_seeded_manifest(project, model_database=None, quote_model=False): "tags": [], "constraints": [], "granularity": None, + "doc_blocks": [], }, "updated_at": { "name": "updated_at", @@ -456,6 +466,7 @@ def expected_seeded_manifest(project, model_database=None, quote_model=False): "tags": [], "constraints": [], "granularity": None, + "doc_blocks": [], }, }, "contract": {"checksum": None, "enforced": False, "alias_types": True}, @@ -473,6 +484,7 @@ def expected_seeded_manifest(project, model_database=None, quote_model=False): "latest_version": None, "time_spine": None, "freshness": None, + "doc_blocks": [], }, "seed.test.seed": { "build_path": None, @@ -506,6 +518,7 @@ def expected_seeded_manifest(project, model_database=None, quote_model=False): "tags": [], "constraints": [], "granularity": None, + "doc_blocks": [], }, "first_name": { "name": "first_name", @@ -516,6 +529,7 @@ def expected_seeded_manifest(project, model_database=None, quote_model=False): "tags": [], "constraints": [], "granularity": None, + "doc_blocks": [], }, "email": { "name": "email", @@ -526,6 +540,7 @@ def expected_seeded_manifest(project, model_database=None, quote_model=False): "tags": [], "constraints": [], "granularity": None, + "doc_blocks": [], }, "ip_address": { "name": "ip_address", @@ -536,6 +551,7 @@ def expected_seeded_manifest(project, model_database=None, quote_model=False): "tags": [], "constraints": [], "granularity": None, + "doc_blocks": [], }, "updated_at": { "name": "updated_at", @@ -546,6 +562,7 @@ def expected_seeded_manifest(project, model_database=None, quote_model=False): "tags": [], "constraints": [], "granularity": None, + "doc_blocks": [], }, }, "docs": {"node_color": None, "show": True}, @@ -554,6 +571,7 @@ def expected_seeded_manifest(project, model_database=None, quote_model=False): "relation_name": relation_name_node_format.format( project.database, my_schema_name, "seed" ), + "doc_blocks": [], }, "test.test.not_null_model_id.d01cc630e6": { "alias": "not_null_model_id", @@ -607,6 +625,7 @@ def expected_seeded_manifest(project, model_database=None, quote_model=False): "checksum": {"name": "none", "checksum": ""}, "unrendered_config": unrendered_test_config, "contract": {"checksum": None, "enforced": False, "alias_types": True}, + "doc_blocks": [], }, "snapshot.test.snapshot_seed": { "alias": "snapshot_seed", @@ -653,6 +672,7 @@ def expected_seeded_manifest(project, model_database=None, quote_model=False): "tags": [], "unique_id": "snapshot.test.snapshot_seed", "unrendered_config": unrendered_snapshot_config, + "doc_blocks": [], }, "test.test.test_nothing_model_.5d38568946": { "alias": "test_nothing_model_", @@ -705,6 +725,7 @@ def expected_seeded_manifest(project, model_database=None, quote_model=False): }, "checksum": {"name": "none", "checksum": ""}, "unrendered_config": unrendered_test_config, + "doc_blocks": [], }, "test.test.unique_model_id.67b76558ff": { "alias": "unique_model_id", @@ -758,6 +779,7 @@ def expected_seeded_manifest(project, model_database=None, quote_model=False): }, "checksum": {"name": "none", "checksum": ""}, "unrendered_config": unrendered_test_config, + "doc_blocks": [], }, }, "sources": { @@ -773,6 +795,7 @@ def expected_seeded_manifest(project, model_database=None, quote_model=False): "tags": [], "constraints": [], "granularity": None, + "doc_blocks": [], } }, "config": { diff --git a/tests/unit/contracts/graph/test_manifest.py b/tests/unit/contracts/graph/test_manifest.py index 526f46c7884..9b6c056e802 100644 --- a/tests/unit/contracts/graph/test_manifest.py +++ b/tests/unit/contracts/graph/test_manifest.py @@ -82,6 +82,7 @@ "compiled_path", "patch_path", "docs", + "doc_blocks", "checksum", "unrendered_config", "unrendered_config_call_dict", diff --git a/tests/unit/contracts/graph/test_nodes_parsed.py b/tests/unit/contracts/graph/test_nodes_parsed.py index 75d451b9956..6aad0f09fe4 100644 --- a/tests/unit/contracts/graph/test_nodes_parsed.py +++ b/tests/unit/contracts/graph/test_nodes_parsed.py @@ -207,6 +207,7 @@ def base_parsed_model_dict(): "config_call_dict": {}, "access": AccessType.Protected.value, "constraints": [], + "doc_blocks": [], } @@ -315,6 +316,7 @@ def complex_parsed_model_dict(): "meta": {}, "tags": [], "constraints": [], + "doc_blocks": [], }, }, "checksum": { @@ -330,6 +332,7 @@ def complex_parsed_model_dict(): "config_call_dict": {}, "access": AccessType.Protected.value, "constraints": [], + "doc_blocks": [], } @@ -538,6 +541,7 @@ def basic_parsed_seed_dict(): "unrendered_config": {}, "unrendered_config_call_dict": {}, "config_call_dict": {}, + "doc_blocks": [], } @@ -632,6 +636,7 @@ def complex_parsed_seed_dict(): "meta": {}, "tags": [], "constraints": [], + "doc_blocks": [], } }, "meta": {"foo": 1000}, @@ -644,6 +649,7 @@ def complex_parsed_seed_dict(): }, "unrendered_config_call_dict": {}, "config_call_dict": {}, + "doc_blocks": [], } @@ -844,6 +850,7 @@ def base_parsed_hook_dict(): "unrendered_config": {}, "unrendered_config_call_dict": {}, "config_call_dict": {}, + "doc_blocks": [], } @@ -925,6 +932,7 @@ def complex_parsed_hook_dict(): "meta": {}, "tags": [], "constraints": [], + "doc_blocks": [], }, }, "index": 13, @@ -938,6 +946,7 @@ def complex_parsed_hook_dict(): }, "unrendered_config_call_dict": {}, "config_call_dict": {}, + "doc_blocks": [], } @@ -1083,6 +1092,7 @@ def basic_parsed_schema_test_dict(): "unrendered_config": {}, "unrendered_config_call_dict": {}, "config_call_dict": {}, + "doc_blocks": [], } @@ -1158,6 +1168,7 @@ def complex_parsed_schema_test_dict(): "meta": {}, "tags": [], "constraints": [], + "doc_blocks": [], }, }, "column_name": "id", @@ -1172,6 +1183,7 @@ def complex_parsed_schema_test_dict(): "unrendered_config": {"materialized": "table", "severity": "WARN"}, "unrendered_config_call_dict": {}, "config_call_dict": {}, + "doc_blocks": [], } @@ -1567,6 +1579,7 @@ def basic_timestamp_snapshot_dict(): }, "unrendered_config_call_dict": {}, "config_call_dict": {}, + "doc_blocks": [], } @@ -1672,6 +1685,7 @@ def basic_check_snapshot_dict(): }, "unrendered_config_call_dict": {}, "config_call_dict": {}, + "doc_blocks": [], }