@@ -266,12 +266,12 @@ For example, the following `<task>` element copies product information from Devi
266266 <api >
267267 <target asset-type = " Hardware" />
268268 <resource
269- doql = "
270- select distinct
271- view_vendor_v1.name as manufacturer,
272- <!-- ... -->
273- "
274- />
269+ doql = "
270+ select distinct
271+ view_vendor_v1.name as manufacturer,
272+ <!-- ... -->
273+ "
274+ />
275275 </api >
276276 <mapping key = " name" doql-suffix = " where GREATEST(view_hardware_v2.last_changed, view_vendor_v1.last_changed, view_device_v2.last_changed) >'%s'" >
277277 <field resource = " name" source-type = " string" target = " name" target-type = " string" max-length = " 255" escape = " true" />
@@ -665,24 +665,24 @@ You need to modify two `<task>` elements within the `mapping.xml` file.
665665 <target
666666 delete = " true" />
667667 <resource
668- doql = "
669- <!-- ... other queries -->
670-
671- <!-- remove or comment out this cluster and device relationship query -->
672-
673- select
674- dc.name as dependent_device_name,
675- format('Device-%s', dc.device_pk) as dependent_device_device42_id,
676- 'Member of' as downstream_relationship,
677- dp.name as dependency_device_name,
678- format('Device-%s', dp.device_pk) as dependency_device_device42_id,
679- 'Includes' as upstream_relationship
680- from view_devices_in_cluster_v1 dic
681- inner join view_device_v2 dp on dic.parent_device_fk = dp.device_pk
682- inner join view_device_v2 dc on dic.child_device_fk = dc.device_pk
683- where lower(dp.type) = 'cluster'
684- "
685- />
668+ doql = "
669+ <!-- ... other queries -->
670+
671+ <!-- remove or comment out this cluster and device relationship query -->
672+
673+ select
674+ dc.name as dependent_device_name,
675+ format('Device-%s', dc.device_pk) as dependent_device_device42_id,
676+ 'Member of' as downstream_relationship,
677+ dp.name as dependency_device_name,
678+ format('Device-%s', dp.device_pk) as dependency_device_device42_id,
679+ 'Includes' as upstream_relationship
680+ from view_devices_in_cluster_v1 dic
681+ inner join view_device_v2 dp on dic.parent_device_fk = dp.device_pk
682+ inner join view_device_v2 dc on dic.child_device_fk = dc.device_pk
683+ where lower(dp.type) = 'cluster'
684+ "
685+ />
686686 </api >
687687 ```
688688</details >
@@ -1009,32 +1009,32 @@ For reference, the DOQL query in the `mapping.xml` file for Software Licensing i
10091009 <api >
10101010 <target />
10111011 <resource
1012- doql ="
1013- select case when p.order_no is null then s.name else s.name || '-' || p.order_no || '-' || pli.line_no end as name,
1014- 'Software License' as contract_type_name,
1015- case when v.name is not null then v.name else sv.name end vendor_name,
1016- pli.cost unit_cost, pli.start_date, pli.end_date,
1017- s.name software_name,
1018- case when pli.quantity is not null then pli.quantity else s.licensed_count end licensed_count,
1019- case when pli.quantity is not null then pli.quantity else s.licensed_count end * pli.cost as cost,
1020- pli.contract_id,
1021- case when slm.is_free = true then 'Free' else 'Volume' end license_type,
1022- pli.frequency,
1023- 'per_unit' as pricing_model,
1024- case when pli.notes is not null and pli.notes <> '' then pli.notes else s.notes end as notes
1025- from view_software_v1 s
1026- left outer join view_softwarelicensemodel_v1 slm on s.softwarelicensemodel_fk = slm.softwarelicensemodel_pk
1027- left outer join view_purchaselineitems_to_softwares_v1 plis on s.software_pk = plis.software_fk
1028- left outer join view_purchaselineitem_v1 pli on plis.purchaselineitem_fk = pli.purchaselineitem_pk
1029- left outer join view_purchase_v1 p on pli.purchase_fk = p.purchase_pk
1030- left outer join view_vendor_v1 v on p.vendor_fk = v.vendor_pk
1031- left outer join view_vendor_v1 sv on s.vendor_fk = sv.vendor_pk
1032- WHERE
1033- lower(s.software_type) = 'managed' and
1034- (pli.purchaselineitem_pk is not null or s.licensed_count is not null) and
1035- (v.name is not null or sv.name is not null)
1036- "
1037- />
1012+ doql ="
1013+ select case when p.order_no is null then s.name else s.name || '-' || p.order_no || '-' || pli.line_no end as name,
1014+ 'Software License' as contract_type_name,
1015+ case when v.name is not null then v.name else sv.name end vendor_name,
1016+ pli.cost unit_cost, pli.start_date, pli.end_date,
1017+ s.name software_name,
1018+ case when pli.quantity is not null then pli.quantity else s.licensed_count end licensed_count,
1019+ case when pli.quantity is not null then pli.quantity else s.licensed_count end * pli.cost as cost,
1020+ pli.contract_id,
1021+ case when slm.is_free = true then 'Free' else 'Volume' end license_type,
1022+ pli.frequency,
1023+ 'per_unit' as pricing_model,
1024+ case when pli.notes is not null and pli.notes <> '' then pli.notes else s.notes end as notes
1025+ from view_software_v1 s
1026+ left outer join view_softwarelicensemodel_v1 slm on s.softwarelicensemodel_fk = slm.softwarelicensemodel_pk
1027+ left outer join view_purchaselineitems_to_softwares_v1 plis on s.software_pk = plis.software_fk
1028+ left outer join view_purchaselineitem_v1 pli on plis.purchaselineitem_fk = pli.purchaselineitem_pk
1029+ left outer join view_purchase_v1 p on pli.purchase_fk = p.purchase_pk
1030+ left outer join view_vendor_v1 v on p.vendor_fk = v.vendor_pk
1031+ left outer join view_vendor_v1 sv on s.vendor_fk = sv.vendor_pk
1032+ WHERE
1033+ lower(s.software_type) = 'managed' and
1034+ (pli.purchaselineitem_pk is not null or s.licensed_count is not null) and
1035+ (v.name is not null or sv.name is not null)
1036+ "
1037+ />
10381038 </api >
10391039```
10401040</details >
0 commit comments