From f495acf15344bf72147b6c7c62f6a076093e6014 Mon Sep 17 00:00:00 2001
From: James Ahlborn <jtahlborn@yahoo.com>
Date: Mon, 24 Jul 2006 18:57:11 +0000
Subject: [PATCH] first attempt at reading with deleted columns

git-svn-id: https://svn.code.sf.net/p/jackcess/code/jackcess/trunk@67 f203690c-595d-4dc9-a70b-905162fa7fd2
---
 .../healthmarketscience/jackcess/Column.java  |  18 +++++++
 .../jackcess/JetFormat.java                   |  10 +++-
 .../healthmarketscience/jackcess/Table.java   |  45 ++++++++++--------
 test/data/delColTest.mdb                      | Bin 0 -> 126976 bytes
 .../jackcess/DatabaseTest.java                |  29 +++++++++++
 5 files changed, 81 insertions(+), 21 deletions(-)
 create mode 100644 test/data/delColTest.mdb

diff --git a/src/java/com/healthmarketscience/jackcess/Column.java b/src/java/com/healthmarketscience/jackcess/Column.java
index 4db8b80..cb6619c 100644
--- a/src/java/com/healthmarketscience/jackcess/Column.java
+++ b/src/java/com/healthmarketscience/jackcess/Column.java
@@ -97,6 +97,10 @@ public class Column implements Comparable<Column> {
   private short _columnNumber;
   /** Column name */
   private String _name;
+  /** the offset of the fixed data in the row */
+  private int _fixedDataOffset;
+  /** the index of the variable length data in the var len offset table */
+  private int _varLenTableIndex;
   
   public Column() {
     this(JetFormat.VERSION_4);
@@ -131,6 +135,12 @@ public class Column implements Comparable<Column> {
         & 1) != 1);
     _compressedUnicode = ((buffer.get(offset +
         format.OFFSET_COLUMN_COMPRESSED_UNICODE) & 1) == 1);
+
+    if(_variableLength) {
+      _varLenTableIndex = buffer.getShort(offset + format.OFFSET_COLUMN_VARIABLE_TABLE_INDEX);
+    } else {
+      _fixedDataOffset = buffer.getShort(offset + format.OFFSET_COLUMN_FIXED_DATA_OFFSET);
+    }
   }
   
   public String getName() {
@@ -189,6 +199,14 @@ public class Column implements Comparable<Column> {
   public short getLength() {
     return _columnLength;
   }
+
+  public int getVarLenTableIndex() {
+    return _varLenTableIndex;
+  }
+
+  public int getFixedDataOffset() {
+    return _fixedDataOffset;
+  }
   
   /**
    * Deserialize a raw byte value for this column into an Object
diff --git a/src/java/com/healthmarketscience/jackcess/JetFormat.java b/src/java/com/healthmarketscience/jackcess/JetFormat.java
index 9ddf4a2..dc127b1 100644
--- a/src/java/com/healthmarketscience/jackcess/JetFormat.java
+++ b/src/java/com/healthmarketscience/jackcess/JetFormat.java
@@ -82,6 +82,8 @@ public abstract class JetFormat {
   public final int OFFSET_COLUMN_VARIABLE;
   public final int OFFSET_COLUMN_COMPRESSED_UNICODE;
   public final int OFFSET_COLUMN_LENGTH;
+  public final int OFFSET_COLUMN_VARIABLE_TABLE_INDEX;
+  public final int OFFSET_COLUMN_FIXED_DATA_OFFSET;
   
   public final int OFFSET_TABLE_DEF_LOCATION;
   public final int OFFSET_NUM_ROWS_ON_PAGE;
@@ -163,6 +165,8 @@ public abstract class JetFormat {
     OFFSET_COLUMN_VARIABLE = defineOffsetColumnVariable();
     OFFSET_COLUMN_COMPRESSED_UNICODE = defineOffsetColumnCompressedUnicode();
     OFFSET_COLUMN_LENGTH = defineOffsetColumnLength();
+    OFFSET_COLUMN_VARIABLE_TABLE_INDEX = defineOffsetColumnVariableTableIndex();
+    OFFSET_COLUMN_FIXED_DATA_OFFSET = defineOffsetColumnFixedDataOffset();
     
     OFFSET_TABLE_DEF_LOCATION = defineOffsetTableDefLocation();
     OFFSET_NUM_ROWS_ON_PAGE = defineOffsetNumRowsOnPage();
@@ -223,7 +227,9 @@ public abstract class JetFormat {
   protected abstract int defineOffsetColumnVariable();
   protected abstract int defineOffsetColumnCompressedUnicode();
   protected abstract int defineOffsetColumnLength();
-
+  protected abstract int defineOffsetColumnVariableTableIndex();
+  protected abstract int defineOffsetColumnFixedDataOffset();
+  
   protected abstract int defineOffsetTableDefLocation();
   protected abstract int defineOffsetNumRowsOnPage();
   protected abstract int defineOffsetRowLocationBlock();
@@ -284,6 +290,8 @@ public abstract class JetFormat {
     protected int defineOffsetColumnVariable() { return 15; }
     protected int defineOffsetColumnCompressedUnicode() { return 16; }
     protected int defineOffsetColumnLength() { return 23; }
+    protected int defineOffsetColumnVariableTableIndex() { return 7; }
+    protected int defineOffsetColumnFixedDataOffset() { return 21; }
   
     protected int defineOffsetTableDefLocation() { return 4; }
     protected int defineOffsetNumRowsOnPage() { return 12; }
diff --git a/src/java/com/healthmarketscience/jackcess/Table.java b/src/java/com/healthmarketscience/jackcess/Table.java
index 35b66a9..b141862 100644
--- a/src/java/com/healthmarketscience/jackcess/Table.java
+++ b/src/java/com/healthmarketscience/jackcess/Table.java
@@ -75,6 +75,8 @@ public class Table {
   /** max Number of columns in the table (includes previous deletions) */
   private short _maxColumnCount;
   /** max Number of variable columns in the table */
+  private short _maxVarColumnCount;
+  /** Number of variable columns in the table */
   private short _varColumnCount;
   /** Number of fixed columns in the table */
   private short _fixedColumnCount;
@@ -208,48 +210,47 @@ public class Table {
           _buffer.limit() - _buffer.position()));
     }
     short columnCount = _buffer.getShort(); //Number of columns in this row
-
+    
     Map<String, Object> rtn = new LinkedHashMap<String, Object>(columnCount);
     NullMask nullMask = new NullMask(columnCount);
     _buffer.position(_buffer.limit() - nullMask.byteSize());  //Null mask at end
     nullMask.read(_buffer);
 
-    short varColumnCount = 0;
+    short rowVarColumnCount = 0;
     byte[][] varColumnData = null;
     short[] varColumnOffsets = null;
     short lastVarColumnStart = 0;
-    // if table varColumnCount is 0, then row info does not include varcol
-    // info
-    if(_varColumnCount > 0) {
+    // if _maxVarColumnCount is 0, then row info does not include varcol info
+    if(_maxVarColumnCount > 0) {
       _buffer.position(_buffer.limit() - nullMask.byteSize() - 2);
-      varColumnCount = _buffer.getShort();  // actual number of variable length columns in this row
-      varColumnData = new byte[varColumnCount][];  //Holds variable length column data
+      rowVarColumnCount = _buffer.getShort();  // number of variable length columns in this row
+      varColumnData = new byte[rowVarColumnCount][];  //Holds variable length column data
 
       //Read in the offsets of each of the variable length columns
-      varColumnOffsets = new short[varColumnCount];
-      _buffer.position(_buffer.position() - 2 - (varColumnCount * 2) - 2);
+      varColumnOffsets = new short[rowVarColumnCount];
+      _buffer.position(_buffer.position() - 2 - (rowVarColumnCount * 2) - 2);
       lastVarColumnStart = _buffer.getShort();
-      for (short i = 0; i < varColumnCount; i++) {
+      for (short i = 0; i < rowVarColumnCount; i++) {
         varColumnOffsets[i] = _buffer.getShort();
       }
     }
       
     
     //Read in the actual data for each of the variable length columns
-    for (short i = 0; i < varColumnCount; i++) {
+    for (short i = 0; i < rowVarColumnCount; i++) {
       _buffer.position(_rowStart + varColumnOffsets[i]);
       varColumnData[i] = new byte[lastVarColumnStart - varColumnOffsets[i]];
       _buffer.get(varColumnData[i]);
       lastVarColumnStart = varColumnOffsets[i];
     }
-    int columnNumber = 0;
-    int varColumnDataIndex = varColumnCount - 1;
-    
-    _buffer.position(_rowStart + 2);  //Move back to the front of the buffer
+
+    // compute start of fixed data
+    int dataStart = _rowStart + 2;
     
     //Now read in the fixed length columns and populate the columnData array
     //with the combination of fixed length and variable length data.
     byte[] columnData = null;
+    int columnNumber = 0;
     for (Iterator iter = _columns.iterator(); iter.hasNext(); columnNumber++) {
       Column column = (Column) iter.next();
       boolean isNull = nullMask.isNull(columnNumber);
@@ -261,16 +262,18 @@ public class Table {
         {
           //Read in fixed length column data
           columnData = new byte[column.getLength()];
+          _buffer.position(dataStart + column.getFixedDataOffset());
           _buffer.get(columnData);
         } 
         else
         {
            if (!isNull) 
            {
-             //Refer to already-read-in variable length data
-             columnData = varColumnData[varColumnDataIndex];
+             // Refer to already-read-in variable length data.  note,
+             // varLenTableIndex is from the *end* of the array...
+             columnData = varColumnData[rowVarColumnCount -
+                                        column.getVarLenTableIndex() - 1];
            }
-           --varColumnDataIndex;
         }
         if (!isNull && columnData != null &&
             (columnNames == null || columnNames.contains(column.getName())))
@@ -334,7 +337,7 @@ public class Table {
     _rowCount = _buffer.getInt(_format.OFFSET_NUM_ROWS);
     _tableType = _buffer.get(_format.OFFSET_TABLE_TYPE);
     _maxColumnCount = _buffer.getShort(_format.OFFSET_MAX_COLS);
-    _varColumnCount = _buffer.getShort(_format.OFFSET_NUM_VAR_COLS);
+    _maxVarColumnCount = _buffer.getShort(_format.OFFSET_NUM_VAR_COLS);
     _columnCount = _buffer.getShort(_format.OFFSET_NUM_COLS);
     _indexCount = _buffer.getInt(_format.OFFSET_NUM_INDEXES);
     
@@ -358,7 +361,9 @@ public class Table {
     for (int i = 0; i < _columnCount; i++) {
       column = new Column(_buffer,
           offset + i * _format.SIZE_COLUMN_HEADER, _pageChannel, _format);
-      if(!column.isVariableLength()) {
+      if(column.isVariableLength()) {
+        _varColumnCount++;
+      } else {
         _fixedColumnCount++;
       }
       _columns.add(column);
diff --git a/test/data/delColTest.mdb b/test/data/delColTest.mdb
new file mode 100644
index 0000000000000000000000000000000000000000..b931b0d9b62655cbc8b931a13ff8f23c39d34829
GIT binary patch
literal 126976
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

literal 0
HcmV?d00001

diff --git a/test/src/java/com/healthmarketscience/jackcess/DatabaseTest.java b/test/src/java/com/healthmarketscience/jackcess/DatabaseTest.java
index 2dba448..86f1bdd 100644
--- a/test/src/java/com/healthmarketscience/jackcess/DatabaseTest.java
+++ b/test/src/java/com/healthmarketscience/jackcess/DatabaseTest.java
@@ -258,6 +258,35 @@ public class DatabaseTest extends TestCase {
     return rtn;
   }
 
+  public void testReadWithDeletedCols() throws Exception {
+    Table table = Database.open(new File("test/data/delColTest.mdb")).getTable("Table1");
+
+    Map<String, Object> expectedRow0 = new HashMap<String, Object>();
+    expectedRow0.put("id", 0);
+    expectedRow0.put("id2", 2);
+    expectedRow0.put("data", "foo");
+    expectedRow0.put("data2", "foo2");
+
+    Map<String, Object> expectedRow1 = new HashMap<String, Object>();
+    expectedRow1.put("id", 3);
+    expectedRow1.put("id2", 5);
+    expectedRow1.put("data", "bar");
+    expectedRow1.put("data2", "bar2");
+
+    int rowNum = 0;
+    Map<String, Object> row = null;
+    while ((row = table.getNextRow()) != null) {
+      if(rowNum == 0) {
+        assertEquals(expectedRow0, row);
+      } else if(rowNum == 1) {
+        assertEquals(expectedRow1, row);
+      } else if(rowNum >= 2) {
+        fail("should only have 2 rows");
+      }
+      rowNum++;
+    }
+  }
+
   private Object[] createTestRow() {
     return new Object[] {"Tim", "R", "McCune", 1234, (byte) 0xad, 555.66d,
         777.88f, (short) 999, new Date()};
-- 
2.39.5