static query

Author: assafmo

README.md

@@ -75,6 +75,9 @@ curl "http://$ADDRESS:$PORT/query" -d "$PARAM_1,$PARAM_2,...,$PARAM_N"
 - Request body must not have a CSV header.
 - Each request body line is a different query.
 - Each param in a line corresponds to a query param (a question mark in the query string).
+- Static query (without any query params):
+  - The request must be a HTTP GET to "http://$ADDRESS:$PORT/query".
+  - The query executes only once.
 
 ## Getting a response
 
@@ -109,3 +112,30 @@ echo -e "github.com\none.one.one.one\ngoogle-public-dns-a.google.com" | curl "ht
   - Has an "headers" field which is an array of headers of the SQL query result.
   - Has an "out" field which is an array of arrays of results. Each inner array is a result row.
 - Element #1 is the result of query #1, Element #2 is the result of query #2, and so forth.
+- Static query (without any query params):
+  - The response JSON has only one element.
+
+## Static query
+
+```bash
+SQLiteQueryServer --db ./test_db/ip_dns.db --query "SELECT * FROM ip_dns" --port 8080
+```
+
+```bash
+curl "http://localhost:8080/query"
+```
+
+```json
+[
+  {
+    "in": [],
+    "headers": ["ip", "dns"],
+    "out": [
+      ["1.1.1.1", "one.one.one.one"],
+      ["8.8.8.8", "google-public-dns-a.google.com"],
+      ["192.30.253.112", "github.com"],
+      ["192.30.253.113", "github.com"]
+    ]
+  }
+]
+```

main.go

@@ -11,6 +11,7 @@ import (
 	"os"
 	"regexp"
 	"strconv"
+	"strings"
 
 	json "github.com/json-iterator/go"
 	_ "github.com/mattn/go-sqlite3"
@@ -26,6 +27,7 @@ func main() {
 
 func cmd(cmdArgs []string) error {
 	log.Printf("SQLiteQueryServer v%s\n", version)
+	log.Println("https://github.com/assafmo/SQLiteQueryServer")
 
 	// Parse cmd args
 	var flagSet = flag.NewFlagSet("cmd flags", flag.ContinueOnError)
@@ -102,26 +104,38 @@ func initQueryHandler(dbPath string, queryString string, serverPort uint) (func(
 			http.Error(w, helpMessage, http.StatusNotFound)
 			return
 		}
-		if r.Method != "POST" {
+		if r.Method != "POST" && r.Method != "GET" {
 			http.Error(w, helpMessage, http.StatusMethodNotAllowed)
 			return
 		}
 
 		// Init fullResponse
 		fullResponse := []queryResult{}
 
-		reqCsvReader := csv.NewReader(r.Body)
+		var reqCsvReader *csv.Reader
+		if r.Method == "GET" {
+			// Static query
+			reqCsvReader = csv.NewReader(strings.NewReader(""))
+		} else {
+			// Parameterized query
+			reqCsvReader = csv.NewReader(r.Body)
+		}
 		reqCsvReader.FieldsPerRecord = -1
 
 		// Iterate over each query
 		for {
 			csvRecord, err := reqCsvReader.Read()
-			if err == io.EOF || err == http.ErrBodyReadAfterClose {
-				// EOF || last line is without \n
-				break
-			} else if err != nil {
-				http.Error(w, fmt.Sprintf("\n\nError reading request body: %v\n\n%s", err, helpMessage), http.StatusInternalServerError)
-				return
+			if r.Method == "POST" {
+				// Parameterized query
+				if err == io.EOF || err == http.ErrBodyReadAfterClose {
+					// EOF || last line is without \n
+					break
+				} else if err != nil {
+					http.Error(w, fmt.Sprintf("\n\nError reading request body: %v\n\n%s", err, helpMessage), http.StatusInternalServerError)
+					return
+				}
+			} else {
+				csvRecord = make([]string, 0)
 			}
 
 			// Init queryResponse
@@ -177,6 +191,11 @@ func initQueryHandler(dbPath string, queryString string, serverPort uint) (func(
 			}
 
 			fullResponse = append(fullResponse, queryResponse)
+
+			if r.Method == "GET" {
+				// Static query - execute only once
+				break
+			}
 		}
 
 		// Return json
@@ -221,8 +240,11 @@ func buildHelpMessage(helpMessage string, queryString string, queryStmt *sql.Stm
 	- Request body must not have a CSV header.
 	- Each request body line is a different query.
 	- Each param in a line corresponds to a query param (a question mark in the query string).
+	- Static query (without any query params):
+		- The request must be a HTTP GET to "http://$ADDRESS:%d/query".
+		- The query executes only once.
 
-`, serverPort, serverPort, serverPort)
+`, serverPort, serverPort, serverPort, serverPort)
 
 	helpMessage += fmt.Sprintf(`Response example:
 	$ echo -e "github.com\none.one.one.one\ngoogle-public-dns-a.google.com" | curl "http://$ADDRESS:%d/query" --data-binary @-
@@ -258,6 +280,10 @@ func buildHelpMessage(helpMessage string, queryString string, queryStmt *sql.Stm
 		- Has an "headers" fields which is an array of headers of the SQL query result.
 		- Has an "out" field which is an array of arrays of results. Each inner array is a result row.
 	- Element #1 is the result of query #1, Element #2 is the result of query #2, and so forth.
+	- Static query (without any query params):
+		- The response JSON has only one element.
+
+For more info visit https://github.com/assafmo/SQLiteQueryServer
 `, serverPort)
 
 	return helpMessage

main_test.go

@@ -252,60 +252,49 @@ func TestMoreThanOneParam(t *testing.T) {
 	compare(t, fullResponse, expectedResponse)
 }
 
-// func TestZeroParams(t *testing.T) {
-// 	log.SetOutput(&bytes.Buffer{})
-
-// 	reqString := "\n"
-
-// 	req := httptest.NewRequest("POST",
-// 		"http://example.org/query",
-// 		strings.NewReader(reqString))
-// 	w := httptest.NewRecorder()
-// 	queryHandler, err := initQueryHandler(testDbPath,
-// 		"SELECT * FROM ip_dns",
-// 		0)
-// 	if err != nil {
-// 		t.Fatal(err)
-// 	}
-// 	queryHandler(w, req)
-
-// 	resp := w.Result()
-// 	defer resp.Body.Close()
-
-// 	if resp.StatusCode != http.StatusOK {
-// 		t.Fatalf(`resp.StatusCode (%d) != http.StatusOK (%d)`, resp.StatusCode, http.StatusOK)
-// 	}
-
-// 	if resp.Header.Get("Content-Type") != "application/json" {
-// 		t.Fatalf(`resp.Header.Get("Content-Type") (%s) != "application/json"`, resp.Header.Get("Content-Type"))
-// 	}
-
-// 	var answer []httpAnswer
-// 	decoder := json.NewDecoder(resp.Body)
-// 	err = decoder.Decode(&answer)
-// 	if err != nil {
-// 		t.Fatal(err)
-// 	}
-
-// 	expectedResponse := []httpAnswer{
-// 		httpAnswer{
-// 			Out: [][]interface{}{
-// 				[]interface{}{"1.1.1.1", "one.one.one.one"},
-// 				[]interface{}{"8.8.8.8", "google-public-dns-a.google.com"},
-// 				[]interface{}{"192.30.253.112", "github.com"},
-// 				[]interface{}{"192.30.253.113", "github.com"},
-// 			}},
-// 		httpAnswer{
-// 			Out: [][]interface{}{
-// 				[]interface{}{"1.1.1.1", "one.one.one.one"},
-// 				[]interface{}{"8.8.8.8", "google-public-dns-a.google.com"},
-// 				[]interface{}{"192.30.253.112", "github.com"},
-// 				[]interface{}{"192.30.253.113", "github.com"},
-// 			}},
-// 	}
-
-// 	compare(t, answer, expectedResponse)
-// }
+func TestZeroParams(t *testing.T) {
+	log.SetOutput(&bytes.Buffer{})
+
+	req := httptest.NewRequest("GET",
+		"http://example.org/query",
+		nil)
+	w := httptest.NewRecorder()
+	queryHandler, err := initQueryHandler(testDbPath, "SELECT * FROM ip_dns", 0)
+	if err != nil {
+		t.Fatal(err)
+	}
+	queryHandler(w, req)
+
+	resp := w.Result()
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		t.Fatalf(`resp.StatusCode (%d) != http.StatusOK (%d)`, resp.StatusCode, http.StatusOK)
+	}
+
+	if resp.Header.Get("Content-Type") != "application/json" {
+		t.Fatalf(`resp.Header.Get("Content-Type") (%s) != "application/json"`, resp.Header.Get("Content-Type"))
+	}
+
+	var answer []queryResult
+	decoder := json.NewDecoder(resp.Body)
+	err = decoder.Decode(&answer)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	expectedResponse := []queryResult{
+		queryResult{
+			Out: [][]interface{}{
+				[]interface{}{"1.1.1.1", "one.one.one.one"},
+				[]interface{}{"8.8.8.8", "google-public-dns-a.google.com"},
+				[]interface{}{"192.30.253.112", "github.com"},
+				[]interface{}{"192.30.253.113", "github.com"},
+			}},
+	}
+
+	compare(t, answer, expectedResponse)
+}
 
 func compare(t *testing.T, answer []queryResult, expectedResponse []queryResult) {
 	for i, v := range expectedResponse {
@@ -386,7 +375,7 @@ func TestBadPathRequest(t *testing.T) {
 func TestBadMethodRequest(t *testing.T) {
 	log.SetOutput(&bytes.Buffer{})
 
-	req := httptest.NewRequest("GET",
+	req := httptest.NewRequest("PUT",
 		"http://example.org/query",
 		nil)
 	w := httptest.NewRecorder()