Add null and not null operators

Author: joelseq

examples/chi/main.go

@@ -26,7 +26,7 @@ func main() {
 
 	// Setup the handler for SQLiteAdmin
 	config := sqliteadmin.Config{
-		Db:       db,
+		DB:       db,
 		Username: "user",
 		Password: "password",
 		Logger:   logger,

examples/stdlib/stdlib.go

@@ -31,7 +31,7 @@ func main() {
 
 	mux.HandleFunc("/admin", func(w http.ResponseWriter, r *http.Request) {
 		if r.Method == "POST" {
-			sHandler.Handle(w, r)
+			sHandler.HandlePost(w, r)
 		}
 	})
 

queryhandlers.go

@@ -72,7 +72,7 @@ func (h *Handler) getTable(w http.ResponseWriter, params map[string]interface{})
 	h.logger.Info(fmt.Sprintf("Command: GetTable, table=%s, limit=%d, offset=%d", table, limit, offset))
 
 	var condition *Condition
-	conditionParam, ok := params["condition"].(interface{})
+	conditionParam, ok := params["condition"]
 	if ok {
 		condition, ok = toCondition(conditionParam, h.logger)
 		if !ok {
@@ -81,7 +81,7 @@ func (h *Handler) getTable(w http.ResponseWriter, params map[string]interface{})
 		}
 		h.logger.Debug(fmt.Sprintf("Condition provided: %v", condition))
 	} else {
-		h.logger.Debug(fmt.Sprintf("No condition provided"))
+		h.logger.Debug("No condition provided")
 	}
 
 	data, err := queryTable(h.db, table, condition, limit, offset, h.logger)
@@ -241,7 +241,7 @@ func queryTable(db *sql.DB, tableName string, condition *Condition, limit int, o
 
 	// Iterate through rows
 	for rows.Next() {
-		err := rows.Scan(scanArgs...)
+		err = rows.Scan(scanArgs...)
 		if err != nil {
 			return nil, fmt.Errorf("error scanning row: %v", err)
 		}
@@ -306,6 +306,10 @@ func getClause(filter Filter) string {
 		return fmt.Sprintf("%s > ?", filter.Column)
 	case OperatorGreaterThanOrEquals:
 		return fmt.Sprintf("%s >= ?", filter.Column)
+	case OperatorIsNull:
+		return fmt.Sprintf("%s IS NULL", filter.Column)
+	case OperatorIsNotNull:
+		return fmt.Sprintf("%s IS NOT NULL", filter.Column)
 	default:
 		return ""
 	}
@@ -390,7 +394,7 @@ func getTableInfo(db *sql.DB, tableName string) (map[string]interface{}, error)
 		var notNull int
 		var defaultValue interface{}
 		var pk int
-		if err := rows.Scan(&cid, &name, &dataType, &notNull, &defaultValue, &pk); err != nil {
+		if err = rows.Scan(&cid, &name, &dataType, &notNull, &defaultValue, &pk); err != nil {
 			return nil, fmt.Errorf("error scanning row: %v", err)
 		}
 

sqliteadmin.go

@@ -6,7 +6,6 @@ package sqliteadmin
 
 import (
 	"database/sql"
-	"embed"
 	"encoding/json"
 	"net/http"
 )
@@ -60,6 +59,8 @@ const (
 	OperatorLessThanOrEquals    Operator = "lte"
 	OperatorGreaterThan         Operator = "gt"
 	OperatorGreaterThanOrEquals Operator = "gte"
+	OperatorIsNull              Operator = "null"
+	OperatorIsNotNull           Operator = "notnull"
 )
 
 const (
@@ -72,10 +73,10 @@ const (
 
 const pathPrefixPlaceholder = "%%__path_prefix__%%"
 
-const DefaultLimit = 100
-const DefaultOffset = 0
-
-var indexHtml embed.FS
+const (
+	DefaultLimit  = 100
+	DefaultOffset = 0
+)
 
 type Logger interface {
 	Info(format string, args ...interface{})
@@ -91,7 +92,7 @@ const (
 )
 
 type Config struct {
-	Db       *sql.DB
+	DB       *sql.DB
 	Username string
 	Password string
 	Logger   Logger
@@ -100,12 +101,18 @@ type Config struct {
 // Creates a new HTTP handler which has a HandlePost method
 // that can be used to handle requests from https://sqliteadmin.dev.
 func NewHandler(c Config) *Handler {
-	return &Handler{
-		db:       c.Db,
+	h := &Handler{
+		db:       c.DB,
 		username: c.Username,
 		password: c.Password,
 		logger:   c.Logger,
 	}
+
+	if h.logger == nil {
+		h.logger = &defaultLogger{}
+	}
+
+	return h
 }
 
 type CommandRequest struct {
@@ -154,3 +161,13 @@ func (h *Handler) HandlePost(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "Invalid command", http.StatusBadRequest)
 	}
 }
+
+var _ Logger = &defaultLogger{}
+
+type defaultLogger struct{}
+
+func (l *defaultLogger) Info(format string, args ...interface{}) {}
+
+func (l *defaultLogger) Error(format string, args ...interface{}) {}
+
+func (l *defaultLogger) Debug(format string, args ...interface{}) {}