mirror
/
go-sqlcipher
mirror of https://github.com/xeodou/go-sqlcipher.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into update/options

This commit is contained in:
Gert-Jan Timmer 2018-05-24 11:43:17 +02:00
parent a909aeb37f 29ac65fc30
commit fdd603e859
2 changed files with 141 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
.travis.yml
View File

@ -1,19 +1,147 @@
language: go language: go
sudo: required
dist: trusty os:
- linux
- osx
addons:
apt:
update: true
env: env:
matrix:
- GOTAGS= - GOTAGS=
- GOTAGS=libsqlite3 - GOTAGS=libsqlite3
- GOTAGS=trace - GOTAGS=trace
- GOTAGS=vtable - GOTAGS=vtable
go: go:
- 1.7.x - 1.7.x
- 1.8.x - 1.8.x
- 1.9.x - 1.9.x
- 1.10.x
- master - master
matrix:
allow_failures:
- go: master
exclude:
- os: osx
go: 1.7.x
include:
- os: linux
go: 1.7.x
env: GOTAGS= GOOS=windows GOARCH=386
- os: linux
go: 1.7.x
env: GOTAGS= GOOS=windows GOARCH=amd64
- os: linux
go: 1.7.x
env: GOTAGS=libsqlite3 GOOS=windows GOARCH=386
- os: linux
go: 1.7.x
env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
- os: linux
go: 1.7.x
env: GOTAGS=trace GOOS=windows GOARCH=386
- os: linux
go: 1.7.x
env: GOTAGS=trace GOOS=windows GOARCH=amd64
- os: linux
go: 1.7.x
env: GOTAGS=vtable GOOS=windows GOARCH=386
- os: linux
go: 1.7.x
env: GOTAGS=vtable GOOS=windows GOARCH=amd64
- os: linux
go: 1.8.x
env: GOTAGS= GOOS=windows GOARCH=386
- os: linux
go: 1.8.x
env: GOTAGS= GOOS=windows GOARCH=amd64
- os: linux
go: 1.8.x
env: GOTAGS=libsqlite3 GOOS=windows GOARCH=386
- os: linux
go: 1.8.x
env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
- os: linux
go: 1.8.x
env: GOTAGS=trace GOOS=windows GOARCH=386
- os: linux
go: 1.8.x
env: GOTAGS=trace GOOS=windows GOARCH=amd64
- os: linux
go: 1.8.x
env: GOTAGS=vtable GOOS=windows GOARCH=386
- os: linux
go: 1.8.x
env: GOTAGS=vtable GOOS=windows GOARCH=amd64
- os: linux
go: 1.9.x
env: GOTAGS= GOOS=windows GOARCH=386
- os: linux
go: 1.9.x
env: GOTAGS= GOOS=windows GOARCH=amd64
- os: linux
go: 1.9.x
env: GOTAGS=libsqlite3 GOOS=windows GOARCH=386
- os: linux
go: 1.9.x
env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
- os: linux
go: 1.9.x
env: GOTAGS=trace GOOS=windows GOARCH=386
- os: linux
go: 1.9.x
env: GOTAGS=trace GOOS=windows GOARCH=amd64
- os: linux
go: 1.9.x
env: GOTAGS=vtable GOOS=windows GOARCH=386
- os: linux
go: 1.9.x
env: GOTAGS=vtable GOOS=windows GOARCH=amd64
- os: linux
go: 1.10.x
env: GOTAGS= GOOS=windows GOARCH=386
- os: linux
go: 1.10.x
env: GOTAGS= GOOS=windows GOARCH=amd64
- os: linux
go: 1.10.x
env: GOTAGS=libsqlite3 GOOS=windows GOARCH=386
- os: linux
go: 1.10.x
env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
- os: linux
go: 1.10.x
env: GOTAGS=trace GOOS=windows GOARCH=386
- os: linux
go: 1.10.x
env: GOTAGS=trace GOOS=windows GOARCH=amd64
- os: linux
go: 1.10.x
env: GOTAGS=vtable GOOS=windows GOARCH=386
- os: linux
go: 1.10.x
env: GOTAGS=vtable GOOS=windows GOARCH=amd64
before_install: before_install:
- go get github.com/mattn/goveralls - |
- go get golang.org/x/tools/cmd/cover if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
brew update
fi
- |
if [[ "${GOOS}" != "windows" ]]; then
go get github.com/mattn/goveralls
go get golang.org/x/tools/cmd/cover
fi
script: script:
- $HOME/gopath/bin/goveralls -repotoken 3qJVUE0iQwqnCbmNcDsjYu1nh4J4KIFXx - GOOS=$(go env GOOS) GOARCH=$(go env GOARCH) go build -v -tags "${GOTAGS}" .
- go test -race -v . -tags "$GOTAGS" - |
if [[ "${GOOS}" != "windows" ]]; then
$HOME/gopath/bin/goveralls -repotoken 3qJVUE0iQwqnCbmNcDsjYu1nh4J4KIFXx
go test -race -v . -tags "${GOTAGS}"
fi

3
sqlite3.go
View File

@ -13,7 +13,10 @@ package sqlite3
#cgo linux,!android CFLAGS: -DHAVE_PREAD64=1 -DHAVE_PWRITE64=1 #cgo linux,!android CFLAGS: -DHAVE_PREAD64=1 -DHAVE_PWRITE64=1
#cgo CFLAGS: -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4_UNICODE61 #cgo CFLAGS: -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4_UNICODE61
#cgo CFLAGS: -DSQLITE_TRACE_SIZE_LIMIT=15 #cgo CFLAGS: -DSQLITE_TRACE_SIZE_LIMIT=15
#cgo CFLAGS: -DSQLITE_OMIT_DEPRECATED
#cgo CFLAGS: -DSQLITE_DISABLE_INTRINSIC #cgo CFLAGS: -DSQLITE_DISABLE_INTRINSIC
#cgo CFLAGS: -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1
#cgo CFLAGS: -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
#cgo CFLAGS: -Wno-deprecated-declarations #cgo CFLAGS: -Wno-deprecated-declarations
#ifndef USE_LIBSQLITE3 #ifndef USE_LIBSQLITE3
#include <sqlite3-binding.h> #include <sqlite3-binding.h>