Commit Graph

918 Commits

Author SHA1 Message Date
mattn
2329c6ea75 Update amalgamation code (#842)
* Update amalgamation code

* Drop go1.9 and go1.10
2020-08-19 20:15:57 +09:00
Olivier Mengué
4c2df3cc46 Travis-CI: set go_import_path (#829)
Set go_import_path to tell Travis-CI where to checkout the code, so the
Travis build can also work on forks. This is important when building
without Go modules support.
2020-07-21 17:00:10 +09:00
Olivier Mengué
979ea59e5a Travis-CI: add Go 1.14.x, change order of Go versions (#830)
Changes in Go versions for the Travis-CI builds:
- reverse order of Go versions so the latest ones are checked first
- add Go 1.14.x (latest stable) at the first position
- use 'tip' instead of 'master' (like https://tip.golang.org) and move
  it just after 1.14.x
2020-07-21 16:59:02 +09:00
Yasuhiro Matsumoto
aa77c03e2f Update README.md 2020-06-18 22:22:56 +09:00
mattn
baaf8a9784 upgrade amalgamation code (#821) 2020-06-06 12:49:38 +09:00
Martin Tournoij
0cec2d7524 Add mock versions of SQLiteDriver and SQLiteConn for +build !cgo (#819)
My app can use PostgreSQL and – optionally – SQLite. I would like to be
able to compile the app without cgo when SQLite isn't used, as this
removes the need for a C compiler which makes builds easier and faster,
especially for end-users.

In the simple case, this is not a problem go-sqlite3 already provides a
simple non-cgo mock so it compiles and gives a runtime error if you try
to use it anyway.

However, now I'd like to register a function for my SQLite connection to
match a PostgreSQL function like so:

	sql.Register("sqlite3_custom", &sqlite3.SQLiteDriver{
		ConnectHook: func(conn *sqlite3.SQLiteConn) error {
			return conn.RegisterFunc("pow", pow, true); err != nil {
		},
	})

But this makes it quite hard to keep the same logic since it refers to
types that don't exist with CGO_ENABLED=0. I will need to create a db.go
with `+build !cgo` and db_cgo.go with `+buid cgo` which duplicates all
the logic but with the sqlite hooks. In my case, this actually affects
quite a lot; for example I have a helper function which connects and
runs migrations and whatnot which looks like:

	type ConnectOptions struct {
		Connect    string // Connect string.
		Schema     []byte // Database schema to create on startup.
		Migrate    *Migrate
		SQLiteHook func(*sqlite3.SQLiteConn) error
	}

And I'd have to have two versions of that, too. You could perhaps do
something with interfaces, but because the sql.Register() call above
references the `sqlite3.SQLiteDriver.ConnectHook` struct field that's
not so straightforward (and wrapping stuff in interfaces probably won't
do much for the general clarity either).

This simplifies all of that by providing some common types that may be
used when setting up a SQLite connectin. I renamed the
`SQLiteDriverMock` to `&SQLiteDriver` for this reason. As far as I can
tell in my testing, this has no real downsides (but perhaps I missed
something?)

---

Note: it might also be worth doing something similar for error.go, as I
already have two variants of the below function (one with cgo as below,
and one without cgo which checks just PostgreSQL):

	// ErrUnique reports if this error reports a UNIQUE constraint violation.
	//
	// This is the cgo version which works for PostgreSQL and SQLite.
	func ErrUnique(err error) bool {
		var sqlErr *sqlite3.Error
		if errors.As(err, &sqlErr) && sqlErr.ExtendedCode == sqlite3.ErrConstraintUnique {
			return true
		}
		var pqErr *pq.Error
		if errors.As(err, &pqErr) && pqErr.Code == "23505" {
			return true
		}
		return false
	}

This is a lot more manageable than the ConnectHook case, but it would be
nicer if it would work without the need for build tags.
2020-06-05 22:06:55 +09:00
turtlemaster19
f600c4bddb Edited note in README (#817) 2020-06-01 22:39:02 +09:00
Vishnu Mohandas
e77f7dd61e Document requirements for cross compiling from OSX (#804)
* Document requirements for cross compiling from OSX 

Inspiration: https://github.com/mattn/go-sqlite3/issues/384#issuecomment-433584967

* Document cross compilation steps using xgo for MACOSX
2020-05-16 00:48:12 +09:00
gber
db4c9426f8 Enable all prefixes for named parameters and allow for unused named parameters (#811)
* Allow unused named parameters

Try to bind all named parameters and ignore those not used.

* Allow "@" and "$" for named parameters

* Add tests for named parameters

Co-authored-by: Guido Berhoerster <guido+go-sqlite3@berhoerster.name>
2020-05-14 23:28:04 +09:00
Diego Becciolini
44b2a6394a Fix #808: remove goconvey (#809)
* don't need smartystreets/goconvey any longer

* synchronise coveralls
2020-05-14 23:24:58 +09:00
ShanePerron
61ad8da9d6 Fix for early termination of returned rows (#805)
Once the regex encountered the first instance of a non-match, it would return without processing the rest of the rows in the statement. This change allows it to process the remaining, only setting the sqlite3_result_int to zero then continuing. This worked fine for the example as it only had one item to process.
2020-05-03 00:42:42 +09:00
rittneje
98a44bcf59 report actual error message if sqlite3_load_extension fails (#800)
* report actual error message if sqlite3_load_extension fails

* more fixes and test cases

Co-authored-by: Jesse Rittner <jrittner@lutron.com>
2020-04-16 14:45:59 +09:00
Paul Bergeron
58b2310c97 Add extension-functions.c info to README (#779) 2020-04-16 14:44:20 +09:00
Yasuhiro Matsumoto
77fdcc27bb Update dependencies 2020-04-16 14:43:15 +09:00
Karthik K
a23162b94b feat: add go modules (#781)
* feat: add go modules

* feat: upgrade goquery dependency
2020-04-16 14:42:04 +09:00
Manfred Touron
67986a7832 chore: remove debug code (#788) 2020-02-27 17:28:46 +09:00
mattn
9bdaffc12b upgrade amalgamation code (#777) 2020-01-28 19:25:19 +09:00
Yasuhiro Matsumoto
ed406dd4e2 Update README.md 2020-01-23 15:57:42 +09:00
Sergey Bronnikov
d51eaf3b34 Fix typo (#763) 2020-01-09 18:43:04 +09:00
rittneje
53cff3fceb fix typo in doc comment (#770) 2019-12-17 16:07:49 +09:00
rittneje
b4f5cc77d1 add SystemErrno to Error (#740)
* adding SystemErrno to Error, and fixing error logic when open fails

* fix for old versions of libsqlite3 that do not have sqlite3_system_errno defined

* fixing pre-processor logic
2019-12-17 15:58:28 +09:00
mattn
590d44c02b Merge pull request #744 from azavorotnii/ctx_cancel
Fix context cancellation racy handling
2019-11-19 01:19:53 +09:00
mattn
0cf797e1cd Merge pull request #760 from mattn/sqlite-amalgamation-3300100
upgrade amalgamation code
2019-11-19 01:18:17 +09:00
Yasuhiro Matsumoto
a1e7f13af0 upgrade amalgamation code 2019-11-18 22:50:50 +09:00
mattn
4d8693d6ee Merge pull request #758 from mattn/noncgo
Add build constraints for non cgo
2019-11-18 19:50:39 +09:00
Yasuhiro Matsumoto
fc06e55305 Add build constraints for non cgo 2019-11-18 18:03:31 +09:00
mattn
67c1376b46 Merge pull request #754 from codesoap/master
Improve readability of Backup()
2019-11-05 14:44:21 +09:00
codesoap
17bc44792c Improve readability of Backup() 2019-10-31 15:26:56 +01:00
mattn
c64f703b0d Merge pull request #753 from opencollective/opencollective
Activating Open Collective
2019-10-31 09:30:00 +09:00
Jess
c74e550595 Added financial contributors to the README 2019-10-30 15:39:31 -07:00
mattn
3f45aefa8d Update FUNDING.yml 2019-10-08 17:38:25 +09:00
mattn
a26641dc74 Merge pull request #750 from tpounds/add-new-go-vers
Add Go 1.12.x/1.13.x to CI
2019-10-08 16:23:26 +09:00
Trevor Pounds
34018519d0 Add Go 1.12.x/1.13.x to CI. 2019-10-07 10:46:06 -04:00
mattn
4396a38886 Merge pull request #747 from azavorotnii/open_journal_mode
Fix Open() journal mode regression
2019-09-24 10:39:45 +09:00
Andrii Zavorotnii
27d3ed467c Fix typo in "_locking_mode" DSN handling 2019-09-23 14:57:24 -07:00
Andrii Zavorotnii
c4a8658099 Fix Open() journal mode regression
[why]
see https://github.com/mattn/go-sqlite3/issues/607

SQLite default journal mode is DELETE, but forcing it on open causes "database is locked"
if other connection exists with WAL mode, for example.

[how]
Don't set DELETE mode if not set in DSN explicitly.

[testing]
Run tests in my project where WAL mode is used.
2019-09-23 14:56:04 -07:00
Andrii Zavorotnii
7e1a61dbcd Fix context cancellation racy handling
[why]
Context cancellation goroutine is not in sync with Next() method lifetime.
It leads to sql.ErrNoRows instead of context.Canceled often (easy to reproduce).
It leads to interruption of next query executed on same connection (harder to reproduce).

[how]
Do query in goroutine, wait when interruption done.

[testing]
Add unit test that reproduces error cases.
2019-09-06 12:15:53 -07:00
Gert-Jan Timmer
d3c690956b Fix memory leak in ExpandedSQL (#738)
Fixes: #733
2019-08-22 14:55:11 +02:00
G.J.R. Timmer
e3726ad6eb Fixed operator 2019-08-22 14:53:27 +02:00
G.J.R. Timmer
b22da71572 Fix _auth_* parameter check
Fixes: #724
2019-08-22 14:53:27 +02:00
G.J.R. Timmer
2ea5857c0e Closes #597 2019-08-22 10:59:46 +02:00
mattn
e24345b069 Merge pull request #734 from gwd/out/fix-libsqlite3-darwin-build
darwin/libsqlite3: Also use the homebrew include path
2019-08-20 00:43:48 +09:00
mattn
f4ce3be229 Merge pull request #735 from mahler/master
Issue #651: Fix of typo
2019-08-20 00:43:38 +09:00
=
85bf186e05 Issue #651: Fix of typo
https://github.com/mattn/go-sqlite3/issues/651
2019-08-19 15:53:09 +02:00
George Dunlap
f9aab7dda8 darwin/libsqlite3: Also use the homebrew include path
When building on darwin with the `libsqlite3` tag, go-sqlite3 adds the
homebrew library path.  It does not, however, add the homebrew include
path, which means that the MacOS sqlite3 header is used instead.  On
my system, this results in build errors that look like this:

./sqlite3_load_extension.go:25:8: could not determine kind of name for C.sqlite3_enable_load_extension
./sqlite3_load_extension.go:33:8: could not determine kind of name for C.sqlite3_load_extension

Add the homebrew include path as well, so that he header matches the
libraries we're using.

Signed-off-by: George Dunlap <george.dunlap@citrix.com>
2019-08-19 11:27:31 +01:00
mattn
d6f416f91c Merge pull request #732 from mattn/sqlite-amalgamation-3290000
upgrade amalgamation code
2019-07-16 16:15:03 +09:00
Yasuhiro Matsumoto
b612a2feea upgrade amalgamation code 2019-07-16 14:56:09 +09:00
mattn
fba062bdb6 Merge pull request #731 from Jason-Cooke/patch-1
docs: fix typo
2019-07-09 13:10:54 +09:00
Jason Cooke
9889b11544 docs: fix typo 2019-07-09 09:09:23 +12:00
mattn
5dd71670cc Merge pull request #727 from MichaelS11/master
Updated Ping and doTestOpen. Added TestOpenContext and TestFileCopyTruncate
2019-06-20 10:01:18 +09:00