Fix adding fixed length columns to an existing table. fixes #159

Retrofit from
git-svn-id: https://svn.code.sf.net/p/jackcess/code/jackcess/trunk@1418 f203690c-595d-4dc9-a70b-905162fa7fd2

Author: spannm

src/main/java/io/github/spannm/jackcess/ColumnBuilder.java

@@ -353,6 +353,14 @@ public void setTextSortOrder(ColumnImpl.SortOrder newTextSortOrder) {
         _sortOrder = newTextSortOrder;
     }
 
+    public boolean storeInNullMask() {
+      return (getType() == DataType.BOOLEAN);
+    }
+
+    public int getFixedDataSize() {
+      return _type.getFixedSize(_length);
+    }
+
     /**
      * Checks that this column definition is valid.
      *

src/main/java/io/github/spannm/jackcess/DataType.java

@@ -43,7 +43,7 @@ public enum DataType {
      * Corresponds to a java {@link Boolean}. Accepts Boolean or {@code null} (which is considered {@code false}).
      * Equivalent to SQL {@link Types#BOOLEAN}.
      */
-    BOOLEAN((byte) 0x01, "Bit", Types.BOOLEAN, 0),
+    BOOLEAN((byte) 0x01, "Bit", Types.BOOLEAN, 1),
     /**
      * Corresponds to a java {@link Byte}. Accepts any {@link Number} (using {@link Number#byteValue}), Boolean as 1 or
      * 0, any Object converted to a String and parsed as Double, or {@code null}. Equivalent to SQL

src/main/java/io/github/spannm/jackcess/impl/ColumnImpl.java

@@ -231,13 +231,8 @@ protected ColumnImpl(TableImpl _table, String _name, DataType _type, int _colNum
 
         mautoNumberGenerator = createAutoNumberGenerator();
 
-        if (mvariableLength) {
-            mvarLenTableIndex = args.buffer.getShort(args.offset + getFormat().OFFSET_COLUMN_VARIABLE_TABLE_INDEX);
-            mfixedDataOffset = 0;
-        } else {
-            mfixedDataOffset = args.buffer.getShort(args.offset + getFormat().OFFSET_COLUMN_FIXED_DATA_OFFSET);
-            mvarLenTableIndex = 0;
-        }
+        mvarLenTableIndex = args.buffer.getShort(args.offset + getFormat().OFFSET_COLUMN_VARIABLE_TABLE_INDEX);
+        mfixedDataOffset = args.buffer.getShort(args.offset + getFormat().OFFSET_COLUMN_FIXED_DATA_OFFSET);
     }
 
     /**
@@ -426,6 +421,10 @@ public int getFixedDataOffset() {
         return mfixedDataOffset;
     }
 
+    protected int getFixedDataSize() {
+        return mtype.getFixedSize(mcolumnLength);
+    }
+
     protected Charset getCharset() {
         return getDatabase().getCharset();
     }
@@ -1312,7 +1311,7 @@ protected ByteBuffer writeRealData(Object obj, int remainingRowLength, ByteOrder
      * @return A buffer containing the bytes
      */
     protected ByteBuffer writeFixedLengthField(Object obj, ByteOrder order) throws IOException {
-        int size = getType().getFixedSize(mcolumnLength);
+        int size = getFixedDataSize();
 
         ByteBuffer buffer = writeFixedLengthField(obj, PageChannel.createBuffer(size, order));
         buffer.flip();
@@ -1802,11 +1801,7 @@ protected static void writeDefinition(TableMutator mutator, ColumnBuilder col, B
         buffer.putInt(TableImpl.MAGIC_TABLE_NUMBER); // constant magic number
         buffer.putShort(col.getColumnNumber()); // Column Number
 
-        if (col.isVariableLength()) {
-            buffer.putShort(colOffsets.getNextVariableOffset(col));
-        } else {
-            buffer.putShort((short) 0);
-        }
+        buffer.putShort(colOffsets.getNextVariableOffset(col));
 
         buffer.putShort(col.getColumnNumber()); // Column Number again
 

src/main/java/io/github/spannm/jackcess/impl/TableImpl.java

@@ -718,7 +718,7 @@ private static Object getRowColumn(JetFormat format, ByteBuffer rowBuffer, Colum
                 // read fixed length value (non-boolean at this point)
                 int dataStart = rowStart + format.OFFSET_COLUMN_FIXED_DATA_ROW_OFFSET;
                 colDataPos = dataStart + column.getFixedDataOffset();
-                colDataLen = column.getType().getFixedSize(column.getLength());
+                colDataLen = column.getFixedDataSize();
 
             } else {
                 int varDataStart;
@@ -1085,20 +1085,20 @@ protected ColumnImpl mutateAddColumn(TableUpdater mutator) throws IOException {
             tableBuffer.position(format.SIZE_TDEF_HEADER + _indexCount * format.SIZE_INDEX_DEFINITION + _columns.size() * format.SIZE_COLUMN_DEF_BLOCK);
 
             // figure out the data offsets for the new column
-            int fixedOffset = 0;
             int varOffset = 0;
-            if (column.isVariableLength()) {
-                // find the variable offset
-                for (ColumnImpl col : _varColumns) {
-                    if (col.getVarLenTableIndex() >= varOffset) {
-                        varOffset = col.getVarLenTableIndex() + 1;
-                    }
+            // find the variable offset
+            for (ColumnImpl col : _varColumns) {
+                if (col.isVariableLength() && (col.getVarLenTableIndex() >= varOffset)) {
+                    varOffset = col.getVarLenTableIndex() + 1;
                 }
-            } else {
+            }
+
+            int fixedOffset = 0;
+            if (!column.isVariableLength() && !column.storeInNullMask()) {
                 // find the fixed offset
                 for (ColumnImpl col : _columns) {
-                    if (!col.isVariableLength() && col.getFixedDataOffset() >= fixedOffset) {
-                        fixedOffset = col.getFixedDataOffset() + col.getType().getFixedSize(col.getLength());
+                    if (!col.isVariableLength() && (col.getFixedDataOffset() >= fixedOffset)) {
+                        fixedOffset = col.getFixedDataOffset() + col.getFixedDataSize();
                     }
                 }
             }

src/main/java/io/github/spannm/jackcess/impl/TableMutator.java

@@ -106,15 +106,22 @@ public void set(int fixedOffset, int varOffset, int longVarOffset) {
         }
 
         public short getNextVariableOffset(ColumnBuilder col) {
+            if (!col.isVariableLength()) {
+                return _varOffset;
+            }
             if (!col.getType().isLongValue()) {
                 return _varOffset++;
             }
             return _longVarOffset++;
         }
 
         public short getNextFixedOffset(ColumnBuilder col) {
+            if (col.storeInNullMask()) {
+                // booleans are stored in null mask, not in fixed data section
+                return 0;
+            }
             short offset = _fixedOffset;
-            _fixedOffset += (short) col.getType().getFixedSize(col.getLength());
+            _fixedOffset += col.getFixedDataSize();
             return offset;
         }
     }