1 files changed, 4 insertions, 11 deletions

@@ -10,20 +10,13 @@ namespace verbly {
   const std::list<std::string> lemma::select = {"lemma_id"};
 
   const field lemma::id = field::integerField(object::lemma, "lemma_id");
-
-  const field lemma::word = field::joinField(object::lemma, "lemma_id", object::word);
-
-  const field lemma::formJoin = field::joinField(object::lemma, "form_id", object::form);
   const field lemma::inflectionCategory = field::integerField(object::lemma, "category");
 
-  filter operator%=(lemma::inflection_field check, filter joinCondition)
-  {
-    return (lemma::formJoin %= joinCondition) && (lemma::inflectionCategory == check.getCategory());
-  }
+  const field lemma::word = field::joinField(object::lemma, "lemma_id", object::word);
 
-  lemma::inflection_field::operator filter() const
+  field lemma::form(inflection category)
   {
-    return (lemma::inflectionCategory == category_);
+    return field::joinWhere(object::lemma, "form_id", object::form, inflectionCategory, static_cast<int>(category));
   }
 
   lemma::lemma(const database& db, sqlite3_stmt* row) : db_(&db), valid_(true)
@@ -68,7 +61,7 @@ namespace verbly {
 
   void lemma::initializeForm(inflection infl) const
   {
-    forms_[infl] = db_->forms(form::lemma(infl) %= *this, false, -1).all();
+    forms_[infl] = db_->forms(form::lemma %= ((inflectionCategory == infl) && *this), verbly::form::id, -1).all();
   }
 
 };