Fix issue 5411: Connector skipping dates (#5422)

Author: MaxKrog

airbyte-integrations/connectors/source-google-ads/source_google_ads/google_ads.py

@@ -76,7 +76,8 @@ def convert_schema_into_query(
  query_template = f"SELECT {fields} FROM {from_category} "
 
  if cursor_field:
- query_template += f"WHERE {cursor_field} > '{from_date}' AND {cursor_field} < '{to_date}' ORDER BY {cursor_field} ASC"
+ # Fix issue 5411: Make date_start and date_end inclusive.
+ query_template += f"WHERE {cursor_field} >= '{from_date}' AND {cursor_field} <= '{to_date}' ORDER BY {cursor_field} ASC"
 
  return query_template
 

airbyte-integrations/connectors/source-google-ads/unit_tests/test_google_ads.py

@@ -23,9 +23,13 @@
 #
 
 from datetime import date
+import pendulum
 
 from source_google_ads.google_ads import GoogleAds
 
+from source_google_ads.streams import chunk_date_range
+from source_google_ads.streams import IncrementalGoogleAdsStream
+
 SAMPLE_SCHEMA = {
  "properties": {
  "segment.date": {
@@ -115,10 +119,22 @@ def test_get_fields_from_schema():
  response = GoogleAds.get_fields_from_schema(SAMPLE_SCHEMA)
  assert response == ["segment.date"]
 
+def test_interval_chunking():
+ mock_intervals = [{'segments.date': '2021-05-18'}, {'segments.date': '2021-06-18'}, {'segments.date': '2021-07-18'}]
+ intervals = chunk_date_range('2021-06-01', 14, 'segments.date', '2021-08-15')
+
+ assert mock_intervals == intervals
+
+def test_get_date_params():
+ mock_start_date = '2021-05-19' # Please note that this is equal to inputted stream_slice start date + 1 day
+ mock_end_date = '2021-06-18'
+ start_date, end_date = IncrementalGoogleAdsStream.get_date_params(stream_slice={'segments.date': '2021-05-18'}, cursor_field='segments.date', end_date=pendulum.parse('2021-08-15'))
+
+ assert mock_start_date == start_date and mock_end_date == end_date
 
 def test_convert_schema_into_query():
  report_name = "ad_group_ad_report"
- query = "SELECT segment.date FROM ad_group_ad WHERE segments.date > '2020-01-01' AND segments.date < '2020-03-01' ORDER BY segments.date ASC"
+ query = "SELECT segment.date FROM ad_group_ad WHERE segments.date >= '2020-01-01' AND segments.date <= '2020-03-01' ORDER BY segments.date ASC"
  response = GoogleAds.convert_schema_into_query(SAMPLE_SCHEMA, report_name, "2020-01-01", "2020-03-01", "segments.date")
  assert response == query