diff options
| author | Egil Moeller <egil.moller@freecode.no> | 2010-03-12 21:33:39 +0100 |
|---|---|---|
| committer | Egil Moeller <egil.moller@freecode.no> | 2010-03-12 21:33:39 +0100 |
| commit | 1d357551227a8e58eff504220de509ec82357095 (patch) | |
| tree | f90ec4b21406391144b1104b6e98ee1b403654ee /trunk | |
| parent | df45eab86aef9db943fabb43667f560bfd388f3b (diff) | |
| download | etherpad-1d357551227a8e58eff504220de509ec82357095.tar.gz etherpad-1d357551227a8e58eff504220de509ec82357095.tar.xz etherpad-1d357551227a8e58eff504220de509ec82357095.zip | |
Bugfix for queries with multiple negative tags
Diffstat (limited to 'trunk')
| -rw-r--r-- | trunk/etherpad/src/etherpad/control/tag/tag_control.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/trunk/etherpad/src/etherpad/control/tag/tag_control.js b/trunk/etherpad/src/etherpad/control/tag/tag_control.js index 56dd50b..bf9e9b2 100644 --- a/trunk/etherpad/src/etherpad/control/tag/tag_control.js +++ b/trunk/etherpad/src/etherpad/control/tag/tag_control.js @@ -76,7 +76,7 @@ function getQueryToSql(tags, antiTags, querySql) { ' join TAG AS t%(n)s on ' + ' t%(n)s.NAME = ? ' + ' and t%(n)s.ID = pt%(n)s.TAG_ID) on ' + - ' pt%(n)s.PAD_ID = p.ID', + ' pt%(n)s.PAD_ID = p.ID ', info)); whereArray.push(stringFormat('pt%(n)s.TAG_ID is null', info)); exceptParamArray.push(tag); @@ -96,9 +96,9 @@ function getQueryToSql(tags, antiTags, querySql) { info.n += 1; } - info["joins"] = joinArray.join(""); - info["excepts"] = exceptArray.join(""); - info["wheres"] = whereArray.length > 0 ? ' where ' + whereArray.join(' ') : ''; + info["joins"] = joinArray.join(' '); + info["excepts"] = exceptArray.join(' '); + info["wheres"] = whereArray.length > 0 ? ' where ' + whereArray.join(' and ') : ''; return { sql: stringFormat( |