From 2faf773bb91bccafcddd67c914bd5b38f5e99162 Mon Sep 17 00:00:00 2001 From: James Ahlborn Date: Wed, 6 Jun 2018 03:09:13 +0000 Subject: [PATCH] return all values in map so that default values, calc values, etc get returned to caller git-svn-id: https://svn.code.sf.net/p/jackcess/code/jackcess/branches/exprs@1165 f203690c-595d-4dc9-a70b-905162fa7fd2 --- .../healthmarketscience/jackcess/impl/TableImpl.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/healthmarketscience/jackcess/impl/TableImpl.java b/src/main/java/com/healthmarketscience/jackcess/impl/TableImpl.java index c084ae8..15a0c8c 100644 --- a/src/main/java/com/healthmarketscience/jackcess/impl/TableImpl.java +++ b/src/main/java/com/healthmarketscience/jackcess/impl/TableImpl.java @@ -2148,7 +2148,7 @@ public class TableImpl implements Table, PropertyMaps.Owner addRow(rowValues); - returnRowValues(row, rowValues, _autoNumColumns); + returnRowValues(row, rowValues, _columns); return row; } @@ -2168,12 +2168,10 @@ public class TableImpl implements Table, PropertyMaps.Owner addRows(rowValuesList); - if(!_autoNumColumns.isEmpty()) { - for(int i = 0; i < rowValuesList.size(); ++i) { - Map row = rows.get(i); - Object[] rowValues = rowValuesList.get(i); - returnRowValues(row, rowValues, _autoNumColumns); - } + for(int i = 0; i < rowValuesList.size(); ++i) { + Map row = rows.get(i); + Object[] rowValues = rowValuesList.get(i); + returnRowValues(row, rowValues, _columns); } return rows; } -- 2.39.5