Skip to content

Adjust GoogleSheetExtractor row data extraction #2222

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
norberttech merged 2 commits into from
Feb 21, 2026
Merged

Adjust GoogleSheetExtractor row data extraction #2222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1597c03
Adjust `GoogleSheetExtractor` row data extraction
stloyd Feb 21, 2026
9b42496
Adjust `GoogleSheetExtractor` row data extraction
stloyd Feb 21, 2026
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
41 changes: 17 additions & 24 deletions ...dapter/etl-adapter-google-sheet/src/Flow/ETL/Adapter/GoogleSheet/GoogleSheetExtractor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,38 +76,31 @@ public function extract(FlowContext $context) : \Generator
$shouldPutInputIntoRows = $context->config->shouldPutInputIntoRows();

while ([] !== $values) {
$rows = \array_map(
function (array $rowData) use ($headers, $headersCount, $shouldPutInputIntoRows) {
$rowDataCount = \count($rowData);
foreach ($values as $rowData) {
$rowDataCount = \count($rowData);

// Expand columns to the size of the previous row
for ($i = $rowDataCount; $i < $headersCount; $i++) {
$rowData[$i] = null;
}

if ($rowDataCount > $headersCount) {
if (!$this->dropExtraColumns) {
throw InvalidArgumentException::because('Row has more columns (%d) than headers (%d)', $rowDataCount, $headersCount);
}
// Expand columns to the size of the previous row
for ($i = $rowDataCount; $i < $headersCount; $i++) {
$rowData[$i] = null;
}

$rowData = \array_slice($rowData, 0, $headersCount);
if ($rowDataCount > $headersCount) {
if (!$this->dropExtraColumns) {
throw InvalidArgumentException::because('Row has more columns (%d) than headers (%d)', $rowDataCount, $headersCount);
}

$row = \array_combine($headers, $rowData);
$rowData = \array_slice($rowData, 0, $headersCount);
}

if ($shouldPutInputIntoRows) {
$row['_spread_sheet_id'] = $this->spreadsheetId;
$row['_sheet_name'] = $this->columnRange->sheetName;
}
$row = \array_combine($headers, $rowData);

return $row;
},
$values
);
if ($shouldPutInputIntoRows) {
$row['_spread_sheet_id'] = $this->spreadsheetId;
$row['_sheet_name'] = $this->columnRange->sheetName;
}

$totalRows += \count($rows);
$totalRows++;

foreach ($rows as $row) {
$signal = yield array_to_rows($row, $context->entryFactory(), schema: $this->schema);

$this->incrementReturnedRows();
Expand Down
11 changes: 11 additions & 0 deletions ...apter-google-sheet/tests/Flow/ETL/Adapter/GoogleSheet/Tests/Fixtures/missing-columns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"range": "Sheet!A1:C5",
"majorDimension": "ROWS",
"values": [
["Header 1", "Header 2", "Header 3"],
["A2", "B2", "C2"],
["A3", "B3"],
["A4", "B4"],
["A5", "B5", "C5"]
]
}
37 changes: 37 additions & 0 deletions ...e-sheet/tests/Flow/ETL/Adapter/GoogleSheet/Tests/Integration/GoogleSheetExtractorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,24 @@ protected function setUp() : void
$this->context = new GoogleSheetsContext();
}

public function test_extract_expand_missing_columns() : void
{
$rows = df()
->extract(
from_google_sheet(
$this->context->sheets(__DIR__ . '/../Fixtures/missing-columns.json'),
'1234567890',
'Sheet',
)
)
->fetch()
->toArray();

foreach ($rows as $row) {
self::assertCount(3, $row);
}
}

public function test_extract_puts_null_in_not_matching_schema_rows() : void
{
$rows = df()
Expand Down Expand Up @@ -58,6 +76,8 @@ public function test_extract_skip_extra_empty_rows() : void
->fetch()
->toArray();

self::assertCount(10, $rows);

foreach ($rows as $row) {
self::assertNotSame([], $row);
}
Expand All @@ -81,6 +101,23 @@ public function test_extract_with_cut_extra_columns() : void
}
}

public function test_extract_with_limit() : void
{
$extractor = from_google_sheet(
$this->context->sheets(__DIR__ . '/../Fixtures/extra-columns.json'),
'1234567890',
'Sheet',
);
$extractor->changeLimit(2);

$rows = df()
->extract($extractor)
->fetch()
->toArray();

self::assertCount(2, $rows);
}

public function test_extract_without_cut_extra_columns() : void
{
$this->expectException(InvalidArgumentException::class);
Expand Down
Loading