Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-08 01:16:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use coalesce for optional columns

Browse Source 
resolves #851
This commit is contained in:
Nico de Haen
2019-11-17 16:19:51 +01:00
committed by holger krekel
parent ad852161f3
commit d7c42f3c98
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/location.rs
View File

@@ -304,16 +304,15 @@ pub fn get_range(
if timestamp_to == 0 { if timestamp_to == 0 {
timestamp_to = time() + 10; timestamp_to = time() + 10;
} }
context context
.sql .sql
.query_map( .query_map(
"SELECT l.id, l.latitude, l.longitude, l.accuracy, l.timestamp, l.independent, \ "SELECT l.id, l.latitude, l.longitude, l.accuracy, l.timestamp, l.independent, \
m.id, l.from_id, l.chat_id, m.txt \ COALESCE(m.id, 0) AS msg_id, l.from_id, l.chat_id, COALESCE(m.txt, '') AS txt \
FROM locations l LEFT JOIN msgs m ON l.id=m.location_id WHERE (? OR l.chat_id=?) \ FROM locations l LEFT JOIN msgs m ON l.id=m.location_id WHERE (? OR l.chat_id=?) \
AND (? OR l.from_id=?) \ AND (? OR l.from_id=?) \
AND (l.independent=1 OR (l.timestamp>=? AND l.timestamp<=?)) \ AND (l.independent=1 OR (l.timestamp>=? AND l.timestamp<=?)) \
ORDER BY l.timestamp DESC, l.id DESC, m.id DESC;", ORDER BY l.timestamp DESC, l.id DESC, msg_id DESC;",
params![ params![
if chat_id == 0 { 1 } else { 0 }, if chat_id == 0 { 1 } else { 0 },
chat_id as i32, chat_id as i32,
@@ -330,7 +329,6 @@ pub fn get_range(
} else { } else {
None None
}; };
let loc = Location { let loc = Location {
location_id: row.get(0)?, location_id: row.get(0)?,
latitude: row.get(1)?, latitude: row.get(1)?,