diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-09-27 21:40:52 -0400 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-09-27 21:40:52 -0400 |
commit | 38c17f093615a16a4b4ec6dc2b5d3edb5c1d3895 (patch) | |
tree | 8da5a3d0eacf5e2fd04c33f57d592e4c1ca303ad /lib/frame.h | |
parent | 3a8bfa95a5df04d97f05545d5bb8df5f3c3f96a3 (diff) | |
download | verbly-38c17f093615a16a4b4ec6dc2b5d3edb5c1d3895.tar.gz verbly-38c17f093615a16a4b4ec6dc2b5d3edb5c1d3895.tar.bz2 verbly-38c17f093615a16a4b4ec6dc2b5d3edb5c1d3895.zip |
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
Diffstat (limited to 'lib/frame.h')
-rw-r--r-- | lib/frame.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/frame.h b/lib/frame.h index 5fa6c6b..3de1931 100644 --- a/lib/frame.h +++ b/lib/frame.h | |||
@@ -3,12 +3,11 @@ | |||
3 | 3 | ||
4 | #include <stdexcept> | 4 | #include <stdexcept> |
5 | #include <list> | 5 | #include <list> |
6 | #include <hkutil/database.h> | ||
6 | #include "field.h" | 7 | #include "field.h" |
7 | #include "filter.h" | 8 | #include "filter.h" |
8 | #include "part.h" | 9 | #include "part.h" |
9 | 10 | ||
10 | struct sqlite3_stmt; | ||
11 | |||
12 | namespace verbly { | 11 | namespace verbly { |
13 | 12 | ||
14 | class database; | 13 | class database; |
@@ -22,7 +21,7 @@ namespace verbly { | |||
22 | 21 | ||
23 | // Construct from database | 22 | // Construct from database |
24 | 23 | ||
25 | frame(const database& db, sqlite3_stmt* row); | 24 | frame(const database& db, hatkirby::row row); |
26 | 25 | ||
27 | // Accessors | 26 | // Accessors |
28 | 27 | ||
@@ -101,15 +100,12 @@ namespace verbly { | |||
101 | static field parts(int index); | 100 | static field parts(int index); |
102 | 101 | ||
103 | private: | 102 | private: |
104 | bool valid_ = false; | ||
105 | 103 | ||
104 | bool valid_ = false; | ||
106 | int id_; | 105 | int id_; |
107 | int groupId_; | 106 | int groupId_; |
108 | int length_; | 107 | int length_; |
109 | std::vector<part> parts_; | 108 | std::vector<part> parts_; |
110 | |||
111 | const database* db_; | ||
112 | |||
113 | }; | 109 | }; |
114 | 110 | ||
115 | }; | 111 | }; |