merge conflict fixes

graze · Jun 27, 2023 · 2c080e2 · 2c080e2
2 parents 0458509 + 503893f
commit 2c080e2
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,8 +17,20 @@
 - Updated the pull request templates. ([PR #65](https://github.com/fivetran/dbt_shopify_source/pull/65))
 
 ## Documentation Updates
-- The `shopify_using_shop_metafields` variable was added to the Adding Metafields of the README. It was erroneously omitted in a previous release. ([PR #70](https://github.com/fivetran/dbt_shopify_source/pull/70))
 - Documentation provided in the README for how to connect sources when leveraging the union schema/database feature. ([PR #70](https://github.com/fivetran/dbt_shopify_source/pull/70))
+# dbt_shopify_source v0.8.3
+
+## Bug Fixes 🐛 🪛 
+[PR #69](https://github.com/fivetran/dbt_shopify_source/pull/69) includes the following fixes:
+- Lower casing `metafield_reference` field in `stg_shopify__metafield` to fix metafield table breakages upstream when the `key` field has different casing for otherwise identical strings.
+- Lower casing `owner_resource` field in `stg_shopify__metafield` to ensure identical `value` fields with different casing are then correctly pivoted together upstream in the shopify transformation package `get_metafields` macro. 
+
+## Contributors
+- [@ZCrookston](https://github.com/ZCrookston) & [@FridayPush](https://github.com/FridayPush) ([Issue #64](https://github.com/fivetran/dbt_shopify_source/issues/64))
+
+## Under the Hood:
+- Incorporated the new `fivetran_utils.drop_schemas_automation` macro into the end of each Buildkite integration test job. ([PR #65](https://github.com/fivetran/dbt_shopify_source/pull/65/files))
+- Updated the pull request [templates](/.github). ([PR #65](https://github.com/fivetran/dbt_shopify_source/pull/65/files))
 
 # dbt_shopify_source v0.8.2
 

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/.gitignore b/integration_tests/.gitignore
@@ -0,0 +1,4 @@
+target/
+dbt_modules/
+logs/
+env/
diff --git a/models/stg_shopify__metafield.sql b/models/stg_shopify__metafield.sql
@@ -33,11 +33,11 @@ final as (
         value,
         lower(coalesce(type, value_type)) as value_type,
         owner_id as owner_resource_id,
-        owner_resource,
+        lower(owner_resource) as owner_resource,
         {{ dbt_date.convert_timezone(column='cast(created_at as ' ~ dbt.type_timestamp() ~ ')', target_tz=var('shopify_timezone', "UTC"), source_tz="UTC") }} as created_at,
         {{ dbt_date.convert_timezone(column='cast(updated_at as ' ~ dbt.type_timestamp() ~ ')', target_tz=var('shopify_timezone', "UTC"), source_tz="UTC") }} as updated_at,
         {{ dbt_date.convert_timezone(column='cast(_fivetran_synced as ' ~ dbt.type_timestamp() ~ ')', target_tz=var('shopify_timezone', "UTC"), source_tz="UTC") }} as _fivetran_synced,
-        {{ dbt.concat(["namespace","'_'","key"]) }} as metafield_reference,
+        lower({{ dbt.concat(["namespace","'_'","key"]) }}) as metafield_reference,
         row_number() over (partition by id order by updated_at desc) = 1 as is_most_recent_record,
         source_relation