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 654bac7bb7'>include/SDL_touch.h
blob: 9b00716b2a9ca1ac227a1d93f18efacd171e8f50 (plain) (blame) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142