Browse Source

Update web/search for DB constant

master
Dylan Baker 4 years ago
parent
commit
88eae898ed
2 changed files with 7 additions and 9 deletions
  1. 6
    9
      lib/search.rb
  2. 1
    0
      web/server.rb

+ 6
- 9
lib/search.rb View File

@@ -1,9 +1,6 @@
1 1
 require 'sequel'
2 2
 
3
-require_relative '../db/connect'
4
-
5 3
 def search(params)
6
-  db = connect
7 4
   query = params[:q].strip
8 5
   offset = (params[:page] - 1) * 10
9 6
   username = params[:username].strip
@@ -18,16 +15,16 @@ def search(params)
18 15
       else
19 16
         'created_at DESC'
20 17
       end
21
-    search_threads(db, query, username, sort, offset)
18
+    search_threads(query, username, sort, offset)
22 19
   when 'posts'
23
-    search_posts(db, query, username, offset)
20
+    search_posts(query, username, offset)
24 21
   else
25 22
     Array.new
26 23
   end
27 24
 end
28 25
 
29
-def search_threads(db, query, username, sort, offset)
30
-  db[<<-SQL, query, username, username, offset]
26
+def search_threads(query, username, sort, offset)
27
+  DB[<<-SQL, query, username, username, offset]
31 28
     SELECT
32 29
       threads.*
33 30
     FROM threads
@@ -40,8 +37,8 @@ def search_threads(db, query, username, sort, offset)
40 37
   SQL
41 38
 end
42 39
 
43
-def search_posts(db, query, username, offset)
44
-  db[<<-SQL, query, username, username, offset]
40
+def search_posts(query, username, offset)
41
+  DB[<<-SQL, query, username, username, offset]
45 42
     SELECT
46 43
       posts.*,
47 44
       threads.title as thread_title,

+ 1
- 0
web/server.rb View File

@@ -2,6 +2,7 @@ require 'dotenv/load'
2 2
 require 'sequel'
3 3
 require 'sinatra'
4 4
 
5
+require_relative '../db/connect'
5 6
 require_relative '../lib/auth'
6 7
 require_relative '../lib/search'
7 8
 

Loading…
Cancel
Save