| database.hxx | database.hxx | |||
|---|---|---|---|---|
| skipping to change at line 30 | skipping to change at line 30 | |||
| #include <odb/sqlite/version.hxx> | #include <odb/sqlite/version.hxx> | |||
| #include <odb/sqlite/forward.hxx> | #include <odb/sqlite/forward.hxx> | |||
| #include <odb/sqlite/query.hxx> | #include <odb/sqlite/query.hxx> | |||
| #include <odb/sqlite/tracer.hxx> | #include <odb/sqlite/tracer.hxx> | |||
| #include <odb/sqlite/connection.hxx> | #include <odb/sqlite/connection.hxx> | |||
| #include <odb/sqlite/connection-factory.hxx> | #include <odb/sqlite/connection-factory.hxx> | |||
| #include <odb/sqlite/transaction-impl.hxx> | #include <odb/sqlite/transaction-impl.hxx> | |||
| #include <odb/sqlite/details/export.hxx> | #include <odb/sqlite/details/export.hxx> | |||
| // We use the sqlite3_open_v2() flags in our interface. Define them | ||||
| // for SQLite earlier that 3.5.0. | ||||
| // | ||||
| #if SQLITE_VERSION_NUMBER < 3005000 | ||||
| # define SQLITE_OPEN_READONLY 0x00000001 | ||||
| # define SQLITE_OPEN_READWRITE 0x00000002 | ||||
| # define SQLITE_OPEN_CREATE 0x00000004 | ||||
| #endif | ||||
| namespace odb | namespace odb | |||
| { | { | |||
| namespace sqlite | namespace sqlite | |||
| { | { | |||
| class transaction_impl; | class transaction_impl; | |||
| class LIBODB_SQLITE_EXPORT database: public odb::database | class LIBODB_SQLITE_EXPORT database: public odb::database | |||
| { | { | |||
| public: | public: | |||
| database (const std::string& name, | database (const std::string& name, | |||
| End of changes. 1 change blocks. | ||||
| 0 lines changed or deleted | 9 lines changed or added | |||
| statement.hxx | statement.hxx | |||
|---|---|---|---|---|
| skipping to change at line 127 | skipping to change at line 127 | |||
| active_ = false; | active_ = false; | |||
| } | } | |||
| } | } | |||
| protected: | protected: | |||
| friend class sqlite::connection; | friend class sqlite::connection; | |||
| connection_type& conn_; | connection_type& conn_; | |||
| auto_handle<sqlite3_stmt> stmt_; | auto_handle<sqlite3_stmt> stmt_; | |||
| #if SQLITE_VERSION_NUMBER < 3005003 | ||||
| std::string text_; | ||||
| #endif | ||||
| bool active_; | bool active_; | |||
| private: | private: | |||
| void | void | |||
| init (const char* text, std::size_t text_size); | init (const char* text, std::size_t text_size); | |||
| // Doubly-linked list of active statements. | // Doubly-linked list of active statements. | |||
| // | // | |||
| private: | protected: | |||
| void | void | |||
| list_add () | list_add () | |||
| { | { | |||
| next_ = conn_.statements_; | next_ = conn_.statements_; | |||
| conn_.statements_ = this; | conn_.statements_ = this; | |||
| if (next_ != 0) | if (next_ != 0) | |||
| next_->prev_ = this; | next_->prev_ = this; | |||
| } | } | |||
| End of changes. 2 change blocks. | ||||
| 1 lines changed or deleted | 5 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 2020200 | #define LIBODB_SQLITE_VERSION 2020300 | |||
| #define LIBODB_SQLITE_VERSION_STR "2.2.2" | #define LIBODB_SQLITE_VERSION_STR "2.2.3" | |||
| #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 | |||