diff options
| author | Star Rauchenberger <fefferburbia@gmail.com> | 2022-12-09 11:54:24 -0500 |
|---|---|---|
| committer | Star Rauchenberger <fefferburbia@gmail.com> | 2022-12-09 11:54:24 -0500 |
| commit | f2731325f551c4cfea861e2e31d214936b9bd619 (patch) | |
| tree | d239c9ea7ec8e38597936555b605362992502973 | |
| parent | 7ea3569e3894f19fbae6cfdb3406f2240570e3c1 (diff) | |
| download | verbly-f2731325f551c4cfea861e2e31d214936b9bd619.tar.gz verbly-f2731325f551c4cfea861e2e31d214936b9bd619.tar.bz2 verbly-f2731325f551c4cfea861e2e31d214936b9bd619.zip | |
Merography and merophony appear to have been backwards
| -rw-r--r-- | lib/form.cpp | 4 | ||||
| -rw-r--r-- | lib/pronunciation.cpp | 4 | ||||
| -rw-r--r-- | lib/query.h | 2 |
3 files changed, 5 insertions, 5 deletions
| 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 { | |||
| 20 | 20 | ||
| 21 | const field form::anagrams = field::joinField(object::form, "anagram_set_id", object::form); | 21 | const field form::anagrams = field::joinField(object::form, "anagram_set_id", object::form); |
| 22 | 22 | ||
| 23 | const field form::merographs = field::selfJoin(object::form, "form_id", "merography", "holograph_id", "merograph_id"); | 23 | const field form::merographs = field::selfJoin(object::form, "form_id", "merography", "merograph_id", "holograph_id"); |
| 24 | const field form::holographs = field::selfJoin(object::form, "form_id", "merography", "merograph_id", "holograph_id"); | 24 | const field form::holographs = field::selfJoin(object::form, "form_id", "merography", "holograph_id", "merograph_id"); |
| 25 | 25 | ||
| 26 | field form::words(inflection category) | 26 | field form::words(inflection category) |
| 27 | { | 27 | { |
| 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 { | |||
| 20 | 20 | ||
| 21 | const field pronunciation::anaphones = field::joinField(object::pronunciation, "anaphone_set_id", object::pronunciation); | 21 | const field pronunciation::anaphones = field::joinField(object::pronunciation, "anaphone_set_id", object::pronunciation); |
| 22 | 22 | ||
| 23 | const field pronunciation::merophones = field::selfJoin(object::pronunciation, "pronunciation_id", "merophony", "holophone_id", "merophone_id"); | 23 | const field pronunciation::merophones = field::selfJoin(object::pronunciation, "pronunciation_id", "merophony", "merophone_id", "holophone_id"); |
| 24 | const field pronunciation::holophones = field::selfJoin(object::pronunciation, "pronunciation_id", "merophony", "merophone_id", "holophone_id"); | 24 | const field pronunciation::holophones = field::selfJoin(object::pronunciation, "pronunciation_id", "merophony", "holophone_id", "merophone_id"); |
| 25 | 25 | ||
| 26 | const field pronunciation::rhymes_field::rhymeJoin = field::joinField(object::pronunciation, "rhyme", object::pronunciation); | 26 | const field pronunciation::rhymes_field::rhymeJoin = field::joinField(object::pronunciation, "rhyme", object::pronunciation); |
| 27 | const pronunciation::rhymes_field pronunciation::rhymes = {}; | 27 | 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 { | |||
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | statement stmt(Object::objectType, std::move(queryFilter)); | 45 | statement stmt(Object::objectType, std::move(queryFilter)); |
| 46 | |||
| 46 | queryString_ = | 47 | queryString_ = |
| 47 | stmt.getQueryString(Object::select, std::move(sortOrder), limit); | 48 | stmt.getQueryString(Object::select, std::move(sortOrder), limit); |
| 48 | |||
| 49 | 49 | ||
| 50 | bindings_ = stmt.getBindings(); | 50 | bindings_ = stmt.getBindings(); |
| 51 | } | 51 | } |