QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-17 20:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

CE-1955 Make sure to skip blank rows (e.g., no columns had a value)

Browse Source
This commit is contained in:
darin.kelkhoff
2025-01-07 11:30:19 -06:00
parent bcedb566ff
commit f7cbf9d1c2
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/insert/mapping/FlatRowsToRecord.java
View File

@ -62,12 +62,22 @@ public class FlatRowsToRecord implements RowsToRecordInterface
QRecord record = new QRecord();
BulkLoadRecordUtils.addBackendDetailsAboutFileRows(record, row);
boolean anyValuesFromFileUsed = false;
for(QFieldMetaData field : table.getFields().values())
{
setValueOrDefault(record, field, null, mapping, row, fieldIndexes.get(field.getName()));
if(setValueOrDefault(record, field, null, mapping, row, fieldIndexes.get(field.getName())))
{
anyValuesFromFileUsed = true;
}
}
rs.add(record);
//////////////////////////////////////////////////////////////////////////
// avoid building empty records (e.g., "past the end" of an Excel file) //
//////////////////////////////////////////////////////////////////////////
if(anyValuesFromFileUsed)
{
rs.add(record);
}
}
BulkLoadValueMapper.valueMapping(rs, mapping, table);

3
qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/insert/mapping/FlatRowsToRecordTest.java
View File

@ -56,7 +56,8 @@ class FlatRowsToRecordTest extends BaseTest
new Serializable[] { 1, "Homer", "Simpson", true, "three fifty" },
new Serializable[] { 2, "Marge", "Simpson", false, "" },
new Serializable[] { 3, "Bart", "Simpson", "A", "99.95" },
new Serializable[] { 4, "Ned", "Flanders", 3.1, "one$" }
new Serializable[] { 4, "Ned", "Flanders", 3.1, "one$" },
new Serializable[] { "", "", "", "", "" } // all blank row (we can get these at the bottoms of files) - make sure it doesn't become a record.
));
BulkLoadFileRow header = fileToRows.next();