Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfix/created-at-update #122

Merged
merged 4 commits into from
Oct 30, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# dbt_hubspot v0.14.0

## 🚨 Breaking Changes 🚨
- The `created_at` field in the `hubspot__contacts` model has been renamed to `created_date` to be consistent with the source data and avoid duplicate columns when persisting all `property_*` fields at the source package.
fivetran-joemarkiewicz marked this conversation as resolved.
Show resolved Hide resolved

## Under the Hood
- Updates to the seed files and seed file configurations for the package integration tests to ensure updates are properly tested.

# dbt_hubspot v0.13.0
## 🚨 Breaking Changes 🚨
- This release will be a breaking change due to the removal of below dependencies.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Include the following hubspot package version in your `packages.yml` file:
```yaml
packages:
- package: fivetran/hubspot
version: [">=0.13.0", "<0.14.0"] # we recommend using ranges to capture non-breaking changes automatically
version: [">=0.14.0", "<0.15.0"] # we recommend using ranges to capture non-breaking changes automatically
fivetran-jamie marked this conversation as resolved.
Show resolved Hide resolved

```
Do **NOT** include the `hubspot_source` package in this file. The transformation package itself has a dependency on it and will install the source package as well.
Expand Down
2 changes: 1 addition & 1 deletion docs/catalog.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/manifest.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/run_results.json

Large diffs are not rendered by default.

12 changes: 9 additions & 3 deletions integration_tests/dbt_project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,10 @@ vars:
hubspot_ticket_pipeline_stage_identifier: "ticket_pipeline_stage_data"
hubspot_ticket_property_history_identifier: "ticket_property_history_data"
hubspot_ticket_identifier: "ticket_data"
contact_list: "{{ fivetran_utils.seed_data_helper('contact_list_data', ['postgres']) }}"
email_event_sent: "{{ fivetran_utils.seed_data_helper('email_event_sent_data', ['snowflake','postgres']) }}"
email_event_dropped: "{{ fivetran_utils.seed_data_helper('email_event_dropped_data', ['snowflake','postgres']) }}"
hubspot_contact_list_identifier: "contact_list_data"
hubspot_email_event_sent_identifier: "email_event_sent_data"
hubspot_email_event_dropped_identifier: "email_event_dropped_data"

seeds:
hubspot_integration_tests:
+quote_columns: "{{ true if target.type == 'redshift' else false }}"
Expand Down Expand Up @@ -136,20 +137,25 @@ seeds:
+column_types:
stage_id: "{{ 'varchar(100)' if target.type in ('redshift','postgres') else 'string'}}"
email_event_sent_data_snowflake:
+alias: email_event_sent_data
+enabled: "{{ true if target.type == 'snowflake' else false }}"
email_event_sent_data_postgres:
+alias: email_event_sent_data
+enabled: "{{ true if target.type == 'postgres' else false }}"
email_event_sent_data:
+enabled: "{{ true if target.type not in ('snowflake', 'postgres') else false }}"
email_event_dropped_data_snowflake:
+alias: email_event_dropped_data
+enabled: "{{ true if target.type == 'snowflake' else false }}"
email_event_dropped_data_postgres:
+alias: email_event_dropped_data
+enabled: "{{ true if target.type == 'postgres' else false }}"
email_event_dropped_data:
+enabled: "{{ true if target.type not in ('snowflake', 'postgres') else false }}"
contact_list_data:
+enabled: "{{ true if target.type != 'postgres' else false }}"
contact_list_data_postgres:
+alias: contact_list_data
+enabled: "{{ true if target.type == 'postgres' else false }}"
email_event_data:
+column_types:
Expand Down
4 changes: 3 additions & 1 deletion integration_tests/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@ dbt-redshift>=1.3.0,<2.0.0
dbt-postgres>=1.3.0,<2.0.0
dbt-spark>=1.3.0,<2.0.0
dbt-spark[PyHive]>=1.3.0,<2.0.0
dbt-databricks>=1.3.0,<2.0.0
dbt-databricks>=1.3.0,<2.0.0

oscrypto @ git+https://github.com/wbond/oscrypto.git@d5f3437
124 changes: 23 additions & 101 deletions integration_tests/seeds/contact_data.csv
Original file line number Diff line number Diff line change
@@ -1,101 +1,23 @@
id,property_email,_fivetran_deleted,property_hs_calculated_merged_vids
34391651,w64Fg0wpGtgNnyFSCaxc1g==,False,32881601:1661707291575;34298801:1661707291579;31400151:1661707291179
32881601,vRsmCw58xQQenH6aM9zPoQ==,False,
34298801,XTM9OgDeoOIpN4Q/dhbXVg==,False,
31400151,aLvlJoM+cjeUq2BmaGKRNQ==,False,
32149701,kIywMt8bE5i8Dkk7l1EI5A==,False,
29408851,5MyJvl5wn/qZAoTxIHe+Hg==,False,
27120001,2jZVc9tOvBqhZmKy6uIwZQ==,False,
36306851,P+MQYTZ3ViqUypmWq7LxsA==,False,
35475951,E+nric7mkG3mBBEwGF+0KA==,False,
33311901,9fXLGhp7Dpjdnnr9GlhH7w==,False,
26151351,VyieWA51zLi7DpfhR5LwLg==,False,
33159551,nPSTdQ1XX36NlTPdQ2icCg==,False,
35372551,qk3f1w7rD8E40zhLuhPKwA==,False,
35123051,sU0JFmxn9VKgIWOU4+3CVw==,False,
31050001,w6Cpa9P5K3dQMlG0b1WuEA==,False,
34291851,qqSa7z8R5iY3pvLB45nLcA==,False,
26954951,x8gDW52C7tVb55di/5WY5Q==,False,
36352701,xHQOgUQ1iwd3jlkXBvU8dA==,False,
30496501,jPOmeFoNgruq3Vnwj6erxg==,False,
28224501,tDbKhqo9VGwUD4K53cIXkQ==,False,
33553701,seya+WTJtulTCYoWjjNk0A==,False,
32476851,BCy3kMsCNAKkDogPTvb6Dw==,False,
26901201,oD3uOvhEfItRe2IR/IJ+GQ==,False,
30491151,CHQ5pV4vk3/UF/UxjFul2Q==,False,
36344151,Lqmsnip+HQpmOUQrc74l9A==,False,
32699251,fUuzm48csLj0yEvbujp8LA==,False,
32375451,Kgp1w2QEWIHJz8AXrTh2iw==,False,
31554351,zbCG88OH0XtwstIIBJB+VA==,False,
34602301,3/hmGAIEhkLpmmdUUFIddw==,False,
30173851,J8L+aGjDHA1LNL2C+Q94sw==,False,
30610901,9nXCd6K985aQ77EZejAztA==,False,
29559851,b/348X13PW5mOUJ0w01pmA==,False,
29796251,pXocy1lUtKeh0p011CKA5A==,False,
26260401,TcP7+Vzd5qGkDFOZURj8/w==,False,
26313501,XZKoLYyn3ZLblGY7qSKbAw==,False,
30012951,E0bkRPWdjc5ssYRi4AOH8g==,False,
31002951,w0VPgZzPQqkHyxJ/iAIfFA==,False,
35203951,AEbiEaXCRdVpKKftrIceoA==,False,
29069051,7AY1/r1BaRnpIaR29tGdfQ==,False,
29991551,AqgNIkTzkEXIca08f9AoPw==,False,
29107101,6MULMiBsQY20mlvNXUTvlw==,False,
35956601,nfGXoS+tzaNP7vl/0Zea7w==,False,
33998301,RMi4An0qRlLtUUKUHaOxXg==,False,
35416401,8a5J5UOsFbcCTj0RhD5zEg==,False,
36011001,KsFFW561PQ0Xei/CAmvQqg==,False,
34388201,nr35Zdjzq3FALiEKEnBGHw==,False,
30477551,QQaxDIbay0EmK2tfIQPrCw==,False,
28250101,jD8Sf+43DCb0xPo9IJsn8g==,False,
31800101,qSlcw3ETLZ5aStITO1Ia8w==,False,
35799501,6hHY8x0EKQ8zOOTIY0y0wA==,False,
31765451,jISsDT6Lvtut2hkfe2zusQ==,False,
33772451,RLnh8YzTAub7rXcdzspUnQ==,False,
32288301,Js1e756ID1Ab/cwbWprEAQ==,False,
35872351,AuG5WV/EcyjhXL+4PxXgkQ==,False,
34234451,ucvHk8TfnPZV88/18+Mqhg==,False,
34125301,Gtz77UTpAExCHHcY0dmpSw==,False,
33649501,5PyAMrR9/Q+8dbDs1gU8Ew==,False,
34540401,8Rc5YSFSeb8IMW2caYaGiQ==,False,
33811001,+gj/o+lVcsotNEduiBZxhg==,False,
33839151,UPFmVrQMESPzUbY/G9VBZQ==,False,
35985751,yQ6LTHBrB3bJezUZ8chjAg==,False,
33779801,6hQJDB3/V2SdaCD9wkSmFg==,False,
36199901,5Cv+oA7YNFbXjQ1YdisYyQ==,False,
35966151,O1DMPwsLkRaXB17Gae8tMw==,False,
33908551,DXJIU+3OuIWoUBXbbGbEMA==,False,
30240801,+7GP6HMvZ9jHDGVojhj6uQ==,False,
35739701,T4uVuKQJy9q1UXurh2MyRg==,False,
28853953,fnBj8bn7UZU6PELM3lOlFQ==,False,
35747101,eSCTqZwKpn24UuvpRHTYHg==,False,
36256751,P4TLkgSG4U3lScLbLEy0cg==,False,
36159251,JeVw/gmUUIihkblI6Qon7A==,False,
35308101,ezVjmptBJPI/Pboiw/JxMw==,False,
36249301,pCbboNBbdmx/XYkyGzqY/A==,False,
26632701,/zhdg2ao0TCiRqQPMmLKdg==,False,
26853101,y+p+rLwLMI/aly7+KVy/Pg==,False,
26854051,vf1f01I5oz7K+EnokRWbdw==,False,
26657001,ZAs1I6UBQB3bKnQuoIYH1w==,False,
28048951,l3C6i5mlnOmWLx+LXEBCTA==,False,
26261301,RgAHIHjrpSlHbswRhSOEMQ==,False,
28063401,ZqAUXjyJvZ/SwDd1oYw6Og==,False,
26728651,kXIiYYHCCl5xVQaeSu+V3w==,False,
33489101,4/bBqMDTUtFMD5R4T3gohg==,False,
28462401,XoUaV1HdMyV7qdKnoYJomw==,False,
35637351,lGgclhMSR0sZvKwaMGzlAQ==,False,
28290551,tkUng76J+AXCr5v5iv4ivQ==,False,
32473101,shTtF7Y1kpD+djJWpvRufw==,False,
30063451,+bdBC8uZN7vhaPvD8m8iQQ==,False,
33730751,JBv5BOLhR7/Gl8Wk/fAWpg==,False,
30148951,02k/MZcBX5iv7wJulC1Ggg==,False,
35958701,baDzffdqSbHneE8X+Eauag==,False,
35917151,WmT/Re/rg/pG6PwbNVelMg==,False,
29588651,JdJuRVlJcjRFtzDD4vv08g==,False,
33340301,o2MVyi1srHxuvMUWjT2lWQ==,False,
34140601,0bdBH0D+AEYGsoc/s6u7+Q==,False,
31722401,V4Av0OBkB6Dck5W5TfN9Jg==,False,
32779401,+MjigFCxbix2u2w88/kATA==,False,
32518101,OxmlrqG8gGU2YUOiuoigHQ==,False,
32236551,u/XuEADERvHhsYCva+lVsg==,False,
29937951,AOD2fREt3cEryQqEyff33A==,False,
28402551,EGrXge9rCk35wP0IFqMy+Q==,False,
_fivetran_deleted,_fivetran_synced,property_email,id,property_company,property_firstname,property_lastname,property_email_1,property_createdate,property_jobtitle,property_annualrevenue,property_hs_calculated_merged_vids,property_created_at
FALSE,2021-04-02 11:16:05,fcb67ef339b691956cc85fa12be6490c,78971951,SampleCompany,db320f93ead463e1a2faee198cd9a122,22370ea245fce0b355938327d41bd1e4,261d3936e165a33b3f31e5fdd0e3121d,2021-04-01 17:32:47,,111111,76340251:1661707291575;46897301:1661707931852;76226001:1661696530403,2021-04-01 17:32:47
FALSE,2021-03-22 11:16:06,6528bb7211b1dc066fc5c292561150c2,76340251,,b70e7b267b0652ee4030c4043cba7cf7,a0a1e71392fc13041b04f743c6727ca2,629f41f1733632c69114a624bca1e1d5,2021-03-21 14:33:30,,111111,,2021-03-21 14:33:30
FALSE,2021-04-02 11:20:23,3abfda161ad50142007f6107db915761,46897301,,c13e13da2073260c2194c15d782e86a9,26c4e5c8064dc58f08b4ef2ebf463beb,4e52945af09feaa93bcfbf710fb23570,2020-10-08 21:13:55,,111111,,2020-10-08 21:13:55
FALSE,2021-03-22 11:16:08,d8215e6e62b9398166ad67ca484fc58d,76226001,,48bc893fcbc0a33ed3ad2cf2d5d57cfe,7a03155bc7e8c00f13d70edae7974096,0474ac00326d6e93558e7727da5e3bdc,2021-03-20 21:42:56,,111111,,2021-03-20 21:42:56
FALSE,2021-04-02 11:19:58,d63232cbab97fc1bb5808e4cba500347,36842001,,a703d6d14769d658f85a3b4c2c1ef9c7,5f55afd748fc4ad2580b768611325148,af58c55d6520c2470fd58e6893c06816,2020-07-15 04:46:01,,111111,,2020-07-15 04:46:01
FALSE,2021-04-02 11:17:59,67717a9896fdbf93e2fa6655e75eb70f,55703851,,bf7c755353603f0bfca9f2070dbaa923,526664ec12dc5105f2c3171ca0909570,8370f130e1bb6435da412b168e29a0ab,2020-12-03 14:43:55,,111111,,2020-12-03 14:43:55
FALSE,2021-04-02 11:17:15,90d65041363376d2abd1f0916df8fa42,74075201,,464e07afc9e46359fb480839150595c5,9c6e765da2eebc87f290f43f74d57c8d,24e5c02e37b9441c33978a53038200d4,2021-03-11 13:08:45,,111111,,2021-03-11 13:08:45
FALSE,2021-04-02 11:21:27,226045995fbc87c01b2eb3847bc4ea8f,48722101,,464e07afc9e46359fb480839150595c5,7fe70fef470fcc46826966e201147015,5cf8d1f804144c2ef34dc98db0fd0105,2020-10-24 13:28:24,,111111,,2020-10-24 13:28:24
FALSE,2021-04-02 11:22:22,b26ae870d0b4763efe3f4bbc53aab1d6,48067201,,8295bd3d7037a0e0c2ee11c99050a9c1,59830e37ce261d31ad0da0d5d270d0e1,abd71c63abd25c0f8286e76f319b9939,2020-10-19 02:34:46,,111111,,2020-10-19 02:34:46
FALSE,2021-04-02 11:20:39,52a2d91b793f582dbe837ea464505732,69869451,,81b8a1b77068d06e1c8190825253066f,20c0c9b9bd7addf3a005da2e3ff184f4,674c0664494482302ec62fa4f11947bc,2021-02-19 13:23:50,,111111,,2021-02-19 13:23:50
FALSE,2021-04-02 11:20:49,cba06e5c14a5aecfbb42d2e813ceb18e,32820151,,399423ff652ebb6a6701be7ec3202fc6,c22e1816539af64a7eadc2b81c3a1905,a37a075d75315d60478339a67c39340f,2020-05-22 16:46:41,,111111,,2020-05-22 16:46:41
FALSE,2021-04-02 11:21:02,045ddfbc7f5c8b229872583f77677b88,70526501,,399423ff652ebb6a6701be7ec3202fc6,c1861b5a8a30be3af3f7fd5e1592296a,4dd5fdb40b67ee13fc486d0073df7bcb,2021-02-22 12:18:44,,111111,,2021-02-22 12:18:44
FALSE,2021-04-02 11:16:53,033e21ce25808e0cda0d02b859ee0690,69487901,,7802feb8467a9bc4dba34269b099230f,36bc4059766459cd3364e405157aa855,263a8a2a4bf46bd88b3fb46072b56982,2021-02-18 15:40:04,,111111,,2021-02-18 15:40:04
FALSE,2021-04-02 11:16:28,693f827dd3adc99c5eb1403f5758dc69,41932551,,4d236810821e8e83a025f2a83ea31820,b18e66b41efd9a3df1a7bc8758da1883,a1ea6eae3d51c7c339478f8ddc3190cf,2020-08-31 04:44:28,,111111,,2020-08-31 04:44:28
FALSE,2021-04-02 11:22:04,0de6489271133caa4da8e73898a66616,75141301,,7c1f90bd9bdc70cc059640a7a6209389,e1229bab1c271d1f1796cb0c52ab9933,c6bf5326b632c7411bd68500eb283e0c,2021-03-16 01:44:16,,111111,,2021-03-16 01:44:16
FALSE,2021-04-02 11:16:59,8c1596c5770ae37d6db57236eabf2883,42820351,,e1229bab1c271d1f1796cb0c52ab9933,b7a71d8799cf6dd75b711a7f52de6675,3d5c92d654be9b684cc91ec6143323d5,2020-09-07 16:19:50,,111111,,2020-09-07 16:19:50
FALSE,2021-04-02 11:15:59,458e4126009a63e8f549af197a6b72f7,79092001,,4ffe35db90d94c6041fb8ddf7b44df29,da4660701a8f38bf4956342c95d87d21,991c1b99ab97f625eb1ead100949bfc9,2021-04-02 01:12:17,,111111,,2021-04-02 01:12:17
FALSE,2021-04-02 11:22:07,3f9e56a211a07baa5836171617f978a8,56072901,,c477d14fc1b786cb85f4b23a0b00fe1c,d8a1d6833510c7544156f41c55aec258,8c9975dd59d43d516775fde0eb57c03f,2020-12-05 17:49:01,,111111,,2020-12-05 17:49:01
FALSE,2021-04-02 11:17:41,6f1eb8fdc225b3b026898b68df5d5be2,39543551,,7f15f1ad99c489dc0314952535e424d5,6252d6e4aef4917a48e2660a821732e3,74be16979710d4c4e7c6647856088456,2020-08-13 15:34:30,,111111,,2020-08-13 15:34:30
FALSE,2021-04-02 11:16:22,0a28bb660df1a8d53b40999f1b1fe2b5,33419651,,d52e32f3a96a64786814ae9b5279fbe5,630a16c4dbe8f48822a279b4a554916f,a71704548944161196a1841e61a3cb4c,2020-06-01 21:13:09,,111111,,2020-06-01 21:13:09
FALSE,2021-04-02 11:21:02,1bd784044acca0b18e917d0255cc619d,69477701,,61409aa1fd47d4a5332de23cbf59a36f,10af01955bb93519c3c287d7e60c670b,e70d013e17f9dd4a17bc37c0a5c0f203,2021-02-18 15:21:47,,111111,,2021-02-18 15:21:47
FALSE,2021-04-02 11:22:27,d547e990ecd4e5e327b41f98cb8f3f4d,39893151,,6fa95b1427af77b3d769ae9cb853382f,f55fbaaca148300ac11f7752528cae3d,bc16a8351419c08a72f2169f4d2ade21,2020-08-17 02:50:12,,111111,,2020-08-17 02:50:12
2 changes: 1 addition & 1 deletion models/marketing/marketing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ models:
description: The contact's last name.
- name: email
description: The email address of the contact.
- name: created_at
- name: created_date
description: The date that the contact was created in your HubSpot account.
- name: job_title
description: The contact's job title.
Expand Down
7 changes: 5 additions & 2 deletions packages.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
packages:
- package: fivetran/hubspot_source
version: [">=0.12.0", "<0.13.0"]
# - package: fivetran/hubspot_source
# version: [">=0.12.0", "<0.13.0"]
- git: https://github.com/fivetran/dbt_hubspot_source.git
revision: feature-bug/created-date-and-utils-star
warn-unpinned: false
Loading