More hkutil refactoring

All database access goes through hatkirby::database now.

verbly::token, verbly::statement::condition, and verbly::part have been converted to use mpark::variant now. verbly::binding has been deleted, and replaced with a mpark::variant typedef in statement.h. This means that the only remaining tagged union class is verbly::generator::part.

refs #5

1 files changed, 3 insertions, 7 deletions

@@ -3,12 +3,11 @@
 
 #include <stdexcept>
 #include <list>
+#include <hkutil/database.h>
 #include "field.h"
 #include "filter.h"
 #include "part.h"
 
-struct sqlite3_stmt;
-
 namespace verbly {
 
   class database;
@@ -22,7 +21,7 @@ namespace verbly {
 
     // Construct from database
 
-    frame(const database& db, sqlite3_stmt* row);
+    frame(const database& db, hatkirby::row row);
 
     // Accessors
 
@@ -101,15 +100,12 @@ namespace verbly {
     static field parts(int index);
 
   private:
-    bool valid_ = false;
 
+    bool valid_ = false;
     int id_;
     int groupId_;
     int length_;
     std::vector<part> parts_;
-
-    const database* db_;
-
   };
 
 };