s4
changeset 566:2d1d651aa1f2
$DT_SQL handling fixed
author | HIROSE Yuuji <yuuji@gentei.org> |
---|---|
date | Thu, 18 Apr 2019 08:17:24 +0900 |
parents | b87e1cbf3491 |
children | 5b911fee7e1b |
files | s4-funcs.sh |
diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line diff
1.1 --- a/s4-funcs.sh Thu Apr 18 07:24:19 2019 +0900 1.2 +++ b/s4-funcs.sh Thu Apr 18 08:17:24 2019 +0900 1.3 @@ -3149,7 +3149,8 @@ 1.4 CREATE TEMPORARY TABLE _target AS 1.5 SELECT b.rowid trowid, b.id 1.6 FROM "$2" b JOIN "$2_s" s 1.7 - ON b.id=s.id AND s.key='owner' AND s.val=$DT_QOWNER; 1.8 + ON b.id=s.id AND s.key='owner' 1.9 + ${DT_QOWNER:+ AND s.val=$DT_QOWNER}; 1.10 1.11 CREATE TEMPORARY TABLE _children AS 1.12 SELECT a.trowid trowid, $_i, a.id, s.val ctime 1.13 @@ -3211,7 +3212,7 @@ 1.14 scols="$scols${scols:+, }b.$as" 1.15 done 1.16 #case author when '$user' then a.rowid else '---' end as ID, 1.17 - if [ -z "DT_SQL" ]; then 1.18 + if [ -n "$DT_SQL" ]; then 1.19 echo "$DT_SQL" 1.20 else 1.21 cat<<-EOF