From f2731325f551c4cfea861e2e31d214936b9bd619 Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Fri, 9 Dec 2022 11:54:24 -0500 Subject: Merography and merophony appear to have been backwards --- lib/form.cpp | 4 ++-- lib/pronunciation.cpp | 4 ++-- lib/query.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/form.cpp b/lib/form.cpp index b5348cb..06a00b9 100644 --- a/lib/form.cpp +++ b/lib/form.cpp @@ -20,8 +20,8 @@ namespace verbly { const field form::anagrams = field::joinField(object::form, "anagram_set_id", object::form); - const field form::merographs = field::selfJoin(object::form, "form_id", "merography", "holograph_id", "merograph_id"); - const field form::holographs = field::selfJoin(object::form, "form_id", "merography", "merograph_id", "holograph_id"); + const field form::merographs = field::selfJoin(object::form, "form_id", "merography", "merograph_id", "holograph_id"); + const field form::holographs = field::selfJoin(object::form, "form_id", "merography", "holograph_id", "merograph_id"); field form::words(inflection category) { diff --git a/lib/pronunciation.cpp b/lib/pronunciation.cpp index 093e11a..856f891 100644 --- a/lib/pronunciation.cpp +++ b/lib/pronunciation.cpp @@ -20,8 +20,8 @@ namespace verbly { const field pronunciation::anaphones = field::joinField(object::pronunciation, "anaphone_set_id", object::pronunciation); - const field pronunciation::merophones = field::selfJoin(object::pronunciation, "pronunciation_id", "merophony", "holophone_id", "merophone_id"); - const field pronunciation::holophones = field::selfJoin(object::pronunciation, "pronunciation_id", "merophony", "merophone_id", "holophone_id"); + const field pronunciation::merophones = field::selfJoin(object::pronunciation, "pronunciation_id", "merophony", "merophone_id", "holophone_id"); + const field pronunciation::holophones = field::selfJoin(object::pronunciation, "pronunciation_id", "merophony", "holophone_id", "merophone_id"); const field pronunciation::rhymes_field::rhymeJoin = field::joinField(object::pronunciation, "rhyme", object::pronunciation); const pronunciation::rhymes_field pronunciation::rhymes = {}; diff --git a/lib/query.h b/lib/query.h index 09d7f1f..65b4e9d 100644 --- a/lib/query.h +++ b/lib/query.h @@ -43,9 +43,9 @@ namespace verbly { } statement stmt(Object::objectType, std::move(queryFilter)); + queryString_ = stmt.getQueryString(Object::select, std::move(sortOrder), limit); - bindings_ = stmt.getBindings(); } -- cgit 1.4.1