Made pronunciation::rhymes join dynamic

This involved adding a new type of filter; one that compares (currently
only equality and inequality) a field with another field located in an
enclosing join context.

In the process, it was discovered that simplifying the lemma::forms join
field earlier actually made some queries return inaccurate results
because the inflection of the form was being ignored and anything in the
lemma would be used because of the inner join. Because the existing
condition join did not allow for the condition field to be on the from
side of the join, two things were done: a condition version of
joinThrough was made, and lemma was finally eliminated as a top-level
object, replaced instead with a condition join between word and form
through lemmas_forms.

Queries are also now grouped by the first select field (assumed to be
the primary ID) of the top table, in order to eliminate duplicates
created by inner joins, so that there is a uniform distribution between
results for random queries.

Created a database index on pronunciations(rhyme) which decreases query
time for rhyming filters. The new database version is
backwards-compatible because no data or structure changed.

1 files changed, 39 insertions, 26 deletions

@@ -16,7 +16,6 @@ namespace verbly {
   const field word::adjectivePosition = field::integerField(object::word, "position", true);
 
   const field word::notions = field::joinField(object::word, "notion_id", object::notion);
-  const field word::lemmas = field::joinField(object::word, "lemma_id", object::lemma);
   const field word::frames = field::joinField(object::word, "group_id", object::frame, true);
 
   const field word::antonyms = field::selfJoin(object::word, "word_id", "antonymy", "antonym_2_id", "antonym_1_id");
@@ -39,6 +38,11 @@ namespace verbly {
   const field word::regionalTerms = field::selfJoin(object::word, "word_id", "regionality", "domain_id", "term_id");
   const field word::regionalDomains = field::selfJoin(object::word, "word_id", "regionality", "term_id", "domain_id");
 
+  field word::forms(inflection category)
+  {
+    return field::joinThroughWhere(object::word, "lemma_id", object::form, "lemmas_forms", "form_id", "category", static_cast<int>(category));
+  }
+
   word::word(const database& db, sqlite3_stmt* row) : db_(&db), valid_(true)
   {
     id_ = sqlite3_column_int(row, 0);
@@ -78,21 +82,6 @@ namespace verbly {
     return notion_;
   }
 
-  const lemma& word::getLemma() const
-  {
-    if (!valid_)
-    {
-      throw std::domain_error("Bad access to uninitialized word");
-    }
-
-    if (!lemma_)
-    {
-      lemma_ = db_->lemmas(lemma::id == lemmaId_).first();
-    }
-
-    return lemma_;
-  }
-
   bool word::hasFrames() const
   {
     if (!valid_)
@@ -133,26 +122,50 @@ namespace verbly {
     return frames_;
   }
 
-  std::string word::getBaseForm() const
+  void word::initializeFrames() const
   {
-    return getLemma().getBaseForm().getText();
+    initializedFrames_ = true;
+    frames_ = db_->frames(*this, {}, -1).all();
   }
 
-  std::vector<std::string> word::getInflections(inflection category) const
+  const form& word::getBaseForm() const
   {
-    std::vector<std::string> result;
-    for (const form& infl : getLemma().getInflections(category))
+    if (!valid_)
     {
-      result.push_back(infl.getText());
+      throw std::domain_error("Bad access to uninitialized word");
     }
 
-    return result;
+    if (!forms_.count(inflection::base))
+    {
+      initializeForm(inflection::base);
+    }
+
+    return forms_.at(inflection::base).front();
   }
 
-  void word::initializeFrames() const
+  bool word::hasInflection(inflection category) const
   {
-    initializedFrames_ = true;
-    frames_ = db_->frames(*this, {}, -1).all();
+    return !getInflections(category).empty();
+  }
+
+  const std::vector<form>& word::getInflections(inflection category) const
+  {
+    if (!valid_)
+    {
+      throw std::domain_error("Bad access to uninitialized word");
+    }
+
+    if (!forms_.count(category))
+    {
+      initializeForm(category);
+    }
+
+    return forms_.at(category);
+  }
+
+  void word::initializeForm(inflection infl) const
+  {
+    forms_[infl] = db_->forms(form::words(infl) %= *this, verbly::form::id, -1).all();
   }
 
 };