Skip to content

Fix GoogleDriveHook.get_file_id parent query operand order (#72541) #72543

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.

Sign up for GitHub

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

Merged
potiuk merged 1 commit into from
Sep 7, 2026
+75 −1
Merged

Fix GoogleDriveHook.get_file_id parent query operand order (#72541) #72543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion providers/google/src/airflow/providers/google/suite/hooks/drive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ def get_file_id(
"""
query = f"name = '{file_name}'"
if folder_id:
query += f" and parents in '{folder_id}'"
query += f" and '{folder_id}' in parents"

if not include_trashed:
query += " and trashed=false"
Expand Down
74 changes: 74 additions & 0 deletions providers/google/tests/unit/google/suite/hooks/test_drive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,16 @@ def test_get_file_id_when_one_file_exists(self, mock_get_conn):
]

result_value = self.gdrive_hook.get_file_id(folder_id, file_name, drive_id)
mock_get_conn.return_value.files.return_value.list.assert_called_once_with(
q=f"name = '{file_name}' and '{folder_id}' in parents",
spaces="drive",
fields="files(id, mimeType)",
orderBy="modifiedTime desc",
driveId=drive_id,
includeItemsFromAllDrives=True,
supportsAllDrives=True,
corpora="drive",
)
assert result_value == {"id": "ID_1", "mime_type": "text/plain"}

@mock.patch("airflow.providers.google.suite.hooks.drive.GoogleDriveHook.get_conn")
Expand Down Expand Up @@ -328,6 +338,16 @@ def test_get_file_id_when_multiple_files_exists(self, mock_get_conn):
]

result_value = self.gdrive_hook.get_file_id(folder_id, file_name, drive_id)
mock_get_conn.return_value.files.return_value.list.assert_called_once_with(
q=f"name = '{file_name}' and '{folder_id}' in parents",
spaces="drive",
fields="files(id, mimeType)",
orderBy="modifiedTime desc",
driveId=drive_id,
includeItemsFromAllDrives=True,
supportsAllDrives=True,
corpora="drive",
)
assert result_value == {"id": "ID_1", "mime_type": "text/plain"}

@mock.patch("airflow.providers.google.suite.hooks.drive.GoogleDriveHook.get_conn")
Expand All @@ -339,8 +359,62 @@ def test_get_file_id_when_no_file_exists(self, mock_get_conn):
mock_get_conn.return_value.files.return_value.list.return_value.execute.side_effect = [{"files": []}]

result_value = self.gdrive_hook.get_file_id(folder_id, file_name, drive_id)
mock_get_conn.return_value.files.return_value.list.assert_called_once_with(
q=f"name = '{file_name}' and '{folder_id}' in parents",
spaces="drive",
fields="files(id, mimeType)",
orderBy="modifiedTime desc",
driveId=drive_id,
includeItemsFromAllDrives=True,
supportsAllDrives=True,
corpora="drive",
)
assert result_value == {}

@pytest.mark.parametrize(
("include_trashed", "expected_query"),
[
(True, "name = 'abc123.csv' and 'abxy1z' in parents"),
(False, "name = 'abc123.csv' and 'abxy1z' in parents and trashed=false"),
],
)
@mock.patch("airflow.providers.google.suite.hooks.drive.GoogleDriveHook.get_conn")
def test_get_file_id_uses_collection_membership_parents_query(
self, mock_get_conn, include_trashed, expected_query
):
folder_id = "abxy1z"
drive_id = "abc123"
file_name = "abc123.csv"
mock_get_conn.return_value.files.return_value.list.return_value.execute.return_value = {"files": []}

self.gdrive_hook.get_file_id(folder_id, file_name, drive_id, include_trashed=include_trashed)

mock_get_conn.return_value.files.return_value.list.assert_called_once_with(
q=expected_query,
spaces="drive",
fields="files(id, mimeType)",
orderBy="modifiedTime desc",
driveId=drive_id,
includeItemsFromAllDrives=True,
supportsAllDrives=True,
corpora="drive",
)

@mock.patch("airflow.providers.google.suite.hooks.drive.GoogleDriveHook.get_conn")
def test_get_file_id_query_without_drive_id(self, mock_get_conn):
folder_id = "abxy1z"
file_name = "abc123.csv"
mock_get_conn.return_value.files.return_value.list.return_value.execute.return_value = {"files": []}

self.gdrive_hook.get_file_id(folder_id, file_name)

mock_get_conn.return_value.files.return_value.list.assert_called_once_with(
q=f"name = '{file_name}' and '{folder_id}' in parents",
spaces="drive",
fields="files(id, mimeType)",
orderBy="modifiedTime desc",
)

@mock.patch("airflow.providers.google.suite.hooks.drive.MediaFileUpload")
@mock.patch("airflow.providers.google.suite.hooks.drive.GoogleDriveHook.get_conn")
@mock.patch("airflow.providers.google.suite.hooks.drive.GoogleDriveHook._ensure_folders_exists")
Expand Down