| exceptions.hxx | exceptions.hxx | |||
|---|---|---|---|---|
| skipping to change at line 22 | skipping to change at line 22 | |||
| #include <odb/exceptions.hxx> | #include <odb/exceptions.hxx> | |||
| #include <odb/sqlite/version.hxx> | #include <odb/sqlite/version.hxx> | |||
| #include <odb/sqlite/forward.hxx> | #include <odb/sqlite/forward.hxx> | |||
| #include <odb/sqlite/details/export.hxx> | #include <odb/sqlite/details/export.hxx> | |||
| namespace odb | namespace odb | |||
| { | { | |||
| namespace sqlite | namespace sqlite | |||
| { | { | |||
| // This exception is thrown if SQLite is forcing the current transactio | ||||
| n | ||||
| // to rollback. This can happen in SQLite 3.7.11 or later if one of the | ||||
| // connections participating in the shared cache rolls back a transacti | ||||
| on. | ||||
| // See the SQLITE_ABORT_ROLLBACK extended error code for detail on this | ||||
| // behavior. | ||||
| // | ||||
| struct LIBODB_EXPORT forced_rollback: recoverable | ||||
| { | ||||
| virtual const char* | ||||
| what () const throw (); | ||||
| }; | ||||
| struct LIBODB_SQLITE_EXPORT database_exception: odb::database_exception | struct LIBODB_SQLITE_EXPORT database_exception: odb::database_exception | |||
| { | { | |||
| database_exception (int error, | database_exception (int error, | |||
| int extended_error, | int extended_error, | |||
| const std::string& message); | const std::string& message); | |||
| ~database_exception () throw (); | ~database_exception () throw (); | |||
| int | int | |||
| error () const | error () const | |||
| End of changes. 1 change blocks. | ||||
| 0 lines changed or deleted | 14 lines changed or added | |||
| version.hxx | version.hxx | |||
|---|---|---|---|---|
| skipping to change at line 38 | skipping to change at line 38 | |||
| // Check that we have compatible ODB version. | // Check that we have compatible ODB version. | |||
| // | // | |||
| #if ODB_VERSION != 20200 | #if ODB_VERSION != 20200 | |||
| # error incompatible odb interface version detected | # error incompatible odb interface version detected | |||
| #endif | #endif | |||
| // libodb-sqlite version: odb interface version plus the bugfix | // libodb-sqlite version: odb interface version plus the bugfix | |||
| // version. | // version. | |||
| // | // | |||
| #define LIBODB_SQLITE_VERSION 2020000 | #define LIBODB_SQLITE_VERSION 2020100 | |||
| #define LIBODB_SQLITE_VERSION_STR "2.2.0" | #define LIBODB_SQLITE_VERSION_STR "2.2.1" | |||
| #include <odb/post.hxx> | #include <odb/post.hxx> | |||
| #endif // ODB_SQLITE_VERSION_HXX | #endif // ODB_SQLITE_VERSION_HXX | |||
| End of changes. 1 change blocks. | ||||
| 2 lines changed or deleted | 2 lines changed or added | |||