Merge pull request #141 from rudderlabs/fix-eventFieldCollision(ETL-72)

fix: fixes issue blocking source creation
rudderlabs · Aug 18, 2023 · a342c6c · a342c6c
2 parents 879d941 + 3ac2041
commit a342c6c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/airbyte-integrations/connectors/source-mixpanel/source_mixpanel/spec.json b/airbyte-integrations/connectors/source-mixpanel/source_mixpanel/spec.json
@@ -85,15 +85,15 @@
         "description": "If not set, data from up to one year ago will replicated by default.",
         "examples": ["2021-11-16"],
         "pattern": "^$|^[0-9]{4}-[0-9]{2}-[0-9]{2}(T[0-9]{2}:[0-9]{2}:[0-9]{2}Z)?$",
-        "format": "date-time"
+        "format": "date"
       },
       "end_date": {
         "order": 6,
         "title": "End Date",
         "type": "string",
         "examples": ["2021-11-16"],
         "pattern": "^$|^[0-9]{4}-[0-9]{2}-[0-9]{2}(T[0-9]{2}:[0-9]{2}:[0-9]{2}Z)?$",
-        "format": "date-time"
+        "format": "date"
       },
       "region": {
         "order": 7,

diff --git a/airbyte-integrations/connectors/source-mixpanel/source_mixpanel/streams/export.py b/airbyte-integrations/connectors/source-mixpanel/source_mixpanel/streams/export.py
@@ -145,7 +145,8 @@ def process_response(self, response: requests.Response, **kwargs) -> Iterable[Ma
         # We prefer response.iter_lines() to response.text.split_lines() as the later can missparse text properties embeding linebreaks
         for record in self.iter_dicts(response.iter_lines(decode_unicode=True)):
             # transform record into flat dict structure
-            item = {"mixpanel_event": record["event"]}
+            # Changed event property name to "mp_event" to avoid conflict with "event" reserved property
+            item = {"mp_event": record["event"]}
             properties = record["properties"]
             for result in transform_property_names(properties.keys()):
                 # Convert all values to string (this is default property type)