merge trunk changes through r1138

git-svn-id: https://svn.code.sf.net/p/jackcess/code/jackcess/branches/exprs@1139 f203690c-595d-4dc9-a70b-905162fa7fd2

diff --cc src/main/java/com/healthmarketscience/jackcess/impl/ColumnImpl.java
index 02b69ea5a835e731aaa0c2bd7fe847084ab4b767,b5a0d0e3c87cb6c8d35d9db6293e493d31a97caf..f8b01eeab36983359bd308f1466315423f70fe69
--- 1/src/main/java/com/healthmarketscience/jackcess/impl/ColumnImpl.java
--- 2/src/main/java/com/healthmarketscience/jackcess/impl/ColumnImpl.java
+++ b/src/main/java/com/healthmarketscience/jackcess/impl/ColumnImpl.java
@@@ -1876,6 -1805,9 +1881,9 @@@ public class ColumnImpl implements Colu
      case COMPLEX_TYPE:
        // leave alone for now?
        return value;
 -              toNumber(value).longValue());
+     case BIG_INT:
+       return ((value instanceof Long) ? value : 
++              toNumber(value, db).longValue());
      default:
        // some variation of binary data
        return toByteArray(value);

diff --cc src/main/java/com/healthmarketscience/jackcess/impl/DatabaseImpl.java
Simple merge