summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--database.h2
-rw-r--r--litterbox.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/database.h b/database.h
index 1837a9f..d02bc28 100644
--- a/database.h
+++ b/database.h
@@ -266,7 +266,7 @@ static const char *InitSQL = SQL(
 		nick, user, target, message
 	FROM events
 	JOIN contexts USING (context)
-	JOIN names ON names.name = events.name;
+	JOIN names USING (name);
 
 	CREATE VIRTUAL TABLE search USING fts5 (
 		network, channel, query, nick, user, target, message,
diff --git a/litterbox.c b/litterbox.c
index af531ff..2ab2bf1 100644
--- a/litterbox.c
+++ b/litterbox.c
@@ -219,8 +219,8 @@ static void querySearch(struct Message *msg) {
 				highlight(search, 6, :bold, :bold),
 				events.event
 			FROM events
-			JOIN contexts ON contexts.context = events.context
-			JOIN names ON names.name = events.name
+			JOIN contexts USING (context)
+			JOIN names USING (name)
 			JOIN search ON search.rowid = events.event
 			WHERE contexts.network = :network
 				AND coalesce(contexts.query = :query, true)
>June McEnroe 2017-05-01Use EX_OK in pbcopyJune McEnroe 2017-04-30Clean up clockJune McEnroe 2017-04-30Clean up error strings in briJune McEnroe 2017-03-18Add -u option to xxJune McEnroe 2017-03-15Fix non-string-literal-format-string in briJune McEnroe 2017-03-15Fix bri compilationJune McEnroe 2017-03-15Use psvar for title settingJune McEnroe 2017-03-14Add bri brightness control scriptJune McEnroe 2017-03-14Add comment to tmux terminal overrideJune McEnroe 2017-03-13Have tmux set block cursor on linux consoleJune McEnroe 2017-03-13Use inverse for Visual in colorschemeJune McEnroe