Bring back accepted changes from mattn/go-sqlite3