1 files changed, 2 insertions, 14 deletions

@@ -16,11 +16,9 @@ namespace verbly {
   const field form::complexity = field::integerField(object::form, "complexity");
   const field form::proper = field::booleanField(object::form, "proper");
 
+  const field form::lemma = field::joinField(object::form, "form_id", object::lemma);
   const field form::pronunciation = field::joinThrough(object::form, "form_id", object::pronunciation, "forms_pronunciations", "pronunciation_id");
 
-  const field form::lemmaJoin = field::joinField(object::form, "form_id", object::lemma);
-  const field form::inflectionCategory = field::integerField("lemmas_forms", "category");
-
   form::form(const database& db, sqlite3_stmt* row) : db_(&db), valid_(true)
   {
     id_ = sqlite3_column_int(row, 0);
@@ -29,16 +27,6 @@ namespace verbly {
     proper_ = (sqlite3_column_int(row, 3) == 1);
   }
 
-  filter operator%=(form::inflection_field check, filter joinCondition)
-  {
-    return (form::lemmaJoin %= (joinCondition && (form::inflectionCategory == check.getCategory())));
-  }
-
-  form::inflection_field::operator filter() const
-  {
-    return (form::lemmaJoin %= (form::inflectionCategory == category_));
-  }
-
   const std::vector<pronunciation>& form::getPronunciations() const
   {
     if (!valid_)
@@ -48,7 +36,7 @@ namespace verbly {
 
     if (!initializedPronunciations_)
     {
-      pronunciations_ = db_->pronunciations(pronunciation::form %= *this, false, -1).all();
+      pronunciations_ = db_->pronunciations(pronunciation::form %= *this, verbly::pronunciation::id, -1).all();
       initializedPronunciations_ = true;
     }