fivetran · fivetran-joemarkiewicz · Jun 30, 2022 · Jun 29, 2022 · Jun 30, 2022 · Jun 30, 2022
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,4 +1,3 @@
-Pull Request
 **Are you a current Fivetran customer?** 
 <!--- Please tell us your name, title and company -->
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# dbt_jira_source v0.4.2
+## Features
+- Added the `parent_id` field in the `stg_jira__field_option` model. This field is used when defining custom fields as parent and child custom fields can be created to define a variety of main categories and subcategories. ([#32](https://github.com/fivetran/dbt_jira_source/pull/32))
+
+## Contributors
+- [@sergiisolaa](https://github.com/sergiisolaa) ([#32](https://github.com/fivetran/dbt_jira_source/pull/32))
+
 # dbt_jira_source v0.4.1
 ## Features
 - Makes Priority data optional. If `jira_using_priorities: false` in `dbt_project.yml`, then `stg_jira__priority_tmp` and `stg_jira__priority` won't build. ([#30](https://github.com/fivetran/dbt_jira_source/pull/30))

diff --git a/dbt_project.yml b/dbt_project.yml
@@ -1,5 +1,5 @@
 name: 'jira_source'
-version: '0.4.1'
+version: '0.4.2'
 config-version: 2
 require-dbt-version: [">=1.0.0", "<2.0.0"]
 

diff --git a/docs/catalog.json b/docs/catalog.json
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/manifest.json b/docs/manifest.json
diff --git a/docs/run_results.json b/docs/run_results.json
diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml
@@ -1,5 +1,5 @@
 name: 'jira_source_integration_tests'
-version: '0.4.1'
+version: '0.4.2'
 config-version: 2
 profile: 'integration_tests'
 

diff --git a/integration_tests/seeds/field_option.csv b/integration_tests/seeds/field_option.csv
@@ -1,4 +1,4 @@
-id,_fivetran_synced,name
-10104,2020-11-23 12:21:00.979,opt 2
-10016,2020-11-17 12:20:52.552,To Do
-10106,2020-11-17 12:20:52.227,opt 4
+id,_fivetran_synced,name,parent_id
+10104,2020-11-23 12:21:00.979,opt 2,10005
+10016,2020-11-17 12:20:52.552,To Do,10005
+10106,2020-11-17 12:20:52.227,opt 4,10005
diff --git a/macros/get_field_option_columns.sql b/macros/get_field_option_columns.sql
@@ -2,6 +2,7 @@
 
 {% set columns = [
     {"name": "id", "datatype": dbt_utils.type_int()},
+    {"name": "parent_id", "datatype": dbt_utils.type_int()},
     {"name": "_fivetran_synced", "datatype": dbt_utils.type_timestamp()},
     {"name": "name", "datatype": dbt_utils.type_string()}
 ] %}

diff --git a/models/src_jira.yml b/models/src_jira.yml
@@ -69,6 +69,8 @@ sources:
         columns:
           - name: id
             description: The ID of the custom field.
+          - name: parent_id
+            description: The ID of the parent custom field.
           - name: name
             description: Name of the field option.
 

diff --git a/models/stg_jira.yml b/models/stg_jira.yml
@@ -65,6 +65,8 @@ models:
         description: The ID of the custom field.
         tests:
           - not_null
+      - name: parent_field_id
+        description: The ID of the parent custom field.
       - name: field_option_name
         description: Name of the field option.
 

diff --git a/models/stg_jira__field_option.sql b/models/stg_jira__field_option.sql
@@ -23,6 +23,7 @@ final as (
 
     select 
         id as field_id,
+        parent_id as parent_field_id,
         name as field_option_name
 
     from fields