From 38c17f093615a16a4b4ec6dc2b5d3edb5c1d3895 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Thu, 27 Sep 2018 21:40:52 -0400 Subject: 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 --- lib/frame.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'lib/frame.cpp') diff --git a/lib/frame.cpp b/lib/frame.cpp index 2351973..51d6936 100644 --- a/lib/frame.cpp +++ b/lib/frame.cpp @@ -1,5 +1,4 @@ #include "frame.h" -#include #include "database.h" #include "query.h" @@ -24,11 +23,11 @@ namespace verbly { return field::joinWhere(object::frame, "frame_id", object::part, "part_index", index); } - frame::frame(const database& db, sqlite3_stmt* row) : db_(&db), valid_(true) + frame::frame(const database& db, hatkirby::row row) : valid_(true) { - id_ = sqlite3_column_int(row, 0); - groupId_ = sqlite3_column_int(row, 1); - length_ = sqlite3_column_int(row, 2); + id_ = mpark::get(row[0]); + groupId_ = mpark::get(row[1]); + length_ = mpark::get(row[2]); parts_ = db.parts(*this, verbly::part::index, -1).all(); } -- cgit 1.4.1