From 7bba9bf8bdcd0b2b7b952ce370508b962e71e12f Mon Sep 17 00:00:00 2001 From: Marcelo Pio de Castro Date: Fri, 10 Feb 2023 09:42:48 -0300 Subject: [PATCH 1/3] Fixed dedupeot working correctly Due to delete only containing id, the deduped dbt could not work properly, so we also fill the cursor field with the current date so it does have a properly end --- .../source_microsoft_dataverse/streams.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/airbyte-integrations/connectors/source-microsoft-dataverse/source_microsoft_dataverse/streams.py b/airbyte-integrations/connectors/source-microsoft-dataverse/source_microsoft_dataverse/streams.py index 063a100fdf83a..a85426a7c098f 100644 --- a/airbyte-integrations/connectors/source-microsoft-dataverse/source_microsoft_dataverse/streams.py +++ b/airbyte-integrations/connectors/source-microsoft-dataverse/source_microsoft_dataverse/streams.py @@ -143,7 +143,9 @@ def parse_response(self, response: requests.Response, **kwargs) -> Iterable[Mapp result.pop("@odata.context", None) result.pop("id", None) result.pop("reason", None) - result.update({"_ab_cdc_deleted_at": datetime.now().isoformat()}) + now = datetime.now().isoformat() + result.update({self.cursor_field[0]: now}) + result.update({"_ab_cdc_deleted_at": now}) else: result.update({"_ab_cdc_updated_at": result[self.cursor_field[0]]}) From ae377cfc0004cf58b9d3c75d0d76654f2e54e785 Mon Sep 17 00:00:00 2001 From: marcosmarxm Date: Thu, 16 Mar 2023 10:30:45 -0300 Subject: [PATCH 2/3] bump connector version --- .../connectors/source-microsoft-dataverse/Dockerfile | 2 +- docs/integrations/sources/microsoft-dataverse.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/airbyte-integrations/connectors/source-microsoft-dataverse/Dockerfile b/airbyte-integrations/connectors/source-microsoft-dataverse/Dockerfile index 52c806d763a38..bab4b96ea1f3d 100644 --- a/airbyte-integrations/connectors/source-microsoft-dataverse/Dockerfile +++ b/airbyte-integrations/connectors/source-microsoft-dataverse/Dockerfile @@ -34,5 +34,5 @@ COPY source_microsoft_dataverse ./source_microsoft_dataverse ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py" ENTRYPOINT ["python", "/airbyte/integration_code/main.py"] -LABEL io.airbyte.version=0.1.0 +LABEL io.airbyte.version=0.1.1 LABEL io.airbyte.name=airbyte/source-microsoft-dataverse diff --git a/docs/integrations/sources/microsoft-dataverse.md b/docs/integrations/sources/microsoft-dataverse.md index 3a17d967e7cf7..a64a55e1c0861 100644 --- a/docs/integrations/sources/microsoft-dataverse.md +++ b/docs/integrations/sources/microsoft-dataverse.md @@ -61,4 +61,5 @@ https://blog.magnetismsolutions.com/blog/paulnieuwelaar/2021/9/21/setting-up-an- | Version | Date | Pull Request | Subject | | :------ | :--------- | :------------------------------------------------------- | :---------------------------------------------- | +| 0.1.1 | 2023-03-16 | [22805](https://github.com/airbytehq/airbyte/pull/22805) | Fixed deduped cursor field value update | | 0.1.0 | 2022-11-14 | [18646](https://github.com/airbytehq/airbyte/pull/18646) | 🎉 New Source: Microsoft Dataverse [python cdk] | From f8212aecfe209d4a4f58f86326e8d36e0622f0b0 Mon Sep 17 00:00:00 2001 From: Octavia Squidington III Date: Thu, 16 Mar 2023 13:43:42 +0000 Subject: [PATCH 3/3] auto-bump connector version --- .../init/src/main/resources/seed/source_definitions.yaml | 2 +- airbyte-config/init/src/main/resources/seed/source_specs.yaml | 2 +- connectors.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml index 4a48d886f67ae..f8d6045232a93 100644 --- a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml @@ -1094,7 +1094,7 @@ - name: Microsoft Dataverse sourceDefinitionId: 9220e3de-3b60-4bb2-a46f-046d59ea235a dockerRepository: airbyte/source-microsoft-dataverse - dockerImageTag: 0.1.0 + dockerImageTag: 0.1.1 documentationUrl: https://docs.airbyte.com/integrations/sources/microsoft-dataverse icon: microsoftdataverse.svg sourceType: api diff --git a/airbyte-config/init/src/main/resources/seed/source_specs.yaml b/airbyte-config/init/src/main/resources/seed/source_specs.yaml index cbd8e1d0260f2..306f1c38e683b 100644 --- a/airbyte-config/init/src/main/resources/seed/source_specs.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_specs.yaml @@ -8650,7 +8650,7 @@ path_in_connector_config: - "credentials" - "client_secret" -- dockerImage: "airbyte/source-microsoft-dataverse:0.1.0" +- dockerImage: "airbyte/source-microsoft-dataverse:0.1.1" spec: documentationUrl: "https://docs.airbyte.io/integrations/sources/microsoft-dataverse" connectionSpecification: diff --git a/connectors.md b/connectors.md index 4649d08f64659..f74f05c544f07 100644 --- a/connectors.md +++ b/connectors.md @@ -135,7 +135,7 @@ | **Mailjet SMS** | Mailjet SMS icon | Source | airbyte/source-mailjet-sms:0.1.0 | alpha | [link](https://docs.airbyte.com/integrations/sources/mailjet-sms) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-mailjet-sms) | `6ec2acea-7fd1-4378-b403-41a666e0c028` | | **Marketo** | Marketo icon | Source | airbyte/source-marketo:1.0.2 | generally_available | [link](https://docs.airbyte.com/integrations/sources/marketo) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-marketo) | `9e0556f4-69df-4522-a3fb-03264d36b348` | | **Metabase** | Metabase icon | Source | airbyte/source-metabase:0.3.1 | beta | [link](https://docs.airbyte.com/integrations/sources/metabase) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-metabase) | `c7cb421b-942e-4468-99ee-e369bcabaec5` | -| **Microsoft Dataverse** | Microsoft Dataverse icon | Source | airbyte/source-microsoft-dataverse:0.1.0 | alpha | [link](https://docs.airbyte.com/integrations/sources/microsoft-dataverse) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-microsoft-dataverse) | `9220e3de-3b60-4bb2-a46f-046d59ea235a` | +| **Microsoft Dataverse** | Microsoft Dataverse icon | Source | airbyte/source-microsoft-dataverse:0.1.1 | alpha | [link](https://docs.airbyte.com/integrations/sources/microsoft-dataverse) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-microsoft-dataverse) | `9220e3de-3b60-4bb2-a46f-046d59ea235a` | | **Microsoft SQL Server (MSSQL)** | Microsoft SQL Server (MSSQL) icon | Source | airbyte/source-mssql:0.4.28 | alpha | [link](https://docs.airbyte.com/integrations/sources/mssql) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-mssql) | `b5ea17b1-f170-46dc-bc31-cc744ca984c1` | | **Microsoft teams** | Microsoft teams icon | Source | airbyte/source-microsoft-teams:0.2.5 | alpha | [link](https://docs.airbyte.com/integrations/sources/microsoft-teams) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-microsoft-teams) | `eaf50f04-21dd-4620-913b-2a83f5635227` | | **Mixpanel** | Mixpanel icon | Source | airbyte/source-mixpanel:0.1.30 | generally_available | [link](https://docs.airbyte.com/integrations/sources/mixpanel) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-mixpanel) | `12928b32-bf0a-4f1e-964f-07e12e37153a` |