[CLC-1198] More attempts to get sqlite to behave nicely
Merge pull request #613 from yuhunglin/CLC-1198

[CLC-1198] More attempts to get sqlite to behave nicely