Skip to content

Commit 78df4e7

Browse files
authored
Merge pull request #551 from brooklyn-data/fix/support-validate-macro-args
Support Validate Macro Args Flag
2 parents 81f902d + 5349fe7 commit 78df4e7

1 file changed

Lines changed: 20 additions & 28 deletions

File tree

macros/_macros.yml

Lines changed: 20 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ macros:
2323
Date: 2023-04-28
2424
arguments:
2525
- name: field_list
26-
type: list
26+
type: list[any]
2727
description: |
2828
A list of fields to concatenate together to form the surrogate key
2929
3030
- name: get_relation
3131
description: |
3232
Identify a relation in the graph from a relation name
3333
arguments:
34-
- name: get_relation_name
34+
- name: relation_name
3535
type: string
3636
description: |
3737
The name of the relation to return from the graph
@@ -87,22 +87,22 @@ macros:
8787
contract for the graph nodes is prone to change without warning. This macro makes handling for these changes easier and more DRY.
8888
arguments:
8989
- name: model
90-
type: Node
90+
type: relation
9191
description: A node object from the dbt graph
9292
- name: update_nested_dict
9393
description: |
9494
A macro that walks through a mapping object (dictionary) and recursively converts types to
9595
something that can be JSON serialized.
9696
arguments:
9797
- name: dictionary
98-
type: mapping
98+
type: dict[str, any]
9999
description: A mapping object to walk through
100100
- name: safe_copy_mapping
101101
description: |
102102
A macro that safely copies a mapping object (dictionary), using the `update_nested_dict` macro to ensure that the types are JSON serializable.
103103
arguments:
104104
- name: dictionary
105-
type: mapping
105+
type: dict[str, any]
106106
description: A mapping object to copy
107107
- name: type_handler
108108
description: |
@@ -127,7 +127,7 @@ macros:
127127
pre/post conversion values.
128128
arguments:
129129
- name: dictionary
130-
type: mapping
130+
type: dict[str, any]
131131
description: A mapping object to validate
132132

133133
## UPLOAD INDIVIDUAL DATASETS ##
@@ -136,7 +136,7 @@ macros:
136136
The macro to support upload of the data to the exposures table.
137137
arguments:
138138
- name: exposures
139-
type: list
139+
type: list[any]
140140
description: |
141141
A list of exposure objects extracted from the dbt graph
142142
@@ -149,7 +149,7 @@ macros:
149149
The macro to support upload of the data to the model_executions table.
150150
arguments:
151151
- name: models
152-
type: list
152+
type: list[any]
153153
description: |
154154
A list of model execution results objects extracted from the dbt result object
155155
@@ -158,7 +158,7 @@ macros:
158158
The macro to support upload of the data to the models table.
159159
arguments:
160160
- name: models
161-
type: list
161+
type: list[any]
162162
description: |
163163
A list of test objects extracted from the dbt graph
164164
@@ -167,7 +167,7 @@ macros:
167167
The macro to support upload of the data to the seed_executions table.
168168
arguments:
169169
- name: seeds
170-
type: list
170+
type: list[any]
171171
description: |
172172
A list of seed execution results objects extracted from the dbt result object
173173
@@ -176,7 +176,7 @@ macros:
176176
The macro to support upload of the data to the seeds table.
177177
arguments:
178178
- name: seeds
179-
type: list
179+
type: list[any]
180180
description: |
181181
A list of seeds objects extracted from the dbt graph
182182
@@ -185,7 +185,7 @@ macros:
185185
The macro to support upload of the data to the snapshot_executions table.
186186
arguments:
187187
- name: snapshots
188-
type: list
188+
type: list[any]
189189
description: |
190190
A list of snapshot execution results objects extracted from the dbt result object
191191
@@ -194,7 +194,7 @@ macros:
194194
The macro to support upload of the data to the snapshots table.
195195
arguments:
196196
- name: snapshots
197-
type: list
197+
type: list[any]
198198
description: |
199199
A list of snapshots objects extracted from the dbt graph
200200
@@ -203,7 +203,7 @@ macros:
203203
The macro to support upload of the data to the sources table.
204204
arguments:
205205
- name: sources
206-
type: list
206+
type: list[any]
207207
description: |
208208
A list of sources objects extracted from the dbt graph
209209
@@ -212,7 +212,7 @@ macros:
212212
The macro to support upload of the data to the test_executions table.
213213
arguments:
214214
- name: tests
215-
type: list
215+
type: list[any]
216216
description: |
217217
A list of test execution results objects extracted from the dbt result object
218218
@@ -221,7 +221,7 @@ macros:
221221
The macro to support upload of the data to the tests table.
222222
arguments:
223223
- name: tests
224-
type: list
224+
type: list[any]
225225
description: |
226226
A list of test objects extracted from the dbt graph
227227
@@ -254,7 +254,7 @@ macros:
254254
description: |
255255
The name of the dataset to return the column names for e.g. `models`
256256
- name: objects_to_upload
257-
type: list
257+
type: list[any]
258258
description: |
259259
The objects to be used to generate the insert statement values - extracted from `get_dataset_content`
260260
@@ -264,18 +264,10 @@ macros:
264264
`upload_results` macro, alongside the `get_column_lists` macro to generate the column names and the
265265
`upload_dataset` macros to generate the data to be inserted.
266266
arguments:
267-
- name: database_name
268-
type: string
269-
description: |
270-
The database name for the relation that the data is to be inserted into
271-
- name: schema_name
272-
type: string
273-
description: |
274-
The schema name for the relation that the data is to be inserted into
275-
- name: table_name
267+
- name: dataset
276268
type: string
277269
description: |
278-
The table name for the relation that the data is to be inserted into
270+
The name of the dataset to return the data for e.g. `models`
279271
- name: fields
280272
type: string
281273
description: |
@@ -290,6 +282,6 @@ macros:
290282
The main macro called to upload the metadata into each of the source tables.
291283
arguments:
292284
- name: results
293-
type: list
285+
type: list[any]
294286
description: |
295287
The results object from dbt.

0 commit comments

Comments
 (0)