Merge branch 'release/0.15.1'

CHANGELOG.md

@@ -1,4 +1,10 @@
-## v 0.15.0
+## v0.15.1
+*2023-10-06, Venice*
+
+- Library updates
+- First version of [`sqliterg`](https://github.com/proofrock/sqliterg), the "spiritual successor" to `ws4sqlite`.
+
+## v0.15.0
 *2023-05-07, Windhoek*
 
 - Issue #29: Allow different path for db companion YAML file

Makefile

@@ -25,69 +25,69 @@ build-nostatic:
 zbuild-all:
 	make build-prepare
 	cd src; CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -trimpath
-	cd src; tar czf ../bin/ws4sqlite-v0.15.0-linux-amd64.tar.gz ws4sqlite
+	cd src; tar czf ../bin/ws4sqlite-v0.15.1-linux-amd64.tar.gz ws4sqlite
 	rm src/ws4sqlite
 	cd src; CGO_ENABLED=0 GOOS=linux GOARCH=arm go build -trimpath
-	cd src; tar czf ../bin/ws4sqlite-v0.15.0-linux-arm.tar.gz ws4sqlite
+	cd src; tar czf ../bin/ws4sqlite-v0.15.1-linux-arm.tar.gz ws4sqlite
 	rm src/ws4sqlite
 	cd src; CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -trimpath
-	cd src; tar czf ../bin/ws4sqlite-v0.15.0-linux-arm64.tar.gz ws4sqlite
+	cd src; tar czf ../bin/ws4sqlite-v0.15.1-linux-arm64.tar.gz ws4sqlite
 	rm src/ws4sqlite
 	cd src; CGO_ENABLED=0 GOOS=linux GOARCH=riscv64 go build -trimpath
-	cd src; tar czf ../bin/ws4sqlite-v0.15.0-linux-riscv64.tar.gz ws4sqlite
+	cd src; tar czf ../bin/ws4sqlite-v0.15.1-linux-riscv64.tar.gz ws4sqlite
 	rm src/ws4sqlite
 	cd src; CGO_ENABLED=0 GOOS=linux GOARCH=s390x go build -trimpath
-	cd src; tar czf ../bin/ws4sqlite-v0.15.0-linux-s390x.tar.gz ws4sqlite
+	cd src; tar czf ../bin/ws4sqlite-v0.15.1-linux-s390x.tar.gz ws4sqlite
 	rm src/ws4sqlite
 	cd src; CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -trimpath
-	cd src; zip -9 ../bin/ws4sqlite-v0.15.0-darwin-amd64.zip ws4sqlite
+	cd src; zip -9 ../bin/ws4sqlite-v0.15.1-darwin-amd64.zip ws4sqlite
 	rm src/ws4sqlite
 	cd src; CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -trimpath
-	cd src; zip -9 ../bin/ws4sqlite-v0.15.0-darwin-arm64.zip ws4sqlite
+	cd src; zip -9 ../bin/ws4sqlite-v0.15.1-darwin-arm64.zip ws4sqlite
 	rm src/ws4sqlite
 	cd src; CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -trimpath
-	cd src; zip -9 ../bin/ws4sqlite-v0.15.0-win-amd64.zip ws4sqlite.exe
+	cd src; zip -9 ../bin/ws4sqlite-v0.15.1-win-amd64.zip ws4sqlite.exe
 	rm src/ws4sqlite.exe
 	cd src; CGO_ENABLED=0 GOOS=windows GOARCH=arm64 go build -trimpath
-	cd src; zip -9 ../bin/ws4sqlite-v0.15.0-win-arm64.zip ws4sqlite.exe
+	cd src; zip -9 ../bin/ws4sqlite-v0.15.1-win-arm64.zip ws4sqlite.exe
 	rm src/ws4sqlite.exe
 	cd src; CGO_ENABLED=0 GOOS=freebsd GOARCH=amd64 go build -trimpath
-	cd src; tar czf ../bin/ws4sqlite-v0.15.0-freebsd-amd64.tar.gz ws4sqlite
+	cd src; tar czf ../bin/ws4sqlite-v0.15.1-freebsd-amd64.tar.gz ws4sqlite
 	rm src/ws4sqlite
 	cd src; CGO_ENABLED=0 GOOS=freebsd GOARCH=arm64 go build -trimpath
-	cd src; tar czf ../bin/ws4sqlite-v0.15.0-freebsd-arm64.tar.gz ws4sqlite
+	cd src; tar czf ../bin/ws4sqlite-v0.15.1-freebsd-arm64.tar.gz ws4sqlite
 	rm src/ws4sqlite
 
 test:
 	cd src; go test -v -timeout 6m
 
 docker:
-	sudo docker buildx build -f Dockerfile.containers --no-cache -t local_ws4sqlite:latest .
+	docker buildx build -f Dockerfile.containers --no-cache -t local_ws4sqlite:latest .
 
 docker-multiarch:
-	sudo docker run --privileged --rm tonistiigi/binfmt --install arm64,arm
-	sudo docker buildx build -f Dockerfile.containers --no-cache -t germanorizzo/ws4sqlite:v0.15.0-amd64 .
-	sudo docker buildx build -f Dockerfile.containers --no-cache --platform linux/arm/v7 -t germanorizzo/ws4sqlite:v0.15.0-arm .
-	sudo docker buildx build -f Dockerfile.containers --no-cache --platform linux/arm64/v8 -t germanorizzo/ws4sqlite:v0.15.0-arm64 .
+	docker run --privileged --rm tonistiigi/binfmt --install arm64,arm
+	docker buildx build -f Dockerfile.containers --no-cache -t germanorizzo/ws4sqlite:v0.15.1-amd64 .
+	docker buildx build -f Dockerfile.containers --no-cache --platform linux/arm/v7 -t germanorizzo/ws4sqlite:v0.15.1-arm .
+	docker buildx build -f Dockerfile.containers --no-cache --platform linux/arm64/v8 -t germanorizzo/ws4sqlite:v0.15.1-arm64 .
 
 docker-publish:
 	make docker-multiarch
-	sudo docker push germanorizzo/ws4sqlite:v0.15.0-amd64
-	sudo docker push germanorizzo/ws4sqlite:v0.15.0-arm
-	sudo docker push germanorizzo/ws4sqlite:v0.15.0-arm64
-	sudo docker manifest create -a germanorizzo/ws4sqlite:v0.15.0 germanorizzo/ws4sqlite:v0.15.0-amd64 germanorizzo/ws4sqlite:v0.15.0-arm germanorizzo/ws4sqlite:v0.15.0-arm64
-	sudo docker manifest push germanorizzo/ws4sqlite:v0.15.0
-	- sudo docker manifest rm germanorizzo/ws4sqlite:latest
-	sudo docker manifest create germanorizzo/ws4sqlite:latest germanorizzo/ws4sqlite:v0.15.0-amd64 germanorizzo/ws4sqlite:v0.15.0-arm germanorizzo/ws4sqlite:v0.15.0-arm64
-	sudo docker manifest push germanorizzo/ws4sqlite:latest
+	docker push germanorizzo/ws4sqlite:v0.15.1-amd64
+	docker push germanorizzo/ws4sqlite:v0.15.1-arm
+	docker push germanorizzo/ws4sqlite:v0.15.1-arm64
+	docker manifest create -a germanorizzo/ws4sqlite:v0.15.1 germanorizzo/ws4sqlite:v0.15.1-amd64 germanorizzo/ws4sqlite:v0.15.1-arm germanorizzo/ws4sqlite:v0.15.1-arm64
+	docker manifest push germanorizzo/ws4sqlite:v0.15.1
+	- docker manifest rm germanorizzo/ws4sqlite:latest
+	docker manifest create germanorizzo/ws4sqlite:latest germanorizzo/ws4sqlite:v0.15.1-amd64 germanorizzo/ws4sqlite:v0.15.1-arm germanorizzo/ws4sqlite:v0.15.1-arm64
+	docker manifest push germanorizzo/ws4sqlite:latest
 
 docker-devel:
-	sudo docker buildx build -f Dockerfile.containers --no-cache -t germanorizzo/ws4sqlite:edge .
-	sudo docker push germanorizzo/ws4sqlite:edge
+	docker buildx build -f Dockerfile.containers --no-cache -t germanorizzo/ws4sqlite:edge .
+	docker push germanorizzo/ws4sqlite:edge
 
 docker-test-and-zbuild-all:
-	sudo docker buildx build -f Dockerfile.binaries --target export -t tmp_binaries_build . --output bin
+	docker buildx build -f Dockerfile.binaries --target export -t tmp_binaries_build . --output bin
 
 docker-cleanup:
-	sudo docker builder prune -af
-	sudo docker image prune -af
+	docker builder prune -af
+	docker image prune -af

README.md

@@ -1,6 +1,10 @@
 # 🌱 ws4sqlite
 
-**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).
+> *This project has now a reimplementarion in Rust, called `sqliterg`, at [**sqliterg.dev**](https://docs.sqliterg.dev). It is not a 1:1 rewrite, but I tried to fix some concepts that I feel I got wrong here; plus it's smaller, (even) faster, (even) less memory-hungry and it can be built with an embedded sqlite or using the one on the system. You should feel at home with it, anyway a [migration guide is here](https://docs.sqliterg.dev/features/migrating-from-ws4sqlite).*
+
+> *`ws4sqlite` is **not really** deprecated, it will continue to receive libraries updates (about monthly), but probably not new features.*
+
+**`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).
 

src/go.mod

@@ -3,47 +3,43 @@ module github.com/proofrock/ws4sqlite
 go 1.20
 
 require (
-	github.com/gofiber/fiber/v2 v2.44.0
+	github.com/gofiber/fiber/v2 v2.49.2
 	github.com/lnquy/cron v1.1.1
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/proofrock/crypgo v1.2.1
 	github.com/proofrock/go-mylittlelogger v0.4.0
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/wI2L/jettison v0.7.4
 	gopkg.in/yaml.v2 v2.4.0
-	modernc.org/sqlite v1.22.1
+	modernc.org/sqlite v1.26.0
 )
 
 require (
 	github.com/andybalholm/brotli v1.0.5 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/uuid v1.3.1 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
-	github.com/klauspost/compress v1.16.5 // indirect
+	github.com/klauspost/compress v1.17.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.18 // indirect
-	github.com/mattn/go-runewidth v0.0.14 // indirect
-	github.com/philhofer/fwd v1.1.2 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
-	github.com/savsgio/dictpool v0.0.0-20221023140959-7bf2e61cea94 // indirect
-	github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee // indirect
-	github.com/tinylib/msgp v1.1.8 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasthttp v1.47.0 // indirect
+	github.com/valyala/fasthttp v1.50.0 // indirect
 	github.com/valyala/tcplisten v1.0.0 // indirect
-	golang.org/x/crypto v0.8.0 // indirect
-	golang.org/x/mod v0.10.0 // indirect
-	golang.org/x/sys v0.8.0 // indirect
-	golang.org/x/tools v0.8.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
+	golang.org/x/mod v0.13.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/tools v0.14.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	lukechampine.com/uint128 v1.3.0 // indirect
-	modernc.org/cc/v3 v3.40.0 // indirect
-	modernc.org/ccgo/v3 v3.16.13 // indirect
-	modernc.org/libc v1.22.5 // indirect
-	modernc.org/mathutil v1.5.0 // indirect
-	modernc.org/memory v1.5.0 // indirect
+	modernc.org/cc/v3 v3.41.0 // indirect
+	modernc.org/ccgo/v3 v3.16.15 // indirect
+	modernc.org/libc v1.24.1 // indirect
+	modernc.org/mathutil v1.6.0 // indirect
+	modernc.org/memory v1.7.2 // indirect
 	modernc.org/opt v0.1.3 // indirect
-	modernc.org/strutil v1.1.3 // indirect
+	modernc.org/strutil v1.2.0 // indirect
 	modernc.org/token v1.1.0 // indirect
 )