Merge branch 'release/0.9.1'

Author: proofrock

.gitignore

@@ -2,7 +2,7 @@ src/ws4sqlite
 test/
 bin/
 .vscode/
-Snippets
+/notes
 
 # Created by https://www.toptal.com/developers/gitignore/api/go,visualstudiocode,macos,linux
 # Edit at https://www.toptal.com/developers/gitignore?templates=go,visualstudiocode,macos,linux

README.md

@@ -1,9 +1,13 @@
 # 🌱 ws4sqlite
 
-**ws4sqlite** is a server-side application that, applied to one or more SQLite files, gives the possibility to perform SQL queries and statements on them via REST (or better, JSON over HTTP).
+**ws4sqlite** is a server application that, applied to one or more SQLite files, allows to perform SQL queries and statements on them via REST (or better, JSON over HTTP).
 
 Possible use cases are the ones where remote access to a sqlite db is useful/needed, for example a data layer for a remote application, possibly serverless or even called from a web page (*after security considerations* of course).
 
+We are also building some client libraries that will abstract the "raw" JSON-based communication. See 
+[here](https://github.com/proofrock/ws4sqlite-client-jvm) for Java/JVM, [here](https://github.com/proofrock/ws4sqlite-client-go)
+for Go(lang); others will follow.
+
 As a quick example, after launching it on a file `mydatabase.db`, it's possible to make a POST call to `http://localhost:12321/mydatabase`, with the following body:
 
 ```json
@@ -41,9 +45,10 @@ Obtaining an answer of
 
 # Features
 
-[Docs](https://germ.gitbook.io/ws4sqlite/) and a [Tutorial](https://germ.gitbook.io/ws4sqlite/tutorial).
+[Docs](https://germ.gitbook.io/ws4sqlite/) and a [Tutorial](https://germ.gitbook.io/ws4sqlite/tutorial). Client library for [Java/JDK](https://github.com/proofrock/ws4sqlite-client-jvm).
 
 - A [**single executable file**](https://germ.gitbook.io/ws4sqlite/documentation/installation) (it's written in Go);
+- HTTP/JSON access, with [**client libraries**](https://germ.gitbook.io/ws4sqlite/client-libraries) for convenience;
 - Can load [**several databases**](https://germ.gitbook.io/ws4sqlite/documentation/configuration-file) at once, for convenience;
 - [**Batching**](https://germ.gitbook.io/ws4sqlite/documentation/requests#batch-parameter-values-for-a-statement) of multiple values set for a single statement;
 - All queries of a call are executed in a [**transaction**](https://germ.gitbook.io/ws4sqlite/documentation/requests);

src/go.mod

@@ -3,7 +3,7 @@ module ws4sqlite
 go 1.17
 
 require (
-	github.com/gofiber/fiber/v2 v2.25.0
+	github.com/gofiber/fiber/v2 v2.26.0
 	github.com/lnquy/cron v1.1.1
 	github.com/mattn/go-sqlite3 v1.14.10
 	github.com/mitchellh/go-homedir v1.1.0

src/go.sum

@@ -5,6 +5,8 @@ github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY
 github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/gofiber/fiber/v2 v2.25.0 h1:kv8dmG/sAFDFpTueCMEn4X0JS5d72pEFTKLZ3miOREw=
 github.com/gofiber/fiber/v2 v2.25.0/go.mod h1:7efVWcBOZi1PyMWznnbitjnARPA7nYZxmQXJVod0bo0=
+github.com/gofiber/fiber/v2 v2.26.0 h1:Awnfqp3fqbZzV3wZWMRJ6Xo2U8X0Ls68M7tXjx52NcM=
+github.com/gofiber/fiber/v2 v2.26.0/go.mod h1:7efVWcBOZi1PyMWznnbitjnARPA7nYZxmQXJVod0bo0=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
 github.com/klauspost/compress v1.14.1 h1:hLQYb23E8/fO+1u53d02A97a8UnsddcvYzq4ERRU4ds=

src/maintenance.go

@@ -38,7 +38,6 @@ const bkpTimeFormat = "060102-1504"
 var bkpTimeGlob = strings.Repeat("?", len(bkpTimeFormat))
 
 func doMaint(id string, mntCfg maintenance, db *sql.DB) func() {
-	mllog.Warn("Parsing for db ", id)
 	var bkpDir, bkpFile string
 	if mntCfg.DoBackup {
 		var err error

src/ws4sqlite.go

@@ -42,7 +42,7 @@ import (
 	"gopkg.in/yaml.v2"
 )
 
-const version = "0.9.0"
+const version = "0.9.1"
 
 // Catches the panics and converts the argument in a struct that Fiber uses to
 // signal the error, setting the response code and the JSON that is actually returned
@@ -282,7 +282,7 @@ func launch(cfg config, disableKeepAlive4Tests bool) {
 						db.Mutex.Lock() // When unauthenticated waits for 2s, and doesn't parallelize, to hinder brute force attacks
 						time.Sleep(2 * time.Second)
 						db.Mutex.Unlock()
-						mllog.Warnf("credentials not valid for user '%s'", user)
+						mllog.Errorf("credentials not valid for user '%s'", user)
 						return false
 					}
 					return true
@@ -487,17 +487,20 @@ func handler(c *fiber.Ctx) error {
 	}()
 
 	for i := range body.Transaction {
-		if body.Transaction[i].Query == "" && body.Transaction[i].Statement == "" {
-			ret.Results = reportError(errors.New("neither query nor statement specified"), fiber.StatusBadRequest, i, body.Transaction[i].NoFail, ret.Results)
+		if (body.Transaction[i].Query == "") == (body.Transaction[i].Statement == "") { // both null or both populated
+			ret.Results = reportError(errors.New("only one of query or statement must be provided"), fiber.StatusBadRequest, i, body.Transaction[i].NoFail, ret.Results)
 			continue
 		}
 
-		if body.Transaction[i].Query != "" && body.Transaction[i].Statement != "" {
-			ret.Results = reportError(errors.New("cannot specify both query and statement"), fiber.StatusBadRequest, i, body.Transaction[i].NoFail, ret.Results)
-			continue
+		hasResultSet := body.Transaction[i].Query != ""
+
+		if hasResultSet && body.Transaction[i].Encoder != nil {
+			ret.Results = reportError(errors.New("cannot specify an encoder for a query"), fiber.StatusBadRequest, i, body.Transaction[i].NoFail, ret.Results)
 		}
 
-		hasResultSet := body.Transaction[i].Query != ""
+		if !hasResultSet && body.Transaction[i].Decoder != nil {
+			ret.Results = reportError(errors.New("cannot specify a decoder for a statement"), fiber.StatusBadRequest, i, body.Transaction[i].NoFail, ret.Results)
+		}
 
 		if !hasResultSet {
 			body.Transaction[i].Query = body.Transaction[i].Statement