git.shiar.nl
/
sheet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ac35af3
)
word: untranslated form column fallback
author
Mischa POSLAWSKY
<perl@shiar.org>
Mon, 6 Jun 2022 14:45:51 +0000
(16:45 +0200)
committer
Mischa POSLAWSKY
<perl@shiar.org>
Mon, 11 Jul 2022 02:02:34 +0000
(
04:02
+0200)
tools/word.pg.sql
patch
|
blob
|
history
diff --git
a/tools/word.pg.sql
b/tools/word.pg.sql
index 6647370b1d2c3a17994209ffec05cf3db01ee3c0..9f6bd41769a1b715b8f81f45f1dffb7254b15248 100644
(file)
--- a/
tools/word.pg.sql
+++ b/
tools/word.pg.sql
@@
-81,18
+81,19
@@
CREATE OR REPLACE VIEW _word_ref AS
CREATE OR REPLACE VIEW _word_tree AS
WITH RECURSIVE r AS (
CREATE OR REPLACE VIEW _word_tree AS
WITH RECURSIVE r AS (
- SELECT w.ref, w.lang, w.cat, w.grade, NULL::int trans
+ SELECT w.ref, w.lang, w.cat, w.grade,
w.form,
NULL::int trans
FROM _word_ref w
UNION ALL
SELECT r.ref, r.lang, w.cat,
CASE WHEN w.lang=r.lang OR t.lang=r.lang THEN r.grade ELSE w.grade END,
FROM _word_ref w
UNION ALL
SELECT r.ref, r.lang, w.cat,
CASE WHEN w.lang=r.lang OR t.lang=r.lang THEN r.grade ELSE w.grade END,
+ CASE WHEN w.lang=r.lang OR t.lang=r.lang THEN r.form ELSE w.form END,
CASE WHEN w.lang=r.lang OR t.lang=r.lang THEN w.id END
FROM r JOIN word w ON w.id = r.cat
LEFT JOIN word t ON w.id = t.ref AND t.lang = r.lang
WHERE r.trans IS NULL
)
CASE WHEN w.lang=r.lang OR t.lang=r.lang THEN w.id END
FROM r JOIN word w ON w.id = r.cat
LEFT JOIN word t ON w.id = t.ref AND t.lang = r.lang
WHERE r.trans IS NULL
)
- SELECT ref, lang, trans cat, grade FROM r WHERE trans IS NOT NULL
- ORDER BY cat, grade, ref;
+ SELECT ref, lang, trans cat, grade
, form
FROM r WHERE trans IS NOT NULL
+ ORDER BY cat, grade,
form,
ref;
CREATE OR REPLACE VIEW _word AS
SELECT
CREATE OR REPLACE VIEW _word AS
SELECT