api, cypress, live: Add cypress tests for live databases

Author: justinclift

api/handlers.go

@@ -157,7 +157,7 @@ func columnsHandler(w http.ResponseWriter, r *http.Request) {
 			}
 		}
 		if !tableOrViewFound {
-			jsonErr(w, "Provided table or view name doesn't exist in this database", http.StatusInternalServerError)
+			jsonErr(w, "Provided table or view name doesn't exist in this database", http.StatusBadRequest)
 			return
 		}
 
@@ -186,6 +186,14 @@ func columnsHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 		if resp.Error != "" {
+			if resp.ErrCode == com.AMQPRequestedTableNotPresent {
+				// The AMQP backend said the requested table name isn't in the database.  So, user error rather than
+				// an "internal server error"
+				jsonErr(w, com.AMQPErrorString(resp.ErrCode), http.StatusBadRequest)
+				return
+			}
+
+			// Some other error occurred, so pass it back to the user
 			err = errors.New(resp.Error)
 			jsonErr(w, err.Error(), http.StatusInternalServerError)
 			return

common/errorcodes.go

@@ -0,0 +1,23 @@
+package common
+
+// A set of error codes returned by the AMQP back end.  We use these so we can
+// change the user facing text as desired without having to worry about
+// potentially breaking the AMQP communication interface
+
+type AMQPErrorCode int
+
+const (
+	AMQPNoError AMQPErrorCode = iota
+	AMQPRequestedTableNotPresent
+)
+
+func AMQPErrorString(errCode AMQPErrorCode) string {
+	switch errCode {
+	case AMQPNoError:
+		return "no error"
+	case AMQPRequestedTableNotPresent:
+		return "Provided table or view name doesn't exist in this database"
+	default:
+		return "unknown error"
+	}
+}

common/live.go

@@ -31,6 +31,7 @@ type LiveDBColumnsResponse struct {
 	Node    string          `json:"node"`
 	Columns []sqlite.Column `json:"columns"`
 	Error   string          `json:"error"`
+	ErrCode AMQPErrorCode   `json:"error_code"`
 }
 
 // LiveDBErrorResponse holds just the node name and any error message used in responses by our AMQP backend

common/sqlite.go

@@ -972,7 +972,7 @@ func SQLiteExecuteQueryLive(baseDir, dbOwner, dbName, loggedInUser, query string
 }
 
 // SQLiteGetColumnsLive is used by our AMQP backend nodes to retrieve the list of columns from a SQLite database
-func SQLiteGetColumnsLive(baseDir, dbOwner, dbName, table string) (columns []sqlite.Column, err error) {
+func SQLiteGetColumnsLive(baseDir, dbOwner, dbName, table string) (columns []sqlite.Column, err error, errCode AMQPErrorCode) {
 	// Open the database on the local node
 	var sdb *sqlite.Conn
 	sdb, err = OpenSQLiteDatabaseLive(baseDir, dbOwner, dbName)
@@ -995,6 +995,7 @@ func SQLiteGetColumnsLive(baseDir, dbOwner, dbName, table string) (columns []sql
 	}
 	if !tableOrViewFound {
 		err = errors.New("Provided table or view name doesn't exist in this database")
+		errCode = AMQPRequestedTableNotPresent
 		return
 	}