[refactor] backdates go-sqlite, fixes reference inconsistencies

Author: Boolean-Autocrat

.github/workflows/ci.yml

@@ -1,23 +1,80 @@
-name: CI
+name: Go
 
 on: [push, pull_request]
 
 jobs:
-  build:
+  test:
+    name: Test
+    runs-on: ${{ matrix.os }}
+    defaults:
+      run:
+        shell: bash
     strategy:
       matrix:
-        go-version: [1.13.x, 1.14.x, 1.15.x]
-        platform: [ubuntu-latest]
-    runs-on: ${{ matrix.platform }}
+        os: [ubuntu-latest, macos-latest]
+        go: ['1.22', '1.23']
+      fail-fast: false
+    env:
+      OS: ${{ matrix.os }}
+      GO: ${{ matrix.go }}
     steps:
-    - name: Install Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: ${{ matrix.go-version }}
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - name: Test
-      run: |
-        go get github.com/frankbraun/gocheck
-        export PATH=$GOPATH/bin:$PATH
-        make test
+      - uses: actions/setup-go@v5
+        with:
+          go-version: ${{ matrix.go }}
+      - if: startsWith(matrix.os, 'macos')
+        run: brew update
+      - name: Get Build Tools
+        run: |
+          go install github.com/ory/go-acc@latest
+      - name: Add $GOPATH/bin to $PATH
+        run: |
+          echo "$(go env GOPATH)/bin" >> "$GITHUB_PATH"
+      - uses: actions/checkout@v4
+      - name: Test
+        run: |
+          go-acc . -- -race -v -tags "sqlite_allow_uri_authority sqlite_app_armor sqlite_column_metadata sqlite_foreign_keys sqlite_fts5 sqlite_introspect sqlite_json sqlite_math_functions sqlite_os_trace sqlite_preupdate_hook sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_trace sqlite_unlock_notify sqlite_vacuum_incr sqlite_vtable"
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          env_vars: OS,GO
+          file: coverage.txt
+
+  test-windows:
+    name: Test for Windows
+    runs-on: windows-latest
+    defaults:
+      run:
+        shell: bash
+    strategy:
+      matrix:
+        go: ['1.21', '1.22']
+      fail-fast: false
+    env:
+      OS: windows-2019
+      GO: ${{ matrix.go }}
+    steps:
+      - uses: msys2/setup-msys2@v2
+        with:
+          update: true
+          install: mingw-w64-x86_64-toolchain mingw-w64-x86_64-sqlite3 mingw-w64-x86_64-sqlcipher mingw-w64-x86_64-icu
+          msystem: MINGW64
+          path-type: inherit
+      - uses: actions/setup-go@v5
+        with:
+          go-version: ${{ matrix.go }}
+      - name: Get Build Tools
+        run: |
+          go install github.com/ory/go-acc@latest
+      - name: Add $GOPATH/bin to $PATH
+        run: |
+          echo "$(go env GOPATH)/bin" >> "$GITHUB_PATH"
+        shell: msys2 {0}
+      - uses: actions/checkout@v4
+      - name: 'Test'
+        run: go-acc . -- -race -v -tags "sqlite_allow_uri_authority sqlite_app_armor sqlite_column_metadata sqlite_foreign_keys sqlite_fts5 sqlite_introspect sqlite_json sqlite_math_functions sqlite_os_trace sqlite_preupdate_hook sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_trace sqlite_unlock_notify sqlite_vacuum_incr sqlite_vtable"
+        shell: msys2 {0}
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          env_vars: OS,GO
+          file: coverage.txt

MAINTENANCE

@@ -9,15 +9,15 @@ tracked for changes (maintenance details below):
 Update code from https://github.com/mattn/go-sqlite3
 ----------------------------------------------------
 
-Current release: v1.14.5
+Current release: master
 
 Use ./track_go-sqlite3.sh
 
 
 Update code from https://github.com/sqlcipher/sqlcipher
 -------------------------------------------------------
 
-Current release: v4.4.2
+Current release: v4.6.1
 
 Execute:
 ./configure
@@ -31,7 +31,7 @@ sqlite3.c
 Update code from https://github.com/libtom/libtomcrypt
 ------------------------------------------------------
 
-Current HEAD: cfbd7f8d364e1438555ff2a247f7e17add11840e
+Current HEAD: develop
 (from develop branch, 2020-08-29)
 
 Use ./track_libtomcrypt.sh

README.md

@@ -1,15 +1,15 @@
 ## go-sqlcipher
 
-[![GoDoc](http://img.shields.io/badge/go-documentation-blue.svg?style=flat-square)](http://godoc.org/github.com/Boolean-Autocrat/go-sqlcipher)
+[![GoDoc](http://img.shields.io/badge/go-documentation-blue.svg?style=flat-square)](http://godoc.org/github.com/mutecomm/go-sqlcipher) [![CI](https://github.com/mutecomm/go-sqlcipher/workflows/CI/badge.svg)](https://github.com/mutecomm/go-sqlcipher/actions)
 
 ### Description
 
 Self-contained Go sqlite3 driver with an AES-256 encrypted sqlite3 database
 conforming to the built-in database/sql interface. It is based on:
 
-- Go sqlite3 driver: https://github.com/mattn/go-sqlite3
-- SQLite extension with AES-256 codec: https://github.com/sqlcipher/sqlcipher
-- AES-256 implementation from: https://github.com/libtom/libtomcrypt
+- Go sqlite3 driver: https://github.com/mattn/go-sqlite3 (master)
+- SQLite extension with AES-256 codec: https://github.com/sqlcipher/sqlcipher (4.6.1)
+- AES-256 implementation from: https://github.com/libtom/libtomcrypt (develop)
 
 SQLite itself is part of SQLCipher.
 
@@ -25,6 +25,10 @@ to upgrade existing database files.
 
 See [migrating databases](https://www.zetetic.net/sqlcipher/sqlcipher-api/#Migrating_Databases) for details.
 
+To upgrade your Go code to the 4.x series, change the import path to
+
+    "github.com/Boolean-Autocrat/go-sqlcipher"
+
 ### Installation
 
 This package can be installed with the go get command:
@@ -37,30 +41,30 @@ To create and open encrypted database files use the following DSN parameters:
 
 ```go
 key := "2DD29CA851E7B56E4697B0E1F08507293D761A05CE4D1B628663F411A8086D99"
-dbname := fmt.Sprintf("db?_pragma_key=x'%s'&_pragma_cipher_page_size=4096", key)
+dbname := fmt.Sprintf("db?_key=x'%s'&_pragma_cipher_page_size=4096", key)
 db, _ := sql.Open("sqlite3", dbname)
 ```
 
-`_pragma_key` is the hex encoded 32 byte key (must be 64 characters long).
+`_key` is the hex encoded 32 byte key (must be 64 characters long).
 `_pragma_cipher_page_size` is the page size of the encrypted database (set if
 you want a different value than the default size).
 
 ```go
 key := url.QueryEscape("secret")
-dbname := fmt.Sprintf("db?_pragma_key=%s&_pragma_cipher_page_size=4096", key)
+dbname := fmt.Sprintf("db?_key=%s&_pragma_cipher_page_size=4096", key)
 db, _ := sql.Open("sqlite3", dbname)
 ```
 
-This uses a passphrase directly as `_pragma_key` with the key derivation function in
+This uses a passphrase directly as `_key` with the key derivation function in
 SQLCipher. Do not forget the `url.QueryEscape()` call in your code!
 
 See also [PRAGMA key](https://www.zetetic.net/sqlcipher/sqlcipher-api/#PRAGMA_key).
 
 API documentation can be found here:
-http://godoc.org/github.com/Boolean-Autocrat/go-sqlcipher
+http://godoc.org/github.com/mutecomm/go-sqlcipher
 
 Use the function
-[sqlite3.IsEncrypted()](https://godoc.org/github.com/Boolean-Autocrat/go-sqlcipher#IsEncrypted)
+[sqlite3.IsEncrypted()](https://godoc.org/github.com/mutecomm/go-sqlcipher#IsEncrypted)
 to check whether a database file is encrypted or not.
 
 Examples can be found under the `./_example` directory

_example/custom_driver_name/Makefile

@@ -7,7 +7,7 @@ import (
 	"math"
 	"math/rand"
 
-	sqlite "github.com/mattn/go-sqlite3"
+	sqlite "github.com/Boolean-Autocrat/go-sqlcipher"
 )
 
 // Computes x^y

_example/custom_driver_name/main.go

@@ -5,7 +5,7 @@ import (
 	"log"
 	"os"
 
-	"github.com/mattn/go-sqlite3"
+	sqlite3 "github.com/Boolean-Autocrat/go-sqlcipher"
 )
 
 func main() {

_example/custom_func/main.go

@@ -7,17 +7,17 @@ import (
 	"os"
 	"strings"
 
-	"github.com/mattn/go-sqlite3"
+	sqlite3 "github.com/Boolean-Autocrat/go-sqlcipher"
 )
 
-func createBulkInsertQuery(n int, start int) (query string, args []any) {
+func createBulkInsertQuery(n int, start int) (query string, args []interface{}) {
 	values := make([]string, n)
-	args = make([]any, n*2)
+	args = make([]interface{}, n*2)
 	pos := 0
 	for i := 0; i < n; i++ {
 		values[i] = "(?, ?)"
 		args[pos] = start + i
-		args[pos+1] = fmt.Sprintf("こんにちは世界%03d", i)
+		args[pos+1] = fmt.Sprintf("こんにちわ世界%03d", i)
 		pos += 2
 	}
 	query = fmt.Sprintf(
@@ -27,7 +27,7 @@ func createBulkInsertQuery(n int, start int) (query string, args []any) {
 	return
 }
 
-func bulkInsert(db *sql.DB, query string, args []any) (err error) {
+func bulkInsert(db *sql.DB, query string, args []interface{}) (err error) {
 	stmt, err := db.Prepare(query)
 	if err != nil {
 		return