Merge pull request #46 from iwongu/extension

iwongu · web-flow · commit 163021c2caa1 · 2017-08-01T11:08:38.000-07:00
Extension
diff --git a/README.md b/README.md
@@ -314,6 +314,22 @@ sqlite3pp::query qry(
   "FROM foods");
 ```
 
+## loadable extension
+
+```cpp
+#define SQLITE3PP_LOADABLE_EXTENSION
+#include <sqlite3ppext.h>
+
+int sqlite3_extension_init(
+  sqlite3 *pdb,
+  char **pzErrMsg,
+  const sqlite3_api_routines *pApi) {
+  SQLITE_EXTENSION_INIT2(pApi);
+  sqlite3pp:database db(sqlite3pp::ext::borrow(pdb));
+  // pdb is not closed since db just borrows it.
+}
+
+```
 
 
 # See also
diff --git a/headeronly_src/sqlite3pp.h b/headeronly_src/sqlite3pp.h
@@ -25,24 +25,33 @@
 #ifndef SQLITE3PP_H
 #define SQLITE3PP_H
 
-#define SQLITE3PP_VERSION "1.0.6"
+#define SQLITE3PP_VERSION "1.0.7"
 #define SQLITE3PP_VERSION_MAJOR 1
 #define SQLITE3PP_VERSION_MINOR 0
-#define SQLITE3PP_VERSION_PATCH 6
+#define SQLITE3PP_VERSION_PATCH 7
 
 #include <functional>
 #include <iterator>
-#include <sqlite3.h>
 #include <stdexcept>
 #include <string>
 #include <tuple>
 
+#ifdef SQLITE3PP_LOADABLE_EXTENSION
+#include <sqlite3ext.h>
+SQLITE_EXTENSION_INIT1
+#else
+#  include <sqlite3.h>
+#endif
+
 namespace sqlite3pp
 {
+  class database;
+
   namespace ext
   {
     class function;
     class aggregate;
+    database borrow(sqlite3* pdb);
   }
 
   template <class T>
@@ -71,6 +80,7 @@ namespace sqlite3pp
     friend class database_error;
     friend class ext::function;
     friend class ext::aggregate;
+    friend database ext::borrow(sqlite3* pdb);
 
    public:
     using busy_handler = std::function<int (int)>;
@@ -119,8 +129,12 @@ namespace sqlite3pp
     void set_update_handler(update_handler h);
     void set_authorize_handler(authorize_handler h);
 
+   private:
+    database(sqlite3* pdb) : db_(pdb), borrowing_(true) {}
+
    private:
     sqlite3* db_;
+    bool borrowing_;
 
     busy_handler bh_;
     commit_handler ch_;
diff --git a/headeronly_src/sqlite3pp.ipp b/headeronly_src/sqlite3pp.ipp
@@ -64,7 +64,7 @@ namespace sqlite3pp
 
   } // namespace
 
-  inline database::database(char const* dbname, int flags, char const* vfs) : db_(nullptr)
+  inline database::database(char const* dbname, int flags, char const* vfs) : db_(nullptr), borrowing_(false)
   {
     if (dbname) {
       auto rc = connect(dbname, flags, vfs);
@@ -74,6 +74,7 @@ namespace sqlite3pp
   }
 
   inline database::database(database&& db) : db_(std::move(db.db_)),
+    borrowing_(std::move(db.borrowing_)),
     bh_(std::move(db.bh_)),
     ch_(std::move(db.ch_)),
     rh_(std::move(db.rh_)),
@@ -87,6 +88,7 @@ namespace sqlite3pp
   {
     db_ = std::move(db.db_);
     db.db_ = nullptr;
+    borrowing_ = std::move(db.borrowing_);
 
     bh_ = std::move(db.bh_);
     ch_ = std::move(db.ch_);
@@ -99,12 +101,16 @@ namespace sqlite3pp
 
   inline database::~database()
   {
-    disconnect();
+    if (!borrowing_) {
+      disconnect();
+    }
   }
 
   inline int database::connect(char const* dbname, int flags, char const* vfs)
   {
-    disconnect();
+    if (!borrowing_) {
+      disconnect();
+    }
 
     return sqlite3_open_v2(dbname, &db_, flags, vfs);
   }
diff --git a/headeronly_src/sqlite3ppext.h b/headeronly_src/sqlite3ppext.h
@@ -76,6 +76,9 @@ namespace sqlite3pp
 
   namespace ext
   {
+    database borrow(sqlite3* pdb) {
+      return database(pdb);
+    }
 
     class context : noncopyable
     {
diff --git a/src/sqlite3pp.cpp b/src/sqlite3pp.cpp
@@ -66,7 +66,7 @@ namespace sqlite3pp
 
   } // namespace
 
-  database::database(char const* dbname, int flags, char const* vfs) : db_(nullptr)
+  database::database(char const* dbname, int flags, char const* vfs) : db_(nullptr), borrowing_(false)
   {
     if (dbname) {
       auto rc = connect(dbname, flags, vfs);
@@ -75,7 +75,12 @@ namespace sqlite3pp
     }
   }
 
+  database::database(sqlite3* pdb) : db_(pdb), borrowing_(true)
+  {
+  }
+
   database::database(database&& db) : db_(std::move(db.db_)),
+    borrowing_(std::move(db.borrowing_)),
     bh_(std::move(db.bh_)),
     ch_(std::move(db.ch_)),
     rh_(std::move(db.rh_)),
@@ -89,7 +94,7 @@ namespace sqlite3pp
   {
     db_ = std::move(db.db_);
     db.db_ = nullptr;
-
+    borrowing_ = std::move(db.borrowing_);
     bh_ = std::move(db.bh_);
     ch_ = std::move(db.ch_);
     rh_ = std::move(db.rh_);
@@ -101,12 +106,16 @@ namespace sqlite3pp
 
   database::~database()
   {
-    disconnect();
+    if (!borrowing_) {
+      disconnect();
+    }
   }
 
   int database::connect(char const* dbname, int flags, char const* vfs)
   {
-    disconnect();
+    if (!borrowing_) {
+      disconnect();
+    }
 
     return sqlite3_open_v2(dbname, &db_, flags, vfs);
   }
diff --git a/src/sqlite3pp.h b/src/sqlite3pp.h
@@ -25,24 +25,33 @@
 #ifndef SQLITE3PP_H
 #define SQLITE3PP_H
 
-#define SQLITE3PP_VERSION "1.0.0"
+#define SQLITE3PP_VERSION "1.0.7"
 #define SQLITE3PP_VERSION_MAJOR 1
 #define SQLITE3PP_VERSION_MINOR 0
-#define SQLITE3PP_VERSION_PATCH 6
+#define SQLITE3PP_VERSION_PATCH 7
 
 #include <functional>
 #include <iterator>
-#include <sqlite3.h>
 #include <stdexcept>
 #include <string>
 #include <tuple>
 
+#ifdef SQLITE3PP_LOADABLE_EXTENSION
+#include <sqlite3ext.h>
+SQLITE_EXTENSION_INIT1
+#else
+#  include <sqlite3.h>
+#endif
+
 namespace sqlite3pp
 {
+  class database;
+
   namespace ext
   {
     class function;
     class aggregate;
+    database borrow(sqlite3* pdb);
   }
 
   template <class T>
@@ -72,6 +81,7 @@ namespace sqlite3pp
     friend class database_error;
     friend class ext::function;
     friend class ext::aggregate;
+    friend database ext::borrow(sqlite3* pdb);
 
    public:
     using busy_handler = std::function<int (int)>;
@@ -120,8 +130,12 @@ namespace sqlite3pp
     void set_update_handler(update_handler h);
     void set_authorize_handler(authorize_handler h);
 
+   private:
+    database(sqlite3* pdb);
+
    private:
     sqlite3* db_;
+    bool borrowing_;
 
     busy_handler bh_;
     commit_handler ch_;
diff --git a/src/sqlite3ppext.cpp b/src/sqlite3ppext.cpp
@@ -59,6 +59,9 @@ namespace sqlite3pp
 
     } // namespace
 
+    database borrow(sqlite3* pdb) {
+      return database(pdb);
+    }
 
     context::context(sqlite3_context* ctx, int nargs, sqlite3_value** values)
       : ctx_(ctx), nargs_(nargs), values_(values)
diff --git a/src/sqlite3ppext.h b/src/sqlite3ppext.h
@@ -76,6 +76,7 @@ namespace sqlite3pp
 
   namespace ext
   {
+    database borrow(sqlite3* pdb);
 
     class context : noncopyable
     {

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ namespace sqlite3pp`
`64`	`64`
`65`	`65`	`} // namespace`
`66`	`66`
`67`		`- inline database::database(char const* dbname, int flags, char const* vfs) : db_(nullptr)`
	`67`	`+ inline database::database(char const* dbname, int flags, char const* vfs) : db_(nullptr), borrowing_(false)`
`68`	`68`	`{`
`69`	`69`	`if (dbname) {`
`70`	`70`	`auto rc = connect(dbname, flags, vfs);`
`@@ -74,6 +74,7 @@ namespace sqlite3pp`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`inline database::database(database&& db) : db_(std::move(db.db_)),`
	`77`	`+ borrowing_(std::move(db.borrowing_)),`
`77`	`78`	`bh_(std::move(db.bh_)),`
`78`	`79`	`ch_(std::move(db.ch_)),`
`79`	`80`	`rh_(std::move(db.rh_)),`
`@@ -87,6 +88,7 @@ namespace sqlite3pp`
`87`	`88`	`{`
`88`	`89`	`db_ = std::move(db.db_);`
`89`	`90`	`db.db_ = nullptr;`
	`91`	`+ borrowing_ = std::move(db.borrowing_);`
`90`	`92`
`91`	`93`	`bh_ = std::move(db.bh_);`
`92`	`94`	`ch_ = std::move(db.ch_);`
`@@ -99,12 +101,16 @@ namespace sqlite3pp`
`99`	`101`
`100`	`102`	`inline database::~database()`
`101`	`103`	`{`
`102`		`- disconnect();`
	`104`	`+ if (!borrowing_) {`
	`105`	`+ disconnect();`
	`106`	`+ }`
`103`	`107`	`}`
`104`	`108`
`105`	`109`	`inline int database::connect(char const* dbname, int flags, char const* vfs)`
`106`	`110`	`{`
`107`		`- disconnect();`
	`111`	`+ if (!borrowing_) {`
	`112`	`+ disconnect();`
	`113`	`+ }`
`108`	`114`
`109`	`115`	`return sqlite3_open_v2(dbname, &db_, flags, vfs);`
`110`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,9 @@ namespace sqlite3pp`
`76`	`76`
`77`	`77`	`namespace ext`
`78`	`78`	`{`
	`79`	`+ database borrow(sqlite3* pdb) {`
	`80`	`+ return database(pdb);`
	`81`	`+ }`
`79`	`82`
`80`	`83`	`class context : noncopyable`
`81`	`84`	`{`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ namespace sqlite3pp`
`66`	`66`
`67`	`67`	`} // namespace`
`68`	`68`
`69`		`- database::database(char const* dbname, int flags, char const* vfs) : db_(nullptr)`
	`69`	`+ database::database(char const* dbname, int flags, char const* vfs) : db_(nullptr), borrowing_(false)`
`70`	`70`	`{`
`71`	`71`	`if (dbname) {`
`72`	`72`	`auto rc = connect(dbname, flags, vfs);`
`@@ -75,7 +75,12 @@ namespace sqlite3pp`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
	`78`	`+ database::database(sqlite3* pdb) : db_(pdb), borrowing_(true)`
	`79`	`+ {`
	`80`	`+ }`
	`81`	`+`
`78`	`82`	`database::database(database&& db) : db_(std::move(db.db_)),`
	`83`	`+ borrowing_(std::move(db.borrowing_)),`
`79`	`84`	`bh_(std::move(db.bh_)),`
`80`	`85`	`ch_(std::move(db.ch_)),`
`81`	`86`	`rh_(std::move(db.rh_)),`
`@@ -89,7 +94,7 @@ namespace sqlite3pp`
`89`	`94`	`{`
`90`	`95`	`db_ = std::move(db.db_);`
`91`	`96`	`db.db_ = nullptr;`
`92`		`-`
	`97`	`+ borrowing_ = std::move(db.borrowing_);`
`93`	`98`	`bh_ = std::move(db.bh_);`
`94`	`99`	`ch_ = std::move(db.ch_);`
`95`	`100`	`rh_ = std::move(db.rh_);`
`@@ -101,12 +106,16 @@ namespace sqlite3pp`
`101`	`106`
`102`	`107`	`database::~database()`
`103`	`108`	`{`
`104`		`- disconnect();`
	`109`	`+ if (!borrowing_) {`
	`110`	`+ disconnect();`
	`111`	`+ }`
`105`	`112`	`}`
`106`	`113`
`107`	`114`	`int database::connect(char const* dbname, int flags, char const* vfs)`
`108`	`115`	`{`
`109`		`- disconnect();`
	`116`	`+ if (!borrowing_) {`
	`117`	`+ disconnect();`
	`118`	`+ }`
`110`	`119`
`111`	`120`	`return sqlite3_open_v2(dbname, &db_, flags, vfs);`
`112`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ namespace sqlite3pp`
`76`	`76`
`77`	`77`	`namespace ext`
`78`	`78`	`{`
	`79`	`+ database borrow(sqlite3* pdb);`
`79`	`80`
`80`	`81`	`class context : noncopyable`
`81`	`82`	`{`