Skip to content

Merge upstream #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Jan 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
3392062
bump codecov/codecov-action@v2 (#957)
shogo82148 Jul 20, 2021
3900dc3
return non-nil result when calling exec with empty query (#973)
avivklas Oct 19, 2021
628398e
chore: readme: Fix link, typos, copy editing (#974)
rasa Oct 22, 2021
1f85ebd
Allow building on OpenBSD (#976)
ledeuns Oct 25, 2021
4bc7a1f
Resolve windows CI issues (#941)
aeneasr Oct 25, 2021
b3df4a5
Fix typo in README.md (#939)
eltociear Oct 25, 2021
1cdbb70
run tests against Go 1.16 (#967)
hbagdi Oct 25, 2021
ab65367
Test on 1.17
mattn Oct 25, 2021
3bb6941
sqlite3.go: use PRAGMA to set busy_timeout (#910)
danp Oct 25, 2021
98d34f9
Use single-quotes around string literals. (#934)
mversiotech Oct 25, 2021
2b780b4
fix idxStr freeing issue (#898)
patrickdevivo Oct 25, 2021
5671e01
Update SQLite3_ The columntypescantype method of type (#909)
Auler Oct 25, 2021
2b131e0
change angle bracket import to quotes (#868)
yihanzhen Oct 25, 2021
a4fc68a
sqlite3_test.go: Fix go test -run=...: Use standard sub-tests (#881)
evanj Oct 25, 2021
9537be5
Adds CIFuzz for fuzzing as continuous integration (#919)
catenacyber Oct 25, 2021
bb15a32
Drop old versions (#979)
mattn Oct 26, 2021
48c6a56
Add go.mod and go.sum for upgrade (#978)
mattn Oct 26, 2021
4761e9c
Do no test with go-acc on Windows (#980)
mattn Oct 26, 2021
8543684
Fix GitHub workflows
mattn Oct 26, 2021
7fbc50c
Update amalgamation code
mattn Dec 26, 2021
98c5219
Temporary disable test for dropping vtable
mattn Dec 26, 2021
c0fa5ea
Add driverName to be possible change driver name
mattn Jan 9, 2022
671e666
Add example using driverName
mattn Jan 9, 2022
ae2a61f
Add sqlite3_file_control() support
benbjohnson Jan 28, 2022
6026c7c
Merge remote-tracking branch 'mattn/master' into merge-upstream
otoolep Jan 31, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions .github/workflows/cifuzz.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: CIFuzz
on: [pull_request]
jobs:
Fuzzing:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
sanitizer: [address]
steps:
- name: Build Fuzzers (${{ matrix.sanitizer }})
uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
with:
oss-fuzz-project-name: 'go-sqlite3'
dry-run: false
sanitizer: ${{ matrix.sanitizer }}
- name: Run Fuzzers (${{ matrix.sanitizer }})
uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
with:
oss-fuzz-project-name: 'go-sqlite3'
fuzz-seconds: 600
dry-run: false
sanitizer: ${{ matrix.sanitizer }}
- name: Upload Crash
uses: actions/upload-artifact@v1
if: failure()
with:
name: ${{ matrix.sanitizer }}-artifacts
path: ./out/artifacts
12 changes: 12 additions & 0 deletions _example/custom_driver_name/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
TARGET = custom_driver_name
ifeq ($(OS),Windows_NT)
TARGET := $(TARGET).exe
endif

all : $(TARGET)

$(TARGET) : main.go
go build -ldflags="-X 'github.com/mattn/go-sqlite3.driverName=my-sqlite3'"

clean :
rm -f $(TARGET)
13 changes: 13 additions & 0 deletions _example/custom_driver_name/main.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package main

import (
"database/sql"

_ "github.com/mattn/go-sqlite3"
)

func main() {
for _, driver := range sql.Drivers() {
println(driver)
}
}
2 changes: 1 addition & 1 deletion backup.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package sqlite3

/*
#ifndef USE_LIBSQLITE3
#include <sqlite3-binding.h>
#include "sqlite3-binding.h"
#else
#include <sqlite3.h>
#endif
Expand Down
2 changes: 1 addition & 1 deletion callback.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ package sqlite3

/*
#ifndef USE_LIBSQLITE3
#include <sqlite3-binding.h>
#include "sqlite3-binding.h"
#else
#include <sqlite3.h>
#endif
Expand Down
2 changes: 1 addition & 1 deletion error.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package sqlite3

/*
#ifndef USE_LIBSQLITE3
#include <sqlite3-binding.h>
#include "sqlite3-binding.h"
#else
#include <sqlite3.h>
#endif
Expand Down
Loading