Skip to content

Commit

Permalink
Merge branch 'v2.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
gjrtimmer committed Jul 24, 2018
2 parents b3511bf + bab5582 commit b94c9c2
Show file tree
Hide file tree
Showing 141 changed files with 9,593 additions and 5,097 deletions.
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
### Issue description
Tell us what should happen and what happens instead

### Example code
```go
If possible, please enter some example code here to reproduce the issue.
```

### Error log
```
If you have an error log, please paste it here.
```

### Configuration
*Driver version (or git SHA):*

*Go version:* run `go version` in your console
9 changes: 9 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
### Description
Please explain the changes you made here.

### Checklist
- [ ] Code compiles correctly
- [ ] Created tests which fail without the change (if possible)
- [ ] All tests passing
- [ ] Extended the README / documentation / Wiki, if necessary
- [ ] Added myself / the copyright holder to the AUTHORS file
31 changes: 28 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,33 @@
.vscode

# Exclude from upgrade
upgrade/*.c
upgrade/*.h
tools/upgrade/*.c
tools/upgrade/*.h

# Exclude upgrade binary
upgrade/upgrade
cmd/upgrade/upgrade
cmd/upgrade/sqlite3.c
cmd/upgrade/sqlite3.h
cmd/upgrade/sqlite3ext.h

# Exclude example binaries
examples/*/*.db
examples/custom_func/custom_func
examples/hook/hook
examples/limit/limit
examples/*/*.so
examples/*/extension
examples/simple/simple
examples/trace/trace
examples/vtable/vtable

debug.test
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
Icon?
ehthumbs.db
Thumbs.db
.idea
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
matrix:
- GOTAGS=
- GOTAGS=libsqlite3
- GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_trace sqlite_userauth sqlite_vacuum_incr sqlite_vtable"
- GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_preupdate_hook sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_trace sqlite_userauth sqlite_vacuum_incr sqlite_codec sqlite_vtable"
- GOTAGS=sqlite_vacuum_full

go:
Expand All @@ -33,9 +33,9 @@ before_install:
fi
script:
- GOOS=$(go env GOOS) GOARCH=$(go env GOARCH) go build -v -tags "${GOTAGS}" .
- GOOS=$(go env GOOS) GOARCH=$(go env GOARCH) go build -v -tags "${GOTAGS}" ./driver
- |
if [[ "${GOOS}" != "windows" ]]; then
$HOME/gopath/bin/goveralls -repotoken 3qJVUE0iQwqnCbmNcDsjYu1nh4J4KIFXx
go test -race -v . -tags "${GOTAGS}"
go test -race -v ./driver -tags "${GOTAGS}"
fi
15 changes: 15 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# This is the official list of Go-SQLite3 authors for copyright purposes.

# If you are submitting a patch, please add your name or the name of the
# organization which holds the copyright to this list in alphabetical order.

# Names should be added to this file as
# Name <email address>
# The email address is not required for organizations.
# Please keep the list sorted (First Name Ascending).

# Individual Persons
G.J.R. Timmer <gjr.timmer@gmail.com>
Yasuhiro Matsumoto <mattn.jp@gmail.com>

# Organizations
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
## Version 2.0.0 (2018-07-20)

Changes:

- Rewrite of package
- Documentation fixes
- Moved `crypt` encoders to subpackage
- Additional Tests

New Features:

- Golang:1.10 `sql/driver` support
- Crypt
`CryptEncoder` interface for implementing custom encoder
`CryptSaltedEncoder` interface for implementing custom encoder with a salt
- Wiki Pages
27 changes: 27 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Contributing Guidelines

## Reporting Issues

Before creating a new Issue, please check first if a similar Issue [already exists](https://github.com/mattn/go-sqlite3/issues?state=open) or was [recently closed](https://github.com/mattn/go-sqlite3/issues?direction=desc&page=1&sort=updated&state=closed).

## Contributing Code

By contributing to this project, you share your code under the MIT License, as specified in the LICENSE file.
Don't forget to add yourself to the AUTHORS file.

### Errors

Errors are preferred to be started with and fully in lower case, with the exception only to names in which uppercase letters are common. For example: NULL, SQLite Go-SQLite3 or function names.

### Code Review

Everyone is invited to review and comment on pull requests.
If it looks fine to you, comment with "LGTM" (Looks good to me).

If changes are required, notice the reviewers with "PTAL" (Please take another look) after committing the fixes.

Before merging the Pull Request, at least one team member must have commented with "LGTM".

## Development Ideas

If you are looking for ideas for code contributions, please check our [Development Ideas](https://github.com/mattn/go-sqlite3/wiki/Development-Ideas) Wiki page.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014 Yasuhiro Matsumoto
Copyright (c) 2018 Yasuhiro Matsumoto

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Loading

0 comments on commit b94c9c2

Please sign in to comment.